summaryrefslogtreecommitdiff
path: root/scripts/ViridianCity.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-06 19:03:05 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-06 19:03:05 -0400
commit772fcc7588a4e1fbe146a02b429cf64282c81dcb (patch)
treef491fa1d38e37ab10534b3f18422e0149ad0deca /scripts/ViridianCity.asm
parentc480632d5494d04f7f5f0298a31877a2293b564e (diff)
Specify the ldh instruction, don't turn ld into ldh
Diffstat (limited to 'scripts/ViridianCity.asm')
-rwxr-xr-xscripts/ViridianCity.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm
index 2a86374e..62d98c4c 100755
--- a/scripts/ViridianCity.asm
+++ b/scripts/ViridianCity.asm
@@ -30,10 +30,10 @@ ViridianCityScript_1900b:
cp $20
ret nz
ld a, $e
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
- ld [hJoyHeld], a
+ ldh [hJoyHeld], a
call ViridianCityScript_190cf
ld a, $3
ld [wViridianCityCurScript], a
@@ -49,10 +49,10 @@ ViridianCityScript_1903d:
cp $13
ret nz
ld a, $5
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
- ld [hJoyHeld], a
+ ldh [hJoyHeld], a
call ViridianCityScript_190cf
ld a, $3
ld [wViridianCityCurScript], a
@@ -60,13 +60,13 @@ ViridianCityScript_1903d:
ViridianCityScript1:
ld a, [wSprite03StateData1YPixels]
- ld [hSpriteScreenYCoord], a
+ ldh [hSpriteScreenYCoord], a
ld a, [wSprite03StateData1XPixels]
- ld [hSpriteScreenXCoord], a
+ ldh [hSpriteScreenXCoord], a
ld a, [wSprite03StateData2MapY]
- ld [hSpriteMapYCoord], a
+ ldh [hSpriteMapYCoord], a
ld a, [wSprite03StateData2MapX]
- ld [hSpriteMapXCoord], a
+ ldh [hSpriteMapXCoord], a
xor a
ld [wListScrollOffset], a
@@ -82,20 +82,20 @@ ViridianCityScript1:
ret
ViridianCityScript2:
- ld a, [hSpriteScreenYCoord]
+ ldh a, [hSpriteScreenYCoord]
ld [wSprite03StateData1YPixels], a
- ld a, [hSpriteScreenXCoord]
+ ldh a, [hSpriteScreenXCoord]
ld [wSprite03StateData1XPixels], a
- ld a, [hSpriteMapYCoord]
+ ldh a, [hSpriteMapYCoord]
ld [wSprite03StateData2MapY], a
- ld a, [hSpriteMapXCoord]
+ ldh a, [hSpriteMapXCoord]
ld [wSprite03StateData2MapX], a
call UpdateSprites
call Delay3
xor a
ld [wJoyIgnore], a
ld a, $f
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [wBattleType], a