aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/LancesRoom.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/LancesRoom.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/LancesRoom.asm')
-rw-r--r--scripts/LancesRoom.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm
index fd1401c2..31b0f240 100644
--- a/scripts/LancesRoom.asm
+++ b/scripts/LancesRoom.asm
@@ -63,7 +63,7 @@ LancesRoomDefaultScript:
cp $3 ; Is player standing next to Lance's sprite?
jr nc, .notStandingNextToLance
ld a, TEXT_LANCESROOM_LANCE
- ldh [hSpriteIndexOrTextID], a
+ ldh [hTextID], a
jp DisplayTextID
.notStandingNextToLance
cp $5 ; Is player standing on the entrance staircase?
@@ -90,7 +90,7 @@ LancesRoomLanceEndBattleScript:
cp $ff
jp z, ResetLanceScript
ld a, TEXT_LANCESROOM_LANCE
- ldh [hSpriteIndexOrTextID], a
+ ldh [hTextID], a
jp DisplayTextID
WalkToLance: