aboutsummaryrefslogtreecommitdiffstats
path: root/data/wild/maps/PokemonTower7F.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/PokemonTower7F.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/PokemonTower7F.asm')
-rwxr-xr-xdata/wild/maps/PokemonTower7F.asm25
1 files changed, 13 insertions, 12 deletions
diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm
index 0f7e66e9..b2faa100 100755
--- a/data/wild/maps/PokemonTower7F.asm
+++ b/data/wild/maps/PokemonTower7F.asm
@@ -1,13 +1,14 @@
TowerMons7:
- db $0F
- db 21,GASTLY
- db 22,GASTLY
- db 23,GASTLY
- db 24,GASTLY
- db 20,GASTLY
- db 28,HAUNTER
- db 22,CUBONE
- db 24,CUBONE
- db 28,HAUNTER
- db 30,HAUNTER
- db $00
+ db 15 ; grass encounter rate
+ db 21, GASTLY
+ db 22, GASTLY
+ db 23, GASTLY
+ db 24, GASTLY
+ db 20, GASTLY
+ db 28, HAUNTER
+ db 22, CUBONE
+ db 24, CUBONE
+ db 28, HAUNTER
+ db 30, HAUNTER
+
+ db 0 ; water encounter rate