aboutsummaryrefslogtreecommitdiffstats
path: root/data/wild/maps/Route4.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/Route4.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/Route4.asm')
-rwxr-xr-xdata/wild/maps/Route4.asm49
1 files changed, 23 insertions, 26 deletions
diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm
index 624d58de..d4f4763b 100755
--- a/data/wild/maps/Route4.asm
+++ b/data/wild/maps/Route4.asm
@@ -1,27 +1,24 @@
Route4Mons:
- db $14
- IF DEF(_RED)
- db 10,RATTATA
- db 10,SPEAROW
- db 8,RATTATA
- db 6,EKANS
- db 8,SPEAROW
- db 10,EKANS
- db 12,RATTATA
- db 12,SPEAROW
- db 8,EKANS
- db 12,EKANS
- ENDC
- IF DEF(_BLUE)
- db 10,RATTATA
- db 10,SPEAROW
- db 8,RATTATA
- db 6,SANDSHREW
- db 8,SPEAROW
- db 10,SANDSHREW
- db 12,RATTATA
- db 12,SPEAROW
- db 8,SANDSHREW
- db 12,SANDSHREW
- ENDC
- db $00
+ db 20 ; grass encounter rate
+ db 10, RATTATA
+ db 10, SPEAROW
+ db 8, RATTATA
+IF DEF(_RED)
+ db 6, EKANS
+ db 8, SPEAROW
+ db 10, EKANS
+ db 12, RATTATA
+ db 12, SPEAROW
+ db 8, EKANS
+ db 12, EKANS
+ENDC
+IF DEF(_BLUE)
+ db 6, SANDSHREW
+ db 8, SPEAROW
+ db 10, SANDSHREW
+ db 12, RATTATA
+ db 12, SPEAROW
+ db 8, SANDSHREW
+ db 12, SANDSHREW
+ENDC
+ db 0 ; water encounter rate