mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-05 13:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl_Magic_Dark (#495)

Browse Source 
* merge upstream

* Merge upstream

* Small formatting

* Data section

* MagicDark_Draw

* Gross match of func_80B874E4

* Add func_8005A9CC to functions.h

* Work on func_80B87A18

* func_80B8772C

* Remove comment

* Work on func_80B87A18

* Correct fp constant

* Add regalloc comment ;(

* Move negatives to numbers

* Stupid casts >:(

* Use this->actor when possible

* It's so close

* Use cast + 0xFF

* func_80B87A18

* Delete asm and replace globalCtx2

* Update spec

* static everything

* Name scale

* Use decimal for alpha

* Name some stuff

* Delete reloc

* Name orbOffset

* Name some functions

* Make unused data colors (because it probably is)

* Change >= to >

* Use clamps

* Name MagicDark_DimLighting

* Name gfx

* Rename prototype params

* Cleanup

* Funny cast

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
Sirius902
2020-12-01 18:36:39 -08:00
committed by GitHub
parent 1bb13b8c70
commit 09fe32e198
14 changed files with 328 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1
View File
@@ -768,6 +768,7 @@ s32 func_8005A77C(Camera* camera, s16 button);
// ? func_8005A8C4(?);
s16 func_8005A948(Camera* camera);
Vec3s* func_8005A970(Vec3s*, Camera*);
s16 func_8005A9CC(s32 arg0);
s16 func_8005A9F4(Camera* camera);
s32 func_8005AA1C(Camera* camera, s32, s16, s32);
s32 Camera_SetParam(Camera*, s32, void*);
include/variables.h
+1 -1
View File
@@ -37,7 +37,7 @@ extern u32 D_04004298;
extern u8 D_04006020[];
extern Gfx D_0400C820[];
extern u32 D_0400CB70;
extern u32 D_04010130;
extern Gfx D_04010130[];
extern Gfx D_04015720[];
extern Gfx D_04015760[];
//extern ? D_0401A0B0;
include/z64.h
+4 -1
View File
@@ -725,7 +725,10 @@ typedef struct {
/* 0xB8 */ UNK_PTR lightSettingsList;
/* 0xBC */ char unk_BC[0x03];
/* 0xBF */ u8 unk_BF;
/* 0xC0 */ char unk_C0[0x16];
/* 0xC0 */ char unk_C0[0x0F];
/* 0xCF */ u8 unk_CF[3];
/* 0xD2 */ s16 unk_D2;
/* 0xD4 */ char unk_D4[0x02];
/* 0xD6 */ s16 unk_D6;
/* 0xD8 */ f32 unk_D8;
/* 0xDC */ u8 unk_DC;