aboutsummaryrefslogtreecommitdiffstats
path: root/data/wild/maps/Route12.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-14 10:21:18 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-14 13:32:09 -0400
commitf37cf959c930ae9595f9f71ce0d9b17dcf5421d0 (patch)
tree33cc0d34fec73e972f4fb040b8b31f59b7e69805 /data/wild/maps/Route12.asm
parentMerge pull request #269 from Rangi42/master (diff)
downloadpokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.tar.gz
pokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.tar.xz
pokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.zip
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/wild/maps/Route12.asm')
-rwxr-xr-xdata/wild/maps/Route12.asm53
1 files changed, 27 insertions, 26 deletions
diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm
index 45dfbc9d..acdfe6b6 100755
--- a/data/wild/maps/Route12.asm
+++ b/data/wild/maps/Route12.asm
@@ -1,27 +1,28 @@
Route12Mons:
- db $0F
- IF DEF(_RED)
- db 24,ODDISH
- db 25,PIDGEY
- db 23,PIDGEY
- db 24,VENONAT
- db 22,ODDISH
- db 26,VENONAT
- db 26,ODDISH
- db 27,PIDGEY
- db 28,GLOOM
- db 30,GLOOM
- ENDC
- IF DEF(_BLUE)
- db 24,BELLSPROUT
- db 25,PIDGEY
- db 23,PIDGEY
- db 24,VENONAT
- db 22,BELLSPROUT
- db 26,VENONAT
- db 26,BELLSPROUT
- db 27,PIDGEY
- db 28,WEEPINBELL
- db 30,WEEPINBELL
- ENDC
- db $00
+ db 15 ; grass encounter rate
+IF DEF(_RED)
+ db 24, ODDISH
+ db 25, PIDGEY
+ db 23, PIDGEY
+ db 24, VENONAT
+ db 22, ODDISH
+ db 26, VENONAT
+ db 26, ODDISH
+ db 27, PIDGEY
+ db 28, GLOOM
+ db 30, GLOOM
+ENDC
+IF DEF(_BLUE)
+ db 24, BELLSPROUT
+ db 25, PIDGEY
+ db 23, PIDGEY
+ db 24, VENONAT
+ db 22, BELLSPROUT
+ db 26, VENONAT
+ db 26, BELLSPROUT
+ db 27, PIDGEY
+ db 28, WEEPINBELL
+ db 30, WEEPINBELL
+ENDC
+
+ db 0 ; water encounter rate