Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
127 changes: 60 additions & 67 deletions config/us/pilotwings64.us.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -453,76 +453,69 @@ segments:
- [0xD4290, c, app/code_D4290]
- [0xD55B0, c, app/wind_objects]

- [0xD5C40, data]
- [0xD5CD0, data]
- [0xD5D40, data]
- [0xD5D50, data]
- [0xD5F10, data]
- [0xD5F20, data]
- [0xD5F40, data]
- [0xD5F60, data]
- [0xD5F70, data]
- [0xD6030, data]
- [0xD62D0, data]
- [0xD62F0, data]
- [0xD6360, data]
- [0xD6410, data]
- [0xD6450, data]
- [0xD64D0, data]
- [0xD64E0, data]
- [0xD6510, data]
- [0xD6540, data]
- [0xD65F0, data]
- [0xD5C40, data] # app/code_51E30
- [0xD5D40, .data, app/code_52230]
- [0xD5D50, .data, app/code_560D0]
- [0xD5F10, .data, app/code_5A6A0]
- [0xD5F20, .data, app/cannonball]
- [0xD5F40, .data, app/code_60020]
- [0xD5F70, data] # app/code_61A60
- [0xD6030, .data, app/code_64070]
- [0xD62D0, .data, app/code_64730]
- [0xD6410, .data, app/code_68220]
- [0xD6450, data] # app/code_69BF0
- [0xD64D0, .data, app/code_6ACE0]
- [0xD6540, data] # also part of app/code_6ACE0
- [0xD65F0, .data, app/code_6ECD0]
- [0xD6610, .data, app/file_menu]
- [0xD6650, data]
- [0xD6660, data]
- [0xD6680, data]
- [0xD6690, data]
- [0xD66E0, data]
- [0xD66F0, data]
- [0xD6800, data]
- [0xD68B0, data]
- [0xD68C0, data]
- [0xD68D0, data]
- [0xD68E0, data]
- [0xD6910, data]
- [0xD6920, data]
- [0xD6930, data]
- [0xD6980, data]
- [0xD6CD0, data]
- [0xD6D20, data]
- [0xD6D80, data]
- [0xD6D90, data]
- [0xD6DC0, data]
- [0xD6DE0, data]
- [0xD6E00, data]
- [0xD6E30, data]
- [0xD6E40, data]
- [0xD6EA0, data]
- [0xD6EB0, data]
- [0xD7000, data]
- [0xD7010, data]
- [0xD70D0, data]
- [0xD70E0, data]
- [0xD7100, data]
- [0xD7140, data]
- [0xD73B0, data]
- [0xD7500, data]
- [0xD7980, data]
- [0xD7990, data]
- [0xD79C0, data]
- [0xD79E0, data]
- [0xD7A30, data]
- [0xD7A40, data]
- [0xD7A90, data]
- [0xD7AE0, data]
- [0xD7AF0, data]
- [0xD7B80, data]
- [0xD7BC0, data]
- [0xD6650, .data, app/code_71500]
- [0xD6660, .data, app/code_722D0]
- [0xD6680, .data, app/code_72910]
- [0xD6690, .data, app/code_72B70]
- [0xD66E0, .data, app/code_75A60]
- [0xD66F0, .data, app/code_796C0]
- [0xD68A0, .data, app/code_7C4C0]
- [0xD68B0, .data, app/code_7CF30]
- [0xD68C0, .data, app/code_7FED0]
- [0xD68D0, .data, app/code_82520]
- [0xD68E0, .data, app/code_82B90]
- [0xD6910, .data, app/code_8A760]
- [0xD6920, .data, app/code_905C0]
- [0xD6930, .data, app/level]
- [0xD6950, .data, app/credits]
- [0xD6CD0, .data, app/code_94E60]
- [0xD6D20, .data, app/map3d]
- [0xD6D70, .data, app/mem]
- [0xD6D80, .data, app/code_9A960]
- [0xD6D90, .data, app/code_9C080]
- [0xD6DE0, .data, app/code_9CF50]
- [0xD6E00, .data, app/code_9D3C0]
- [0xD6E30, .data, app/pads]
- [0xD6E40, .data, app/hud]
- [0xD6EA0, .data, app/demo_attitude]
- [0xD6EB0, data] # app/code_A8C30
- [0xD7000, data] # app/demo
- [0xD7010, data] # app/rings
- [0xD70D0, data] # app/code_AE460
- [0xD70E0, data] # app/code_AF950
- [0xD7100, data] # app/code_B2900
- [0xD7140, data] # app/code_B3A70
- [0xD7170, data] # app/code_B5280
- [0xD7500, data] # app/code_B6FE0
- [0xD7990, data] # app/code_BB820
- [0xD7A30, data] # app/code_BD670
- [0xD7A40, data] # app/snap
- [0xD7AE0, data] # app/snd
- [0xD7B40, data] # app/snow, might be incorrectly cut
- [0xD7B80, data] # app/spath
- [0xD7BC0, data] # app/code_C9B60
- [0xD7BD0, data] # app/code_CB7C0
- [0xD7CC0, data] # app/level_objects
- [0xD7D20, .data, app/thermals]
- [0xD7D30, data]
- [0xD7E10, data]
- [0xD7EF0, data]
- [0xD7E10, data] # app/code_CE4F0
- [0xD7EF0, data] # app/code_D2D50
- [0xD7F20, data] # app/code_D3810
- [0xD7F40, .rodata, app/code_51E30]
- [0xD7F60, .rodata, app/code_52230]
- [0xD8340, .rodata, app/code_556C0]
Expand Down
5 changes: 5 additions & 0 deletions config/us/sym/symbol_addrs_app.txt
Original file line number Diff line number Diff line change
Expand Up @@ -294,3 +294,8 @@ D_80355034 = 0x80355034; // type:f32 force_migration:True
D_80355038 = 0x80355038; // type:f32 force_migration:True
D_8035503C = 0x8035503C; // type:f32 force_migration:True
D_80355040 = 0x80355040; // type:f32 force_migration:True

