Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2025-02-17 03:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introducing z64audio.h (#459)

Browse Source 
* Copy over z64audio.h from audio WIP

* Cleanup z64audio.h

* PR Suggestions

* Improvements from Audio doc WIP

* More cleanup

* Remove a few structs, Introduce OcarinaSongId

* More cleanup from audio docs WIP

* Fix
This commit is contained in:
engineer124 2021-11-20 05:26:20 +11:00 committed by GitHub
parent 2dd84d8a9f
commit c8b0ff3f74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1191 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/variables.h
View File

@ -1867,7 +1867,7 @@ extern s8 D_801DB4B8;
// extern UNK_TYPE1 D_801DB8B8;
// extern UNK_TYPE1 D_801DB900;
extern UNK_PTR D_801DB930;
extern s8018CFAC D_801DB958[21];
extern AudioSpec D_801DB958[21];
// rodata
extern f32 D_801DBDF0;
@ -3635,7 +3635,7 @@ extern OSMesg D_801FD034;
// extern UNK_TYPE1 D_801FE4C0;
// extern UNK_TYPE1 D_801FE640;
// extern UNK_TYPE1 D_801FE6D0;
extern s801FE7C0 D_801FE7C0[1];
extern SoundRequest D_801FE7C0[1];
// extern UNK_TYPE1 D_801FFBC0;
// extern UNK_TYPE1 D_801FFBC8;
// extern UNK_TYPE1 D_801FFBD0;

40
include/z64.h
View File

@ -24,6 +24,7 @@
#include "z64actor.h"
#include "z64animation.h"
#include "z64audio.h"
#include "z64bgcheck.h"
#include "z64collision_check.h"
#include "z64cutscene.h"
@ -440,29 +441,6 @@ typedef struct {
/* 0x14 */ OSMesgQueue unk14;
} s80185D40; // size = 0x2C
typedef struct {
/* 0x00 */ u32 unk0;
/* 0x04 */ u8 unk4;
/* 0x05 */ u8 unk5;
/* 0x06 */ u8 unk6;
/* 0x07 */ UNK_TYPE1 pad7[0x2];
/* 0x09 */ u8 unk9;
/* 0x0A */ UNK_TYPE1 padA[0x2];
/* 0x0C */ u32 unkC;
/* 0x10 */ u16 unk10;
/* 0x12 */ u16 unk12;
/* 0x14 */ u16 unk14;
/* 0x16 */ UNK_TYPE1 pad16[0x2];
/* 0x18 */ u32 unk18;
/* 0x1C */ u32 unk1C;
/* 0x20 */ u32 unk20;
/* 0x24 */ u32 unk24;
/* 0x28 */ u32 unk28;
/* 0x2C */ u32 unk2C;
/* 0x30 */ u32 unk30;
/* 0x34 */ u32 unk34;
} s8018CFAC; // size = 0x38
typedef struct {
/* 0x0 */ u8 unk0;
/* 0x1 */ u8 unk1;
@ -474,10 +452,6 @@ typedef struct {
/* 0x7 */ u8 unk7;
} s801AEC84; // size = 0x8
typedef struct {
/* 0x00 */ UNK_TYPE1 pad0[0x14];
} s801FE7C0; // size = 0x14
typedef struct {
/* 0x00 */ Vec3f unk0;
/* 0x0C */ Vec3f unkC;
@ -608,12 +582,6 @@ typedef struct {
typedef void(*fault_update_input_func)(Input* input);
typedef struct {
/* 0x00 */ u8 noteIdx;
/* 0x01 */ u8 state;
/* 0x02 */ u8 pos;
} OcarinaStaff; // size = 0x3;
typedef struct {
/* 0x000 */ View view;
/* 0x168 */ u8* iconItemSegment;
@ -1297,12 +1265,6 @@ typedef struct ActorListEntry {
#define OS_SC_NMI_MSG 3 // name is made up, 3 is OS_SC_RDP_DONE_MSG in the original sched.c
#define OS_SC_PRE_NMI_MSG 4
typedef struct {
/* 0x0000 */ OSTask task;
/* 0x0040 */ OSMesgQueue* taskQueue;
/* 0x0044 */ char unk_44[0xC];
} AudioTask; // size = 0x50
typedef struct {
/* 0x000 */ IrqMgr* irqMgr;
/* 0x004 */ SchedContext* sched;

1186
include/z64audio.h Normal file
View File

File diff suppressed because it is too large Load Diff

4
tools/disasm/variables.txt
View File

@ -2478,7 +2478,7 @@
0x801DB8B8:("D_801DB8B8","UNK_TYPE1","",0x1),
0x801DB900:("D_801DB900","UNK_TYPE1","",0x1),
0x801DB930:("D_801DB930","UNK_PTR","",0x4),
0x801DB958:("D_801DB958","s8018CFAC","[21]",0x498),
0x801DB958:("D_801DB958","AudioSpec","[21]",0x498),
0x801DBDF0:("D_801DBDF0","f32","",0x4),
0x801DBDF4:("jtbl_801DBDF4","UNK_PTR","",0x4),
0x801DBE68:("D_801DBE68","f32","",0x4),
@ -4431,7 +4431,7 @@
0x801FE4C0:("D_801FE4C0","UNK_TYPE1","",0x1),
0x801FE640:("D_801FE640","UNK_TYPE1","",0x1),
0x801FE6D0:("D_801FE6D0","UNK_TYPE1","",0x1),
0x801FE7C0:("D_801FE7C0","s801FE7C0","[1]",0x14),
0x801FE7C0:("D_801FE7C0","SoundRequest","[1]",0x14),
0x801FFBC0:("D_801FFBC0","UNK_TYPE1","",0x1),
0x801FFBC8:("D_801FFBC8","UNK_TYPE1","",0x1),
0x801FFBD0:("D_801FFBD0","UNK_TYPE1","",0x1),