diff options
| -rw-r--r-- | home/copy.asm | 28 | ||||
| -rw-r--r-- | home/farcall.asm | 8 | ||||
| -rw-r--r-- | home/gfx.asm | 12 | ||||
| -rw-r--r-- | home/map.asm | 4 | ||||
| -rw-r--r-- | home/menu.asm | 4 | ||||
| -rw-r--r-- | home/print_text.asm | 4 | ||||
| -rw-r--r-- | hram.asm | 3 |
7 files changed, 32 insertions, 31 deletions
diff --git a/home/copy.asm b/home/copy.asm index 018986cf2..8e7d07c12 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -54,31 +54,31 @@ ByteFill:: GetFarByte:: ; retrieve a single byte from a:hl, and return it in a. ; bankswitch to new bank - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [hROMBank] push af - ldh a, [hBuffer] + ldh a, [hStackBank] rst Bankswitch ; get byte from new bank ld a, [hl] - ldh [hBuffer], a + ldh [hFarByte], a ; bankswitch to previous bank pop af rst Bankswitch ; return retrieved value in a - ldh a, [hBuffer] + ldh a, [hFarByte] ret GetFarHalfword:: ; retrieve a halfword from a:hl, and return it in hl. ; bankswitch to new bank - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [hROMBank] push af - ldh a, [hBuffer] + ldh a, [hStackBank] rst Bankswitch ; get halfword from new bank, put it in hl @@ -92,10 +92,10 @@ GetFarHalfword:: ret FarCopyWRAM:: - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [rSVBK] push af - ldh a, [hBuffer] + ldh a, [hStackBank] ldh [rSVBK], a call CopyBytes @@ -105,23 +105,23 @@ FarCopyWRAM:: ret GetFarWRAMByte:: - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [rSVBK] push af - ldh a, [hBuffer] + ldh a, [hStackBank] ldh [rSVBK], a ld a, [hl] - ldh [hBuffer], a + ldh [hFarByte], a pop af ldh [rSVBK], a - ldh a, [hBuffer] + ldh a, [hFarByte] ret GetFarWRAMWord:: - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [rSVBK] push af - ldh a, [hBuffer] + ldh a, [hStackBank] ldh [rSVBK], a ld a, [hli] ld h, [hl] diff --git a/home/farcall.asm b/home/farcall.asm index be050c642..3e2d6e549 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -2,10 +2,10 @@ FarCall_de:: ; Call a:de. ; Preserves other registers. - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [hROMBank] push af - ldh a, [hBuffer] + ldh a, [hStackBank] rst Bankswitch call .de jr ReturnFarCall @@ -18,10 +18,10 @@ FarCall_hl:: ; Call a:hl. ; Preserves other registers. - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [hROMBank] push af - ldh a, [hBuffer] + ldh a, [hStackBank] rst Bankswitch call FarCall_JumpToHL diff --git a/home/gfx.asm b/home/gfx.asm index 4655f204f..fa92c2608 100644 --- a/home/gfx.asm +++ b/home/gfx.asm @@ -19,10 +19,10 @@ Get1bpp_2:: ret FarCopyBytesDouble_DoubleBankSwitch:: - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [hROMBank] push af - ldh a, [hBuffer] + ldh a, [hStackBank] rst Bankswitch call FarCopyBytesDouble @@ -135,10 +135,10 @@ DecompressRequest2bpp:: FarCopyBytes:: ; copy bc bytes from a:hl to de - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [hROMBank] push af - ldh a, [hBuffer] + ldh a, [hStackBank] rst Bankswitch call CopyBytes @@ -151,10 +151,10 @@ FarCopyBytesDouble: ; Copy bc bytes from a:hl to bc*2 bytes at de, ; doubling each byte in the process. - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [hROMBank] push af - ldh a, [hBuffer] + ldh a, [hStackBank] rst Bankswitch ; switcheroo, de <> hl diff --git a/home/map.asm b/home/map.asm index ebcf7f879..d012cbe58 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1043,10 +1043,10 @@ MapTextbox:: Call_a_de:: ; Call a:de. - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [hROMBank] push af - ldh a, [hBuffer] + ldh a, [hStackBank] rst Bankswitch call .de diff --git a/home/menu.asm b/home/menu.asm index ae9696815..4959c3bb7 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -809,10 +809,10 @@ MenuTextboxWaitButton:: ret Place2DMenuItemName:: - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [hROMBank] push af - ldh a, [hBuffer] + ldh a, [hStackBank] rst Bankswitch call PlaceString diff --git a/home/print_text.asm b/home/print_text.asm index 51f23edb2..8ba2ac71f 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -107,10 +107,10 @@ MobilePrintNum:: ret FarPrintText:: - ldh [hBuffer], a + ldh [hStackBank], a ldh a, [hROMBank] push af - ldh a, [hBuffer] + ldh a, [hStackBank] rst Bankswitch call PrintText @@ -3,7 +3,8 @@ SECTION "HRAM", HRAM hTransferVirtualOAM:: ds 10 ; ff80 hROMBankBackup:: db ; ff8a -hBuffer:: db ; ff8b +hFarByte:: +hStackBank:: db ; ff8b hSRAMBank:: db ; ff8c hRTCDayHi:: db ; ff8d |