From 613d34678b7e9da1a467ec48fff23bfa75209871 Mon Sep 17 00:00:00 2001
From: Sylvie <35663410+Rangi42@users.noreply.github.com>
Date: Wed, 18 Sep 2024 21:01:18 -0400
Subject: Split `hSpriteIndexOrTextID` into `hSpriteIndex` and `hTextID` (#462)

Also identify `wPPUpCountAndMaxPP`
---
 scripts/Route22.asm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts/Route22.asm')

diff --git a/scripts/Route22.asm b/scripts/Route22.asm
index ad02b4c7..1a2602fd 100644
--- a/scripts/Route22.asm
+++ b/scripts/Route22.asm
@@ -124,7 +124,7 @@ Route22Rival1StartBattleScript:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, TEXT_ROUTE22_RIVAL1
-	ldh [hSpriteIndexOrTextID], a
+	ldh [hTextID], a
 	call DisplayTextID
 	ld hl, wStatusFlags3
 	set BIT_TALKED_TO_TRAINER, [hl]
@@ -166,7 +166,7 @@ Route22Rival1AfterBattleScript:
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
 	ld a, TEXT_ROUTE22_RIVAL1
-	ldh [hSpriteIndexOrTextID], a
+	ldh [hTextID], a
 	call DisplayTextID
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
@@ -280,7 +280,7 @@ Route22Rival2StartBattleScript:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, TEXT_ROUTE22_RIVAL2
-	ldh [hSpriteIndexOrTextID], a
+	ldh [hTextID], a
 	call DisplayTextID
 	ld hl, wStatusFlags3
 	set BIT_TALKED_TO_TRAINER, [hl]
@@ -325,7 +325,7 @@ Route22Rival2AfterBattleScript:
 	ld [wJoyIgnore], a
 	SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
 	ld a, TEXT_ROUTE22_RIVAL2
-	ldh [hSpriteIndexOrTextID], a
+	ldh [hTextID], a
 	call DisplayTextID
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wNewSoundID], a
-- 
cgit v1.3.1-sl0p