Specify the ldh instruction, don't turn ld into ldh

11 files changed, 152 insertions, 152 deletions

diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index d8e593a5..caf62852 100755
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -19,7 +19,7 @@ HallOfFamePC:
 	coord hl, 0, 14
 	call FillFourRowsWithBlack
 	ld a, %11000000
-	ld [rBGP], a
+	ldh [rBGP], a
 	call EnableLCD
 	ld a, SFX_STOP_ALL_MUSIC
 	call PlaySoundWaitForCurrent
@@ -38,7 +38,7 @@ FadeInCreditsText:
 	ld b, 4
 .loop
 	ld a, [hli]
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld c, 5
 	call DelayFrames
 	dec b
@@ -47,7 +47,7 @@ FadeInCreditsText:
 
 DisplayCreditsMon:
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call SaveScreenTilesToBuffer1
 	call FillMiddleOfScreenWithWhite
 
@@ -67,17 +67,17 @@ DisplayCreditsMon:
 	ld hl, vBGMap0 + $c
 	call CreditsCopyTileMapToVRAM
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call LoadScreenTilesFromBuffer1
 	ld hl, vBGMap0
 	call CreditsCopyTileMapToVRAM
 	ld a, $A7
-	ld [rWX], a
+	ldh [rWX], a
 	ld hl, vBGMap1
 	call CreditsCopyTileMapToVRAM
 	call FillMiddleOfScreenWithWhite
 	ld a, %11111100 ; make the mon a black silhouette
-	ld [rBGP], a
+	ldh [rBGP], a
 
 ; scroll the mon left by one tile 7 times
 	ld bc, 7
@@ -92,16 +92,16 @@ DisplayCreditsMon:
 	ld c, 20
 .scrollLoop2
 	call ScrollCreditsMonLeft
-	ld a, [rWX]
+	ldh a, [rWX]
 	sub 8
-	ld [rWX], a
+	ldh [rWX], a
 	dec c
 	jr nz, .scrollLoop2
 
 	xor a
-	ld [hWY], a
+	ldh [hWY], a
 	ld a, %11000000
-	ld [rBGP], a
+	ldh [rBGP], a
 	ret
 
 INCLUDE "data/credits/credits_mons.asm"
@@ -119,13 +119,13 @@ ScrollCreditsMonLeft:
 	ret
 
 ScrollCreditsMonLeft_SetSCX:
-	ld a, [rLY]
+	ldh a, [rLY]
 	cp l
 	jr nz, ScrollCreditsMonLeft_SetSCX
 	ld a, h
-	ld [rSCX], a
+	ldh [rSCX], a
 .loop
-	ld a, [rLY]
+	ldh a, [rLY]
 	cp h
 	jr z, .loop
 	ret
@@ -138,11 +138,11 @@ HoFGBPalettes:
 
 CreditsCopyTileMapToVRAM:
 	ld a, l
-	ld [hAutoBGTransferDest], a
+	ldh [hAutoBGTransferDest], a
 	ld a, h
-	ld [hAutoBGTransferDest + 1], a
+	ldh [hAutoBGTransferDest + 1], a
 	ld a, 1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	jp Delay3
 
 ZeroMemory:
diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm
index 1e3aaad4..b006dea6 100755
--- a/engine/movie/evolution.asm
+++ b/engine/movie/evolution.asm
@@ -13,13 +13,13 @@ EvolveMon:
 	ld [wNewSoundID], a
 	call PlaySound
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	ld a, SFX_TINK
 	call PlaySound
 	call Delay3
 	xor a
-	ld [hAutoBGTransferEnabled], a
-	ld [hTilesetType], a
+	ldh [hAutoBGTransferEnabled], a
+	ldh [hTilesetType], a
 	ld a, [wEvoOldSpecies]
 	ld [wWholeScreenPaletteMonSpecies], a
 	ld c, 0
@@ -37,7 +37,7 @@ EvolveMon:
 	ld [wd0b5], a
 	call Evolution_LoadPic
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	ld a, [wEvoOldSpecies]
 	call PlayCry
 	call WaitForSoundToFinish
@@ -117,7 +117,7 @@ Evolution_BackAndForthAnim:
 Evolution_ChangeMonPic:
 	push bc
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	coord hl, 7, 2
 	lb bc, 7, 7
 	ld de, SCREEN_WIDTH - 7
