mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-05-23 06:54:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

fox_43E80 decomped, matches and data import in fox_bg, some cleanup (#63)

Browse Source 
* tank?

* matches and data

* excess files

* another extra file
This commit is contained in:
petrie911
2023-12-30 08:14:06 -06:00
committed by GitHub
parent 4bba3fa8be
commit 89cde81114
20 changed files with 2262 additions and 1959 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+14 -3
View File
@@ -132,9 +132,9 @@ void func_80042FDC(Object_408*);
void func_80042FE8(Object_408*);
// fox_43E80
void func_80043468(Player* );
void func_800444BC(Player *);
void func_80047504(Player *);
void func_80043468(Player* player);
void func_800444BC(Player * player);
void func_80047504(Player * player);
// sf_496E0
void func_80049C0C(Player *);
@@ -512,6 +512,17 @@ void func_800B7184(Player *, s32);
void func_800B73E0(Player *);
void func_800B852C(s32 , Item *);
void func_800B86CC(void);
void func_800AD7F0(Player *player);
void func_800ADF58(Player *player);
void func_800B415C(Player *player);
void func_800B41E0(Player *player);
void func_800B41EC(Player *player);
void func_800A46A0(Player* player);
void func_800A86E4(Player* player);
void func_800A887C(Player* player);
s32 func_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot,
f32 zRot, f32 arg9, f32 argA, f32 argB);
bool func_800A8054(s32 objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, Vec3f* arg7, Vec3f* arg8);
// fox_radio
s32 func_800BA7BC(u16*, s32);
include/gfx.h
+4
View File
@@ -26,6 +26,10 @@
#define VTX_T(x,y,z,s,t,cr,cg,cb,a) { { x, y, z }, 0, { s, t }, { cr, cg, cb, a } }
typedef struct {
u8 r, g, b;
} Color_RGB8; // size = 0x3
typedef union {
u16 data[SCREEN_HEIGHT * SCREEN_WIDTH];
u16 array[SCREEN_HEIGHT][SCREEN_WIDTH];
include/variables.h
+6 -4
View File
@@ -289,7 +289,7 @@ extern s32 D_8015F978;
extern s32 D_8015F97C;
extern s32 D_8015F980;
extern f32 D_8015F984;
extern f32 D_80161394;
// extern f32 D_80161394;
// fox_43AC0
extern s32 D_801613A0;
@@ -516,7 +516,7 @@ extern u8 D_80177B6C;
extern s32 D_80177B70[7];
extern u8 D_80177B8C;
extern s32 D_80177B90[7];
extern s8 D_80177BAC;
extern u8 D_80177BAC;
extern s32 D_80177BB0[7];
//
extern u16 D_Timer_80177BD0[4];
@@ -826,7 +826,7 @@ extern Gfx* D_E6A810_801B7584[];
extern Gfx* D_E6A810_801B7608[];
extern Gfx* D_E6A810_801B769C[];
extern f32 D_E6A810_801B83A8[];
extern s8 D_E6A810_801BA1E8;
extern u8 D_E6A810_801BA1E8;
// ovl_E9F1D0
extern f32 D_E9F1D0_801A7F58;
@@ -969,10 +969,12 @@ extern Gfx D_3000090[];
extern Gfx D_3000660[];
extern u16 D_3000BC0[];
extern Gfx D_3001C90[];
extern u16 D_3002E80[];
extern Gfx D_3003CE0[];
extern Gfx D_3004680[];
extern Gfx D_3005980[];
extern Gfx D_3005AB0[];
extern u16 D_3005EA8[];
extern Gfx D_30066B0[];
extern Gfx D_3007650[];
extern Gfx D_3008100[];
@@ -1053,7 +1055,6 @@ extern f32 D_302EE64[];
extern f32 D_302EE80[];
extern f32 D_302EE9C[];
// ast_918430, ast_922730
extern AnimationHeader D_4000080;
extern Limb* D_400014C[];
@@ -1210,6 +1211,7 @@ extern f32 D_60092E8[];
extern f32 D_6009388[];
extern Gfx D_60097E0[];
extern u16* D_6009B34[];
extern u16 D_6009BB8[];
extern f32 D_6009CC4[];
extern f32 D_6009CFC[];
extern Gfx D_6009E30[];