From 6527ee1b7a0abdfa1bde9594b09688ec3290ab58 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Tue, 15 Apr 2025 14:13:58 -0400 Subject: [PATCH] Fix HOOK_ON_WARP params --- data/dynos_warps.cpp | 4 ++-- src/game/rendering_graph_node.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/dynos_warps.cpp b/data/dynos_warps.cpp index 41185fbdd..20df82b15 100644 --- a/data/dynos_warps.cpp +++ b/data/dynos_warps.cpp @@ -260,7 +260,7 @@ static void *DynOS_Warp_UpdateWarp(void *aCmd, bool aIsLevelInitDone) { } // lua hooks - smlua_call_event_hooks_warp_params(HOOK_ON_WARP, sWarpDest.type, sWarpDest.levelNum, sWarpDest.areaIdx, sWarpDest.nodeId, sWarpDest.arg); + smlua_call_event_hooks_warp_params(HOOK_ON_WARP, sWarpDest.type, sDynosWarpLevelNum, sDynosWarpAreaNum, sDynosWarpNodeNum, sWarpDest.arg); // Reset values sDynosWarpTargetArea = -1; @@ -405,7 +405,7 @@ static void *DynOS_Warp_UpdateExit(void *aCmd, bool aIsLevelInitDone) { sDynosExitTargetWarp = NULL; // lua hooks - smlua_call_event_hooks_warp_params(HOOK_ON_WARP, sWarpDest.type, sWarpDest.levelNum, sWarpDest.areaIdx, sWarpDest.nodeId, sWarpDest.arg); + smlua_call_event_hooks_warp_params(HOOK_ON_WARP, sWarpDest.type, sDynosWarpLevelNum, sDynosWarpAreaNum, sDynosWarpNodeNum, sWarpDest.arg); } // Phase 4 - Unlock Mario as soon as the second transition is ended diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c index 2547b5ffd..2cbbf9cf8 100644 --- a/src/game/rendering_graph_node.c +++ b/src/game/rendering_graph_node.c @@ -1206,7 +1206,7 @@ static s32 obj_is_in_view(struct GraphNodeObject *node, Mat4 matrix) { return TRUE; } -static void geo_sanitize_object_gfx() { +static void geo_sanitize_object_gfx(void) { geo_append_display_list(obj_sanitize_gfx, LAYER_OPAQUE); geo_append_display_list(obj_sanitize_gfx, LAYER_ALPHA); geo_append_display_list(obj_sanitize_gfx, LAYER_TRANSPARENT);