aboutsummaryrefslogtreecommitdiffstats
path: root/data/wild/maps/SafariZoneNorth.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-15 12:26:16 -0400
committerGitHub <noreply@github.com>2020-07-15 12:26:16 -0400
commite18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch)
treed8a157ae5aa323a00873efe79eb4693327b8bb70 /data/wild/maps/SafariZoneNorth.asm
parentMerge pull request #269 from Rangi42/master (diff)
parentDon't compare strings with ==; use STRCMP (diff)
downloadpokeyellow-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/SafariZoneNorth.asm')
-rwxr-xr-xdata/wild/maps/SafariZoneNorth.asm51
1 files changed, 24 insertions, 27 deletions
diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm
index c1b6a547..4482571b 100755
--- a/data/wild/maps/SafariZoneNorth.asm
+++ b/data/wild/maps/SafariZoneNorth.asm
@@ -1,28 +1,25 @@
ZoneMons2:
- db $1E
- 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
+ db 30 ; grass encounter rate
+IF DEF(_RED)
+ db 22, NIDORAN_M
+ db 26, RHYHORN
+ db 23, PARAS
+ db 25, EXEGGCUTE
+ db 30, NIDORINO
+ db 27, EXEGGCUTE
+ db 30, NIDORINA
+ENDC
+IF DEF(_BLUE)
+ db 22, NIDORAN_F
+ db 26, RHYHORN
+ db 23, PARAS
+ db 25, EXEGGCUTE
+ db 30, NIDORINA
+ db 27, EXEGGCUTE
+ db 30, NIDORINO
+ENDC
+ db 32, VENOMOTH
+ db 26, CHANSEY
+ db 28, TAUROS
+
+ db 0 ; water encounter rate