Leahnaya/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-04-26 00:37:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

document buttonActions struct members
Some checks are pending
CI / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
Marcus Huderle 2025-02-20 08:38:09 -06:00
parent 38a57aa856
commit 05f8f3ba0a
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/global.h
View File

@ -104,9 +104,9 @@ struct UnkPinballGame1334
struct PinballGame
{
/*0x000*/ u32 unk0;
/*0x004*/ u8 unk4[5];
/*0x009*/ u8 unk9[5];
/*0x00E*/ u8 unkE[5];
/*0x004*/ u8 newButtonActions[5]; // e.g. player pressing the appropriate buttons to trigger the left flipper action, etc.
/*0x009*/ u8 releasedButtonActions[5];
/*0x00E*/ u8 heldButtonActions[5];
/*0x013*/ s8 progressForBonus; // Current number of Pokéballs filled by catch mode and evo mode
/*0x014*/ s8 unk14;
/*0x015*/ u8 filler15;

2
include/main.h
View File

@ -54,7 +54,7 @@ struct Main
/*0x03*/ u8 subState;
/*0x04*/ u8 selectedField;
/*0x05*/ u8 unk5;
/*0x06*/ u8 unk6;
/*0x06*/ u8 unk6; // isBonusField (?)
/*0x07*/ s8 eReaderBonuses[NUM_EREADER_CARDS];
/*0x0C*/ u8 unkC;
/*0x0D*/ u8 unkD;

36
src/pinball_game_main.c
View File

@ -97,7 +97,7 @@ void sub_47110(void);
static void sub_4A270(void);
void sub_4A518(void);
void sub_4A90C(void);
void sub_4B280(void);
void UpdateButtonActionsFromJoy(void);
void sub_4B334(void);
void sub_4B408(s16);
void sub_4B654(void);
@ -616,7 +616,7 @@ void sub_4ABEC(void)
{
s16 i;
sub_4B280();
UpdateButtonActionsFromJoy();
gUnknown_020028D8[1].unk4();
if (gMain.unkE == 0 && !(gMain.unkF & 0x2))
{
@ -740,7 +740,7 @@ void sub_4AE8C(void)
{
s16 i;
sub_4B280();
UpdateButtonActionsFromJoy();
gUnknown_020028D8[1].unk4();
if (gMain.unkF & 0x2)
return;
@ -917,14 +917,14 @@ void nullsub_19(void)
{
}
void sub_4B280(void)
void UpdateButtonActionsFromJoy(void)
{
u16 i;
for (i = 0; i < 5; i++)
{
gCurrentPinballGame->unk4[i] = 0;
gCurrentPinballGame->unk9[i] = 0;
gCurrentPinballGame->newButtonActions[i] = 0;
gCurrentPinballGame->releasedButtonActions[i] = 0;
}
if (gMain.unkF)
@ -935,17 +935,17 @@ void sub_4B280(void)
int buttonConfigKeyMask = (gMain.buttonConfigs[i][0] | gMain.buttonConfigs[i][1]) & KEYS_MASK;
if (buttonConfigKeyMask == JOY_HELD(buttonConfigKeyMask))
{
if (gCurrentPinballGame->unkE[i] == 0)
gCurrentPinballGame->unk4[i] = 1;
if (gCurrentPinballGame->heldButtonActions[i] == 0)
gCurrentPinballGame->newButtonActions[i] = 1;
gCurrentPinballGame->unkE[i] = 1;
gCurrentPinballGame->heldButtonActions[i] = 1;
}
else
{
if (gCurrentPinballGame->unkE[i])
gCurrentPinballGame->unk9[i] = 1;
if (gCurrentPinballGame->heldButtonActions[i])
gCurrentPinballGame->releasedButtonActions[i] = 1;
gCurrentPinballGame->unkE[i] = 0;
gCurrentPinballGame->heldButtonActions[i] = 0;
}
}
}
@ -956,8 +956,8 @@ void sub_4B334(void)
for (i = 0; i < 5; i++)
{
gCurrentPinballGame->unk4[i] = 0;
gCurrentPinballGame->unk9[i] = 0;
gCurrentPinballGame->newButtonActions[i] = 0;
gCurrentPinballGame->releasedButtonActions[i] = 0;
}
if (gMain.unkF)
@ -967,15 +967,15 @@ void sub_4B334(void)
{
for (i = 0; i < 5; i++)
{
gCurrentPinballGame->unk4[i] = (gUnknown_02031520.unk10[gUnknown_02031510].unk0 >> i) & 0x1;
gCurrentPinballGame->unk9[i] = (gUnknown_02031520.unk10[gUnknown_02031510].unk1 >> i) & 0x1;
gCurrentPinballGame->unkE[i] = (gUnknown_02031520.unk10[gUnknown_02031510].unk2 >> i) & 0x1;
gCurrentPinballGame->newButtonActions[i] = (gUnknown_02031520.unk10[gUnknown_02031510].unk0 >> i) & 0x1;
gCurrentPinballGame->releasedButtonActions[i] = (gUnknown_02031520.unk10[gUnknown_02031510].unk1 >> i) & 0x1;
gCurrentPinballGame->heldButtonActions[i] = (gUnknown_02031520.unk10[gUnknown_02031510].unk2 >> i) & 0x1;
}
gUnknown_02031510++;
}
if (gCurrentPinballGame->unk4[1])
if (gCurrentPinballGame->newButtonActions[1])
gMain.newKeys = A_BUTTON;
}