Fix Respawn Cooldown being there when it shouldn't, rewrote in C

CLF78 · Nov 20, 2024 · 385e72d · 385e72d
1 parent a5e0322
commit 385e72d
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 49 deletions.
diff --git a/files/UIPatches/Global/message/Manu.bmg b/files/UIPatches/Global/message/Manu.bmg
diff --git a/src/include/kartdynamics.h b/src/include/kartdynamics.h
@@ -0,0 +1,14 @@
+#pragma once
+#include "common.h"
+
+typedef struct {
+    u8 unk[0x171]; // Values we don't need to know
+    bool noGravity;
+    bool isHit;
+    bool force0xVelY;
+    bool inBullet;
+    // Incomplete (more values we don't need to know)
+} KartDynamics;
+
+
+
diff --git a/src/payload/main.c b/src/payload/main.c
@@ -161,9 +161,6 @@ void loadCodes() {
 	// Instant Respawn + Respawn Cooldown (by davidevgen, CLF78,stebler and Lami)
 	directWrite8(InstantRespawn1, 0);
 	directWriteBranch(InstantRespawn2, RespawnCooldown, true);
-	directWrite8(InstantRespawn3, 0);
-	directWrite8(InstantRespawn4, 0);
-	directWrite8Offset(InstantRespawn4, 0x2, 0);
 
 	// Invisibility (by CLF78)
 	directWriteBranch(InvisibilityHook, Invisibility, true);

diff --git a/src/payload/main/respawn.S b/src/payload/main/respawn.S
diff --git a/src/payload/main/respawn.c b/src/payload/main/respawn.c
@@ -0,0 +1,17 @@
+#include "common.h"
+#include "hidenseek.h"
+#include "kartdynamics.h"
+#include "os.h"
+#include "racedata.h"
+
+extern u8 InstantRespawn3;
+void RespawnCooldown(KartDynamics* kartDynamics){
+    if (Have30SecondsPassed && !HideNSeekData.players[Racedata->main.scenarios[0].settings.hudPlayerIds[0]].isSeeker){
+        kartDynamics->noGravity = 1;
+        InstantRespawn3 = 0x6E;
+    } else {
+        kartDynamics->noGravity = 0;
+        InstantRespawn3 = 0;
+    }
+}
+
diff --git a/src/rmce.ld b/src/rmce.ld
@@ -176,9 +176,8 @@ SECTIONS {
 
 	/* Instant Respawn */
 	InstantRespawn1 = 0x8056EFDB;
-	InstantRespawn2 = 0x805733BC;
-	InstantRespawn3 = 0x8057339b;
-	InstantRespawn4 = 0x808b1305;
+	InstantRespawn2 = 0x8057339c;
+	InstantRespawn3 = 0x808b1305;
 
 	/* Invisibility */
 	InvisibilityHook = 0x80653AAC;

diff --git a/src/rmcj.ld b/src/rmcj.ld
@@ -176,9 +176,8 @@ SECTIONS {
 
 	/* Instant Respawn */
 	InstantRespawn1 = 0x805737AB;
-	InstantRespawn2 = 0x805795A0;
-	InstantRespawn3 = 0x8057957f;
-	InstantRespawn4 = 0x808b4d25;
+	InstantRespawn2 = 0x80579580;
+	InstantRespawn3 = 0x808b4d25;
 
 	/* Invisibility */
 	InvisibilityHook = 0x806575A0;

diff --git a/src/rmck.ld b/src/rmck.ld
@@ -176,9 +176,8 @@ SECTIONS {
 
 	/* Instant Respawn */
 	InstantRespawn1 = 0x80561E83;
-	InstantRespawn2 = 0x80567C78;
-	InstantRespawn3 = 0x80567c57;
-	InstantRespawn4 = 0x808a403d;
+	InstantRespawn2 = 0x80567c58;
+	InstantRespawn3 = 0x808a403d;
 
 	/* Invisibility */
 	InvisibilityHook = 0x8064624C;

diff --git a/src/rmcp.ld b/src/rmcp.ld
@@ -176,9 +176,8 @@ SECTIONS {
 
 	/* Instant Respawn */
 	InstantRespawn1 = 0x80573E2B;
-	InstantRespawn2 = 0x80579C20;
-	InstantRespawn3 = 0x80579bff;
-	InstantRespawn4 = 0x808b5bc5;
+	InstantRespawn2 = 0x80579c00;
+	InstantRespawn3 = 0x808b5bc5;
 
 	/* Invisibility */
 	InvisibilityHook = 0x80657F34;