diff --git a/OTRExporter/colors/hud/buttons/colorBtnA b/OTRExporter/colors/hud/buttons/colorBtnA new file mode 100644 index 000000000..f1c032b42 Binary files /dev/null and b/OTRExporter/colors/hud/buttons/colorBtnA differ diff --git a/OTRExporter/colors/hud/buttons/colorBtnB b/OTRExporter/colors/hud/buttons/colorBtnB new file mode 100644 index 000000000..73bc40cd9 Binary files /dev/null and b/OTRExporter/colors/hud/buttons/colorBtnB differ diff --git a/OTRExporter/colors/hud/buttons/colorBtnCDown b/OTRExporter/colors/hud/buttons/colorBtnCDown new file mode 100644 index 000000000..0614be392 Binary files /dev/null and b/OTRExporter/colors/hud/buttons/colorBtnCDown differ diff --git a/OTRExporter/colors/hud/buttons/colorBtnCLeft b/OTRExporter/colors/hud/buttons/colorBtnCLeft new file mode 100644 index 000000000..0614be392 Binary files /dev/null and b/OTRExporter/colors/hud/buttons/colorBtnCLeft differ diff --git a/OTRExporter/colors/hud/buttons/colorBtnCRight b/OTRExporter/colors/hud/buttons/colorBtnCRight new file mode 100644 index 000000000..0614be392 Binary files /dev/null and b/OTRExporter/colors/hud/buttons/colorBtnCRight differ diff --git a/OTRExporter/colors/hud/buttons/colorBtnCUp b/OTRExporter/colors/hud/buttons/colorBtnCUp new file mode 100644 index 000000000..0614be392 Binary files /dev/null and b/OTRExporter/colors/hud/buttons/colorBtnCUp differ diff --git a/OTRExporter/colors/hud/buttons/colorBtnStart b/OTRExporter/colors/hud/buttons/colorBtnStart new file mode 100644 index 000000000..5d900b85b Binary files /dev/null and b/OTRExporter/colors/hud/buttons/colorBtnStart differ diff --git a/OTRExporter/colors/hud/colorAmmoCountDefault b/OTRExporter/colors/hud/colorAmmoCountDefault new file mode 100644 index 000000000..7b574daaf Binary files /dev/null and b/OTRExporter/colors/hud/colorAmmoCountDefault differ diff --git a/OTRExporter/colors/hud/colorAmmoCountEmpty b/OTRExporter/colors/hud/colorAmmoCountEmpty new file mode 100644 index 000000000..a36dcf76c Binary files /dev/null and b/OTRExporter/colors/hud/colorAmmoCountEmpty differ diff --git a/OTRExporter/colors/hud/colorAmmoCountFull b/OTRExporter/colors/hud/colorAmmoCountFull new file mode 100644 index 000000000..860ca2d40 Binary files /dev/null and b/OTRExporter/colors/hud/colorAmmoCountFull differ diff --git a/OTRExporter/colors/hud/colorHeartDDFill b/OTRExporter/colors/hud/colorHeartDDFill new file mode 100644 index 000000000..f41fce8cf Binary files /dev/null and b/OTRExporter/colors/hud/colorHeartDDFill differ diff --git a/OTRExporter/colors/hud/colorHeartDDOutline b/OTRExporter/colors/hud/colorHeartDDOutline new file mode 100644 index 000000000..7b574daaf Binary files /dev/null and b/OTRExporter/colors/hud/colorHeartDDOutline differ diff --git a/OTRExporter/colors/hud/colorHeartFill b/OTRExporter/colors/hud/colorHeartFill new file mode 100644 index 000000000..bd6952337 Binary files /dev/null and b/OTRExporter/colors/hud/colorHeartFill differ diff --git a/OTRExporter/colors/hud/colorHeartOutline b/OTRExporter/colors/hud/colorHeartOutline new file mode 100644 index 000000000..8506ca122 Binary files /dev/null and b/OTRExporter/colors/hud/colorHeartOutline differ diff --git a/OTRExporter/colors/hud/colorMagicBorder b/OTRExporter/colors/hud/colorMagicBorder new file mode 100644 index 000000000..7b574daaf Binary files /dev/null and b/OTRExporter/colors/hud/colorMagicBorder differ diff --git a/OTRExporter/colors/hud/colorMagicBorderDim b/OTRExporter/colors/hud/colorMagicBorderDim new file mode 100644 index 000000000..7acd79279 Binary files /dev/null and b/OTRExporter/colors/hud/colorMagicBorderDim differ diff --git a/OTRExporter/colors/hud/colorMagicFillBurn b/OTRExporter/colors/hud/colorMagicFillBurn new file mode 100644 index 000000000..ebbb61a2c Binary files /dev/null and b/OTRExporter/colors/hud/colorMagicFillBurn differ diff --git a/OTRExporter/colors/hud/colorMagicFillNormal b/OTRExporter/colors/hud/colorMagicFillNormal new file mode 100644 index 000000000..9dce65568 Binary files /dev/null and b/OTRExporter/colors/hud/colorMagicFillNormal differ diff --git a/OTRExporter/colors/hud/colorMinimap b/OTRExporter/colors/hud/colorMinimap new file mode 100644 index 000000000..2de959fe1 Binary files /dev/null and b/OTRExporter/colors/hud/colorMinimap differ diff --git a/OTRExporter/colors/hud/colorRupeeCountEmpty b/OTRExporter/colors/hud/colorRupeeCountEmpty new file mode 100644 index 000000000..7b574daaf Binary files /dev/null and b/OTRExporter/colors/hud/colorRupeeCountEmpty differ diff --git a/OTRExporter/colors/hud/colorRupeeCountFull b/OTRExporter/colors/hud/colorRupeeCountFull new file mode 100644 index 000000000..860ca2d40 Binary files /dev/null and b/OTRExporter/colors/hud/colorRupeeCountFull differ diff --git a/OTRExporter/colors/hud/colorRupeeCountNormal b/OTRExporter/colors/hud/colorRupeeCountNormal new file mode 100644 index 000000000..7b574daaf Binary files /dev/null and b/OTRExporter/colors/hud/colorRupeeCountNormal differ diff --git a/OTRExporter/colors/hud/colorRupeeIcon b/OTRExporter/colors/hud/colorRupeeIcon new file mode 100644 index 000000000..34b997b60 Binary files /dev/null and b/OTRExporter/colors/hud/colorRupeeIcon differ diff --git a/OTRExporter/colors/hud/colorSmallKeyCountNormal b/OTRExporter/colors/hud/colorSmallKeyCountNormal new file mode 100644 index 000000000..7b574daaf Binary files /dev/null and b/OTRExporter/colors/hud/colorSmallKeyCountNormal differ diff --git a/OTRExporter/colors/hud/colorSmallKeyIcon b/OTRExporter/colors/hud/colorSmallKeyIcon new file mode 100644 index 000000000..f3c73a683 Binary files /dev/null and b/OTRExporter/colors/hud/colorSmallKeyIcon differ diff --git a/OTRExporter/colors/hud/colorTimerCountNormal b/OTRExporter/colors/hud/colorTimerCountNormal new file mode 100644 index 000000000..7b574daaf Binary files /dev/null and b/OTRExporter/colors/hud/colorTimerCountNormal differ diff --git a/OTRExporter/colors/hud/colorTimerCountPanic b/OTRExporter/colors/hud/colorTimerCountPanic new file mode 100644 index 000000000..a8ee1e5e2 Binary files /dev/null and b/OTRExporter/colors/hud/colorTimerCountPanic differ diff --git a/OTRExporter/colors/hud/colorTimerCountWarning b/OTRExporter/colors/hud/colorTimerCountWarning new file mode 100644 index 000000000..09d6f1a0a Binary files /dev/null and b/OTRExporter/colors/hud/colorTimerCountWarning differ diff --git a/OTRExporter/colors/message/icons/colorTextStopIconDim b/OTRExporter/colors/message/icons/colorTextStopIconDim new file mode 100644 index 000000000..59476643e Binary files /dev/null and b/OTRExporter/colors/message/icons/colorTextStopIconDim differ diff --git a/OTRExporter/colors/message/icons/colorTextStopIconGlow b/OTRExporter/colors/message/icons/colorTextStopIconGlow new file mode 100644 index 000000000..77a37bf3f Binary files /dev/null and b/OTRExporter/colors/message/icons/colorTextStopIconGlow differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteABase b/OTRExporter/colors/message/ocarina/colorNoteABase new file mode 100644 index 000000000..a9f8a90fd Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteABase differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteAFlashBase b/OTRExporter/colors/message/ocarina/colorNoteAFlashBase new file mode 100644 index 000000000..0ed9474f2 Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteAFlashBase differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteAFlashLight b/OTRExporter/colors/message/ocarina/colorNoteAFlashLight new file mode 100644 index 000000000..f22bea952 Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteAFlashLight differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCDownBase b/OTRExporter/colors/message/ocarina/colorNoteCDownBase new file mode 100644 index 000000000..26988ecd8 Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCDownBase differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCDownFlashBase b/OTRExporter/colors/message/ocarina/colorNoteCDownFlashBase new file mode 100644 index 000000000..d1acff204 Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCDownFlashBase differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCDownFlashLight b/OTRExporter/colors/message/ocarina/colorNoteCDownFlashLight new file mode 100644 index 000000000..f7ad6a31b Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCDownFlashLight differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCLeftBase b/OTRExporter/colors/message/ocarina/colorNoteCLeftBase new file mode 100644 index 000000000..26988ecd8 Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCLeftBase differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCLeftFlashBase b/OTRExporter/colors/message/ocarina/colorNoteCLeftFlashBase new file mode 100644 index 000000000..d1acff204 Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCLeftFlashBase differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCLeftFlashLight b/OTRExporter/colors/message/ocarina/colorNoteCLeftFlashLight new file mode 100644 index 000000000..f7ad6a31b Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCLeftFlashLight differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCRightBase b/OTRExporter/colors/message/ocarina/colorNoteCRightBase new file mode 100644 index 000000000..26988ecd8 Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCRightBase differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCRightFlashBase b/OTRExporter/colors/message/ocarina/colorNoteCRightFlashBase new file mode 100644 index 000000000..d1acff204 Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCRightFlashBase differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCRightFlashLight b/OTRExporter/colors/message/ocarina/colorNoteCRightFlashLight new file mode 100644 index 000000000..f7ad6a31b Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCRightFlashLight differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCUpBase b/OTRExporter/colors/message/ocarina/colorNoteCUpBase new file mode 100644 index 000000000..26988ecd8 Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCUpBase differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCUpFlashBase b/OTRExporter/colors/message/ocarina/colorNoteCUpFlashBase new file mode 100644 index 000000000..d1acff204 Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCUpFlashBase differ diff --git a/OTRExporter/colors/message/ocarina/colorNoteCUpFlashLight b/OTRExporter/colors/message/ocarina/colorNoteCUpFlashLight new file mode 100644 index 000000000..f7ad6a31b Binary files /dev/null and b/OTRExporter/colors/message/ocarina/colorNoteCUpFlashLight differ diff --git a/OTRExporter/colors/message/text/default/colorTextAdjustableDefault b/OTRExporter/colors/message/text/default/colorTextAdjustableDefault new file mode 100644 index 000000000..1644c6b5d Binary files /dev/null and b/OTRExporter/colors/message/text/default/colorTextAdjustableDefault differ diff --git a/OTRExporter/colors/message/text/default/colorTextBlack b/OTRExporter/colors/message/text/default/colorTextBlack new file mode 100644 index 000000000..a8a523a7b Binary files /dev/null and b/OTRExporter/colors/message/text/default/colorTextBlack differ diff --git a/OTRExporter/colors/message/text/default/colorTextBlue b/OTRExporter/colors/message/text/default/colorTextBlue new file mode 100644 index 000000000..19100f617 Binary files /dev/null and b/OTRExporter/colors/message/text/default/colorTextBlue differ diff --git a/OTRExporter/colors/message/text/default/colorTextLightBlue b/OTRExporter/colors/message/text/default/colorTextLightBlue new file mode 100644 index 000000000..cedb8d3b5 Binary files /dev/null and b/OTRExporter/colors/message/text/default/colorTextLightBlue differ diff --git a/OTRExporter/colors/message/text/default/colorTextPurple b/OTRExporter/colors/message/text/default/colorTextPurple new file mode 100644 index 000000000..db464c6ed Binary files /dev/null and b/OTRExporter/colors/message/text/default/colorTextPurple differ diff --git a/OTRExporter/colors/message/text/default/colorTextRed b/OTRExporter/colors/message/text/default/colorTextRed new file mode 100644 index 000000000..6cac0a23c Binary files /dev/null and b/OTRExporter/colors/message/text/default/colorTextRed differ diff --git a/OTRExporter/colors/message/text/default/colorTextWhite b/OTRExporter/colors/message/text/default/colorTextWhite new file mode 100644 index 000000000..7b574daaf Binary files /dev/null and b/OTRExporter/colors/message/text/default/colorTextWhite differ diff --git a/OTRExporter/colors/message/text/default/colorTextYellow b/OTRExporter/colors/message/text/default/colorTextYellow new file mode 100644 index 000000000..4102b7d45 Binary files /dev/null and b/OTRExporter/colors/message/text/default/colorTextYellow differ diff --git a/OTRExporter/colors/message/text/no_shadow/colorTextLightBlue b/OTRExporter/colors/message/text/no_shadow/colorTextLightBlue new file mode 100644 index 000000000..4d7a0d01c Binary files /dev/null and b/OTRExporter/colors/message/text/no_shadow/colorTextLightBlue differ diff --git a/OTRExporter/colors/message/text/wooden/colorTextBlue b/OTRExporter/colors/message/text/wooden/colorTextBlue new file mode 100644 index 000000000..44d290d7e Binary files /dev/null and b/OTRExporter/colors/message/text/wooden/colorTextBlue differ diff --git a/OTRExporter/colors/message/text/wooden/colorTextLightBlue b/OTRExporter/colors/message/text/wooden/colorTextLightBlue new file mode 100644 index 000000000..b9bb0c833 Binary files /dev/null and b/OTRExporter/colors/message/text/wooden/colorTextLightBlue differ diff --git a/OTRExporter/colors/message/text/wooden/colorTextPurple b/OTRExporter/colors/message/text/wooden/colorTextPurple new file mode 100644 index 000000000..ef67a32a5 Binary files /dev/null and b/OTRExporter/colors/message/text/wooden/colorTextPurple differ diff --git a/OTRExporter/colors/message/text/wooden/colorTextRed b/OTRExporter/colors/message/text/wooden/colorTextRed new file mode 100644 index 000000000..00dcf802a Binary files /dev/null and b/OTRExporter/colors/message/text/wooden/colorTextRed differ diff --git a/OTRExporter/colors/message/text/wooden/colorTextYellow b/OTRExporter/colors/message/text/wooden/colorTextYellow new file mode 100644 index 000000000..ce07104c3 Binary files /dev/null and b/OTRExporter/colors/message/text/wooden/colorTextYellow differ diff --git a/OTRExporter/colors/pause/colorPauseCursorAEquip b/OTRExporter/colors/pause/colorPauseCursorAEquip new file mode 100644 index 000000000..d67c73b4e Binary files /dev/null and b/OTRExporter/colors/pause/colorPauseCursorAEquip differ diff --git a/OTRExporter/colors/pause/colorPauseCursorCEquip b/OTRExporter/colors/pause/colorPauseCursorCEquip new file mode 100644 index 000000000..09d6f1a0a Binary files /dev/null and b/OTRExporter/colors/pause/colorPauseCursorCEquip differ diff --git a/OTRExporter/colors/pause/colorPauseCursorNoEquip b/OTRExporter/colors/pause/colorPauseCursorNoEquip new file mode 100644 index 000000000..7b574daaf Binary files /dev/null and b/OTRExporter/colors/pause/colorPauseCursorNoEquip differ diff --git a/OTRExporter/colors/pause/colorPauseInfoPanelButtonA b/OTRExporter/colors/pause/colorPauseInfoPanelButtonA new file mode 100644 index 000000000..ce78c26c3 Binary files /dev/null and b/OTRExporter/colors/pause/colorPauseInfoPanelButtonA differ diff --git a/OTRExporter/colors/pause/colorPauseSavePrompt b/OTRExporter/colors/pause/colorPauseSavePrompt new file mode 100644 index 000000000..0cbf92ab6 Binary files /dev/null and b/OTRExporter/colors/pause/colorPauseSavePrompt differ diff --git a/OTRExporter/colors/player/colorGauntletGold b/OTRExporter/colors/player/colorGauntletGold new file mode 100644 index 000000000..b177e4a53 Binary files /dev/null and b/OTRExporter/colors/player/colorGauntletGold differ diff --git a/OTRExporter/colors/player/colorGauntletSilver b/OTRExporter/colors/player/colorGauntletSilver new file mode 100644 index 000000000..7b574daaf Binary files /dev/null and b/OTRExporter/colors/player/colorGauntletSilver differ diff --git a/OTRExporter/colors/player/colorTunicGoron b/OTRExporter/colors/player/colorTunicGoron new file mode 100644 index 000000000..f49262068 Binary files /dev/null and b/OTRExporter/colors/player/colorTunicGoron differ diff --git a/OTRExporter/colors/player/colorTunicKokiri b/OTRExporter/colors/player/colorTunicKokiri new file mode 100644 index 000000000..b4d89ec3f Binary files /dev/null and b/OTRExporter/colors/player/colorTunicKokiri differ diff --git a/OTRExporter/colors/player/colorTunicZora b/OTRExporter/colors/player/colorTunicZora new file mode 100644 index 000000000..67bbed9c8 Binary files /dev/null and b/OTRExporter/colors/player/colorTunicZora differ diff --git a/OTRExporter/colors/shop/colorShopArrowDim b/OTRExporter/colors/shop/colorShopArrowDim new file mode 100644 index 000000000..a36dcf76c Binary files /dev/null and b/OTRExporter/colors/shop/colorShopArrowDim differ diff --git a/OTRExporter/colors/shop/colorShopArrowNormal b/OTRExporter/colors/shop/colorShopArrowNormal new file mode 100644 index 000000000..09d6f1a0a Binary files /dev/null and b/OTRExporter/colors/shop/colorShopArrowNormal differ diff --git a/OTRExporter/colors/shop/colorShopCursorDim b/OTRExporter/colors/shop/colorShopCursorDim new file mode 100644 index 000000000..a3b670d40 Binary files /dev/null and b/OTRExporter/colors/shop/colorShopCursorDim differ diff --git a/OTRExporter/colors/shop/colorShopCursorNormal b/OTRExporter/colors/shop/colorShopCursorNormal new file mode 100644 index 000000000..332ad2418 Binary files /dev/null and b/OTRExporter/colors/shop/colorShopCursorNormal differ diff --git a/OTRExporter/colors/shop/colorShopStick b/OTRExporter/colors/shop/colorShopStick new file mode 100644 index 000000000..7c8bf68f6 Binary files /dev/null and b/OTRExporter/colors/shop/colorShopStick differ 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);