aboutsummaryrefslogtreecommitdiffstats
path: root/data/wild/maps/PokemonMansion2F.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/PokemonMansion2F.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/PokemonMansion2F.asm')
-rwxr-xr-xdata/wild/maps/PokemonMansion2F.asm53
1 files changed, 27 insertions, 26 deletions
diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm
index 985474fc..494973b2 100755
--- a/data/wild/maps/PokemonMansion2F.asm
+++ b/data/wild/maps/PokemonMansion2F.asm
@@ -1,27 +1,28 @@
MansionMons2:
- db $0A
- IF DEF(_RED)
- db 32,GROWLITHE
- db 34,KOFFING
- db 34,KOFFING
- db 30,PONYTA
- db 30,KOFFING
- db 32,PONYTA
- db 30,GRIMER
- db 28,PONYTA
- db 39,WEEZING
- db 37,MUK
- ENDC
- IF DEF(_BLUE)
- db 32,VULPIX
- db 34,GRIMER
- db 34,GRIMER
- db 30,PONYTA
- db 30,GRIMER
- db 32,PONYTA
- db 30,KOFFING
- db 28,PONYTA
- db 39,MUK
- db 37,WEEZING
- ENDC
- db $00
+ db 10 ; grass encounter rate
+IF DEF(_RED)
+ db 32, GROWLITHE
+ db 34, KOFFING
+ db 34, KOFFING
+ db 30, PONYTA
+ db 30, KOFFING
+ db 32, PONYTA
+ db 30, GRIMER
+ db 28, PONYTA
+ db 39, WEEZING
+ db 37, MUK
+ENDC
+IF DEF(_BLUE)
+ db 32, VULPIX
+ db 34, GRIMER
+ db 34, GRIMER
+ db 30, PONYTA
+ db 30, GRIMER
+ db 32, PONYTA
+ db 30, KOFFING
+ db 28, PONYTA
+ db 39, MUK
+ db 37, WEEZING
+ENDC
+
+ db 0 ; water encounter rate