mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-06 17:32:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link ac_insect

Browse Source
This commit is contained in:
Cuyler36
2024-04-28 20:44:07 -04:00
parent b3954273c6
commit b440100ee0
12 changed files with 1709 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_insect.h
+1 -1
View File
@@ -3,6 +3,7 @@
#include "types.h"
#include "m_actor.h"
#include "ac_insect_h.h"
#ifdef __cplusplus
extern "C" {
@@ -15,4 +16,3 @@ extern ACTOR_PROFILE Insect_Profile;
#endif
#endif
include/ac_insect_h.h
+136 -28
View File
@@ -4,54 +4,162 @@
#include "types.h"
#include "m_actor.h"
#include "m_lib.h"
#include "ac_tools.h"
#ifdef __cplusplus
extern "C" {
#endif
#define aINS_ACTOR_NUM 9
#define aINS_MAX_STRESS_DIST (3 * mFI_UNIT_BASE_SIZE_F)
#define aINS_PATIENCE_STEP 0.5f
enum {
aINS_MAKE_NEW,
aINS_MAKE_EXIST,
aINS_MAKE_NUM
};
enum {
aINS_PROGRAM_CHOU,
aINS_PROGRAM_BATTA,
aINS_PROGRAM_TONBO,
aINS_PROGRAM_TENTOU,
aINS_PROGRAM_HOTARU,
aINS_PROGRAM_SEMI,
aINS_PROGRAM_KABUTO,
aINS_PROGRAM_GOKI,
aINS_PROGRAM_HITODAMA,
aINS_PROGRAM_AMENBO,
aINS_PROGRAM_KA,
aINS_PROGRAM_DANGO,
aINS_PROGRAM_KERA,
aINS_PROGRAM_MINO,
aINS_PROGRAM_NUM
};
/* sizeof(aINS_Init_c) == 0x18 */
typedef struct insect_init_s {
/* 0x00 */ int insect_type;
/* 0x04 */ xyz_t position;
/* 0x10 */ int extra_data;
/* 0x14 */ GAME* game;
/* 0x00 */ int insect_type;
/* 0x04 */ xyz_t position;
/* 0x10 */ int extra_data;
/* 0x14 */ GAME* game;
} aINS_Init_c;
/* sizeof(aINS_INSECT_DUMMY_ACTOR) == 0x288 */
typedef struct insect_dummy_actor_s {
ACTOR actor;
/* TODO: finish */
} aINS_INSECT_DUMMY_ACTOR;
typedef void (*aINS_MOVE_PROC)(ACTOR*);
typedef void (*aINS_ACTION_PROC)(ACTOR*, GAME*);
typedef aINS_INSECT_DUMMY_ACTOR* (*aINS_make_insect_proc)(aINS_Init_c*, int);
/* sizeof(aINS_INSECT_ACTOR) == 0x288 */
typedef struct insect_actor_s {
TOOLS_ACTOR tools_actor; /* why tools actor? */
int exist_flag;
int type;
aINS_MOVE_PROC move_proc;
int action;
aINS_ACTION_PROC action_proc;
f32 _1E0;
f32 _1E4;
f32 speed_step;
f32 target_speed;
f32 patience;
ClObjPipe_c col_pipe;
f32 bg_range;
f32 bg_height;
int bg_type;
mActor_name_t item;
struct {
u8 destruct : 1;
u8 bit_1 : 1;
u8 bit_2 : 1;
u8 bit_3 : 1;
u8 bit_4 : 1;
u8 bit_5 : 1;
u8 bit_6 : 1;
u8 bit_7 : 1;
} insect_flags;
int life_time;
int alpha_time;
int timer;
int continue_timer;
int flag;
/* Dynamic for each insect actor type */
int s32_work0;
int s32_work1;
int s32_work2;
int s32_work3;
f32 f32_work0;
f32 f32_work1;
f32 f32_work2;
f32 f32_work3;
int _254;
int _258;
int alpha0;
int alpha1;
int alpha2;
s16 ut_x;
s16 ut_z;
Lights point_light;
Light_list* light_list;
int light_flag;
s16 light_counter;
s16 light_step;
} aINS_INSECT_ACTOR;
/* sizeof(aINS_CTRL_ACTOR) == 0x183C */
typedef struct insect_ctrl_actor_s {
ACTOR actor_class;
aINS_INSECT_ACTOR insect_actor[aINS_ACTOR_NUM];
} aINS_CTRL_ACTOR;
/* sizeof(aINS_overlay_entry_c) == 0x1C08 */
typedef struct insect_overlay_s {
u8 data[0x1C00];
int _1C00;
int _1C04;
} ATTRIBUTE_ALIGN(8) aINS_overlay_entry_c;
typedef struct {
aINS_overlay_entry_c entries[3];
} aINS_overlay_c;
typedef ACTOR* (*aINS_make_insect_proc)(aINS_Init_c*, int);
typedef void (*aINS_make_ant_proc)(aINS_Init_c*, s8, s8);
typedef void (*aINS_dt_proc)(ACTOR*, GAME*);
typedef aINS_INSECT_DUMMY_ACTOR* (*aINS_make_actor_proc)(GAME*, int, xyz_t*);
typedef ACTOR* (*aINS_make_actor_proc)(GAME*, int, xyz_t*);
typedef void (*aINS_set_pl_act_tim_proc)(int, int, int);
typedef int (*aINS_chk_live_insect_proc)(int, int, GAME*);
typedef void (*aINS_position_move_proc)(ACTOR*);
typedef ACTOR* (*aINS_search_near_insect_proc)(GAME*, f32, f32);
typedef ACTOR* (*aINS_search_near_insect_proc)(f32, f32, GAME*);
/* sizeof(aINS_Clip_c) == 0x50 */
typedef struct ac_insect_clip_s {
/* 0x00 */ aINS_make_insect_proc make_insect_proc;
/* 0x04 */ aINS_make_ant_proc make_ant_proc; // unused clip proc in AC
/* 0x08 */ void* unused_08;
/* 0x0C */ aINS_dt_proc dt_proc;
/* 0x10 */ aINS_make_actor_proc make_actor_proc;
/* 0x14 */ aINS_set_pl_act_tim_proc set_pl_act_tim_proc;
/* 0x18 */ aINS_chk_live_insect_proc chk_live_insect_proc;
/* 0x1C */ aINS_search_near_insect_proc search_near_insect_proc;
/* 0x20 */ int pl_action;
/* 0x24 */ int pl_action_ut_x;
/* 0x28 */ int pl_action_ut_z;
/* 0x2C */ aINS_position_move_proc position_move_proc;
/* 0x30 */ int ant_spawn_pending;
/* 0x34 */ aINS_Init_c ant_spawn_info;
/* 0x4C */ u8 ant_ut_x;
/* 0x4D */ u8 ant_ut_z;
/* 0x00 */ aINS_make_insect_proc make_insect_proc;
/* 0x04 */ aINS_make_ant_proc make_ant_proc; // unused clip proc in AC
/* 0x08 */ void* unused_08;
/* 0x0C */ aINS_dt_proc dt_proc;
/* 0x10 */ aINS_make_actor_proc make_actor_proc;
/* 0x14 */ aINS_set_pl_act_tim_proc set_pl_act_tim_proc;
/* 0x18 */ aINS_chk_live_insect_proc chk_live_insect_proc;
/* 0x1C */ aINS_search_near_insect_proc search_near_insect_proc;
/* 0x20 */ int pl_action;
/* 0x24 */ int pl_action_ut_x;
/* 0x28 */ int pl_action_ut_z;
/* 0x2C */ aINS_position_move_proc position_move_proc;
/* 0x30 */ int ant_spawn_pending;
/* 0x34 */ aINS_Init_c ant_spawn_info;
/* 0x4C */ s8 ant_bx;
/* 0x4D */ s8 ant_bz;
} aINS_Clip_c;
/* must include m_common_data.h to use this macro */
#define aINS_CLIP (Common_Get(clip).insect_clip)
#ifdef __cplusplus
}
#endif
include/m_collision_bg.h
+5
View File
@@ -286,6 +286,11 @@ extern int mCoBG_RangeCheckLinePoint(f32* start_xz, f32* end_xz, f32* point_xz);
extern int mCoBG_GetDistPointAndLine2D_Norm(f32* dist, f32* start_xz, f32* end_xz, f32* norm, f32* point_xz);
extern f32 mCoBG_Get2VectorAngleF(f32* v0, f32* v1, u8 type);
extern int mCoBG_CheckUtFlat(const xyz_t* pos);
extern void mCoBG_BgCheckControll_RemoveDirectedUnitColumn(xyz_t* reverse_pos, ACTOR* actor, f32 check_range,
f32 offset_y, s16 wall_attr_check, s16 no_reverse,
s16 check_type, int ut_x, int ut_z);
extern xyz_t mCoBG_UniqueWallCheck(ACTOR* actorx, f32 range, f32 y_ofs);
extern xyz_t mCoBG_ScopeWallCheck(ACTOR* actorx, const xyz_t* pos, f32 x, f32 z, f32 range, f32 y_ofs);
extern void mCoBG_InitMoveBgData();
extern void mCoBG_InitBlockBgCheckMode();
include/m_lib.h
+2 -1
View File
@@ -15,7 +15,8 @@ extern "C" {
#define SHT_MINV (1.0f / SHT_MAX)
#define ABS(x) (((x) >= 0) ? (x) : -(x))
#define SQ(x) ((x) * (x))
#define CLAMP_MAX(x, min) ((min) < (x) ? (min) : (x))
#define CLAMP_MIN(x, min) ((x) < (min) ? (min) : (x))
#define CLAMP_MAX(x, max) ((max) < (x) ? (max) : (x))
#define CLAMP(x, min, max) ((x) < (min) ? (min) : ((x > (max) ? (max) : (x))))
/* Float modulo operator */
include/m_lights.h
+1 -1
View File
@@ -34,7 +34,7 @@ typedef union {
typedef struct lights_s {
u8 type;
LightParams lights;
} Lights;
} Lights; // size = 0xE
typedef struct light_list {
/* 0x0 */ Lights* info;
include/m_player_lib.h
+1
View File
@@ -71,6 +71,7 @@ extern int mPlib_check_player_actor_main_index_Furniture_Move(GAME* game);
extern int mPlib_request_main_sitdown_type1(GAME* game, int direct, const xyz_t* pos, int ftr_no);
extern int mPlib_request_main_lie_bed_type1(GAME* game, int direct, const xyz_t* pos, int head_direct, int ftr_no);
extern void mPlib_change_player_cloth(GAME* game, int idx);
extern u32 mPlib_Get_item_net_catch_label(void);
extern mPlayer_change_data_from_submenu_c* mPlib_Get_change_data_from_submenu_p();