aboutsummaryrefslogtreecommitdiffstats
path: root/data/wild/maps/SeafoamIslandsB1F.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/SeafoamIslandsB1F.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/SeafoamIslandsB1F.asm')
-rwxr-xr-xdata/wild/maps/SeafoamIslandsB1F.asm53
1 files changed, 27 insertions, 26 deletions
diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm
index 6f96f240..79762821 100755
--- a/data/wild/maps/SeafoamIslandsB1F.asm
+++ b/data/wild/maps/SeafoamIslandsB1F.asm
@@ -1,27 +1,28 @@
IslandMonsB1:
- db $0A
- IF DEF(_RED)
- db 30,STARYU
- db 30,HORSEA
- db 32,SHELLDER
- db 32,HORSEA
- db 28,SLOWPOKE
- db 30,SEEL
- db 30,SLOWPOKE
- db 28,SEEL
- db 38,DEWGONG
- db 37,SEADRA
- ENDC
- IF DEF(_BLUE)
- db 30,SHELLDER
- db 30,KRABBY
- db 32,STARYU
- db 32,KRABBY
- db 28,PSYDUCK
- db 30,SEEL
- db 30,PSYDUCK
- db 28,SEEL
- db 38,DEWGONG
- db 37,KINGLER
- ENDC
- db $00
+ db 10 ; grass encounter rate
+IF DEF(_RED)
+ db 30, STARYU
+ db 30, HORSEA
+ db 32, SHELLDER
+ db 32, HORSEA
+ db 28, SLOWPOKE
+ db 30, SEEL
+ db 30, SLOWPOKE
+ db 28, SEEL
+ db 38, DEWGONG
+ db 37, SEADRA
+ENDC
+IF DEF(_BLUE)
+ db 30, SHELLDER
+ db 30, KRABBY
+ db 32, STARYU
+ db 32, KRABBY
+ db 28, PSYDUCK
+ db 30, SEEL
+ db 30, PSYDUCK
+ db 28, SEEL
+ db 38, DEWGONG
+ db 37, KINGLER
+ENDC
+
+ db 0 ; water encounter rate