From d3bdd5cee9fd2a19c3ad9980c502a85f1ae5197f Mon Sep 17 00:00:00 2001 From: louist103 Date: Sat, 7 Oct 2023 14:12:40 -0400 Subject: [PATCH] data --- spec | 1 - .../actors/ovl_Obj_Mure2/z_obj_mure2.c | 50 ++++++++++++++++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/spec b/spec index e4508b5bd..f2175b371 100644 --- a/spec +++ b/spec @@ -1551,7 +1551,6 @@ beginseg name "ovl_Obj_Mure2" compress include "build/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.o" - include "build/data/ovl_Obj_Mure2/ovl_Obj_Mure2.data.o" include "build/data/ovl_Obj_Mure2/ovl_Obj_Mure2.reloc.o" endseg diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index bda4dc258..a88c67f7f 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -17,7 +17,11 @@ void func_809613C4(ObjMure2* this, PlayState* play); void func_809613FC(ObjMure2* this, PlayState* play); void func_80961490(ObjMure2* this, PlayState* play); -#if 0 +void func_80960CF0(Vec3f*, Vec3f*); +void func_80960E0C(Vec3f*, Vec3f*); +void func_80960F0C(Vec3f*, Vec3f*); + +#if 1 ActorInit Obj_Mure2_InitVars = { ACTOR_OBJ_MURE2, ACTORCAT_PROP, @@ -30,6 +34,50 @@ ActorInit Obj_Mure2_InitVars = { (ActorFunc)NULL, }; +Vec3f D_80961590 = { +2560000.0, +2560000.0, +2560000.0, +}; + +Vec3f D_8096159C = { +2907025.0, +2907025.0, +2907025.0, +}; + +s16 D_809615A8[] = { +0x0009,0x000C, +0x0008,0x0000, +}; + +s16 D_809615B0[] = { +0x0090,0x0090, +0x00B0,0x0000, +}; + +s16 D_809615B8[] = { +0x0028,0x0666, +0x0028,0x2CCC, +0x0028,0x5999, +0x0028,0x8666, +0x0014,0xC000, +0x0050,0x1333, +0x0050,0x4000, +0x0050,0x6CCC, +0x0050,0x9333, +0x0050,0xACCC, +0x0050,0xC666, +0x003C,0xE000, +}; + +typedef void (*ObjMure2UnkFunc)(Vec3f*, Vec3f*); +ObjMure2UnkFunc D_809615E8[] = { +func_80960CF0, +func_80960E0C, +func_80960F0C, +}; + // static InitChainEntry sInitChain[] = { static InitChainEntry D_809615F4[] = { ICHAIN_F32(uncullZoneForward, 100, ICHAIN_CONTINUE),