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/route7.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/route7.asm')
| -rwxr-xr-x | data/wildPokemon/route7.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm index ecda56aa..42073d11 100755 --- a/data/wildPokemon/route7.asm +++ b/data/wildPokemon/route7.asm @@ -1,6 +1,6 @@ -Route7Mons: +Route7Mons: db $0F - + IF _RED db 19,PIDGEY db 19,ODDISH @@ -13,7 +13,7 @@ Route7Mons: db 19,MANKEY db 20,MANKEY ENDC - + IF _GREEN || !_JAPAN && _BLUE db 19,PIDGEY db 19,BELLSPROUT @@ -26,7 +26,7 @@ Route7Mons: db 19,MEOWTH db 20,MEOWTH ENDC - + IF _JAPAN && _BLUE db 19,PIDGEY db 19,ODDISH @@ -39,7 +39,7 @@ Route7Mons: db 19,MEOWTH db 20,MEOWTH ENDC - + IF _YELLOW db 20,PIDGEY db 22,PIDGEY @@ -52,6 +52,6 @@ Route7Mons: db 24,JIGGLYPUFF db 24,JIGGLYPUFF ENDC - + db $00 |