ref: d693721f979f6045ff3dccec69b6ddd5d5f03e62
parent: 02e6e3765eb81beb2c8a518f37fdd93f6e1da170
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Wed May 21 04:48:30 EDT 2014
Use constants for the starter mons
--- a/constants.asm
+++ b/constants.asm
@@ -28,4 +28,4 @@
INCLUDE "constants/credits_constants.asm"
INCLUDE "constants/music_constants.asm"
INCLUDE "constants/tilesets.asm"
-
+INCLUDE "constants/starter_mons.asm"
--- /dev/null
+++ b/constants/starter_mons.asm
@@ -1,0 +1,3 @@
+STARTER1 EQU CHARMANDER
+STARTER2 EQU SQUIRTLE
+STARTER3 EQU BULBASAUR
--- a/main.asm
+++ b/main.asm
@@ -30086,11 +30086,11 @@
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 @@
; 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
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@@ -141,12 +141,12 @@
; 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
--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@@ -69,12 +69,12 @@
; 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
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -196,9 +196,9 @@
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 @@
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,11 +783,11 @@
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
@@ -794,11 +794,11 @@
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
@@ -805,11 +805,11 @@
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)
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@@ -137,12 +137,12 @@
; 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
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -140,9 +140,9 @@
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 @@
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
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -184,12 +184,12 @@
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
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@@ -98,12 +98,12 @@
; 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