From 283084cce49b0bdb65916f35e55654a3b365f452 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 24 Oct 2019 20:49:10 -0400 Subject: script_menu through task_yes_no_maybe --- src/script_menu.c | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 263 insertions(+) create mode 100644 src/script_menu.c (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c new file mode 100644 index 000000000..d375ece08 --- /dev/null +++ b/src/script_menu.c @@ -0,0 +1,263 @@ +#include "global.h" +#include "palette.h" +#include "text.h" +#include "list_menu.h" +#include "menu.h" +#include "task.h" +#include "sound.h" +#include "script_menu.h" +#include "quest_log.h" +#include "window.h" +#include "new_menu_helpers.h" +#include "event_data.h" +#include "script.h" +#include "constants/songs.h" + +struct MultichoiceListStruct +{ + const struct MenuAction *list; + u8 count; +}; + +EWRAM_DATA u8 gUnknown_2039988 = 0; + +void sub_809CA64(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos); +u8 sub_809CBB4(u8 count); +void sub_809CC18(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId); +void sub_809CC98(u8 taskId); +void sub_809CD48(u8 mcId); +void task_yes_no_maybe(u8 taskId); +void sub_809D6B0(u8 windowId); +u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height); + +extern const u8 *const gUnknown_83E072C[]; +extern const u8 *const gUnknown_83E0738[]; +extern const u8 *const gUnknown_83E0748[]; +extern const struct MultichoiceListStruct gUnknown_83E04B0[]; + +u16 sub_809C954(const u8 *str) +{ + return (GetStringWidth(1, str, 0) + 7) / 8; +} + +u8 sub_809C974(const struct ListMenuItem * items, u8 count) +{ + u16 i; + u8 width = sub_809C954(items[0].label); + u8 tmp; + + for (i = 1; i < count; i++) + { + tmp = sub_809C954(items[i].label); + if (width < tmp) + width = tmp; + } + return width; +} + +bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 mcId, u8 ignoreBpress) +{ + if (FuncIsActiveTask(sub_809CC98) == TRUE) + return FALSE; + gSpecialVar_Result = 0xFF; + sub_809CA64(left, top, mcId, ignoreBpress, 0); + return TRUE; +} + +bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 cursorPos) +{ + if (FuncIsActiveTask(sub_809CC98) == TRUE) + return FALSE; + gSpecialVar_Result = 0xFF; + sub_809CA64(left, top, mcId, ignoreBpress, cursorPos); + return TRUE; +} + +void sub_809CA64(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos) +{ + s32 i; + s32 strWidth; + s32 tmp; + u8 width; + u8 height; + u8 count; + u8 windowId; + const struct MenuAction * list; + + if ((ignoreBpress & 2) || sub_81119D4(sub_809D6D4) != TRUE) + { + ignoreBpress &= 1; + count = gUnknown_83E04B0[mcId].count; + list = gUnknown_83E04B0[mcId].list; + strWidth = 0; + for (i = 0; i < count; i++) + { + tmp = GetStringWidth(2, list[i].text, 0); + if (tmp > strWidth) + strWidth = tmp; + } + width = (strWidth + 9) / 8 + 1; + if (left + width > 28) + left = 28 - width; + height = sub_809CBB4(count); + windowId = CreateWindowFromRect(left, top, width, height); + SetStdWindowBorderStyle(windowId, FALSE); + if (mcId == 30 || mcId == 13 || mcId == 41) + MultichoiceList_PrintItems(windowId, 2, 8, 2, 14, count, list, 0, 2); + else + MultichoiceList_PrintItems(windowId, 2, 8, 2, 14, count, list, 0, 2); + Menu_InitCursor(windowId, 2, 0, 2, 14, count, initPos); + sub_809CC18(ignoreBpress, count, windowId, mcId); + ScheduleBgCopyTilemapToVram(0); + } +} + +u8 sub_809CBB4(u8 count) +{ + switch (count) + { + case 0: + return 1; + case 1: + return 2; + case 2: + return 4; + case 3: + return 6; + case 4: + return 7; + case 5: + return 9; + case 6: + return 11; + case 7: + return 13; + case 8: + return 14; + default: + return 1; + } +} + +void sub_809CC18(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId) +{ + u8 taskId; + if (mcId == 39 || mcId == 47 || mcId == 50) + gUnknown_2039988 = 12; + else + gUnknown_2039988 = 0; + taskId = CreateTask(sub_809CC98, 80); + gTasks[taskId].data[4] = ignoreBpress; + if (count > 3) + gTasks[taskId].data[5] = TRUE; + else + gTasks[taskId].data[5] = FALSE; + gTasks[taskId].data[6] = windowId; + gTasks[taskId].data[7] = mcId; + sub_809CD48(mcId); +} + +void sub_809CC98(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + s8 input; + if (!gPaletteFade.active) + { + if (gUnknown_2039988 != 0) + gUnknown_2039988--; + else + { + if (data[5] == FALSE) + input = Menu_ProcessInputNoWrapAround(); + else + input = Menu_ProcessInput(); + if (JOY_NEW(DPAD_UP | DPAD_DOWN)) + sub_809CD48(data[7]); + switch (input) + { + case -2: + return; + case -1: + if (data[4]) + return; + PlaySE(SE_SELECT); + gSpecialVar_Result = 127; + break; + default: + gSpecialVar_Result = input; + break; + } + sub_809D6B0(data[6]); + DestroyTask(taskId); + EnableBothScriptContexts(); + } + } +} + +void sub_809CD48(u8 mcId) +{ + switch (mcId) + { + case 39: + FillWindowPixelBuffer(0, PIXEL_FILL(1)); + AddTextPrinterParameterized2(0, 2, gUnknown_83E072C[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); + break; + case 47: + FillWindowPixelBuffer(0, PIXEL_FILL(1)); + AddTextPrinterParameterized2(0, 2, gUnknown_83E0738[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); + break; + case 50: + FillWindowPixelBuffer(0, PIXEL_FILL(1)); + AddTextPrinterParameterized2(0, 2, gUnknown_83E0748[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); + break; + } +} + +bool8 ScriptMenu_YesNo(u8 unused, u8 stuff) +{ + if (FuncIsActiveTask(task_yes_no_maybe) == TRUE) + return FALSE; + gSpecialVar_Result = 255; + if (!sub_81119D4(sub_809D6D4)) + { + DisplayYesNoMenuDefaultYes(); + CreateTask(task_yes_no_maybe, 80); + } + return TRUE; +} + +bool8 sub_809CE38(void) +{ + if (gSpecialVar_Result == 255) + return FALSE; + else + return TRUE; +} + +void task_yes_no_maybe(u8 taskId) +{ + s8 input; + if (gTasks[taskId].data[2] < 5) + { + gTasks[taskId].data[2]++; + } + else + { + input = Menu_ProcessInputNoWrapClearOnChoose(); + switch (input) + { + case -2: + return; + case -1: + case 1: + PlaySE(SE_SELECT); + gSpecialVar_Result = FALSE; + break; + case 0: + gSpecialVar_Result = TRUE; + break; + } + DestroyTask(taskId); + EnableBothScriptContexts(); + } +} -- cgit v1.2.3 From 0a440d658b2d4a311381b1d297872e7eece7486f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 11:10:08 -0400 Subject: Finish script_menu code decomp --- src/script_menu.c | 428 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 422 insertions(+), 6 deletions(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index d375ece08..4bc7bfec9 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1,7 +1,6 @@ #include "global.h" #include "palette.h" #include "text.h" -#include "list_menu.h" #include "menu.h" #include "task.h" #include "sound.h" @@ -11,7 +10,12 @@ #include "new_menu_helpers.h" #include "event_data.h" #include "script.h" +#include "strings.h" +#include "string_util.h" +#include "field_effect.h" +#include "event_scripts.h" #include "constants/songs.h" +#include "constants/species.h" struct MultichoiceListStruct { @@ -27,6 +31,9 @@ void sub_809CC18(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId); void sub_809CC98(u8 taskId); void sub_809CD48(u8 mcId); void task_yes_no_maybe(u8 taskId); +void sub_809CFDC(u8 taskId); +void sub_809D070(void); +bool8 sub_809D404(void); void sub_809D6B0(u8 windowId); u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height); @@ -34,21 +41,27 @@ extern const u8 *const gUnknown_83E072C[]; extern const u8 *const gUnknown_83E0738[]; extern const u8 *const gUnknown_83E0748[]; extern const struct MultichoiceListStruct gUnknown_83E04B0[]; +extern const struct SpriteSheet sMuseumKabutopsSprSheets[]; +extern const u16 sMuseumKabutopsSprPalette[]; +extern const struct SpriteSheet sMuseumAerodactylSprSheets[]; +extern const u16 sMuseumAerodactylSprPalette[]; +extern const struct SpriteTemplate sMuseumFossilSprTemplate; +extern const u8 *const gUnknown_83E17E0[]; u16 sub_809C954(const u8 *str) { return (GetStringWidth(1, str, 0) + 7) / 8; } -u8 sub_809C974(const struct ListMenuItem * items, u8 count) +u8 sub_809C974(const struct MenuAction * items, u8 count) { u16 i; - u8 width = sub_809C954(items[0].label); + u8 width = sub_809C954(items[0].text); u8 tmp; for (i = 1; i < count; i++) { - tmp = sub_809C954(items[i].label); + tmp = sub_809C954(items[i].text); if (width < tmp) width = tmp; } @@ -84,7 +97,7 @@ void sub_809CA64(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos) u8 windowId; const struct MenuAction * list; - if ((ignoreBpress & 2) || sub_81119D4(sub_809D6D4) != TRUE) + if ((ignoreBpress & 2) || QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4) != TRUE) { ignoreBpress &= 1; count = gUnknown_83E04B0[mcId].count; @@ -218,7 +231,7 @@ bool8 ScriptMenu_YesNo(u8 unused, u8 stuff) if (FuncIsActiveTask(task_yes_no_maybe) == TRUE) return FALSE; gSpecialVar_Result = 255; - if (!sub_81119D4(sub_809D6D4)) + if (!QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4)) { DisplayYesNoMenuDefaultYes(); CreateTask(task_yes_no_maybe, 80); @@ -261,3 +274,406 @@ void task_yes_no_maybe(u8 taskId) EnableBothScriptContexts(); } } + +bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount) +{ + const struct MenuAction * list; + u8 count; + u8 width; + u8 rowCount; + u8 taskId; + if (FuncIsActiveTask(sub_809CFDC) == TRUE) + return FALSE; + gSpecialVar_Result = 255; + if (QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4) != TRUE) + { + list = gUnknown_83E04B0[multichoiceId].list; + count = gUnknown_83E04B0[multichoiceId].count; + width = sub_809C974(list, count) + 1; + rowCount = count / columnCount; + taskId = CreateTask(sub_809CFDC, 80); + gTasks[taskId].data[4] = a4; + gTasks[taskId].data[6] = CreateWindowFromRect(left, top, width * columnCount, rowCount * 2); + SetStdWindowBorderStyle(gTasks[taskId].data[6], FALSE); + MultichoiceGrid_PrintItems(gTasks[taskId].data[6], 1, width * 8, 16, columnCount, rowCount, list); + MultichoiceGrid_InitCursor(gTasks[taskId].data[6], 1, 0, 1, width * 8, columnCount, rowCount, 0); + ScheduleBgCopyTilemapToVram(0); + } + return TRUE; +} + +void sub_809CFDC(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + s8 input = Menu_ProcessInputGridLayout(); + switch (input) + { + case -2: + return; + case -1: + if (data[4]) + return; + PlaySE(SE_SELECT); + gSpecialVar_Result = 127; + break; + default: + gSpecialVar_Result = input; + break; + } + sub_809D6B0(data[6]); + DestroyTask(taskId); + EnableBothScriptContexts(); +} + +bool8 ScrSpecial_CreatePCMenu(void) +{ + if (FuncIsActiveTask(sub_809CC98) == TRUE) + return FALSE; + gSpecialVar_Result = 255; + sub_809D070(); + return TRUE; +} + +void sub_809D070(void) +{ + u8 cursorWidth = GetMenuCursorDimensionByFont(2, 0); + u8 height = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT); + u8 windowWidth; + u8 nitems; + u8 windowId; + switch (sub_809C954(gUnknown_8417BB6)) + { + default: + if (FlagGet(FLAG_SYS_POKEDEX_GET)) + windowWidth = 14; + else + windowWidth = 13; + break; + case 9: + case 10: + windowWidth = 14; + break; + } + if (FlagGet(FLAG_SYS_GAME_CLEAR)) + { + nitems = 5; + windowId = CreateWindowFromRect(0, 0, windowWidth, 10); + SetStdWindowBorderStyle(windowId, FALSE); + AddTextPrinterParameterized(windowId, 2, gUnknown_8417BD3, cursorWidth, 34, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gUnknown_8417BBE, cursorWidth, 50, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gUnknown_8417BCB, cursorWidth, 66, 0xFF, NULL); + } + else + { + if (FlagGet(FLAG_SYS_POKEDEX_GET)) + nitems = 4; + else + nitems = 3; + windowId = CreateWindowFromRect(0, 0, windowWidth, nitems * 2); + SetStdWindowBorderStyle(windowId, FALSE); + if (FlagGet(FLAG_SYS_POKEDEX_GET)) + AddTextPrinterParameterized(windowId, 2, gUnknown_8417BD3, cursorWidth, 34, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gUnknown_8417BCB, cursorWidth, 2 + 16 * (nitems - 1), 0xFF, NULL); + } + if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC)) + AddTextPrinterParameterized(windowId, 2, gUnknown_8417BAC, cursorWidth, 2 , 0xFF, NULL); + else + AddTextPrinterParameterized(windowId, 2, gUnknown_8417B9F, cursorWidth, 2 , 0xFF, NULL); + StringExpandPlaceholders(gStringVar4, gUnknown_8417BB6); + Menu_PrintFormatIntlPlayerName(windowId, gStringVar4, cursorWidth, 18); + Menu_InitCursor(windowId, 2, 0, 2, 16, nitems, 0); + sub_809CC18(FALSE, nitems, windowId, 0xFF); + ScheduleBgCopyTilemapToVram(0); +} + +void ScriptMenu_DisplayPCStartupPrompt(void) +{ + sub_80F7768(0, TRUE); + AddTextPrinterParameterized2(0, 2, gUnknown_81A508A, 0, NULL, 2, 1, 3); +} + +void sub_809D288(u8 taskId) +{ + struct Task * task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + task->data[0]++; + break; + case 1: + break; + case 2: + sub_8083A5C(&gSprites[task->data[2]], task->data[2]); + task->data[0]++; + break; + case 3: + sub_809D6B0(task->data[5]); + DestroyTask(taskId); + break; + } +} + +bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y) +{ + u8 spriteId; + u8 taskId; + if (QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4) == TRUE) + return TRUE; + if (FindTaskIdByFunc(sub_809D288) != 0xFF) + return FALSE; + spriteId = sub_8083970(species, 8 * x + 40, 8 * y + 40, FALSE); + taskId = CreateTask(sub_809D288, 80); + gTasks[taskId].data[5] = CreateWindowFromRect(x, y, 8, 8); + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = species; + gTasks[taskId].data[2] = spriteId; + gSprites[spriteId].callback = SpriteCallbackDummy; + gSprites[spriteId].oam.priority = 0; + SetStdWindowBorderStyle(gTasks[taskId].data[5], TRUE); + ScheduleBgCopyTilemapToVram(0); + return TRUE; +} + +bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) +{ + u8 taskId = FindTaskIdByFunc(sub_809D288); + if (taskId == 0xFF) + return NULL; + gTasks[taskId].data[0]++; + return sub_809D404; +} + +bool8 sub_809D404(void) +{ + if (FindTaskIdByFunc(sub_809D288) == 0xFF) + return TRUE; + else + return FALSE; +} + +void sub_809D424(void) +{ + u8 taskId = FindTaskIdByFunc(sub_809D288); + struct Task * task; + if (taskId != 0xFF) + { + task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + case 1: + case 2: + sub_8083A5C(&gSprites[task->data[2]], task->data[2]); + sub_809D6B0(task->data[5]); + DestroyTask(taskId); + break; + case 3: + sub_809D6B0(task->data[5]); + DestroyTask(taskId); + break; + } + } +} + +void sub_809D494(u8 taskId) +{ + struct Task * task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + task->data[0]++; + break; + case 1: + break; + case 2: + DestroySprite(&gSprites[task->data[2]]); + FreeSpriteTilesByTag(7000); + task->data[0]++; + break; + case 3: + sub_809D6B0(task->data[5]); + DestroyTask(taskId); + break; + } +} + +bool8 Special_OpenMuseumFossilPic(void) +{ + u8 spriteId; + u8 taskId; + if (QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4) == TRUE) + return TRUE; + if (FindTaskIdByFunc(sub_809D494) != 0xFF) + return FALSE; + if (gSpecialVar_0x8004 == SPECIES_KABUTOPS) + { + LoadSpriteSheets(sMuseumKabutopsSprSheets); + LoadPalette(sMuseumKabutopsSprPalette, 0x1D0, 0x20); + } + else if (gSpecialVar_0x8004 == SPECIES_AERODACTYL) + { + LoadSpriteSheets(sMuseumAerodactylSprSheets); + LoadPalette(sMuseumAerodactylSprPalette, 0x1D0, 0x20); + } + else + { + return FALSE; + } + spriteId = CreateSprite(&sMuseumFossilSprTemplate, gSpecialVar_0x8005 * 8 + 40, gSpecialVar_0x8006 * 8 + 40, 0); + gSprites[spriteId].oam.paletteNum = 13; + taskId = CreateTask(sub_809D494, 80); + gTasks[taskId].data[5] = CreateWindowFromRect(gSpecialVar_0x8005, gSpecialVar_0x8006, 8, 8); + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[2] = spriteId; + SetStdWindowBorderStyle(gTasks[taskId].data[5], TRUE); + ScheduleBgCopyTilemapToVram(0); + return TRUE; +} + +bool8 Special_CloseMuseumFossilPic(void) +{ + u8 taskId = FindTaskIdByFunc(sub_809D494); + if (taskId == 0xFF) + return FALSE; + gTasks[taskId].data[0]++; + return TRUE; +} + +u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height) +{ + struct WindowTemplate template = SetWindowTemplateFields(0, left + 1, top + 1, width, height, 15, 0x038); + u8 windowId = AddWindow(&template); + PutWindowTilemap(windowId); + return windowId; +} + +void sub_809D6B0(u8 windowId) +{ + ClearWindowTilemap(windowId); + ClearStdWindowAndFrameToTransparent(windowId, TRUE); + RemoveWindow(windowId); +} + +void sub_809D6D4(void) +{ + u8 taskId; + s16 *data; + ScriptContext1_SetupScript(EventScript_1A7AE0); + taskId = FindTaskIdByFunc(sub_809D288); + if (taskId != 0xFF) + { + data = gTasks[taskId].data; + if (data[0] < 2) + sub_8083A5C(&gSprites[data[2]], data[2]); + } + taskId = FindTaskIdByFunc(sub_809D494); + if (taskId != 0xFF) + { + data = gTasks[taskId].data; + if (data[0] < 2) + { + DestroySprite(&gSprites[data[2]]); + FreeSpriteTilesByTag(7000); + } + } +} + +void sub_809D764(void) +{ + u8 r4; + u8 top; + u8 nitems; + u8 cursorWidth; + u8 fontHeight; + u8 windowId; + u8 i; + gSpecialVar_Result = 255; + if (QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4) != TRUE) + { + if (gSpecialVar_0x8005 == 1) + { + if (gSpecialVar_0x8004 < 5) + r4 = 5; + else + r4 = 4; + nitems = 5; + top = 2; + } + else + { + r4 = 0; + nitems = 6; + top = 0; + } + cursorWidth = GetMenuCursorDimensionByFont(2, 0); + fontHeight = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT); + windowId = CreateWindowFromRect(17, top, 11, nitems * 2); + SetStdWindowBorderStyle(windowId, FALSE); + for (i = 0; i < nitems - 2; i++) + { + if (r4 != gSpecialVar_0x8004) + AddTextPrinterParameterized(windowId, 2, gUnknown_83E17E0[r4], cursorWidth, i * 16 + 2, 0xFF, NULL); + else + i--; + r4++; + if (r4 == 8) + r4 = 0; + } + AddTextPrinterParameterized(windowId, 2, gUnknown_8417DED, cursorWidth, i * 16 + 2, 0xFF, NULL); + i++; + AddTextPrinterParameterized(windowId, 2, gOtherText_Exit, cursorWidth, i * 16 + 2, 0xFF, NULL); + Menu_InitCursor(windowId, 2, 0, 2, 16, nitems, 0); + sub_809CC18(FALSE, nitems, windowId, 0xFF); + ScheduleBgCopyTilemapToVram(0); + } +} + +u16 sub_809D8C0(void) +{ + if (gSpecialVar_Result == 127) + return 127; + if (gSpecialVar_0x8005 == 1) + { + if (gSpecialVar_Result == 3) + { + return 254; + } + else if (gSpecialVar_Result == 4) + { + return 127; + } + else if (gSpecialVar_Result == 0) + { + if (gSpecialVar_0x8004 > 4) + return 4; + else + return 5; + } + else if (gSpecialVar_Result == 1) + { + if (gSpecialVar_0x8004 > 5) + return 5; + else + return 6; + } + else if (gSpecialVar_Result == 2) + { + if (gSpecialVar_0x8004 > 6) + return 6; + else + return 7; + } + } + else + { + if (gSpecialVar_Result == 4) + return 254; + else if (gSpecialVar_Result == 5) + return 127; + else if (gSpecialVar_Result >= gSpecialVar_0x8004) + return gSpecialVar_Result + 1; + else + return gSpecialVar_Result; + } + return 0; +} -- cgit v1.2.3 From 00675eaafba7605bdbf5c16984975e4ed6ad6bde Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 13:23:46 -0400 Subject: script_menu data --- src/script_menu.c | 744 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 679 insertions(+), 65 deletions(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index 4bc7bfec9..a06d80bb1 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -16,6 +16,8 @@ #include "event_scripts.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/seagallop.h" +#include "constants/menu.h" struct MultichoiceListStruct { @@ -33,20 +35,628 @@ void sub_809CD48(u8 mcId); void task_yes_no_maybe(u8 taskId); void sub_809CFDC(u8 taskId); void sub_809D070(void); -bool8 sub_809D404(void); +bool8 PicboxWait(void); void sub_809D6B0(u8 windowId); u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height); -extern const u8 *const gUnknown_83E072C[]; -extern const u8 *const gUnknown_83E0738[]; -extern const u8 *const gUnknown_83E0748[]; -extern const struct MultichoiceListStruct gUnknown_83E04B0[]; -extern const struct SpriteSheet sMuseumKabutopsSprSheets[]; -extern const u16 sMuseumKabutopsSprPalette[]; -extern const struct SpriteSheet sMuseumAerodactylSprSheets[]; -extern const u16 sMuseumAerodactylSprPalette[]; -extern const struct SpriteTemplate sMuseumFossilSprTemplate; -extern const u8 *const gUnknown_83E17E0[]; + +static const struct MenuAction sScriptMultiChoiceMenu_0[] = { + { gUnknown_8417938 }, + { gUnknown_841793C } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_2[] = { + { gUnknown_8417ADC }, + { gUnknown_8417AE3 }, + { gUnknown_8417AE9 }, + { gUnknown_8417AEE } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_3[] = { + { gUnknown_84178F0 }, + { gUnknown_8417907 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_4[] = { + { gUnknown_84178EB }, + { gUnknown_8417907 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_5[] = { + { gUnknown_84178FD }, + { gUnknown_8417907 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_6[] = { + { gUnknown_84178F0 }, + { gUnknown_84178EB }, + { gUnknown_8417907 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_7[] = { + { gUnknown_84178F0 }, + { gUnknown_84178FD }, + { gUnknown_8417907 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_8[] = { + { gUnknown_84178EB }, + { gUnknown_84178FD }, + { gUnknown_8417907 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_9[] = { + { gUnknown_84178F0 }, + { gUnknown_84178EB }, + { gUnknown_84178FD }, + { gUnknown_8417907 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_15[] = { + { gUnknown_8417914 }, + { gUnknown_841790C }, + { gUnknown_8417910 }, + { gUnknown_8417918 }, + { gUnknown_841791C }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_16[] = { + { gUnknown_8417938 }, + { gUnknown_841793C }, + { gUnknown_84178E6 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_17[] = { + { gUnknown_8417944 }, + { gUnknown_8417952 }, + { gUnknown_8417960 }, + { gUnknown_84178E6 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_18[] = { + { gUnknown_8417938 }, + { gUnknown_841793C }, + { gUnknown_84178E6 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_19[] = { + { gUnknown_841796D }, + { gUnknown_841797F }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_20[] = { + { gUnknown_841806D }, + { gUnknown_841805D }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_21[] = { + { gUnknown_8417D56 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_22[] = { + { gUnknown_8417D63 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_23[] = { + { gUnknown_8417D6F }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_24[] = { + { gUnknown_8417D56 }, + { gUnknown_8417D6F }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_25[] = { + { gUnknown_8417D63 }, + { gUnknown_8417D6F }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_26[] = { + { gUnknown_8417984 }, + { gUnknown_841799A }, + { gUnknown_84179AD }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_30[] = { + { gUnknown_8417A42 }, + { gUnknown_8417A58 }, + { gUnknown_8417A6E }, + { gUnknown_8417A84 }, + { gUnknown_8417A9A }, + { gUnknown_8417D4C } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_41[] = { + { gUnknown_8417F4D }, + { gUnknown_8417ED9 }, + { gUnknown_8417EF7 }, + { gUnknown_8417F11 }, + { gUnknown_8417F2F }, + { gUnknown_8417D4C } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_27[] = { + { gUnknown_84179C0 }, + { gUnknown_84179D6 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_28[] = { + { gUnknown_84179ED }, + { gUnknown_84179F7 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_29[] = { + { gUnknown_8417A37 }, + { gUnknown_8417A3D } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_31[] = { + { gUnknown_8417ABC }, + { gUnknown_8417AB9 }, + { gUnknown_8417AB6 }, + { gUnknown_8417AB3 }, + { gUnknown_8417AB0 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_32[] = { + { gUnknown_8417C0F }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_33[] = { + { gUnknown_8417C1B }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_34[] = { + { gUnknown_8417C0F }, + { gUnknown_8417C1B }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_35[] = { + { gUnknown_8417C24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_36[] = { + { gUnknown_8417C0F }, + { gUnknown_8417C24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_37[] = { + { gUnknown_8417C1B }, + { gUnknown_8417C24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_38[] = { + { gUnknown_8417C0F }, + { gUnknown_8417C1B }, + { gUnknown_8417C24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_0[] = { + { gUnknown_8417A24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_1[] = { + { gUnknown_8417A02 }, + { gUnknown_8417A24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_2[] = { + { gUnknown_8417A0C }, + { gUnknown_8417A24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_3[] = { + { gUnknown_8417A02 }, + { gUnknown_8417A0C }, + { gUnknown_8417A24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_4[] = { + { gUnknown_8417A19 }, + { gUnknown_8417A24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_5[] = { + { gUnknown_8417A02 }, + { gUnknown_8417A19 }, + { gUnknown_8417A24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_6[] = { + { gUnknown_8417A0C }, + { gUnknown_8417A19 }, + { gUnknown_8417A24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_7[] = { + { gUnknown_8417A02 }, + { gUnknown_8417A0C }, + { gUnknown_8417A19 }, + { gUnknown_8417A24 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_1[] = { + { gUnknown_8417BE2 }, + { gUnknown_8417BE8 }, + { gUnknown_8417BF0 }, + { gUnknown_8417BF8 }, + { gUnknown_8417C01 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_13[] = { + { gUnknown_8417C33 }, + { gUnknown_8417C4B } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_14[] = { + { gUnknown_8417C55 }, + { gUnknown_8417C6A }, + { gUnknown_8417C83 }, + { gUnknown_8417C9D }, + { gUnknown_8417CB7 }, + { gUnknown_8417D4C } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_39[] = { + { gUnknown_8417D79 }, + { gUnknown_8417D86 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_40[] = { + { gUnknown_8417D90 }, + { gUnknown_8417DA0 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_42[] = { + { gUnknown_841805D }, + { gUnknown_8418061 }, + { gUnknown_8418069 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_43[] = { + { gUnknown_841807D }, + { gUnknown_841808E }, + { gUnknown_841809C }, + { gOtherText_Quit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_44[] = { + { gUnknown_8417DFE }, + { gUnknown_8417E09 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_45[] = { + { gUnknown_8417DF3 }, + { gUnknown_8417E09 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_46[] = { + { gUnknown_8417DF3 }, + { gUnknown_8417DFE }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_47[] = { + { gUnknown_8417D79 }, + { gUnknown_8417E50 }, + { gUnknown_8417E5A }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_48[] = { + { gUnknown_8417E66 }, + { gUnknown_8417E67 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_50[] = { + { gUnknown_8417D79 }, + { gUnknown_8417E50 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_49[] = { + { gUnknown_8417E72 }, + { gUnknown_8417E7F }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_51[] = { + { gUnknown_8417E94 }, + { gUnknown_8417EA4 } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_52[] = { + { gUnknown_8417D79 }, + { gUnknown_8417E50 }, + { gUnknown_8417E71 }, + { gUnknown_8417E5A }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_53[] = { + { gUnknown_8417D79 }, + { gUnknown_8417E50 }, + { gUnknown_8417E71 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_54[] = { + { gUnknown_8417EB3 }, + { gUnknown_8417EC1 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_55[] = { + { gUnknown_8417EB3 }, + { gUnknown_8417ECC }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_56[] = { + { gUnknown_8417EB3 }, + { gUnknown_8417EC1 }, + { gUnknown_8417ECC }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_57[] = { + { gUnknown_8417DF3 }, + { gUnknown_8417DFE }, + { gUnknown_8417E09 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_58[] = { + { gUnknown_8417E46 }, + { gUnknown_8417DFE }, + { gUnknown_8417E09 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_59[] = { + { gUnknown_8417E46 }, + { gUnknown_8417DF3 }, + { gUnknown_8417E09 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_60[] = { + { gUnknown_8417E46 }, + { gUnknown_8417DF3 }, + { gUnknown_8417DFE }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_61[] = { + { gUnknown_8417E46 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_62[] = { + { gUnknown_8417F68 }, + { gUnknown_8417F67 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_63[] = { + { gUnknown_8417F77 }, + { gUnknown_8417F69 }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_64[] = { + { gOtherText_Single }, + { gOtherText_Double }, + { gOtherText_Knockout }, + { gOtherText_Mixed }, + { gOtherText_Exit } +}; + +static const struct MenuAction sScriptMultiChoiceMenu_10[] = { + { gOtherText_Exit } +}; + +const struct MultichoiceListStruct gScriptMultiChoiceMenus[] = { + { sScriptMultiChoiceMenu_0, NELEMS(sScriptMultiChoiceMenu_0) }, + { sScriptMultiChoiceMenu_1, NELEMS(sScriptMultiChoiceMenu_1) }, + { sScriptMultiChoiceMenu_2, NELEMS(sScriptMultiChoiceMenu_2) }, + { sScriptMultiChoiceMenu_3, NELEMS(sScriptMultiChoiceMenu_3) }, + { sScriptMultiChoiceMenu_4, NELEMS(sScriptMultiChoiceMenu_4) }, + { sScriptMultiChoiceMenu_5, NELEMS(sScriptMultiChoiceMenu_5) }, + { sScriptMultiChoiceMenu_6, NELEMS(sScriptMultiChoiceMenu_6) }, + { sScriptMultiChoiceMenu_7, NELEMS(sScriptMultiChoiceMenu_7) }, + { sScriptMultiChoiceMenu_8, NELEMS(sScriptMultiChoiceMenu_8) }, + { sScriptMultiChoiceMenu_9, NELEMS(sScriptMultiChoiceMenu_9) }, + { sScriptMultiChoiceMenu_10, NELEMS(sScriptMultiChoiceMenu_10) }, + { sScriptMultiChoiceMenu_10, NELEMS(sScriptMultiChoiceMenu_10) }, + { sScriptMultiChoiceMenu_10, NELEMS(sScriptMultiChoiceMenu_10) }, + { sScriptMultiChoiceMenu_13, NELEMS(sScriptMultiChoiceMenu_13) }, + { sScriptMultiChoiceMenu_14, NELEMS(sScriptMultiChoiceMenu_14) }, + { sScriptMultiChoiceMenu_15, NELEMS(sScriptMultiChoiceMenu_15) }, + { sScriptMultiChoiceMenu_16, NELEMS(sScriptMultiChoiceMenu_16) }, + { sScriptMultiChoiceMenu_17, NELEMS(sScriptMultiChoiceMenu_17) }, + { sScriptMultiChoiceMenu_18, NELEMS(sScriptMultiChoiceMenu_18) }, + { sScriptMultiChoiceMenu_19, NELEMS(sScriptMultiChoiceMenu_19) }, + { sScriptMultiChoiceMenu_20, NELEMS(sScriptMultiChoiceMenu_20) }, + { sScriptMultiChoiceMenu_21, NELEMS(sScriptMultiChoiceMenu_21) }, + { sScriptMultiChoiceMenu_22, NELEMS(sScriptMultiChoiceMenu_22) }, + { sScriptMultiChoiceMenu_23, NELEMS(sScriptMultiChoiceMenu_23) }, + { sScriptMultiChoiceMenu_24, NELEMS(sScriptMultiChoiceMenu_24) }, + { sScriptMultiChoiceMenu_25, NELEMS(sScriptMultiChoiceMenu_25) }, + { sScriptMultiChoiceMenu_26, NELEMS(sScriptMultiChoiceMenu_26) }, + { sScriptMultiChoiceMenu_27, NELEMS(sScriptMultiChoiceMenu_27) }, + { sScriptMultiChoiceMenu_28, NELEMS(sScriptMultiChoiceMenu_28) }, + { sScriptMultiChoiceMenu_29, NELEMS(sScriptMultiChoiceMenu_29) }, + { sScriptMultiChoiceMenu_30, NELEMS(sScriptMultiChoiceMenu_30) }, + { sScriptMultiChoiceMenu_31, NELEMS(sScriptMultiChoiceMenu_31) }, + { sScriptMultiChoiceMenu_32, NELEMS(sScriptMultiChoiceMenu_32) }, + { sScriptMultiChoiceMenu_33, NELEMS(sScriptMultiChoiceMenu_33) }, + { sScriptMultiChoiceMenu_34, NELEMS(sScriptMultiChoiceMenu_34) }, + { sScriptMultiChoiceMenu_35, NELEMS(sScriptMultiChoiceMenu_35) }, + { sScriptMultiChoiceMenu_36, NELEMS(sScriptMultiChoiceMenu_36) }, + { sScriptMultiChoiceMenu_37, NELEMS(sScriptMultiChoiceMenu_37) }, + { sScriptMultiChoiceMenu_38, NELEMS(sScriptMultiChoiceMenu_38) }, + { sScriptMultiChoiceMenu_39, NELEMS(sScriptMultiChoiceMenu_39) }, + { sScriptMultiChoiceMenu_40, NELEMS(sScriptMultiChoiceMenu_40) }, + { sScriptMultiChoiceMenu_41, NELEMS(sScriptMultiChoiceMenu_41) }, + { sScriptMultiChoiceMenu_42, NELEMS(sScriptMultiChoiceMenu_42) }, + { sScriptMultiChoiceMenu_43, NELEMS(sScriptMultiChoiceMenu_43) }, + { sScriptMultiChoiceMenu_44, NELEMS(sScriptMultiChoiceMenu_44) }, + { sScriptMultiChoiceMenu_45, NELEMS(sScriptMultiChoiceMenu_45) }, + { sScriptMultiChoiceMenu_46, NELEMS(sScriptMultiChoiceMenu_46) }, + { sScriptMultiChoiceMenu_47, NELEMS(sScriptMultiChoiceMenu_47) }, + { sScriptMultiChoiceMenu_48, NELEMS(sScriptMultiChoiceMenu_48) }, + { sScriptMultiChoiceMenu_49, NELEMS(sScriptMultiChoiceMenu_49) }, + { sScriptMultiChoiceMenu_50, NELEMS(sScriptMultiChoiceMenu_50) }, + { sScriptMultiChoiceMenu_51, NELEMS(sScriptMultiChoiceMenu_51) }, + { sScriptMultiChoiceMenu_52, NELEMS(sScriptMultiChoiceMenu_52) }, + { sScriptMultiChoiceMenu_53, NELEMS(sScriptMultiChoiceMenu_53) }, + { sScriptMultiChoiceMenu_54, NELEMS(sScriptMultiChoiceMenu_54) }, + { sScriptMultiChoiceMenu_55, NELEMS(sScriptMultiChoiceMenu_55) }, + { sScriptMultiChoiceMenu_56, NELEMS(sScriptMultiChoiceMenu_56) }, + { sScriptMultiChoiceMenu_57, NELEMS(sScriptMultiChoiceMenu_57) }, + { sScriptMultiChoiceMenu_58, NELEMS(sScriptMultiChoiceMenu_58) }, + { sScriptMultiChoiceMenu_59, NELEMS(sScriptMultiChoiceMenu_59) }, + { sScriptMultiChoiceMenu_60, NELEMS(sScriptMultiChoiceMenu_60) }, + { sScriptMultiChoiceMenu_61, NELEMS(sScriptMultiChoiceMenu_61) }, + { sScriptMultiChoiceMenu_62, NELEMS(sScriptMultiChoiceMenu_62) }, + { sScriptMultiChoiceMenu_63, NELEMS(sScriptMultiChoiceMenu_63) }, + { sScriptMultiChoiceMenu_64, NELEMS(sScriptMultiChoiceMenu_64) } +}; + +const u8 *const gStdStringPtrs[] = { + gUnknown_8417ABF, + gUnknown_8417AC4, + gUnknown_8417ACB, + gUnknown_8417AD0, + gUnknown_8417AD6, + gUnknown_8417AF4, + gUnknown_8417AF9, + gUnknown_8417B00, + gUnknown_8417B05, + gUnknown_8417B0B, + gUnknown_8417B11, + gUnknown_8417B17, + gUnknown_8417B21, + gUnknown_8417B2C, + gUnknown_8417B36, + gUnknown_8417B3E, + gUnknown_8417B4B, + gUnknown_8417B58, + gUnknown_8417B65, + gUnknown_8417B72, + gUnknown_8417B7C, + gUnknown_8417B87, + gUnknown_8417B94, + gUnknown_8417C2D, + gUnknown_8417DA9, + gUnknown_8417DB6, + gUnknown_8417DC7, + gUnknown_8417DD9, + gUnknown_8417DE1 +}; + +static const u8 *const gUnknown_83E072C[] = { + Text_1BC388, + Text_1BC3C7, + Text_1BCB42 +}; + +static const u8 *const gUnknown_83E0738[] = { + Text_1BCA95, + Text_1BCACB, + Text_1BCAF2, + Text_1BCB42 +}; + +static const u8 *const gUnknown_83E0748[] = { + Text_1BCA95, + Text_1BCACB, + Text_1BCB42 +}; + +static const union AnimCmd sMuseumFossilAnim0[] = { + ANIMCMD_FRAME(0, 10), + ANIMCMD_END +}; + +static const union AnimCmd *const sMuseumFossilAnimCmdTable[] = { + sMuseumFossilAnim0 +}; + +static const struct OamData sMuseumFossilOamData = { + .shape = SPRITE_SHAPE(64x64), + .size = SPRITE_SIZE(64x64) +}; + +static const struct SpriteTemplate sMuseumFossilSprTemplate = { + .tileTag = 7000, + .paletteTag = 0xFFFF, + .oam = &sMuseumFossilOamData, + .anims = sMuseumFossilAnimCmdTable, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy +}; + +static const u16 sMuseumAerodactylSprTiles[] = INCBIN_U16("data/script_menu/aerodactyl_fossil.4bpp"); +static const u16 sMuseumAerodactylSprPalette[] = INCBIN_U16("data/script_menu/aerodactyl_fossil.gbapal"); +static const u16 sMuseumKabutopsSprTiles[] = INCBIN_U16("data/script_menu/kabutops_fossil.4bpp"); +static const u16 sMuseumKabutopsSprPalette[] = INCBIN_U16("data/script_menu/kabutops_fossil.gbapal"); + +static const struct SpriteSheet sMuseumKabutopsSprSheets[] = { + {sMuseumKabutopsSprTiles, 0x800, 7000}, + {} +}; + +static const struct SpriteSheet sMuseumAerodactylSprSheets[] = { + {sMuseumAerodactylSprTiles, 0x800, 7000}, + {} +}; + + +static const u8 *const sSeaGallopDestStrings[] = { + gUnknown_8417E46, + gUnknown_8417DF3, + gUnknown_8417DFE, + gUnknown_8417E09, + gUnknown_8417E16, + gUnknown_8417E22, + gUnknown_8417E2E, + gUnknown_8417E39 +}; u16 sub_809C954(const u8 *str) { @@ -72,7 +682,7 @@ bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 mcId, u8 ignoreBpress) { if (FuncIsActiveTask(sub_809CC98) == TRUE) return FALSE; - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = SCR_MENU_UNSET; sub_809CA64(left, top, mcId, ignoreBpress, 0); return TRUE; } @@ -81,7 +691,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 mcId, u8 ignoreBpres { if (FuncIsActiveTask(sub_809CC98) == TRUE) return FALSE; - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = SCR_MENU_UNSET; sub_809CA64(left, top, mcId, ignoreBpress, cursorPos); return TRUE; } @@ -97,11 +707,11 @@ void sub_809CA64(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos) u8 windowId; const struct MenuAction * list; - if ((ignoreBpress & 2) || QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4) != TRUE) + if ((ignoreBpress & 2) || QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE) { ignoreBpress &= 1; - count = gUnknown_83E04B0[mcId].count; - list = gUnknown_83E04B0[mcId].list; + count = gScriptMultiChoiceMenus[mcId].count; + list = gScriptMultiChoiceMenus[mcId].list; strWidth = 0; for (i = 0; i < count; i++) { @@ -194,7 +804,7 @@ void sub_809CC98(u8 taskId) if (data[4]) return; PlaySE(SE_SELECT); - gSpecialVar_Result = 127; + gSpecialVar_Result = SCR_MENU_CANCEL; break; default: gSpecialVar_Result = input; @@ -230,8 +840,8 @@ bool8 ScriptMenu_YesNo(u8 unused, u8 stuff) { if (FuncIsActiveTask(task_yes_no_maybe) == TRUE) return FALSE; - gSpecialVar_Result = 255; - if (!QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4)) + gSpecialVar_Result = SCR_MENU_UNSET; + if (!QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites)) { DisplayYesNoMenuDefaultYes(); CreateTask(task_yes_no_maybe, 80); @@ -241,7 +851,7 @@ bool8 ScriptMenu_YesNo(u8 unused, u8 stuff) bool8 sub_809CE38(void) { - if (gSpecialVar_Result == 255) + if (gSpecialVar_Result == SCR_MENU_UNSET) return FALSE; else return TRUE; @@ -284,11 +894,11 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 co u8 taskId; if (FuncIsActiveTask(sub_809CFDC) == TRUE) return FALSE; - gSpecialVar_Result = 255; - if (QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4) != TRUE) + gSpecialVar_Result = SCR_MENU_UNSET; + if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE) { - list = gUnknown_83E04B0[multichoiceId].list; - count = gUnknown_83E04B0[multichoiceId].count; + list = gScriptMultiChoiceMenus[multichoiceId].list; + count = gScriptMultiChoiceMenus[multichoiceId].count; width = sub_809C974(list, count) + 1; rowCount = count / columnCount; taskId = CreateTask(sub_809CFDC, 80); @@ -314,7 +924,7 @@ void sub_809CFDC(u8 taskId) if (data[4]) return; PlaySE(SE_SELECT); - gSpecialVar_Result = 127; + gSpecialVar_Result = SCR_MENU_CANCEL; break; default: gSpecialVar_Result = input; @@ -329,7 +939,7 @@ bool8 ScrSpecial_CreatePCMenu(void) { if (FuncIsActiveTask(sub_809CC98) == TRUE) return FALSE; - gSpecialVar_Result = 255; + gSpecialVar_Result = SCR_MENU_UNSET; sub_809D070(); return TRUE; } @@ -392,7 +1002,7 @@ void ScriptMenu_DisplayPCStartupPrompt(void) AddTextPrinterParameterized2(0, 2, gUnknown_81A508A, 0, NULL, 2, 1, 3); } -void sub_809D288(u8 taskId) +static void Task_ScriptShowMonPic(u8 taskId) { struct Task * task = &gTasks[taskId]; switch (task->data[0]) @@ -417,12 +1027,12 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y) { u8 spriteId; u8 taskId; - if (QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4) == TRUE) + if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) == TRUE) return TRUE; - if (FindTaskIdByFunc(sub_809D288) != 0xFF) + if (FindTaskIdByFunc(Task_ScriptShowMonPic) != 0xFF) return FALSE; spriteId = sub_8083970(species, 8 * x + 40, 8 * y + 40, FALSE); - taskId = CreateTask(sub_809D288, 80); + taskId = CreateTask(Task_ScriptShowMonPic, 80); gTasks[taskId].data[5] = CreateWindowFromRect(x, y, 8, 8); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = species; @@ -436,16 +1046,16 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y) bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) { - u8 taskId = FindTaskIdByFunc(sub_809D288); + u8 taskId = FindTaskIdByFunc(Task_ScriptShowMonPic); if (taskId == 0xFF) return NULL; gTasks[taskId].data[0]++; - return sub_809D404; + return PicboxWait; } -bool8 sub_809D404(void) +bool8 PicboxWait(void) { - if (FindTaskIdByFunc(sub_809D288) == 0xFF) + if (FindTaskIdByFunc(Task_ScriptShowMonPic) == 0xFF) return TRUE; else return FALSE; @@ -453,7 +1063,7 @@ bool8 sub_809D404(void) void sub_809D424(void) { - u8 taskId = FindTaskIdByFunc(sub_809D288); + u8 taskId = FindTaskIdByFunc(Task_ScriptShowMonPic); struct Task * task; if (taskId != 0xFF) { @@ -501,7 +1111,7 @@ bool8 Special_OpenMuseumFossilPic(void) { u8 spriteId; u8 taskId; - if (QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4) == TRUE) + if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) == TRUE) return TRUE; if (FindTaskIdByFunc(sub_809D494) != 0xFF) return FALSE; @@ -554,12 +1164,12 @@ void sub_809D6B0(u8 windowId) RemoveWindow(windowId); } -void sub_809D6D4(void) +void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void) { u8 taskId; s16 *data; ScriptContext1_SetupScript(EventScript_1A7AE0); - taskId = FindTaskIdByFunc(sub_809D288); + taskId = FindTaskIdByFunc(Task_ScriptShowMonPic); if (taskId != 0xFF) { data = gTasks[taskId].data; @@ -578,8 +1188,10 @@ void sub_809D6D4(void) } } -void sub_809D764(void) +void Special_DrawSeaGallopDestinationMenu(void) { + // 8004 = Starting location + // 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit) u8 r4; u8 top; u8 nitems; @@ -587,21 +1199,21 @@ void sub_809D764(void) u8 fontHeight; u8 windowId; u8 i; - gSpecialVar_Result = 255; - if (QuestLog_ScheduleRoutineIfNotInPlaybackMode(sub_809D6D4) != TRUE) + gSpecialVar_Result = SCR_MENU_UNSET; + if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE) { if (gSpecialVar_0x8005 == 1) { - if (gSpecialVar_0x8004 < 5) - r4 = 5; + if (gSpecialVar_0x8004 < SEAGALLOP_FIVE_ISLAND) + r4 = SEAGALLOP_FIVE_ISLAND; else - r4 = 4; + r4 = SEAGALLOP_FOUR_ISLAND; nitems = 5; top = 2; } else { - r4 = 0; + r4 = SEAGALLOP_VERMILION_CITY; nitems = 6; top = 0; } @@ -612,12 +1224,12 @@ void sub_809D764(void) for (i = 0; i < nitems - 2; i++) { if (r4 != gSpecialVar_0x8004) - AddTextPrinterParameterized(windowId, 2, gUnknown_83E17E0[r4], cursorWidth, i * 16 + 2, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, sSeaGallopDestStrings[r4], cursorWidth, i * 16 + 2, 0xFF, NULL); else i--; r4++; - if (r4 == 8) - r4 = 0; + if (r4 == SEAGALLOP_CINNABAR_ISLAND) + r4 = SEAGALLOP_VERMILION_CITY; } AddTextPrinterParameterized(windowId, 2, gUnknown_8417DED, cursorWidth, i * 16 + 2, 0xFF, NULL); i++; @@ -628,52 +1240,54 @@ void sub_809D764(void) } } -u16 sub_809D8C0(void) +u16 Special_GetSelectedSeaGallopDestination(void) { - if (gSpecialVar_Result == 127) - return 127; + // 8004 = Starting location + // 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit) + if (gSpecialVar_Result == SCR_MENU_CANCEL) + return SCR_MENU_CANCEL; if (gSpecialVar_0x8005 == 1) { if (gSpecialVar_Result == 3) { - return 254; + return SEAGALLOP_MORE; } else if (gSpecialVar_Result == 4) { - return 127; + return SCR_MENU_CANCEL; } else if (gSpecialVar_Result == 0) { - if (gSpecialVar_0x8004 > 4) - return 4; + if (gSpecialVar_0x8004 > SEAGALLOP_FOUR_ISLAND) + return SEAGALLOP_FOUR_ISLAND; else - return 5; + return SEAGALLOP_FIVE_ISLAND; } else if (gSpecialVar_Result == 1) { - if (gSpecialVar_0x8004 > 5) - return 5; + if (gSpecialVar_0x8004 > SEAGALLOP_FIVE_ISLAND) + return SEAGALLOP_FIVE_ISLAND; else - return 6; + return SEAGALLOP_SIX_ISLAND; } else if (gSpecialVar_Result == 2) { - if (gSpecialVar_0x8004 > 6) - return 6; + if (gSpecialVar_0x8004 > SEAGALLOP_SIX_ISLAND) + return SEAGALLOP_SIX_ISLAND; else - return 7; + return SEAGALLOP_SEVEN_ISLAND; } } else { if (gSpecialVar_Result == 4) - return 254; + return SEAGALLOP_MORE; else if (gSpecialVar_Result == 5) - return 127; + return SCR_MENU_CANCEL; else if (gSpecialVar_Result >= gSpecialVar_0x8004) return gSpecialVar_Result + 1; else return gSpecialVar_Result; } - return 0; + return SEAGALLOP_VERMILION_CITY; } -- cgit v1.2.3 From 1f73aff8f45b4f83ddd044f2d32032cb678d36c1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 13:41:57 -0400 Subject: script_menu static funcs and vars --- src/script_menu.c | 118 +++++++++++++++++++++++++++--------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index a06d80bb1..5df40c935 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -25,19 +25,19 @@ struct MultichoiceListStruct u8 count; }; -EWRAM_DATA u8 gUnknown_2039988 = 0; +EWRAM_DATA u8 sDelay = 0; -void sub_809CA64(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos); -u8 sub_809CBB4(u8 count); -void sub_809CC18(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId); -void sub_809CC98(u8 taskId); -void sub_809CD48(u8 mcId); -void task_yes_no_maybe(u8 taskId); -void sub_809CFDC(u8 taskId); -void sub_809D070(void); -bool8 PicboxWait(void); -void sub_809D6B0(u8 windowId); -u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height); +static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos); +static u8 sub_809CBB4(u8 count); +static void sub_809CC18(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId); +static void Task_MultichoiceMenu_HandleInput(u8 taskId); +static void MultiChoicePrintHelpDescription(u8 mcId); +static void task_yes_no_maybe(u8 taskId); +static void sub_809CFDC(u8 taskId); +static void CreatePCMenuWindow(void); +static bool8 PicboxWait(void); +static void DestroyScriptMenuWindow(u8 windowId); +static u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height); static const struct MenuAction sScriptMultiChoiceMenu_0[] = { @@ -589,20 +589,20 @@ const u8 *const gStdStringPtrs[] = { gUnknown_8417DE1 }; -static const u8 *const gUnknown_83E072C[] = { +static const u8 *const sDescriptionPtrs_CableClub_TradeBattleCancel[] = { Text_1BC388, Text_1BC3C7, Text_1BCB42 }; -static const u8 *const gUnknown_83E0738[] = { +static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[] = { Text_1BCA95, Text_1BCACB, Text_1BCAF2, Text_1BCB42 }; -static const u8 *const gUnknown_83E0748[] = { +static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCancel[] = { Text_1BCA95, Text_1BCACB, Text_1BCB42 @@ -658,20 +658,20 @@ static const u8 *const sSeaGallopDestStrings[] = { gUnknown_8417E39 }; -u16 sub_809C954(const u8 *str) +static u16 GetStringTilesWide(const u8 *str) { return (GetStringWidth(1, str, 0) + 7) / 8; } -u8 sub_809C974(const struct MenuAction * items, u8 count) +static u8 GetMenuWidthFromList(const struct MenuAction * items, u8 count) { u16 i; - u8 width = sub_809C954(items[0].text); + u8 width = GetStringTilesWide(items[0].text); u8 tmp; for (i = 1; i < count; i++) { - tmp = sub_809C954(items[i].text); + tmp = GetStringTilesWide(items[i].text); if (width < tmp) width = tmp; } @@ -680,23 +680,23 @@ u8 sub_809C974(const struct MenuAction * items, u8 count) bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 mcId, u8 ignoreBpress) { - if (FuncIsActiveTask(sub_809CC98) == TRUE) + if (FuncIsActiveTask(Task_MultichoiceMenu_HandleInput) == TRUE) return FALSE; gSpecialVar_Result = SCR_MENU_UNSET; - sub_809CA64(left, top, mcId, ignoreBpress, 0); + DrawVerticalMultichoiceMenu(left, top, mcId, ignoreBpress, 0); return TRUE; } bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 cursorPos) { - if (FuncIsActiveTask(sub_809CC98) == TRUE) + if (FuncIsActiveTask(Task_MultichoiceMenu_HandleInput) == TRUE) return FALSE; gSpecialVar_Result = SCR_MENU_UNSET; - sub_809CA64(left, top, mcId, ignoreBpress, cursorPos); + DrawVerticalMultichoiceMenu(left, top, mcId, ignoreBpress, cursorPos); return TRUE; } -void sub_809CA64(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos) +static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos) { s32 i; s32 strWidth; @@ -735,7 +735,7 @@ void sub_809CA64(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos) } } -u8 sub_809CBB4(u8 count) +static u8 sub_809CBB4(u8 count) { switch (count) { @@ -762,14 +762,14 @@ u8 sub_809CBB4(u8 count) } } -void sub_809CC18(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId) +static void sub_809CC18(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId) { u8 taskId; if (mcId == 39 || mcId == 47 || mcId == 50) - gUnknown_2039988 = 12; + sDelay = 12; else - gUnknown_2039988 = 0; - taskId = CreateTask(sub_809CC98, 80); + sDelay = 0; + taskId = CreateTask(Task_MultichoiceMenu_HandleInput, 80); gTasks[taskId].data[4] = ignoreBpress; if (count > 3) gTasks[taskId].data[5] = TRUE; @@ -777,17 +777,17 @@ void sub_809CC18(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId) gTasks[taskId].data[5] = FALSE; gTasks[taskId].data[6] = windowId; gTasks[taskId].data[7] = mcId; - sub_809CD48(mcId); + MultiChoicePrintHelpDescription(mcId); } -void sub_809CC98(u8 taskId) +static void Task_MultichoiceMenu_HandleInput(u8 taskId) { s16 *data = gTasks[taskId].data; s8 input; if (!gPaletteFade.active) { - if (gUnknown_2039988 != 0) - gUnknown_2039988--; + if (sDelay != 0) + sDelay--; else { if (data[5] == FALSE) @@ -795,7 +795,7 @@ void sub_809CC98(u8 taskId) else input = Menu_ProcessInput(); if (JOY_NEW(DPAD_UP | DPAD_DOWN)) - sub_809CD48(data[7]); + MultiChoicePrintHelpDescription(data[7]); switch (input) { case -2: @@ -810,28 +810,28 @@ void sub_809CC98(u8 taskId) gSpecialVar_Result = input; break; } - sub_809D6B0(data[6]); + DestroyScriptMenuWindow(data[6]); DestroyTask(taskId); EnableBothScriptContexts(); } } } -void sub_809CD48(u8 mcId) +static void MultiChoicePrintHelpDescription(u8 mcId) { switch (mcId) { case 39: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, gUnknown_83E072C[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_CableClub_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 47: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, gUnknown_83E0738[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; case 50: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, gUnknown_83E0748[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_WirelessCenter_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); break; } } @@ -857,7 +857,7 @@ bool8 sub_809CE38(void) return TRUE; } -void task_yes_no_maybe(u8 taskId) +static void task_yes_no_maybe(u8 taskId) { s8 input; if (gTasks[taskId].data[2] < 5) @@ -899,7 +899,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 co { list = gScriptMultiChoiceMenus[multichoiceId].list; count = gScriptMultiChoiceMenus[multichoiceId].count; - width = sub_809C974(list, count) + 1; + width = GetMenuWidthFromList(list, count) + 1; rowCount = count / columnCount; taskId = CreateTask(sub_809CFDC, 80); gTasks[taskId].data[4] = a4; @@ -912,7 +912,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 co return TRUE; } -void sub_809CFDC(u8 taskId) +static void sub_809CFDC(u8 taskId) { s16 *data = gTasks[taskId].data; s8 input = Menu_ProcessInputGridLayout(); @@ -930,28 +930,28 @@ void sub_809CFDC(u8 taskId) gSpecialVar_Result = input; break; } - sub_809D6B0(data[6]); + DestroyScriptMenuWindow(data[6]); DestroyTask(taskId); EnableBothScriptContexts(); } bool8 ScrSpecial_CreatePCMenu(void) { - if (FuncIsActiveTask(sub_809CC98) == TRUE) + if (FuncIsActiveTask(Task_MultichoiceMenu_HandleInput) == TRUE) return FALSE; gSpecialVar_Result = SCR_MENU_UNSET; - sub_809D070(); + CreatePCMenuWindow(); return TRUE; } -void sub_809D070(void) +static void CreatePCMenuWindow(void) { u8 cursorWidth = GetMenuCursorDimensionByFont(2, 0); u8 height = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT); u8 windowWidth; u8 nitems; u8 windowId; - switch (sub_809C954(gUnknown_8417BB6)) + switch (GetStringTilesWide(gUnknown_8417BB6)) { default: if (FlagGet(FLAG_SYS_POKEDEX_GET)) @@ -1017,7 +1017,7 @@ static void Task_ScriptShowMonPic(u8 taskId) task->data[0]++; break; case 3: - sub_809D6B0(task->data[5]); + DestroyScriptMenuWindow(task->data[5]); DestroyTask(taskId); break; } @@ -1053,7 +1053,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) return PicboxWait; } -bool8 PicboxWait(void) +static bool8 PicboxWait(void) { if (FindTaskIdByFunc(Task_ScriptShowMonPic) == 0xFF) return TRUE; @@ -1074,18 +1074,18 @@ void sub_809D424(void) case 1: case 2: sub_8083A5C(&gSprites[task->data[2]], task->data[2]); - sub_809D6B0(task->data[5]); + DestroyScriptMenuWindow(task->data[5]); DestroyTask(taskId); break; case 3: - sub_809D6B0(task->data[5]); + DestroyScriptMenuWindow(task->data[5]); DestroyTask(taskId); break; } } } -void sub_809D494(u8 taskId) +void Task_WaitMuseumFossilPic(u8 taskId) { struct Task * task = &gTasks[taskId]; switch (task->data[0]) @@ -1101,7 +1101,7 @@ void sub_809D494(u8 taskId) task->data[0]++; break; case 3: - sub_809D6B0(task->data[5]); + DestroyScriptMenuWindow(task->data[5]); DestroyTask(taskId); break; } @@ -1113,7 +1113,7 @@ bool8 Special_OpenMuseumFossilPic(void) u8 taskId; if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) == TRUE) return TRUE; - if (FindTaskIdByFunc(sub_809D494) != 0xFF) + if (FindTaskIdByFunc(Task_WaitMuseumFossilPic) != 0xFF) return FALSE; if (gSpecialVar_0x8004 == SPECIES_KABUTOPS) { @@ -1131,7 +1131,7 @@ bool8 Special_OpenMuseumFossilPic(void) } spriteId = CreateSprite(&sMuseumFossilSprTemplate, gSpecialVar_0x8005 * 8 + 40, gSpecialVar_0x8006 * 8 + 40, 0); gSprites[spriteId].oam.paletteNum = 13; - taskId = CreateTask(sub_809D494, 80); + taskId = CreateTask(Task_WaitMuseumFossilPic, 80); gTasks[taskId].data[5] = CreateWindowFromRect(gSpecialVar_0x8005, gSpecialVar_0x8006, 8, 8); gTasks[taskId].data[0] = 0; gTasks[taskId].data[2] = spriteId; @@ -1142,14 +1142,14 @@ bool8 Special_OpenMuseumFossilPic(void) bool8 Special_CloseMuseumFossilPic(void) { - u8 taskId = FindTaskIdByFunc(sub_809D494); + u8 taskId = FindTaskIdByFunc(Task_WaitMuseumFossilPic); if (taskId == 0xFF) return FALSE; gTasks[taskId].data[0]++; return TRUE; } -u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height) +static u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height) { struct WindowTemplate template = SetWindowTemplateFields(0, left + 1, top + 1, width, height, 15, 0x038); u8 windowId = AddWindow(&template); @@ -1157,7 +1157,7 @@ u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height) return windowId; } -void sub_809D6B0(u8 windowId) +static void DestroyScriptMenuWindow(u8 windowId) { ClearWindowTilemap(windowId); ClearStdWindowAndFrameToTransparent(windowId, TRUE); @@ -1176,7 +1176,7 @@ void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void) if (data[0] < 2) sub_8083A5C(&gSprites[data[2]], data[2]); } - taskId = FindTaskIdByFunc(sub_809D494); + taskId = FindTaskIdByFunc(Task_WaitMuseumFossilPic); if (taskId != 0xFF) { data = gTasks[taskId].data; -- cgit v1.2.3 From d33509ec93a5c6fc5b49b9efc2c92225a01846aa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 13:56:01 -0400 Subject: script_menu name strings --- src/script_menu.c | 454 +++++++++++++++++++++++++++--------------------------- 1 file changed, 227 insertions(+), 227 deletions(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index 5df40c935..eee943793 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -41,439 +41,439 @@ static u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height); static const struct MenuAction sScriptMultiChoiceMenu_0[] = { - { gUnknown_8417938 }, - { gUnknown_841793C } + { gText_Yes }, + { gText_No } }; static const struct MenuAction sScriptMultiChoiceMenu_2[] = { - { gUnknown_8417ADC }, - { gUnknown_8417AE3 }, - { gUnknown_8417AE9 }, - { gUnknown_8417AEE } + { gText_Normal }, + { gText_Black }, + { gText_Pink }, + { gText_Sepia } }; static const struct MenuAction sScriptMultiChoiceMenu_3[] = { - { gUnknown_84178F0 }, - { gUnknown_8417907 } + { gText_HallOfFame }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_4[] = { - { gUnknown_84178EB }, - { gUnknown_8417907 } + { gText_Eggs }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_5[] = { - { gUnknown_84178FD }, - { gUnknown_8417907 } + { gText_Victories }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_6[] = { - { gUnknown_84178F0 }, - { gUnknown_84178EB }, - { gUnknown_8417907 } + { gText_HallOfFame }, + { gText_Eggs }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_7[] = { - { gUnknown_84178F0 }, - { gUnknown_84178FD }, - { gUnknown_8417907 } + { gText_HallOfFame }, + { gText_Victories }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_8[] = { - { gUnknown_84178EB }, - { gUnknown_84178FD }, - { gUnknown_8417907 } + { gText_Eggs }, + { gText_Victories }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_9[] = { - { gUnknown_84178F0 }, - { gUnknown_84178EB }, - { gUnknown_84178FD }, - { gUnknown_8417907 } + { gText_HallOfFame }, + { gText_Eggs }, + { gText_Victories }, + { gText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_15[] = { - { gUnknown_8417914 }, - { gUnknown_841790C }, - { gUnknown_8417910 }, - { gUnknown_8417918 }, - { gUnknown_841791C }, + { gText_Slp }, + { gText_Psn }, + { gText_Par }, + { gText_Brn }, + { gText_Frz }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_16[] = { - { gUnknown_8417938 }, - { gUnknown_841793C }, - { gUnknown_84178E6 } + { gText_Yes }, + { gText_No }, + { gText_Info } }; static const struct MenuAction sScriptMultiChoiceMenu_17[] = { - { gUnknown_8417944 }, - { gUnknown_8417952 }, - { gUnknown_8417960 }, - { gUnknown_84178E6 }, + { gText_SingleBattle }, + { gText_DoubleBattle }, + { gText_MultiBattle }, + { gText_Info }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_18[] = { - { gUnknown_8417938 }, - { gUnknown_841793C }, - { gUnknown_84178E6 } + { gText_Yes }, + { gText_No }, + { gText_Info } }; static const struct MenuAction sScriptMultiChoiceMenu_19[] = { - { gUnknown_841796D }, - { gUnknown_841797F }, + { gText_MakeAChallenge }, + { gText_Info_2 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_20[] = { - { gUnknown_841806D }, - { gUnknown_841805D }, + { gText_Rooftop }, + { gText_B1F }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_21[] = { - { gUnknown_8417D56 }, + { gText_HelixFossil }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_22[] = { - { gUnknown_8417D63 }, + { gText_DomeFossil }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_23[] = { - { gUnknown_8417D6F }, + { gText_OldAmber }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_24[] = { - { gUnknown_8417D56 }, - { gUnknown_8417D6F }, + { gText_HelixFossil }, + { gText_OldAmber }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_25[] = { - { gUnknown_8417D63 }, - { gUnknown_8417D6F }, + { gText_DomeFossil }, + { gText_OldAmber }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_26[] = { - { gUnknown_8417984 }, - { gUnknown_841799A }, - { gUnknown_84179AD }, + { gText_FreshWater200 }, + { gText_SodaPop300 }, + { gText_Lemonade350 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_30[] = { - { gUnknown_8417A42 }, - { gUnknown_8417A58 }, - { gUnknown_8417A6E }, - { gUnknown_8417A84 }, - { gUnknown_8417A9A }, - { gUnknown_8417D4C } + { gText_Tm134000Coins }, + { gText_Tm233500Coins }, + { gText_Tm244000Coins }, + { gText_Tm304500Coins }, + { gText_Tm354000Coins }, + { gText_NoThanks_2 } }; static const struct MenuAction sScriptMultiChoiceMenu_41[] = { - { gUnknown_8417F4D }, - { gUnknown_8417ED9 }, - { gUnknown_8417EF7 }, - { gUnknown_8417F11 }, - { gUnknown_8417F2F }, - { gUnknown_8417D4C } + { gText_SmokeBall800Coins }, + { gText_MiracleSeed1000Coins }, + { gText_Charcoal1000Coins }, + { gText_MysticWater1000Coins }, + { gText_YellowFlute1600Coins }, + { gText_NoThanks_2 } }; static const struct MenuAction sScriptMultiChoiceMenu_27[] = { - { gUnknown_84179C0 }, - { gUnknown_84179D6 }, + { gText_50Coins1000 }, + { gText_500Coins10000 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_28[] = { - { gUnknown_84179ED }, - { gUnknown_84179F7 } + { gText_Excellent }, + { gText_NotSoBad } }; static const struct MenuAction sScriptMultiChoiceMenu_29[] = { - { gUnknown_8417A37 }, - { gUnknown_8417A3D } + { gText_Right }, + { gText_Left } }; static const struct MenuAction sScriptMultiChoiceMenu_31[] = { - { gUnknown_8417ABC }, - { gUnknown_8417AB9 }, - { gUnknown_8417AB6 }, - { gUnknown_8417AB3 }, - { gUnknown_8417AB0 }, + { gText_5F }, + { gText_4F }, + { gText_3F }, + { gText_2F }, + { gText_1F }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_32[] = { - { gUnknown_8417C0F }, + { gText_FreshWater }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_33[] = { - { gUnknown_8417C1B }, + { gText_SodaPop }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_34[] = { - { gUnknown_8417C0F }, - { gUnknown_8417C1B }, + { gText_FreshWater }, + { gText_SodaPop }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_35[] = { - { gUnknown_8417C24 }, + { gText_Lemonade }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_36[] = { - { gUnknown_8417C0F }, - { gUnknown_8417C24 }, + { gText_FreshWater }, + { gText_Lemonade }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_37[] = { - { gUnknown_8417C1B }, - { gUnknown_8417C24 }, + { gText_SodaPop }, + { gText_Lemonade }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_38[] = { - { gUnknown_8417C0F }, - { gUnknown_8417C1B }, - { gUnknown_8417C24 }, + { gText_FreshWater }, + { gText_SodaPop }, + { gText_Lemonade }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_0[] = { - { gUnknown_8417A24 }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_1[] = { - { gUnknown_8417A02 }, - { gUnknown_8417A24 }, + { gText_RedShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_2[] = { - { gUnknown_8417A0C }, - { gUnknown_8417A24 }, + { gText_YellowShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_3[] = { - { gUnknown_8417A02 }, - { gUnknown_8417A0C }, - { gUnknown_8417A24 }, + { gText_RedShard }, + { gText_YellowShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_4[] = { - { gUnknown_8417A19 }, - { gUnknown_8417A24 }, + { gText_BlueShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_5[] = { - { gUnknown_8417A02 }, - { gUnknown_8417A19 }, - { gUnknown_8417A24 }, + { gText_RedShard }, + { gText_BlueShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_6[] = { - { gUnknown_8417A0C }, - { gUnknown_8417A19 }, - { gUnknown_8417A24 }, + { gText_YellowShard }, + { gText_BlueShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_7[] = { - { gUnknown_8417A02 }, - { gUnknown_8417A0C }, - { gUnknown_8417A19 }, - { gUnknown_8417A24 }, + { gText_RedShard }, + { gText_YellowShard }, + { gText_BlueShard }, + { gText_GreenShard }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_1[] = { - { gUnknown_8417BE2 }, - { gUnknown_8417BE8 }, - { gUnknown_8417BF0 }, - { gUnknown_8417BF8 }, - { gUnknown_8417C01 } + { gText_Eevee }, + { gText_Flareon }, + { gText_Jolteon }, + { gText_Vaporeon }, + { gText_QuitLooking } }; static const struct MenuAction sScriptMultiChoiceMenu_13[] = { - { gUnknown_8417C33 }, - { gUnknown_8417C4B } + { gText_Bicycle1000000 }, + { gText_NoThanks } }; static const struct MenuAction sScriptMultiChoiceMenu_14[] = { - { gUnknown_8417C55 }, - { gUnknown_8417C6A }, - { gUnknown_8417C83 }, - { gUnknown_8417C9D }, - { gUnknown_8417CB7 }, - { gUnknown_8417D4C } + { gText_Abra180Coins }, + { gText_Clefairy500Coins }, + { gText_Dratini2800Coins }, + { gText_Scyther5500Coins }, + { gText_Porygon9999Coins }, + { gText_NoThanks_2 } }; static const struct MenuAction sScriptMultiChoiceMenu_39[] = { - { gUnknown_8417D79 }, - { gUnknown_8417D86 }, + { gText_TradeCenter }, + { gText_Colosseum }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_40[] = { - { gUnknown_8417D90 }, - { gUnknown_8417DA0 }, + { gText_GameLinkCable }, + { gText_Wireless }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_42[] = { - { gUnknown_841805D }, - { gUnknown_8418061 }, - { gUnknown_8418069 }, + { gText_B1F }, + { gText_B2F }, + { gText_B4F }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_43[] = { - { gUnknown_841807D }, - { gUnknown_841808E }, - { gUnknown_841809C }, + { gText_LinkedGamePlay }, + { gText_DirectCorner }, + { gText_UnionRoom }, { gOtherText_Quit } }; static const struct MenuAction sScriptMultiChoiceMenu_44[] = { - { gUnknown_8417DFE }, - { gUnknown_8417E09 }, + { gText_TwoIsland }, + { gText_ThreeIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_45[] = { - { gUnknown_8417DF3 }, - { gUnknown_8417E09 }, + { gText_OneIsland }, + { gText_ThreeIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_46[] = { - { gUnknown_8417DF3 }, - { gUnknown_8417DFE }, + { gText_OneIsland }, + { gText_TwoIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_47[] = { - { gUnknown_8417D79 }, - { gUnknown_8417E50 }, - { gUnknown_8417E5A }, + { gText_TradeCenter }, + { gText_Colosseum_2 }, + { gText_BerryCrush }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_48[] = { - { gUnknown_8417E66 }, - { gUnknown_8417E67 }, + { gText_Dummy_8417E66 }, + { gText_Dummy_8417E67 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_50[] = { - { gUnknown_8417D79 }, - { gUnknown_8417E50 }, + { gText_TradeCenter }, + { gText_Colosseum_2 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_49[] = { - { gUnknown_8417E72 }, - { gUnknown_8417E7F }, + { gText_PokemonJump }, + { gText_DodrioBerryPicking }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_51[] = { - { gUnknown_8417E94 }, - { gUnknown_8417EA4 } + { gText_2Tinymushrooms }, + { gText_1BigMushroom } }; static const struct MenuAction sScriptMultiChoiceMenu_52[] = { - { gUnknown_8417D79 }, - { gUnknown_8417E50 }, - { gUnknown_8417E71 }, - { gUnknown_8417E5A }, + { gText_TradeCenter }, + { gText_Colosseum_2 }, + { gText_Dummy_8417E71 }, + { gText_BerryCrush }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_53[] = { - { gUnknown_8417D79 }, - { gUnknown_8417E50 }, - { gUnknown_8417E71 }, + { gText_TradeCenter }, + { gText_Colosseum_2 }, + { gText_Dummy_8417E71 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_54[] = { - { gUnknown_8417EB3 }, - { gUnknown_8417EC1 }, + { gText_SeviiIslands }, + { gText_NavelRock }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_55[] = { - { gUnknown_8417EB3 }, - { gUnknown_8417ECC }, + { gText_SeviiIslands }, + { gText_BirthIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_56[] = { - { gUnknown_8417EB3 }, - { gUnknown_8417EC1 }, - { gUnknown_8417ECC }, + { gText_SeviiIslands }, + { gText_NavelRock }, + { gText_BirthIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_57[] = { - { gUnknown_8417DF3 }, - { gUnknown_8417DFE }, - { gUnknown_8417E09 }, + { gText_OneIsland }, + { gText_TwoIsland }, + { gText_ThreeIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_58[] = { - { gUnknown_8417E46 }, - { gUnknown_8417DFE }, - { gUnknown_8417E09 }, + { gText_Vermilion }, + { gText_TwoIsland }, + { gText_ThreeIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_59[] = { - { gUnknown_8417E46 }, - { gUnknown_8417DF3 }, - { gUnknown_8417E09 }, + { gText_Vermilion }, + { gText_OneIsland }, + { gText_ThreeIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_60[] = { - { gUnknown_8417E46 }, - { gUnknown_8417DF3 }, - { gUnknown_8417DFE }, + { gText_Vermilion }, + { gText_OneIsland }, + { gText_TwoIsland }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_61[] = { - { gUnknown_8417E46 }, + { gText_Vermilion }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_62[] = { - { gUnknown_8417F68 }, - { gUnknown_8417F67 }, + { gText_Dummy_8417F68 }, + { gText_Dummy_8417F67 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_63[] = { - { gUnknown_8417F77 }, - { gUnknown_8417F69 }, + { gText_JoinGroup }, + { gText_BecomeLeader }, { gOtherText_Exit } }; @@ -558,35 +558,35 @@ const struct MultichoiceListStruct gScriptMultiChoiceMenus[] = { }; const u8 *const gStdStringPtrs[] = { - gUnknown_8417ABF, - gUnknown_8417AC4, - gUnknown_8417ACB, - gUnknown_8417AD0, - gUnknown_8417AD6, - gUnknown_8417AF4, - gUnknown_8417AF9, - gUnknown_8417B00, - gUnknown_8417B05, - gUnknown_8417B0B, - gUnknown_8417B11, - gUnknown_8417B17, - gUnknown_8417B21, - gUnknown_8417B2C, - gUnknown_8417B36, - gUnknown_8417B3E, - gUnknown_8417B4B, - gUnknown_8417B58, - gUnknown_8417B65, - gUnknown_8417B72, - gUnknown_8417B7C, - gUnknown_8417B87, - gUnknown_8417B94, - gUnknown_8417C2D, - gUnknown_8417DA9, - gUnknown_8417DB6, - gUnknown_8417DC7, - gUnknown_8417DD9, - gUnknown_8417DE1 + gText_Cool, + gText_Beauty, + gText_Cute, + gText_Smart, + gText_Tough, + gText_Cool_2, + gText_Beauty_2, + gText_Cute_2, + gText_Smart_2, + gText_Tough_2, + gText_Items, + gText_KeyItems, + gText_PokeBalls, + gText_TmsgUnknown_8417B2CHms, + gText_Berries, + gText_Boulderbadge, + gText_Cascadebadge, + gText_Thunderbadge, + gText_Rainbowbadge, + gText_Soulbadge, + gText_Marshbadge, + gText_Volcanobadge, + gText_Earthbadge, + gText_Coins_2, + gText_ItemsPocket, + gText_KeyItemsPocket, + gText_PokeBallsPocket, + gText_TmCase, + gText_BerryPouch_2 }; static const u8 *const sDescriptionPtrs_CableClub_TradeBattleCancel[] = { @@ -648,14 +648,14 @@ static const struct SpriteSheet sMuseumAerodactylSprSheets[] = { static const u8 *const sSeaGallopDestStrings[] = { - gUnknown_8417E46, - gUnknown_8417DF3, - gUnknown_8417DFE, - gUnknown_8417E09, - gUnknown_8417E16, - gUnknown_8417E22, - gUnknown_8417E2E, - gUnknown_8417E39 + gText_Vermilion, + gText_OneIsland, + gText_TwoIsland, + gText_ThreeIsland, + gText_FourIsland, + gText_FiveIsland, + gText_SixIsland, + gText_SevenIsland }; static u16 GetStringTilesWide(const u8 *str) @@ -951,7 +951,7 @@ static void CreatePCMenuWindow(void) u8 windowWidth; u8 nitems; u8 windowId; - switch (GetStringTilesWide(gUnknown_8417BB6)) + switch (GetStringTilesWide(gText_SPc)) { default: if (FlagGet(FLAG_SYS_POKEDEX_GET)) @@ -969,9 +969,9 @@ static void CreatePCMenuWindow(void) nitems = 5; windowId = CreateWindowFromRect(0, 0, windowWidth, 10); SetStdWindowBorderStyle(windowId, FALSE); - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BD3, cursorWidth, 34, 0xFF, NULL); - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BBE, cursorWidth, 50, 0xFF, NULL); - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BCB, cursorWidth, 66, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_HallOfFame_2, cursorWidth, 50, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_LogOff, cursorWidth, 66, 0xFF, NULL); } else { @@ -982,14 +982,14 @@ static void CreatePCMenuWindow(void) windowId = CreateWindowFromRect(0, 0, windowWidth, nitems * 2); SetStdWindowBorderStyle(windowId, FALSE); if (FlagGet(FLAG_SYS_POKEDEX_GET)) - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BD3, cursorWidth, 34, 0xFF, NULL); - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BCB, cursorWidth, 2 + 16 * (nitems - 1), 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_LogOff, cursorWidth, 2 + 16 * (nitems - 1), 0xFF, NULL); } if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC)) - AddTextPrinterParameterized(windowId, 2, gUnknown_8417BAC, cursorWidth, 2 , 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_BillSPc, cursorWidth, 2 , 0xFF, NULL); else - AddTextPrinterParameterized(windowId, 2, gUnknown_8417B9F, cursorWidth, 2 , 0xFF, NULL); - StringExpandPlaceholders(gStringVar4, gUnknown_8417BB6); + AddTextPrinterParameterized(windowId, 2, gText_SomeoneSPc, cursorWidth, 2 , 0xFF, NULL); + StringExpandPlaceholders(gStringVar4, gText_SPc); Menu_PrintFormatIntlPlayerName(windowId, gStringVar4, cursorWidth, 18); Menu_InitCursor(windowId, 2, 0, 2, 16, nitems, 0); sub_809CC18(FALSE, nitems, windowId, 0xFF); @@ -1231,7 +1231,7 @@ void Special_DrawSeaGallopDestinationMenu(void) if (r4 == SEAGALLOP_CINNABAR_ISLAND) r4 = SEAGALLOP_VERMILION_CITY; } - AddTextPrinterParameterized(windowId, 2, gUnknown_8417DED, cursorWidth, i * 16 + 2, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_Other, cursorWidth, i * 16 + 2, 0xFF, NULL); i++; AddTextPrinterParameterized(windowId, 2, gOtherText_Exit, cursorWidth, i * 16 + 2, 0xFF, NULL); Menu_InitCursor(windowId, 2, 0, 2, 16, nitems, 0); -- cgit v1.2.3 From 15298c6cd152ebbe8dcf30fd9dcc384b7da02d19 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 14:01:40 -0400 Subject: Fix some string names --- src/script_menu.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index eee943793..1076e19c0 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -161,33 +161,33 @@ static const struct MenuAction sScriptMultiChoiceMenu_25[] = { }; static const struct MenuAction sScriptMultiChoiceMenu_26[] = { - { gText_FreshWater200 }, - { gText_SodaPop300 }, - { gText_Lemonade350 }, + { gText_FreshWater_200 }, + { gText_SodaPop_300 }, + { gText_Lemonade_350 }, { gOtherText_Exit } }; static const struct MenuAction sScriptMultiChoiceMenu_30[] = { - { gText_Tm134000Coins }, - { gText_Tm233500Coins }, - { gText_Tm244000Coins }, - { gText_Tm304500Coins }, - { gText_Tm354000Coins }, + { gText_Tm13_4000Coins }, + { gText_Tm23_3500Coins }, + { gText_Tm24_4000Coins }, + { gText_Tm30_4500Coins }, + { gText_Tm35_4000Coins }, { gText_NoThanks_2 } }; static const struct MenuAction sScriptMultiChoiceMenu_41[] = { - { gText_SmokeBall800Coins }, - { gText_MiracleSeed1000Coins }, - { gText_Charcoal1000Coins }, - { gText_MysticWater1000Coins }, - { gText_YellowFlute1600Coins }, + { gText_SmokeBall_800Coins }, + { gText_MiracleSeed_1000Coins }, + { gText_Charcoal_1000Coins }, + { gText_MysticWater_1000Coins }, + { gText_YellowFlute_1600Coins }, { gText_NoThanks_2 } }; static const struct MenuAction sScriptMultiChoiceMenu_27[] = { - { gText_50Coins1000 }, - { gText_500Coins10000 }, + { gText_50Coins_1000 }, + { gText_500Coins_10000 }, { gOtherText_Exit } }; @@ -311,16 +311,16 @@ static const struct MenuAction sScriptMultiChoiceMenu_1[] = { }; static const struct MenuAction sScriptMultiChoiceMenu_13[] = { - { gText_Bicycle1000000 }, + { gText_Bicycle_1000000 }, { gText_NoThanks } }; static const struct MenuAction sScriptMultiChoiceMenu_14[] = { - { gText_Abra180Coins }, - { gText_Clefairy500Coins }, - { gText_Dratini2800Coins }, - { gText_Scyther5500Coins }, - { gText_Porygon9999Coins }, + { gText_Abra_180Coins }, + { gText_Clefairy_500Coins }, + { gText_Dratini_2800Coins }, + { gText_Scyther_5500Coins }, + { gText_Porygon_9999Coins }, { gText_NoThanks_2 } }; -- cgit v1.2.3 From 359ec8dde1d069b8b335e863f332f65c262c9145 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 14:52:54 -0400 Subject: Name multichoice menus --- src/script_menu.c | 258 +++++++++++++++++++++++++++--------------------------- 1 file changed, 129 insertions(+), 129 deletions(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index 1076e19c0..08baed433 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -40,59 +40,59 @@ static void DestroyScriptMenuWindow(u8 windowId); static u8 CreateWindowFromRect(u8 left, u8 top, u8 width, u8 height); -static const struct MenuAction sScriptMultiChoiceMenu_0[] = { +static const struct MenuAction sScriptMultiChoiceMenu_YesNo[] = { { gText_Yes }, { gText_No } }; -static const struct MenuAction sScriptMultiChoiceMenu_2[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TrainerCardIconTint[] = { { gText_Normal }, { gText_Black }, { gText_Pink }, { gText_Sepia } }; -static const struct MenuAction sScriptMultiChoiceMenu_3[] = { +static const struct MenuAction sScriptMultiChoiceMenu_HOF_Quit[] = { { gText_HallOfFame }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_4[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Eggs_Quit[] = { { gText_Eggs }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_5[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Victories_Quit[] = { { gText_Victories }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_6[] = { +static const struct MenuAction sScriptMultiChoiceMenu_HOF_Eggs_Quit[] = { { gText_HallOfFame }, { gText_Eggs }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_7[] = { +static const struct MenuAction sScriptMultiChoiceMenu_HOF_Victories_Quit[] = { { gText_HallOfFame }, { gText_Victories }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_8[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Eggs_Victories_Quit[] = { { gText_Eggs }, { gText_Victories }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_9[] = { +static const struct MenuAction sScriptMultiChoiceMenu_HOF_Eggs_Victories_Quit[] = { { gText_HallOfFame }, { gText_Eggs }, { gText_Victories }, { gText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_15[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TrainerSchoolWhiteboard[] = { { gText_Slp }, { gText_Psn }, { gText_Par }, @@ -101,13 +101,13 @@ static const struct MenuAction sScriptMultiChoiceMenu_15[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_16[] = { +static const struct MenuAction sScriptMultiChoiceMenu_YesNoInfo[] = { { gText_Yes }, { gText_No }, { gText_Info } }; -static const struct MenuAction sScriptMultiChoiceMenu_17[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SingleDoubleMultiInfoExit[] = { { gText_SingleBattle }, { gText_DoubleBattle }, { gText_MultiBattle }, @@ -115,59 +115,59 @@ static const struct MenuAction sScriptMultiChoiceMenu_17[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_18[] = { +static const struct MenuAction sScriptMultiChoiceMenu_YesNoInfo2[] = { { gText_Yes }, { gText_No }, { gText_Info } }; -static const struct MenuAction sScriptMultiChoiceMenu_19[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ChallengeInfoExit[] = { { gText_MakeAChallenge }, { gText_Info_2 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_20[] = { +static const struct MenuAction sScriptMultiChoiceMenu_RooftopB1F[] = { { gText_Rooftop }, { gText_B1F }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_21[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Helix[] = { { gText_HelixFossil }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_22[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Dome[] = { { gText_DomeFossil }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_23[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Amber[] = { { gText_OldAmber }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_24[] = { +static const struct MenuAction sScriptMultiChoiceMenu_HelixAmber[] = { { gText_HelixFossil }, { gText_OldAmber }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_25[] = { +static const struct MenuAction sScriptMultiChoiceMenu_DomeAmber[] = { { gText_DomeFossil }, { gText_OldAmber }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_26[] = { +static const struct MenuAction sScriptMultiChoiceMenu_CeladonVendingMachine[] = { { gText_FreshWater_200 }, { gText_SodaPop_300 }, { gText_Lemonade_350 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_30[] = { +static const struct MenuAction sScriptMultiChoiceMenu_GameCornerTMPrizes[] = { { gText_Tm13_4000Coins }, { gText_Tm23_3500Coins }, { gText_Tm24_4000Coins }, @@ -176,7 +176,7 @@ static const struct MenuAction sScriptMultiChoiceMenu_30[] = { { gText_NoThanks_2 } }; -static const struct MenuAction sScriptMultiChoiceMenu_41[] = { +static const struct MenuAction sScriptMultiChoiceMenu_GameCornerBattleItemPrizes[] = { { gText_SmokeBall_800Coins }, { gText_MiracleSeed_1000Coins }, { gText_Charcoal_1000Coins }, @@ -185,65 +185,65 @@ static const struct MenuAction sScriptMultiChoiceMenu_41[] = { { gText_NoThanks_2 } }; -static const struct MenuAction sScriptMultiChoiceMenu_27[] = { +static const struct MenuAction sScriptMultiChoiceMenu_GameCornerCoinPurchaseCounter[] = { { gText_50Coins_1000 }, { gText_500Coins_10000 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_28[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Excellent_NotSoBad[] = { { gText_Excellent }, { gText_NotSoBad } }; -static const struct MenuAction sScriptMultiChoiceMenu_29[] = { +static const struct MenuAction sScriptMultiChoiceMenu_RightLeft[] = { { gText_Right }, { gText_Left } }; -static const struct MenuAction sScriptMultiChoiceMenu_31[] = { - { gText_5F }, - { gText_4F }, - { gText_3F }, - { gText_2F }, - { gText_1F }, +static const struct MenuAction sScriptMultiChoiceMenu_DeptStoreElevator[] = { + { gText_5F_2 }, + { gText_4F_2 }, + { gText_3F_2 }, + { gText_2F_2 }, + { gText_1F_2 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_32[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlFreshWater[] = { { gText_FreshWater }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_33[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlSodaPop[] = { { gText_SodaPop }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_34[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPop[] = { { gText_FreshWater }, { gText_SodaPop }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_35[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlLemonade[] = { { gText_Lemonade }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_36[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlFreshWaterLemonade[] = { { gText_FreshWater }, { gText_Lemonade }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_37[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlSodaPopLemonade[] = { { gText_SodaPop }, { gText_Lemonade }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_38[] = { +static const struct MenuAction sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPopLemonade[] = { { gText_FreshWater }, { gText_SodaPop }, { gText_Lemonade }, @@ -302,7 +302,7 @@ static const struct MenuAction sScriptMultiChoiceMenu_Unref_Shards_7[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_1[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Eeveelutions[] = { { gText_Eevee }, { gText_Flareon }, { gText_Jolteon }, @@ -310,12 +310,12 @@ static const struct MenuAction sScriptMultiChoiceMenu_1[] = { { gText_QuitLooking } }; -static const struct MenuAction sScriptMultiChoiceMenu_13[] = { +static const struct MenuAction sScriptMultiChoiceMenu_BikeShop[] = { { gText_Bicycle_1000000 }, { gText_NoThanks } }; -static const struct MenuAction sScriptMultiChoiceMenu_14[] = { +static const struct MenuAction sScriptMultiChoiceMenu_GameCornerPokemonPrizes[] = { { gText_Abra_180Coins }, { gText_Clefairy_500Coins }, { gText_Dratini_2800Coins }, @@ -324,51 +324,51 @@ static const struct MenuAction sScriptMultiChoiceMenu_14[] = { { gText_NoThanks_2 } }; -static const struct MenuAction sScriptMultiChoiceMenu_39[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TradeCenter_Colosseum[] = { { gText_TradeCenter }, { gText_Colosseum }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_40[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Link_Wireless[] = { { gText_GameLinkCable }, { gText_Wireless }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_42[] = { +static const struct MenuAction sScriptMultiChoiceMenu_RocketHideoutElevator[] = { { gText_B1F }, { gText_B2F }, { gText_B4F }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_43[] = { +static const struct MenuAction sScriptMultiChoiceMenu_LinkedDirectUnion[] = { { gText_LinkedGamePlay }, { gText_DirectCorner }, { gText_UnionRoom }, { gOtherText_Quit } }; -static const struct MenuAction sScriptMultiChoiceMenu_44[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Island23[] = { { gText_TwoIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_45[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Island13[] = { { gText_OneIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_46[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Island12[] = { { gText_OneIsland }, { gText_TwoIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_47[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseumCrush[] = { { gText_TradeCenter }, { gText_Colosseum_2 }, { gText_BerryCrush }, @@ -381,24 +381,24 @@ static const struct MenuAction sScriptMultiChoiceMenu_48[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_50[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseum_2[] = { { gText_TradeCenter }, { gText_Colosseum_2 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_49[] = { +static const struct MenuAction sScriptMultiChoiceMenu_PokejumpDodrio[] = { { gText_PokemonJump }, { gText_DodrioBerryPicking }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_51[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Mushrooms[] = { { gText_2Tinymushrooms }, { gText_1BigMushroom } }; -static const struct MenuAction sScriptMultiChoiceMenu_52[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseumBlankCrush[] = { { gText_TradeCenter }, { gText_Colosseum_2 }, { gText_Dummy_8417E71 }, @@ -406,61 +406,61 @@ static const struct MenuAction sScriptMultiChoiceMenu_52[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_53[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TradeColosseumBlank[] = { { gText_TradeCenter }, { gText_Colosseum_2 }, { gText_Dummy_8417E71 }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_54[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeviiNavel[] = { { gText_SeviiIslands }, { gText_NavelRock }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_55[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeviiBirth[] = { { gText_SeviiIslands }, { gText_BirthIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_56[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeviiNavelBirth[] = { { gText_SeviiIslands }, { gText_NavelRock }, { gText_BirthIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_57[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeaGallop123[] = { { gText_OneIsland }, { gText_TwoIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_58[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV23[] = { { gText_Vermilion }, { gText_TwoIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_59[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV13[] = { { gText_Vermilion }, { gText_OneIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_60[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV12[] = { { gText_Vermilion }, { gText_OneIsland }, { gText_TwoIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_61[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopVermilion[] = { { gText_Vermilion }, { gOtherText_Exit } }; @@ -471,13 +471,13 @@ static const struct MenuAction sScriptMultiChoiceMenu_62[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_63[] = { +static const struct MenuAction sScriptMultiChoiceMenu_JoinOrLead[] = { { gText_JoinGroup }, { gText_BecomeLeader }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_64[] = { +static const struct MenuAction sScriptMultiChoiceMenu_TrainerTowerMode[] = { { gOtherText_Single }, { gOtherText_Double }, { gOtherText_Knockout }, @@ -485,76 +485,76 @@ static const struct MenuAction sScriptMultiChoiceMenu_64[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_10[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Exit[] = { { gOtherText_Exit } }; const struct MultichoiceListStruct gScriptMultiChoiceMenus[] = { - { sScriptMultiChoiceMenu_0, NELEMS(sScriptMultiChoiceMenu_0) }, - { sScriptMultiChoiceMenu_1, NELEMS(sScriptMultiChoiceMenu_1) }, - { sScriptMultiChoiceMenu_2, NELEMS(sScriptMultiChoiceMenu_2) }, - { sScriptMultiChoiceMenu_3, NELEMS(sScriptMultiChoiceMenu_3) }, - { sScriptMultiChoiceMenu_4, NELEMS(sScriptMultiChoiceMenu_4) }, - { sScriptMultiChoiceMenu_5, NELEMS(sScriptMultiChoiceMenu_5) }, - { sScriptMultiChoiceMenu_6, NELEMS(sScriptMultiChoiceMenu_6) }, - { sScriptMultiChoiceMenu_7, NELEMS(sScriptMultiChoiceMenu_7) }, - { sScriptMultiChoiceMenu_8, NELEMS(sScriptMultiChoiceMenu_8) }, - { sScriptMultiChoiceMenu_9, NELEMS(sScriptMultiChoiceMenu_9) }, - { sScriptMultiChoiceMenu_10, NELEMS(sScriptMultiChoiceMenu_10) }, - { sScriptMultiChoiceMenu_10, NELEMS(sScriptMultiChoiceMenu_10) }, - { sScriptMultiChoiceMenu_10, NELEMS(sScriptMultiChoiceMenu_10) }, - { sScriptMultiChoiceMenu_13, NELEMS(sScriptMultiChoiceMenu_13) }, - { sScriptMultiChoiceMenu_14, NELEMS(sScriptMultiChoiceMenu_14) }, - { sScriptMultiChoiceMenu_15, NELEMS(sScriptMultiChoiceMenu_15) }, - { sScriptMultiChoiceMenu_16, NELEMS(sScriptMultiChoiceMenu_16) }, - { sScriptMultiChoiceMenu_17, NELEMS(sScriptMultiChoiceMenu_17) }, - { sScriptMultiChoiceMenu_18, NELEMS(sScriptMultiChoiceMenu_18) }, - { sScriptMultiChoiceMenu_19, NELEMS(sScriptMultiChoiceMenu_19) }, - { sScriptMultiChoiceMenu_20, NELEMS(sScriptMultiChoiceMenu_20) }, - { sScriptMultiChoiceMenu_21, NELEMS(sScriptMultiChoiceMenu_21) }, - { sScriptMultiChoiceMenu_22, NELEMS(sScriptMultiChoiceMenu_22) }, - { sScriptMultiChoiceMenu_23, NELEMS(sScriptMultiChoiceMenu_23) }, - { sScriptMultiChoiceMenu_24, NELEMS(sScriptMultiChoiceMenu_24) }, - { sScriptMultiChoiceMenu_25, NELEMS(sScriptMultiChoiceMenu_25) }, - { sScriptMultiChoiceMenu_26, NELEMS(sScriptMultiChoiceMenu_26) }, - { sScriptMultiChoiceMenu_27, NELEMS(sScriptMultiChoiceMenu_27) }, - { sScriptMultiChoiceMenu_28, NELEMS(sScriptMultiChoiceMenu_28) }, - { sScriptMultiChoiceMenu_29, NELEMS(sScriptMultiChoiceMenu_29) }, - { sScriptMultiChoiceMenu_30, NELEMS(sScriptMultiChoiceMenu_30) }, - { sScriptMultiChoiceMenu_31, NELEMS(sScriptMultiChoiceMenu_31) }, - { sScriptMultiChoiceMenu_32, NELEMS(sScriptMultiChoiceMenu_32) }, - { sScriptMultiChoiceMenu_33, NELEMS(sScriptMultiChoiceMenu_33) }, - { sScriptMultiChoiceMenu_34, NELEMS(sScriptMultiChoiceMenu_34) }, - { sScriptMultiChoiceMenu_35, NELEMS(sScriptMultiChoiceMenu_35) }, - { sScriptMultiChoiceMenu_36, NELEMS(sScriptMultiChoiceMenu_36) }, - { sScriptMultiChoiceMenu_37, NELEMS(sScriptMultiChoiceMenu_37) }, - { sScriptMultiChoiceMenu_38, NELEMS(sScriptMultiChoiceMenu_38) }, - { sScriptMultiChoiceMenu_39, NELEMS(sScriptMultiChoiceMenu_39) }, - { sScriptMultiChoiceMenu_40, NELEMS(sScriptMultiChoiceMenu_40) }, - { sScriptMultiChoiceMenu_41, NELEMS(sScriptMultiChoiceMenu_41) }, - { sScriptMultiChoiceMenu_42, NELEMS(sScriptMultiChoiceMenu_42) }, - { sScriptMultiChoiceMenu_43, NELEMS(sScriptMultiChoiceMenu_43) }, - { sScriptMultiChoiceMenu_44, NELEMS(sScriptMultiChoiceMenu_44) }, - { sScriptMultiChoiceMenu_45, NELEMS(sScriptMultiChoiceMenu_45) }, - { sScriptMultiChoiceMenu_46, NELEMS(sScriptMultiChoiceMenu_46) }, - { sScriptMultiChoiceMenu_47, NELEMS(sScriptMultiChoiceMenu_47) }, + { sScriptMultiChoiceMenu_YesNo, NELEMS(sScriptMultiChoiceMenu_YesNo) }, + { sScriptMultiChoiceMenu_Eeveelutions, NELEMS(sScriptMultiChoiceMenu_Eeveelutions) }, + { sScriptMultiChoiceMenu_TrainerCardIconTint, NELEMS(sScriptMultiChoiceMenu_TrainerCardIconTint) }, + { sScriptMultiChoiceMenu_HOF_Quit, NELEMS(sScriptMultiChoiceMenu_HOF_Quit) }, + { sScriptMultiChoiceMenu_Eggs_Quit, NELEMS(sScriptMultiChoiceMenu_Eggs_Quit) }, + { sScriptMultiChoiceMenu_Victories_Quit, NELEMS(sScriptMultiChoiceMenu_Victories_Quit) }, + { sScriptMultiChoiceMenu_HOF_Eggs_Quit, NELEMS(sScriptMultiChoiceMenu_HOF_Eggs_Quit) }, + { sScriptMultiChoiceMenu_HOF_Victories_Quit, NELEMS(sScriptMultiChoiceMenu_HOF_Victories_Quit) }, + { sScriptMultiChoiceMenu_Eggs_Victories_Quit, NELEMS(sScriptMultiChoiceMenu_Eggs_Victories_Quit) }, + { sScriptMultiChoiceMenu_HOF_Eggs_Victories_Quit, NELEMS(sScriptMultiChoiceMenu_HOF_Eggs_Victories_Quit) }, + { sScriptMultiChoiceMenu_Exit, NELEMS(sScriptMultiChoiceMenu_Exit) }, + { sScriptMultiChoiceMenu_Exit, NELEMS(sScriptMultiChoiceMenu_Exit) }, + { sScriptMultiChoiceMenu_Exit, NELEMS(sScriptMultiChoiceMenu_Exit) }, + { sScriptMultiChoiceMenu_BikeShop, NELEMS(sScriptMultiChoiceMenu_BikeShop) }, + { sScriptMultiChoiceMenu_GameCornerPokemonPrizes, NELEMS(sScriptMultiChoiceMenu_GameCornerPokemonPrizes) }, + { sScriptMultiChoiceMenu_TrainerSchoolWhiteboard, NELEMS(sScriptMultiChoiceMenu_TrainerSchoolWhiteboard) }, + { sScriptMultiChoiceMenu_YesNoInfo, NELEMS(sScriptMultiChoiceMenu_YesNoInfo) }, + { sScriptMultiChoiceMenu_SingleDoubleMultiInfoExit, NELEMS(sScriptMultiChoiceMenu_SingleDoubleMultiInfoExit) }, + { sScriptMultiChoiceMenu_YesNoInfo2, NELEMS(sScriptMultiChoiceMenu_YesNoInfo2) }, + { sScriptMultiChoiceMenu_ChallengeInfoExit, NELEMS(sScriptMultiChoiceMenu_ChallengeInfoExit) }, + { sScriptMultiChoiceMenu_RooftopB1F, NELEMS(sScriptMultiChoiceMenu_RooftopB1F) }, + { sScriptMultiChoiceMenu_Helix, NELEMS(sScriptMultiChoiceMenu_Helix) }, + { sScriptMultiChoiceMenu_Dome, NELEMS(sScriptMultiChoiceMenu_Dome) }, + { sScriptMultiChoiceMenu_Amber, NELEMS(sScriptMultiChoiceMenu_Amber) }, + { sScriptMultiChoiceMenu_HelixAmber, NELEMS(sScriptMultiChoiceMenu_HelixAmber) }, + { sScriptMultiChoiceMenu_DomeAmber, NELEMS(sScriptMultiChoiceMenu_DomeAmber) }, + { sScriptMultiChoiceMenu_CeladonVendingMachine, NELEMS(sScriptMultiChoiceMenu_CeladonVendingMachine) }, + { sScriptMultiChoiceMenu_GameCornerCoinPurchaseCounter, NELEMS(sScriptMultiChoiceMenu_GameCornerCoinPurchaseCounter) }, + { sScriptMultiChoiceMenu_Excellent_NotSoBad, NELEMS(sScriptMultiChoiceMenu_Excellent_NotSoBad) }, + { sScriptMultiChoiceMenu_RightLeft, NELEMS(sScriptMultiChoiceMenu_RightLeft) }, + { sScriptMultiChoiceMenu_GameCornerTMPrizes, NELEMS(sScriptMultiChoiceMenu_GameCornerTMPrizes) }, + { sScriptMultiChoiceMenu_DeptStoreElevator, NELEMS(sScriptMultiChoiceMenu_DeptStoreElevator) }, + { sScriptMultiChoiceMenu_ThirstyGirlFreshWater, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlFreshWater) }, + { sScriptMultiChoiceMenu_ThirstyGirlSodaPop, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlSodaPop) }, + { sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPop, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPop) }, + { sScriptMultiChoiceMenu_ThirstyGirlLemonade, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlLemonade) }, + { sScriptMultiChoiceMenu_ThirstyGirlFreshWaterLemonade, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlFreshWaterLemonade) }, + { sScriptMultiChoiceMenu_ThirstyGirlSodaPopLemonade, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlSodaPopLemonade) }, + { sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPopLemonade, NELEMS(sScriptMultiChoiceMenu_ThirstyGirlFreshWaterSodaPopLemonade) }, + { sScriptMultiChoiceMenu_TradeCenter_Colosseum, NELEMS(sScriptMultiChoiceMenu_TradeCenter_Colosseum) }, + { sScriptMultiChoiceMenu_Link_Wireless, NELEMS(sScriptMultiChoiceMenu_Link_Wireless) }, + { sScriptMultiChoiceMenu_GameCornerBattleItemPrizes, NELEMS(sScriptMultiChoiceMenu_GameCornerBattleItemPrizes) }, + { sScriptMultiChoiceMenu_RocketHideoutElevator, NELEMS(sScriptMultiChoiceMenu_RocketHideoutElevator) }, + { sScriptMultiChoiceMenu_LinkedDirectUnion, NELEMS(sScriptMultiChoiceMenu_LinkedDirectUnion) }, + { sScriptMultiChoiceMenu_Island23, NELEMS(sScriptMultiChoiceMenu_Island23) }, + { sScriptMultiChoiceMenu_Island13, NELEMS(sScriptMultiChoiceMenu_Island13) }, + { sScriptMultiChoiceMenu_Island12, NELEMS(sScriptMultiChoiceMenu_Island12) }, + { sScriptMultiChoiceMenu_TradeColosseumCrush, NELEMS(sScriptMultiChoiceMenu_TradeColosseumCrush) }, { sScriptMultiChoiceMenu_48, NELEMS(sScriptMultiChoiceMenu_48) }, - { sScriptMultiChoiceMenu_49, NELEMS(sScriptMultiChoiceMenu_49) }, - { sScriptMultiChoiceMenu_50, NELEMS(sScriptMultiChoiceMenu_50) }, - { sScriptMultiChoiceMenu_51, NELEMS(sScriptMultiChoiceMenu_51) }, - { sScriptMultiChoiceMenu_52, NELEMS(sScriptMultiChoiceMenu_52) }, - { sScriptMultiChoiceMenu_53, NELEMS(sScriptMultiChoiceMenu_53) }, - { sScriptMultiChoiceMenu_54, NELEMS(sScriptMultiChoiceMenu_54) }, - { sScriptMultiChoiceMenu_55, NELEMS(sScriptMultiChoiceMenu_55) }, - { sScriptMultiChoiceMenu_56, NELEMS(sScriptMultiChoiceMenu_56) }, - { sScriptMultiChoiceMenu_57, NELEMS(sScriptMultiChoiceMenu_57) }, - { sScriptMultiChoiceMenu_58, NELEMS(sScriptMultiChoiceMenu_58) }, - { sScriptMultiChoiceMenu_59, NELEMS(sScriptMultiChoiceMenu_59) }, - { sScriptMultiChoiceMenu_60, NELEMS(sScriptMultiChoiceMenu_60) }, - { sScriptMultiChoiceMenu_61, NELEMS(sScriptMultiChoiceMenu_61) }, + { sScriptMultiChoiceMenu_PokejumpDodrio, NELEMS(sScriptMultiChoiceMenu_PokejumpDodrio) }, + { sScriptMultiChoiceMenu_TradeColosseum_2, NELEMS(sScriptMultiChoiceMenu_TradeColosseum_2) }, + { sScriptMultiChoiceMenu_Mushrooms, NELEMS(sScriptMultiChoiceMenu_Mushrooms) }, + { sScriptMultiChoiceMenu_TradeColosseumBlankCrush, NELEMS(sScriptMultiChoiceMenu_TradeColosseumBlankCrush) }, + { sScriptMultiChoiceMenu_TradeColosseumBlank, NELEMS(sScriptMultiChoiceMenu_TradeColosseumBlank) }, + { sScriptMultiChoiceMenu_SeviiNavel, NELEMS(sScriptMultiChoiceMenu_SeviiNavel) }, + { sScriptMultiChoiceMenu_SeviiBirth, NELEMS(sScriptMultiChoiceMenu_SeviiBirth) }, + { sScriptMultiChoiceMenu_SeviiNavelBirth, NELEMS(sScriptMultiChoiceMenu_SeviiNavelBirth) }, + { sScriptMultiChoiceMenu_SeaGallop123, NELEMS(sScriptMultiChoiceMenu_SeaGallop123) }, + { sScriptMultiChoiceMenu_SeaGallopV23, NELEMS(sScriptMultiChoiceMenu_SeaGallopV23) }, + { sScriptMultiChoiceMenu_SeaGallopV13, NELEMS(sScriptMultiChoiceMenu_SeaGallopV13) }, + { sScriptMultiChoiceMenu_SeaGallopV12, NELEMS(sScriptMultiChoiceMenu_SeaGallopV12) }, + { sScriptMultiChoiceMenu_SeaGallopVermilion, NELEMS(sScriptMultiChoiceMenu_SeaGallopVermilion) }, { sScriptMultiChoiceMenu_62, NELEMS(sScriptMultiChoiceMenu_62) }, - { sScriptMultiChoiceMenu_63, NELEMS(sScriptMultiChoiceMenu_63) }, - { sScriptMultiChoiceMenu_64, NELEMS(sScriptMultiChoiceMenu_64) } + { sScriptMultiChoiceMenu_JoinOrLead, NELEMS(sScriptMultiChoiceMenu_JoinOrLead) }, + { sScriptMultiChoiceMenu_TrainerTowerMode, NELEMS(sScriptMultiChoiceMenu_TrainerTowerMode) } }; const u8 *const gStdStringPtrs[] = { -- cgit v1.2.3 From 4b052a204084119ad9302ccdf43b76733447a2df Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 17:01:05 -0400 Subject: Resolve review comments --- src/script_menu.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index 08baed433..ed2f0aa0a 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -21,11 +21,11 @@ struct MultichoiceListStruct { - const struct MenuAction *list; + const struct MenuAction * list; u8 count; }; -EWRAM_DATA u8 sDelay = 0; +static EWRAM_DATA u8 sDelay = 0; static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos); static u8 sub_809CBB4(u8 count); @@ -432,35 +432,35 @@ static const struct MenuAction sScriptMultiChoiceMenu_SeviiNavelBirth[] = { { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_SeaGallop123[] = { +static const struct MenuAction sScriptMultiChoiceMenu_Seagallop123[] = { { gText_OneIsland }, { gText_TwoIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV23[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeagallopV23[] = { { gText_Vermilion }, { gText_TwoIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV13[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeagallopV13[] = { { gText_Vermilion }, { gText_OneIsland }, { gText_ThreeIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopV12[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeagallopV12[] = { { gText_Vermilion }, { gText_OneIsland }, { gText_TwoIsland }, { gOtherText_Exit } }; -static const struct MenuAction sScriptMultiChoiceMenu_SeaGallopVermilion[] = { +static const struct MenuAction sScriptMultiChoiceMenu_SeagallopVermilion[] = { { gText_Vermilion }, { gOtherText_Exit } }; @@ -547,11 +547,11 @@ const struct MultichoiceListStruct gScriptMultiChoiceMenus[] = { { sScriptMultiChoiceMenu_SeviiNavel, NELEMS(sScriptMultiChoiceMenu_SeviiNavel) }, { sScriptMultiChoiceMenu_SeviiBirth, NELEMS(sScriptMultiChoiceMenu_SeviiBirth) }, { sScriptMultiChoiceMenu_SeviiNavelBirth, NELEMS(sScriptMultiChoiceMenu_SeviiNavelBirth) }, - { sScriptMultiChoiceMenu_SeaGallop123, NELEMS(sScriptMultiChoiceMenu_SeaGallop123) }, - { sScriptMultiChoiceMenu_SeaGallopV23, NELEMS(sScriptMultiChoiceMenu_SeaGallopV23) }, - { sScriptMultiChoiceMenu_SeaGallopV13, NELEMS(sScriptMultiChoiceMenu_SeaGallopV13) }, - { sScriptMultiChoiceMenu_SeaGallopV12, NELEMS(sScriptMultiChoiceMenu_SeaGallopV12) }, - { sScriptMultiChoiceMenu_SeaGallopVermilion, NELEMS(sScriptMultiChoiceMenu_SeaGallopVermilion) }, + { sScriptMultiChoiceMenu_Seagallop123, NELEMS(sScriptMultiChoiceMenu_Seagallop123) }, + { sScriptMultiChoiceMenu_SeagallopV23, NELEMS(sScriptMultiChoiceMenu_SeagallopV23) }, + { sScriptMultiChoiceMenu_SeagallopV13, NELEMS(sScriptMultiChoiceMenu_SeagallopV13) }, + { sScriptMultiChoiceMenu_SeagallopV12, NELEMS(sScriptMultiChoiceMenu_SeagallopV12) }, + { sScriptMultiChoiceMenu_SeagallopVermilion, NELEMS(sScriptMultiChoiceMenu_SeagallopVermilion) }, { sScriptMultiChoiceMenu_62, NELEMS(sScriptMultiChoiceMenu_62) }, { sScriptMultiChoiceMenu_JoinOrLead, NELEMS(sScriptMultiChoiceMenu_JoinOrLead) }, { sScriptMultiChoiceMenu_TrainerTowerMode, NELEMS(sScriptMultiChoiceMenu_TrainerTowerMode) } @@ -647,7 +647,7 @@ static const struct SpriteSheet sMuseumAerodactylSprSheets[] = { }; -static const u8 *const sSeaGallopDestStrings[] = { +static const u8 *const sSeagallopDestStrings[] = { gText_Vermilion, gText_OneIsland, gText_TwoIsland, @@ -1188,7 +1188,7 @@ void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void) } } -void Special_DrawSeaGallopDestinationMenu(void) +void Special_DrawSeagallopDestinationMenu(void) { // 8004 = Starting location // 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit) @@ -1224,7 +1224,7 @@ void Special_DrawSeaGallopDestinationMenu(void) for (i = 0; i < nitems - 2; i++) { if (r4 != gSpecialVar_0x8004) - AddTextPrinterParameterized(windowId, 2, sSeaGallopDestStrings[r4], cursorWidth, i * 16 + 2, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, sSeagallopDestStrings[r4], cursorWidth, i * 16 + 2, 0xFF, NULL); else i--; r4++; @@ -1240,7 +1240,7 @@ void Special_DrawSeaGallopDestinationMenu(void) } } -u16 Special_GetSelectedSeaGallopDestination(void) +u16 Special_GetSelectedSeagallopDestination(void) { // 8004 = Starting location // 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit) -- cgit v1.2.3 From fd78afa5a7d4441fe0d76693e301deb6bc2557dc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Oct 2019 17:11:31 -0400 Subject: Name remaining static routines in script_menu.c --- src/script_menu.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index ed2f0aa0a..b3826322b 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -28,12 +28,12 @@ struct MultichoiceListStruct static EWRAM_DATA u8 sDelay = 0; static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpress, u8 initPos); -static u8 sub_809CBB4(u8 count); -static void sub_809CC18(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId); +static u8 GetMCWindowHeight(u8 count); +static void CreateMCMenuInputHandlerTask(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId); static void Task_MultichoiceMenu_HandleInput(u8 taskId); static void MultiChoicePrintHelpDescription(u8 mcId); -static void task_yes_no_maybe(u8 taskId); -static void sub_809CFDC(u8 taskId); +static void Task_YesNoMenu_HandleInput(u8 taskId); +static void Hask_MultichoiceGridMenu_HandleInput(u8 taskId); static void CreatePCMenuWindow(void); static bool8 PicboxWait(void); static void DestroyScriptMenuWindow(u8 windowId); @@ -722,7 +722,7 @@ static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpres width = (strWidth + 9) / 8 + 1; if (left + width > 28) left = 28 - width; - height = sub_809CBB4(count); + height = GetMCWindowHeight(count); windowId = CreateWindowFromRect(left, top, width, height); SetStdWindowBorderStyle(windowId, FALSE); if (mcId == 30 || mcId == 13 || mcId == 41) @@ -730,12 +730,12 @@ static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpres else MultichoiceList_PrintItems(windowId, 2, 8, 2, 14, count, list, 0, 2); Menu_InitCursor(windowId, 2, 0, 2, 14, count, initPos); - sub_809CC18(ignoreBpress, count, windowId, mcId); + CreateMCMenuInputHandlerTask(ignoreBpress, count, windowId, mcId); ScheduleBgCopyTilemapToVram(0); } } -static u8 sub_809CBB4(u8 count) +static u8 GetMCWindowHeight(u8 count) { switch (count) { @@ -762,7 +762,7 @@ static u8 sub_809CBB4(u8 count) } } -static void sub_809CC18(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId) +static void CreateMCMenuInputHandlerTask(u8 ignoreBpress, u8 count, u8 windowId, u8 mcId) { u8 taskId; if (mcId == 39 || mcId == 47 || mcId == 50) @@ -838,13 +838,13 @@ static void MultiChoicePrintHelpDescription(u8 mcId) bool8 ScriptMenu_YesNo(u8 unused, u8 stuff) { - if (FuncIsActiveTask(task_yes_no_maybe) == TRUE) + if (FuncIsActiveTask(Task_YesNoMenu_HandleInput) == TRUE) return FALSE; gSpecialVar_Result = SCR_MENU_UNSET; if (!QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites)) { DisplayYesNoMenuDefaultYes(); - CreateTask(task_yes_no_maybe, 80); + CreateTask(Task_YesNoMenu_HandleInput, 80); } return TRUE; } @@ -857,7 +857,7 @@ bool8 sub_809CE38(void) return TRUE; } -static void task_yes_no_maybe(u8 taskId) +static void Task_YesNoMenu_HandleInput(u8 taskId) { s8 input; if (gTasks[taskId].data[2] < 5) @@ -892,7 +892,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 co u8 width; u8 rowCount; u8 taskId; - if (FuncIsActiveTask(sub_809CFDC) == TRUE) + if (FuncIsActiveTask(Hask_MultichoiceGridMenu_HandleInput) == TRUE) return FALSE; gSpecialVar_Result = SCR_MENU_UNSET; if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE) @@ -901,7 +901,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 co count = gScriptMultiChoiceMenus[multichoiceId].count; width = GetMenuWidthFromList(list, count) + 1; rowCount = count / columnCount; - taskId = CreateTask(sub_809CFDC, 80); + taskId = CreateTask(Hask_MultichoiceGridMenu_HandleInput, 80); gTasks[taskId].data[4] = a4; gTasks[taskId].data[6] = CreateWindowFromRect(left, top, width * columnCount, rowCount * 2); SetStdWindowBorderStyle(gTasks[taskId].data[6], FALSE); @@ -912,7 +912,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 co return TRUE; } -static void sub_809CFDC(u8 taskId) +static void Hask_MultichoiceGridMenu_HandleInput(u8 taskId) { s16 *data = gTasks[taskId].data; s8 input = Menu_ProcessInputGridLayout(); @@ -992,7 +992,7 @@ static void CreatePCMenuWindow(void) StringExpandPlaceholders(gStringVar4, gText_SPc); Menu_PrintFormatIntlPlayerName(windowId, gStringVar4, cursorWidth, 18); Menu_InitCursor(windowId, 2, 0, 2, 16, nitems, 0); - sub_809CC18(FALSE, nitems, windowId, 0xFF); + CreateMCMenuInputHandlerTask(FALSE, nitems, windowId, 0xFF); ScheduleBgCopyTilemapToVram(0); } @@ -1235,7 +1235,7 @@ void Special_DrawSeagallopDestinationMenu(void) i++; AddTextPrinterParameterized(windowId, 2, gOtherText_Exit, cursorWidth, i * 16 + 2, 0xFF, NULL); Menu_InitCursor(windowId, 2, 0, 2, 16, nitems, 0); - sub_809CC18(FALSE, nitems, windowId, 0xFF); + CreateMCMenuInputHandlerTask(FALSE, nitems, windowId, 0xFF); ScheduleBgCopyTilemapToVram(0); } } -- cgit v1.2.3