summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-05-21 08:48:30 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-05-21 09:54:33 -0400
commitd693721f979f6045ff3dccec69b6ddd5d5f03e62 (patch)
tree741e3ccda37dee3d53bd54da62379be6fdbee53e /main.asm
parent02e6e3765eb81beb2c8a518f37fdd93f6e1da170 (diff)
Use constants for the starter mons
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm10
1 files changed, 5 insertions, 5 deletions
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