Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions config/us/pilotwings64.us.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,9 @@ segments:
subsegments:
- [0x51E30, c, app/code_51E30]
- [0x52230, c, app/balls]
- [0x556C0, c, app/code_556C0]
- [0x560D0, c, app/birdman]
- [0x536E0, c, app/birdman0]
- [0x556C0, c, app/birdman1]
- [0x560D0, c, app/birdman2]
- [0x58120, c, app/bmsound]
- [0x58B00, c, app/code_58B00]
- [0x597E0, c, app/bonus]
Expand Down Expand Up @@ -465,7 +466,7 @@ segments:

- [0xD5C40, data] # app/code_51E30
- [0xD5D40, .data, app/balls]
- [0xD5D50, .data, app/birdman]
- [0xD5D50, .data, app/birdman2]
- [0xD5F10, .data, app/code_5A6A0]
- [0xD5F20, .data, app/cannonball]
- [0xD5F40, .data, app/code_60020]
Expand Down Expand Up @@ -529,8 +530,9 @@ segments:
- [0xD7F20, .data, app/code_D3810]
- [0xD7F40, .rodata, app/code_51E30]
- [0xD7F60, .rodata, app/balls]
- [0xD8340, .rodata, app/code_556C0]
- [0xD83B0, .rodata, app/birdman]
- [0xD7FC0, .rodata, app/birdman0]
- [0xD8340, .rodata, app/birdman1]
- [0xD83B0, .rodata, app/birdman2]
- [0xD84A0, .rodata, app/bmsound]
- [0xD8590, .rodata, app/code_58B00]
- [0xD85D0, .rodata, app/bonus]
Expand Down
53 changes: 52 additions & 1 deletion config/us/sym/symbol_addrs_app.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,54 @@

app_firstfunc = 0x802CA900; // type:func

ballsInit = 0x802CAD00; // type:func
ballsInitBall = 0x802CADE8; // type:func
balls_802CAF50 = 0x802CAF50; // type:func
ballsLoad = 0x802CB094; // type:func
ballsMotionUpdate = 0x802CB2FC; // type:func
ballsDeinit = 0x802CB35C; // type:func
ballsFrameUpdate = 0x802CB3F8; // type:func
ballsFrameUpdateOne = 0x802CB56C; // type:func
balls_802CB6D4 = 0x802CB6D4; // type:func
balls_802CB9B4 = 0x802CB9B4; // type:func
ballsCollision = 0x802CBC9C; // type:func
ballsPhysics = 0x802CBE94; // type:func
ballsPopped = 0x802CBE94; // type:func
ballsGet_802CC064 = 0x802CC064; // type:func
balls_802CC0D4 = 0x802CC0D4; // type:func
ballsGetCount = 0x802CC13C; // type:func
ballsGet_802CC15C = 0x802CC15C; // type:func

// birdman0
bird_802CC1B0 = 0x802CC1B0; // type:func
bird_802CC270 = 0x802CC270; // type:func
bird_802CC39C = 0x802CC39C; // type:func
bird_802CC51C = 0x802CC51C; // type:func
bird_802CC55C = 0x802CC55C; // type:func
bird_802CD0F8 = 0x802CD0F8; // type:func
bird_802CD2E8 = 0x802CD2E8; // type:func
bird_802CE0A4 = 0x802CE0A4; // type:func

// birdman1
bird_802CE190 = 0x802CE190; // type:func
bird_802CEA60 = 0x802CEA60; // type:func
bird_802CEB68 = 0x802CEB68; // type:func

