From 5bcf4cde3240ee3dea9cae01c2b779a5e7e50a5d Mon Sep 17 00:00:00 2001 From: Stardust Sauce Date: Sat, 9 Apr 2022 18:32:05 -0400 Subject: [PATCH] Assetized A button on save test. Updated extractor to add colors to main OTR. --- OTRExporter/colors/hud/buttons/colorBtnA | Bin 0 -> 67 bytes OTRExporter/colors/hud/buttons/colorBtnB | Bin 0 -> 67 bytes OTRExporter/colors/hud/buttons/colorBtnCDown | Bin 0 -> 67 bytes OTRExporter/colors/hud/buttons/colorBtnCLeft | Bin 0 -> 67 bytes OTRExporter/colors/hud/buttons/colorBtnCRight | Bin 0 -> 67 bytes OTRExporter/colors/hud/buttons/colorBtnCUp | Bin 0 -> 67 bytes OTRExporter/colors/hud/buttons/colorBtnStart | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorAmmoCountDefault | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorAmmoCountEmpty | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorAmmoCountFull | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorHeartDDFill | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorHeartDDOutline | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorHeartFill | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorHeartOutline | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorMagicBorder | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorMagicBorderDim | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorMagicFillBurn | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorMagicFillNormal | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorMinimap | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorRupeeCountEmpty | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorRupeeCountFull | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorRupeeCountNormal | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorRupeeIcon | Bin 0 -> 67 bytes .../colors/hud/colorSmallKeyCountNormal | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorSmallKeyIcon | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorTimerCountNormal | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorTimerCountPanic | Bin 0 -> 67 bytes OTRExporter/colors/hud/colorTimerCountWarning | Bin 0 -> 67 bytes .../colors/message/icons/colorTextStopIconDim | Bin 0 -> 67 bytes .../colors/message/icons/colorTextStopIconGlow | Bin 0 -> 67 bytes .../colors/message/ocarina/colorNoteABase | Bin 0 -> 67 bytes .../colors/message/ocarina/colorNoteAFlashBase | Bin 0 -> 67 bytes .../message/ocarina/colorNoteAFlashLight | Bin 0 -> 67 bytes .../colors/message/ocarina/colorNoteCDownBase | Bin 0 -> 67 bytes .../message/ocarina/colorNoteCDownFlashBase | Bin 0 -> 67 bytes .../message/ocarina/colorNoteCDownFlashLight | Bin 0 -> 67 bytes .../colors/message/ocarina/colorNoteCLeftBase | Bin 0 -> 67 bytes .../message/ocarina/colorNoteCLeftFlashBase | Bin 0 -> 67 bytes .../message/ocarina/colorNoteCLeftFlashLight | Bin 0 -> 67 bytes .../colors/message/ocarina/colorNoteCRightBase | Bin 0 -> 67 bytes .../message/ocarina/colorNoteCRightFlashBase | Bin 0 -> 67 bytes .../message/ocarina/colorNoteCRightFlashLight | Bin 0 -> 67 bytes .../colors/message/ocarina/colorNoteCUpBase | Bin 0 -> 67 bytes .../message/ocarina/colorNoteCUpFlashBase | Bin 0 -> 67 bytes .../message/ocarina/colorNoteCUpFlashLight | Bin 0 -> 67 bytes .../text/default/colorTextAdjustableDefault | Bin 0 -> 67 bytes .../colors/message/text/default/colorTextBlack | Bin 0 -> 67 bytes .../colors/message/text/default/colorTextBlue | Bin 0 -> 67 bytes .../message/text/default/colorTextLightBlue | Bin 0 -> 67 bytes .../message/text/default/colorTextPurple | Bin 0 -> 67 bytes .../colors/message/text/default/colorTextRed | Bin 0 -> 67 bytes .../colors/message/text/default/colorTextWhite | Bin 0 -> 67 bytes .../message/text/default/colorTextYellow | Bin 0 -> 67 bytes .../message/text/no_shadow/colorTextLightBlue | Bin 0 -> 67 bytes .../colors/message/text/wooden/colorTextBlue | Bin 0 -> 67 bytes .../message/text/wooden/colorTextLightBlue | Bin 0 -> 67 bytes .../colors/message/text/wooden/colorTextPurple | Bin 0 -> 67 bytes .../colors/message/text/wooden/colorTextRed | Bin 0 -> 67 bytes .../colors/message/text/wooden/colorTextYellow | Bin 0 -> 67 bytes .../colors/pause/colorPauseCursorAEquip | Bin 0 -> 67 bytes .../colors/pause/colorPauseCursorCEquip | Bin 0 -> 67 bytes .../colors/pause/colorPauseCursorNoEquip | Bin 0 -> 67 bytes .../colors/pause/colorPauseInfoPanelButtonA | Bin 0 -> 67 bytes OTRExporter/colors/pause/colorPauseSavePrompt | Bin 0 -> 67 bytes OTRExporter/colors/player/colorGauntletGold | Bin 0 -> 67 bytes OTRExporter/colors/player/colorGauntletSilver | Bin 0 -> 67 bytes OTRExporter/colors/player/colorTunicGoron | Bin 0 -> 67 bytes OTRExporter/colors/player/colorTunicKokiri | Bin 0 -> 67 bytes OTRExporter/colors/player/colorTunicZora | Bin 0 -> 67 bytes OTRExporter/colors/shop/colorShopArrowDim | Bin 0 -> 67 bytes OTRExporter/colors/shop/colorShopArrowNormal | Bin 0 -> 67 bytes OTRExporter/colors/shop/colorShopCursorDim | Bin 0 -> 67 bytes OTRExporter/colors/shop/colorShopCursorNormal | Bin 0 -> 67 bytes OTRExporter/colors/shop/colorShopStick | Bin 0 -> 67 bytes OTRExporter/extract_assets.py | 3 ++- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 17 ++++++++++++----- 76 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 OTRExporter/colors/hud/buttons/colorBtnA create mode 100644 OTRExporter/colors/hud/buttons/colorBtnB create mode 100644 OTRExporter/colors/hud/buttons/colorBtnCDown create mode 100644 OTRExporter/colors/hud/buttons/colorBtnCLeft create mode 100644 OTRExporter/colors/hud/buttons/colorBtnCRight create mode 100644 OTRExporter/colors/hud/buttons/colorBtnCUp create mode 100644 OTRExporter/colors/hud/buttons/colorBtnStart create mode 100644 OTRExporter/colors/hud/colorAmmoCountDefault create mode 100644 OTRExporter/colors/hud/colorAmmoCountEmpty create mode 100644 OTRExporter/colors/hud/colorAmmoCountFull create mode 100644 OTRExporter/colors/hud/colorHeartDDFill create mode 100644 OTRExporter/colors/hud/colorHeartDDOutline create mode 100644 OTRExporter/colors/hud/colorHeartFill create mode 100644 OTRExporter/colors/hud/colorHeartOutline create mode 100644 OTRExporter/colors/hud/colorMagicBorder create mode 100644 OTRExporter/colors/hud/colorMagicBorderDim create mode 100644 OTRExporter/colors/hud/colorMagicFillBurn create mode 100644 OTRExporter/colors/hud/colorMagicFillNormal create mode 100644 OTRExporter/colors/hud/colorMinimap create mode 100644 OTRExporter/colors/hud/colorRupeeCountEmpty create mode 100644 OTRExporter/colors/hud/colorRupeeCountFull create mode 100644 OTRExporter/colors/hud/colorRupeeCountNormal create mode 100644 OTRExporter/colors/hud/colorRupeeIcon create mode 100644 OTRExporter/colors/hud/colorSmallKeyCountNormal create mode 100644 OTRExporter/colors/hud/colorSmallKeyIcon create mode 100644 OTRExporter/colors/hud/colorTimerCountNormal create mode 100644 OTRExporter/colors/hud/colorTimerCountPanic create mode 100644 OTRExporter/colors/hud/colorTimerCountWarning create mode 100644 OTRExporter/colors/message/icons/colorTextStopIconDim create mode 100644 OTRExporter/colors/message/icons/colorTextStopIconGlow create mode 100644 OTRExporter/colors/message/ocarina/colorNoteABase create mode 100644 OTRExporter/colors/message/ocarina/colorNoteAFlashBase create mode 100644 OTRExporter/colors/message/ocarina/colorNoteAFlashLight create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCDownBase create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCDownFlashBase create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCDownFlashLight create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCLeftBase create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCLeftFlashBase create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCLeftFlashLight create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCRightBase create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCRightFlashBase create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCRightFlashLight create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCUpBase create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCUpFlashBase create mode 100644 OTRExporter/colors/message/ocarina/colorNoteCUpFlashLight create mode 100644 OTRExporter/colors/message/text/default/colorTextAdjustableDefault create mode 100644 OTRExporter/colors/message/text/default/colorTextBlack create mode 100644 OTRExporter/colors/message/text/default/colorTextBlue create mode 100644 OTRExporter/colors/message/text/default/colorTextLightBlue create mode 100644 OTRExporter/colors/message/text/default/colorTextPurple create mode 100644 OTRExporter/colors/message/text/default/colorTextRed create mode 100644 OTRExporter/colors/message/text/default/colorTextWhite create mode 100644 OTRExporter/colors/message/text/default/colorTextYellow create mode 100644 OTRExporter/colors/message/text/no_shadow/colorTextLightBlue create mode 100644 OTRExporter/colors/message/text/wooden/colorTextBlue create mode 100644 OTRExporter/colors/message/text/wooden/colorTextLightBlue create mode 100644 OTRExporter/colors/message/text/wooden/colorTextPurple create mode 100644 OTRExporter/colors/message/text/wooden/colorTextRed create mode 100644 OTRExporter/colors/message/text/wooden/colorTextYellow create mode 100644 OTRExporter/colors/pause/colorPauseCursorAEquip create mode 100644 OTRExporter/colors/pause/colorPauseCursorCEquip create mode 100644 OTRExporter/colors/pause/colorPauseCursorNoEquip create mode 100644 OTRExporter/colors/pause/colorPauseInfoPanelButtonA create mode 100644 OTRExporter/colors/pause/colorPauseSavePrompt create mode 100644 OTRExporter/colors/player/colorGauntletGold create mode 100644 OTRExporter/colors/player/colorGauntletSilver create mode 100644 OTRExporter/colors/player/colorTunicGoron create mode 100644 OTRExporter/colors/player/colorTunicKokiri create mode 100644 OTRExporter/colors/player/colorTunicZora create mode 100644 OTRExporter/colors/shop/colorShopArrowDim create mode 100644 OTRExporter/colors/shop/colorShopArrowNormal create mode 100644 OTRExporter/colors/shop/colorShopCursorDim create mode 100644 OTRExporter/colors/shop/colorShopCursorNormal create mode 100644 OTRExporter/colors/shop/colorShopStick diff --git a/OTRExporter/colors/hud/buttons/colorBtnA b/OTRExporter/colors/hud/buttons/colorBtnA new file mode 100644 index 0000000000000000000000000000000000000000..f1c032b426fb342695363c24fc5d5ac6b7435cbf GIT binary patch literal 67 dcmZQzU|^ literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/hud/colorMagicBorder b/OTRExporter/colors/hud/colorMagicBorder new file mode 100644 index 0000000000000000000000000000000000000000..7b574daaf47db3ed544cf4d5dbcfb848533a9896 GIT binary patch literal 67 ecmZQzU|F9rab%n6tP literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/hud/colorMagicFillNormal b/OTRExporter/colors/hud/colorMagicFillNormal new file mode 100644 index 0000000000000000000000000000000000000000..9dce655685db444ca7e131a1dd3e1a3eb1a87cd7 GIT binary patch literal 67 dcmZQzU|038DZ1 literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/hud/colorRupeeCountEmpty b/OTRExporter/colors/hud/colorRupeeCountEmpty new file mode 100644 index 0000000000000000000000000000000000000000..7b574daaf47db3ed544cf4d5dbcfb848533a9896 GIT binary patch literal 67 ecmZQzU||_ literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/message/ocarina/colorNoteCDownFlashLight b/OTRExporter/colors/message/ocarina/colorNoteCDownFlashLight new file mode 100644 index 0000000000000000000000000000000000000000..f7ad6a31b76a8ad8e2892ff2ce71ce990a086140 GIT binary patch literal 67 ecmZQzU||_ literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/message/ocarina/colorNoteCLeftFlashLight b/OTRExporter/colors/message/ocarina/colorNoteCLeftFlashLight new file mode 100644 index 0000000000000000000000000000000000000000..f7ad6a31b76a8ad8e2892ff2ce71ce990a086140 GIT binary patch literal 67 ecmZQzU||_ literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/message/ocarina/colorNoteCRightFlashLight b/OTRExporter/colors/message/ocarina/colorNoteCRightFlashLight new file mode 100644 index 0000000000000000000000000000000000000000..f7ad6a31b76a8ad8e2892ff2ce71ce990a086140 GIT binary patch literal 67 ecmZQzU||_ literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/message/ocarina/colorNoteCUpFlashLight b/OTRExporter/colors/message/ocarina/colorNoteCUpFlashLight new file mode 100644 index 0000000000000000000000000000000000000000..f7ad6a31b76a8ad8e2892ff2ce71ce990a086140 GIT binary patch literal 67 ecmZQzU|OTOOjR{Qv literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/message/text/default/colorTextLightBlue b/OTRExporter/colors/message/text/default/colorTextLightBlue new file mode 100644 index 0000000000000000000000000000000000000000..cedb8d3b53dca9bd0c75529009043c8cca7b4516 GIT binary patch literal 67 ecmZQzU|qn+Y2L literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/message/text/default/colorTextWhite b/OTRExporter/colors/message/text/default/colorTextWhite new file mode 100644 index 0000000000000000000000000000000000000000..7b574daaf47db3ed544cf4d5dbcfb848533a9896 GIT binary patch literal 67 ecmZQzU|_*TwFzMW literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/message/text/wooden/colorTextLightBlue b/OTRExporter/colors/message/text/wooden/colorTextLightBlue new file mode 100644 index 0000000000000000000000000000000000000000..b9bb0c8332a4396eb65d3c7bbf871ebebe0995cd GIT binary patch literal 67 ecmZQzU|nh~0|~$Y literal 0 HcmV?d00001 diff --git a/OTRExporter/colors/pause/colorPauseCursorAEquip b/OTRExporter/colors/pause/colorPauseCursorAEquip new file mode 100644 index 0000000000000000000000000000000000000000..d67c73b4e1ce5984a19b79f170395df19dfc847b GIT binary patch literal 67 dcmZQzU|tnhE>> literal 0 HcmV?d00001 diff --git a/OTRExporter/extract_assets.py b/OTRExporter/extract_assets.py index 404b49ced..63f3182cf 100755 --- a/OTRExporter/extract_assets.py +++ b/OTRExporter/extract_assets.py @@ -15,6 +15,7 @@ def BuildOTR(): shutil.copyfile("baserom/Audiotable", "Extract/Audiotable") shutil.copytree("assets", "Extract/assets") + shutil.copytree("colors", "Extract/colors") execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPD/ZAPD.out" @@ -114,4 +115,4 @@ def main(): shutil.rmtree("Extract") if __name__ == "__main__": - main() \ No newline at end of file + main() 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 089092b3a..e5c5150fc 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 @@ -1468,6 +1468,11 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) { } void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) { + static Color_RGB8 aButtonColor; + if (aButtonColor.r == NULL) { + aButtonColor = *(Color_RGB8*)ResourceMgr_LoadBlobByName(colorPauseInfoPanelButtonA); + } + static void* D_8082AD54[3] = { gPauseToEquipENGTex, gPauseToEquipGERTex, @@ -1784,9 +1789,9 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) { pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADE0[gSaveContext.language] << 5; - gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL); + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, 255); + POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0); - gDPPipeSync(POLY_KAL_DISP++); gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 255, 255); POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, D_8082AD60[gSaveContext.language], @@ -1864,9 +1869,9 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) { pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADE8[gSaveContext.language] << 5; - gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL); + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, 255); + POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0); - gDPPipeSync(POLY_KAL_DISP++); gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 255, 255); POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, D_8082AD6C[gSaveContext.language], @@ -1890,7 +1895,9 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) { pauseCtx->infoPanelVtx[21].v.tc[0] = pauseCtx->infoPanelVtx[23].v.tc[0] = D_8082ADD8[gSaveContext.language] << 5; - gSPDisplayList(POLY_KAL_DISP++, gAButtonIconDL); + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, 255); + POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gABtnSymbolTex, 24, 16, 0); + gDPPipeSync(POLY_KAL_DISP++); gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 255, 255);