From 47979336e29d7e22d524e35ddc50576874ead009 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sat, 26 Dec 2015 16:27:21 -0500 Subject: Start disassembling bank0F (Battle) All current findings will be located in engine/battle/core_.asm --- engine/battle/common_text.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/battle/common_text.asm') diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 687fbf99..f357f695 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -8,7 +8,7 @@ PrintBeginningBattleText: ; f4000 (3d:4000) cp LAVENDER_HOUSE_1 jr c, .pokemonTower .notPokemonTower - ld a,[W_BATTLETYPE] + ld a,[wBattleType] cp $4 ; new battle type? jr nz,.notnewbattletype callab Func_fd0d0 @@ -35,7 +35,7 @@ PrintBeginningBattleText: ; f4000 (3d:4000) call DelayFrames ld hl, TrainerWantsToFightText .wildBattle - ld a, [W_BATTLETYPE] + ld a, [wBattleType] and a jr nz, .doNotDrawPokeballs push hl -- cgit v1.3.1-sl0p