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

Audio WIP (#836)

Browse source 
* being code_800EC960

* wip

* wip

* more audio progress

* migrate data in code_800E11F0

* wip

* make ok

* remove asm

* wip

* move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094

* more progress

* wip

* wip

* split code_800E11F0

* migrate rodata in code_800E11F0

* match functions that couldn't because of data issues

* move code_800E4FE0 asm files

* wip

* more wip

* fix global functions, and forward declarations

* wip

* wip

* wip

* ocarina wip

* match a couple functions

* some progress

* separate some bss

* match func_800EDA3C

* some matching

* more matches

* migrate audio rodata

* some matches

* more matchess

* start on synthesis

* work on synthesis

* fix function declaration

* Merge branch 'master' into audio

* match a few more functions

* wip

* wip

* more matching, rename Audio_SetBGM to Audio_QueueSeqCmd

* name several audio functions, and audiocontext members

* more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis

* audio wip

* match a few more functions.

* wip

* add missing NON_MATCHING directive

* wip

* some matching, data reogranization

* match cursed function

* wip

* wip

* formatting

* remove prefix from struct memebers

* missed function rename

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
krimtonz 2021-07-27 18:44:58 -05:00 • committed by GitHub
parent cc9a04feb4
commit d1a5ea5110
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
429 changed files with 9047 additions and 17038 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/overlays/actors/ovl_Fishing/z_fishing.c
View file

@ -869,7 +869,7 @@ void Fishing_Init(Actor* thisx, GlobalContext* globalCtx2) {
D_80B7E0AC = 0;
D_80B7E0A6 = 10;
Audio_SetBGM(0x100100FF);
Audio_QueueSeqCmd(0x100100FF);
if (sLinkAge == 1) {
if ((HIGH_SCORE(HS_FISHING) & 0x7F) != 0) {
@ -3586,7 +3586,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
this->unk_198 = 1.7f;
this->unk_19C = 7000.0f;
D_80B7E124 = 1;
Audio_SetBGM(0x81A);
Audio_QueueSeqCmd(0x81A);
D_80B7E0A6 = 0;
if (this->unk_150 == 1) {
@ -3791,7 +3791,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
} else {
D_80B7E086 = 0x4082;
func_800A9F6C(0.0f, 1, 3, 1);
Audio_SetBGM(0x100A00FF);
Audio_QueueSeqCmd(0x100A00FF);
}
this->unk_158 = this->unk_15A = 0;
@ -3859,7 +3859,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
}
if (this->unk_17A[0] == 90) {
Audio_SetBGM(0x924);
Audio_QueueSeqCmd(0x924);
D_80B7A67C = 40;
if (this->unk_150 == 0) {
@ -3969,7 +3969,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
D_80B7E148 = 520.0f;
D_80B7E144 = 195.0f;
Audio_SetBGM(0x100A00FF);
Audio_QueueSeqCmd(0x100A00FF);
D_80B7E0A6 = 20;
D_80B7A6CC = 3;
}
@ -5204,7 +5204,7 @@ void Fishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
D_80B7A6CC = 20;
func_800A9F6C(0.0f, 150, 10, 10);
func_80078884(NA_SE_SY_TRE_BOX_APPEAR);
Audio_SetBGM(0x101400FF);
Audio_QueueSeqCmd(0x101400FF);
}
if (KREG(0) != 0) {
@ -5213,7 +5213,7 @@ void Fishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
D_80B7A6CC = 20;
func_800A9F6C(0.0f, 150, 10, 10);
func_80078884(NA_SE_SY_TRE_BOX_APPEAR);
Audio_SetBGM(0x101400FF);
Audio_QueueSeqCmd(0x101400FF);
}
if (D_80B7A6D0 != 0) {
@ -5429,7 +5429,7 @@ void Fishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
case 22:
if (D_80B7A6D0 == 30) {
Audio_SetBGM(0x922);
Audio_QueueSeqCmd(0x922);
}
D_80B7A6D4 = 1;
@ -5739,15 +5739,15 @@ void Fishing_DrawOwner(Actor* thisx, GlobalContext* globalCtx) {
if (D_80B7E0A6 == 0) {
if (sLinkAge != 1) {
Audio_SetBGM(0x19);
Audio_QueueSeqCmd(0x19);
} else {
Audio_SetBGM(0x27);
Audio_QueueSeqCmd(0x27);
}
if (sLinkAge != 1) {
Audio_SetBGM(0x19);
Audio_QueueSeqCmd(0x19);
} else {
Audio_SetBGM(0x27);
Audio_QueueSeqCmd(0x27);
}
}
}