aboutsummaryrefslogtreecommitdiffstats
path: root/data/wild/maps/Route7.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/Route7.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/Route7.asm')
-rwxr-xr-xdata/wild/maps/Route7.asm52
1 files changed, 26 insertions, 26 deletions
diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm
index 559c98ee..39508bf0 100755
--- a/data/wild/maps/Route7.asm
+++ b/data/wild/maps/Route7.asm
@@ -1,27 +1,27 @@
Route7Mons:
- db $0F
- IF DEF(_RED)
- db 19,PIDGEY
- db 19,ODDISH
- db 17,MANKEY
- db 22,ODDISH
- db 22,PIDGEY
- db 18,MANKEY
- db 18,GROWLITHE
- db 20,GROWLITHE
- db 19,MANKEY
- db 20,MANKEY
- ENDC
- IF DEF(_BLUE)
- db 19,PIDGEY
- db 19,BELLSPROUT
- db 17,MEOWTH
- db 22,BELLSPROUT
- db 22,PIDGEY
- db 18,MEOWTH
- db 18,VULPIX
- db 20,VULPIX
- db 19,MEOWTH
- db 20,MEOWTH
- ENDC
- db $00
+ db 15 ; grass encounter rate
+ db 19, PIDGEY
+IF DEF(_RED)
+ db 19, ODDISH
+ db 17, MANKEY
+ db 22, ODDISH
+ db 22, PIDGEY
+ db 18, MANKEY
+ db 18, GROWLITHE
+ db 20, GROWLITHE
+ db 19, MANKEY
+ db 20, MANKEY
+ENDC
+IF DEF(_BLUE)
+ db 19, BELLSPROUT
+ db 17, MEOWTH
+ db 22, BELLSPROUT
+ db 22, PIDGEY
+ db 18, MEOWTH
+ db 18, VULPIX
+ db 20, VULPIX
+ db 19, MEOWTH
+ db 20, MEOWTH
+ENDC
+
+ db 0 ; water encounter rate