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/unknowndungeonb1.asm | 39 +++++++++-------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) (limited to 'data/wildPokemon/unknowndungeonb1.asm') diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm index 6a88edb2..5848678f 100755 --- a/data/wildPokemon/unknowndungeonb1.asm +++ b/data/wildPokemon/unknowndungeonb1.asm @@ -1,33 +1,14 @@ DungeonMonsB1: db $19 - IF DEF(_YELLOW) - db 54,GOLBAT - db 59,GOLBAT - db 55,GRAVELER - db 52,RHYHORN - db 62,RHYDON - db 60,DITTO - db 56,CHANSEY - db 65,DITTO - db 55,LICKITUNG - db 50,LICKITUNG - ELSE - db 55,RHYDON - db 55,MAROWAK - db 55,ELECTRODE - db 64,CHANSEY - db 64,PARASECT - db 64,RAICHU - IF DEF(_RED) - db 57,ARBOK - ENDC - IF DEF(_BLUE) || DEF(_GREEN) - db 57,SANDSLASH - ENDC - db 65,DITTO - db 63,DITTO - db 67,DITTO - ENDC - + db 54,GOLBAT + db 59,GOLBAT + db 55,GRAVELER + db 52,RHYHORN + db 62,RHYDON + db 60,DITTO + db 56,CHANSEY + db 65,DITTO + db 55,LICKITUNG + db 50,LICKITUNG db $00 -- cgit v1.3.1-sl0p