mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-09-07 11:11:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge headers from nitro decomp (#69)

Browse Source 
* merge headers from nitro decomp

* cleanup: use inlines from g2.h and gx.h when changing registers

* cleanup: remove externs declarations in source files
This commit is contained in:
Yanis
2026-05-25 02:55:16 +02:00
committed by GitHub
parent 530fcd8c07
commit 69ef244371
138 changed files with 3084 additions and 1096 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/031_Land/MapObject/MapObjectChestBase.cpp
+13 -13
View File
@@ -8,8 +8,8 @@
extern "C" unk32 func_0200f218(unk32, const char *);
extern "C" void func_0200b58c(void *);
extern "C" void func_01ffb714(Vec3p *, Vec3p *, void *);
extern "C" void func_01ffcfcc(Vec3p *, Vec3p *, Vec3p *);
extern "C" void func_01ffb714(VecFx32 *, VecFx32 *, void *);
extern "C" void func_01ffcfcc(VecFx32 *, VecFx32 *, VecFx32 *);
struct UnkStruct_ov031_02117c84 {
u16 mUnk_00;
@@ -90,14 +90,14 @@ ARM bool MapObjectChestBase::vfunc_00() {
// non-matching
ARM void MapObjectChestBase::vfunc_04() {
q20 iVar2;
fx32 iVar2;
UnkStruct_027e0cd8_0c *pUVar5;
Vec3p sp48;
Vec3p sp3C;
Vec3p local_38;
Vec3p local_44;
Vec3p sp18;
Vec3p spC;
VecFx32 sp48;
VecFx32 sp3C;
VecFx32 local_38;
VecFx32 local_44;
VecFx32 sp18;
VecFx32 spC;
Vec2b local_5e;
Vec2b local_62;
Vec2b local_64;
@@ -125,7 +125,7 @@ ARM void MapObjectChestBase::vfunc_04() {
spC.y = FLOAT_TO_Q20(1.0f);
spC.z = FLOAT_TO_Q20(0.5f);
Vec3p_Add((Vec3p *) &sp3C, &spC, (Vec3p *) &sp3C);
VecFx32_Add((VecFx32 *) &sp3C, &spC, (VecFx32 *) &sp3C);
local_68.x = this->mUnk_3A.x;
local_68.y = this->mUnk_3A.y;
@@ -180,7 +180,7 @@ ARM void MapObjectChestBase::vfunc_04() {
}
}
func_01ffcfcc(&local_44, &sp48, (Vec3p *) &sp3C);
func_01ffcfcc(&local_44, &sp48, (VecFx32 *) &sp3C);
this->mUnk_050.mUnk_0C.x = local_44.x;
this->mUnk_050.mUnk_0C.y = local_44.y;
@@ -251,8 +251,8 @@ ARM bool MapObjectChestBase::vfunc_44() {
}
ARM void MapObjectChestBase::func_ov031_02103f48() {
Vec3p local_10;
Vec3p_Init(this->mPos.x, this->mPos.y + 0x800, this->mPos.z, &local_10);
VecFx32 local_10;
VecFx32_Init(this->mPos.x, this->mPos.y + 0x800, this->mPos.z, &local_10);
data_027e0cec->func_ov000_0209feac(0x81f, &local_10, 4, 0, 0);
}
src/031_Land/MapObject/MapObjectDoorBase.cpp
+20 -20
View File
@@ -1,10 +1,10 @@
#define DOORBASE_DTOR_NOINLINE
#include "MapObject/MapObjectDoorBase.hpp"
#include "Unknown/Common.hpp"
#include "Unknown/UnkMemFuncs.h"
#include "Unknown/UnkStruct_0204af1c.hpp"
#include "Unknown/UnkStruct_027e0998.hpp"
#include "Unknown/UnkStruct_027e09b8.hpp"
#include <nitro/mi.h>
extern "C" unk32 func_01ffb464(unk32 param1);
extern "C" void func_01ff9218(void *, unk32, unk32);
@@ -310,7 +310,7 @@ struct UnkStackStruct {
s16 mUnk_04;
s16 mUnk_06;
unk32 mUnk_08;
Vec3p mUnk_0C;
VecFx32 mUnk_0C;
u16 mUnk_18;
u16 mUnk_1A;
u16 mUnk_1C;
@@ -367,13 +367,13 @@ ARM void MapObjectDoorBase::vfunc_5C(unk32 param1, unk32 param2) {
auStack_5c.mUnk_3B = 0;
}
UnkStackStruct *puVar5 = (UnkStackStruct *) func_ov000_02077590(3);
auStack_5c.mUnk_18 = puVar5->mUnk_00;
auStack_5c.mUnk_1A = puVar5->mUnk_02;
auStack_5c.mUnk_1C = puVar5->mUnk_04;
auStack_5c.mUnk_1E = puVar5->mUnk_06;
auStack_5c.mUnk_20 = puVar5->mUnk_08;
auStack_5c.mUnk_24.coords = puVar5->mUnk_0C.coords;
UnkStackStruct *puVar5 = (UnkStackStruct *) func_ov000_02077590(3);
auStack_5c.mUnk_18 = puVar5->mUnk_00;
auStack_5c.mUnk_1A = puVar5->mUnk_02;
auStack_5c.mUnk_1C = puVar5->mUnk_04;
auStack_5c.mUnk_1E = puVar5->mUnk_06;
auStack_5c.mUnk_20 = puVar5->mUnk_08;
auStack_5c.mUnk_24 = puVar5->mUnk_0C;
u16 unk_18 = puVar5->mUnk_18;
u16 unk_1A = puVar5->mUnk_1A;
@@ -455,13 +455,13 @@ ARM void MapObjectDoorBase::vfunc_5C(unk32 param1, unk32 param2) {
auStack_9c.mUnk_38 |= 0x200;
UnkStackStruct *puVar5 = (UnkStackStruct *) func_ov000_02077590(2);
auStack_9c.mUnk_18 = puVar5->mUnk_00;
auStack_9c.mUnk_1A = puVar5->mUnk_02;
auStack_9c.mUnk_1C = puVar5->mUnk_04;
auStack_9c.mUnk_1E = puVar5->mUnk_06;
auStack_9c.mUnk_20 = puVar5->mUnk_08;
auStack_9c.mUnk_24.coords = puVar5->mUnk_0C.coords;
UnkStackStruct *puVar5 = (UnkStackStruct *) func_ov000_02077590(2);
auStack_9c.mUnk_18 = puVar5->mUnk_00;
auStack_9c.mUnk_1A = puVar5->mUnk_02;
auStack_9c.mUnk_1C = puVar5->mUnk_04;
auStack_9c.mUnk_1E = puVar5->mUnk_06;
auStack_9c.mUnk_20 = puVar5->mUnk_08;
auStack_9c.mUnk_24 = puVar5->mUnk_0C;
u16 unk_18 = puVar5->mUnk_18;
u16 unk_1A = puVar5->mUnk_1A;
@@ -552,7 +552,7 @@ struct stack_struct {
};
extern "C" void func_01ff9fbc(Mat2p *, unk32, Mat2p *);
extern q4 data_0203f964[];
extern fx16 data_0203f964[];
ARM void MapObjectDoorBase::func_ov031_020fcb78(s8 *param1, s8 param2) {
Vec2s sp10;
@@ -653,8 +653,8 @@ ARM void MapObjectDoorBase::vfunc_44() {}
ARM void MapObjectDoorBase::vfunc_4C() {}
ARM void MapObjectDoorBase::vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3) {
Vec3p local_20;
ARM void MapObjectDoorBase::vfunc_84(unk32 param1, VecFx32 *param2, unk16 *param3) {
VecFx32 local_20;
*param3 = this->mUnk_14;
if (param1 != 0) {
@@ -669,7 +669,7 @@ ARM void MapObjectDoorBase::vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3)
*param3 += -DEG_TO_ANG(180);
}
Vec3p_Add(&this->mPos, &local_20, param2);
VecFx32_Add(&this->mPos, &local_20, param2);
}
ARM void MapObjectDoorBase::func_ov031_020fcf0c(unk32 param1) {
src/031_Land/MapObject/MapObjectDoorClick.cpp
+18 -18
View File
@@ -5,8 +5,8 @@
#include "Unknown/UnkStruct_027e0cec.hpp"
extern "C" f32 func_02039f04(unk32);
extern "C" void func_01ffaf74(Vec3p *, Mat4x3p *, Vec3p *);
extern "C" void func_01ffcfcc(Vec3p *, Vec3p *, Vec3p *);
extern "C" void func_01ffaf74(VecFx32 *, Mat4x3p *, VecFx32 *);
extern "C" void func_01ffcfcc(VecFx32 *, VecFx32 *, VecFx32 *);
extern "C" unk32 func_01ffb428(unk32, unk32);
extern "C" unk32 func_01ffb464(unk32 param1);
extern "C" void func_01ff9218(void *, unk32, unk32);
@@ -49,9 +49,9 @@ ARM u16 MapObjectDoorClick::vfunc2_1C(unk32 param1) {
// https://decomp.me/scratch/zmw3b
ARM bool MapObjectDoorClick::vfunc_00(void) {
Vec3p local_1c;
Vec3p local_28;
Vec3p local_40[2];
VecFx32 local_1c;
VecFx32 local_28;
VecFx32 local_40[2];
this->func_ov031_020fbf10(true, false);
this->mUnk_8B = true;
@@ -223,8 +223,8 @@ ARM void MapObjectDoorClick::vfunc_14(void) {
u16 angle = (u16) sVar2;
Mat3p m;
Vec3p local_48;
Vec3p temp;
VecFx32 local_48;
VecFx32 temp;
Mat3p_InitYRotation(&m, SIN(angle), COS(angle));
temp.x = this->mPos.x - FLOAT_TO_Q20(1.0f) + this->mUnk_70;
@@ -350,15 +350,15 @@ ARM void MapObjectDoorClick::vfunc_7C(void) {
}
ARM void MapObjectDoorClick::vfunc_78(void) {
Vec3p local_24;
Vec3p local_30;
Vec3p VStack_3c;
Vec3p VStack_48;
VecFx32 local_24;
VecFx32 local_30;
VecFx32 VStack_3c;
VecFx32 VStack_48;
Mat4x3p m;
Vec3p local_84;
Vec3p local_90;
VecFx32 local_84;
VecFx32 local_90;
Vec3p temp;
VecFx32 temp;
temp.x = this->mPos.x;
temp.z = this->mPos.z;
temp.y = this->mPos.y;
@@ -387,13 +387,13 @@ ARM void MapObjectDoorClick::vfunc_78(void) {
func_01ffaf74(&local_90, &m, &local_90);
func_01ffaf74(&local_84, &m, &local_84);
Vec3p_Add(&local_24, &local_90, &local_24);
Vec3p_Add(&local_24, &local_84, &VStack_3c);
VecFx32_Add(&local_24, &local_90, &local_24);
VecFx32_Add(&local_24, &local_84, &VStack_3c);
local_90.x = -local_90.x;
local_84.x = -local_84.x;
Vec3p_Add(&local_30, &local_90, &local_30);
Vec3p_Add(&local_30, &local_84, &VStack_48);
VecFx32_Add(&local_30, &local_90, &local_30);
VecFx32_Add(&local_30, &local_84, &VStack_48);
if (this->mUnk_68.mUnk_00 != NULL) {
this->mUnk_68.mUnk_00->func_ov000_02052c48(&VStack_3c, &local_24);
src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp
+29 -29
View File
@@ -16,8 +16,8 @@
extern "C" void *func_ov000_02077590(unk32);
extern "C" unk32 func_01ffb428(unk32, unk32);
extern "C" void func_01ffaf74(Vec3p *, Mat4x3p *, Vec3p *);
extern "C" void func_01ff93c0(Vec3p *, q20);
extern "C" void func_01ffaf74(VecFx32 *, Mat4x3p *, VecFx32 *);
extern "C" void func_01ff93c0(VecFx32 *, fx32);
extern unk32 data_ov031_02110c00[];
extern UnkStruct_ov000_020b34c4_Callback data_ov000_020b4cc4;
@@ -62,7 +62,7 @@ ARM bool MapObjectDoorDangerSpawn::vfunc_00(void) {
ARM void MapObjectDoorDangerSpawn::vfunc_04(void) {
UnkStruct_027e0cd8_0c *ptr;
Vec3p auStack_20;
VecFx32 auStack_20;
if (this->mUnk_20.mUnk_00[1] == 2) {
this->mUnk_6C = 0;
@@ -159,8 +159,8 @@ struct UnkStruct_Copy {
ARM void MapObjectDoorDangerSpawn::vfunc_08(void) {
UnkStruct_Copy sp3C;
UnkStruct_Copy sp1C;
Vec3p sp10;
Vec3p sp4;
VecFx32 sp10;
VecFx32 sp4;
if (this->mUnk_AC < this->mUnk_AE) {
this->mUnk_AC++;
@@ -521,7 +521,7 @@ ARM bool MapObjectDoorDangerSpawn::vfunc_6C(void) {
ARM bool MapObjectDoorDangerSpawn::func_ov031_020fdec8(void) {
UnkStruct_027e0cd8_0c *pUVar4;
Vec3p *uVar3;
VecFx32 *uVar3;
int iVar1;
switch (this->mUnk_20.mUnk_00[1]) {
@@ -570,7 +570,7 @@ ARM void MapObjectDoorDangerSpawn::vfunc_14(void) {
Mat3p m;
Mat3p_InitYRotation(&m, SIN((u16) this->mUnk_14), COS((u16) this->mUnk_14));
Vec3p pos(this->mPos);
VecFx32 pos(this->mPos);
pos.y += -(this->mUnk_6C * 2);
this->mUnk_94.vfunc_14(&m, &pos);
@@ -602,13 +602,13 @@ ARM void MapObjectDoorDangerSpawn::vfunc2_10(void) {
// https://decomp.me/scratch/DEJfq
ARM void MapObjectDoorDangerSpawn::vfunc_74(void) {
Vec3p local_28;
Vec3p local_34;
Vec3p local_40;
Vec3p local_4c;
VecFx32 local_28;
VecFx32 local_34;
VecFx32 local_40;
VecFx32 local_4c;
Mat4x3p m;
q20 b33 = 0xB33;
fx32 b33 = 0xB33;
local_34.x = this->mPos.x;
local_34.y = this->mPos.y;
@@ -637,8 +637,8 @@ ARM void MapObjectDoorDangerSpawn::vfunc_74(void) {
func_01ffaf74(&local_40, &m, &local_40);
func_01ffaf74(&local_4c, &m, &local_4c);
Vec3p_Add(&local_28, &local_40, &local_28);
Vec3p_Add(&local_34, &local_4c, &local_34);
VecFx32_Add(&local_28, &local_40, &local_28);
VecFx32_Add(&local_34, &local_4c, &local_34);
data_027e0cec->func_ov000_0209ff8c(&this->mUnk_68, 0x8CF, &local_28, 4);
data_027e0cec->func_ov000_0209ff8c(&this->mUnk_A8, 0x8CF, &local_34, 4);
@@ -694,7 +694,7 @@ ARM unk32 MapObjectDoorDangerSpawn::vfunc_8C(void) {
return 0;
}
ARM void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3) {
ARM void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, VecFx32 *param2, unk16 *param3) {
s16 iVar1;
if (!this->mUnk_58) {
@@ -702,7 +702,7 @@ ARM void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, Vec3p *param2, unk16 *
return;
}
Vec3p local_24;
VecFx32 local_24;
*param3 = this->mUnk_14;
iVar1 = this->mUnk_14 + DEG_TO_ANG(30);
if (param1 != 0) {
@@ -716,9 +716,9 @@ ARM void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, Vec3p *param2, unk16 *
*param3 += DEG_TO_ANG(180);
}
Vec3p_Add(&this->mPos, &local_24, param2);
VecFx32_Add(&this->mPos, &local_24, param2);
Vec3p local_30;
VecFx32 local_30;
this->mUnk_5A = this->mUnk_14;
iVar1 = this->mUnk_14 - DEG_TO_ANG(30);
if (param1 != 0) {
@@ -731,25 +731,25 @@ ARM void MapObjectDoorDangerSpawn::vfunc_84(unk32 param1, Vec3p *param2, unk16 *
local_30.y = 0;
this->mUnk_5A += DEG_TO_ANG(180);
}
Vec3p_Add(&this->mPos, &local_30, &this->mUnk_5C);
VecFx32_Add(&this->mPos, &local_30, &this->mUnk_5C);
}
ARM void MapObjectDoorDangerSpawn::func_ov031_020fe5fc(Vec3p *param1, MapObjectDoorDangerSpawn *thisx) {
ARM void MapObjectDoorDangerSpawn::func_ov031_020fe5fc(VecFx32 *param1, MapObjectDoorDangerSpawn *thisx) {
if (data_027e0ce0->func_01fff1a4()) {
Vec3p *piVar2 = data_027e0ce0->func_01fff148(1);
Vec3p *piVar3 = data_027e0ce0->func_01fff148(0);
VecFx32 *piVar2 = data_027e0ce0->func_01fff148(1);
VecFx32 *piVar3 = data_027e0ce0->func_01fff148(0);
Vec3p temp;
Vec3p_Init(piVar3->x, piVar3->y, piVar3->z, &temp);
VecFx32 temp;
VecFx32_Init(piVar3->x, piVar3->y, piVar3->z, &temp);
Vec3p pos;
Vec3p_Init(temp.x + piVar2->x, temp.y + piVar2->y, temp.z + piVar2->z, &pos);
VecFx32 pos;
VecFx32_Init(temp.x + piVar2->x, temp.y + piVar2->y, temp.z + piVar2->z, &pos);
func_01ff93c0(&pos, FLOAT_TO_Q20(0.5f));
param1->coords = pos.coords;
*param1 = pos;
} else {
Vec3p *piVar4 = data_027e0ce0->func_01fff148(0);
param1->coords = piVar4->coords;
VecFx32 *piVar4 = data_027e0ce0->func_01fff148(0);
*param1 = *piVar4;
}
}
src/031_Land/MapObject/MapObjectDoorKey.cpp
+14 -14
View File
@@ -5,7 +5,7 @@
#include "Unknown/UnkStruct_027e0cec.hpp"
extern "C" f32 func_02039f04(unk32);
extern "C" void func_01ffaf74(Vec3p *, Mat4x3p *, Vec3p *);
extern "C" void func_01ffaf74(VecFx32 *, Mat4x3p *, VecFx32 *);
const UnkStruct_ov031_021150b0 data_ov031_02115184(0x1E66);
@@ -68,8 +68,8 @@ ARM void MapObjectDoorKey::vfunc_14(void) {
u16 angle = (u16) sVar2;
Mat3p m;
Vec3p local_48;
Vec3p temp;
VecFx32 local_48;
VecFx32 temp;
Mat3p_InitYRotation(&m, SIN(angle), COS(angle));
temp.x = this->mPos.x - FLOAT_TO_Q20(1.0f) + this->mUnk_70;
@@ -175,15 +175,15 @@ ARM void MapObjectDoorKey::vfunc_7C(void) {
}
ARM void MapObjectDoorKey::vfunc_78(void) {
Vec3p local_24;
Vec3p local_30;
Vec3p VStack_3c;
Vec3p VStack_48;
VecFx32 local_24;
VecFx32 local_30;
VecFx32 VStack_3c;
VecFx32 VStack_48;
Mat4x3p m;
Vec3p local_84;
Vec3p local_90;
VecFx32 local_84;
VecFx32 local_90;
Vec3p temp;
VecFx32 temp;
temp.x = this->mPos.x;
temp.z = this->mPos.z;
temp.y = this->mPos.y;
@@ -212,13 +212,13 @@ ARM void MapObjectDoorKey::vfunc_78(void) {
func_01ffaf74(&local_90, &m, &local_90);
func_01ffaf74(&local_84, &m, &local_84);
Vec3p_Add(&local_24, &local_90, &local_24);
Vec3p_Add(&local_24, &local_84, &VStack_3c);
VecFx32_Add(&local_24, &local_90, &local_24);
VecFx32_Add(&local_24, &local_84, &VStack_3c);
local_90.x = -local_90.x;
local_84.x = -local_84.x;
Vec3p_Add(&local_30, &local_90, &local_30);
Vec3p_Add(&local_30, &local_84, &VStack_48);
VecFx32_Add(&local_30, &local_90, &local_30);
VecFx32_Add(&local_30, &local_84, &VStack_48);
if (this->mUnk_68.mUnk_00 != NULL) {
this->mUnk_68.mUnk_00->func_ov000_02052c48(&VStack_3c, &local_24);
src/031_Land/MapObject/MapObjectDoorSwitch.cpp
+10 -10
View File
@@ -5,9 +5,9 @@
#include "Unknown/UnkStruct_027e0cec.hpp"
#include "versions.h"
extern "C" void func_01ffaf74(Vec3p *, Mat4x3p *, Vec3p *);
extern "C" q20 func_01ffb464(q20);
extern "C" void func_01ff9218(q20 *, q20, q20);
extern "C" void func_01ffaf74(VecFx32 *, Mat4x3p *, VecFx32 *);
extern "C" fx32 func_01ffb464(fx32);
extern "C" void func_01ff9218(fx32 *, fx32, fx32);
const UnkStruct_ov031_021150b0 data_ov031_02115254(0x1E66);
@@ -118,7 +118,7 @@ ARM void MapObjectDoorSwitch::vfunc_14(void) {
Mat3p_InitYRotation(&m, SIN(angle), COS(angle));
Vec3p local_40(this->mPos);
VecFx32 local_40(this->mPos);
local_40.y -= this->mUnk_6C * 2;
this->mUnk_094.vfunc_14(&m, &local_40);
}
@@ -128,16 +128,16 @@ ARM void MapObjectDoorSwitch::vfunc_18(s8 *param1, s8 param2) {
}
ARM void MapObjectDoorSwitch::vfunc_74(void) {
Vec3p local_20 = this->mPos;
Vec3p local_2c;
Vec3p_Init(0, 0, 0x666, &local_2c);
VecFx32 local_20 = this->mPos;
VecFx32 local_2c;
VecFx32_Init(0, 0, 0x666, &local_2c);
Mat4x3p m;
u16 angle = this->mUnk_14;
Mat4x3p_InitYRotation(&m, SIN(angle), COS(angle));
func_01ffaf74(&local_2c, &m, &local_2c);
Vec3p_Add(&local_20, &local_2c, &local_20);
VecFx32_Add(&local_20, &local_2c, &local_20);
data_027e0cec->func_ov000_0209ff8c(&this->mUnk_68, 0x8CF, &local_20, 4);
@@ -224,7 +224,7 @@ ARM void MapObjectDoorSwitch::vfunc_54(void) {
func_01ff9218(&this->mUnkPos, -FLOAT_TO_Q20(1.35f), func_01ffb464(INT_TO_Q20(this->mUnk_80)));
}
q20 temp_118 = this->mUnkPos;
fx32 temp_118 = this->mUnkPos;
this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
this->mUnk_0F4.mUnk_0C.z = temp_118;
@@ -271,7 +271,7 @@ ARM void MapObjectDoorSwitch::vfunc_54(void) {
func_01ff9218(&this->mUnkPos, -FLOAT_TO_Q20(1.35f), func_01ffb464(INT_TO_Q20(this->mUnk_80)));
}
q20 temp_118 = this->mUnkPos;
fx32 temp_118 = this->mUnkPos;
this->mUnk_0F4.mUnk_0C.x = -FLOAT_TO_Q20(1.0f);
this->mUnk_0F4.mUnk_0C.y = FLOAT_TO_Q20(0.0f);
this->mUnk_0F4.mUnk_0C.z = temp_118;