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

1 files changed, 0 insertions, 125 deletions

diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm
index b121efc0..338db855 100755
--- a/data/trainer_parties.asm
+++ b/data/trainer_parties.asm
@@ -33,19 +33,11 @@ YoungsterData: ; 39d99 (e:5d99)
 	db 17,RATTATA,RATTATA,RATICATE,0
 	db 18,NIDORAN_M,NIDORINO,0
 	db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0
-if DEF(_YELLOW)
 	db 24,SANDSHREW,0
-endc
 BugCatcherData: ; 39dce (e:5dce)
-if DEF(_YELLOW)
 	db 7,CATERPIE,CATERPIE,0
 	db 6,METAPOD,CATERPIE,METAPOD,0
 	db 10,CATERPIE,0
-else
-	db 6,WEEDLE,CATERPIE,0
-	db 7,WEEDLE,KAKUNA,WEEDLE,0
-	db 9,WEEDLE,0
-endc
 	db 10,CATERPIE,WEEDLE,CATERPIE,0
 	db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0
 	db 11,CATERPIE,METAPOD,0
@@ -57,9 +49,7 @@ endc
 	db 18,METAPOD,CATERPIE,VENONAT,0
 	db 19,BEEDRILL,BEEDRILL,0
 	db 20,CATERPIE,WEEDLE,VENONAT,0
-if DEF(_YELLOW)
 	db 8,CATERPIE,METAPOD,0
-endc
 LassData: ; 39e0c (e:5e0c)
 	db 9,PIDGEY,PIDGEY,0
 	db 10,RATTATA,NIDORAN_M,0
@@ -72,24 +62,14 @@ LassData: ; 39e0c (e:5e0c)
 	db 15,NIDORAN_M,NIDORAN_F,0
 	db 13,ODDISH,PIDGEY,ODDISH,0
 	db 18,PIDGEY,NIDORAN_F,0
-if DEF(_YELLOW)
 	db 20,JIGGLYPUFF,0
-else
-	db 18,RATTATA,PIKACHU,0
-endc
 	db 23,NIDORAN_F,NIDORINA,0
 	db 24,MEOWTH,MEOWTH,MEOWTH,0
-if DEF(_YELLOW)
 	db 19,PIDGEY,RATTATA,NIDORAN_F,MEOWTH,NIDORAN_M,0
-else
-	db 19,PIDGEY,RATTATA,NIDORAN_M,MEOWTH,PIKACHU,0
-endc
 	db 22,CLEFAIRY,CLEFAIRY,0
 	db 23,BELLSPROUT,WEEPINBELL,0
 	db 23,ODDISH,GLOOM,0
-if DEF(_YELLOW)
 	db 6,NIDORAN_F,NIDORAN_M,0
-endc
 SailorData: ; 39e58 (e:5e58)
 	db 18,MACHOP,SHELLDER,0
 	db 17,MACHOP,TENTACOOL,0
@@ -98,17 +78,9 @@ SailorData: ; 39e58 (e:5e58)
 	db 18,TENTACOOL,STARYU,0
 	db 17,HORSEA,HORSEA,HORSEA,0
 	db 20,MACHOP,0
-if DEF(_YELLOW)
 	db 24,MAGNEMITE,0
-else
-	db 21,PIKACHU,PIKACHU,0
-endc
 JrTrainerMData: ; 39e78 (e:5e78)
-if DEF(_YELLOW)
 	db 9,DIGLETT,SANDSHREW,0
-else
-	db 11,DIGLETT,SANDSHREW,0
-endc
 	db 14,RATTATA,EKANS,0
 	db 18,MANKEY,0
 	db 20,SQUIRTLE,0
@@ -117,34 +89,20 @@ endc
 	db 21,GROWLITHE,CHARMANDER,0
 	db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0
 	db 29,NIDORAN_M,NIDORINO,0
-if DEF(_YELLOW)
 	db 16,WEEPINBELL,0
-endc
 JrTrainerFData: ; 39e9d (e:5e9d)
 	db 19,GOLDEEN,0
-if DEF(_YELLOW)
 	db 16,ODDISH,BELLSPROUT,0
-else
-	db 16,RATTATA,PIKACHU,0
-endc
 	db 16,PIDGEY,PIDGEY,PIDGEY,0
 	db 22,BULBASAUR,0
 	db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0
 	db 23,MEOWTH,0
-if DEF(_YELLOW)
 	db 20,JIGGLYPUFF,CLEFAIRY,0
-else
-	db 20,PIKACHU,CLEFAIRY,0
-endc
 	db 21,PIDGEY,PIDGEOTTO,0
 	db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0
 	db 22,ODDISH,BULBASAUR,0
 	db 24,BULBASAUR,IVYSAUR,0
-if DEF(_YELLOW)
 	db 24,PIDGEY,MEOWTH,RATTATA,PIDGEY,MEOWTH,0
