summaryrefslogtreecommitdiff
path: root/engine/link
diff options
context:
space:
mode:
Diffstat (limited to 'engine/link')
-rw-r--r--engine/link/link.asm212
-rw-r--r--engine/link/link_trade.asm16
-rw-r--r--engine/link/mystery_gift.asm278
-rw-r--r--engine/link/time_capsule.asm2
4 files changed, 254 insertions, 254 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm
index 5363a3047..178b18740 100644
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -6,8 +6,8 @@ LinkCommunications:
call ClearSprites
call UpdateSprites
xor a
- ld [hSCX], a
- ld [hSCY], a
+ ldh [hSCX], a
+ ldh [hSCY], a
ld c, 80
call DelayFrames
call ClearScreen
@@ -42,26 +42,26 @@ Gen2ToGen1LinkComms:
xor a
ld [wPlayerLinkAction], a
call WaitLinkTransfer
- ld a, [hSerialConnectionStatus]
+ ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
jr nz, .player_1
ld c, 3
call DelayFrames
xor a
- ld [hSerialSend], a
+ ldh [hSerialSend], a
ld a, (0 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
call DelayFrame
xor a
- ld [hSerialSend], a
+ ldh [hSerialSend], a
ld a, (0 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
.player_1
ld de, MUSIC_NONE
@@ -69,9 +69,9 @@ Gen2ToGen1LinkComms:
ld c, 3
call DelayFrames
xor a
- ld [rIF], a
+ ldh [rIF], a
ld a, $8
- ld [rIE], a
+ ldh [rIE], a
ld hl, wd1f3
ld de, wEnemyMonSpecies
ld bc, $11
@@ -89,9 +89,9 @@ Gen2ToGen1LinkComms:
ld bc, wTrademons - wLink_c608
call Serial_ExchangeBytes
xor a
- ld [rIF], a
+ ldh [rIF], a
ld a, $1d
- ld [rIE], a
+ ldh [rIE], a
call Link_CopyRandomNumbers
ld hl, wOTPlayerName
call Link_FindFirstNonControlCharacter_SkipZero
@@ -170,7 +170,7 @@ Gen2ToGen1LinkComms:
ld [wUnusedD102 + 1], a
ld de, MUSIC_NONE
call PlayMusic
- ld a, [hSerialConnectionStatus]
+ ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
ld c, 66
call z, DelayFrames
@@ -186,26 +186,26 @@ Gen2ToGen2LinkComms:
ld a, [wScriptVar]
and a
jp z, LinkTimeout
- ld a, [hSerialConnectionStatus]
+ ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
jr nz, .Player1
ld c, 3
call DelayFrames
xor a
- ld [hSerialSend], a
+ ldh [hSerialSend], a
ld a, (0 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
call DelayFrame
xor a
- ld [hSerialSend], a
+ ldh [hSerialSend], a
ld a, (0 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
.Player1:
ld de, MUSIC_NONE
@@ -213,9 +213,9 @@ Gen2ToGen2LinkComms:
ld c, 3
call DelayFrames
xor a
- ld [rIF], a
+ ldh [rIF], a
ld a, $8
- ld [rIE], a
+ ldh [rIE], a
ld hl, wd1f3
ld de, wEnemyMonSpecies
ld bc, $11
@@ -242,9 +242,9 @@ Gen2ToGen2LinkComms:
.not_trading
xor a
- ld [rIF], a
+ ldh [rIF], a
ld a, $1d
- ld [rIE], a
+ ldh [rIE], a
ld de, MUSIC_NONE
call PlayMusic
call Link_CopyRandomNumbers
@@ -412,7 +412,7 @@ Gen2ToGen2LinkComms:
ld [wUnusedD102 + 1], a
ld de, MUSIC_NONE
call PlayMusic
- ld a, [hSerialConnectionStatus]
+ ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
ld c, 66
call z, DelayFrames
@@ -440,28 +440,28 @@ Gen2ToGen2LinkComms:
push af
ld a, 1
ld [wDisableTextAcceleration], a
- ld a, [rIE]
+ ldh a, [rIE]
push af
- ld a, [rIF]
+ ldh a, [rIF]
push af
xor a
- ld [rIF], a
- ld a, [rIE]
+ ldh [rIF], a
+ ldh a, [rIE]
set 1, a
- ld [rIE], a
+ ldh [rIE], a
pop af
- ld [rIF], a
+ ldh [rIF], a
predef StartBattle
- ld a, [rIF]
+ ldh a, [rIF]
ld h, a
xor a
- ld [rIF], a
+ ldh [rIF], a
pop af
- ld [rIE], a
+ ldh [rIE], a
ld a, h
- ld [rIF], a
+ ldh [rIF], a
pop af
ld [wDisableTextAcceleration], a
pop af
@@ -485,7 +485,7 @@ LinkTimeout:
xor a
ld [hld], a
ld [hl], a
- ld [hVBlank], a
+ ldh [hVBlank], a
push de
hlcoord 0, 12
ld b, 4
@@ -512,10 +512,10 @@ LinkTimeout:
ExchangeBytes:
ld a, TRUE
- ld [hSerialIgnoringInitialData], a
+ ldh [hSerialIgnoringInitialData], a
.loop
ld a, [hl]
- ld [hSerialSend], a
+ ldh [hSerialSend], a
call Serial_ExchangeByte
push bc
ld b, a
@@ -524,14 +524,14 @@ ExchangeBytes:
.delay_cycles
dec a
jr nz, .delay_cycles
- ld a, [hSerialIgnoringInitialData]
+ ldh a, [hSerialIgnoringInitialData]
and a
ld a, b
pop bc
jr z, .load
dec hl
xor a
- ld [hSerialIgnoringInitialData], a
+ ldh [hSerialIgnoringInitialData], a
jr .loop
.load
@@ -786,10 +786,10 @@ Link_PrepPartyData_Gen1:
pop bc
pop de
- ld a, [hQuotient + 1]
+ ldh a, [hQuotient + 1]
ld [de], a
inc de
- ld a, [hQuotient + 2]
+ ldh a, [hQuotient + 2]
ld [de], a
inc de
ld h, b
@@ -1059,9 +1059,9 @@ Function2868a:
predef CalcMonStatC
pop bc
pop hl
- ld a, [hQuotient + 1]
+ ldh a, [hQuotient + 1]
ld [hli], a
- ld a, [hQuotient + 2]
+ ldh a, [hQuotient + 2]
ld [hli], a
push hl
push bc
@@ -1072,9 +1072,9 @@ Function2868a:
predef CalcMonStatC
pop bc
pop hl
- ld a, [hQuotient + 1]
+ ldh a, [hQuotient + 1]
ld [hli], a
- ld a, [hQuotient + 2]
+ ldh a, [hQuotient + 2]
ld [hli], a
push hl
ld hl, $1b
@@ -1128,7 +1128,7 @@ Link_CopyOTData:
ret
Link_CopyRandomNumbers:
- ld a, [hSerialConnectionStatus]
+ ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
ret z
ld hl, wEnemyMonSpecies
@@ -1518,7 +1518,7 @@ Function28ade:
ldcoord_a 9, 17
.loop2
call JoyTextDelay
- ld a, [hJoyLast]
+ ldh a, [hJoyLast]
and a
jr z, .loop2
bit A_BUTTON_F, a
@@ -1556,12 +1556,12 @@ Function28b22:
xor a
ld [wcfbb], a
xor a
- ld [rSB], a
- ld [hSerialSend], a
+ ldh [rSB], a
+ ldh [hSerialSend], a
ld a, (0 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
ret
Unreferenced_Function28b42:
@@ -1851,7 +1851,7 @@ LinkTrade:
call LoadFontsBattleExtra
ld b, SCGB_DIPLOMA
call GetSGBLayout
- ld a, [hSerialConnectionStatus]
+ ldh a, [hSerialConnectionStatus]
cp USING_EXTERNAL_CLOCK
jr z, .player_2
predef TradeAnimation
@@ -2091,7 +2091,7 @@ EnterTimeCapsule:
ld c, 40
call DelayFrames
xor a
- ld [hVBlank], a
+ ldh [hVBlank], a
inc a
ld [wLinkMode], a
ret
@@ -2100,46 +2100,46 @@ WaitForOtherPlayerToExit:
ld c, 3
call DelayFrames
ld a, CONNECTION_NOT_ESTABLISHED
- ld [hSerialConnectionStatus], a
+ ldh [hSerialConnectionStatus], a
xor a
- ld [rSB], a
- ld [hSerialReceive], a
+ ldh [rSB], a
+ ldh [hSerialReceive], a
ld a, (0 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
ld c, 3
call DelayFrames
xor a
- ld [rSB], a
- ld [hSerialReceive], a
+ ldh [rSB], a
+ ldh [hSerialReceive], a
ld a, (0 << rSC_ON) | 0
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 0
- ld [rSC], a
+ ldh [rSC], a
ld c, 3
call DelayFrames
xor a
- ld [rSB], a
- ld [hSerialReceive], a
- ld [rSC], a
+ ldh [rSB], a
+ ldh [hSerialReceive], a
+ ldh [rSC], a
ld c, 3
call DelayFrames
ld a, CONNECTION_NOT_ESTABLISHED
- ld [hSerialConnectionStatus], a
- ld a, [rIF]
+ ldh [hSerialConnectionStatus], a
+ ldh a, [rIF]
push af
xor a
- ld [rIF], a
+ ldh [rIF], a
ld a, $f
- ld [rIE], a
+ ldh [rIE], a
pop af
- ld [rIF], a
+ ldh [rIF], a
ld hl, wLinkTimeoutFrames
xor a
ld [hli], a
ld [hl], a
- ld [hVBlank], a
+ ldh [hVBlank], a
ld [wLinkMode], a
ret
@@ -2157,13 +2157,13 @@ SetBitsForBattleRequest:
SetBitsForTimeCapsuleRequest:
ld a, $2
- ld [rSB], a
+ ldh [rSB], a
xor a
- ld [hSerialReceive], a
+ ldh [hSerialReceive], a
ld a, (0 << rSC_ON) | 0
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 0
- ld [rSC], a
+ ldh [rSC], a
xor a ; LINK_TIMECAPSULE - 1
ld [wPlayerLinkAction], a
ld [wChosenCableClubRoom], a
@@ -2174,13 +2174,13 @@ WaitForLinkedFriend:
and a
jr z, .no_link_action
ld a, $2
- ld [rSB], a
+ ldh [rSB], a
xor a
- ld [hSerialReceive], a
+ ldh [hSerialReceive], a
ld a, (0 << rSC_ON) | 0
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 0
- ld [rSC], a
+ ldh [rSC], a
call DelayFrame
call DelayFrame
call DelayFrame
@@ -2191,21 +2191,21 @@ WaitForLinkedFriend:
ld a, $ff
ld [wLinkTimeoutFrames], a
.loop
- ld a, [hSerialConnectionStatus]
+ ldh a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
jr z, .connected
cp USING_EXTERNAL_CLOCK
jr z, .connected
ld a, CONNECTION_NOT_ESTABLISHED
- ld [hSerialConnectionStatus], a
+ ldh [hSerialConnectionStatus], a
ld a, $2
- ld [rSB], a
+ ldh [rSB], a
xor a
- ld [hSerialReceive], a
+ ldh [hSerialReceive], a
ld a, (0 << rSC_ON) | 0
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 0
- ld [rSC], a
+ ldh [rSC], a
ld a, [wLinkTimeoutFrames]
dec a
ld [wLinkTimeoutFrames], a
@@ -2217,11 +2217,11 @@ WaitForLinkedFriend:
.not_done
ld a, $1
- ld [rSB], a
+ ldh [rSB], a
ld a, (0 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
ld a, (1 << rSC_ON) | 1
- ld [rSC], a
+ ldh [rSC], a
call DelayFrame
jr .loop
@@ -2250,12 +2250,12 @@ CheckLinkTimeout:
ld [hl], a
call WaitBGMap
ld a, $2
- ld [hVBlank], a
+ ldh [hVBlank], a
call DelayFrame
call DelayFrame
call Link_CheckCommunicationError
xor a
- ld [hVBlank], a
+ ldh [hVBlank], a
ld a, [wScriptVar]
and a
ret nz
@@ -2271,7 +2271,7 @@ Function29dba:
ld [hl], a
call WaitBGMap
ld a, $2
- ld [hVBlank], a
+ ldh [hVBlank], a
call DelayFrame
call DelayFrame
call Link_CheckCommunicationError
@@ -2305,12 +2305,12 @@ Function29dba:
.vblank
xor a
- ld [hVBlank], a
+ ldh [hVBlank], a
ret
Link_CheckCommunicationError:
xor a
- ld [hSerialReceivedNewData], a
+ ldh [hSerialReceivedNewData], a
ld a, [wLinkTimeoutFrames]
ld h, a
ld a, [wLinkTimeoutFrames + 1]
@@ -2403,7 +2403,7 @@ CheckBothSelectedSameRoom:
inc a
ld [wLinkMode], a
xor a
- ld [hVBlank], a
+ ldh [hVBlank], a
ld a, TRUE
ld [wScriptVar], a
ret
@@ -2420,7 +2420,7 @@ TimeCapsule:
callfar LinkCommunications
call EnableSpriteUpdates
xor a
- ld [hVBlank], a
+ ldh [hVBlank], a
ret
TradeCenter:
@@ -2430,7 +2430,7 @@ TradeCenter:
callfar LinkCommunications
call EnableSpriteUpdates
xor a
- ld [hVBlank], a
+ ldh [hVBlank], a
ret
Colosseum:
@@ -2440,7 +2440,7 @@ Colosseum:
callfar LinkCommunications
call EnableSpriteUpdates
xor a
- ld [hVBlank], a
+ ldh [hVBlank], a
ret
CloseLink:
@@ -2460,12 +2460,12 @@ Link_ResetSerialRegistersAfterLinkClosure:
ld c, 3
call DelayFrames
ld a, CONNECTION_NOT_ESTABLISHED
- ld [hSerialConnectionStatus], a
+ ldh [hSerialConnectionStatus], a
ld a, $2
- ld [rSB], a
+ ldh [rSB], a
xor a
- ld [hSerialReceive], a
- ld [rSC], a
+ ldh [hSerialReceive], a
+ ldh [rSC], a
ret
Link_EnsureSync:
@@ -2473,7 +2473,7 @@ Link_EnsureSync:
ld [wPlayerLinkAction], a
ld [wcf57], a
ld a, $2
- ld [hVBlank], a
+ ldh [hVBlank], a
call DelayFrame
call DelayFrame
.receive_loop
@@ -2491,13 +2491,13 @@ Link_EnsureSync:
.done
xor a
- ld [hVBlank], a
+ ldh [hVBlank], a
ld a, b
and $f
ret
CableClubCheckWhichChris:
- ld a, [hSerialConnectionStatus]
+ ldh a, [hSerialConnectionStatus]
cp USING_EXTERNAL_CLOCK
ld a, TRUE
jr z, .yes
diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm
index a250e84fa..95be2817a 100644
--- a/engine/link/link_trade.asm
+++ b/engine/link/link_trade.asm
@@ -185,10 +185,10 @@ LinkTradeMenu:
.GetJoypad:
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
@@ -201,11 +201,11 @@ LinkTradeMenu:
.MenuAction:
ld hl, w2DMenuFlags2
res 7, [hl]
- ld a, [hBGMapMode]
+ ldh a, [hBGMapMode]
push af
call .loop
pop af
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
.loop
@@ -228,15 +228,15 @@ LinkTradeMenu:
ret
.UpdateBGMapAndOAM:
- 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
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
.loop2
diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm
index 6fba91619..041c0c337 100644
--- a/engine/link/mystery_gift.asm
+++ b/engine/link/mystery_gift.asm
@@ -13,16 +13,16 @@ DoMysteryGift:
ld [wca01], a
ld a, $14
ld [wca02], a
- ld a, [rIE]
+ ldh a, [rIE]
push af
call Function104a95
ld d, a
xor a
- ld [rIF], a
+ ldh [rIF], a
pop af
- ld [rIE], a
+ ldh [rIE], a
push de
call ClearTileMap
call EnableLCD
@@ -117,7 +117,7 @@ DoMysteryGift:
.PrintTextAndExit:
call PrintText
ld a, LCDC_DEFAULT
- ld [rLCDC], a
+ ldh [rLCDC], a
ret
.String_PressAToLink_BToCancel:
@@ -233,13 +233,13 @@ Function104a95:
.loop2
call Function104d96
call Function104ddd
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $10
jp z, Function104bd0
cp $6c
jr nz, .loop2
- ld a, [hPrintNum9]
+ ldh a, [hPrintNum9]
cp $2
jr z, Function104b22
ld hl, hPrintNum1
@@ -251,7 +251,7 @@ Function104a95:
jr Function104b0a
; Delay frame
.ly_loop
- ld a, [rLY]
+ ldh a, [rLY]
cp LY_VBLANK
jr c, .ly_loop
ld c, LOW(rRP)
@@ -270,14 +270,14 @@ Function104a95:
ld a, [$ff00+c]
and b
ld b, a
- ld a, [rLY]
+ ldh a, [rLY]
cp LY_VBLANK
jr nc, .ly_loop2
.ly_loop3
ld a, [$ff00+c]
and b
ld b, a
- ld a, [rLY]
+ ldh a, [rLY]
cp LY_VBLANK
jr c, .ly_loop3
@@ -288,11 +288,11 @@ Function104a95:
or a
jr nz, .loop2
; Check if we've pressed the B button
- ld a, [hMGJoypadReleased]
+ ldh a, [hMGJoypadReleased]
bit B_BUTTON_F, a
jr z, .loop3
ld a, $10
- ld [hMGStatusFlags], a
+ ldh [hMGStatusFlags], a
jp Function104bd0
Function104b04:
@@ -328,14 +328,14 @@ Function104b40:
Function104b49:
call Function105033
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret nz
- ld a, [hPrintNum1]
+ ldh a, [hPrintNum1]
cp $96
jp nz, Function104d32
ld a, $90
- ld [hPrintNum1], a
+ ldh [hPrintNum1], a
call Function104d38
ret nz
ld hl, hPrintNum1
@@ -343,7 +343,7 @@ Function104b49:
call Function104d4e
ret nz
call Function10502e
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret nz
call Function104d43
@@ -354,19 +354,19 @@ Function104b49:
call Function104d56
ret nz
call Function105033
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret
Function104b88:
ld a, $96
- ld [hPrintNum1], a
+ ldh [hPrintNum1], a
ld hl, hPrintNum1
ld b, $1
call Function104d4e
ret nz
call Function10502e
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret nz
call Function104d43
@@ -376,10 +376,10 @@ Function104b88:
call Function104d56
ret nz
call Function105033
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret nz
- ld a, [hPrintNum1]
+ ldh a, [hPrintNum1]
cp $90
jp nz, Function104d32
call Function104d38
@@ -390,13 +390,13 @@ Function104b88:
call Function104d4e
ret nz
call Function10502e
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret
Function104bd0:
nop
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $10
jr z, .quit
cp $6c
@@ -415,7 +415,7 @@ Function104bd0:
call MysteryGift_ClearTrainerData
ld a, $26
ld [wca02], a
- ld a, [hPrintNum9]
+ ldh a, [hPrintNum9]
cp $2
jr z, .asm_104c10
call Function104d43
@@ -428,14 +428,14 @@ Function104bd0:
jp Function104b22
.quit
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
push af
call Function104da0
xor a
- ld [rIF], a
- ld a, [rIE]
+ ldh [rIF], a
+ ldh a, [rIE]
or $1
- ld [rIE], a
+ ldh [rIE], a
ei
call DelayFrame
pop af
@@ -448,12 +448,12 @@ Function104c2d:
.asm_104c37
call Function104d96
call Function104ddd
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $10
jp z, Function104d1c
cp $6c
jr nz, .asm_104c37
- ld a, [hPrintNum9]
+ ldh a, [hPrintNum9]
cp $2
jr z, .asm_104c6c
call Function104c8a
@@ -484,14 +484,14 @@ Function104c8a:
call Function104d56
ret nz
call Function105033
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret nz
- ld a, [hPrintNum1]
+ ldh a, [hPrintNum1]
cp $3c
jp nz, Function104d32
swap a
- ld [hPrintNum1], a
+ ldh [hPrintNum1], a
call Function104d38
ret nz
ld hl, hPrintNum1
@@ -499,7 +499,7 @@ Function104c8a:
call Function104d4e
ret nz
call Function10502e
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret nz
call Function104d43
@@ -510,19 +510,19 @@ Function104c8a:
call Function104d56
ret nz
call Function105033
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret
Function104cd2:
ld a, $3c
- ld [hPrintNum1], a
+ ldh [hPrintNum1], a
ld hl, hPrintNum1
ld b, $1
call Function104d4e
ret nz
call Function10502e
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret nz
call Function104d43
@@ -532,10 +532,10 @@ Function104cd2:
call Function104d56
ret nz
call Function105033
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret nz
- ld a, [hPrintNum1]
+ ldh a, [hPrintNum1]
swap a
cp $3c
jp nz, Function104d32
@@ -547,20 +547,20 @@ Function104cd2:
call Function104d4e
ret nz
call Function10502e
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret
Function104d1c:
nop
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
push af
call Function104da0
xor a
- ld [rIF], a
- ld a, [rIE]
+ ldh [rIF], a
+ ldh a, [rIE]
or $1
- ld [rIE], a
+ ldh [rIE], a
ei
call DelayFrame
pop af
@@ -568,42 +568,42 @@ Function104d1c:
Function104d32:
ld a, $80
- ld [hMGStatusFlags], a
+ ldh [hMGStatusFlags], a
and a
ret
Function104d38:
call Function104d96
call Function104e46
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret
Function104d43:
call Function104d96
call Function104dfe
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret
Function104d4e:
call Function104e93
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret
Function104d56:
call Function104f57
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
cp $6c
ret
Function104d5e:
call Function104d74
ld a, $4
- ld [rIE], a
+ ldh [rIE], a
xor a
- ld [rIF], a
+ ldh [rIF], a
call Function104d96
xor a
ld b, a
@@ -616,46 +616,46 @@ Function104d5e:
Function104d74:
xor a
- ld [rTAC], a
+ ldh [rTAC], a
ld a, $fe
- ld [rTMA], a
- ld [rTIMA], a
+ ldh [rTMA], a
+ ldh [rTIMA], a
ld a, $2
- ld [rTAC], a
+ ldh [rTAC], a
or $4
- ld [rTAC], a
+ ldh [rTAC], a
ret
Function104d86:
xor a
- ld [rTAC], a
- ld [rTMA], a
- ld [rTIMA], a
+ ldh [rTAC], a
+ ldh [rTMA], a
+ ldh [rTIMA], a
ld a, $2
- ld [rTAC], a
+ ldh [rTAC], a
or $4
- ld [rTAC], a
+ ldh [rTAC], a
ret
Function104d96:
ld a, $c0
call Function104e8c
ld a, $1
- ld [hPrintNum9], a
+ ldh [hPrintNum9], a
ret
Function104da0:
xor a
call Function104e8c
ld a, $2
- ld [rTAC], a
+ ldh [rTAC], a
ret
Function104da9:
inc d
ret z
xor a
- ld [rIF], a
+ ldh [rIF], a
halt
ld a, [$ff00+c]
bit 1, a
@@ -667,7 +667,7 @@ Function104db7:
inc d
ret z
xor a
- ld [rIF], a
+ ldh [rIF], a
halt
ld a, [$ff00+c]
bit 1, a
@@ -682,7 +682,7 @@ Function104dc5:
dec d
ret z
xor a
- ld [rIF], a
+ ldh [rIF], a
halt
jr .wait
@@ -693,7 +693,7 @@ Function104dd1:
dec d
ret z
xor a
- ld [rIF], a
+ ldh [rIF], a
halt
jr .wait
@@ -701,16 +701,16 @@ Function104ddd:
ld d, $0
ld e, d
ld a, $1
- ld [hPrintNum9], a
+ ldh [hPrintNum9], a
.loop
call MysteryGift_ReadJoypad
ld b, $2
ld c, LOW(rRP)
- ld a, [hMGJoypadReleased]
+ ldh a, [hMGJoypadReleased]
bit B_BUTTON_F, a
jr z, .next
ld a, $10
- ld [hMGStatusFlags], a
+ ldh [hMGStatusFlags], a
ret
.next
@@ -734,7 +734,7 @@ Function104dfe:
call Function104da9
jp z, Function104f42
ld a, $6c
- ld [hMGStatusFlags], a
+ ldh [hMGStatusFlags], a
ld d, $3d
call Function104dd1
ld d, $5
@@ -760,7 +760,7 @@ Function104e3a:
jr nz, .loop
Function104e46:
ld a, $2
- ld [hPrintNum9], a
+ ldh [hPrintNum9], a
ld c, LOW(rRP)
ld d, $0
ld e, d
@@ -787,19 +787,19 @@ Function104e46:
ld d, $3d
call Function104dd1
ld a, $6c
- ld [hMGStatusFlags], a
+ ldh [hMGStatusFlags], a
ret
Function104e8c:
- ld [rRP], a
+ ldh [rRP], a
ld a, $ff
- ld [hMGStatusFlags], a
+ ldh [hMGStatusFlags], a
ret
Function104e93:
xor a
- ld [hPrintNum5], a
- ld [hPrintNum6], a
+ ldh [hPrintNum5], a
+ ldh [hPrintNum6], a
push hl
push bc
ld c, LOW(rRP)
@@ -815,10 +815,10 @@ Function104e93:
pop bc
pop hl
call Function104ed6
- ld a, [hPrintNum5]
- ld [hPrintNum2], a
- ld a, [hPrintNum6]
- ld [hPrintNum3], a
+ ldh a, [hPrintNum5]
+ ldh [hPrintNum2], a
+ ldh a, [hPrintNum6]
+ ldh [hPrintNum3], a
push hl
ld hl, hPrintNum2
ld b, $2
@@ -826,10 +826,10 @@ Function104e93:
ld hl, hMGStatusFlags
ld b, $1
call Function104faf
- ld a, [hPrintNum2]
- ld [hPrintNum5], a
- ld a, [hPrintNum3]
- ld [hPrintNum6], a
+ ldh a, [hPrintNum2]
+ ldh [hPrintNum5], a
+ ldh a, [hPrintNum3]
+ ldh [hPrintNum6], a
pop hl
ret
@@ -845,26 +845,26 @@ Function104ed6:
cpl
ld b, a
ld a, $f4
- ld [rTMA], a
+ ldh [rTMA], a
.asm_104eee
inc b
jr z, .asm_104f2e
ld a, $8
- ld [hPrintNum4], a
+ ldh [hPrintNum4], a
ld a, [hli]
ld e, a
- ld a, [hPrintNum5]
+ ldh a, [hPrintNum5]
add e
- ld [hPrintNum5], a
- ld a, [hPrintNum6]
+ ldh [hPrintNum5], a
+ ldh a, [hPrintNum6]
adc 0
- ld [hPrintNum6], a
+ ldh [hPrintNum6], a
.asm_104f02
xor a
- ld [rIF], a
+ ldh [rIF], a
halt
ld a, $c1
- ld [rRP], a
+ ldh [rRP], a
ld d, $1
ld a, e
rlca
@@ -872,27 +872,27 @@ Function104ed6:
jr nc, .asm_104f13
inc d
.asm_104f13
- ld a, [rTIMA]
+ ldh a, [rTIMA]
cp $f8
jr c, .asm_104f13
ld a, $c0
- ld [rRP], a
+ ldh [rRP], a
dec d
jr z, .asm_104f25
xor a
- ld [rIF], a
+ ldh [rIF], a
halt
.asm_104f25
- ld a, [hPrintNum4]
+ ldh a, [hPrintNum4]
dec a
jr z, .asm_104eee
- ld [hPrintNum4], a
+ ldh [hPrintNum4], a
jr .asm_104f02
.asm_104f2e
ld a, $fe
- ld [rTMA], a
+ ldh [rTMA], a
xor a
- ld [rIF], a
+ ldh [rIF], a
halt
ld d, $5
call Function104dc5
@@ -901,46 +901,46 @@ Function104ed6:
ret
Function104f42:
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
or $2
- ld [hMGStatusFlags], a
+ ldh [hMGStatusFlags], a
ret
Function104f49:
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
or $1
- ld [hMGStatusFlags], a
+ ldh [hMGStatusFlags], a
ret
Function104f50:
- ld a, [hMGStatusFlags]
+ ldh a, [hMGStatusFlags]
or $80
- ld [hMGStatusFlags], a
+ ldh [hMGStatusFlags], a
ret
Function104f57:
xor a
- ld [hPrintNum5], a
- ld [hPrintNum6], a
+ ldh [hPrintNum5], a
+ ldh [hPrintNum6], a
push bc
push hl
ld hl, hPrintNum2
ld b, $2
call Function104faf
- ld a, [hPrintNum3]
- ld [hPrintNum8], a
+ ldh a, [hPrintNum3]
+ ldh [hPrintNum8], a
ld b, a
pop hl
pop af
cp b
jp c, Function104f50
- ld a, [hPrintNum2]
+ ldh a, [hPrintNum2]
cp $5a
jp nz, Function104f50
call Function104faf
- ld a, [hPrintNum5]
+ ldh a, [hPrintNum5]
ld d, a
- ld a, [hPrintNum6]
+ ldh a, [hPrintNum6]
ld e, a
push hl
push de
@@ -965,9 +965,9 @@ Function104f57:
pop de
pop hl
ld a, d
- ld [hPrintNum5], a
+ ldh [hPrintNum5], a
ld a, e
- ld [hPrintNum6], a
+ ldh [hPrintNum6], a
ret
Function104faf:
@@ -985,13 +985,13 @@ Function104faf:
cpl
ld b, a
xor a
- ld [hMGJoypadPressed + 2], a
+ ldh [hMGJoypadPressed + 2], a
call Function104d86
.asm_104fd2
inc b
jr z, .asm_10501a
ld a, $8
- ld [hPrintNum4], a
+ ldh [hPrintNum4], a
.asm_104fd9
ld d, $0
.asm_104fdb
@@ -1008,10 +1008,10 @@ Function104faf:
bit 1, a
jr nz, .asm_104fe5
.asm_104fed
- ld a, [hMGJoypadPressed + 2]
+ ldh a, [hMGJoypadPressed + 2]
ld d, a
- ld a, [rTIMA]
- ld [hMGJoypadPressed + 2], a
+ ldh a, [rTIMA]
+ ldh [hMGJoypadPressed + 2], a
sub d
cp $12
jr c, .asm_104ffd
@@ -1020,9 +1020,9 @@ Function104faf:
.asm_104ffd
res 0, e
.asm_104fff
- ld a, [hPrintNum4]
+ ldh a, [hPrintNum4]
dec a
- ld [hPrintNum4], a
+ ldh [hPrintNum4], a
jr z, .asm_10500b
ld a, e
rlca
@@ -1031,17 +1031,17 @@ Function104faf:
.asm_10500b
ld a, e
ld [hli], a
- ld a, [hPrintNum5]
+ ldh a, [hPrintNum5]
add e
- ld [hPrintNum5], a
- ld a, [hPrintNum6]
+ ldh [hPrintNum5], a
+ ldh a, [hPrintNum6]
adc 0
- ld [hPrintNum6], a
+ ldh [hPrintNum6], a
jr .asm_104fd2
.asm_10501a
call Function104d74
xor a
- ld [rIF], a
+ ldh [rIF], a
ld d, $0
call Function104da9
jp z, Function104f42
@@ -1061,10 +1061,10 @@ MysteryGift_ReadJoypad:
; We can only get four inputs at a time.
; We take d-pad first for no particular reason.
ld a, R_DPAD
- ld [rJOYP], a
+ ldh [rJOYP], a
; Read twice to give the request time to take.
- ld a, [rJOYP]
- ld a, [rJOYP]
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
; The Joypad register output is in the lo nybble (inversed).
; We make the hi nybble of our new container d-pad input.
@@ -1078,10 +1078,10 @@ MysteryGift_ReadJoypad:
; Buttons make 8 total inputs (A, B, Select, Start).
; We can fit this into one byte.
ld a, R_BUTTONS
- ld [rJOYP], a
+ ldh [rJOYP], a
; Wait for input to stabilize.
rept 6
- ld a, [rJOYP]
+ ldh a, [rJOYP]
endr
; Buttons take the lo nybble.
cpl
@@ -1089,17 +1089,17 @@ endr
or b
ld c, a
; To get the delta we xor the last frame's input with the new one.
- ld a, [hMGJoypadPressed]
+ ldh a, [hMGJoypadPressed]
xor c
; Released this frame:
and c
- ld [hMGJoypadReleased], a
+ ldh [hMGJoypadReleased], a
; Pressed this frame:
ld a, c
- ld [hMGJoypadPressed], a
+ ldh [hMGJoypadPressed], a
ld a, $30
; Reset the joypad register since we're done with it.
- ld [rJOYP], a
+ ldh [rJOYP], a
ret
MysteryGift_CheckAndSetDecorationAlreadyReceived:
@@ -1408,14 +1408,14 @@ Function105688:
call MysteryGift_ClearTrainerData
ld a, $24
ld [wca02], a
- ld a, [rIE]
+ ldh a, [rIE]
push af
call Function104c2d
ld d, a
xor a
- ld [rIF], a
+ ldh [rIF], a
pop af
- ld [rIE], a
+ ldh [rIE], a
ld a, d
cp $10
jp z, Function105712
@@ -1479,7 +1479,7 @@ Function10571a:
PrintTextAndExit_JP:
call PrintText
ld a, LCDC_DEFAULT
- ld [rLCDC], a
+ ldh [rLCDC], a
ret
String_PressAToLink_BToCancel_JP:
diff --git a/engine/link/time_capsule.asm b/engine/link/time_capsule.asm
index 499e9fc34..f1a93f90c 100644
--- a/engine/link/time_capsule.asm
+++ b/engine/link/time_capsule.asm
@@ -128,7 +128,7 @@ PlaceTradePartnerNamesAndParty:
push de
push hl
ld a, c
- ld [hProduct], a
+ ldh [hProduct], a
call GetPokemonName
pop hl
call PlaceString