// birdman2
bird_802CEBA0 = 0x802CEBA0; // type:func
bird_802CECB8 = 0x802CECB8; // type:func
bird_802CEDF8 = 0x802CEDF8; // type:func
bird_802CF24C = 0x802CF24C; // type:func
bird_802CF5B4 = 0x802CF5B4; // type:func
bird_802CF640 = 0x802CF640; // type:func
bird_802CF76C = 0x802CF76C; // type:func
bird_802CF8A4 = 0x802CF8A4; // type:func
bird_802CFAC8 = 0x802CFAC8; // type:func
bird_802CFEA8 = 0x802CFEA8; // type:func
bird_802CFF74 = 0x802CFF74; // type:func
bird_802D0080 = 0x802D0080; // type:func
bird_802D08F8 = 0x802D08F8; // type:func
bird_802D0A28 = 0x802D0A28; // type:func
bird_802D0ABC = 0x802D0ABC; // type:func

bonusStar_802D25AC = 0x802D25AC; // type:func

Expand Down Expand Up @@ -362,6 +408,11 @@ gClassShortNames = 0x80350988; // size:0x10
gVehShortNames = 0x80350998; // size:0x1C
gCurTestIdx = 0x803509B4;

gBallCount = 0x80357210;
gBallSplitCount = 0x80357211;
gBalls = 0x80357218; // size:0x2170
sRefBALS = 0x8035938C;

sOptionsPanel = 0x8036C120; // type:s16
sStickHeld = 0x8036C124;
sGameComplete = 0x8036C128;
Expand Down
2 changes: 2 additions & 0 deletions include/uv_janim.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <uv_dobj.h>

void* uvJanimLoad(s32);
void func_80200638(s32, Unk80371120*);
void func_802006FC(Unk80371120*, Unk80371120*, Unk80371120*, f32);
void func_80200B00(s32, s32, f32);
void uvJanimPoseLine(Unk80371120*, s32, f32);
void uvJanimPoseGrid(Unk80371120*, s32, f32, f32);
Expand Down
135 changes: 85 additions & 50 deletions include/uv_level.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,32 @@ typedef struct Unk802D3658_Unk230 {

typedef struct {
s32 unk0;
u8 pad4[0x18];
Vec3F unk4;
Vec3F unk10;
Vec3F unk1C;
Vec3F unk28;
} Unk802D3658_Unk1120;
} Unk802D3658_Unk1120; // size = 0x34

typedef struct {
s32 unk0;
u8 pad4[0x24];
Unk802D3658_Unk1120 unk4[5];
} Unk802D3658_Unk111C; // size = 0x108

typedef struct {
s32 unk0;
s32 unk4;
s32 unk8;
u8 pad8[0xC];
f32 unk18;
Vec3F unk1C;
Vec3F unk28;
Vec3F unk34;
} Unk802D3658_Unk1228;
} Unk802D3658_Unk1228; // size = 0x40

typedef struct {
s32 unk0;
Unk802D3658_Unk1228 unk4[5];
} Unk802D3658_Unk1224; // size = 0x144

