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/viridianforest.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/viridianforest.asm')
| -rwxr-xr-x | data/wildPokemon/viridianforest.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm index e80ba681..2ca828eb 100755 --- a/data/wildPokemon/viridianforest.asm +++ b/data/wildPokemon/viridianforest.asm @@ -1,4 +1,4 @@ -ForestMons: ; +ForestMons: IF !_YELLOW db $08 IF _RED @@ -21,11 +21,11 @@ ForestMons: ; db 4,KAKUNA db 3,WEEDLE ENDC - + db 3,PIKACHU db 5,PIKACHU ENDC - + IF _YELLOW db $19 db 3,CATERPIE |