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/route7.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/route7.asm')
| -rwxr-xr-x | data/wildPokemon/route7.asm | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm index 505b632b..559c98ee 100755 --- a/data/wildPokemon/route7.asm +++ b/data/wildPokemon/route7.asm @@ -1,6 +1,5 @@ Route7Mons: db $0F - IF DEF(_RED) db 19,PIDGEY db 19,ODDISH @@ -13,8 +12,7 @@ Route7Mons: db 19,MANKEY db 20,MANKEY ENDC - - IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE) + IF DEF(_BLUE) db 19,PIDGEY db 19,BELLSPROUT db 17,MEOWTH @@ -26,32 +24,4 @@ Route7Mons: db 19,MEOWTH db 20,MEOWTH ENDC - - IF DEF(_JAPAN) && DEF(_BLUE) - db 19,PIDGEY - db 19,ODDISH - db 17,MEOWTH - db 22,ODDISH - db 22,PIDGEY - db 18,MEOWTH - db 18,GROWLITHE - db 20,GROWLITHE - db 19,MEOWTH - db 20,MEOWTH - ENDC - - IF DEF(_YELLOW) - db 20,PIDGEY - db 22,PIDGEY - db 20,RATTATA - db 15,ABRA - db 19,ABRA - db 24,PIDGEOTTO - db 26,ABRA - db 19,JIGGLYPUFF - db 24,JIGGLYPUFF - db 24,JIGGLYPUFF - ENDC - db $00 - |