From 791423ff980dc815f4d2c98cf13a1b27ab4298d6 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Thu, 10 Sep 2020 22:18:10 -0700
Subject: [PATCH] Properly offset player spawns

---
 src/game/mario.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/game/mario.c b/src/game/mario.c
index 45583e84..cefef77b 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -2027,13 +2027,14 @@ static void init_single_mario(struct MarioState* m) {
 
     // two-player hack
     u8 isLocal = (m->playerIndex == 0);
+    f32 spawnAngle = m->faceAngle[1] + 0x4000;
     if ((gNetworkType == NT_CLIENT && isLocal) || (gNetworkType == NT_SERVER && !isLocal)) {
-        m->pos[0] += 50.0f * coss(m->faceAngle[1]);
-        m->pos[2] += 50.0f * sins(m->faceAngle[1]);
+        m->pos[0] += 60.0f * sins(spawnAngle);
+        m->pos[2] += 60.0f * coss(spawnAngle);
     }
     else {
-        m->pos[0] -= 50.0f * coss(m->faceAngle[1]);
-        m->pos[2] -= 50.0f * sins(m->faceAngle[1]);
+        m->pos[0] -= 60.0f * sins(spawnAngle);
+        m->pos[2] -= 60.0f * coss(spawnAngle);
     }
 
     m->floorHeight = find_floor(m->pos[0], m->pos[1], m->pos[2], &m->floor);