@@ -134,7 +134,7 @@ Evolution_ChangeMonPic:
 	dec b
 	jr nz, .loop
 	ld a, 1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call Delay3
 	pop bc
 	ret
@@ -143,7 +143,7 @@ Evolution_CheckForCancel:
 	call DelayFrame
 	push bc
 	call JoypadLowSensitivity
-	ld a, [hJoy5]
+	ldh a, [hJoy5]
 	pop bc
 	and B_BUTTON
 	jr nz, .pressedB
diff --git a/engine/movie/gamefreak.asm b/engine/movie/gamefreak.asm
index 78e48384..d3b5eb88 100755
--- a/engine/movie/gamefreak.asm
+++ b/engine/movie/gamefreak.asm
@@ -1,8 +1,8 @@
 LoadShootingStarGraphics:
 	ld a, $f9
-	ld [rOBP0], a
+	ldh [rOBP0], a
 	ld a, $a4
-	ld [rOBP1], a
+	ldh [rOBP1], a
 	ld de, AnimationTileset2 + $30 ; star tile (top left quadrant)
 	ld hl, vChars1 + $200
 	lb bc, BANK(AnimationTileset2), $01
@@ -201,9 +201,9 @@ MoveDownSmallStars:
 	jr nz, .innerLoop
 ; Toggle the palette so that the lower star in the small stars tile blinks in
 ; and out.
-	ld a, [rOBP1]
+	ldh a, [rOBP1]
 	xor %10100000
-	ld [rOBP1], a
+	ldh [rOBP1], a
 
 	ld c, 3
 	call CheckForUserInterruption
diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm
index f0553eb6..355a3f4f 100755
--- a/engine/movie/hall_of_fame.asm
+++ b/engine/movie/hall_of_fame.asm
@@ -19,12 +19,12 @@ AnimateHallOfFame:
 	call FillMemory
 	xor a
 	ld [wUpdateSpritesEnabled], a
-	ld [hTilesetType], a
+	ldh [hTilesetType], a
 	ld [wSpriteFlipped], a
 	ld [wLetterPrintingDelayFlags], a ; no delay
 	ld [wHoFMonOrPlayer], a ; mon
 	inc a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	ld hl, wNumHoFTeams
 	ld a, [hl]
 	inc a
@@ -32,7 +32,7 @@ AnimateHallOfFame:
 	inc [hl]
 .skipInc
 	ld a, $90
-	ld [hWY], a
+	ldh [hWY], a
 	ld c, BANK(Music_HallOfFame)
 	ld a, MUSIC_HALL_OF_FAME
 	call PlayMusic
@@ -86,7 +86,7 @@ AnimateHallOfFame:
 	call HoFDisplayPlayerStats
 	call HoFFadeOutScreenAndMusic
 	xor a
-	ld [hWY], a
+	ldh [hWY], a
 	ld hl, rLCDC
 	res 3, [hl]
 	ret
@@ -97,9 +97,9 @@ HallOfFameText:
 HoFShowMonOrPlayer:
 	call ClearScreen
 	ld a, $d0
-	ld [hSCY], a
+	ldh [hSCY], a
 	ld a, $c0
-	ld [hSCX], a
+	ldh [hSCX], a
 	ld a, [wHoFMonSpecies]
 	ld [wcf91], a
 	ld [wd0b5], a
@@ -121,7 +121,7 @@ HoFShowMonOrPlayer:
 	ld c, 0
 	call RunPaletteCommand
 	ld a, %11100100
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld c, $31 ; back pic
 	call HoFLoadMonPlayerPicTileIDs
 	ld d, $a0
@@ -133,7 +133,7 @@ HoFShowMonOrPlayer:
 .next2
 	call .ScrollPic ; scroll back pic left
 	xor a
-	ld [hSCY], a
+	ldh [hSCY], a
 	ld c, a ; front pic
 	call HoFLoadMonPlayerPicTileIDs
 	ld d, 0
@@ -142,9 +142,9 @@ HoFShowMonOrPlayer:
 
 .ScrollPic
 	call DelayFrame
-	ld a, [hSCX]
+	ldh a, [hSCX]
 	add e
-	ld [hSCX], a
+	ldh [hSCX], a
 	cp d
 	jr nz, .ScrollPic
 	ret
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 21f1a885..1aba3408 100755
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -12,15 +12,15 @@ const_value = 3
 
 PlayIntro:
 	xor a
