summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/battle.asm22
-rw-r--r--home/copy.asm28
-rw-r--r--home/copy2.asm4
-rw-r--r--home/cry.asm2
-rw-r--r--home/decompress.asm2
-rw-r--r--home/fade.asm14
-rw-r--r--home/farcall.asm2
-rw-r--r--home/handshake.asm6
-rw-r--r--home/init.asm74
-rw-r--r--home/item.asm6
-rw-r--r--home/joypad.asm136
-rw-r--r--home/lcd.asm28
-rw-r--r--home/map.asm114
-rw-r--r--home/map_objects.asm24
-rw-r--r--home/menu.asm20
-rw-r--r--home/palettes.asm58
-rwxr-xr-xhome/print_num.asm1
-rwxr-xr-xhome/print_text.asm2
-rw-r--r--home/random.asm16
-rw-r--r--home/rst.asm2
-rw-r--r--home/serial.asm108
-rw-r--r--home/text.asm24
-rwxr-xr-xhome/tilemap.asm4
-rw-r--r--home/time.asm62
-rw-r--r--home/vblank.asm140
-rw-r--r--home/video.asm80
-rw-r--r--home/window.asm36
27 files changed, 508 insertions, 507 deletions
diff --git a/home/battle.asm b/home/battle.asm
index a29db60f..a7f7a558 100644
--- a/home/battle.asm
+++ b/home/battle.asm
@@ -1,6 +1,6 @@
UserPartyAttr:: ; 3b69
push af
- ld a, [hBattleTurn]
+ ldh a, [hBattleTurn]
and a
jr nz, .asm_3b72
pop af
@@ -12,7 +12,7 @@ UserPartyAttr:: ; 3b69
OpponentPartyAttr::
push af
- ld a, [hBattleTurn]
+ ldh a, [hBattleTurn]
and a
jr z, .asm_3b7e
pop af
@@ -52,21 +52,21 @@ ResetDamage::
SetPlayerTurn::
xor a
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
ret
SetEnemyTurn::
ld a, $1
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
ret
UpdateOpponentInParty::
- ld a, [hBattleTurn]
+ ldh a, [hBattleTurn]
and a
jr z, UpdateEnemyMonInParty
jr UpdateBattleMonInParty
- ld a, [hBattleTurn]
+ ldh a, [hBattleTurn]
and a
jr z, UpdateBattleMonInParty
jr UpdateEnemyMonInParty
@@ -121,7 +121,7 @@ GetBattleVarAddr:: ; 3c0b (0:3c0b)
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [hBattleTurn]
+ ldh a, [hBattleTurn]
and a
jr z, .asm_3c1d
inc hl
@@ -186,14 +186,14 @@ GetBattleVarAddr:: ; 3c0b (0:3c0b)
db $23 ; ???
FarCopyRadioText::
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [hli]
ld e, a
ld a, [hli]
ld d, a
ld a, [hli]
- ld [hROMBank], a
+ ldh [hROMBank], a
ld [MBC3RomBank], a
ld a, e
ld l, a
@@ -203,13 +203,13 @@ FarCopyRadioText::
ld bc, $28
call CopyBytes
pop af
- ld [hROMBank], a
+ ldh [hROMBank], a
ld [MBC3RomBank], a
ret
StdBattleTextBox::
GLOBAL BattleText
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(BattleText) ; $40
rst Bankswitch
diff --git a/home/copy.asm b/home/copy.asm
index 50f25e15..0067c85f 100644
--- a/home/copy.asm
+++ b/home/copy.asm
@@ -1,6 +1,6 @@
Functiond70:: ; d70 (0:0d70)
ld b, a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, b
rst Bankswitch
@@ -60,7 +60,7 @@ DecompressRequest2bpp::
FarCopyBytes:: ; dcd (0:0dcd)
ld [wBuffer], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wBuffer]
rst Bankswitch
@@ -71,7 +71,7 @@ FarCopyBytes:: ; dcd (0:0dcd)
FarCopyBytesDouble:: ; ddd (0:0ddd)
ld [wBuffer], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wBuffer]
rst Bankswitch
@@ -100,11 +100,11 @@ FarCopyBytesDouble:: ; ddd (0:0ddd)
ret
Request2bpp:: ; dfe (0:0dfe)
- ld a, [hBGMapMode]
+ ldh a, [hBGMapMode]
push af
xor a
- ld [hBGMapMode], a
- ld a, [hROMBank]
+ ldh [hBGMapMode], a
+ ldh a, [hROMBank]
push af
ld a, b
rst Bankswitch
@@ -125,7 +125,7 @@ Request2bpp:: ; dfe (0:0dfe)
pop af
rst Bankswitch
pop af
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
.cycle
@@ -138,11 +138,11 @@ Request2bpp:: ; dfe (0:0dfe)
jr .check
Request1bpp:: ; e38 (0:0e38)
- ld a, [hBGMapMode]
+ ldh a, [hBGMapMode]
push af
xor a
- ld [hBGMapMode], a
- ld a, [hROMBank]
+ ldh [hBGMapMode], a
+ ldh a, [hROMBank]
push af
ld a, b
rst Bankswitch
@@ -163,7 +163,7 @@ Request1bpp:: ; e38 (0:0e38)
pop af
rst Bankswitch
pop af
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
.cycle
@@ -176,7 +176,7 @@ Request1bpp:: ; e38 (0:0e38)
jr .check
Get2bpp::
- ld a, [rLCDC]
+ ldh a, [rLCDC]
bit 7, a
jp nz, Request2bpp
Copy2bpp::
@@ -197,7 +197,7 @@ Copy2bpp::
jp FarCopyBytes
Get1bpp::
- ld a, [rLCDC]
+ ldh a, [rLCDC]
bit 7, a
jp nz, Request1bpp
Copy1bpp::
@@ -218,7 +218,7 @@ Copy1bpp::
jp FarCopyBytesDouble
Functionea6::
- ld a, [rLCDC]
+ ldh a, [rLCDC]
add a
jp c, Request2bpp
Functioneac::
diff --git a/home/copy2.asm b/home/copy2.asm
index 3ba05db9..e319cd6b 100644
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -15,7 +15,7 @@ CopyBytes:: ; 311a (0:311a)
GetFarByte:: ; 3128 (0:3128)
ld [wBuffer], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wBuffer]
rst Bankswitch
@@ -28,7 +28,7 @@ GetFarByte:: ; 3128 (0:3128)
GetFarHalfword:: ; 313c (0:313c)
ld [wBuffer], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wBuffer]
rst Bankswitch
diff --git a/home/cry.asm b/home/cry.asm
index 3fcda0c3..6b96df91 100644
--- a/home/cry.asm
+++ b/home/cry.asm
@@ -31,7 +31,7 @@ _PlayMonCry::
LoadCryHeader::
call GetCryIndex
ret c
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, $3c
rst Bankswitch
diff --git a/home/decompress.asm b/home/decompress.asm
index 11283966..5e36d828 100644
--- a/home/decompress.asm
+++ b/home/decompress.asm
@@ -2,7 +2,7 @@ FarDecompress:: ; b40
; Decompress graphics data from a:hl to de.
ld [wLZBank], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wLZBank]
rst Bankswitch
diff --git a/home/fade.asm b/home/fade.asm
index 7b11604c..3d0afdce 100644
--- a/home/fade.asm
+++ b/home/fade.asm
@@ -11,15 +11,15 @@ Function360:: ; 360 (0:0360)
dec h
.okay
ld a, [hli]
- ld [rBGP], a
+ ldh [rBGP], a
ld a, [hli]
- ld [rOBP0], a
+ ldh [rOBP0], a
ld a, [hli]
- ld [rOBP1], a
+ ldh [rOBP1], a
ret
RotateFourPalettesRight::
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr z, .dmg
ld hl, IncGradGBPalTable_00
@@ -32,7 +32,7 @@ RotateFourPalettesRight::
jr RotatePalettesRight
RotateThreePalettesRight::
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr z, .dmg
ld hl, IncGradGBPalTable_05
@@ -60,7 +60,7 @@ RotatePalettesRight::
ret
RotateFourPalettesLeft::
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr z, .dmg
ld hl, IncGradGBPalTable_04 - 1
@@ -73,7 +73,7 @@ RotateFourPalettesLeft::
jr RotatePalettesLeft
RotateThreePalettesLeft::
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr z, .dmg
ld hl, IncGradGBPalTable_07 - 1
diff --git a/home/farcall.asm b/home/farcall.asm
index e1d46449..f42133b3 100644
--- a/home/farcall.asm
+++ b/home/farcall.asm
@@ -1,6 +1,6 @@
FarCall_hl:: ; 2e27 (0:2e27)
ld [wBuffer], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wBuffer]
rst Bankswitch
diff --git a/home/handshake.asm b/home/handshake.asm
index c49bca22..f4e8c7d3 100644
--- a/home/handshake.asm
+++ b/home/handshake.asm
@@ -28,14 +28,14 @@ AskSerial:: ; 1ebf (0:1ebf)
; handshake
ld a, $88
- ld [rSB], a
+ ldh [rSB], a
; switch to internal clock
ld a, %00000001
- ld [rSC], a
+ ldh [rSC], a
; start transfer
ld a, %10000001
- ld [rSC], a
+ ldh [rSC], a
ret
diff --git a/home/init.asm b/home/init.asm
index 747d7817..b06820f0 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -1,7 +1,7 @@
Reset:: ; 5b0 (0:05b0)
call MapSetup_Sound_Off
xor a
- ld [hMapAnims], a
+ ldh [hMapAnims], a
call ClearPalettes
ei
ld hl, wd8ba
@@ -17,34 +17,34 @@ _Start:: ; 5c6 (0:05c6)
.cgb
ld a, $1
.load
- ld [hCGB], a
+ ldh [hCGB], a
Init:: ; 5d1 (0:05d1)
di
xor a
- ld [rIF], a
- ld [rIE], a
- ld [rRP], a
- ld [rSCX], a
- ld [rSCY], a
- ld [rSB], a
- ld [rSC], a
- ld [rWX], a
- ld [rWY], a
- ld [rBGP], a
- ld [rOBP0], a
- ld [rOBP1], a
- ld [rTMA], a
- ld [rTAC], a
+ ldh [rIF], a
+ ldh [rIE], a
+ ldh [rRP], a
+ ldh [rSCX], a
+ ldh [rSCY], a
+ ldh [rSB], a
+ ldh [rSC], a
+ ldh [rWX], a
+ ldh [rWY], a
+ ldh [rBGP], a
+ ldh [rOBP0], a
+ ldh [rOBP1], a
+ ldh [rTMA], a
+ ldh [rTAC], a
ld [wceeb], a
ld a, $4
- ld [rTAC], a
+ ldh [rTAC], a
.wait
- ld a, [rLY]
+ ldh a, [rLY]
cp 145
jr nz, .wait
xor a
- ld [rLCDC], a
+ ldh [rLCDC], a
; Clear WRAM
ld hl, wMusicPlaying
@@ -60,14 +60,14 @@ Init:: ; 5d1 (0:05d1)
ld sp, wStackTop
call ClearVRAM
- ld a, [hCGB]
+ ldh a, [hCGB]
push af
xor a
- ld hl, HRAM_START
- ld bc, HRAM_END - HRAM_START
+ ld hl, HRAM_Begin
+ ld bc, HRAM_End - HRAM_Begin
call ByteFill
pop af
- ld [hCGB], a
+ ldh [hCGB], a
call ClearSprites
@@ -77,24 +77,24 @@ Init:: ; 5d1 (0:05d1)
call LoadPushOAM
xor a
- ld [hMapAnims], a
- ld [hSCX], a
- ld [hSCY], a
- ld [rJOYP], a
+ ldh [hMapAnims], a
+ ldh [hSCX], a
+ ldh [hSCY], a
+ ldh [rJOYP], a
ld a, $8 ; HBlank int enable
- ld [rSTAT], a
+ ldh [rSTAT], a
ld a, $90
- ld [hWY], a
- ld [rWY], a
+ ldh [hWY], a
+ ldh [rWY], a
ld a, $7
- ld [hWX], a
- ld [rWX], a
+ ldh [hWX], a
+ ldh [rWX], a
ld a, -1
- ld [hLinkPlayerNumber], a
+ ldh [hLinkPlayerNumber], a
ld h, $98
call BlankBGMap
@@ -104,9 +104,9 @@ Init:: ; 5d1 (0:05d1)
callfar InitCGBPals
ld a, $9c
- ld [hBGMapAddress + 1], a
+ ldh [hBGMapAddress + 1], a
xor a
- ld [hBGMapAddress], a
+ ldh [hBGMapAddress], a
farcall StartClock
@@ -125,10 +125,10 @@ Init:: ; 5d1 (0:05d1)
; OBJ 8x8
; OBJ on
; BG on
- ld [rLCDC], a
+ ldh [rLCDC], a
ld a, $1f
- ld [rIE], a
+ ldh [rIE], a
ei
call DelayFrame
diff --git a/home/item.asm b/home/item.asm
index abad27f2..d443c281 100644
--- a/home/item.asm
+++ b/home/item.asm
@@ -16,7 +16,7 @@ TossItem::
push hl
push de
push bc
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(TossItem_)
rst Bankswitch
@@ -31,7 +31,7 @@ TossItem::
ReceiveItem::
push bc
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(ReceiveItem_)
rst Bankswitch
@@ -50,7 +50,7 @@ CheckItem::
push hl
push de
push bc
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(CheckItem_)
rst Bankswitch
diff --git a/home/joypad.asm b/home/joypad.asm
index 4f629a9f..317413d0 100644
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -3,8 +3,8 @@ JoypadInt:: ; 8df (0:08df)
ClearJoypad::
xor a
- ld [hJoyPressed], a
- ld [hJoyDown], a
+ ldh [hJoyPressed], a
+ ldh [hJoyDown], a
ret
Joypad:: ; 8e6 (0:08e6)
@@ -15,42 +15,42 @@ Joypad:: ; 8e6 (0:08e6)
and a
ret nz
ld a, $20
- ld [rJOYP], a
- ld a, [rJOYP]
- ld a, [rJOYP]
+ ldh [rJOYP], a
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
cpl
and $f
swap a
ld b, a
ld a, $10
- ld [rJOYP], a
- ld a, [rJOYP]
- ld a, [rJOYP]
- ld a, [rJOYP]
- ld a, [rJOYP]
- ld a, [rJOYP]
- ld a, [rJOYP]
+ ldh [rJOYP], a
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
cpl
and $f
or b
ld b, a
ld a, $30
- ld [rJOYP], a
- ld a, [hJoypadDown]
+ ldh [rJOYP], a
+ ldh a, [hJoypadDown]
ld e, a
xor b
ld d, a
and e
- ld [hJoypadReleased], a
+ ldh [hJoypadReleased], a
ld a, d
and b
- ld [hJoypadPressed], a
+ ldh [hJoypadPressed], a
ld c, a
- ld a, [hJoypadSum]
+ ldh a, [hJoypadSum]
or c
- ld [hJoypadSum], a
+ ldh [hJoypadSum], a
ld a, b
- ld [hJoypadDown], a
+ ldh [hJoypadDown], a
and $f
cp $f
jp z, Reset
@@ -64,20 +64,20 @@ GetJoypad:: ; 935 (0:0935)
ld a, [wInputType]
cp $ff
jr z, .auto
- ld a, [hJoypadDown]
+ ldh a, [hJoypadDown]
ld b, a
- ld a, [hJoyDown]
+ ldh a, [hJoyDown]
ld e, a
xor b
ld d, a
and e
- ld [hJoyReleased], a
+ ldh [hJoyReleased], a
ld a, d
and b
- ld [hJoyPressed], a
+ ldh [hJoyPressed], a
ld c, a
ld a, b
- ld [hJoyDown], a
+ ldh [hJoyDown], a
.quit
pop bc
pop de
@@ -86,7 +86,7 @@ GetJoypad:: ; 935 (0:0935)
ret
.auto
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wAutoInputBank]
rst Bankswitch
@@ -131,8 +131,8 @@ GetJoypad:: ; 935 (0:0935)
pop af
rst Bankswitch
ld a, b
- ld [hJoyPressed], a
- ld [hJoyDown], a
+ ldh [hJoyPressed], a
+ ldh [hJoyDown], a
jr .quit
StartAutoInput::
@@ -144,9 +144,9 @@ StartAutoInput::
xor a
ld [wAutoInputLength], a
xor a
- ld [hJoyPressed], a
- ld [hJoyReleased], a
- ld [hJoyDown], a
+ ldh [hJoyPressed], a
+ ldh [hJoyReleased], a
+ ldh [hJoyDown], a
ld a, $ff
ld [wInputType], a
ret
@@ -167,11 +167,11 @@ JoyTitleScreenInput::
call JoyTextDelay
pop bc
- ld a, [hJoyDown]
+ ldh a, [hJoyDown]
cp D_UP | SELECT | B_BUTTON
jr z, .keycombo
- ld a, [hJoyLast]
+ ldh a, [hJoyLast]
and START | A_BUTTON
jr nz, .keycombo
@@ -188,33 +188,33 @@ JoyTitleScreenInput::
JoyWaitAorB::
call DelayFrame
call GetJoypad
- ld a, [hJoyPressed]
+ ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON
ret nz
call RTC
jr JoyWaitAorB
WaitButton::
- ld a, [hOAMUpdate]
+ ldh a, [hOAMUpdate]
push af
ld a, $1
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
call WaitBGMap
call JoyWaitAorB
pop af
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
ret
JoyTextDelay:: ; a08 (0:0a08)
call GetJoypad
- ld a, [hInMenu]
+ ldh a, [hInMenu]
and a
- ld a, [hJoyPressed]
+ ldh a, [hJoyPressed]
jr z, .ok
- ld a, [hJoyDown]
+ ldh a, [hJoyDown]
.ok
- ld [hJoyLast], a
- ld a, [hJoyPressed]
+ ldh [hJoyLast], a
+ ldh a, [hJoyPressed]
and a
jr z, .checkframedelay
ld a, 15
@@ -226,7 +226,7 @@ JoyTextDelay:: ; a08 (0:0a08)
and a
jr z, .restartframedelay
xor a
- ld [hJoyLast], a
+ ldh [hJoyLast], a
ret
.restartframedelay
@@ -235,33 +235,33 @@ JoyTextDelay:: ; a08 (0:0a08)
ret
WaitPressAorB_BlinkCursor::
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
push af
- ld a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndexBuffer]
push af
xor a
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
ld a, $6
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
.loop
push hl
hlcoord 18, 17
call BlinkCursor
pop hl
call JoyTextDelay
- ld a, [hJoyLast]
+ ldh a, [hJoyLast]
and A_BUTTON | B_BUTTON
jr z, .loop
pop af
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
pop af
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
ret
SimpleWaitPressAorB::
.loop
call JoyTextDelay
- ld a, [hJoyLast]
+ ldh a, [hJoyLast]
and A_BUTTON | B_BUTTON
jr z, .loop
ret
@@ -282,10 +282,10 @@ ButtonSound::
jp DelayFrames
JoyWaitInput:: ; a77 (0:0a77)
- ld a, [hOAMUpdate]
+ ldh a, [hOAMUpdate]
push af
ld a, $1
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
ld a, [wInputType]
or a
jr z, .wait_loop
@@ -294,22 +294,22 @@ JoyWaitInput:: ; a77 (0:0a77)
.wait_loop
call JoyBlinkCursor
call JoyTextDelay
- ld a, [hJoyPressed]
+ ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON
jr nz, .received_input
call RTC
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call DelayFrame
jr .wait_loop
.received_input
pop af
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
ret
JoyBlinkCursor:: ; aa6 (0:0aa6)
- ld a, [hVBlankCounter]
+ ldh a, [hVBlankCounter]
and $10
jr z, .cursor_off
ld a, "▼"
@@ -329,37 +329,37 @@ BlinkCursor:: ; ab6 (0:0ab6)
cp b
pop bc
jr nz, .place_arrow
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
dec a
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
ret nz
- ld a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndexBuffer]
dec a
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
ret nz
ld a, "─"
ld [hl], a
ld a, -1
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
ld a, 6
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
ret
.place_arrow
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
and a
ret z
dec a
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
ret nz
dec a
- ld [hMapObjectIndexBuffer], a
- ld a, [hObjectStructIndexBuffer]
+ ldh [hMapObjectIndexBuffer], a
+ ldh a, [hObjectStructIndexBuffer]
dec a
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
ret nz
ld a, 6
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
ld a, "▼"
ld [hl], a
ret
diff --git a/home/lcd.asm b/home/lcd.asm
index b488cbec..6ccfaece 100644
--- a/home/lcd.asm
+++ b/home/lcd.asm
@@ -1,14 +1,14 @@
LCD:: ; 41b (0:041b)
push af
- ld a, [hLCDCPointer]
+ ldh a, [hLCDCPointer]
and a
jr z, .done
push hl
- ld a, [rLY]
+ ldh a, [rLY]
ld l, a
ld h, wLYOverrides >> 8
ld h, [hl]
- ld a, [hLCDCPointer]
+ ldh a, [hLCDCPointer]
ld l, a
ld a, h
ld h, rSCY >> 8
@@ -22,37 +22,37 @@ DisableLCD::
; Turn the LCD off
; Don't need to do anything if the LCD is already off
- ld a, [rLCDC]
+ ldh a, [rLCDC]
bit 7, a
ret z
xor a
- ld [rIF], a
- ld a, [rIE]
+ ldh [rIF], a
+ ldh a, [rIE]
ld b, a
; Disable VBlank
res 0, a
- ld [rIE], a
+ ldh [rIE], a
.wait
; Wait until VBlank would normally happen
- ld a, [rLY]
+ ldh a, [rLY]
cp 145
jr nz, .wait
- ld a, [rLCDC]
+ ldh a, [rLCDC]
and %01111111
- ld [rLCDC], a
+ ldh [rLCDC], a
xor a
- ld [rIF], a
+ ldh [rIF], a
ld a, b
- ld [rIE], a
+ ldh [rIE], a
ret
EnableLCD::
- ld a, [rLCDC]
+ ldh a, [rLCDC]
set 7, a
- ld [rLCDC], a
+ ldh [rLCDC], a
ret
diff --git a/home/map.asm b/home/map.asm
index 53b4c295..7aeda60e 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -38,7 +38,7 @@ GetCurrentMapTrigger:: ; 1f78 (0:1f78)
GetMapTrigger:: ; 1f95 (0:1f95)
push bc
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(MapTriggers)
rst Bankswitch
@@ -83,7 +83,7 @@ OverworldTextModeSwitch:: ; 1fc1 (0:1fc1)
ret
LoadMapPart:: ; 1fc8 (0:1fc8)
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wTilesetBlocksBank]
rst Bankswitch
@@ -186,10 +186,10 @@ endr
ReturnToMapFromSubmenu::
ld a, $fa
- ld [hMapEntryMethod], a
+ ldh [hMapEntryMethod], a
farcall RunMapSetupScript
xor a
- ld [hMapEntryMethod], a
+ ldh [hMapEntryMethod], a
ret
Function2086::
@@ -222,8 +222,8 @@ Function20c7:: ; 20c7 (0:20c7)
ld [wd05c], a
xor a
ld [wd05b], a
- ld [hSCY], a
- ld [hSCX], a
+ ldh [hSCY], a
+ ldh [hSCX], a
farcall ApplyBGMapAnchorToObjects
ld a, $60
ld bc, $400
@@ -234,12 +234,12 @@ Function20c7:: ; 20c7 (0:20c7)
Function20e6:: ; 20e6 (0:20e6)
decoord 0, 0
call Function20f7
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
ret z
decoord 0, 0, wAttrMap
ld a, $1
- ld [rVBK], a
+ ldh [rVBK], a
Function20f7:: ; 20f7 (0:20f7)
ld hl, $9800
ld c, $14
@@ -258,16 +258,16 @@ Function20f7:: ; 20f7 (0:20f7)
dec b
jr nz, .asm_20fe
ld a, $0
- ld [rVBK], a
+ ldh [rVBK], a
ret
Function2112::
call LoadTilesetHeader
call LoadTileset
xor a
- ld [hMapAnims], a
+ ldh [hMapAnims], a
xor a
- ld [hTileAnimFrame], a
+ ldh [hTileAnimFrame], a
farcall Function1416d
call LoadFontsExtra
ret
@@ -500,7 +500,7 @@ Function22a5::
Function22ad:: ; 22ad (0:22ad)
farcall Function14a18
ret nc
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
call SwitchToMapScriptHeaderBank
call Function22c1
@@ -565,7 +565,7 @@ Function22fe:: ; 22fe (0:22fe)
ret
Function2302:: ; 2302 (0:2302)
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
call SwitchToMapScriptHeaderBank
call Function230f
@@ -1039,13 +1039,13 @@ LoadBlockData::
ret
ChangeMap:: ; 260d (0:260d)
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld hl, wc700
ld a, [wMapWidth]
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
add $6
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
ld c, a
ld b, $0
add hl, bc
@@ -1063,7 +1063,7 @@ ChangeMap:: ; 260d (0:260d)
ld b, a
.asm_2635
push hl
- ld a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndexBuffer]
ld c, a
.asm_2639
ld a, [de]
@@ -1072,7 +1072,7 @@ ChangeMap:: ; 260d (0:260d)
dec c
jr nz, .asm_2639
pop hl
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
add l
ld l, a
jr nc, .asm_2647
@@ -1101,9 +1101,9 @@ FillMapConnections:: ; 264d (0:264d)
ld a, [wd097]
ld d, a
ld a, [wd098]
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
ld a, [wd099]
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
call FillNorthConnectionStrip
.asm_2679
ld a, [wd09e]
@@ -1122,9 +1122,9 @@ FillMapConnections:: ; 264d (0:264d)
ld a, [wd0a3]
ld d, a
ld a, [wd0a4]
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
ld a, [wd0a5]
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
call FillSouthConnectionStrip
.asm_26a5
ld a, [wd0aa]
@@ -1145,7 +1145,7 @@ FillMapConnections:: ; 264d (0:264d)
ld a, [wd0b0]
ld b, a
ld a, [wd0b1]
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
call FillWestConnectionStrip
.asm_26d0
ld a, [wd0b6]
@@ -1166,7 +1166,7 @@ FillMapConnections:: ; 264d (0:264d)
ld a, [wd0bc]
ld b, a
ld a, [wd0bd]
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
call FillEastConnectionStrip
.asm_26fb
ret
@@ -1177,7 +1177,7 @@ FillSouthConnectionStrip:: ; 26fc (0:26fc)
.asm_26fe
push de
push hl
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
ld b, a
.asm_2703
ld a, [hli]
@@ -1186,7 +1186,7 @@ FillSouthConnectionStrip:: ; 26fc (0:26fc)
dec b
jr nz, .asm_2703
pop hl
- ld a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndexBuffer]
ld e, a
ld d, $0
add hl, de
@@ -1206,7 +1206,7 @@ FillWestConnectionStrip:: ; 271f (0:271f)
FillEastConnectionStrip:: ; 271f (0:271f)
ld a, [wMapWidth]
add $6
- ld [hConnectedMapWidth], a
+ ldh [hConnectedMapWidth], a
push de
push hl
ld a, [hli]
@@ -1219,12 +1219,12 @@ FillEastConnectionStrip:: ; 271f (0:271f)
ld [de], a
inc de
pop hl
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
ld e, a
ld d, $0
add hl, de
pop de
- ld a, [hConnectedMapWidth]
+ ldh a, [hConnectedMapWidth]
add e
ld e, a
jr nc, .asm_2740
@@ -1258,7 +1258,7 @@ CallMapScript::
RunMapCallback:: ; 2764 (0:2764)
ld b, a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
call SwitchToMapScriptHeaderBank
call FindCallback
@@ -1320,23 +1320,23 @@ ExecuteCallbackScript:: ; 279d (0:279d)
ret
MapTextbox::
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, b
rst Bankswitch
call SetUpTextbox
ld a, $1
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
call PrintTextboxText
xor a
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
pop af
rst Bankswitch
ret
Call_a_de::
ld [wBuffer], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wBuffer]
rst Bankswitch
@@ -1350,7 +1350,7 @@ Call_a_de::
ret
GetMovementData::
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, b
rst Bankswitch
@@ -1364,7 +1364,7 @@ GetMovementData::
GetScriptByte::
push hl
push bc
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wScriptBank]
rst Bankswitch
@@ -1407,7 +1407,7 @@ CoordinatesEventText::
db "@"
CheckObjectMask::
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
.asm_282c
ld e, a
ld d, $0
@@ -1418,7 +1418,7 @@ CheckObjectMask::
ret
MaskObject:: ; 2835 (0:2835)
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
ld e, a
ld d, $0
ld hl, wd545
@@ -1428,7 +1428,7 @@ MaskObject:: ; 2835 (0:2835)
ret
UnmaskObject:: ; 2841 (0:2841)
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
ld e, a
ld d, $0
ld hl, wMapObjectsEnd
@@ -1448,7 +1448,7 @@ ScrollMapDown::
ld d, a
call UpdateBGMapRow
ld a, $1
- ld [hBGMapUpdate], a
+ ldh [hBGMapUpdate], a
ret
ScrollMapUp::
@@ -1470,7 +1470,7 @@ ScrollMapUp::
ld d, a
call UpdateBGMapRow
ld a, $1
- ld [hBGMapUpdate], a
+ ldh [hBGMapUpdate], a
ret
ScrollMapRight::
@@ -1485,7 +1485,7 @@ ScrollMapRight::
ld d, a
call UpdateBGMapColumn
ld a, $1
- ld [hBGMapUpdate], a
+ ldh [hBGMapUpdate], a
ret
ScrollMapLeft::
@@ -1507,7 +1507,7 @@ ScrollMapLeft::
ld d, a
call UpdateBGMapColumn
ld a, $1
- ld [hBGMapUpdate], a
+ ldh [hBGMapUpdate], a
ret
BackupBGMapRow:: ; 28da (0:28da)
@@ -1566,7 +1566,7 @@ UpdateBGMapRow:: ; 28f6 (0:28f6)
dec c
jr nz, .asm_2904
ld a, $14
- ld [hFFDE], a
+ ldh [hFFDE], a
ret
UpdateBGMapColumn:: ; 291b (0:291b)
@@ -1590,7 +1590,7 @@ UpdateBGMapColumn:: ; 291b (0:291b)
dec c
jr nz, .asm_2920
ld a, $12
- ld [hFFDE], a
+ ldh [hFFDE], a
ret
Function2939::
@@ -1619,7 +1619,7 @@ LoadTileset:: ; 2944 (0:2944)
farcall LoadMapGroupRoof
.asm_2966
xor a
- ld [hTileAnimFrame], a
+ ldh [hTileAnimFrame], a
ret
BufferScreen::
@@ -1658,7 +1658,7 @@ SaveScreen::
ld de, wda04
ld a, [wMapWidth]
add $6
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
ld a, [wPlayerStepDirection]
and a
jr z, .asm_29bc
@@ -1672,7 +1672,7 @@ SaveScreen::
.asm_29b1
ld de, wda0a
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
ld c, a
ld b, $0
add hl, bc
@@ -1704,7 +1704,7 @@ LoadNeighboringBlockData::
ld l, a
ld a, [wMapWidth]
add $6
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
ld de, wda04
ld b, $6
ld c, $5
@@ -1726,7 +1726,7 @@ SaveScreen_LoadNeighbor::
inc d
.asm_29f9
pop hl
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
ld c, a
ld b, $0
add hl, bc
@@ -1985,7 +1985,7 @@ CheckFacingSign::
and a
ret z
ld c, a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
call SwitchToMapScriptHeaderBank
call CheckIfFacingTileCoordIsSign
@@ -2035,7 +2035,7 @@ CheckCurrentMapXYTriggers::
and a
ret z
ld c, a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
call SwitchToMapScriptHeaderBank
call .TriggerCheck
@@ -2096,7 +2096,7 @@ CheckCurrentMapXYTriggers::
FadeToMenu::
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call LoadStandardMenuDataHeader
farcall FadeOutPalettes
call ClearSprites
@@ -2144,7 +2144,7 @@ ReturnToMapWithSpeechTextbox::
call UpdateTimePals
call DelayFrame
ld a, $1
- ld [hMapAnims], a
+ ldh [hMapAnims], a
pop af
ret
@@ -2154,7 +2154,7 @@ ReloadTilesetAndPalettes:: ; 2c87 (0:2c87)
farcall RefreshSprites
call Functiond9e
call LoadFontsExtra
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wMapGroup]
ld b, a
@@ -2200,7 +2200,7 @@ GetMapHeaderMember:: ; 2cdd (0:2cdd)
ld a, [wMapNumber]
ld c, a
GetAnyMapHeaderMember:: ; 2ce5 (0:2ce5)
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(MapGroupPointers)
rst Bankswitch
@@ -2239,7 +2239,7 @@ GetAnyMapBank:: ; 2d0a (0:2d0a)
ret
PartiallyCopyMapHeader:: ; 2d16 (0:2d16)
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(MapGroupPointers)
rst Bankswitch
diff --git a/home/map_objects.asm b/home/map_objects.asm
index 8742ed5e..874346f5 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -16,7 +16,7 @@ GetSpriteVTile::
ld hl, wUsedSprites + 2
ld c, $b
ld b, a
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp $0
jr z, .asm_16c8
ld a, b
@@ -48,7 +48,7 @@ DoesSpriteHaveFacings::
push de
push hl
ld b, a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(DoesSpriteHaveFacings_)
rst Bankswitch
@@ -83,7 +83,7 @@ GetTileCollision:: ; 16fa (0:16fa)
ld e, a
ld d, $0
add hl, de
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(TileCollisionTable)
rst Bankswitch
@@ -193,14 +193,14 @@ GetMapObject:: ; 176f (0:176f)
ret
CheckObjectVisibility:: ; 177b (0:177b)
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
call GetMapObject
ld hl, 0
add hl, bc
ld a, [hl]
cp $ff
jr z, .asm_1790
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
call GetObjectStruct
and a
ret
@@ -282,21 +282,21 @@ CheckObjectTime::
ret
Function17ea::
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
call GetMapObject
call CopyObjectStruct_
ret
CopyObjectStruct::
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
call UnmaskObject
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
call GetMapObject
farcall CopyObjectStruct_
ret
ApplyDeletionToMapObject:: ; 1804 (0:1804)
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
call GetMapObject
ld hl, 0
add hl, bc
@@ -373,7 +373,7 @@ Function1855::
LoadMovementDataPointer::
ld [wMovementPerson], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
ld [wMovementDataPointerBank], a
ld a, l
ld [wMovementDataPointerAddr], a
@@ -461,7 +461,7 @@ GetInitialFacing::
CopySpriteMovementData::
ld l, a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(SpriteMovementData)
rst Bankswitch
@@ -521,7 +521,7 @@ CopySpriteMovementData::
ret
GetMovementByte_::
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [hli]
rst Bankswitch
diff --git a/home/menu.asm b/home/menu.asm
index ed5660af..a418baab 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -57,7 +57,7 @@ Call_ExitMenu::
VerticalMenu:: ; 1bf3 (0:1bf3)
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call MenuBox
call UpdateSprites
call PlaceVerticalMenuItems
@@ -213,17 +213,17 @@ DrawVariableLengthMenuBox:: ; 1ce9 (0:1ce9)
MenuWriteText:: ; 1cf6 (0:1cf6)
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call GetMenuIndexSet
call RunMenuItemPrintingFunction
call SafeUpdateSprites
- ld a, [hOAMUpdate]
+ ldh a, [hOAMUpdate]
push af
ld a, $1
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
call ApplyTilemap
pop af
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
ret
AutomaticGetMenuBottomCoord:: ; 1d10 (0:1d10)
@@ -474,7 +474,7 @@ MenuTextBoxWaitButton::
Place2DMenuItemName::
ld [wBuffer], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wBuffer]
rst Bankswitch
@@ -485,7 +485,7 @@ Place2DMenuItemName::
_2DMenu::
call CopyMenuData2
- ld a, [hROMBank]
+ ldh a, [hROMBank]
ld [wMenuDataBank], a
push af
ld a, BANK(_2DMenu_)
@@ -499,8 +499,8 @@ _2DMenu::
ResetBGWindow::
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld a, $90
- ld [rWY], a
- ld [hWY], a
+ ldh [rWY], a
+ ldh [hWY], a
ret
diff --git a/home/palettes.asm b/home/palettes.asm
index 9762c124..df80d14e 100644
--- a/home/palettes.asm
+++ b/home/palettes.asm
@@ -1,42 +1,42 @@
UpdatePalsIfCGB:: ; bdf (0:0bdf)
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
ret z
UpdateCGBPals:: ; be3 (0:0be3)
- ld a, [hCGBPalUpdate]
+ ldh a, [hCGBPalUpdate]
and a
ret z
ForceUpdateCGBPals::
ld hl, wBGPals
ld a, $80
- ld [rBGPI], a
+ ldh [rBGPI], a
ld c, 8 / 2
.bgp
rept 2 palettes
ld a, [hli]
- ld [rBGPD], a
+ ldh [rBGPD], a
endr
dec c
jr nz, .bgp
ld a, $80
- ld [rOBPI], a
+ ldh [rOBPI], a
ld c, 8 / 2
.obp
rept 2 palettes
ld a, [hli]
- ld [rOBPD], a
+ ldh [rOBPD], a
endr
dec c
jr nz, .obp
xor a
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
scf
ret
DmgToCgbBGPals:: ; c61 (0:0c61)
- ld [rBGP], a
+ ldh [rBGP], a
push af
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr z, .end
push hl
@@ -44,12 +44,12 @@ DmgToCgbBGPals:: ; c61 (0:0c61)
push bc
ld hl, wBGPals
ld de, wTempBGPals
- ld a, [rBGP]
+ ldh a, [rBGP]
ld b, a
ld c, $8
call CopyPals
ld a, $1
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
pop bc
pop de
pop hl
@@ -59,10 +59,10 @@ DmgToCgbBGPals:: ; c61 (0:0c61)
DmgToCgbObjPals:: ; c83 (0:0c83)
ld a, e
- ld [rOBP0], a
+ ldh [rOBP0], a
ld a, d
- ld [rOBP1], a
- ld a, [hCGB]
+ ldh [rOBP1], a
+ ldh a, [hCGB]
and a
ret z
push hl
@@ -70,21 +70,21 @@ DmgToCgbObjPals:: ; c83 (0:0c83)
push bc
ld hl, wOBPals
ld de, wTempOBPals
- ld a, [rOBP0]
+ ldh a, [rOBP0]
ld b, a
ld c, $8
call CopyPals
ld a, $1
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
pop bc
pop de
pop hl
ret
DmgToCgbObjPal0::
- ld [rOBP0], a
+ ldh [rOBP0], a
push af
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr z, .end
push hl
@@ -92,12 +92,12 @@ DmgToCgbObjPal0::
push bc
ld hl, wOBPals
ld de, wTempOBPals
- ld a, [rOBP0]
+ ldh a, [rOBP0]
ld b, a
ld c, $1
call CopyPals
ld a, $1
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
pop bc
pop de
pop hl
@@ -106,9 +106,9 @@ DmgToCgbObjPal0::
ret
DmgToCgbObjPal1::
- ld [rOBP1], a
+ ldh [rOBP1], a
push af
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr z, .end
push hl
@@ -116,12 +116,12 @@ DmgToCgbObjPal1::
push bc
ld hl, wOBPals + 1 palettes
ld de, wTempOBPals + 1 palettes
- ld a, [rOBP1]
+ ldh a, [rOBP1]
ld b, a
ld c, $1
call CopyPals
ld a, $1
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
pop bc
pop de
pop hl
@@ -166,17 +166,17 @@ CopyPals:: ; cea (0:0cea)
ret
ClearVBank1::
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
ret z
ld a, $1
- ld [rVBK], a
+ ldh [rVBK], a
ld hl, $8000
ld bc, $2000
xor a
call ByteFill
ld a, $0
- ld [rVBK], a
+ ldh [rVBK], a
ret
Functiond2a::
@@ -198,7 +198,7 @@ Functiond2a::
ret
ReloadSpritesNoPalettes::
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
ret z
ld hl, wBGPals
@@ -206,7 +206,7 @@ ReloadSpritesNoPalettes::
xor a
call ByteFill
ld a, $1
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
call DelayFrame
ret
diff --git a/home/print_num.asm b/home/print_num.asm
index 70f07607..6fba0071 100755
--- a/home/print_num.asm
+++ b/home/print_num.asm
@@ -34,6 +34,7 @@ PrintNum::
jr z, .byte
cp 2
jr z, .word
+
; maximum 3 bytes
.long
ld a, [de]
diff --git a/home/print_text.asm b/home/print_text.asm
index 31cbd744..b140b0de 100755
--- a/home/print_text.asm
+++ b/home/print_text.asm
@@ -137,7 +137,7 @@ Function33e9:: ; 33e9 (0:33e9)
FarPrintText::
ld [wBuffer], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [wBuffer]
rst Bankswitch
diff --git a/home/random.asm b/home/random.asm
index 3c2972af..5b2f4933 100644
--- a/home/random.asm
+++ b/home/random.asm
@@ -1,20 +1,20 @@
Random:: ; 30a2 (0:30a2)
push bc
- ld a, [rDIV]
+ ldh a, [rDIV]
ld b, a
- ld a, [hRandom]
+ ldh a, [hRandom]
adc b
- ld [hRandom], a
- ld a, [rDIV]
+ ldh [hRandom], a
+ ldh a, [rDIV]
ld b, a
- ld a, [hRandomSub]
+ ldh a, [hRandomSub]
sbc b
- ld [hRandomSub], a
+ ldh [hRandomSub], a
pop bc
ret
BattleRandom::
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(BattleRandom_)
rst Bankswitch
@@ -38,7 +38,7 @@ RandomRange::
push bc
.asm_30d1
call Random
- ld a, [hRandom]
+ ldh a, [hRandom]
ld c, a
add b
jr c, .asm_30d1
diff --git a/home/rst.asm b/home/rst.asm
index 1c9b5f6e..7da45ddd 100644
--- a/home/rst.asm
+++ b/home/rst.asm
@@ -8,7 +8,7 @@ SECTION "rst8",ROM0
jp FarCall_hl
SECTION "rst10",ROM0
- ld [hROMBank], a
+ ldh [hROMBank], a
ld [MBC3RomBank], a
ret
diff --git a/home/serial.asm b/home/serial.asm
index 262d7ad9..bd51084e 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -8,20 +8,20 @@ Serial:: ; 6aa (0:06aa)
bit 0, a
jr nz, .printer
- ld a, [hLinkPlayerNumber]
+ ldh a, [hLinkPlayerNumber]
inc a
jr z, .init_player_number
- ld a, [rSB]
- ld [hSerialReceive], a
- ld a, [hSerialSend]
- ld [rSB], a
- ld a, [hLinkPlayerNumber]
+ ldh a, [rSB]
+ ldh [hSerialReceive], a
+ ldh a, [hSerialSend]
+ ldh [rSB], a
+ ldh a, [hLinkPlayerNumber]
cp $2
jr z, .player2
ld a, 0 << rSC_ON
- ld [rSC], a
+ ldh [rSC], a
ld a, 1 << rSC_ON
- ld [rSC], a
+ ldh [rSC], a
jr .player2
.printer
@@ -29,43 +29,43 @@ Serial:: ; 6aa (0:06aa)
jr .end
.init_player_number
- ld a, [rSB]
+ ldh a, [rSB]
cp $1
jr z, .player1
cp $2
jr nz, .player2
.player1
- ld [hSerialReceive], a
- ld [hLinkPlayerNumber], a
+ ldh [hSerialReceive], a
+ ldh [hLinkPlayerNumber], a
cp $2
jr z, ._player2
xor a
- ld [rSB], a
+ ldh [rSB], a
ld a, $3
- ld [rDIV], a
+ ldh [rDIV], a
.wait_bit_7
- ld a, [rDIV]
+ ldh a, [rDIV]
bit 7, a
jr nz, .wait_bit_7
; cycle the serial controller
ld a, 0 << rSC_ON
- ld [rSC], a
+ ldh [rSC], a
ld a, 1 << rSC_ON
- ld [rSC], a
+ ldh [rSC], a
jr .player2
._player2
xor a
- ld [rSB], a
+ ldh [rSB], a
.player2
ld a, $1
- ld [hFFCC], a
+ ldh [hFFCC], a
ld a, SERIAL_NO_DATA_BYTE
- ld [hSerialSend], a
+ ldh [hSerialSend], a
.end
pop hl
@@ -76,10 +76,10 @@ Serial:: ; 6aa (0:06aa)
Function710:: ; 710
ld a, $1
- ld [hFFCE], a
+ ldh [hFFCE], a
.loop
ld a, [hl]
- ld [hSerialSend], a
+ ldh [hSerialSend], a
call Function73b
push bc
ld b, a
@@ -88,7 +88,7 @@ Function710:: ; 710
.wait
dec a
jr nz, .wait
- ld a, [hFFCE]
+ ldh a, [hFFCE]
and a
ld a, b
pop bc
@@ -97,7 +97,7 @@ Function710:: ; 710
cp SERIAL_PREAMBLE_BYTE
jr nz, .loop
xor a
- ld [hFFCE], a
+ ldh [hFFCE], a
jr .loop
.load
@@ -112,19 +112,19 @@ Function710:: ; 710
Function73b:: ; 73b (0:073b)
.loop
xor a
- ld [hFFCC], a
- ld a, [hLinkPlayerNumber]
+ ldh [hFFCC], a
+ ldh a, [hLinkPlayerNumber]
cp $2
jr nz, .loop2
ld a, (1 << rSC_CLOCK) | (0 << rSC_ON)
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_CLOCK) | (1 << rSC_ON)
- ld [rSC], a
+ ldh [rSC], a
.loop2
- ld a, [hFFCC]
+ ldh a, [hFFCC]
and a
jr nz, .reset_ffcc
- ld a, [hLinkPlayerNumber]
+ ldh a, [hLinkPlayerNumber]
cp $1
jr nz, .not_player_1_or_wLinkTimeoutFrames_zero
call CheckLinkTimeout
@@ -144,7 +144,7 @@ Function73b:: ; 73b (0:073b)
jp SerialDisconnected
.not_player_1_or_wLinkTimeoutFrames_zero
- ld a, [rIE]
+ ldh a, [rIE]
and $f
cp $8
jr nz, .loop2
@@ -156,7 +156,7 @@ Function73b:: ; 73b (0:073b)
dec a
ld [wce5d + 1], a
jr nz, .loop2
- ld a, [hLinkPlayerNumber]
+ ldh a, [hLinkPlayerNumber]
cp $1
jr z, .reset_ffcc
@@ -167,8 +167,8 @@ Function73b:: ; 73b (0:073b)
.reset_ffcc
xor a
- ld [hFFCC], a
- ld a, [rIE]
+ ldh [hFFCC], a
+ ldh a, [rIE]
and $f
sub $8
jr nz, .rIE_not_equal_8
@@ -178,7 +178,7 @@ Function73b:: ; 73b (0:073b)
ld [wce5d + 1], a
.rIE_not_equal_8
- ld a, [hSerialReceive]
+ ldh a, [hSerialReceive]
cp SERIAL_NO_DATA_BYTE
ret nz
call CheckLinkTimeout
@@ -198,13 +198,13 @@ Function73b:: ; 73b (0:073b)
jr z, SerialDisconnected
.link_timed_out
- ld a, [rIE]
+ ldh a, [rIE]
and $f
cp $8
ld a, SERIAL_NO_DATA_BYTE
ret z
ld a, [hl]
- ld [hSerialSend], a
+ ldh [hSerialSend], a
call DelayFrame
jp .loop
@@ -234,18 +234,18 @@ Function7ec:: ; 7ec
ld de, wOtherPlayerLinkMode
ld c, $2
ld a, $1
- ld [hFFCE], a
+ ldh [hFFCE], a
.asm_7f8
call DelayFrame
ld a, [hl]
- ld [hSerialSend], a
+ ldh [hSerialSend], a
call Function73b
ld b, a
inc hl
- ld a, [hFFCE]
+ ldh a, [hFFCE]
and a
ld a, $0
- ld [hFFCE], a
+ ldh [hFFCE], a
jr nz, .asm_7f8
ld a, b
ld [de], a
@@ -329,27 +329,27 @@ LinkTransfer:: ; 872 (0:0872)
call LinkTransferReceive
ld a, [wPlayerLinkAction]
add b
- ld [hSerialSend], a
- ld a, [hLinkPlayerNumber]
+ ldh [hSerialSend], a
+ ldh a, [hLinkPlayerNumber]
cp $2
jr nz, .asm_89f
ld a, $1
- ld [rSC], a
+ ldh [rSC], a
ld a, $81
- ld [rSC], a
+ ldh [rSC], a
.asm_89f
call LinkTransferReceive
pop bc
ret
LinkTransferReceive:: ; 8a4 (0:08a4)
- ld a, [hSerialReceive]
+ ldh a, [hSerialReceive]
ld [wOtherPlayerLinkMode], a
and $f0
cp b
ret nz
xor a
- ld [hSerialReceive], a
+ ldh [hSerialReceive], a
ld a, [wOtherPlayerLinkMode]
and $f
ld [wOtherPlayerLinkAction], a
@@ -357,14 +357,14 @@ LinkTransferReceive:: ; 8a4 (0:08a4)
LinkDataReceived:: ; 8b9 (0:08b9)
xor a
- ld [hSerialSend], a
- ld a, [hLinkPlayerNumber]
+ ldh [hSerialSend], a
+ ldh a, [hLinkPlayerNumber]
cp $2
ret nz
ld a, $1
- ld [rSC], a
+ ldh [rSC], a
ld a, $81
- ld [rSC], a
+ ldh [rSC], a
ret
Function8ca:: ; 8ca
@@ -372,11 +372,11 @@ Function8ca:: ; 8ca
and a
ret nz
ld a, $2
- ld [rSB], a
+ ldh [rSB], a
xor a
- ld [hSerialReceive], a
+ ldh [hSerialReceive], a
ld a, $0
- ld [rSC], a
+ ldh [rSC], a
ld a, $80
- ld [rSC], a
+ ldh [rSC], a
ret
diff --git a/home/text.asm b/home/text.asm
index d1cee382..9c1104f5 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -23,7 +23,7 @@ ClearTileMap::
ld a, " "
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
- ld a, [rLCDC]
+ ldh a, [rLCDC]
bit 7, a
ret z
jp WaitBGMap
@@ -276,12 +276,12 @@ Char36:: print_name Char36Text ; 10cf (0:10cf)
Char37:: print_name Char37Text ; 10d6 (0:10d6)
PlaceMoveTargetsName:: ; 10dd (0:10dd)
- ld a, [hBattleTurn]
+ ldh a, [hBattleTurn]
xor $1
jr PlaceMonsName
PlaceMoveUsersName:: ; 10e3 (0:10e3)
- ld a, [hBattleTurn]
+ ldh a, [hBattleTurn]
PlaceMonsName::
push de
and a
@@ -502,13 +502,13 @@ TextScroll:: ; 121d (0:121d)
Text_WaitBGMap:: ; 123a (0:123a)
push bc
- ld a, [hOAMUpdate]
+ ldh a, [hOAMUpdate]
push af
ld a, $1
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
call WaitBGMap
pop af
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
pop bc
ret
@@ -535,7 +535,7 @@ UnloadBlinkingCursor:: ; 125b (0:125b)
FarString::
ld b, a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, b
rst Bankswitch
@@ -634,14 +634,14 @@ Text_TX_RAM:: ; 12d6 (0:12d6)
ret
Text_TX_FAR:: ; 12e2 (0:12e2)
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, [hli]
ld e, a
ld a, [hli]
ld d, a
ld a, [hli]
- ld [hROMBank], a
+ ldh [hROMBank], a
ld [MBC3RomBank], a
push hl
ld h, d
@@ -649,7 +649,7 @@ Text_TX_FAR:: ; 12e2 (0:12e2)
call DoTextUntilTerminator
pop hl
pop af
- ld [hROMBank], a
+ ldh [hROMBank], a
ld [MBC3RomBank], a
ret
@@ -751,7 +751,7 @@ Text_TX_EXIT:: ; 136d (0:136d)
push hl
push bc
call GetJoypad
- ld a, [hJoyDown]
+ ldh a, [hJoyDown]
and A_BUTTON | B_BUTTON
jr nz, .skip
ld c, 30
@@ -823,7 +823,7 @@ Text_TX_DOTS:: ; 13c3 (0:13c3)
ld a, "…"
ld [hli], a
call GetJoypad
- ld a, [hJoyDown]
+ ldh a, [hJoyDown]
and A_BUTTON | B_BUTTON
jr nz, .next
ld c, 10
diff --git a/home/tilemap.asm b/home/tilemap.asm
index 4cccbb61..ecced960 100755
--- a/home/tilemap.asm
+++ b/home/tilemap.asm
@@ -33,10 +33,10 @@ ScrollingMenuJoypad:: ; 1a70 (0:1a70)
GetMenuJoypad:: ; 1a7a (0:1a7a)
push bc
push af
- ld a, [hJoyLast]
+ ldh a, [hJoyLast]
and D_PAD
ld b, a
- ld a, [hJoyPressed]
+ ldh a, [hJoyPressed]
and BUTTONS
or b
ld b, a
diff --git a/home/time.asm b/home/time.asm
index 8acc72d9..ab03e930 100644
--- a/home/time.asm
+++ b/home/time.asm
@@ -24,31 +24,31 @@ GetClock:: ; 477 (0:0477)
ld [hl], RTC_S
ld a, [de]
and $3f
- ld [hRTCSeconds], a
+ ldh [hRTCSeconds], a
ld [hl], RTC_M
ld a, [de]
and $3f
- ld [hRTCMinutes], a
+ ldh [hRTCMinutes], a
ld [hl], RTC_H
ld a, [de]
and $1f
- ld [hRTCHours], a
+ ldh [hRTCHours], a
ld [hl], RTC_DL
ld a, [de]
- ld [hRTCDayLo], a
+ ldh [hRTCDayLo], a
ld [hl], RTC_DH
ld a, [de]
- ld [hRTCDayHi], a
+ ldh [hRTCDayHi], a
call CloseSRAM
ret
FixDays:: ; 4a8 (0:04a8)
- ld a, [hRTCDayHi]
+ ldh a, [hRTCDayHi]
bit 0, a
jr z, .daylo
res 0, a
- ld [hRTCDayHi], a
- ld a, [hRTCDayLo]
+ ldh [hRTCDayHi], a
+ ldh a, [hRTCDayLo]
.modh
sub 140
jr nc, .modh
@@ -56,18 +56,18 @@ FixDays:: ; 4a8 (0:04a8)
sub 140
jr nc, .modl
add 140
- ld [hRTCDayLo], a
+ ldh [hRTCDayLo], a
ld a, $40
jr .set
.daylo
- ld a, [hRTCDayLo]
+ ldh a, [hRTCDayLo]
cp 140
jr c, .quit
.mod
sub 140
jr nc, .mod
add 140
- ld [hRTCDayLo], a
+ ldh [hRTCDayLo], a
ld a, $20
.set
push af
@@ -81,7 +81,7 @@ FixDays:: ; 4a8 (0:04a8)
ret
FixTime:: ; 4de (0:04de)
- ld a, [hRTCSeconds]
+ ldh a, [hRTCSeconds]
ld c, a
ld a, [wd1df]
add c
@@ -89,9 +89,9 @@ FixTime:: ; 4de (0:04de)
jr nc, .asm_4eb
add 60
.asm_4eb
- ld [hSeconds], a
+ ldh [hSeconds], a
ccf
- ld a, [hRTCMinutes]
+ ldh a, [hRTCMinutes]
ld c, a
ld a, [wd1de]
adc c
@@ -99,9 +99,9 @@ FixTime:: ; 4de (0:04de)
jr nc, .asm_4fb
add 60
.asm_4fb
- ld [hMinutes], a
+ ldh [hMinutes], a
ccf
- ld a, [hRTCHours]
+ ldh a, [hRTCHours]
ld c, a
ld a, [wd1dd]
adc c
@@ -109,9 +109,9 @@ FixTime:: ; 4de (0:04de)
jr nc, .asm_50b
add 24
.asm_50b
- ld [hHours], a
+ ldh [hHours], a
ccf
- ld a, [hRTCDayLo]
+ ldh a, [hRTCDayLo]
ld c, a
ld a, [wd1dc]
adc c
@@ -127,11 +127,11 @@ SetTimeOfDay::
SetDayOfWeek::
call UpdateTime
- ld a, [hHours]
+ ldh a, [hHours]
ld [wStringBuffer2 + 1], a
- ld a, [hMinutes]
+ ldh a, [hMinutes]
ld [wStringBuffer2 + 2], a
- ld a, [hSeconds]
+ ldh a, [hSeconds]
ld [wStringBuffer2 + 3], a
jr InitTime
@@ -146,11 +146,11 @@ PanicResetClock::
ClearhRTC:: ; 546 (0:0546)
xor a
- ld [hRTCSeconds], a
- ld [hRTCMinutes], a
- ld [hRTCHours], a
- ld [hRTCDayLo], a
- ld [hRTCDayHi], a
+ ldh [hRTCSeconds], a
+ ldh [hRTCMinutes], a
+ ldh [hRTCHours], a
+ ldh [hRTCDayLo], a
+ ldh [hRTCDayHi], a
ret
SetClock:: ; 552 (0:0552)
@@ -164,19 +164,19 @@ SetClock:: ; 552 (0:0552)
bit 6, a
ld [de], a
ld [hl], RTC_S
- ld a, [hRTCSeconds]
+ ldh a, [hRTCSeconds]
ld [de], a
ld [hl], RTC_M
- ld a, [hRTCMinutes]
+ ldh a, [hRTCMinutes]
ld [de], a
ld [hl], RTC_H
- ld a, [hRTCHours]
+ ldh a, [hRTCHours]
ld [de], a
ld [hl], RTC_DL
- ld a, [hRTCDayLo]
+ ldh a, [hRTCDayLo]
ld [de], a
ld [hl], RTC_DH
- ld a, [hRTCDayHi]
+ ldh a, [hRTCDayHi]
res 6, a
ld [de], a
call CloseSRAM
diff --git a/home/vblank.asm b/home/vblank.asm
index 485b875c..9c360586 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -3,7 +3,7 @@ VBlank::
push bc
push de
push hl
- ld a, [hVBlank]
+ ldh a, [hVBlank]
and $7
ld e, a
ld d, $0
@@ -54,29 +54,29 @@ VBlank0:: ; 180
inc [hl]
; advance random variables
- ld a, [rDIV]
+ ldh a, [rDIV]
ld b, a
- ld a, [hRandomAdd]
+ ldh a, [hRandomAdd]
adc b
- ld [hRandomAdd], a
+ ldh [hRandomAdd], a
- ld a, [rDIV]
+ ldh a, [rDIV]
ld b, a
- ld a, [hRandomSub]
+ ldh a, [hRandomSub]
sbc b
- ld [hRandomSub], a
+ ldh [hRandomSub], a
- ld a, [hROMBank]
+ ldh a, [hROMBank]
ld [wROMBankBackup], a
- ld a, [hSCX]
- ld [rSCX], a
- ld a, [hSCY]
- ld [rSCY], a
- ld a, [hWY]
- ld [rWY], a
- ld a, [hWX]
- ld [rWX], a
+ ldh a, [hSCX]
+ ldh [rSCX], a
+ ldh a, [hSCY]
+ ldh [rSCY], a
+ ldh a, [hWY]
+ ldh [rWY], a
+ ldh a, [hWX]
+ ldh [rWX], a
; There's only time to call one of these in one vblank.
; Calls are in order of priority.
@@ -96,10 +96,10 @@ VBlank0:: ; 180
.done
- ld a, [hOAMUpdate]
+ ldh a, [hOAMUpdate]
and a
jr nz, .done_oam
- call hPushOAM
+ call hTransferVirtualOAM
.done_oam
@@ -129,8 +129,8 @@ VBlank0:: ; 180
call _UpdateSound
ld a, [wROMBankBackup]
rst Bankswitch
- ld a, [hSeconds]
- ld [hSecondsBackup], a
+ ldh a, [hSeconds]
+ ldh [hSecondsBackup], a
ret
VBlank1:: ; 1f4
@@ -140,21 +140,21 @@ VBlank1:: ; 1f4
; tiles
; oam
; sound / lcd stat
- ld a, [hROMBank]
+ ldh a, [hROMBank]
ld [wROMBankBackup], a
- ld a, [hSCX]
- ld [rSCX], a
- ld a, [hSCY]
- ld [rSCY], a
+ ldh a, [hSCX]
+ ldh [rSCX], a
+ ldh a, [hSCY]
+ ldh [rSCY], a
call UpdatePals
jr c, .done
call UpdateBGMap
call Serve2bppRequest
- call hPushOAM
+ call hTransferVirtualOAM
.done
- ld a, [hLCDCPointer]
+ ldh a, [hLCDCPointer]
or a
jr z, .skip_lcd
ld c, a
@@ -165,20 +165,20 @@ VBlank1:: ; 1f4
ld [wVBlankOccurred], a
; get requested ints
- ld a, [rIF]
+ ldh a, [rIF]
ld b, a
; discard requested ints
xor a
- ld [rIF], a
+ ldh [rIF], a
; enable lcd stat
ld a, %10 ; lcd stat
- ld [rIE], a
+ ldh [rIE], a
; rerequest serial int if applicable (still disabled)
; request lcd stat
ld a, b
and %1000 ; serial
or %10 ; lcd stat
- ld [rIF], a
+ ldh [rIF], a
ei
ld a, BANK(_UpdateSound)
@@ -188,22 +188,22 @@ VBlank1:: ; 1f4
rst Bankswitch
; enable ints
ld a, %11111
- ld [rIE], a
+ ldh [rIE], a
ret
UpdatePals:: ; 23e
; update pals for either dmg or cgb
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jp nz, UpdateCGBPals
; update gb pals
ld a, [wBGP]
- ld [rBGP], a
+ ldh [rBGP], a
ld a, [wOBP0]
- ld [rOBP0], a
+ ldh [rOBP0], a
ld a, [wOPB1]
- ld [rOBP1], a
+ ldh [rOBP1], a
and a
ret
@@ -215,13 +215,13 @@ VBlank4:: ; 255
; serial
; sound
- ld a, [hROMBank]
+ ldh a, [hROMBank]
ld [wROMBankBackup], a
call UpdateBGMap
call Serve2bppRequest
- call hPushOAM
+ call hTransferVirtualOAM
call Joypad
@@ -245,11 +245,11 @@ VBlank5:: ; 278
; tiles
; joypad
- ld a, [hROMBank]
+ ldh a, [hROMBank]
ld [wROMBankBackup], a
- ld a, [hSCX]
- ld [rSCX], a
+ ldh a, [hSCX]
+ ldh [rSCX], a
call UpdatePalsIfCGB
jr c, .done
@@ -264,11 +264,11 @@ VBlank5:: ; 278
call Joypad
xor a
- ld [rIF], a
+ ldh [rIF], a
ld a, %10 ; lcd stat
- ld [rIE], a
+ ldh [rIE], a
; request lcd stat
- ld [rIF], a
+ ldh [rIF], a
ei
ld a, BANK(_UpdateSound)
@@ -279,16 +279,16 @@ VBlank5:: ; 278
di
xor a
- ld [rIF], a
+ ldh [rIF], a
; enable ints
ld a, %11111
- ld [rIE], a
+ ldh [rIE], a
ret
VBlank2:: ; 2b0
; sound only
- ld a, [hROMBank]
+ ldh a, [hROMBank]
ld [wROMBankBackup], a
ld a, BANK(_UpdateSound)
@@ -310,36 +310,36 @@ VBlank3:: ; 2c4
; oam
; sound / lcd stat
- ld a, [hVBlankCounter]
+ ldh a, [hVBlankCounter]
inc a
- ld [hVBlankCounter], a
+ ldh [hVBlankCounter], a
- ld a, [rDIV]
+ ldh a, [rDIV]
ld b, a
- ld a, [hRandomAdd]
+ ldh a, [hRandomAdd]
adc b
- ld [hRandomAdd], a
+ ldh [hRandomAdd], a
- ld a, [rDIV]
+ ldh a, [rDIV]
ld b, a
- ld a, [hRandomSub]
+ ldh a, [hRandomSub]
sbc b
- ld [hRandomSub], a
+ ldh [hRandomSub], a
call Joypad
- ld a, [hROMBank]
+ ldh a, [hROMBank]
ld [wROMBankBackup], a
- ld a, [hSCX]
- ld [rSCX], a
- ld a, [hSCY]
- ld [rSCY], a
+ ldh a, [hSCX]
+ ldh [rSCX], a
+ ldh a, [hSCY]
+ ldh [rSCY], a
- ld a, [hWY]
- ld [rWY], a
- ld a, [hWX]
- ld [rWX], a
+ ldh a, [hWY]
+ ldh [rWY], a
+ ldh a, [hWX]
+ ldh [rWX], a
call UpdateBGMap
call UpdateBGMapBuffer
@@ -349,7 +349,7 @@ VBlank3:: ; 2c4
call Serve1bppRequest
call AnimateTileset
- call hPushOAM
+ call hTransferVirtualOAM
xor a
ld [wVBlankOccurred], a
@@ -362,11 +362,11 @@ VBlank3:: ; 2c4
.okay
xor a
- ld [rIF], a
+ ldh [rIF], a
ld a, %10 ; lcd stat
- ld [rIE], a
+ ldh [rIE], a
; request lcd stat
- ld [rIF], a
+ ldh [rIF], a
ei
ld a, BANK(_UpdateSound)
@@ -377,8 +377,8 @@ VBlank3:: ; 2c4
di
xor a
- ld [rIF], a
+ ldh [rIF], a
; enable ints
ld a, %11111
- ld [rIE], a
+ ldh [rIE], a
ret
diff --git a/home/video.asm b/home/video.asm
index 0d105791..aca44d2d 100644
--- a/home/video.asm
+++ b/home/video.asm
@@ -1,5 +1,5 @@
UpdateBGMapBuffer:: ; 1458 (0:1458)
- ld a, [hBGMapUpdate]
+ ldh a, [hBGMapUpdate]
and a
ret z
@@ -15,7 +15,7 @@ UpdateBGMapBuffer:: ; 1458 (0:1458)
rept 2
pop bc
ld a, $1
- ld [rVBK], a
+ ldh [rVBK], a
ld a, [hli]
ld [bc], a
inc c
@@ -23,7 +23,7 @@ rept 2
ld [bc], a
dec c
ld a, $0
- ld [rVBK], a
+ ldh [rVBK], a
ld a, [de]
inc de
ld [bc], a
@@ -33,29 +33,29 @@ rept 2
ld [bc], a
endr
- ld a, [hFFDE]
+ ldh a, [hFFDE]
dec a
dec a
- ld [hFFDE], a
+ ldh [hFFDE], a
jr nz, .next
- ld a, [hSPBuffer]
+ ldh a, [hSPBuffer]
ld l, a
- ld a, [hSPBuffer + 1]
+ ldh a, [hSPBuffer + 1]
ld h, a
ld sp, hl
xor a
- ld [hBGMapUpdate], a
+ ldh [hBGMapUpdate], a
scf
ret
WaitTop::
- ld a, [hBGMapMode]
+ ldh a, [hBGMapMode]
and a
ret z
- ld a, [hBGMapThird]
+ ldh a, [hBGMapThird]
and a
jr z, .done
call DelayFrame
@@ -63,11 +63,11 @@ WaitTop::
.done
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
UpdateBGMap:: ; 14bb (0:14bb)
- ld a, [hBGMapMode]
+ ldh a, [hBGMapMode]
and a
ret z
@@ -78,18 +78,18 @@ UpdateBGMap:: ; 14bb (0:14bb)
dec a
- ld a, [hBGMapAddress]
+ ldh a, [hBGMapAddress]
ld l, a
- ld a, [hBGMapAddress + 1]
+ ldh a, [hBGMapAddress + 1]
ld h, a
push hl
xor a
- ld [hBGMapAddress], a
+ ldh [hBGMapAddress], a
ld a, $9c
- ld [hBGMapAddress + 1], a
+ ldh [hBGMapAddress + 1], a
- ld a, [hBGMapMode]
+ ldh a, [hBGMapMode]
push af
cp $3
call z, .Tiles
@@ -99,19 +99,19 @@ UpdateBGMap:: ; 14bb (0:14bb)
pop hl
ld a, l
- ld [hBGMapAddress], a
+ ldh [hBGMapAddress], a
ld a, h
- ld [hBGMapAddress + 1], a
+ ldh [hBGMapAddress + 1], a
ret
.Attr
ld a, $1
- ld [rVBK], a
+ ldh [rVBK], a
hlcoord 0, 0, wAttrMap
call .update
ld a, $0
- ld [rVBK], a
+ ldh [rVBK], a
ret
.Tiles
@@ -119,7 +119,7 @@ UpdateBGMap:: ; 14bb (0:14bb)
.update
ld [hSPBuffer], sp
- ld a, [hBGMapThird]
+ ldh a, [hBGMapThird]
and a
jr z, .top
dec a
@@ -130,9 +130,9 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
add hl, de
ld sp, hl
- ld a, [hBGMapAddress + 1]
+ ldh a, [hBGMapAddress + 1]
ld h, a
- ld a, [hBGMapAddress]
+ ldh a, [hBGMapAddress]
ld l, a
ld de, 2 * THIRD_HEIGHT * BG_MAP_WIDTH
@@ -146,9 +146,9 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
add hl, de
ld sp, hl
- ld a, [hBGMapAddress + 1]
+ ldh a, [hBGMapAddress + 1]
ld h, a
- ld a, [hBGMapAddress]
+ ldh a, [hBGMapAddress]
ld l, a
ld de, THIRD_HEIGHT * BG_MAP_WIDTH
@@ -160,15 +160,15 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
.top
ld sp, hl
- ld a, [hBGMapAddress + 1]
+ ldh a, [hBGMapAddress + 1]
ld h, a
- ld a, [hBGMapAddress]
+ ldh a, [hBGMapAddress]
ld l, a
ld a, $1
.start
- ld [hBGMapThird], a
+ ldh [hBGMapThird], a
ld a, SCREEN_HEIGHT / 3
; Discrepancy between TileMap and BGMap
@@ -191,9 +191,9 @@ endr
dec a
jr nz, .row
- ld a, [hSPBuffer]
+ ldh a, [hSPBuffer]
ld l, a
- ld a, [hSPBuffer + 1]
+ ldh a, [hSPBuffer + 1]
ld h, a
ld sp, hl
ret
@@ -254,9 +254,9 @@ endr
ld [wRequested1bppSource], sp
- ld a, [hSPBuffer]
+ ldh a, [hSPBuffer]
ld l, a
- ld a, [hSPBuffer + 1]
+ ldh a, [hSPBuffer + 1]
ld h, a
ld sp, hl
ret
@@ -303,18 +303,18 @@ endr
ld [wRequested2bppSource], sp
- ld a, [hSPBuffer]
+ ldh a, [hSPBuffer]
ld l, a
- ld a, [hSPBuffer + 1]
+ ldh a, [hSPBuffer + 1]
ld h, a
ld sp, hl
ret
AnimateTileset:: ; 162b (0:162b)
- ld a, [hMapAnims]
+ ldh a, [hMapAnims]
and a
ret z
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, $3f
rst Bankswitch
@@ -329,7 +329,7 @@ AnimateTileset:: ; 162b (0:162b)
Function1642:: ; 1642 (0:1642)
nop
- ld a, [hFF9E]
+ ldh a, [hVBlankCounter + 1]
and a
ret z
dec a
@@ -337,7 +337,7 @@ Function1642:: ; 1642 (0:1642)
dec a
jr z, .two
ld a, $2
- ld [hFF9E], a
+ ldh [hVBlankCounter + 1], a
ld hl, hBGMapAddress
ld a, [hli]
ld h, [hl]
@@ -364,7 +364,7 @@ endr
xor a
ld de, $320
.go
- ld [hFF9E], a
+ ldh [hVBlankCounter + 1], a
ld hl, hBGMapAddress
ld a, [hli]
ld h, [hl]
diff --git a/home/window.asm b/home/window.asm
index 67326091..d3272f07 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -1,6 +1,6 @@
Function2e80:: ; 2e80 (0:2e80)
call ClearWindowData
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; and BANK(LoadFonts_NoOAMUpdate)
rst Bankswitch
@@ -12,26 +12,26 @@ Function2e80:: ; 2e80 (0:2e80)
ret
CloseText
- ld a, [hOAMUpdate]
+ ldh a, [hOAMUpdate]
push af
ld a, $1
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
call .CloseText
pop af
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
ret
.CloseText:
call ClearWindowData
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call OverworldTextModeSwitch
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call SafeUpdateSprites
ld a, $90
- ld [hWY], a
+ ldh [hWY], a
farcall Function1415c
call ReplacePlayerSprite
ld hl, wd565
@@ -41,7 +41,7 @@ CloseText
OpenText::
call ClearWindowData
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; and BANK(LoadFonts_NoOAMUpdate)
rst Bankswitch
@@ -54,32 +54,32 @@ OpenText::
ret
_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 2ee3 (0:2ee3)
- ld a, [hOAMUpdate]
+ ldh a, [hOAMUpdate]
push af
ld a, $1
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
call CGBOnly_LoadEDTile
pop af
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
ret
SafeUpdateSprites:: ; 2ef1 (0:2ef1)
- ld a, [hOAMUpdate]
+ ldh a, [hOAMUpdate]
push af
- ld a, [hBGMapMode]
+ ldh a, [hBGMapMode]
push af
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld a, $1
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
call UpdateSprites
xor a
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
call DelayFrame
pop af
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
pop af
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
ret
Function2f0e::
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 10:18:39 +0000