From 8d4adb0f50554c8bb835b12a4823f6d060e31afa Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Fri, 1 Nov 2024 10:46:28 -0500 Subject: [PATCH] Fix build issue (#4504) --- soh/soh/Enhancements/Holiday/Fredomato.cpp | 3 +-- soh/soh/Enhancements/custom-message/CustomMessageManager.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/Holiday/Fredomato.cpp b/soh/soh/Enhancements/Holiday/Fredomato.cpp index 5ac148c2d..bb01ea991 100644 --- a/soh/soh/Enhancements/Holiday/Fredomato.cpp +++ b/soh/soh/Enhancements/Holiday/Fredomato.cpp @@ -92,8 +92,7 @@ static void RandomGrotto_Draw(Actor* actor, PlayState* play) { OPEN_DISPS(play->state.gfxCtx); Gfx_SetupDL_25Xlu(play->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGrottoDL); Matrix_Translate(0.0f, -2700.0f, 0.0f, MTXMODE_APPLY); diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp index 477cb765e..c165a1364 100644 --- a/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp +++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.cpp @@ -10,7 +10,7 @@ #include "soh/util.h" extern "C" { - PlayState* gPlayState; +extern PlayState* gPlayState; } using namespace std::literals::string_literals;