aboutsummaryrefslogtreecommitdiffstats
path: root/data/wild/maps/Route22.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/Route22.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/Route22.asm')
-rwxr-xr-xdata/wild/maps/Route22.asm52
1 files changed, 26 insertions, 26 deletions
diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm
index 750a2f4e..c8f72608 100755
--- a/data/wild/maps/Route22.asm
+++ b/data/wild/maps/Route22.asm
@@ -1,27 +1,27 @@
Route22Mons:
- db $19
- IF DEF(_RED)
- db 3,RATTATA
- db 3,NIDORAN_M
- db 4,RATTATA
- db 4,NIDORAN_M
- db 2,RATTATA
- db 2,NIDORAN_M
- db 3,SPEAROW
- db 5,SPEAROW
- db 3,NIDORAN_F
- db 4,NIDORAN_F
- ENDC
- IF DEF(_BLUE)
- db 3,RATTATA
- db 3,NIDORAN_F
- db 4,RATTATA
- db 4,NIDORAN_F
- db 2,RATTATA
- db 2,NIDORAN_F
- db 3,SPEAROW
- db 5,SPEAROW
- db 3,NIDORAN_M
- db 4,NIDORAN_M
- ENDC
- db $00
+ db 25 ; grass encounter rate
+ db 3, RATTATA
+IF DEF(_RED)
+ db 3, NIDORAN_M
+ db 4, RATTATA
+ db 4, NIDORAN_M
+ db 2, RATTATA
+ db 2, NIDORAN_M
+ db 3, SPEAROW
+ db 5, SPEAROW
+ db 3, NIDORAN_F
+ db 4, NIDORAN_F
+ENDC
+IF DEF(_BLUE)
+ db 3, NIDORAN_F
+ db 4, RATTATA
+ db 4, NIDORAN_F
+ db 2, RATTATA
+ db 2, NIDORAN_F
+ db 3, SPEAROW
+ db 5, SPEAROW
+ db 3, NIDORAN_M
+ db 4, NIDORAN_M
+ENDC
+
+ db 0 ; water encounter rate