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/PowerPlant.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/PowerPlant.asm')
| -rwxr-xr-x | data/wild/maps/PowerPlant.asm | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm index 35eece95..f70dfbcb 100755 --- a/data/wild/maps/PowerPlant.asm +++ b/data/wild/maps/PowerPlant.asm @@ -1,19 +1,20 @@ PowerPlantMons: - db $0A - db 21,VOLTORB - db 21,MAGNEMITE - db 20,PIKACHU - db 24,PIKACHU - db 23,MAGNEMITE - db 23,VOLTORB - db 32,MAGNETON - db 35,MAGNETON - IF DEF(_RED) - db 33,ELECTABUZZ - db 36,ELECTABUZZ - ENDC - IF DEF(_BLUE) - db 33,RAICHU - db 36,RAICHU - ENDC - db $00 + db 10 ; grass encounter rate + db 21, VOLTORB + db 21, MAGNEMITE + db 20, PIKACHU + db 24, PIKACHU + db 23, MAGNEMITE + db 23, VOLTORB + db 32, MAGNETON + db 35, MAGNETON +IF DEF(_RED) + db 33, ELECTABUZZ + db 36, ELECTABUZZ +ENDC +IF DEF(_BLUE) + db 33, RAICHU + db 36, RAICHU +ENDC + + db 0 ; water encounter rate |