diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-07 19:48:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 19:48:22 -0400 |
| commit | 9571c550b6a0dcb3a4f54513c881661a87271024 (patch) | |
| tree | d73507228a57e4f3cece2fb93fe7df3a9439553f /scripts/LoreleisRoom.asm | |
| parent | c480632d5494d04f7f5f0298a31877a2293b564e (diff) | |
| parent | bbf2f51a02b2544f1bef32a5868503b474ae2fef (diff) | |
Merge pull request #263 from Rangi42/master
Syncing style with pokecrystal
Diffstat (limited to 'scripts/LoreleisRoom.asm')
| -rwxr-xr-x | scripts/LoreleisRoom.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/LoreleisRoom.asm b/scripts/LoreleisRoom.asm index c03d1161..f2cdfb45 100755 --- a/scripts/LoreleisRoom.asm +++ b/scripts/LoreleisRoom.asm @@ -65,8 +65,8 @@ LoreleiScript0: call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [hJoyPressed], a - ld [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a ld a, [wCoordIndex] @@ -76,7 +76,7 @@ LoreleiScript0: jr z, LoreleiScriptWalkIntoRoom .stopPlayerFromLeaving ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -112,7 +112,7 @@ LoreleiScript2: cp $ff jp z, ResetLoreleiScript ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID LoreleisRoom_TextPointers: |