From f3b948226b11bca9c59715b27b404b3c1ec32c51 Mon Sep 17 00:00:00 2001 From: Lywx Date: Mon, 6 May 2024 17:19:15 -0600 Subject: [PATCH] Bump lus and fixed PatchGfx (#4125) * Bump lus and fixed PatchGfx * Bump libultraship to main --- libultraship | 2 +- soh/soh/OTRGlobals.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libultraship b/libultraship index 7d71a2906..a5d84b294 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit 7d71a290657a2d3b09a83e8b33025e807f4fb38e +Subproject commit a5d84b29429dcd9b32fb1d8b169b6dd269e6c979 diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 0a0b83d4a..b61bb65cc 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -1791,7 +1791,7 @@ extern "C" void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const ch } Gfx* destinationGfx = (Gfx*)&res->Instructions[destinationIndex]; - Gfx sourceGfx = res->Instructions[sourceIndex]; + Gfx sourceGfx = *(Gfx*)&res->Instructions[sourceIndex]; if (!originalGfx.contains(path) || !originalGfx[path].contains(patchName)) { originalGfx[path][patchName] = {