nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

shipinit dont show master sword (#4989)

Browse Source 
* Initial Commit

* Added full functionality for both Hylian and Mirror

* Included Format

* Removed Format

* Pedestal Cutscene

* Much Less OnGameUpdating

* Fix function call

* use enums

* move animation skip to vb should

* move taking out master sword to put in pedestal check into vb should

* move the rest of it over

* extra newline was bugging me

* update on `"IS_RANDO"` and use `COND`s

* make new "uncategorized" section for VB enum

* move shoulds to new file

* move vb rsk checks into conds

---------

Co-authored-by: Patrick12115 <Patrick12115@hotmail.com>
Co-authored-by: Malkierian <malkierian@gmail.com>
This commit is contained in:
briaguya
2025-02-12 06:32:40 -08:00
committed by GitHub
parent 46c6d2f526
commit 37fd39c7b5
3 changed files with 133 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7381,7 +7381,7 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) {
}
if ((this->heldActor == NULL) || Player_HoldsHookshot(this)) {
if ((interactedActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT) {
if (GameInteractor_Should(VB_SHOW_MASTER_SWORD_TO_PLACE_IN_PEDESTAL, (interactedActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT)) {
s32 sp24 = this->itemAction;
this->itemAction = PLAYER_IA_NONE;
@@ -10853,7 +10853,9 @@ void Player_Init(Actor* thisx, PlayState* play2) {
}
}
sStartModeFuncs[startMode](play, this);
if (GameInteractor_Should(VB_EXECUTE_PLAYER_STARTMODE_FUNC, true, startMode)) {
sStartModeFuncs[startMode](play, this);
}
if (startMode != PLAYER_START_MODE_NOTHING) {
if ((gSaveContext.gameMode == 0) || (gSaveContext.gameMode == 3)) {