Use structs.h generated from Ghidra project

This commit is contained in:
rozlette
2019-09-29 01:37:21 -05:00
parent 0ecea6b626
commit a8060ddcff
21 changed files with 1791 additions and 514 deletions
@@ -20,17 +20,17 @@ 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);
z_ActorInit bgBgFuKaitenInitVar = {
z_ActorInitData bgBgFuKaitenInitVar = {
0x01AE,
1,
0,
0x30,
0x01A0,
sizeof(z_ActorBgFuKaiten),
(z_ActorFunc)z_bg_fu_kaiten_init,
(z_ActorFunc)z_bg_fu_kaiten_fini,
(z_ActorFunc)z_bg_fu_kaiten_main,
(z_ActorFunc)func_80ACB5A0
(actor_func)z_bg_fu_kaiten_init,
(actor_func)z_bg_fu_kaiten_fini,
(actor_func)z_bg_fu_kaiten_main,
(actor_func)func_80ACB5A0
};
f32 D_80ACB650 = 0.002;
@@ -18,17 +18,17 @@ void func_80BD54BC(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt);
void func_80BD5500(z_ActorBgIkanaRay* this);
void func_80BD5530(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt);
z_ActorInit bgIkanaRayInitVar = {
z_ActorInitData bgIkanaRayInitVar = {
0x0256,
6,
0,
0,
0x0203,
sizeof(z_ActorBgIkanaRay),
(z_ActorFunc)z_bg_ikana_ray_init,
(z_ActorFunc)z_bg_ikana_ray_fini,
(z_ActorFunc)z_bg_ikana_ray_main,
(z_ActorFunc)z_bg_ikana_ray_draw
(actor_func)z_bg_ikana_ray_init,
(actor_func)z_bg_ikana_ray_fini,
(actor_func)z_bg_ikana_ray_main,
(actor_func)z_bg_ikana_ray_draw
};
GLOBAL_ASM(
@@ -119,7 +119,7 @@ void func_80BD54BC(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) {
}
void func_80BD5500(z_ActorBgIkanaRay* this) {
this->baseActor.drawFunc = (z_ActorFunc)z_bg_ikana_ray_draw;
this->baseActor.drawFunc = (actor_func)z_bg_ikana_ray_draw;
this->baseActor.unk4 &= 0xFFFFFFEF;
this->unk404 = func_80BD5530;
}