From ad2c8963d2c9a617f336c5e1f62422578a8ee6cf Mon Sep 17 00:00:00 2001
From: tgsm <doodrabbit@hotmail.com>
Date: Sun, 21 Jul 2024 11:50:03 -0500
Subject: [PATCH] Finish matching zNPCGoalTiki

---
 configure.py                 |  2 +-
 src/SB/Game/zNPCGoalTiki.cpp | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/configure.py b/configure.py
index be01b892..bad01eaa 100644
--- a/configure.py
+++ b/configure.py
@@ -418,7 +418,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Game/zNPCGoalCommon.cpp"), # wrong function order
             Object(NonMatching, "SB/Game/zNPCGoalStd.cpp"),
             Object(NonMatching, "SB/Game/zNPCGoalRobo.cpp"),
-            Object(NonMatching, "SB/Game/zNPCGoalTiki.cpp"),
+            Object(Matching, "SB/Game/zNPCGoalTiki.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Game/zNPCMessenger.cpp"),
             Object(NonMatching, "SB/Game/zNPCMgr.cpp"),
             Object(Matching, "SB/Game/zNPCTypes.cpp"),
diff --git a/src/SB/Game/zNPCGoalTiki.cpp b/src/SB/Game/zNPCGoalTiki.cpp
index 5a983ca1..e8d17eab 100644
--- a/src/SB/Game/zNPCGoalTiki.cpp
+++ b/src/SB/Game/zNPCGoalTiki.cpp
@@ -7,11 +7,6 @@
 #include "xEvent.h"
 #include "zNPCTypes.h"
 
-extern F32 _836_0;
-extern F32 _837_3;
-extern F32 _862_2;
-extern F32 _863_1;
-
 xFactoryInst* GOALCreate_Tiki(S32 who, RyzMemGrow* grow, void*)
 {
     xGoal* goal;
@@ -64,11 +59,11 @@ S32 zNPCGoalTikiIdle::Enter(F32, void*)
 
     if (tiki->SelfType() == NPC_TYPE_TIKI_THUNDER)
     {
-        tmr_wait = _836_0;
+        tmr_wait = 0.1f;
     }
     else if (!tiki->nav_dest)
     {
-        tmr_wait = _837_3;
+        tmr_wait = 2.0f;
     }
     else
     {
@@ -112,10 +107,10 @@ S32 zNPCGoalTikiCount::Enter(F32, void*)
 {
     zNPCTiki* tiki = (zNPCTiki*)GetOwner();
 
-    tmr_count = _862_2;
+    tmr_count = 3.0f;
     beingCarried = 0;
 
-    tiki->t1 = _863_1;
+    tiki->t1 = 0.0f;
 
     return 0;
 }