-else
-	db 24,PIDGEY,MEOWTH,RATTATA,PIKACHU,MEOWTH,0
-endc
 	db 30,POLIWAG,POLIWAG,0
 	db 27,PIDGEY,MEOWTH,PIDGEY,PIDGEOTTO,0
 	db 28,GOLDEEN,POLIWAG,HORSEA,0
@@ -153,17 +111,11 @@ endc
 	db 20,MEOWTH,ODDISH,PIDGEY,0
 	db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0
 	db 28,GLOOM,ODDISH,ODDISH,0
-if DEF(_YELLOW)
 	db 29,PIDGEY,PIDGEOTTO,0
-else
-	db 29,PIKACHU,RAICHU,0
-endc
 	db 33,CLEFAIRY,0
 	db 29,BELLSPROUT,ODDISH,TANGELA,0
 	db 30,TENTACOOL,HORSEA,SEEL,0
-if DEF(_YELLOW)
 	db 20,CUBONE,0
-endc
 PokemaniacData: ; 39f09 (e:5f09)
 	db 30,RHYHORN,LICKITUNG,0
 	db 20,CUBONE,SLOWPOKE,0
@@ -282,11 +234,7 @@ BeautyData: ; 3a0d1 (e:60d1)
 	db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0
 	db 24,BELLSPROUT,BELLSPROUT,0
 	db 26,EXEGGCUTE,0
-if DEF(_YELLOW)
 	db 27,RATTATA,VULPIX,RATTATA,0
-else
-	db 27,RATTATA,PIKACHU,RATTATA,0
-endc
 	db 29,CLEFAIRY,MEOWTH,0
 	db 35,SEAKING,0
 	db 30,SHELLDER,SHELLDER,CLOYSTER,0
@@ -304,11 +252,7 @@ PsychicData: ; 3a115 (e:6115)
 	db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0
 	db 38,SLOWBRO,0
 RockerData: ; 3a127 (e:6127)
-if DEF(_YELLOW)
 	db 20,VOLTORB,VOLTORB,VOLTORB,0
-else
-	db 20,VOLTORB,MAGNEMITE,VOLTORB,0
-endc
 	db 29,VOLTORB,ELECTRODE,0
 JugglerData: ; 3a130 (e:6130)
 	db 29,KADABRA,MR_MIME,0
@@ -355,21 +299,9 @@ BlackbeltData: ; 3a1be (e:61be)
 	db 38,MACHOKE,MACHOP,MACHOKE,0
 	db 43,MACHOKE,MACHOP,MACHOKE,0
 Green1Data: ; 3a1e4 (e:61e4)
-if DEF(_YELLOW)
 	db 5,EEVEE,0
 	db $FF,9,SPEAROW,8,EEVEE,0
 	db $FF,18,SPEAROW,15,SANDSHREW,15,RATTATA,17,EEVEE,0
-else
-	db 5,SQUIRTLE,0
-	db 5,BULBASAUR,0
-	db 5,CHARMANDER,0
-	db $FF,9,PIDGEY,8,SQUIRTLE,0
-	db $FF,9,PIDGEY,8,BULBASAUR,0
-	db $FF,9,PIDGEY,8,CHARMANDER,0
-	db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,SQUIRTLE,0
-	db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,BULBASAUR,0
-	db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,CHARMANDER,0
-endc
 ProfOakData: ; 3a21d (e:621d)
 	db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0
 	db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,VENUSAUR,70,GYARADOS,0
@@ -391,15 +323,9 @@ ScientistData: ; 3a241 (e:6241)
 	db 33,MAGNEMITE,MAGNETON,VOLTORB,0
 	db 34,MAGNEMITE,ELECTRODE,0
 GiovanniData: ; 3a27e (e:627e)
-if DEF(_YELLOW)
 	db $FF,25,ONIX,24,RHYHORN,29,PERSIAN,0
 	db $FF,37,NIDORINO,35,PERSIAN,37,RHYHORN,41,NIDOQUEEN,0
 	db $FF,50,DUGTRIO,53,PERSIAN,53,NIDOQUEEN,55,NIDOKING,55,RHYDON,0
-else
-	db $FF,25,ONIX,24,RHYHORN,29,KANGASKHAN,0
-	db $FF,37,NIDORINO,35,KANGASKHAN,37,RHYHORN,41,NIDOQUEEN,0
-	db $FF,45,RHYHORN,42,DUGTRIO,44,NIDOQUEEN,45,NIDOKING,50,RHYDON,0
-endc
 RocketData: ; 3a29c (e:629c)
 	db 13,RATTATA,ZUBAT,0
 	db 11,SANDSHREW,RATTATA,ZUBAT,0
@@ -442,7 +368,6 @@ RocketData: ; 3a29c (e:629c)
 	db 33,MACHOKE,0
 	db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0
 	db 32,CUBONE,DROWZEE,MAROWAK,0
-if DEF(_YELLOW)
 JessieJamesData:
 	db 14,EKANS,MEOWTH,KOFFING,0
 	db 25,KOFFING,MEOWTH,EKANS,0
@@ -452,7 +377,6 @@ JessieJamesData:
 	db 27,KOFFING,0
 	db 29,WEEZING,0
 	db 33,WEEZING,0
