AlexOn1ine 1131b205f2 conflicts

2025-08-28 14:09:38 +02:00

..

layouts

…

maps

Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge

2025-06-25 17:54:59 +02:00

scripts

Add rock climb history from ghoul

2025-08-05 20:47:05 +02:00

text

…

tilesets

…

battle_anim_scripts.s

25/08/25 Master merge

2025-08-25 17:30:38 +02:00

battle_scripts_1.s

conflicts

2025-08-28 14:09:38 +02:00

battle_scripts_2.s

Wild Pokémon animate after breaking out of Poké Ball (#7339)

2025-08-01 18:14:42 +02:00

contest_ai_scripts.s

…

event_scripts.s

Merge branch 'followers' into lighting

2025-06-24 20:44:44 -04:00

field_effect_scripts.s

Rock climb by ghoulslash (#7432)

2025-08-03 14:52:07 +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

Refactor field moves (#6660)

2025-05-31 09:03:12 +02:00

sound_data.s

Add config options for removing bard phoneme audio to save ROM space (#7155)

2025-06-18 20:16:25 -07:00

specials.inc

Add Set Hidden Nature option to the debug menu (#7281)

2025-07-07 13:33:57 -04:00