diff options
| author | surskitty <surskitty@gmail.com> | 2018-01-23 00:02:56 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2018-01-23 00:02:56 -0500 |
| commit | fbc6fe4722f3faa69f4126ea3d2fe3a41fcba16d (patch) | |
| tree | 98c4ff39e6cb5a310c8184ba7634ef5eb7cfd19e /engine/battle/checkbattlescene.asm | |
| parent | 4162705db909da94a62f30b5e2caee048b3bc107 (diff) | |
| parent | c60f1331fef22b886adf3472d2b4f348832cfaf7 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/battle/checkbattlescene.asm')
| -rw-r--r-- | engine/battle/checkbattlescene.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/checkbattlescene.asm b/engine/battle/checkbattlescene.asm index b63f00907..a33cc62e3 100644 --- a/engine/battle/checkbattlescene.asm +++ b/engine/battle/checkbattlescene.asm @@ -1,7 +1,7 @@ CheckBattleScene: ; 4ea44 ; Return carry if battle scene is turned off. - ld a, 0 + ld a, BANK(wLinkMode) ld hl, wLinkMode call GetFarWRAMByte cp LINK_MOBILE @@ -19,9 +19,9 @@ CheckBattleScene: ; 4ea44 and a jr nz, .from_wram - ld a, $4 + ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call GetSRAMBank - ld a, [$a60c] + ld a, [$a60c] ; address of MBC30 bank ld c, a call CloseSRAM @@ -33,7 +33,7 @@ CheckBattleScene: ; 4ea44 ret .from_wram - ld a, $5 + ld a, BANK(w5_dc00) ld hl, w5_dc00 call GetFarWRAMByte bit 0, a |