dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up mauville_old_man, drop ScrSpecial prefix

Browse Source
This commit is contained in:
GriffinR
2021-10-18 00:08:36 -04:00
parent ed6fdd743f
commit db8ce5d7f9
9 changed files with 457 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ MauvilleCity_PokemonCenter_1F_OnTransition:
end end
MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx:: MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx::
special ScrSpecial_SetMauvilleOldManObjEventGfx special SetMauvilleOldManObjEventGfx
end end
MauvilleCity_PokemonCenter_1F_EventScript_Nurse:: MauvilleCity_PokemonCenter_1F_EventScript_Nurse::
data/scripts/mauville_man.inc
+27 -26
View File
@@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan:: MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan::
special ScrSpecial_GetCurrentMauvilleMan special Script_GetCurrentMauvilleMan
switch VAR_RESULT switch VAR_RESULT
case MAUVILLE_MAN_BARD, MauvilleCity_PokemonCenter_1F_EventScript_Bard case MAUVILLE_MAN_BARD, MauvilleCity_PokemonCenter_1F_EventScript_Bard
case MAUVILLE_MAN_HIPSTER, MauvilleCity_PokemonCenter_1F_EventScript_Hipster case MAUVILLE_MAN_HIPSTER, MauvilleCity_PokemonCenter_1F_EventScript_Hipster
@@ -21,9 +21,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_Bard::
MauvilleCity_PokemonCenter_1F_EventScript_PlaySong:: MauvilleCity_PokemonCenter_1F_EventScript_PlaySong::
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special ScrSpecial_PlayBardSong special PlayBardSong
delay 60 delay 60
special ScrSpecial_HasBardSongBeenChanged special HasBardSongBeenChanged
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics
msgbox MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers, MSGBOX_DEFAULT
@@ -52,12 +52,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics::
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics
msgbox MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou, MSGBOX_DEFAULT
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
special ScrSpecial_PlayBardSong special PlayBardSong
delay 60 delay 60
msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics
special ScrSpecial_SaveBardSongLyrics special SaveBardSongLyrics
msgbox MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile, MSGBOX_DEFAULT
release release
end end
@@ -73,7 +73,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Hipster::
faceplayer faceplayer
setflag FLAG_SYS_HIPSTER_MEET setflag FLAG_SYS_HIPSTER_MEET
msgbox MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening, MSGBOX_DEFAULT
special ScrSpecial_GetHipsterSpokenFlag special GetHipsterSpokenFlag
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord
msgbox MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou, MSGBOX_DEFAULT
@@ -81,7 +81,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Hipster::
end end
MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord:: MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord::
special ScrSpecial_HipsterTeachWord special HipsterTryTeachWord
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TeachWord goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TeachWord
msgbox MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach, MSGBOX_DEFAULT
@@ -90,7 +90,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord::
MauvilleCity_PokemonCenter_1F_EventScript_TeachWord:: MauvilleCity_PokemonCenter_1F_EventScript_TeachWord::
msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase, MSGBOX_DEFAULT
special ScrSpecial_SetHipsterSpokenFlag special SetHipsterSpokenFlag
release release
end end
@@ -160,7 +160,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Trader::
msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade
special ScrSpecial_GetTraderTradedFlag special GetTraderTradedFlag
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded
message MauvilleCity_PokemonCenter_1F_Text_PickADecorItem message MauvilleCity_PokemonCenter_1F_Text_PickADecorItem
@@ -179,7 +179,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded::
end end
MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive:: MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive::
special ScrSpecial_TraderMenuGetDecoration special TraderMenuGetDecoration
waitstate waitstate
compare VAR_0x8004, 0 compare VAR_0x8004, 0
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor
@@ -188,7 +188,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive::
msgbox MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt, MSGBOX_YESNO msgbox MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor
special ScrSpecial_DoesPlayerHaveNoDecorations special DoesPlayerHaveNoDecorations
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor
goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive
@@ -218,19 +218,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor::
MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive:: MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive::
msgbox MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade, MSGBOX_DEFAULT
special ScrSpecial_TraderMenuGiveDecoration special TraderShowDecorationMenu
waitstate waitstate
compare VAR_0x8006, 0 compare VAR_0x8006, 0
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor
compare VAR_0x8006, 0xFFFF compare VAR_0x8006, 0xFFFF
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse
special ScrSpecial_IsDecorationFull special IsDecorationCategoryFull
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor
msgbox MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor, MSGBOX_YESNO msgbox MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive
special ScrSpecial_TraderDoDecorationTrade special TraderDoDecorationTrade
msgbox MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC, MSGBOX_DEFAULT
release release
end end
@@ -818,20 +818,20 @@ MauvilleCity_PokemonCenter_1F_EventScript_Storyteller::
msgbox MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale, MSGBOX_YESNO msgbox MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot specialvar VAR_RESULT, StorytellerGetFreeStorySlot
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales
message MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell message MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell
waitmessage waitmessage
special ScrSpecial_StorytellerStoryListMenu special StorytellerStoryListMenu
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
special ScrSpecial_StorytellerDisplayStory special Script_StorytellerDisplayStory
waitmessage waitmessage
waitbuttonpress waitbuttonpress
specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat specialvar VAR_RESULT, StorytellerUpdateStat
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales
goto MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale goto MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale
@@ -842,7 +842,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection::
MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales:: MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales::
msgbox MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends, MSGBOX_DEFAULT
specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded specialvar VAR_RESULT, HasStorytellerAlreadyRecorded
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd
goto MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales goto MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales
@@ -853,7 +853,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales::
msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales, MSGBOX_YESNO msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat specialvar VAR_RESULT, Script_StorytellerInitializeRandomStat
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale
msgbox MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend, MSGBOX_DEFAULT msgbox MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend, MSGBOX_DEFAULT
@@ -909,7 +909,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Giddy::
end end
MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale:: MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale::
special ScrSpecial_GiddyShouldTellAnotherTale special GiddyShouldTellAnotherTale
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
@@ -917,7 +917,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale::
end end
MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale:: MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale::
special ScrSpecial_GiddyShouldTellAnotherTale special GiddyShouldTellAnotherTale
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
@@ -929,15 +929,16 @@ MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale::
goto MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale goto MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale
end end
@ Regardless of whether yes or no is selected below, Giddy will continue to tell stories until he's told 10 @ Giddy will continue to tell stories regardless of whether yes or no is selected below.
@ Each story there is a 10% chance it will be his last. Otherwise he will stop at 10 stories.
MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale:: MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale::
special ScrSpecial_GenerateGiddyLine special GenerateGiddyLine
special ShowFieldMessageStringVar4 special ShowFieldMessageStringVar4
waitmessage waitmessage
yesnobox 20, 8 yesnobox 20, 8
compare VAR_RESULT, 1 compare VAR_RESULT, YES
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale
compare VAR_RESULT, 0 compare VAR_RESULT, NO
goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale
end end
data/specials.inc
+22 -22
View File
@@ -108,28 +108,28 @@ gSpecials::
def_special DoWateringBerryTreeAnim def_special DoWateringBerryTreeAnim
def_special ShowEasyChatScreen def_special ShowEasyChatScreen
def_special ShowEasyChatProfile def_special ShowEasyChatProfile
def_special ScrSpecial_GetCurrentMauvilleMan def_special Script_GetCurrentMauvilleMan
def_special ScrSpecial_HasBardSongBeenChanged def_special HasBardSongBeenChanged
def_special ScrSpecial_SaveBardSongLyrics def_special SaveBardSongLyrics
def_special ScrSpecial_GetHipsterSpokenFlag def_special GetHipsterSpokenFlag
def_special ScrSpecial_SetHipsterSpokenFlag def_special SetHipsterSpokenFlag
def_special ScrSpecial_HipsterTeachWord def_special HipsterTryTeachWord
def_special ScrSpecial_PlayBardSong def_special PlayBardSong
def_special ScrSpecial_SetMauvilleOldManObjEventGfx def_special SetMauvilleOldManObjEventGfx
def_special ScrSpecial_GenerateGiddyLine def_special GenerateGiddyLine
def_special ScrSpecial_GiddyShouldTellAnotherTale def_special GiddyShouldTellAnotherTale
def_special ScrSpecial_StorytellerGetFreeStorySlot def_special StorytellerGetFreeStorySlot
def_special ScrSpecial_StorytellerDisplayStory def_special Script_StorytellerDisplayStory
def_special ScrSpecial_StorytellerStoryListMenu def_special StorytellerStoryListMenu
def_special ScrSpecial_StorytellerUpdateStat def_special StorytellerUpdateStat
def_special ScrSpecial_StorytellerInitializeRandomStat def_special Script_StorytellerInitializeRandomStat
def_special ScrSpecial_HasStorytellerAlreadyRecorded def_special HasStorytellerAlreadyRecorded
def_special ScrSpecial_TraderMenuGetDecoration def_special TraderMenuGetDecoration
def_special ScrSpecial_GetTraderTradedFlag def_special GetTraderTradedFlag
def_special ScrSpecial_DoesPlayerHaveNoDecorations def_special DoesPlayerHaveNoDecorations
def_special ScrSpecial_IsDecorationFull def_special IsDecorationCategoryFull
def_special ScrSpecial_TraderMenuGiveDecoration def_special TraderShowDecorationMenu
def_special ScrSpecial_TraderDoDecorationTrade def_special TraderDoDecorationTrade
def_special GetSeedotSizeRecordInfo def_special GetSeedotSizeRecordInfo
def_special CompareSeedotSize def_special CompareSeedotSize
def_special GetLotadSizeRecordInfo def_special GetLotadSizeRecordInfo
include/constants/global.h
+1
View File
@@ -95,6 +95,7 @@
#define BARD_SONG_LENGTH 6 #define BARD_SONG_LENGTH 6
#define NUM_STORYTELLER_TALES 4 #define NUM_STORYTELLER_TALES 4
#define NUM_TRADER_ITEMS 4 #define NUM_TRADER_ITEMS 4
#define GIDDY_MAX_TALES 10
#define OPTIONS_BUTTON_MODE_NORMAL 0 #define OPTIONS_BUTTON_MODE_NORMAL 0
#define OPTIONS_BUTTON_MODE_LR 1 #define OPTIONS_BUTTON_MODE_LR 1
include/global.h
+1 -1
View File
@@ -639,7 +639,7 @@ struct MauvilleManGiddy
/*0x00*/ u8 id; /*0x00*/ u8 id;
/*0x01*/ u8 taleCounter; /*0x01*/ u8 taleCounter;
/*0x02*/ u8 questionNum; /*0x02*/ u8 questionNum;
/*0x04*/ u16 randomWords[10]; /*0x04*/ u16 randomWords[GIDDY_MAX_TALES];
/*0x18*/ u8 questionList[8]; /*0x18*/ u8 questionList[8];
/*0x20*/ u8 language; /*0x20*/ u8 language;
}; /*size = 0x2C*/ }; /*size = 0x2C*/
include/mauville_old_man.h
+1 -1
View File
@@ -5,7 +5,7 @@ extern struct BardSong gBardSong;
void SetMauvilleOldMan(void); void SetMauvilleOldMan(void);
u8 GetCurrentMauvilleOldMan(void); u8 GetCurrentMauvilleOldMan(void);
void ScrSpecial_SetMauvilleOldManObjEventGfx(void); void SetMauvilleOldManObjEventGfx(void);
u8 sub_81201C8(void); u8 sub_81201C8(void);
void SanitizeMauvilleOldManForRuby(OldMan *dest); void SanitizeMauvilleOldManForRuby(OldMan *dest);
void sub_8120670(void); void sub_8120670(void);
include/wild_encounter.h
-1
View File
@@ -33,7 +33,6 @@ extern const struct WildPokemonHeader gWildMonHeaders[];
void DisableWildEncounters(bool8 disabled); void DisableWildEncounters(bool8 disabled);
bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior); bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior);
void ScrSpecial_RockSmashWildEncounter(void);
bool8 SweetScentWildEncounter(void); bool8 SweetScentWildEncounter(void);
bool8 DoesCurrentMapHaveFishingMons(void); bool8 DoesCurrentMapHaveFishingMons(void);
void FishingWildEncounter(u8 rod); void FishingWildEncounter(u8 rod);
src/mauville_old_man.c
+398 -423
View File
File diff suppressed because it is too large Load Diff
src/trader.c
+6 -6
View File
@@ -130,13 +130,13 @@ void Task_HandleGetDecorationMenuInput(u8 taskId)
} }
} }
void ScrSpecial_GetTraderTradedFlag(void) void GetTraderTradedFlag(void)
{ {
struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader; struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
gSpecialVar_Result = trader->alreadyTraded; gSpecialVar_Result = trader->alreadyTraded;
} }
void ScrSpecial_DoesPlayerHaveNoDecorations(void) void DoesPlayerHaveNoDecorations(void)
{ {
u8 i; u8 i;
@@ -151,7 +151,7 @@ void ScrSpecial_DoesPlayerHaveNoDecorations(void)
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
void ScrSpecial_IsDecorationFull(void) void IsDecorationCategoryFull(void)
{ {
gSpecialVar_Result = FALSE; gSpecialVar_Result = FALSE;
if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
@@ -162,7 +162,7 @@ void ScrSpecial_IsDecorationFull(void)
} }
} }
void ScrSpecial_TraderMenuGiveDecoration(void) void TraderShowDecorationMenu(void)
{ {
CreateTask(ShowDecorationCategoriesWindow, 0); CreateTask(ShowDecorationCategoriesWindow, 0);
} }
@@ -190,7 +190,7 @@ void ExitTraderMenu(u8 taskId)
EnableBothScriptContexts(); EnableBothScriptContexts();
} }
void ScrSpecial_TraderDoDecorationTrade(void) void TraderDoDecorationTrade(void)
{ {
struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader; struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
@@ -202,7 +202,7 @@ void ScrSpecial_TraderDoDecorationTrade(void)
trader->alreadyTraded = TRUE; trader->alreadyTraded = TRUE;
} }
void ScrSpecial_TraderMenuGetDecoration(void) void TraderMenuGetDecoration(void)
{ {
u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0); u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0);
CreateAvailableDecorationsMenu(taskId); CreateAvailableDecorationsMenu(taskId);