hBuffer -> hStackBank and hFarByte

This commit is contained in:
Rangi 2020-04-06 12:52:46 -04:00
parent 9076d63d62
commit 1ec60810b8
7 changed files with 32 additions and 31 deletions

View File

@ -54,31 +54,31 @@ ByteFill::
GetFarByte:: GetFarByte::
; retrieve a single byte from a:hl, and return it in a. ; retrieve a single byte from a:hl, and return it in a.
; bankswitch to new bank ; bankswitch to new bank
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
rst Bankswitch rst Bankswitch
; get byte from new bank ; get byte from new bank
ld a, [hl] ld a, [hl]
ldh [hBuffer], a ldh [hFarByte], a
; bankswitch to previous bank ; bankswitch to previous bank
pop af pop af
rst Bankswitch rst Bankswitch
; return retrieved value in a ; return retrieved value in a
ldh a, [hBuffer] ldh a, [hFarByte]
ret ret
GetFarHalfword:: GetFarHalfword::
; retrieve a halfword from a:hl, and return it in hl. ; retrieve a halfword from a:hl, and return it in hl.
; bankswitch to new bank ; bankswitch to new bank
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
rst Bankswitch rst Bankswitch
; get halfword from new bank, put it in hl ; get halfword from new bank, put it in hl
@ -92,10 +92,10 @@ GetFarHalfword::
ret ret
FarCopyWRAM:: FarCopyWRAM::
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
ldh [rSVBK], a ldh [rSVBK], a
call CopyBytes call CopyBytes
@ -105,23 +105,23 @@ FarCopyWRAM::
ret ret
GetFarWRAMByte:: GetFarWRAMByte::
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
ldh [rSVBK], a ldh [rSVBK], a
ld a, [hl] ld a, [hl]
ldh [hBuffer], a ldh [hFarByte], a
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a
ldh a, [hBuffer] ldh a, [hFarByte]
ret ret
GetFarWRAMWord:: GetFarWRAMWord::
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
ldh [rSVBK], a ldh [rSVBK], a
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]

View File

@ -2,10 +2,10 @@ FarCall_de::
; Call a:de. ; Call a:de.
; Preserves other registers. ; Preserves other registers.
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
rst Bankswitch rst Bankswitch
call .de call .de
jr ReturnFarCall jr ReturnFarCall
@ -18,10 +18,10 @@ FarCall_hl::
; Call a:hl. ; Call a:hl.
; Preserves other registers. ; Preserves other registers.
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
rst Bankswitch rst Bankswitch
call FarCall_JumpToHL call FarCall_JumpToHL

View File

@ -19,10 +19,10 @@ Get1bpp_2::
ret ret
FarCopyBytesDouble_DoubleBankSwitch:: FarCopyBytesDouble_DoubleBankSwitch::
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
rst Bankswitch rst Bankswitch
call FarCopyBytesDouble call FarCopyBytesDouble
@ -135,10 +135,10 @@ DecompressRequest2bpp::
FarCopyBytes:: FarCopyBytes::
; copy bc bytes from a:hl to de ; copy bc bytes from a:hl to de
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
rst Bankswitch rst Bankswitch
call CopyBytes call CopyBytes
@ -151,10 +151,10 @@ FarCopyBytesDouble:
; Copy bc bytes from a:hl to bc*2 bytes at de, ; Copy bc bytes from a:hl to bc*2 bytes at de,
; doubling each byte in the process. ; doubling each byte in the process.
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
rst Bankswitch rst Bankswitch
; switcheroo, de <> hl ; switcheroo, de <> hl

View File

@ -1043,10 +1043,10 @@ MapTextbox::
Call_a_de:: Call_a_de::
; Call a:de. ; Call a:de.
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
rst Bankswitch rst Bankswitch
call .de call .de

View File

@ -809,10 +809,10 @@ MenuTextboxWaitButton::
ret ret
Place2DMenuItemName:: Place2DMenuItemName::
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
rst Bankswitch rst Bankswitch
call PlaceString call PlaceString

View File

@ -107,10 +107,10 @@ MobilePrintNum::
ret ret
FarPrintText:: FarPrintText::
ldh [hBuffer], a ldh [hStackBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hBuffer] ldh a, [hStackBank]
rst Bankswitch rst Bankswitch
call PrintText call PrintText

View File

@ -3,7 +3,8 @@ SECTION "HRAM", HRAM
hTransferVirtualOAM:: ds 10 ; ff80 hTransferVirtualOAM:: ds 10 ; ff80
hROMBankBackup:: db ; ff8a hROMBankBackup:: db ; ff8a
hBuffer:: db ; ff8b hFarByte::
hStackBank:: db ; ff8b
hSRAMBank:: db ; ff8c hSRAMBank:: db ; ff8c
hRTCDayHi:: db ; ff8d hRTCDayHi:: db ; ff8d