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

Decompile z_play.c and Match/Document some of z_view.c (#74)

Browse source 
* Decompile z_play.c and Match/Document some of z_view.c

Also fix the last non matching in z_sample.c and update some game state functions.

* Suggestions from PR #74

* Fix undefined reference to Gameplay_DrawOverlay

* Suggestion from PR #74 (2)

* Fix a fake argument in func_800BC450
This commit is contained in:
Roman971 2020-04-16 23:36:12 +02:00 • committed by GitHub
parent 9ac1f8130d
commit 262f6c507c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
278 changed files with 5139 additions and 5939 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,8 +46,8 @@ void ObjRoomtimer_Init(ObjRoomtimer* this, GlobalContext* globalCtx) {
void ObjRoomtimer_Destroy(ObjRoomtimer* this, GlobalContext* globalCtx) {
if (this->actor.params != 0x3FF) {
if (gSaveContext.timer_1_value > 0) {
gSaveContext.timer_1_state = 10;
if (gSaveContext.timer1Value > 0) {
gSaveContext.timer1State = 10;
}
}
}
@ -64,7 +64,7 @@ void func_80B9D054(ObjRoomtimer* this, GlobalContext* globalCtx) {
void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) {
if (Flags_GetTempClear(globalCtx, this->actor.room)) {
if (this->actor.params != 0x3FF) {
gSaveContext.timer_1_state = 10;
gSaveContext.timer1State = 10;
}
Flags_SetClear(globalCtx, this->actor.room);
@ -73,9 +73,9 @@ void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) {
Actor_Kill(&this->actor);
} else {
if (this->actor.params != 0x3FF) {
if (gSaveContext.timer_1_value == 0) {
if (gSaveContext.timer1Value == 0) {
Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
func_800C0B60(globalCtx); // Void Out
Gameplay_TriggerVoidOut(globalCtx);
Actor_Kill(&this->actor);
}
}