mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-24 23:31:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Spawn Child Tree near Anju and fix Bushes that spawn near Graveyard entrance.

Browse Source
This commit is contained in:
Caladius
2023-10-31 19:36:49 -04:00
parent 409f443ed0
commit e62fea9fcb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+1 -1
View File
@@ -266,7 +266,7 @@ void EnKusa_Init(Actor* thisx, PlayState* play) {
return;
}
if (gPlayState->sceneNum == SCENE_KAKARIKO_VILLAGE) {
if (gPlayState->sceneNum == SCENE_KAKARIKO_VILLAGE && this->actor.world.pos.z < 600.0) {
Actor_Kill(this);
} else {
EnKusa_SetupWaitObject(this);
soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
+7 -1
View File
@@ -173,10 +173,16 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) {
f32 floorY;
s16 extraRot;
if (gPlayState->sceneNum == SCENE_KAKARIKO_VILLAGE && this->actor.params >= 0 || this->actor.params <= WOOD_TREE_KAKARIKO_ADULT) {
if (gPlayState->sceneNum == SCENE_KAKARIKO_VILLAGE && this->actor.params <= WOOD_TREE_KAKARIKO_ADULT) {
Actor_Kill(this);
}
if (gPlayState->sceneNum == SCENE_KAKARIKO_VILLAGE && this->actor.params >= 0) {
this->actor.world.pos.x = 754.051;
this->actor.world.pos.y = 80.0;
this->actor.world.pos.z = 1429.908;
}
// The tree in Kakariko's day scene does not have the same params to spawn the GS
// as the night scene, For the always spawn GS enhancement we apply the needed
// params to have the GS drop when bonking