Hedara 0a876b46ec Merge branch 'master' into master-to-upcoming ... Conflicts: data/battle_scripts_1.s include/constants/expansion.h src/field_control_avatar.c src/ow_abilities.c		2026-05-02 21:15:57 +02:00
..
layouts	Add FRLG (#7423)	2026-01-28 17:41:12 +01:00
maps	Properly cancel move relearner NPC after refusing to learn a move (#9774)	2026-04-14 14:17:42 +02:00
scripts	Merge branch 'master' into master-to-upcoming	2026-05-02 21:15:57 +02:00
text	feat (shopMenu): conditional item appearances (#9425)	2026-03-31 14:33:35 +02:00
tilesets	Add FRLG (#7423)	2026-01-28 17:41:12 +01:00
battle_anim_scripts.s	Add Held Berry Animation (#9168)	2026-04-15 23:09:51 +02:00
battle_scripts_1.s	Merge branch 'master' into master-to-upcoming	2026-05-02 21:15:57 +02:00
battle_scripts_2.s	Refactor Battle Messages (#9655)	2026-04-03 20:27:54 +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	Overworld Encounters (#8434)	2026-04-29 19:36:14 +02:00
field_effect_scripts.s	Overworld Encounters (#8434)	2026-04-29 19:36:14 +02: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	Fix space indentation in .s and .inc files (#9371)	2026-02-27 12:45:00 -08: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	Reworked event evolution tryspecialevo (#7573)	2026-04-10 05:24:20 -07:00