aboutsummaryrefslogtreecommitdiffstats
path: root/data/wildPokemon/unknowndungeon2.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/unknowndungeon2.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/unknowndungeon2.asm')
-rwxr-xr-xdata/wildPokemon/unknowndungeon2.asm30
1 files changed, 14 insertions, 16 deletions
diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm
index a09c985c..9422f3a0 100755
--- a/data/wildPokemon/unknowndungeon2.asm
+++ b/data/wildPokemon/unknowndungeon2.asm
@@ -1,14 +1,25 @@
DungeonMons2:
db $0F
- IF !_YELLOW
+ IF DEF(_YELLOW)
+ db 52,GOLBAT
+ db 57,GOLBAT
+ db 50,GRAVELER
+ db 56,SANDSLASH
+ db 50,RHYHORN
+ db 60,DITTO
+ db 58,GLOOM
+ db 58,WEEPINBELL
+ db 60,RHYDON
+ db 58,RHYDON
+ ELSE
db 51,DODRIO
db 51,VENOMOTH
db 51,KADABRA
db 52,RHYDON
- IF _RED || _GREEN || (_BLUE && !_JAPAN)
+ IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
db 52,MAROWAK
ENDC
- IF (_BLUE && _JAPAN)
+ IF (DEF(_BLUE) && DEF(_JAPAN))
db 52,MAROWAK
ENDC
db 52,ELECTRODE
@@ -18,18 +29,5 @@ DungeonMons2:
db 60,DITTO
ENDC
- IF _YELLOW
- db 52,GOLBAT
- db 57,GOLBAT
- db 50,GRAVELER
- db 56,SANDSLASH
- db 50,RHYHORN
- db 60,DITTO
- db 58,GLOOM
- db 58,WEEPINBELL
- db 60,RHYDON
- db 58,RHYDON
- ENDC
-
db $00