ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix backwards names

Browse Source
This commit is contained in:
Phlosioneer 2019-02-26 22:30:40 -05:00
parent 44e92ce259
commit 6cb4c677cd
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/rom_8011DC0.s
View File

@ -563,7 +563,7 @@ _080170CA:
negs r0, r0 negs r0, r0
b _08017110 b _08017110
_080170D4: _080170D4:
bl DisplayYesNoMenuWithDefault bl DisplayYesNoMenuDefaultYes
ldrb r0, [r4] ldrb r0, [r4]
adds r0, 0x1 adds r0, 0x1
strb r0, [r4] strb r0, [r4]
@ -26550,7 +26550,7 @@ _08024246:
strb r0, [r5, 0xC] strb r0, [r5, 0xC]
b _080242D8 b _080242D8
_0802426A: _0802426A:
bl DisplayYesNoMenuWithDefault bl DisplayYesNoMenuDefaultYes
b _080242D0 b _080242D0
_08024270: _08024270:
bl Menu_ProcessInputNoWrapClearOnChoose bl Menu_ProcessInputNoWrapClearOnChoose

4
include/menu.h
View File

@ -32,7 +32,7 @@ void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram); void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
void SetStandardWindowBorderStyle(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1);
void DisplayYesNoMenuWithDefault(void); void DisplayYesNoMenuDefaultYes(void);
u32 GetPlayerTextSpeed(void); u32 GetPlayerTextSpeed(void);
u8 GetPlayerTextSpeedDelay(void); u8 GetPlayerTextSpeedDelay(void);
void sub_81978B0(u16 arg0); void sub_81978B0(u16 arg0);
@ -81,7 +81,7 @@ u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numC
void sub_819786C(u8 windowId, bool8 copyToVram); void sub_819786C(u8 windowId, bool8 copyToVram);
void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress); void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress);
void RemoveStartMenuWindow(void); void RemoveStartMenuWindow(void);
void DisplayYesNoMenuWithDefaultDefaultNo(u8 initialCursorPos); void DisplayYesNoMenuWithDefault(u8 initialCursorPos);
void sub_819A344(u8 a0, u8 *dest, u8 color); void sub_819A344(u8 a0, u8 *dest, u8 color);
void RemoveMapNamePopUpWindow(void); void RemoveMapNamePopUpWindow(void);
u8 GetMapNamePopUpWindowId(void); u8 GetMapNamePopUpWindowId(void);

10
src/decoration.c
View File

@ -1628,7 +1628,7 @@ void sub_8128950(u8 taskId)
void sub_81289D0(u8 taskId) void sub_81289D0(u8 taskId)
{ {
DisplayYesNoMenuWithDefault(); DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A72C4); DoYesNoFuncWithChoice(taskId, &gUnknown_085A72C4);
} }
@ -1693,7 +1693,7 @@ void sub_8128AAC(u8 taskId)
void sub_8128B80(u8 taskId) void sub_8128B80(u8 taskId)
{ {
DisplayYesNoMenuWithDefault(); DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A72CC); DoYesNoFuncWithChoice(taskId, &gUnknown_085A72CC);
} }
@ -2588,7 +2588,7 @@ void sub_812A0E8(u8 taskId)
void sub_812A1A0(u8 taskId) void sub_812A1A0(u8 taskId)
{ {
DisplayYesNoMenuWithDefault(); DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A7348); DoYesNoFuncWithChoice(taskId, &gUnknown_085A7348);
} }
@ -2601,7 +2601,7 @@ void sub_812A1C0(u8 taskId)
void sub_812A1F0(u8 taskId) void sub_812A1F0(u8 taskId)
{ {
DisplayYesNoMenuWithDefault(); DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A7350); DoYesNoFuncWithChoice(taskId, &gUnknown_085A7350);
} }
@ -2725,7 +2725,7 @@ void sub_812A3D4(u8 taskId)
void sub_812A458(u8 taskId) void sub_812A458(u8 taskId)
{ {
DisplayYesNoMenuWithDefault(); DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A741C); DoYesNoFuncWithChoice(taskId, &gUnknown_085A741C);
} }

4
src/menu.c
View File

@ -458,12 +458,12 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback)
CopyWindowToVram(0, 3); CopyWindowToVram(0, 3);
} }
void DisplayYesNoMenuWithDefault(void) void DisplayYesNoMenuDefaultYes(void)
{ {
CreateYesNoMenu(&sYesNo_WindowTemplates, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0); 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); CreateYesNoMenu(&sYesNo_WindowTemplates, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, initialCursorPos);
} }

