aboutsummaryrefslogtreecommitdiffstats
path: root/data/wildPokemon/route7.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2016-02-12 21:10:58 -0700
committerIIMarckus <iimarckus@gmail.com>2016-02-12 21:10:58 -0700
commit757114cad28d59eacdf22f26cd175aca17cb5407 (patch)
tree9c8ad00dd63e38acd27e080fc67e80900cdc47f1 /data/wildPokemon/route7.asm
parentRemove misleading (unreferenced) labels. (diff)
downloadpokeyellow-757114cad28d59eacdf22f26cd175aca17cb5407.tar.gz
pokeyellow-757114cad28d59eacdf22f26cd175aca17cb5407.tar.xz
pokeyellow-757114cad28d59eacdf22f26cd175aca17cb5407.zip
Get rid of yellow ifdefs in wild Pokémon.
Diffstat (limited to 'data/wildPokemon/route7.asm')
-rwxr-xr-xdata/wildPokemon/route7.asm32
1 files changed, 1 insertions, 31 deletions
diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm
index 505b632b..559c98ee 100755
--- a/data/wildPokemon/route7.asm
+++ b/data/wildPokemon/route7.asm
@@ -1,6 +1,5 @@
Route7Mons:
db $0F
-
IF DEF(_RED)
db 19,PIDGEY
db 19,ODDISH
@@ -13,8 +12,7 @@ Route7Mons:
db 19,MANKEY
db 20,MANKEY
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 19,PIDGEY
db 19,BELLSPROUT
db 17,MEOWTH
@@ -26,32 +24,4 @@ Route7Mons:
db 19,MEOWTH
db 20,MEOWTH
ENDC
-
- IF DEF(_JAPAN) && DEF(_BLUE)
- db 19,PIDGEY
- db 19,ODDISH
- db 17,MEOWTH
- db 22,ODDISH
- db 22,PIDGEY
- db 18,MEOWTH
- db 18,GROWLITHE
- db 20,GROWLITHE
- db 19,MEOWTH
- db 20,MEOWTH
- ENDC
-
- IF DEF(_YELLOW)
- db 20,PIDGEY
- db 22,PIDGEY
- db 20,RATTATA
- db 15,ABRA
- db 19,ABRA
- db 24,PIDGEOTTO
- db 26,ABRA
- db 19,JIGGLYPUFF
- db 24,JIGGLYPUFF
- db 24,JIGGLYPUFF
- ENDC
-
db $00
-