aboutsummaryrefslogtreecommitdiffstats
path: root/data/wild/maps/Route6.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-03-25 17:39:44 -0500
committerdannye <33dannye@gmail.com>2021-03-25 17:39:44 -0500
commiteb47bda8ee5c1f002236200df36012de9e243a97 (patch)
treefc69fc5435582efebd36fc54414673dd8ac7f646 /data/wild/maps/Route6.asm
parentMerge remote-tracking branch 'remotes/pokered/master' (diff)
parentVerify data table and name list sizes with assertion macros (diff)
downloadpokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.gz
pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.xz
pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/wild/maps/Route6.asm')
-rw-r--r--data/wild/maps/Route6.asm6
1 files changed, 4 insertions, 2 deletions
diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm
index 067d2694..df91e521 100644
--- a/data/wild/maps/Route6.asm
+++ b/data/wild/maps/Route6.asm
@@ -1,5 +1,5 @@
Route6Mons:
- db 15 ; grass encounter rate
+ def_grass_wildmons 15 ; encounter rate
db 15, PIDGEY
db 14, RATTATA
db 7, ABRA
@@ -10,8 +10,9 @@ Route6Mons:
db 3, JIGGLYPUFF
db 5, JIGGLYPUFF
db 7, JIGGLYPUFF
+ end_grass_wildmons
- db 3 ; water encounter rate
+ def_water_wildmons 3 ; encounter rate
db 15, PSYDUCK
db 15, PSYDUCK
db 15, PSYDUCK
@@ -22,3 +23,4 @@ Route6Mons:
db 15, PSYDUCK
db 15, GOLDUCK
db 20, GOLDUCK
+ end_water_wildmons