D_8035AF30 = 0x8035AF30; // type:f32
D_8035AF34 = 0x8035AF34; // type:f32
D_8035AF38 = 0x8035AF38; // type:f32
D_8035AF3C = 0x8035AF3C; // type:f32
11 changes: 6 additions & 5 deletions src/app/cannonball.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@
#include "save.h"
#include "snd.h"

// .data likely owned by this file
extern f32 D_8034E9F0;
extern u8 D_8034E9F4;
extern s32 D_8034E9F8;
extern f32 D_8034EA00;
// .data
f32 D_8034E9F0 = 0.0f;
u8 D_8034E9F4 = 0;
s32 D_8034E9F8 = 0;
f32 D_8034E9FC = 0.0f; // used in cannonPilotLand
f32 D_8034EA00 = 0.0f;

// .bss likely owned by this file
extern Unk803599D0 D_80359A30;
Expand Down
4 changes: 4 additions & 0 deletions src/app/code_52230.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#include "common.h"
#include "code_52230.h"

// .data
// list of model ids
s32 D_8034E810[] = { 0xF4, 0xF5, 0xF6 };

#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CAD00.s")

#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CADE8.s")
Expand Down
15 changes: 15 additions & 0 deletions src/app/code_560D0.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
#include "common.h"

f32 D_8034E820 = 0.175f;

