From 658f9351fe9349eb16edab8d5d503ef741449d4a Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 11 Aug 2018 14:58:51 -0700 Subject: Rename some specials --- src/mauville_old_man.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/mauville_old_man.c') diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 591e3ad9a..752e19e9c 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -136,7 +136,7 @@ void SetMauvilleOldMan(void) SetupGiddy(); break; } - ScrSpecial_SetMauvilleOldManEventObjGfx(); + Special_SetMauvilleOldManEventObjGfx(); } u8 GetCurrentMauvilleOldMan(void) @@ -146,12 +146,12 @@ u8 GetCurrentMauvilleOldMan(void) return common->id; } -void ScrSpecial_GetCurrentMauvilleMan(void) +void Special_GetCurrentMauvilleMan(void) { gSpecialVar_Result = GetCurrentMauvilleOldMan(); } -void ScrSpecial_HasBardSongBeenChanged(void) +void Special_HasBardSongBeenChanged(void) { u16 *scriptResult = &gSpecialVar_Result; // why?? struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; @@ -159,7 +159,7 @@ void ScrSpecial_HasBardSongBeenChanged(void) *scriptResult = bard->hasChangedSong; } -void ScrSpecial_SaveBardSongLyrics(void) +void Special_SaveBardSongLyrics(void) { u16 i; struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; @@ -225,13 +225,13 @@ static void PrepareSongText(void) } } -void ScrSpecial_PlayBardSong(void) +void Special_PlayBardSong(void) { StartBardSong(gSpecialVar_0x8004); ScriptContext1_Stop(); } -void ScrSpecial_GetHipsterSpokenFlag(void) +void Special_GetHipsterSpokenFlag(void) { u16 *scriptResult = &gSpecialVar_Result; // again?? struct MauvilleManHipster *hipster = &gSaveBlock1Ptr->oldMan.hipster; @@ -239,14 +239,14 @@ void ScrSpecial_GetHipsterSpokenFlag(void) *scriptResult = hipster->alreadySpoken; } -void ScrSpecial_SetHipsterSpokenFlag(void) +void Special_SetHipsterSpokenFlag(void) { struct MauvilleManHipster *hipster = &gSaveBlock1Ptr->oldMan.hipster; hipster->alreadySpoken = TRUE; } -void ScrSpecial_HipsterTeachWord(void) +void Special_HipsterTeachWord(void) { u16 var = sub_811F01C(); @@ -261,7 +261,7 @@ void ScrSpecial_HipsterTeachWord(void) } } -void ScrSpecial_GiddyShouldTellAnotherTale(void) +void Special_GiddyShouldTellAnotherTale(void) { struct MauvilleManGiddy *giddy = &gSaveBlock1Ptr->oldMan.giddy; @@ -276,7 +276,7 @@ void ScrSpecial_GiddyShouldTellAnotherTale(void) } } -void ScrSpecial_GenerateGiddyLine(void) +void Special_GenerateGiddyLine(void) { struct MauvilleManGiddy *giddy = &gSaveBlock1Ptr->oldMan.giddy; @@ -406,7 +406,7 @@ void ResetMauvilleOldManFlag(void) case MAUVILLE_MAN_GIDDY: break; } - ScrSpecial_SetMauvilleOldManEventObjGfx(); + Special_SetMauvilleOldManEventObjGfx(); } @@ -671,7 +671,7 @@ static void Task_BardSong(u8 taskId) sub_8197224(); } -void ScrSpecial_SetMauvilleOldManEventObjGfx(void) +void Special_SetMauvilleOldManEventObjGfx(void) { VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD); } @@ -1199,24 +1199,24 @@ static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu } // Sets gSpecialVar_Result to TRUE if player selected a story -void ScrSpecial_StorytellerStoryListMenu(void) +void Special_StorytellerStoryListMenu(void) { CreateTask(Task_StoryListMenu, 80); } -void ScrSpecial_StorytellerDisplayStory(void) +void Special_StorytellerDisplayStory(void) { StorytellerDisplayStory(sSelectedStory); } -u8 ScrSpecial_StorytellerGetFreeStorySlot(void) +u8 Special_StorytellerGetFreeStorySlot(void) { sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; return GetFreeStorySlot(); } // Returns TRUE if stat has increased -bool8 ScrSpecial_StorytellerUpdateStat(void) +bool8 Special_StorytellerUpdateStat(void) { u8 r4; sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; @@ -1230,7 +1230,7 @@ bool8 ScrSpecial_StorytellerUpdateStat(void) return FALSE; } -bool8 ScrSpecial_HasStorytellerAlreadyRecorded(void) +bool8 Special_HasStorytellerAlreadyRecorded(void) { sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; @@ -1240,7 +1240,7 @@ bool8 ScrSpecial_HasStorytellerAlreadyRecorded(void) return TRUE; } -bool8 ScrSpecial_StorytellerInitializeRandomStat(void) +bool8 Special_StorytellerInitializeRandomStat(void) { sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; return StorytellerInitializeRandomStat(); -- cgit v1.2.3 From cb9127ccafd894708ede6ece8831de7af483f695 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 11 Aug 2018 15:16:41 -0700 Subject: Revert "Rename some specials" This reverts commit 658f9351fe9349eb16edab8d5d503ef741449d4a. --- src/mauville_old_man.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/mauville_old_man.c') diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 752e19e9c..591e3ad9a 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -136,7 +136,7 @@ void SetMauvilleOldMan(void) SetupGiddy(); break; } - Special_SetMauvilleOldManEventObjGfx(); + ScrSpecial_SetMauvilleOldManEventObjGfx(); } u8 GetCurrentMauvilleOldMan(void) @@ -146,12 +146,12 @@ u8 GetCurrentMauvilleOldMan(void) return common->id; } -void Special_GetCurrentMauvilleMan(void) +void ScrSpecial_GetCurrentMauvilleMan(void) { gSpecialVar_Result = GetCurrentMauvilleOldMan(); } -void Special_HasBardSongBeenChanged(void) +void ScrSpecial_HasBardSongBeenChanged(void) { u16 *scriptResult = &gSpecialVar_Result; // why?? struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; @@ -159,7 +159,7 @@ void Special_HasBardSongBeenChanged(void) *scriptResult = bard->hasChangedSong; } -void Special_SaveBardSongLyrics(void) +void ScrSpecial_SaveBardSongLyrics(void) { u16 i; struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; @@ -225,13 +225,13 @@ static void PrepareSongText(void) } } -void Special_PlayBardSong(void) +void ScrSpecial_PlayBardSong(void) { StartBardSong(gSpecialVar_0x8004); ScriptContext1_Stop(); } -void Special_GetHipsterSpokenFlag(void) +void ScrSpecial_GetHipsterSpokenFlag(void) { u16 *scriptResult = &gSpecialVar_Result; // again?? struct MauvilleManHipster *hipster = &gSaveBlock1Ptr->oldMan.hipster; @@ -239,14 +239,14 @@ void Special_GetHipsterSpokenFlag(void) *scriptResult = hipster->alreadySpoken; } -void Special_SetHipsterSpokenFlag(void) +void ScrSpecial_SetHipsterSpokenFlag(void) { struct MauvilleManHipster *hipster = &gSaveBlock1Ptr->oldMan.hipster; hipster->alreadySpoken = TRUE; } -void Special_HipsterTeachWord(void) +void ScrSpecial_HipsterTeachWord(void) { u16 var = sub_811F01C(); @@ -261,7 +261,7 @@ void Special_HipsterTeachWord(void) } } -void Special_GiddyShouldTellAnotherTale(void) +void ScrSpecial_GiddyShouldTellAnotherTale(void) { struct MauvilleManGiddy *giddy = &gSaveBlock1Ptr->oldMan.giddy; @@ -276,7 +276,7 @@ void Special_GiddyShouldTellAnotherTale(void) } } -void Special_GenerateGiddyLine(void) +void ScrSpecial_GenerateGiddyLine(void) { struct MauvilleManGiddy *giddy = &gSaveBlock1Ptr->oldMan.giddy; @@ -406,7 +406,7 @@ void ResetMauvilleOldManFlag(void) case MAUVILLE_MAN_GIDDY: break; } - Special_SetMauvilleOldManEventObjGfx(); + ScrSpecial_SetMauvilleOldManEventObjGfx(); } @@ -671,7 +671,7 @@ static void Task_BardSong(u8 taskId) sub_8197224(); } -void Special_SetMauvilleOldManEventObjGfx(void) +void ScrSpecial_SetMauvilleOldManEventObjGfx(void) { VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD); } @@ -1199,24 +1199,24 @@ static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu } // Sets gSpecialVar_Result to TRUE if player selected a story -void Special_StorytellerStoryListMenu(void) +void ScrSpecial_StorytellerStoryListMenu(void) { CreateTask(Task_StoryListMenu, 80); } -void Special_StorytellerDisplayStory(void) +void ScrSpecial_StorytellerDisplayStory(void) { StorytellerDisplayStory(sSelectedStory); } -u8 Special_StorytellerGetFreeStorySlot(void) +u8 ScrSpecial_StorytellerGetFreeStorySlot(void) { sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; return GetFreeStorySlot(); } // Returns TRUE if stat has increased -bool8 Special_StorytellerUpdateStat(void) +bool8 ScrSpecial_StorytellerUpdateStat(void) { u8 r4; sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; @@ -1230,7 +1230,7 @@ bool8 Special_StorytellerUpdateStat(void) return FALSE; } -bool8 Special_HasStorytellerAlreadyRecorded(void) +bool8 ScrSpecial_HasStorytellerAlreadyRecorded(void) { sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; @@ -1240,7 +1240,7 @@ bool8 Special_HasStorytellerAlreadyRecorded(void) return TRUE; } -bool8 Special_StorytellerInitializeRandomStat(void) +bool8 ScrSpecial_StorytellerInitializeRandomStat(void) { sStorytellerPtr = &gSaveBlock1Ptr->oldMan.storyteller; return StorytellerInitializeRandomStat(); -- cgit v1.2.3 From 2f59df03ab8dbd5d9edb28b5680cc668aafc6684 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Sep 2018 23:38:30 +0200 Subject: Standartize AddTextPrinterParametrized functions, --- src/mauville_old_man.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mauville_old_man.c') diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 591e3ad9a..6ebc7affa 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -438,7 +438,7 @@ static void BardSong_TextSubPrinter(struct TextSubPrinter * printer, u16 a1) static void sub_8120708(const u8 * src) { NewMenuHelpers_DrawDialogueFrame(0, 0); - PrintTextOnWindow(0, 1, src, 0, 1, 1, BardSong_TextSubPrinter); + AddTextPrinterParameterized(0, 1, src, 0, 1, 1, BardSong_TextSubPrinter); gUnknown_03002F84 = TRUE; CopyWindowToVram(0, 3); } @@ -1160,9 +1160,9 @@ static void PrintStoryList(void) u16 gameStatID = sStorytellerPtr->gameStatIDs[i]; if (gameStatID == 0) break; - PrintTextOnWindow(sStorytellerWindowId, 1, GetStoryTitleByStat(gameStatID), 8, 16 * i + 1, 0xFF, NULL); + AddTextPrinterParameterized(sStorytellerWindowId, 1, GetStoryTitleByStat(gameStatID), 8, 16 * i + 1, 0xFF, NULL); } - PrintTextOnWindow(sStorytellerWindowId, 1, gText_Exit, 8, 16 * i + 1, 0xFF, NULL); + AddTextPrinterParameterized(sStorytellerWindowId, 1, gText_Exit, 8, 16 * i + 1, 0xFF, NULL); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sStorytellerWindowId, GetFreeStorySlot() + 1, 0); CopyWindowToVram(sStorytellerWindowId, 3); } -- cgit v1.2.3 From b860d583e4a5b6fd39e725df998ee9837f7f3029 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 14 Sep 2018 12:15:46 -0500 Subject: Document main_menu --- src/mauville_old_man.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mauville_old_man.c') diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 6ebc7affa..3d3408bbb 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -668,7 +668,7 @@ static void Task_BardSong(u8 taskId) task->tState = 3; break; } - sub_8197224(); + RunTextPrintersAndIsPrinter0Active(); } void ScrSpecial_SetMauvilleOldManEventObjGfx(void) -- cgit v1.2.3