aboutsummaryrefslogtreecommitdiffstats
path: root/data/wild/maps/Route5.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/Route5.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/Route5.asm')
-rwxr-xr-xdata/wild/maps/Route5.asm53
1 files changed, 27 insertions, 26 deletions
diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm
index cb8c583b..dd200378 100755
--- a/data/wild/maps/Route5.asm
+++ b/data/wild/maps/Route5.asm
@@ -1,27 +1,28 @@
Route5Mons:
- db $0F
- IF DEF(_RED)
- db 13,ODDISH
- db 13,PIDGEY
- db 15,PIDGEY
- db 10,MANKEY
- db 12,MANKEY
- db 15,ODDISH
- db 16,ODDISH
- db 16,PIDGEY
- db 14,MANKEY
- db 16,MANKEY
- ENDC
- IF DEF(_BLUE)
- db 13,BELLSPROUT
- db 13,PIDGEY
- db 15,PIDGEY
- db 10,MEOWTH
- db 12,MEOWTH
- db 15,BELLSPROUT
- db 16,BELLSPROUT
- db 16,PIDGEY
- db 14,MEOWTH
- db 16,MEOWTH
- ENDC
- db $00
+ db 15 ; grass encounter rate
+IF DEF(_RED)
+ db 13, ODDISH
+ db 13, PIDGEY
+ db 15, PIDGEY
+ db 10, MANKEY
+ db 12, MANKEY
+ db 15, ODDISH
+ db 16, ODDISH
+ db 16, PIDGEY
+ db 14, MANKEY
+ db 16, MANKEY
+ENDC
+IF DEF(_BLUE)
+ db 13, BELLSPROUT
+ db 13, PIDGEY
+ db 15, PIDGEY
+ db 10, MEOWTH
+ db 12, MEOWTH
+ db 15, BELLSPROUT
+ db 16, BELLSPROUT
+ db 16, PIDGEY
+ db 14, MEOWTH
+ db 16, MEOWTH
+ENDC
+
+ db 0 ; water encounter rate