diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-26 16:27:21 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-26 16:27:21 -0500 |
| commit | 47979336e29d7e22d524e35ddc50576874ead009 (patch) | |
| tree | 91723be28641be80ad475b61b5b40f03e1eab9ae /engine/battle/common_text.asm | |
| parent | 043e9327650f2ee0053fe43a29c9d63bc5e120d3 (diff) | |
Start disassembling bank0F (Battle)
All current findings will be located in engine/battle/core_.asm
Diffstat (limited to 'engine/battle/common_text.asm')
| -rw-r--r-- | engine/battle/common_text.asm | 4 |
1 files changed, 2 insertions, 2 deletions
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 |