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

Refactor & improvements for ac_npc_rtc

Browse Source
This commit is contained in:
Cuyler36
2024-07-08 22:09:19 -04:00
parent 3a91d186ee
commit 4c4a34d108
6 changed files with 324 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_npc_rtc.h
+12 -13
View File
@@ -9,22 +9,22 @@
extern "C" {
#endif
typedef struct actor_npc_rtc_s NPCRTC_ACTOR;
typedef struct actor_npc_rtc_s NPC_RTC_ACTOR;
typedef void (*aNPCRTC_SUB_PROC)(NPCRTC_ACTOR* rtc, GAME_PLAY* play);
typedef void (*aNRTC_PROC)(NPC_RTC_ACTOR* rtc, GAME_PLAY* play);
struct actor_npc_rtc_s{
struct actor_npc_rtc_s {
NPC_ACTOR npc_class;
int unk994;
int unk998;
aNPCRTC_SUB_PROC unk99C;
int unk9A0;
int talk_idx;
int unk998;
aNRTC_PROC talk_proc;
int talk_flag;
int unk9A4;
int unk9A8;
int unk9AC;
int unk9B0;
int unk9B4;
int unk9B8;
int think_idx;
int counter;
int fade_timer;
int bgm_timer;
int first_talk_timer;
};
extern ACTOR_PROFILE Npc_Rtc_Profile;
@@ -34,4 +34,3 @@ extern ACTOR_PROFILE Npc_Rtc_Profile;
#endif
#endif
include/m_choice.h
+2
View File
@@ -124,6 +124,8 @@ extern void mChoice_no_b_set(mChoice_c* choice);
extern void mChoice_no_b_close_set(mChoice_c* choice);
/* Macros */
#define mChoice_CHECK_MAIN_NORMAL() mChoice_check_main_normal(mChoice_Get_base_window_p())
#define mChoice_GET_CHOSENUM() mChoice_Get_ChoseNum(mChoice_Get_base_window_p())
#define mChoice_CLEAR_CHOSENUM() mChoice_Clear_ChoseNum(mChoice_Get_base_window_p())
#define mChoice_NO_B_SET() mChoice_no_b_set(mChoice_Get_base_window_p())
include/m_msg.h
+4
View File
@@ -359,10 +359,14 @@ extern void mMsg_sound_unset_voice_silent(mMsg_Window_c* msg_p, int update_mode)
#define mMsg_GET_MSG_NUM() mMsg_Get_msg_num(mMsg_Get_base_window_p())
#define mMsg_SET_IDLING_REQ() mMsg_Set_idling_req(mMsg_Get_base_window_p())
#define mMsg_CHECK_MAINNORMALCONTINUE() mMsg_Check_MainNormalContinue(mMsg_Get_base_window_p())
#define mMsg_CHECK_MAINNORMAL() mMsg_Check_MainNormal(mMsg_Get_base_window_p())
#define mMsg_CHECK_MAINDISAPPEAR() mMsg_Check_MainDisappear(mMsg_Get_base_window_p())
#define mMsg_CHECK_MAINHIDE() mMsg_Check_MainHide(mMsg_Get_base_window_p())
#define mMsg_CHECK_MAIN_WAIT() mMsg_Check_main_wait(mMsg_Get_base_window_p())
#define mMsg_CHECK_NOT_SERIES_MAIN_WAIT() mMsg_Check_not_series_main_wait(mMsg_Get_base_window_p())
#define mMsg_REQUEST_MAIN_DISAPPEAR() mMsg_request_main_disappear(mMsg_Get_base_window_p())
#define mMsg_REQUEST_MAIN_DISAPPEAR_WAIT_TYPE1() mMsg_request_main_disappear_wait_type1(mMsg_Get_base_window_p())