diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-15 12:26:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 12:26:16 -0400 |
| commit | e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch) | |
| tree | d8a157ae5aa323a00873efe79eb4693327b8bb70 /data/wild/maps/SafariZoneWest.asm | |
| parent | Merge pull request #269 from Rangi42/master (diff) | |
| parent | Don't compare strings with ==; use STRCMP (diff) | |
| download | pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.gz pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.tar.xz pokeyellow-e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a.zip | |
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/wild/maps/SafariZoneWest.asm')
| -rwxr-xr-x | data/wild/maps/SafariZoneWest.asm | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index 47b6a102..c9989cc9 100755 --- a/data/wild/maps/SafariZoneWest.asm +++ b/data/wild/maps/SafariZoneWest.asm @@ -1,27 +1,25 @@ ZoneMons3: - db $1E - IF DEF(_RED) - db 25,NIDORAN_M - db 26,DODUO - db 23,VENONAT - db 24,EXEGGCUTE - db 33,NIDORINO - db 26,EXEGGCUTE - db 25,NIDORAN_F - db 31,VENOMOTH - db 26,TAUROS - db 28,KANGASKHAN - ENDC - IF DEF(_BLUE) - db 25,NIDORAN_F - db 26,DODUO - db 23,VENONAT - db 24,EXEGGCUTE - db 33,NIDORINA - db 26,EXEGGCUTE - db 25,NIDORAN_M - db 31,VENOMOTH - db 26,TAUROS - db 28,KANGASKHAN - ENDC - db $00 + db 30 ; grass encounter rate +IF DEF(_RED) + db 25, NIDORAN_M + db 26, DODUO + db 23, VENONAT + db 24, EXEGGCUTE + db 33, NIDORINO + db 26, EXEGGCUTE + db 25, NIDORAN_F +ENDC +IF DEF(_BLUE) + db 25, NIDORAN_F + db 26, DODUO + db 23, VENONAT + db 24, EXEGGCUTE + db 33, NIDORINA + db 26, EXEGGCUTE + db 25, NIDORAN_M +ENDC + db 31, VENOMOTH + db 26, TAUROS + db 28, KANGASKHAN + + db 0 ; water encounter rate |