aboutsummaryrefslogtreecommitdiffstats
path: root/data/wildPokemon/pokemontower6.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2014-10-17 02:42:32 -0600
committerIIMarckus <iimarckus@gmail.com>2014-10-17 02:42:32 -0600
commita3d3f8324a670aad8bf1348b65192544c8ab2d9f (patch)
treeb431eefa402d0d7106b03d701367a571216d5a74 /data/wildPokemon/pokemontower6.asm
parentMinor comment/label improvements in Cinnabar Lab. (diff)
downloadpokeyellow-a3d3f8324a670aad8bf1348b65192544c8ab2d9f.tar.gz
pokeyellow-a3d3f8324a670aad8bf1348b65192544c8ab2d9f.tar.xz
pokeyellow-a3d3f8324a670aad8bf1348b65192544c8ab2d9f.zip
Kill version.asm.
Diffstat (limited to 'data/wildPokemon/pokemontower6.asm')
-rwxr-xr-xdata/wildPokemon/pokemontower6.asm26
1 files changed, 12 insertions, 14 deletions
diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm
index abd2969a..b97e2ddd 100755
--- a/data/wildPokemon/pokemontower6.asm
+++ b/data/wildPokemon/pokemontower6.asm
@@ -1,20 +1,7 @@
TowerMons6:
db $0F
- IF !_YELLOW
- db 21,GASTLY
- db 22,GASTLY
- db 23,GASTLY
- db 24,GASTLY
- db 20,GASTLY
- db 19,GASTLY
- db 26,HAUNTER
- db 22,CUBONE
- db 24,CUBONE
- db 28,HAUNTER
- ENDC
-
- IF _YELLOW
+ IF DEF(_YELLOW)
db 22,GASTLY
db 23,GASTLY
db 24,GASTLY
@@ -25,6 +12,17 @@ TowerMons6:
db 27,GASTLY
db 22,HAUNTER
db 27,HAUNTER
+ ELSE
+ db 21,GASTLY
+ db 22,GASTLY
+ db 23,GASTLY
+ db 24,GASTLY
+ db 20,GASTLY
+ db 19,GASTLY
+ db 26,HAUNTER
+ db 22,CUBONE
+ db 24,CUBONE
+ db 28,HAUNTER
ENDC
db $00