From 46c2a38c7c55ff01e8787dfd624cb1c771248b6c Mon Sep 17 00:00:00 2001 From: xCrystal Date: Wed, 1 Apr 2015 11:41:20 +0200 Subject: Rename battle files and split move effects Part 2 5.asm, 9.asm, and a.asm --- main.asm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 958c774f..1c7f15f9 100755 --- a/main.asm +++ b/main.asm @@ -4825,7 +4825,7 @@ INCLUDE "engine/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" INCLUDE "engine/overworld/emotion_bubbles.asm" INCLUDE "engine/evolve_trade.asm" -INCLUDE "engine/battle/5.asm" +INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" @@ -5154,7 +5154,9 @@ TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" SECTION "Battle (bank 9)", ROMX, BANK[$9] -INCLUDE "engine/battle/9.asm" +INCLUDE "engine/battle/print_type.asm" +INCLUDE "engine/battle/save_trainer_name.asm" +INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" SECTION "Pics 2", ROMX, BANK[PICS_2] @@ -5226,7 +5228,7 @@ MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" SECTION "Battle (bank A)", ROMX, BANK[$A] -INCLUDE "engine/battle/a.asm" +INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" SECTION "Pics 3", ROMX, BANK[PICS_3] -- cgit v1.2.3