typedef struct {
u8 unk0;
Expand Down Expand Up @@ -118,9 +133,7 @@ typedef struct {
f32 unk5C;
f32 unk60;
f32 unk64;
f32 unk68;
f32 unk6C;
f32 unk70;
Vec3F unk68;
f32 unk74;
f32 unk78;
f32 unk7C;
Expand Down Expand Up @@ -159,13 +172,8 @@ typedef struct {
u8 pad1108[0x1114 - 0x1108];
u8 unk1114;
u8 pad1115[0x111C - 0x1115];

s32 unk111C;
Unk802D3658_Unk1120 unk1120[5]; // 1120:1223

s32 unk1224;
Unk802D3658_Unk1228 unk1228[5]; // 1228:1367

Unk802D3658_Unk111C unk111C;
Unk802D3658_Unk1224 unk1224;
f32 unk1368;
f32 unk136C;
f32 unk1370;
Expand Down Expand Up @@ -217,6 +225,33 @@ typedef struct {
s32 unkA8;
} Unk80362690;

typedef struct {
Vec3F pos;
u8 padC[0x18 - 0xC];
s32 unk18;
f32 unk1C;
u8 type; // 0x20
u8 unk21;
u8 pad22[0x24 - 0x22];
f32 unk24;
f32 unk28;
f32 unk2C;
f32 scale; // 0x30
s32 unk34;
s32 unk38;
f32 unk3C;
f32 unk40;
u8 pad44[4];
f32 unk48;
f32 unk4C;
f32 unk50;
s32 unk54;
s32 unk58;
f32 unk5C;
f32 unk60;
f32 unk64;
} LevelBALS;

typedef struct {
Vec3F pos;
Vec3F angle;
Expand Down Expand Up @@ -329,42 +364,42 @@ typedef struct {
f32 unk404;
f32 unk408;
u8 unk40C[0x10];
u8 countTHER; // count THER
u8 countLWIN; // count LWIN
u8 countTPAD; // count TPAD
u8 countLPAD; // count LPAD
u8 countLSTP; // count LSTP
u8 countRNGS; // count RNGS
u8 countBALS; // count BALS
u8 countTARG; // count TARG
u8 countHPAD; // count HPAD
u8 countBTGT; // count BTGT
u8 countPHTS; // count PHTS
u8 countFALC; // count FALC
u8 countSDFM; // count SDFM
u8 countCNTG; // count CNTG
u8 countHOPD; // count HOPD
u8 countOBSV; // count OBSV
u8 countTHER;
u8 countLWIN;
u8 countTPAD;
u8 countLPAD;
u8 countLSTP;
u8 countRNGS;
u8 countBALS;
u8 countTARG;
u8 countHPAD;
u8 countBTGT;
u8 countPHTS;
u8 countFALC;
u8 countSDFM;
u8 countCNTG;
u8 countHOPD;
u8 countOBSV;
} comm;
void* dataNAME; // ptr NAME
void* dataINFO; // ptr INFO
void* dataJPTX; // ptr JPTX
LevelTHER* dataTHER; // ptr THER
void* dataLWIN; // ptr LWIN
void* dataTPAD; // ptr TPAD
void* dataLPAD; // ptr LPAD
void* dataLSTP; // ptr LSTP
void* dataRNGS; // ptr RNGS
void* dataBALS; // ptr BALS
void* dataTARG; // ptr TARG
void* dataHPAD; // ptr HPAD
void* dataBTGT; // ptr BTGT
void* dataPHTS; // ptr PHTS
void* dataFALC; // ptr FALC
void* dataSDFM; // ptr SDFM
void* dataCNTG; // ptr CNTG
void* dataHOPD; // ptr HOPD
LevelOBSV* dataOBSV; // ptr OBSV
void* dataNAME;
void* dataINFO;
void* dataJPTX;
LevelTHER* dataTHER;
void* dataLWIN;
void* dataTPAD;
void* dataLPAD;
void* dataLSTP;
void* dataRNGS;
LevelBALS* dataBALS;
void* dataTARG;
void* dataHPAD;
void* dataBTGT;
void* dataPHTS;
void* dataFALC;
void* dataSDFM;
void* dataCNTG;
void* dataHOPD;
LevelOBSV* dataOBSV;
} LevelCommObjects;

extern Unk80362690* D_80362690;
Expand Down Expand Up @@ -416,7 +451,7 @@ s32 levelDataGetOBSV(LevelOBSV** data);
s32 levelDataGetLPAD(void** data);
s32 levelDataGetLSTP(void** data);
s32 levelDataGetRNGS(void** data);
s32 levelDataGetBALS(void** data);
s32 levelDataGetBALS(LevelBALS** data);
s32 levelDataGetTARG(void** data);
s32 levelDataGetHPAD(void** data);
s32 levelDataGetBTGT(LevelBTGT** data);
Expand Down
2 changes: 1 addition & 1 deletion include/uv_model.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <uv_matrix.h>

s32 uvModelGet(s32, s32);
void uvModelGetProps(s32, s32, void*, s32);
void uvModelGetProps(s32, ...);
void uvModelGetPosm(s32 model, s32 part, Mtx4F*);

#endif // UV_MODEL_H
Loading