From 10211cc461b35140c815e18e95f7070eb0dcc586 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Wed, 1 Apr 2015 17:03:05 +0200 Subject: Rename battle files and split move effects Part 5 15.asm, 16.asm, 1a.asm, 1c.asm --- main.asm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 9cc8b91f..62d5940b 100755 --- a/main.asm +++ b/main.asm @@ -6014,7 +6014,7 @@ DayCareMBlocks: INCBIN "maps/daycarem.blk" FuchsiaHouse3Blocks: INCBIN "maps/fuchsiahouse3.blk" -INCLUDE "engine/battle/15.asm" +INCLUDE "engine/battle/experience.asm" INCLUDE "scripts/route2.asm" INCLUDE "scripts/route3.asm" @@ -6094,7 +6094,7 @@ Route18Blocks: INCBIN "maps/route18.blk" INCBIN "maps/unusedblocks58d7d.blk" -INCLUDE "engine/battle/16.asm" +INCLUDE "engine/battle/common_text.asm" INCLUDE "engine/experience.asm" @@ -6451,7 +6451,7 @@ Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" SECTION "bank1A",ROMX,BANK[$1A] -INCLUDE "engine/battle/1a.asm" +INCLUDE "engine/battle/decrement_pp.asm" Version_GFX: IF DEF(_RED) @@ -6508,7 +6508,8 @@ INCLUDE "engine/gamefreak.asm" INCLUDE "engine/hall_of_fame.asm" INCLUDE "engine/overworld/healing_machine.asm" INCLUDE "engine/overworld/player_animations.asm" -INCLUDE "engine/battle/1c.asm" +INCLUDE "engine/battle/ghost_marowak_anim.asm" +INCLUDE "engine/battle/battle_transitions.asm" INCLUDE "engine/town_map.asm" INCLUDE "engine/mon_party_sprites.asm" INCLUDE "engine/in_game_trades.asm" -- cgit v1.3.1-sl0p