From 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Sat, 6 Jun 2015 13:51:06 -0500 Subject: Build only Yellow Conflicts: gfx/intro_nido_1.6x6.png gfx/intro_nido_2.6x6.png gfx/intro_nido_3.6x6.png gfx/redgreenversion.png text.asm text/maps/cerulean_trade_house.asm text/maps/copycats_house_1f.asm text/maps/daycare_2.asm text/maps/museum_2f.asm text/maps/oaks_lab.asm text/maps/pewter_gym.asm text/maps/route_9_1.asm text/maps/school.asm text/maps/vermilion_gym_1.asm yellow/main.asm --- data/wildPokemon/route13.asm | 76 +++++++++++++------------------------------- 1 file changed, 22 insertions(+), 54 deletions(-) (limited to 'data/wildPokemon/route13.asm') diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm index 1b694f36..9dadf7e1 100755 --- a/data/wildPokemon/route13.asm +++ b/data/wildPokemon/route13.asm @@ -1,57 +1,25 @@ Route13Mons: - IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE)) - db $14 - db 24,ODDISH - db 25,PIDGEY - db 27,PIDGEY - db 24,VENONAT - db 22,ODDISH - db 26,VENONAT - db 26,ODDISH - db 25,DITTO - db 28,GLOOM - db 30,GLOOM - db $00 - ENDC + db $0F + db 25,ODDISH + db 25,BELLSPROUT + db 28,PIDGEOTTO + db 28,PIDGEY + db 27,ODDISH + db 27,BELLSPROUT + db 29,GLOOM + db 29,WEEPINBELL + db 26,FARFETCH_D + db 31,FARFETCH_D - IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE)) - db $14 - db 24,BELLSPROUT - db 25,PIDGEY - db 27,PIDGEY - db 24,VENONAT - db 22,BELLSPROUT - db 26,VENONAT - db 26,BELLSPROUT - db 25,DITTO - db 28,WEEPINBELL - db 30,WEEPINBELL - db $00 - ENDC - - IF DEF(_YELLOW) - db $0F - db 25,ODDISH - db 25,BELLSPROUT - db 28,PIDGEOTTO - db 28,PIDGEY - db 27,ODDISH - db 27,BELLSPROUT - db 29,GLOOM - db 29,WEEPINBELL - db 26,FARFETCH_D - db 31,FARFETCH_D - - db $03 - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWPOKE - db 15,SLOWBRO - db 20,SLOWBRO - ENDC + db $03 + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWPOKE + db 15,SLOWBRO + db 20,SLOWBRO -- cgit v1.3.1-sl0p