mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-09 18:57:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Oceff wipe6 (#686)

Browse Source 
* Uncorrupted; Not OK

* Merged upstream -- actually OK

* Update assets/xml/overlays/ovl_Oceff_Wipe6.xml

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* - Removed Extra 0 characters; clang-format-11

* Removed new warnings.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Nick
2022-03-25 02:45:37 +00:00
committed by GitHub
parent 80cbdb956d
commit ce7aa87454
9 changed files with 85 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -1158,7 +1158,7 @@ s16 Camera_ClearFlags(Camera* camera, s16 flags);
s32 func_800DFFAC(Camera* camera, Actor* doorActor, s16 bgCamDataId, f32 arg3, s16 timer1, s16 timer2, s16 timer3);
// UNK_TYPE4 func_800E007C(Camera* param_1, Camera* param_2);
// UNK_TYPE4 func_800E01AC(void);
// void func_800E01B8(void);
Vec3f* Camera_GetQuakeOffset(Vec3f* dst, Camera* camera);
// void func_800E01DC(s32 param_1, u32 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
// UNK_TYPE4 func_800E0228(void);
// void func_800E0238(void);
include/z64.h
+2 -1
View File
@@ -872,7 +872,8 @@ typedef struct {
/* 0x12074 */ UNK_TYPE1 pad12074[0x4];
/* 0x12078 */ s32 bankRupeesSelected;
/* 0x1207C */ s32 bankRupees;
/* 0x12080 */ UNK_TYPE1 pad12080[0x31];
/* 0x12080 */ UNK_TYPE1 pad12080[0x30];
/* 0x120B0 */ u8 unk120B0;
/* 0x120B1 */ u8 unk120B1;
/* 0x120B2 */ UNK_TYPE1 pad120B2[0x22];
/* 0x120D4 */ UNK_TYPE2 unk120D4;