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/powerplant.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/powerplant.asm')
| -rwxr-xr-x | data/wildPokemon/powerplant.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm index 741232c3..a67ab2e9 100755 --- a/data/wildPokemon/powerplant.asm +++ b/data/wildPokemon/powerplant.asm @@ -1,7 +1,7 @@ -PowerPlantMons: +PowerPlantMons: db $0A IF !_YELLOW - + db 21,VOLTORB db 21,MAGNEMITE db 20,PIKACHU @@ -19,7 +19,7 @@ PowerPlantMons: db 36,RAICHU ENDC ENDC - + IF _YELLOW db 30,MAGNEMITE db 35,MAGNEMITE @@ -32,6 +32,6 @@ PowerPlantMons: db 33,MUK db 37,MUK ENDC - + db $00 |