mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #174 from Cuyler36/player_submenu_change_data_struct

Browse Source 
Add player submenu main index request change struct
This commit is contained in:
Cuyler36
2023-12-05 20:06:51 -05:00
committed by GitHub
parent 096290853b 632061bcd8
commit 8c052e6a2f
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_player.h
+18
View File
@@ -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;
include/m_player_lib.h
+2
View File
@@ -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);