Hedara
950dbe7897
Merge commit '16357c7' into pret-merge
...
Conflicts:
include/battle.h
include/battle_controllers.h
include/battle_script_commands.h
include/contest.h
include/list_menu.h
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_main.c
src/battle_message.c
src/battle_tower.c
src/berry_crush.c
src/contest.c
src/ereader_helpers.c
src/evolution_scene.c
src/hall_of_fame.c
src/mauville_old_man.c
src/mystery_gift_menu.c
src/pokedex.c
src/pokenav_conditions_search_results.c
src/pokenav_menu_handler_gfx.c
src/pokenav_ribbons_list.c
src/rom_header_gf.c
src/union_room.c
src/union_room_battle.c
src/union_room_player_avatar.c
2025-05-24 19:22:31 +02:00
Bassoonian
16357c7e29
Streamline pointer notation ( #2139 )
2025-05-16 12:04:44 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation ( #5982 )
2025-01-25 22:02:39 +01:00
SarnPoke
a422db09c6
Fix Slateport Battle Tent/Battle Factory ( #5281 )
...
* Fix Slateport Battle Tent/Battle Factory
Stops the Battle Factory and Slateport Battle Tent from returning no Pokémon when player wants to swap their Pokémon.
* Fix player rental party being junk data after rest
Fixes #5280
* Consolidate checks into single method
Consolidates every gSpecialVar_0x8005 check into a singular method.
2024-09-02 16:53:03 -04:00
GriffinR
866c32a735
Add temp var aliases
2023-08-04 14:17:28 -04:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
GriffinR
ff2d8a9c4e
Add frontier trainer constants
2019-12-20 21:14:05 -05:00
GriffinR
ddfa0c6298
Document Battle Tower scripts
2019-12-17 20:56:13 -05:00
GriffinR
9b3d1cfab6
Set up Battle Dome and Tower macros
2019-12-05 21:11:17 -06:00
GriffinR
be17c1602d
Set up remaining facility script doc, use Palace macros
2019-12-05 21:11:17 -06:00
GriffinR
8d870d94c9
Document Battle Arena scripts
2019-11-26 18:47:48 -06:00
GriffinR
63ee15fc28
Document Frontier Util
2019-11-25 18:37:48 -06:00
GriffinR
4dfa959fa2
Begin documenting Battle Pike and Frontier Util
2019-11-25 18:37:48 -06:00
Marcus Huderle
d59f5a8e56
Misc overworld documentation
2018-12-27 16:52:13 -06:00
DizzyEggg
f0ec68c058
add include
2018-11-19 18:14:28 +01:00
DizzyEggg
69683f9572
Decompile Battle Palace
2018-11-12 15:41:19 +01:00
