aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/AgathasRoom.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/AgathasRoom.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/AgathasRoom.asm')
-rw-r--r--scripts/AgathasRoom.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm
index cf5254ac..0f3acc18 100644
--- a/scripts/AgathasRoom.asm
+++ b/scripts/AgathasRoom.asm
@@ -75,7 +75,7 @@ AgathasRoomDefaultScript:
jr z, AgathaScriptWalkIntoRoom
.stopPlayerFromLeaving
ld a, TEXT_AGATHASROOM_AGATHA_DONT_RUN_AWAY
- ldh [hSpriteIndexOrTextID], a
+ ldh [hTextID], a
call DisplayTextID
ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
@@ -111,7 +111,7 @@ AgathasRoomAgathaEndBattleScript:
cp $ff
jp z, ResetAgathaScript
ld a, TEXT_AGATHASROOM_AGATHA
- ldh [hSpriteIndexOrTextID], a
+ ldh [hTextID], a
call DisplayTextID
ld a, SCRIPT_CHAMPIONSROOM_PLAYER_ENTERS
ld [wChampionsRoomCurScript], a