From 65016499ab0d7b3a94142731d5ce2df884194a33 Mon Sep 17 00:00:00 2001 From: rozlette Date: Thu, 23 Jun 2022 21:15:12 -0500 Subject: [PATCH 01/14] Get rid of erroneous int casts --- libultraship/libultraship/SohImGuiImpl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp index f3ba3dcc1..bcce3adf2 100644 --- a/libultraship/libultraship/SohImGuiImpl.cpp +++ b/libultraship/libultraship/SohImGuiImpl.cpp @@ -354,10 +354,10 @@ namespace SohImGui { } for (size_t pixel = 0; pixel < texBuffer.size() / 4; pixel++) { - texBuffer[pixel * 4 + 0] *= (uint8_t)tint.x; - texBuffer[pixel * 4 + 1] *= (uint8_t)tint.y; - texBuffer[pixel * 4 + 2] *= (uint8_t)tint.z; - texBuffer[pixel * 4 + 3] *= (uint8_t)tint.w; + texBuffer[pixel * 4 + 0] *= tint.x; + texBuffer[pixel * 4 + 1] *= tint.y; + texBuffer[pixel * 4 + 2] *= tint.z; + texBuffer[pixel * 4 + 3] *= tint.w; } const auto asset = new GameAsset{ api->new_texture() }; From 1f1de82bb8f4a3a83dd86f7dced954ed1aa10ea7 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sat, 25 Jun 2022 03:30:14 -0400 Subject: [PATCH 02/14] casts jya_cobra's shadowTexture pointer to uintptr_t instead of s32. --- soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 064537f2d..d921c81db 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -596,7 +596,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 994), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPLoadTextureBlock(POLY_XLU_DISP++, ALIGN16((s32)(&this->shadowTexture)), G_IM_FMT_I, G_IM_SIZ_8b, 0x40, 0x40, 0, + gDPLoadTextureBlock(POLY_XLU_DISP++, ALIGN16((uintptr_t)(&this->shadowTexture)), G_IM_FMT_I, G_IM_SIZ_8b, 0x40, 0x40, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); From 8535568f53b3df88af7c77b933918581645b232e Mon Sep 17 00:00:00 2001 From: rozlette Date: Thu, 23 Jun 2022 22:12:41 -0500 Subject: [PATCH 03/14] Fix ability to assign equipment you don't own --- .../ovl_kaleido_scope/z_kaleido_equipment.c | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 650be8b62..f8a66ba2f 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -535,32 +535,37 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) { } else if (CVar_GetS32("gAssignableTunicsAndBoots", 0) != 0) { // Only allow assigning tunic and boots to c-buttons if (pauseCtx->cursorY[PAUSE_EQUIP] > 1) { - u16 slot = 0; - switch (cursorItem) { - case ITEM_TUNIC_KOKIRI: - slot = SLOT_TUNIC_KOKIRI; - break; - case ITEM_TUNIC_GORON: - slot = SLOT_TUNIC_GORON; - break; - case ITEM_TUNIC_ZORA: - slot = SLOT_TUNIC_ZORA; - break; - case ITEM_BOOTS_KOKIRI: - slot = SLOT_BOOTS_KOKIRI; - break; - case ITEM_BOOTS_IRON: - slot = SLOT_BOOTS_IRON; - break; - case ITEM_BOOTS_HOVER: - slot = SLOT_BOOTS_HOVER; - break; - default: - break; + if (CHECK_OWNED_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP] - 1)) { + u16 slot = 0; + switch (cursorItem) { + case ITEM_TUNIC_KOKIRI: + slot = SLOT_TUNIC_KOKIRI; + break; + case ITEM_TUNIC_GORON: + slot = SLOT_TUNIC_GORON; + break; + case ITEM_TUNIC_ZORA: + slot = SLOT_TUNIC_ZORA; + break; + case ITEM_BOOTS_KOKIRI: + slot = SLOT_BOOTS_KOKIRI; + break; + case ITEM_BOOTS_IRON: + slot = SLOT_BOOTS_IRON; + break; + case ITEM_BOOTS_HOVER: + slot = SLOT_BOOTS_HOVER; + break; + default: + break; + } + KaleidoScope_SetupItemEquip(globalCtx, cursorItem, slot, + pauseCtx->equipVtx[cursorSlot * 4].v.ob[0] * 10, + pauseCtx->equipVtx[cursorSlot * 4].v.ob[1] * 10); + } else { + Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); } - KaleidoScope_SetupItemEquip(globalCtx, cursorItem, slot, - pauseCtx->equipVtx[cursorSlot * 4].v.ob[0] * 10, - pauseCtx->equipVtx[cursorSlot * 4].v.ob[1] * 10); } } } else { From b96bd4ea9d301006bcdc43dde557662bb0dd332e Mon Sep 17 00:00:00 2001 From: rozlette Date: Thu, 23 Jun 2022 20:55:43 -0500 Subject: [PATCH 04/14] Fix title cards for market potion shop and bombchu shop --- soh/src/code/z_actor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index 79a3f4032..adcac4522 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -869,11 +869,12 @@ void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCt case SCENE_ZOORA: texture = gZoraShopTitleCardENGTex; break; - case SCENE_ALLEY_SHOP: + case SCENE_NIGHT_SHOP: texture = gBombchuShopTitleCardENGTex; break; case SCENE_DRAG: case SCENE_MAHOUYA: + case SCENE_ALLEY_SHOP: texture = gPotionShopTitleCardENGTex; break; case SCENE_FACE_SHOP: From 284a7fba95fcbef8d0e37be8ee5c096d61555176 Mon Sep 17 00:00:00 2001 From: rozlette Date: Thu, 23 Jun 2022 20:17:59 -0500 Subject: [PATCH 05/14] Invalidate message item icon texture before drawing --- soh/src/code/z_message_PAL.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index b17a2af56..a3492f967 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -749,6 +749,9 @@ u16 Message_DrawItemIcon(GlobalContext* globalCtx, u16 itemId, Gfx** p, u16 i) { gDPSetCombineMode(gfx++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, msgCtx->textColorAlpha); + // Invalidate icon texture as it may have changed from the last time a text box had an icon + gSPInvalidateTexCache(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE); + if (itemId >= ITEM_MEDALLION_FOREST) { gDPLoadTextureBlock(gfx++, (uintptr_t)msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, G_IM_FMT_RGBA, G_IM_SIZ_32b, 24, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, From 0f84682bc083c6dda34b688317637d09f203eb00 Mon Sep 17 00:00:00 2001 From: rozlette Date: Thu, 23 Jun 2022 19:26:15 -0500 Subject: [PATCH 06/14] Add margins for dpad --- soh/src/code/z_parameter.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 56e8ab817..303964eb1 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -3722,9 +3722,11 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPLoadTextureBlock(OVERLAY_DISP++, ResourceMgr_LoadFileRaw("assets/ship_of_harkinian/buttons/dpad.bin"), G_IM_FMT_IA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPWideTextureRectangle(OVERLAY_DISP++, OTRGetRectDimensionFromRightEdge(DPAD_X) << 2, DPAD_Y << 2, - (OTRGetRectDimensionFromRightEdge(DPAD_X) + 32) << 2, (DPAD_Y + 32) << 2, - G_TX_RENDERTILE, 0, 0, (1 << 10), (1 << 10)); + gSPWideTextureRectangle(OVERLAY_DISP++, OTRGetRectDimensionFromRightEdge(DPAD_X + Right_HUD_Margin) << 2, + (DPAD_Y + (Top_HUD_Margin * -1)) << 2, + (OTRGetRectDimensionFromRightEdge(DPAD_X + Right_HUD_Margin) + 32) << 2, + (DPAD_Y + 32 + (Top_HUD_Margin * -1)) << 2, G_TX_RENDERTILE, 0, 0, (1 << 10), + (1 << 10)); // DPad-Up Button Icon & Ammo Count if (gSaveContext.equips.buttonItems[4] < 0xF0) { From 447e68a65948f2515bff87feca5f1bf5be863026 Mon Sep 17 00:00:00 2001 From: rozlette Date: Thu, 23 Jun 2022 21:58:08 -0500 Subject: [PATCH 07/14] Fixed some instances where the original OOT save is erroneously preserved or recreated, leading to another conversion next time you launched the game --- soh/soh/OTRGlobals.cpp | 1 - soh/soh/SaveManager.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index d9e7949c5..eff66f700 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -56,7 +56,6 @@ OTRGlobals::OTRGlobals() { context = Ship::GlobalCtx2::CreateInstance("Ship of Harkinian"); gSaveStateMgr = std::make_shared(); context->GetWindow()->Init(); - CheckSaveFile(SRAM_SIZE); } OTRGlobals::~OTRGlobals() { diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index e4e7fbbdc..31a9b6aec 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -51,6 +51,7 @@ void SaveManager::Init() { // If there is a lingering unversioned save, convert it if (std::filesystem::exists("oot_save.sav")) { ConvertFromUnversioned(); + std::filesystem::rename("oot_save.sav", "oot_save.bak"); } // If the global save file exist, load it. Otherwise, create it. @@ -1172,8 +1173,6 @@ void SaveManager::ConvertFromUnversioned() { } } - std::filesystem::rename("oot_save.sav", "oot_save.bak"); - #undef SLOT_SIZE #undef SLOT_OFFSET } From cc22fe17bbe97f9569c422814a9d3633f0f65789 Mon Sep 17 00:00:00 2001 From: Kenix3 Date: Sun, 26 Jun 2022 22:09:18 -0400 Subject: [PATCH 08/14] Headphones setting in game should now work. Resolves #13 --- libultraship/libultraship/mixer.c | 2 +- libultraship/libultraship/mixer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libultraship/libultraship/mixer.c b/libultraship/libultraship/mixer.c index 302a54ef4..1e66dc8a1 100644 --- a/libultraship/libultraship/mixer.c +++ b/libultraship/libultraship/mixer.c @@ -364,7 +364,7 @@ void aS8DecImpl(uint8_t flags, ADPCM_STATE state) { memcpy(state, out - 16, 16 * sizeof(int16_t)); } -void aAddMixerImpl(uint16_t in_addr, uint16_t out_addr, uint16_t count) { +void aAddMixerImpl(uint16_t count, uint16_t in_addr, uint16_t out_addr) { int16_t *in = BUF_S16(in_addr); int16_t *out = BUF_S16(out_addr); int nbytes = ROUND_UP_64(ROUND_DOWN_16(count)); diff --git a/libultraship/libultraship/mixer.h b/libultraship/libultraship/mixer.h index 62cf7e4ba..2e1279a86 100644 --- a/libultraship/libultraship/mixer.h +++ b/libultraship/libultraship/mixer.h @@ -51,7 +51,7 @@ void aEnvMixerImpl(uint16_t in_addr, uint16_t n_samples, bool swap_reverb, int32_t wet_dry_addr, u32 unk); void aMixImpl(uint16_t count, int16_t gain, uint16_t in_addr, uint16_t out_addr); void aS8DecImpl(uint8_t flags, ADPCM_STATE state); -void aAddMixerImpl(uint16_t in_addr, uint16_t out_addr, uint16_t count); +void aAddMixerImpl(uint16_t count, uint16_t in_addr, uint16_t out_addr); void aDuplicateImpl(uint16_t count, uint16_t in_addr, uint16_t out_addr); void aResampleZohImpl(uint16_t pitch, uint16_t start_fract); void aInterlImpl(uint16_t in_addr, uint16_t out_addr, uint16_t n_samples); From a58ddd4f552ce6bb4cf3ac1da2166321efda6916 Mon Sep 17 00:00:00 2001 From: vaguerant Date: Mon, 27 Jun 2022 17:16:58 +1000 Subject: [PATCH 09/14] Map Select name fixes --- soh/src/overlays/gamestates/ovl_select/z_select.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/soh/src/overlays/gamestates/ovl_select/z_select.c b/soh/src/overlays/gamestates/ovl_select/z_select.c index 43cb479c7..c203c1f79 100644 --- a/soh/src/overlays/gamestates/ovl_select/z_select.c +++ b/soh/src/overlays/gamestates/ovl_select/z_select.c @@ -69,9 +69,9 @@ static SceneSelectEntry sScenes[] = { { "24:Grave 1", Select_LoadGame, 0x031C }, { "25:Grave 2", Select_LoadGame, 0x004B }, { "26:Royal Family's Tomb", Select_LoadGame, 0x002D }, - { "27:Great Fairy's Fountain (Din)", Select_LoadGame, 0x0315 }, - { "28:Great Fairy's Fountain (Farore)", Select_LoadGame, 0x036D }, - { "29:Great Fairy's Fountain (Nayru)", Select_LoadGame, 0x0371 }, + { "27:Great Fairy's Fountain (Power)", Select_LoadGame, 0x0315 }, + { "28:Fairy's Fountain (Grotto)", Select_LoadGame, 0x036D }, + { "29:Great Fairy's Fountain (Magic)", Select_LoadGame, 0x0371 }, { "30:Ganon's Tower - Collapsing", Select_LoadGame, 0x043F }, { "31:Castle Courtyard", Select_LoadGame, 0x0400 }, { "32:Fishing Pond", Select_LoadGame, 0x045F }, @@ -129,7 +129,7 @@ static SceneSelectEntry sScenes[] = { { "84:Stairs to Ganondorf's Lair", Select_LoadGame, 0x041B }, { "85:Ganondorf's Lair", Select_LoadGame, 0x041F }, { "86:Ice Cavern", Select_LoadGame, 0x0088 }, - { "87:Dampé Grave Relay Game", Select_LoadGame, 0x044F }, + { "87:Dampe Grave Relay Game", Select_LoadGame, 0x044F }, { "88:Inside Ganon's Castle", Select_LoadGame, 0x0467 }, { "89:Ganon's Lair", Select_LoadGame, 0x0517 }, { "90:Escaping Ganon's Castle 1", Select_LoadGame, 0x0179 }, From 82f790d082a1f459e59d4931df6513cfb9730ccf Mon Sep 17 00:00:00 2001 From: vaguerant Date: Mon, 27 Jun 2022 21:01:55 +1000 Subject: [PATCH 10/14] Change Power to Upgrades --- soh/src/overlays/gamestates/ovl_select/z_select.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/src/overlays/gamestates/ovl_select/z_select.c b/soh/src/overlays/gamestates/ovl_select/z_select.c index c203c1f79..3295e5698 100644 --- a/soh/src/overlays/gamestates/ovl_select/z_select.c +++ b/soh/src/overlays/gamestates/ovl_select/z_select.c @@ -69,7 +69,7 @@ static SceneSelectEntry sScenes[] = { { "24:Grave 1", Select_LoadGame, 0x031C }, { "25:Grave 2", Select_LoadGame, 0x004B }, { "26:Royal Family's Tomb", Select_LoadGame, 0x002D }, - { "27:Great Fairy's Fountain (Power)", Select_LoadGame, 0x0315 }, + { "27:Great Fairy's Fountain (Upgrades)", Select_LoadGame, 0x0315 }, { "28:Fairy's Fountain (Grotto)", Select_LoadGame, 0x036D }, { "29:Great Fairy's Fountain (Magic)", Select_LoadGame, 0x0371 }, { "30:Ganon's Tower - Collapsing", Select_LoadGame, 0x043F }, From 9f5618def4a2299b6624611e02b76e4397548aa5 Mon Sep 17 00:00:00 2001 From: rozlette Date: Mon, 27 Jun 2022 18:39:46 -0500 Subject: [PATCH 11/14] Rename Soh* files --- libultraship/libultraship/{SohConsole.cpp => Console.cpp} | 0 libultraship/libultraship/{SohConsole.h => Console.h} | 0 libultraship/libultraship/{SohHooks.cpp => Hooks.cpp} | 0 libultraship/libultraship/{SohHooks.h => Hooks.h} | 0 libultraship/libultraship/{SohImGuiImpl.cpp => ImGuiImpl.cpp} | 0 libultraship/libultraship/{SohImGuiImpl.h => ImGuiImpl.h} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename libultraship/libultraship/{SohConsole.cpp => Console.cpp} (100%) rename libultraship/libultraship/{SohConsole.h => Console.h} (100%) rename libultraship/libultraship/{SohHooks.cpp => Hooks.cpp} (100%) rename libultraship/libultraship/{SohHooks.h => Hooks.h} (100%) rename libultraship/libultraship/{SohImGuiImpl.cpp => ImGuiImpl.cpp} (100%) rename libultraship/libultraship/{SohImGuiImpl.h => ImGuiImpl.h} (100%) diff --git a/libultraship/libultraship/SohConsole.cpp b/libultraship/libultraship/Console.cpp similarity index 100% rename from libultraship/libultraship/SohConsole.cpp rename to libultraship/libultraship/Console.cpp diff --git a/libultraship/libultraship/SohConsole.h b/libultraship/libultraship/Console.h similarity index 100% rename from libultraship/libultraship/SohConsole.h rename to libultraship/libultraship/Console.h diff --git a/libultraship/libultraship/SohHooks.cpp b/libultraship/libultraship/Hooks.cpp similarity index 100% rename from libultraship/libultraship/SohHooks.cpp rename to libultraship/libultraship/Hooks.cpp diff --git a/libultraship/libultraship/SohHooks.h b/libultraship/libultraship/Hooks.h similarity index 100% rename from libultraship/libultraship/SohHooks.h rename to libultraship/libultraship/Hooks.h diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/ImGuiImpl.cpp similarity index 100% rename from libultraship/libultraship/SohImGuiImpl.cpp rename to libultraship/libultraship/ImGuiImpl.cpp diff --git a/libultraship/libultraship/SohImGuiImpl.h b/libultraship/libultraship/ImGuiImpl.h similarity index 100% rename from libultraship/libultraship/SohImGuiImpl.h rename to libultraship/libultraship/ImGuiImpl.h From 39a50a406bb1d7fb04792cd87bc0879617f61f23 Mon Sep 17 00:00:00 2001 From: rozlette Date: Mon, 27 Jun 2022 18:43:28 -0500 Subject: [PATCH 12/14] Update names --- libultraship/libultraship/Console.cpp | 4 +- libultraship/libultraship/Hooks.cpp | 2 +- libultraship/libultraship/ImGuiImpl.cpp | 6 +- libultraship/libultraship/ImGuiImpl.h | 2 +- .../libultraship/Lib/Fast3D/gfx_pc.cpp | 4 +- libultraship/libultraship/ModManager.cpp | 2 +- libultraship/libultraship/ModModule.h | 4 +- .../libultraship/libultraship.vcxproj | 910 +++++++++--------- .../libultraship/libultraship.vcxproj.filters | 12 +- soh/src/code/audioMgr.c | 2 +- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 2 +- 11 files changed, 475 insertions(+), 475 deletions(-) diff --git a/libultraship/libultraship/Console.cpp b/libultraship/libultraship/Console.cpp index 6f04bc917..6708f1bfb 100644 --- a/libultraship/libultraship/Console.cpp +++ b/libultraship/libultraship/Console.cpp @@ -1,11 +1,11 @@ -#include "SohConsole.h" +#include "Console.h" #include #include #include "Cvar.h" #include "GlobalCtx2.h" -#include "SohImGuiImpl.h" +#include "ImGuiImpl.h" #include "Lib/ImGui/imgui.h" #include "Utils/StringHelper.h" #include "Lib/ImGui/imgui_internal.h" diff --git a/libultraship/libultraship/Hooks.cpp b/libultraship/libultraship/Hooks.cpp index c11745e84..2b66ed318 100644 --- a/libultraship/libultraship/Hooks.cpp +++ b/libultraship/libultraship/Hooks.cpp @@ -1,4 +1,4 @@ -#include "SohHooks.h" +#include "Hooks.h" #include #include #include diff --git a/libultraship/libultraship/ImGuiImpl.cpp b/libultraship/libultraship/ImGuiImpl.cpp index bcce3adf2..60a29f2f9 100644 --- a/libultraship/libultraship/ImGuiImpl.cpp +++ b/libultraship/libultraship/ImGuiImpl.cpp @@ -1,4 +1,4 @@ -#include "SohImGuiImpl.h" +#include "ImGuiImpl.h" #include #include @@ -10,8 +10,8 @@ #include "Archive.h" #include "Environment.h" #include "GameSettings.h" -#include "SohConsole.h" -#include "SohHooks.h" +#include "Console.h" +#include "Hooks.h" #include "Lib/ImGui/imgui_internal.h" #include "GlobalCtx2.h" #include "ResourceMgr.h" diff --git a/libultraship/libultraship/ImGuiImpl.h b/libultraship/libultraship/ImGuiImpl.h index 1ae02c1e7..00f494180 100644 --- a/libultraship/libultraship/ImGuiImpl.h +++ b/libultraship/libultraship/ImGuiImpl.h @@ -2,7 +2,7 @@ #include "GameOverlay.h" #include "Lib/ImGui/imgui.h" -#include "SohConsole.h" +#include "Console.h" struct GameAsset { uint32_t textureId; diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp index cf5403867..89019aa97 100644 --- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp +++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp @@ -25,11 +25,11 @@ #include "gfx_window_manager_api.h" #include "gfx_rendering_api.h" #include "gfx_screen_config.h" -#include "../../SohHooks.h" +#include "../../Hooks.h" #include "../../luslog.h" #include "../StrHash64.h" -#include "../../SohImGuiImpl.h" +#include "../../ImGuiImpl.h" #include "../../Environment.h" #include "../../GameVersions.h" #include "../../ResourceMgr.h" diff --git a/libultraship/libultraship/ModManager.cpp b/libultraship/libultraship/ModManager.cpp index c07f169ac..8aa2715de 100644 --- a/libultraship/libultraship/ModManager.cpp +++ b/libultraship/libultraship/ModManager.cpp @@ -1,7 +1,7 @@ #include "ModManager.h" #include "TextureMod.h" #include "ModModule.h" -#include "SohImGuiImpl.h" +#include "ImGuiImpl.h" namespace Ship { std::vector modules; diff --git a/libultraship/libultraship/ModModule.h b/libultraship/libultraship/ModModule.h index e77c47234..da62273db 100644 --- a/libultraship/libultraship/ModModule.h +++ b/libultraship/libultraship/ModModule.h @@ -1,7 +1,7 @@ #pragma once #include "ModManager.h" -#include "SohHooks.h" -#include "SohConsole.h" +#include "Hooks.h" +#include "Console.h" #include "Archive.h" namespace Ship { diff --git a/libultraship/libultraship/libultraship.vcxproj b/libultraship/libultraship/libultraship.vcxproj index 27006aec0..a4e018e2d 100644 --- a/libultraship/libultraship/libultraship.vcxproj +++ b/libultraship/libultraship/libultraship.vcxproj @@ -1,456 +1,456 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - Testing - Win32 - - - Testing - x64 - - - - 16.0 - Win32Proj - {6da9b521-65b7-41e2-8f8a-f0451cc18ed8} - libultraship - 10.0 - libultraship - - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\libjpeg\include;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath) - $(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath) - MinimumRecommendedRules.ruleset - - - - - true - $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\libjpeg\include;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(IncludePath) - $(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath) - MinimumRecommendedRules.ruleset - - - - - false - $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath) - $(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath) - MinimumRecommendedRules.ruleset - - - - - true - $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath) - $(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath) - MinimumRecommendedRules.ruleset - - - - - true - $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(IncludePath) - $(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath) - MinimumRecommendedRules.ruleset - - - - - false - $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath) - $(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath) - MinimumRecommendedRules.ruleset - - - - - - Level2 - true - SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC - true - stdcpp20 - stdc17 - MultiThreadedDebug - true - Disabled - Default - false - - - Console - true - - - - - Level2 - true - SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)GLEW_STATIC - true - stdcpp20 - stdc17 - MultiThreadedDebug - true - - - Console - true - - - - - Level3 - true - true - true - SPDLOG_ACTIVE_LEVEL=0;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC - true - stdcpp20 - stdc17 - MultiThreaded - true - - - Console - true - true - true - - - - - Level3 - true - SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC - true - stdcpp20 - stdc17 - MultiThreadedDebug - true - Default - - - Console - true - - - - - Level3 - true - SPDLOG_ACTIVE_LEVEL=0;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)GLEW_STATIC - true - stdcpp20 - stdc17 - MultiThreadedDebug - true - - - Console - true - - - - - Level3 - true - true - true - SPDLOG_ACTIVE_LEVEL=0;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC - true - stdcpplatest - stdc11 - MultiThreaded - true - - - Console - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {02d10590-9542-3f55-aaf8-6055677e2a2a} - false - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + Testing + Win32 + + + Testing + x64 + + + + 16.0 + Win32Proj + {6da9b521-65b7-41e2-8f8a-f0451cc18ed8} + libultraship + 10.0 + libultraship + + + + StaticLibrary + true + v142 + Unicode + + + StaticLibrary + true + v142 + Unicode + + + StaticLibrary + false + v142 + true + Unicode + + + StaticLibrary + true + v142 + Unicode + + + StaticLibrary + true + v142 + Unicode + + + StaticLibrary + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\libjpeg\include;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath) + $(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath) + MinimumRecommendedRules.ruleset + + + + + true + $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\libjpeg\include;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(IncludePath) + $(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath) + MinimumRecommendedRules.ruleset + + + + + false + $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath) + $(ProjectDir)Lib\SDL\lib\x86;$(LibraryPath) + MinimumRecommendedRules.ruleset + + + + + true + $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath) + $(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath) + MinimumRecommendedRules.ruleset + + + + + true + $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(IncludePath) + $(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath) + MinimumRecommendedRules.ruleset + + + + + false + $(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)Lib\Fast3D\U64;$(ProjectDir)Lib\spdlog\include;$(ProjectDir)Lib\SDL;$(ProjectDir)Lib\GLEW;$(ProjectDir)..\..\StormLib\src\;$(IncludePath) + $(ProjectDir)Lib\SDL\lib\x64;$(LibraryPath) + MinimumRecommendedRules.ruleset + + + + + + Level2 + true + SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC + true + stdcpp20 + stdc17 + MultiThreadedDebug + true + Disabled + Default + false + + + Console + true + + + + + Level2 + true + SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)GLEW_STATIC + true + stdcpp20 + stdc17 + MultiThreadedDebug + true + + + Console + true + + + + + Level3 + true + true + true + SPDLOG_ACTIVE_LEVEL=0;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC + true + stdcpp20 + stdc17 + MultiThreaded + true + + + Console + true + true + true + + + + + Level3 + true + SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC + true + stdcpp20 + stdc17 + MultiThreadedDebug + true + Default + + + Console + true + + + + + Level3 + true + SPDLOG_ACTIVE_LEVEL=0;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)GLEW_STATIC + true + stdcpp20 + stdc17 + MultiThreadedDebug + true + + + Console + true + + + + + Level3 + true + true + true + SPDLOG_ACTIVE_LEVEL=0;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC + true + stdcpplatest + stdc11 + MultiThreaded + true + + + Console + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {02d10590-9542-3f55-aaf8-6055677e2a2a} + false + + + + + \ No newline at end of file diff --git a/libultraship/libultraship/libultraship.vcxproj.filters b/libultraship/libultraship/libultraship.vcxproj.filters index 8cc7aed54..d1682c86f 100644 --- a/libultraship/libultraship/libultraship.vcxproj.filters +++ b/libultraship/libultraship/libultraship.vcxproj.filters @@ -300,10 +300,10 @@ Source Files\Lib\ImGui - + Source Files\CustomImpl - + Source Files\CustomImpl @@ -336,7 +336,7 @@ Source Files\ModManager - + Source Files\CustomImpl\Hooks @@ -584,10 +584,10 @@ Source Files\Lib\ImGui - + Source Files\CustomImpl - + Source Files\CustomImpl @@ -632,7 +632,7 @@ Source Files\ModManager\ModModule - + Source Files\CustomImpl\Hooks diff --git a/soh/src/code/audioMgr.c b/soh/src/code/audioMgr.c index ab34a4617..dc826aa5c 100644 --- a/soh/src/code/audioMgr.c +++ b/soh/src/code/audioMgr.c @@ -1,5 +1,5 @@ #include "global.h" -#include "SohHooks.h" +#include "Hooks.h" #include void func_800C3C80(AudioMgr* audioMgr) { diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index be4d038ae..b41c6f97d 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -12,7 +12,7 @@ #include "textures/map_name_static/map_name_static.h" #include "textures/map_48x85_static/map_48x85_static.h" #include "vt.h" -#include "SohHooks.h" +#include "Hooks.h" #include "soh/frame_interpolation.h" From c14e4f387c35df602b4534a6912badfff0e37e5d Mon Sep 17 00:00:00 2001 From: rozlette Date: Mon, 27 Jun 2022 19:39:13 -0500 Subject: [PATCH 13/14] Add more files --- libultraship/libultraship/GameOverlay.cpp | 4 ++-- libultraship/libultraship/GameSettings.cpp | 4 ++-- libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp | 2 +- libultraship/libultraship/Lib/Fast3D/gfx_dxgi.cpp | 2 +- libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp | 2 +- libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp | 2 +- .../Lib/spdlog/include/spdlog/sinks/sohconsole_sink.h | 2 +- libultraship/libultraship/Window.cpp | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libultraship/libultraship/GameOverlay.cpp b/libultraship/libultraship/GameOverlay.cpp index 042ff980c..5f98a3104 100644 --- a/libultraship/libultraship/GameOverlay.cpp +++ b/libultraship/libultraship/GameOverlay.cpp @@ -4,8 +4,8 @@ #include "File.h" #include "Archive.h" #include "ResourceMgr.h" -#include "SohConsole.h" -#include "SohImGuiImpl.h" +#include "Console.h" +#include "ImGuiImpl.h" #include "TextureMod.h" #include "Lib/ImGui/imgui_internal.h" #include "Utils/StringHelper.h" diff --git a/libultraship/libultraship/GameSettings.cpp b/libultraship/libultraship/GameSettings.cpp index 51c7034c8..7b22c7bf4 100644 --- a/libultraship/libultraship/GameSettings.cpp +++ b/libultraship/libultraship/GameSettings.cpp @@ -10,9 +10,9 @@ #include "ConfigFile.h" #include "Cvar.h" #include "GlobalCtx2.h" -#include "SohImGuiImpl.h" +#include "ImGuiImpl.h" #include "../../soh/include/z64audio.h" -#include "SohHooks.h" +#include "Hooks.h" #include "../../soh/soh/Enhancements/debugconsole.h" #include "Window.h" diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp index f1661f426..3d1fd3546 100644 --- a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp +++ b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp @@ -24,7 +24,7 @@ #include "gfx_dxgi.h" #include "gfx_screen_config.h" -#include "../../SohImGuiImpl.h" +#include "../../ImGuiImpl.h" #include "gfx_cc.h" #include "gfx_rendering_api.h" diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_dxgi.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_dxgi.cpp index d257d7b08..4c8b85122 100644 --- a/libultraship/libultraship/Lib/Fast3D/gfx_dxgi.cpp +++ b/libultraship/libultraship/Lib/Fast3D/gfx_dxgi.cpp @@ -26,7 +26,7 @@ #include "gfx_direct3d_common.h" #include "gfx_screen_config.h" #include "gfx_pc.h" -#include "../../SohImGuiImpl.h" +#include "../../ImGuiImpl.h" #define DECLARE_GFX_DXGI_FUNCTIONS #include "gfx_dxgi.h" diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp index a2ac989ee..c7b71962c 100644 --- a/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp +++ b/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp @@ -39,7 +39,7 @@ #include "gfx_cc.h" #include "gfx_rendering_api.h" -#include "../../SohImGuiImpl.h" +#include "../../ImGuiImpl.h" #include "../../Environment.h" #include "../../GlobalCtx2.h" #include "gfx_pc.h" diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp index 87940a1a3..3853a60c5 100644 --- a/libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp +++ b/libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp @@ -21,7 +21,7 @@ #include #endif -#include "../../SohImGuiImpl.h" +#include "../../ImGuiImpl.h" #include "gfx_window_manager_api.h" #include "gfx_screen_config.h" diff --git a/libultraship/libultraship/Lib/spdlog/include/spdlog/sinks/sohconsole_sink.h b/libultraship/libultraship/Lib/spdlog/include/spdlog/sinks/sohconsole_sink.h index 4fa03b5e0..b9d3cdbf3 100644 --- a/libultraship/libultraship/Lib/spdlog/include/spdlog/sinks/sohconsole_sink.h +++ b/libultraship/libultraship/Lib/spdlog/include/spdlog/sinks/sohconsole_sink.h @@ -8,7 +8,7 @@ #include #include #include -#include "SohImGuiImpl.h" +#include "ImGuiImpl.h" #include "GameSettings.h" #include "Cvar.h" #include diff --git a/libultraship/libultraship/Window.cpp b/libultraship/libultraship/Window.cpp index 82506bd1e..c3dcd8605 100644 --- a/libultraship/libultraship/Window.cpp +++ b/libultraship/libultraship/Window.cpp @@ -26,8 +26,8 @@ #include #include #include -#include "SohHooks.h" -#include "SohConsole.h" +#include "Hooks.h" +#include "Console.h" #include From d63c0077eea864f7fa004a2e61ba02108f6ea23c Mon Sep 17 00:00:00 2001 From: rozlette Date: Mon, 27 Jun 2022 19:55:17 -0500 Subject: [PATCH 14/14] Add more files --- soh/soh/Enhancements/debugconsole.cpp | 2 +- soh/soh/Enhancements/debugger/actorViewer.cpp | 2 +- soh/soh/Enhancements/debugger/colViewer.cpp | 2 +- soh/soh/Enhancements/debugger/debugSaveEditor.cpp | 2 +- soh/soh/Enhancements/savestates.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp index 1b892be74..e96942893 100644 --- a/soh/soh/Enhancements/debugconsole.cpp +++ b/soh/soh/Enhancements/debugconsole.cpp @@ -3,7 +3,7 @@ #endif #include "debugconsole.h" -#include "../libultraship/SohImGuiImpl.h" +#include "../libultraship/ImGuiImpl.h" #include "savestates.h" #include diff --git a/soh/soh/Enhancements/debugger/actorViewer.cpp b/soh/soh/Enhancements/debugger/actorViewer.cpp index a3294797b..33bc532a0 100644 --- a/soh/soh/Enhancements/debugger/actorViewer.cpp +++ b/soh/soh/Enhancements/debugger/actorViewer.cpp @@ -1,6 +1,6 @@ #include "actorViewer.h" #include "../../util.h" -#include "../libultraship/SohImGuiImpl.h" +#include "../libultraship/ImGuiImpl.h" #include "ImGuiHelpers.h" #include diff --git a/soh/soh/Enhancements/debugger/colViewer.cpp b/soh/soh/Enhancements/debugger/colViewer.cpp index 1a7c60ba8..cdf1a0e80 100644 --- a/soh/soh/Enhancements/debugger/colViewer.cpp +++ b/soh/soh/Enhancements/debugger/colViewer.cpp @@ -1,5 +1,5 @@ #include "colViewer.h" -#include "../libultraship/SohImGuiImpl.h" +#include "../libultraship/ImGuiImpl.h" #include "ImGuiHelpers.h" #include "../../frame_interpolation.h" diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index d243ce49a..bb6c15f20 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -1,6 +1,6 @@ #include "debugSaveEditor.h" #include "../../util.h" -#include "../libultraship/SohImGuiImpl.h" +#include "../libultraship/ImGuiImpl.h" #include "ImGuiHelpers.h" #include diff --git a/soh/soh/Enhancements/savestates.cpp b/soh/soh/Enhancements/savestates.cpp index 19ea22f86..6c4d3c16e 100644 --- a/soh/soh/Enhancements/savestates.cpp +++ b/soh/soh/Enhancements/savestates.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include "z64.h" #include "z64save.h"