From 9ce552659a37cb7e2288b3f2b11c65a6ba46259a Mon Sep 17 00:00:00 2001 From: aMannus Date: Thu, 21 Jul 2022 12:22:36 +0200 Subject: [PATCH] Changed iceTrapped var name/type and tooltip --- soh/include/z64player.h | 2 +- soh/soh/Enhancements/randomizer/randomizer.cpp | 3 ++- soh/src/code/z_actor.c | 2 +- soh/src/overlays/actors/ovl_En_Si/z_en_si.c | 4 ++-- soh/src/overlays/actors/ovl_player_actor/z_player.c | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/soh/include/z64player.h b/soh/include/z64player.h index bbc0fcea3..45b717c14 100644 --- a/soh/include/z64player.h +++ b/soh/include/z64player.h @@ -622,7 +622,7 @@ typedef struct Player { /* 0x0A86 */ s8 unk_A86; /* 0x0A87 */ u8 unk_A87; /* 0x0A88 */ Vec3f unk_A88; // previous body part 0 position - /* 0x0A89 */ u8 iceTrapped; + /* 0x0A89 */ bool pendingIceTrap; } Player; // size = 0xA94 #endif diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index a0730fc2c..ea8ffd924 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -3926,7 +3926,8 @@ void DrawRandoEditor(bool& open) { // Shuffle Tokens ImGui::Text(Settings::Tokensanity.GetName().c_str()); InsertHelpHoverText( - "Shuffles Golden Skulltula Tokens into the item pool.\n" + "Shuffles Golden Skulltula Tokens into the item pool. This means\n" + "Golden Skulltulas can contain other items as well.\n" "\n" "Off - GS tokens will not be shuffled.\n" "\n" diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index e59dd8954..cdeb974e8 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -1983,7 +1983,7 @@ s32 GiveItemWithoutActor(GlobalContext* globalCtx, s32 getItemId) { player->getItemDirection = player->actor.shape.rot.y; // Player state 26 = Player is frozen if (player->stateFlags1 & (PLAYER_STATE1_26)) { - player->iceTrapped = 0; + player->pendingIceTrap = false; } return true; } diff --git a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c index cfd134d34..aa67f1a20 100644 --- a/soh/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/soh/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -101,7 +101,7 @@ void func_80AFB768(EnSi* this, GlobalContext* globalCtx) { getItemId = Randomizer_GetRandomizedItemId(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum); if (getItemId == GI_ICE_TRAP) { player->getItemId = GI_ICE_TRAP; - player->iceTrapped = 1; + player->pendingIceTrap = true; textId = 0xF8; } else { textId = sGetItemTable[getItemId - 1].textId; @@ -138,7 +138,7 @@ void func_80AFB89C(EnSi* this, GlobalContext* globalCtx) { getItemId = Randomizer_GetRandomizedItemId(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum); if (getItemId == GI_ICE_TRAP) { player->getItemId = GI_ICE_TRAP; - player->iceTrapped = 1; + player->pendingIceTrap = true; textId = 0xF8; } else { textId = sGetItemTable[getItemId - 1].textId; diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index bff6cf3ec..05574b1df 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -10978,7 +10978,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { Collider_ResetQuadAC(globalCtx, &this->shieldQuad.base); Collider_ResetQuadAT(globalCtx, &this->shieldQuad.base); - if (this->iceTrapped != 0) { + if (this->pendingIceTrap == true) { GiveItemWithoutActor(globalCtx, GI_ICE_TRAP); } }