From 632061bcd8434a7f625a3e1fc178896d116c3cc6 Mon Sep 17 00:00:00 2001 From: Cuyler36 Date: Tue, 5 Dec 2023 20:06:20 -0500 Subject: [PATCH] Add player submenu main index request change struct --- include/m_player.h | 18 ++++++++++++++++++ include/m_player_lib.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/include/m_player.h b/include/m_player.h index ed034161..7365da1e 100644 --- a/include/m_player.h +++ b/include/m_player.h @@ -154,6 +154,24 @@ enum { mPlayer_INDEX_DEMO_GET_GOLDEN_AXE_WAIT }; +typedef struct player_request_putin_scoop_from_submenu_s { + xyz_t wpos; + mActor_name_t item; + int got_golden_item; +} mPlayer_request_putin_scoop_from_submenu_data_c; + +typedef union { + mPlayer_request_putin_scoop_from_submenu_data_c putin_scoop_from_submenu_data; + /* TODO: others */ + u8 force_size[72]; // TEMP +} mPlayer_request_main_data; + +typedef struct { + int requested_main_index; + int requested_index_pending; + mPlayer_request_main_data request_main_data; +} mPlayer_change_data_from_submenu_c; + /* sizeof(struct player_actor_s) == 0x13A8 */ struct player_actor_s { /* 0x0000 */ ACTOR actor_class; diff --git a/include/m_player_lib.h b/include/m_player_lib.h index 640a187b..7ea3e724 100644 --- a/include/m_player_lib.h +++ b/include/m_player_lib.h @@ -46,6 +46,8 @@ extern int mPlib_able_submenu_type1(GAME* game); extern void mPlib_request_main_demo_wait_from_submenu(ACTOR* force_speak_label); extern void mPlib_Load_PlayerTexAndPallet(void* tex_p, void* pal_p, int idx); +extern mPlayer_change_data_from_submenu_c* mPlib_Get_change_data_from_submenu_p(); + extern void mPlib_Object_Exchange_keep_new_PlayerMdl(GAME_PLAY* play); extern void mPlib_Object_Exchange_keep_new_PlayerTex(GAME_PLAY* play, int bank_id, int base_idx); extern void mPlib_Object_Exchange_keep_new_PlayerFaceTex(GAME_PLAY* play);