Use constants for the starter mons

10 files changed, 35 insertions, 32 deletions

diff --git a/constants.asm b/constants.asm
index 9c386c81..7c51afcf 100644
--- a/constants.asm
+++ b/constants.asm
@@ -28,4 +28,4 @@ INCLUDE "constants/connection_constants.asm"
 INCLUDE "constants/credits_constants.asm"
 INCLUDE "constants/music_constants.asm"
 INCLUDE "constants/tilesets.asm"
-
+INCLUDE "constants/starter_mons.asm"
diff --git a/constants/starter_mons.asm b/constants/starter_mons.asm
new file mode 100755
index 00000000..16de35d4
--- /dev/null
+++ b/constants/starter_mons.asm
@@ -0,0 +1,3 @@
+STARTER1 EQU CHARMANDER
+STARTER2 EQU SQUIRTLE
+STARTER3 EQU BULBASAUR
diff --git a/main.asm b/main.asm
index 946fe4b8..8c55a917 100755
--- a/main.asm
+++ b/main.asm
@@ -30086,11 +30086,11 @@ TitleBallYTable: ; 372a0 (d:72a0)
 Func_372ac: ; 372ac (d:72ac)
 ; Animate the TitleBall if a starter just got scrolled out.
 	ld a, [wWhichTrade] ; $cd3d
-	cp CHARMANDER
+	cp STARTER1
 	jr z, .ok
-	cp SQUIRTLE
+	cp STARTER2
 	jr z, .ok
-	cp BULBASAUR
+	cp STARTER3
 	ret nz
 .ok
 	ld e, 1 ; animate titleball
@@ -32157,10 +32157,10 @@ ReadTrainer: ; 39c53 (e:5c53)
 
 ; starter
 	ld a,[W_RIVALSTARTER]
-	cp BULBASAUR
+	cp STARTER3
 	ld b,MEGA_DRAIN
 	jr z,.GiveStarterMove
-	cp CHARMANDER
+	cp STARTER1
 	ld b,FIRE_BLAST
 	jr z,.GiveStarterMove
 	ld b,BLIZZARD ; must be squirtle
diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm
index 86e353b1..61157bbb 100755
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@@ -141,12 +141,12 @@ CeruleanCityScript1: ; 19567 (6:5567)
 
 	; select which team to use during the encounter
 	ld a, [W_RIVALSTARTER]
-	cp SQUIRTLE
+	cp STARTER2
 	jr nz, .NotSquirtle ; 0x19592 $4
 	ld a, $7
 	jr .done
 .NotSquirtle
-	cp BULBASAUR
+	cp STARTER3
 	jr nz, .Charmander ; 0x1959a $4
 	ld a, $8
 	jr .done
diff --git a/scripts/gary.asm b/scripts/gary.asm
index 48f7d950..dc7b1252 100755
--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@@ -69,12 +69,12 @@ GaryScript2: ; 75f6a (1d:5f6a)
 
 	; select which team to use during the encounter
 	ld a, [W_RIVALSTARTER]
-	cp SQUIRTLE
+	cp STARTER2
 	jr nz, .NotSquirtle ; 0x75f9f $4
 	ld a, $1
 	jr .done
 .NotSquirtle
-	cp BULBASAUR
+	cp STARTER3
 	jr nz, .Charmander ; 0x75fa7 $4
 	ld a, $2
 	jr .done
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index 427b1aa5..83815f2d 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -196,9 +196,9 @@ OaksLabScript7: ; 1cc72 (7:4c72)
 
 OaksLabScript8: ; 1cc80 (7:4c80)
 	ld a, [W_PLAYERSTARTER]
-	cp CHARMANDER
+	cp STARTER1
 	jr z, .Charmander ; 0x1cc85 $6
-	cp SQUIRTLE
+	cp STARTER2
 	jr z, .Squirtle ; 0x1cc89 $1d
 	jr .Bulbasaur ; 0x1cc8b $38
 .Charmander
@@ -366,12 +366,12 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
 	ld a, SONY1 + $C8
 	ld [W_CUROPPONENT], a
 	ld a, [W_RIVALSTARTER]
-	cp SQUIRTLE
+	cp STARTER2
 	jr nz, .NotSquirtle ; 0x1cdc9 $4
 	ld a, $1
 	jr .done ; 0x1cdcd $a
 .NotSquirtle
-	cp BULBASAUR
+	cp STARTER3
 	jr nz, .Charmander ; 0x1cdd1 $4
 	ld a, $2
 	jr .done ; 0x1cdd5 $2
