diff options
| -rw-r--r-- | main.asm | 293 | 
1 files changed, 293 insertions, 0 deletions
| @@ -35979,6 +35979,168 @@ TeamMoves: ; 5D32  	db LANCE,BARRIER  	db $FF +if _YELLOW +; different format from above. + +; entry ≔ trainerclass, trainerid, moveset+, 0 +; moveset ≔ partymon, partymon'smove, moveid + +	db BUG_CATCHER,$f +	db 2,2,TACKLE +	db 2,3,STRING_SHOT +	db 0 + +	db YOUNGSTER,$e +	db 1,4,FISSURE +	db 0 + +	db BROCK,$1 +	db 2,3,BIND +	db 2,4,BIDE +	db 0 + +	db MISTY,$1 +	db 2,4,BUBBLEBEAM +	db 0 + +	db LT__SURGE,$1 +	db 1,1,THUNDERBOLT +	db 1,2,MEGA_PUNCH +	db 1,3,MEGA_KICK +	db 1,4,GROWL +	db 0 + +	db ERIKA,$1 +	db 1,3,MEGA_DRAIN +	db 2,1,RAZOR_LEAF +	db 3,1,PETAL_DANCE +	db 0 + +	db KOGA,$1 +	db 1,1,TOXIC +	db 1,2,TACKLE +	db 2,1,TOXIC +	db 2,3,SUPERSONIC +	db 3,1,TOXIC +	db 3,2,DOUBLE_EDGE +	db 4,1,LEECH_LIFE +	db 4,2,DOUBLE_TEAM +	db 4,3,PSYCHIC_M +	db 4,4,TOXIC +	db 0 + +	db BLAINE,$1 +	db 1,1,FLAMETHROWER +	db 1,4,CONFUSE_RAY +	db 3,1,FLAMETHROWER +	db 3,2,FIRE_BLAST +	db 3,3,REFLECT +	db 0 + +	db SABRINA,$1 +	db 1,1,FLASH +	db 2,1,KINESIS +	db 2,4,PSYWAVE +	db 3,1,PSYWAVE +	db 0 + +	db GIOVANNI,$3 +	db 1,3,FISSURE +	db 2,2,DOUBLE_TEAM +	db 3,1,EARTHQUAKE +	db 3,3,THUNDER +	db 4,1,EARTHQUAKE +	db 4,2,LEER +	db 4,3,THUNDER +	db 5,1,ROCK_SLIDE +	db 5,4,EARTHQUAKE +	db 0 + +	db LORELEI,$1 +	db 1,1,BUBBLEBEAM +	db 2,3,ICE_BEAM +	db 3,1,PSYCHIC_M +	db 3,2,SURF +	db 4,3,LOVELY_KISS +	db 5,3,BLIZZARD +	db 0 + +	db BRUNO,$1 +	db 1,1,ROCK_SLIDE +	db 1,2,SCREECH +	db 1,4,DIG +	db 2,3,FIRE_PUNCH +	db 2,4,DOUBLE_TEAM +	db 3,1,DOUBLE_KICK +	db 3,2,MEGA_KICK +	db 3,4,DOUBLE_TEAM +	db 4,1,ROCK_SLIDE +	db 4,2,SCREECH +	db 4,4,EARTHQUAKE +	db 5,2,KARATE_CHOP +	db 5,3,STRENGTH +	db 0 + +	db AGATHA,$1 +	db 1,2,SUBSTITUTE +	db 1,3,LICK +	db 1,4,MEGA_DRAIN +	db 2,2,TOXIC +	db 2,4,LEECH_LIFE +	db 3,2,LICK +	db 4,1,WRAP +	db 5,2,PSYCHIC_M +	db 0 + +	db LANCE,$1 +	db 1,1,DRAGON_RAGE +	db 2,1,THUNDER_WAVE +	db 2,3,THUNDERBOLT +	db 3,1,BUBBLEBEAM +	db 3,2,WRAP +	db 3,3,ICE_BEAM +	db 4,1,WING_ATTACK +	db 4,2,SWIFT +	db 4,3,FLY +	db 5,1,BLIZZARD +	db 5,2,FIRE_BLAST +	db 5,3,THUNDER +	db 0 + +	db SONY3,$1 +	db 1,3,EARTHQUAKE +	db 2,4,KINESIS +	db 3,4,LEECH_SEED +	db 4,1,ICE_BEAM +	db 5,1,CONFUSE_RAY +	db 5,4,FIRE_SPIN +	db 6,3,QUICK_ATTACK +	db 0 + +	db SONY3,$2 +	db 1,3,EARTHQUAKE +	db 2,4,KINESIS +	db 3,4,LEECH_SEED +	db 4,1,THUNDERBOLT +	db 5,1,ICE_BEAM +	db 6,2,REFLECT +	db 6,3,QUICK_ATTACK +	db 0 + +	db SONY3,$3 +	db 1,3,EARTHQUAKE +	db 2,4,KINESIS +	db 3,4,LEECH_SEED +	db 4,1,CONFUSE_RAY +	db 4,4,FIRE_SPIN +	db 5,1,THUNDERBOLT +	db 6,1,AURORA_BEAM +	db 6,3,QUICK_ATTACK +	db 0 + +	db $ff +endc +  TrainerDataPointers: ; 5D3B  	dw YoungsterData,BugCatcherData,LassData,SailorData,JrTrainerMData  	dw JrTrainerFData,PokemaniacData,SuperNerdData,HikerData,BikerData @@ -36014,10 +36176,19 @@ YoungsterData:  	db 17,RATTATA,RATTATA,RATICATE,0  	db 18,NIDORAN_M,NIDORINO,0  	db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0 +if _YELLOW +	db 24,SANDSHREW,0 +endc  BugCatcherData: +if _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 @@ -36029,6 +36200,9 @@ BugCatcherData:  	db 18,METAPOD,CATERPIE,VENONAT,0  	db 19,BEEDRILL,BEEDRILL,0  	db 20,CATERPIE,WEEDLE,VENONAT,0 +if _YELLOW +	db 8,CATERPIE,METAPOD,0 +endc  LassData:  	db 9,PIDGEY,PIDGEY,0  	db 10,RATTATA,NIDORAN_M,0 @@ -36041,13 +36215,24 @@ LassData:  	db 15,NIDORAN_M,NIDORAN_F,0  	db 13,ODDISH,PIDGEY,ODDISH,0  	db 18,PIDGEY,NIDORAN_F,0 +if _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 _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 _YELLOW +	db 6,NIDORAN_F,NIDORAN_M,0 +endc  SailorData:  	db 18,MACHOP,SHELLDER,0  	db 17,MACHOP,TENTACOOL,0 @@ -36056,9 +36241,17 @@ SailorData:  	db 18,TENTACOOL,STARYU,0  	db 17,HORSEA,HORSEA,HORSEA,0  	db 20,MACHOP,0 +if _YELLOW +	db 24,MAGNEMITE,0 +else  	db 21,PIKACHU,PIKACHU,0 +endc  JrTrainerMData: +if _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 @@ -36067,19 +36260,34 @@ JrTrainerMData:  	db 21,GROWLITHE,CHARMANDER,0  	db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0  	db 29,NIDORAN_M,NIDORINO,0 +if _YELLOW +	db 16,WEEPINBELL,0 +endc  JrTrainerFData:  	db 19,GOLDEEN,0 +if _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 _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 _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 @@ -36088,10 +36296,17 @@ JrTrainerFData:  	db 20,MEOWTH,ODDISH,PIDGEY,0  	db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0  	db 28,GLOOM,ODDISH,ODDISH,0 +if _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 _YELLOW +	db 20,CUBONE,0 +endc  PokemaniacData:  	db 30,RHYHORN,LICKITUNG,0  	db 20,CUBONE,SLOWPOKE,0 @@ -36210,7 +36425,11 @@ BeautyData:  	db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0  	db 24,BELLSPROUT,BELLSPROUT,0  	db 26,EXEGGCUTE,0 +if _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 @@ -36228,7 +36447,11 @@ PsychicData:  	db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0  	db 38,SLOWBRO,0  RockerData: +if _YELLOW +	db 20,VOLTORB,VOLTORB,VOLTORB,0 +else  	db 20,VOLTORB,MAGNEMITE,VOLTORB,0 +endc  	db 29,VOLTORB,ELECTRODE,0  JugglerData:  	db 29,KADABRA,MR_MIME,0 @@ -36275,6 +36498,11 @@ BlackbeltData:  	db 38,MACHOKE,MACHOP,MACHOKE,0  	db 43,MACHOKE,MACHOP,MACHOKE,0  Green1Data: +if _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 @@ -36284,6 +36512,7 @@ Green1Data:  	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:  	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 @@ -36305,9 +36534,15 @@ ScientistData:  	db 33,MAGNEMITE,MAGNETON,VOLTORB,0  	db 34,MAGNEMITE,ELECTRODE,0  GiovanniData: +if _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:  	db 13,RATTATA,ZUBAT,0  	db 11,SANDSHREW,RATTATA,ZUBAT,0 @@ -36350,6 +36585,17 @@ RocketData:  	db 33,MACHOKE,0  	db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0  	db 32,CUBONE,DROWZEE,MAROWAK,0 +if _YELLOW +JessieJamesData: +	db 14,EKANS,MEOWTH,KOFFING,0 +	db 25,KOFFING,MEOWTH,EKANS,0 +	db 27,MEOWTH,ARBOK,WEEZING,0 +	db 31,WEEZING,ARBOK,MEOWTH,0 +	db 16,KOFFING,0 +	db 27,KOFFING,0 +	db 29,WEEZING,0 +	db 33,WEEZING,0 +endc  CooltrainerMData:  	db 39,NIDORINO,NIDOKING,0  	db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0 @@ -36373,26 +36619,66 @@ CooltrainerFData:  BrunoData:  	db $FF,53,ONIX,55,HITMONCHAN,55,HITMONLEE,56,ONIX,58,MACHAMP,0  BrockData: +if _YELLOW +	db $FF,10,GEODUDE,12,ONIX,0 +else  	db $FF,12,GEODUDE,14,ONIX,0 +endc  MistyData:  	db $FF,18,STARYU,21,STARMIE,0  LtSurgeData: +if _YELLOW +	db $FF,28,RAICHU,0 +else  	db $FF,21,VOLTORB,18,PIKACHU,24,RAICHU,0 +endc  ErikaData: +if _YELLOW +	db $FF,30,TANGELA,32,WEEPINBELL,32,GLOOM,0 +else  	db $FF,29,VICTREEBEL,24,TANGELA,29,VILEPLUME,0 +endc  KogaData: +if _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: +if _YELLOW +	db $FF,48,NINETALES,50,RAPIDASH,54,ARCANINE,0 +else  	db $FF,42,GROWLITHE,40,PONYTA,42,RAPIDASH,47,ARCANINE,0 +endc  SabrinaData: +if _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:  	db 18,GROWLITHE,GROWLITHE,0  	db 19,NIDORAN_M,NIDORAN_F,0 +if _YELLOW +	db 22,VOLTORB,MAGNEMITE,0 +else  	db 23,PIKACHU,0 +endc  	db 48,PRIMEAPE,0  	db 17,GROWLITHE,PONYTA,0  Green2Data: +if _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 +	db $FF,25,FEAROW,23,VULPIX,22,MAGNEMITE,20,SANDSHREW,25,EEVEE,0 +	db $FF,38,SANDSLASH,35,NINETALES,37,CLOYSTER,35,KADABRA,40,JOLTEON,0 +	db $FF,38,SANDSLASH,35,CLOYSTER,37,MAGNETON,35,KADABRA,40,FLAREON,0 +	db $FF,38,SANDSLASH,35,MAGNETON,37,NINETALES,35,KADABRA,40,VAPOREON,0 +	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 @@ -36405,10 +36691,17 @@ Green2Data:  	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: +if _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:  	db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0  ChannelerData: | 
