Merge branch 'ACreTeam:master' into master

This commit is contained in:
Vi
2025-06-08 14:28:38 -05:00
committed by GitHub
23 changed files with 2010 additions and 20 deletions
+12 -1
View File
@@ -3,11 +3,23 @@
#include "types.h"
#include "m_actor.h"
#include "ac_npc.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct countdown_npc0_actor_s COUNTDOWN_NPC0_ACTOR;
typedef void (*aCD0_ACT_PROC)(COUNTDOWN_NPC0_ACTOR *actor);
struct countdown_npc0_actor_s {
NPC_ACTOR npc_class;
int action;
aCD0_ACT_PROC act_proc;
int term;
};
extern ACTOR_PROFILE Countdown_Npc0_Profile;
#ifdef __cplusplus
@@ -15,4 +27,3 @@ extern ACTOR_PROFILE Countdown_Npc0_Profile;
#endif
#endif
+13 -1
View File
@@ -3,11 +3,24 @@
#include "types.h"
#include "m_actor.h"
#include "ac_npc.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct hanabi_npc0_actor_s HANABI_NPC0_ACTOR;
typedef void (*aHN0_ACT_PROC)(HANABI_NPC0_ACTOR* actor);
struct hanabi_npc0_actor_s {
NPC_ACTOR npc_class;
int action;
int next_action;
aHN0_ACT_PROC act_proc;
s16 base_angle;
};
extern ACTOR_PROFILE Hanabi_Npc0_Profile;
#ifdef __cplusplus
@@ -15,4 +28,3 @@ extern ACTOR_PROFILE Hanabi_Npc0_Profile;
#endif
#endif
+15 -1
View File
@@ -3,11 +3,26 @@
#include "types.h"
#include "m_actor.h"
#include "ac_npc.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct hanabi_npc1_actor_s HANABI_NPC1_ACTOR;
typedef void (*aHN1_ACT_PROC)(HANABI_NPC1_ACTOR* actor);
struct hanabi_npc1_actor_s {
NPC_ACTOR npc_class;
int action;
aHN1_ACT_PROC act_proc;
s16 dst_pos_x;
s16 dst_pos_z;
int npc_idx;
u8 clap_se_no;
};
extern ACTOR_PROFILE Hanabi_Npc1_Profile;
#ifdef __cplusplus
@@ -15,4 +30,3 @@ extern ACTOR_PROFILE Hanabi_Npc1_Profile;
#endif
#endif
+13 -1
View File
@@ -3,11 +3,24 @@
#include "types.h"
#include "m_actor.h"
#include "ac_npc.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct hanami_npc0_actor_s HANAMI_NPC0_ACTOR;
typedef void (*aHM0_ACT_PROC)(HANAMI_NPC0_ACTOR* actor);
struct hanami_npc0_actor_s {
NPC_ACTOR npc_class;
int action;
aHM0_ACT_PROC act_proc;
int event_idx;
u8 clap_se_no;
};
extern ACTOR_PROFILE Hanami_Npc0_Profile;
#ifdef __cplusplus
@@ -15,4 +28,3 @@ extern ACTOR_PROFILE Hanami_Npc0_Profile;
#endif
#endif
+12 -1
View File
@@ -3,11 +3,23 @@
#include "types.h"
#include "m_actor.h"
#include "ac_npc.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct hanami_npc1_actor_s HANAMI_NPC1_ACTOR;
typedef void (*aHM1_ACT_PROC)(HANAMI_NPC1_ACTOR* actor);
struct hanami_npc1_actor_s {
NPC_ACTOR npc_class;
int action;
int next_action;
aHM1_ACT_PROC act_proc;
};
extern ACTOR_PROFILE Hanami_Npc1_Profile;
#ifdef __cplusplus
@@ -15,4 +27,3 @@ extern ACTOR_PROFILE Hanami_Npc1_Profile;
#endif
#endif