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/trader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/trader.c') diff --git a/src/trader.c b/src/trader.c index c4d70ac9a..2cb74b23c 100644 --- a/src/trader.c +++ b/src/trader.c @@ -130,13 +130,13 @@ void Task_HandleGetDecorationMenuInput(u8 taskId) } } -void ScrSpecial_GetTraderTradedFlag(void) +void Special_GetTraderTradedFlag(void) { struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader; gSpecialVar_Result = trader->alreadyTraded; } -void ScrSpecial_DoesPlayerHaveNoDecorations(void) +void Special_DoesPlayerHaveNoDecorations(void) { u8 i; @@ -151,7 +151,7 @@ void ScrSpecial_DoesPlayerHaveNoDecorations(void) gSpecialVar_Result = TRUE; } -void ScrSpecial_IsDecorationFull(void) +void Special_IsDecorationFull(void) { gSpecialVar_Result = FALSE; if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category @@ -162,7 +162,7 @@ void ScrSpecial_IsDecorationFull(void) } } -void ScrSpecial_TraderMenuGiveDecoration(void) +void Special_TraderMenuGiveDecoration(void) { CreateTask(sub_8127208, 0); } @@ -190,7 +190,7 @@ void sub_8133E1C(u8 taskId) EnableBothScriptContexts(); } -void ScrSpecial_TraderDoDecorationTrade(void) +void Special_TraderDoDecorationTrade(void) { struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader; @@ -202,7 +202,7 @@ void ScrSpecial_TraderDoDecorationTrade(void) trader->alreadyTraded = TRUE; } -void ScrSpecial_TraderMenuGetDecoration(void) +void Special_TraderMenuGetDecoration(void) { u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0); CreateAvailableDecorationsMenu(taskId); -- 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/trader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/trader.c') diff --git a/src/trader.c b/src/trader.c index 2cb74b23c..c4d70ac9a 100644 --- a/src/trader.c +++ b/src/trader.c @@ -130,13 +130,13 @@ void Task_HandleGetDecorationMenuInput(u8 taskId) } } -void Special_GetTraderTradedFlag(void) +void ScrSpecial_GetTraderTradedFlag(void) { struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader; gSpecialVar_Result = trader->alreadyTraded; } -void Special_DoesPlayerHaveNoDecorations(void) +void ScrSpecial_DoesPlayerHaveNoDecorations(void) { u8 i; @@ -151,7 +151,7 @@ void Special_DoesPlayerHaveNoDecorations(void) gSpecialVar_Result = TRUE; } -void Special_IsDecorationFull(void) +void ScrSpecial_IsDecorationFull(void) { gSpecialVar_Result = FALSE; if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category @@ -162,7 +162,7 @@ void Special_IsDecorationFull(void) } } -void Special_TraderMenuGiveDecoration(void) +void ScrSpecial_TraderMenuGiveDecoration(void) { CreateTask(sub_8127208, 0); } @@ -190,7 +190,7 @@ void sub_8133E1C(u8 taskId) EnableBothScriptContexts(); } -void Special_TraderDoDecorationTrade(void) +void ScrSpecial_TraderDoDecorationTrade(void) { struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader; @@ -202,7 +202,7 @@ void Special_TraderDoDecorationTrade(void) trader->alreadyTraded = TRUE; } -void Special_TraderMenuGetDecoration(void) +void ScrSpecial_TraderMenuGetDecoration(void) { u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0); CreateAvailableDecorationsMenu(taskId); -- 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/trader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/trader.c') diff --git a/src/trader.c b/src/trader.c index c4d70ac9a..f081d7e95 100644 --- a/src/trader.c +++ b/src/trader.c @@ -77,11 +77,11 @@ void CreateAvailableDecorationsMenu(u8 taskId) for (i = 0; i < 4; i++) { if (trader->decorIds[i] > NUM_DECORATIONS) - PrintTextOnWindow(data[3], 1, gText_FiveMarks, 8, 16 * i + 1, 255, NULL); + AddTextPrinterParameterized(data[3], 1, gText_FiveMarks, 8, 16 * i + 1, 255, NULL); else - PrintTextOnWindow(data[3], 1, gDecorations[trader->decorIds[i]].name, 8, 16 * i + 1, 255, NULL); + AddTextPrinterParameterized(data[3], 1, gDecorations[trader->decorIds[i]].name, 8, 16 * i + 1, 255, NULL); } - PrintTextOnWindow(data[3], 1, gText_Exit, 8, 16 * i + 1, 255, NULL); + AddTextPrinterParameterized(data[3], 1, gText_Exit, 8, 16 * i + 1, 255, NULL); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[3], 5, 0); schedule_bg_copy_tilemap_to_vram(0); } -- cgit v1.2.3