mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +00:00
Code Issues Projects Releases Wiki Activity

attchaedA/attachedB renamed to parent/child (#358)

Browse source 
* fix colliderinit typo

* rename parent/child

* cleanup

* forgot to change something in functions.h

* SpawnAsChild

* format
This commit is contained in:
fig02 2020-08-29 18:25:16 -04:00 • committed by GitHub
parent 468c592792
commit 1f1b5e39f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
233 changed files with 584 additions and 585 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
View file

@ -177,7 +177,7 @@ void ItemOcarina_StartSoTCutscene(ItemOcarina* this, GlobalContext* globalCtx) {
}
void ItemOcarina_WaitInWater(ItemOcarina* this, GlobalContext* globalCtx) {
if (func_8002F410(&this->actor, globalCtx)) {
if (Actor_HasParent(&this->actor, globalCtx)) {
gSaveContext.eventChkInf[4] |= 8;
Flags_SetSwitch(globalCtx, 3);
this->actionFunc = ItemOcarina_StartSoTCutscene;