Merge branch 'master' into doc-union

1 files changed, 42 insertions, 40 deletions

diff --git a/include/event_scripts.h b/include/event_scripts.h
index 3340da6f5..1a24aa59d 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -240,48 +240,48 @@ extern const u8 gTVWhatsNo1InHoennTodayText05[];
 extern const u8 gTVWhatsNo1InHoennTodayText06[];
 extern const u8 gTVWhatsNo1InHoennTodayText07[];
 extern const u8 gTVWhatsNo1InHoennTodayText08[];
-extern const u8 TVSecretBaseSecrets_Text_Intro[]; 
+extern const u8 TVSecretBaseSecrets_Text_Intro[];
 extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1[];
 extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2[];
 extern const u8 TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving[];
-extern const u8 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer[]; 
-extern const u8 TVSecretBaseSecrets_Text_PlayerEnjoyedBase[]; 
+extern const u8 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer[];
+extern const u8 TVSecretBaseSecrets_Text_PlayerEnjoyedBase[];
 extern const u8 TVSecretBaseSecrets_Text_PlayerHugeFanOfBase[];
-extern const u8 TVSecretBaseSecrets_Text_Outro[]; 
-extern const u8 TVSecretBaseSecrets_Text_StoppedMoving1[]; 
-extern const u8 TVSecretBaseSecrets_Text_StoppedMoving2[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedChair[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedBalloon[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedTent[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedPlant[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedGoldShield[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSilverShield[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedGlassOrnament[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedTV[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedMudBall[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedBag[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedCushion[]; 
-extern const u8 TVSecretBaseSecrets_Text_HitCushion[]; 
-extern const u8 TVSecretBaseSecrets_Text_HuggedCushion[]; 
-extern const u8 TVSecretBaseSecrets_Text_BattledWon[]; 
-extern const u8 TVSecretBaseSecrets_Text_BattledLost[]; 
-extern const u8 TVSecretBaseSecrets_Text_DeclinedBattle[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedPoster[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedNoteMat[]; 
-extern const u8 TVSecretBaseSecrets_Text_BattledDraw[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSpinMat[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSandOrnament[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedDesk[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedBrick[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSolidBoard[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedFence[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedGlitterMat[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedTire[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedStand[]; 
+extern const u8 TVSecretBaseSecrets_Text_Outro[];
+extern const u8 TVSecretBaseSecrets_Text_StoppedMoving1[];
+extern const u8 TVSecretBaseSecrets_Text_StoppedMoving2[];
+extern const u8 TVSecretBaseSecrets_Text_UsedChair[];
+extern const u8 TVSecretBaseSecrets_Text_UsedBalloon[];
+extern const u8 TVSecretBaseSecrets_Text_UsedTent[];
+extern const u8 TVSecretBaseSecrets_Text_UsedPlant[];
+extern const u8 TVSecretBaseSecrets_Text_UsedGoldShield[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSilverShield[];
+extern const u8 TVSecretBaseSecrets_Text_UsedGlassOrnament[];
+extern const u8 TVSecretBaseSecrets_Text_UsedTV[];
+extern const u8 TVSecretBaseSecrets_Text_UsedMudBall[];
+extern const u8 TVSecretBaseSecrets_Text_UsedBag[];
+extern const u8 TVSecretBaseSecrets_Text_UsedCushion[];
+extern const u8 TVSecretBaseSecrets_Text_HitCushion[];
+extern const u8 TVSecretBaseSecrets_Text_HuggedCushion[];
+extern const u8 TVSecretBaseSecrets_Text_BattledWon[];
+extern const u8 TVSecretBaseSecrets_Text_BattledLost[];
+extern const u8 TVSecretBaseSecrets_Text_DeclinedBattle[];
+extern const u8 TVSecretBaseSecrets_Text_UsedPoster[];
+extern const u8 TVSecretBaseSecrets_Text_UsedNoteMat[];
+extern const u8 TVSecretBaseSecrets_Text_BattledDraw[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSpinMat[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSandOrnament[];
+extern const u8 TVSecretBaseSecrets_Text_UsedDesk[];
+extern const u8 TVSecretBaseSecrets_Text_UsedBrick[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSolidBoard[];
+extern const u8 TVSecretBaseSecrets_Text_UsedFence[];
+extern const u8 TVSecretBaseSecrets_Text_UsedGlitterMat[];
+extern const u8 TVSecretBaseSecrets_Text_UsedTire[];
+extern const u8 TVSecretBaseSecrets_Text_UsedStand[];
 extern const u8 TVSecretBaseSecrets_Text_BrokeDoor[];
-extern const u8 TVSecretBaseSecrets_Text_UsedDoll[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSlide[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedDoll[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSlide[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown[];
 extern const u8 TVSecretBaseSecrets_Text_UsedJumpMat[];
 extern const u8 gTVSafariFanClubText00[];
 extern const u8 gTVSafariFanClubText01[];
@@ -584,9 +584,11 @@ extern const u8 SecretBase_EventScript_ShrubUseSecretPower[];
 extern const u8 TrainerHill_EventScript_TrainerBattle[];
 
 // Item Use
-extern u8 BerryTree_EventScript_ItemUsePlantBerry[];
-extern u8 BerryTree_EventScript_ItemUseWailmerPail[];
-extern u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[];
+extern const u8 BerryTree_EventScript_ItemUsePlantBerry[];
+extern const u8 BerryTree_EventScript_ItemUseWailmerPail[];
+extern const u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[];
+
+extern const u8 EventScript_SelectWithoutRegisteredItem[];
 
 // overworld
 extern const u8 EventScript_WhiteOut[];