dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remainder of script_menu documentation

Browse Source
This commit is contained in:
GriffinR
2019-09-19 18:31:09 -04:00
parent 275695c189
commit 9fb24bbbce
6 changed files with 289 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SlateportCity_Harbor/scripts.inc
+2 -2
View File
@@ -175,7 +175,7 @@ SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06
SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A
goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_20CB50 goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_20CB50
multichoicedefault 18, 8, MULTI_SSTIDAL_SLATEPORT_2, 2, 0 multichoicedefault 18, 8, MULTI_SSTIDAL_SLATEPORT_NO_BF, 2, 0
switch VAR_RESULT switch VAR_RESULT
case 0, SlateportCity_Harbor_EventScript_20CB92 case 0, SlateportCity_Harbor_EventScript_20CB92
case 1, SlateportCity_Harbor_EventScript_20CC2D case 1, SlateportCity_Harbor_EventScript_20CC2D
@@ -183,7 +183,7 @@ SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A
end end
SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50 SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50
multichoicedefault 17, 6, MULTI_SSTIDAL_SLATEPORT_1, 2, 0 multichoicedefault 17, 6, MULTI_SSTIDAL_SLATEPORT_WITH_BF, 2, 0
switch VAR_RESULT switch VAR_RESULT
case 0, SlateportCity_Harbor_EventScript_20CB92 case 0, SlateportCity_Harbor_EventScript_20CB92
case 1, SlateportCity_Harbor_EventScript_20CBBA case 1, SlateportCity_Harbor_EventScript_20CBBA
include/constants/script_menu.h
+2 -2
View File
@@ -60,11 +60,11 @@
#define MULTI_GAME_CORNER_COINS 49 #define MULTI_GAME_CORNER_COINS 49
#define MULTI_HOWS_FISHING 50 #define MULTI_HOWS_FISHING 50
#define MULTI_UNUSED_51 51 #define MULTI_UNUSED_51 51
#define MULTI_SSTIDAL_SLATEPORT_1 52 // TODO: rename #define MULTI_SSTIDAL_SLATEPORT_WITH_BF 52
#define MULTI_SSTIDAL_BATTLE_FRONTIER 53 #define MULTI_SSTIDAL_BATTLE_FRONTIER 53
#define MULTI_RIGHTLEFT 54 #define MULTI_RIGHTLEFT 54
#define MULTI_GAME_CORNER_TMS 55 #define MULTI_GAME_CORNER_TMS 55
#define MULTI_SSTIDAL_SLATEPORT_2 56 // #define MULTI_SSTIDAL_SLATEPORT_NO_BF 56
#define MULTI_FLOORS 57 #define MULTI_FLOORS 57
#define MULTI_SHARDS_R 58 #define MULTI_SHARDS_R 58
#define MULTI_SHARDS_Y 59 #define MULTI_SHARDS_Y 59
include/script_menu.h
+10 -10
View File
@@ -3,17 +3,17 @@
extern const u8 *const gStdStrings[]; extern const u8 *const gStdStrings[];
bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4); bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress);
bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5); bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 defaultChoice);
bool8 ScriptMenu_YesNo(u8 var1, u8 var2); bool8 ScriptMenu_YesNo(u8 left, u8 top);
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 columnCount);
bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y);
bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
int ConvertPixelWidthToTileWidth(int); int ConvertPixelWidthToTileWidth(int width);
u8 CreateWindowFromRect(u8, u8, u8, u8); u8 CreateWindowFromRect(u8 x, u8 y, u8 width, u8 height);
void ClearToTransparentAndRemoveWindow(u8); void ClearToTransparentAndRemoveWindow(u8 windowId);
int DisplayTextAndGetWidth(const u8*, int); int DisplayTextAndGetWidth(const u8* str, int width);
int ScriptMenu_AdjustLeftCoordFromWidth(int arg0, int tileWidth); int ScriptMenu_AdjustLeftCoordFromWidth(int left, int width);
bool16 ScriptMenu_CreatePCMultichoice(void); bool16 ScriptMenu_CreatePCMultichoice(void);
void ScriptMenu_DisplayPCStartupPrompt(void); void ScriptMenu_DisplayPCStartupPrompt(void);
src/data/script_menu.h
+13 -12
View File
@@ -288,7 +288,7 @@ const struct MenuAction MultichoiceList_HowsFishing[] =
{gText_NotSoGood}, {gText_NotSoGood},
}; };
const struct MenuAction MultichoiceList_SSTidalSlateport1[] = const struct MenuAction MultichoiceList_SSTidalSlateportWithBF[] =
{ {
{gText_LilycoveCity}, {gText_LilycoveCity},
{gText_BattleFrontier}, {gText_BattleFrontier},
@@ -308,7 +308,7 @@ const struct MenuAction MultichoiceList_RightLeft[] =
{gText_Left}, {gText_Left},
}; };
const struct MenuAction MultichoiceList_SSTidalSlateport2[] = const struct MenuAction MultichoiceList_SSTidalSlateportNoBF[] =
{ {
{gText_LilycoveCity}, {gText_LilycoveCity},
{gText_Exit}, {gText_Exit},
@@ -836,11 +836,11 @@ const struct MultichoiceListStruct gMultichoiceLists[] =
[MULTI_GAME_CORNER_COINS] = MULTICHOICE(MultichoiceList_GameCornerCoins), [MULTI_GAME_CORNER_COINS] = MULTICHOICE(MultichoiceList_GameCornerCoins),
[MULTI_HOWS_FISHING] = MULTICHOICE(MultichoiceList_HowsFishing), [MULTI_HOWS_FISHING] = MULTICHOICE(MultichoiceList_HowsFishing),
[MULTI_UNUSED_51] = MULTICHOICE(MultichoiceList_Exit), [MULTI_UNUSED_51] = MULTICHOICE(MultichoiceList_Exit),
[MULTI_SSTIDAL_SLATEPORT_1] = MULTICHOICE(MultichoiceList_SSTidalSlateport1), [MULTI_SSTIDAL_SLATEPORT_WITH_BF] = MULTICHOICE(MultichoiceList_SSTidalSlateportWithBF),
[MULTI_SSTIDAL_BATTLE_FRONTIER] = MULTICHOICE(MultichoiceList_SSTidalBattleFrontier), [MULTI_SSTIDAL_BATTLE_FRONTIER] = MULTICHOICE(MultichoiceList_SSTidalBattleFrontier),
[MULTI_RIGHTLEFT] = MULTICHOICE(MultichoiceList_RightLeft), [MULTI_RIGHTLEFT] = MULTICHOICE(MultichoiceList_RightLeft),
[MULTI_GAME_CORNER_TMS] = MULTICHOICE(MultichoiceList_GameCornerTMs), [MULTI_GAME_CORNER_TMS] = MULTICHOICE(MultichoiceList_GameCornerTMs),
[MULTI_SSTIDAL_SLATEPORT_2] = MULTICHOICE(MultichoiceList_SSTidalSlateport2), [MULTI_SSTIDAL_SLATEPORT_NO_BF] = MULTICHOICE(MultichoiceList_SSTidalSlateportNoBF),
[MULTI_FLOORS] = MULTICHOICE(MultichoiceList_Floors), [MULTI_FLOORS] = MULTICHOICE(MultichoiceList_Floors),
[MULTI_SHARDS_R] = MULTICHOICE(MultichoiceList_ShardsR), [MULTI_SHARDS_R] = MULTICHOICE(MultichoiceList_ShardsR),
[MULTI_SHARDS_Y] = MULTICHOICE(MultichoiceList_ShardsY), [MULTI_SHARDS_Y] = MULTICHOICE(MultichoiceList_ShardsY),
@@ -952,17 +952,18 @@ const u8 *const sPCNameStrings[] =
gText_LogOff, gText_LogOff,
}; };
const u8 *const gLilycoveSSTidalDestinations[] = const u8 *const gLilycoveSSTidalDestinations[SSTIDAL_SELECTION_COUNT] =
{ {
gText_SlateportCity, [SSTIDAL_SELECTION_SLATEPORT] = gText_SlateportCity,
gText_BattleFrontier, [SSTIDAL_SELECTION_BATTLE_FRONTIER] = gText_BattleFrontier,
gText_SouthernIsland, [SSTIDAL_SELECTION_SOUTHERN_ISLAND] = gText_SouthernIsland,
gText_NavelRock, [SSTIDAL_SELECTION_NAVEL_ROCK] = gText_NavelRock,
gText_BirthIsland, [SSTIDAL_SELECTION_BIRTH_ISLAND] = gText_BirthIsland,
gText_FarawayIsland, [SSTIDAL_SELECTION_FARAWAY_ISLAND] = gText_FarawayIsland,
gText_Exit, [SSTIDAL_SELECTION_EXIT] = gText_Exit,
}; };
// TODO: name
const u8 *const gUnknown_0858BB9C[] = const u8 *const gUnknown_0858BB9C[] =
{ {
CableClub_Text_TradeUsingLinkCable, CableClub_Text_TradeUsingLinkCable,
src/field_specials.c
-1
View File
@@ -83,7 +83,6 @@ static EWRAM_DATA u8 sPCBoxToSendMon = 0;
static EWRAM_DATA u32 sUnknown_0203AB70 = 0; static EWRAM_DATA u32 sUnknown_0203AB70 = 0;
struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate;
static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH];
extern const u16 gEventObjectPalette8[]; extern const u16 gEventObjectPalette8[];
extern const u16 gEventObjectPalette17[]; extern const u16 gEventObjectPalette17[];
src/script_menu.c
+38 -37
View File
@@ -20,24 +20,23 @@
#include "data/script_menu.h" #include "data/script_menu.h"
EWRAM_DATA u8 gProcessInputDelay = 0; static EWRAM_DATA u8 sProcessInputDelay = 0;
static u8 sLilycoveSSTidalSelections[ARRAY_COUNT(gLilycoveSSTidalDestinations)]; static u8 sLilycoveSSTidalSelections[SSTIDAL_SELECTION_COUNT];
//static u32 filler_0300112c;
static void Task_HandleMultichoiceInput(u8); static void Task_HandleMultichoiceInput(u8 taskId);
static void Task_HandleYesNoInput(u8); static void Task_HandleYesNoInput(u8 taskId);
static void Task_HandleMultichoiceGridInput(u8); static void Task_HandleMultichoiceGridInput(u8 taskId);
static void DrawMultichoiceMenu(u8, u8, u8, bool8, u8); static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 cursorPos);
static void sub_80E1FBC(u8, u8, u8, u8); static void InitMultichoiceCheckWrap(bool8 ignoreBPress, u8 count, u8 windowId, u8 multichoiceId);
static void DrawLinkServicesMultichoiceMenu(u8); static void DrawLinkServicesMultichoiceMenu(u8 multichoiceId);
static void CreatePCMultichoice(void); static void CreatePCMultichoice(void);
static void CreateLilycoveSSTidalMultichoice(void); static void CreateLilycoveSSTidalMultichoice(void);
static bool8 IsPicboxClosed(void); static bool8 IsPicboxClosed(void);
static void CreateStartMenuForPokenavTutorial(void); static void CreateStartMenuForPokenavTutorial(void);
static void sub_80E2CC4(u8, u8, u8, u8); static void InitMultichoiceNoWrap(bool8 ignoreBPress, u8 unusedCount, u8 windowId, u8 multichoiceId);
bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress) bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress)
{ {
if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE) if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
{ {
@@ -66,7 +65,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8
} }
// Unused // Unused
static u16 sub_80E1EB8(const u8 *str) static u16 GetLengthWithExpandedPlayerName(const u8 *str)
{ {
u16 length = 0; u16 length = 0;
@@ -75,7 +74,7 @@ static u16 sub_80E1EB8(const u8 *str)
if (*str == PLACEHOLDER_BEGIN) if (*str == PLACEHOLDER_BEGIN)
{ {
str++; str++;
if (*str == 1) if (*str == 1) // 01 is the second byte of the {PLAYER} placeholder
{ {
length += StringLength(gSaveBlock2Ptr->playerName); length += StringLength(gSaveBlock2Ptr->playerName);
str++; str++;
@@ -91,7 +90,7 @@ static u16 sub_80E1EB8(const u8 *str)
return length; return length;
} }
static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 cursorPos) static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 cursorPos)
{ {
int i; int i;
u8 windowId; u8 windowId;
@@ -112,7 +111,7 @@ static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPre
PrintMenuTable(windowId, count, actions); PrintMenuTable(windowId, count, actions);
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, count, cursorPos); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, count, cursorPos);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
sub_80E1FBC(ignoreBPress, count, windowId, multichoiceId); InitMultichoiceCheckWrap(ignoreBPress, count, windowId, multichoiceId);
} }
#define tLeft data[0] #define tLeft data[0]
@@ -124,17 +123,17 @@ static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPre
#define tWindowId data[6] #define tWindowId data[6]
#define tMultichoiceId data[7] #define tMultichoiceId data[7]
static void sub_80E1FBC(u8 ignoreBPress, u8 count, u8 windowId, u8 multichoiceId) static void InitMultichoiceCheckWrap(bool8 ignoreBPress, u8 count, u8 windowId, u8 multichoiceId)
{ {
u8 i; u8 i;
u8 taskId; u8 taskId;
gProcessInputDelay = 2; sProcessInputDelay = 2;
for (i = 0; i < ARRAY_COUNT(gLinkServicesMultichoiceIds); i++) for (i = 0; i < ARRAY_COUNT(gLinkServicesMultichoiceIds); i++)
{ {
if (gLinkServicesMultichoiceIds[i] == multichoiceId) if (gLinkServicesMultichoiceIds[i] == multichoiceId)
{ {
gProcessInputDelay = 12; sProcessInputDelay = 12;
} }
} }
@@ -160,9 +159,9 @@ static void Task_HandleMultichoiceInput(u8 taskId)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
if (gProcessInputDelay) if (sProcessInputDelay)
{ {
gProcessInputDelay--; sProcessInputDelay--;
} }
else else
{ {
@@ -249,7 +248,7 @@ static void Task_HandleYesNoInput(u8 taskId)
EnableBothScriptContexts(); EnableBothScriptContexts();
} }
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 columnCount) bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 columnCount)
{ {
if (FuncIsActiveTask(Task_HandleMultichoiceGridInput) == TRUE) if (FuncIsActiveTask(Task_HandleMultichoiceGridInput) == TRUE)
{ {
@@ -348,7 +347,8 @@ static void CreatePCMultichoice(void)
width = ConvertPixelWidthToTileWidth(pixelWidth); width = ConvertPixelWidthToTileWidth(pixelWidth);
if (FlagGet(FLAG_SYS_GAME_CLEAR)) // player has cleared game? // Include Hall of Fame option if player is champion
if (FlagGet(FLAG_SYS_GAME_CLEAR))
{ {
numChoices = 4; numChoices = 4;
windowId = CreateWindowFromRect(0, 0, width, 8); windowId = CreateWindowFromRect(0, 0, width, 8);
@@ -364,7 +364,8 @@ static void CreatePCMultichoice(void)
AddTextPrinterParameterized(windowId, 1, gText_LogOff, y, 33, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(windowId, 1, gText_LogOff, y, 33, TEXT_SPEED_FF, NULL);
} }
if (FlagGet(FLAG_SYS_PC_LANETTE)) // player met lanette? // Change PC name if player has met Lanette
if (FlagGet(FLAG_SYS_PC_LANETTE))
AddTextPrinterParameterized(windowId, 1, gText_LanettesPC, y, 1, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(windowId, 1, gText_LanettesPC, y, 1, TEXT_SPEED_FF, NULL);
else else
AddTextPrinterParameterized(windowId, 1, gText_SomeonesPC, y, 1, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(windowId, 1, gText_SomeonesPC, y, 1, TEXT_SPEED_FF, NULL);
@@ -373,7 +374,7 @@ static void CreatePCMultichoice(void)
PrintPlayerNameOnWindow(windowId, gStringVar4, y, 17); PrintPlayerNameOnWindow(windowId, gStringVar4, y, 17);
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, numChoices, 0); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, numChoices, 0);
CopyWindowToVram(windowId, 3); CopyWindowToVram(windowId, 3);
sub_80E1FBC(FALSE, numChoices, windowId, MULTI_PC); InitMultichoiceCheckWrap(FALSE, numChoices, windowId, MULTI_PC);
} }
void ScriptMenu_DisplayPCStartupPrompt(void) void ScriptMenu_DisplayPCStartupPrompt(void)
@@ -408,7 +409,7 @@ static void CreateLilycoveSSTidalMultichoice(void)
u8 i; u8 i;
u32 j; u32 j;
for (i = 0; i < ARRAY_COUNT(sLilycoveSSTidalSelections); i++) for (i = 0; i < SSTIDAL_SELECTION_COUNT; i++)
{ {
sLilycoveSSTidalSelections[i] = 0xFF; sLilycoveSSTidalSelections[i] = 0xFF;
} }
@@ -509,7 +510,7 @@ static void CreateLilycoveSSTidalMultichoice(void)
{ {
pixelWidth = 0; pixelWidth = 0;
for (j = 0; j < ARRAY_COUNT(gLilycoveSSTidalDestinations); j++) for (j = 0; j < SSTIDAL_SELECTION_COUNT; j++)
{ {
u8 selection = sLilycoveSSTidalSelections[j]; u8 selection = sLilycoveSSTidalSelections[j];
if (selection != 0xFF) if (selection != 0xFF)
@@ -522,7 +523,7 @@ static void CreateLilycoveSSTidalMultichoice(void)
windowId = CreateWindowFromRect(MAX_MULTICHOICE_WIDTH - width, (6 - count) * 2, width, count * 2); windowId = CreateWindowFromRect(MAX_MULTICHOICE_WIDTH - width, (6 - count) * 2, width, count * 2);
SetStandardWindowBorderStyle(windowId, 0); SetStandardWindowBorderStyle(windowId, 0);
for (selectionCount = 0, i = 0; i < ARRAY_COUNT(gLilycoveSSTidalDestinations); i++) for (selectionCount = 0, i = 0; i < SSTIDAL_SELECTION_COUNT; i++)
{ {
if (sLilycoveSSTidalSelections[i] != 0xFF) if (sLilycoveSSTidalSelections[i] != 0xFF)
{ {
@@ -533,7 +534,7 @@ static void CreateLilycoveSSTidalMultichoice(void)
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, count, count - 1); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, count, count - 1);
CopyWindowToVram(windowId, 3); CopyWindowToVram(windowId, 3);
sub_80E1FBC(FALSE, count, windowId, MULTI_SSTIDAL_LILYCOVE); InitMultichoiceCheckWrap(FALSE, count, windowId, MULTI_SSTIDAL_LILYCOVE);
} }
} }
@@ -695,17 +696,17 @@ static void CreateStartMenuForPokenavTutorial(void)
AddTextPrinterParameterized(windowId, 1, gText_MenuOptionSave, 8, 89, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(windowId, 1, gText_MenuOptionSave, 8, 89, TEXT_SPEED_FF, NULL);
AddTextPrinterParameterized(windowId, 1, gText_MenuOptionOption, 8, 105, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(windowId, 1, gText_MenuOptionOption, 8, 105, TEXT_SPEED_FF, NULL);
AddTextPrinterParameterized(windowId, 1, gText_MenuOptionExit, 8, 121, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(windowId, 1, gText_MenuOptionExit, 8, 121, TEXT_SPEED_FF, NULL);
sub_81983AC(windowId, 1, 0, 9, 16, 8, 0); sub_81983AC(windowId, 1, 0, 9, 16, ARRAY_COUNT(MultichoiceList_ForcedStartMenu), 0);
sub_80E2CC4(FALSE, 8, windowId, MULTI_FORCED_START_MENU); InitMultichoiceNoWrap(FALSE, ARRAY_COUNT(MultichoiceList_ForcedStartMenu), windowId, MULTI_FORCED_START_MENU);
CopyWindowToVram(windowId, 3); CopyWindowToVram(windowId, 3);
} }
#define tWindowId data[6] #define tWindowId data[6]
static void sub_80E2CC4(bool8 ignoreBPress, u8 unused, u8 windowId, u8 multichoiceId) static void InitMultichoiceNoWrap(bool8 ignoreBPress, u8 unusedCount, u8 windowId, u8 multichoiceId)
{ {
u8 taskId; u8 taskId;
gProcessInputDelay = 2; sProcessInputDelay = 2;
taskId = CreateTask(Task_HandleMultichoiceInput, 80); taskId = CreateTask(Task_HandleMultichoiceInput, 80);
gTasks[taskId].tIgnoreBPress = ignoreBPress; gTasks[taskId].tIgnoreBPress = ignoreBPress;
gTasks[taskId].tDoWrap = 0; gTasks[taskId].tDoWrap = 0;
@@ -729,14 +730,14 @@ static int DisplayTextAndGetWidthInternal(const u8 *str)
return GetStringWidth(1, temp, 0); return GetStringWidth(1, temp, 0);
} }
int DisplayTextAndGetWidth(const u8 *str, int prevMaxWidth) int DisplayTextAndGetWidth(const u8 *str, int prevWidth)
{ {
int len = DisplayTextAndGetWidthInternal(str); int width = DisplayTextAndGetWidthInternal(str);
if (len < prevMaxWidth) if (width < prevWidth)
{ {
len = prevMaxWidth; width = prevWidth;
} }
return len; return width;
} }
int ConvertPixelWidthToTileWidth(int width) int ConvertPixelWidthToTileWidth(int width)