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/SilphCo7F.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/SilphCo7F.asm')
| -rw-r--r-- | scripts/SilphCo7F.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index de9e689d..381eff7a 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -138,7 +138,7 @@ SilphCo7FDefaultScript: ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, TEXT_SILPHCO7F_RIVAL - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID ld a, SILPHCO7F_RIVAL ldh [hSpriteIndex], a @@ -175,7 +175,7 @@ SilphCo7FRivalStartBattleScript: xor a ld [wJoyIgnore], a ld a, TEXT_SILPHCO7F_RIVAL_WAITED_HERE - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID call Delay3 ld hl, wStatusFlags3 @@ -218,7 +218,7 @@ SilphCo7FRivalAfterBattleScript: ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, TEXT_SILPHCO7F_RIVAL_GOOD_LUCK_TO_YOU - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a |