ovl_Kamakura_Npc0 OK (#82)

* ovl_Kamakura_Npc0 OK

* fixed warnings

* fun names

* suggestions

* removed useless variable

* change back from bool to s32

* forgor protopye

2 files changed, 53 insertions, 22 deletions

diff --git a/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c b/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c
index 47eab0a..5de6bfb 100644
--- a/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c
+++ b/src/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0.c
@@ -8,8 +8,12 @@ void aKM0_actor_ct(Actor* thisx, Game_Play* game_play);
 void aKM0_actor_dt(Actor* thisx, Game_Play* game_play);
 void aKM0_actor_init(Actor* thisx, Game_Play* game_play);
 void aKM0_actor_save(Actor* thisx, Game_Play* game_play);
+void aKM0_talk_request(UNK_TYPE arg0, UNK_TYPE arg1);
+void aKM0_talk_init(UNK_TYPE arg0, UNK_TYPE arg1);
+s32 aKM0_talk_end_chk(UNK_TYPE arg0, UNK_TYPE arg1);
+void aKM0_actor_move(void);
+void aKM0_actor_draw(void);
 
-#if 0
 ActorProfile Kamakura_Npc0_Profile = {
     /* */ ACTOR_KAMAKURA_NPC0,
     /* */ ACTOR_PART_NPC,
@@ -20,25 +24,55 @@ ActorProfile Kamakura_Npc0_Profile = {
     /* */ aKM0_actor_ct,
     /* */ aKM0_actor_dt,
     /* */ aKM0_actor_init,
-    /* */ (ActorFunc)none_proc1,
+    /* */ (void*)none_proc1,
     /* */ aKM0_actor_save,
 };
-#endif
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0/aKM0_actor_ct.s")
+struct_809AEFA4 aKM0_ct_data = {
+    aKM0_actor_move, aKM0_actor_draw, 3, aKM0_talk_request, aKM0_talk_init, aKM0_talk_end_chk,
+};
+
+void aKM0_actor_ct(Actor* thisx, Game_Play* game_play) {
+    if (common_data.unk_1004C->unk_BC(thisx, game_play) == 1) {
+        common_data.unk_1004C->unk_C0(thisx, game_play, &aKM0_ct_data);
+        common_data.unk_1004C->unk_118(thisx);
+    }
+}
+
+void aKM0_actor_save(Actor* thisx, Game_Play* game_play) {
+    common_data.unk_1004C->unk_C8(thisx, game_play);
+}
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0/aKM0_actor_save.s")
+void aKM0_actor_dt(Actor* thisx, Game_Play* game_play) {
+    common_data.unk_1004C->unk_C4(thisx, game_play);
+}
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0/aKM0_actor_dt.s")
+void aKM0_actor_init(Actor* thisx, Game_Play* game_play) {
+    common_data.unk_1004C->unk_CC(thisx, game_play);
+}
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0/aKM0_actor_init.s")
+void aKM0_talk_request(UNK_TYPE arg0, UNK_TYPE arg1 UNUSED) {
+    common_data.unk_10078->unk_00(arg0);
+}
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0/func_809DF884_jp.s")
+void aKM0_talk_init(UNK_TYPE arg0, UNK_TYPE arg1 UNUSED) {
+    common_data.unk_10078->unk_04(arg0);
+}
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0/func_809DF8B4_jp.s")
+s32 aKM0_talk_end_chk(UNK_TYPE arg0, UNK_TYPE arg1 UNUSED) {
+    s32 var_v1;
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0/func_809DF8E4_jp.s")
+    var_v1 = false;
+    if (common_data.unk_10078->unk_08(arg0) == 1) {
+        var_v1 = true;
+    }
+    return var_v1;
+}
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0/func_809DF92C_jp.s")
+void aKM0_actor_move(void) {
+    common_data.unk_1004C->unk_D0();
+}
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Kamakura_Npc0/ac_kamakura_npc0/func_809DF958_jp.s")
+void aKM0_actor_draw(void) {
+    common_data.unk_1004C->unk_E4();
+}
diff --git a/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c b/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c
index ac8e35c..211b680 100644
--- a/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c
+++ b/src/overlays/actors/ovl_Npc_Engineer/ac_npc_engineer.c
@@ -9,8 +9,8 @@ void aNEG_actor_ct(Actor* thisx, Game_Play* game_play);
 void aNEG_actor_dt(Actor* thisx, Game_Play* game_play);
 void aNEG_actor_init(Actor* thisx, Game_Play* game_play);
 void aNEG_actor_save(Actor* thisx, Game_Play* game_play);
-void func_809AEF28_jp(void);
-void func_809AEF54_jp(void);
+void aNEG_actor_move(void);
+void aNEG_actor_draw(void);
 
 ActorProfile Npc_Engineer_Profile = {
     /* */ ACTOR_NPC_ENGINEER,
@@ -26,11 +26,8 @@ ActorProfile Npc_Engineer_Profile = {
     /* */ aNEG_actor_save,
 };
 
-struct_809AEFA4 D_809AEFA4_jp = {
-    func_809AEF28_jp,
-    func_809AEF54_jp,
-    4,
-    0,
+struct_809AEFA4 aNEG_ct_data = {
+    aNEG_actor_move, aNEG_actor_draw, 4, NULL, NULL, NULL,
 };
 
 void aNEG_actor_ct(Actor* thisx, Game_Play* game_play) {
@@ -38,7 +35,7 @@ void aNEG_actor_ct(Actor* thisx, Game_Play* game_play) {
 
     if (common_data.unk_1004C->unk_BC(thisx, game_play) == 1) {
         this->unk7C0 = none_proc1;
-        common_data.unk_1004C->unk_C0(thisx, game_play, &D_809AEFA4_jp);
+        common_data.unk_1004C->unk_C0(thisx, game_play, &aNEG_ct_data);
         this->unk80C = -1;
         this->unk7FD = 0;
         this->unk8AC = -1;
@@ -64,10 +61,10 @@ void aNEG_actor_init(Actor* thisx, Game_Play* game_play) {
     common_data.unk_1004C->unk_CC(thisx, game_play);
 }
 
-void func_809AEF28_jp(void) {
+void aNEG_actor_move(void) {
     common_data.unk_1004C->unk_D0();
 }
 
-void func_809AEF54_jp(void) {
+void aNEG_actor_draw(void) {
     common_data.unk_1004C->unk_E4();
 }