summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-26 22:30:40 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-26 22:30:40 -0500
commit6cb4c677cdf156d9d78f5f27bf3168882c1447ec (patch)
treec0c7b844aeb25653d5d1dd5e2dcbef2bbdd213b1 /src
parent44e92ce2596981c8d42b70922e5ae84d6b321ab1 (diff)
Fix backwards names
Diffstat (limited to 'src')
-rw-r--r--src/decoration.c10
-rw-r--r--src/menu.c4
-rw-r--r--src/player_pc.c2
-rw-r--r--src/roulette.c4
-rw-r--r--src/script_menu.c2
-rw-r--r--src/secret_base.c2
-rw-r--r--src/start_menu.c8
7 files changed, 16 insertions, 16 deletions
diff --git a/src/decoration.c b/src/decoration.c
index 98c3ef028..207cb1bf0 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1628,7 +1628,7 @@ void sub_8128950(u8 taskId)
void sub_81289D0(u8 taskId)
{
- DisplayYesNoMenuWithDefault();
+ DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A72C4);
}
@@ -1693,7 +1693,7 @@ void sub_8128AAC(u8 taskId)
void sub_8128B80(u8 taskId)
{
- DisplayYesNoMenuWithDefault();
+ DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A72CC);
}
@@ -2588,7 +2588,7 @@ void sub_812A0E8(u8 taskId)
void sub_812A1A0(u8 taskId)
{
- DisplayYesNoMenuWithDefault();
+ DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A7348);
}
@@ -2601,7 +2601,7 @@ void sub_812A1C0(u8 taskId)
void sub_812A1F0(u8 taskId)
{
- DisplayYesNoMenuWithDefault();
+ DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A7350);
}
@@ -2725,7 +2725,7 @@ void sub_812A3D4(u8 taskId)
void sub_812A458(u8 taskId)
{
- DisplayYesNoMenuWithDefault();
+ DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A741C);
}
diff --git a/src/menu.c b/src/menu.c
index 39d6f3fd1..753bd52a9 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -458,12 +458,12 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback)
CopyWindowToVram(0, 3);
}
-void DisplayYesNoMenuWithDefault(void)
+void DisplayYesNoMenuDefaultYes(void)
{
CreateYesNoMenu(&sYesNo_WindowTemplates, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0);
}
-void DisplayYesNoMenuWithDefaultDefaultNo(u8 initialCursorPos)
+void DisplayYesNoMenuWithDefault(u8 initialCursorPos)
{
CreateYesNoMenu(&sYesNo_WindowTemplates, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, initialCursorPos);
}
diff --git a/src/player_pc.c b/src/player_pc.c
index 6ba5999ce..028101edb 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -761,7 +761,7 @@ static void Mailbox_MoveToBag(u8 taskId)
static void Mailbox_DrawYesNoBeforeMove(u8 taskId)
{
- DisplayYesNoMenuWithDefault();
+ DisplayYesNoMenuDefaultYes();
gTasks[taskId].func = Mailbox_MoveToBagYesNoPrompt;
}
diff --git a/src/roulette.c b/src/roulette.c
index 4723e0687..e099e878c 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -1043,7 +1043,7 @@ static void sub_81408A8(u8 taskId)
static void sub_8140914(u8 taskId)
{
- DisplayYesNoMenuWithDefault();
+ DisplayYesNoMenuDefaultYes();
DrawStdWindowFrame(gUnknown_0203AB8C, 0);
AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C13, 0, 1, TEXT_SPEED_FF, 0);
CopyWindowToVram(gUnknown_0203AB8C, 3);
@@ -3256,7 +3256,7 @@ static const struct SpriteTemplate gUnknown_085B7AEC =
static void sub_81428C4(u8 r0)
{
- DisplayYesNoMenuWithDefault();
+ DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(r0, &gUnknown_085B6408);
}
diff --git a/src/script_menu.c b/src/script_menu.c
index ccbbcdfe1..409191803 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1202,7 +1202,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top)
else
{
gSpecialVar_Result = 0xFF;
- DisplayYesNoMenuWithDefault();
+ DisplayYesNoMenuDefaultYes();
taskId = CreateTask(Task_HandleYesNoInput, 0x50);
return TRUE;
}
diff --git a/src/secret_base.c b/src/secret_base.c
index 342a9960a..f8480fef0 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1033,7 +1033,7 @@ void sub_80E9FFC(u8 taskId)
void sub_80EA06C(u8 taskId)
{
- DisplayYesNoMenuWithDefault();
+ DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_0858D058);
}
diff --git a/src/start_menu.c b/src/start_menu.c
index f88630aee..3fe1b7d61 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -961,7 +961,7 @@ static u8 SaveConfirmSaveCallback(void)
static u8 SaveYesNoCallback(void)
{
- DisplayYesNoMenuWithDefault(); // Show Yes/No menu
+ DisplayYesNoMenuDefaultYes(); // Show Yes/No menu
sSaveDialogCallback = SaveConfirmInputCallback;
return SAVE_IN_PROGRESS;
}
@@ -1014,14 +1014,14 @@ static u8 SaveFileExistsCallback(void)
static u8 SaveConfirmOverwriteDefaultNoCallback(void)
{
- DisplayYesNoMenuWithDefaultDefaultNo(1); // Show Yes/No menu (No selected as default)
+ DisplayYesNoMenuWithDefault(1); // Show Yes/No menu (No selected as default)
sSaveDialogCallback = SaveOverwriteInputCallback;
return SAVE_IN_PROGRESS;
}
static u8 SaveConfirmOverwriteCallback(void)
{
- DisplayYesNoMenuWithDefault(); // Show Yes/No menu
+ DisplayYesNoMenuDefaultYes(); // Show Yes/No menu
sSaveDialogCallback = SaveOverwriteInputCallback;
return SAVE_IN_PROGRESS;
}
@@ -1144,7 +1144,7 @@ static u8 BattlePyramidConfirmRetireCallback(void)
static u8 BattlePyramidRetireYesNoCallback(void)
{
- DisplayYesNoMenuWithDefaultDefaultNo(1); // Show Yes/No menu (No selected as default)
+ DisplayYesNoMenuWithDefault(1); // Show Yes/No menu (No selected as default)
sSaveDialogCallback = BattlePyramidRetireInputCallback;
return SAVE_IN_PROGRESS;