diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /data/wildPokemon/route14.asm | |
| parent | Pull a lot of engine out of main.asm (diff) | |
| parent | Update INSTALL.md (diff) | |
| download | pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.gz pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.xz pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.zip | |
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'data/wildPokemon/route14.asm')
| -rwxr-xr-x | data/wildPokemon/route14.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm index c3e0743b..76d9118f 100755 --- a/data/wildPokemon/route14.asm +++ b/data/wildPokemon/route14.asm @@ -1,4 +1,4 @@ -Route14Mons: +Route14Mons: db $0F IF _RED || (_JAPAN && _BLUE) db 24,ODDISH @@ -12,7 +12,7 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 24,BELLSPROUT db 26,PIDGEY @@ -25,7 +25,7 @@ Route14Mons: db 28,PIDGEOTTO db 30,PIDGEOTTO ENDC - + IF _YELLOW db 26,ODDISH db 26,BELLSPROUT @@ -38,6 +38,6 @@ Route14Mons: db 27,VENONAT db 30,VENOMOTH ENDC - + db $00 |