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/route12.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/route12.asm')
| -rwxr-xr-x | data/wildPokemon/route12.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm index e16b407b..b15a2223 100755 --- a/data/wildPokemon/route12.asm +++ b/data/wildPokemon/route12.asm @@ -1,6 +1,6 @@ -Route12Mons: +Route12Mons: db $0F - + IF _RED || (_JAPAN && _BLUE) db 24,ODDISH db 25,PIDGEY @@ -14,7 +14,7 @@ Route12Mons: db 30,GLOOM db $00 ENDC - + IF _GREEN || (!_JAPAN && _BLUE) db 24,BELLSPROUT db 25,PIDGEY @@ -28,7 +28,7 @@ Route12Mons: db 30,WEEPINBELL db $00 ENDC - + IF _YELLOW db 25,ODDISH db 25,BELLSPROUT |