Merge headers from nitro decomp (#69)

* 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
+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);
}