aboutsummaryrefslogtreecommitdiffstats
path: root/data/wildPokemon/route21.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-13 17:59:46 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-13 17:59:46 -0400
commit31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (patch)
tree6941b2b38a2615223b30e8cceb7aab636768dabd /data/wildPokemon/route21.asm
parentSplit default names strings into separate lines to make it less unpleasant to... (diff)
parentFix typo: ninetails.asm -> ninetales.asm (diff)
downloadpokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.gz
pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.xz
pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/wildPokemon/route21.asm')
-rwxr-xr-xdata/wildPokemon/route21.asm36
1 files changed, 10 insertions, 26 deletions
diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm
index 7017081d..3cc73ba0 100755
--- a/data/wildPokemon/route21.asm
+++ b/data/wildPokemon/route21.asm
@@ -1,30 +1,15 @@
Route21Mons:
db $19
-
- IF DEF(_YELLOW)
- db 15,PIDGEY
- db 13,RATTATA
- db 13,PIDGEY
- db 11,PIDGEY
- db 17,PIDGEY
- db 15,RATTATA
- db 15,RATICATE
- db 17,PIDGEOTTO
- db 19,PIDGEOTTO
- db 15,PIDGEOTTO
- ELSE
- db 21,RATTATA
- db 23,PIDGEY
- db 30,RATICATE
- db 23,RATTATA
- db 21,PIDGEY
- db 30,PIDGEOTTO
- db 32,PIDGEOTTO
- db 28,TANGELA
- db 30,TANGELA
- db 32,TANGELA
- ENDC
-
+ db 21,RATTATA
+ db 23,PIDGEY
+ db 30,RATICATE
+ db 23,RATTATA
+ db 21,PIDGEY
+ db 30,PIDGEOTTO
+ db 32,PIDGEOTTO
+ db 28,TANGELA
+ db 30,TANGELA
+ db 32,TANGELA
db $05
db 5,TENTACOOL
db 10,TENTACOOL
@@ -36,4 +21,3 @@ Route21Mons:
db 30,TENTACOOL
db 35,TENTACOOL
db 40,TENTACOOL
-