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/Route6.asm | 53 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'data/wild/maps/Route6.asm') diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm index 92512ffb..15585ea4 100755 --- a/data/wild/maps/Route6.asm +++ b/data/wild/maps/Route6.asm @@ -1,27 +1,28 @@ Route6Mons: - db $0F - IF DEF(_RED) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MANKEY - db 12,MANKEY - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MANKEY - db 16,MANKEY - ENDC - IF DEF(_BLUE) - db 13,BELLSPROUT - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,BELLSPROUT - db 16,BELLSPROUT - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - ENDC - db $00 + db 15 ; grass encounter rate +IF DEF(_RED) + db 13, ODDISH + db 13, PIDGEY + db 15, PIDGEY + db 10, MANKEY + db 12, MANKEY + db 15, ODDISH + db 16, ODDISH + db 16, PIDGEY + db 14, MANKEY + db 16, MANKEY +ENDC +IF DEF(_BLUE) + db 13, BELLSPROUT + db 13, PIDGEY + db 15, PIDGEY + db 10, MEOWTH + db 12, MEOWTH + db 15, BELLSPROUT + db 16, BELLSPROUT + db 16, PIDGEY + db 14, MEOWTH + db 16, MEOWTH +ENDC + + db 0 ; water encounter rate -- cgit v1.3.1-sl0p