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

Actor Cleanups (#177)

Browse source 
* rename init chains, colchkinfo, colider inits, damage tables

* actor cleanups

* fix collider init script names

* small fixes

* ichain arg name

* change dynapoly types and names

* revert enru1 data name

* and the type

* pr suggestions
This commit is contained in:
fig02 2020-05-31 05:55:48 -04:00 • committed by GitHub
parent 13a94482e5
commit 78d0883f04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
108 changed files with 786 additions and 869 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
View file

@ -1,7 +1,7 @@
/*
* File: z_obj_roomtimer.c
* Overlay: ovl_Obj_Roomtimer
* Description: Timer
* Description: Starts Timer 1 with a value specified in params
*/
#include "z_obj_roomtimer.h"
@ -51,10 +51,8 @@ void ObjRoomtimer_Init(Actor* thisx, GlobalContext* globalCtx) {
void ObjRoomtimer_Destroy(Actor* thisx, GlobalContext* globalCtx) {
ObjRoomtimer* this = THIS;
if (this->actor.params != 0x3FF) {
if (gSaveContext.timer1Value > 0) {
gSaveContext.timer1State = 10;
}
if ((this->actor.params != 0x3FF) && (gSaveContext.timer1Value > 0)) {
gSaveContext.timer1State = 10;
}
}
@ -72,18 +70,15 @@ void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) {
if (this->actor.params != 0x3FF) {
gSaveContext.timer1State = 10;
}
Flags_SetClear(globalCtx, this->actor.room);
Flags_SetSwitch(globalCtx, this->switchFlag);
func_80078884(NA_SE_SY_CORRECT_CHIME);
Actor_Kill(&this->actor);
} else {
if (this->actor.params != 0x3FF) {
if (gSaveContext.timer1Value == 0) {
Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Gameplay_TriggerVoidOut(globalCtx);
Actor_Kill(&this->actor);
}
if ((this->actor.params != 0x3FF) && (gSaveContext.timer1Value == 0)) {
Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Gameplay_TriggerVoidOut(globalCtx);
Actor_Kill(&this->actor);
}
}
}