diff --git a/data/overlays/actors/z_demo_gj.data.s b/data/overlays/actors/z_demo_gj.data.s deleted file mode 100644 index 141edc3b3a..0000000000 --- a/data/overlays/actors/z_demo_gj.data.s +++ /dev/null @@ -1,88 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_8097BDE0 - .word 0x00000900, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x001E0064, 0x00000000, 0x00000000 -glabel D_8097BE0C - .word 0x00000900, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x0019006E, 0x00000000, 0x00000000 -glabel D_8097BE38 - .word 0x00000900, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x001900C8, 0x00000000, 0x00000000 -glabel D_8097BE64 - .word 0x00000000, 0x40C00000, 0x00000000 -glabel D_8097BE70 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_8097BE7C - .word 0x00000000 -glabel D_8097BE80 - .word 0x00000000 -glabel D_8097BE84 - .word 0x48500064 -glabel D_8097BE88 - .word 0xC3B98000, 0x44948000, 0xC3978000 -glabel D_8097BE94 - .word 0xC2EE0000, 0x44840000, 0xC3130000 -glabel D_8097BEA0 - .word 0xC0C00000, 0x4483A000, 0xC3EC8000 -glabel D_8097BEAC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_8097BEB8 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_8097BEC4 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_8097BED0 - .word func_8097ADF0 -.word func_8097A160 -.word func_8097A39C -.word func_8097A56C -.word func_8097A73C -.word func_8097A90C -.word func_8097AADC -.word func_8097AD18 -.word func_8097A190 -.word func_8097A3CC -.word func_8097A59C -.word func_8097A76C -.word func_8097A93C -.word func_8097AB0C -.word func_8097AD48 -.word func_8097B340 -.word func_8097B864 -.word func_8097BB78 -.word func_8097B370 -.word func_8097B894 -.word func_8097BBA8 -glabel D_8097BF24 - .word func_8097BD70 -.word func_8097AE38 -.word func_8097A1C0 -.word func_8097A3FC -.word func_8097A5CC -.word func_8097A79C -.word func_8097A96C -.word func_8097AB3C -.word func_8097AD78 -.word func_8097A1E4 -.word func_8097A420 -.word func_8097A5F0 -.word func_8097A7C0 -.word func_8097A990 -.word func_8097AB60 -.word func_8097AD9C -.word func_8097B3A0 -.word func_8097B8C4 -.word func_8097BBD8 -glabel Demo_Gj_InitVars - .word 0x01B10600, 0x00000030, 0x01850000, 0x00000278 -.word DemoGj_Init -.word DemoGj_Destroy -.word DemoGj_Update -.word DemoGj_Draw - diff --git a/spec b/spec index 6889fd1cd5..349a6ec465 100644 --- a/spec +++ b/spec @@ -1499,7 +1499,6 @@ endseg beginseg name "ovl_Demo_Gj" include "build/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.o" - include "build/data/overlays/actors/z_demo_gj.data.o" include "build/data/overlays/actors/z_demo_gj.reloc.o" endseg diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index ca1187dac1..8fdb3176f2 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -28,6 +28,129 @@ extern UNK_TYPE D_060033E0; extern Gfx D_06003710; extern UNK_TYPE D_06003AF0; + +// sCylinderInit +static ColliderCylinderInitType1 D_8097BDE0 = { + { + COLTYPE_HIT0, + AT_NONE, + AC_ON | AC_TYPE_PLAYER, + OC1_NONE, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0x00000008, 0x00, 0x00 }, + TOUCH_NONE, + BUMP_ON, + OCELEM_NONE, + }, + { 30, 100, 0, { 0, 0, 0 } }, +}; + +static ColliderCylinderInitType1 D_8097BE0C = { + { + COLTYPE_HIT0, + AT_NONE, + AC_ON | AC_TYPE_PLAYER, + OC1_NONE, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0x00000008, 0x00, 0x00 }, + TOUCH_NONE, + BUMP_ON, + OCELEM_NONE, + }, + { 25, 110, 0, { 0, 0, 0 } }, +}; + +static ColliderCylinderInitType1 D_8097BE38 = { + { + COLTYPE_HIT0, + AT_NONE, + AC_ON | AC_TYPE_PLAYER, + OC1_NONE, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0x00000008, 0x00, 0x00 }, + TOUCH_NONE, + BUMP_ON, + OCELEM_NONE, + }, + { 25, 200, 0, { 0, 0, 0 } }, +}; + +// velocity +static Vec3f D_8097BE64 = { + 0.0f, 6.0f, 0.0f +}; + +// accel +static Vec3f D_8097BE70 = { + 0.0f, 0.0f, 0.0f +}; + +// primColor +static Color_RGBA8 D_8097BE7C = { + 0, 0, 0, 0 +}; + +// envColor +static Color_RGBA8 D_8097BE80 = { + 0, 0, 0, 0 +}; + + +// D_8097BE84 +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), +}; + +static Vec3f D_8097BE88 = { + -371.0f, 1188.0f, -303.0f +}; + +static Vec3f D_8097BE94 = { + -119.0f, 1056.0f, -147.0f +}; + +static Vec3f D_8097BEA0 = { + -6.0f, 1053.0f, -473.0f +}; + +/* +glabel D_8097BEAC + .word 0x00000000, 0x00000000, 0x00000000 +*/ +static s32 D_8097BEAC[] = { + 0, 0, 0 +}; + +/* +glabel D_8097BEB8 + .word 0x00000000, 0x00000000, 0x00000000 +*/ +static s32 D_8097BEB8[] = { + 0, 0, 0 +}; + +/* +glabel D_8097BEC4 + .word 0x00000000, 0x00000000, 0x00000000 +*/ +static s32 D_8097BEC4[] = { + 0, 0, 0 +}; + + + typedef void (*DemoGjActionFunc)(DemoGj*, GlobalContext*); void func_8097ADF0(DemoGj* this, GlobalContext* globalCtx); @@ -52,8 +175,6 @@ void func_8097B370(DemoGj* this, GlobalContext* globalCtx); void func_8097B894(DemoGj* this, GlobalContext* globalCtx); void func_8097BBA8(DemoGj* this, GlobalContext* globalCtx); -extern DemoGjActionFunc D_8097BED0[]; -/* static DemoGjActionFunc D_8097BED0[] = { func_8097ADF0, func_8097A160, @@ -77,7 +198,6 @@ static DemoGjActionFunc D_8097BED0[] = { func_8097B894, func_8097BBA8, }; -*/ void func_8097BD70(DemoGj* this, GlobalContext* globalCtx); @@ -100,8 +220,7 @@ void func_8097B3A0(DemoGj* this, GlobalContext* globalCtx); void func_8097B8C4(DemoGj* this, GlobalContext* globalCtx); void func_8097BBD8(DemoGj* this, GlobalContext* globalCtx); -extern DemoGjActionFunc D_8097BF24[]; -/* + static DemoGjActionFunc D_8097BF24[] = { func_8097BD70, func_8097AE38, @@ -123,9 +242,9 @@ static DemoGjActionFunc D_8097BF24[] = { func_8097B8C4, func_8097BBD8, }; -*/ -/* + + const ActorInit Demo_Gj_InitVars = { ACTOR_DEMO_GJ, ACTORCAT_PROP, @@ -138,84 +257,6 @@ const ActorInit Demo_Gj_InitVars = { (ActorFunc)DemoGj_Draw, }; -static ColliderCylinderInitType1 sCylinderInit = { - { - COLTYPE_HIT0, - AT_NONE, - AC_ON | AC_TYPE_PLAYER, - OC1_NONE, - COLSHAPE_CYLINDER, - }, - { - ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE, - BUMP_ON, - OCELEM_NONE, - }, - { 30, 100, 0, { 0, 0, 0 } }, -}; - -static ColliderCylinderInitType1 sCylinderInit = { - { - COLTYPE_HIT0, - AT_NONE, - AC_ON | AC_TYPE_PLAYER, - OC1_NONE, - COLSHAPE_CYLINDER, - }, - { - ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE, - BUMP_ON, - OCELEM_NONE, - }, - { 25, 110, 0, { 0, 0, 0 } }, -}; - -static ColliderCylinderInitType1 sCylinderInit = { - { - COLTYPE_HIT0, - AT_NONE, - AC_ON | AC_TYPE_PLAYER, - OC1_NONE, - COLSHAPE_CYLINDER, - }, - { - ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE, - BUMP_ON, - OCELEM_NONE, - }, - { 25, 200, 0, { 0, 0, 0 } }, -}; -*/ - -/* -static InitChainEntry sInitChain[] = { - ICHAIN_VEC3F_DIV1000(unk_50, 100, ICHAIN_STOP), -}; -*/ -// D_8097BE84 -extern InitChainEntry sInitChain[]; - - -extern Vec3f D_8097BE64; // velocity -extern Vec3f D_8097BE70; // accel -extern Color_RGBA8 D_8097BE7C; // primColor -extern Color_RGBA8 D_8097BE80; // envColor - -extern Vec3f D_8097BE88; -extern Vec3f D_8097BEA0; - -extern ColliderCylinderInitType1 D_8097BDE0; -extern ColliderCylinderInitType1 D_8097BE0C; -extern ColliderCylinderInitType1 D_8097BE38; s32 func_80978930(DemoGj *this) { diff --git a/undefined_syms.txt b/undefined_syms.txt index f12e44240d..e0364d847a 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1976,6 +1976,18 @@ D_060033E0 = 0x060033E0; D_06003710 = 0x06003710; D_06003AF0 = 0x06003AF0; +D_8097BE64 = 0x8097BE64; +D_8097BE70 = 0x8097BE70; +D_8097BE7C = 0x8097BE7C; +D_8097BE80 = 0x8097BE80; +D_8097BE84 = 0x8097BE84; +D_8097BE88 = 0x8097BE88; +D_8097BE94 = 0x8097BE94; +D_8097BEA0 = 0x8097BEA0; +D_8097BEAC = 0x8097BEAC; +D_8097BEB8 = 0x8097BEB8; +D_8097BEC4 = 0x8097BEC4; + // z_demo_ik D_0600035C = 0x0600035C; D_06000380 = 0x06000380;