From 2a886a4a0e4903ac5d1688e367e4dcb6e3213826 Mon Sep 17 00:00:00 2001 From: aMannus Date: Wed, 29 Nov 2023 10:39:26 +0100 Subject: [PATCH] Default magic color, ornament hunt tracker icon, small fix --- .../parameter_static/gTriforcePiece.rgba32.png | Bin 1761 -> 984 bytes soh/soh/OTRGlobals.cpp | 2 ++ .../ovl_En_ChristmasTree/z_en_christmastree.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/soh/assets/custom/textures/parameter_static/gTriforcePiece.rgba32.png b/soh/assets/custom/textures/parameter_static/gTriforcePiece.rgba32.png index cc67b6a133d237ccada031e4efa53358a9f77415..eace659af2937bf5145a4ea2101f3d15fb42d749 100644 GIT binary patch delta 963 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 diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index e10bda18a..78da02263 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -1062,6 +1062,8 @@ extern "C" void InitOTR() { tm *tm_now = localtime(&now); CVarRegisterInteger("gLetItSnow", 1); + CVarRegisterInteger("gCosmetics.Consumable_Magic.Changed", 1); + CVarRegisterColor("gCosmetics.Consumable_Magic.Value", Color_RGBA8{ 255, 0, 0, 255 }); srand(now); #ifdef ENABLE_CROWD_CONTROL diff --git a/soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c b/soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c index 66514fd4b..32a2cf81f 100644 --- a/soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c +++ b/soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c @@ -131,7 +131,7 @@ void EnChristmasTree_HandleEndTitle(EnChristmasTree* this, PlayState* play) { // Hide player so he's not visible in the final screen. Also move him so target arrow on tree dissapears. player->actor.scale.x = player->actor.scale.y = player->actor.scale.z = 0.00001f; - player->actor.world.pos.y = -200.0f; + player->actor.world.pos.z = 500.0f; // Hide HUD Interface_ChangeAlpha(1);