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/Route15.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/Route15.asm')
| -rwxr-xr-x | data/wild/maps/Route15.asm | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index b4762230..13bd7f32 100755 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm @@ -1,27 +1,26 @@ Route15Mons: - db $0F - IF DEF(_RED) - db 24,ODDISH - db 26,DITTO - db 23,PIDGEY - db 26,VENONAT - db 22,ODDISH - db 28,VENONAT - db 26,ODDISH - db 30,GLOOM - db 28,PIDGEOTTO - db 30,PIDGEOTTO - ENDC - IF DEF(_BLUE) - db 24,BELLSPROUT - db 26,DITTO - db 23,PIDGEY - db 26,VENONAT - db 22,BELLSPROUT - db 28,VENONAT - db 26,BELLSPROUT - db 30,WEEPINBELL - db 28,PIDGEOTTO - db 30,PIDGEOTTO - ENDC - db $00 + db 15 ; grass encounter rate +IF DEF(_RED) + db 24, ODDISH + db 26, DITTO + db 23, PIDGEY + db 26, VENONAT + db 22, ODDISH + db 28, VENONAT + db 26, ODDISH + db 30, GLOOM +ENDC +IF DEF(_BLUE) + db 24, BELLSPROUT + db 26, DITTO + db 23, PIDGEY + db 26, VENONAT + db 22, BELLSPROUT + db 28, VENONAT + db 26, BELLSPROUT + db 30, WEEPINBELL +ENDC + db 28, PIDGEOTTO + db 30, PIDGEOTTO + + db 0 ; water encounter rate |