diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-10-17 02:42:32 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-10-17 02:42:32 -0600 |
| commit | a3d3f8324a670aad8bf1348b65192544c8ab2d9f (patch) | |
| tree | b431eefa402d0d7106b03d701367a571216d5a74 /data/wildPokemon/powerplant.asm | |
| parent | Minor comment/label improvements in Cinnabar Lab. (diff) | |
| download | pokeyellow-a3d3f8324a670aad8bf1348b65192544c8ab2d9f.tar.gz pokeyellow-a3d3f8324a670aad8bf1348b65192544c8ab2d9f.tar.xz pokeyellow-a3d3f8324a670aad8bf1348b65192544c8ab2d9f.zip | |
Kill version.asm.
Diffstat (limited to 'data/wildPokemon/powerplant.asm')
| -rwxr-xr-x | data/wildPokemon/powerplant.asm | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm index a67ab2e9..f956fcf2 100755 --- a/data/wildPokemon/powerplant.asm +++ b/data/wildPokemon/powerplant.asm @@ -1,7 +1,18 @@ PowerPlantMons: db $0A - IF !_YELLOW - + + IF DEF(_YELLOW) + db 30,MAGNEMITE + db 35,MAGNEMITE + db 33,MAGNETON + db 33,VOLTORB + db 37,VOLTORB + db 33,GRIMER + db 37,GRIMER + db 38,MAGNETON + db 33,MUK + db 37,MUK + ELSE db 21,VOLTORB db 21,MAGNEMITE db 20,PIKACHU @@ -10,28 +21,14 @@ PowerPlantMons: db 23,VOLTORB db 32,MAGNETON db 35,MAGNETON - IF _RED + IF DEF(_RED) db 33,ELECTABUZZ db 36,ELECTABUZZ ENDC - IF _GREEN || _BLUE + IF DEF(_GREEN) || DEF(_BLUE) db 33,RAICHU db 36,RAICHU ENDC ENDC - IF _YELLOW - db 30,MAGNEMITE - db 35,MAGNEMITE - db 33,MAGNETON - db 33,VOLTORB - db 37,VOLTORB - db 33,GRIMER - db 37,GRIMER - db 38,MAGNETON - db 33,MUK - db 37,MUK - ENDC - db $00 - |