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/route12.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/route12.asm')
| -rwxr-xr-x | data/wildPokemon/route12.asm | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm index 9bb26a6d..45dfbc9d 100755 --- a/data/wildPokemon/route12.asm +++ b/data/wildPokemon/route12.asm @@ -1,7 +1,6 @@ Route12Mons: db $0F - - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 24,ODDISH db 25,PIDGEY db 23,PIDGEY @@ -12,10 +11,8 @@ Route12Mons: db 27,PIDGEY db 28,GLOOM db 30,GLOOM - db $00 ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 24,BELLSPROUT db 25,PIDGEY db 23,PIDGEY @@ -26,31 +23,5 @@ Route12Mons: db 27,PIDGEY db 28,WEEPINBELL db 30,WEEPINBELL - db $00 ENDC - - IF DEF(_YELLOW) - db 25,ODDISH - db 25,BELLSPROUT - db 28,PIDGEY - db 28,PIDGEOTTO - db 27,ODDISH - db 27,BELLSPROUT - db 29,GLOOM - db 29,WEEPINBELL - db 26,FARFETCHD - db 31,FARFETCHD - - db $03 - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWBRO - db 20,SLOWBRO - ENDC - + db $00 |