From 6d80f06d2ba25e53dc995d0828d400a7ed083c49 Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Wed, 17 Jan 2024 17:49:06 +0000 Subject: [PATCH] Extract Mtx definitions to headers (#68) --- ZAPDTR | 2 +- mm/src/code/z_draw.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ZAPDTR b/ZAPDTR index aaf3714f2..bd47c5af5 160000 --- a/ZAPDTR +++ b/ZAPDTR @@ -1 +1 @@ -Subproject commit aaf3714f239b80e86ad508b1a715506589624ef2 +Subproject commit bd47c5af5896d7cad5a149b6df21853e4eae0ea0 diff --git a/mm/src/code/z_draw.c b/mm/src/code/z_draw.c index d1836ab09..1d5b967d7 100644 --- a/mm/src/code/z_draw.c +++ b/mm/src/code/z_draw.c @@ -249,8 +249,8 @@ static DrawItemTableEntry sDrawItemTable[] = { // GID_MASK_BLAST, OBJECT_GI_MASK21 { GetItem_DrawOpa0Xlu1, { gGiBlastMaskEmptyDL, gGiBlastMaskDL } }, // GID_FAIRY, OBJECT_GI_BOTTLE_04 - { GetItem_DrawFairyContainer, // BENTODO - { gGiFairyBottleEmptyDL, gGiFairyBottleGlassCorkDL, gGiFairyBottleContentsDL, NULL } }, + { GetItem_DrawFairyContainer, + { gGiFairyBottleEmptyDL, gGiFairyBottleGlassCorkDL, gGiFairyBottleContentsDL, &gGiFairyBottleBillboardRotMtx } }, // GID_MASK_SCENTS, OBJECT_GI_MASK22 { GetItem_DrawOpa01, { gGiMaskOfScentsFaceDL, gGiMaskOfScentsTeethDL } }, // GID_MASK_CAPTAIN, OBJECT_GI_MASK18 @@ -332,8 +332,7 @@ static DrawItemTableEntry sDrawItemTable[] = { // GID_HYLIAN_LOACH, OBJECT_GI_LOACH { GetItem_DrawOpa0Xlu1, { gGiHylianLoachEmptyDL, gGiHylianLoachDL } }, // GID_SEAHORSE_CAUGHT, OBJECT_GI_SEAHORSE - // BENTODO - { GetItem_DrawSeahorse, { gGiSeahorseEmptyDL, gGiSeahorseBodyDL, gGiSeahorseGlowDL, NULL } }, + { GetItem_DrawSeahorse, { gGiSeahorseEmptyDL, gGiSeahorseBodyDL, gGiSeahorseGlowDL, &gGiSeahorseBillboardRotMtx } }, // GID_REMAINS_GOHT, OBJECT_BSMASK { GetItem_DrawRemains, { gRemainsGohtDL, gRemainsGohtDL } }, // GID_REMAINS_GYORG, OBJECT_BSMASK