Solar decompiled, some cleanup (#102)

* stuff

* stuff

* temps

* matched

* so complete

* merge and clean

* format

* graphics macros
This commit is contained in:
petrie911
2024-01-22 00:28:02 -03:00
committed by GitHub
parent 61b55d90ce
commit 119dfa9354
19 changed files with 3804 additions and 1380 deletions
+12 -1
View File
@@ -543,7 +543,8 @@ extern Gfx D_6011EE0[];
extern Gfx D_60120F0[];
extern u8 D_6012310[];
extern u8 D_60123F0[];
extern Gfx D_6012C00[];
extern Gfx D_6012C00_Gfx[];
extern AnimationHeader D_6012C00_Anim;
extern u8 D_60131A0[];
extern Gfx D_60132B0[];
extern u8 D_6013470[];
@@ -942,6 +943,16 @@ extern f32 D_603E030[];
extern f32 D_603E09C[];
extern f32 D_603E0EC[];
extern Gfx D_60084C0[];
extern Gfx D_6008D40[];
extern Gfx D_6007C40[];
extern Gfx D_601B790[];
extern Gfx D_601B790[];
extern Gfx D_601A700[];
extern Gfx D_6019670[];
extern Gfx D_60185E0[];
extern Gfx D_6017550[];
// ast_9DD390, ast_A0E340, ast_BFA740, ast_CBFE70, ast_D27600
extern Gfx D_7000000[];
extern u8 D_7000F10[];
+8 -2
View File
@@ -42,7 +42,7 @@ void func_8001CE28(u8, f32 *);
void func_8001D034(f32*, s32, u8);
void func_8001D10C(f32*, u32);
void func_8001D15C(u8);
void func_8001D1C8(u8, s32);
void func_8001D1C8(u8, u32);
void func_8001D2FC(f32 *, u16);
void func_8001D3A0(f32 *, u16);
void func_8001D400(s8);
@@ -116,6 +116,9 @@ void func_800319AC(Actor* this);
void func_80035448(Actor* actor);
//fox_beam
void func_80038140(PlayerShot* shot);
void func_80036318(PlayerShot* shot);
void func_80035DEC(f32 xPos, f32 yPos, f32 zPos);
void PlayerShot_Initialize(PlayerShot *);
void func_800365E4(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void func_8003D9B8(void);
@@ -152,7 +155,7 @@ void func_80045E7C(Player*);
void func_80047504(Player * player);
void func_80046358(Player*);
// sf_496E0
// fox_demo
void func_80048AC0(s32 teamId);
void func_80049C0C(Player *);
void func_8004A52C(Player *);
@@ -160,6 +163,7 @@ void func_8004AA84(void);
void func_8004AAF4(Player *);
void func_8004C930(Player *);
void func_8004CCC0(Player *);
void func_8004D440(Player* player);
void func_8004E3D8(Player *);
void func_8004F8AC(Actor*);
void func_8004FEC0(Actor*);
@@ -315,6 +319,7 @@ void func_800771CC(Actor*);
void func_80077218(Actor*);
// fox_effect
s32 func_80081B24(f32 posX, f32 posY, f32 posZ, f32 scale2);
void func_80077240(f32 posX, f32 posY, f32 posZ, s32 hits);
void func_8007729C(void);
void func_80077790(void);
@@ -531,6 +536,7 @@ void func_800A3CA0(void);
s32 Play_CheckMedalStatus(u16);
s32 Play_GetMaxShields(void);
void func_800A6028(f32*, u32);
void func_800AC290(Player* player, PlayerShot* shot, f32 arg2, f32 arg3, PlayerShotId shotId, f32 arg5);
void func_800A5844(void);
void func_800A594C(void);
void func_800A5D6C(void);
+2 -2
View File
@@ -10,7 +10,7 @@
// extern f32 D_i3_801C4188; Currently externed in relevant files for bss ordering
void func_i3_801BE034(Actor*, Player*);
void func_i3_801BE034(Actor*);
void func_i3_8018DA58(Actor*);
void func_i3_8019E5F0(Actor*);
@@ -97,7 +97,7 @@ void func_i3_801ABA40(PlayerShot*);
void func_i3_801AC274(Player*);
void func_i3_801AC8A8(f32, f32, f32, f32, s32);
void func_i3_801AC918(Effect*);
void func_i3_801ACBB4(void);
void func_i3_801ACBB4(Player*);
void func_i3_801ACE50(Player*);
void func_i3_801AD328(Player*);
void func_i3_801AD688(Actor *);
+2 -2
View File
@@ -12,8 +12,8 @@
#define SHT_MAX 32767.0f
#define SHT_MINV (1.0f / SHT_MAX)
#define RAD_TO_DEG(radians) ((radians * 180.0f) / M_PI)
#define DEG_TO_RAD(degrees) ((degrees * M_PI) / 180.0f)
#define RAD_TO_DEG(radians) (((radians) * 180.0f) / M_PI)
#define DEG_TO_RAD(degrees) (((degrees) * M_PI) / 180.0f)
typedef union {
struct {