summaryrefslogtreecommitdiff
path: root/data/wildPokemon/rocktunnel2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/wildPokemon/rocktunnel2.asm')
-rwxr-xr-xdata/wildPokemon/rocktunnel2.asm31
1 files changed, 15 insertions, 16 deletions
diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm
index f158453e..0a47d984 100755
--- a/data/wildPokemon/rocktunnel2.asm
+++ b/data/wildPokemon/rocktunnel2.asm
@@ -1,15 +1,27 @@
TunnelMonsB2:
db $0F
- IF !_YELLOW
+
+ IF DEF(_YELLOW)
+ db 20,ZUBAT
+ db 17,GEODUDE
+ db 18,MACHOP
+ db 21,ZUBAT
+ db 22,ZUBAT
+ db 21,GEODUDE
+ db 20,MACHOP
+ db 14,ONIX
+ db 18,ONIX
+ db 22,ONIX
+ ELSE
db 16,ZUBAT
db 17,ZUBAT
db 17,GEODUDE
db 15,MACHOP
db 16,GEODUDE
- IF _RED || _GREEN || (_BLUE && !_JAPAN)
+ IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
db 18,ZUBAT
ENDC
- IF (_BLUE && _JAPAN)
+ IF DEF(_BLUE) && DEF(_JAPAN)
db 18,DITTO
ENDC
db 17,MACHOP
@@ -18,18 +30,5 @@ TunnelMonsB2:
db 18,GEODUDE
ENDC
- IF _YELLOW
- db 20,ZUBAT
- db 17,GEODUDE
- db 18,MACHOP
- db 21,ZUBAT
- db 22,ZUBAT
- db 21,GEODUDE
- db 20,MACHOP
- db 14,ONIX
- db 18,ONIX
- db 22,ONIX
- ENDC
-
db $00