summaryrefslogtreecommitdiff
path: root/data/wildPokemon/powerplant.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/wildPokemon/powerplant.asm')
-rwxr-xr-xdata/wildPokemon/powerplant.asm33
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
-