mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-28 08:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename tons of structs because we aren't using the z_ prefix anymore ;_;

Browse Source
This commit is contained in:
rozlette
2019-11-14 00:52:31 -06:00
parent b1938991fa
commit a09a799eef
15 changed files with 748 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c
+14 -14
View File
@@ -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
src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c
+19 -19
View File
@@ -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
}