ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Faster bean planting (#6473)

Browse source
This commit is contained in:
Jordan Longstaff 2026-04-08 18:54:04 -04:00 committed by GitHub
parent 40425c8c28
commit 4122d8079e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
View file

@ -1534,6 +1534,14 @@ typedef enum {
// - `*BossGanondrof` // - `*BossGanondrof`
VB_PHANTOM_GANON_DEATH_SCENE, VB_PHANTOM_GANON_DEATH_SCENE,
// #### `result`
// ```c
// true
// ```
// #### `args`
// - None
VB_PLAY_BEAN_PLANTING_CS,
// #### `result` // #### `result`
// ##### In `DoorWarp1_ChildWarpOut` - `SCENE_DODONGOS_CAVERN_BOSS` // ##### In `DoorWarp1_ChildWarpOut` - `SCENE_DODONGOS_CAVERN_BOSS`
// ```c // ```c

1
soh/soh/Enhancements/timesaver_hook_handlers.cpp
View file

@ -572,6 +572,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
} }
break; break;
} }
case VB_PLAY_BEAN_PLANTING_CS:
case VB_PLAY_EYEDROP_CREATION_ANIM: case VB_PLAY_EYEDROP_CREATION_ANIM:
case VB_PLAY_EYEDROPS_CS: case VB_PLAY_EYEDROPS_CS:
case VB_PLAY_DROP_FISH_FOR_JABU_CS: case VB_PLAY_DROP_FISH_FOR_JABU_CS:

4
soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
View file

@ -551,7 +551,9 @@ void ObjBean_WaitForBean(ObjBean* this, PlayState* play) {
void func_80B8FE00(ObjBean* this) { void func_80B8FE00(ObjBean* this) {
this->actionFunc = func_80B8FE3C; this->actionFunc = func_80B8FE3C;
ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_LEAVES); ObjBean_SetDrawMode(this, BEAN_STATE_DRAW_LEAVES);
this->timer = 60; if (GameInteractor_Should(VB_PLAY_BEAN_PLANTING_CS, true)) {
this->timer = 60;
}
} }
// Link is looking at the soft soil // Link is looking at the soft soil

4
soh/src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -6063,7 +6063,9 @@ s32 Player_ActionHandler_13(Player* this, PlayState* play) {
Inventory_ChangeAmmo(ITEM_BEAN, -1); Inventory_ChangeAmmo(ITEM_BEAN, -1);
Player_SetupActionPreserveItemAction(play, this, Player_Action_8084279C, 0); Player_SetupActionPreserveItemAction(play, this, Player_Action_8084279C, 0);
this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE; this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
this->av2.actionVar2 = 0x50; if (GameInteractor_Should(VB_PLAY_BEAN_PLANTING_CS, true)) {
this->av2.actionVar2 = 0x50;
}
this->av1.actionVar1 = -1; this->av1.actionVar1 = -1;
} }
talkActor->flags |= ACTOR_FLAG_TALK; talkActor->flags |= ACTOR_FLAG_TALK;