2
src/player_pc.c
View File

@ -761,7 +761,7 @@ static void Mailbox_MoveToBag(u8 taskId)
static void Mailbox_DrawYesNoBeforeMove(u8 taskId) static void Mailbox_DrawYesNoBeforeMove(u8 taskId)
{ {
DisplayYesNoMenuWithDefault(); DisplayYesNoMenuDefaultYes();
gTasks[taskId].func = Mailbox_MoveToBagYesNoPrompt; gTasks[taskId].func = Mailbox_MoveToBagYesNoPrompt;
} }

4
src/roulette.c
View File

@ -1043,7 +1043,7 @@ static void sub_81408A8(u8 taskId)
static void sub_8140914(u8 taskId) static void sub_8140914(u8 taskId)
{ {
DisplayYesNoMenuWithDefault(); DisplayYesNoMenuDefaultYes();
DrawStdWindowFrame(gUnknown_0203AB8C, 0); DrawStdWindowFrame(gUnknown_0203AB8C, 0);
AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C13, 0, 1, TEXT_SPEED_FF, 0); AddTextPrinterParameterized(gUnknown_0203AB8C, 1, gUnknown_082A5C13, 0, 1, TEXT_SPEED_FF, 0);
CopyWindowToVram(gUnknown_0203AB8C, 3); CopyWindowToVram(gUnknown_0203AB8C, 3);
@ -3256,7 +3256,7 @@ static const struct SpriteTemplate gUnknown_085B7AEC =
static void sub_81428C4(u8 r0) static void sub_81428C4(u8 r0)
{ {
DisplayYesNoMenuWithDefault(); DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(r0, &gUnknown_085B6408); DoYesNoFuncWithChoice(r0, &gUnknown_085B6408);
} }

2
src/script_menu.c
View File

@ -1202,7 +1202,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top)
else else
{ {
gSpecialVar_Result = 0xFF; gSpecialVar_Result = 0xFF;
DisplayYesNoMenuWithDefault(); DisplayYesNoMenuDefaultYes();
taskId = CreateTask(Task_HandleYesNoInput, 0x50); taskId = CreateTask(Task_HandleYesNoInput, 0x50);
return TRUE; return TRUE;
} }

2
src/secret_base.c
View File

@ -1033,7 +1033,7 @@ void sub_80E9FFC(u8 taskId)
void sub_80EA06C(u8 taskId) void sub_80EA06C(u8 taskId)
{ {
DisplayYesNoMenuWithDefault(); DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_0858D058); DoYesNoFuncWithChoice(taskId, &gUnknown_0858D058);
} }

8
src/start_menu.c
View File

@ -961,7 +961,7 @@ static u8 SaveConfirmSaveCallback(void)
static u8 SaveYesNoCallback(void) static u8 SaveYesNoCallback(void)
{ {
DisplayYesNoMenuWithDefault(); // Show Yes/No menu DisplayYesNoMenuDefaultYes(); // Show Yes/No menu
sSaveDialogCallback = SaveConfirmInputCallback; sSaveDialogCallback = SaveConfirmInputCallback;
return SAVE_IN_PROGRESS; return SAVE_IN_PROGRESS;
} }
@ -1014,14 +1014,14 @@ static u8 SaveFileExistsCallback(void)
static u8 SaveConfirmOverwriteDefaultNoCallback(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; sSaveDialogCallback = SaveOverwriteInputCallback;
return SAVE_IN_PROGRESS; return SAVE_IN_PROGRESS;
} }
static u8 SaveConfirmOverwriteCallback(void) static u8 SaveConfirmOverwriteCallback(void)
{ {
DisplayYesNoMenuWithDefault(); // Show Yes/No menu DisplayYesNoMenuDefaultYes(); // Show Yes/No menu
sSaveDialogCallback = SaveOverwriteInputCallback; sSaveDialogCallback = SaveOverwriteInputCallback;
return SAVE_IN_PROGRESS; return SAVE_IN_PROGRESS;
} }
@ -1144,7 +1144,7 @@ static u8 BattlePyramidConfirmRetireCallback(void)
static u8 BattlePyramidRetireYesNoCallback(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; sSaveDialogCallback = BattlePyramidRetireInputCallback;
return SAVE_IN_PROGRESS; return SAVE_IN_PROGRESS;