Hedara 82c474bcd0 Merge branch 'master' into master-to-upcoming ... Conflicts: include/config/battle.h		2026-01-04 17:31:25 +01:00
..
layouts	Cawt FRLG part 1 (#8396)	2025-11-30 09:28:36 -08:00
maps	Refactoring the way teachable learnsets are generated (#8027)	2025-12-26 13:13:29 +01:00
scripts	Migrated some strings out of strings.c/strings.h (#8270)	2026-01-02 23:48:00 -08:00
text	Migrated some strings out of strings.c/strings.h (#8270)	2026-01-02 23:48:00 -08:00
tilesets	Cawt FRLG part 1 (#8396)	2025-11-30 09:28:36 -08:00
battle_anim_scripts.s	Merge branch 'master' into master-to-upcoming	2026-01-04 17:31:25 +01:00
battle_scripts_1.s	Merge commit '0e33bf916e80e4dcf4f96ca0419a8b2fda5da51d' into master-to-upcoming	2026-01-04 11:28:59 +01:00
battle_scripts_2.s	Trainer slides for multiple trainers and multibattles (#7588)	2025-12-30 20:28:53 +00:00
contest_ai_scripts.s
event_scripts.s	Migrated some strings out of strings.c/strings.h (#8270)	2026-01-02 23:48:00 -08:00
field_effect_scripts.s	Misc style and whitespace cleanup (#8681)	2026-01-02 18:01:43 +01:00
map_events.s	Implement GSC berry/apricorn tree functionality. (#7777)	2025-11-14 20:28:55 +01:00
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	Bugfix hidefollower not waiting properly (#7768)	2025-10-19 16:39:07 +02:00
sound_data.s	Make TRUE and 1 behave the same in config/species_enabled.h (#8421)	2025-12-04 15:27:50 +01:00
specials.inc	Add Chooseboxmon special (#5428)	2025-12-04 22:46:55 +01:00