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/SaffronGym.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/SaffronGym.asm')
| -rw-r--r-- | scripts/SaffronGym.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index 2de1081b..556cd4c5 100644 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm @@ -45,20 +45,20 @@ SaffronGymSabrinaPostBattle: SaffronGymSabrinaReceiveTM46Script: ld a, TEXT_SAFFRONGYM_SABRINA_MARSH_BADGE_INFO - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID SetEvent EVENT_BEAT_SABRINA lb bc, TM_PSYWAVE, 1 call GiveItem jr nc, .BagFull ld a, TEXT_SAFFRONGYM_SABRINA_RECEIVED_TM46 - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID SetEvent EVENT_GOT_TM46 jr .gymVictory .BagFull ld a, TEXT_SAFFRONGYM_SABRINA_TM46_NO_ROOM - ldh [hSpriteIndexOrTextID], a + ldh [hTextID], a call DisplayTextID .gymVictory ld hl, wObtainedBadges |