Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps

1 files changed, 29 insertions, 29 deletions

diff --git a/include/event_scripts.h b/include/event_scripts.h
index 851559724..925b4389d 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -3,7 +3,7 @@
 
 extern const u8 EventScript_TestSignpostMsg[];
 extern const u8 EventScript_TryGetTrainerScript[];
-extern const u8 EventScript_271354[];
+extern const u8 EventScript_StartTrainerApproach[];
 extern const u8 EventScript_DoNoIntroTrainerBattle[];
 extern const u8 EventScript_TryDoDoubleTrainerBattle[];
 extern const u8 EventScript_TryDoNormalTrainerBattle[];
@@ -135,13 +135,13 @@ extern const u8 gTVTodaysRivalTrainerText03[];
 extern const u8 gTVTodaysRivalTrainerText04[];
 extern const u8 gTVTodaysRivalTrainerText05[];
 extern const u8 gTVTodaysRivalTrainerText06[];
-extern const u8 gTVDewfordTrendWatcherNetworkText00[];
-extern const u8 gTVDewfordTrendWatcherNetworkText01[];
-extern const u8 gTVDewfordTrendWatcherNetworkText02[];
-extern const u8 gTVDewfordTrendWatcherNetworkText03[];
-extern const u8 gTVDewfordTrendWatcherNetworkText04[];
-extern const u8 gTVDewfordTrendWatcherNetworkText05[];
-extern const u8 gTVDewfordTrendWatcherNetworkText06[];
+extern const u8 TrendWatcher_Text_Intro[];
+extern const u8 TrendWatcher_Text_MaleTaughtMePhrase[];
+extern const u8 TrendWatcher_Text_FemaleTaughtMePhrase[];
+extern const u8 TrendWatcher_Text_PhraseWasHopeless[];
+extern const u8 TrendWatcher_Text_MaleTellMeBigger[];
+extern const u8 TrendWatcher_Text_FemaleTellMeBigger[];
+extern const u8 TrendWatcher_Text_Outro[];
 extern const u8 gTVHoennTreasureInvestigatorsText00[];
 extern const u8 gTVHoennTreasureInvestigatorsText01[];
 extern const u8 gTVHoennTreasureInvestigatorsText02[];
@@ -196,22 +196,22 @@ extern const u8 gTVTrainerFanClubText08[];
 extern const u8 gTVTrainerFanClubText09[];
 extern const u8 gTVTrainerFanClubText10[];
 extern const u8 gTVTrainerFanClubText11[];
-extern const u8 gTVCutiesText00[];
-extern const u8 gTVCutiesText01[];
-extern const u8 gTVCutiesText02[];
-extern const u8 gTVCutiesText03[];
-extern const u8 gTVCutiesText04[];
-extern const u8 gTVCutiesText05[];
-extern const u8 gTVCutiesText06[];
-extern const u8 gTVCutiesText07[];
-extern const u8 gTVCutiesText08[];
-extern const u8 gTVCutiesText09[];
-extern const u8 gTVCutiesText10[];
-extern const u8 gTVCutiesText11[];
-extern const u8 gTVCutiesText12[];
-extern const u8 gTVCutiesText13[];
-extern const u8 gTVCutiesText14[];
-extern const u8 gTVCutiesText15[];
+extern const u8 TVSpotTheCuties_Text_Intro[];
+extern const u8 TVSpotTheCuties_Text_RibbonsLow[];
+extern const u8 TVSpotTheCuties_Text_RibbonsMid[];
+extern const u8 TVSpotTheCuties_Text_RibbonsHigh[];
+extern const u8 TVSpotTheCuties_Text_RibbonIntro[];
+extern const u8 TVSpotTheCuties_Text_RibbonChampion[];
+extern const u8 TVSpotTheCuties_Text_RibbonCool[];
+extern const u8 TVSpotTheCuties_Text_RibbonBeauty[];
+extern const u8 TVSpotTheCuties_Text_RibbonCute[];
+extern const u8 TVSpotTheCuties_Text_RibbonSmart[];
+extern const u8 TVSpotTheCuties_Text_RibbonTough[];
+extern const u8 TVSpotTheCuties_Text_RibbonWinning[];
+extern const u8 TVSpotTheCuties_Text_RibbonVictory[];
+extern const u8 TVSpotTheCuties_Text_RibbonArtist[];
+extern const u8 TVSpotTheCuties_Text_RibbonEffort[];
+extern const u8 TVSpotTheCuties_Text_Outro[];
 extern const u8 gTVPokemonNewsBattleFrontierText00[];
 extern const u8 gTVPokemonNewsBattleFrontierText01[];
 extern const u8 gTVPokemonNewsBattleFrontierText02[];
@@ -344,10 +344,10 @@ extern const u8 gTVInSearchOfTrainersText05[];
 extern const u8 gTVInSearchOfTrainersText06[];
 extern const u8 gTVInSearchOfTrainersText07[];
 extern const u8 gTVInSearchOfTrainersText08[];
-extern const u8 gTVPokemonContestLiveUpdates2Text00[];
-extern const u8 gTVPokemonContestLiveUpdates2Text01[];
-extern const u8 gTVPokemonContestLiveUpdates2Text02[];
-extern const u8 gTVPokemonContestLiveUpdates2Text03[];
+extern const u8 ContestLadyShow_Text_Intro[];
+extern const u8 ContestLadyShow_Text_Won[];
+extern const u8 ContestLadyShow_Text_Lost[];
+extern const u8 ContestLadyShow_Text_LostBadly[];
 extern const u8 gPokeNewsTextSlateport_Upcoming[];
 extern const u8 gPokeNewsTextSlateport_Ongoing[];
 extern const u8 gPokeNewsTextSlateport_Ending[];
@@ -607,7 +607,7 @@ extern const u8 EventScript_BattleColosseum_2P_PlayerSpot0[];
 extern const u8 EventScript_BattleColosseum_2P_PlayerSpot1[];
 extern const u8 EventScript_TradeCenter_Chair1[];
 extern const u8 EventScript_TradeCenter_Chair0[];
-extern const u8 EventScript_ConfirmLeaveTradeRoom[];
+extern const u8 EventScript_ConfirmLeaveCableClubRoom[];
 extern const u8 EventScript_TerminateLink[];
 
 #endif // GUARD_EVENT_SCRIPTS_H