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/route14.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/route14.asm')
| -rwxr-xr-x | data/wildPokemon/route14.asm | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm index 999981af..aad5aa48 100755 --- a/data/wildPokemon/route14.asm +++ b/data/wildPokemon/route14.asm @@ -1,6 +1,6 @@ Route14Mons: db $0F - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_RED) db 24,ODDISH db 26,PIDGEY db 23,DITTO @@ -12,8 +12,7 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) + IF DEF(_BLUE) db 24,BELLSPROUT db 26,PIDGEY db 23,DITTO @@ -25,19 +24,4 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - - IF DEF(_YELLOW) - db 26,ODDISH - db 26,BELLSPROUT - db 24,VENONAT - db 30,PIDGEOTTO - db 28,ODDISH - db 28,BELLSPROUT - db 30,GLOOM - db 30,WEEPINBELL - db 27,VENONAT - db 30,VENOMOTH - ENDC - db $00 - |