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

Implement & link ac_ev_pumpkin

Browse Source
This commit is contained in:
Cuyler36
2025-03-24 21:43:48 -04:00
parent 0d96b07102
commit 479ed07308
5 changed files with 483 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_ev_pumpkin.h
+19 -1
View File
@@ -3,11 +3,30 @@
#include "types.h"
#include "m_actor.h"
#include "ac_npc.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct ev_pumpkin_common_s {
s8 bx;
s8 bz;
} aEv_pumpkin_common_c;
typedef struct ev_pumpkin_actor_s EV_PUMPKIN_ACTOR;
typedef void (*aEPK_TALK_PROC)(EV_PUMPKIN_ACTOR* pumpkin, GAME_PLAY* play);
struct ev_pumpkin_actor_s {
NPC_ACTOR npc_class;
int talk_action;
aEPK_TALK_PROC talk_proc;
aEv_pumpkin_common_c* common_p;
mActor_name_t present;
mActor_name_t item;
};
extern ACTOR_PROFILE Ev_Pumpkin_Profile;
#ifdef __cplusplus
@@ -15,4 +34,3 @@ extern ACTOR_PROFILE Ev_Pumpkin_Profile;
#endif
#endif
include/ac_handOverItem.h
+5 -1
View File
@@ -34,6 +34,11 @@ enum {
aHOI_PRESENT_TYPE_NUM
};
// You must include m_common_data.h to use these macros
#define aHOI_CLIP CLIP(handOverItem_clip)
#define aHOI_TRANSFER_DONE() (aHOI_CLIP->master_actor == NULL)
#define aHOI_TRANSFER_IN_PROGRESS() (aHOI_CLIP->master_actor != NULL)
typedef struct hand_over_item_actor_s HANDOVERITEM_ACTOR;
typedef ACTOR* (*aHOI_BIRTH_PROC)(mActor_name_t, int, int, ACTOR*);
@@ -78,4 +83,3 @@ extern ACTOR_PROFILE HandOverItem_Profile;
#endif
#endif