aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/CeladonGym.asm
diff options
context:
space:
mode:
authorSylvie <35663410+Rangi42@users.noreply.github.com>2024-09-18 21:01:18 -0400
committerGitHub <noreply@github.com>2024-09-18 21:01:18 -0400
commit613d34678b7e9da1a467ec48fff23bfa75209871 (patch)
treec21669899a90df25aaac9b4b4d213ac525d6f277 /scripts/CeladonGym.asm
parentUse correct label in get_trainer_name.asm (#461) (diff)
downloadpokeyellow-613d34678b7e9da1a467ec48fff23bfa75209871.tar.gz
pokeyellow-613d34678b7e9da1a467ec48fff23bfa75209871.tar.xz
pokeyellow-613d34678b7e9da1a467ec48fff23bfa75209871.zip
Split `hSpriteIndexOrTextID` into `hSpriteIndex` and `hTextID` (#462)
Also identify `wPPUpCountAndMaxPP`
Diffstat (limited to 'scripts/CeladonGym.asm')
-rw-r--r--scripts/CeladonGym.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm
index ea1f5053..ca7da4e5 100644
--- a/scripts/CeladonGym.asm
+++ b/scripts/CeladonGym.asm
@@ -45,20 +45,20 @@ CeladonGymErikaPostBattleScript:
CeladonGymReceiveTM21:
ld a, TEXT_CELADONGYM_RAINBOWBADGE_INFO
- ldh [hSpriteIndexOrTextID], a
+ ldh [hTextID], a
call DisplayTextID
SetEvent EVENT_BEAT_ERIKA
lb bc, TM_MEGA_DRAIN, 1
call GiveItem
jr nc, .BagFull
ld a, TEXT_CELADONGYM_RECEIVED_TM21
- ldh [hSpriteIndexOrTextID], a
+ ldh [hTextID], a
call DisplayTextID
SetEvent EVENT_GOT_TM21
jr .gymVictory
.BagFull
ld a, TEXT_CELADONGYM_TM21_NO_ROOM
- ldh [hSpriteIndexOrTextID], a
+ ldh [hTextID], a
call DisplayTextID
.gymVictory
ld hl, wObtainedBadges