mirror of
https://github.com/pret/pokeemerald.git
synced 2026-09-30 22:07:24 -05:00
merge with pret
This commit is contained in:
@@ -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[];
|
||||
@@ -382,27 +382,27 @@ extern const u8 EventScript_UseRockSmash[];
|
||||
extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC[];
|
||||
extern const u8 LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC[];
|
||||
|
||||
//mauville_old_man
|
||||
extern const u8 gOtherText_Is[];
|
||||
extern const u8 gOtherText_DontYouAgree[];
|
||||
extern const u8 gText_SoPretty[];
|
||||
extern const u8 gText_SoDarling[];
|
||||
extern const u8 gText_SoRelaxed[];
|
||||
extern const u8 gText_SoSunny[];
|
||||
extern const u8 gText_SoDesirable[];
|
||||
extern const u8 gText_SoExciting[];
|
||||
extern const u8 gText_SoAmusing[];
|
||||
extern const u8 gText_SoMagical[];
|
||||
extern const u8 gMauvilleManText_ISoWantToGoOnAVacation[];
|
||||
extern const u8 gMauvilleManText_IBoughtCrayonsWith120Colors[];
|
||||
extern const u8 gMauvilleManText_WouldntItBeNiceIfWeCouldFloat[];
|
||||
extern const u8 gMauvilleManText_WhenYouWriteOnASandyBeach[];
|
||||
extern const u8 gMauvilleManText_WhatsTheBottomOfTheSeaLike[];
|
||||
extern const u8 gMauvilleManText_WhenYouSeeTheSettingSunDoesIt[];
|
||||
extern const u8 gMauvilleManText_LyingBackInTheGreenGrass[];
|
||||
extern const u8 gMauvilleManText_SecretBasesAreSoWonderful[];
|
||||
// Mauville Old Man (Giddy)
|
||||
extern const u8 GiddyText_Is[];
|
||||
extern const u8 GiddyText_DontYouAgree[];
|
||||
extern const u8 GiddyText_SoPretty[];
|
||||
extern const u8 GiddyText_SoDarling[];
|
||||
extern const u8 GiddyText_SoRelaxed[];
|
||||
extern const u8 GiddyText_SoSunny[];
|
||||
extern const u8 GiddyText_SoDesirable[];
|
||||
extern const u8 GiddyText_SoExciting[];
|
||||
extern const u8 GiddyText_SoAmusing[];
|
||||
extern const u8 GiddyText_SoMagical[];
|
||||
extern const u8 GiddyText_ISoWantToGoOnAVacation[];
|
||||
extern const u8 GiddyText_IBoughtCrayonsWith120Colors[];
|
||||
extern const u8 GiddyText_WouldntItBeNiceIfWeCouldFloat[];
|
||||
extern const u8 GiddyText_WhenYouWriteOnASandyBeach[];
|
||||
extern const u8 GiddyText_WhatsTheBottomOfTheSeaLike[];
|
||||
extern const u8 GiddyText_WhenYouSeeTheSettingSunDoesIt[];
|
||||
extern const u8 GiddyText_LyingBackInTheGreenGrass[];
|
||||
extern const u8 GiddyText_SecretBasesAreSoWonderful[];
|
||||
|
||||
// mauville old man storyteller
|
||||
// Mauville Old Man (storyteller)
|
||||
extern const u8 MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle[];
|
||||
extern const u8 MauvilleCity_PokemonCenter_1F_Text_SavedGameAction[];
|
||||
extern const u8 MauvilleCity_PokemonCenter_1F_Text_SavedGameStory[];
|
||||
|
||||
Reference in New Issue
Block a user