From e74dce24b4bbb0d0d23a1724932b289050b66d4a Mon Sep 17 00:00:00 2001 From: xCrystal Date: Wed, 1 Apr 2015 11:23:27 +0200 Subject: Rename battle files and split move effects Part 1 1.asm, 4.asm, and 4_2.asm --- main.asm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index cb77e5a3..958c774f 100755 --- a/main.asm +++ b/main.asm @@ -1907,7 +1907,7 @@ FieldMoveDisplayData: ; 7823 (1:7823) db $ff ; list terminator -INCLUDE "engine/battle/1.asm" +INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm" INCLUDE "engine/menu/players_pc.asm" @@ -4755,7 +4755,7 @@ PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" SECTION "Battle (bank 4)", ROMX, BANK[$4] -INCLUDE "engine/battle/4.asm" +INCLUDE "engine/overworld/is_player_just_outside_map.asm" INCLUDE "engine/menu/status_screen.asm" INCLUDE "engine/menu/party_menu.asm" @@ -4766,7 +4766,12 @@ ShrinkPic2:: INCBIN "pic/trainer/shrink2.pic" INCLUDE "engine/turn_sprite.asm" INCLUDE "engine/menu/start_sub_menus.asm" INCLUDE "engine/items/tms.asm" -INCLUDE "engine/battle/4_2.asm" +INCLUDE "engine/battle/end_of_battle.asm" +INCLUDE "engine/battle/wild_encounters.asm" +INCLUDE "engine/battle/moveEffects/recoil_effect.asm" +INCLUDE "engine/battle/moveEffects/conversion_effect.asm" +INCLUDE "engine/battle/moveEffects/haze_effect.asm" +INCLUDE "engine/battle/get_trainer_name.asm" INCLUDE "engine/random.asm" -- cgit v1.3.1-sl0p