diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-15 12:26:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 12:26:16 -0400 |
| commit | e18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch) | |
| tree | d8a157ae5aa323a00873efe79eb4693327b8bb70 /data/wild/maps/SeafoamIslands1F.asm | |
| parent | Merge pull request #269 from Rangi42/master (diff) | |
| parent | Don't compare strings with ==; use STRCMP (diff) | |
| download | pokeyellow-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/SeafoamIslands1F.asm')
| -rwxr-xr-x | data/wild/maps/SeafoamIslands1F.asm | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm index 3c431f9a..b191de13 100755 --- a/data/wild/maps/SeafoamIslands1F.asm +++ b/data/wild/maps/SeafoamIslands1F.asm @@ -1,27 +1,27 @@ IslandMons1: - db $0F - IF DEF(_RED) - db 30,SEEL - db 30,SLOWPOKE - db 30,SHELLDER - db 30,HORSEA - db 28,HORSEA - db 21,ZUBAT - db 29,GOLBAT - db 28,PSYDUCK - db 28,SHELLDER - db 38,GOLDUCK - ENDC - IF DEF(_BLUE) - db 30,SEEL - db 30,PSYDUCK - db 30,STARYU - db 30,KRABBY - db 28,KRABBY - db 21,ZUBAT - db 29,GOLBAT - db 28,SLOWPOKE - db 28,STARYU - db 38,SLOWBRO - ENDC - db $00 + db 15 ; grass encounter rate + db 30, SEEL +IF DEF(_RED) + db 30, SLOWPOKE + db 30, SHELLDER + db 30, HORSEA + db 28, HORSEA + db 21, ZUBAT + db 29, GOLBAT + db 28, PSYDUCK + db 28, SHELLDER + db 38, GOLDUCK +ENDC +IF DEF(_BLUE) + db 30, PSYDUCK + db 30, STARYU + db 30, KRABBY + db 28, KRABBY + db 21, ZUBAT + db 29, GOLBAT + db 28, SLOWPOKE + db 28, STARYU + db 38, SLOWBRO +ENDC + + db 0 ; water encounter rate |