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/PokemonMansion3F.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/PokemonMansion3F.asm')
| -rwxr-xr-x | data/wild/maps/PokemonMansion3F.asm | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm index 9c5521ae..bbb14213 100755 --- a/data/wild/maps/PokemonMansion3F.asm +++ b/data/wild/maps/PokemonMansion3F.asm @@ -1,27 +1,28 @@ MansionMons3: - db $0A - IF DEF(_RED) - db 31,KOFFING - db 33,GROWLITHE - db 35,KOFFING - db 32,PONYTA - db 34,PONYTA - db 40,WEEZING - db 34,GRIMER - db 38,WEEZING - db 36,PONYTA - db 42,MUK - ENDC - IF DEF(_BLUE) - db 31,GRIMER - db 33,VULPIX - db 35,GRIMER - db 32,PONYTA - db 34,MAGMAR - db 40,MUK - db 34,KOFFING - db 38,MUK - db 36,PONYTA - db 42,WEEZING - ENDC - db $00 + db 10 ; grass encounter rate +IF DEF(_RED) + db 31, KOFFING + db 33, GROWLITHE + db 35, KOFFING + db 32, PONYTA + db 34, PONYTA + db 40, WEEZING + db 34, GRIMER + db 38, WEEZING + db 36, PONYTA + db 42, MUK +ENDC +IF DEF(_BLUE) + db 31, GRIMER + db 33, VULPIX + db 35, GRIMER + db 32, PONYTA + db 34, MAGMAR + db 40, MUK + db 34, KOFFING + db 38, MUK + db 36, PONYTA + db 42, WEEZING +ENDC + + db 0 ; water encounter rate |