From fb422e8d9c78c56db27d974baa04c7a16bf5df41 Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Thu, 4 Jan 2018 14:53:50 -0500 Subject: Use BANK for hardcoded WRAM banks preceding FarCopyWRAM/GetFarWRAMByte calls. --- engine/battle/checkbattlescene.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/battle/checkbattlescene.asm') diff --git a/engine/battle/checkbattlescene.asm b/engine/battle/checkbattlescene.asm index b63f00907..5253c3c47 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 @@ -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 -- cgit v1.2.3 From d6f20ae74619fa4b3071867016fa7ae7253df98f Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Mon, 8 Jan 2018 17:13:37 -0500 Subject: Use BANK for hardcoded SRAM banks (except for vestigial refs to JP's banks 4-7) --- engine/battle/checkbattlescene.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/battle/checkbattlescene.asm') diff --git a/engine/battle/checkbattlescene.asm b/engine/battle/checkbattlescene.asm index 5253c3c47..24d06b8c9 100644 --- a/engine/battle/checkbattlescene.asm +++ b/engine/battle/checkbattlescene.asm @@ -19,7 +19,7 @@ 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 c, a -- cgit v1.2.3 From 94f32db7bc4a5e4e4d8837d3110d0876146783af Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Mon, 8 Jan 2018 22:48:58 -0500 Subject: Document hardcoded SRAM addresses. --- engine/battle/checkbattlescene.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/battle/checkbattlescene.asm') diff --git a/engine/battle/checkbattlescene.asm b/engine/battle/checkbattlescene.asm index 24d06b8c9..a33cc62e3 100644 --- a/engine/battle/checkbattlescene.asm +++ b/engine/battle/checkbattlescene.asm @@ -21,7 +21,7 @@ CheckBattleScene: ; 4ea44 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 -- cgit v1.2.3