From 47805e69c2c554e4b8a7ebcff46af9e3be1fc057 Mon Sep 17 00:00:00 2001
From: MegaIDK <125525714+MegaIDK@users.noreply.github.com>
Date: Tue, 5 Sep 2023 14:09:01 -0300
Subject: ovl_Normal_Npc OK (#87)

* ovl_Normal_Npc OK

* format
---
 src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c | 36 ++++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c b/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c
index 5a178fe..8cbb358 100644
--- a/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c
+++ b/src/overlays/actors/ovl_Normal_Npc/ac_normal_npc.c
@@ -8,8 +8,9 @@ void aNOR_actor_ct(Actor* thisx, Game_Play* game_play);
 void aNOR_actor_dt(Actor* thisx, Game_Play* game_play);
 void aNOR_actor_init(Actor* thisx, Game_Play* game_play);
 void aNOR_actor_save(Actor* thisx, Game_Play* game_play);
+void aNOR_actor_move(void);
+void aNOR_actor_draw(void);
 
-#if 0
 ActorProfile Normal_Npc_Profile = {
     /* */ ACTOR_NORMAL_NPC,
     /* */ ACTOR_PART_NPC,
@@ -20,19 +21,36 @@ ActorProfile Normal_Npc_Profile = {
     /* */ aNOR_actor_ct,
     /* */ aNOR_actor_dt,
     /* */ aNOR_actor_init,
-    /* */ (ActorFunc)none_proc1,
+    /* */ (void*)none_proc1,
     /* */ aNOR_actor_save,
 };
-#endif
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Normal_Npc/ac_normal_npc/aNOR_actor_ct.s")
+struct_809AEFA4 aNOR_ct_data = {
+    aNOR_actor_move, aNOR_actor_draw, 1, NULL, NULL, NULL,
+};
+
+void aNOR_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, &aNOR_ct_data);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Normal_Npc/ac_normal_npc/aNOR_actor_dt.s")
+void aNOR_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_Normal_Npc/ac_normal_npc/aNOR_actor_save.s")
+void aNOR_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_Normal_Npc/ac_normal_npc/aNOR_actor_init.s")
+void aNOR_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_Normal_Npc/ac_normal_npc/func_809A5B4C_jp.s")
+void aNOR_actor_move(void) {
+    common_data.unk_1004C->unk_D0();
+}
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Normal_Npc/ac_normal_npc/func_809A5B78_jp.s")
+void aNOR_actor_draw(void) {
+    common_data.unk_1004C->unk_E4();
+}
-- 
cgit v1.2.3