-	ld [hJoyHeld], a
+	ldh [hJoyHeld], a
 	inc a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call PlayShootingStar
 	call PlayIntroScene
 	call GBFadeOutToWhite
 	xor a
-	ld [hSCX], a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hSCX], a
+	ldh [hAutoBGTransferEnabled], a
 	call ClearSprites
 	call DelayFrame
 	ret
@@ -29,11 +29,11 @@ PlayIntroScene:
 	ld b, SET_PAL_NIDORINO_INTRO
 	call RunPaletteCommand
 	ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE
-	ld [rBGP], a
-	ld [rOBP0], a
-	ld [rOBP1], a
+	ldh [rBGP], a
+	ldh [rOBP0], a
+	ldh [rOBP1], a
 	xor a
-	ld [hSCX], a
+	ldh [hSCX], a
 	ld b, GENGAR_INTRO_TILES1
 	call IntroCopyTiles
 	ld a, 0
@@ -245,7 +245,7 @@ IntroMoveMon:
 	cp MOVE_GENGAR_LEFT
 	jr z, .moveGengarLeft
 ; move Gengar right
-	ld a, [hSCX]
+	ldh a, [hSCX]
 	dec a
 	dec a
 	jr .next
@@ -259,11 +259,11 @@ IntroMoveMon:
 	call UpdateIntroNidorinoOAM
 	pop de
 .moveGengarLeft
-	ld a, [hSCX]
+	ldh a, [hSCX]
 	inc a
 	inc a
 .next
-	ld [hSCX], a
+	ldh [hSCX], a
 	push de
 	ld c, 2
 	call CheckForUserInterruption
@@ -313,7 +313,7 @@ PlayShootingStar:
 	call RunPaletteCommand
 	callba LoadCopyrightAndTextBoxTiles
 	ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld c, 180
 	call DelayFrames
 	call ClearScreen
diff --git a/engine/movie/oak_speech/init_player_data.asm b/engine/movie/oak_speech/init_player_data.asm
index c576e65a..bd181bbd 100644
--- a/engine/movie/oak_speech/init_player_data.asm
+++ b/engine/movie/oak_speech/init_player_data.asm
@@ -2,11 +2,11 @@ InitPlayerData:
 InitPlayerData2:
 
 	call Random
-	ld a, [hRandomSub]
+	ldh a, [hRandomSub]
 	ld [wPlayerID], a
 
 	call Random
-	ld a, [hRandomAdd]
+	ldh a, [hRandomAdd]
 	ld [wPlayerID + 1], a
 
 	ld a, $ff
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm
index 0dd0c2dc..2328e3ab 100755
--- a/engine/movie/oak_speech/oak_speech.asm
+++ b/engine/movie/oak_speech/oak_speech.asm
@@ -52,7 +52,7 @@ OakSpeech:
 	ld [wDestinationMap], a
 	call SpecialWarpIn
 	xor a
-	ld [hTilesetType], a
+	ldh [hTilesetType], a
 	ld a, [wd732]
 	bit 1, a ; possibly a debug mode bit
 	jp nz, .skipChoosingNames
@@ -104,12 +104,12 @@ OakSpeech:
 	ld hl, OakSpeechText3
 	call PrintText
 .next
-	ld a, [hLoadedROMBank]
+	ldh a, [hLoadedROMBank]
 	push af
 	ld a, SFX_SHRINK
 	call PlaySound
 	pop af
-	ld [hLoadedROMBank], a
+	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
 	ld c, 4
 	call DelayFrames
@@ -126,7 +126,7 @@ OakSpeech:
 	lb bc, BANK(ShrinkPic2), $00
 	call IntroDisplayPicCenteredOrUpperRight
 	call ResetPlayerSpriteData
-	ld a, [hLoadedROMBank]
+	ldh a, [hLoadedROMBank]
 	push af
 	ld a, BANK(Music_PalletTown)
 	ld [wAudioROMBank], a
@@ -137,7 +137,7 @@ OakSpeech:
 	ld [wNewSoundID], a
 	call PlaySound
 	pop af
-	ld [hLoadedROMBank], a
+	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
 	ld c, 20
 	call DelayFrames
@@ -175,7 +175,7 @@ FadeInIntroPic:
 	ld b, 6
 .next
 	ld a, [hli]
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld c, 10
 	call DelayFrames
 	dec b
