Finish matching zNPCGoalTiki

bfbbdecomp · Jul 21, 2024 · a0c9efc · a0c9efc
1 parent c84b0b3
commit a0c9efc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git 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
@@ -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;
 }