Eduardo Quezada
82252251e7
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -03:00
Eduardo Quezada
3f98c78297
Added POKEMART_LIST_END to avoid users accidentally removing it ( #1947 )
2024-12-04 17:38:23 -05:00
psf
58aa1e0034
Merge branch 'upcoming' into scriptCommands
2024-09-30 06:57:54 -07:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03:00
ghoulslash
d695a6240d
Convert settotemboost command to callnative ( #5418 )
...
* settotemboost use callnative
* Update src/battle_main.c
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-22 11:25:42 +02:00
pkmnsnfrn
d76ccddad3
spaces to tabs in inc files
2024-09-14 09:03:49 -07:00
pkmnsnfrn
60fb0b34fd
Modified getobjectxy to allow for custom destinations
2024-09-14 07:48:24 -07:00
pkmnsnfrn
1665423e52
Renamed scripts to match vanilla
...
Cleaned up descriptions
2024-09-14 07:11:04 -07:00
pkmnsnfrn
a509f28038
Changed Scripot_GetObjectFacingDirection to callnative
2024-09-14 06:32:47 -07:00
pkmnsnfrn
510af1bee6
Restored original functions and made script versions
2024-09-12 20:55:37 -07:00
pkmnsnfrn
ecd435cd84
Changed CheckChosenMOnMatchDesiredSpecies and CheckPartyHasSpecies to callnative
2024-09-12 20:45:14 -07:00
pkmnsnfrn
c2db77c4f6
Changed Script_GetSetPokedexFlag to callnative
2024-09-12 20:15:55 -07:00
pkmnsnfrn
be7938f322
Changed CheckObjectAtXY to callnative
2024-09-12 18:55:11 -07:00
pkmnsnfrn
10bb349b8c
Changed GetObjectPosition to callnative
2024-09-12 18:41:42 -07:00
pkmnsnfrn
22b0fdf5c3
Removed checkspecies_auto and made that the default behavior
2024-09-12 18:18:41 -07:00
pkmnsnfrn
979c9994f7
Set VAR_RESULT to the number of removed items from removeallitem per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531
2024-09-12 05:47:12 -07:00
pkmnsnfrn
f87440a25a
Removed setmonball per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531
2024-09-12 05:43:55 -07:00
pkmnsnfrn
a0e914b749
Merge branch 'upcoming' into scriptCommands
2024-09-12 05:39:24 -07:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers ( #4767 )
...
* add item descption headers and (default-off) config
* revert test script
* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling
* add ow item header config value labels
* Update include/config/overworld.h
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update src/overworld.c
* Update include/overworld.h
* ScriptShowItemDescription remove unused var
* fix ScriptShowItemDescription warning
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-03 20:22:01 +02:00
pkmnsnfrn
67f8a61eef
Moved current and template positions to headers
2024-08-14 19:44:18 -07:00
pkmnsnfrn
dc06321054
Moved pokedex flags to constants files andadded constants to header of event_scripts
2024-08-14 19:24:55 -07:00
pkmnsnfrn
458340e043
Moved pokedex special constants to header
2024-08-14 19:09:56 -07:00
pkmnsnfrn
bdeedaa949
Renamed evObjId to localId
2024-08-14 19:05:30 -07:00
pkmnsnfrn
881e54a52b
Incremental improvement of getobjectfacing
2024-08-12 06:51:09 -07:00
pkmnsnfrn
f0d5b68f70
Improved checkspecies functions
2024-08-11 22:10:04 -07:00
pkmnsnfrn
abb17ea88b
Improved dex flags functions
2024-08-11 21:01:31 -07:00
pkmnsnfrn
ebae09f0a6
Improved checkobjectat
2024-08-11 20:16:27 -07:00
pkmnsnfrn
7f5ecd8d0f
getobjectfacingdirection
2024-08-11 19:27:18 -07:00
pkmnsnfrn
262505589a
checkforspecies
2024-08-11 19:19:15 -07:00
pkmnsnfrn
e746334e1e
Added setmonball
2024-08-11 18:53:39 -07:00
pkmnsnfrn
fba1452c3b
Added Seen/CaughtMon macros
2024-08-11 18:49:42 -07:00
pkmnsnfrn
0784f9fa74
Added checkobjectat
2024-08-10 21:40:57 -07:00
pkmnsnfrn
811b5d286e
Added getobjectposition
2024-08-10 21:17:50 -07:00
pkmnsnfrn
73953b3e39
Added removeallitem
2024-08-10 14:43:50 -07:00
Bassoonian
89cba94567
Update event.inc to accomodate new gDecompressionBuffer name ( #5100 )
2024-08-05 22:21:12 -04:00
psf
3e03419bdb
Add OW_FLAG_PAUSE_TIME, pausefakertc, resumefakertc and togglefakertc ( #4954 )
...
* First concept
* Fixed config file and added static assert
* Reset debug scripts
* Cleaned up overworld config
* Renamed new Rtc pausing functions per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1675393121
* Added tabs instead of spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1676791279
* Update include/config/overworld.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 20:44:27 +02:00
ghoulslash
e1d8ef8190
Dynamic AI Functions ( #4908 )
...
* dynamic ai func
* add AI_TagBattlePreferFoe as an example
* Update src/battle_ai_main.c
* Update src/battle_ai_main.c
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-09 13:50:48 +02:00
ghoulslash
353727a805
Add createmon Script Cmd, Support for 2v1Wild Battles ( #4688 )
...
* add createmon and setwilddoubleflag script cmds to support createing mons at given player or enemy slots and setting up 2v1 battles
* give givemon macro PARTY_SIZE for tests
* style fixes
* add createmon test
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-06-13 19:11:36 +02:00
Alex
78f1da4131
Adds 1 vs 2 macro ( #4741 )
2024-06-08 09:49:28 +02:00
Eduardo Quezada
da91e6a392
Remove unused callfunc
2024-06-02 10:53:45 -04:00
Eduardo Quezada
1359966a14
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/event_object_movement.c
# src/scrcmd.c
2024-06-01 20:17:19 -04:00
Eduardo Quezada
e7f66e663b
Convert callfuncs to callnative
2024-05-29 19:25:51 -04:00
Eduardo Quezada
3d05961dd5
getdirectiontoface macro
2024-05-29 15:52:21 -04:00
Eduardo Quezada
d1e2f620b8
Proper macro capitalization
2024-05-29 14:40:53 -04:00
Eduardo Quezada
25567070d6
Moved callfuncs to general macros folder + added comments + removed unused "emote" macro
2024-05-22 13:52:26 -04:00
Jaizu
2358ee88e3
Fix virtual object events
2024-05-19 12:41:51 +02:00
Eduardo Quezada
35a76248d1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/pokemon/species_info/gen_4_families.h
2024-05-06 16:03:29 -04:00
Bassoonian
c5552f53da
checkteratype setteratype ( #4460 )
2024-04-30 00:12:34 +02:00
Eduardo Quezada
39ed85635f
Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/data.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon/species_info/gen_1_families.h
# src/data/pokemon/species_info/gen_2_families.h
# src/data/pokemon/species_info/gen_3_families.h
# src/data/pokemon/species_info/gen_4_families.h
# src/data/pokemon/species_info/gen_5_families.h
# src/data/pokemon/species_info/gen_6_families.h
# src/data/pokemon/species_info/gen_7_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-03-17 23:41:23 -03:00
LOuroboros
64b7cfeb29
Upgrading the debug menu's 'Poison Party' ( #4235 )
...
* Upgrading the debug menu's 'Poison Party'
* Optimized the 'No Pokémon' check in Debug_EventScript_InflictStatus1
* Killed a pointless function call in Script_SetStatus1
* Added Frostbite support to ¡inflict status1'
2024-03-01 19:55:54 +01:00
