From 0004a8c89628a8a3fd4ab55d23e7a51cf1b3df75 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Tue, 30 Apr 2024 12:43:24 +0100 Subject: [PATCH] Fix Scarecrow Song (#271) --- mm/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mm/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/mm/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 089c078bc..cf91da04c 100644 --- a/mm/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/mm/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -114,10 +114,15 @@ void OceffWipe4_Draw(Actor* thisx, PlayState* play) { gSPDisplayList(POLY_XLU_DISP++, sScarecrowSongMaterialDL); } - gSPDisplayList(POLY_XLU_DISP++, sScarecrowSongModelDL); + // #region 2S2H [Port] + // We need to first load the DL before we can index it on the port + Gfx* scarecrowSongModelDL = ResourceMgr_LoadTexOrDListByName(sScarecrowSongModelDL); + + gSPDisplayList(POLY_XLU_DISP++, scarecrowSongModelDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(play->state.gfxCtx, G_TX_RENDERTILE, scroll * 2, scroll * -2, 32, 64, 1, scroll * -1, scroll, 32, 32)); - gSPDisplayList(POLY_XLU_DISP++, &sScarecrowSongModelDL[11]); + gSPDisplayList(POLY_XLU_DISP++, &scarecrowSongModelDL[11]); + // #endregion CLOSE_DISPS(play->state.gfxCtx); }