Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-25 07:29:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Addressed remaining comments on PR (a couple missed extra parentheses & renaming a constant from poketch_button.h

Browse Source
This commit is contained in:
Trainer Riley 2024-06-19 20:27:55 -07:00
parent faf359cdc1
commit 0580004e9f
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/overlay025/poketch_button.h
View File

@ -11,7 +11,7 @@ typedef void (* PoketchButtonCallback)(u32, u32, u32, void *);
enum ButtonManagerState {
BUTTON_MANAGER_STATE_NULL = 0,
BUTTON_MANAGER_STATE_TOUCH,
BUTTON_MANAGER_STATE_SLIDEOUT, // Slid touch off of button but did not release
BUTTON_MANAGER_STATE_DRAGGING, // Slid touch off of button but did not release
BUTTON_MANAGER_STATE_TAP,
BUTTON_MANAGER_STATE_DOUBLETAP,
BUTTON_MANAGER_STATE_TIMER0,

2
src/overlay025/poketch_button.c
View File

@ -205,7 +205,7 @@ static u32 Button_OnPressed(PoketchButton *button, BOOL touched, BOOL tapped)
}
} else if (touched) {
PoketchButton_ChangeState(button, BUTTON_STATE_IDLE);
return BUTTON_MANAGER_STATE_SLIDEOUT;
return BUTTON_MANAGER_STATE_DRAGGING;
} else {
// We don't reset the timer because we want to check for double tap with the same timer
if (button->doubleTapTime) {

18
src/overlay025/poketch_system.c
View File

@ -26,7 +26,7 @@
#include "unk_020508D4.h"
#include "unk_02099D44.h"
#include "overlay025/ov25_02254560.h"
#include "constants/sdat.h"
#include "consts/sdat.h"
#include "gender.h"
FS_EXTERN_OVERLAY(overlay26);
@ -229,7 +229,7 @@ static void PoketchSystem_Shutdown (PoketchSystem *poketchSys)
ov25_02254754(poketchSys->unk_1C);
}
typedef void (*const PoketchEvent)(PoketchSystem *);
typedef void (*const PoketchEvent)(PoketchSystem *poketchSys);
static PoketchEvent sPoketchEvents[] = {
PoketchEvent_InitApp,
PoketchEvent_UpdateApp,
@ -637,7 +637,7 @@ static void PoketchSystem_OnButtonEvent(u32 buttonID, u32 buttonEvent, u32 touch
buttonEvent = BUTTON_MANAGER_STATE_NULL;
}
break;
case BUTTON_MANAGER_STATE_SLIDEOUT:
case BUTTON_MANAGER_STATE_DRAGGING:
if (poketchSys->unk_30 == 7 || poketchSys->unk_30 == 10) {
buttonEvent = BUTTON_MANAGER_STATE_TAP;
}
@ -698,8 +698,8 @@ BOOL PoketchSystem_GetDisplayHeldCoords(u32 *x, u32 *y)
{
PoketchSystem *poketchSys = PoketchSystem_GetFromFieldSystem();
if (poketchSys->appChanging == FALSE
&& ov25_0225450C(poketchSys) == 0
if (!poketchSys->appChanging
&& !ov25_0225450C(poketchSys)
&& TouchScreen_GetHoldState(x, y)) {
return PoketchSystem_InsideScreenBounds(*x, *y);
}
@ -711,10 +711,10 @@ BOOL PoketchSystem_GetDisplayTappedCoords(u32 *x, u32 *y)
{
PoketchSystem *poketchSys = PoketchSystem_GetFromFieldSystem();
if ((poketchSys->appChanging == FALSE) && (ov25_0225450C(poketchSys) == 0)) {
if (TouchScreen_GetTapState(x, y)) {
return PoketchSystem_InsideScreenBounds(*x, *y);
}
if (!poketchSys->appChanging
&& !ov25_0225450C(poketchSys)
&& TouchScreen_GetTapState(x, y)) {
return PoketchSystem_InsideScreenBounds(*x, *y);
}
return FALSE;