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/Route8Gate.asm | |
| parent | Merge pull request #262 from Rangi42/master (diff) | |
| parent | Move all code out of home.asm into home/ (diff) | |
| download | pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.tar.gz pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.tar.xz pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.zip | |
Merge pull request #263 from Rangi42/master
Syncing style with pokecrystal
Diffstat (limited to 'scripts/Route8Gate.asm')
| -rwxr-xr-x | scripts/Route8Gate.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/Route8Gate.asm b/scripts/Route8Gate.asm index d3003c4d..9ddaf601 100755 --- a/scripts/Route8Gate.asm +++ b/scripts/Route8Gate.asm @@ -30,13 +30,13 @@ Route8GateScript0: ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a xor a - ld [hJoyHeld], a - callba RemoveGuardDrink - ld a, [hItemToRemoveID] + ldh [hJoyHeld], a + farcall RemoveGuardDrink + ldh a, [hItemToRemoveID] and a jr nz, .asm_1e220 ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Route8GateScript_1e1d7 ld a, $1 @@ -46,7 +46,7 @@ Route8GateScript0: ld hl, wd728 set 6, [hl] ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID CoordsData_1e22c: |