diff options
| -rw-r--r-- | asm/party_menu.s | 6 | ||||
| -rw-r--r-- | include/menu_helpers.h | 2 | ||||
| -rw-r--r-- | src/field_special_scene.c | 2 | ||||
| -rw-r--r-- | src/menu_helpers.c | 20 | ||||
| -rw-r--r-- | src/teachy_tv.c | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index 88ecfae07..9042219e3 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -3218,7 +3218,7 @@ sub_8120328: @ 8120328 lsrs r4, r0, 24 adds r5, r4, 0 movs r0, 0x6 - bl RunTextPrintersRetIsActive + bl RunTextPrinters_CheckActive lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 @@ -4529,7 +4529,7 @@ sub_8120D08: @ 8120D08 ldr r5, _08120D38 @ =gTasks+0x8 adds r0, r4, r5 ldrb r0, [r0] - bl RunTextPrintersRetIsActive + bl RunTextPrinters_CheckActive lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 @@ -4643,7 +4643,7 @@ sub_8120DE0: @ 8120DE0 ldr r6, _08120E14 @ =gTasks+0x8 adds r4, r5, r6 ldrb r0, [r4] - bl RunTextPrintersRetIsActive + bl RunTextPrinters_CheckActive lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 diff --git a/include/menu_helpers.h b/include/menu_helpers.h index 1220ea1bd..93a4fe5d3 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -19,7 +19,7 @@ void sub_812225C(u16 *, u16 *, u8, u8); void sub_8122298(u16 *, u16 *, u8, u8, u8); void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data); bool8 sub_81221AC(void); -bool16 RunTextPrintersRetIsActive(u8 textPrinterId); +bool16 RunTextPrinters_CheckActive(u8 textPrinterId); bool8 sub_80BF72C(void); bool8 MenuHelpers_LinkSomething(void); void SetVBlankHBlankCallbacksToNull(void); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 535f5165d..dd48340b3 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -23,4 +23,4 @@ void nullsub_60(void) void nullsub_61(void) { -}
\ No newline at end of file +} diff --git a/src/menu_helpers.c b/src/menu_helpers.c index e0f143072..12837c099 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -36,7 +36,7 @@ void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 gTasks[taskId].func = Task_ContinueTaskAfterMessagePrints; } -bool16 RunTextPrintersRetIsActive(u8 textPrinterId) +bool16 RunTextPrinters_CheckActive(u8 textPrinterId) { RunTextPrinters(); return IsTextPrinterActive(textPrinterId); @@ -44,7 +44,7 @@ bool16 RunTextPrintersRetIsActive(u8 textPrinterId) static void Task_ContinueTaskAfterMessagePrints(u8 taskId) { - if (!RunTextPrintersRetIsActive(gUnknown_20399D0)) + if (!RunTextPrinters_CheckActive(gUnknown_20399D0)) gUnknown_20399CC(taskId); } @@ -75,9 +75,9 @@ u8 GetLRKeysState(void) { if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) { - if (gMain.newKeys & L_BUTTON) + if (JOY_NEW(L_BUTTON)) return 1; - if (gMain.newKeys & R_BUTTON) + if (JOY_NEW(R_BUTTON)) return 2; } return 0; @@ -87,9 +87,9 @@ u8 sub_80BF66C(void) { if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR) { - if (gMain.newAndRepeatedKeys & L_BUTTON) + if (JOY_REPT(L_BUTTON)) return 1; - if (gMain.newAndRepeatedKeys & R_BUTTON) + if (JOY_REPT(R_BUTTON)) return 2; } return 0; @@ -178,7 +178,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1) { s16 valBefore = (*arg0); - if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP) + if (JOY_REPT(DPAD_ANY) == DPAD_UP) { (*arg0)++; if ((*arg0) > arg1) @@ -194,7 +194,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1) return TRUE; } } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) + else if (JOY_REPT(DPAD_ANY) == DPAD_DOWN) { (*arg0)--; if ((*arg0) <= 0) @@ -209,7 +209,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1) return TRUE; } } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT) + else if (JOY_REPT(DPAD_ANY) == DPAD_RIGHT) { (*arg0) += 10; if ((*arg0) > arg1) @@ -224,7 +224,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1) return TRUE; } } - else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT) + else if (JOY_REPT(DPAD_ANY) == DPAD_LEFT) { (*arg0) -= 10; if ((*arg0) <= 0) diff --git a/src/teachy_tv.c b/src/teachy_tv.c index 60e43c29c..eb5a7293d 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -817,7 +817,7 @@ static void TTVcmd_NpcMoveAndSetupTextPrinter(u8 taskId) static void TTVcmd_IdleIfTextPrinterIsActive(u8 taskId) { s16 *data = gTasks[taskId].data; - if (!RunTextPrintersRetIsActive(0)) + if (!RunTextPrinters_CheckActive(0)) ++data[3]; } @@ -945,7 +945,7 @@ static const u8 sGrassAnimArray[] = static void TTVcmd_IdleIfTextPrinterIsActive2(u8 taskId) { s16 *data = gTasks[taskId].data; - if (!RunTextPrintersRetIsActive(0)) + if (!RunTextPrinters_CheckActive(0)) ++data[3]; } |