From b83f29e907239afc431997dbf144b0a65d511e7c Mon Sep 17 00:00:00 2001 From: Leaze Date: Sat, 11 Mar 2023 13:54:35 +0100 Subject: [PATCH] setup: set initial starting position --- src/engine/level_script.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/engine/level_script.c b/src/engine/level_script.c index b0463393..d0447ed7 100644 --- a/src/engine/level_script.c +++ b/src/engine/level_script.c @@ -654,12 +654,14 @@ static void level_cmd_unload_area(void) { static void level_cmd_set_mario_start_pos(void) { gMarioSpawnInfo->areaIndex = CMD_GET(u8, 2); + // TODO: values are hardcoded into code rn, maybe look into loading them from a specific memory + // location (as before) or (better) from easily configurable sources #if IS_64_BIT - vec3s_set(gMarioSpawnInfo->startPos, CMD_GET(s16, 6), CMD_GET(s16, 8), CMD_GET(s16, 10)); + vec3s_set(gMarioSpawnInfo->startPos, 0, 1200, 1800); #else - vec3s_copy(gMarioSpawnInfo->startPos, CMD_GET(Vec3s, 6)); + vec3s_set(gMarioSpawnInfo->startPos, 0, 1200, 1800); #endif - vec3s_set(gMarioSpawnInfo->startAngle, 0, CMD_GET(s16, 4) * 0x8000 / 180, 0); + vec3s_set(gMarioSpawnInfo->startAngle, 0, 180 * 0x8000 / 180, 0); sCurrentCmd = CMD_NEXT; }