-endc
 CooltrainerMData: ; 3a35a (e:635a)
 	db 39,NIDORINO,NIDOKING,0
 	db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0
@@ -476,55 +400,26 @@ CooltrainerFData: ; 3a385 (e:6385)
 BrunoData: ; 3a3a9 (e:63a9)
 	db $FF,53,ONIX,55,HITMONCHAN,55,HITMONLEE,56,ONIX,58,MACHAMP,0
 BrockData: ; 3a3b5 (e:63b5)
-if DEF(_YELLOW)
 	db $FF,10,GEODUDE,12,ONIX,0
-else
-	db $FF,12,GEODUDE,14,ONIX,0
-endc
 MistyData: ; 3a3bb (e:63bb)
 	db $FF,18,STARYU,21,STARMIE,0
 LtSurgeData: ; 3a3c1 (e:63c1)
-if DEF(_YELLOW)
 	db $FF,28,RAICHU,0
-else
-	db $FF,21,VOLTORB,18,PIKACHU,24,RAICHU,0
-endc
 ErikaData: ; 3a3c9 (e:63c9)
-if DEF(_YELLOW)
 	db $FF,30,TANGELA,32,WEEPINBELL,32,GLOOM,0
-else
-	db $FF,29,VICTREEBEL,24,TANGELA,29,VILEPLUME,0
-endc
 KogaData: ; 3a3d1 (e:63d1)
-if DEF(_YELLOW)
 	db $FF,44,VENONAT,46,VENONAT,48,VENONAT,50,VENOMOTH,0
-else
-	db $FF,37,KOFFING,39,MUK,37,KOFFING,43,WEEZING,0
-endc
 BlaineData: ; 3a3db (e:63db)
-if DEF(_YELLOW)
 	db $FF,48,NINETALES,50,RAPIDASH,54,ARCANINE,0
-else
-	db $FF,42,GROWLITHE,40,PONYTA,42,RAPIDASH,47,ARCANINE,0
-endc
 SabrinaData: ; 3a3e5 (e:63e5)
-if DEF(_YELLOW)
 	db $FF,50,ABRA,50,KADABRA,50,ALAKAZAM,0
-else
-	db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0
-endc
 GentlemanData: ; 3a3ef (e:63ef)
 	db 18,GROWLITHE,GROWLITHE,0
 	db 19,NIDORAN_M,NIDORAN_F,0
-if DEF(_YELLOW)
 	db 22,VOLTORB,MAGNEMITE,0
-else
-	db 23,PIKACHU,0
-endc
 	db 48,PRIMEAPE,0
 	db 17,GROWLITHE,PONYTA,0
 Green2Data: ; 3a401 (e:6401)
-if DEF(_YELLOW)
 	db $FF,19,SPEAROW,16,RATTATA,18,SANDSHREW,20,EEVEE,0
 	db $FF,25,FEAROW,23,SHELLDER,22,VULPIX,20,SANDSHREW,25,EEVEE,0
 	db $FF,25,FEAROW,23,MAGNEMITE,22,SHELLDER,20,SANDSHREW,25,EEVEE,0
@@ -535,30 +430,10 @@ if DEF(_YELLOW)
 	db $FF,47,SANDSLASH,45,EXEGGCUTE,45,NINETALES,47,CLOYSTER,50,KADABRA,53,JOLTEON,0
 	db $FF,47,SANDSLASH,45,EXEGGCUTE,45,CLOYSTER,47,MAGNETON,50,KADABRA,53,FLAREON,0
 	db $FF,47,SANDSLASH,45,EXEGGCUTE,45,MAGNETON,47,NINETALES,50,KADABRA,53,VAPOREON,0
-else
-	db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,WARTORTLE,0
-	db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,IVYSAUR,0
-	db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,CHARMELEON,0
-	db $FF,25,PIDGEOTTO,23,GROWLITHE,22,EXEGGCUTE,20,KADABRA,25,WARTORTLE,0
-	db $FF,25,PIDGEOTTO,23,GYARADOS,22,GROWLITHE,20,KADABRA,25,IVYSAUR,0
-	db $FF,25,PIDGEOTTO,23,EXEGGCUTE,22,GYARADOS,20,KADABRA,25,CHARMELEON,0
-	db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0
-	db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0
-	db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0
-	db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0
-	db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0
-	db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0
-endc
 Green3Data: ; 3a491 (e:6491)
-if DEF(_YELLOW)
 	db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,CLOYSTER,63,NINETALES,65,JOLTEON,0
 	db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,MAGNETON,63,CLOYSTER,65,FLAREON,0
 	db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,NINETALES,63,MAGNETON,65,VAPOREON,0
-else
-	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR,65,BLASTOISE,0
-	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE,65,VENUSAUR,0
-	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS,65,CHARIZARD,0
-endc
 LoreleiData: ; 3a4bb (e:64bb)
 	db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0
 ChannelerData: ; 3a4c7 (e:64c7)