f32 D_8034E824[] = { -1.570797f, 0.0f, -0.26179948f, 0.005f, -0.2094396f, 0.01f, -0.1570797f, 0.02f, -0.0872665f, 0.05f, 0.0f, 0.1f,
0.0523599f, 0.15f, 0.0698132f, 0.2f, 0.07679452f, 0.5f, 0.08028518f, 0.85f, 0.08552117f, 1.05f, 0.090757154f, 1.0f,
0.1047198f, 0.85f, 0.1221731f, 1.05f, 0.1396264f, 1.43f, 0.1570797f, 1.65f, 0.174533f, 1.85f, 0.1919863f, 1.85f,
0.2094396f, 1.15f, 0.26179948f, 0.8f, 0.31415939f, 0.5f, 0.52359897f, 0.5f, 1.570797f, 0.5f, 0.0f, 0.0f,
0.5f, 0.1f, 5.0f, 0.25f, 10.0f, 0.8f, 20.0f, 1.0f, 30.0f, 0.9f, 35.0f, 0.75f,
40.0f, 0.54f, 50.0f, 0.35f, 60.0f, 0.22f, 100.0f, 0.0f };

f32 D_8034E934[] = { 0.0f, 0.0f, 0.3f, 0.0f, 1.7f, 0.0f, 3.0f, 0.0f, 7.0f, 0.6f, 13.0f, -1.3f, 15.0f, -2.0f, 18.0f, -2.2f, 20.0f, -2.5f, 21.0f, -1.8f,
23.9f, -1.0f, 24.0f, 0.0f, 24.1f, 1.0f, 25.0f, 2.0f, 33.5f, 2.2f, 36.0f, 2.0f, 51.0f, 1.8f, 67.0f, 1.3f, 81.5f, 20.0f, 100.0f, 50.0f };

// used in func_802CEBA0
f32 D_8034E9D4[3] = { 0.0f };

#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CEBA0.s")

#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CECB8.s")
Expand Down
10 changes: 7 additions & 3 deletions src/app/code_5A6A0.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@ typedef struct {
u8 pad20[0x40 - 0x20];
} Unk802D472C_SP60;

extern f32 D_8034E9E0;
extern u8 D_8034E9E4;
// .data
f32 D_8034E9E0 = 1.0f;
u8 D_8034E9E4 = 0;
s32 pad_D_8034E9E8 = 0;

// .bss
extern Unk803599D0 D_803599D0;
extern f32 D_80359A24;

Expand All @@ -36,7 +40,7 @@ static void func_802D532C(Unk802D3658_Arg0* arg0);
static void func_802D559C(Unk802D3658_Arg0* arg0);
static s32 func_802D4CA4(Unk802D3658_Arg0*, Mtx4F*);
static void func_802D58EC(Unk802D3658_Arg0*, Mtx4F*);
void func_802D4274(Unk802D3658_Arg0* arg0);
/* static */ void func_802D4274(Unk802D3658_Arg0* arg0);

