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
14 changes: 7 additions & 7 deletions docs/pilotwings64_file_system.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,13 @@ HOPD is the target area for the jumble hopper missions.

Offset | Type | Description
-------|------|------------
0x0 | f32 | X position
0x4 | f32 | Y position
0x8 | f32 | Z position
0xC | ?? | TBD
0x13 | u8 | TBD (0x01
0x14 | f32 | scale
0x18 | f32 | height
0x0 | ?? | TBD
0x4 | f32 | X position
0x8 | f32 | Y position
0xC | f32 | Z position
0x10 | s32 | TBD (always 0x01)
0x14 | f32 | scale (either 40.0 or 30.0)
0x18 | f32 | height (always 50.0)
0x1C | ?? | TBD
0x20 | | **Total length**

Expand Down
20 changes: 18 additions & 2 deletions include/uv_level.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,22 @@ typedef struct {
s32 unkA8;
} Unk80362690;

typedef struct {
Vec3F pos;
Vec3F angle;
u8 unk18;
u8 padC[3];
} LevelBTGT;

typedef struct {
u8 pad0[4];
Vec3F pos;
s32 unk10;
f32 scale;
f32 height;
u8 pad1C[4];
} LevelHOPD;

typedef struct {
f32 x;
f32 y;
Expand Down Expand Up @@ -246,9 +262,9 @@ u8 levelDataGetRNGS(void** data);
u8 levelDataGetBALS(void** data);
u8 levelDataGetTARG(void** data);
u8 levelDataGetHPAD(void** data);
u8 levelDataGetBTGT(void** data);
u8 levelDataGetBTGT(LevelBTGT** data);
u8 levelDataGetPHTS(void** data);
u8 levelDataGetFALC(void** data);
u8 levelDataGetHOPD(void** data);
u8 levelDataGetHOPD(LevelHOPD** data);

#endif // UV_LEVEL_H
2 changes: 1 addition & 1 deletion src/app/cannonball.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ void cannonMovementFrame(Unk802D5C5C_Arg0* arg0, u8 arg1) {
}
hud->radarUnk70 = arg0->unk14.m[3][2];
hud->elapsedTime = arg0->unk8;
hud->unk18 = arg0->unkA4;
hud->power = arg0->unkA4;
hud->unk8C = arg0->unk1CC * 4.0f * 0.7f;
hud->altitude = arg0->unk120 * 0.7f;
hud->altSeaLevel = arg0->unk14.m[3][2] * 0.7f;
Expand Down
1 change: 1 addition & 0 deletions src/app/cannonball.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define APP_CANNONBALL_H

#include <PR/ultratypes.h>
#include <uv_level.h>
#include <uv_matrix.h>
#include "code_5A6A0.h"

Expand Down
1 change: 1 addition & 0 deletions src/app/code_9A960.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
extern f32 D_8034F850; // .data related to time
extern f32 D_8034F854; // .data = 0.1f, only ever read

void func_80313430(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5);
void func_80313570(Mtx4F*, f32*, f32*, f32*, f32*, f32*, f32*);
void func_80313640(f32 tx, f32 ty, f32 tz, f32 rz, f32 rx, f32 ry, Mtx4F* mat);
f32 func_80313AF4(f32, f32, f32);
Expand Down
27 changes: 27 additions & 0 deletions src/app/code_9E2F0.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,33 @@

#include <uv_level.h>

typedef struct {
u8 unk0[4];
f32 x;
f32 y;
s32 unkC;
u8 unk10[4];
u8 unk14;
u8 pad15[3];
} Unk8036C2E8;

typedef struct {
f32 unk0;
f32 unk4;
u8 pad8[4];
f32 unkC;
f32 unk10;
u8 pad14[0x10];
f32 x;
f32 y;
u8 unk2C[0x10];
} Unk8036C438;

extern u8 D_8036C2B9; // count of D_8036C2E8, related to objects shown on radar
extern u8 D_8036C2BA; // count of D_8036C438, related to objects shown on radar
extern Unk8036C2E8 D_8036C2E8[]; // landing pads?
extern Unk8036C438 D_8036C438[]; // landing strips?

void func_80316DC0(void);
void func_80316E40(void);
void func_80317634(Unk80345464_Arg0*);
Expand Down
14 changes: 14 additions & 0 deletions src/app/code_CDB20.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
#ifndef APP_CODE_CDB20_H
#define APP_CODE_CDB20_H

#include <PR/ultratypes.h>

typedef struct {
u8 pad0[4];
f32 unk4;
f32 unk8;
f32 unkC;
u8 pad10[4];
f32 unk14;
} Unk8037AB58;

extern u8 D_8037AB54; // count of D_8037AB58, related to objects shown on radar
extern Unk8037AB58 D_8037AB58[]; // rings?

void func_803465F0(void);
void func_8034662C(void);
void func_8034695C(void);
Expand Down
Loading