summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c28
-rw-r--r--src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c38
-rw-r--r--src/boot/boot_0x80080180.c2
-rw-r--r--src/boot/boot_0x80085320.c12
-rw-r--r--src/boot_O2_g3/z_std_dma.c20
-rw-r--r--src/code/code_0x800A5AC0.c22
-rw-r--r--src/code/code_0x800BF9A0.c4
-rw-r--r--src/code/z_actor.c2
-rw-r--r--src/code/z_effect_soft_sprite.c42
-rw-r--r--src/code/z_lib.c80
10 files changed, 125 insertions, 125 deletions
diff --git a/src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c b/src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c
index 4be0b8857..1af337254 100644
--- a/src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c
+++ b/src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c
@@ -2,7 +2,7 @@
#include <global.h>
typedef struct z_ActorBgFuKaiten_s {
- /* 0x000 */ z_Actor baseActor;
+ /* 0x000 */ Actor baseActor;
/* 0x144 */ UNK_TYPE unk144;
/* 0x148 */ u8 pad0[0x18];
/* 0x160 */ f32 unk160;
@@ -13,14 +13,14 @@ typedef struct z_ActorBgFuKaiten_s {
/* 0x16E */ u8 pad1[0x2];
} z_ActorBgFuKaiten;
-void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt);
-void z_bg_fu_kaiten_fini(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt);
+void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, GlobalContext* ctxt);
+void z_bg_fu_kaiten_fini(z_ActorBgFuKaiten* this, GlobalContext* ctxt);
UNK_RET func_80ACB4B4(z_ActorBgFuKaiten* this);
UNK_RET func_80ACB50C(z_ActorBgFuKaiten* this);
-void z_bg_fu_kaiten_main(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt);
-void func_80ACB5A0(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt);
+void z_bg_fu_kaiten_main(z_ActorBgFuKaiten* this, GlobalContext* ctxt);
+void func_80ACB5A0(z_ActorBgFuKaiten* this, GlobalContext* ctxt);
-z_ActorInitData bgBgFuKaitenInitVar = {
+ActorInitData bgBgFuKaitenInitVar = {
0x01AE,
1,
0,
@@ -61,15 +61,15 @@ glabel D_80ACB654
/* 000167 0x80ACB69C */ .word 0x00000040
)
-void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt) {
+void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, GlobalContext* ctxt) {
UNK_TYPE pad0;
UNK_TYPE pad1;
UNK_TYPE sp24 = 0;
- func_800B67E0((z_Actor*)this, 1.0);
- func_800CAE10((z_Actor*)this, 3);
+ func_800B67E0((Actor*)this, 1.0);
+ func_800CAE10((Actor*)this, 3);
func_800C9564((UNK_TYPE)&D_06002D30, &sp24); // XXX: D_06002D30 is probably a constant
- this->unk144 = func_800C6188(ctxt, &ctxt->unk880, (z_Actor*)this, sp24);
+ this->unk144 = func_800C6188(ctxt, &ctxt->unk880, (Actor*)this, sp24);
this->unk164 = 0.0;
this->unk168 = 0;
@@ -77,7 +77,7 @@ void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt) {
this->unk16C = 0;
}
-void z_bg_fu_kaiten_fini(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt) {
+void z_bg_fu_kaiten_fini(z_ActorBgFuKaiten* this, GlobalContext* ctxt) {
func_800C64CC(ctxt, &ctxt->unk880, this->unk144);
}
@@ -99,15 +99,15 @@ UNK_RET func_80ACB50C(z_ActorBgFuKaiten* this) {
this->baseActor.unk24.y -= this->unk164 * func_800FED44(this->unk16C);
}
-void z_bg_fu_kaiten_main(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt) {
+void z_bg_fu_kaiten_main(z_ActorBgFuKaiten* this, GlobalContext* ctxt) {
func_80ACB4B4(this);
func_80ACB50C(this);
}
#ifdef NON_MATCHING
-void func_80ACB5A0(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt) {
- z_GraphicsContext* sp24 = ctxt->unk0;
+void func_80ACB5A0(z_ActorBgFuKaiten* this, GlobalContext* ctxt) {
+ GraphicsContext* sp24 = ctxt->unk0;
UNK_TYPE pad;
// XXX: register allocation is wrong here
diff --git a/src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c b/src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c
index 67cd7f022..0fd1095fa 100644
--- a/src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c
+++ b/src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c
@@ -2,23 +2,23 @@
#include <global.h>
typedef struct z_ActorBgIkanaRay_s {
- /* 0x000 */ z_Actor baseActor;
+ /* 0x000 */ Actor baseActor;
/* 0x144 */ UNK_TYPE unk144;
/* 0x148 */ u8 pad5[0x48];
/* 0x190 */ UNK_TYPE unk190;
- /* 0x194 */ void(*unk404)(struct z_ActorBgIkanaRay_s*, z_GlobalContext*);
+ /* 0x194 */ void(*unk404)(struct z_ActorBgIkanaRay_s*, GlobalContext*);
} z_ActorBgIkanaRay;
-void z_bg_ikana_ray_init(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt);
-void z_bg_ikana_ray_fini(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt);
-void z_bg_ikana_ray_main(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt);
-void z_bg_ikana_ray_draw(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt);
+void z_bg_ikana_ray_init(z_ActorBgIkanaRay* this, GlobalContext* ctxt);
+void z_bg_ikana_ray_fini(z_ActorBgIkanaRay* this, GlobalContext* ctxt);
+void z_bg_ikana_ray_main(z_ActorBgIkanaRay* this, GlobalContext* ctxt);
+void z_bg_ikana_ray_draw(z_ActorBgIkanaRay* this, GlobalContext* ctxt);
void func_80BD5498(z_ActorBgIkanaRay* this);
-void func_80BD54BC(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt);
+void func_80BD54BC(z_ActorBgIkanaRay* this, GlobalContext* ctxt);
void func_80BD5500(z_ActorBgIkanaRay* this);
-void func_80BD5530(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt);
+void func_80BD5530(z_ActorBgIkanaRay* this, GlobalContext* ctxt);
-z_ActorInitData bgIkanaRayInitVar = {
+ActorInitData bgIkanaRayInitVar = {
0x0256,
6,
0,
@@ -48,7 +48,7 @@ glabel D_80BD55F0
)
// TODO macro
-z_ActorInitVar bgIkanaRayCompInit[] = {
+ActorInitVar bgIkanaRayCompInit[] = {
{1, 6, 0x0FC, 4000},
{1, 6, 0x100, 1000},
{1, 6, 0x104, 1000},
@@ -84,14 +84,14 @@ glabel D_80BD562C
/* 000177 0x80BD5684 */ .word 0x8200001C
)
-void z_bg_ikana_ray_init(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) {
+void z_bg_ikana_ray_init(z_ActorBgIkanaRay* this, GlobalContext* ctxt) {
UNK_TYPE* sp24 = &this->unk144;
u32 pad;
- func_800FFADC((z_Actor*)this, bgIkanaRayCompInit);
+ func_800FFADC((Actor*)this, bgIkanaRayCompInit);
func_800E119C(ctxt, sp24);
- func_800E130C(ctxt, sp24, (z_Actor*)this, &D_80BD55F0);
- func_800E7DF8((z_Actor*)this, &this->unk144);
+ func_800E130C(ctxt, sp24, (Actor*)this, &D_80BD55F0);
+ func_800E7DF8((Actor*)this, &this->unk144);
this->unk190 = func_80100504((UNK_TYPE)&D_06001228); // XXX: D_06001228 is probably a constant
if (func_800B5BB0(ctxt, this->baseActor.unk1C & 0x7F) != 0) {
@@ -101,7 +101,7 @@ void z_bg_ikana_ray_init(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) {
}
}
-void z_bg_ikana_ray_fini(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) {
+void z_bg_ikana_ray_fini(z_ActorBgIkanaRay* this, GlobalContext* ctxt) {
UNK_TYPE* a1 = &this->unk144;
func_800E11EC(ctxt, a1);
}
@@ -112,7 +112,7 @@ void func_80BD5498(z_ActorBgIkanaRay* this) {
this->unk404 = func_80BD54BC;
}
-void func_80BD54BC(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) {
+void func_80BD54BC(z_ActorBgIkanaRay* this, GlobalContext* ctxt) {
if (func_800B5BB0(ctxt, this->baseActor.unk1C & 0x7F) != 0) {
func_80BD5500(this);
}
@@ -124,15 +124,15 @@ void func_80BD5500(z_ActorBgIkanaRay* this) {
this->unk404 = func_80BD5530;
}
-void func_80BD5530(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) {
+void func_80BD5530(z_ActorBgIkanaRay* this, GlobalContext* ctxt) {
func_800E2558(ctxt, &ctxt->unk18884, &this->unk144);
}
-void z_bg_ikana_ray_main(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) {
+void z_bg_ikana_ray_main(z_ActorBgIkanaRay* this, GlobalContext* ctxt) {
this->unk404(this, ctxt);
}
-void z_bg_ikana_ray_draw(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) {
+void z_bg_ikana_ray_draw(z_ActorBgIkanaRay* this, GlobalContext* ctxt) {
func_80131758(ctxt, this->unk190);
func_800BE03C(ctxt, (UNK_TYPE)&D_06001100); // XXX: D_06001100 is probably a constant
}
diff --git a/src/boot/boot_0x80080180.c b/src/boot/boot_0x80080180.c
index acf8ede50..44beb638d 100644
--- a/src/boot/boot_0x80080180.c
+++ b/src/boot/boot_0x80080180.c
@@ -43,7 +43,7 @@ UNK_RET func_80080250(void) {
sp28 = *v0;
*v0 = 0;
- func_80080C04((z_DmaRequest*)&sp48, (UNK_FUN_ARG)func_800A5AC0, v1, (u32)t7 - (u32)v1, 0, &sp30, 0);
+ func_80080C04((DmaRequest*)&sp48, (UNK_FUN_ARG)func_800A5AC0, v1, (u32)t7 - (u32)v1, 0, &sp30, 0);
func_8008019C();
func_800801EC();
osRecvMesg(&sp30, 0, 1);
diff --git a/src/boot/boot_0x80085320.c b/src/boot/boot_0x80085320.c
index 0bc8a1066..834d5c648 100644
--- a/src/boot/boot_0x80085320.c
+++ b/src/boot/boot_0x80085320.c
@@ -1,9 +1,9 @@
#include <ultra64.h>
#include <global.h>
-void func_80085320(z_ThreadInfo* a0, UNK_PTR a1, UNK_PTR a2, UNK_TYPE a3, UNK_TYPE sp10, UNK_PTR sp14) {
+void func_80085320(ThreadInfo* a0, UNK_PTR a1, UNK_PTR a2, UNK_TYPE a3, UNK_TYPE sp10, UNK_PTR sp14) {
UNK_TYPE* i;
- z_ThreadInfo* v0;
+ ThreadInfo* v0;
if (a0 == NULL) {
g_s80085320_ListHead = NULL;
@@ -42,7 +42,7 @@ void func_80085320(z_ThreadInfo* a0, UNK_PTR a1, UNK_PTR a2, UNK_TYPE a3, UNK_TY
}
}
-UNK_RET func_800853F8(z_ThreadInfo* a0) {
+UNK_RET func_800853F8(ThreadInfo* a0) {
if (a0->prev == NULL) {
if (g_s80085320_ListHead == a0) {
g_s80085320_ListHead = a0->next;
@@ -58,7 +58,7 @@ UNK_RET func_800853F8(z_ThreadInfo* a0) {
}
}
-UNK_TYPE func_80085468(z_ThreadInfo* a0) {
+UNK_TYPE func_80085468(ThreadInfo* a0) {
UNK_TYPE* v1 = a0->unk8;
UNK_TYPE* a1 = a0->unkC;
UNK_TYPE* v0 = v1;
@@ -83,7 +83,7 @@ UNK_TYPE func_80085468(z_ThreadInfo* a0) {
}
UNK_TYPE func_800854E0(UNK_ARGS) {
- z_ThreadInfo* s0 = g_s80085320_ListHead;
+ ThreadInfo* s0 = g_s80085320_ListHead;
UNK_TYPE ret = 0;
while (s0 != NULL) {
if (func_80085468(s0) != 0) {
@@ -95,7 +95,7 @@ UNK_TYPE func_800854E0(UNK_ARGS) {
return ret;
}
-UNK_RET func_80085538(z_ThreadInfo* a0) {
+UNK_RET func_80085538(ThreadInfo* a0) {
if (a0 == NULL) {
func_800854E0();
} else {
diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c
index f7a598de3..2230d489a 100644
--- a/src/boot_O2_g3/z_std_dma.c
+++ b/src/boot_O2_g3/z_std_dma.c
@@ -48,8 +48,8 @@ void Dmamgr_osEPiStartDmaWrapper(OSPiHandle* pihandle, OSIoMesg* mb, s32 directi
osEPiStartDma(pihandle, mb, direction);
}
-z_DmadataEntry* Dmamgr_FindDmaEntry(u32 a0) {
- z_DmadataEntry* curr;
+DmadataEntry* Dmamgr_FindDmaEntry(u32 a0) {
+ DmadataEntry* curr;
for (curr = dmadata; curr->vromEnd != 0; curr++) {
if (a0 < curr->vromStart) continue;
@@ -62,7 +62,7 @@ z_DmadataEntry* Dmamgr_FindDmaEntry(u32 a0) {
}
s32 Dmamgr_TranslateVromToRom(u32 a0) {
- z_DmadataEntry* v0 = Dmamgr_FindDmaEntry(a0);
+ DmadataEntry* v0 = Dmamgr_FindDmaEntry(a0);
if (v0 != NULL) {
if (v0->romEnd == 0) {
@@ -80,7 +80,7 @@ s32 Dmamgr_TranslateVromToRom(u32 a0) {
}
s32 Dmamgr_FindDmaIndex(u32 a0) {
- z_DmadataEntry* v0 = Dmamgr_FindDmaEntry(a0);
+ DmadataEntry* v0 = Dmamgr_FindDmaEntry(a0);
if (v0 != NULL) {
return v0 - dmadata;
@@ -95,7 +95,7 @@ UNK_TYPE* func_800809F4(u32 a0) {
#ifdef NONMATCHING
-void Dmamgr_HandleRequest(z_DmaRequest* a0) {
+void Dmamgr_HandleRequest(DmaRequest* a0) {
UNK_TYPE sp34;
UNK_TYPE sp30;
UNK_TYPE sp2C;
@@ -149,9 +149,9 @@ GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_HandleRequest.asm")
#ifdef NONMATCHING
void Dmamgr_ThreadEntry(void* a0) {
- z_DmaRequest* sp34;
+ DmaRequest* sp34;
UNK_TYPE pad;
- z_DmaRequest* s0;
+ DmaRequest* s0;
for (;;) {
osRecvMesg(&D_8009B2C0, (OSMesg)&sp34, 1);
@@ -172,7 +172,7 @@ GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_ThreadEntry.asm")
#ifdef NONMATCHING
-s32 Dmamgr_SendRequest(z_DmaRequest* a0, UNK_FUN_PTR(a1), UNK_PTR a2, UNK_TYPE a3, UNK_TYPE sp30, OSMesgQueue* sp34, UNK_TYPE sp38) {
+s32 Dmamgr_SendRequest(DmaRequest* a0, UNK_FUN_PTR(a1), UNK_PTR a2, UNK_TYPE a3, UNK_TYPE sp30, OSMesgQueue* sp34, UNK_TYPE sp38) {
// TODO this isn't correct, it uses a lui, addiu to get the address of D_80096B60, then loads it,
// meaning that this is likely just "if (*D_80096B60 >= 2)". However, I can not get it to not
// produce the usual lui, lw combo to load from an address :/
@@ -199,7 +199,7 @@ GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_SendRequest.asm")
#endif
s32 Dmamgr_SendRequestAndWait(UNK_TYPE a0, UNK_PTR a1, UNK_TYPE a2) {
- z_DmaRequest sp48;
+ DmaRequest sp48;
OSMesgQueue sp30;
OSMesg sp2C;
s32 ret;
@@ -220,7 +220,7 @@ s32 Dmamgr_SendRequestAndWait(UNK_TYPE a0, UNK_PTR a1, UNK_TYPE a2) {
#ifdef NONMATCHING
void Dmamgr_Start() {
- z_DmadataEntry* v0;
+ DmadataEntry* v0;
u32 v1;
// TODO register load ordering is wrong
Dmamgr_DoDmaTransfer(&dmadataRomStart, dmadata, (u8*)&dmadataRomEnd - (u8*)&dmadataRomStart);
diff --git a/src/code/code_0x800A5AC0.c b/src/code/code_0x800A5AC0.c
index 534bec030..9d393fbeb 100644
--- a/src/code/code_0x800A5AC0.c
+++ b/src/code/code_0x800A5AC0.c
@@ -6,23 +6,23 @@
// This file is most likely En_A_Obj
UNK_RET EnAObj_Init(void* a0, UNK_TYPE a1) {
- z_ActorEnAObj* s0 = (z_ActorEnAObj*)a0;
+ ActorEnAObj* s0 = (ActorEnAObj*)a0;
s0->base.textId = ((s0->base.variable >> 8) & 0xFF) | 0x300;
s0->base.variable = (s0->base.variable & 0xFF) - 9;
- Lib_ApplyActorInitVars((z_Actor*)s0, (z_ActorInitVar*)&D_801ADEAC);
+ Lib_ApplyActorInitVars((Actor*)s0, (ActorInitVar*)&D_801ADEAC);
func_800B3BA4(&s0->base.unkBC, 0, (UNK_PTR)&func_800B3FC0, 12);
- Collision_InitCylinder(a1, &s0->collision, (z_Actor*)s0, &D_801ADE80);
- Collision_CylinderMoveToActor((z_Actor*)s0, &s0->collision);
+ Collision_InitCylinder(a1, &s0->collision, (Actor*)s0, &D_801ADE80);
+ Collision_CylinderMoveToActor((Actor*)s0, &s0->collision);
s0->base.unkA0.unk16 = 255;
s0->update = (actor_func)EnAObj_Update1;
}
-UNK_RET EnAObj_Fini(z_ActorEnAObj* a0, z_GlobalContext* a1) {
- z_ColCylinder* a2 = &a0->collision;
+UNK_RET EnAObj_Fini(ActorEnAObj* a0, GlobalContext* a1) {
+ ColCylinder* a2 = &a0->collision;
Collision_FiniCylinder(a1, a2);
}
-UNK_RET EnAObj_Update1(z_ActorEnAObj* a0, UNK_TYPE a1) {
+UNK_RET EnAObj_Update1(ActorEnAObj* a0, UNK_TYPE a1) {
s16 v0;
s32 v1;
if (func_800B84D0(a0, a1) != 0) {
@@ -36,18 +36,18 @@ UNK_RET EnAObj_Update1(z_ActorEnAObj* a0, UNK_TYPE a1) {
}
}
-UNK_RET EnAObj_Update2(z_ActorEnAObj* a0) {
+UNK_RET EnAObj_Update2(ActorEnAObj* a0) {
if (func_800B867C(a0) != 0) {
a0->update = (actor_func)EnAObj_Update1;
}
}
-UNK_RET EnAObj_Main(z_ActorEnAObj* a0, UNK_TYPE a1) {
- (a0->update)((z_Actor*)a0, (z_GlobalContext*)a1);
+UNK_RET EnAObj_Main(ActorEnAObj* a0, UNK_TYPE a1) {
+ (a0->update)((Actor*)a0, (GlobalContext*)a1);
func_800B675C(a0, 0x42340000);
Collision_AddOT(a1, a1 + 0x18884, &a0->collision);
}
-UNK_RET EnAObj_Draw(z_ActorEnAObj* a0, UNK_TYPE a1) {
+UNK_RET EnAObj_Draw(ActorEnAObj* a0, UNK_TYPE a1) {
func_800BDFC0(a1, D_801ADEB0[a0->base.variable], a1, a0);
}
diff --git a/src/code/code_0x800BF9A0.c b/src/code/code_0x800BF9A0.c
index f0ee6166f..a252fb962 100644
--- a/src/code/code_0x800BF9A0.c
+++ b/src/code/code_0x800BF9A0.c
@@ -3,7 +3,7 @@
UNK_RET func_800BF9A0(UNK_TYPE a0, UNK_TYPE a1) {
s32 i;
- z_ActorOverlayTableEntry* s0;
+ ActorOverlayTableEntry* s0;
UNK_TYPE v1;
func_8008439C(-2, 0);
@@ -19,7 +19,7 @@ UNK_RET func_800BF9A0(UNK_TYPE a0, UNK_TYPE a1) {
UNK_TYPE func_800BFA78(UNK_TYPE a0, UNK_TYPE a1) {
s32 i;
- z_ActorOverlayTableEntry* v0 = &D_801AEFD0;
+ ActorOverlayTableEntry* v0 = &D_801AEFD0;
UNK_TYPE t1;
UNK_TYPE a2;
UNK_TYPE a0_2 = a0;
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index c75d5d09d..18b608a9c 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -259,7 +259,7 @@ GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8898.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8934.asm")
-UNK_TYPE Actor_HasParent(z_Actor* actor, z_GlobalContext* ctxt) {
+UNK_TYPE Actor_HasParent(Actor* actor, GlobalContext* ctxt) {
if (actor->parent != NULL) {
return 1;
} else {
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index bb1451982..80b4f7bf7 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -1,12 +1,12 @@
#include <ultra64.h>
#include <global.h>
-void EffectSS_Init(z_GlobalContext* ctxt, s32 numEntries) {
+void EffectSS_Init(GlobalContext* ctxt, s32 numEntries) {
u32 i;
- z_LoadedParticleEntry* iter;
- z_ParticleOverlayTableEntry* iter2;
+ LoadedParticleEntry* iter;
+ ParticleOverlayTableEntry* iter2;
- EffectSS2Info.data_table = (z_LoadedParticleEntry*)GameStateHeap_AllocFromEnd(&ctxt->commonVars.heap, numEntries * sizeof(z_LoadedParticleEntry));
+ EffectSS2Info.data_table = (LoadedParticleEntry*)GameStateHeap_AllocFromEnd(&ctxt->commonVars.heap, numEntries * sizeof(LoadedParticleEntry));
EffectSS2Info.searchIndex = 0;
EffectSS2Info.size = numEntries;
@@ -19,10 +19,10 @@ void EffectSS_Init(z_GlobalContext* ctxt, s32 numEntries) {
}
}
-void EffectSS_Clear(z_GlobalContext* ctxt) {
+void EffectSS_Clear(GlobalContext* ctxt) {
u32 i;
- z_LoadedParticleEntry* iter;
- z_ParticleOverlayTableEntry* iter2;
+ LoadedParticleEntry* iter;
+ ParticleOverlayTableEntry* iter2;
void* addr;
EffectSS2Info.data_table = NULL;
@@ -44,11 +44,11 @@ void EffectSS_Clear(z_GlobalContext* ctxt) {
}
}
-z_LoadedParticleEntry* EffectSS_GetTable() {
+LoadedParticleEntry* EffectSS_GetTable() {
return EffectSS2Info.data_table;
}
-void EffectSS_Delete(z_LoadedParticleEntry* a0) {
+void EffectSS_Delete(LoadedParticleEntry* a0) {
if (a0->flags & 0x2) {
func_801A72CC((UNK_PTR)&a0->position);
}
@@ -60,7 +60,7 @@ void EffectSS_Delete(z_LoadedParticleEntry* a0) {
EffectSS_ResetLoadedParticleEntry(a0);
}
-void EffectSS_ResetLoadedParticleEntry(z_LoadedParticleEntry* particle) {
+void EffectSS_ResetLoadedParticleEntry(LoadedParticleEntry* particle) {
u32 i;
particle->type = 0x27;
@@ -152,7 +152,7 @@ GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm")
#endif
-void EffectSS_Copy(z_GlobalContext* ctxt, z_LoadedParticleEntry* a1) {
+void EffectSS_Copy(GlobalContext* ctxt, LoadedParticleEntry* a1) {
u32 index;
if (func_8016A01C(ctxt) != 1) {
if (EffectSS_FindFreeSpace(a1->priority, &index) == 0) {
@@ -164,12 +164,12 @@ void EffectSS_Copy(z_GlobalContext* ctxt, z_LoadedParticleEntry* a1) {
#ifdef NONMATCHING
-void EffectSS_LoadParticle(z_GlobalContext* ctxt, u32 type, u32 priority, void* initData) {
+void EffectSS_LoadParticle(GlobalContext* ctxt, u32 type, u32 priority, void* initData) {
u32 index;
u32 initRet;
u32 overlaySize;
- z_ParticleOverlayInfo* overlayInfo;
- z_ParticleOverlayTableEntry* entry = &particleOverlayTable[type];
+ ParticleOverlayInfo* overlayInfo;
+ ParticleOverlayTableEntry* entry = &particleOverlayTable[type];
if (EffectSS_FindFreeSpace(priority, &index) != 0) {
return;
@@ -193,7 +193,7 @@ void EffectSS_LoadParticle(z_GlobalContext* ctxt, u32 type, u32 priority, void*
// XXX this should use a0, but it doesn't
if (entry->overlayInfo != NULL) {
- overlayInfo = (z_ParticleOverlayInfo*)(-(entry->vramStart - entry->loadedRamAddr) + (u32)entry->overlayInfo);
+ overlayInfo = (ParticleOverlayInfo*)(-(entry->vramStart - entry->loadedRamAddr) + (u32)entry->overlayInfo);
} else {
overlayInfo = NULL;
}
@@ -222,8 +222,8 @@ GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/EffectSS_LoadParticle.asm")
// XXX regalloc is wrong
#ifdef NONMATCHING
-void EffectSS_UpdateParticle(z_GlobalContext* ctxt, u32 index) {
- z_LoadedParticleEntry* particle = &EffectSS2Info.data_table[index];
+void EffectSS_UpdateParticle(GlobalContext* ctxt, u32 index) {
+ LoadedParticleEntry* particle = &EffectSS2Info.data_table[index];
if (particle->update != NULL) {
particle->velocity.x += particle->acceleration.x;
@@ -244,7 +244,7 @@ GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/EffectSS_UpdateParticle.asm")
#endif
-void EffectSS_UpdateAllParticles(z_GlobalContext* ctxt) {
+void EffectSS_UpdateAllParticles(GlobalContext* ctxt) {
s32 i;
for (i = 0; i < EffectSS2Info.size; i++) {
@@ -265,8 +265,8 @@ void EffectSS_UpdateAllParticles(z_GlobalContext* ctxt) {
// XXX regalloc is wrong
#ifdef NONMATCHING
-void EffectSS_DrawParticle(z_GlobalContext* ctxt, s32 index) {
- z_LoadedParticleEntry* entry = &EffectSS2Info.data_table[index];
+void EffectSS_DrawParticle(GlobalContext* ctxt, s32 index) {
+ LoadedParticleEntry* entry = &EffectSS2Info.data_table[index];
if (entry->draw != 0) {
(*entry->draw)(ctxt);
}
@@ -278,7 +278,7 @@ GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/EffectSS_DrawParticle.asm")
#endif
-void EffectSS_DrawAllParticles(z_GlobalContext* ctxt) {
+void EffectSS_DrawAllParticles(GlobalContext* ctxt) {
UNK_TYPE s0;
s32 i;
diff --git a/src/code/z_lib.c b/src/code/z_lib.c
index 2648097ad..8ae55a51a 100644
--- a/src/code/z_lib.c
+++ b/src/code/z_lib.c
@@ -255,7 +255,7 @@ s16 Lib_randStride_s(s16 a0, s16 a1, s16 a2) {
return (s16)(randZeroOne() * a2) * a1 + a0;
}
-UNK_RET Lib_CopyVec3f(z_Vector3f* dst, z_Vector3f* src) {
+UNK_RET Lib_CopyVec3f(Vector3f* dst, Vector3f* src) {
f32 x = src->x;
f32 y = src->y;
f32 z = src->z;
@@ -265,7 +265,7 @@ UNK_RET Lib_CopyVec3f(z_Vector3f* dst, z_Vector3f* src) {
dst->z = z;
}
-UNK_RET Lib_CopyVec3s(z_Vector3s* dst, z_Vector3s* src) {
+UNK_RET Lib_CopyVec3s(Vector3s* dst, Vector3s* src) {
s16 x = src->x;
s16 y = src->y;
s16 z = src->z;
@@ -275,7 +275,7 @@ UNK_RET Lib_CopyVec3s(z_Vector3s* dst, z_Vector3s* src) {
dst->z = z;
}
-UNK_RET Lib_ToVec3f(z_Vector3f* dst, z_Vector3s* src) {
+UNK_RET Lib_ToVec3f(Vector3f* dst, Vector3s* src) {
f32 x = src->x;
f32 y = src->y;
f32 z = src->z;
@@ -285,7 +285,7 @@ UNK_RET Lib_ToVec3f(z_Vector3f* dst, z_Vector3s* src) {
dst->z = z;
}
-UNK_RET Lib_ToVec3s(z_Vector3s* dst, z_Vector3f* src) {
+UNK_RET Lib_ToVec3s(Vector3s* dst, Vector3f* src) {
f32 x = src->x;
f32 y = src->y;
f32 z = src->z;
@@ -295,55 +295,55 @@ UNK_RET Lib_ToVec3s(z_Vector3s* dst, z_Vector3f* src) {
dst->z = z;
}
-UNK_RET Lib_AddVec3f(z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2) {
+UNK_RET Lib_AddVec3f(Vector3f* a0, Vector3f* a1, Vector3f* a2) {
a2->x = a0->x + a1->x;
a2->y = a0->y + a1->y;
a2->z = a0->z + a1->z;
}
-UNK_RET Lib_SubVec3f(z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2) {
+UNK_RET Lib_SubVec3f(Vector3f* a0, Vector3f* a1, Vector3f* a2) {
a2->x = a0->x - a1->x;
a2->y = a0->y - a1->y;
a2->z = a0->z - a1->z;
}
-UNK_RET Lib_SubVec3sToVec3f(z_Vector3f* a0, z_Vector3s* a1, z_Vector3s* a2) {
+UNK_RET Lib_SubVec3sToVec3f(Vector3f* a0, Vector3s* a1, Vector3s* a2) {
a0->x = a1->x - a2->x;
a0->y = a1->y - a2->y;
a0->z = a1->z - a2->z;
}
-UNK_RET Lib_ScaleInPlaceVec3f(z_Vector3f* a0, f32 a1) {
+UNK_RET Lib_ScaleInPlaceVec3f(Vector3f* a0, f32 a1) {
a0->x *= a1;
a0->y *= a1;
a0->z *= a1;
}
-UNK_RET Lib_ScaleVec3f(z_Vector3f* a0, f32 a1, z_Vector3f* a2) {
+UNK_RET Lib_ScaleVec3f(Vector3f* a0, f32 a1, Vector3f* a2) {
a2->x = a0->x * a1;
a2->y = a0->y * a1;
a2->z = a0->z * a1;
}
-UNK_RET Lib_LerpVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3) {
+UNK_RET Lib_LerpVec3f(Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3) {
a3->x = (a1->x - a0->x) * a2 + a0->x;
a3->y = (a1->y - a0->y) * a2 + a0->y;
a3->z = (a1->z - a0->z) * a2 + a0->z;
}
-UNK_RET Lib_AddScaledVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3) {
+UNK_RET Lib_AddScaledVec3f(Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3) {
a3->x = a1->x * a2 + a0->x;
a3->y = a1->y * a2 + a0->y;
a3->z = a1->z * a2 + a0->z;
}
-UNK_RET Lib_ModifyRandScaled(z_Vector3f* a0, f32 a1, z_Vector3f* a2) {
+UNK_RET Lib_ModifyRandScaled(Vector3f* a0, f32 a1, Vector3f* a2) {
a2->x = randPlusMinusPoint5Scaled(a1) + a0->x;
a2->y = randPlusMinusPoint5Scaled(a1) + a0->y;
a2->z = randPlusMinusPoint5Scaled(a1) + a0->z;
}
-void Lib_ScaledNormalizedDifferenceVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3) {
+void Lib_ScaledNormalizedDifferenceVec3f(Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3) {
f32 f0 = Lib_DistanceAndDifferenceVec3f(a0, a1, a3);
f32 f2;
@@ -358,24 +358,24 @@ void Lib_ScaledNormalizedDifferenceVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2,
a3->z *= f2;
}
-f32 Lib_DistanceVec3f(z_Vector3f* a0, z_Vector3f* a1) {
- z_Vector3f sp1C;
+f32 Lib_DistanceVec3f(Vector3f* a0, Vector3f* a1) {
+ Vector3f sp1C;
Lib_SubVec3f(a1, a0, &sp1C);
return sqrtf((sp1C.x * sp1C.x) + (sp1C.y * sp1C.y) + (sp1C.z * sp1C.z));
}
-f32 Lib_DistanceAndDifferenceVec3f(z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2) {
+f32 Lib_DistanceAndDifferenceVec3f(Vector3f* a0, Vector3f* a1, Vector3f* a2) {
Lib_SubVec3f(a1, a0, a2);
return sqrtf((a2->x * a2->x) + (a2->y * a2->y) + (a2->z * a2->z));
}
-f32 Lib_DistanceXZVec3f(z_Vector3f* a0, z_Vector3f* a1) {
+f32 Lib_DistanceXZVec3f(Vector3f* a0, Vector3f* a1) {
f32 dx = a1->x - a0->x;
f32 dz = a1->z - a0->z;
return sqrtf((dx * dx) + (dz * dz));
}
-f32 Lib_DistanceAndDifferenceXZVec3f(z_Vector3f* a0, z_Vector3f* a1, f32* a2, f32* a3) {
+f32 Lib_DistanceAndDifferenceXZVec3f(Vector3f* a0, Vector3f* a1, f32* a2, f32* a3) {
*a2 = a1->x - a0->x;
*a3 = a1->z - a0->z;
return sqrtf((*a2 * *a2) + (*a3 * *a3));
@@ -383,7 +383,7 @@ f32 Lib_DistanceAndDifferenceXZVec3f(z_Vector3f* a0, z_Vector3f* a1, f32* a2, f3
#ifdef NONMATCHING
-UNK_RET Lib_PushAwayXZVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2) {
+UNK_RET Lib_PushAwayXZVec3f(Vector3f* a0, Vector3f* a1, f32 a2) {
f32 sp24;
f32 sp20;
f32 f0 = Lib_DistanceAndDifferenceXZVec3f(a1, a0, &sp24, &sp20);
@@ -405,60 +405,60 @@ GLOBAL_ASM("./asm/nonmatching/z_lib/Lib_PushAwayXZVec3f.asm")
#endif
-f32 Lib_DistanceYVec3f(z_Vector3f* a0, z_Vector3f* a1) {
+f32 Lib_DistanceYVec3f(Vector3f* a0, Vector3f* a1) {
return a1->y - a0->y;
}
-UNK_TYPE Lib_YawVec3f(z_Vector3f* a0, z_Vector3f* a1) {
+UNK_TYPE Lib_YawVec3f(Vector3f* a0, Vector3f* a1) {
f32 f14 = a1->x - a0->x;
f32 f12 = a1->z - a0->z;
return atans_flip(f12, f14);
}
-UNK_TYPE Lib_PitchVec3f(z_Vector3f* a0, z_Vector3f* a1) {
+UNK_TYPE Lib_PitchVec3f(Vector3f* a0, Vector3f* a1) {
return atans_flip(Lib_DistanceXZVec3f(a0, a1), a0->y - a1->y);
}
-void Lib_ApplyActorInitVars(z_Actor* a0, z_ActorInitVar* a1) {
+void Lib_ApplyActorInitVars(Actor* a0, ActorInitVar* a1) {
do {
D_801BE960[a1->type]((u8*)a0, a1);
} while ((a1++)->cont);
}
-UNK_RET Lib_ApplyActorInitVarByte1(u8* a0, z_ActorInitVar* a1) {
+UNK_RET Lib_ApplyActorInitVarByte1(u8* a0, ActorInitVar* a1) {
*(u8*)(a0 + a1->offset) = (u8)(a1->value);
}
-UNK_RET Lib_ApplyActorInitVarByte2(u8* a0, z_ActorInitVar* a1) {
+UNK_RET Lib_ApplyActorInitVarByte2(u8* a0, ActorInitVar* a1) {
*(u8*)(a0 + a1->offset) = (u8)(a1->value);
}
-UNK_RET Lib_ApplyActorInitVarShort1(u8* a0, z_ActorInitVar* a1) {
+UNK_RET Lib_ApplyActorInitVarShort1(u8* a0, ActorInitVar* a1) {
*(u16*)(a0 + a1->offset) = (u16)(a1->value);
}
-UNK_RET Lib_ApplyActorInitVarShort2(u8* a0, z_ActorInitVar* a1) {
+UNK_RET Lib_ApplyActorInitVarShort2(u8* a0, ActorInitVar* a1) {
*(u16*)(a0 + a1->offset) = (u16)(a1->value);
}
-UNK_RET Lib_ApplyActorInitVarWord1(u8* a0, z_ActorInitVar* a1) {
+UNK_RET Lib_ApplyActorInitVarWord1(u8* a0, ActorInitVar* a1) {
*(u32*)(a0 + a1->offset) = (u32)(a1->value);
}
-UNK_RET Lib_ApplyActorInitVarWord2(u8* a0, z_ActorInitVar* a1) {
+UNK_RET Lib_ApplyActorInitVarWord2(u8* a0, ActorInitVar* a1) {
*(u32*)(a0 + a1->offset) = (u32)(a1->value);
}
-UNK_RET Lib_ApplyActorInitVarFloat(u8* a0, z_ActorInitVar* a1) {
+UNK_RET Lib_ApplyActorInitVarFloat(u8* a0, ActorInitVar* a1) {
*(f32*)(a0 + a1->offset) = (f32)(a1->value);
}
-UNK_RET Lib_ApplyActorInitVarFloat1000th(u8* a0, z_ActorInitVar* a1) {
+UNK_RET Lib_ApplyActorInitVarFloat1000th(u8* a0, ActorInitVar* a1) {
*(f32*)(a0 + a1->offset) = (f32)(a1->value) / 1000;
}
-UNK_RET Lib_ApplyActorInitVarVector3f(u8* a0, z_ActorInitVar* a1) {
- z_Vector3f* v0 = (z_Vector3f*)(a0 + a1->offset);
+UNK_RET Lib_ApplyActorInitVarVector3f(u8* a0, ActorInitVar* a1) {
+ Vector3f* v0 = (Vector3f*)(a0 + a1->offset);
f32 f0 = (f32)(a1->value);
v0->z = f0;
@@ -466,8 +466,8 @@ UNK_RET Lib_ApplyActorInitVarVector3f(u8* a0, z_ActorInitVar* a1) {
v0->x = f0;
}
-UNK_RET Lib_ApplyActorInitVarVector3f1000th(u8* a0, z_ActorInitVar* a1) {
- z_Vector3f* v0 = (z_Vector3f*)(a0 + a1->offset);
+UNK_RET Lib_ApplyActorInitVarVector3f1000th(u8* a0, ActorInitVar* a1) {
+ Vector3f* v0 = (Vector3f*)(a0 + a1->offset);
f32 f0 = (f32)(a1->value) / 1000;
v0->z = f0;
@@ -475,8 +475,8 @@ UNK_RET Lib_ApplyActorInitVarVector3f1000th(u8* a0, z_ActorInitVar* a1) {
v0->x = f0;
}
-UNK_RET Lib_ApplyActorInitVarVector3s(u8* a0, z_ActorInitVar* a1) {
- z_Vector3s* v0 = (z_Vector3s*)(a0 + a1->offset);
+UNK_RET Lib_ApplyActorInitVarVector3s(u8* a0, ActorInitVar* a1) {
+ Vector3s* v0 = (Vector3s*)(a0 + a1->offset);
s16 v1 = (s16)(a1->value);
v0->z = v1;
@@ -600,7 +600,7 @@ UNK_RET func_801000F4(UNK_TYPE a0, u16 a1) {
func_8019F1C0(a0, a1);
}
-void Lib_TranslateAndRotateYVec3f(z_Vector3f* a0, s16 a1, z_Vector3f* a2, z_Vector3f* a3) {
+void Lib_TranslateAndRotateYVec3f(Vector3f* a0, s16 a1, Vector3f* a2, Vector3f* a3) {
f32 sp1C;
f32 f0;
@@ -626,8 +626,8 @@ GLOBAL_ASM("./asm/nonmatching/z_lib/Lib_LerpRGB.asm")
#endif
-f32 Lib_PushAwayVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2) {
- z_Vector3f sp24;
+f32 Lib_PushAwayVec3f(Vector3f* a0, Vector3f* a1, f32 a2) {
+ Vector3f sp24;
f32 f2;
f32 f0;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 12:42:23 +0000