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

Faster empty bottle, faster bean skulltula (#5355)

Browse Source 
* Faster empty bottle, faster bean skulltula

* shipinit
This commit is contained in:
Philip Dubé
2025-05-13 19:30:04 +00:00
committed by GitHub
parent f9cde383b7
commit eb95f9060f
6 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
soh/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
View File

@@ -7,6 +7,8 @@
#include "z_obj_makekinsuta.h"
#include "vt.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
void ObjMakekinsuta_Init(Actor* thisx, PlayState* play);
@@ -47,7 +49,7 @@ void ObjMakekinsuta_Init(Actor* thisx, PlayState* play) {
void func_80B98320(ObjMakekinsuta* this, PlayState* play) {
if (this->unk_152 != 0) {
if (this->timer >= 60 && !func_8002DEEC(GET_PLAYER(play))) {
if (GameInteractor_Should(VB_SPAWN_BEAN_SKULLTULA, this->timer >= 60) && !func_8002DEEC(GET_PLAYER(play))) {
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_SW, this->actor.world.pos.x, this->actor.world.pos.y,
this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, (this->actor.params | 0x8000), true);
this->actionFunc = ObjMakekinsuta_DoNothing;

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

@@ -14752,6 +14752,8 @@ static AnimSfxEntry D_80854A34[] = {
void Player_Action_8084EFC0(Player* this, PlayState* play) {
Player_DecelerateToZero(this);
GameInteractor_Should(VB_EMPTYING_BOTTLE, true, this);
if (LinkAnimation_Update(play, &this->skelAnime)) {
func_8083C0E8(this, play);
func_8005B1A4(Play_GetCamera(play, 0));