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/route6.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/route6.asm')
| -rwxr-xr-x | data/wildPokemon/route6.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm index a2e0f4d0..253a5943 100755 --- a/data/wildPokemon/route6.asm +++ b/data/wildPokemon/route6.asm @@ -1,6 +1,6 @@ -Route6Mons: +Route6Mons: db $0F - + IF _RED db 13,ODDISH db 13,PIDGEY @@ -14,7 +14,7 @@ Route6Mons: db 16,MANKEY db $00 ENDC - + IF _GREEN || !_JAPAN && _BLUE db 13,BELLSPROUT db 13,PIDGEY @@ -28,7 +28,7 @@ Route6Mons: db 16,MEOWTH db $00 ENDC - + IF _JAPAN && _BLUE db 13,ODDISH db 13,PIDGEY @@ -42,7 +42,7 @@ Route6Mons: db 16,MEOWTH db $00 ENDC - + IF _YELLOW db 15,PIDGEY db 14,RATTATA |