summaryrefslogtreecommitdiff
path: root/data/wild/maps/Route25.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/Route25.asm
parentaa97e196dd5b37e89db5ddf154dc7aea9b02a045 (diff)
parent93d0697f37aca8ed7a21298a980876af6d43268b (diff)
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/wild/maps/Route25.asm')
-rwxr-xr-xdata/wild/maps/Route25.asm53
1 files changed, 27 insertions, 26 deletions
diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm
index 4884fa64..7e0ded65 100755
--- a/data/wild/maps/Route25.asm
+++ b/data/wild/maps/Route25.asm
@@ -1,27 +1,28 @@
Route25Mons:
- db $0F
- IF DEF(_RED)
- db 8,WEEDLE
- db 9,KAKUNA
- db 13,PIDGEY
- db 12,ODDISH
- db 13,ODDISH
- db 12,ABRA
- db 14,ODDISH
- db 10,ABRA
- db 7,METAPOD
- db 8,CATERPIE
- ENDC
- IF DEF(_BLUE)
- db 8,CATERPIE
- db 9,METAPOD
- db 13,PIDGEY
- db 12,BELLSPROUT
- db 13,BELLSPROUT
- db 12,ABRA
- db 14,BELLSPROUT
- db 10,ABRA
- db 7,KAKUNA
- db 8,WEEDLE
- ENDC
- db $00
+ db 15 ; grass encounter rate
+IF DEF(_RED)
+ db 8, WEEDLE
+ db 9, KAKUNA
+ db 13, PIDGEY
+ db 12, ODDISH
+ db 13, ODDISH
+ db 12, ABRA
+ db 14, ODDISH
+ db 10, ABRA
+ db 7, METAPOD
+ db 8, CATERPIE
+ENDC
+IF DEF(_BLUE)
+ db 8, CATERPIE
+ db 9, METAPOD
+ db 13, PIDGEY
+ db 12, BELLSPROUT
+ db 13, BELLSPROUT
+ db 12, ABRA
+ db 14, BELLSPROUT
+ db 10, ABRA
+ db 7, KAKUNA
+ db 8, WEEDLE
+ENDC
+
+ db 0 ; water encounter rate