mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-09 20:41:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement mario furniture actors

Browse Source
This commit is contained in:
Cuyler36
2024-03-05 03:53:12 -05:00
parent c5e7b14b00
commit 91e8c77555
13 changed files with 373 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_my_room.h
+31
View File
@@ -12,6 +12,35 @@ extern "C" {
typedef struct my_room_actor_s MY_ROOM_ACTOR;
enum {
aMR_CONTACT_LEFT,
aMR_CONTACT_RIGHT,
aMR_CONTACT_CENTER,
aMR_CONTACT_NUM
};
enum {
aMR_CONTACT_DIR_BACK,
aMR_CONTACT_DIR_RIGHT,
aMR_CONTACT_DIR_FRONT,
aMR_CONTACT_DIR_LEFT,
aMR_CONTACT_DIR_NUM
};
typedef struct my_room_contact_s {
int contact_flag;
int ftr_no;
int direction;
int contact_side;
f32 contact_percent;
f32* normal_p;
f32 contact_edge0[2];
f32 contact_edge1[2];
int contact_direction;
} aMR_contact_info_c;
typedef struct my_room_clock_info_s {
int tick0; /* set on frame 15 */
int tick1; /* set on frame 45 */
@@ -77,6 +106,8 @@ extern ACTOR_PROFILE My_Room_Profile;
extern int aMR_CorrespondFurniture(mActor_name_t ftr0, mActor_name_t ftr1);
extern int aMR_GetFurnitureUnit(mActor_name_t ftr);
extern mActor_name_t aMR_FurnitureFg_to_FurnitureFgWithDirect(mActor_name_t ftr, int direct);
extern void aMR_SameFurnitureSwitchOFF(u16 ftr_name);
extern aMR_contact_info_c* aMR_GetContactInfoLayer1(void);
#ifdef __cplusplus
}
include/m_player_lib.h
+1
View File
@@ -59,6 +59,7 @@ extern int mPlib_request_main_demo_getoff_boat_standup_type1(const xyz_t* pos, s
extern int mPlib_check_player_actor_main_index_RecieveMove(GAME* game);
extern int mPlib_check_label_player_demo_wait(GAME* game, void* label);
extern int mPlib_check_player_outdoor_start(GAME* game);
extern void mPlib_Set_change_color_request();
extern mPlayer_change_data_from_submenu_c* mPlib_Get_change_data_from_submenu_p();