Hedara 9d80ad530d Merge branch 'master' into master-to-upcoming ... Conflicts: Makefile data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc data/maps/MtChimney/scripts.inc data/maps/MtPyre_Summit/scripts.inc data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc include/constants/event_objects.h include/constants/expansion.h src/battle_script_commands.c src/battle_util.c src/field_screen_effect.c		2025-05-28 14:26:15 +02:00
..
layouts	REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS	2024-12-21 11:00:27 -03:00
maps	Merge branch 'master' into master-to-upcoming	2025-05-28 14:26:15 +02:00
scripts	Merge branch 'master' into master-to-upcoming	2025-05-28 14:26:15 +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	Documented usage of createsprite gSlideMonToOffsetSpriteTemplate (#6953)	2025-05-23 14:41:25 +02:00
battle_scripts_1.s	Fixes Gen3 berry activation timing (#6993)	2025-05-27 23:36:00 +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 branch 'master' into master-to-upcoming	2025-05-28 14:26:15 +02: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