mirror of
https://github.com/ACreTeam/ac-decomp
synced 2026-05-23 06:34:18 -04:00
ac_npc_needlework: finish talk TU
This commit is contained in:
+1
-14
@@ -5,6 +5,7 @@
|
||||
#include "m_actor.h"
|
||||
#include "m_needlework.h"
|
||||
#include "c_keyframe.h"
|
||||
#include "ac_misin_clip.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -12,20 +13,6 @@ extern "C" {
|
||||
|
||||
typedef struct misin_actor_s MISIN_ACTOR;
|
||||
|
||||
typedef void (*aMSN_REQUEST_MISIN_STOP_PROC)(void);
|
||||
typedef void (*aMSN_REQUEST_MISIN_MOVE_PROC)(void);
|
||||
|
||||
typedef void (*aMSN_REQUEST_DUSTCLOTH_STOP_PROC)(void);
|
||||
typedef void (*aMSN_REQUEST_DUSTCLOTH_MOVE_PROC)(void);
|
||||
|
||||
typedef struct misin_clip_s {
|
||||
MISIN_ACTOR* misin_actor_p;
|
||||
aMSN_REQUEST_MISIN_STOP_PROC request_misin_stop_proc;
|
||||
aMSN_REQUEST_MISIN_MOVE_PROC request_misin_move_proc;
|
||||
aMSN_REQUEST_DUSTCLOTH_STOP_PROC request_dustcloth_stop_proc;
|
||||
aMSN_REQUEST_DUSTCLOTH_MOVE_PROC request_dustcloth_move_proc;
|
||||
} aMSN_Clip_c;
|
||||
|
||||
#define aMSN_GetClip() ((aMSN_Clip_c*)Common_Get(clip).misin_clip)
|
||||
|
||||
typedef struct misin_dustcloth_s {
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
#ifndef AC_MISIN_CLIP_H
|
||||
#define AC_MISIN_CLIP_H
|
||||
|
||||
#include "types.h"
|
||||
#include "m_actor.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef void (*aMSN_REQUEST_MISIN_STOP_PROC)(void);
|
||||
typedef void (*aMSN_REQUEST_MISIN_MOVE_PROC)(void);
|
||||
|
||||
typedef void (*aMSN_REQUEST_DUSTCLOTH_STOP_PROC)(void);
|
||||
typedef void (*aMSN_REQUEST_DUSTCLOTH_MOVE_PROC)(void);
|
||||
|
||||
typedef struct misin_clip_s {
|
||||
ACTOR* misin_actor_p;
|
||||
aMSN_REQUEST_MISIN_STOP_PROC request_misin_stop_proc;
|
||||
aMSN_REQUEST_MISIN_MOVE_PROC request_misin_move_proc;
|
||||
aMSN_REQUEST_DUSTCLOTH_STOP_PROC request_dustcloth_stop_proc;
|
||||
aMSN_REQUEST_DUSTCLOTH_MOVE_PROC request_dustcloth_move_proc;
|
||||
} aMSN_Clip_c;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* AC_MISIN_CLIP_H */
|
||||
@@ -43,7 +43,7 @@ struct npc_needlework_actor_s {
|
||||
u8 _9B3;
|
||||
u8 _9B4;
|
||||
u8 buy_ut_idx;
|
||||
u8 _9B5;
|
||||
u8 _9B6;
|
||||
u8 my_proc_idx;
|
||||
u8 pl_area;
|
||||
u8 now_area;
|
||||
|
||||
+2
-1
@@ -38,6 +38,7 @@
|
||||
#include "ac_needlework_indoor_clip.h"
|
||||
#include "ac_countdown_clip.h"
|
||||
#include "ac_tokyoso_control.h"
|
||||
#include "ac_misin_clip.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -50,7 +51,7 @@ typedef struct clip_s {
|
||||
/* 0x000 */ BoxTrick01_data_c box_trick_data[4];
|
||||
/* 0x020 */ int arrange_ftr_num;
|
||||
/* 0x024 */ aNI_Clip_c* needlework_indoor_clip;
|
||||
/* 0x028 */ void* misin_clip;
|
||||
/* 0x028 */ aMSN_Clip_c* misin_clip;
|
||||
/* 0x02C */ aHTBL_Clip_c* htbl_clip;
|
||||
/* 0x030 */ void* _030;
|
||||
/* 0x034 */ void* _034;
|
||||
|
||||
Reference in New Issue
Block a user