@@ -192,18 +192,18 @@ IntroFadePalettes:
 
 MovePicLeft:
 	ld a, 119
-	ld [rWX], a
+	ldh [rWX], a
 	call DelayFrame
 
 	ld a, %11100100
-	ld [rBGP], a
+	ldh [rBGP], a
 .next
 	call DelayFrame
-	ld a, [rWX]
+	ldh a, [rWX]
 	sub 8
 	cp $FF
 	ret z
-	ld [rWX], a
+	ldh [rWX], a
 	jr .next
 
 DisplayPicCenteredOrUpperRight:
@@ -229,5 +229,5 @@ IntroDisplayPicCenteredOrUpperRight:
 	coord hl, 6, 4
 .next
 	xor a
-	ld [hStartTileID], a
+	ldh [hStartTileID], a
 	predef_jump CopyUncompressedPicToTilemap
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index 743d0d13..5ee0a871 100755
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -90,13 +90,13 @@ OakSpeechSlidePicCommon:
 	push hl
 	push de
 	push bc
-	ld [hSlideDirection], a
+	ldh [hSlideDirection], a
 	ld a, d
-	ld [hSlideAmount], a
+	ldh [hSlideAmount], a
 	ld a, e
-	ld [hSlidingRegionSize], a
+	ldh [hSlidingRegionSize], a
 	ld c, a
-	ld a, [hSlideDirection]
+	ldh a, [hSlideDirection]
 	and a
 	jr nz, .next
 ; If sliding right, point hl to the end of the pic's tiles.
@@ -107,8 +107,8 @@ OakSpeechSlidePicCommon:
 	ld e, l
 .loop
 	xor a
-	ld [hAutoBGTransferEnabled], a
-	ld a, [hSlideDirection]
+	ldh [hAutoBGTransferEnabled], a
+	ldh a, [hSlideDirection]
 	and a
 	jr nz, .slideLeft
 ; sliding right
@@ -123,7 +123,7 @@ OakSpeechSlidePicCommon:
 .next2
 	dec c
 	jr nz, .loop
