Unk 020183 f0 #345
Merged
Unk 020183 f0 #345
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PikalaxALT
force-pushed
the
unk_020183F0
branch
from
18cb5b0
to
ab71f61
Compare
adrienntindall
requested changes
Oct 28, 2024
| @@ -83,7 +85,7 @@ typedef struct BerryPotsAppData { | |||
| u16 totalBerryQuantity; | |||
| u16 totalMulchQuantity; | |||
| BgConfig *bgConfig; | |||
| void *unk8C; | |||
| TouchscreenListMenuSpawner *menuSpawner; | |||
There was a problem hiding this comment.
is spawner really the best term here?
There was a problem hiding this comment.
i'm open to suggestions
| MENU_INPUT_STATE_TOUCH, | ||
| } MenuInputState; | ||
|
|
||
| typedef struct MenuInputStateMgr { |
There was a problem hiding this comment.
Why is this a struct and can you get it to match without it?
There was a problem hiding this comment.
think about it, does it really make sense to have a getter and a setter for a BOOL?
There was a problem hiding this comment.
considering this is gf, yes
include/options_app.h
Outdated
| #include "options.h" | ||
| #include "overlay_manager.h" | ||
|
|
||
| typedef struct OptionsApp_Args { | ||
| u32 unk0; | ||
| Options *options; | ||
| BOOL *unk8; | ||
| MenuInputStateMgr *unk8; |
There was a problem hiding this comment.
unk8 -> menuInputStateMgr
Also if Mgr = Manager we should write it as Man (shorthand) or straight up in long hand
include/overlay_55.h
Outdated
| @@ -11,7 +11,7 @@ typedef struct UnkStruct_ov55_021E5B08 { | |||
| u16 unk0; | |||
| u8 mailMessageIdx; | |||
| Options *options; | |||
| u32 *unk8; | |||
| MenuInputStateMgr *unk8; | |||
src/party_menu.c
Outdated
| @@ -91,7 +91,7 @@ static BOOL PartyMenu_HandleDpadInput(PartyMenu *partyMenu); | |||
| static u8 PartyMenu_GetSelectionInDirection(PartyMenu *partyMenu, u8 *px, u8 *py, u8 direction); | |||
| static u8 PartyMenu_GetNewSelectionFromTable(PartyMenu *partyMenu, u8 *px, u8 *py, const u8 *table); | |||
| static void sub_0207AC20(PartyMenu *partyMenu); | |||
| static int sub_0207AC70(PartyMenu *partyMenu, BOOL a1); | |||
| static int sub_0207AC70(PartyMenu *partyMenu, MenuInputState a1); | |||
src/party_menu.c
Outdated
| @@ -1443,7 +1443,7 @@ static void sub_0207AC20(PartyMenu *partyMenu) { | |||
| } | |||
| } | |||
|
|
|||
| static int sub_0207AC70(PartyMenu *partyMenu, BOOL a1) { | |||
| static int sub_0207AC70(PartyMenu *partyMenu, MenuInputState a1) { | |||
src/party_menu.c
Outdated
| @@ -2712,9 +2712,9 @@ void PartyMenu_DeleteContextMenuAndList(PartyMenu *partyMenu) { | |||
| ListMenuItems_Delete(partyMenu->listMenuItems); | |||
| } | |||
|
|
|||
| void sub_0207CB3C(PartyMenu *partyMenu, BOOL a1) { | |||
| void sub_0207CB3C(PartyMenu *partyMenu, MenuInputState a1) { | |||
src/touch_save_app.c
Outdated
| @@ -497,8 +497,8 @@ static BOOL TouchSaveApp_ShouldPrintAlternateSavingMessage(TouchSaveAppData *dat | |||
| return Save_NumModifiedPCBoxesIsMany(data->fieldSystem->saveData); | |||
| } | |||
|
|
|||
| static void ov30_0225DC00(BOOL *a0, u32 a1) { | |||
| sub_02018410(a0, a1); | |||
| static void ov30_0225DC00(MenuInputStateMgr *stateMgr, MenuInputState state) { | |||
There was a problem hiding this comment.
can prolly name this as just a static version of set state
| static void TouchscreenListMenu_PlaySE(TouchscreenListMenu *menu, u16 sndseq); | ||
| static void TouchscreenListMenu_InvokeCallback(TouchscreenListMenu *menu, int a1); | ||
|
|
||
| TouchscreenListMenuSpawner *TouchscreenListMenuSpawner_Create(HeapID heapId, PaletteData *paletteData) { |
There was a problem hiding this comment.
Ideally just rename spawner to manager and remove the current manager as a struct
adrienntindall
approved these changes
Oct 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.