From d693721f979f6045ff3dccec69b6ddd5d5f03e62 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Wed, 21 May 2014 08:48:30 -0400 Subject: Use constants for the starter mons --- main.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'main.asm') 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 -- cgit v1.2.3