summaryrefslogtreecommitdiff
path: root/home.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-12-26 16:27:21 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-12-26 16:27:21 -0500
commit47979336e29d7e22d524e35ddc50576874ead009 (patch)
tree91723be28641be80ad475b61b5b40f03e1eab9ae /home.asm
parent043e9327650f2ee0053fe43a29c9d63bc5e120d3 (diff)
Start disassembling bank0F (Battle)
All current findings will be located in engine/battle/core_.asm
Diffstat (limited to 'home.asm')
-rw-r--r--home.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/home.asm b/home.asm
index a36f86b0..7bcb7676 100644
--- a/home.asm
+++ b/home.asm
@@ -1540,7 +1540,7 @@ DisplayListMenuID:: ; 2ae0 (0:2ae0)
ld [H_AUTOBGTRANSFERENABLED],a ; disable auto-transfer
ld a,1
ld [hJoy7],a ; joypad state update flag
- ld a,[W_BATTLETYPE]
+ ld a,[wBattleType]
and a ; is it the Old Man battle?
jr nz,.specialBattleType
ld a,$01 ; hardcoded bank
@@ -1596,7 +1596,7 @@ DisplayListMenuIDLoop:: ; 2b4d (0:2b4d)
ld a,1
ld [H_AUTOBGTRANSFERENABLED],a ; enable transfer
call Delay3
- ld a,[W_BATTLETYPE]
+ ld a,[wBattleType]
and a ; is it the Old Man battle?
jr z,.notOldManBattle
.oldManBattle