Implement & link jaudio_NES/staff.c

include/audio.h

@@ -15,6 +15,26 @@ typedef struct audio_tempo_beat_s {
     /* 0x01 */ s8 beat;
 } TempoBeat_c;
 
+/* sizeof(StaffRollInfo_c) == 0x18 */
+typedef struct audio_staffroll_info_s {
+    /* 0x00 */ s16 staffroll_part;
+    /* 0x02 */ s16 _01;
+    /* 0x08 */ f64 percent;
+    /* 0x10 */ s8 mouth_num;
+    /* 0x11 */ s8 blink_flag;
+    /* 0x12 */ s8 beat;
+} StaffRollInfo_c;
+
+enum {
+    STAFFROLL_PART_START,
+    STAFFROLL_PART_INTRO,
+    STAFFROLL_PART_MAIN,
+    STAFFROLL_PART_FADEOUT,
+    STAFFROLL_PART_FINISH,
+
+    STAFFROLL_PART_NUM
+};
+
 enum {
     VOICE_STATUS_NORMAL,
     VOICE_STATUS_ANGRY,
@@ -94,7 +114,7 @@ extern void sAdos_KishaStatusLevel(f32 speed, u32 ongenNum1, u16 angle1, f32 dis
 
 extern void sAdos_GetRadioCounter(void* p);
 extern void sAdos_GetKappaCounter(void* p);
-extern void sAdos_GetStaffRollInfo(void* p);
+extern void sAdos_GetStaffRollInfo(StaffRollInfo_c* info);
 
 extern void sAdos_TTKK_ARM(u8 mode);
 

include/jaudio_NES/audiocommon.h

@@ -14,6 +14,7 @@ extern "C" {
 #define AUDIO_ARAM_HEAP_SIZE 0xC000
 
 #define AUDIO_GROUP_MAX 5
+#define AUDIO_SUBTRACK_NUM 16
 
 #define NA_MAKE_COMMAND(a0, a1, a2, a3) \
     (u32)((((a0) & 0xFF) << 24) | (((a1) & 0xFF) << 16) | (((a2) & 0xFF) << 8) | (((a3) & 0xFF) << 0))

include/jaudio_NES/audiostruct.h

@@ -520,7 +520,7 @@ struct group_ {
     /* 0x02C */ f32 fade_volume_scale;
     /* 0x030 */ f32 applied_fade_volume;
     /* 0x034 */ f32 bend;
-    /* 0x038 */ sub* subtracks[16];
+    /* 0x038 */ sub* subtracks[AUDIO_SUBTRACK_NUM];
     /* 0x078 */ seqplayer seq_player;
     /* 0x094 */ u8* short_note_velocity_tbl;
     /* 0x098 */ u8* short_note_gate_time_tbl;

include/jaudio_NES/staff.h

@@ -2,22 +2,18 @@
 #define STAFF_H
 
 #include "types.h"
+#include "audio.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct staff_roll_info_s{
-    s16 unk0;
-    int unk4;
-    f64 unk8;
-}StaffRoll;
-
-extern void Na_GetStaffRollInfo(void*);
+extern void Na_StaffRollInit(void);
+extern void Na_StaffRollStart(s16 seq_no);
+extern void Na_GetStaffRollInfo(StaffRollInfo_c* info);
 
 #ifdef __cplusplus
 }
 #endif
 
-
-#endif
+#endif