diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-06 19:03:05 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-06 19:03:05 -0400 |
| commit | 772fcc7588a4e1fbe146a02b429cf64282c81dcb (patch) | |
| tree | f491fa1d38e37ab10534b3f18422e0149ad0deca /scripts/AgathasRoom.asm | |
| parent | Merge pull request #262 from Rangi42/master (diff) | |
| download | pokeyellow-772fcc7588a4e1fbe146a02b429cf64282c81dcb.tar.gz pokeyellow-772fcc7588a4e1fbe146a02b429cf64282c81dcb.tar.xz pokeyellow-772fcc7588a4e1fbe146a02b429cf64282c81dcb.zip | |
Specify the ldh instruction, don't turn ld into ldh
Diffstat (limited to 'scripts/AgathasRoom.asm')
| -rwxr-xr-x | scripts/AgathasRoom.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm index 6d304de8..b49b2a2b 100755 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm @@ -63,8 +63,8 @@ AgathaScript0: 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] @@ -74,7 +74,7 @@ AgathaScript0: jr z, AgathaScriptWalkIntoRoom .stopPlayerFromLeaving ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -110,7 +110,7 @@ AgathaScript2: cp $ff jp z, ResetAgathaScript ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wChampionsRoomCurScript], a |