aboutsummaryrefslogtreecommitdiffstats
path: root/data/wildPokemon/viridianforest.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/viridianforest.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/viridianforest.asm')
-rwxr-xr-xdata/wildPokemon/viridianforest.asm31
1 files changed, 15 insertions, 16 deletions
diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm
index 2ca828eb..bac991c5 100755
--- a/data/wildPokemon/viridianforest.asm
+++ b/data/wildPokemon/viridianforest.asm
@@ -1,7 +1,19 @@
ForestMons:
- IF !_YELLOW
+ IF DEF(_YELLOW)
+ db $19
+ db 3,CATERPIE
+ db 4,METAPOD
+ db 4,CATERPIE
+ db 5,CATERPIE
+ db 4,PIDGEY
+ db 6,PIDGEY
+ db 6,CATERPIE
+ db 6,METAPOD
+ db 8,PIDGEY
+ db 9,PIDGEOTTO
+ ELSE
db $08
- IF _RED
+ IF DEF(_RED)
db 4,WEEDLE
db 5,KAKUNA
db 3,WEEDLE
@@ -11,7 +23,7 @@ ForestMons:
db 4,METAPOD
db 3,CATERPIE
ENDC
- IF _BLUE || _GREEN
+ IF DEF(_BLUE) || DEF(_GREEN)
db 4,CATERPIE
db 5,METAPOD
db 3,CATERPIE
@@ -26,19 +38,6 @@ ForestMons:
db 5,PIKACHU
ENDC
- IF _YELLOW
- db $19
- db 3,CATERPIE
- db 4,METAPOD
- db 4,CATERPIE
- db 5,CATERPIE
- db 4,PIDGEY
- db 6,PIDGEY
- db 6,CATERPIE
- db 6,METAPOD
- db 8,PIDGEY
- db 9,PIDGEOTTO
- ENDC
db $00