Hedara 1abfa7acfa Merge branch 'master' into master-upcoming ... Conflicts: include/battle.h include/constants/battle_string_ids.h src/battle_ai_util.c src/battle_main.c src/battle_util.c test/battle/ai/ai.c		2025-05-12 18:21:35 +02:00
..
layouts	REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS	2024-12-21 11:00:27 -03:00
maps	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2025-02-20 19:17:59 -03:00
scripts	Follower NPCs (follow-me) (#6500)	2025-04-27 14:56:18 +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	Merge branch 'master' into master-upcoming-2025-04-30	2025-04-30 15:22:37 +02:00
battle_scripts_1.s	Merge branch 'master' into master-upcoming	2025-05-12 18:21:35 +02:00
battle_scripts_2.s	Remove old slide workaround (#6754)	2025-05-03 10:54:49 +02:00
contest_ai_scripts.s
event_scripts.s	Follower NPCs (follow-me) (#6500)	2025-04-27 14:56:18 +02:00
field_effect_scripts.s	Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477)	2025-04-08 16:21:32 +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