dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

doc option_menu

Browse Source
This commit is contained in:
PikalaxALT
2020-03-29 17:45:11 -04:00
parent 8c23bd7c96
commit 1bed74a6a1
12 changed files with 80 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/pokemon_summary_screen.s
+6 -6
View File
@@ -490,7 +490,7 @@ _081348D6:
.align 2, 0 .align 2, 0
_081348E0: .4byte 0x00003270 _081348E0: .4byte 0x00003270
_081348E4: _081348E4:
bl sub_80BF72C bl MenuHelpers_CallLinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -786,7 +786,7 @@ _08134B38:
_08134B58: .4byte gUnknown_203B140 _08134B58: .4byte gUnknown_203B140
_08134B5C: .4byte 0x00003270 _08134B5C: .4byte 0x00003270
_08134B60: _08134B60:
bl sub_8058244 bl Overworld_LinkRecvQueueLengthMoreThan2
cmp r0, 0x1 cmp r0, 0x1
beq _08134B9A beq _08134B9A
bl sub_800B270 bl sub_800B270
@@ -8687,7 +8687,7 @@ _08138D0A:
_08138D10: _08138D10:
b _08139094 b _08139094
_08138D12: _08138D12:
bl sub_80BF72C bl MenuHelpers_CallLinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -9080,7 +9080,7 @@ _08139024:
.align 2, 0 .align 2, 0
_08139030: .4byte gUnknown_203B16D _08139030: .4byte gUnknown_203B16D
_08139034: _08139034:
bl sub_80BF72C bl MenuHelpers_CallLinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -9800,7 +9800,7 @@ _08139604:
_08139620: .4byte gUnknown_203B140 _08139620: .4byte gUnknown_203B140
_08139624: .4byte 0x00003288 _08139624: .4byte 0x00003288
_08139628: _08139628:
bl sub_80BF72C bl MenuHelpers_CallLinkSomething
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -13905,7 +13905,7 @@ _0813B700: .4byte 0x00003003
_0813B704: .4byte 0x00003004 _0813B704: .4byte 0x00003004
_0813B708: .4byte 0x0000328c _0813B708: .4byte 0x0000328c
_0813B70C: _0813B70C:
bl sub_8058244 bl Overworld_LinkRecvQueueLengthMoreThan2
cmp r0, 0 cmp r0, 0
bne _0813B746 bne _0813B746
bl sub_800B270 bl sub_800B270
include/menu_helpers.h
+1 -1
View File
@@ -15,7 +15,7 @@ struct YesNoFuncTable
}; };
bool16 RunTextPrinters_CheckActive(u8 textPrinterId); bool16 RunTextPrinters_CheckActive(u8 textPrinterId);
bool32 sub_80BF72C(void); bool32 MenuHelpers_CallLinkSomething(void);
bool8 sub_80BF748(void); bool8 sub_80BF748(void);
bool8 MenuHelpers_LinkSomething(void); bool8 MenuHelpers_LinkSomething(void);
void SetVBlankHBlankCallbacksToNull(void); void SetVBlankHBlankCallbacksToNull(void);
include/overworld.h
+1 -1
View File
@@ -146,7 +146,7 @@ bool8 BGMusicStopped(void);
bool8 IsMapTypeIndoors(u8 mapType); bool8 IsMapTypeIndoors(u8 mapType);
bool32 Overworld_IsBikingAllowed(void); bool32 Overworld_IsBikingAllowed(void);
void Overworld_ResetStateAfterDigEscRope(void); void Overworld_ResetStateAfterDigEscRope(void);
bool32 sub_8058244(void); bool32 Overworld_LinkRecvQueueLengthMoreThan2(void);
u8 GetCurrentMapType(void); u8 GetCurrentMapType(void);
u8 GetLastUsedWarpMapType(void); u8 GetLastUsedWarpMapType(void);
src/berry_pouch.c
+3 -3
View File
@@ -457,7 +457,7 @@ static void CB2_InitBerryPouch(void)
{ {
while (1) while (1)
{ {
if ((u8)sub_80BF72C() == TRUE) if ((u8)MenuHelpers_CallLinkSomething() == TRUE)
break; break;
if (RunBerryPouchInit() == TRUE) if (RunBerryPouchInit() == TRUE)
break; break;
@@ -934,7 +934,7 @@ static void Task_BerryPouchMain(u8 taskId)
{ {
s16 * data = gTasks[taskId].data; s16 * data = gTasks[taskId].data;
s32 menuInput; s32 menuInput;
if (!gPaletteFade.active && (u8)sub_80BF72C() != TRUE) if (!gPaletteFade.active && (u8)MenuHelpers_CallLinkSomething() != TRUE)
{ {
menuInput = ListMenu_ProcessInput(data[0]); menuInput = ListMenu_ProcessInput(data[0]);
ListMenuGetScrollAndRow(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow); ListMenuGetScrollAndRow(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow);
@@ -1040,7 +1040,7 @@ static void Task_NormalContextMenu(u8 taskId)
static void Task_NormalContextMenu_HandleInput(u8 taskId) static void Task_NormalContextMenu_HandleInput(u8 taskId)
{ {
s8 input; s8 input;
if ((u8)sub_80BF72C() != TRUE) if ((u8)MenuHelpers_CallLinkSomething() != TRUE)
{ {
input = Menu_ProcessInputNoWrapAround(); input = Menu_ProcessInputNoWrapAround();
switch (input) switch (input)
src/item_menu.c
+4 -4
View File
@@ -377,7 +377,7 @@ static void CB2_OpenBagMenu(void)
{ {
while (1) while (1)
{ {
if ((u8)sub_80BF72C() == TRUE) if ((u8)MenuHelpers_CallLinkSomething() == TRUE)
break; break;
if (LoadBagMenuGraphics() == TRUE) if (LoadBagMenuGraphics() == TRUE)
break; break;
@@ -1050,7 +1050,7 @@ static void Task_BagMenu_HandleInput(u8 taskId)
return; return;
if (FuncIsActiveTask(Task_AnimateWin0v) == TRUE) if (FuncIsActiveTask(Task_AnimateWin0v) == TRUE)
return; return;
if ((u8)sub_80BF72C() == TRUE) if ((u8)MenuHelpers_CallLinkSomething() == TRUE)
return; return;
switch (ProcessPocketSwitchInput(taskId, gBagMenuState.pocket)) switch (ProcessPocketSwitchInput(taskId, gBagMenuState.pocket))
{ {
@@ -1244,7 +1244,7 @@ static void Task_MoveItemInPocket_HandleInput(u8 taskId)
s32 input; s32 input;
u16 itemsAbove; u16 itemsAbove;
u16 cursorPos; u16 cursorPos;
if ((u8)sub_80BF72C() == TRUE) if ((u8)MenuHelpers_CallLinkSomething() == TRUE)
return; return;
input = ListMenu_ProcessInput(data[0]); input = ListMenu_ProcessInput(data[0]);
ListMenuGetScrollAndRow(data[0], &gBagMenuState.cursorPos[gBagMenuState.pocket], &gBagMenuState.itemsAbove[gBagMenuState.pocket]); ListMenuGetScrollAndRow(data[0], &gBagMenuState.cursorPos[gBagMenuState.pocket], &gBagMenuState.itemsAbove[gBagMenuState.pocket]);
@@ -1447,7 +1447,7 @@ static void Task_ItemContext_FieldOrBattle(u8 taskId)
static void Task_FieldItemContextMenuHandleInput(u8 taskId) static void Task_FieldItemContextMenuHandleInput(u8 taskId)
{ {
s8 input; s8 input;
if ((u8)sub_80BF72C() != TRUE) if ((u8)MenuHelpers_CallLinkSomething() != TRUE)
{ {
input = Menu_ProcessInputNoWrapAround(); input = Menu_ProcessInputNoWrapAround();
switch (input) switch (input)
src/item_pc.c
+1 -1
View File
@@ -385,7 +385,7 @@ static bool8 ItemPc_DoGfxSetup(void)
gMain.state++; gMain.state++;
break; break;
case 20: case 20:
if ((u8)sub_80BF72C() != TRUE) if ((u8)MenuHelpers_CallLinkSomething() != TRUE)
gMain.state++; gMain.state++;
break; break;
default: default:
src/mail.c
+1 -1
View File
@@ -588,7 +588,7 @@ static bool8 DoInitMailView(void)
} }
break; break;
case 15: case 15:
if (sub_8058244() == TRUE) if (Overworld_LinkRecvQueueLengthMoreThan2() == TRUE)
return FALSE; return FALSE;
break; break;
case 16: case 16:
src/menu_helpers.c
+3 -3
View File
@@ -125,17 +125,17 @@ bool8 MenuHelpers_LinkSomething(void)
return FALSE; return FALSE;
} }
bool32 sub_80BF72C(void) bool32 MenuHelpers_CallLinkSomething(void)
{ {
if (!MenuHelpers_LinkSomething()) if (!MenuHelpers_LinkSomething())
return FALSE; return FALSE;
else else
return (u8)sub_8058244(); return (u8)Overworld_LinkRecvQueueLengthMoreThan2();
} }
bool8 sub_80BF748(void) bool8 sub_80BF748(void)
{ {
if ((u8)sub_80BF72C() == TRUE) if ((u8)MenuHelpers_CallLinkSomething() == TRUE)
return TRUE; return TRUE;
else if (sub_800B270() != TRUE) else if (sub_800B270() != TRUE)
return FALSE; return FALSE;
src/option_menu.c
+46 -43
View File
@@ -43,11 +43,10 @@ enum
struct OptionMenu struct OptionMenu
{ {
/*0x00*/ u16 option[MENUITEM_COUNT]; /*0x00*/ u16 option[MENUITEM_COUNT];
/*0x0E*/ u16 unkE; /*0x0E*/ u16 cursorPos;
/*0x10*/ u8 state3; /*0x10*/ u8 loadState;
/*0x11*/ u8 state; /*0x11*/ u8 state;
/*0x12*/ u8 state2; /*0x12*/ u8 loadPaletteState;
/*0x13*/ u8 unk13;
}; };
static EWRAM_DATA struct OptionMenu *sOptionMenuPtr = NULL; static EWRAM_DATA struct OptionMenu *sOptionMenuPtr = NULL;
@@ -68,9 +67,9 @@ static u8 OptionMenu_ProcessInput(void);
static void BufferOptionMenuString(u8 selection); static void BufferOptionMenuString(u8 selection);
static void CloseAndSaveOptionMenu(u8 taskId); static void CloseAndSaveOptionMenu(u8 taskId);
static void PrintOptionMenuHeader(void); static void PrintOptionMenuHeader(void);
static void sub_8088C0C(void); static void DrawOptionMenuBg(void);
static void LoadOptionMenuItemNames(void); static void LoadOptionMenuItemNames(void);
static void sub_8088DE0(u16 selection); static void UpdateSettingSelectionDisplay(u16 selection);
// Data Definitions // Data Definitions
static const struct WindowTemplate sOptionMenuWinTemplates[] = static const struct WindowTemplate sOptionMenuWinTemplates[] =
@@ -208,10 +207,10 @@ void CB2_OptionsMenuFromStartMenu(void)
if (gMain.savedCallback == NULL) if (gMain.savedCallback == NULL)
gMain.savedCallback = CB2_ReturnToFieldWithOpenMenu; gMain.savedCallback = CB2_ReturnToFieldWithOpenMenu;
sOptionMenuPtr = AllocZeroed(sizeof(struct OptionMenu)); sOptionMenuPtr = AllocZeroed(sizeof(struct OptionMenu));
sOptionMenuPtr->state3 = 0; sOptionMenuPtr->loadState = 0;
sOptionMenuPtr->state2 = 0; sOptionMenuPtr->loadPaletteState = 0;
sOptionMenuPtr->state = 0; sOptionMenuPtr->state = 0;
sOptionMenuPtr->unkE = 0; sOptionMenuPtr->cursorPos = 0;
sOptionMenuPtr->option[MENUITEM_TEXTSPEED] = gSaveBlock2Ptr->optionsTextSpeed; sOptionMenuPtr->option[MENUITEM_TEXTSPEED] = gSaveBlock2Ptr->optionsTextSpeed;
sOptionMenuPtr->option[MENUITEM_BATTLESCENE] = gSaveBlock2Ptr->optionsBattleSceneOff; sOptionMenuPtr->option[MENUITEM_BATTLESCENE] = gSaveBlock2Ptr->optionsBattleSceneOff;
sOptionMenuPtr->option[MENUITEM_BATTLESTYLE] = gSaveBlock2Ptr->optionsBattleStyle; sOptionMenuPtr->option[MENUITEM_BATTLESTYLE] = gSaveBlock2Ptr->optionsBattleStyle;
@@ -262,7 +261,7 @@ static void CB2_OptionMenu(void)
PrintOptionMenuHeader(); PrintOptionMenuHeader();
break; break;
case 5: case 5:
sub_8088C0C(); DrawOptionMenuBg();
break; break;
case 6: case 6:
LoadOptionMenuItemNames(); LoadOptionMenuItemNames();
@@ -272,7 +271,7 @@ static void CB2_OptionMenu(void)
BufferOptionMenuString(i); BufferOptionMenuString(i);
break; break;
case 8: case 8:
sub_8088DE0(sOptionMenuPtr->unkE); UpdateSettingSelectionDisplay(sOptionMenuPtr->cursorPos);
break; break;
case 9: case 9:
OptionMenu_PickSwitchCancel(); OptionMenu_PickSwitchCancel();
@@ -340,7 +339,7 @@ static void OptionMenu_ResetSpriteData(void)
static bool8 LoadOptionMenuPalette(void) static bool8 LoadOptionMenuPalette(void)
{ {
switch (sOptionMenuPtr->state2) switch (sOptionMenuPtr->loadPaletteState)
{ {
case 0: case 0:
LoadBgTiles(1, GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->tiles, 0x120, 0x1AA); LoadBgTiles(1, GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->tiles, 0x120, 0x1AA);
@@ -358,51 +357,55 @@ static bool8 LoadOptionMenuPalette(void)
default: default:
return TRUE; return TRUE;
} }
sOptionMenuPtr->state2++; sOptionMenuPtr->loadPaletteState++;
return FALSE; return FALSE;
} }
static void Task_OptionMenu(u8 taskId) static void Task_OptionMenu(u8 taskId)
{ {
switch (sOptionMenuPtr->state3) switch (sOptionMenuPtr->loadState)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
OptionMenu_SetVBlankCallback(); OptionMenu_SetVBlankCallback();
sOptionMenuPtr->state3++; sOptionMenuPtr->loadState++;
break;
case 1:
if (gPaletteFade.active)
return;
sOptionMenuPtr->loadState++;
break; break;
case 2: case 2:
if (sub_80BF72C() == TRUE) if (MenuHelpers_CallLinkSomething() == TRUE)
break; break;
switch (OptionMenu_ProcessInput()) switch (OptionMenu_ProcessInput())
{ {
case 0: case 0:
break; break;
case 1: case 1:
sOptionMenuPtr->state3++; sOptionMenuPtr->loadState++;
break; break;
case 2: case 2:
LoadBgTiles(1, GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->tiles, 0x120, 0x1AA); LoadBgTiles(1, GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->tiles, 0x120, 0x1AA);
LoadPalette(GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->palette, 0x20, 0x20); LoadPalette(GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->palette, 0x20, 0x20);
BufferOptionMenuString(sOptionMenuPtr->unkE); BufferOptionMenuString(sOptionMenuPtr->cursorPos);
break; break;
case 3: case 3:
sub_8088DE0(sOptionMenuPtr->unkE); UpdateSettingSelectionDisplay(sOptionMenuPtr->cursorPos);
break; break;
case 4: case 4:
BufferOptionMenuString(sOptionMenuPtr->unkE); BufferOptionMenuString(sOptionMenuPtr->cursorPos);
break; break;
} }
break; break;
case 3: case 3:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
sOptionMenuPtr->state3++; sOptionMenuPtr->loadState++;
break; break;
case 1:
case 4: case 4:
if (gPaletteFade.active) if (gPaletteFade.active)
return; return;
sOptionMenuPtr->state3++; sOptionMenuPtr->loadState++;
break; break;
case 5: case 5:
CloseAndSaveOptionMenu(taskId); CloseAndSaveOptionMenu(taskId);
@@ -416,43 +419,43 @@ static u8 OptionMenu_ProcessInput(void)
u16* curr; u16* curr;
if (JOY_REPT(DPAD_RIGHT)) if (JOY_REPT(DPAD_RIGHT))
{ {
current = sOptionMenuPtr->option[(sOptionMenuPtr->unkE)]; current = sOptionMenuPtr->option[(sOptionMenuPtr->cursorPos)];
if (current == (sOptionMenuItemCounts[sOptionMenuPtr->unkE] - 1)) if (current == (sOptionMenuItemCounts[sOptionMenuPtr->cursorPos] - 1))
sOptionMenuPtr->option[sOptionMenuPtr->unkE] = 0; sOptionMenuPtr->option[sOptionMenuPtr->cursorPos] = 0;
else else
sOptionMenuPtr->option[sOptionMenuPtr->unkE] = current + 1; sOptionMenuPtr->option[sOptionMenuPtr->cursorPos] = current + 1;
if (sOptionMenuPtr->unkE == MENUITEM_FRAMETYPE) if (sOptionMenuPtr->cursorPos == MENUITEM_FRAMETYPE)
return 2; return 2;
else else
return 4; return 4;
} }
else if (JOY_REPT(DPAD_LEFT)) else if (JOY_REPT(DPAD_LEFT))
{ {
curr = &sOptionMenuPtr->option[sOptionMenuPtr->unkE]; curr = &sOptionMenuPtr->option[sOptionMenuPtr->cursorPos];
if (*curr == 0) if (*curr == 0)
*curr = sOptionMenuItemCounts[sOptionMenuPtr->unkE] - 1; *curr = sOptionMenuItemCounts[sOptionMenuPtr->cursorPos] - 1;
else else
--*curr; --*curr;
if (sOptionMenuPtr->unkE == MENUITEM_FRAMETYPE) if (sOptionMenuPtr->cursorPos == MENUITEM_FRAMETYPE)
return 2; return 2;
else else
return 4; return 4;
} }
else if (JOY_REPT(DPAD_UP)) else if (JOY_REPT(DPAD_UP))
{ {
if (sOptionMenuPtr->unkE == MENUITEM_TEXTSPEED) if (sOptionMenuPtr->cursorPos == MENUITEM_TEXTSPEED)
sOptionMenuPtr->unkE = MENUITEM_CANCEL; sOptionMenuPtr->cursorPos = MENUITEM_CANCEL;
else else
sOptionMenuPtr->unkE = sOptionMenuPtr->unkE - 1; sOptionMenuPtr->cursorPos = sOptionMenuPtr->cursorPos - 1;
return 3; return 3;
} }
else if (JOY_REPT(DPAD_DOWN)) else if (JOY_REPT(DPAD_DOWN))
{ {
if (sOptionMenuPtr->unkE == MENUITEM_CANCEL) if (sOptionMenuPtr->cursorPos == MENUITEM_CANCEL)
sOptionMenuPtr->unkE = MENUITEM_TEXTSPEED; sOptionMenuPtr->cursorPos = MENUITEM_TEXTSPEED;
else else
sOptionMenuPtr->unkE = sOptionMenuPtr->unkE + 1; sOptionMenuPtr->cursorPos = sOptionMenuPtr->cursorPos + 1;
return 3; return 3;
} }
else if (JOY_NEW(B_BUTTON) || JOY_NEW(A_BUTTON)) else if (JOY_NEW(B_BUTTON) || JOY_NEW(A_BUTTON))
@@ -531,7 +534,7 @@ static void PrintOptionMenuHeader(void)
CopyWindowToVram(0, 3); CopyWindowToVram(0, 3);
} }
static void sub_8088C0C(void) static void DrawOptionMenuBg(void)
{ {
u8 h; u8 h;
h = 2; h = 2;
@@ -566,12 +569,12 @@ static void LoadOptionMenuItemNames(void)
} }
} }
static void sub_8088DE0(u16 selection) static void UpdateSettingSelectionDisplay(u16 selection)
{ {
u16 v1, v2; u16 maxLetterHeight, y;
v1 = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT); maxLetterHeight = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT);
v2 = selection * (v1 - 1) + 0x3A; y = selection * ( maxLetterHeight - 1) + 0x3A;
SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(v2, v2 + v1)); SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(y, y + maxLetterHeight));
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0x10, 0xE0)); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0x10, 0xE0));
} }
src/overworld.c
+8 -8
View File
@@ -120,7 +120,7 @@ u8 gFieldLinkPlayerCount;
static u8 sPlayerTradingStates[4]; static u8 sPlayerTradingStates[4];
static KeyInterCB sPlayerKeyInterceptCallback; static KeyInterCB sPlayerKeyInterceptCallback;
static bool8 gUnknown_3000E88; static bool8 sReceivingFromLink;
static u8 sRfuKeepAliveTimer; static u8 sRfuKeepAliveTimer;
static u8 CountBadgesForOverworldWhiteOutLossCalculation(void); static u8 CountBadgesForOverworldWhiteOutLossCalculation(void);
@@ -1629,7 +1629,7 @@ static void CB2_ReturnToFieldLocal(void)
static void CB2_ReturnToFieldLink(void) static void CB2_ReturnToFieldLink(void)
{ {
if (!sub_8058244() && map_loading_iteration_2_link(&gMain.state)) if (!Overworld_LinkRecvQueueLengthMoreThan2() && map_loading_iteration_2_link(&gMain.state))
SetMainCallback2(CB2_Overworld); SetMainCallback2(CB2_Overworld);
} }
@@ -3181,15 +3181,15 @@ static void sub_8058230(void)
ScriptContext2_Enable(); ScriptContext2_Enable();
} }
bool32 sub_8058244(void) bool32 Overworld_LinkRecvQueueLengthMoreThan2(void)
{ {
if (!IsUpdateLinkStateCBActive()) if (!IsUpdateLinkStateCBActive())
return FALSE; return FALSE;
if (GetLinkRecvQueueLength() >= 3) if (GetLinkRecvQueueLength() >= 3)
gUnknown_3000E88 = TRUE; sReceivingFromLink = TRUE;
else else
gUnknown_3000E88 = FALSE; sReceivingFromLink = FALSE;
return gUnknown_3000E88; return sReceivingFromLink;
} }
bool32 sub_8058274(void) bool32 sub_8058274(void)
@@ -3207,8 +3207,8 @@ bool32 sub_8058274(void)
else if (sPlayerKeyInterceptCallback != KeyInterCB_DeferToEventScript) else if (sPlayerKeyInterceptCallback != KeyInterCB_DeferToEventScript)
return FALSE; return FALSE;
temp = gUnknown_3000E88; temp = sReceivingFromLink;
gUnknown_3000E88 = FALSE; sReceivingFromLink = FALSE;
if (temp == TRUE) if (temp == TRUE)
return TRUE; return TRUE;
src/tm_case.c
+3 -3
View File
@@ -304,7 +304,7 @@ static void CB2_SetUpTMCaseUI_Blocking(void)
{ {
while (1) while (1)
{ {
if ((u8)sub_80BF72C() == TRUE) if ((u8)MenuHelpers_CallLinkSomething() == TRUE)
break; break;
if (DoSetUpTMCaseUI() == TRUE) if (DoSetUpTMCaseUI() == TRUE)
break; break;
@@ -733,7 +733,7 @@ static void Task_TMCaseMain(u8 taskId)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
if ((u8)sub_80BF72C() != TRUE) if ((u8)MenuHelpers_CallLinkSomething() != TRUE)
{ {
input = ListMenu_ProcessInput(data[0]); input = ListMenu_ProcessInput(data[0]);
ListMenuGetScrollAndRow(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow); ListMenuGetScrollAndRow(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow);
@@ -814,7 +814,7 @@ static void Task_TMContextMenu_HandleInput(u8 taskId)
{ {
s8 input; s8 input;
if ((u8)sub_80BF72C() != TRUE) if ((u8)MenuHelpers_CallLinkSomething() != TRUE)
{ {
input = Menu_ProcessInputNoWrapAround(); input = Menu_ProcessInputNoWrapAround();
switch (input) switch (input)
src/trainer_card.c
+3 -3
View File
@@ -589,7 +589,7 @@ static void Task_TrainerCard(u8 taskId)
} }
break; break;
case STATE_WAIT_FLIP_TO_BACK: case STATE_WAIT_FLIP_TO_BACK:
if (IsCardFlipTaskActive() && sub_8058244() != TRUE) if (IsCardFlipTaskActive() && Overworld_LinkRecvQueueLengthMoreThan2() != TRUE)
{ {
PlaySE(SE_CARD3); PlaySE(SE_CARD3);
sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_BACK; sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_BACK;
@@ -647,7 +647,7 @@ static void Task_TrainerCard(u8 taskId)
CloseTrainerCard(taskId); CloseTrainerCard(taskId);
break; break;
case STATE_WAIT_FLIP_TO_FRONT: case STATE_WAIT_FLIP_TO_FRONT:
if (IsCardFlipTaskActive() && sub_8058244() != TRUE) if (IsCardFlipTaskActive() && Overworld_LinkRecvQueueLengthMoreThan2() != TRUE)
{ {
sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_FRONT; sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_FRONT;
PlaySE(SE_CARD3); PlaySE(SE_CARD3);
@@ -1727,7 +1727,7 @@ static bool8 Task_AnimateCardFlipDown(struct Task* task)
static bool8 Task_DrawFlippedCardSide(struct Task* task) static bool8 Task_DrawFlippedCardSide(struct Task* task)
{ {
sTrainerCardDataPtr->allowDMACopy = FALSE; sTrainerCardDataPtr->allowDMACopy = FALSE;
if (sub_8058244() == TRUE) if (Overworld_LinkRecvQueueLengthMoreThan2() == TRUE)
return FALSE; return FALSE;
do do