izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Misc NON_MATCHINGS/NON_EQUIVALENTS (#696)

Browse Source 
* Match the rest in fireObj

* Fix FireObjLightParams struct

* Fix up bomjima

* Match ObjSnowball

* 2 functions in EnGoroiwa

* Rename randMultiplier

* Minor cleanup

* More cleanup

* Boss02 Ok

* Match Boss06_Draw

* format

* bss

* Remove static from osFlash bss

* PR suggestions

* Remove LightInfoPositional

* 0x4000

* Format

* Cleanup

* Fix bombjima data

* Boss02 newline

* PR stuff

* Change func_8012CF0C to NON_EQUIVALENT

* Matched func_8012CF0C by AngheloAlf

* RSPMatrix -> Mtx

* Bubbles fix
This commit is contained in:
Derek Hensley
2022-03-09 22:02:27 -03:00
committed by GitHub
parent fe32df0e82
commit d36b0d506d
20 changed files with 129 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64.h
+13 -7
View File
@@ -139,15 +139,21 @@ typedef struct {
/* 0x4 */ f32 dynamicSizeStep;
/* 0x8 */ u8 state;
/* 0x9 */ u8 sizeGrowsCos2;
/* 0xA */ u8 unkA;
/* 0xA */ u8 colorsIndex;
/* 0xB */ u8 flags;
/* 0xC */ u8 unkC;
/* 0xC */ u8 lightParamsIndex;
} FireObjInitParams; // size = 0xD
typedef struct {
typedef struct FireObjColors {
/* 0x0 */ Color_RGBA8 primColor;
/* 0x4 */ u8 unk4;
/* 0x4 */ u8 lod;
/* 0x5 */ Color_RGB8 envColor;
} FireObjColors; // size = 0x8
typedef struct FireObjLightParams {
/* 0x0 */ s16 radius;
/* 0x2 */ Color_RGB8 color;
/* 0x5 */ Color_RGB8 maxColorAdj;
} FireObjLightParams; // size = 0x8
#define FONT_CHAR_TEX_WIDTH 16
@@ -1158,8 +1164,8 @@ typedef enum {
struct FireObjLight {
/* 0x00 */ LightNode* light;
/* 0x04 */ LightInfoPositional lightInfo;
/* 0x12 */ u8 unk12;
/* 0x04 */ LightInfo lightInfo;
/* 0x12 */ u8 lightParamsIndex;
}; // size = 0x13
#define OS_SC_RETRACE_MSG 1
@@ -1210,7 +1216,7 @@ struct FireObj {
/* 0x24 */ u8 state; // 0 - growing, 1 - shrinking, 2 - fully lit, 3 - not lit
/* 0x25 */ u8 sizeGrowsCos2;
/* 0x26 */ u8 unk26;
/* 0x27 */ u8 unk27;
/* 0x27 */ u8 colorsIndex;
/* 0x28 */ u8 flags; // bit 0 - ?, bit 1 - ?
/* 0x29 */ UNK_TYPE1 pad29[0x1];
/* 0x2A */ s16 ignitionDelay;
include/z64light.h
-5
View File
@@ -57,11 +57,6 @@ typedef struct Lights {
/* 0x08 */ Lightsn l;
} Lights; // size = 0x80
typedef struct LightInfoPositional {
/* 0x0 */ u8 type;
/* 0x2 */ LightPoint params;
} LightInfoPositional; // size = 0xE
typedef struct LightNode {
/* 0x0 */ LightInfo* info;
/* 0x4 */ struct LightNode* prev;