Hedara 726f18f360 Merge remote-tracking branch 'pret/master' into pret-merge ... Conflicts: asm/macros/event.inc data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc data/scripts/trainer_hill.inc include/graphics.h		2025-06-24 10:42:24 +02:00
..
layouts
maps	Merge remote-tracking branch 'pret/master' into pret-merge	2025-06-24 10:42:24 +02:00
scripts	Merge remote-tracking branch 'pret/master' into pret-merge	2025-06-24 10:42:24 +02:00
text
tilesets
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
contest_ai_scripts.s
event_scripts.s	Moved time constants to dedicated files (#7019)	2025-05-30 16:39:01 +02:00
field_effect_scripts.s
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
sound_data.s
specials.inc