Add constants for player and rival starters

6 files changed, 13 insertions, 13 deletions

diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm
index 637482eb..67a27710 100644
--- a/engine/debug/debug_party.asm
+++ b/engine/debug/debug_party.asm
@@ -17,7 +17,7 @@ DebugTeam:
 	db SNORLAX, 80
 	db PERSIAN, 80
 	db JIGGLYPUFF, 15
-	db PIKACHU, 5
+	db STARTER_PIKACHU, 5
 	db -1 ; end
 
 DebugStart:
@@ -75,13 +75,13 @@ IF DEF(_DEBUG)
 	call DebugSetPokedexEntries
 	SetEvent EVENT_GOT_POKEDEX
 
-	; Player chose Pikachu.
+	; Rival chose Jolteon.
 	ld hl, wRivalStarter
-	ld a, 1
+	ld a, RIVAL_STARTER_JOLTEON
 	ld [hli], a
 	ld a, NUM_POKEMON
 	ld [hli], a ; hl = wUnknownDebugByte
-	ld a, PIKACHU
+	ld a, STARTER_PIKACHU
 	ld [hl], a ; hl = wPlayerStarter
 
 	; Give max money.
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index b9751e1e..c054761c 100755
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -169,7 +169,7 @@ StartMenu_Pokemon::
 	res 1, [hl]
 	jp z, .loop
 	ld a, [wcf91]
-	cp PIKACHU ; is this surfing pikachu?
+	cp STARTER_PIKACHU
 	jr z, .surfingPikachu
 	ld a, $1
 	jr .continue
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm
index 1a327def..7acbd693 100755
--- a/engine/movie/oak_speech/oak_speech.asm
+++ b/engine/movie/oak_speech/oak_speech.asm
@@ -72,7 +72,7 @@ OakSpeech:
 	call PrintText
 	call GBFadeOutToWhite
 	call ClearScreen
-	ld a, PIKACHU
+	ld a, STARTER_PIKACHU
 	ld [wd0b5], a
 	ld [wcf91], a
 	call GetMonHeader
diff --git a/engine/movie/title_rb.asm b/engine/movie/title_rb.asm
index df630b53..597684df 100755
--- a/engine/movie/title_rb.asm
+++ b/engine/movie/title_rb.asm
@@ -92,11 +92,11 @@ TitleBallYTable:
 TitleScreenAnimateBallIfStarterOut:
 ; Animate the TitleBall if a starter just got scrolled out.
 	ld a, [wTitleScreenScene]
-	cp STARTER1
+	cp CHARMANDER ; starter 1
 	jr z, .ok
-	cp STARTER2
+	cp SQUIRTLE ; starter 2
 	jr z, .ok
-	cp STARTER3
+	cp BULBASAUR ; starter 3
 	ret nz
 .ok
 	ld e, 1 ; animate titleball
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm
index 61db6e80..f4963f17 100755
--- a/engine/pikachu/pikachu_emotions.asm
+++ b/engine/pikachu/pikachu_emotions.asm
@@ -381,7 +381,7 @@ IsPlayerPikachuAsleepInParty:
 	ld a, [hl]
 	cp $ff
 	jr z, .done
-	cp PIKACHU
+	cp STARTER_PIKACHU
 	jr nz, .curMonNotStarterPikachu
 	callfar IsThisPartymonStarterPikachu
 	jr nc, .curMonNotStarterPikachu
diff --git a/engine/pikachu/pikachu_status.asm b/engine/pikachu/pikachu_status.asm
index c73d3b3f..5fc92ead 100755
--- a/engine/pikachu/pikachu_status.asm
+++ b/engine/pikachu/pikachu_status.asm
@@ -9,7 +9,7 @@ IsStarterPikachuInOurParty::
 	push hl
 	inc a
 	jr z, .noPlayerPikachu
-	cp PIKACHU + 1
+	cp STARTER_PIKACHU + 1
 	jr nz, .curMonNotPlayerPikachu
 	ld h, d
 	ld l, e
@@ -79,7 +79,7 @@ asm_fce21:
 	ld a, [wWhichPokemon]
 	call AddNTimes
 	ld a, [hl]
-	cp PIKACHU
+	cp STARTER_PIKACHU
 	jr nz, .notPlayerPikachu
 	ld bc, wPartyMon1OTID - wPartyMon1
 	add hl, bc
@@ -189,7 +189,7 @@ IsSurfingPikachuInThePlayersParty::
 	push hl
 	inc a
 	jr z, .noSurfingPlayerPikachu
-	cp PIKACHU+1
+	cp STARTER_PIKACHU + 1
 	jr nz, .curMonNotSurfingPlayerPikachu
 	ld h, d
 	ld l, e