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/safarizone2.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/safarizone2.asm')
| -rwxr-xr-x | data/wildPokemon/safarizone2.asm | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm index 2adb18ed..5de4ad00 100755 --- a/data/wildPokemon/safarizone2.asm +++ b/data/wildPokemon/safarizone2.asm @@ -1,50 +1,48 @@ ZoneMons2: db $1E - IF !_YELLOW - IF _RED || (_JAPAN && _BLUE) + 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 _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 22,NIDORAN_F ENDC db 26,RHYHORN db 23,PARAS db 25,EXEGGCUTE - IF _RED || (_JAPAN && _BLUE) + IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) db 30,NIDORINO ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 30,NIDORINA ENDC db 27,EXEGGCUTE - IF _RED || (_JAPAN && _BLUE) + IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) db 30,NIDORINA ENDC - IF _GREEN || (!_JAPAN && _BLUE) + IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 30,NIDORINO ENDC db 32,VENOMOTH db 26,CHANSEY - IF _RED || _GREEN || (!_JAPAN && _BLUE) + IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) db 28,TAUROS ENDC - IF (_JAPAN && _BLUE) + IF (DEF(_JAPAN) && DEF(_BLUE)) db 28,PINSIR ENDC ENDC - IF _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 - ENDC - db $00 |