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

Implement & link ac_ant, move insect defs to ac_insect_h header

Browse Source
This commit is contained in:
Cuyler36
2025-01-26 11:08:31 -05:00
parent adf42b6491
commit 28cb1a64ef
22 changed files with 416 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_ant.h
+14 -1
View File
@@ -8,6 +8,20 @@
extern "C" {
#endif
typedef struct ant_actor_s ANT_ACTOR;
typedef void (*aANT_ACT_PROC)(ANT_ACTOR* ant, GAME* game);
struct ant_actor_s {
/* 0x000 */ ACTOR actor_class;
/* 0x174 */ aANT_ACT_PROC act_proc;
/* 0x178 */ int action;
/* 0x17C */ int alpha;
/* 0x180 */ ACTOR* insect_actor;
/* 0x184 */ int disappear_counter;
/* 0x188 */ mActor_name_t* below_fg_p;
};
extern ACTOR_PROFILE Ant_Profile;
#ifdef __cplusplus
@@ -15,4 +29,3 @@ extern ACTOR_PROFILE Ant_Profile;
#endif
#endif
include/ac_insect_h.h
+48
View File
@@ -14,6 +14,54 @@ extern "C" {
#define aINS_MAX_STRESS_DIST (3 * mFI_UNIT_BASE_SIZE_F)
#define aINS_PATIENCE_STEP 0.5f
enum insect_type {
aINS_INSECT_TYPE_COMMON_BUTTERFLY,
aINS_INSECT_TYPE_YELLOW_BUTTERFLY,
aINS_INSECT_TYPE_TIGER_BUTTERFLY,
aINS_INSECT_TYPE_PURPLE_BUTTERFLY,
aINS_INSECT_TYPE_ROBUST_CICADA,
aINS_INSECT_TYPE_WALKER_CICADA,
aINS_INSECT_TYPE_EVENING_CICADA,
aINS_INSECT_TYPE_BROWN_CICADA,
aINS_INSECT_TYPE_BEE,
aINS_INSECT_TYPE_COMMON_DRAGONFLY,
aINS_INSECT_TYPE_RED_DRAGONFLY,
aINS_INSECT_TYPE_DARNER_DRAGONFLY,
aINS_INSECT_TYPE_BANDED_DRAGONFLY,
aINS_INSECT_TYPE_LONG_LOCUST,
aINS_INSECT_TYPE_MIGRATORY_LOCUST,
aINS_INSECT_TYPE_CRICKET,
aINS_INSECT_TYPE_GRASSHOPPER,
aINS_INSECT_TYPE_BELL_CRICKET,
aINS_INSECT_TYPE_PINE_CRICKET,
aINS_INSECT_TYPE_DRONE_BEETLE,
aINS_INSECT_TYPE_DYNASTID_BEETLE,
aINS_INSECT_TYPE_FLAT_STAG_BEETLE,
aINS_INSECT_TYPE_JEWEL_BEETLE,
aINS_INSECT_TYPE_LONGHORN_BEETLE,
aINS_INSECT_TYPE_LADYBUG,
aINS_INSECT_TYPE_SPOTTED_LADYBUG,
aINS_INSECT_TYPE_MANTIS,
aINS_INSECT_TYPE_FIREFLY,
aINS_INSECT_TYPE_COCKROACH,
aINS_INSECT_TYPE_SAW_STAG_BEETLE,
aINS_INSECT_TYPE_MOUNTAIN_BEETLE,
aINS_INSECT_TYPE_GIANT_BEETLE,
aINS_INSECT_TYPE_SNAIL,
aINS_INSECT_TYPE_MOLE_CRICKET,
aINS_INSECT_TYPE_POND_SKATER,
aINS_INSECT_TYPE_BAGWORM,
aINS_INSECT_TYPE_PILL_BUG,
aINS_INSECT_TYPE_SPIDER,
aINS_INSECT_TYPE_ANT,
aINS_INSECT_TYPE_MOSQUITO,
aINS_INSECT_TYPE_NUM,
aINS_INSECT_TYPE_SPIRIT = aINS_INSECT_TYPE_NUM,
aINS_INSECT_TYPE_NONE,
aINS_INSECT_TYPE_EXTENDED_NUM
};
enum {
aINS_MAKE_NEW,
aINS_MAKE_EXIST,
include/ac_set_ovl_insect.h
+2 -49
View File
@@ -3,6 +3,7 @@
#include "types.h"
#include "ac_set_manager.h"
#include "ac_insect_h.h"
#ifdef __cplusplus
extern "C" {
@@ -10,55 +11,7 @@ extern "C" {
#define aSOI_TERM_TRANSITION_MAX_DAYS 5
#define aSOI_INSECT_TYPE_INVALID -1
enum insect_type {
aSOI_INSECT_TYPE_COMMON_BUTTERFLY,
aSOI_INSECT_TYPE_YELLOW_BUTTERFLY,
aSOI_INSECT_TYPE_TIGER_BUTTERFLY,
aSOI_INSECT_TYPE_PURPLE_BUTTERFLY,
aSOI_INSECT_TYPE_ROBUST_CICADA,
aSOI_INSECT_TYPE_WALKER_CICADA,
aSOI_INSECT_TYPE_EVENING_CICADA,
aSOI_INSECT_TYPE_BROWN_CICADA,
aSOI_INSECT_TYPE_BEE,
aSOI_INSECT_TYPE_COMMON_DRAGONFLY,
aSOI_INSECT_TYPE_RED_DRAGONFLY,
aSOI_INSECT_TYPE_DARNER_DRAGONFLY,
aSOI_INSECT_TYPE_BANDED_DRAGONFLY,
aSOI_INSECT_TYPE_LONG_LOCUST,
aSOI_INSECT_TYPE_MIGRATORY_LOCUST,
aSOI_INSECT_TYPE_CRICKET,
aSOI_INSECT_TYPE_GRASSHOPPER,
aSOI_INSECT_TYPE_BELL_CRICKET,
aSOI_INSECT_TYPE_PINE_CRICKET,
aSOI_INSECT_TYPE_DRONE_BEETLE,
aSOI_INSECT_TYPE_DYNASTID_BEETLE,
aSOI_INSECT_TYPE_FLAT_STAG_BEETLE,
aSOI_INSECT_TYPE_JEWEL_BEETLE,
aSOI_INSECT_TYPE_LONGHORN_BEETLE,
aSOI_INSECT_TYPE_LADYBUG,
aSOI_INSECT_TYPE_SPOTTED_LADYBUG,
aSOI_INSECT_TYPE_MANTIS,
aSOI_INSECT_TYPE_FIREFLY,
aSOI_INSECT_TYPE_COCKROACH,
aSOI_INSECT_TYPE_SAW_STAG_BEETLE,
aSOI_INSECT_TYPE_MOUNTAIN_BEETLE,
aSOI_INSECT_TYPE_GIANT_BEETLE,
aSOI_INSECT_TYPE_SNAIL,
aSOI_INSECT_TYPE_MOLE_CRICKET,
aSOI_INSECT_TYPE_POND_SKATER,
aSOI_INSECT_TYPE_BAGWORM,
aSOI_INSECT_TYPE_PILL_BUG,
aSOI_INSECT_TYPE_SPIDER,
aSOI_INSECT_TYPE_ANT,
aSOI_INSECT_TYPE_MOSQUITO,
aSOI_INSECT_TYPE_NUM,
aSOI_INSECT_TYPE_SPIRIT = aSOI_INSECT_TYPE_NUM,
aSOI_INSECT_TYPE_NONE,
aSOI_INSECT_TYPE_EXTENDED_NUM
};
#define aINS_INSECT_TYPE_INVALID -1
#define aSOI_SPAWN_AREA_INVALID -1
include/m_actor.h
+1 -1
View File
@@ -453,7 +453,7 @@ typedef enum bank_id {
ACTOR_OBJ_BANK_EF_MINSECT,
ACTOR_OBJ_BANK_AC_SIGN,
ACTOR_OBJ_BANK_MURAL,
ACTOR_OBJ_BANK_413,
ACTOR_OBJ_BANK_ANT,
ACTOR_OBJ_BANK_414,
ACTOR_OBJ_BANK_415,
ACTOR_OBJ_BANK_416,
include/m_player.h
+1 -1
View File
@@ -714,7 +714,7 @@ enum {
enum {
mPlayer_NET_CATCH_TYPE_INSECT,
mPlayer_NET_CATCH_TYPE_UNK1,
mPlayer_NET_CATCH_TYPE_ANT,
mPlayer_NET_CATCH_TYPE_NUM
};