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/route22.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/route22.asm')
| -rwxr-xr-x | data/wildPokemon/route22.asm | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm index 78c5631a..750a2f4e 100755 --- a/data/wildPokemon/route22.asm +++ b/data/wildPokemon/route22.asm @@ -1,6 +1,6 @@ Route22Mons: db $19 - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 3,RATTATA db 3,NIDORAN_M db 4,RATTATA @@ -12,7 +12,7 @@ Route22Mons: db 3,NIDORAN_F db 4,NIDORAN_F ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 3,RATTATA db 3,NIDORAN_F db 4,RATTATA @@ -24,17 +24,4 @@ Route22Mons: db 3,NIDORAN_M db 4,NIDORAN_M ENDC - IF DEF(_YELLOW) - db 2,NIDORAN_M - db 2,NIDORAN_F - db 3,MANKEY - db 3,RATTATA - db 4,NIDORAN_M - db 4,NIDORAN_F - db 5,MANKEY - db 2,SPEAROW - db 4,SPEAROW - db 6,SPEAROW - ENDC db $00 - |