diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-09-18 21:01:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-18 21:01:18 -0400 |
| commit | 613d34678b7e9da1a467ec48fff23bfa75209871 (patch) | |
| tree | c21669899a90df25aaac9b4b4d213ac525d6f277 /scripts/PalletTown.asm | |
| parent | Use correct label in get_trainer_name.asm (#461) (diff) | |
| download | pokeyellow-613d34678b7e9da1a467ec48fff23bfa75209871.tar.gz pokeyellow-613d34678b7e9da1a467ec48fff23bfa75209871.tar.xz pokeyellow-613d34678b7e9da1a467ec48fff23bfa75209871.zip | |
Split `hSpriteIndexOrTextID` into `hSpriteIndex` and `hTextID` (#462)
Also identify `wPPUpCountAndMaxPP`
Diffstat (limited to 'scripts/PalletTown.asm')
| -rw-r--r-- | scripts/PalletTown.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index a787fcc4..14c5a840 100644 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -47,7 +47,7 @@ PalletTownOakHeyWaitScript: xor a ld [wOakWalkedToPlayer], a ld a, TEXT_PALLETTOWN_OAK - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a @@ -101,7 +101,7 @@ PalletTownOakNotSafeComeWithMeScript: ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, TEXT_PALLETTOWN_OAK - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID ; set up movement script that causes the player to follow Oak to his lab ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN |