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_t_npc_sao

Browse Source
This commit is contained in:
Cuyler36
2023-12-07 17:56:08 -05:00
parent ccdd22a449
commit 246b3e7fda
38 changed files with 215 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_t_anrium1.h
-1
View File
@@ -14,7 +14,6 @@ typedef void (*ANRIUM1_PROC)(ACTOR*);
typedef struct t_anrium_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
ANRIUM1_PROC proc;
int current_id;
}ANRIUM1_ACTOR;
include/ac_t_bag1.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*BAG1_PROC)(ACTOR*);
typedef struct t_bag1_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
BAG1_PROC proc;
int current_id;
}BAG1_ACTOR;
include/ac_t_bag2.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*BAG2_PROC)(ACTOR*);
typedef struct t_bag2_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
BAG2_PROC proc;
int current_id;
}BAG2_ACTOR;
include/ac_t_biscus1.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*BISCUS1_PROC)(ACTOR*);
typedef struct t_biscus1_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
BISCUS1_PROC proc;
int current_id;
}BISCUS1_ACTOR;
include/ac_t_biscus2.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*BISCUS2_PROC)(ACTOR*);
typedef struct t_biscus2_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
BISCUS2_PROC proc;
int current_id;
}BISCUS2_ACTOR;
include/ac_t_biscus3.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*BISCUS3_PROC)(ACTOR*);
typedef struct t_biscus3_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
BISCUS3_PROC proc;
int current_id;
}BISCUS3_ACTOR;
include/ac_t_biscus4.h
-1
View File
@@ -16,7 +16,6 @@ typedef void (*BISCUS4_PROC)(ACTOR*);
typedef struct t_biscus4_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
BISCUS4_PROC proc;
int current_id;
}BISCUS4_ACTOR;
include/ac_t_cobra1.h
-1
View File
@@ -16,7 +16,6 @@ typedef void (*COBRA1_PROC)(ACTOR*);
typedef struct t_cobra1_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
COBRA1_PROC proc;
int current_id;
}COBRA1_ACTOR;
include/ac_t_cracker.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*CRACKER_PROC)(ACTOR*);
typedef struct t_cracker_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
CRACKER_PROC proc;
int current_id;
}CRACKER_ACTOR;
include/ac_t_flag.h
-2
View File
@@ -13,8 +13,6 @@ extern ACTOR_PROFILE T_Flag_Profile;
typedef struct t_flag_s{
TOOLS_ACTOR tools_class;
u32 unk1C4;
u32 unk1C8;
s16 angle;
s16 addendedang;
int unk1D0;
include/ac_t_hanabi.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*HANABI_PROC)(ACTOR*);
typedef struct t_hanabi_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
HANABI_PROC proc;
int current_id;
}HANABI_ACTOR;
include/ac_t_hasu1.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*HASU1_PROC)(ACTOR*);
typedef struct t_hasu1_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
HASU1_PROC proc;
int current_id;
}HASU1_ACTOR;
include/ac_t_hat1.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*HAT1_PROC)(ACTOR*);
typedef struct t_hat1_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
HAT1_PROC proc;
int current_id;
}HAT1_ACTOR;
include/ac_t_hat2.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*HAT2_PROC)(ACTOR*);
typedef struct t_hat2_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
HAT2_PROC proc;
int current_id;
}HAT2_ACTOR;
include/ac_t_hat3.h
-1
View File
@@ -15,7 +15,6 @@ typedef void (*HAT3_PROC)(ACTOR*);
typedef struct t_hat3_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
HAT3_PROC proc;
int current_id;
}HAT3_ACTOR;
include/ac_t_npc_sao.h
+18
View File
@@ -3,11 +3,29 @@
#include "types.h"
#include "m_actor.h"
#include "ac_tools.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct npc_sao_tool_s NPC_SAO_TOOL_ACTOR;
typedef void (*aTNS_ACTION_PROC)(NPC_SAO_TOOL_ACTOR*);
struct npc_sao_tool_s {
TOOLS_ACTOR tool_class;
aTNS_ACTION_PROC action_proc; // 0x1cc
u8 action; // 0x1d0
short rotation_y; // 0x1d2
f32 pos_x; // 0x1d4
f32 pos_y; // 0x1d8
f32 pos_z; // 0x1dc
};
extern void aTNS_actor_ct(ACTOR* actorx, GAME* game);
extern void aTNS_actor_move(ACTOR* actorx, GAME* game);
extern void aTNS_actor_draw(ACTOR* actorx, GAME* game);
extern ACTOR_PROFILE T_NpcSao_Profile;
#ifdef __cplusplus
include/ac_t_pistol.h
-1
View File
@@ -14,7 +14,6 @@ typedef void (*PISTOL_PROC)(ACTOR*);
typedef struct t_pistol_s{
TOOLS_ACTOR tools_class;
u8 pad2[0x8];
PISTOL_PROC proc;
int current_id;
}PISTOL_ACTOR;
include/ac_tools.h
+9 -7
View File
@@ -60,15 +60,17 @@ typedef enum {
} ToolName;
typedef struct tools_s{
ACTOR actor_class;
ToolName tool_name;
MtxF matrix_work;
int enable;
int unk1BC;
int process_id;
/* 0x000 */ ACTOR actor_class;
/* 0x174 */ int tool_name;
/* 0x178 */ MtxF matrix_work;
/* 0x1B8 */ int init_matrix;
/* 0x1BC */ int unk1BC;
/* 0x1C0 */ int work0;
/* 0x1C4 */ int work1;
/* 0x1C8 */ int work2;
}TOOLS_ACTOR;
typedef TOOLS_ACTOR* (*ToolBirthProc)(ToolName, int, TOOLS_ACTOR*, GAME_PLAY*, s16, int*);
typedef TOOLS_ACTOR* (*ToolBirthProc)(int, int, TOOLS_ACTOR*, GAME_PLAY*, s16, int*);
typedef int (*ToolChgRequestModeProc)(ACTOR*, TOOLS_ACTOR*, int);
typedef struct ToolClip {
include/m_actor.h
+1 -1
View File
@@ -409,7 +409,7 @@ typedef enum bank_id {
ACTOR_OBJ_BANK_367,
ACTOR_OBJ_BANK_368,
ACTOR_OBJ_BANK_369,
ACTOR_OBJ_BANK_370,
ACTOR_OBJ_BANK_NPC_SAO,
ACTOR_OBJ_BANK_371,
ACTOR_OBJ_BANK_372,
ACTOR_OBJ_BANK_373,