ac_npc_rtc OK

include/ac_nameplate.h

@@ -12,7 +12,7 @@ extern ACTOR_PROFILE Nameplate_Profile;
 
 typedef struct nameplate_actor_s{
     ACTOR actor_class;
-	u8 pad[0x2D8 - 0x170];
+    u8 pad[0x2D8 - 0x170];
 }NAMEPLATE_ACTOR;
 
 #ifdef __cplusplus

include/ac_npc.h

@@ -35,7 +35,7 @@ enum {
 
   aNPC_ATTENTION_TYPE_NUM
 };
-
+ 
 enum {
   aNPC_THINK_WAIT,
   aNPC_THINK_WANDER,
@@ -136,12 +136,25 @@ typedef struct npc_info_s {
 
 /* TODO: draw data */
 typedef struct npc_draw_info_s {
-  /* 0x000 */ u8 _000[0x584 - 0x000];
+  /* 0x000 */ u8 _000[0x20 - 0];
+  /* 0x020 */ f32 _20;
+  /* 0x024 */ f32 _24; 
+  /* 0x024 */ u8 _028[0x534 - 0x028];
+  /* 0x538 */ u8 _534;
+  /* 0x538 */ u8 _535;
+  /* 0x538 */ u8 _536;
+  /* 0x538 */ u8 _537;
+  /* 0x538 */ u8 _538;
+  /* 0x538 */ u8 _539;
+  /* 0x540 */ u8 _53A[0x580 - 0x53A];
+  /* 0x580 */ int _580;
   /* 0x584 */ int texture_bank_idx;
-  /* 0x588 */ u8 _588[0x5BD - 0x588];
+  /* 0x588 */ u8 _588[0x5BD - 0x588]; 
   /* 0x5BD */ u8 _5BD;
-  /* 0x5BE */ u8 _5BE[0x630 - 0x5BE];
-} aNPC_draw_info_c;
+  /* 0x5BE */ u8 _5BE;
+  /* 0x5BE */ u8 _5BF[0x630 - 0x5BF];
+} aNPC_draw_info_c; 
+
 
 typedef void (*aNPC_THINK_PROC)(NPC_ACTOR*, GAME_PLAY*, int);
 

include/ac_npc_rtc.h

@@ -3,11 +3,30 @@
 
 #include "types.h"
 #include "m_actor.h"
+#include "ac_npc.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef struct actor_npc_rtc_s NPCRTC_ACTOR;
+
+typedef void (*aNPCRTC_SUB_PROC)(NPCRTC_ACTOR* rtc, GAME_PLAY* play);
+
+struct actor_npc_rtc_s{
+    NPC_ACTOR npc_class;
+    int unk994;
+    int unk998; 
+    aNPCRTC_SUB_PROC unk99C;
+    int unk9A0;
+    int unk9A4;
+    int unk9A8;
+    int unk9AC;
+    int unk9B0; 
+    int unk9B4;
+    int unk9B8;
+};
+
 extern ACTOR_PROFILE Npc_Rtc_Profile;
 
 #ifdef __cplusplus

include/jaudio_NES/staff.h

@@ -7,6 +7,12 @@
  extern "C" {
 #endif
 
+typedef struct staff_roll_info_s{
+    s16 unk0;
+    int unk4;
+    f64 unk8;
+}StaffRoll;
+
 extern void Na_GetStaffRollInfo(void*);
 
 #ifdef __cplusplus

include/m_card.h

@@ -26,6 +26,8 @@ extern void mCD_InitAll();
 extern void mCD_LoadLand();
 extern void mCD_toNextLand();
 
+extern int mCD_EraseBrokenLand_bg(void*);
+extern int mCD_card_format_bg(u8);
 #ifdef __cplusplus
 }
 #endif

include/m_common_data.h

@@ -296,7 +296,8 @@ typedef struct common_data_s {
   /* 0x02DB46 */ mCD_persistent_data_c travel_persistent_data; /* used for checking if travelling back to town */
   /* 0x02DBA2 */ s16 island_weather;
   /* 0x02DBA4 */ s16 island_weather_intensity;
-  /* 0x02DBA6 */ u8 _2DBA6[0x2DBAC - 0x2DBA6];
+  /* 0x02DBA6 */ s16 _2DBA6;
+  /* 0x02DBA8 */ u8 _2DBA8;
   /* 0X02DBAC */ int famicom_2DBAC;
   /* 0x02DBB0 */ s16 can_look_goki_count;
   /* 0x02DBB4 */ f32 rainbow_opacity; /* current opacity of rainbow (0.0f - 1.0f) */

include/m_play.h

@@ -70,7 +70,7 @@ struct game_play_s {
   /* 0x2318 */ fbdemo_fade color_fade;
   /* 0x2328 */ CollisionCheck_c collision_check;
   /* 0x23F8 */ DRAW_CHK_PROC draw_chk_proc; // only used by mikanbox actor
-  /* 0x23FC */ u32 fade_color_value;
+  /* 0x23FC */ rgba8888 fade_color_value;
   /* 0x2400 */ Scene_data_status_c* scene_data_status;
   /* 0x2404 */ u8 _2400[0x2600 - 0x2404];
 };