aboutsummaryrefslogtreecommitdiffstats
path: root/data/wildPokemon/route17.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/route17.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/route17.asm')
-rwxr-xr-xdata/wildPokemon/route17.asm36
1 files changed, 10 insertions, 26 deletions
diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm
index 36283a99..8dffd9a3 100755
--- a/data/wildPokemon/route17.asm
+++ b/data/wildPokemon/route17.asm
@@ -1,29 +1,13 @@
Route17Mons:
db $19
-
- IF DEF(_YELLOW)
- db 26,DODUO
- db 27,FEAROW
- db 27,DODUO
- db 28,DODUO
- db 28,PONYTA
- db 30,PONYTA
- db 29,FEAROW
- db 28,DODUO
- db 32,PONYTA
- db 29,DODRIO
- ELSE
- db 20,SPEAROW
- db 22,SPEAROW
- db 25,RATICATE
- db 24,DODUO
- db 27,RATICATE
- db 26,DODUO
- db 28,DODUO
- db 29,RATICATE
- db 25,FEAROW
- db 27,FEAROW
- ENDC
-
+ db 20,SPEAROW
+ db 22,SPEAROW
+ db 25,RATICATE
+ db 24,DODUO
+ db 27,RATICATE
+ db 26,DODUO
+ db 28,DODUO
+ db 29,RATICATE
+ db 25,FEAROW
+ db 27,FEAROW
db $00
-