summaryrefslogtreecommitdiff
path: root/scripts/VermilionCity.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-07 19:48:22 -0400
committerGitHub <noreply@github.com>2020-07-07 19:48:22 -0400
commit9571c550b6a0dcb3a4f54513c881661a87271024 (patch)
treed73507228a57e4f3cece2fb93fe7df3a9439553f /scripts/VermilionCity.asm
parentc480632d5494d04f7f5f0298a31877a2293b564e (diff)
parentbbf2f51a02b2544f1bef32a5868503b474ae2fef (diff)
Merge pull request #263 from Rangi42/master
Syncing style with pokecrystal
Diffstat (limited to 'scripts/VermilionCity.asm')
-rwxr-xr-xscripts/VermilionCity.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm
index 127ee16a..9178cd65 100755
--- a/scripts/VermilionCity.asm
+++ b/scripts/VermilionCity.asm
@@ -15,7 +15,7 @@ VermilionCity_Script:
.setFirstLockTrashCanIndex
call Random
- ld a, [hRandomSub]
+ ldh a, [hRandomSub]
and $e
ld [wFirstLockTrashCanIndex], a
ret
@@ -45,10 +45,10 @@ VermilionCityScript0:
call ArePlayerCoordsInArray
ret nc
xor a
- ld [hJoyHeld], a
+ ldh [hJoyHeld], a
ld [wcf0d], a
ld a, $3
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
CheckEvent EVENT_SS_ANNE_LEFT
jr nz, .shipHasDeparted
@@ -98,7 +98,7 @@ VermilionCityScript3:
ret nz
xor a
ld [wJoyIgnore], a
- ld [hJoyHeld], a
+ ldh [hJoyHeld], a
ld a, $0
ld [wVermilionCityCurScript], a
ret