mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-28 20:32:18 -05:00
Code Issues Projects Releases Wiki Activity

Pedestal Cutscene

Browse Source
This commit is contained in:
Patrick12115 2024-09-19 20:47:32 -04:00
parent 3196ea3a9b
commit 2a5f528863
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
soh/soh/Enhancements/mods.cpp
View File

@ -719,7 +719,10 @@ void RegisterMirrorModeHandler() {
void RegisterPatchNoMSHandler() { void RegisterPatchNoMSHandler() {
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() { GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
if (CVarGetInteger("gRandomizeShuffleMasterSword", 0) && (gSaveContext.equips.buttonItems[0] == ITEM_NONE)) { if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_MASTER_SWORD) &&
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER &&
gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS &&
gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BROKEN)) {
for (int i = 43; i <= 46; i++) { for (int i = 43; i <= 46; i++) {
std::string patchName = "adultNoMS." + std::to_string(1) + "." + std::to_string(i); std::string patchName = "adultNoMS." + std::to_string(1) + "." + std::to_string(i);
ResourceMgr_PatchGfxByName(gLinkAdultHylianShieldSwordAndSheathFarDL, patchName.c_str(), i, gsDPNoOp()); ResourceMgr_PatchGfxByName(gLinkAdultHylianShieldSwordAndSheathFarDL, patchName.c_str(), i, gsDPNoOp());

10
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -6881,7 +6881,8 @@ s32 Player_ActionChange_2(Player* this, PlayState* play) {
} }
if ((this->heldActor == NULL) || Player_HoldsHookshot(this)) { if ((this->heldActor == NULL) || Player_HoldsHookshot(this)) {
if ((interactedActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT) { if ((interactedActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT &&
!(Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD && !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)))) {
s32 sp24 = this->itemAction; s32 sp24 = this->itemAction;
this->itemAction = PLAYER_IA_NONE; this->itemAction = PLAYER_IA_NONE;
@ -10258,6 +10259,13 @@ void Player_Init(Actor* thisx, PlayState* play2) {
} }
} }
if (initMode == 1 && IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) &&
!CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
Math_Vec3f_Copy(&this->actor.world.pos, &D_808546F4);
this->yaw = this->actor.shape.rot.y = -0x8000;
initMode = 13;
}
D_80854738[initMode](play, this); D_80854738[initMode](play, this);
if (initMode != 0) { if (initMode != 0) {