BuffelSaft 0a27b575dc Fix merge error in battle scripts

2022-01-27 17:24:11 +13:00

..

layouts

…

maps

…

scripts

…

text

…

tilesets

…

battle_anim_scripts.s

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2

2022-01-27 17:18:51 +13:00

battle_scripts_1.s

Fix merge error in battle scripts

2022-01-27 17:24:11 +13:00

battle_scripts_2.s

…

contest_ai_scripts.s

…

ereader_link_data.bin

…

ereader_link_data.s

…

event_scripts.s

Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

2021-12-01 20:17:08 -08:00

field_effect_scripts.s

…

map_events.s

…

maps.s

…

multiboot_berry_glitch_fix.s

…

multiboot_pokemon_colosseum.s

…

mystery_event_script_cmd_table.s

…

mystery_gift.s

…

pokemon_colosseum.mb

…

script_cmd_table.inc

…

sound_data.s

…

specials.inc

…

tilesets.s

…