@@ -783,33 +783,33 @@ OaksLabText41: ; 1d0fd (7:50fd)
 OaksLabText29: ; 1d102 (7:5102)
 OaksLabText2: ; 1d102 (7:5102)
 	db $8
-	ld a, SQUIRTLE
+	ld a, STARTER2
 	ld [$cd3d], a
 	ld a, $3
 	ld [$cd3e], a
-	ld a, CHARMANDER
+	ld a, STARTER1
 	ld b, $2
 	jr OaksLabScript_1d133 ; 0x1d111 $20
 
 OaksLabText30: ; 1d113 (7:5113)
 OaksLabText3: ; 1d113 (7:5113)
 	db $8
-	ld a, BULBASAUR
+	ld a, STARTER3
 	ld [$cd3d], a
 	ld a, $4
 	ld [$cd3e], a
-	ld a, SQUIRTLE
+	ld a, STARTER2
 	ld b, $3
 	jr OaksLabScript_1d133 ; 0x1d122 $f
 
 OaksLabText31: ; 1d124 (7:5124)
 OaksLabText4: ; 1d124 (7:5124)
 	db $8
-	ld a, CHARMANDER
+	ld a, STARTER1
 	ld [$cd3d], a
 	ld a, $2
 	ld [$cd3e], a
-	ld a, BULBASAUR
+	ld a, STARTER3
 	ld b, $4
 
 OaksLabScript_1d133: ; 1d133 (7:5133)
diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm
index dbbc8e63..4554413a 100755
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@@ -137,12 +137,12 @@ PokemonTower2Text1: ; 605df (18:45df)
 
 	; select which team to use during the encounter
 	ld a, [W_RIVALSTARTER]
-	cp SQUIRTLE
+	cp STARTER2
 	jr nz, .NotSquirtle ; 0x6060f
 	ld a, $4
 	jr .done
 .NotSquirtle ; 0x60615
-	cp BULBASAUR
+	cp STARTER3
 	jr nz, .Charmander ; 0x60617
 	ld a, $5
 	jr .done
diff --git a/scripts/route22.asm b/scripts/route22.asm
index 28918b5c..75d10595 100755
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -140,9 +140,9 @@ Route22Script1: ; 50f62 (14:4f62)
 
 StarterMons_50faf: ; 50faf (14:4faf)
 ; starter the rival picked, rival trainer number
-	db SQUIRTLE,$04
-	db BULBASAUR,$05
-	db CHARMANDER,$06
+	db STARTER2,$04
+	db STARTER3,$05
+	db STARTER1,$06
 
 Route22Script2: ; 50fb5 (14:4fb5)
 	ld a, [$d057]
@@ -283,9 +283,9 @@ Route22Script4: ; 51087 (14:5087)
 	ret
 
 StarterMons_510d9: ; 510d9 (14:50d9)
-	db SQUIRTLE,$0a
-	db BULBASAUR,$0b
-	db CHARMANDER,$0c
+	db STARTER2,$0a
+	db STARTER3,$0b
+	db STARTER1,$0c
 
 Route22Script5: ; 510df (14:50df)
 	ld a, [W_ISINBATTLE] ; $d057
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index 5691ad8a..d1c1bdb6 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -184,12 +184,12 @@ SilphCo7Script3: ; 51c82 (14:5c82)
 	ld a, SONY2 + $c8
 	ld [W_CUROPPONENT], a ; $d059
 	ld a, [W_RIVALSTARTER] ; $d715
-	cp SQUIRTLE
+	cp STARTER2
 	jr nz, .asm_51cb6
 	ld a, $7
 	jr .asm_51cc0
 .asm_51cb6
-	cp BULBASAUR
+	cp STARTER3
 	jr nz, .asm_51cbe
 	ld a, $8
 	jr .asm_51cc0
diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm
index 3ff41c1d..449dab83 100755
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@@ -98,12 +98,12 @@ SSAnne2Script1: ; 61430 (18:5430)
 
 	; select which team to use during the encounter
 	ld a, [W_RIVALSTARTER]
-	cp SQUIRTLE
+	cp STARTER2
 	jr nz, .NotSquirtle ; 0x61451 $4
 	ld a, $1
 	jr .done
 .NotSquirtle
-	cp BULBASAUR
+	cp STARTER3
 	jr nz, .Charmander ; 0x61459 $4
 	ld a, $2
 	jr .done