diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-13 22:53:20 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-13 22:53:20 -0700 |
| commit | e23f34125879e680e1a6ee263cb3dbb579cc5135 (patch) | |
| tree | 2474334d0166f7889ad46689dd80b542383143e3 /predef | |
| parent | eb9fc6676cfed0460d19ce441134dbcdfce49b0d (diff) | |
Battle type constants in the wild.
Also add constants for trap and Celebi event battles.
Diffstat (limited to 'predef')
| -rw-r--r-- | predef/cgb.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm index 8d59b2326..38f4e146d 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -840,11 +840,13 @@ Function93ba: ; 93ba Function93d3: ; 93d3 ld a, [BattleType] - cp $3 + cp BATTLETYPE_TUTORIAL jr z, .asm_93e6 + ld a, [PlayerGender] bit 0, a jr z, .asm_93e6 + ld hl, Palettes_9469 jr .asm_93e9 |