void func_802D3170(u8 arg0, Unk802D3658_Arg0* arg1) {
f32 one;
Expand Down
10 changes: 10 additions & 0 deletions src/app/code_60020.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

#include "code_60020.h"

f32 D_8034EA10 = 0.0f;
f32 D_8034EA14 = 0.0f;
f32 D_8034EA18 = 0.0f;
f32 D_8034EA1C = 0.0f;
f32 D_8034EA20 = 0.0f;
f32 D_8034EA24 = 0.0f;
s32 padD_8034EA28 = 0;
s32 padD_8034EA2C = 0;
Vec3F D_8034EA30 = { 0.0f, 0.0f, 0.0f }; // used for assignment in func_802D9430

#pragma GLOBAL_ASM("asm/nonmatchings/app/code_60020/func_802D8AF0.s")

#pragma GLOBAL_ASM("asm/nonmatchings/app/code_60020/func_802D9220.s")
Expand Down
103 changes: 103 additions & 0 deletions src/app/code_64070.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,108 @@
#include "common.h"

typedef struct {
u16 unk0;
u8 unk2;
u16 unk4;
} Unk8034EBD8_Unk4;

typedef struct {
u8 length;
Unk8034EBD8_Unk4* unk4;
} Unk8034EBD8;

Unk8034EBD8_Unk4 D_8034EB00[] = {
{ 0xDF, 0x6C, 0x4D },
{ 0xDC, 0xB2, 0x4E },
{ 0xDD, 0xC4, 0x4F },
{ 0x2E, 0xA3, 0x50 },
};

Unk8034EBD8_Unk4 D_8034EB18[] = {
{ 0xE3, 0x62, 0x52 },
{ 0xE3, 0x92, 0x51 },
{ 0xC1, 0xB3, 0x4E },
{ 0xC1, 0xC6, 0x53 },
{ 0x2E, 0xA3, 0x50 },
};

Unk8034EBD8_Unk4 D_8034EB38[] = {
{ 0xE6, 0x7E, 0x54 },
{ 0xE6, 0x68, 0x55 },
{ 0xD8, 0xA7, 0x4E },
{ 0xD8, 0xB9, 0x56 },
{ 0x2E, 0xA3, 0x50 },
};

Unk8034EBD8_Unk4 D_8034EB58[] = {
{ 0xFB, 0x68, 0x57 },
{ 0x26, 0xB3, 0x58 },
};

Unk8034EBD8_Unk4 D_8034EB64[] = {
{ 0xDF, 0x6A, 0x59 },
{ 0xDA, 0xA1, 0x5A },
{ 0x3B, 0xC8, 0x5B },
{ 0x3B, 0xB4, 0x5C },
{ 0x3B, 0x9F, 0x5D },
{ 0x1E, 0x9F, 0x5E },
{ 0x26, 0xB4, 0x5F },
{ 0x26, 0xC9, 0x60 },
};

Unk8034EBD8_Unk4 D_8034EB94[] = {
{ 0xDE, 0x68, 0x61 },
{ 0x3B, 0xB3, 0x62 },
{ 0x3B, 0xC6, 0x63 },
{ 0x1B, 0xB3, 0x5E },
{ 0x23, 0xC3, 0x5F },
{ 0x23, 0xD0, 0x60 },
};

Unk8034EBD8_Unk4 D_8034EBB8[] = {
{ 0xE4, 0x63, 0x64 },
{ 0xE4, 0x83, 0x65 },
{ 0xDC, 0xB2, 0x4E },
{ 0xDC, 0xC4, 0x4F },
{ 0x2E, 0xA3, 0x50 },
};

Unk8034EBD8 D_8034EBD8[] = {
{ 0x04, D_8034EB00 },
{ 0x05, D_8034EB38 },
{ 0x05, D_8034EB18 },
{ 0x02, D_8034EB58 },
{ 0x08, D_8034EB64 },
{ 0x06, D_8034EB94 },
{ 0x05, D_8034EBB8 },
};

s16 D_8034EC10[] = { 0x7A, 0x35, 0x9E, 0x35, -1, 0x9D, 0x35, 0x9D, 0x64, -1, 0xBE, 0x24, 0xBE,
0x46, -1, 0xF4, 0x48, 0xF4, 0x5D, -1, 0xF4, 0x5C, 0xC6, 0x5C, -1, -1 };

s16 D_8034EC44[] = { 0xD5, 0xC3, 0xB0, 0x93, -1, 0x9C, 0x7C, 0x4B, 0x7C, 0x4B, 0x9F, -1, 0xDC, 0x7C,
0xB2, 0x7C, -1, 0xB3, 0x7C, 0xB3, 0x67, -1, 0xBD, 0x7C, 0xBD, 0x70, -1, -1 };

s16 D_8034EC7C[] = {
0xB2, 0x67, 0xB2, 0x99, 0xDF, 0x99, -1, 0xBC, 0x6E, 0xDF, 0x6E, -1, 0xBB, 0xCB, 0xAF, 0x98, -1, 0x9C, 0x7C, 0x4B, 0x7C, 0x4B, 0x9F, -1, -1
};

s16 D_8034ECB0[] = {
0xB2, 0x67, 0xB2, 0x84, 0xE1, 0x84, -1, 0xBC, 0x6E, 0xE1, 0x6E, -1, 0xAF, 0x98, 0xD0, 0xBD, -1, 0x9C, 0x7C, 0x4B, 0x7C, 0x4B, 0x9F, -1, -1
};

s16 D_8034ECE4[] = { 0x9C, 0x7C, 0x4B, 0x7C, 0x4B, 0xAD, -1, 0xBC, 0x6E, 0xF5, 0x6E, -1, -1 };

s16 D_8034ED00[] = { 0xB2, 0x67, 0xB2, 0xA7, 0xD2, 0xA7, -1, 0xBC, 0x6F, 0xDA, 0x6F, -1, 0x9C, 0x7C, 0x4B, 0x7C, 0x4B, 0x99, -1, -1 };

s16 D_8034ED28[] = { 0x4B, 0xAB, 0x4B, 0x80, 0x9B, 0x80, -1, 0xBC, 0x6E, 0xDA, 0x6E, -1, -1 };

s16 D_8034ED44[] = {
0xB2, 0x67, 0xB2, 0x89, 0xDF, 0x89, -1, 0xBC, 0x6E, 0xDF, 0x6E, -1, 0xAF, 0x98, 0xD5, 0xC3, -1, 0x9C, 0x7C, 0x4B, 0x7C, 0x4B, 0x9F, -1, -1
};

s16* D_8034ED78[] = { D_8034EC44, D_8034ECB0, D_8034EC7C, D_8034ECE4, D_8034ED00, D_8034ED28, D_8034ED44, NULL, NULL, NULL };

#pragma GLOBAL_ASM("asm/nonmatchings/app/code_64070/func_802DCB40.s")

#pragma GLOBAL_ASM("asm/nonmatchings/app/code_64070/func_802DCBA0.s")
Expand Down
38 changes: 38 additions & 0 deletions src/app/code_64730.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,42 @@
#include "common.h"
#include "code_5A6A0.h"

s8 D_8034EDA0 = 0;
s8 D_8034EDA4[] = { 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };

f32 D_8034EDBC = 0.0f;

u8 D_8034EDC0 = 0xFF;
u8 D_8034EDC4 = 0xFF;
s32 D_8034EDC8 = 0xFFFF;
s32 D_8034EDCC = 0xFFFF;
s32 D_8034EDD0 = 0;
s32 D_8034EDD4 = 0;
s32 D_8034EDD8 = 0;

Unk803599D0 D_8034EDDC[] = { 8, 0.36f, 0.0f, 0.412f, 0.1f, 0.465f, 0.25f, 0.517f, 0.475f, 0.568f, 0.5f, 0.62f, 0.475f, 0.673f, 0.25f, 0.725f, 0.0f };

s32 padD_8034ED30[4] = { 0 };

s16 D_8034EE30[] = { 0x0110, 0x0114, 0x0116, 0x0118, 0x011A, 0x011C, 0x011E, 0x0122, 0x0123, 0x0124, 0x0125, 0x0126, 0x0127, 0x012B,
0x012D, 0x012F, 0x0131, 0x0133, 0x0135, 0x0136, 0x0137, 0x0138, 0x0139, 0x013A, 0x0144, 0x014A, 0x014C, 0x014D,
0x014E, 0x014F, 0x0150, 0x0152, 0x0153, 0x0154, 0x0155, 0x0156, 0x013B, 0x013E, 0x013F, 0x0140, 0x0141, 0x0142 };

u8 D_8034EE84[] = {
0x4C, 0x4D, 0x4B, 0x51, 0x50, 0x4F, 0x4E, 0x00,
};

f32 D_8034EE8C[] = {
-0.745f, -1.336f, -1.221f, -0.828f, -1.36f, -1.076f, -0.745f, -1.336f, -1.0f, -1.0f, -1.0f, -1.0f,
};

f32 D_8034EEBC[] = {
-0.745f, -1.336f, -1.221f, -0.828f, -1.36f, -1.076f,
};

f32 D_8034EED4 = 0.0f;
f32 D_8034EED8 = 1.6f;

#pragma GLOBAL_ASM("asm/nonmatchings/app/code_64730/func_802DD200.s")

Expand Down
Loading