-	ld a, [hSlideDirection]
+	ldh a, [hSlideDirection]
 	and a
 	jr z, .next3
 ; If sliding left, we need to zero the last tile in the pic (there is no need
@@ -134,13 +134,13 @@ OakSpeechSlidePicCommon:
 	ld [hl], a
 .next3
 	ld a, 1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call Delay3
-	ld a, [hSlidingRegionSize]
+	ldh a, [hSlidingRegionSize]
 	ld c, a
 	ld h, d
 	ld l, e
-	ld a, [hSlideDirection]
+	ldh a, [hSlideDirection]
 	and a
 	jr nz, .slideLeft2
 	inc hl
@@ -150,9 +150,9 @@ OakSpeechSlidePicCommon:
 .next4
 	ld d, h
 	ld e, l
-	ld a, [hSlideAmount]
+	ldh a, [hSlideAmount]
 	dec a
-	ld [hSlideAmount], a
+	ldh [hSlideAmount], a
 	jr nz, .loop
 	pop bc
 	pop de
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 5ee9b77f..62eb37d0 100755
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -11,7 +11,7 @@ SetDefaultNamesBeforeTitlescreen::
 	ld de, wRivalName
 	call CopyFixedLengthText
 	xor a
-	ld [hWY], a
+	ldh [hWY], a
 	ld [wLetterPrintingDelayFlags], a
 	ld hl, wd732
 	ld [hli], a
@@ -24,14 +24,14 @@ SetDefaultNamesBeforeTitlescreen::
 DisplayTitleScreen:
 	call GBPalWhiteOut
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	xor a
-	ld [hTilesetType], a
-	ld [hSCX], a
+	ldh [hTilesetType], a
+	ldh [hSCX], a
 	ld a, $40
-	ld [hSCY], a
+	ldh [hSCY], a
 	ld a, $90
-	ld [hWY], a
+	ldh [hWY], a
 	call ClearScreen
 	call DisableLCD
 	call LoadFontTilePatterns
@@ -130,7 +130,7 @@ ENDC
 	call TitleScreenCopyTileMapToVRAM
 	call SaveScreenTilesToBuffer1
 	ld a, $40
-	ld [hWY], a
+	ldh [hWY], a
 	call LoadScreenTilesFromBuffer2
 	ld a, vBGMap0 / $100
 	call TitleScreenCopyTileMapToVRAM
@@ -138,7 +138,7 @@ ENDC
 	call RunPaletteCommand
 	call GBPalNormal
 	ld a, %11100100
-	ld [rOBP0], a
+	ldh [rOBP0], a
 
 ; make pokemon logo bounce up and down
 	ld bc, hSCY ; background scroll Y
@@ -190,7 +190,7 @@ ENDC
 ; scroll game version in from the right
 	call PrintGameVersionOnTitleScreen
 	ld a, SCREEN_HEIGHT_PX
-	ld [hWY], a
+	ldh [hWY], a
 	ld d, 144
 .scrollTitleScreenGameVersionLoop
 	ld h, d
@@ -237,9 +237,9 @@ ENDC
 	call GBPalWhiteOutWithDelay3
 	call ClearSprites
 	xor a
-	ld [hWY], a
+	ldh [hWY], a
 	inc a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call ClearScreen
 	ld a, vBGMap0 / $100
 	call TitleScreenCopyTileMapToVRAM
@@ -247,7 +247,7 @@ ENDC
 	call TitleScreenCopyTileMapToVRAM
 	call Delay3
 	call LoadGBPal
-	ld a, [hJoyHeld]
+	ldh a, [hJoyHeld]
 	ld b, a
 	and D_UP | SELECT | B_BUTTON
 	cp D_UP | SELECT | B_BUTTON
@@ -280,7 +280,7 @@ TitleScreenPickNewMon:
 	call LoadTitleMonSprite
 
 	ld a, $90
-	ld [hWY], a
+	ldh [hWY], a
 	ld d, 1 ; scroll out
 	callba TitleScroll
 	ret
@@ -289,20 +289,20 @@ TitleScreenScrollInMon:
 	ld d, 0 ; scroll in
 	callba TitleScroll
 	xor a
-	ld [hWY], a
+	ldh [hWY], a
 	ret
 
 ScrollTitleScreenGameVersion:
 .wait
-	ld a, [rLY]
+	ldh a, [rLY]
 	cp l
 	jr nz, .wait
 
 	ld a, h
-	ld [rSCX], a
+	ldh [rSCX], a
 
 .wait2
-	ld a, [rLY]
+	ldh a, [rLY]
 	cp h
 	jr z, .wait2
 	ret
@@ -358,12 +358,12 @@ LoadTitleMonSprite:
 	jp LoadFrontSpriteByMonIndex
 
 TitleScreenCopyTileMapToVRAM:
-	ld [hAutoBGTransferDest + 1], a
+	ldh [hAutoBGTransferDest + 1], a
 	jp Delay3
 
 LoadCopyrightAndTextBoxTiles:
 	xor a
-	ld [hWY], a
+	ldh [hWY], a
 	call ClearScreen
 	call LoadTextBoxTilePatterns
 
diff --git a/engine/movie/title2.asm b/engine/movie/title2.asm
index 2346fcc5..315cf6b5 100755
--- a/engine/movie/title2.asm
+++ b/engine/movie/title2.asm
@@ -69,15 +69,15 @@ _TitleScroll:
 
 .ScrollBetween:
 .wait
-	ld a, [rLY] ; rLY
+	ldh a, [rLY] ; rLY
 	cp l
 	jr nz, .wait
 
 	ld a, h
-	ld [rSCX], a
+	ldh [rSCX], a
 
 .wait2
-	ld a, [rLY] ; rLY
+	ldh a, [rLY] ; rLY
 	cp h
 	jr z, .wait2
 	ret
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index 8b596e5e..c8005b93 100755
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -20,14 +20,14 @@ ExternalClockTradeAnim:
 TradeAnimCommon:
 	ld a, [wOptions]
 	push af
-	ld a, [hSCY]
+	ldh a, [hSCY]
 	push af
-	ld a, [hSCX]
+	ldh a, [hSCX]
 	push af
 	xor a
 	ld [wOptions], a
-	ld [hSCY], a
-	ld [hSCX], a
+	ldh [hSCY], a
+	ldh [hSCX], a
 	push de
 .loop
 	pop de
@@ -49,9 +49,9 @@ TradeAnimCommon:
 	jp hl ; call trade func, which will return to the top of the loop
 .done
 	pop af
-	ld [hSCX], a
+	ldh [hSCX], a
 	pop af
-	ld [hSCY], a
+	ldh [hSCY], a
 	pop af
 	ld [wOptions], a
 	ret
@@ -137,10 +137,10 @@ Trade_Delay100:
 
 Trade_CopyTileMapToVRAM:
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call Delay3
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	ret
 
 Trade_Delay80:
@@ -181,10 +181,10 @@ LoadTradingGFXAndMonNames:
 	jr z, .next
 	ld a, $f0 ; SGB OBP0
 .next
-	ld [rOBP0], a
+	ldh [rOBP0], a
 	call EnableLCD
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	ld a, [wTradedPlayerMonSpecies]
 	ld [wd11e], a
 	call GetMonName
@@ -198,7 +198,7 @@ LoadTradingGFXAndMonNames:
 
 Trade_LoadMonPartySpriteGfx:
 	ld a, %11010000
-	ld [rOBP1], a
+	ldh [rOBP1], a
 	jpba LoadMonPartySpriteGfx
 
 Trade_SwapNames:
@@ -224,14 +224,14 @@ Trade_Cleanup:
 
 Trade_ShowPlayerMon:
 	ld a, %10101011
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	ld a, $50
-	ld [hWY], a
+	ldh [hWY], a
 	ld a, $86
-	ld [rWX], a
-	ld [hSCX], a
+	ldh [rWX], a
+	ldh [hSCX], a
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	coord hl, 4, 0
 	ld b, 6
 	ld c, 10
@@ -247,8 +247,8 @@ Trade_ShowPlayerMon:
 	push af
 	call DelayFrame
 	pop af
-	ld [rWX], a
-	ld [hSCX], a
+	ldh [rWX], a
+	ldh [hSCX], a
 	dec a
 	dec a
 	and a
@@ -261,7 +261,7 @@ Trade_ShowPlayerMon:
 	ld a, [wTradedPlayerMonSpecies]
 	call PlayCry
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	ret
 
 Trade_DrawOpenEndOfLinkCable:
@@ -277,10 +277,10 @@ Trade_DrawOpenEndOfLinkCable:
 	call Trade_CopyCableTilesOffScreen
 
 	ld a, $a0
-	ld [hSCX], a
+	ldh [hSCX], a
 	call DelayFrame
 	ld a, %10001011
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	coord hl, 6, 2
 	ld b, $7 ; open end of link cable tile ID list index
 	call CopyTileIDsFromList_ZeroBaseTileID
@@ -289,9 +289,9 @@ Trade_DrawOpenEndOfLinkCable:
 	call PlaySound
 	ld c, 20
 .loop
-	ld a, [hSCX]
+	ldh a, [hSCX]
 	add 4
-	ld [hSCX], a
+	ldh [hSCX], a
 	dec c
 	jr nz, .loop
 	ret
@@ -302,7 +302,7 @@ Trade_AnimateBallEnteringLinkCable:
 	ld c, 10
 	call DelayFrames
 	ld a, %11100100
-	ld [rOBP0], a
+	ldh [rOBP0], a
 	xor a
 	ld [wLinkCableAnimBulgeToggle], a
 	lb bc, $20, $60
@@ -336,13 +336,13 @@ Trade_AnimateBallEnteringLinkCable:
 .ballSpriteReachedEdgeOfScreen
 	call ClearSprites
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call ClearScreen
 	ld b, $98
 	call CopyScreenTileBufferToVRAM
 	call Delay3
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	ret
 
 Trade_BallInsideLinkCableOAM:
@@ -360,13 +360,13 @@ Trade_ShowEnemyMon:
 	call Trade_PrintEnemyMonInfoText
 	call Trade_CopyTileMapToVRAM
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	ld a, [wTradedEnemyMonSpecies]
 	call Trade_LoadMonSprite
 	ld a, TRADE_BALL_POOF_ANIM
 	call Trade_ShowAnimation
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	ld a, [wTradedEnemyMonSpecies]
 	call PlayCry
 	call Trade_Delay100
@@ -381,7 +381,7 @@ Trade_AnimLeftToRight:
 	ld a, $1
 	ld [wTradedMonMovingRight], a
 	ld a, %11100100
-	ld [rOBP0], a
+	ldh [rOBP0], a
 	ld a, $54
 	ld [wBaseCoordX], a
 	ld a, $1c
@@ -397,7 +397,7 @@ Trade_AnimLeftToRight:
 	ld b, $6
 	call Trade_AnimMonMoveHorizontal
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call Trade_DrawCableAcrossScreen
 	ld b, $4
 	call Trade_AnimMonMoveHorizontal
@@ -405,7 +405,7 @@ Trade_AnimLeftToRight:
 	ld b, $6
 	call Trade_AnimMonMoveHorizontal
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call Trade_AnimMonMoveVertical
 	jp ClearSprites
 
@@ -430,7 +430,7 @@ Trade_AnimRightToLeft:
 	ld b, $6
 	call Trade_AnimMonMoveHorizontal
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call Trade_DrawCableAcrossScreen
 	ld b, $4
 	call Trade_AnimMonMoveHorizontal
@@ -438,24 +438,24 @@ Trade_AnimRightToLeft:
 	ld b, $6
 	call Trade_AnimMonMoveHorizontal
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	jp ClearSprites
 
 Trade_InitGameboyTransferGfx:
 ; Initialises the graphics for showing a mon moving between gameboys.
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call ClearScreen
 	xor a
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call Trade_LoadMonPartySpriteGfx
 	call DelayFrame
 	ld a, %10101011
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	xor a
-	ld [hSCX], a
+	ldh [hSCX], a
 	ld a, $90
-	ld [hWY], a
+	ldh [hWY], a
 	ret
 
 Trade_DrawLeftGameboy:
@@ -555,11 +555,11 @@ Trade_CopyCableTilesOffScreen:
 	call CopyToRedrawRowOrColumnSrcTiles
 	pop hl
 	ld a, h
-	ld [hRedrawRowOrColumnDest + 1], a
+	ldh [hRedrawRowOrColumnDest + 1], a
 	ld a, l
-	ld [hRedrawRowOrColumnDest], a
+	ldh [hRedrawRowOrColumnDest], a
 	ld a, REDRAW_ROW
-	ld [hRedrawRowOrColumnMode], a
+	ldh [hRedrawRowOrColumnMode], a
 	ld c, 10
 	jp DelayFrames
 
@@ -574,14 +574,14 @@ Trade_AnimMonMoveHorizontal:
 	dec a
 	jr z, .movingRight
 ; moving left
-	ld a, [hSCX]
+	ldh a, [hSCX]
 	sub $2
 	jr .next
 .movingRight
-	ld a, [hSCX]
+	ldh a, [hSCX]
 	add $2
 .next
-	ld [hSCX], a
+	ldh [hSCX], a
 	call DelayFrame
 	dec d
 	jr nz, .scrollLoop
@@ -596,9 +596,9 @@ Trade_AnimCircledMon:
 	push de
 	push bc
 	push hl
-	ld a, [rBGP]
+	ldh a, [rBGP]
 	xor $3c ; make link cable flash
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld hl, wOAMBuffer + $02
 	ld de, $4
 	ld c, $14
@@ -731,9 +731,9 @@ Trade_LoadMonSprite:
 	ld b, SET_PAL_POKEMON_WHOLE_SCREEN
 	ld c, 0
 	call RunPaletteCommand
-	ld a, [hAutoBGTransferEnabled]
+	ldh a, [hAutoBGTransferEnabled]
 	xor $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call GetMonHeader
 	coord hl, 7, 2
 	call LoadFlippedFrontSpriteByMonIndex
@@ -743,16 +743,16 @@ Trade_LoadMonSprite:
 Trade_ShowClearedWindow:
 ; clears the window and covers the BG entirely with the window
 	ld a, $1
-	ld [hAutoBGTransferEnabled], a
+	ldh [hAutoBGTransferEnabled], a
 	call ClearScreen
 	ld a, %11100011
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	ld a, $7
-	ld [rWX], a
+	ldh [rWX], a
 	xor a
-	ld [hWY], a
+	ldh [hWY], a
 	ld a, $90
-	ld [hSCX], a
+	ldh [hSCX], a
 	ret
 
 Trade_SlideTextBoxOffScreen:
@@ -764,17 +764,17 @@ Trade_SlideTextBoxOffScreen:
 	call DelayFrames
 .loop
 	call DelayFrame
-	ld a, [rWX]
+	ldh a, [rWX]
 	inc a
 	inc a
-	ld [rWX], a
+	ldh [rWX], a
 	cp $a1
 	jr nz, .loop
 	call Trade_ClearTileMap
 	ld c, 10
 	call DelayFrames
 	ld a, $7
-	ld [rWX], a
+	ldh [rWX], a
 	ret
 
 PrintTradeWentToText: