Hedara 1916703e5a Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge ... Conflicts: include/battle_script_commands.h include/constants/event_objects.h include/event_object_movement.h include/field_effect.h include/field_effect_helpers.h include/sprite.h src/battle_controller_player.c src/event_object_movement.c src/pokeball.c		2025-06-25 17:49:19 +02:00
..
layouts	REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS	2024-12-21 11:00:27 -03:00
maps	Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge	2025-06-25 17:49:19 +02:00
scripts	Merge commit '07fd8a28fbd5b23a6828846e4606fc3ecd54c3d9' into merrp-merge	2025-06-25 17:14:52 +02:00
text	Add caught mon to full party by sending a different mon to the Box (#6058)	2025-02-09 00:54:58 +01:00
tilesets	REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS	2024-12-21 11:00:27 -03:00
battle_anim_scripts.s	Fix savage spin out spider web template (#7137)	2025-06-18 11:04:24 +02:00
battle_scripts_1.s	Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170)	2025-06-21 00:04:01 +02:00
battle_scripts_2.s	Remove old slide workaround (#6754)	2025-05-03 10:54:49 +02:00
contest_ai_scripts.s	Move general config file to the config folder (#4805)	2024-06-19 13:42:01 +02:00
event_scripts.s	Merge remote-tracking branch 'upstream/master' into followers	2025-06-24 20:39:12 -04:00
field_effect_scripts.s	Remove trailing whitespace (#6968)	2025-05-23 22:33:12 +02:00
map_events.s
maps.s
mb_berry_fix.gba
mb_colosseum.gba
mb_ereader.gba
multiboot_berry_glitch_fix.s
multiboot_ereader.s
multiboot_pokemon_colosseum.s
mystery_event_script_cmd_table.s
mystery_gift.s
script_cmd_table.inc	Merge remote-tracking branch 'upstream/master' into followers	2025-02-10 00:11:38 -05:00
sound_data.s
specials.inc	Add Code Entry functionality (#5951)	2025-01-25 22:03:08 +01:00