Skip to content

Decompile some of app/code_61A60 #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gcsmith merged 4 commits into from
Mar 8, 2026
Merged

Decompile some of app/code_61A60 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a83bcfc
Decompile some of app/code_61A60
queueRAM Mar 5, 2026
87e15e9
Match func_802DBE64 and func_802DC074
queueRAM Mar 6, 2026
4451d65
Decompile func_802DB6D4, func_802DB9B8, func_802DB38C
queueRAM Mar 7, 2026
b229343
Update func_802300F0 interface from PR#83
queueRAM Mar 7, 2026
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
2 changes: 1 addition & 1 deletion include/uv_level.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ typedef struct {
s32 unk0;
s32 unk4;
s32 unk8;
u8 pad8[0xC];
Vec3F unkC;
f32 unk18;
Vec3F unk1C;
Vec3F unk28;
Expand Down
1 change: 1 addition & 0 deletions include/uv_sobj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ void uvSobjPosm(u32 soid, s32 dstIdx, Mtx4F* src);
void uvSobj_8022D168(u32 soid, s32 srcIdx, Mtx4F* dst);
u16 uvSobj_8022D1E4(u32 soid);
void uvSobjModel(u32 soid, s32);
s32 uvSobjGetSeg(s32 terraId, f32, f32, f32, f32, f32, f32, s32**, f32**, Vec3F**);

#endif // UV_SOBJ_H
24 changes: 12 additions & 12 deletions src/app/birdman2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ void bird_802CECB8(Unk80367704* arg0) {
arg0->unk234.z = 0.0f;
arg0->unk234.y = 0.0f;
arg0->unk234.x = 0.0f;
arg0->unk258 = 0.0f;
arg0->unk254 = 0.0f;
arg0->unk250 = 0.0f;
arg0->unk250.z = 0.0f;
arg0->unk250.y = 0.0f;
arg0->unk250.x = 0.0f;
arg0->unk25C.y = 0.0f;
arg0->unk24C = 0.0f;
arg0->unk248 = arg0->unk24C;
Expand Down Expand Up @@ -192,7 +192,7 @@ void bird_802CEDF8(Unk80367704* arg0) {
break;
}
} else {
arg0->unk258 = -arg0->unk2B4 * 5.6f * arg0->unkE4;
arg0->unk250.z = -arg0->unk2B4 * 5.6f * arg0->unkE4;
func_80313E18(&arg0->unk25C, &arg0->unk10);
arg0->unk200.x = func_80313AF4(0.0f, arg0->unk200.x, 10.0f);
arg0->unk200.y = func_80313AF4(0.0f, arg0->unk200.y, 10.0f);
Expand All @@ -209,8 +209,8 @@ void bird_802CEDF8(Unk80367704* arg0) {
arg0->unk228.z = 0.0f;
arg0->unk228.y = 0.0f;
arg0->unk228.x = 0.0f;
arg0->unk254 = 0.0f;
arg0->unk250 = 0.0f;
arg0->unk250.y = 0.0f;
arg0->unk250.x = 0.0f;
if (arg0->unk2D0 > 1.9f) {
arg0->unk105 = 0;
arg0->unk164 = 2.5f;
Expand All @@ -231,19 +231,19 @@ void bird_802CEDF8(Unk80367704* arg0) {
arg0->unk218.x += D_8034F854 * arg0->unk234.x;
arg0->unk218.y += D_8034F854 * arg0->unk234.y;
arg0->unk218.z += D_8034F854 * arg0->unk234.z;
arg0->unk244 += D_8034F854 * arg0->unk250;
arg0->unk248 += D_8034F854 * arg0->unk254;
arg0->unk24C += D_8034F854 * arg0->unk258;
arg0->unk244 += D_8034F854 * arg0->unk250.x;
arg0->unk248 += D_8034F854 * arg0->unk250.y;
arg0->unk24C += D_8034F854 * arg0->unk250.z;
uvMat4LocalTranslate(&arg0->unk10, arg0->unk200.x * D_8034F854, arg0->unk200.y * D_8034F854, arg0->unk200.z * D_8034F854);
uvMat4RotateAxis(&arg0->unk10, arg0->unk24C * D_8034F854, 'z');
uvMat4RotateAxis(&arg0->unk10, arg0->unk244 * D_8034F854, 'x');
uvMat4RotateAxis(&arg0->unk10, arg0->unk248 * D_8034F854, 'y');
arg0->unk228.x = 0.0f;
arg0->unk228.y = 0.0f;
arg0->unk228.z = 0.0f;
arg0->unk250 = 0.0f;
arg0->unk254 = 0.0f;
arg0->unk258 = 0.0f;
arg0->unk250.x = 0.0f;
arg0->unk250.y = 0.0f;
arg0->unk250.z = 0.0f;
if (arg0->unk104 != 3) {
bird_802D0ABC(arg0);
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/cannonball.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "code_5A6A0.h"
#include "code_60020.h"
#include "code_66160.h"
#include "code_69BF0.h"
#include "code_72010.h"
#include "code_72B70.h"
#include "code_7FED0.h"
Expand Down Expand Up @@ -793,7 +794,6 @@ void cannonLoadPilot(u8 pilot, Unk802D5B50_Arg2* arg1) {
#pragma GLOBAL_ASM("asm/nonmatchings/app/cannonball/cannonLoad802D77D8.s")
#else
// protos might be incorrect
void func_802E26C0(void);
void func_802E66F4(f32);
void func_802E68B0(s32);
void func_802EDD9C(void*, Mtx4F*);
Expand Down
9 changes: 5 additions & 4 deletions src/app/code_5A6A0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "demo.h"
#include "environment.h"

// TODO: Unk802D472C_SP60 needs to be merged with some combination of Unk802D3658_Unk1224/8
typedef struct {
s32 unk0;
u8 pad4[0x1C - 0x4];
Expand Down Expand Up @@ -638,7 +639,7 @@ s32 func_802D472C(Unk802D3658_Arg0* arg0, Mtx4F* arg1) {
sp1A8.y += arg0->unk8 * dy;
sp1A8.z += arg0->unk8 * dz;
}
temp_v0 = func_802DB224(&sp60[0].unk0, 0xD, arg0->unk4, arg0->unk6, &sp1A8, &sp1B4);
temp_v0 = func_802DB224((Unk802D3658_Unk1224*)&sp60, 0xD, arg0->unk4, arg0->unk6, &sp1A8, &sp1B4);
if (temp_v0 == 0) {
return 0;
}
Expand Down Expand Up @@ -672,10 +673,10 @@ s32 func_802D472C(Unk802D3658_Arg0* arg0, Mtx4F* arg1) {

s32 func_802D4A30(Unk802D3658_Arg0* arg0, Mtx4F* arg1) {
s32 sp2A4;
u8 pad[0x144];
s32 pad;
Unk802D3658_Unk1120* temp_s2;
Unk802D3658_Unk1228* var_s3;
s32 sp154;
Unk802D3658_Unk1224 sp154;
Vec3F sp148;
Vec3F sp13C;
Vec3F sp130;
Expand Down Expand Up @@ -708,7 +709,7 @@ s32 func_802D4A30(Unk802D3658_Arg0* arg0, Mtx4F* arg1) {
sp130.y = sp70.m[3][1] + (arg1->m[1][1] * 1.5f * arg0->unk3C);
sp130.z = sp70.m[3][2] + (arg1->m[1][2] * 1.5f * arg0->unk3C);
(void)func_802DB224(&sp154, 9, arg0->unk4, arg0->unk6, &sp13C, &sp130);
if (sp154 > 0) {
if (sp154.unk0 > 0) {
return -1;
}
uvMat4LocalTranslate(arg1, sp148.x, sp148.y, sp148.z);
Expand Down
Loading