diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index f3b2ee46d..16c101301 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -975,7 +975,7 @@ BattleAnimCmd_RaiseSub: ; cc640 (33:4640) push af ld a, 1 ; unnecessary bankswitch? ld [rSVBK], a - xor a ; effectively ld a, BANK(sScratch) + xor a ; sScratch call GetSRAMBank GetSubstitutePic: ; cc64c @@ -1049,7 +1049,7 @@ BattleAnimCmd_MinimizeOpp: ; cc6cf (33:46cf) push af ld a, 1 ; unnecessary bankswitch? ld [rSVBK], a - xor a ; effectively ld a, BANK(sScratch) + xor a ; sScratch call GetSRAMBank call GetMinimizePic call Request2bpp @@ -1105,7 +1105,7 @@ BattleAnimCmd_Minimize: ; cc735 (33:4735) push af ld a, 1 ; unnecessary bankswitch? ld [rSVBK], a - xor a ; effectively ld a, BANK(sScratch) + xor a ; sScratch call GetSRAMBank call GetMinimizePic ld hl, vTiles0 tile $00 diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 3dfee282d..771d3ea5a 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -178,7 +178,7 @@ UnownPrinter: ; 16be4 hlcoord 1, 9 ld de, UnownDexVacantString call PlaceString - xor a ; effectively ld a, BANK(sScratch) + xor a ; sScratch call GetSRAMBank ld hl, sScratch ld bc, $31 tiles diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm index 287ae7537..1e0b90fc5 100644 --- a/engine/events/print_unown_2.asm +++ b/engine/events/print_unown_2.asm @@ -1,7 +1,7 @@ RotateUnownFrontpic: ; e0000 ; something to do with Unown printer push de - xor a ; effectively ld a, BANK(sScratch) + xor a ; sScratch call GetSRAMBank ld hl, sScratch ld bc, 0 diff --git a/engine/menu.asm b/engine/menu.asm index 83ee69373..f04e82ca1 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -730,7 +730,7 @@ Function24423: ; 24423 ld a, [VramState] bit 0, a ret z - xor a ; effectively ld a, BANK(sScratch) + xor a ; sScratch call GetSRAMBank hlcoord 0, 0 ld de, sScratch @@ -738,7 +738,7 @@ Function24423: ; 24423 call CopyBytes call CloseSRAM call OverworldTextModeSwitch - xor a ; effectively ld a, BANK(sScratch) + xor a ; sScratch call GetSRAMBank ld hl, sScratch decoord 0, 0