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

Removal of Kakariko Center Tree, Bushes, and NPC's for both ages.

Browse Source
This commit is contained in:
Caladius
2023-10-31 18:35:02 -04:00
parent ff7fa77427
commit 409f443ed0
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
+2
View File
@@ -65,6 +65,8 @@ void EnHs2_Init(Actor* thisx, PlayState* play) {
this->actionFunc = func_80A6F1A4;
this->unk_2A8 = 0;
this->actor.targetMode = 6;
Actor_Kill(this);
}
void EnHs2_Destroy(Actor* thisx, PlayState* play) {
soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
+1 -1
View File
@@ -829,7 +829,7 @@ s32 EnHy_ShouldSpawn(EnHy* this, PlayState* play) {
} else if ((this->actor.params & 0x7F) != ENHY_TYPE_BOJ_12 && IS_NIGHT) {
return false;
} else {
return true;
return false;
}
case SCENE_IMPAS_HOUSE:
if ((this->actor.params & 0x7F) != ENHY_TYPE_BOJ_10) {
soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+6 -1
View File
@@ -266,7 +266,12 @@ void EnKusa_Init(Actor* thisx, PlayState* play) {
return;
}
EnKusa_SetupWaitObject(this);
if (gPlayState->sceneNum == SCENE_KAKARIKO_VILLAGE) {
Actor_Kill(this);
} else {
EnKusa_SetupWaitObject(this);
}
}
void EnKusa_Destroy(Actor* thisx, PlayState* play2) {
soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
+1 -1
View File
@@ -105,7 +105,7 @@ void EnToryo_Init(Actor* thisx, PlayState* play) {
break;
case SCENE_KAKARIKO_VILLAGE:
if ((LINK_AGE_IN_YEARS == YEARS_CHILD) && IS_DAY) {
this->stateFlags |= 2;
Actor_Kill(this);
}
break;
case SCENE_KAKARIKO_CENTER_GUEST_HOUSE:
soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
+4
View File
@@ -173,6 +173,10 @@ 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) {
Actor_Kill(this);
}
// 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