diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 17:59:46 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 17:59:46 -0400 |
| commit | 31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (patch) | |
| tree | 6941b2b38a2615223b30e8cceb7aab636768dabd /data/wildPokemon/route2.asm | |
| parent | Split default names strings into separate lines to make it less unpleasant to... (diff) | |
| parent | Fix typo: ninetails.asm -> ninetales.asm (diff) | |
| download | pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.gz pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.xz pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/wildPokemon/route2.asm')
| -rwxr-xr-x | data/wildPokemon/route2.asm | 55 |
1 files changed, 20 insertions, 35 deletions
diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm index 8f9eb4e5..fb3a5e82 100755 --- a/data/wildPokemon/route2.asm +++ b/data/wildPokemon/route2.asm @@ -1,39 +1,24 @@ Route2Mons: db $19 - - IF DEF(_YELLOW) - db 3,RATTATA - db 3,PIDGEY - db 4,RATTATA - db 4,NIDORAN_M - db 4,NIDORAN_F - db 5,PIDGEY - db 6,NIDORAN_M - db 6,NIDORAN_F - db 7,PIDGEY - db 7,PIDGEY - ELSE - db 3,RATTATA - db 3,PIDGEY - db 4,PIDGEY - db 4,RATTATA - db 5,PIDGEY - if DEF(_RED) - db 3,WEEDLE - ENDC - if DEF(_BLUE) - db 3,CATERPIE - ENDC - db 2,RATTATA - db 5,RATTATA - if DEF(_RED) - db 4,WEEDLE - db 5,WEEDLE - ENDC - if DEF(_BLUE) - db 4,CATERPIE - db 5,CATERPIE - ENDC + db 3,RATTATA + db 3,PIDGEY + db 4,PIDGEY + db 4,RATTATA + db 5,PIDGEY + if DEF(_RED) + db 3,WEEDLE + ENDC + if DEF(_BLUE) + db 3,CATERPIE + ENDC + db 2,RATTATA + db 5,RATTATA + if DEF(_RED) + db 4,WEEDLE + db 5,WEEDLE + ENDC + if DEF(_BLUE) + db 4,CATERPIE + db 5,CATERPIE ENDC db $00 - |