From f37cf959c930ae9595f9f71ce0d9b17dcf5421d0 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 14 Jul 2020 10:21:18 -0400 Subject: Clean up some data, using macros for multiline list entries --- data/wild/maps/Route12.asm | 53 +++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'data/wild/maps/Route12.asm') diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm index 45dfbc9d..acdfe6b6 100755 --- a/data/wild/maps/Route12.asm +++ b/data/wild/maps/Route12.asm @@ -1,27 +1,28 @@ Route12Mons: - db $0F - IF DEF(_RED) - db 24,ODDISH - db 25,PIDGEY - db 23,PIDGEY - db 24,VENONAT - db 22,ODDISH - db 26,VENONAT - db 26,ODDISH - db 27,PIDGEY - db 28,GLOOM - db 30,GLOOM - ENDC - IF DEF(_BLUE) - db 24,BELLSPROUT - db 25,PIDGEY - db 23,PIDGEY - db 24,VENONAT - db 22,BELLSPROUT - db 26,VENONAT - db 26,BELLSPROUT - db 27,PIDGEY - db 28,WEEPINBELL - db 30,WEEPINBELL - ENDC - db $00 + db 15 ; grass encounter rate +IF DEF(_RED) + db 24, ODDISH + db 25, PIDGEY + db 23, PIDGEY + db 24, VENONAT + db 22, ODDISH + db 26, VENONAT + db 26, ODDISH + db 27, PIDGEY + db 28, GLOOM + db 30, GLOOM +ENDC +IF DEF(_BLUE) + db 24, BELLSPROUT + db 25, PIDGEY + db 23, PIDGEY + db 24, VENONAT + db 22, BELLSPROUT + db 26, VENONAT + db 26, BELLSPROUT + db 27, PIDGEY + db 28, WEEPINBELL + db 30, WEEPINBELL +ENDC + + db 0 ; water encounter rate -- cgit v1.3.1-sl0p