Merge pull request #118 from lillyflower648/main

Matched 2 Functions in game.c
TheOnlyZac · Nov 17, 2024 · d419847 · d419847
2 parents a5facdb + 6f3e4a1
commit d419847
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/P2/game.c b/src/P2/game.c
@@ -42,7 +42,12 @@ INCLUDE_ASM(const s32, "P2/game", FUN_00160650);
 
 INCLUDE_ASM(const s32, "P2/game", SetupGame__FPci);
 
-INCLUDE_ASM(const s32, "P2/game", UpdateGameState__Ff);
+void UpdateGameState(float dt)
+{
+    g_pgsCur->dt += dt;
+    g_pwsCur->dt += dt;
+    g_plsCur->dt += dt;
+}
 
 INCLUDE_ASM(const s32, "P2/game", LsFromWid);
 
@@ -71,7 +76,14 @@ INCLUDE_ASM(const s32, "P2/game", FCharmAvailable__Fv);
 
 INCLUDE_ASM(const s32, "P2/game", func_00160C90);
 
-INCLUDE_ASM(const s32, "P2/game", PfLookupDialog__FP2LS3OID);
+int PfLookupDialog(LS *pls, OID oidDialog)
+{
+    // todo figure out what these magic numbers represent
+    if (oidDialog - 0x33bU >= 0xc) {
+        return 0;
+    }
+    return -0xcd8 + (int)pls + (oidDialog * 4);
+}
 
 INCLUDE_ASM(const s32, "P2/game", clr_8_bytes_1);