mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-08 18:13:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link ac_npc2

Browse Source
This commit is contained in:
Cuyler36
2025-01-06 17:06:26 -05:00
parent 845de24a64
commit 7a3aef7367
37 changed files with 3240 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_npc.h
+94 -8
View File
@@ -155,6 +155,7 @@ enum {
aNPC_ATTENTION_TYPE_NUM
};
#ifndef aNPC_NPC2
enum {
aNPC_THINK_WAIT,
aNPC_THINK_WANDER,
@@ -169,6 +170,19 @@ enum {
aNPC_THINK_NUM
};
#else
enum {
aNPC_THINK_WAIT,
aNPC_THINK_HIDE,
aNPC_THINK_WANDER,
aNPC_THINK_OUT_OF_ROOM,
aNPC_THINK_EXIT_WAIT,
aNPC_THINK_INTO_ROOM,
aNPC_THINK_SPECIAL,
aNPC_THINK_NUM
};
#endif
enum {
aNPC_THINK_TYPE_INIT,
@@ -459,6 +473,15 @@ enum {
#define aNPC_ACT_NONE 0xFF
enum {
aNPC_ACTION_PROC_TYPE_INIT,
aNPC_ACTION_PROC_TYPE_CHG_DATA,
aNPC_ACTION_PROC_TYPE_MAIN,
aNPC_ACTION_PROC_TYPE_NUM
};
#ifndef aNPC_NPC2
enum {
aNPC_ACT_WAIT,
aNPC_ACT_WALK,
@@ -487,14 +510,6 @@ enum {
aNPC_ACT_NUM
};
enum {
aNPC_ACTION_PROC_TYPE_INIT,
aNPC_ACTION_PROC_TYPE_CHG_DATA,
aNPC_ACTION_PROC_TYPE_MAIN,
aNPC_ACTION_PROC_TYPE_NUM
};
enum {
aNPC_ACTION_TYPE_WAIT,
aNPC_ACTION_TYPE_WAIT_KI,
@@ -556,6 +571,77 @@ enum {
aNPC_ACTION_TYPE_NUM
};
#else
enum {
aNPC_ACT_WAIT,
aNPC_ACT_WALK,
aNPC_ACT_RUN,
aNPC_ACT_TURN,
aNPC_ACT_TURN2,
aNPC_ACT_TALK,
aNPC_ACT_KEITAI_ON,
aNPC_ACT_KEITAI_OFF,
aNPC_ACT_ENSOU,
aNPC_ACT_WAIT_E,
aNPC_ACT_TRANS,
aNPC_ACT_GET,
aNPC_ACT_CONTRACT,
aNPC_ACT_NOT_CONTRACT,
aNPC_ACT_NOT_CONTRACT2,
aNPC_ACT_CHANGE_CLOTH,
aNPC_ACT_SPECIAL,
aNPC_ACT_NUM
};
enum {
aNPC_ACTION_TYPE_WAIT,
aNPC_ACTION_TYPE_WAIT_KI,
aNPC_ACTION_TYPE_WAIT_DO,
aNPC_ACTION_TYPE_WAIT_AI,
aNPC_ACTION_TYPE_WAIT_NEMU,
aNPC_ACTION_TYPE_WALK,
aNPC_ACTION_TYPE_WALK_KI,
aNPC_ACTION_TYPE_WALK_DO,
aNPC_ACTION_TYPE_WALK_AI,
aNPC_ACTION_TYPE_RUN,
aNPC_ACTION_TYPE_RUN_KI,
aNPC_ACTION_TYPE_RUN_DO,
aNPC_ACTION_TYPE_RUN_AI,
aNPC_ACTION_TYPE_TURN,
aNPC_ACTION_TYPE_TURN2,
aNPC_ACTION_TYPE_TALK_TURN,
aNPC_ACTION_TYPE_TALK,
aNPC_ACTION_TYPE_KEITAI_ON,
aNPC_ACTION_TYPE_KEITAI_OFF,
aNPC_ACTION_TYPE_TRANS_MOVE,
aNPC_ACTION_TYPE_TRANSFER,
aNPC_ACTION_TYPE_TRANS_WAIT,
aNPC_ACTION_TYPE_SEND_MAIL,
aNPC_ACTION_TYPE_GET_MOVE,
aNPC_ACTION_TYPE_GET,
aNPC_ACTION_TYPE_GET_PULL,
aNPC_ACTION_TYPE_GET_PULL_WAIT,
aNPC_ACTION_TYPE_GET_PUTAWAY,
aNPC_ACTION_TYPE_GET_EAT,
aNPC_ACTION_TYPE_GET_CHANGE,
aNPC_ACTION_TYPE_GET_RETURN,
aNPC_ACTION_TYPE_GET_F,
aNPC_ACTION_TYPE_GET_PULL_F,
aNPC_ACTION_TYPE_GET_PULL_WAIT_F,
aNPC_ACTION_TYPE_GET_PUTAWAY_F,
aNPC_ACTION_TYPE_GET_RETURN_F,
aNPC_ACTION_TYPE_ESTIMATE_F,
aNPC_ACTION_TYPE_CONTRACT,
aNPC_ACTION_TYPE_CONTRACT_PULL,
aNPC_ACTION_TYPE_CONTRACT_PUTAWAY,
aNPC_ACTION_TYPE_NOT_CONTRACT,
aNPC_ACTION_TYPE_ENSOU,
aNPC_ACTION_TYPE_WAIT_E,
aNPC_ACTION_TYPE_NUM
};
#endif
typedef void (*aNPC_ACTION_PROC)(NPC_ACTOR*, GAME_PLAY*, int);
include/audio.h
+1 -1
View File
@@ -63,7 +63,7 @@ extern void sAdo_SysTrgStart(u16 id);
extern void sAdo_PlyWalkSe(u16 walk, const xyz_t* pos);
extern void sAdo_PlyWalkSeRoom(u8 walk, const xyz_t* pos);
extern void sAdo_NpcWalkSe(u16 se_no, const xyz_t* pos);
extern void sAdo_NpcWalkSeRoom(u16 se_no, const xyz_t* pos);
extern void sAdo_NpcWalkSeRoom(u8 se_no, const xyz_t* pos);
extern void sAdo_PlayerStatusLevel(f32 speed, int p);
include/audio_defs.h
+4
View File
@@ -177,8 +177,12 @@ typedef enum audio_sound_effects {
NA_SE_UCHIWA = 0x167,
NA_SE_LAWNMOWER = 0x177,
NA_SE_207 = 0x207,
NA_SE_SCOOP_SHIGEMI = 0x401,
NA_SE_40B = 0x40B,
NA_SE_CAMERA_MOVE1 = 0x40D,
NA_SE_CAMERA_MOVE2,
include/jaudio_NES/game64.h
+1 -1
View File
@@ -17,7 +17,7 @@ extern void Na_SysTrgStart(u16);
extern void Na_PlyWalkSe(u16, u16, f32);
extern void Na_PlyWalkSeRoom(u8, u16, f32);
extern void Na_NpcWalkSe(u16, u16, f32);
extern void Na_NpcWalkSeRoom(u16, u16, f32);
extern void Na_NpcWalkSeRoom(u8, u16, f32);
extern void Na_PlayerStatusLevel(f32, int);
extern void Na_VoiceSe(u8, u8, u8, s16, u8, u8);
extern void Na_MessageStatus(u8);