diff options
| author | IIMarckus <iimarckus@gmail.com> | 2016-02-12 21:10:58 -0700 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2016-02-12 21:10:58 -0700 |
| commit | 757114cad28d59eacdf22f26cd175aca17cb5407 (patch) | |
| tree | 9c8ad00dd63e38acd27e080fc67e80900cdc47f1 /data/wildPokemon/safarizone2.asm | |
| parent | Remove misleading (unreferenced) labels. (diff) | |
| download | pokeyellow-757114cad28d59eacdf22f26cd175aca17cb5407.tar.gz pokeyellow-757114cad28d59eacdf22f26cd175aca17cb5407.tar.xz pokeyellow-757114cad28d59eacdf22f26cd175aca17cb5407.zip | |
Get rid of yellow ifdefs in wild Pokémon.
Diffstat (limited to 'data/wildPokemon/safarizone2.asm')
| -rwxr-xr-x | data/wildPokemon/safarizone2.asm | 68 |
1 files changed, 24 insertions, 44 deletions
diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm index 5de4ad00..c1b6a547 100755 --- a/data/wildPokemon/safarizone2.asm +++ b/data/wildPokemon/safarizone2.asm @@ -1,48 +1,28 @@ ZoneMons2: db $1E - IF DEF(_YELLOW) - db 36,NIDORAN_M - db 14,NIDORAN_F - db 20,EXEGGCUTE - db 25,RHYHORN - db 23,NIDORINA - db 28,KANGASKHAN - db 16,CUBONE - db 33,KANGASKHAN - db 25,SCYTHER - db 15,PINSIR - ELSE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 22,NIDORAN_M - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 22,NIDORAN_F - ENDC - db 26,RHYHORN - db 23,PARAS - db 25,EXEGGCUTE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINO - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINA - ENDC - db 27,EXEGGCUTE - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINA - ENDC - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 30,NIDORINO - ENDC - db 32,VENOMOTH - db 26,CHANSEY - IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db 28,TAUROS - ENDC - IF (DEF(_JAPAN) && DEF(_BLUE)) - db 28,PINSIR - ENDC + IF DEF(_RED) + db 22,NIDORAN_M ENDC - + IF DEF(_BLUE) + db 22,NIDORAN_F + ENDC + db 26,RHYHORN + db 23,PARAS + db 25,EXEGGCUTE + IF DEF(_RED) + db 30,NIDORINO + ENDC + IF DEF(_BLUE) + db 30,NIDORINA + ENDC + db 27,EXEGGCUTE + IF DEF(_RED) + db 30,NIDORINA + ENDC + IF DEF(_BLUE) + db 30,NIDORINO + ENDC + db 32,VENOMOTH + db 26,CHANSEY + db 28,TAUROS db $00 - |