diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_TwinrovaDeathCS.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_TwinrovaDeathCS.s index 20f087e32b..adf2f85a1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_TwinrovaDeathCS.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_TwinrovaDeathCS.s @@ -62,8 +62,8 @@ glabel BossTw_TwinrovaDeathCS /* 06DBC 8093FA8C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 06DC0 8093FA90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000568 /* 06DC4 8093FA94 14410005 */ bne $v0, $at, .L8093FAAC -/* 06DC8 8093FA98 3C050602 */ lui $a1, %hi(D_060216DC) ## $a1 = 06020000 -/* 06DCC 8093FA9C 24A516DC */ addiu $a1, $a1, %lo(D_060216DC) ## $a1 = 060216DC +/* 06DC8 8093FA98 3C050602 */ lui $a1, %hi(object_tw_Anim_0216DC) ## $a1 = 06020000 +/* 06DCC 8093FA9C 24A516DC */ addiu $a1, $a1, %lo(object_tw_Anim_0216DC) ## $a1 = 060216DC /* 06DD0 8093FAA0 0C029490 */ jal Animation_MorphToPlayOnce /* 06DD4 8093FAA4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 06DD8 8093FAA8 86420150 */ lh $v0, 0x0150($s2) ## 00000150 diff --git a/assets/xml/objects/object_brob.xml b/assets/xml/objects/object_brob.xml index 8e805b87a4..718dcd5617 100644 --- a/assets/xml/objects/object_brob.xml +++ b/assets/xml/objects/object_brob.xml @@ -20,6 +20,6 @@ - + diff --git a/assets/xml/objects/object_bw.xml b/assets/xml/objects/object_bw.xml index e61e30ab31..712d4b4959 100644 --- a/assets/xml/objects/object_bw.xml +++ b/assets/xml/objects/object_bw.xml @@ -24,6 +24,6 @@ - + diff --git a/assets/xml/objects/object_d_elevator.xml b/assets/xml/objects/object_d_elevator.xml index b946203394..6be59c154b 100644 --- a/assets/xml/objects/object_d_elevator.xml +++ b/assets/xml/objects/object_d_elevator.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_dekujr.xml b/assets/xml/objects/object_dekujr.xml index e4141a50ba..e906bf61c4 100644 --- a/assets/xml/objects/object_dekujr.xml +++ b/assets/xml/objects/object_dekujr.xml @@ -7,7 +7,7 @@ - - + + diff --git a/assets/xml/objects/object_demo_6k.xml b/assets/xml/objects/object_demo_6k.xml index aef9f90efa..73058d5e46 100644 --- a/assets/xml/objects/object_demo_6k.xml +++ b/assets/xml/objects/object_demo_6k.xml @@ -5,6 +5,9 @@ + + + diff --git a/assets/xml/objects/object_door_killer.xml b/assets/xml/objects/object_door_killer.xml index 41cd4f8d1a..8da96881ff 100644 --- a/assets/xml/objects/object_door_killer.xml +++ b/assets/xml/objects/object_door_killer.xml @@ -12,6 +12,6 @@ - + diff --git a/assets/xml/objects/object_fr.xml b/assets/xml/objects/object_fr.xml index c8533dd6ba..5935f371d4 100644 --- a/assets/xml/objects/object_fr.xml +++ b/assets/xml/objects/object_fr.xml @@ -1,7 +1,7 @@ - - + + diff --git a/assets/xml/objects/object_ganon.xml b/assets/xml/objects/object_ganon.xml index b880161b2b..21da569a40 100644 --- a/assets/xml/objects/object_ganon.xml +++ b/assets/xml/objects/object_ganon.xml @@ -51,7 +51,8 @@ - + + diff --git a/assets/xml/objects/object_gndd.xml b/assets/xml/objects/object_gndd.xml index fc76de6a6b..96e264c349 100644 --- a/assets/xml/objects/object_gndd.xml +++ b/assets/xml/objects/object_gndd.xml @@ -42,7 +42,9 @@ - + + + diff --git a/assets/xml/objects/object_haka_objects.xml b/assets/xml/objects/object_haka_objects.xml index d76cb3b7c4..237ff2f275 100644 --- a/assets/xml/objects/object_haka_objects.xml +++ b/assets/xml/objects/object_haka_objects.xml @@ -1,7 +1,7 @@ - + @@ -19,39 +19,39 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/assets/xml/objects/object_ice_objects.xml b/assets/xml/objects/object_ice_objects.xml index ee8fb94ce2..a4e2e9b12b 100644 --- a/assets/xml/objects/object_ice_objects.xml +++ b/assets/xml/objects/object_ice_objects.xml @@ -1,17 +1,18 @@ - + - + - + - + + diff --git a/assets/xml/objects/object_im.xml b/assets/xml/objects/object_im.xml index e261066fd1..707269caf7 100644 --- a/assets/xml/objects/object_im.xml +++ b/assets/xml/objects/object_im.xml @@ -30,8 +30,8 @@ - - + + diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml index 7b788efd0b..66295f90d9 100644 --- a/assets/xml/objects/object_in.xml +++ b/assets/xml/objects/object_in.xml @@ -18,7 +18,8 @@ - + + @@ -28,9 +29,11 @@ - + + - + + diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml index 970a6fe056..d2c01e8781 100644 --- a/assets/xml/objects/object_kingdodongo.xml +++ b/assets/xml/objects/object_kingdodongo.xml @@ -48,7 +48,7 @@ - + diff --git a/assets/xml/objects/object_kz.xml b/assets/xml/objects/object_kz.xml index 3c745bfff3..a0e5dccd58 100644 --- a/assets/xml/objects/object_kz.xml +++ b/assets/xml/objects/object_kz.xml @@ -3,13 +3,16 @@ - + - + + + + diff --git a/assets/xml/objects/object_lightbox.xml b/assets/xml/objects/object_lightbox.xml index bc11405fb2..552a79d7c7 100644 --- a/assets/xml/objects/object_lightbox.xml +++ b/assets/xml/objects/object_lightbox.xml @@ -10,6 +10,6 @@ - + diff --git a/assets/xml/objects/object_lightswitch.xml b/assets/xml/objects/object_lightswitch.xml index 241500e7e1..cfd5dcfb40 100644 --- a/assets/xml/objects/object_lightswitch.xml +++ b/assets/xml/objects/object_lightswitch.xml @@ -1,9 +1,14 @@ + + + - + + + diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml index 6951763a83..7c1286645b 100644 --- a/assets/xml/objects/object_ma2.xml +++ b/assets/xml/objects/object_ma2.xml @@ -17,11 +17,14 @@ - + + - + + - + + @@ -60,6 +63,6 @@ - + diff --git a/assets/xml/objects/object_mizu_objects.xml b/assets/xml/objects/object_mizu_objects.xml index 9042884490..de3bdf636e 100644 --- a/assets/xml/objects/object_mizu_objects.xml +++ b/assets/xml/objects/object_mizu_objects.xml @@ -19,7 +19,9 @@ - + + + diff --git a/assets/xml/objects/object_mori_hineri1.xml b/assets/xml/objects/object_mori_hineri1.xml index c86047131f..517c02780b 100644 --- a/assets/xml/objects/object_mori_hineri1.xml +++ b/assets/xml/objects/object_mori_hineri1.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_mori_hineri1a.xml b/assets/xml/objects/object_mori_hineri1a.xml index ac1e44696b..fb20482ddf 100644 --- a/assets/xml/objects/object_mori_hineri1a.xml +++ b/assets/xml/objects/object_mori_hineri1a.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_mori_hineri2.xml b/assets/xml/objects/object_mori_hineri2.xml index 2c9bfe44fe..a23d9060c0 100644 --- a/assets/xml/objects/object_mori_hineri2.xml +++ b/assets/xml/objects/object_mori_hineri2.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_mori_hineri2a.xml b/assets/xml/objects/object_mori_hineri2a.xml index 14e22992c9..282fd267f6 100644 --- a/assets/xml/objects/object_mori_hineri2a.xml +++ b/assets/xml/objects/object_mori_hineri2a.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_reeba.xml b/assets/xml/objects/object_reeba.xml index 4e103cb3f0..32c697bd9d 100644 --- a/assets/xml/objects/object_reeba.xml +++ b/assets/xml/objects/object_reeba.xml @@ -22,6 +22,6 @@ - + diff --git a/assets/xml/objects/object_rl.xml b/assets/xml/objects/object_rl.xml index c7d10022a9..fa423e5297 100644 --- a/assets/xml/objects/object_rl.xml +++ b/assets/xml/objects/object_rl.xml @@ -17,7 +17,8 @@ - + + diff --git a/assets/xml/objects/object_siofuki.xml b/assets/xml/objects/object_siofuki.xml index 453bc94740..a23240a728 100644 --- a/assets/xml/objects/object_siofuki.xml +++ b/assets/xml/objects/object_siofuki.xml @@ -2,6 +2,6 @@ - + diff --git a/assets/xml/objects/object_spot01_matoyab.xml b/assets/xml/objects/object_spot01_matoyab.xml index 1564f0e86d..720f50cd3e 100644 --- a/assets/xml/objects/object_spot01_matoyab.xml +++ b/assets/xml/objects/object_spot01_matoyab.xml @@ -1,5 +1,7 @@ + + diff --git a/assets/xml/objects/object_spot02_objects.xml b/assets/xml/objects/object_spot02_objects.xml index 1e8b44d07d..28452bf5ad 100644 --- a/assets/xml/objects/object_spot02_objects.xml +++ b/assets/xml/objects/object_spot02_objects.xml @@ -8,12 +8,12 @@ - + - + - + diff --git a/assets/xml/objects/object_spot03_object.xml b/assets/xml/objects/object_spot03_object.xml index 7f77013d24..f182e7d99a 100644 --- a/assets/xml/objects/object_spot03_object.xml +++ b/assets/xml/objects/object_spot03_object.xml @@ -1,10 +1,15 @@ - + + + + + + - + diff --git a/assets/xml/objects/object_spot05_objects.xml b/assets/xml/objects/object_spot05_objects.xml index 1e49c5a57c..6e70791493 100644 --- a/assets/xml/objects/object_spot05_objects.xml +++ b/assets/xml/objects/object_spot05_objects.xml @@ -2,9 +2,9 @@ - + - + diff --git a/assets/xml/objects/object_spot07_object.xml b/assets/xml/objects/object_spot07_object.xml index 6623a564c1..fce169032d 100644 --- a/assets/xml/objects/object_spot07_object.xml +++ b/assets/xml/objects/object_spot07_object.xml @@ -6,12 +6,12 @@ - + - + diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml index 653e19a56c..fe617cf148 100644 --- a/assets/xml/objects/object_st.xml +++ b/assets/xml/objects/object_st.xml @@ -22,8 +22,8 @@ - - + + diff --git a/assets/xml/objects/object_ta.xml b/assets/xml/objects/object_ta.xml index cbc90d9535..595e4aa0d0 100644 --- a/assets/xml/objects/object_ta.xml +++ b/assets/xml/objects/object_ta.xml @@ -18,12 +18,15 @@ - + + + + - + diff --git a/assets/xml/objects/object_tite.xml b/assets/xml/objects/object_tite.xml index f8c9ecab4b..1be65c4950 100644 --- a/assets/xml/objects/object_tite.xml +++ b/assets/xml/objects/object_tite.xml @@ -3,15 +3,20 @@ - - - + + + - - + + + + + - + + + diff --git a/assets/xml/objects/object_toki_objects.xml b/assets/xml/objects/object_toki_objects.xml index 76ba2030cc..3a688d732a 100644 --- a/assets/xml/objects/object_toki_objects.xml +++ b/assets/xml/objects/object_toki_objects.xml @@ -16,7 +16,7 @@ - + diff --git a/assets/xml/objects/object_tr.xml b/assets/xml/objects/object_tr.xml index cb2f3391f3..fbac8018c7 100644 --- a/assets/xml/objects/object_tr.xml +++ b/assets/xml/objects/object_tr.xml @@ -1,12 +1,12 @@ - - + + - - - + + + diff --git a/assets/xml/objects/object_tw.xml b/assets/xml/objects/object_tw.xml index c774df4937..291f4676de 100644 --- a/assets/xml/objects/object_tw.xml +++ b/assets/xml/objects/object_tw.xml @@ -136,12 +136,12 @@ - + - + - + @@ -271,7 +271,7 @@ - + diff --git a/assets/xml/textures/nintendo_rogo_static.xml b/assets/xml/textures/nintendo_rogo_static.xml index fe9fac8dd9..7a60524b20 100644 --- a/assets/xml/textures/nintendo_rogo_static.xml +++ b/assets/xml/textures/nintendo_rogo_static.xml @@ -1,5 +1,8 @@ - + + + + diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 858f29b2fc..3804c172eb 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -212,7 +212,7 @@ void func_80871FB8(BgDodoago* this, GlobalContext* globalCtx) { D_80872824--; return; } - + if (D_80872824 == 0x6C) { for (i = 10; i >= 0; i--) { currentPos.x = D_808725CC[i].x + this->dyna.actor.world.pos.x; diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c index a8d1dc4ce7..c862467571 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c @@ -1,7 +1,5 @@ #include "z_bg_ganon_otyuka.h" -extern Gfx D_08000000[]; - static UNK_TYPE sPlatformTexture[] = { 0x19033187, 0x39C74207, 0x4A495247, 0x5A494A09, 0x498749C5, 0x5A476247, 0x62076287, 0x734F8393, 0x6A8B6A09, 0x5A495207, 0x49C54A89, 0x4A895289, 0x5AC95A89, 0x5A4B5A8B, 0x5A896249, 0x52095207, 0x19033185, 0x420949C7, @@ -200,7 +198,7 @@ static Gfx sFlashDList[] = { COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPDisplayList(D_08000000), + gsSPDisplayList(0x08000000), gsSPVertex(sFlashVerts, 8, 0), gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), gsSP2Triangles(4, 2, 5, 0, 4, 0, 2, 0), diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index a39b91e3a9..d9e3faa634 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -38,8 +38,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern CutsceneData D_02002640[]; - void BgGjyoBridge_Init(Actor* thisx, GlobalContext* globalCtx) { BgGjyoBridge* this = THIS; s32 pad; diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 3c41f6d7fe..dabb62ce85 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -6,6 +6,7 @@ #include "z_bg_haka_gate.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_haka_objects/object_haka_objects.h" #define FLAGS 0x00000000 @@ -47,13 +48,6 @@ void BgHakaGate_GateOpen(BgHakaGate* this, GlobalContext* globalCtx); void BgHakaGate_SkullOfTruth(BgHakaGate* this, GlobalContext* globalCtx); void BgHakaGate_FalseSkull(BgHakaGate* this, GlobalContext* globalCtx); -extern CollisionHeader D_0600A938; -extern Gfx D_0600F1B0[]; -extern Gfx D_06010A10[]; -extern Gfx D_06010C10[]; -extern CollisionHeader D_06010E10; -extern CollisionHeader D_060131C4; - static s16 sSkullOfTruthRotY = 0x100; static u8 sPuzzleState = 1; static f32 sStatueDistToPlayer = 0; @@ -111,7 +105,7 @@ void BgHakaGate_Init(Actor* thisx, GlobalContext* globalCtx) { } } else { if (thisx->params == BGHAKAGATE_STATUE) { - CollisionHeader_GetVirtual(&D_060131C4, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_0131C4, &colHeader); this->vTimer = 0; sStatueDistToPlayer = 0.0f; if (Flags_GetSwitch(globalCtx, this->switchFlag)) { @@ -120,14 +114,14 @@ void BgHakaGate_Init(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc = BgHakaGate_StatueIdle; } } else if (thisx->params == BGHAKAGATE_FLOOR) { - CollisionHeader_GetVirtual(&D_06010E10, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_010E10, &colHeader); if (Flags_GetSwitch(globalCtx, this->switchFlag)) { this->actionFunc = BgHakaGate_DoNothing; } else { this->actionFunc = BgHakaGate_FloorClosed; } } else { // BGHAKAGATE_GATE - CollisionHeader_GetVirtual(&D_0600A938, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_00A938, &colHeader); if (Flags_GetSwitch(globalCtx, this->switchFlag)) { this->actionFunc = BgHakaGate_DoNothing; thisx->world.pos.y += 80.0f; @@ -349,7 +343,7 @@ void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx) { MtxF currentMtxF; if ((thisx->flags & 0x80) == 0x80) { - Gfx_DrawDListXlu(globalCtx, D_0600F1B0); + Gfx_DrawDListXlu(globalCtx, object_haka_objects_DL_00F1B0); } else { func_80093D18(globalCtx->state.gfxCtx); if (thisx->params == BGHAKAGATE_FLOOR) { @@ -360,14 +354,14 @@ void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(0.0f, 0.0f, 2000.0f, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 788), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06010A10); + gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_010A10); Matrix_Put(¤tMtxF); Matrix_Translate(0.0f, 0.0f, 2000.0f, MTXMODE_APPLY); Matrix_RotateX(-this->vOpenAngle * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_Translate(0.0f, 0.0f, -2000.0f, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 796), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06010C10); + gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_010C10); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 800); } else { Gfx_DrawDListOpa(globalCtx, displayLists[thisx->params]); diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 2d72de4ab3..8374781b54 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -5,6 +5,7 @@ */ #include "z_bg_haka_meganebg.h" +#include "objects/object_haka_objects/object_haka_objects.h" #define FLAGS 0x00000000 @@ -48,18 +49,12 @@ static u32 D_8087E3FC[] = { }; static Gfx* D_8087E410[] = { - 0x06008EB0, - 0x0600A1A0, - 0x06005000, - 0x06000040, + object_haka_objects_DL_008EB0, + object_haka_objects_DL_00A1A0, + object_haka_objects_DL_005000, + object_haka_objects_DL_000040, }; -extern CollisionHeader D_06000118; -extern CollisionHeader D_06005334; -extern Gfx D_06008EB0[]; -extern CollisionHeader D_06009168; -extern CollisionHeader D_0600A7F4; - void BgHakaMeganeBG_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgHakaMeganeBG* this = THIS; @@ -72,18 +67,18 @@ void BgHakaMeganeBG_Init(Actor* thisx, GlobalContext* globalCtx) { if (thisx->params == 2) { DynaPolyActor_Init(&this->dyna, DPM_UNK3); thisx->flags |= 0x10; - CollisionHeader_GetVirtual(&D_06005334, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_005334, &colHeader); this->actionFunc = func_8087E258; } else { DynaPolyActor_Init(&this->dyna, DPM_PLAYER); if (thisx->params == 0) { - CollisionHeader_GetVirtual(&D_06009168, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_009168, &colHeader); thisx->flags |= 0x80; this->unk_16A = 20; this->actionFunc = func_8087DFF8; } else if (thisx->params == 3) { - CollisionHeader_GetVirtual(&D_06000118, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_000118, &colHeader); thisx->home.pos.y += 100.0f; if (Flags_GetSwitch(globalCtx, this->unk_168)) { @@ -94,7 +89,7 @@ void BgHakaMeganeBG_Init(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc = func_8087E288; } } else { - CollisionHeader_GetVirtual(&D_0600A7F4, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_00A7F4, &colHeader); this->unk_16A = 80; this->actionFunc = func_8087E10C; thisx->uncullZoneScale = 3000.0f; @@ -220,7 +215,7 @@ void BgHakaMeganeBG_Draw(Actor* thisx, GlobalContext* globalCtx) { s16 params = this->dyna.actor.params; if (params == 0) { - Gfx_DrawDListXlu(globalCtx, D_06008EB0); + Gfx_DrawDListXlu(globalCtx, object_haka_objects_DL_008EB0); } else { Gfx_DrawDListOpa(globalCtx, D_8087E410[params]); } diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index 9b87dc6b7b..0231c01cab 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -5,6 +5,8 @@ */ #include "z_bg_haka_sgami.h" +#include "objects/object_haka_objects/object_haka_objects.h" +#include "objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0x00000011 @@ -26,9 +28,6 @@ void BgHakaSgami_Draw(Actor* thisx, GlobalContext* globalCtx); void BgHakaSgami_SetupSpin(BgHakaSgami* this, GlobalContext* globalCtx); void BgHakaSgami_Spin(BgHakaSgami* this, GlobalContext* globalCtx); -extern Gfx D_0600BF20[]; -extern Gfx D_060021F0[]; - const ActorInit Bg_Haka_Sgami_InitVars = { ACTOR_BG_HAKA_SGAMI, ACTORCAT_PROP, @@ -301,10 +300,10 @@ void BgHakaSgami_Draw(Actor* thisx, GlobalContext* globalCtx) { BgHakaSgami* this = THIS; if (this->unk_151 != 0) { - Gfx_DrawDListXlu(globalCtx, D_0600BF20); + Gfx_DrawDListXlu(globalCtx, object_haka_objects_DL_00BF20); } else if (this->actor.params == SCYTHE_TRAP_SHADOW_TEMPLE) { - Gfx_DrawDListOpa(globalCtx, D_0600BF20); + Gfx_DrawDListOpa(globalCtx, object_haka_objects_DL_00BF20); } else { - Gfx_DrawDListOpa(globalCtx, D_060021F0); + Gfx_DrawDListOpa(globalCtx, object_ice_objects_DL_0021F0); } } diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index 8b96f4cc88..b19c1579cf 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -5,6 +5,7 @@ */ #include "z_bg_haka_ship.h" +#include "objects/object_haka_objects/object_haka_objects.h" #define FLAGS 0x00000030 @@ -22,12 +23,6 @@ void BgHakaShip_SetupCrash(BgHakaShip* this, GlobalContext* globalCtx); void BgHakaShip_CrashShake(BgHakaShip* this, GlobalContext* globalCtx); void BgHakaShip_CrashFall(BgHakaShip* this, GlobalContext* globalCtx); -extern Gfx D_06005A70[]; -extern Gfx D_0600D330[]; -extern CollisionHeader D_0600E408; -extern Gfx D_0600E910[]; -extern CollisionHeader D_0600ED7C; - const ActorInit Bg_Haka_Ship_InitVars = { ACTOR_BG_HAKA_SHIP, ACTORCAT_BG, @@ -55,11 +50,11 @@ void BgHakaShip_Init(Actor* thisx, GlobalContext* globalCtx) { this->dyna.actor.params &= 0xFF; if (this->dyna.actor.params == 0) { - CollisionHeader_GetVirtual(&D_0600E408, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_00E408, &colHeader); this->counter = 8; this->actionFunc = BgHakaShip_WaitForSong; } else { - CollisionHeader_GetVirtual(&D_0600ED7C, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_00ED7C, &colHeader); this->actionFunc = BgHakaShip_ChildUpdatePosition; } this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); @@ -209,22 +204,22 @@ void BgHakaShip_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->dyna.actor.params == 0) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 534), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_0600D330); + gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_00D330); angleTemp = this->yOffset * (M_PI / 0x8000); Matrix_Translate(-3670.0f, 620.0f, 1150.0f, MTXMODE_APPLY); Matrix_RotateZ(angleTemp, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 547), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06005A70); + gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_005A70); Matrix_Translate(0.0f, 0.0f, -2300.0f, MTXMODE_APPLY); Matrix_RotateZ(-(2.0f * angleTemp), MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 556), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06005A70); + gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_005A70); } else { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 562), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_0600E910); + gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_00E910); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 568); if (this->actionFunc == BgHakaShip_CutsceneStationary || this->actionFunc == BgHakaShip_Move) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index e715c7cd87..fee1deea6a 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -5,6 +5,7 @@ */ #include "z_bg_haka_trap.h" +#include "objects/object_haka_objects/object_haka_objects.h" #define FLAGS 0x00000000 @@ -106,10 +107,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern CollisionHeader D_060081D0; -extern CollisionHeader D_06008D10; -extern CollisionHeader D_06009CD0; - void BgHakaTrap_Init(Actor* thisx, GlobalContext* globalCtx) { static UNK_TYPE D_80881014 = 0; BgHakaTrap* this = THIS; @@ -139,7 +136,7 @@ void BgHakaTrap_Init(Actor* thisx, GlobalContext* globalCtx) { thisx->flags |= 0x10; if (thisx->params == HAKA_TRAP_SPIKED_BOX) { - CollisionHeader_GetVirtual(&D_06009CD0, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_009CD0, &colHeader); this->timer = 30; if (D_80881014 != 0) { @@ -158,11 +155,11 @@ void BgHakaTrap_Init(Actor* thisx, GlobalContext* globalCtx) { this->colliderCylinder.dim.height = 40; } else { if (thisx->params == HAKA_TRAP_SPIKED_WALL) { - CollisionHeader_GetVirtual(&D_060081D0, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_0081D0, &colHeader); thisx->home.pos.x -= 200.0f; } else { thisx->home.pos.x += 200.0f; - CollisionHeader_GetVirtual(&D_06008D10, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_008D10, &colHeader); } Collider_InitTris(globalCtx, &this->colliderSpikes); diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index e72ebe89ca..e527ee826a 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -6,6 +6,7 @@ #include "z_bg_haka_tubo.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_haka_objects/object_haka_objects.h" #define FLAGS 0x00000010 @@ -77,9 +78,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern CollisionHeader D_060108B8; -extern Gfx D_0600FE40[]; - void BgHakaTubo_Init(Actor* thisx, GlobalContext* globalCtx) { BgHakaTubo* this = THIS; s32 pad; @@ -87,7 +85,7 @@ void BgHakaTubo_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK3); - CollisionHeader_GetVirtual(&D_060108B8, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_0108B8, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); Collider_InitCylinder(globalCtx, &this->potCollider); Collider_SetCylinder(globalCtx, &this->potCollider, &this->dyna.actor, &sPotColliderInit); @@ -248,6 +246,6 @@ void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) { void BgHakaTubo_Draw(Actor* thisx, GlobalContext* globalCtx) { BgHakaTubo* this = THIS; - Gfx_DrawDListOpa(globalCtx, D_0600FE40); + Gfx_DrawDListOpa(globalCtx, object_haka_objects_DL_00FE40); BgHakaTubo_DrawFlameCircle(this, globalCtx); } diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 5738518272..9a9fc24878 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -6,6 +6,7 @@ #include "z_bg_haka_zou.h" #include "objects/object_hakach_objects/object_hakach_objects.h" +#include "objects/object_haka_objects/object_haka_objects.h" #define FLAGS 0x00000010 @@ -72,9 +73,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern CollisionHeader D_06005E30; -extern CollisionHeader D_06006F70; - void BgHakaZou_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgHakaZou* this = THIS; @@ -174,7 +172,7 @@ void BgHakaZou_Wait(BgHakaZou* this, GlobalContext* globalCtx) { colHeader = NULL; if (this->dyna.actor.params == STA_GIANT_BIRD_STATUE) { - CollisionHeader_GetVirtual(&D_06006F70, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_006F70, &colHeader); this->collider.dim.radius = 80; this->collider.dim.height = 100; this->collider.dim.yShift = -30; @@ -182,7 +180,7 @@ void BgHakaZou_Wait(BgHakaZou* this, GlobalContext* globalCtx) { this->collider.dim.pos.z += 56; this->dyna.actor.uncullZoneScale = 1500.0f; } else if (this->dyna.actor.params == STA_BOMBABLE_SKULL_WALL) { - CollisionHeader_GetVirtual(&D_06005E30, &colHeader); + CollisionHeader_GetVirtual(&object_haka_objects_Col_005E30, &colHeader); this->collider.dim.yShift = -50; } else { CollisionHeader_GetVirtual(&gBotwBombSpotCol, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index 9b3ca174ef..714c4e4943 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -5,6 +5,7 @@ */ #include "z_bg_ice_objects.h" +#include "objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0x00000000 @@ -20,9 +21,6 @@ void BgIceObjects_Slide(BgIceObjects* this, GlobalContext* globalCtx); void BgIceObjects_Reset(BgIceObjects* this, GlobalContext* globalCtx); void BgIceObjects_Stuck(BgIceObjects* this, GlobalContext* globalCtx); -extern Gfx D_06000190[]; -extern CollisionHeader D_060003F0; - static Color_RGBA8 sWhite = { 250, 250, 250, 255 }; static Color_RGBA8 sGray = { 180, 180, 180, 255 }; static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; @@ -50,7 +48,7 @@ void BgIceObjects_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_060003F0, &colHeader); + CollisionHeader_GetVirtual(&object_ice_objects_Col_0003F0, &colHeader); Math_Vec3f_Copy(&this->targetPos, &this->dyna.actor.home.pos); this->actionFunc = BgIceObjects_Idle; this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); @@ -237,5 +235,5 @@ void BgIceObjects_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgIceObjects* this = THIS; - Gfx_DrawDListOpa(globalCtx, D_06000190); + Gfx_DrawDListOpa(globalCtx, object_ice_objects_DL_000190); } diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index b5778aae32..8516d4b7fc 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -1,4 +1,5 @@ #include "z_bg_ice_shelter.h" +#include "objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0x00000000 @@ -15,12 +16,6 @@ void func_808911BC(BgIceShelter* this); void func_8089107C(BgIceShelter* this, GlobalContext* globalCtx); void func_808911D4(BgIceShelter* this, GlobalContext* globalCtx); -extern Gfx D_060006F0[]; -extern Gfx D_060012A0[]; -extern CollisionHeader D_06001C1C; -extern Gfx D_06002640[]; -extern CollisionHeader D_06002920; - const ActorInit Bg_Ice_Shelter_InitVars = { ACTOR_BG_ICE_SHELTER, ACTORCAT_BG, @@ -158,10 +153,10 @@ void BgIceShelter_Init(Actor* thisx, GlobalContext* globalCtx) { switch (type) { case 2: - func_80890874(this, globalCtx, &D_06001C1C, 0); + func_80890874(this, globalCtx, &object_ice_objects_Col_001C1C, 0); break; case 3: - func_80890874(this, globalCtx, &D_06002920, 0); + func_80890874(this, globalCtx, &object_ice_objects_Col_002920, 0); break; } @@ -421,7 +416,7 @@ void BgIceShelter_Draw(Actor* thisx, GlobalContext* globalCtx2) { -globalCtx->gameplayFrames & 0x7F, 0x20, 0x20, 1, -globalCtx->gameplayFrames & 0x7F, globalCtx->gameplayFrames & 0x7F, 0x20, 0x20)); - gSPDisplayList(POLY_XLU_DISP++, D_060006F0); + gSPDisplayList(POLY_XLU_DISP++, object_ice_objects_DL_0006F0); break; case 2: @@ -433,11 +428,11 @@ void BgIceShelter_Draw(Actor* thisx, GlobalContext* globalCtx2) { globalCtx->gameplayFrames & 0xFF, 0x40, 0x40, 1, globalCtx->gameplayFrames & 0xFF, globalCtx->gameplayFrames & 0xFF, 0x40, 0x40)); - gSPDisplayList(POLY_XLU_DISP++, D_060012A0); + gSPDisplayList(POLY_XLU_DISP++, object_ice_objects_DL_0012A0); break; case 3: - gSPDisplayList(POLY_XLU_DISP++, D_06002640); + gSPDisplayList(POLY_XLU_DISP++, object_ice_objects_DL_002640); break; } diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index 7312c5d0ae..5295e92aea 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -5,6 +5,7 @@ */ #include "z_bg_ice_shutter.h" +#include "objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0x00000010 @@ -31,9 +32,6 @@ const ActorInit Bg_Ice_Shutter_InitVars = { (ActorFunc)BgIceShutter_Draw, }; -extern CollisionHeader D_06002854; -extern Gfx D_06002740[]; - static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -60,7 +58,7 @@ void BgIceShutter_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyActor_Init(&this->dyna, DPM_UNK); sp28 = this->dyna.actor.params & 0xFF; this->dyna.actor.params = (this->dyna.actor.params >> 8) & 0xFF; - CollisionHeader_GetVirtual(&D_06002854, &colHeader); + CollisionHeader_GetVirtual(&object_ice_objects_Col_002854, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (sp28 == 2) { this->dyna.actor.shape.rot.x = -0x4000; @@ -133,5 +131,5 @@ void BgIceShutter_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgIceShutter_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_06002740); + Gfx_DrawDListOpa(globalCtx, object_ice_objects_DL_002740); } diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 609c55aeb5..4c6557b34e 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -5,6 +5,7 @@ */ #include "z_bg_ice_turara.h" +#include "objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0x00000000 @@ -41,9 +42,6 @@ static ColliderCylinderInit sCylinderInit = { { 13, 120, 0, { 0, 0, 0 } }, }; -extern Gfx D_060023D0[]; -extern CollisionHeader D_06002594; - const ActorInit Bg_Ice_Turara_InitVars = { ACTOR_BG_ICE_TURARA, ACTORCAT_PROP, @@ -70,7 +68,7 @@ void BgIceTurara_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06002594, &colHeader); + CollisionHeader_GetVirtual(&object_ice_objects_Col_002594, &colHeader); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit); Collider_UpdateCylinder(&this->dyna.actor, &this->collider); @@ -201,5 +199,5 @@ void BgIceTurara_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgIceTurara_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_060023D0); + Gfx_DrawDListOpa(globalCtx, object_ice_objects_DL_0023D0); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 5e2faf70ea..c96aeeb34a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -6,6 +6,7 @@ #include "z_bg_jya_haheniron.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" +#include "objects/object_jya_iron/object_jya_iron.h" #define FLAGS 0x00000010 @@ -76,8 +77,6 @@ static Vec3f D_808987A0[] = { 0.0f, 14.0f, 0.0f }; static Vec3f D_808987AC[] = { 0.0f, 8.0f, 0.0f }; -extern Gfx D_06000880[]; - void BgJyaHaheniron_ColliderInit(BgJyaHaheniron* this, GlobalContext* globalCtx) { s32 pad; @@ -109,7 +108,7 @@ void BgJyaHaheniron_SpawnFragments(GlobalContext* globalCtx, Vec3f* vec1, Vec3f* } EffectSsKakera_Spawn(globalCtx, vec1, &vel, vec1, -350, arg5, 40, 4, 0, sKakeraScales[i], 0, 20, 40, - KAKERA_COLOR_NONE, OBJECT_JYA_IRON, D_06000880); + KAKERA_COLOR_NONE, OBJECT_JYA_IRON, gObjectJyaIronDL_000880); angle += 0x3333; } pos.x = vec1->x + (vec2->x * 5.0f); diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index 0113cfd0fc..037fd0ee4a 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -6,6 +6,12 @@ #include "z_bg_mori_hineri.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_box/object_box.h" +#include "objects/object_mori_hineri1/object_mori_hineri1.h" +#include "objects/object_mori_hineri1a/object_mori_hineri1a.h" +#include "objects/object_mori_hineri2/object_mori_hineri2.h" +#include "objects/object_mori_hineri2a/object_mori_hineri2a.h" +#include "objects/object_mori_tex/object_mori_tex.h" #define FLAGS 0x00000030 @@ -48,13 +54,6 @@ static Gfx* sDLists[] = { 0x06002B70, }; -extern CollisionHeader D_060054B8; -extern CollisionHeader D_06003490; -extern CollisionHeader D_060043D0; -extern CollisionHeader D_06006078; -extern Gfx D_06000AE8[]; -extern Gfx D_06001678[]; - void BgMoriHineri_Init(Actor* thisx, GlobalContext* globalCtx) { BgMoriHineri* this = THIS; s8 moriHineriObjIdx; @@ -142,16 +141,16 @@ void func_808A39FC(BgMoriHineri* this, GlobalContext* globalCtx) { this->dyna.actor.draw = BgMoriHineri_DrawHallAndRoom; if (this->dyna.actor.params == 0) { this->actionFunc = func_808A3C8C; - CollisionHeader_GetVirtual(&D_060054B8, &colHeader); + CollisionHeader_GetVirtual(&object_mori_hineri1_Col_0054B8, &colHeader); } else if (this->dyna.actor.params == 1) { this->actionFunc = BgMoriHineri_SpawnBossKeyChest; - CollisionHeader_GetVirtual(&D_06003490, &colHeader); + CollisionHeader_GetVirtual(&object_mori_hineri1a_Col_003490, &colHeader); } else if (this->dyna.actor.params == 2) { this->actionFunc = BgMoriHineri_DoNothing; - CollisionHeader_GetVirtual(&D_060043D0, &colHeader); + CollisionHeader_GetVirtual(&object_mori_hineri2_Col_0043D0, &colHeader); } else { this->actionFunc = func_808A3C8C; - CollisionHeader_GetVirtual(&D_06006078, &colHeader); + CollisionHeader_GetVirtual(&object_mori_hineri2a_Col_006078, &colHeader); } this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); } @@ -264,7 +263,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 689), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000AE8); + gSPDisplayList(POLY_OPA_DISP++, gTreasureChestBossKeyChestFrontDL); Matrix_Put(&mtx); Matrix_Translate(167.0f, -218.0f, -453.0f, MTXMODE_APPLY); if (Flags_GetTreasure(globalCtx, 0xE)) { @@ -275,7 +274,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 703), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06001678); + gSPDisplayList(POLY_OPA_DISP++, gTreasureChestBossKeyChestSideAndTopDL); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 709); diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index d68723068c..8ae8dd53c3 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -6,6 +6,7 @@ #include "z_bg_po_syokudai.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_syokudai/object_syokudai.h" #define FLAGS 0x00000000 @@ -75,8 +76,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; -extern Gfx D_060003A0[]; - void BgPoSyokudai_Init(Actor* thisx, GlobalContext* globalCtx) { BgPoSyokudai* this = THIS; s32 pad; @@ -157,7 +156,7 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 319), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_060003A0); + gSPDisplayList(POLY_OPA_DISP++, gGoldenTorchDL); if (Flags_GetSwitch(globalCtx, this->actor.params)) { Color_RGBA8* primColor = &sPrimColors[this->flameColor]; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index f99297ceb3..145795b59b 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -6,6 +6,7 @@ #include "z_bg_spot01_objects2.h" #include "objects/object_spot01_matoya/object_spot01_matoya.h" +#include "objects/object_spot01_matoyab/object_spot01_matoyab.h" #define FLAGS 0x00000010 @@ -40,8 +41,6 @@ static InitChainEntry sInitChain[] = { static Gfx* D_808AC510[] = { 0x06001EB0, 0x06002780, 0x06003078, 0x06001228, 0x06001528 }; -extern CollisionHeader D_06001C58; - void BgSpot01Objects2_Init(Actor* thisx, GlobalContext* globalCtx) { BgSpot01Objects2* this = THIS; @@ -105,7 +104,7 @@ void func_808AC2BC(BgSpot01Objects2* this, GlobalContext* globalCtx) { this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); break; case 3: // Shooting Gallery, spawns Carpenter Sabooro during the day - CollisionHeader_GetVirtual(&D_06001C58, &colHeader); + CollisionHeader_GetVirtual(&object_spot01_matoyab_col, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); if (IS_DAY) { func_808AC22C(globalCtx->setupPathList, &position, ((s32)thisx->params >> 8) & 0xFF, 0); diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 0d71d6541c..08eee11ef6 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot02_objects.h" +#include "objects/object_spot02_objects/object_spot02_objects.h" #define FLAGS 0x00000030 @@ -25,13 +26,6 @@ void func_808ACB58(BgSpot02Objects* this, GlobalContext* globalCtx); void func_808ACC34(BgSpot02Objects* this, GlobalContext* globalCtx); void func_808AD3D4(BgSpot02Objects* this, GlobalContext* globalCtx); -extern CollisionHeader D_060128D8; -extern CollisionHeader D_06012BA4; -extern CollisionHeader D_060133EC; -extern Gfx D_060013F0[]; -extern Gfx D_060126F0[]; -extern Gfx D_06012D30[]; - static void* D_808AD850[] = { 0x060096B0, 0x0600A2B0, 0x0600AEB0, 0x0600BAB0, 0x0600C6B0, 0x0600D2B0, 0x0600DEB0, 0x0600EAB0, 0x0600F6B0, 0x060102B0, 0x06010EB0, 0x06011AB0, @@ -76,10 +70,10 @@ void BgSpot02Objects_Init(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc = func_808ACAFC; } - CollisionHeader_GetVirtual(&D_06012BA4, &colHeader); + CollisionHeader_GetVirtual(&object_spot02_objects_Col_012BA4, &colHeader); } else if (thisx->params == 1) { this->actionFunc = func_808AC8FC; - CollisionHeader_GetVirtual(&D_060128D8, &colHeader); + CollisionHeader_GetVirtual(&object_spot02_objects_Col_0128D8, &colHeader); thisx->flags |= 0x400000; } else { if (globalCtx->sceneNum == SCENE_SPOT02) { @@ -88,7 +82,7 @@ void BgSpot02Objects_Init(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc = func_808AC8FC; } - CollisionHeader_GetVirtual(&D_060133EC, &colHeader); + CollisionHeader_GetVirtual(&object_spot02_objects_Col_0133EC, &colHeader); } this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); @@ -158,7 +152,7 @@ void func_808ACA08(BgSpot02Objects* this, GlobalContext* globalCtx) { if (this->timer == 20) { this->dyna.actor.draw = NULL; EffectSsHahen_SpawnBurst(globalCtx, &this->dyna.actor.world.pos, 30.0f, 0, 25, 5, 40, OBJECT_SPOT02_OBJECTS, 20, - D_06012D30); + object_spot02_objects_DL_012D30); } else if (this->timer == 0) { Actor_Kill(&this->dyna.actor); } @@ -262,7 +256,7 @@ void func_808ACCB8(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_808AD850[this->unk_16A])); gDPPipeSync(POLY_XLU_DISP++); - gSPDisplayList(POLY_XLU_DISP++, D_060126F0); + gSPDisplayList(POLY_XLU_DISP++, object_spot02_objects_DL_0126F0); gDPPipeSync(POLY_XLU_DISP++); } @@ -325,7 +319,7 @@ void func_808AD450(Actor* thisx, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 2 * this->timer, -3 * this->timer, 32, 64, 1, 4 * this->timer, -6 * this->timer, 32, 64)); gDPPipeSync(POLY_XLU_DISP++); - gSPDisplayList(POLY_XLU_DISP++, D_060013F0); + gSPDisplayList(POLY_XLU_DISP++, object_spot02_objects_DL_0013F0); gDPPipeSync(POLY_XLU_DISP++); } } diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index 2e22f965f1..9b01e5e229 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot03_taki.h" +#include "objects/object_spot03_object/object_spot03_object.h" #define FLAGS 0x00000030 @@ -33,19 +34,10 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern CollisionHeader D_06000C98; - -// These are identical vertex data for the waterfall. -extern Vtx* D_06000800[]; // Vertex buffer 0 -extern Vtx* D_06000990[]; // Vertex buffer 1 - -extern Gfx* D_06000B20[]; -extern Gfx* D_06000BC0[]; -extern Gfx* D_06001580[]; - void BgSpot03Taki_ApplyOpeningAlpha(BgSpot03Taki* this, s32 bufferIndex) { s32 i; - Vtx* vtx = (bufferIndex == 0) ? SEGMENTED_TO_VIRTUAL(D_06000800) : SEGMENTED_TO_VIRTUAL(D_06000990); + Vtx* vtx = (bufferIndex == 0) ? SEGMENTED_TO_VIRTUAL(object_spot03_object_Vtx_000800) + : SEGMENTED_TO_VIRTUAL(object_spot03_object_Vtx_000990); for (i = 0; i < 5; i++) { vtx[i + 10].v.cn[3] = this->openingAlpha; @@ -59,7 +51,7 @@ void BgSpot03Taki_Init(Actor* thisx, GlobalContext* globalCtx) { this->switchFlag = (this->dyna.actor.params & 0x3F); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06000C98, &colHeader); + CollisionHeader_GetVirtual(&object_spot03_object_Col_000C98, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); this->bufferIndex = 0; @@ -141,21 +133,21 @@ void BgSpot03Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames * 5, 64, 64, 1, 0, gameplayFrames * 5, 64, 64)); - gSPDisplayList(POLY_XLU_DISP++, D_06000B20); + gSPDisplayList(POLY_XLU_DISP++, object_spot03_object_DL_000B20); if (this->bufferIndex == 0) { - gSPVertex(POLY_XLU_DISP++, D_06000800, 25, 0); + gSPVertex(POLY_XLU_DISP++, object_spot03_object_Vtx_000800, 25, 0); } else { - gSPVertex(POLY_XLU_DISP++, D_06000990, 25, 0); + gSPVertex(POLY_XLU_DISP++, object_spot03_object_Vtx_000990, 25, 0); } - gSPDisplayList(POLY_XLU_DISP++, D_06000BC0); + gSPDisplayList(POLY_XLU_DISP++, object_spot03_object_DL_000BC0); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 3, 64, 64, 1, -gameplayFrames, gameplayFrames * 3, 64, 64)); - gSPDisplayList(POLY_XLU_DISP++, D_06001580); + gSPDisplayList(POLY_XLU_DISP++, object_spot03_object_DL_001580); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot03_taki.c", 358); diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index ffe066cbca..1e8f1e7d82 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot05_soko.h" +#include "objects/object_spot05_objects/object_spot05_objects.h" #define FLAGS 0x00000000 @@ -18,9 +19,6 @@ void func_808AE5A8(BgSpot05Soko* this, GlobalContext* globalCtx); void func_808AE5B4(BgSpot05Soko* this, GlobalContext* globalCtx); void func_808AE630(BgSpot05Soko* this, GlobalContext* globalCtx); -extern CollisionHeader D_06000918; -extern CollisionHeader D_060012C0; - const ActorInit Bg_Spot05_Soko_InitVars = { ACTOR_BG_SPOT05_SOKO, ACTORCAT_PROP, @@ -38,8 +36,8 @@ static InitChainEntry sInitChain[] = { }; static Gfx* sDLists[] = { - 0x06000840, - 0x06001190, + object_spot05_objects_DL_000840, + object_spot05_objects_DL_001190, }; void BgSpot05Soko_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -53,14 +51,14 @@ void BgSpot05Soko_Init(Actor* thisx, GlobalContext* globalCtx) { thisx->params &= 0xFF; DynaPolyActor_Init(&this->dyna, DPM_UNK); if (thisx->params == 0) { - CollisionHeader_GetVirtual(&D_06000918, &colHeader); + CollisionHeader_GetVirtual(&object_spot05_objects_Col_000918, &colHeader); if (LINK_IS_ADULT) { Actor_Kill(thisx); } else { this->actionFunc = func_808AE5A8; } } else { - CollisionHeader_GetVirtual(&D_060012C0, &colHeader); + CollisionHeader_GetVirtual(&object_spot05_objects_Col_0012C0, &colHeader); if (Flags_GetSwitch(globalCtx, this->switchFlag) != 0) { Actor_Kill(thisx); } else { diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index 68d5b94654..ae86b32975 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot07_taki.h" +#include "objects/object_spot07_object/object_spot07_object.h" #define FLAGS 0x00000030 @@ -17,15 +18,6 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx); void BgSpot07Taki_DoNothing(BgSpot07Taki* this, GlobalContext* globalCtx); -extern Gfx D_06000460[]; -extern Gfx D_06000BE0[]; -extern Gfx D_06001CF0[]; -extern Gfx D_06001F68[]; -extern CollisionHeader D_06002590; -extern Gfx D_06003210[]; -extern Gfx D_060032D8[]; -extern CollisionHeader D_060038FC; - const ActorInit Bg_Spot07_Taki_InitVars = { ACTOR_BG_SPOT07_TAKI, ACTORCAT_BG, @@ -51,9 +43,9 @@ void BgSpot07Taki_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); if (LINK_IS_ADULT) { if (this->dyna.actor.params == 0) { - CollisionHeader_GetVirtual(&D_06002590, &colHeader); + CollisionHeader_GetVirtual(&object_spot07_object_Col_002590, &colHeader); } else { - CollisionHeader_GetVirtual(&D_060038FC, &colHeader); + CollisionHeader_GetVirtual(&object_spot07_object_Col_0038FC, &colHeader); } this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); } @@ -86,9 +78,9 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot07_taki.c", 177), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->dyna.actor.params == 0) { - gSPDisplayList(POLY_OPA_DISP++, D_06001CF0); + gSPDisplayList(POLY_OPA_DISP++, object_spot07_object_DL_001CF0); } else { - gSPDisplayList(POLY_OPA_DISP++, D_06003210); + gSPDisplayList(POLY_OPA_DISP++, object_spot07_object_DL_003210); } } func_80093D84(globalCtx->state.gfxCtx); @@ -109,7 +101,7 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 0, ((frames * 3) & 0x1FF), 32, 128, 1, frames * 0, ((frames * 3) & 0x1FF), 32, 128)); - gSPDisplayList(POLY_XLU_DISP++, D_06000460); + gSPDisplayList(POLY_XLU_DISP++, object_spot07_object_DL_000460); } else { gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 0, ((frames * -1) & 0x7F), 32, 32, 1, @@ -117,12 +109,12 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 0, ((frames * 3) & 0x1FF), 32, 128, 1, frames * 0, ((frames * 3) & 0x1FF), 32, 128)); - gSPDisplayList(POLY_XLU_DISP++, &D_06000BE0); + gSPDisplayList(POLY_XLU_DISP++, object_spot07_object_DL_000BE0); } } else if (this->dyna.actor.params == 0) { - gSPDisplayList(POLY_XLU_DISP++, D_06001F68); + gSPDisplayList(POLY_XLU_DISP++, object_spot07_object_DL_001F68); } else { - gSPDisplayList(POLY_XLU_DISP++, D_060032D8); + gSPDisplayList(POLY_XLU_DISP++, object_spot07_object_DL_0032D8); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot07_taki.c", 272); } diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 7e4ccf88bc..325266959a 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -1,5 +1,6 @@ #include "z_bg_spot16_bombstone.h" #include "objects/object_spot16_obj/object_spot16_obj.h" +#include "objects/object_bombiwa/object_bombiwa.h" #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" @@ -21,9 +22,6 @@ void func_808B5934(BgSpot16Bombstone* this); void func_808B5AF0(BgSpot16Bombstone* this); void func_808B5A78(BgSpot16Bombstone* this); -extern Gfx D_06000C20[]; -extern Gfx D_060009E0[]; - static EnBombf* sPlayerBomb = NULL; static s16 sTimer = 0; @@ -221,7 +219,7 @@ s32 func_808B4E58(BgSpot16Bombstone* this, GlobalContext* globalctx) { actor->shape.rot.y = D_808B5DD8[actor->params][8]; actor->shape.rot.z = D_808B5DD8[actor->params][9]; - this->dList = D_060009E0; + this->dList = object_bombiwa_DL_0009E0; this->bombiwaBankIndex = Object_GetIndex(&globalctx->objectCtx, OBJECT_BOMBIWA); if (this->bombiwaBankIndex < 0) { @@ -348,7 +346,7 @@ void BgSpot16Bombstone_SpawnFragments(BgSpot16Bombstone* this, GlobalContext* gl scale = D_808B6074[index] * this->actor.scale.x * 3; EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &this->actor.world.pos, -420, 0x31, 0xF, 0xF, 0, scale, 2, - 0x40, 160, KAKERA_COLOR_NONE, OBJECT_BOMBIWA, D_060009E0); + 0x40, 160, KAKERA_COLOR_NONE, OBJECT_BOMBIWA, object_bombiwa_DL_0009E0); index += 1; } while (index != ARRAY_COUNT(D_808B6074)); } diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index e0566f474c..95ae4f1081 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -5,6 +5,7 @@ */ #include "z_bg_toki_hikari.h" +#include "objects/object_toki_objects/object_toki_objects.h" #define FLAGS 0x00000020 @@ -22,13 +23,6 @@ void func_808BA22C(BgTokiHikari* this, GlobalContext* globalCtx); void func_808BA274(BgTokiHikari* this, GlobalContext* globalCtx); void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx); -extern Gfx D_06000880[]; -extern Gfx D_060009C0[]; -extern Gfx D_06000A10[]; -extern Gfx D_06007E20[]; -extern Gfx D_06007EE0[]; -extern Gfx D_06008190[]; - const ActorInit Bg_Toki_Hikari_InitVars = { ACTOR_BG_TOKI_HIKARI, ACTORCAT_BG, @@ -97,9 +91,9 @@ void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (LINK_IS_ADULT) { - gSPDisplayList(POLY_OPA_DISP++, D_06008190); + gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_008190); } else { - gSPDisplayList(POLY_OPA_DISP++, D_06007E20); + gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_007E20); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128, 64, 32)); @@ -110,7 +104,7 @@ void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 278), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06007EE0); + gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_007EE0); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 284); } @@ -161,7 +155,7 @@ void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -2 * (globalCtx->gameplayFrames & 0x7F), 0, 0x20, 0x40, 1, (globalCtx->gameplayFrames & 0x7F) * 4, 0, 0x20, 0x40)); - gSPDisplayList(POLY_XLU_DISP++, D_06000880); + gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_000880); Matrix_Pop(); Matrix_Push(); gDPPipeSync(POLY_XLU_DISP++); @@ -173,7 +167,7 @@ void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 415), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_060009C0); + gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_0009C0); Matrix_Pop(); Matrix_Push(); gDPPipeSync(POLY_XLU_DISP++); @@ -185,7 +179,7 @@ void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 437), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06000A10); + gSPDisplayList(POLY_XLU_DISP++, &object_toki_objects_DL_0009C0[10]); Matrix_Pop(); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 443); } diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index 87ec59a566..0826eb793a 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -5,6 +5,7 @@ */ #include "z_bg_toki_swd.h" +#include "objects/object_toki_objects/object_toki_objects.h" #define FLAGS 0x00000010 @@ -19,8 +20,6 @@ void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx); void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx); void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx); -extern Gfx D_06001BD0[]; - extern CutsceneData D_808BB2F0[]; extern CutsceneData D_808BB7A0[]; extern CutsceneData D_808BBD90[]; @@ -176,7 +175,7 @@ void BgTokiSwd_Draw(Actor* thisx, GlobalContext* globalCtx2) { Gfx_TexScroll(globalCtx->state.gfxCtx, 0, -(globalCtx->gameplayFrames % 0x80), 32, 32)); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 742), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06001BD0); + gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_001BD0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776); } diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 4689e41872..1906e81a53 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -1,4 +1,5 @@ #include "z_boss_dodongo.h" +#include "objects/object_kingdodongo/object_kingdodongo.h" #include "scenes/dungeons/ddan_boss/ddan_boss_room_1.h" #define FLAGS 0x00000035 @@ -54,36 +55,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(targetArrowOffset, 8200.0f, ICHAIN_STOP), }; -extern SkeletonHeader D_0601B310; -extern AnimationHeader D_0600F0D8; -extern AnimationHeader D_06008EEC; -extern u64 D_06017410[]; // Title card -extern AnimationHeader D_0601CAE0; -extern AnimationHeader D_06008EEC; -extern AnimationHeader D_060061D4; -extern AnimationHeader D_0600DF38; -extern AnimationHeader D_0600E848; -extern AnimationHeader D_06004E0C; -extern AnimationHeader D_060042A8; -extern AnimationHeader D_06009D10; -extern AnimationHeader D_0601D934; -extern AnimationHeader D_06002D0C; -extern AnimationHeader D_060042A8; -extern AnimationHeader D_06001074; -extern AnimationHeader D_06003CF8; -extern s16 D_06015890[]; -extern s16 D_06017210[]; -extern s16 D_06015D90[]; -extern s16 D_06016390[]; -extern s16 D_06016590[]; -extern s16 D_06016790[]; -extern s16 D_06015990[]; -extern s16 D_06015F90[]; -extern s16 D_06016990[]; -extern s16 D_06016E10[]; -extern Gfx D_06009D50[]; -extern Gfx D_06009DD0[]; - void func_808C1190(s16* arg0, u8* arg1, s16 arg2) { if (arg2[arg1] != 0) { arg0[arg2 / 2] = 0; @@ -123,16 +94,16 @@ void func_808C1278(s16* arg0, u8* arg1, s16 arg2) { } void func_808C12C4(u8* arg1, s16 arg2) { - func_808C1190(SEGMENTED_TO_VIRTUAL(D_06015890), arg1, arg2); - func_808C1200(SEGMENTED_TO_VIRTUAL(D_06017210), arg1, arg2); - func_808C11D0(SEGMENTED_TO_VIRTUAL(D_06015D90), arg1, arg2); - func_808C11D0(SEGMENTED_TO_VIRTUAL(D_06016390), arg1, arg2); - func_808C11D0(SEGMENTED_TO_VIRTUAL(D_06016590), arg1, arg2); - func_808C11D0(SEGMENTED_TO_VIRTUAL(D_06016790), arg1, arg2); - func_808C1230(SEGMENTED_TO_VIRTUAL(D_06015990), arg1, arg2); - func_808C1230(SEGMENTED_TO_VIRTUAL(D_06015F90), arg1, arg2); - func_808C1278(SEGMENTED_TO_VIRTUAL(D_06016990), arg1, arg2); - func_808C1278(SEGMENTED_TO_VIRTUAL(D_06016E10), arg1, arg2); + func_808C1190(SEGMENTED_TO_VIRTUAL(object_kingdodongo_Tex_015890), arg1, arg2); + func_808C1200(SEGMENTED_TO_VIRTUAL(object_kingdodongo_Tex_017210), arg1, arg2); + func_808C11D0(SEGMENTED_TO_VIRTUAL(object_kingdodongo_Tex_015D90), arg1, arg2); + func_808C11D0(SEGMENTED_TO_VIRTUAL(object_kingdodongo_Tex_016390), arg1, arg2); + func_808C11D0(SEGMENTED_TO_VIRTUAL(object_kingdodongo_Tex_016590), arg1, arg2); + func_808C11D0(SEGMENTED_TO_VIRTUAL(object_kingdodongo_Tex_016790), arg1, arg2); + func_808C1230(SEGMENTED_TO_VIRTUAL(object_kingdodongo_Tex_015990), arg1, arg2); + func_808C1230(SEGMENTED_TO_VIRTUAL(object_kingdodongo_Tex_015F90), arg1, arg2); + func_808C1278(SEGMENTED_TO_VIRTUAL(object_kingdodongo_Tex_016990), arg1, arg2); + func_808C1278(SEGMENTED_TO_VIRTUAL(object_kingdodongo_Tex_016E10), arg1, arg2); } void func_808C1554(void* arg0, void* floorTex, s32 arg2, f32 arg3) { @@ -217,8 +188,9 @@ void BossDodongo_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 9200.0f, ActorShadow_DrawCircle, 250.0f); Actor_SetScale(&this->actor, 0.01f); - SkelAnime_Init(globalCtx, &this->skelAnime, &D_0601B310, &D_0600F0D8, NULL, NULL, 0); - Animation_PlayLoop(&this->skelAnime, &D_0600F0D8); + SkelAnime_Init(globalCtx, &this->skelAnime, &object_kingdodongo_Skel_01B310, &object_kingdodongo_Anim_00F0D8, NULL, + NULL, 0); + Animation_PlayLoop(&this->skelAnime, &object_kingdodongo_Anim_00F0D8); this->unk_1F8 = 1.0f; BossDodongo_SetupIntroCutscene(this, globalCtx); this->health = 12; @@ -257,9 +229,9 @@ void BossDodongo_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void BossDodongo_SetupIntroCutscene(BossDodongo* this, GlobalContext* globalCtx) { - s16 frames = Animation_GetLastFrame(&D_0600F0D8); + s16 frames = Animation_GetLastFrame(&object_kingdodongo_Anim_00F0D8); - Animation_Change(&this->skelAnime, &D_0600F0D8, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_00F0D8, 1.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); this->actionFunc = BossDodongo_IntroCutscene; this->csState = 0; this->unk_1BC = 1; @@ -373,8 +345,8 @@ void BossDodongo_IntroCutscene(BossDodongo* this, GlobalContext* globalCtx) { this->unk_196 = 30; this->unk_198 = 150; this->unk_204 = 0.0f; - Animation_Change(&this->skelAnime, &D_06008EEC, 1.0f, 0.0f, Animation_GetLastFrame(&D_06008EEC), - ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_008EEC, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_008EEC), ANIMMODE_ONCE, 0.0f); SkelAnime_Update(&this->skelAnime); } } else if (this->unk_198 == 0) { @@ -396,8 +368,8 @@ void BossDodongo_IntroCutscene(BossDodongo* this, GlobalContext* globalCtx) { this->unk_196 = 0x1E; this->unk_198 = 0x96; this->unk_204 = 0.0f; - Animation_Change(&this->skelAnime, &D_06008EEC, 1.0f, 0.0f, Animation_GetLastFrame(&D_06008EEC), - ANIMMODE_ONCE, -5.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_008EEC, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_008EEC), ANIMMODE_ONCE, -5.0f); } break; case 4: @@ -432,8 +404,9 @@ void BossDodongo_IntroCutscene(BossDodongo* this, GlobalContext* globalCtx) { if (this->unk_198 == 0x5A) { if (!(gSaveContext.eventChkInf[7] & 2)) { - TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(&D_06017410), - 0xA0, 0xB4, 0x80, 0x28); + TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, + SEGMENTED_TO_VIRTUAL(&object_kingdodongo_Blob_017410), 0xA0, 0xB4, 0x80, + 0x28); } Audio_QueueSeqCmd(0x6B); } @@ -480,8 +453,8 @@ void BossDodongo_IntroCutscene(BossDodongo* this, GlobalContext* globalCtx) { void BossDodongo_SetupDamaged(BossDodongo* this) { if (this->actionFunc != BossDodongo_Damaged) { - Animation_Change(&this->skelAnime, &D_06001074, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001074), ANIMMODE_ONCE, - -5.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_001074, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_001074), ANIMMODE_ONCE, -5.0f); this->actionFunc = BossDodongo_Damaged; } @@ -489,8 +462,8 @@ void BossDodongo_SetupDamaged(BossDodongo* this) { } void BossDodongo_SetupExplode(BossDodongo* this) { - Animation_Change(&this->skelAnime, &D_0600E848, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600E848), ANIMMODE_ONCE, - -5.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_00E848, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_00E848), ANIMMODE_ONCE, -5.0f); this->actionFunc = BossDodongo_Explode; this->unk_1B0 = 10; this->unk_1C0 = 2; @@ -500,8 +473,8 @@ void BossDodongo_SetupExplode(BossDodongo* this) { } void BossDodongo_SetupWalk(BossDodongo* this) { - Animation_Change(&this->skelAnime, &D_0601D934, 1.0f, 0.0f, Animation_GetLastFrame(&D_0601D934), ANIMMODE_ONCE, - -10.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_01D934, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_01D934), ANIMMODE_ONCE, -10.0f); this->unk_1AA = 0; this->actionFunc = BossDodongo_Walk; this->unk_1DA = 0; @@ -510,7 +483,7 @@ void BossDodongo_SetupWalk(BossDodongo* this) { } void BossDodongo_SetupRoll(BossDodongo* this) { - Animation_Change(&this->skelAnime, &D_0600DF38, 1.0f, 0.0f, 59.0f, ANIMMODE_ONCE, -5.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_00DF38, 1.0f, 0.0f, 59.0f, ANIMMODE_ONCE, -5.0f); this->actionFunc = BossDodongo_Roll; this->numWallCollisions = 0; this->unk_1DA = 27; @@ -519,8 +492,8 @@ void BossDodongo_SetupRoll(BossDodongo* this) { void BossDodongo_SetupBlowFire(BossDodongo* this) { this->actor.speedXZ = 0.0f; this->unk_1E4 = 0.0f; - Animation_Change(&this->skelAnime, &D_060061D4, 1.0f, 0.0f, Animation_GetLastFrame(&D_060061D4), ANIMMODE_ONCE, - 0.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_0061D4, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_0061D4), ANIMMODE_ONCE, 0.0f); this->actionFunc = BossDodongo_BlowFire; this->unk_1DA = 50; this->unk_1AE = 0; @@ -528,8 +501,8 @@ void BossDodongo_SetupBlowFire(BossDodongo* this) { void BossDodongo_SetupInhale(BossDodongo* this) { this->actor.speedXZ = 0.0f; - Animation_Change(&this->skelAnime, &D_06008EEC, 1.0f, 0.0f, Animation_GetLastFrame(&D_06008EEC), ANIMMODE_ONCE, - -5.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_008EEC, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_008EEC), ANIMMODE_ONCE, -5.0f); this->actionFunc = BossDodongo_Inhale; this->unk_1DA = 100; this->unk_1AC = 0; @@ -541,7 +514,7 @@ void BossDodongo_Damaged(BossDodongo* this, GlobalContext* globalCtx) { Math_SmoothStepToF(&this->unk_1F8, 1.0f, 0.5f, 0.02f, 0.001f); Math_SmoothStepToF(&this->unk_208, 0.05f, 1.0f, 0.005f, 0.0f); - if (Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&D_06001074))) { + if (Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&object_kingdodongo_Anim_001074))) { BossDodongo_SetupRoll(this); } } @@ -575,8 +548,8 @@ void BossDodongo_Explode(BossDodongo* this, GlobalContext* globalCtx) { func_8002836C(globalCtx, &dustPos, &dustVel, &dustAcell, &dustPrimColor, &dustEnvColor, 500, 10, 10); } - Animation_Change(&this->skelAnime, &D_06004E0C, 1.0f, 0.0f, Animation_GetLastFrame(&D_06004E0C), ANIMMODE_ONCE, - -5.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_004E0C, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_004E0C), ANIMMODE_ONCE, -5.0f); this->actionFunc = BossDodongo_LayDown; Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION); Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_DAMAGE); @@ -595,9 +568,9 @@ void BossDodongo_LayDown(BossDodongo* this, GlobalContext* globalCtx) { Math_SmoothStepToF(&this->unk_1F8, 1.3f, 1.0f, 0.1f, 0.001f); SkelAnime_Update(&this->skelAnime); - if (Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&D_06004E0C))) { - Animation_Change(&this->skelAnime, &D_060042A8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060042A8), ANIMMODE_LOOP, - -5.0f); + if (Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&object_kingdodongo_Anim_004E0C))) { + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_0042A8, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_0042A8), ANIMMODE_LOOP, -5.0f); this->actionFunc = BossDodongo_Vulnerable; this->unk_1DA = 100; } @@ -611,8 +584,8 @@ void BossDodongo_Vulnerable(BossDodongo* this, GlobalContext* globalCtx) { SkelAnime_Update(&this->skelAnime); if (this->unk_1DA == 0) { - Animation_Change(&this->skelAnime, &D_06009D10, 1.0f, 0.0f, Animation_GetLastFrame(&D_06009D10), ANIMMODE_ONCE, - -5.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_009D10, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_009D10), ANIMMODE_ONCE, -5.0f); this->actionFunc = BossDodongo_GetUp; } } @@ -620,7 +593,7 @@ void BossDodongo_Vulnerable(BossDodongo* this, GlobalContext* globalCtx) { void BossDodongo_GetUp(BossDodongo* this, GlobalContext* globalCtx) { SkelAnime_Update(&this->skelAnime); - if (Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&D_06009D10))) { + if (Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&object_kingdodongo_Anim_009D10))) { BossDodongo_SetupRoll(this); } } @@ -687,7 +660,7 @@ void BossDodongo_Walk(BossDodongo* this, GlobalContext* globalCtx) { if (this->unk_1AA == 0) { if (Animation_OnFrame(&this->skelAnime, 14.0f)) { - Animation_PlayLoop(&this->skelAnime, &D_0601CAE0); + Animation_PlayLoop(&this->skelAnime, &object_kingdodongo_Anim_01CAE0); this->unk_1AA = 1; } } else if (this->unk_1BC != 2) { @@ -1301,8 +1274,8 @@ void BossDodongo_UpdateDamage(BossDodongo* this, GlobalContext* globalCtx) { void BossDodongo_SetupDeathCutscene(BossDodongo* this) { this->actor.speedXZ = 0.0f; this->unk_1E4 = 0.0f; - Animation_Change(&this->skelAnime, &D_06002D0C, 1.0f, 0.0f, Animation_GetLastFrame(&D_06002D0C), ANIMMODE_ONCE, - -5.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_002D0C, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_002D0C), ANIMMODE_ONCE, -5.0f); this->actionFunc = BossDodongo_DeathCutscene; Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_DEAD); this->unk_1DA = 0; @@ -1356,9 +1329,9 @@ void BossDodongo_DeathCutscene(BossDodongo* this, GlobalContext* globalCtx) { Math_SmoothStepToF(&this->cameraAt.x, this->actor.world.pos.x, 0.2f, 30.0f, 0.1f); Math_SmoothStepToF(&this->cameraAt.y, this->actor.focus.pos.y - 70.0f, 0.2f, 30.0f, 0.1f); Math_SmoothStepToF(&this->cameraAt.z, this->actor.world.pos.z, 0.2f, 30.0f, 0.1f); - if (Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&D_06002D0C))) { - Animation_Change(&this->skelAnime, &D_06003CF8, 1.0f, 0.0f, Animation_GetLastFrame(&D_06003CF8), - ANIMMODE_ONCE, -1.0f); + if (Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&object_kingdodongo_Anim_002D0C))) { + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_003CF8, 1.0f, 0.0f, + Animation_GetLastFrame(&object_kingdodongo_Anim_003CF8), ANIMMODE_ONCE, -1.0f); this->csState = 6; Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BG_BREAKWALL, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, 0x6000); @@ -1369,8 +1342,9 @@ void BossDodongo_DeathCutscene(BossDodongo* this, GlobalContext* globalCtx) { Math_SmoothStepToF(&this->cameraAt.y, (this->actor.world.pos.y - 70.0f) + 130.0f, 0.2f, 20.0f, 0.1f); Math_SmoothStepToF(&this->cameraAt.z, this->actor.world.pos.z, 0.2f, 30.0f, 0.1f); - if (Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&D_06003CF8))) { - Animation_Change(&this->skelAnime, &D_0600DF38, 1.0f, 30.0f, 59.0f, ANIMMODE_ONCE, -1.0f); + if (Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&object_kingdodongo_Anim_003CF8))) { + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_00DF38, 1.0f, 30.0f, 59.0f, ANIMMODE_ONCE, + -1.0f); this->csState = 7; this->unk_228 = 7700.0f; this->unk_204 = 0.0f; @@ -1459,8 +1433,8 @@ void BossDodongo_DeathCutscene(BossDodongo* this, GlobalContext* globalCtx) { case 8: case 9: if (this->unk_1DA == 884) { - Animation_Change(&this->skelAnime, &D_060042A8, 1.0f, 0.0f, (f32)Animation_GetLastFrame(&D_060042A8), - ANIMMODE_LOOP, -20.0f); + Animation_Change(&this->skelAnime, &object_kingdodongo_Anim_0042A8, 1.0f, 0.0f, + (f32)Animation_GetLastFrame(&object_kingdodongo_Anim_0042A8), ANIMMODE_LOOP, -20.0f); tempSin = this->cameraEye.x - this->actor.world.pos.x; tempCos = this->cameraEye.z - this->actor.world.pos.z; this->unk_22C = sqrtf(SQ(tempSin) + SQ(tempCos)); @@ -1714,7 +1688,7 @@ void BossDodongo_DrawEffects(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); if (phi_s3 == 0) { - gSPDisplayList(POLY_XLU_DISP++, D_06009D50); + gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_009D50); phi_s3++; } @@ -1724,7 +1698,7 @@ void BossDodongo_DrawEffects(GlobalContext* globalCtx) { Matrix_Scale(eff->unk_2C, eff->unk_2C, 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_dodongo.c", 5253), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06009DD0); + gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_009DD0); } } diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index dec1ab5bb8..f94059e976 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -1,5 +1,6 @@ #include "z_boss_tw.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_tw/object_tw.h" #define FLAGS 0x00000035 @@ -231,78 +232,6 @@ static s16 D_8094C87C; static u8 D_8094C87E; static BossTwEffect sTwEffects[150]; -extern FlexSkeletonHeader D_060070E0; -extern AnimationHeader D_06006F28; -extern FlexSkeletonHeader D_0601F888; -extern AnimationHeader D_0603A2D0; -extern AnimationHeader D_06032BF8; -extern AnimationHeader D_06035988; -extern AnimationHeader D_060343B4; -extern AnimationHeader D_06035030; -extern AnimationHeader D_060338F0; -extern AnimationHeader D_06024374; -extern AnimationHeader D_06023750; -extern AnimationHeader D_06022700; -extern AnimationHeader D_06036FBC; -extern Gfx D_0601A528[]; -extern Gfx D_0601A998[]; -extern Gfx D_0601AB00[]; -extern Gfx D_0601A430[]; -extern Gfx D_0601A790[]; -extern Gfx D_0601AA50[]; -extern Gfx D_0601A5A8[]; -extern Gfx D_0601F390[]; -extern Gfx D_0601F238[]; -extern Gfx D_0601EEB0[]; -extern Gfx D_0601EC68[]; -extern Gfx D_0601E0E0[]; -extern Gfx D_0601E020[]; -extern Gfx D_0601DDF0[]; -extern Gfx D_0601E3A0[]; -extern Gfx D_0601E2C0[]; -extern Gfx D_0601E9F0[]; -extern Gfx D_0602D940[]; -extern Gfx D_0602D890[]; -extern Gfx D_0601CEE0[]; -extern Gfx D_0601DBE8[]; -extern Gfx D_06019D40[]; // Koume Ground Crater -extern Gfx D_06018FC0[]; // Koume Ground Smoke -extern Gfx D_06019938[]; // koume Ground Flame -extern Gfx D_0601BC00[]; -extern Gfx D_0601C1C0[]; -extern Gfx D_06013E98[]; -extern Gfx D_06013F98[]; -extern Gfx D_06014070[]; -extern Gfx D_06014158[]; -extern Gfx D_06013AE8[]; -extern Gfx D_06013D68[]; -extern Gfx D_06012CE0[]; -extern Gfx D_060134B8[]; -extern Gfx D_06012B38[]; -extern Gfx D_06013310[]; -extern AnimationHeader D_060216DC; -extern AnimationHeader D_0600230C; -extern AnimationHeader D_06001D10; -extern AnimationHeader D_060017E0; -extern AnimationHeader D_060012A4; -extern AnimationHeader D_060004A4; -extern AnimationHeader D_06000AAC; -extern AnimationHeader D_060088C8; -extern UNK_TYPE D_0602E170[]; -extern AnimationHeader D_06038E2C; -extern AnimationHeader D_06032BF8; -extern AnimationHeader D_06007CA8; -extern AnimationHeader D_06006530; -extern AnimationHeader D_0600578C; -extern AnimationHeader D_06004548; -extern AnimationHeader D_06009398; -extern AnimationHeader D_06003614; -extern AnimationHeader D_06003E34; -extern AnimationHeader D_06007688; -extern FlexSkeletonHeader D_06032020; -extern AnimationHeader D_060244B4; -extern Gfx D_0601F608[]; - void BossTw_AddDotEffect(GlobalContext* globalCtx, Vec3f* initalPos, Vec3f* initalSpeed, Vec3f* accel, f32 scale, s16 args, s16 countLimit) { s16 i; @@ -582,7 +511,7 @@ void BossTw_Init(Actor* thisx, GlobalContext* globalCtx2) { if (this->actor.params == TW_KOTAKE) { Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInitKoumeKotake); this->actor.naviEnemyId = 0x33; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060070E0, &D_06006F28, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_tw_Skel_0070E0, &object_tw_Anim_006F28, NULL, NULL, 0); if (gSaveContext.eventChkInf[7] & 0x20) { // began twinrova battle @@ -595,12 +524,12 @@ void BossTw_Init(Actor* thisx, GlobalContext* globalCtx2) { BossTw_SetupCSWait(this, globalCtx); } - Animation_MorphToLoop(&this->skelAnime, &D_06006F28, -3.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_006F28, -3.0f); this->visible = true; } else if (this->actor.params == TW_KOUME) { Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInitKoumeKotake); this->actor.naviEnemyId = 0x32; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0601F888, &D_06006F28, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_tw_Skel_01F888, &object_tw_Anim_006F28, NULL, NULL, 0); if (gSaveContext.eventChkInf[7] & 0x20) { // began twinrova battle @@ -612,7 +541,7 @@ void BossTw_Init(Actor* thisx, GlobalContext* globalCtx2) { BossTw_SetupCSWait(this, globalCtx); } - Animation_MorphToLoop(&this->skelAnime, &D_06006F28, -3.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_006F28, -3.0f); this->visible = true; } else { // Twinrova @@ -621,8 +550,8 @@ void BossTw_Init(Actor* thisx, GlobalContext* globalCtx2) { this->actor.colChkInfo.health = 24; this->actor.update = BossTw_TwinrovaUpdate; this->actor.draw = BossTw_TwinrovaDraw; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06032020, &D_060244B4, NULL, NULL, 0); - Animation_MorphToLoop(&this->skelAnime, &D_060244B4, -3.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_tw_Skel_032020, &object_tw_Anim_0244B4, NULL, NULL, 0); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_0244B4, -3.0f); if (gSaveContext.eventChkInf[7] & 0x20) { // began twinrova battle @@ -720,7 +649,7 @@ void BossTw_SetupFlyTo(BossTw* this, GlobalContext* globalCtx) { this->actor.flags |= 1; this->actionFunc = BossTw_FlyTo; this->rotateSpeed = 0.0f; - Animation_MorphToLoop(&this->skelAnime, &D_06006F28, -10.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_006F28, -10.0f); if ((Rand_ZeroOne() < 0.5f) && (otherTw != NULL && otherTw->actionFunc == BossTw_ShootBeam)) { // Other Sister is shooting a beam, go near them. this->targetPos.x = otherTw->actor.world.pos.x + Rand_CenteredFloat(200.0f); @@ -781,8 +710,8 @@ void BossTw_SetupShootBeam(BossTw* this, GlobalContext* globalCtx) { Player* player = PLAYER; this->actionFunc = BossTw_ShootBeam; - Animation_MorphToPlayOnce(&this->skelAnime, &D_06007688, -5.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06007688); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_007688, -5.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_007688); this->timers[1] = 70; this->targetPos = player->actor.world.pos; this->csState1 = 0; @@ -1122,13 +1051,13 @@ void BossTw_ShootBeam(BossTw* this, GlobalContext* globalCtx) { } if (Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) { - Animation_MorphToLoop(&this->skelAnime, &D_06009398, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_009398, 0.0f); this->workf[ANIM_SW_TGT] = 10000.0f; } if (this->timers[1] == 1) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06003614, 0.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06003614); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_003614, 0.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_003614); this->unk_4DC = 0.0f; this->spawnPortalAlpha = 0.0f; this->flameAlpha = 0.0f; @@ -1136,7 +1065,7 @@ void BossTw_ShootBeam(BossTw* this, GlobalContext* globalCtx) { } } else { if (Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) { - Animation_MorphToLoop(&this->skelAnime, &D_06003E34, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_003E34, 0.0f); this->workf[ANIM_SW_TGT] = 10000.0f; } @@ -1390,8 +1319,8 @@ void BossTw_ShootBeam(BossTw* this, GlobalContext* globalCtx) { void BossTw_SetupFinishBeamShoot(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_FinishBeamShoot; - Animation_MorphToPlayOnce(&this->skelAnime, &D_06004548, 0.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06004548); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_004548, 0.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_004548); } void BossTw_FinishBeamShoot(BossTw* this, GlobalContext* globalCtx) { @@ -1411,7 +1340,7 @@ void BossTw_FinishBeamShoot(BossTw* this, GlobalContext* globalCtx) { void BossTw_SetupHitByBeam(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_HitByBeam; - Animation_MorphToPlayOnce(&this->skelAnime, &D_0600578C, 0.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_00578C, 0.0f); this->timers[0] = 53; this->actor.speedXZ = 0.0f; @@ -1465,8 +1394,8 @@ void BossTw_HitByBeam(BossTw* this, GlobalContext* globalCtx) { } if (this->timers[0] == 1) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06006530, 0.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06006530); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_006530, 0.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_006530); } if ((this->timers[0] == 0) && Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) { @@ -1476,8 +1405,8 @@ void BossTw_HitByBeam(BossTw* this, GlobalContext* globalCtx) { void BossTw_SetupLaugh(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_Laugh; - Animation_MorphToPlayOnce(&this->skelAnime, &D_060088C8, 0.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_060088C8); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_0088C8, 0.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_0088C8); this->actor.speedXZ = 0.0f; } @@ -1499,8 +1428,8 @@ void BossTw_Laugh(BossTw* this, GlobalContext* globalCtx) { void BossTw_SetupSpin(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_Spin; - Animation_MorphToPlayOnce(&this->skelAnime, &D_06007CA8, -3.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06007CA8); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_007CA8, -3.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_007CA8); this->actor.speedXZ = 0.0f; SkelAnime_Update(&this->skelAnime); this->timers[0] = 20; @@ -1528,7 +1457,7 @@ void BossTw_SetupMergeCS(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_MergeCS; this->rotateSpeed = 0.0f; this->actor.speedXZ = 0.0f; - Animation_MorphToLoop(&this->skelAnime, &D_06006F28, -10.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_006F28, -10.0f); } void BossTw_MergeCS(BossTw* this, GlobalContext* globalCtx) { @@ -1707,8 +1636,8 @@ void BossTw_TwinrovaMergeCS(BossTw* this, GlobalContext* globalCtx) { BossTw_SetupWait(sKotakePtr, globalCtx); BossTw_SetupWait(sKoumePtr, globalCtx); Actor_SetScale(&this->actor, 0.0f); - Animation_MorphToPlayOnce(&this->skelAnime, &D_06038E2C, 0.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06038E2C); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_038E2C, 0.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_038E2C); this->timers[0] = 50; func_8002DF54(globalCtx, &this->actor, 2); Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_TRANSFORM); @@ -1722,7 +1651,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, GlobalContext* globalCtx) { case 1: if (Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) { - Animation_MorphToLoop(&this->skelAnime, &D_06032BF8, -15.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, -15.0f); } sEnvType = -1; @@ -1797,7 +1726,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, GlobalContext* globalCtx) { void BossTw_SetupDeathCS(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_DeathCS; - Animation_MorphToLoop(&this->skelAnime, &D_060004A4, -3.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_0004A4, -3.0f); this->unk_5F8 = 0; this->work[CS_TIMER_2] = Rand_ZeroFloat(20.0f); } @@ -1923,7 +1852,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { if (this->work[CS_TIMER_1] >= 236) { this->csState2 = 2; sKoumePtr->visible = 1; - Animation_MorphToLoop(&sKoumePtr->skelAnime, &D_060004A4, 0.0f); + Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_0004A4, 0.0f); sKoumePtr->actor.world.pos.x = 0.0f; sKoumePtr->actor.world.pos.y = 80.0f; sKoumePtr->actor.world.pos.z = 600.0f; @@ -2003,8 +1932,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { this->subCamAtStep.z = fabsf(this->subCamAtTarget.z - this->subCamAt.z); this->subCamUpdateRate = 0.0f; this->subCamDistStep = 0.05f; - Animation_MorphToPlayOnce(&sKoumePtr->skelAnime, &D_06000AAC, 0.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06000AAC); + Animation_MorphToPlayOnce(&sKoumePtr->skelAnime, &object_tw_Anim_000AAC, 0.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_000AAC); this->work[CS_TIMER_1] = 0; } break; @@ -2052,8 +1981,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { 1.0f, 0.005f); } else { if (this->work[CS_TIMER_1] == 50) { - Animation_MorphToPlayOnce(&sKoumePtr->skelAnime, &D_060088C8, -5); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_060088C8); + Animation_MorphToPlayOnce(&sKoumePtr->skelAnime, &object_tw_Anim_0088C8, -5); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_0088C8); } if (this->work[CS_TIMER_1] == 60) { @@ -2061,7 +1990,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { } if (Animation_OnFrame(&sKoumePtr->skelAnime, this->workf[ANIM_SW_TGT])) { - Animation_MorphToLoop(&sKoumePtr->skelAnime, &D_06006F28, 0.f); + Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_006F28, 0.f); this->workf[ANIM_SW_TGT] = 1000.0f; } @@ -2077,7 +2006,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { this->work[CS_TIMER_1] = 0; this->subCamYawStep = 0.0f; sKotakePtr->visible = 1; - Animation_MorphToLoop(&sKotakePtr->skelAnime, &D_060004A4, 0.0f); + Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_0004A4, 0.0f); sKotakePtr->actor.world.pos.x = 0.0f; sKotakePtr->actor.world.pos.y = 80.0f; sKotakePtr->actor.world.pos.z = -600.0f; @@ -2105,7 +2034,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { Math_ApproachF(&this->subCamYawStep, 12288.0f, 1.0f, 384.0f); if (Animation_OnFrame(&sKoumePtr->skelAnime, this->workf[ANIM_SW_TGT])) { - Animation_MorphToLoop(&sKoumePtr->skelAnime, &D_06006F28, 0.0f); + Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_006F28, 0.0f); this->workf[ANIM_SW_TGT] = 1000.0f; } } @@ -2167,8 +2096,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { this->subCamAtStep.z = fabsf(this->subCamAtTarget.z - this->subCamAt.z); this->subCamUpdateRate = 0; this->subCamDistStep = 0.05f; - Animation_MorphToPlayOnce(&sKotakePtr->skelAnime, &D_06000AAC, 0); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06000AAC); + Animation_MorphToPlayOnce(&sKotakePtr->skelAnime, &object_tw_Anim_000AAC, 0); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_000AAC); this->work[CS_TIMER_1] = 0; } break; @@ -2214,8 +2143,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { 1.0f, 0.005f); } else { if (this->work[CS_TIMER_1] == 50) { - Animation_MorphToPlayOnce(&sKotakePtr->skelAnime, &D_060088C8, -5.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_060088C8); + Animation_MorphToPlayOnce(&sKotakePtr->skelAnime, &object_tw_Anim_0088C8, -5.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_0088C8); } if (this->work[CS_TIMER_1] == 60) { @@ -2223,7 +2152,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { } if (Animation_OnFrame(&sKotakePtr->skelAnime, this->workf[ANIM_SW_TGT])) { - Animation_MorphToLoop(&sKotakePtr->skelAnime, &D_06006F28, 0.0f); + Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_006F28, 0.0f); this->workf[ANIM_SW_TGT] = 1000.0f; } @@ -2266,7 +2195,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { Math_ApproachF(&this->subCamYawStep, 12288.0f, 1.0f, 384.0f); if (Animation_OnFrame(&sKotakePtr->skelAnime, this->workf[ANIM_SW_TGT])) { - Animation_MorphToLoop(&sKotakePtr->skelAnime, &D_06006F28, 0.0f); + Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_006F28, 0.0f); this->workf[ANIM_SW_TGT] = 1000.0f; } } @@ -2287,8 +2216,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) { globalCtx->envCtx.unk_BE = 1; globalCtx->envCtx.unk_BD = 1; globalCtx->envCtx.unk_D8 = 0.0f; - TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(D_0602E170), 0xA0, - 0xB4, 0x80, 0x28); + TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, + SEGMENTED_TO_VIRTUAL(object_tw_Blob_02E170), 0xA0, 0xB4, 0x80, 0x28); gSaveContext.eventChkInf[7] |= 0x20; Audio_QueueSeqCmd(0x1B); } @@ -2441,7 +2370,7 @@ void BossTw_DeathBall(BossTw* this, GlobalContext* globalCtx) { void BossTw_TwinrovaSetupDeathCS(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_TwinrovaDeathCS; - Animation_MorphToLoop(&this->skelAnime, &D_06024374, -3.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_024374, -3.0f); this->actor.world.rot.y = this->actor.shape.rot.y; this->actor.flags &= ~1; this->csState2 = this->csState1 = 0; @@ -2616,31 +2545,31 @@ void BossTw_DeathCSMsgSfx(BossTw* this, GlobalContext* globalCtx) { switch (kotakeAnim) { case 1: - Animation_MorphToLoop(&sKotakePtr->skelAnime, &D_0600230C, -5.0f); + Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_00230C, -5.0f); break; case 2: - Animation_MorphToLoop(&sKotakePtr->skelAnime, &D_06001D10, -5.0f); + Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_001D10, -5.0f); break; case 3: - Animation_MorphToLoop(&sKotakePtr->skelAnime, &D_060017E0, -5.0f); + Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_0017E0, -5.0f); break; case 4: - Animation_MorphToLoop(&sKotakePtr->skelAnime, &D_060012A4, -5.0f); + Animation_MorphToLoop(&sKotakePtr->skelAnime, &object_tw_Anim_0012A4, -5.0f); break; } switch (koumeAnim) { case 1: - Animation_MorphToLoop(&sKoumePtr->skelAnime, &D_0600230C, -5.0f); + Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_00230C, -5.0f); break; case 2: - Animation_MorphToLoop(&sKoumePtr->skelAnime, &D_06001D10, -5.0f); + Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_001D10, -5.0f); break; case 3: - Animation_MorphToLoop(&sKoumePtr->skelAnime, &D_060017E0, -5.0f); + Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_0017E0, -5.0f); break; case 4: - Animation_MorphToLoop(&sKoumePtr->skelAnime, &D_060012A4, -5.0f); + Animation_MorphToLoop(&sKoumePtr->skelAnime, &object_tw_Anim_0012A4, -5.0f); break; } @@ -2695,7 +2624,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, GlobalContext* globalCtx) { switch (this->csState1) { case 0: if (this->work[CS_TIMER_1] == 15) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_060216DC, -3.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_0216DC, -3.0f); } if (this->work[CS_TIMER_1] >= 15) { @@ -3253,9 +3182,9 @@ s32 BossTw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList if (limbIndex == 21) { if (this->unk_5F8 == 0) { if (this->actor.params == 0) { - *dList = D_06012CE0; + *dList = object_tw_DL_012CE0; } else { - *dList = D_060134B8; + *dList = object_tw_DL_0134B8; } } } @@ -3265,9 +3194,9 @@ s32 BossTw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList *dList = NULL; } else if (this->scepterAlpha == 0.0f) { if (this->actor.params == 0) { - *dList = D_06012B38; + *dList = object_tw_DL_012B38; } else { - *dList = D_06013310; + *dList = object_tw_DL_013310; } } } @@ -3295,9 +3224,9 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6190), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); if (this->actor.params == 0) { - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06013AE8)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013AE8)); } else { - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06013D68)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013D68)); } } break; @@ -3313,14 +3242,14 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); if (this->actor.params == 0) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 225, 255, (s16)this->scepterAlpha); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06013E98)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013E98)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, (s16)this->scepterAlpha); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06013F98)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013F98)); } else { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 20, 0, (s16)this->scepterAlpha); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06014070)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_014070)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 70, 0, (s16)this->scepterAlpha); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06014158)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_014158)); } } break; @@ -3342,7 +3271,7 @@ void func_80941BC0(BossTw* this, GlobalContext* globalCtx) { G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F11]); gDPSetEnvColor(POLY_XLU_DISP++, 0, 40, 30, 80); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601BC00)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01BC00)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 215, 215, 215, (s16)this->workf[UNK_F11] * this->workf[UNK_F14]); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128); gSPSegment(POLY_XLU_DISP++, 8, @@ -3352,7 +3281,7 @@ void func_80941BC0(BossTw* this, GlobalContext* globalCtx) { Matrix_RotateY(this->workf[UNK_F15], MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6423), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601C1C0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01C1C0)); Matrix_Pop(); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6427), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); @@ -3367,7 +3296,7 @@ void func_80941BC0(BossTw* this, GlobalContext* globalCtx) { GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA), G_RM_ZB_OVL_SURF2); gSPSetGeometryMode(POLY_XLU_DISP++, G_CULL_BACK | G_FOG); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A790)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A790)); Matrix_Pop(); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6461); @@ -3391,7 +3320,7 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 40, 00, (s16)this->workf[KM_GRND_CRTR_A]); gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 255, 245, 255, 128); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06019D40)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_019D40)); func_800D1FD4(&globalCtx->mf_11DA0); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6514), @@ -3403,7 +3332,7 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 80, 0, 0, (s16)this->workf[KM_GD_SMOKE_A]); gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 100); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06018FC0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_018FC0)); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (-this->work[CS_TIMER_1] * 3) & 0x7F, 0, 0x20, 0x20, 1, 0, @@ -3414,7 +3343,7 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) { Matrix_Scale(this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6575), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06019938)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_019938)); Matrix_Pop(); @@ -3440,17 +3369,17 @@ void func_809426F0(BossTw* this, GlobalContext* globalCtx) { if (this->actor.params == 0) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 135, 175, 165, (s16)this->spawnPortalAlpha); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601CEE0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01CEE0)); } else { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, (s16)this->spawnPortalAlpha); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601DBE8)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DBE8)); } Matrix_Pop(); if (this->actor.params == 0) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, (s16)this->flameAlpha); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A998)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A998)); } else { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 20, 0, (s16)this->flameAlpha); gDPSetEnvColor(POLY_XLU_DISP++, 255, 215, 255, 128); @@ -3468,7 +3397,7 @@ void func_809426F0(BossTw* this, GlobalContext* globalCtx) { func_800D1FD4(&globalCtx->mf_11DA0); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6751), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A430)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); Matrix_Pop(); } @@ -3502,7 +3431,7 @@ void func_80942C70(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(this->beamScale, this->beamScale, (this->beamDist * 0.01f * 98.0f) / 20000.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6846), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601DDF0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DDF0)); if (this->beamReflectionDist > 10.0f) { Matrix_Translate(this->beamReflectionOrigin.x, this->beamReflectionOrigin.y, this->beamReflectionOrigin.z, @@ -3514,7 +3443,7 @@ void func_80942C70(Actor* thisx, GlobalContext* globalCtx) { MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6870), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601DDF0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DDF0)); } Matrix_Pop(); @@ -3534,7 +3463,7 @@ void func_80943028(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6908), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601F608)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F608)); func_80094044(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 200); Matrix_Translate(this->actor.world.pos.x, 240.0f, this->actor.world.pos.z, MTXMODE_NEW); @@ -3684,13 +3613,13 @@ s32 BossTw_TwinrovaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx break; case 19: if (this->unk_5F8 != 0) { - *dList = D_0602D940; + *dList = object_tw_DL_02D940; } break; case 20: if (this->unk_5F8 != 0) { - *dList = D_0602D890; + *dList = object_tw_DL_02D890; } break; } @@ -3791,20 +3720,20 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) { temp_a0 = (Math_SinS(this->work[CS_TIMER_1] * 2730 * temp_t0) * D_8094C854 * 0.5f) + (D_8094C854 * 0.5f); if (sShieldFireCharge != 0) { gDPSetEnvColor(POLY_XLU_DISP++, 255, 245, 255, temp_a0); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601E0E0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01E0E0)); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (this->work[CS_TIMER_1] * 2) * temp_t0, 0, 0x20, 0x20, 1, (-this->work[CS_TIMER_1] * 2) * temp_t0, 0, 0x20, 0x20)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 20, 0, (s16)D_8094C854); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601E020)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01E020)); } else { gDPSetEnvColor(POLY_XLU_DISP++, 225, 255, 255, temp_a0); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601E3A0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01E3A0)); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (-this->work[CS_TIMER_1] * 5) * temp_t0, 0x20, 0x40, 1, (this->work[CS_TIMER_1] * 4) * temp_t0, 0, 0x20, 0x20)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 175, 205, 195, (s16)D_8094C854); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601E2C0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01E2C0)); } } } @@ -3839,7 +3768,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, this->work[CS_TIMER_1] * D_8094C872, 0x20, 0x40, 1, 0, this->work[CS_TIMER_1] * D_8094C872, 0x20, 0x20)); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601E9F0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01E9F0)); } Matrix_Pop(); @@ -3864,28 +3793,28 @@ void BossTw_SpawnPortalDraw(BossTw* this, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7582), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601EC68)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EC68)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 135, 175, 165, (s16)this->spawnPortalAlpha); Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7596), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601CEE0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01CEE0)); Matrix_Translate(0.0f, 232.0f, 600.0f, MTXMODE_NEW); Matrix_Scale(this->spawnPortalScale, this->spawnPortalScale, this->spawnPortalScale, MTXMODE_APPLY); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7617), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601EC68)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EC68)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, (s16)this->spawnPortalAlpha); Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7631), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601DBE8)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DBE8)); Matrix_Pop(); @@ -3905,7 +3834,7 @@ void func_80944C50(BossTw* this, GlobalContext* globalCtx) { Matrix_Scale(this->workf[UNK_F19], this->workf[UNK_F19], this->workf[UNK_F19], MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7671), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601F390)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F390)); Matrix_Pop(); gSPSegment(POLY_XLU_DISP++, 8, @@ -3914,7 +3843,7 @@ void func_80944C50(BossTw* this, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F18] / 2); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7694), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601F238)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F238)); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -sKoumePtr->work[CS_TIMER_1] * 5, @@ -3928,7 +3857,7 @@ void func_80944C50(BossTw* this, GlobalContext* globalCtx) { Matrix_Scale(scale, 1.0f, scale, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7728), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601EEB0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EEB0)); Matrix_Pop(); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7732); @@ -4533,7 +4462,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) { func_800D1FD4(&globalCtx->mf_11DA0); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 8865), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A430)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); } break; @@ -4542,7 +4471,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) { case TW_ICE_BLAST: gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, (s8)this->workf[TAIL_ALPHA]); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A998)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A998)); for (i = 9; i >= 0; i--) { gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll( @@ -4557,7 +4486,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) { func_800D1FD4(&globalCtx->mf_11DA0); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9004), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601AB00)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); } break; @@ -4597,11 +4526,11 @@ void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) { func_800D1FD4(&globalCtx->mf_11DA0); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9071), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A430)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); } } else { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, (s8)this->workf[TAIL_ALPHA]); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A998)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A998)); for (i = 9; i >= 0; i--) { gSPSegment(POLY_XLU_DISP++, 8, @@ -4617,7 +4546,7 @@ void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) { func_800D1FD4(&globalCtx->mf_11DA0); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9107), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601AB00)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); } } @@ -4984,7 +4913,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { for (i = 0; i < ARRAY_COUNT(sTwEffects); i++) { if (currentEffect->type == 1) { if (sp18F == 0) { - gSPDisplayList(POLY_XLU_DISP++, D_0601A528); + gSPDisplayList(POLY_XLU_DISP++, object_tw_DL_01A528); sp18F++; } @@ -4995,7 +4924,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9617), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_0601A5A8); + gSPDisplayList(POLY_XLU_DISP++, object_tw_DL_01A5A8); } currentEffect++; @@ -5007,7 +4936,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { for (i = 0; i < ARRAY_COUNT(sTwEffects); i++) { if (currentEffect->type == 3) { if (sp18F == 0) { - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A998)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A998)); sp18F++; } @@ -5020,7 +4949,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9660), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601AB00)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); } currentEffect++; } @@ -5045,7 +4974,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9709), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A430)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); } currentEffect++; @@ -5090,7 +5019,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BACK | G_FOG); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A790)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A790)); } currentEffect++; @@ -5105,7 +5034,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { if (currentEffect->type == TWEFF_PLYR_FRZ) { if (sp18F == 0) { - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601AA50)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AA50)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, 255); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, 0, 0x20, 0x20)); @@ -5135,7 +5064,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { Matrix_RotateX((BossTw_RandZeroOne() - 0.5f) * M_PI * 0.5f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9855), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601AB00)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); } } @@ -5149,7 +5078,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { if (currentEffect->type >= 6) { if (currentEffect->work[EFF_ARGS] == 0) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, currentEffect->alpha); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A998)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A998)); } else { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 20, 0, currentEffect->alpha); gDPPipeSync(POLY_XLU_DISP++); @@ -5166,9 +5095,9 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (currentEffect->work[EFF_ARGS] == 0) { - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601AB00)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); } else { - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0601A430)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); } } @@ -5180,7 +5109,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { void BossTw_TwinrovaSetupArriveAtTarget(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_TwinrovaArriveAtTarget; - Animation_MorphToLoop(&this->skelAnime, &D_06032BF8, -3.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, -3.0f); this->work[CS_TIMER_1] = Rand_ZeroFloat(100.0f); this->timers[1] = 25; this->rotateSpeed = 0.0f; @@ -5203,8 +5132,8 @@ void BossTw_TwinrovaArriveAtTarget(BossTw* this, GlobalContext* globalCtx) { void BossTw_TwinrovaSetupChargeBlast(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_TwinrovaChargeBlast; - Animation_MorphToPlayOnce(&this->skelAnime, &D_06036FBC, -5.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06036FBC); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_036FBC, -5.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_036FBC); this->csState1 = 0; } @@ -5236,12 +5165,12 @@ void BossTw_TwinrovaSetupShootBlast(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_TwinrovaShootBlast; if (sTwinrovaBlastType == 0) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06022700, 0.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_022700, 0.0f); } else { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06023750, 0.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_023750, 0.0f); } - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06023750); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_023750); } void BossTw_TwinrovaShootBlast(BossTw* this, GlobalContext* globalCtx) { @@ -5299,7 +5228,7 @@ void BossTw_TwinrovaShootBlast(BossTw* this, GlobalContext* globalCtx) { void BossTw_TwinrovaSetupDoneBlastShoot(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_TwinrovaDoneBlastShoot; - Animation_MorphToLoop(&this->skelAnime, &D_06032BF8, -10.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, -10.0f); this->timers[1] = 60; } @@ -5320,7 +5249,7 @@ void BossTw_TwinrovaDoneBlastShoot(BossTw* this, GlobalContext* globalCtx) { void BossTw_TwinrovaDamage(BossTw* this, GlobalContext* globalCtx, u8 damage) { if (this->actionFunc != BossTw_TwinrovaStun) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_060338F0, -15.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_0338F0, -15.0f); this->timers[0] = 150; this->timers[1] = 20; this->csState1 = 0; @@ -5328,8 +5257,8 @@ void BossTw_TwinrovaDamage(BossTw* this, GlobalContext* globalCtx, u8 damage) { } else { this->work[FOG_TIMER] = 10; this->work[INVINC_TIMER] = 20; - Animation_MorphToPlayOnce(&this->skelAnime, &D_06024374, -3.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06024374); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_024374, -3.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_024374); this->csState1 = 1; if ((s8)(this->actor.colChkInfo.health -= damage) < 0) { @@ -5391,12 +5320,12 @@ void BossTw_TwinrovaStun(BossTw* this, GlobalContext* globalCtx) { if (this->csState1 == 0) { if (this->timers[1] == 0) { this->csState1 = 1; - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_060343B4); - Animation_Change(&this->skelAnime, &D_060343B4, 1.0f, 0.0f, this->workf[ANIM_SW_TGT], 3, 0.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_0343B4); + Animation_Change(&this->skelAnime, &object_tw_Anim_0343B4, 1.0f, 0.0f, this->workf[ANIM_SW_TGT], 3, 0.0f); } } else if (Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) { this->workf[ANIM_SW_TGT] = 1000.0f; - Animation_MorphToLoop(&this->skelAnime, &D_06035030, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_035030, 0.0f); } if (this->actor.bgCheckFlags & 1) { @@ -5409,8 +5338,8 @@ void BossTw_TwinrovaStun(BossTw* this, GlobalContext* globalCtx) { } void BossTw_TwinrovaSetupGetUp(BossTw* this, GlobalContext* globalCtx) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06035988, 0.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_06035988); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_035988, 0.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_035988); this->actionFunc = BossTw_TwinrovaGetUp; this->timers[0] = 50; } @@ -5421,7 +5350,7 @@ void BossTw_TwinrovaGetUp(BossTw* this, GlobalContext* globalCtx) { if (Animation_OnFrame(&this->skelAnime, this->workf[ANIM_SW_TGT])) { this->workf[ANIM_SW_TGT] = 1000.0f; - Animation_MorphToLoop(&this->skelAnime, &D_06032BF8, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, 0.0f); } if (this->timers[0] == 0) { @@ -5455,7 +5384,7 @@ void BossTw_TwinrovaSetupFly(BossTw* this, GlobalContext* globalCtx) { this->actor.world.rot.y = Math_FAtan2F(xDiff, zDiff) * (32768 / M_PI); xzDist = sqrtf(SQ(xDiff) + SQ(zDiff)); this->actor.world.rot.x = Math_FAtan2F(yDiff, xzDist) * (32768 / M_PI); - Animation_MorphToLoop(&this->skelAnime, &D_06032BF8, -10.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, -10.0f); } void BossTw_TwinrovaFly(BossTw* this, GlobalContext* globalCtx) { @@ -5494,7 +5423,7 @@ void BossTw_TwinrovaFly(BossTw* this, GlobalContext* globalCtx) { void BossTw_TwinrovaSetupSpin(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_TwinrovaSpin; - Animation_MorphToLoop(&this->skelAnime, &D_06032BF8, 0.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tw_Anim_032BF8, 0.0f); this->timers[0] = 20; this->actor.speedXZ = 0.0f; } @@ -5515,8 +5444,8 @@ void BossTw_TwinrovaSpin(BossTw* this, GlobalContext* globalCtx) { void BossTw_TwinrovaSetupLaugh(BossTw* this, GlobalContext* globalCtx) { this->actionFunc = BossTw_TwinrovaLaugh; - Animation_MorphToPlayOnce(&this->skelAnime, &D_0603A2D0, 0.0f); - this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&D_0603A2D0); + Animation_MorphToPlayOnce(&this->skelAnime, &object_tw_Anim_03A2D0, 0.0f); + this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&object_tw_Anim_03A2D0); this->actor.speedXZ = 0.0f; } diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index b2c0ac469d..d7ed5bd134 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -7,6 +7,8 @@ #include "z_demo_6k.h" #include "vt.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_demo_6k/object_demo_6k.h" +#include "objects/object_gnd_magic/object_gnd_magic.h" #include "overlays/actors/ovl_Eff_Dust/z_eff_dust.h" #define FLAGS 0x00000010 @@ -37,12 +39,6 @@ void func_80968B70(Actor* thisx, GlobalContext* globalCtx); void func_80968FB0(Actor* thisx, GlobalContext* globalCtx); void func_809691BC(Demo6K* this, GlobalContext* globalCtx, s32 params); -extern Gfx D_06001040[]; -extern Gfx D_06001190[]; -extern Gfx D_060022B0[]; -extern Vtx D_060035E0[]; -extern Gfx D_060039D0[]; - const ActorInit Demo_6K_InitVars = { ACTOR_DEMO_6K, ACTORCAT_PROP, @@ -593,7 +589,7 @@ void func_80967FFC(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, colors[i][0].r, colors[i][0].g, colors[i][0].b, 255); gDPSetEnvColor(POLY_XLU_DISP++, colors[i][1].r, colors[i][1].g, colors[i][1].b, 255); - gSPDisplayList(POLY_XLU_DISP++, D_060022B0); + gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_0022B0); } // required to avoid optimizing out i @@ -609,7 +605,7 @@ void func_80968298(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u32 timer1 = this->timer1; f32 scale = this->unk_164 * this->unk_168; - Vtx* vertices = SEGMENTED_TO_VIRTUAL(D_060035E0); + Vtx* vertices = SEGMENTED_TO_VIRTUAL(object_demo_6kVtx_0035E0); s32 i; s32 i2; u8 alpha; @@ -641,14 +637,14 @@ void func_80968298(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (0xFFF - (timer1 * 6)) & 0xFFF, (timer1 * 12) & 0xFFF, 128, 64, 1, (0xFFF - (timer1 * 6)) & 0xFFF, (timer1 * 12) & 0xFFF, 64, 32)); - gSPDisplayList(POLY_XLU_DISP++, D_060039D0); + gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_0039D0); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1189), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 50, 50, 50, 255); - gSPDisplayList(POLY_XLU_DISP++, D_06001040); + gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_001040); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1198); } @@ -767,7 +763,7 @@ void func_80968B70(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, primColor[0], primColor[1], primColor[2], primColor[3]); gDPSetEnvColor(POLY_XLU_DISP++, envColor[0], envColor[1], envColor[2], 128); - gSPDisplayList(POLY_XLU_DISP++, D_06001190); + gSPDisplayList(POLY_XLU_DISP++, object_gnd_magic_DL_001190); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1368); } diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 25524d3491..5f9d6aa7ac 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -10,6 +10,27 @@ #include "objects/object_ec/object_ec.h" #include "objects/object_fish/object_fish.h" #include "objects/object_oF1d_map/object_oF1d_map.h" +#include "objects/object_ma2/object_ma2.h" +#include "objects/object_in/object_in.h" +#include "objects/object_ta/object_ta.h" +#include "objects/object_fu/object_fu.h" +#include "objects/object_toryo/object_toryo.h" +#include "objects/object_daiku/object_daiku.h" +#include "objects/object_ge1/object_ge1.h" +#include "objects/object_kz/object_kz.h" +#include "objects/object_md/object_md.h" +#include "objects/object_niw/object_niw.h" +#include "objects/object_ds2/object_ds2.h" +#include "objects/object_os/object_os.h" +#include "objects/object_rs/object_rs.h" +#include "objects/object_gm/object_gm.h" +#include "objects/object_km1/object_km1.h" +#include "objects/object_kw1/object_kw1.h" +#include "objects/object_bji/object_bji.h" +#include "objects/object_ahg/object_ahg.h" +#include "objects/object_bob/object_bob.h" +#include "objects/object_bba/object_bba.h" +#include "objects/object_ane/object_ane.h" #define FLAGS 0x00000010 @@ -80,11 +101,41 @@ typedef enum { } DemoEcDrawconfig; static s16 sDrawObjects[] = { - OBJECT_IN, OBJECT_TA, OBJECT_FU, OBJECT_KM1, OBJECT_KW1, OBJECT_BJI, OBJECT_AHG, - OBJECT_BOB, OBJECT_BBA, OBJECT_TORYO, OBJECT_DAIKU, OBJECT_DAIKU, OBJECT_DAIKU, OBJECT_DAIKU, - OBJECT_KM1, OBJECT_KW1, OBJECT_GE1, OBJECT_GE1, OBJECT_GE1, OBJECT_ZO, OBJECT_KZ, - OBJECT_MD, OBJECT_NIW, OBJECT_NIW, OBJECT_NIW, OBJECT_ANE, OBJECT_DS2, OBJECT_OS, - OBJECT_FISH, OBJECT_RS, OBJECT_OF1D_MAP, OBJECT_OF1D_MAP, OBJECT_OF1D_MAP, OBJECT_OF1D_MAP, OBJECT_MA2, + /* 0 */ OBJECT_IN, + /* 1 */ OBJECT_TA, + /* 2 */ OBJECT_FU, + /* 3 */ OBJECT_KM1, + /* 4 */ OBJECT_KW1, + /* 5 */ OBJECT_BJI, + /* 6 */ OBJECT_AHG, + /* 7 */ OBJECT_BOB, + /* 8 */ OBJECT_BBA, + /* 9 */ OBJECT_TORYO, + /* 10 */ OBJECT_DAIKU, + /* 11 */ OBJECT_DAIKU, + /* 12 */ OBJECT_DAIKU, + /* 13 */ OBJECT_DAIKU, + /* 14 */ OBJECT_KM1, + /* 15 */ OBJECT_KW1, + /* 16 */ OBJECT_GE1, + /* 17 */ OBJECT_GE1, + /* 18 */ OBJECT_GE1, + /* 19 */ OBJECT_ZO, + /* 20 */ OBJECT_KZ, + /* 21 */ OBJECT_MD, + /* 22 */ OBJECT_NIW, + /* 23 */ OBJECT_NIW, + /* 24 */ OBJECT_NIW, + /* 25 */ OBJECT_ANE, + /* 26 */ OBJECT_DS2, + /* 27 */ OBJECT_OS, + /* 28 */ OBJECT_FISH, + /* 29 */ OBJECT_RS, + /* 30 */ OBJECT_OF1D_MAP, + /* 31 */ OBJECT_OF1D_MAP, + /* 32 */ OBJECT_OF1D_MAP, + /* 33 */ OBJECT_OF1D_MAP, + /* 34 */ OBJECT_MA2, }; static s16 sAnimationObjects[] = { @@ -94,73 +145,8 @@ static s16 sAnimationObjects[] = { OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_GM, OBJECT_MA2, }; -// skeletons (all from other objects) - -// Object_IN -extern FlexSkeletonHeader D_06013B88; - -// Object_TA -extern FlexSkeletonHeader D_0600B7B8; - -// Object_FU -extern FlexSkeletonHeader D_06006C90; - -// Object_KM1, Object_KW1, Object_BJI, Objct_AHG, Object_BOB, Object_BBA, Object_ANE -extern FlexSkeletonHeader D_060000F0; - -// Object_Toryo -extern FlexSkeletonHeader D_06007150; - -// Object_Daiku -extern FlexSkeletonHeader D_06007958; - -// Object_GE1 -extern FlexSkeletonHeader D_06000330; - -// Object_KZ -extern FlexSkeletonHeader D_060086D0; - -// Object_MD -extern FlexSkeletonHeader D_06007FB8; - -// Object_Niw -extern FlexSkeletonHeader D_06002530; - -// Object_DS2 -extern FlexSkeletonHeader D_06004258; - -// Object_OS -extern FlexSkeletonHeader D_06004658; - -// Object_RS -extern FlexSkeletonHeader D_06004868; - -// Object_MA2 -extern FlexSkeletonHeader D_06008D90; - -// animations from other objects -extern AnimationHeader D_060002B8; -extern AnimationHeader D_06009EE0; // Object MA2 -extern AnimationHeader D_06004390; -extern AnimationHeader D_060076C0; -extern AnimationHeader D_06005F20; - -// mouth textures -extern u8 D_06004350[]; -extern u8 D_06007AC0[]; -extern u8 D_06006920[]; -extern u8 D_060004C8[]; -extern u8 D_060035D8[]; -extern u8 D_06003770[]; - -// PostLimbDraw display lists -extern Gfx D_06005BD0[]; -extern Gfx D_06005AC0[]; -extern Gfx D_06005990[]; -extern Gfx D_06005880[]; -extern Gfx D_06009198[]; -extern Gfx D_06009430[]; -extern Gfx D_06009690[]; +extern FlexSkeletonHeader object_bji_Skel_0000F0; +extern FlexSkeletonHeader object_ahg_Skel_0000F0; void DemoEc_Destroy(Actor* thisx, GlobalContext* globalCtx) { DemoEc* this = THIS; @@ -367,7 +353,7 @@ void DemoEc_SetNpcActionPosRot(DemoEc* this, GlobalContext* globalCtx, s32 actio void DemoEc_InitIngo(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06013B88); + DemoEc_InitSkelAnime(this, globalCtx, &object_in_Skel_013B88); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcIngoAnim, 0, 0.0f, false); func_8096D64C(this, globalCtx); @@ -383,12 +369,12 @@ void DemoEc_UpdateIngo(DemoEc* this, GlobalContext* globalCtx) { } void DemoEc_DrawIngo(DemoEc* this, GlobalContext* globalCtx) { - DemoEc_DrawSkeleton(this, globalCtx, &D_06004390, &D_06004350, 0, 0); + DemoEc_DrawSkeleton(this, globalCtx, &object_in_Tex_004390, &object_in_Tex_004350, 0, 0); } void DemoEc_InitTalon(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_0600B7B8); + DemoEc_InitSkelAnime(this, globalCtx, &object_ta_Skel_00B7B8); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcTalonAnim, 0, 0.0f, false); func_8096D64C(this, globalCtx); @@ -404,12 +390,12 @@ void DemoEc_UpdateTalon(DemoEc* this, GlobalContext* globalCtx) { } void DemoEc_DrawTalon(DemoEc* this, GlobalContext* globalCtx) { - DemoEc_DrawSkeleton(this, globalCtx, &D_060076C0, &D_06007AC0, NULL, NULL); + DemoEc_DrawSkeleton(this, globalCtx, &object_ta_Tex_0076C0, &object_ta_Tex_007AC0, NULL, NULL); } void DemoEc_InitWindmillMan(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06006C90); + DemoEc_InitSkelAnime(this, globalCtx, &gWindmillManSkel); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcWindmillManAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -425,12 +411,12 @@ void DemoEc_UpdateWindmillMan(DemoEc* this, GlobalContext* globalCtx) { } void DemoEc_DrawWindmillMan(DemoEc* this, GlobalContext* globalCtx) { - DemoEc_DrawSkeleton(this, globalCtx, &D_06005F20, &D_06006920, NULL, NULL); + DemoEc_DrawSkeleton(this, globalCtx, &gWindmillManEyeClosedTex, &gWindMillManMouthAngryTex, NULL, NULL); } void DemoEc_InitKokiriBoy(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_InitSkelAnime(this, globalCtx, &gKm1Skel); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcKokiriAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -441,7 +427,7 @@ void DemoEc_InitKokiriBoy(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitDancingKokiriBoy(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_InitSkelAnime(this, globalCtx, &gKm1Skel); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcDancingKokiriAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -469,7 +455,7 @@ void DemoEc_DrawKokiriBoy(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitKokiriGirl(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_InitSkelAnime(this, globalCtx, &gKw1Skel); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcKokiriAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -480,7 +466,7 @@ void DemoEc_InitKokiriGirl(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitDancingKokiriGirl(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_InitSkelAnime(this, globalCtx, &gKw1Skel); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcDancingKokiriAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -511,7 +497,7 @@ void DemoEc_DrawKokiriGirl(DemoEc* this, GlobalContext* globalCtx) { } void DemoEc_InitOldMan(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_InitSkelAnime(this, globalCtx, &object_bji_Skel_0000F0); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcOldManAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -539,7 +525,7 @@ void DemoEc_DrawOldMan(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitBeardedMan(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_InitSkelAnime(this, globalCtx, &object_ahg_Skel_0000F0); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcOldManAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -567,7 +553,7 @@ void DemoEc_DrawBeardedMan(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitWoman(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_InitSkelAnime(this, globalCtx, &object_bob_Skel_0000F0); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcOldManAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -593,7 +579,7 @@ void DemoEc_DrawWoman(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitOldWoman(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_InitSkelAnime(this, globalCtx, &object_bba_Skel_0000F0); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcOldManAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -609,12 +595,12 @@ void DemoEc_UpdateOldWoman(DemoEc* this, GlobalContext* globalCtx) { } void DemoEc_DrawOldWoman(DemoEc* this, GlobalContext* globalCtx) { - DemoEc_DrawSkeleton(this, globalCtx, &D_060004C8, NULL, NULL, NULL); + DemoEc_DrawSkeleton(this, globalCtx, &object_bba_Tex_0004C8, NULL, NULL, NULL); } void DemoEc_InitBossCarpenter(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06007150); + DemoEc_InitSkelAnime(this, globalCtx, &object_toryo_Skel_007150); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcCarpenterAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -635,7 +621,7 @@ void DemoEc_DrawBossCarpenter(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitCarpenter(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06007958); + DemoEc_InitSkelAnime(this, globalCtx, &object_daiku_Skel_007958); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcCarpenterAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -678,13 +664,13 @@ s32 DemoEc_CarpenterOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gf Gfx* DemoEc_GetCarpenterPostLimbDList(DemoEc* this) { switch (this->actor.params) { case 10: - return D_06005BD0; + return object_daiku_DL_005BD0; case 11: - return D_06005AC0; + return object_daiku_DL_005AC0; case 12: - return D_06005990; + return object_daiku_DL_005990; case 13: - return D_06005880; + return object_daiku_DL_005880; default: osSyncPrintf(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); return 0; @@ -708,7 +694,7 @@ void DemoEc_DrawCarpenter(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitGerudo(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06000330); + DemoEc_InitSkelAnime(this, globalCtx, &gGerudoWhiteSkel); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcGerudoAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -727,11 +713,11 @@ void DemoEc_UpdateGerudo(DemoEc* this, GlobalContext* globalCtx) { Gfx* DemoEc_GetGerudoPostLimbDList(DemoEc* this) { switch (this->actor.params) { case 16: - return D_06009198; + return gGerudoWhiteHairstyleBobDL; case 17: - return D_06009430; + return gGerudoWhiteHairstyleStraightFringeDL; case 18: - return D_06009690; + return gGerudoWhiteHairstyleSpikyDL; default: osSyncPrintf(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); return NULL; @@ -785,7 +771,7 @@ void DemoEc_DrawDancingZora(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitKingZora(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_060086D0); + DemoEc_InitSkelAnime(this, globalCtx, &object_kz_Skel_0086D0); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcKingZoraAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -870,7 +856,7 @@ void DemoEc_DrawKingZora(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitMido(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06007FB8); + DemoEc_InitSkelAnime(this, globalCtx, &gMidoSkel); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcMidoAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -937,7 +923,7 @@ void DemoEc_InitCucco(DemoEc* this, GlobalContext* globalCtx) { AnimationHeader* animation; DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06002530); + DemoEc_InitSkelAnime(this, globalCtx, &gCuccoSkel); DemoEc_UseAnimationObject(this, globalCtx); if (this->actor.params == 22) { @@ -967,7 +953,7 @@ void DemoEc_DrawCucco(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitCuccoLady(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_060000F0); + DemoEc_InitSkelAnime(this, globalCtx, &gCuccoLadySkel); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcCuccoLadyAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -993,7 +979,7 @@ void DemoEc_DrawCuccoLady(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitPotionShopOwner(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06004258); + DemoEc_InitSkelAnime(this, globalCtx, &object_ds2_Skel_004258); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcPotionShopOwnerAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -1019,7 +1005,7 @@ void DemoEc_DrawPotionShopOwner(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitMaskShopOwner(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06004658); + DemoEc_InitSkelAnime(this, globalCtx, &object_os_Skel_004658); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcPotionShopOwnerAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -1035,7 +1021,7 @@ void DemoEc_UpdateMaskShopOwner(DemoEc* this, GlobalContext* globalCtx) { } void DemoEc_DrawMaskShopOwner(DemoEc* this, GlobalContext* globalCtx) { - DemoEc_DrawSkeleton(this, globalCtx, &D_060035D8, NULL, NULL, NULL); + DemoEc_DrawSkeleton(this, globalCtx, &gOsEyeClosedTex, NULL, NULL, NULL); } void DemoEc_InitFishingOwner(DemoEc* this, GlobalContext* globalCtx) { @@ -1079,7 +1065,7 @@ void DemoEc_DrawFishingOwner(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitBombchuShopOwner(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06004868); + DemoEc_InitSkelAnime(this, globalCtx, &object_rs_Skel_004868); DemoEc_UseAnimationObject(this, globalCtx); DemoEc_ChangeAnimation(this, &gDemoEcPotionShopOwnerAnim, 0, 0.0f, false); func_8096D5D4(this, globalCtx); @@ -1096,7 +1082,8 @@ void DempEc_UpdateBombchuShopOwner(DemoEc* this, GlobalContext* globalCtx) { } void DemoEc_DrawBombchuShopOwner(DemoEc* this, GlobalContext* globalCtx) { - static void* eyeTextures[] = { 0x06003968, 0x06003D68, 0x06004168 }; + static void* eyeTextures[] = { gBombchuShopkeeperEyeOpenTex, gBombchuShopkeeperEyeHalfTex, + gBombchuShopkeeperEyeClosedTex }; s32 eyeTexIndex = this->eyeTexIndex; void* eyeTexture = eyeTextures[eyeTexIndex]; @@ -1124,7 +1111,7 @@ void DemoEc_InitGorons(DemoEc* this, GlobalContext* globalCtx) { goronScale = 15.0f; } else { goronScale = 5.0f; - animation = &D_060002B8; + animation = &object_gm_Anim_0002B8; } DemoEc_ChangeAnimation(this, animation, 0, 0.0f, false); @@ -1156,9 +1143,9 @@ void DemoEc_DrawGorons(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitMalon(DemoEc* this, GlobalContext* globalCtx) { DemoEc_UseDrawObject(this, globalCtx); - DemoEc_InitSkelAnime(this, globalCtx, &D_06008D90); + DemoEc_InitSkelAnime(this, globalCtx, &object_ma2_Skel_008D90); DemoEc_UseAnimationObject(this, globalCtx); - DemoEc_ChangeAnimation(this, &D_06009EE0, 0, 0.0f, false); + DemoEc_ChangeAnimation(this, &object_ma2_Anim_009EE0, 0, 0.0f, false); func_8096D5D4(this, globalCtx); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); this->updateMode = EC_UPDATE_MALON; @@ -1173,49 +1160,49 @@ void DemoEc_UpdateMalon(DemoEc* this, GlobalContext* globalCtx) { } void DemoEc_DrawMalon(DemoEc* this, GlobalContext* globalCtx) { - static void* eyeTextures[] = { 0x06002570, 0x06002C70, 0x06003070 }; + static void* eyeTextures[] = { object_ma2_Tex_002570, object_ma2_Tex_002C70, object_ma2_Tex_003070 }; s32 eyeTexIndex = this->eyeTexIndex; void* eyeTexture = eyeTextures[eyeTexIndex]; - DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &D_06003770, NULL, NULL); + DemoEc_DrawSkeleton(this, globalCtx, eyeTexture, &object_ma2_Tex_003770, NULL, NULL); } static DemoEcInitFunc sInitFuncs[] = { - DemoEc_InitIngo, - DemoEc_InitTalon, - DemoEc_InitWindmillMan, - DemoEc_InitKokiriBoy, - DemoEc_InitKokiriGirl, - DemoEc_InitOldMan, - DemoEc_InitBeardedMan, - DemoEc_InitWoman, - DemoEc_InitOldWoman, - DemoEc_InitBossCarpenter, - DemoEc_InitCarpenter, - DemoEc_InitCarpenter, - DemoEc_InitCarpenter, - DemoEc_InitCarpenter, - DemoEc_InitDancingKokiriBoy, - DemoEc_InitDancingKokiriGirl, - DemoEc_InitGerudo, - DemoEc_InitGerudo, - DemoEc_InitGerudo, - DemoEc_InitDancingZora, - DemoEc_InitKingZora, - DemoEc_InitMido, - DemoEc_InitCucco, - DemoEc_InitCucco, - DemoEc_InitCucco, - DemoEc_InitCuccoLady, - DemoEc_InitPotionShopOwner, - DemoEc_InitMaskShopOwner, - DemoEc_InitFishingOwner, - DemoEc_InitBombchuShopOwner, - DemoEc_InitGorons, - DemoEc_InitGorons, - DemoEc_InitGorons, - DemoEc_InitGorons, - DemoEc_InitMalon, + /* 0 */ DemoEc_InitIngo, + /* 1 */ DemoEc_InitTalon, + /* 2 */ DemoEc_InitWindmillMan, + /* 3 */ DemoEc_InitKokiriBoy, + /* 4 */ DemoEc_InitKokiriGirl, + /* 5 */ DemoEc_InitOldMan, + /* 6 */ DemoEc_InitBeardedMan, + /* 7 */ DemoEc_InitWoman, + /* 8 */ DemoEc_InitOldWoman, + /* 9 */ DemoEc_InitBossCarpenter, + /* 10 */ DemoEc_InitCarpenter, + /* 11 */ DemoEc_InitCarpenter, + /* 12 */ DemoEc_InitCarpenter, + /* 13 */ DemoEc_InitCarpenter, + /* 14 */ DemoEc_InitDancingKokiriBoy, + /* 15 */ DemoEc_InitDancingKokiriGirl, + /* 16 */ DemoEc_InitGerudo, + /* 17 */ DemoEc_InitGerudo, + /* 18 */ DemoEc_InitGerudo, + /* 19 */ DemoEc_InitDancingZora, + /* 20 */ DemoEc_InitKingZora, + /* 21 */ DemoEc_InitMido, + /* 22 */ DemoEc_InitCucco, + /* 23 */ DemoEc_InitCucco, + /* 24 */ DemoEc_InitCucco, + /* 25 */ DemoEc_InitCuccoLady, + /* 26 */ DemoEc_InitPotionShopOwner, + /* 27 */ DemoEc_InitMaskShopOwner, + /* 28 */ DemoEc_InitFishingOwner, + /* 29 */ DemoEc_InitBombchuShopOwner, + /* 30 */ DemoEc_InitGorons, + /* 31 */ DemoEc_InitGorons, + /* 32 */ DemoEc_InitGorons, + /* 33 */ DemoEc_InitGorons, + /* 34 */ DemoEc_InitMalon, }; void DemoEc_InitNpc(DemoEc* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 0d339ee27f..a5b9b617c3 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -6,6 +6,7 @@ #include "z_demo_ext.h" #include "vt.h" +#include "objects/object_fhg/object_fhg.h" #define FLAGS 0x00000010 @@ -27,8 +28,6 @@ void DemoExt_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoExt_Update(Actor* thisx, GlobalContext* globalCtx); void DemoExt_Draw(Actor* thisx, GlobalContext* globalCtx); -extern Gfx D_0600FAA0[]; - void DemoExt_Destroy(Actor* thisx, GlobalContext* globalCtx) { } @@ -213,7 +212,7 @@ void DemoExt_DrawVortex(Actor* thisx, GlobalContext* globalCtx) { Gfx_TwoTexScroll(gfxCtx, 0, curScroll[0], curScroll[1], 0x40, 0x40, 1, curScroll[2], curScroll[3], 0x40, 0x40)); gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_0600FAA0); + gSPDisplayList(POLY_XLU_DISP++, gPhantomWarpDL); gSPPopMatrix(POLY_XLU_DISP++, G_MTX_MODELVIEW); CLOSE_DISPS(gfxCtx, "../z_demo_ext.c", 512); diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index e9d4a54a2f..8fa4762452 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -7,6 +7,7 @@ #include "z_demo_im.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" #include "scenes/indoors/nakaniwa/nakaniwa_scene.h" +#include "objects/object_im/object_im.h" #include "vt.h" #define FLAGS 0x00000011 @@ -102,19 +103,6 @@ const ActorInit Demo_Im_InitVars = { (ActorFunc)DemoIm_Draw, }; -extern AnimationHeader D_06000710; -extern AnimationHeader D_06000AFC; -extern Gfx D_0600EDE8[]; -extern AnimationHeader D_060014E4; -extern AnimationHeader D_06001868; -extern FlexSkeletonHeader D_0600F788; -extern AnimationHeader D_0600FB10; -extern AnimationHeader D_060101C8; -extern AnimationHeader D_06010EE0; -extern AnimationHeader D_0601182C; -extern AnimationHeader D_06011C08; -extern AnimationHeader D_06012218; - void func_80984BE0(DemoIm* this) { s32 pad[3]; s16* unk_25E = &this->unk_25E; @@ -307,7 +295,7 @@ void func_80985280(DemoIm* this, AnimationHeader* animHeaderSeg, u8 arg2, f32 tr } void func_80985310(DemoIm* this, GlobalContext* globalCtx) { - func_80985280(this, &D_06001868, 0, 0.0f, 0); + func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0); this->actor.shape.yOffset = -10000.0f; } @@ -351,8 +339,8 @@ void func_8098544C(DemoIm* this, GlobalContext* globalCtx) { void func_809854DC(DemoIm* this, GlobalContext* globalCtx) { if ((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[5] != NULL) && (globalCtx->csCtx.npcActions[5]->action == 2)) { - Animation_Change(&this->skelAnime, &D_06001868, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001868), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, 0.0f); this->action = 2; this->drawConfig = 1; func_80985358(this, globalCtx); @@ -369,16 +357,16 @@ void func_8098557C(DemoIm* this) { void func_809855A8(DemoIm* this, GlobalContext* globalCtx) { if ((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[5] != NULL) && (globalCtx->csCtx.npcActions[5]->action == 3)) { - Animation_Change(&this->skelAnime, &D_06000710, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000710), ANIMMODE_ONCE, - 4.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_000710, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_000710), ANIMMODE_ONCE, 4.0f); this->action = 4; } } void func_80985640(DemoIm* this, s32 arg1) { if (arg1 != 0) { - Animation_Change(&this->skelAnime, &D_06000AFC, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000AFC), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_000AFC, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_000AFC), ANIMMODE_LOOP, 0.0f); this->action = 5; } } @@ -436,7 +424,7 @@ void func_80985830(DemoIm* this, GlobalContext* globalCtx) { } void func_80985860(DemoIm* this, GlobalContext* globalCtx) { - func_80985280(this, &D_06001868, 0, 0.0f, 0); + func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0); this->action = 7; this->actor.shape.shadowAlpha = 0; } @@ -452,8 +440,8 @@ void func_809858C8(DemoIm* this, GlobalContext* globalCtx) { void func_80985948(DemoIm* this, GlobalContext* globalCtx) { if (func_809850E8(this, globalCtx, 4, 5)) { - Animation_Change(&this->skelAnime, &D_06011C08, 1.0f, 0.0f, Animation_GetLastFrame(&D_06011C08), ANIMMODE_ONCE, - 0.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_011C08, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_011C08), ANIMMODE_ONCE, 0.0f); this->action = 8; this->drawConfig = 2; this->unk_26C = 0; @@ -492,8 +480,8 @@ void func_809859E0(DemoIm* this, GlobalContext* globalCtx) { void func_80985B34(DemoIm* this, GlobalContext* globalCtx) { if (func_80985134(this, globalCtx, 4, 5)) { - Animation_Change(&this->skelAnime, &D_06012218, 1.0f, 0.0f, Animation_GetLastFrame(&D_06012218), ANIMMODE_ONCE, - -8.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_012218, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_012218), ANIMMODE_ONCE, -8.0f); this->action = 8; this->drawConfig = 2; this->unk_268 = kREG(5) + 10.0f; @@ -549,7 +537,7 @@ void func_80985CE8(DemoIm* this, GlobalContext* globalCtx) { } void func_80985E60(DemoIm* this, GlobalContext* globalCtx) { - func_80985280(this, &D_06001868, 0, 0.0f, 0); + func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0); this->action = 10; this->unk_280 = 1; } @@ -563,7 +551,7 @@ void func_80985EAC(DemoIm* this, GlobalContext* globalCtx) { } void func_80985EF4(DemoIm* this) { - if (!Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&D_0601182C) - 1.0f)) { + if (!Animation_OnFrame(&this->skelAnime, Animation_GetLastFrame(&object_im_Anim_01182C) - 1.0f)) { func_80985060(this); } } @@ -574,8 +562,8 @@ void func_80985F54(DemoIm* this) { } void func_80985F64(DemoIm* this, GlobalContext* globalCtx) { - Animation_Change(&this->skelAnime, &D_06001868, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001868), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, 0.0f); func_80985180(this, globalCtx, 5); this->action = 11; this->drawConfig = 1; @@ -583,15 +571,15 @@ void func_80985F64(DemoIm* this, GlobalContext* globalCtx) { void func_80985FE8(DemoIm* this, s32 arg1) { if (arg1 != 0) { - Animation_Change(&this->skelAnime, &D_0601182C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0601182C), ANIMMODE_LOOP, - -8.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_01182C, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_01182C), ANIMMODE_LOOP, -8.0f); } } void func_8098604C(DemoIm* this) { - f32 frameCount = Animation_GetLastFrame(&D_06010EE0); + f32 frameCount = Animation_GetLastFrame(&object_im_Anim_010EE0); - Animation_Change(&this->skelAnime, &D_06010EE0, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, -8.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_010EE0, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, -8.0f); this->action = 12; this->drawConfig = 1; this->unk_2D0 = 1; @@ -604,15 +592,15 @@ void func_809860C8(DemoIm* this) { void func_809860DC(DemoIm* this, s32 arg1) { if (arg1 != 0) { - Animation_Change(&this->skelAnime, &D_06001868, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001868), ANIMMODE_LOOP, - -8.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, -8.0f); this->unk_2D0 = 0; } } void func_80986148(DemoIm* this) { - Animation_Change(&this->skelAnime, &D_06010EE0, -1.0f, Animation_GetLastFrame(&D_06010EE0), 0.0f, ANIMMODE_ONCE, - -8.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_010EE0, -1.0f, Animation_GetLastFrame(&object_im_Anim_010EE0), + 0.0f, ANIMMODE_ONCE, -8.0f); this->action = 14; this->drawConfig = 1; } @@ -630,8 +618,8 @@ void func_809861C4(DemoIm* this, GlobalContext* globalCtx) { func_80986148(this); break; case 7: - Animation_Change(&this->skelAnime, &D_0601182C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0601182C), - ANIMMODE_LOOP, -8.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_01182C, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_01182C), ANIMMODE_LOOP, -8.0f); this->action = 12; break; default: @@ -722,7 +710,7 @@ void func_809864D4(DemoIm* this, GlobalContext* globalCtx) { } void func_8098652C(DemoIm* this, GlobalContext* globalCtx) { - func_80985280(this, &D_06001868, 0, 0.0f, 0); + func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0); this->action = 15; } @@ -765,16 +753,16 @@ void func_80986700(DemoIm* this) { } void func_80986710(DemoIm* this, GlobalContext* globalCtx) { - Animation_Change(&this->skelAnime, &D_06001868, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001868), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_001868, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_001868), ANIMMODE_LOOP, 0.0f); func_80985180(this, globalCtx, 5); this->action = 16; this->drawConfig = 1; } void func_80986794(DemoIm* this) { - Animation_Change(&this->skelAnime, &D_060014E4, 1.0f, 0.0f, Animation_GetLastFrame(&D_060014E4), ANIMMODE_ONCE, - -8.0f); + Animation_Change(&this->skelAnime, &object_im_Anim_0014E4, 1.0f, 0.0f, + Animation_GetLastFrame(&object_im_Anim_0014E4), ANIMMODE_ONCE, -8.0f); this->action = 17; this->drawConfig = 1; } @@ -831,7 +819,7 @@ void func_80986948(DemoIm* this, GlobalContext* globalCtx) { } void func_809869B0(DemoIm* this, GlobalContext* globalCtx) { - func_80985280(this, &D_06001868, 0, 0.0f, 0); + func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0); this->action = 18; this->actor.shape.shadowAlpha = 0; } @@ -1001,7 +989,7 @@ void func_80986FA8(DemoIm* this, GlobalContext* globalCtx) { } void func_80987018(DemoIm* this, GlobalContext* globalCtx) { - func_80985280(this, &D_06001868, 0, 0.0f, 0); + func_80985280(this, &object_im_Anim_001868, 0, 0.0f, 0); this->action = 27; this->drawConfig = 0; this->actor.shape.shadowAlpha = 0; @@ -1036,13 +1024,13 @@ void func_80987128(DemoIm* this) { } void func_80987174(DemoIm* this) { - func_80985280(this, &D_060101C8, 2, -8.0f, 0); + func_80985280(this, &object_im_Anim_0101C8, 2, -8.0f, 0); this->action = 30; } void func_809871B4(DemoIm* this, s32 arg1) { if (arg1 != 0) { - func_80985280(this, &D_0600FB10, 0, 0.0f, 0); + func_80985280(this, &object_im_Anim_00FB10, 0, 0.0f, 0); } } @@ -1112,7 +1100,8 @@ void DemoIm_Init(Actor* thisx, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); func_80984D00(thisx, globalCtx); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600F788, NULL, this->jointTable, this->morphTable, 17); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_im_Skel_00F788, NULL, this->jointTable, this->morphTable, + 17); thisx->flags &= ~1; switch (this->actor.params) { @@ -1161,7 +1150,7 @@ s32 DemoIm_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList } if ((*unk_2D0 != 0) && (limbIndex == 15)) { - *dList = D_0600EDE8; + *dList = object_im_DL_00EDE8; } return false; diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index cbb916d55b..cb3f665d1a 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -7,6 +7,9 @@ #include "z_door_killer.h" #include "objects/gameplay_keep/gameplay_keep.h" #include "objects/object_hidan_objects/object_hidan_objects.h" +#include "objects/object_mizu_objects/object_mizu_objects.h" +#include "objects/object_haka_door/object_haka_door.h" +#include "objects/object_door_killer/object_door_killer.h" #define FLAGS 0x00000010 @@ -28,8 +31,6 @@ void DoorKiller_SetProperties(DoorKiller* this, GlobalContext* globalCtx); void DoorKiller_DrawDoor(Actor* thisx, GlobalContext* globalCtx); void DoorKiller_DrawRubble(Actor* thisx, GlobalContext* globalCtx); -extern FlexSkeletonHeader D_06001BC8; - const ActorInit Door_Killer_InitVars = { ACTOR_DOOR_KILLER, ACTORCAT_BG, @@ -91,8 +92,8 @@ static ColliderJntSphInit sJntSphInit = { static DoorKillerTextureEntry sDoorTextures[4] = { { OBJECT_HIDAN_OBJECTS, gFireTempleDoorKillerTex }, - { OBJECT_MIZU_OBJECTS, 0x060035C0 }, - { OBJECT_HAKA_DOOR, 0x06000000 }, + { OBJECT_MIZU_OBJECTS, object_mizu_objects_Tex_0035C0 }, + { OBJECT_HAKA_DOOR, object_haka_door_Tex_000000 }, { OBJECT_GAMEPLAY_KEEP, gWoodenDoorTex }, }; @@ -125,7 +126,8 @@ void DoorKiller_Init(Actor* thisx, GlobalContext* globalCtx2) { case DOOR_KILLER_DOOR: // `jointTable` is used for both the `jointTable` and `morphTable` args here. Because this actor doesn't // play any animations it does not cause problems, but it would need to be changed otherwise. - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06001BC8, NULL, this->jointTable, this->jointTable, 9); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_door_killer_Skel_001BC8, NULL, this->jointTable, + this->jointTable, 9); this->actionFunc = DoorKiller_SetProperties; DoorKiller_SetProperties(this, globalCtx); @@ -512,7 +514,8 @@ void DoorKiller_DrawDoor(Actor* thisx, GlobalContext* globalCtx) { } void DoorKiller_DrawRubble(Actor* thisx, GlobalContext* globalCtx) { - static Gfx* dLists[] = { 0x06001250, 0x06001550, 0x060017B8, 0x06001A58 }; + static Gfx* dLists[] = { object_door_killer_DL_001250, object_door_killer_DL_001550, object_door_killer_DL_0017B8, + object_door_killer_DL_001A58 }; s32 rubblePieceIndex = (thisx->params & 0xFF) - 1; DoorKiller* this = THIS; diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index ae6c2b6e20..92e0ca7fac 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -5,6 +5,7 @@ */ #include "z_door_toki.h" +#include "objects/object_toki_objects/object_toki_objects.h" #define FLAGS 0x00000000 @@ -26,8 +27,6 @@ const ActorInit Door_Toki_InitVars = { NULL, }; -extern CollisionHeader D_06007888; - static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; @@ -39,7 +38,7 @@ void DoorToki_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06007888, &colHeader); + CollisionHeader_GetVirtual(&gDoorTokiCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); } diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index df841a5662..f5b3554e3c 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -1,4 +1,5 @@ #include "z_efc_erupc.h" +#include "objects/object_efc_erupc/object_efc_erupc.h" #define FLAGS 0x00000030 @@ -15,11 +16,6 @@ void EfcErupc_UpdateParticles(EfcErupc* this, GlobalContext* globalCtx); void EfcErupc_AddParticle(EfcErupcParticles* particles, Vec3f* pos, Vec3f* vel, Vec3f* accel, f32 scaleFactor); void EfcErupc_InitParticles(EfcErupcParticles* particles); -extern Gfx D_06001720[]; -extern Gfx D_06002570[]; -extern Gfx D_06002760[]; -extern Gfx D_060027D8[]; - const ActorInit Efc_Erupc_InitVars = { ACTOR_EFC_ERUPC, ACTORCAT_ITEMACTION, @@ -143,7 +139,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) { if (globalCtx->csCtx.state != 0) { if ((globalCtx->csCtx.npcActions[1] != 0) && (globalCtx->csCtx.npcActions[1]->action == 2)) { - gSPDisplayList(POLY_XLU_DISP++, D_06002570); + gSPDisplayList(POLY_XLU_DISP++, object_efc_erupc_DL_002570); } } Matrix_Pop(); @@ -157,7 +153,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) { if ((csAction == 2) || (csAction == 3)) { gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 200, 255); gDPSetEnvColor(POLY_XLU_DISP++, 100, 0, 0, 255); - gSPDisplayList(POLY_XLU_DISP++, D_06001720); + gSPDisplayList(POLY_XLU_DISP++, object_efc_erupc_DL_001720); } } } @@ -174,7 +170,7 @@ void EfcErupc_DrawParticles(EfcErupcParticles* particles, GlobalContext* globalC for (i = 0; i < EFC_ERUPC_NUM_PARTICLES; i++, particles++) { if (particles->isActive) { func_80093D84(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_XLU_DISP++, D_06002760); + gSPDisplayList(POLY_XLU_DISP++, object_efc_erupc_DL_002760); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, particles->color.r, particles->color.g, particles->color.b, particles->alpha); gDPSetEnvColor(POLY_XLU_DISP++, 150, 0, 0, 0); @@ -184,7 +180,7 @@ void EfcErupc_DrawParticles(EfcErupcParticles* particles, GlobalContext* globalC Matrix_Scale(particles->scale, particles->scale, 1.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_efc_erupc.c", 393), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_060027D8); + gSPDisplayList(POLY_XLU_DISP++, object_efc_erupc_DL_0027D8); } } CLOSE_DISPS(gfxCtx, "../z_efc_erupc.c", 399); diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index af3574ecb8..a5954c1a4e 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -5,6 +5,7 @@ */ #include "z_en_ba.h" +#include "objects/object_bxa/object_bxa.h" #define FLAGS 0x00000015 @@ -24,9 +25,6 @@ void EnBa_RecoilFromDamage(EnBa* this, GlobalContext* globalCtx); void EnBa_Die(EnBa* this, GlobalContext* globalCtx); void EnBa_SetupSwingAtPlayer(EnBa* this); -extern Gfx D_06000890[]; -extern Gfx D_06001D80[]; - const ActorInit En_Ba_InitVars = { ACTOR_EN_BA, ACTORCAT_ENEMY, @@ -507,7 +505,7 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Pop(); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ba.c", 973), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000890); + gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_000890); } else { gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (globalCtx->gameplayFrames * 2) % 128, @@ -517,7 +515,7 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 125, 100, 255); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ba.c", 991), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06001D80); + gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_001D80); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ba.c", 995); } diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 6abc0a0a5c..0f349ffb6a 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -6,6 +6,7 @@ #include "z_en_bb.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_Bb/object_Bb.h" #define FLAGS 0x01000015 @@ -91,10 +92,6 @@ void EnBb_Green(EnBb* this, GlobalContext* globalCtx); void EnBb_Stunned(EnBb* this, GlobalContext* globalCtx); -extern AnimationHeader D_06000184; -extern AnimationHeader D_06000444; -extern SkeletonHeader D_06001A30; - static DamageTable sDamageTableBlueGreen = { /* Deku nut */ DMG_ENTRY(0, 0xF), /* Deku stick */ DMG_ENTRY(2, 0x0), @@ -316,7 +313,8 @@ void EnBb_Init(Actor* thisx, GlobalContext* globalCtx) { EnBb* this = THIS; Actor_ProcessInitChain(thisx, sInitChain); - SkelAnime_Init(globalCtx, &this->skelAnime, &D_06001A30, &D_06000444, this->jointTable, this->morphTable, 16); + SkelAnime_Init(globalCtx, &this->skelAnime, &object_Bb_Skel_001A30, &object_Bb_Anim_000444, this->jointTable, + this->morphTable, 16); this->unk_254 = 0; thisx->colChkInfo.health = 4; Collider_InitJntSph(globalCtx, &this->collider); @@ -533,7 +531,7 @@ void EnBb_Damage(EnBb* this, GlobalContext* globalCtx) { } void EnBb_SetupBlue(EnBb* this) { - Animation_PlayLoop(&this->skelAnime, &D_06000444); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444); this->actor.speedXZ = (Rand_ZeroOne() * 0.5f) + 0.5f; this->timer = (Rand_ZeroOne() * 20.0f) + 40.0f; this->unk_264 = (Rand_ZeroOne() * 30.0f) + 180.0f; @@ -578,14 +576,14 @@ void EnBb_Blue(EnBb* this, GlobalContext* globalCtx) { if (this->charge && (this->targetActor == NULL)) { this->vMoveAngleY = this->actor.world.rot.y; if (this->actor.xzDistToPlayer < 200.0f) { - Animation_PlayLoop(&this->skelAnime, &D_06000184); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000184); this->vMoveAngleY = this->actor.yawTowardsPlayer; } this->maxSpeed = (Rand_ZeroOne() * 1.5f) + 6.0f; this->timer = (Rand_ZeroOne() * 5.0f) + 20.0f; this->actionState = BBBLUE_NORMAL; } else { - Animation_PlayLoop(&this->skelAnime, &D_06000444); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444); this->maxSpeed = (Rand_ZeroOne() * 1.5f) + 1.0f; this->timer = (Rand_ZeroOne() * 20.0f) + 40.0f; this->vMoveAngleY = Math_SinF(this->bobPhase) * 65535.0f; @@ -593,7 +591,7 @@ void EnBb_Blue(EnBb* this, GlobalContext* globalCtx) { } if ((this->actor.xzDistToPlayer < 150.0f) && (this->actionState != BBBLUE_NORMAL)) { if (!this->charge) { - Animation_PlayLoop(&this->skelAnime, &D_06000184); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000184); this->maxSpeed = (Rand_ZeroOne() * 1.5f) + 6.0f; this->timer = (Rand_ZeroOne() * 5.0f) + 20.0f; this->vMoveAngleY = this->actor.yawTowardsPlayer; @@ -671,7 +669,7 @@ void EnBb_Blue(EnBb* this, GlobalContext* globalCtx) { } void EnBb_SetupDown(EnBb* this) { - Animation_PlayLoop(&this->skelAnime, &D_06000444); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444); this->action = BB_DOWN; this->timer = 200; this->actor.colorFilterTimer = 0; @@ -749,7 +747,7 @@ void EnBb_Down(EnBb* this, GlobalContext* globalCtx) { } void EnBb_SetupRed(GlobalContext* globalCtx, EnBb* this) { - Animation_PlayLoop(&this->skelAnime, &D_06000184); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000184); if (this->action == BB_DOWN) { this->actor.speedXZ = 5.0f; this->actor.gravity = -1.0f; @@ -876,7 +874,7 @@ void EnBb_SetWaypoint(EnBb* this, GlobalContext* globalCtx) { } void EnBb_SetupWhite(GlobalContext* globalCtx, EnBb* this) { - Animation_PlayLoop(&this->skelAnime, &D_06000444); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444); this->actor.speedXZ = 0.0f; this->actor.world.pos.y += 60.0f; this->flameScaleX = 100.0f; @@ -907,11 +905,11 @@ void EnBb_White(EnBb* this, GlobalContext* globalCtx) { if (this->timer == 0) { EnBb_SetWaypoint(this, globalCtx); EnBb_FaceWaypoint(this); - Animation_PlayLoop(&this->skelAnime, &D_06000184); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000184); this->timer = Rand_ZeroOne() * 30.0f + 40.0f; } else { if (this->moveMode != BBMOVE_NORMAL) { - Animation_PlayLoop(&this->skelAnime, &D_06000444); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444); } this->actor.world.rot.y += 0x1F40; } @@ -944,7 +942,7 @@ void EnBb_White(EnBb* this, GlobalContext* globalCtx) { void EnBb_InitGreen(EnBb* this, GlobalContext* globalCtx) { Vec3f bobOffset = { 0.0f, 0.0f, 0.0f }; - Animation_PlayLoop(&this->skelAnime, &D_06000444); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444); this->moveMode = BBMOVE_NOCLIP; this->actionState = BBGREEN_FLAME_ON; this->bobPhase = Rand_ZeroOne(); @@ -967,7 +965,7 @@ void EnBb_InitGreen(EnBb* this, GlobalContext* globalCtx) { } void EnBb_SetupGreen(EnBb* this) { - Animation_PlayLoop(&this->skelAnime, &D_06000444); + Animation_PlayLoop(&this->skelAnime, &object_Bb_Anim_000444); this->moveMode = BBMOVE_NOCLIP; this->actionState = BBGREEN_FLAME_ON; this->targetActor = NULL; diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index b6d2587779..460831f1f8 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -5,6 +5,7 @@ */ #include "z_en_bdfire.h" +#include "objects/object_kingdodongo/object_kingdodongo.h" #define FLAGS 0x00000030 @@ -19,8 +20,6 @@ void EnBdfire_DrawFire(EnBdfire* this, GlobalContext* globalCtx); void func_809BC2A4(EnBdfire* this, GlobalContext* globalCtx); void func_809BC598(EnBdfire* this, GlobalContext* globalCtx); -extern Gfx D_0601D950[]; - const ActorInit En_Bdfire_InitVars = { 0, ACTORCAT_ENEMY, @@ -219,7 +218,7 @@ void EnBdfire_DrawFire(EnBdfire* this, GlobalContext* globalCtx) { Matrix_Translate(0.0f, 11.0f, 0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bdfire.c", 647), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_0601D950); + gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_01D950); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bdfire.c", 651); } diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index 69b819c982..50638d56d8 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -5,6 +5,7 @@ */ #include "z_en_brob.h" +#include "objects/object_brob/object_brob.h" #define FLAGS 0x00000005 @@ -23,13 +24,6 @@ void func_809CB2B8(EnBrob* this, GlobalContext* globalCtx); void func_809CB354(EnBrob* this, GlobalContext* globalCtx); void func_809CB458(EnBrob* this, GlobalContext* globalCtx); -extern AnimationHeader D_06000290; -extern FlexSkeletonHeader D_060015D8; -extern AnimationHeader D_06001678; -extern AnimationHeader D_06001750; -extern AnimationHeader D_06001958; -extern CollisionHeader D_06001A70; - const ActorInit En_Brob_InitVars = { ACTOR_EN_BROB, ACTORCAT_ENEMY, @@ -69,9 +63,10 @@ void EnBrob_Init(Actor* thisx, GlobalContext* globalCtx) { EnBrob* this = THIS; CollisionHeader* colHeader = NULL; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060015D8, &D_06001750, this->jointTable, this->morphTable, 10); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_brob_Skel_0015D8, &object_brob_Anim_001750, + this->jointTable, this->morphTable, 10); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&D_06001A70, &colHeader); + CollisionHeader_GetVirtual(&object_brob_Col_001A70, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); Collider_InitCylinder(globalCtx, &this->colliders[0]); Collider_SetCylinder(globalCtx, &this->colliders[0], &this->dyna.actor, &sCylinderInit); @@ -118,21 +113,21 @@ void func_809CADDC(EnBrob* this, GlobalContext* globalCtx) { } void func_809CAE44(EnBrob* this, GlobalContext* globalCtx) { - Animation_PlayOnce(&this->skelAnime, &D_06001750); + Animation_PlayOnce(&this->skelAnime, &object_brob_Anim_001750); func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); this->unk_1AE = 1000; this->actionFunc = func_809CB114; } void func_809CAEA0(EnBrob* this) { - Animation_MorphToLoop(&this->skelAnime, &D_06001958, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &object_brob_Anim_001958, -5.0f); this->unk_1AE = 8000; this->timer = 1200; this->actionFunc = func_809CB218; } void func_809CAEF4(EnBrob* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06000290, -5.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_brob_Anim_000290, -5.0f); this->unk_1AE -= 125.0f; Actor_SetColorFilter(&this->dyna.actor, 0, 0xFF, 0, 0x50); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EN_GOMA_JR_FREEZE); @@ -140,14 +135,14 @@ void func_809CAEF4(EnBrob* this) { } void func_809CAF88(EnBrob* this) { - Animation_Change(&this->skelAnime, &D_06001750, -1.0f, Animation_GetLastFrame(&D_06001750), 0.0f, ANIMMODE_ONCE, - -5.0f); + Animation_Change(&this->skelAnime, &object_brob_Anim_001750, -1.0f, + Animation_GetLastFrame(&object_brob_Anim_001750), 0.0f, ANIMMODE_ONCE, -5.0f); this->unk_1AE = 8250; this->actionFunc = func_809CB354; } void func_809CB008(EnBrob* this) { - Animation_MorphToLoop(&this->skelAnime, &D_06001678, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &object_brob_Anim_001678, -5.0f); this->timer = 10; this->actionFunc = func_809CB458; } diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index de3bc72efa..ac9f2bfb2f 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -6,6 +6,7 @@ #include "z_en_bw.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_bw/object_bw.h" #define FLAGS 0x00000015 @@ -34,11 +35,6 @@ void func_809D0268(EnBw* this, GlobalContext* globalCtx); void func_809D03CC(EnBw* this); void func_809D0424(EnBw* this, GlobalContext* globalCtx); -extern AnimationHeader D_06000228; -extern SkeletonHeader D_060020F0; -extern AnimationHeader D_060021A0; -extern AnimationHeader D_06002250; - const ActorInit En_Bw_InitVars = { ACTOR_EN_BW, ACTORCAT_ENEMY, @@ -138,7 +134,8 @@ void EnBw_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.012999999f); this->actor.naviEnemyId = 0x23; this->actor.gravity = -2.0f; - SkelAnime_Init(globalCtx, &this->skelAnime, &D_060020F0, &D_06000228, this->jointTable, this->morphTable, 12); + SkelAnime_Init(globalCtx, &this->skelAnime, &object_bw_Skel_0020F0, &object_bw_Anim_000228, this->jointTable, + this->morphTable, 12); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f); this->actor.colChkInfo.damageTable = &sDamageTable; this->actor.colChkInfo.health = 6; @@ -179,7 +176,7 @@ void func_809CE884(EnBw* this, GlobalContext* globalCtx) { } void func_809CE9A8(EnBw* this) { - Animation_MorphToLoop(&this->skelAnime, &D_06000228, -2.0f); + Animation_MorphToLoop(&this->skelAnime, &object_bw_Anim_000228, -2.0f); this->unk_220 = 2; this->unk_222 = Rand_ZeroOne() * 200.0f + 200.0f; this->unk_232 = 0; @@ -394,7 +391,7 @@ void func_809CEA24(EnBw* this, GlobalContext* globalCtx) { } void func_809CF72C(EnBw* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_060021A0, -2.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_bw_Anim_0021A0, -2.0f); this->unk_220 = 3; this->unk_221 = 0; this->unk_250 = 0.6f; @@ -426,7 +423,7 @@ void func_809CF7AC(EnBw* this, GlobalContext* globalCtx) { } void func_809CF8F0(EnBw* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06002250, -1.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_bw_Anim_002250, -1.0f); this->actor.speedXZ = 7.0f; this->actor.world.rot.y = this->actor.shape.rot.y = this->actor.yawTowardsPlayer; this->unk_220 = 4; @@ -471,7 +468,7 @@ void func_809CF984(EnBw* this, GlobalContext* globalCtx) { } void func_809CFBA8(EnBw* this) { - Animation_MorphToLoop(&this->skelAnime, &D_06002250, -1.0f); + Animation_MorphToLoop(&this->skelAnime, &object_bw_Anim_002250, -1.0f); this->unk_220 = 5; this->unk_222 = 1000; this->unk_260 = 0.0f; @@ -529,7 +526,7 @@ void func_809CFC4C(EnBw* this, GlobalContext* globalCtx) { } void func_809CFF10(EnBw* this) { - Animation_MorphToLoop(&this->skelAnime, &D_06002250, -1.0f); + Animation_MorphToLoop(&this->skelAnime, &object_bw_Anim_002250, -1.0f); this->unk_220 = 6; this->unk_222 = 1000; this->unk_221 = 3; diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index 5eb2871505..c113eed0eb 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -5,6 +5,7 @@ */ #include "z_en_bx.h" +#include "objects/object_bxa/object_bxa.h" #define FLAGS 0x00000010 @@ -15,8 +16,6 @@ void EnBx_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnBx_Update(Actor* thisx, GlobalContext* globalCtx); void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx); -extern Gfx D_060022F0[]; - const ActorInit En_Bx_InitVars = { ACTOR_EN_BX, ACTORCAT_ENEMY, @@ -238,7 +237,7 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_ToMtx(mtx, "../z_en_bx.c", 507); } - gSPDisplayList(POLY_OPA_DISP++, D_060022F0); + gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_0022F0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bx.c", 511); } diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 72329751bc..c7898d7df0 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -1,5 +1,6 @@ #include "z_en_daiku.h" #include "overlays/actors/ovl_En_GeldB/z_en_geldb.h" +#include "objects/object_daiku/object_daiku.h" #define FLAGS 0x00000019 @@ -57,8 +58,6 @@ void EnDaiku_EscapeRun(EnDaiku* this, GlobalContext* globalCtx); s32 EnDaiku_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx); void EnDaiku_PostLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3s* rot, void* thisx); -extern FlexSkeletonHeader D_06007958; - const ActorInit En_Daiku_InitVars = { ACTOR_EN_DAIKU, ACTORCAT_NPC, @@ -129,8 +128,9 @@ static DamageTable sDamageTable = { }; static EnDaikuAnimation sAnimations[] = { - { 0x06001AB0, 1.0f, 0, 0 }, { 0x06007DE0, 1.0f, 0, 0 }, { 0x0600885C, 1.0f, 0, 0 }, - { 0x06000C44, 1.0f, 0, 0 }, { 0x06008164, 1.0f, 0, 0 }, + { &object_daiku_Anim_001AB0, 1.0f, 0, 0 }, { &object_daiku_Anim_007DE0, 1.0f, 0, 0 }, + { &object_daiku_Anim_00885C, 1.0f, 0, 0 }, { &object_daiku_Anim_000C44, 1.0f, 0, 0 }, + { &object_daiku_Anim_008164, 1.0f, 0, 0 }, }; static EnDaikuEscapeSubCamParam sEscapeSubCamParams[] = { @@ -181,7 +181,8 @@ void EnDaiku_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.shape.rot.z = 0; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007958, NULL, this->jointTable, this->morphTable, 17); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_007958, NULL, this->jointTable, this->morphTable, + 17); if (!noKill) { Actor_Kill(&this->actor); @@ -633,7 +634,8 @@ s32 EnDaiku_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Ve } void EnDaiku_PostLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3s* rot, void* thisx) { - static Gfx* hairDLists[] = { 0x06005BD0, 0x06005AC0, 0x06005990, 0x06005880 }; + static Gfx* hairDLists[] = { object_daiku_DL_005BD0, object_daiku_DL_005AC0, object_daiku_DL_005990, + object_daiku_DL_005880 }; static Vec3f targetPosHeadLocal = { 700, 1100, 0 }; EnDaiku* this = THIS; diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 2d4f27627f..e9fdf252f2 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -5,6 +5,7 @@ */ #include "z_en_daiku_kakariko.h" +#include "objects/object_daiku/object_daiku.h" #define FLAGS 0x00000019 @@ -25,8 +26,6 @@ void EnDaikuKakariko_Draw(Actor* thisx, GlobalContext* globalCtx); void EnDaikuKakariko_Wait(EnDaikuKakariko* this, GlobalContext* globalCtx); void EnDaikuKakariko_Run(EnDaikuKakariko* this, GlobalContext* globalCtx); -extern FlexSkeletonHeader D_06007958; - const ActorInit En_Daiku_Kakariko_InitVars = { ACTOR_EN_DAIKU_KAKARIKO, ACTORCAT_NPC, @@ -97,8 +96,9 @@ static DamageTable sDamageTable = { }; static struct_D_80AA1678 sAnimations[] = { - { 0x06001AB0, 1.0f, 2, -7.0f }, { 0x06007DE0, 1.0f, 0, -7.0f }, { 0x0600885C, 1.0f, 0, -7.0f }, - { 0x06000C44, 1.0f, 0, -7.0f }, { 0x06000600, 1.0f, 0, -7.0f }, { 0x06008164, 1.0f, 0, -7.0f }, + { &object_daiku_Anim_001AB0, 1.0f, 2, -7.0f }, { &object_daiku_Anim_007DE0, 1.0f, 0, -7.0f }, + { &object_daiku_Anim_00885C, 1.0f, 0, -7.0f }, { &object_daiku_Anim_000C44, 1.0f, 0, -7.0f }, + { &object_daiku_Anim_000600, 1.0f, 0, -7.0f }, { &object_daiku_Anim_008164, 1.0f, 0, -7.0f }, }; void EnDaikuKakariko_SetAnimFromIndex(EnDaikuKakariko* this, s32 animIndex, s32* currentAnimIndex) { @@ -151,7 +151,8 @@ void EnDaikuKakariko_Init(Actor* thisx, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 40.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007958, NULL, this->jointTable, this->morphTable, 17); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_daiku_Skel_007958, NULL, this->jointTable, this->morphTable, + 17); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); @@ -516,7 +517,8 @@ s32 EnDaikuKakariko_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gf } void EnDaikuKakariko_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - static Gfx* carpenterHeadDLists[] = { 0x06005BD0, 0x06005AC0, 0x06005990, 0x06005880 }; + static Gfx* carpenterHeadDLists[] = { object_daiku_DL_005BD0, object_daiku_DL_005AC0, object_daiku_DL_005990, + object_daiku_DL_005880 }; static Vec3f unkVec = { 700.0f, 1100.0f, 0.0f }; EnDaikuKakariko* this = THIS; diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 549792c0b1..0b91ade158 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -1,4 +1,5 @@ #include "z_en_dh.h" +#include "objects/object_dh/object_dh.h" #define FLAGS 0x00000415 @@ -32,17 +33,6 @@ void EnDh_Burrow(EnDh* this, GlobalContext* globalCtx); void EnDh_Damage(EnDh* this, GlobalContext* globalCtx); void EnDh_Death(EnDh* this, GlobalContext* globalCtx); -extern FlexSkeletonHeader D_06007E88; -extern AnimationHeader D_06005880; -extern AnimationHeader D_06003A8C; -extern AnimationHeader D_06004658; -extern AnimationHeader D_06002148; -extern AnimationHeader D_06003D6C; -extern AnimationHeader D_060032BC; -extern AnimationHeader D_06001A3C; -extern AnimationHeader D_0600375C; -extern Gfx D_06007FC0[]; - const ActorInit En_Dh_InitVars = { ACTOR_EN_DH, ACTORCAT_ENEMY, @@ -153,7 +143,8 @@ void EnDh_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); this->actor.colChkInfo.damageTable = &D_809EC620; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007E88, &D_06005880, this->jointTable, this->limbRotTable, 16); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dh_Skel_007E88, &object_dh_Anim_005880, this->jointTable, + this->limbRotTable, 16); ActorShape_Init(&this->actor.shape, 0.0f, &ActorShadow_DrawCircle, 64.0f); this->actor.params = ENDH_WAIT_UNDERGROUND; this->actor.colChkInfo.mass = MASS_HEAVY; @@ -196,7 +187,7 @@ void EnDh_SpawnDebris(GlobalContext* globalCtx, EnDh* this, Vec3f* spawnPos, f32 } void EnDh_SetupWait(EnDh* this) { - Animation_PlayLoop(&this->skelAnime, &D_06003A8C); + Animation_PlayLoop(&this->skelAnime, &object_dh_Anim_003A8C); this->curAction = DH_WAIT; this->actor.world.pos.x = Rand_CenteredFloat(600.0f) + this->actor.home.pos.x; this->actor.world.pos.z = Rand_CenteredFloat(600.0f) + this->actor.home.pos.z; @@ -250,8 +241,8 @@ void EnDh_Wait(EnDh* this, GlobalContext* globalCtx) { } void EnDh_SetupWalk(EnDh* this) { - Animation_Change(&this->skelAnime, &D_06003A8C, 1.0f, 0.0f, Animation_GetLastFrame(&D_06003A8C) - 3.0f, - ANIMMODE_LOOP, -6.0f); + Animation_Change(&this->skelAnime, &object_dh_Anim_003A8C, 1.0f, 0.0f, + Animation_GetLastFrame(&object_dh_Anim_003A8C) - 3.0f, ANIMMODE_LOOP, -6.0f); this->curAction = DH_WALK; this->timer = 300; this->actor.speedXZ = 1.0f; @@ -279,7 +270,7 @@ void EnDh_Walk(EnDh* this, GlobalContext* globalCtx) { } void EnDh_SetupRetreat(EnDh* this, GlobalContext* globalCtx) { - Animation_MorphToLoop(&this->skelAnime, &D_06005880, -4.0f); + Animation_MorphToLoop(&this->skelAnime, &object_dh_Anim_005880, -4.0f); this->curAction = DH_RETREAT; this->timer = 70; this->actor.speedXZ = 1.0f; @@ -299,7 +290,7 @@ void EnDh_Retreat(EnDh* this, GlobalContext* globalCtx) { } void EnDh_SetupAttack(EnDh* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06004658, -6.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_dh_Anim_004658, -6.0f); this->timer = this->actionState = 0; this->curAction = DH_ATTACK; this->actor.speedXZ = 0.0f; @@ -312,14 +303,15 @@ void EnDh_Attack(EnDh* this, GlobalContext* globalCtx) { if (SkelAnime_Update(&this->skelAnime)) { this->actionState++; } else if ((this->actor.xzDistToPlayer > 100.0f) || !Actor_IsFacingPlayer(&this->actor, 60 * 0x10000 / 360)) { - Animation_Change(&this->skelAnime, &D_06004658, -1.0f, this->skelAnime.curFrame, 0.0f, ANIMMODE_ONCE, -4.0f); + Animation_Change(&this->skelAnime, &object_dh_Anim_004658, -1.0f, this->skelAnime.curFrame, 0.0f, ANIMMODE_ONCE, + -4.0f); this->actionState = 4; this->collider2.base.atFlags = this->collider2.elements[0].info.toucherFlags = AT_NONE; // also TOUCH_NONE this->collider2.elements[0].info.toucher.dmgFlags = this->collider2.elements[0].info.toucher.damage = 0; } switch (this->actionState) { case 1: - Animation_PlayOnce(&this->skelAnime, &D_06001A3C); + Animation_PlayOnce(&this->skelAnime, &object_dh_Anim_001A3C); this->actionState++; Audio_PlayActorSound2(&this->actor, NA_SE_EN_DEADHAND_BITE); case 0: @@ -345,12 +337,12 @@ void EnDh_Attack(EnDh* this, GlobalContext* globalCtx) { break; case 3: if ((this->actor.xzDistToPlayer <= 100.0f) && (Actor_IsFacingPlayer(&this->actor, 60 * 0x10000 / 360))) { - Animation_Change(&this->skelAnime, &D_06004658, 1.0f, 20.0f, Animation_GetLastFrame(&D_06004658), - ANIMMODE_ONCE, -6.0f); + Animation_Change(&this->skelAnime, &object_dh_Anim_004658, 1.0f, 20.0f, + Animation_GetLastFrame(&object_dh_Anim_004658), ANIMMODE_ONCE, -6.0f); this->actionState = 0; } else { - Animation_Change(&this->skelAnime, &D_06004658, -1.0f, Animation_GetLastFrame(&D_06004658), 0.0f, - ANIMMODE_ONCE, -4.0f); + Animation_Change(&this->skelAnime, &object_dh_Anim_004658, -1.0f, + Animation_GetLastFrame(&object_dh_Anim_004658), 0.0f, ANIMMODE_ONCE, -4.0f); this->actionState++; this->collider2.base.atFlags = this->collider2.elements[0].info.toucherFlags = AT_NONE; // also TOUCH_NONE @@ -367,7 +359,7 @@ void EnDh_Attack(EnDh* this, GlobalContext* globalCtx) { } void EnDh_SetupBurrow(EnDh* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06002148, -6.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_dh_Anim_002148, -6.0f); this->curAction = DH_BURROW; this->dirtWaveSpread = this->actor.speedXZ = 0.0f; this->actor.world.rot.y = this->actor.shape.rot.y; @@ -409,7 +401,7 @@ void EnDh_Burrow(EnDh* this, GlobalContext* globalCtx) { } void EnDh_SetupDamage(EnDh* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06003D6C, -6.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_dh_Anim_003D6C, -6.0f); if (this->actor.bgCheckFlags & 1) { this->actor.speedXZ = -1.0f; } @@ -428,10 +420,10 @@ void EnDh_Damage(EnDh* this, GlobalContext* globalCtx) { if (this->retreat) { EnDh_SetupRetreat(this, globalCtx); } else if ((this->actor.xzDistToPlayer <= 105.0f) && Actor_IsFacingPlayer(&this->actor, 60 * 0x10000 / 360)) { - f32 frames = Animation_GetLastFrame(&D_06004658); + f32 frames = Animation_GetLastFrame(&object_dh_Anim_004658); EnDh_SetupAttack(this); - Animation_Change(&this->skelAnime, &D_06004658, 1.0f, 20.0f, frames, ANIMMODE_ONCE, -6.0f); + Animation_Change(&this->skelAnime, &object_dh_Anim_004658, 1.0f, 20.0f, frames, ANIMMODE_ONCE, -6.0f); } else { EnDh_SetupWalk(this); } @@ -440,7 +432,7 @@ void EnDh_Damage(EnDh* this, GlobalContext* globalCtx) { } void EnDh_SetupDeath(EnDh* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_060032BC, -1.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_dh_Anim_0032BC, -1.0f); this->curAction = DH_DEATH; this->timer = 300; this->actor.flags &= ~1; @@ -454,7 +446,7 @@ void EnDh_SetupDeath(EnDh* this) { void EnDh_Death(EnDh* this, GlobalContext* globalCtx) { if (SkelAnime_Update(&this->skelAnime) || (this->timer != 300)) { if (this->timer == 300) { - Animation_PlayLoop(&this->skelAnime, &D_0600375C); + Animation_PlayLoop(&this->skelAnime, &object_dh_Anim_00375C); } this->timer--; if (this->timer < 150) { @@ -585,7 +577,7 @@ void EnDh_Draw(Actor* thisx, GlobalContext* globalCtx) { MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dh.c", 1160), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06007FC0); + gSPDisplayList(POLY_XLU_DISP++, object_dh_DL_007FC0); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dh.c", 1166); } diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 73f4f6b213..044e2ff63e 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -6,6 +6,7 @@ #include "z_en_dha.h" #include "overlays/actors/ovl_En_Dh/z_en_dh.h" +#include "objects/object_dh/object_dh.h" #define FLAGS 0x00000015 @@ -148,9 +149,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; -extern FlexSkeletonHeader D_06000BD8; -extern AnimationHeader D_060015B0; - void EnDha_SetupAction(EnDha* this, EnDhaActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -160,7 +158,8 @@ void EnDha_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); this->actor.colChkInfo.damageTable = &sDamageTable; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06000BD8, &D_060015B0, this->jointTable, this->morphTable, 4); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dh_Skel_000BD8, &object_dh_Anim_0015B0, this->jointTable, + this->morphTable, 4); ActorShape_Init(&this->actor.shape, 0, ActorShadow_DrawFeet, 90.0f); this->actor.focus.pos = this->actor.world.pos; this->actor.focus.pos.y += 50.0f; @@ -182,7 +181,7 @@ void EnDha_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void EnDha_SetupWait(EnDha* this) { - Animation_PlayLoop(&this->skelAnime, &D_060015B0); + Animation_PlayLoop(&this->skelAnime, &object_dh_Anim_0015B0); this->unk_1C0 = 0; this->actionTimer = ((Rand_ZeroOne() * 10.0f) + 5.0f); this->actor.speedXZ = 0.0f; diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index e8a5b4371c..44babe2139 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -6,6 +6,7 @@ #include "z_en_dodojr.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" +#include "objects/object_dodojr/object_dodojr.h" #define FLAGS 0x00000005 @@ -32,13 +33,6 @@ void func_809F7B3C(EnDodojr* this, GlobalContext* globalCtx); void func_809F7C48(EnDodojr* this, GlobalContext* globalCtx); void func_809F768C(EnDodojr* this, GlobalContext* globalCtx); -extern AnimationHeader D_060004A0; -extern AnimationHeader D_060005F0; -extern AnimationHeader D_06000724; -extern AnimationHeader D_06000860; -extern AnimationHeader D_060009D4; -extern SkeletonHeader D_060020E0; - const ActorInit En_Dodojr_InitVars = { ACTOR_EN_DODOJR, ACTORCAT_ENEMY, @@ -77,7 +71,8 @@ void EnDodojr_Init(Actor* thisx, GlobalContext* globalCtx) { EnDodojr* this = THIS; ActorShape_Init(&this->actor.shape, 0.0f, NULL, 18.0f); - SkelAnime_Init(globalCtx, &this->skelAnime, &D_060020E0, &D_060009D4, this->jointTable, this->morphTable, 15); + SkelAnime_Init(globalCtx, &this->skelAnime, &object_dodojr_Skel_0020E0, &object_dodojr_Anim_0009D4, + this->jointTable, this->morphTable, 15); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(4), &sColChkInit); @@ -168,18 +163,18 @@ s32 func_809F68B0(EnDodojr* this, GlobalContext* globalCtx) { } void func_809F6994(EnDodojr* this) { - f32 lastFrame = Animation_GetLastFrame(&D_06000860); + f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_000860); - Animation_Change(&this->skelAnime, &D_06000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, -10.0f); + Animation_Change(&this->skelAnime, &object_dodojr_Anim_000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, -10.0f); this->actor.velocity.y = 0.0f; this->actor.speedXZ = 2.6f; this->actor.gravity = -0.8f; } void func_809F6A20(EnDodojr* this) { - f32 lastFrame = Animation_GetLastFrame(&D_060004A0); + f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_0004A0); - Animation_Change(&this->skelAnime, &D_060004A0, 1.0f, 0.0f, lastFrame, ANIMMODE_ONCE, -10.0f); + Animation_Change(&this->skelAnime, &object_dodojr_Anim_0004A0, 1.0f, 0.0f, lastFrame, ANIMMODE_ONCE, -10.0f); this->actor.speedXZ = 0.0f; this->actor.velocity.x = 0.0f; this->actor.velocity.z = 0.0f; @@ -192,17 +187,17 @@ void func_809F6A20(EnDodojr* this) { } void func_809F6AC4(EnDodojr* this) { - f32 lastFrame = Animation_GetLastFrame(&D_060005F0); + f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_0005F0); - Animation_Change(&this->skelAnime, &D_060005F0, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, 0.0f); + Animation_Change(&this->skelAnime, &object_dodojr_Anim_0005F0, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, 0.0f); this->actor.velocity.y = 0.0f; this->actor.gravity = -0.8f; } void func_809F6B38(EnDodojr* this) { - f32 lastFrame = Animation_GetLastFrame(&D_06000724); + f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_000724); - Animation_Change(&this->skelAnime, &D_06000724, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, -10.0f); + Animation_Change(&this->skelAnime, &object_dodojr_Anim_000724, 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP, -10.0f); this->actor.gravity = -0.8f; this->unk_1FC = 3; this->actor.velocity.y = 10.0f; @@ -219,7 +214,7 @@ void func_809F6BBC(EnDodojr* this) { } void func_809F6C24(EnDodojr* this) { - Animation_Change(&this->skelAnime, &D_06000724, 1.0f, 8.0f, 12.0f, ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &object_dodojr_Anim_000724, 1.0f, 8.0f, 12.0f, ANIMMODE_ONCE, 0.0f); Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_EAT); this->actor.speedXZ = 0.0f; this->actor.velocity.x = 0.0f; @@ -395,7 +390,7 @@ void func_809F72A4(EnDodojr* this, GlobalContext* globalCtx) { } void func_809F73AC(EnDodojr* this, GlobalContext* globalCtx) { - f32 lastFrame = Animation_GetLastFrame(&D_06000860); + f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_000860); Player* player = PLAYER; f32 dist; @@ -403,7 +398,8 @@ void func_809F73AC(EnDodojr* this, GlobalContext* globalCtx) { dist = this->actor.world.pos.y - player->actor.world.pos.y; if (!(dist >= 40.0f)) { - Animation_Change(&this->skelAnime, &D_06000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, -10.0f); + Animation_Change(&this->skelAnime, &object_dodojr_Anim_000860, 1.8f, 0.0f, lastFrame, ANIMMODE_LOOP_INTERP, + -10.0f); Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_UP); this->actor.world.pos.y -= 60.0f; this->actor.flags |= 1; diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 8db7faad1e..9652f79dc3 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -5,6 +5,7 @@ */ #include "z_en_dog.h" +#include "objects/object_dog/object_dog.h" #define FLAGS 0x00000000 @@ -57,14 +58,14 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, 50 }; static struct_80034EC0_Entry sAnimations[] = { - { 0x06001368, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x06001368, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, - { 0x06000D78, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, - { 0x06000278, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, - { 0x06001150, 1.0f, 0.0f, 4.0f, ANIMMODE_ONCE, -6.0f }, - { 0x06001150, 1.0f, 5.0f, 25.0f, ANIMMODE_LOOP_PARTIAL, -6.0f }, - { 0x06000928, 1.0f, 0.0f, 6.0f, ANIMMODE_ONCE, -6.0f }, - { 0x06000C28, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, + { &object_dog_Anim_001368, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &object_dog_Anim_001368, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, + { &object_dog_Anim_000D78, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, + { &object_dog_Anim_000278, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, + { &object_dog_Anim_001150, 1.0f, 0.0f, 4.0f, ANIMMODE_ONCE, -6.0f }, + { &object_dog_Anim_001150, 1.0f, 5.0f, 25.0f, ANIMMODE_LOOP_PARTIAL, -6.0f }, + { &object_dog_Anim_000928, 1.0f, 0.0f, 6.0f, ANIMMODE_ONCE, -6.0f }, + { &object_dog_Anim_000C28, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -6.0f }, }; typedef enum { @@ -77,13 +78,9 @@ typedef enum { /* 0x06 */ DOG_BOW_2 } DogBehavior; -extern FlexSkeletonHeader D_06007290; -extern AnimationHeader D_06001368; -extern AnimationHeader D_06000D78; -extern AnimationHeader D_06000278; - void EnDog_PlayWalkSFX(EnDog* this) { - AnimationHeader* walk = &D_06001368; + AnimationHeader* walk = &object_dog_Anim_001368; + if (this->skelAnime.animation == walk) { if ((this->skelAnime.curFrame == 1.0f) || (this->skelAnime.curFrame == 7.0f)) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHIBI_WALK); @@ -92,7 +89,8 @@ void EnDog_PlayWalkSFX(EnDog* this) { } void EnDog_PlayRunSFX(EnDog* this) { - AnimationHeader* run = &D_06000D78; + AnimationHeader* run = &object_dog_Anim_000D78; + if (this->skelAnime.animation == run) { if ((this->skelAnime.curFrame == 2.0f) || (this->skelAnime.curFrame == 4.0f)) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHIBI_WALK); @@ -101,7 +99,8 @@ void EnDog_PlayRunSFX(EnDog* this) { } void EnDog_PlayBarkSFX(EnDog* this) { - AnimationHeader* bark = &D_06000278; + AnimationHeader* bark = &object_dog_Anim_000278; + if (this->skelAnime.animation == bark) { if ((this->skelAnime.curFrame == 13.0f) || (this->skelAnime.curFrame == 19.0f)) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_SMALL_DOG_BARK); @@ -238,7 +237,8 @@ void EnDog_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007290, NULL, this->jointTable, this->morphTable, 13); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_dog_Skel_007290, NULL, this->jointTable, this->morphTable, + 13); func_80034EC0(&this->skelAnime, sAnimations, 0); if ((this->actor.params & 0x8000) == 0) { diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 71e4518e17..c5f4fb83d2 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -1,6 +1,7 @@ #include "z_en_encount2.h" #include "overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h" #include "vt.h" +#include "objects/object_efc_star_field/object_efc_star_field.h" #define FLAGS 0x00000030 @@ -23,8 +24,6 @@ void EnEncount2_ParticleInit(EnEncount2* this, Vec3f* particlePos, f32 scale); void EnEncount2_ParticleDraw(Actor* thisx, GlobalContext* globalCtx); void EnEncount2_ParticleUpdate(EnEncount2* this, GlobalContext* globalCtx); -extern Gfx* D_06000DE0[]; - const ActorInit En_Encount2_InitVars = { ACTOR_EN_ENCOUNT2, ACTORCAT_ENEMY, @@ -365,7 +364,7 @@ void EnEncount2_ParticleDraw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_encount2.c", 669), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000DE0); + gSPDisplayList(POLY_OPA_DISP++, object_efc_star_field_DL_000DE0); } } } diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 8b69f84177..6824895a80 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -1,6 +1,7 @@ #include "z_en_fire_rock.h" #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" #include "vt.h" +#include "objects/object_efc_star_field/object_efc_star_field.h" #define FLAGS 0x00000030 @@ -16,8 +17,6 @@ void FireRock_WaitOnFloor(EnFireRock* this, GlobalContext* globalCtx); void EnFireRock_Fall(EnFireRock* this, GlobalContext* globalCtx); void EnFireRock_SpawnMoreBrokenPieces(EnFireRock* this, GlobalContext* globalCtx); -extern Gfx D_06000DE0[]; - const ActorInit En_Fire_Rock_InitVars = { ACTOR_EN_FIRE_ROCK, ACTORCAT_ENEMY, @@ -395,6 +394,6 @@ void EnFireRock_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fire_rock.c", 768), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000DE0); + gSPDisplayList(POLY_OPA_DISP++, object_efc_star_field_DL_000DE0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fire_rock.c", 773); } diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 1bbc64b79e..f2b8ad4036 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -1,6 +1,7 @@ #include "z_en_fr.h" #include "objects/gameplay_field_keep/gameplay_field_keep.h" #include "vt.h" +#include "objects/object_fr/object_fr.h" #define FLAGS 0x02000019 @@ -50,11 +51,6 @@ void EnFr_Deactivate(EnFr* this, GlobalContext* globalCtx); void EnFr_GiveReward(EnFr* this, GlobalContext* globalCtx); void EnFr_SetIdle(EnFr* this, GlobalContext* globalCtx); -extern FlexSkeletonHeader D_0600B498; // Frog -extern AnimationHeader D_06001534; // Frog -extern AnimationHeader D_060007BC; // Frog Jumping -extern AnimationHeader D_060011C0; // Frog Landing - /* Frogs params WIP docs @@ -278,8 +274,8 @@ void EnFr_Update(Actor* thisx, GlobalContext* globalCtx) { sEnFrPointers.frogs[frogIndex] = this; Actor_ProcessInitChain(&this->actor, sInitChain); // frog - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B498, &D_06001534, this->jointTable, this->morphTable, - 24); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_fr_Skel_00B498, &object_fr_Anim_001534, + this->jointTable, this->morphTable, 24); // butterfly SkelAnime_Init(globalCtx, &this->skelAnimeButterfly, &gButterflySkel, &gButterflyAnim, this->jointTableButterfly, this->morphTableButterfly, 8); @@ -397,8 +393,8 @@ void EnFr_DecrementBlinkTimerUpdate(EnFr* this) { void EnFr_SetupJumpingOutOfWater(EnFr* this, GlobalContext* globalCtx) { if (sEnFrPointers.flags == sTimerJumpingOutOfWater[this->actor.params - 1]) { - Animation_Change(&this->skelAnime, &D_060007BC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060007BC), ANIMMODE_ONCE, - 0.0f); + Animation_Change(&this->skelAnime, &object_fr_Anim_0007BC, 1.0f, 0.0f, + Animation_GetLastFrame(&object_fr_Anim_0007BC), ANIMMODE_ONCE, 0.0f); EnFr_DrawActive(this); this->actionFunc = EnFr_JumpingOutOfWater; } @@ -446,20 +442,20 @@ void EnFr_OrientOnLogSpot(EnFr* this, GlobalContext* globalCtx) { if ((rotYRemaining == 0) && (this->skelAnime.curFrame == this->skelAnime.endFrame)) { sEnFrPointers.flags++; this->actionFunc = EnFr_ChooseJumpFromLogSpot; - Animation_Change(&this->skelAnime, &D_06001534, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001534), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_fr_Anim_001534, 1.0f, 0.0f, + Animation_GetLastFrame(&object_fr_Anim_001534), ANIMMODE_LOOP, 0.0f); } } void EnFr_ChooseJumpFromLogSpot(EnFr* this, GlobalContext* globalCtx) { if (sEnFrPointers.flags == 12) { this->actor.world.rot.y = ((f32)0x8000 / M_PI) * sLogSpotToFromWater[this->actor.params].yaw; - Animation_Change(&this->skelAnime, &D_060007BC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060007BC), ANIMMODE_ONCE, - 0.0f); + Animation_Change(&this->skelAnime, &object_fr_Anim_0007BC, 1.0f, 0.0f, + Animation_GetLastFrame(&object_fr_Anim_0007BC), ANIMMODE_ONCE, 0.0f); this->actionFunc = EnFr_JumpingBackIntoWater; } else if (this->isJumpingUp) { - Animation_Change(&this->skelAnime, &D_060007BC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060007BC), ANIMMODE_ONCE, - 0.0f); + Animation_Change(&this->skelAnime, &object_fr_Anim_0007BC, 1.0f, 0.0f, + Animation_GetLastFrame(&object_fr_Anim_0007BC), ANIMMODE_ONCE, 0.0f); this->actionFunc = EnFr_JumpingUp; } } @@ -481,8 +477,8 @@ void EnFr_JumpingUp(EnFr* this, GlobalContext* globalCtx) { if (EnFr_IsBelowLogSpot(this, &yDistToLogSpot)) { this->isJumpingUp = false; this->actor.gravity = 0.0f; - Animation_Change(&this->skelAnime, &D_060011C0, 1.0f, 0.0f, Animation_GetLastFrame(&D_060011C0), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_fr_Anim_0011C0, 1.0f, 0.0f, + Animation_GetLastFrame(&object_fr_Anim_0011C0), ANIMMODE_LOOP, 0.0f); this->actionFunc = EnFr_ChooseJumpFromLogSpot; } else if ((this->actor.velocity.y <= 0.0f) && (yDistToLogSpot < 40.0f)) { this->skelAnime.playSpeed = 1.0f; @@ -503,8 +499,8 @@ void EnFr_JumpingBackIntoWater(EnFr* this, GlobalContext* globalCtx) { // Final Spot Reached if ((this->actor.velocity.y < 0.0f) && (this->actor.world.pos.y < yUnderwater)) { - Animation_Change(&this->skelAnime, &D_06001534, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001534), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_fr_Anim_001534, 1.0f, 0.0f, + Animation_GetLastFrame(&object_fr_Anim_001534), ANIMMODE_LOOP, 0.0f); this->actionFunc = EnFr_SetupJumpingOutOfWater; EnFr_DrawIdle(this); this->isDeactivating = true; diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 9b64dd72ec..049464861c 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -10,6 +10,7 @@ #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_tsubo/object_tsubo.h" #define FLAGS 0x00000030 @@ -38,9 +39,6 @@ void EnGSwitch_SpawnEffects(EnGSwitch* this, Vec3f* pos, s16 scale, s16 colorIdx void EnGSwitch_UpdateEffects(EnGSwitch* this, GlobalContext* globalCtx); void EnGSwitch_DrawEffects(EnGSwitch* this, GlobalContext* globalCtx); -extern Gfx D_060017C0[]; -extern Gfx D_06001960[]; - static s16 sCollectedCount = 0; static ColliderCylinderInit sCylinderInit = { @@ -401,7 +399,7 @@ void EnGSwitch_ArcheryPot(EnGSwitch* this, GlobalContext* globalCtx) { scale = 30.0f + Rand_ZeroOne() * 130.0f; EffectSsKakera_Spawn(globalCtx, &pos, &vel, thisPos, -240, phi_s0, 10, 10, 0, scale, 0, 0x20, 60, - KAKERA_COLOR_NONE, OBJECT_TSUBO, D_06001960); + KAKERA_COLOR_NONE, OBJECT_TSUBO, object_tsubo_DL_001960); } func_80033480(globalCtx, thisPos, 30.0f, 4, 20, 50, 0); Audio_PlaySoundAtPosition(globalCtx, thisPos, 40, NA_SE_EV_POT_BROKEN); @@ -462,7 +460,7 @@ void EnGSwitch_DrawPot(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_g_switch.c", 925), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_060017C0); + gSPDisplayList(POLY_OPA_DISP++, object_tsubo_DL_0017C0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_g_switch.c", 928); } } diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 06a6e2e4a5..cf547d4493 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -6,6 +6,7 @@ #include "z_en_gm.h" #include "objects/object_oF1d_map/object_oF1d_map.h" +#include "objects/object_gm/object_gm.h" #include "vt.h" #define FLAGS 0x00000019 @@ -27,8 +28,6 @@ void EnGm_ProcessChoiceIndex(EnGm* this, GlobalContext* globalCtx); void func_80A3DF00(EnGm* this, GlobalContext* globalCtx); void func_80A3DF60(EnGm* this, GlobalContext* globalCtx); -extern AnimationHeader D_060002B8; - const ActorInit En_Gm_InitVars = { ACTOR_EN_GM, ACTORCAT_NPC, @@ -109,8 +108,8 @@ void func_80A3D838(EnGm* this, GlobalContext* globalCtx) { this->actor.flags &= ~0x10; SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, NULL, this->jointTable, this->morphTable, 18); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objGmBankIndex].segment); - Animation_Change(&this->skelAnime, &D_060002B8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060002B8), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_gm_Anim_0002B8, 1.0f, 0.0f, + Animation_GetLastFrame(&object_gm_Anim_0002B8), ANIMMODE_LOOP, 0.0f); this->actor.draw = EnGm_Draw; Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &sCylinderInit); diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 67e16203b8..090505c2de 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -6,6 +6,7 @@ #include "z_en_hs.h" #include "vt.h" +#include "objects/object_hs/object_hs.h" #define FLAGS 0x00000009 @@ -51,11 +52,6 @@ static ColliderCylinderInit sCylinderInit = { { 40, 40, 0, { 0, 0, 0 } }, }; -extern AnimationHeader D_06000304; -extern AnimationHeader D_06000528; -extern AnimationHeader D_060005C0; -extern FlexSkeletonHeader D_06006260; - void func_80A6E3A0(EnHs* this, EnHsActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -65,8 +61,9 @@ void EnHs_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06006260, &D_060005C0, this->jointTable, this->morphTable, 16); - Animation_PlayLoop(&this->skelAnime, &D_060005C0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_hs_Skel_006260, &object_hs_Anim_0005C0, this->jointTable, + this->morphTable, 16); + Animation_PlayLoop(&this->skelAnime, &object_hs_Anim_0005C0); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); this->actor.colChkInfo.mass = MASS_IMMOVABLE; @@ -179,8 +176,8 @@ void func_80A6E7BC(EnHs* this, GlobalContext* globalCtx) { break; } - Animation_Change(&this->skelAnime, &D_060005C0, 1.0f, 0.0f, Animation_GetLastFrame(&D_060005C0), ANIMMODE_LOOP, - 8.0f); + Animation_Change(&this->skelAnime, &object_hs_Anim_0005C0, 1.0f, 0.0f, + Animation_GetLastFrame(&object_hs_Anim_0005C0), ANIMMODE_LOOP, 8.0f); } this->unk_2A8 |= 1; @@ -192,8 +189,8 @@ void func_80A6E8CC(EnHs* this, GlobalContext* globalCtx) { if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) { func_8010B720(globalCtx, 0x10B3); func_80A6E3A0(this, func_80A6E7BC); - Animation_Change(&this->skelAnime, &D_06000528, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000528), ANIMMODE_LOOP, - 8.0f); + Animation_Change(&this->skelAnime, &object_hs_Anim_000528, 1.0f, 0.0f, + Animation_GetLastFrame(&object_hs_Anim_000528), ANIMMODE_LOOP, 8.0f); } if (this->unk_2AA > 0) { @@ -214,8 +211,8 @@ void func_80A6E9AC(EnHs* this, GlobalContext* globalCtx) { if (func_8002F368(globalCtx) == 7) { player->actor.textId = 0x10B2; func_80A6E3A0(this, func_80A6E8CC); - Animation_Change(&this->skelAnime, &D_06000304, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000304), - ANIMMODE_LOOP, 8.0f); + Animation_Change(&this->skelAnime, &object_hs_Anim_000304, 1.0f, 0.0f, + Animation_GetLastFrame(&object_hs_Anim_000304), ANIMMODE_LOOP, 8.0f); this->unk_2AA = 40; func_80078884(NA_SE_SY_TRE_BOX_APPEAR); } else { diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 4fb5da10d1..4d90dc26ce 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -6,6 +6,7 @@ #include "z_en_hs2.h" #include "vt.h" +#include "objects/object_hs/object_hs.h" #define FLAGS 0x00000009 @@ -49,16 +50,14 @@ static ColliderCylinderInit sCylinderInit = { { 40, 40, 0, { 0, 0, 0 } }, }; -extern FlexSkeletonHeader D_06006260; -extern AnimationHeader D_060005C0; - void EnHs2_Init(Actor* thisx, GlobalContext* globalCtx) { EnHs2* this = THIS; s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06006260, &D_060005C0, this->jointTable, this->morphTable, 16); - Animation_PlayLoop(&this->skelAnime, &D_060005C0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_hs_Skel_006260, &object_hs_Anim_0005C0, this->jointTable, + this->morphTable, 16); + Animation_PlayLoop(&this->skelAnime, &object_hs_Anim_0005C0); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); this->actor.colChkInfo.mass = MASS_IMMOVABLE; diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 40da3cee6e..7751f94728 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -1,5 +1,6 @@ #include "z_en_in.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" +#include "objects/object_in/object_in.h" #define FLAGS 0x00000019 @@ -62,35 +63,41 @@ static CollisionCheckInfoInit2 sColChkInfoInit = { }; static struct_D_80AA1678 sAnimationInfo[] = { - { 0x06001CC0, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06001CC0, 1.0f, ANIMMODE_LOOP, -10.0f }, - { 0x06013C6C, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06013C6C, 1.0f, ANIMMODE_LOOP, -10.0f }, - { 0x06000CB0, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x060003B4, 1.0f, ANIMMODE_LOOP, -10.0f }, - { 0x06001BE0, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06013D60, 1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x0601431C, 1.0f, ANIMMODE_LOOP, 0.0f }, { 0x06014CA8, 1.0f, ANIMMODE_LOOP, 0.0f }, + { &object_in_Anim_001CC0, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_001CC0, 1.0f, ANIMMODE_LOOP, -10.0f }, + { &object_in_Anim_013C6C, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_013C6C, 1.0f, ANIMMODE_LOOP, -10.0f }, + { &object_in_Anim_000CB0, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_0003B4, 1.0f, ANIMMODE_LOOP, -10.0f }, + { &object_in_Anim_001BE0, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_013D60, 1.0f, ANIMMODE_LOOP, 0.0f }, + { &object_in_Anim_01431C, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_in_Anim_014CA8, 1.0f, ANIMMODE_LOOP, 0.0f }, }; static AnimationHeader* D_80A7B918[] = { - 0x060151C8, 0x06015DF0, 0x06016B3C, 0x06015814, 0x0601646C, 0x060175D0, 0x06017B58, 0x06018C38, + &object_in_Anim_0151C8, &object_in_Anim_015DF0, &object_in_Anim_016B3C, &object_in_Anim_015814, + &object_in_Anim_01646C, &object_in_Anim_0175D0, &object_in_Anim_017B58, &object_in_Anim_018C38, }; static Gfx* sAlternateOutfitDLs[] = { - NULL, NULL, 0x06013688, 0x060137C0, 0x06013910, 0x060132B8, 0x060133F0, - 0x06013540, 0x06013100, 0x06011758, 0x06012AC0, 0x06012BF0, 0x06012D20, 0x06012480, - 0x060125B0, 0x060126E0, 0x06011AD8, 0x06012350, 0x06012220, 0x06012120, + NULL, + NULL, + object_in_DL_013688, + object_in_DL_0137C0, + object_in_DL_013910, + object_in_DL_0132B8, + object_in_DL_0133F0, + object_in_DL_013540, + object_in_DL_013100, + object_in_DL_011758, + object_in_DL_012AC0, + object_in_DL_012BF0, + object_in_DL_012D20, + object_in_DL_012480, + object_in_DL_0125B0, + object_in_DL_0126E0, + object_in_DL_011AD8, + object_in_DL_012350, + object_in_DL_012220, + object_in_DL_012120, }; -extern AnimationHeader D_060003B4; -extern AnimationHeader D_06001BE0; -extern AnimationHeader D_06013D60; -extern AnimationHeader D_06014CA8; -extern AnimationHeader D_06015814; -extern AnimationHeader D_0601646C; -extern AnimationHeader D_06018C38; -extern FlexSkeletonHeader D_06013B88; -extern UNK_TYPE D_060034D0; -extern Gfx D_06007A20[]; -extern Gfx D_06007BF8[]; - u16 func_80A78FB0(GlobalContext* globalCtx) { if (gSaveContext.eventChkInf[1] & 0x10) { if (gSaveContext.infTable[9] & 0x80) { @@ -298,8 +305,8 @@ void func_80A795C8(EnIn* this, GlobalContext* globalCtx) { Player* player = PLAYER; s16 phi_a3; - if (this->skelAnime.animation == &D_060003B4 || this->skelAnime.animation == &D_06001BE0 || - this->skelAnime.animation == &D_06013D60) { + if (this->skelAnime.animation == &object_in_Anim_0003B4 || this->skelAnime.animation == &object_in_Anim_001BE0 || + this->skelAnime.animation == &object_in_Anim_013D60) { phi_a3 = 1; } else { phi_a3 = 0; @@ -401,7 +408,7 @@ void func_80A79AB4(EnIn* this, GlobalContext* globalCtx) { s32 i; u32 f = 0; - if (this->skelAnime.animation != &D_06014CA8) { + if (this->skelAnime.animation != &object_in_Anim_014CA8) { f = globalCtx->gameplayFrames; } for (i = 0; i < ARRAY_COUNT(this->unk_330); i++) { @@ -496,7 +503,8 @@ void func_80A79FB0(EnIn* this, GlobalContext* globalCtx) { if (Object_IsLoaded(&globalCtx->objectCtx, this->ingoObjBankIndex) || this->actor.params <= 0) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06013B88, NULL, this->jointTable, this->morphTable, 20); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_in_Skel_013B88, NULL, this->jointTable, + this->morphTable, 20); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit); @@ -595,12 +603,12 @@ void func_80A79FB0(EnIn* this, GlobalContext* globalCtx) { } void func_80A7A304(EnIn* this, GlobalContext* globalCtx) { - if (this->skelAnime.animation == &D_06015814 || this->skelAnime.animation == &D_0601646C) { + if (this->skelAnime.animation == &object_in_Anim_015814 || this->skelAnime.animation == &object_in_Anim_01646C) { if (this->skelAnime.curFrame == 8.0f) { func_800F41E0(&this->actor.projectedPos, NA_SE_VO_IN_LASH_0, 2); } } - if (this->skelAnime.animation == &D_06018C38 && this->skelAnime.curFrame == 20.0f) { + if (this->skelAnime.animation == &object_in_Anim_018C38 && this->skelAnime.curFrame == 20.0f) { Audio_PlayActorSound2(&this->actor, NA_SE_VO_IN_CRY_0); } if (SkelAnime_Update(&this->skelAnime) != 0) { @@ -900,7 +908,7 @@ void EnIn_Update(Actor* thisx, GlobalContext* globalCtx) { CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &collider->base); if (this->actionFunc != func_80A7A304) { SkelAnime_Update(&this->skelAnime); - if (this->skelAnime.animation == &D_06001BE0 && ((gSaveContext.eventInf[0] & 0xF) != 6)) { + if (this->skelAnime.animation == &object_in_Anim_001BE0 && ((gSaveContext.eventInf[0] & 0xF) != 6)) { func_80A79690(&this->skelAnime, this, globalCtx); } Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); @@ -961,24 +969,25 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec Matrix_MultVec3f(&D_80A7B9A8, &this->actor.focus.pos); this->actor.focus.rot = this->actor.world.rot; } - if (limbIndex == 12 && this->skelAnime.animation == &D_06014CA8) { - gSPDisplayList(POLY_OPA_DISP++, D_06007A20); + if (limbIndex == 12 && this->skelAnime.animation == &object_in_Anim_014CA8) { + gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007A20); } - if (limbIndex == 15 && this->skelAnime.animation == &D_06014CA8) { - gSPDisplayList(POLY_OPA_DISP++, D_06007BF8); + if (limbIndex == 15 && this->skelAnime.animation == &object_in_Anim_014CA8) { + gSPDisplayList(POLY_OPA_DISP++, object_in_DL_007BF8); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2365); } void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx) { - static UNK_TYPE* D_80A7B9B4[] = { 0x06003590, 0x060047D0, 0x06004BD0, 0x06004390 }; + static UNK_TYPE* D_80A7B9B4[] = { object_in_Tex_003590, object_in_Tex_0047D0, object_in_Tex_004BD0, + object_in_Tex_004390 }; EnIn* this = THIS; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2384); if (this->actionFunc != func_80A79FB0) { func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80A7B9B4[this->unk_1EE])); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_060034D0)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_in_Tex_0034D0)); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnIn_OverrideLimbDraw, EnIn_PostLimbDraw, &this->actor); } diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index f4870a9854..78809ec445 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -6,6 +6,7 @@ #include "z_en_kakasi.h" #include "vt.h" +#include "objects/object_ka/object_ka.h" #define FLAGS 0x02000009 @@ -43,9 +44,6 @@ static ColliderCylinderInit sCylinderInit = { { 20, 70, 0, { 0, 0, 0 } }, }; -extern FlexSkeletonHeader D_060065B0; -extern AnimationHeader D_06000214; - const ActorInit En_Kakasi_InitVars = { ACTOR_EN_KAKASI, ACTORCAT_NPC, @@ -74,7 +72,7 @@ void EnKakasi_Init(Actor* thisx, GlobalContext* globalCtx) { Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); this->actor.targetMode = 6; - SkelAnime_InitFlex(globalCtx, &this->skelanime, &D_060065B0, &D_06000214, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelanime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, NULL, NULL, 0); this->rot = this->actor.world.rot; this->actor.flags |= 0x400; @@ -175,9 +173,9 @@ void func_80A8F320(EnKakasi* this, GlobalContext* globalCtx, s16 arg) { } void func_80A8F660(EnKakasi* this, GlobalContext* globalCtx) { - f32 frameCount = Animation_GetLastFrame(&D_06000214); + f32 frameCount = Animation_GetLastFrame(&object_ka_Anim_000214); - Animation_Change(&this->skelanime, &D_06000214, 1.0f, 0.0f, (s16)frameCount, ANIMMODE_LOOP, -10.0f); + Animation_Change(&this->skelanime, &object_ka_Anim_000214, 1.0f, 0.0f, (s16)frameCount, ANIMMODE_LOOP, -10.0f); this->actor.textId = 0x4076; this->unk_196 = 6; diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index b1e2a57af5..25880d52c4 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -6,6 +6,7 @@ #include "z_en_kakasi2.h" #include "vt.h" +#include "objects/object_ka/object_ka.h" #define FLAGS 0x0A000031 @@ -42,9 +43,6 @@ void func_80A904D8(EnKakasi2* this, GlobalContext* globalCtx); void func_80A90578(EnKakasi2* this, GlobalContext* globalCtx); void func_80A906C4(EnKakasi2* this, GlobalContext* globalCtx); -extern FlexSkeletonHeader D_060065B0; -extern AnimationHeader D_06000214; - const ActorInit En_Kakasi2_InitVars = { ACTOR_EN_KAKASI2, ACTORCAT_PROP, @@ -100,7 +98,7 @@ void EnKakasi2_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.draw = func_80A90948; Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, NULL, NULL, 0); this->actionFunc = func_80A9062C; } else { this->actionFunc = func_80A90264; @@ -126,7 +124,7 @@ void func_80A90264(EnKakasi2* this, GlobalContext* globalCtx) { this->actor.draw = func_80A90948; Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, NULL, NULL, 0); OnePointCutscene_Attention(globalCtx, &this->actor); this->actor.flags |= 0x8000001; @@ -151,7 +149,8 @@ void func_80A90264(EnKakasi2* this, GlobalContext* globalCtx) { this->actor.draw = func_80A90948; Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, NULL, NULL, + 0); OnePointCutscene_Attention(globalCtx, &this->actor); func_80078884(NA_SE_SY_CORRECT_CHIME); @@ -162,9 +161,9 @@ void func_80A90264(EnKakasi2* this, GlobalContext* globalCtx) { } void func_80A904D8(EnKakasi2* this, GlobalContext* globalCtx) { - f32 frameCount = Animation_GetLastFrame(&D_06000214); + f32 frameCount = Animation_GetLastFrame(&object_ka_Anim_000214); - Animation_Change(&this->skelAnime, &D_06000214, 1.0f, 0.0f, (s16)frameCount, ANIMMODE_LOOP, -10.0f); + Animation_Change(&this->skelAnime, &object_ka_Anim_000214, 1.0f, 0.0f, (s16)frameCount, ANIMMODE_LOOP, -10.0f); Audio_PlayActorSound2(&this->actor, NA_SE_EV_COME_UP_DEKU_JR); this->actionFunc = func_80A90578; } @@ -189,9 +188,9 @@ void func_80A90578(EnKakasi2* this, GlobalContext* globalCtx) { } void func_80A9062C(EnKakasi2* this, GlobalContext* globalCtx) { - f32 frameCount = Animation_GetLastFrame(&D_06000214); + f32 frameCount = Animation_GetLastFrame(&object_ka_Anim_000214); - Animation_Change(&this->skelAnime, &D_06000214, 0.0f, 0.0f, (s16)frameCount, ANIMMODE_ONCE, -10.0f); + Animation_Change(&this->skelAnime, &object_ka_Anim_000214, 0.0f, 0.0f, (s16)frameCount, ANIMMODE_ONCE, -10.0f); this->actionFunc = func_80A906C4; } diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index acd57b407b..28dc11e5c6 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -6,6 +6,7 @@ #include "z_en_kakasi3.h" #include "vt.h" +#include "objects/object_ka/object_ka.h" #define FLAGS 0x02000009 @@ -47,9 +48,6 @@ static ColliderCylinderInit sCylinderInit = { { 20, 70, 0, { 0, 0, 0 } }, }; -extern FlexSkeletonHeader D_060065B0; -extern AnimationHeader D_06000214; - const ActorInit En_Kakasi3_InitVars = { ACTOR_EN_KAKASI3, ACTORCAT_NPC, @@ -79,7 +77,7 @@ void EnKakasi3_Init(Actor* thisx, GlobalContext* globalCtx) { Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, NULL, NULL, 0); this->actor.flags |= 0x400; this->rot = this->actor.world.rot; this->actor.colChkInfo.mass = MASS_IMMOVABLE; @@ -178,9 +176,9 @@ void func_80A90EBC(EnKakasi3* this, GlobalContext* globalCtx, s32 arg) { } void func_80A911F0(EnKakasi3* this, GlobalContext* globalCtx) { - f32 frameCount = Animation_GetLastFrame(&D_06000214); + f32 frameCount = Animation_GetLastFrame(&object_ka_Anim_000214); - Animation_Change(&this->skelAnime, &D_06000214, 1.0f, 0.0f, (s16)frameCount, ANIMMODE_LOOP, -10.0f); + Animation_Change(&this->skelAnime, &object_ka_Anim_000214, 1.0f, 0.0f, (s16)frameCount, ANIMMODE_LOOP, -10.0f); this->actionFunc = func_80A91284; } diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 9daab279e6..ff81782d7f 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -6,6 +6,7 @@ #include "z_en_kanban.h" #include "objects/gameplay_keep/gameplay_keep.h" +#include "objects/object_kanban/object_kanban.h" #include "vt.h" #define FLAGS 0x00000019 @@ -76,9 +77,6 @@ void EnKanban_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx); void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx); -extern Gfx D_06000C30[]; -extern Gfx D_06001630[]; - const ActorInit En_Kanban_InitVars = { ACTOR_EN_KANBAN, ACTORCAT_PROP, @@ -765,8 +763,9 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) { } static Gfx* sDisplayLists[] = { - 0x06000CB0, 0x06000DB8, 0x06000E78, 0x06000F38, 0x06000FF8, 0x060010B8, - 0x060011C0, 0x060012C8, 0x060013D0, 0x06001488, 0x06001540, + object_kanban_DL_000CB0, object_kanban_DL_000DB8, object_kanban_DL_000E78, object_kanban_DL_000F38, + object_kanban_DL_000FF8, object_kanban_DL_0010B8, object_kanban_DL_0011C0, object_kanban_DL_0012C8, + object_kanban_DL_0013D0, object_kanban_DL_001488, object_kanban_DL_001540, }; #include "z_en_kanban_gfx.c" @@ -813,7 +812,7 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1659); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_OPA_DISP++, D_06000C30); + gSPDisplayList(POLY_OPA_DISP++, object_kanban_DL_000C30); if (this->actionState != ENKANBAN_SIGN) { Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); @@ -861,7 +860,7 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 150, 0); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1773), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06001630); + gSPDisplayList(POLY_XLU_DISP++, object_kanban_DL_001630); } } if ((this->actor.projectedPos.z <= 400.0f) && (this->actor.projectedPos.z > 0.0f) && diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index ef82e1d3dd..50b14afc3e 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -5,6 +5,7 @@ */ #include "z_en_kz.h" +#include "objects/object_kz/object_kz.h" #define FLAGS 0x00000009 @@ -58,13 +59,11 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; static struct_80034EC0_Entry sAnimations[] = { - { 0x0600075C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, - { 0x0600075C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, - { 0x0600046C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { &object_kz_Anim_00075C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f }, + { &object_kz_Anim_00075C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, + { &object_kz_Anim_00046C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, }; -extern FlexSkeletonHeader D_060086D0; - u16 EnKz_GetTextNoMaskChild(GlobalContext* globalCtx, EnKz* this) { Player* player = PLAYER; @@ -316,7 +315,8 @@ void EnKz_Init(Actor* thisx, GlobalContext* globalCtx) { EnKz* this = THIS; s32 pad; - SkelAnime_InitFlex(globalCtx, &this->skelanime, &D_060086D0, NULL, this->jointTable, this->morphTable, 12); + SkelAnime_InitFlex(globalCtx, &this->skelanime, &object_kz_Skel_0086D0, NULL, this->jointTable, this->morphTable, + 12); ActorShape_Init(&this->actor.shape, 0.0, NULL, 0.0); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); @@ -486,9 +486,9 @@ void EnKz_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec void EnKz_Draw(Actor* thisx, GlobalContext* globalCtx) { static void* sEyeSegments[] = { - 0x06001470, - 0x06001870, - 0x06001C70, + object_kz_Tex_001470, + object_kz_Tex_001870, + object_kz_Tex_001C70, }; EnKz* this = THIS; diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index a8d8c10d42..0cd2063904 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -5,6 +5,7 @@ */ #include "z_en_lightbox.h" +#include "objects/object_lightbox/object_lightbox.h" #define FLAGS 0x00000010 @@ -27,9 +28,6 @@ const ActorInit En_Lightbox_InitVars = { (ActorFunc)EnLightbox_Draw, }; -extern Gfx D_06000B70[]; -extern CollisionHeader D_06001F10; - void EnLightbox_Init(Actor* thisx, GlobalContext* globalCtx) { CollisionHeader* colHeader = NULL; EnLightbox* this = THIS; @@ -59,7 +57,7 @@ void EnLightbox_Init(Actor* thisx, GlobalContext* globalCtx) { this->dyna.unk_15C = 0; thisx->targetMode = 0; thisx->gravity = -2.0f; - CollisionHeader_GetVirtual(&D_06001F10, &colHeader); + CollisionHeader_GetVirtual(&object_lightbox_Col_001F10, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); } @@ -112,5 +110,5 @@ void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) { } void EnLightbox_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_06000B70); + Gfx_DrawDListOpa(globalCtx, object_lightbox_DL_000B70); } diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index cc1274c98f..a3df7d0044 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -56,12 +56,6 @@ static u16 sSfxIds[] = { NA_SE_IT_ROLLING_CUT_LV1, }; -extern Gfx D_04012570[]; -extern Gfx D_04012690[]; -extern Gfx D_04012AF0[]; -extern Gfx D_04012C10[]; -extern Gfx D_04013610[]; - // Setup action void func_80A9EFE0(EnMThunder* this, EnMThunderActionFunc actionFunc) { this->actionFunc = actionFunc; diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index fceb814995..4e8573f669 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -1,4 +1,5 @@ #include "z_en_ma2.h" +#include "objects/object_ma2/object_ma2.h" #define FLAGS 0x02000039 @@ -61,11 +62,6 @@ static struct_D_80AA1678 D_80AA2858[] = { { 0x06009EE0, 1.0f, ANIMMODE_LOOP, -10.0f }, }; -extern Gfx D_06005420[]; -extern FlexSkeletonHeader D_06008D90; -extern AnimationHeader D_060093BC; -extern AnimationHeader D_06009EE0; - u16 func_80AA19A0(GlobalContext* globalCtx, Actor* thisx) { u16 faceReaction = Text_GetFaceReaction(globalCtx, 23); if (faceReaction != 0) { @@ -122,7 +118,7 @@ void func_80AA1AE4(EnMa2* this, GlobalContext* globalCtx) { Player* player = PLAYER; s16 phi_a3; - if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &D_06009EE0)) { + if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &object_ma2_Anim_009EE0)) { phi_a3 = 1; } else { phi_a3 = 0; @@ -159,7 +155,7 @@ u16 func_80AA1B58(EnMa2* this, GlobalContext* globalCtx) { } s32 func_80AA1C68(EnMa2* this) { - if (this->skelAnime.animation != &D_06009EE0) { + if (this->skelAnime.animation != &object_ma2_Anim_009EE0) { return 0; } if (this->unk_1E0.unk_00 != 0) { @@ -191,7 +187,7 @@ void func_80AA1D44(EnMa2* this, s32 idx) { } void func_80AA1DB4(EnMa2* this, GlobalContext* globalCtx) { - if (this->skelAnime.animation == &D_06009EE0) { + if (this->skelAnime.animation == &object_ma2_Anim_009EE0) { if (this->unk_1E0.unk_00 == 0) { if (this->unk_20A != 0) { func_800F6584(0); @@ -211,7 +207,7 @@ void EnMa2_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008D90, NULL, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_008D90, NULL, NULL, NULL, 0); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(22), &sColChkInfoInit); @@ -356,8 +352,8 @@ void EnMa2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve if (limbIndex == 18) { Matrix_MultVec3f(&vec, &this->actor.focus.pos); } - if ((limbIndex == 14) && (this->skelAnime.animation == &D_060093BC)) { - gSPDisplayList(POLY_OPA_DISP++, D_06005420); + if ((limbIndex == 14) && (this->skelAnime.animation == &object_ma2_Anim_0093BC)) { + gSPDisplayList(POLY_OPA_DISP++, object_ma2_DL_005420); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ma2.c", 927); diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 953e783e91..df9f0d3397 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -5,6 +5,7 @@ */ #include "z_en_ma3.h" +#include "objects/object_ma2/object_ma2.h" #define FLAGS 0x00000039 @@ -65,11 +66,6 @@ static struct_D_80AA1678 D_80AA3848[] = { { 0x06009EE0, 1.0f, ANIMMODE_LOOP, -10.0f }, }; -extern u32 D_06005420; -extern FlexSkeletonHeader D_06008D90; -extern AnimationHeader D_060093BC; -extern AnimationHeader D_06009EE0; - u16 func_80AA2AA0(GlobalContext* globalCtx, Actor* thisx) { Player* player = PLAYER; s16* timer1ValuePtr; // weirdness with this necessary to match @@ -181,7 +177,7 @@ void func_80AA2E54(EnMa3* this, GlobalContext* globalCtx) { Player* player = PLAYER; s16 phi_a3; - if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &D_06009EE0)) { + if ((this->unk_1E0.unk_00 == 0) && (this->skelAnime.animation == &object_ma2_Anim_009EE0)) { phi_a3 = 1; } else { phi_a3 = 0; @@ -206,7 +202,7 @@ s32 func_80AA2EC8(EnMa3* this, GlobalContext* globalCtx) { } s32 func_80AA2F28(EnMa3* this) { - if (this->skelAnime.animation != &D_06009EE0) { + if (this->skelAnime.animation != &object_ma2_Anim_009EE0) { return 0; } if (this->unk_1E0.unk_00 != 0) { @@ -242,7 +238,7 @@ void EnMa3_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06008D90, NULL, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ma2_Skel_008D90, NULL, NULL, NULL, 0); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(22), &sColChkInfoInit); @@ -338,8 +334,8 @@ void EnMa3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve if (limbIndex == 18) { Matrix_MultVec3f(&vec, &this->actor.focus.pos); } - if ((limbIndex == 14) && (this->skelAnime.animation == &D_060093BC)) { - gSPDisplayList(POLY_OPA_DISP++, &D_06005420); + if ((limbIndex == 14) && (this->skelAnime.animation == &object_ma2_Anim_0093BC)) { + gSPDisplayList(POLY_OPA_DISP++, &object_ma2_DL_005420); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ma3.c", 950); diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 1e9f89fec8..6ab9c55c60 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -5,6 +5,7 @@ */ #include "z_en_mk.h" +#include "objects/object_mk/object_mk.h" #define FLAGS 0x00000019 @@ -17,12 +18,6 @@ void EnMk_Draw(Actor* thisx, GlobalContext* globalCtx); void EnMk_Wait(EnMk* this, GlobalContext* globalCtx); -extern AnimationHeader D_06000368; -extern AnimationHeader D_06000724; -extern AnimationHeader D_06000AC0; -extern AnimationHeader D_06000D88; -extern FlexSkeletonHeader D_06005DF0; - const ActorInit En_Mk_InitVars = { ACTOR_EN_MK, ACTORCAT_NPC, @@ -62,8 +57,9 @@ void EnMk_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.minVelocityY = -4.0f; this->actor.gravity = -1.0f; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06005DF0, &D_06000D88, this->jointTable, this->morphTable, 13); - Animation_PlayLoop(&this->skelAnime, &D_06000D88); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_mk_Skel_005DF0, &object_mk_Anim_000D88, this->jointTable, + this->morphTable, 13); + Animation_PlayLoop(&this->skelAnime, &object_mk_Anim_000D88); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); this->actor.colChkInfo.mass = 0xFF; @@ -136,8 +132,8 @@ void func_80AACC04(EnMk* this, GlobalContext* globalCtx) { } else { this->timer = 16; this->actionFunc = func_80AACBAC; - Animation_Change(&this->skelAnime, &D_06000D88, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000D88), ANIMMODE_LOOP, - -4.0f); + Animation_Change(&this->skelAnime, &object_mk_Anim_000D88, 1.0f, 0.0f, + Animation_GetLastFrame(&object_mk_Anim_000D88), ANIMMODE_LOOP, -4.0f); this->flags &= ~2; } } @@ -149,8 +145,8 @@ void func_80AACCA0(EnMk* this, GlobalContext* globalCtx) { } else { this->timer = 120; this->actionFunc = func_80AACC04; - Animation_Change(&this->skelAnime, &D_06000724, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000724), ANIMMODE_LOOP, - -4.0f); + Animation_Change(&this->skelAnime, &object_mk_Anim_000724, 1.0f, 0.0f, + Animation_GetLastFrame(&object_mk_Anim_000724), ANIMMODE_LOOP, -4.0f); this->flags &= ~2; } } @@ -164,8 +160,8 @@ void func_80AACD48(EnMk* this, GlobalContext* globalCtx) { globalCtx->msgCtx.msgMode = 0x37; player->exchangeItemId = EXCH_ITEM_NONE; this->timer = 16; - Animation_Change(&this->skelAnime, &D_06000D88, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000D88), ANIMMODE_LOOP, - -4.0f); + Animation_Change(&this->skelAnime, &object_mk_Anim_000D88, 1.0f, 0.0f, + Animation_GetLastFrame(&object_mk_Anim_000D88), ANIMMODE_LOOP, -4.0f); this->flags &= ~2; } @@ -175,8 +171,8 @@ void func_80AACD48(EnMk* this, GlobalContext* globalCtx) { void func_80AACE2C(EnMk* this, GlobalContext* globalCtx) { if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { func_8010B720(globalCtx, 0x4001); - Animation_Change(&this->skelAnime, &D_06000AC0, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000AC0), ANIMMODE_ONCE, - -4.0f); + Animation_Change(&this->skelAnime, &object_mk_Anim_000AC0, 1.0f, 0.0f, + Animation_GetLastFrame(&object_mk_Anim_000AC0), ANIMMODE_ONCE, -4.0f); this->flags &= ~2; this->actionFunc = func_80AACD48; } @@ -187,8 +183,8 @@ void func_80AACE2C(EnMk* this, GlobalContext* globalCtx) { void func_80AACEE8(EnMk* this, GlobalContext* globalCtx) { if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { func_8010B720(globalCtx, 0x4000); - Animation_Change(&this->skelAnime, &D_06000AC0, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000AC0), ANIMMODE_LOOP, - -4.0f); + Animation_Change(&this->skelAnime, &object_mk_Anim_000AC0, 1.0f, 0.0f, + Animation_GetLastFrame(&object_mk_Anim_000AC0), ANIMMODE_LOOP, -4.0f); this->flags &= ~2; this->actionFunc = func_80AACE2C; } @@ -256,8 +252,8 @@ void EnMk_Wait(EnMk* this, GlobalContext* globalCtx) { case EXCH_ITEM_FROG: player->actor.textId = 0x4019; this->actionFunc = func_80AACEE8; - Animation_Change(&this->skelAnime, &D_06000368, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000368), - ANIMMODE_ONCE, -4.0f); + Animation_Change(&this->skelAnime, &object_mk_Anim_000368, 1.0f, 0.0f, + Animation_GetLastFrame(&object_mk_Anim_000368), ANIMMODE_ONCE, -4.0f); this->flags &= ~2; gSaveContext.timer2State = 0; func_80078884(NA_SE_SY_TRE_BOX_APPEAR); diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 4c922a0997..4b00e5f201 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -5,6 +5,7 @@ */ #include "z_en_mu.h" +#include "objects/object_mu/object_mu.h" #define FLAGS 0x00000009 @@ -18,9 +19,6 @@ void EnMu_Draw(Actor* thisx, GlobalContext* globalCtx); void EnMu_Pose(EnMu* this, GlobalContext* globalCtx); s16 EnMu_CheckDialogState(GlobalContext* globalCtx, Actor* thisx); -extern AnimationHeader D_060003F4; -extern FlexSkeletonHeader D_06004F70; - static ColliderCylinderInit D_80AB0BD0 = { { COLTYPE_NONE, @@ -135,7 +133,7 @@ void EnMu_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 160.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004F70, &D_060003F4, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_mu_Skel_004F70, &object_mu_Anim_0003F4, NULL, NULL, 0); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &D_80AB0BD0); CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &D_80AB0BFC); diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 5ae2978b20..5f84498f3f 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -9,6 +9,10 @@ #include "objects/object_ds2/object_ds2.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "objects/object_masterkokiri/object_masterkokiri.h" +#include "objects/object_km1/object_km1.h" +#include "objects/object_mastergolon/object_mastergolon.h" +#include "objects/object_masterzoora/object_masterzoora.h" +#include "objects/object_masterkokirihead/object_masterkokirihead.h" #define FLAGS 0x00000019 @@ -25,11 +29,6 @@ void EnOssan_DrawZoraShopkeeper(Actor* thisx, GlobalContext* globalCtx); void EnOssan_DrawGoronShopkeeper(Actor* thisx, GlobalContext* globalCtx); void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, GlobalContext* globalCtx); -extern FlexSkeletonHeader D_060000F0; -extern AnimationHeader D_060000FC; -extern AnimationHeader D_0600078C; -extern Gfx D_06002820[]; - void EnOssan_InitActionFunc(EnOssan* this, GlobalContext* globalCtx); void EnOssan_MainActionFunc(EnOssan* this, GlobalContext* globalCtx); @@ -1991,7 +1990,7 @@ void EnOssan_InitBazaarShopkeeper(EnOssan* this, GlobalContext* globalCtx) { } void EnOssan_InitKokiriShopkeeper(EnOssan* this, GlobalContext* globalCtx) { - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_060000F0, NULL, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gKm1Skel, NULL, NULL, NULL, 0); gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objBankIndex3].segment); Animation_Change(&this->skelAnime, &object_masterkokiri_Anim_0004A8, 1.0f, 0.0f, Animation_GetLastFrame(&object_masterkokiri_Anim_0004A8), 0, 0.0f); @@ -2004,7 +2003,8 @@ void EnOssan_InitKokiriShopkeeper(EnOssan* this, GlobalContext* globalCtx) { void EnOssan_InitGoronShopkeeper(EnOssan* this, GlobalContext* globalCtx) { SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, NULL, NULL, NULL, 0); gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objBankIndex3].segment); - Animation_Change(&this->skelAnime, &D_060000FC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060000FC), 0, 0.0f); + Animation_Change(&this->skelAnime, &gGoronShopkeeperAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gGoronShopkeeperAnim), + 0, 0.0f); this->actor.draw = EnOssan_DrawGoronShopkeeper; this->obj3ToSeg6Func = EnOssan_Obj3ToSeg6; } @@ -2012,7 +2012,8 @@ void EnOssan_InitGoronShopkeeper(EnOssan* this, GlobalContext* globalCtx) { void EnOssan_InitZoraShopkeeper(EnOssan* this, GlobalContext* globalCtx) { SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gZoraSkel, NULL, NULL, NULL, 0); gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objBankIndex3].segment); - Animation_Change(&this->skelAnime, &D_0600078C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600078C), 0, 0.0f); + Animation_Change(&this->skelAnime, &gZoraShopkeeperAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gZoraShopkeeperAnim), + 0, 0.0f); this->actor.draw = EnOssan_DrawZoraShopkeeper; this->obj3ToSeg6Func = EnOssan_Obj3ToSeg6; } @@ -2372,7 +2373,7 @@ s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(GlobalContext* globalCtx, s32 limbI if (limbIndex == 15) { gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->objBankIndex2].segment); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objBankIndex2].segment); - *dList = D_06002820; + *dList = gKokiriShopkeeperHeadDL; gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(sKokiriShopkeeperEyeTextures[this->eyeTextureIdx])); } diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 3732ebd3c8..3a2f2105ef 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -5,6 +5,7 @@ */ #include "z_en_part.h" +#include "objects/object_tite/object_tite.h" #define FLAGS 0x00000010 @@ -27,13 +28,6 @@ const ActorInit En_Part_InitVars = { (ActorFunc)EnPart_Draw, }; -extern UNK_TYPE D_06001300[]; -extern UNK_TYPE D_06001700[]; -extern UNK_TYPE D_06001900[]; -extern UNK_TYPE D_06001B00[]; -extern UNK_TYPE D_06001F00[]; -extern UNK_TYPE D_06002100[]; -extern Gfx D_06002FF0[]; extern Gfx D_06015380[]; void EnPart_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -303,14 +297,14 @@ void EnPart_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x08, func_80ACEAC0(globalCtx->state.gfxCtx, 255, 255, 255, 180, 180, 180)); gSPSegment(POLY_OPA_DISP++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 225, 205, 115, 25, 20, 0)); gSPSegment(POLY_OPA_DISP++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 225, 205, 115, 25, 20, 0)); - } else if ((thisx->params == 9) && (this->displayList == D_06002FF0)) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_06001300)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_06001700)); - gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_06001900)); - } else if ((thisx->params == 10) && (this->displayList == D_06002FF0)) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_06001B00)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_06001F00)); - gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_06002100)); + } else if ((thisx->params == 9) && (this->displayList == object_tite_DL_002FF0)) { + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001300)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001700)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001900)); + } else if ((thisx->params == 10) && (this->displayList == object_tite_DL_002FF0)) { + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001B00)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001F00)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(object_tite_Tex_002100)); } if (this->displayList != NULL) { diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 3a869d580c..87cd33f90f 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -1,4 +1,5 @@ #include "z_en_rd.h" +#include "objects/object_rd/object_rd.h" #define FLAGS 0x00000415 @@ -117,20 +118,6 @@ static Vec3f D_80AE4940 = { 300.0f, 0.0f, 0.0f }; static Vec3f D_80AE494C = { 300.0f, 0.0f, 0.0f }; static Vec3f D_80AE4958 = { 0.25f, 0.25f, 0.25f }; -extern FlexSkeletonHeader D_06003DD8; -extern AnimationHeader D_06004268; -extern AnimationHeader D_060046F8; -extern AnimationHeader D_06004ADC; -extern AnimationHeader D_06004F94; -extern AnimationHeader D_060057AC; -extern AnimationHeader D_06005D98; -extern AnimationHeader D_06006E88; -extern AnimationHeader D_060074F0; -extern AnimationHeader D_06008040; -extern AnimationHeader D_060087D0; -extern FlexSkeletonHeader D_0600E778; -extern AnimationHeader D_0600EFDC; - void EnRd_SetupAction(EnRd* this, EnRdActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -157,12 +144,12 @@ void EnRd_Init(Actor* thisx, GlobalContext* globalCtx) { } if (thisx->params >= -1) { - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600E778, &D_060087D0, this->jointTable, this->morphTable, - 26); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_00E778, &object_rd_Anim_0087D0, + this->jointTable, this->morphTable, 26); thisx->naviEnemyId = 0x2A; } else { - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06003DD8, &D_060087D0, this->jointTable, this->morphTable, - 26); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_003DD8, &object_rd_Anim_0087D0, + this->jointTable, this->morphTable, 26); thisx->naviEnemyId = 0x2D; } @@ -211,9 +198,9 @@ void func_80AE2630(GlobalContext* globalCtx, Actor* thisx, s32 arg2) { void func_80AE269C(EnRd* this) { if (this->actor.params != 2) { - Animation_MorphToLoop(&this->skelAnime, &D_060087D0, -6.0f); + Animation_MorphToLoop(&this->skelAnime, &object_rd_Anim_0087D0, -6.0f); } else { - Animation_PlayLoop(&this->skelAnime, &D_06005D98); + Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_005D98); } this->unk_31B = 0; @@ -230,9 +217,9 @@ void func_80AE2744(EnRd* this, GlobalContext* globalCtx) { if ((this->actor.params == 2) && (0.0f == this->skelAnime.curFrame)) { if (Rand_ZeroOne() >= 0.5f) { - Animation_PlayLoop(&this->skelAnime, &D_06005D98); + Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_005D98); } else { - Animation_PlayLoop(&this->skelAnime, &D_060057AC); + Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_0057AC); } } else { this->unk_30C--; @@ -275,7 +262,8 @@ void func_80AE2744(EnRd* this, GlobalContext* globalCtx) { } void func_80AE2970(EnRd* this) { - Animation_Change(&this->skelAnime, &D_060087D0, 0, 0, Animation_GetLastFrame(&D_060087D0), ANIMMODE_LOOP, -6.0f); + Animation_Change(&this->skelAnime, &object_rd_Anim_0087D0, 0, 0, Animation_GetLastFrame(&object_rd_Anim_0087D0), + ANIMMODE_LOOP, -6.0f); this->unk_31B = 11; this->unk_30C = 6; this->actor.shape.rot.x = -0x4000; @@ -309,8 +297,8 @@ void func_80AE2A10(EnRd* this, GlobalContext* globalCtx) { } void func_80AE2B90(EnRd* this, GlobalContext* globalCtx) { - Animation_Change(&this->skelAnime, &D_0600EFDC, 1.0f, 4.0f, Animation_GetLastFrame(&D_0600EFDC), - ANIMMODE_LOOP_INTERP, -4.0f); + Animation_Change(&this->skelAnime, &object_rd_Anim_00EFDC, 1.0f, 4.0f, + Animation_GetLastFrame(&object_rd_Anim_00EFDC), ANIMMODE_LOOP_INTERP, -4.0f); this->actor.speedXZ = 0.4f; this->unk_31B = 4; EnRd_SetupAction(this, func_80AE2C1C); @@ -379,8 +367,8 @@ void func_80AE2C1C(EnRd* this, GlobalContext* globalCtx) { } void func_80AE2F50(EnRd* this, GlobalContext* globalCtx) { - Animation_Change(&this->skelAnime, &D_0600EFDC, 0.5f, 0, Animation_GetLastFrame(&D_0600EFDC), ANIMMODE_LOOP_INTERP, - -4.0f); + Animation_Change(&this->skelAnime, &object_rd_Anim_00EFDC, 0.5f, 0, Animation_GetLastFrame(&object_rd_Anim_00EFDC), + ANIMMODE_LOOP_INTERP, -4.0f); this->unk_31B = 2; EnRd_SetupAction(this, func_80AE2FD0); } @@ -428,8 +416,8 @@ void func_80AE2FD0(EnRd* this, GlobalContext* globalCtx) { } void func_80AE31DC(EnRd* this) { - Animation_Change(&this->skelAnime, &D_0600EFDC, 0.5f, 0, Animation_GetLastFrame(&D_0600EFDC), ANIMMODE_LOOP_INTERP, - -4.0f); + Animation_Change(&this->skelAnime, &object_rd_Anim_00EFDC, 0.5f, 0, Animation_GetLastFrame(&object_rd_Anim_00EFDC), + ANIMMODE_LOOP_INTERP, -4.0f); this->unk_31B = 3; this->unk_305 = 1; EnRd_SetupAction(this, func_80AE3260); @@ -474,7 +462,7 @@ void func_80AE3260(EnRd* this, GlobalContext* globalCtx) { } void func_80AE33F0(EnRd* this) { - Animation_PlayOnce(&this->skelAnime, &D_06004ADC); + Animation_PlayOnce(&this->skelAnime, &object_rd_Anim_004ADC); this->unk_30C = this->unk_304 = 0; this->unk_319 = 200; this->unk_31B = 8; @@ -492,7 +480,7 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) { switch (this->unk_304) { case 1: - Animation_PlayLoop(&this->skelAnime, &D_06004268); + Animation_PlayLoop(&this->skelAnime, &object_rd_Anim_004268); this->unk_304++; globalCtx->damagePlayer(globalCtx, -8); func_800AA000(this->actor.xzDistToPlayer, 0xFF, 1, 0xC); @@ -502,8 +490,8 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) { Math_SmoothStepToS(&this->unk_310, 0, 1, 0x5DC, 0); case 2: if (!(player->stateFlags2 & 0x80)) { - Animation_Change(&this->skelAnime, &D_060046F8, 0.5f, 0.0f, Animation_GetLastFrame(&D_060046F8), - ANIMMODE_ONCE_INTERP, 0.0f); + Animation_Change(&this->skelAnime, &object_rd_Anim_0046F8, 0.5f, 0.0f, + Animation_GetLastFrame(&object_rd_Anim_0046F8), ANIMMODE_ONCE_INTERP, 0.0f); this->unk_304++; this->unk_31B = 4; return; @@ -553,8 +541,8 @@ void func_80AE3454(EnRd* this, GlobalContext* globalCtx) { } void func_80AE37BC(EnRd* this) { - Animation_Change(&this->skelAnime, &D_06004F94, 0.0f, 0.0f, Animation_GetLastFrame(&D_06004F94), ANIMMODE_ONCE, - 0.0f); + Animation_Change(&this->skelAnime, &object_rd_Anim_004F94, 0.0f, 0.0f, + Animation_GetLastFrame(&object_rd_Anim_004F94), ANIMMODE_ONCE, 0.0f); this->unk_31B = 7; EnRd_SetupAction(this, func_80AE3834); } @@ -578,7 +566,7 @@ void func_80AE3834(EnRd* this, GlobalContext* globalCtx) { } void func_80AE392C(EnRd* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06008040, -4.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_rd_Anim_008040, -4.0f); this->unk_31B = 5; EnRd_SetupAction(this, func_80AE3978); } @@ -594,8 +582,8 @@ void func_80AE3978(EnRd* this, GlobalContext* globalCtx) { } void func_80AE39D4(EnRd* this) { - Animation_Change(&this->skelAnime, &D_06008040, -1.0f, Animation_GetLastFrame(&D_06008040), 0.0f, ANIMMODE_ONCE, - -4.0f); + Animation_Change(&this->skelAnime, &object_rd_Anim_008040, -1.0f, Animation_GetLastFrame(&object_rd_Anim_008040), + 0.0f, ANIMMODE_ONCE, -4.0f); this->unk_31B = 6; EnRd_SetupAction(this, func_80AE3A54); } @@ -607,7 +595,7 @@ void func_80AE3A54(EnRd* this, GlobalContext* globalCtx) { } void func_80AE3A8C(EnRd* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_060074F0, -6.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_rd_Anim_0074F0, -6.0f); if (this->actor.bgCheckFlags & 1) { this->actor.speedXZ = -2.0f; @@ -645,7 +633,7 @@ void func_80AE3B18(EnRd* this, GlobalContext* globalCtx) { } void func_80AE3C20(EnRd* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_06006E88, -1.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &object_rd_Anim_006E88, -1.0f); this->unk_31B = 10; this->unk_30C = 300; this->actor.flags &= ~1; diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 46d5f1bbbe..e9e4dfc147 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -8,6 +8,7 @@ #include "z_en_reeba.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "vt.h" +#include "objects/object_reeba/object_reeba.h" #define FLAGS 0x08000015 @@ -98,9 +99,6 @@ static ColliderCylinderInit sCylinderInit = { { 20, 40, 0, { 0, 0, 0 } }, }; -extern AnimationHeader D_060001E4; -extern SkeletonHeader D_06001EE8; - void EnReeba_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnReeba* this = THIS; @@ -110,7 +108,8 @@ void EnReeba_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.targetMode = 3; this->actor.gravity = -3.5f; this->actor.focus.pos = this->actor.world.pos; - SkelAnime_Init(globalCtx, &this->skelanime, &D_06001EE8, &D_060001E4, this->jointTable, this->morphTable, 18); + SkelAnime_Init(globalCtx, &this->skelanime, &object_reeba_Skel_001EE8, &object_reeba_Anim_0001E4, this->jointTable, + this->morphTable, 18); this->actor.colChkInfo.mass = MASS_HEAVY; this->actor.colChkInfo.health = 4; Collider_InitCylinder(globalCtx, &this->collider); @@ -166,11 +165,11 @@ void EnReeba_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void func_80AE4F40(EnReeba* this, GlobalContext* globalCtx) { - f32 frames = Animation_GetLastFrame(&D_060001E4); + f32 frames = Animation_GetLastFrame(&object_reeba_Anim_0001E4); Player* player = PLAYER; s16 playerSpeed; - Animation_Change(&this->skelanime, &D_060001E4, 2.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); + Animation_Change(&this->skelanime, &object_reeba_Anim_0001E4, 2.0f, 0.0f, frames, ANIMMODE_LOOP, -10.0f); playerSpeed = fabsf(player->linearVelocity); this->unk_278 = 20 - playerSpeed * 2; diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index 724b6b2886..be2df85d3a 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -6,6 +6,7 @@ #include "z_en_rl.h" #include "vt.h" +#include "objects/object_rl/object_rl.h" #define FLAGS 0x00000010 @@ -28,12 +29,7 @@ void func_80AE7FD0(EnRl* this, GlobalContext* globalCtx); void func_80AE7FDC(EnRl* this, GlobalContext* globalCtx); void func_80AE7D94(EnRl* this, GlobalContext* globalCtx); -static void* D_80AE81A0[] = { 0x06003620, 0x06003960, 0x06003B60 }; - -extern FlexSkeletonHeader D_06007B38; -extern AnimationHeader D_06000A3C; -extern AnimationHeader D_06000830; -extern AnimationHeader D_0600040C; +static void* D_80AE81A0[] = { object_rl_Tex_003620, object_rl_Tex_003960, object_rl_Tex_003B60 }; void EnRl_Destroy(Actor* thisx, GlobalContext* globalCtx) { EnRl* this = THIS; @@ -57,8 +53,8 @@ void func_80AE72D0(EnRl* this) { } void func_80AE7358(EnRl* this) { - Animation_Change(&this->skelAnime, &D_06000A3C, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000A3C), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_rl_Anim_000A3C, 1.0f, 0.0f, + Animation_GetLastFrame(&object_rl_Anim_000A3C), ANIMMODE_LOOP, 0.0f); this->action = 4; this->drawConfig = 0; this->alpha = 0; @@ -115,7 +111,7 @@ s32 func_80AE74FC(EnRl* this, GlobalContext* globalCtx, u16 arg2, s32 arg3) { } void func_80AE7544(EnRl* this, GlobalContext* globalCtx) { - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007B38, &D_06000A3C, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rl_Skel_007B38, &object_rl_Anim_000A3C, NULL, NULL, 0); } void func_80AE7590(EnRl* this, GlobalContext* globalCtx) { @@ -151,8 +147,8 @@ void func_80AE7698(EnRl* this, GlobalContext* globalCtx) { if (globalCtx->csCtx.state != CS_STATE_IDLE) { csCmdActorAction = globalCtx->csCtx.npcActions[0]; if (csCmdActorAction != NULL && csCmdActorAction->action == 3) { - Animation_Change(&this->skelAnime, &D_0600040C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600040C), - ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &object_rl_Anim_00040C, 1.0f, 0.0f, + Animation_GetLastFrame(&object_rl_Anim_00040C), ANIMMODE_ONCE, 0.0f); this->action = 2; } } @@ -160,8 +156,8 @@ void func_80AE7698(EnRl* this, GlobalContext* globalCtx) { void func_80AE772C(EnRl* this, s32 arg1) { if (arg1) { - Animation_Change(&this->skelAnime, &D_06000830, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000830), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_rl_Anim_000830, 1.0f, 0.0f, + Animation_GetLastFrame(&object_rl_Anim_000830), ANIMMODE_LOOP, 0.0f); this->action = 3; } } @@ -194,7 +190,7 @@ void func_80AE7838(EnRl* this, GlobalContext* globalCtx) { } void func_80AE7878(EnRl* this, GlobalContext* globalCtx) { - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007B38, &D_06000A3C, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rl_Skel_007B38, &object_rl_Anim_000A3C, NULL, NULL, 0); this->action = 4; this->actor.shape.shadowAlpha = 0; } @@ -246,8 +242,8 @@ void func_80AE79A4(EnRl* this, GlobalContext* globalCtx) { void func_80AE7AF8(EnRl* this, GlobalContext* globalCtx) { if (func_80AE74B4(this, globalCtx, 3, 0)) { - Animation_Change(&this->skelAnime, &D_0600040C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600040C), ANIMMODE_ONCE, - -8.0f); + Animation_Change(&this->skelAnime, &object_rl_Anim_00040C, 1.0f, 0.0f, + Animation_GetLastFrame(&object_rl_Anim_00040C), ANIMMODE_ONCE, -8.0f); this->action = 6; } else if (func_80AE74FC(this, globalCtx, 4, 0)) { this->action = 5; @@ -264,8 +260,8 @@ void func_80AE7AF8(EnRl* this, GlobalContext* globalCtx) { void func_80AE7BF8(EnRl* this, s32 arg1) { if (arg1 != 0) { - Animation_Change(&this->skelAnime, &D_06000830, 1.0f, 0.0f, Animation_GetLastFrame(&D_06000830), ANIMMODE_LOOP, - 0.0f); + Animation_Change(&this->skelAnime, &object_rl_Anim_000830, 1.0f, 0.0f, + Animation_GetLastFrame(&object_rl_Anim_000830), ANIMMODE_LOOP, 0.0f); this->action = 7; } } diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index ec4888e56b..de43fe6e98 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -6,6 +6,7 @@ #include "z_en_sb.h" #include "vt.h" +#include "objects/object_sb/object_sb.h" #define FLAGS 0x00000005 @@ -106,20 +107,13 @@ typedef enum { /* 0x04 */ SHELLBLADE_BOUNCE } ShellbladeBehavior; -extern FlexSkeletonHeader D_06002BF0; -extern AnimationHeader D_06000194; -extern AnimationHeader D_0600004C; -extern AnimationHeader D_06000124; -extern AnimationHeader D_06002C8C; -extern AnimationHeader D_060000B4; - void EnSb_Init(Actor* thisx, GlobalContext* globalCtx) { EnSb* this = THIS; Actor_ProcessInitChain(&this->actor, sInitChain); this->actor.colChkInfo.damageTable = sDamageTable; this->actor.colChkInfo.health = 2; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06002BF0, &D_06000194, NULL, NULL, 0); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_sb_Skel_002BF0, &object_sb_Anim_000194, NULL, NULL, 0); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &sCylinderInit); this->isDead = false; @@ -151,45 +145,49 @@ void EnSb_SpawnBubbles(GlobalContext* globalCtx, EnSb* this) { } void EnSb_SetupWaitClosed(EnSb* this) { - Animation_Change(&this->skelAnime, &D_0600004C, 1.0f, 0, Animation_GetLastFrame(&D_0600004C), ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &object_sb_Anim_00004C, 1.0f, 0, Animation_GetLastFrame(&object_sb_Anim_00004C), + ANIMMODE_ONCE, 0.0f); this->behavior = SHELLBLADE_WAIT_CLOSED; this->actionFunc = EnSb_WaitClosed; } void EnSb_SetupOpen(EnSb* this) { - Animation_Change(&this->skelAnime, &D_06000194, 1.0f, 0, Animation_GetLastFrame(&D_06000194), ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &object_sb_Anim_000194, 1.0f, 0, Animation_GetLastFrame(&object_sb_Anim_000194), + ANIMMODE_ONCE, 0.0f); this->behavior = SHELLBLADE_OPEN; this->actionFunc = EnSb_Open; Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHELL_MOUTH); } void EnSb_SetupWaitOpen(EnSb* this) { - Animation_Change(&this->skelAnime, &D_06002C8C, 1.0f, 0, Animation_GetLastFrame(&D_06002C8C), ANIMMODE_LOOP, 0.0f); + Animation_Change(&this->skelAnime, &object_sb_Anim_002C8C, 1.0f, 0, Animation_GetLastFrame(&object_sb_Anim_002C8C), + ANIMMODE_LOOP, 0.0f); this->behavior = SHELLBLADE_WAIT_OPEN; this->actionFunc = EnSb_WaitOpen; } void EnSb_SetupLunge(EnSb* this) { - f32 frameCount = Animation_GetLastFrame(&D_06000124); + f32 frameCount = Animation_GetLastFrame(&object_sb_Anim_000124); f32 playbackSpeed = this->actor.yDistToWater > 0.0f ? 1.0f : 0.0f; - Animation_Change(&this->skelAnime, &D_06000124, playbackSpeed, 0.0f, frameCount, ANIMMODE_ONCE, 0); + Animation_Change(&this->skelAnime, &object_sb_Anim_000124, playbackSpeed, 0.0f, frameCount, ANIMMODE_ONCE, 0); this->behavior = SHELLBLADE_LUNGE; this->actionFunc = EnSb_Lunge; Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHELL_MOUTH); } void EnSb_SetupBounce(EnSb* this) { - Animation_Change(&this->skelAnime, &D_060000B4, 1.0f, 0, Animation_GetLastFrame(&D_060000B4), ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &object_sb_Anim_0000B4, 1.0f, 0, Animation_GetLastFrame(&object_sb_Anim_0000B4), + ANIMMODE_ONCE, 0.0f); this->behavior = SHELLBLADE_BOUNCE; this->actionFunc = EnSb_Bounce; } void EnSb_SetupCooldown(EnSb* this, s32 changeSpeed) { - f32 frameCount = Animation_GetLastFrame(&D_0600004C); + f32 frameCount = Animation_GetLastFrame(&object_sb_Anim_00004C); if (this->behavior != SHELLBLADE_WAIT_CLOSED) { - Animation_Change(&this->skelAnime, &D_0600004C, 1.0f, 0, frameCount, ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &object_sb_Anim_00004C, 1.0f, 0, frameCount, ANIMMODE_ONCE, 0.0f); } this->behavior = SHELLBLADE_WAIT_CLOSED; if (changeSpeed) { @@ -221,7 +219,7 @@ void EnSb_WaitClosed(EnSb* this, GlobalContext* globalCtx) { void EnSb_Open(EnSb* this, GlobalContext* globalCtx) { f32 currentFrame = this->skelAnime.curFrame; - if (Animation_GetLastFrame(&D_06000194) <= currentFrame) { + if (Animation_GetLastFrame(&object_sb_Anim_000194) <= currentFrame) { this->timer = 15; EnSb_SetupWaitOpen(this); } else { @@ -292,7 +290,7 @@ void EnSb_Bounce(EnSb* this, GlobalContext* globalCtx) { f32 frameCount; currentFrame = this->skelAnime.curFrame; - frameCount = Animation_GetLastFrame(&D_060000B4); + frameCount = Animation_GetLastFrame(&object_sb_Anim_0000B4); Math_StepToF(&this->actor.speedXZ, 0.0f, 0.2f); if (currentFrame == frameCount) { diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 6bdda72487..74d515740e 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -5,6 +5,7 @@ */ #include "z_en_siofuki.h" +#include "objects/object_siofuki/object_siofuki.h" #define FLAGS 0x00000030 @@ -35,9 +36,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern Gfx D_06000B70[]; -extern UNK_TYPE D_06000D78; - void EnSiofuki_Init(Actor* thisx, GlobalContext* globalCtx) { EnSiofuki* this = THIS; s32 type; @@ -51,7 +49,7 @@ void EnSiofuki_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(thisx, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_PLAYER); - CollisionHeader_GetVirtual(&D_06000D78, &colHeader); + CollisionHeader_GetVirtual(&object_siofuki_Col_000D78, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); this->sfxFlags |= 1; @@ -294,7 +292,7 @@ void EnSiofuki_Draw(Actor* thisx, GlobalContext* globalCtx) { x = gameplayFrames * 15; y = gameplayFrames * -15; gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, x, y, 64, 64, 1, x, y, 64, 64)); - gSPDisplayList(POLY_XLU_DISP++, D_06000B70); + gSPDisplayList(POLY_XLU_DISP++, object_siofuki_DL_000B70); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_siofuki.c", 674); if (this->sfxFlags & 1) { diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 9161fd40b3..f6dd9d2759 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -1,4 +1,5 @@ #include "z_en_ssh.h" +#include "objects/object_ssh/object_ssh.h" #define FLAGS 0x00000035 @@ -29,12 +30,6 @@ void EnSsh_Drop(EnSsh* this, GlobalContext* globalCtx); void EnSsh_Return(EnSsh* this, GlobalContext* globalCtx); void EnSsh_Start(EnSsh* this, GlobalContext* globalCtx); -extern AnimationHeader D_06000304; -extern SkeletonHeader D_060052E0; -extern Gfx D_060046C0[]; -extern Gfx D_06004080[]; -extern Gfx D_06004DE8[]; - static Vtx D_80B043C0[] = { VTX(-1, 0, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), VTX(1, 0, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0xFF), @@ -628,7 +623,7 @@ void EnSsh_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnSsh* this = THIS; - frameCount = Animation_GetLastFrame(&D_06000304); + frameCount = Animation_GetLastFrame(&object_ssh_Anim_000304); if (this->actor.params == ENSSH_FATHER) { if (gSaveContext.inventory.gsTokens >= 100) { Actor_Kill(&this->actor); @@ -639,8 +634,8 @@ void EnSsh_Init(Actor* thisx, GlobalContext* globalCtx) { return; } ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); - SkelAnime_Init(globalCtx, &this->skelAnime, &D_060052E0, NULL, this->jointTable, this->morphTable, 30); - Animation_Change(&this->skelAnime, &D_06000304, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP_INTERP, 0.0f); + SkelAnime_Init(globalCtx, &this->skelAnime, &object_ssh_Skel_0052E0, NULL, this->jointTable, this->morphTable, 30); + Animation_Change(&this->skelAnime, &object_ssh_Anim_000304, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP_INTERP, 0.0f); this->blureIdx = EnSsh_CreateBlureEffect(globalCtx); EnSsh_InitColliders(this, globalCtx); this->stateFlags = 0; @@ -867,17 +862,17 @@ s32 EnSsh_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, break; case 4: if (this->actor.params == ENSSH_FATHER) { - *dList = D_060046C0; + *dList = object_ssh_DL_0046C0; } break; case 5: if (this->actor.params == ENSSH_FATHER) { - *dList = D_06004080; + *dList = object_ssh_DL_004080; } break; case 8: if (this->actor.params == ENSSH_FATHER) { - *dList = D_06004DE8; + *dList = object_ssh_DL_004DE8; } break; } diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index f859503fa2..78b49c9fb3 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -5,6 +5,7 @@ */ #include "z_en_st.h" +#include "objects/object_st/object_st.h" #define FLAGS 0x00000035 @@ -123,21 +124,15 @@ static ColliderJntSphInit sJntSphInit = { sJntSphElementsInit, }; -extern SkeletonHeader D_06005298; -extern AnimationHeader D_06000304; -extern AnimationHeader D_06005B98; -extern AnimationHeader D_060055A8; -extern AnimationHeader D_060055A8; - static struct_80034EC0_Entry sAnimations[] = { - { &D_06000304, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, 0.0f }, - { &D_06005B98, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, - { &D_06000304, 4.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, - { &D_06000304, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, - { &D_060055A8, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, - { &D_06000304, 8.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, - { &D_06000304, 6.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, - { &D_06005B98, 2.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, + { &object_st_Anim_000304, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, 0.0f }, + { &object_st_Anim_005B98, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, + { &object_st_Anim_000304, 4.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, + { &object_st_Anim_000304, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, + { &object_st_Anim_0055A8, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE_INTERP, -8.0f }, + { &object_st_Anim_000304, 8.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, + { &object_st_Anim_000304, 6.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, + { &object_st_Anim_005B98, 2.0f, 0.0f, -1.0f, ANIMMODE_LOOP_INTERP, -8.0f }, }; void EnSt_SetupAction(EnSt* this, EnStActionFunc actionFunc) { @@ -793,7 +788,7 @@ void EnSt_Init(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 14.0f); - SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005298, NULL, this->jointTable, this->morphTable, 30); + SkelAnime_Init(globalCtx, &this->skelAnime, &object_st_Skel_005298, NULL, this->jointTable, this->morphTable, 30); func_80034EC0(&this->skelAnime, sAnimations, 0); this->blureIdx = EnSt_CreateBlureEffect(globalCtx); EnSt_InitColliders(this, globalCtx); diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 1b61d7d949..375a9ad7c3 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -5,6 +5,7 @@ */ #include "z_en_stream.h" +#include "objects/object_stream/object_stream.h" #define FLAGS 0x00000010 @@ -16,8 +17,6 @@ void EnStream_Update(Actor* thisx, GlobalContext* globalCtx); void EnStream_Draw(Actor* thisx, GlobalContext* globalCtx); void EnStream_WaitForPlayer(EnStream* this, GlobalContext* globalCtx); -extern Gfx D_06000950[]; - const ActorInit En_Stream_InitVars = { ACTOR_EN_STREAM, ACTORCAT_BG, @@ -142,6 +141,6 @@ void EnStream_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 30, -multipliedFrames, 0x40, 0x40, 1, multipliedFrames, -multipliedFrames, 0x40, 0x40)); - gSPDisplayList(POLY_XLU_DISP++, D_06000950); + gSPDisplayList(POLY_XLU_DISP++, object_stream_DL_000950); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_stream.c", 310); } diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 9fcfadb155..b1f4e2ea5f 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -1,4 +1,5 @@ #include "z_en_sw.h" +#include "objects/object_st/object_st.h" #define FLAGS 0x00000015 @@ -49,27 +50,14 @@ static ColliderJntSphInit sJntSphInit = { static CollisionCheckInfoInit2 D_80B0F074 = { 1, 2, 25, 25, MASS_IMMOVABLE }; static struct_80034EC0_Entry D_80B0F080[] = { - { 0x06000304, 1.0f, 0.0f, -1.0f, 0x01, 0.0f }, - { 0x06000304, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, - { 0x060055A8, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, - { 0x06005B98, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, + { &object_st_Anim_000304, 1.0f, 0.0f, -1.0f, 0x01, 0.0f }, + { &object_st_Anim_000304, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, + { &object_st_Anim_0055A8, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, + { &object_st_Anim_005B98, 1.0f, 0.0f, -1.0f, 0x01, -8.0f }, }; char D_80B0F630[0x80]; // unused -extern SkeletonHeader D_06005298; -extern Gfx D_06004788[]; -extern Gfx D_060046F0[]; -extern Gfx D_06004658[]; -extern Gfx D_060045C0[]; -extern Gfx D_06004820[]; -extern Gfx D_060048B8[]; -extern Gfx D_06004950[]; -extern Gfx D_060049E8[]; -extern Gfx D_06003FB0[]; -extern Gfx D_060043D8[]; -extern AnimationHeader D_06000304; - void EnSw_CrossProduct(Vec3f* a, Vec3f* b, Vec3f* dst) { dst->x = (a->y * b->z) - (a->z * b->y); dst->y = (a->z * b->x) - (a->x * b->z); @@ -242,7 +230,7 @@ void EnSw_Init(Actor* thisx, GlobalContext* globalCtx) { return; } - SkelAnime_Init(globalCtx, &this->skelAnime, &D_06005298, NULL, this->jointTable, this->morphTable, 30); + SkelAnime_Init(globalCtx, &this->skelAnime, &object_st_Skel_005298, NULL, this->jointTable, this->morphTable, 30); func_80034EC0(&this->skelAnime, D_80B0F080, 0); ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f); Collider_InitJntSph(globalCtx, &this->collider); @@ -789,7 +777,7 @@ void func_80B0E314(EnSw* this, Vec3f arg1, f32 arg4) { s32 func_80B0E430(EnSw* this, f32 arg1, s16 arg2, s32 arg3, GlobalContext* globalCtx) { Camera* activeCam; - f32 lastFrame = Animation_GetLastFrame(&D_06000304); + f32 lastFrame = Animation_GetLastFrame(&object_st_Anim_000304); if (DECR(this->unk_388) != 0) { Math_SmoothStepToF(&this->skelAnime.playSpeed, 0.0f, 0.6f, 1000.0f, 0.01f); @@ -917,34 +905,34 @@ s32 EnSw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, if (((this->actor.params & 0xE000) >> 0xD) != 0) { switch (limbIndex) { case 23: - *dList = D_06004788; + *dList = object_st_DL_004788; break; case 8: - *dList = D_060046F0; + *dList = object_st_DL_0046F0; break; case 14: - *dList = D_06004658; + *dList = object_st_DL_004658; break; case 11: - *dList = D_060045C0; + *dList = object_st_DL_0045C0; break; case 26: - *dList = D_06004820; + *dList = object_st_DL_004820; break; case 20: - *dList = D_060048B8; + *dList = object_st_DL_0048B8; break; case 17: - *dList = D_06004950; + *dList = object_st_DL_004950; break; case 29: - *dList = D_060049E8; + *dList = object_st_DL_0049E8; break; case 5: - *dList = D_06003FB0; + *dList = object_st_DL_003FB0; break; case 4: - *dList = D_060043D8; + *dList = object_st_DL_0043D8; break; } } diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 79fe56090a..7d31978a22 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -6,6 +6,7 @@ #include "z_en_ta.h" #include "vt.h" +#include "objects/object_ta/object_ta.h" #define FLAGS 0x00000009 @@ -71,22 +72,11 @@ static Vec3f D_80B16E7C = { }; static void* D_80B16E88[] = { - 0x06007F80, - 0x06006EC0, - 0x060072C0, + object_ta_Tex_007F80, + object_ta_Tex_006EC0, + object_ta_Tex_0072C0, }; -extern AnimationHeader D_060017E8; -extern AnimationHeader D_06001C94; -extern UNK_TYPE D_06006DC0; -extern FlexSkeletonHeader D_0600B7B8; -extern AnimationHeader D_0600BF38; -extern AnimationHeader D_0600C48C; -extern AnimationHeader D_0600C858; -extern AnimationHeader D_0600CD50; -extern AnimationHeader D_0600CF28; -extern AnimationHeader D_0600E3D8; - void func_80B13AA0(EnTa* this, EnTaActionFunc arg1, EnTaUnkFunc arg2) { this->unk_25C = arg1; this->unk_260 = arg2; @@ -126,7 +116,8 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B7B8, &D_06001C94, this->jointTable, this->morphTable, 17); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ta_Skel_00B7B8, &object_ta_Anim_001C94, this->jointTable, + this->morphTable, 17); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); @@ -152,13 +143,13 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) { } else if (gSaveContext.eventChkInf[6] & 0x400) { func_80B13AA0(this, func_80B14CAC, func_80B167C0); this->unk_2B4 = 0; - Animation_PlayOnce(&this->skelAnime, &D_06001C94); - this->unk_2E4 = &D_06001C94; + Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_001C94); + this->unk_2E4 = &object_ta_Anim_001C94; } else { func_80B13AA0(this, func_80B14754, func_80B167FC); this->unk_2B4 = 2; - Animation_PlayOnce(&this->skelAnime, &D_0600CD50); - this->unk_2E4 = &D_0600CD50; + Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50); + this->unk_2E4 = &object_ta_Anim_00CD50; this->actor.shape.shadowScale = 54.0f; } break; @@ -174,8 +165,8 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) { } else { func_80B13AA0(this, func_80B14D98, func_80B167C0); this->unk_2B4 = 0; - Animation_PlayOnce(&this->skelAnime, &D_06001C94); - this->unk_2E4 = &D_06001C94; + Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_001C94); + this->unk_2E4 = &object_ta_Anim_001C94; } break; default: @@ -186,13 +177,13 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) { } else if (gSaveContext.eventChkInf[1] & 0x8) { func_80B13AA0(this, func_80B14C18, func_80B167C0); this->unk_2B4 = 0; - Animation_PlayOnce(&this->skelAnime, &D_06001C94); - this->unk_2E4 = &D_06001C94; + Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_001C94); + this->unk_2E4 = &object_ta_Anim_001C94; } else { func_80B13AA0(this, func_80B14634, func_80B167FC); this->unk_2B4 = 2; - Animation_PlayOnce(&this->skelAnime, &D_0600CD50); - this->unk_2E4 = &D_0600CD50; + Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50); + this->unk_2E4 = &object_ta_Anim_00CD50; this->actor.shape.shadowScale = 54.0f; } } else if (globalCtx->sceneNum == SCENE_SOUKO) { @@ -218,29 +209,29 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) { if (gSaveContext.eventInf[0] & 0x400) { func_80B13AA0(this, func_80B16608, func_80B16938); - Animation_Change(&this->skelAnime, &D_0600C48C, 1.0f, - Animation_GetLastFrame(&D_0600C48C) - 1.0f, - Animation_GetLastFrame(&D_0600C48C), ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f, + Animation_GetLastFrame(&object_ta_Anim_00C48C) - 1.0f, + Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, 0.0f); gSaveContext.eventInf[0] &= ~0x400; } else { func_80B13AA0(this, func_80B16504, func_80B16854); this->unk_2B4 = 0; - Animation_PlayOnce(&this->skelAnime, &D_060017E8); - this->unk_2E4 = &D_060017E8; + Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_0017E8); + this->unk_2E4 = &object_ta_Anim_0017E8; } } else { func_80B13AA0(this, func_80B146F8, func_80B167FC); this->unk_2B4 = 2; - Animation_PlayOnce(&this->skelAnime, &D_0600CD50); - this->unk_2E4 = &D_0600CD50; + Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50); + this->unk_2E4 = &object_ta_Anim_00CD50; this->actor.shape.shadowScale = 54.0f; } } } else { func_80B13AA0(this, func_80B14634, func_80B167FC); this->unk_2B4 = 2; - Animation_PlayOnce(&this->skelAnime, &D_0600CD50); - this->unk_2E4 = &D_0600CD50; + Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CD50); + this->unk_2E4 = &object_ta_Anim_00CD50; this->actor.shape.shadowScale = 54.0f; } break; @@ -333,8 +324,8 @@ void func_80B14570(EnTa* this, GlobalContext* globalCtx) { func_80B13AA0(this, func_80B144D8, func_80B167C0); this->unk_2CE = 3; this->unk_2CC = 60; - Animation_PlayOnce(&this->skelAnime, &D_0600E3D8); - this->unk_2E4 = &D_06001C94; + Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00E3D8); + this->unk_2E4 = &object_ta_Anim_001C94; Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SURPRISE); } } @@ -485,8 +476,8 @@ void func_80B14B6C(EnTa* this, GlobalContext* globalCtx) { func_80B13AA0(this, func_80B14AF4, func_80B167C0); this->unk_2CC = 5; gSaveContext.eventChkInf[1] |= 0x10; - Animation_PlayOnce(&this->skelAnime, &D_0600CF28); - this->unk_2E4 = &D_0600C858; + Animation_PlayOnce(&this->skelAnime, &object_ta_Anim_00CF28); + this->unk_2E4 = &object_ta_Anim_00C858; } this->unk_2E0 |= 1; } @@ -568,18 +559,18 @@ void func_80B14EDC(EnTa* this, GlobalContext* globalCtx) { void func_80B14F20(EnTa* this, EnTaActionFunc arg1) { func_80B13AA0(this, arg1, func_80B16854); this->unk_2B4 = 2; - Animation_Change(&this->skelAnime, &D_060017E8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060017E8), ANIMMODE_ONCE, - -5.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_0017E8, 1.0f, 0.0f, + Animation_GetLastFrame(&object_ta_Anim_0017E8), ANIMMODE_ONCE, -5.0f); this->unk_2E2 = 0; - this->unk_2E4 = &D_060017E8; + this->unk_2E4 = &object_ta_Anim_0017E8; } void func_80B14FAC(EnTa* this, EnTaActionFunc arg1) { this->unk_2B4 = 1; func_80B13AA0(this, arg1, func_80B16938); this->unk_2E0 &= ~0x10; - Animation_Change(&this->skelAnime, &D_0600C48C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600C48C), ANIMMODE_ONCE, - -5.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f, 0.0f, + Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, -5.0f); } void func_80B15034(EnTa* this, GlobalContext* globalCtx) { @@ -611,8 +602,9 @@ void func_80B15100(EnTa* this, GlobalContext* globalCtx) { if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { s32 unk_2CA; - Animation_Change(&this->skelAnime, &D_0600C48C, 1.0f, Animation_GetLastFrame(&D_0600C48C) - 1.0f, - Animation_GetLastFrame(&D_0600C48C), ANIMMODE_ONCE, 10.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f, + Animation_GetLastFrame(&object_ta_Anim_00C48C) - 1.0f, + Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, 10.0f); this->unk_2E0 &= ~0x10; func_80106CCC(globalCtx); unk_2CA = this->unk_2CA; @@ -659,10 +651,10 @@ s32 func_80B152D0(EnTa* this, GlobalContext* globalCtx) { void func_80B15308(EnTa* this) { if (this->unk_2E0 & 0x10) { if (this->unk_2E0 & 0x100) { - Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 17.0f, 22.0f, ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 17.0f, 22.0f, ANIMMODE_ONCE, 0.0f); this->unk_2E0 &= ~0x100; } else { - Animation_Change(&this->skelAnime, &D_0600BF38, -1.0f, 21.0f, 16.0f, ANIMMODE_ONCE, 3.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, -1.0f, 21.0f, 16.0f, ANIMMODE_ONCE, 3.0f); this->unk_2E0 |= 0x100; } this->unk_2E0 &= ~0x10; @@ -715,7 +707,8 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) { this->unk_2C4[i]--; } else { this->unk_2CA = i; - Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, + -10.0f); this->unk_2E0 &= ~0x10; switch (func_80B152D0(this, globalCtx)) { @@ -724,7 +717,8 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) { func_8002DF54(globalCtx, &this->actor, 1); func_8010B680(globalCtx, 0x2084, &this->actor); this->unk_25C = func_80B15424; - Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, + -10.0f); this->unk_2E0 &= ~0x10; this->unk_2E0 &= ~0x100; gSaveContext.eventInf[0] |= 0x100; @@ -767,7 +761,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) { func_80B14E28(this, globalCtx); gSaveContext.eventInf[0] &= ~0x100; this->unk_2E0 |= 0x80; - Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f); this->unk_2E0 &= ~0x10; this->unk_2E0 &= ~0x100; } @@ -810,8 +804,9 @@ void func_80B1585C(EnTa* this, GlobalContext* globalCtx) { if (this->unk_2CC == 0) { func_80B13AA0(this, func_80B154FC, func_80B16938); this->unk_2E0 &= ~0x10; - Animation_Change(&this->skelAnime, &D_0600C48C, 1.0f, Animation_GetLastFrame(&D_0600C48C) - 1.0f, - Animation_GetLastFrame(&D_0600C48C), ANIMMODE_ONCE, 10.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00C48C, 1.0f, + Animation_GetLastFrame(&object_ta_Anim_00C48C) - 1.0f, + Animation_GetLastFrame(&object_ta_Anim_00C48C), ANIMMODE_ONCE, 10.0f); func_8002DF54(globalCtx, &this->actor, 7); } } @@ -820,8 +815,8 @@ void func_80B15AD4(EnTa* this, GlobalContext* globalCtx) { if (this->unk_2CC == 0 && this->unk_2E0 & 0x20) { func_80B13AA0(this, func_80B1585C, func_80B16938); this->unk_2E0 &= ~0x10; - Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 1.0f, Animation_GetLastFrame(&D_0600BF38), ANIMMODE_ONCE, - 0.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 1.0f, + Animation_GetLastFrame(&object_ta_Anim_00BF38), ANIMMODE_ONCE, 0.0f); this->unk_2CC = 50; func_80088B34(0x1E); func_800F5ACC(0x6C); @@ -841,7 +836,7 @@ void func_80B15BF8(EnTa* this, GlobalContext* globalCtx) { if (this->unk_2E0 & 0x10) { func_80B13AA0(this, func_80B15AD4, func_80B16938); this->unk_2E0 &= ~0x10; - Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 0.0f, 1.0f, ANIMMODE_ONCE, 0.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 0.0f, 1.0f, ANIMMODE_ONCE, 0.0f); this->unk_2CC = 5; } if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { @@ -854,7 +849,7 @@ void func_80B15CC8(EnTa* this, GlobalContext* globalCtx) { if (this->unk_2E0 & 0x10) { func_80B13AA0(this, func_80B15BF8, func_80B16938); this->unk_2E0 &= ~0x10; - Animation_Change(&this->skelAnime, &D_0600BF38, -1.0f, 29.0f, 0.0f, ANIMMODE_ONCE, 10.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, -1.0f, 29.0f, 0.0f, ANIMMODE_ONCE, 10.0f); } if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { this->unk_2E0 |= 0x20; @@ -865,7 +860,7 @@ void func_80B15CC8(EnTa* this, GlobalContext* globalCtx) { void func_80B15D90(EnTa* this, GlobalContext* globalCtx) { func_80B13AA0(this, func_80B15CC8, func_80B16938); this->unk_2E0 &= ~0x10; - Animation_Change(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f); + Animation_Change(&this->skelAnime, &object_ta_Anim_00BF38, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f); func_8010B720(globalCtx, 0x2080); this->unk_2E0 &= ~0x20; } @@ -1223,7 +1218,7 @@ void EnTa_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800943C8(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(D_80B16E88[this->unk_2B4])); - gSPSegment(POLY_OPA_DISP++, 0x9, SEGMENTED_TO_VIRTUAL(&D_06006DC0)); + gSPSegment(POLY_OPA_DISP++, 0x9, SEGMENTED_TO_VIRTUAL(&object_ta_Tex_006DC0)); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnTa_OverrideLimbDraw, EnTa_PostLimbDraw, this); diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 09fceaec7a..28d6f9924b 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -6,6 +6,7 @@ #include "z_en_takara_man.h" #include "vt.h" +#include "objects/object_ts/object_ts.h" #define FLAGS 0x08000039 @@ -37,9 +38,6 @@ const ActorInit En_Takara_Man_InitVars = { static u8 sTakaraIsInitialized = false; -extern FlexSkeletonHeader D_06004FE0; -extern AnimationHeader D_06000498; - void EnTakaraMan_Destroy(Actor* thisx, GlobalContext* globalCtx) { } @@ -58,7 +56,8 @@ void EnTakaraMan_Init(Actor* thisx, GlobalContext* globalCtx) { globalCtx->actorCtx.flags.chest); // "Bun! %x" (needs a better translation) globalCtx->actorCtx.flags.chest = 0; gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] = -1; - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06004FE0, &D_06000498, this->jointTable, this->morphTable, 10); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ts_Skel_004FE0, &object_ts_Anim_000498, this->jointTable, + this->morphTable, 10); thisx->focus.pos = thisx->world.pos; this->pos = thisx->world.pos; thisx->world.pos.x = 133.0f; @@ -74,9 +73,9 @@ void EnTakaraMan_Init(Actor* thisx, GlobalContext* globalCtx) { } void func_80B176E0(EnTakaraMan* this, GlobalContext* globalCtx) { - f32 frameCount = Animation_GetLastFrame(&D_06000498); + f32 frameCount = Animation_GetLastFrame(&object_ts_Anim_000498); - Animation_Change(&this->skelAnime, &D_06000498, 1.0f, 0.0f, (s16)frameCount, ANIMMODE_LOOP, -10.0f); + Animation_Change(&this->skelAnime, &object_ts_Anim_000498, 1.0f, 0.0f, (s16)frameCount, ANIMMODE_LOOP, -10.0f); if (!this->unk_214) { this->actor.textId = 0x6D; this->dialogState = 4; diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 289f35537c..6e12e85393 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -8,6 +8,7 @@ #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #include "vt.h" +#include "objects/object_tite/object_tite.h" #define FLAGS 0x00000015 @@ -75,21 +76,6 @@ void EnTite_FallApart(EnTite* this, GlobalContext* globalCtx); void EnTite_FlipOnBack(EnTite* this, GlobalContext* globalCtx); void EnTite_FlipUpright(EnTite* this, GlobalContext* globalCtx); -extern SkeletonHeader D_06003A20; -extern AnimationHeader D_060012E4; // Idle (14 frames) -extern AnimationHeader D_06000A14; // Turning (8 frames) -extern AnimationHeader D_0600083C; // Lunge (6 frames) -extern AnimationHeader D_06000C70; // Jump / travelling to player (11 frames) - -// blue tektite textures -extern u32 D_06001300; -extern u32 D_06001700; -extern u32 D_06001900; -// red tektite textures -extern u32 D_06001B00; -extern u32 D_06001F00; -extern u32 D_06002100; - const ActorInit En_Tite_InitVars = { ACTOR_EN_TITE, ACTORCAT_ENEMY, @@ -172,7 +158,7 @@ static InitChainEntry sInitChain[] = { }; static AnimationHeader* D_80B1B634[] = { - 0x0600083C, 0x060004F8, 0x0600069C, NULL, NULL, NULL, + &object_tite_Anim_00083C, &object_tite_Anim_0004F8, &object_tite_Anim_00069C, NULL, NULL, NULL, }; // Some kind of offset for the position of each tektite foot @@ -195,7 +181,8 @@ void EnTite_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(thisx, sInitChain); thisx->targetMode = 3; Actor_SetScale(thisx, 0.01f); - SkelAnime_Init(globalCtx, &this->skelAnime, &D_06003A20, &D_060012E4, this->jointTable, this->morphTable, 25); + SkelAnime_Init(globalCtx, &this->skelAnime, &object_tite_Skel_003A20, &object_tite_Anim_0012E4, this->jointTable, + this->morphTable, 25); ActorShape_Init(&thisx->shape, -200.0f, ActorShadow_DrawCircle, 70.0f); this->flipState = TEKTITE_INITIAL; thisx->colChkInfo.damageTable = sDamageTable; @@ -234,7 +221,7 @@ void EnTite_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void EnTite_SetupIdle(EnTite* this) { - Animation_MorphToLoop(&this->skelAnime, &D_060012E4, 4.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tite_Anim_0012E4, 4.0f); this->action = TEKTITE_IDLE; this->vIdleTimer = Rand_S16Offset(15, 30); this->actor.speedXZ = 0.0f; @@ -266,8 +253,7 @@ void EnTite_Idle(EnTite* this, GlobalContext* globalCtx) { } void EnTite_SetupAttack(EnTite* this) { - - Animation_PlayOnce(&this->skelAnime, &D_0600083C); + Animation_PlayOnce(&this->skelAnime, &object_tite_Anim_00083C); this->action = TEKTITE_ATTACK; this->vAttackState = TEKTITE_BEGIN_LUNGE; this->vQueuedJumps = Rand_S16Offset(1, 3); @@ -384,7 +370,7 @@ void EnTite_Attack(EnTite* this, GlobalContext* globalCtx) { } else { Player* player = PLAYER; this->collider.base.atFlags &= ~AT_HIT; - Animation_MorphToLoop(&this->skelAnime, &D_060012E4, 4.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tite_Anim_0012E4, 4.0f); this->actor.speedXZ = -6.0f; this->actor.world.rot.y = this->actor.yawTowardsPlayer; if (&player->actor == this->collider.base.at) { @@ -436,7 +422,7 @@ void EnTite_Attack(EnTite* this, GlobalContext* globalCtx) { } void EnTite_SetupTurnTowardPlayer(EnTite* this) { - Animation_PlayLoop(&this->skelAnime, &D_06000A14); + Animation_PlayLoop(&this->skelAnime, &object_tite_Anim_000A14); this->action = TEKTITE_TURN_TOWARD_PLAYER; if ((this->actor.bgCheckFlags & 3) || ((this->actor.params == TEKTITE_BLUE) && (this->actor.bgCheckFlags & 0x20))) { if (this->actor.velocity.y <= 0.0f) { @@ -503,7 +489,7 @@ void EnTite_TurnTowardPlayer(EnTite* this, GlobalContext* globalCtx) { } void EnTite_SetupMoveTowardPlayer(EnTite* this) { - Animation_PlayLoop(&this->skelAnime, &D_06000C70); + Animation_PlayLoop(&this->skelAnime, &object_tite_Anim_000C70); this->action = TEKTITE_MOVE_TOWARD_PLAYER; this->actor.velocity.y = 10.0f; this->actor.gravity = -1.0f; @@ -619,7 +605,7 @@ void EnTite_MoveTowardPlayer(EnTite* this, GlobalContext* globalCtx) { void EnTite_SetupRecoil(EnTite* this) { this->action = TEKTITE_RECOIL; - Animation_MorphToLoop(&this->skelAnime, &D_060012E4, 4.0f); + Animation_MorphToLoop(&this->skelAnime, &object_tite_Anim_0012E4, 4.0f); this->actor.speedXZ = -6.0f; this->actor.world.rot.y = this->actor.yawTowardsPlayer; this->actor.gravity = -1.0f; @@ -683,8 +669,8 @@ void EnTite_Recoil(EnTite* this, GlobalContext* globalCtx) { } void EnTite_SetupStunned(EnTite* this) { - Animation_Change(&this->skelAnime, &D_060012E4, 0.0f, 0.0f, (f32)Animation_GetLastFrame(&D_060012E4), ANIMMODE_LOOP, - 4.0f); + Animation_Change(&this->skelAnime, &object_tite_Anim_0012E4, 0.0f, 0.0f, + (f32)Animation_GetLastFrame(&object_tite_Anim_0012E4), ANIMMODE_LOOP, 4.0f); this->action = TEKTITE_STUNNED; this->actor.speedXZ = -6.0f; this->actor.world.rot.y = this->actor.yawTowardsPlayer; @@ -788,7 +774,7 @@ void EnTite_FallApart(EnTite* this, GlobalContext* globalCtx) { void EnTite_SetupFlipOnBack(EnTite* this) { - Animation_PlayLoopSetSpeed(&this->skelAnime, &D_06000A14, 1.5f); + Animation_PlayLoopSetSpeed(&this->skelAnime, &object_tite_Anim_000A14, 1.5f); Audio_PlayActorSound2(&this->actor, NA_SE_EN_TEKU_REVERSE); this->flipState = TEKTITE_FLIPPED; this->vOnBackTimer = 500; @@ -999,13 +985,13 @@ void EnTite_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); Collider_UpdateSpheres(0, &this->collider); if (this->actor.params == TEKTITE_BLUE) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_06001300)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_06001700)); - gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(&D_06001900)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001300)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001700)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001900)); } else { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_06001B00)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_06001F00)); - gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(&D_06002100)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001B00)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(object_tite_Tex_001F00)); + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(object_tite_Tex_002100)); } SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, EnTite_PostLimbDraw, thisx); diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index dcef2b7584..4f3a1831e2 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -5,6 +5,7 @@ */ #include "z_en_toryo.h" +#include "objects/object_toryo/object_toryo.h" #define FLAGS 0x00000009 @@ -95,12 +96,10 @@ typedef struct { f32 transitionRate; } EnToryoAnimation; -static EnToryoAnimation sEnToryoAnimation = { 0x06000E50, 1.0f, 0, 0 }; +static EnToryoAnimation sEnToryoAnimation = { &object_toryo_Anim_000E50, 1.0f, 0, 0 }; static Vec3f sMultVec = { 800.0f, 1000.0f, 0.0f }; -extern FlexSkeletonHeader D_06007150; - void EnToryo_Init(Actor* thisx, GlobalContext* globalCtx) { EnToryo* this = THIS; s32 pad; @@ -128,7 +127,8 @@ void EnToryo_Init(Actor* thisx, GlobalContext* globalCtx) { } ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 42.0f); - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007150, NULL, this->jointTable, this->morphTable, 17); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_toryo_Skel_007150, NULL, this->jointTable, this->morphTable, + 17); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 5fdf9f6a92..6c35185b5d 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -5,6 +5,7 @@ */ #include "z_en_tr.h" +#include "objects/object_tr/object_tr.h" #define FLAGS 0x00000010 @@ -81,14 +82,6 @@ static void* sEyeTextures[] = { 0x060098D8, // Closed }; -extern AnimationHeader D_060013CC; // Looking over right shoulder -extern AnimationHeader D_06001CDC; // Standing, broom in left hand -extern AnimationHeader D_060035CC; // Looking over left shoulder -extern AnimationHeader D_06003FC8; // Standing, broom over right shoulder -extern AnimationHeader D_060049C8; // Floating on broom -extern FlexSkeletonHeader D_0600C530; -extern FlexSkeletonHeader D_06011688; - void EnTr_SetupAction(EnTr* this, EnTrActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -104,18 +97,18 @@ void EnTr_Init(Actor* thisx, GlobalContext* globalCtx) { switch (this->actor.params) { case TR_KOUME: - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011688, &D_06003FC8, this->jointTable, - this->morphTable, 27); - Animation_PlayOnce(&this->skelAnime, &D_06003FC8); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_tr_Skel_011688, &object_tr_Anim_003FC8, + this->jointTable, this->morphTable, 27); + Animation_PlayOnce(&this->skelAnime, &object_tr_Anim_003FC8); this->animation = NULL; EnTr_SetupAction(this, EnTr_ChooseAction1); this->actionIndex = 3; break; case TR_KOTAKE: - SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600C530, &D_06001CDC, this->jointTable, - this->morphTable, 27); - Animation_PlayOnce(&this->skelAnime, &D_06001CDC); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_tr_Skel_00C530, &object_tr_Anim_001CDC, + this->jointTable, this->morphTable, 27); + Animation_PlayOnce(&this->skelAnime, &object_tr_Anim_001CDC); this->animation = NULL; EnTr_SetupAction(this, EnTr_ChooseAction1); this->actionIndex = 2; @@ -310,7 +303,7 @@ void EnTr_WaitToReappear(EnTr* this, GlobalContext* globalCtx) { this->timer = 34; EnTr_SetStartPosRot(this, globalCtx, this->actionIndex); EnTr_SetupAction(this, EnTr_Reappear); - Animation_PlayLoop(&this->skelAnime, &D_060049C8); + Animation_PlayLoop(&this->skelAnime, &object_tr_Anim_0049C8); this->animation = NULL; Actor_SetScale(&this->actor, 0.003f); } @@ -359,7 +352,7 @@ void EnTr_ChooseAction1(EnTr* this, GlobalContext* globalCtx) { case 3: EnTr_SetStartPosRot(this, globalCtx, this->actionIndex); EnTr_SetupAction(this, EnTr_ChooseAction2); - Animation_PlayLoop(&this->skelAnime, &D_060049C8); + Animation_PlayLoop(&this->skelAnime, &object_tr_Anim_0049C8); this->animation = NULL; break; @@ -370,7 +363,7 @@ void EnTr_ChooseAction1(EnTr* this, GlobalContext* globalCtx) { case 7: EnTr_SetupAction(this, EnTr_FlyKidnapCutscene); - Animation_PlayLoop(&this->skelAnime, &D_060049C8); + Animation_PlayLoop(&this->skelAnime, &object_tr_Anim_0049C8); this->animation = NULL; this->timer = ((this->actor.params != TR_KOUME) ? ((u8)frames * 0x400) + 0x8000 : (u8)frames * 0x400); @@ -389,17 +382,17 @@ void EnTr_Update(Actor* thisx, GlobalContext* globalCtx) { if (SkelAnime_Update(&this->skelAnime) != 0) { if (this->animation != NULL) { - if ((this->animation == &D_060035CC) || (this->animation == &D_060013CC)) { + if ((this->animation == &object_tr_Anim_0035CC) || (this->animation == &object_tr_Anim_0013CC)) { if (this->actor.params != TR_KOUME) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH2); } else { Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH); } Animation_PlayLoop(&this->skelAnime, this->animation); - } else if (this->animation == &D_060049C8) { + } else if (this->animation == &object_tr_Anim_0049C8) { EnTr_SetupAction(this, EnTr_ChooseAction2); - Animation_Change(&this->skelAnime, &D_060049C8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060049C8), - ANIMMODE_LOOP, -5.0f); + Animation_Change(&this->skelAnime, &object_tr_Anim_0049C8, 1.0f, 0.0f, + Animation_GetLastFrame(&object_tr_Anim_0049C8), ANIMMODE_LOOP, -5.0f); } else { Animation_PlayLoop(&this->skelAnime, this->animation); } diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 70ad28862c..61843be28d 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -10,6 +10,10 @@ #include "objects/gameplay_keep/gameplay_keep.h" #include "objects/object_horse_zelda/object_horse_zelda.h" #include "objects/object_horse_ganon/object_horse_ganon.h" +#include "objects/object_im/object_im.h" +#include "objects/object_gndd/object_gndd.h" +#include "objects/object_ganon/object_ganon.h" +#include "objects/object_opening_demo1/object_opening_demo1.h" #define FLAGS 0x00000010 @@ -38,40 +42,6 @@ void func_80B2BA38(EnViewer* this, GlobalContext* globalCtx); void func_80B2C130(EnViewer* this, GlobalContext* globalCtx); extern Mtx D_01000000; -extern AnimationHeader D_06000450; -extern AnimationHeader D_060005B4; -extern AnimationHeader D_060008A0; -extern AnimationHeader D_06000BC8; -extern AnimationHeader D_06000F54; -extern AnimationHeader D_06001410; -extern AnimationHeader D_060014F4; -extern AnimationHeader D_06001D28; -extern AnimationHeader D_06002574; -extern AnimationHeader D_06002928; -extern AnimationHeader D_060029CC; -extern AnimationHeader D_06003284; -extern AnimationHeader D_06003428; -extern AnimationHeader D_06003D84; -extern AnimationHeader D_0600420C; -extern AnimationHeader D_06004260; -extern AnimationHeader D_06004534; -extern AnimationHeader D_060048B0; -extern AnimationHeader D_060048FC; -extern AnimationHeader D_0600504C; -extern AnimationHeader D_060050A8; -extern UNK_TYPE D_06007210; -extern UNK_TYPE D_0600A4E0; -extern Gfx D_0600BE90[]; -extern Gfx D_0600D0D8[]; -extern Gfx D_0600E1A8[]; -extern UNK_TYPE D_0600F178; -extern UNK_TYPE D_0600F378; -extern UNK_TYPE D_0600F578; -extern UNK_TYPE D_0600F778; -extern FlexSkeletonHeader D_0600F788; -extern AnimationHeader D_06011348; -extern FlexSkeletonHeader D_060114E8; -extern FlexSkeletonHeader D_060119E8; static u8 D_80B2CEC0 = false; @@ -93,15 +63,15 @@ static InitChainEntry sInitChain[] = { struct_80B2CEE8 D_80B2CEE8[] = { { OBJECT_HORSE_ZELDA, OBJECT_HORSE_ZELDA, 1, 0, 2, 20, 1, &gHorseZeldaSkel, &gHorseZeldaGallopingAnim }, - { OBJECT_IM, OBJECT_OPENING_DEMO1, 1, 0, 0, 10, 3, &D_0600F788, &D_060029CC }, - { OBJECT_ZL4, OBJECT_OPENING_DEMO1, 1, 0, 0, 10, 2, &gChildZeldaSkel, &D_06000450 }, - { OBJECT_GNDD, OBJECT_GNDD, 1, -6, 0, 10, 0, &D_060119E8, &D_06002928 }, + { OBJECT_IM, OBJECT_OPENING_DEMO1, 1, 0, 0, 10, 3, &object_im_Skel_00F788, &object_opening_demo1_Anim_0029CC }, + { OBJECT_ZL4, OBJECT_OPENING_DEMO1, 1, 0, 0, 10, 2, &gChildZeldaSkel, &object_opening_demo1_Anim_000450 }, + { OBJECT_GNDD, OBJECT_GNDD, 1, -6, 0, 10, 0, &object_gndd_Skel_0119E8, &object_gndd_Anim_002928 }, { OBJECT_HORSE_GANON, OBJECT_HORSE_GANON, 1, 0, 2, 20, 1, &gHorseGanonSkel, &gHorseGanonRearingAnim }, - { OBJECT_GNDD, OBJECT_GNDD, 1, -6, 0, 10, 0, &D_060119E8, &D_060005B4 }, + { OBJECT_GNDD, OBJECT_GNDD, 1, -6, 0, 10, 0, &object_gndd_Skel_0119E8, &object_gndd_Anim_0005B4 }, { OBJECT_HORSE_GANON, OBJECT_HORSE_GANON, 1, 0, 2, 20, 1, &gHorseGanonSkel, &gHorseGanonGallopingAnim }, - { OBJECT_GNDD, OBJECT_GNDD, 1, -6, 0, 10, 0, &D_060119E8, &D_06004260 }, - { OBJECT_GNDD, OBJECT_GNDD, 1, -6, 0, 10, 0, &D_060119E8, &D_060050A8 }, - { OBJECT_GANON, OBJECT_GANON, 1, -6, 0, 10, 0, &D_060114E8, &D_06011348 }, + { OBJECT_GNDD, OBJECT_GNDD, 1, -6, 0, 10, 0, &object_gndd_Skel_0119E8, &object_gndd_Anim_004260 }, + { OBJECT_GNDD, OBJECT_GNDD, 1, -6, 0, 10, 0, &object_gndd_Skel_0119E8, &object_gndd_Anim_0050A8 }, + { OBJECT_GANON, OBJECT_GANON, 1, -6, 0, 10, 0, &object_ganon_Skel_0114E8, &object_ganon_Anim_011348 }, }; static EnViewerAnimFunc sAnimFuncs[] = { @@ -308,8 +278,8 @@ void func_80B2A75C(EnViewer* this, GlobalContext* globalCtx) { if (globalCtx->csCtx.state != CS_STATE_IDLE && globalCtx->csCtx.npcActions[1] != NULL) { if (globalCtx->csCtx.npcActions[1]->action == 2 && D_80B2CFCC == 0) { if (params == 3) { - if (this->skin.skelAnime.animation != &D_06002928) { - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &D_06002928, 1.0f); + if (this->skin.skelAnime.animation != &object_gndd_Anim_002928) { + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_gndd_Anim_002928, 1.0f); } } else if (this->skin.skelAnime.animation != &gHorseGanonIdleAnim) { Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &gHorseGanonIdleAnim, 1.0f); @@ -317,8 +287,8 @@ void func_80B2A75C(EnViewer* this, GlobalContext* globalCtx) { } else if (globalCtx->csCtx.npcActions[1]->action == 1) { D_80B2CFCC = 100; if (params == 3) { - if (this->skin.skelAnime.animation != &D_06001D28) { - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &D_06001D28, 1.0f); + if (this->skin.skelAnime.animation != &object_gndd_Anim_001D28) { + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_gndd_Anim_001D28, 1.0f); } } else if (this->skin.skelAnime.animation != &gHorseGanonRearingAnim) { Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &gHorseGanonRearingAnim, 1.0f); @@ -327,44 +297,44 @@ void func_80B2A75C(EnViewer* this, GlobalContext* globalCtx) { switch (this->unk_1E5) { case 0: if (globalCtx->csCtx.npcActions[1]->action == 4) { - Animation_MorphToPlayOnce(&this->skin.skelAnime, &D_06000F54, -5.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_gndd_Anim_000F54, -5.0f); this->unk_1E5++; } break; case 1: if (animationEnded) { - Animation_MorphToLoop(&this->skin.skelAnime, &D_060014F4, -5.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_0014F4, -5.0f); this->unk_1E5++; } break; case 2: if (globalCtx->csCtx.npcActions[1]->action == 5) { - Animation_MorphToPlayOnce(&this->skin.skelAnime, &D_060008A0, -5.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_gndd_Anim_0008A0, -5.0f); this->unk_1E5++; } break; case 3: if (animationEnded) { - Animation_MorphToLoop(&this->skin.skelAnime, &D_06000BC8, -5.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_000BC8, -5.0f); this->unk_1E5++; } break; case 4: if (globalCtx->csCtx.npcActions[1]->action == 11) { - Animation_MorphToLoop(&this->skin.skelAnime, &D_060014F4, -20.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_0014F4, -20.0f); this->unk_1E5++; } break; case 5: if (globalCtx->csCtx.npcActions[1]->action == 8) { - Animation_MorphToLoop(&this->skin.skelAnime, &D_06002928, -15.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_002928, -15.0f); this->unk_1E5++; } break; case 6: if (globalCtx->csCtx.npcActions[1]->action == 12) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_VOICE_DEMO); - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &D_060005B4, 3.0f); + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_gndd_Anim_0005B4, 3.0f); this->unk_1E5++; } break; @@ -392,15 +362,17 @@ void func_80B2A75C(EnViewer* this, GlobalContext* globalCtx) { switch (this->unk_1E5) { case 0: if (globalCtx->csCtx.state != CS_STATE_IDLE && globalCtx->csCtx.npcActions[0] != NULL && - globalCtx->csCtx.npcActions[0]->action == 6 && this->skin.skelAnime.animation != &D_06002574) { - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &D_06002574, 1.5f); + globalCtx->csCtx.npcActions[0]->action == 6 && + this->skin.skelAnime.animation != &object_opening_demo1_Anim_002574) { + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_opening_demo1_Anim_002574, 1.5f); this->unk_1E5++; } break; case 1: if (globalCtx->csCtx.state != CS_STATE_IDLE && globalCtx->csCtx.npcActions[0] != NULL && - globalCtx->csCtx.npcActions[0]->action == 2 && this->skin.skelAnime.animation != &D_060029CC) { - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &D_060029CC, 3.0f); + globalCtx->csCtx.npcActions[0]->action == 2 && + this->skin.skelAnime.animation != &object_opening_demo1_Anim_0029CC) { + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_opening_demo1_Anim_0029CC, 3.0f); this->unk_1E5++; } break; @@ -411,8 +383,8 @@ void func_80B2A75C(EnViewer* this, GlobalContext* globalCtx) { case 0: if (globalCtx->csCtx.state != CS_STATE_IDLE) { if (globalCtx->csCtx.npcActions[0] != NULL && globalCtx->csCtx.npcActions[0]->action == 6 && - this->skin.skelAnime.animation != &D_06001410) { - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &D_06001410, 1.5f); + this->skin.skelAnime.animation != &object_opening_demo1_Anim_001410) { + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_opening_demo1_Anim_001410, 1.5f); this->unk_1E5++; } } @@ -420,8 +392,8 @@ void func_80B2A75C(EnViewer* this, GlobalContext* globalCtx) { case 1: if (globalCtx->csCtx.state != CS_STATE_IDLE) { if (globalCtx->csCtx.npcActions[0] != NULL && globalCtx->csCtx.npcActions[0]->action == 2 && - this->skin.skelAnime.animation != &D_06000450) { - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &D_06000450, 3.0f); + this->skin.skelAnime.animation != &object_opening_demo1_Anim_000450) { + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_opening_demo1_Anim_000450, 3.0f); this->unk_1E5++; } } @@ -431,18 +403,18 @@ void func_80B2A75C(EnViewer* this, GlobalContext* globalCtx) { func_800F67A0(0); switch (this->unk_1E5) { case 0: - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &D_0600504C, 1.0f); + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_opening_demo1_Anim_00504C, 1.0f); this->unk_1E5++; break; case 1: if (globalCtx->csCtx.npcActions[0]->action == 11) { - Animation_MorphToPlayOnce(&this->skin.skelAnime, &D_0600420C, -5.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_opening_demo1_Anim_00420C, -5.0f); this->unk_1E5++; } break; case 2: if (animationEnded) { - Animation_MorphToLoop(&this->skin.skelAnime, &D_060048FC, -5.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &object_opening_demo1_Anim_0048FC, -5.0f); this->unk_1E5++; } break; @@ -456,13 +428,13 @@ void func_80B2A75C(EnViewer* this, GlobalContext* globalCtx) { if (globalCtx->csCtx.state != CS_STATE_IDLE && globalCtx->csCtx.npcActions[1] != NULL && globalCtx->csCtx.npcActions[1]->action == 7) { Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - Animation_MorphToPlayOnce(&this->skin.skelAnime, &D_06004534, -5.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_gndd_Anim_004534, -5.0f); this->unk_1E5++; } break; case 1: if (animationEnded) { - Animation_MorphToLoop(&this->skin.skelAnime, &D_060048B0, -5.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_0048B0, -5.0f); this->unk_1E5++; } break; @@ -475,26 +447,26 @@ void func_80B2A75C(EnViewer* this, GlobalContext* globalCtx) { case 0: if (globalCtx->csCtx.state != CS_STATE_IDLE) { if (globalCtx->csCtx.npcActions[1] != NULL && globalCtx->csCtx.npcActions[1]->action == 9) { - Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &D_060050A8, 1.0f); + Animation_PlayLoopSetSpeed(&this->skin.skelAnime, &object_gndd_Anim_0050A8, 1.0f); this->unk_1E5++; } } break; case 1: if (globalCtx->csCtx.npcActions[1]->action == 10) { - Animation_MorphToPlayOnce(&this->skin.skelAnime, &D_06003284, -10.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_gndd_Anim_003284, -10.0f); this->unk_1E5++; } break; case 2: if (animationEnded) { - Animation_MorphToLoop(&this->skin.skelAnime, &D_06003D84, -5.0f); + Animation_MorphToLoop(&this->skin.skelAnime, &object_gndd_Anim_003D84, -5.0f); this->unk_1E5++; } break; case 3: if (globalCtx->csCtx.npcActions[1]->action == 4) { - Animation_MorphToPlayOnce(&this->skin.skelAnime, &D_06003428, -5.0f); + Animation_MorphToPlayOnce(&this->skin.skelAnime, &object_gndd_Anim_003428, -5.0f); this->unk_1E5++; } break; @@ -512,11 +484,11 @@ void EnViewer_Update(Actor* thisx, GlobalContext* globalCtx) { s32 func_80B2B2F4(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { if (gSaveContext.sceneSetupIndex == 4) { if (globalCtx->csCtx.frames >= 400 && limbIndex == 5) { - *dList = D_0600E1A8; + *dList = object_gndd_DL_00E1A8; } } else { if (globalCtx->csCtx.frames >= 1510 && globalCtx->csCtx.frames < 1651 && limbIndex == 5) { - *dList = D_0600E1A8; + *dList = object_gndd_DL_00E1A8; } } return 0; @@ -528,7 +500,7 @@ void func_80B2B364(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_viewer.c", 1370), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0600BE90)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90)); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_viewer.c", 1372); } } @@ -551,23 +523,23 @@ void func_80B2B4A8(EnViewer* this, GlobalContext* globalCtx) { } if (frames + 1127 >= globalCtx->csCtx.frames) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_0600F178)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_0600F178)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F178)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F178)); } else if (frames + 1128 >= globalCtx->csCtx.frames) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_0600F378)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_0600F378)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F378)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F378)); } else if (frames + 1129 >= globalCtx->csCtx.frames) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_0600F578)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_0600F578)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F578)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F578)); } else { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_0600F778)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_0600F778)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F778)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_gndd_Tex_00F778)); } } else if (params == 9) { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_0600A4E0)); + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_ganon_Tex_00A4E0)); } if (params == 9) { @@ -676,15 +648,15 @@ void func_80B2BA38(EnViewer* this, GlobalContext* globalCtx) { s32 func_80B2C10C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { if (limbIndex == 16) { - *dList = D_0600D0D8; + *dList = object_im_DL_00D0D8; } return 0; } void func_80B2C130(EnViewer* this, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_viewer.c", 1717); - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&D_06007210)); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&D_06007210)); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(&object_im_Tex_007210)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(&object_im_Tex_007210)); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); SkelAnime_DrawFlexOpa(globalCtx, this->skin.skelAnime.skeleton, this->skin.skelAnime.jointTable, diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 9187929538..a36ea5d5d3 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -5,6 +5,7 @@ */ #include "z_en_wood02.h" +#include "objects/object_wood02/object_wood02.h" #define FLAGS 0x00000000 @@ -75,20 +76,29 @@ static InitChainEntry sInitChain[] = { }; static Gfx* D_80B3BF54[] = { - 0x060078D0, 0x06007CA0, 0x060080D0, 0x06000090, 0x06000340, 0x06000340, 0x06000700, + object_wood02_DL_0078D0, object_wood02_DL_007CA0, object_wood02_DL_0080D0, object_wood02_DL_000090, + object_wood02_DL_000340, object_wood02_DL_000340, object_wood02_DL_000700, }; static Gfx* D_80B3BF70[] = { - 0x06007968, 0x06007D38, 0x060081A8, NULL, NULL, NULL, - 0x06007AD0, 0x06007E20, 0x06008350, 0x06000160, 0x06000440, 0x06000700, + object_wood02_DL_007968, + object_wood02_DL_007D38, + object_wood02_DL_0081A8, + NULL, + NULL, + NULL, + object_wood02_DL_007AD0, + object_wood02_DL_007E20, + object_wood02_DL_008350, + object_wood02_DL_000160, + object_wood02_DL_000440, + object_wood02_DL_000700, }; static f32 sSpawnCos; static f32 sSpawnSin; -extern Gfx D_06000700[]; - s32 EnWood02_SpawnZoneCheck(EnWood02* this, GlobalContext* globalCtx, Vec3f* pos) { f32 phi_f12; @@ -432,7 +442,7 @@ void EnWood02_Draw(Actor* thisx, GlobalContext* globalCtx) { if ((this->actor.params == WOOD_LEAF_GREEN) || (this->actor.params == WOOD_LEAF_YELLOW)) { func_80093D18(gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, red, green, blue, 127); - Gfx_DrawDListOpa(globalCtx, D_06000700); + Gfx_DrawDListOpa(globalCtx, object_wood02_DL_000700); } else if (D_80B3BF70[this->drawType & 0xF] != NULL) { Gfx_DrawDListOpa(globalCtx, D_80B3BF54[this->drawType & 0xF]); gDPSetEnvColor(POLY_XLU_DISP++, red, green, blue, 0); diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 58b083e5c5..e6d4eb6a82 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -6,6 +6,7 @@ #include "z_obj_bombiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" +#include "objects/object_bombiwa/object_bombiwa.h" #define FLAGS 0x00000000 @@ -64,8 +65,6 @@ static s16 sEffectScales[] = { 17, 14, 10, 8, 7, 5, 3, 2, }; -extern Gfx D_060009E0[]; - void ObjBombiwa_InitCollision(Actor* thisx, GlobalContext* globalCtx) { ObjBombiwa* this = THIS; @@ -106,7 +105,7 @@ void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) { s16 scale; s32 i; - dlist = D_060009E0; + dlist = object_bombiwa_DL_0009E0; for (i = 0; i < ARRAY_COUNT(sEffectScales); i++) { pos.x = ((Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.home.pos.x; pos.y = ((Rand_ZeroOne() * 5.0f) + this->actor.home.pos.y) + 8.0f; @@ -145,5 +144,5 @@ void ObjBombiwa_Update(Actor* thisx, GlobalContext* globalCtx) { } void ObjBombiwa_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_060009E0); + Gfx_DrawDListOpa(globalCtx, object_bombiwa_DL_0009E0); } diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index a99ce98e40..c62649d826 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -5,6 +5,7 @@ */ #include "z_obj_dekujr.h" +#include "objects/object_dekujr/object_dekujr.h" #define FLAGS 0x00000009 @@ -41,9 +42,6 @@ static ColliderCylinderInitToActor sCylinderInit = { { 60, 80, 0, { 0, 0, 0 } }, }; -extern Gfx D_060030D0[]; // Display list for dekujr body -extern Gfx D_060032D8[]; // Display list for dekujr face and shadow - void ObjDekujr_Init(Actor* thisx, GlobalContext* globalCtx) { ObjDekujr* this = THIS; s32 pad; @@ -160,7 +158,7 @@ void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 379), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_060030D0); + gSPDisplayList(POLY_OPA_DISP++, object_dekujr_DL_0030D0); frameCount = globalCtx->state.frames; gSPSegment( @@ -168,7 +166,7 @@ void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frameCount % 128, 0, 32, 32, 1, frameCount % 128, 0, 32, 32)); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 399), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_060032D8); + gSPDisplayList(POLY_XLU_DISP++, object_dekujr_DL_0032D8); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 409); } diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index ec79c676bb..ab70fa332f 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -5,6 +5,7 @@ */ #include "z_obj_elevator.h" +#include "objects/object_d_elevator/object_d_elevator.h" #define FLAGS 0x00000000 @@ -40,9 +41,6 @@ static InitChainEntry sInitChain[] = { static f32 sScales[] = { 0.1f, 0.05f }; -extern Gfx D_06000180[]; -extern CollisionHeader D_06000360; - void ObjElevator_SetupAction(ObjElevator* this, ObjElevatorActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -66,7 +64,7 @@ void ObjElevator_Init(Actor* thisx, GlobalContext* globalCtx) { ObjElevator* this = THIS; f32 temp_f0; - func_80B92B08(this, globalCtx, &D_06000360, DPM_PLAYER); + func_80B92B08(this, globalCtx, &object_d_elevator_Col_000360, DPM_PLAYER); Actor_SetScale(thisx, sScales[thisx->params & 1]); Actor_ProcessInitChain(thisx, sInitChain); temp_f0 = (thisx->params >> 8) & 0xF; @@ -125,5 +123,5 @@ void ObjElevator_Update(Actor* thisx, GlobalContext* globalCtx) { } void ObjElevator_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, D_06000180); + Gfx_DrawDListOpa(globalCtx, object_d_elevator_DL_000180); } diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index bcd7699e21..a34787b06e 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -7,6 +7,7 @@ #include "z_obj_lightswitch.h" #include "vt.h" #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" +#include "objects/object_lightswitch/object_lightswitch.h" #define FLAGS 0x00000010 @@ -36,13 +37,6 @@ void ObjLightswitch_DisappearDelay(ObjLightswitch* this, GlobalContext* globalCt void ObjLightswitch_SetupDisappear(ObjLightswitch* this); void ObjLightswitch_Disappear(ObjLightswitch* this, GlobalContext* globalCtx); -extern Gfx D_06000260[]; // face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color -extern Gfx D_06000398[]; // flame ring, branches to dlist 0x09000000, uses env color -extern Gfx D_06000408[]; // a square, geometry only -extern UNK_TYPE D_06000420[]; // rgba16 32x32 eyes open -extern UNK_TYPE D_06000C20[]; // rgba16 32x32 eyes closed -extern UNK_TYPE D_06001420[]; // rgba16 32x32 eyes open, smiling - const ActorInit Obj_Lightswitch_InitVars = { ACTOR_OBJ_LIGHTSWITCH, ACTORCAT_SWITCH, @@ -83,7 +77,8 @@ static ColliderJntSphInit sColliderJntSphInit = { static CollisionCheckInfoInit sColChkInfoInit = { 0, 12, 60, MASS_IMMOVABLE }; -static void* sFaceTextures[] = { D_06000C20, D_06000420, D_06001420 }; +static void* sFaceTextures[] = { object_lightswitch_Tex_000C20, object_lightswitch_Tex_000420, + object_lightswitch_Tex_001420 }; static Vec3f D_80B97F68 = { -1707.0f, 843.0f, -180.0f }; static Vec3f D_80B97F74 = { 0.0f, 0.0f, 0.0f }; @@ -429,7 +424,7 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 841), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sFaceTextures[this->faceTextureIndex])); - gSPDisplayList(POLY_OPA_DISP++, D_06000260); + gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000260); rot.x = this->actor.shape.rot.x; rot.y = this->actor.shape.rot.y; @@ -438,14 +433,14 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 859), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000398); + gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000398); rot.z = this->actor.shape.rot.z - this->flameRingRot; func_800D1694(pos.x, pos.y, pos.z, &rot); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 873), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_06000408); + gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000408); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 878); } @@ -469,7 +464,7 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 912), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sFaceTextures[this->faceTextureIndex])); - gSPDisplayList(POLY_XLU_DISP++, D_06000260); + gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000260); sp60.x = this->actor.shape.rot.x; sp60.y = this->actor.shape.rot.y; @@ -479,14 +474,14 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 930), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06000398); + gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000398); sp60.z = this->actor.shape.rot.z - this->flameRingRot; func_800D1694(sp68.x, sp68.y, sp68.z, &sp60); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 944), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06000408); + gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000408); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 949); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index 24e0a84170..af59d14041 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -5,6 +5,7 @@ */ #include "z_eff_ss_extra.h" +#include "objects/object_yabusame_point/object_yabusame_point.h" #define rObjBankIdx regs[0] #define rTimer regs[1] @@ -22,8 +23,6 @@ EffectSsInit Effect_Ss_Extra_InitVars = { EffectSsExtra_Init, }; -extern Gfx D_06000DC0[]; - u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { EffectSsExtraInitParams* initParams = (EffectSsExtraInitParams*)initParamsx; s32 pad; @@ -71,7 +70,7 @@ void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 186), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rScoreIdx])); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06000DC0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_yabusame_point_DL_000DC0)); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 194); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index 8f20bc8073..7a8181438f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -5,6 +5,7 @@ */ #include "z_eff_ss_ice_smoke.h" +#include "objects/object_fz/object_fz.h" #define rObjBankIdx regs[0] #define rAlpha regs[1] @@ -19,9 +20,6 @@ EffectSsInit Effect_Ss_Ice_Smoke_InitVars = { EffectSsIceSmoke_Init, }; -extern Gfx D_060030A0[]; -extern Gfx D_06003158[]; - u32 EffectSsIceSmoke_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { EffectSsIceSmokeInitParams* initParams = (EffectSsIceSmokeInitParams*)initParamsx; s32 pad; @@ -70,7 +68,7 @@ void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) func_80093D84(globalCtx->state.gfxCtx); gSegments[6] = VIRTUAL_TO_PHYSICAL(object); gSPSegment(POLY_XLU_DISP++, 0x06, object); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_060030A0)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gFreezardSteamStartDL)); gDPPipeSync(POLY_XLU_DISP++); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 235, 235, this->rAlpha); gSPSegment( @@ -85,7 +83,7 @@ void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) if (mtx != NULL) { gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_06003158)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gFreezardSteamDL)); } } else { this->life = -1; diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 2ac6a536f5..8784c83d52 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -6,10 +6,7 @@ #include "global.h" #include "alloca.h" - -extern Gfx D_01002720[]; -extern u8 D_01001800[]; -extern u8 D_01000000[]; +#include "textures/nintendo_rogo_static/nintendo_rogo_static.h" void Title_PrintBuildInfo(Gfx** gfxp) { Gfx* g; @@ -90,7 +87,7 @@ void Title_Draw(TitleContext* this) { Matrix_RotateRPY(0, sTitleRotY, 0, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, "../z_title.c", 424), G_MTX_LOAD); - gSPDisplayList(POLY_OPA_DISP++, &D_01002720); + gSPDisplayList(POLY_OPA_DISP++, gNintendo64LogoDL); func_800944C4(this->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetCycleType(POLY_OPA_DISP++, G_CYC_2CYCLE); @@ -100,13 +97,13 @@ void Title_Draw(TitleContext* this) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 170, 255, 255, 255); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 255, 128); - gDPLoadMultiBlock(POLY_OPA_DISP++, &D_01001800, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + gDPLoadMultiBlock(POLY_OPA_DISP++, nintendo_rogo_static_Tex_001800, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 11); for (idx = 0, y = 94; idx < 16; idx++, y += 2) { - gDPLoadTextureBlock(POLY_OPA_DISP++, &D_01000000[0x180 * idx], G_IM_FMT_I, G_IM_SIZ_8b, 192, 2, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD); + gDPLoadTextureBlock(POLY_OPA_DISP++, &((u8*)nintendo_rogo_static_Tex_000000)[0x180 * idx], G_IM_FMT_I, + G_IM_SIZ_8b, 192, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, + G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gDPSetTileSize(POLY_OPA_DISP++, 1, this->uls, (this->ult & 0x7F) - idx * 4, 0, 0); gSPTextureRectangle(POLY_OPA_DISP++, 388, y << 2, 1156, (y + 2) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); diff --git a/undefined_syms.txt b/undefined_syms.txt index 17af8475e0..97836aac3d 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -57,19 +57,16 @@ D_A4800004 = 0xA4800004; // SI_PIF_ADDR_RD64B_REG D_A4800010 = 0xA4800010; // SI_PIF_ADDR_WR64B_REG D_A4800018 = 0xA4800018; // SI_STATUS_REG +// until ZAPD can handle non-aligned textures, +// we can't use the built assets tied to some symbols +gKm1Skel = 0x060000F0; +gKw1Skel = 0x060000F0; +object_ahg_Skel_0000F0 = 0x060000F0; +object_bji_Skel_0000F0 = 0x060000F0; + // segment addresses D_0300AA48 = 0x0300AA48; D_03012B20 = 0x03012B20; -D_06001220 = 0x06001220; -D_06001220 = 0x06001220; -D_06001290 = 0x06001290; -D_06001290 = 0x06001290; -D_06001438 = 0x06001438; -D_06001438 = 0x06001438; -D_06001470 = 0x06001470; -D_06001470 = 0x06001470; -D_06001C40 = 0x06001C40; -D_06016118 = 0x06016118; D_06025218 = 0x06025218; D_060252D8 = 0x060252D8; D_06025438 = 0x06025438; @@ -87,172 +84,9 @@ D_0703811C = 0x0703811C; // z_skelanime link_animetion_segment = 0x07000000; -// z_door_toki -D_06007888 = 0x06007888; - -// z_bg_spot01_objects2 -D_06001C58 = 0x06001C58; - -// z_bg_spot11_bakudankabe -D_0500A880 = 0x0500A880; - -// z_door_ana -D_05001390 = 0x05001390; - -// z_bg_elevator -D_06000360 = 0x06000360; -D_06000180 = 0x06000180; - -// z_bg_hidan_dalm -D_0600BBF0 = 0x0600BBF0; -D_0600BDF0 = 0x0600BDF0; -D_0600DA10 = 0x0600DA10; - -// z_bg_hidan_fslift -D_0600B630 = 0x0600B630; -D_0600E1E8 = 0x0600E1E8; - -// z_bg_hidan_syoku -D_0600A7E0 = 0x0600A7E0; -D_0600E568 = 0x0600E568; - -// z_bg_menkuri_kaiten -D_060038D0 = 0x060038D0; -D_060042D8 = 0x060042D8; - -// z_bg_mizu_uzu -D_060074EC = 0x060074EC; - -// z_bg_mizu_water -D_06004B20 = 0x06004B20; - -// z_bg_spot07_taki -D_060038FC = 0x060038FC; -D_06002590 = 0x06002590; - -// z_bg_spot08_bakudankabe -D_060039D4 = 0x060039D4; -D_06003898 = 0x06003898; - -// z_bg_ydan_hasi -D_06005780 = 0x06005780; -D_06007798 = 0x06007798; -D_06005DE0 = 0x06005DE0; - -// z_bg_ydan_maruta -D_060066A8 = 0x060066A8; -D_06008D88 = 0x06008D88; -D_06006570 = 0x06006570; - -// z_en_dodongo -D_06008318 = 0x06008318; -D_06004C20 = 0x06004C20; -D_06008B1C = 0x06008B1C; -D_060028F0 = 0x060028F0; -D_06003088 = 0x06003088; -D_060013C4 = 0x060013C4; -D_06001A44 = 0x06001A44; -D_060042C4 = 0x060042C4; -D_06003B14 = 0x06003B14; -D_06015890 = 0x06015890; -D_06017210 = 0x06017210; -D_06015D90 = 0x06015D90; -D_06016390 = 0x06016390; -D_06016590 = 0x06016590; -D_06016790 = 0x06016790; -D_06015990 = 0x06015990; -D_06015F90 = 0x06015F90; -D_06016990 = 0x06016990; -D_06016E10 = 0x06016E10; - -// z_en_ma2 -D_06005420 = 0x06005420; -D_06008D90 = 0x06008D90; -D_060093BC = 0x060093BC; -D_06009EE0 = 0x06009EE0; - -// z_bg_spot17_bakudankabe -D_0500A880 = 0x0500A880; - -// z_en_hs2 -D_060005C0 = 0x60005C0; -D_06006260 = 0x6006260; - -// z_en_blkobj -D_060014E0 = 0x060014E0; -D_060053D0 = 0x060053D0; -D_06007564 = 0x06007564; - -// z_en_lightbox -D_06001F10 = 0x06001F10; -D_06000B70 = 0x06000B70; - -// z_en_rd -D_06004268 = 0x06004268; -D_060046F8 = 0x060046F8; -D_06004ADC = 0x06004ADC; -D_06004F94 = 0x06004F94; -D_060057AC = 0x060057AC; -D_06005D98 = 0x06005D98; -D_06006E88 = 0x06006E88; -D_060074F0 = 0x060074F0; -D_06008040 = 0x06008040; -D_060087D0 = 0x060087D0; -D_0600E778 = 0x0600E778; -D_0600EFDC = 0x0600EFDC; -D_06003DD8 = 0x06003DD8; - -// z_eff_ss_extra -D_06000DC0 = 0x06000DC0; - -// z_bg_ganon_otyuka -D_08000000 = 0x08000000; - -// z_bg_gate_shutter -D_06001CD0 = 0x06001CD0; -D_06001DA8 = 0x06001DA8; - -// z_bg_gjyo_bridge -D_02002640 = 0x02002640; - -// z_bg_spot15_saku -D_060003C0 = 0x060003C0; - -// z_eff_ss_ice_smoke -D_060030A0 = 0x060030A0; -D_06003158 = 0x06003158; - -// z_bg_haka_meganebg -D_06000118 = 0x06000118; -D_06005334 = 0x06005334; -D_06008EB0 = 0x06008EB0; -D_06009168 = 0x06009168; -D_0600A7F4 = 0x0600A7F4; - -// z_bg_haka_trap -D_060081D0 = 0x60081D0; -D_06008D10 = 0x6008D10; -D_06009CD0 = 0x6009CD0; - -// z_en_niw_girl -D_06009948 = 0x06009948; -D_06000378 = 0x06000378; -D_06009C78 = 0x06009C78; - // z_title -D_01002720 = 0x01002720; -D_01001800 = 0x01001800; D_01000000 = 0x01000000; -// z_shot_sun -D_02007020 = 0x02007020; - -// z_demo_go -D_060029A8 = 0x060029A8; -D_06004930 = 0x06004930; -D_0600E680 = 0x0600E680; -D_0600FEF0 = 0x0600FEF0; - // z_demo_ik D_0600035C = 0x0600035C; D_06000380 = 0x06000380; @@ -274,450 +108,35 @@ D_0601EB40 = 0x0601EB40; D_0601EE34 = 0x0601EE34; D_06000900 = 0x06000900; -// z_demo_im -D_06000710 = 0x06000710; -D_06000AFC = 0x06000AFC; -D_0600EDE8 = 0x0600EDE8; -D_060014E4 = 0x060014E4; -D_06001868 = 0x06001868; -D_0600FB10 = 0x0600FB10; -D_0600F788 = 0x0600F788; -D_060101C8 = 0x060101C8; -D_06010EE0 = 0x06010EE0; -D_0601182C = 0x0601182C; -D_06011C08 = 0x06011C08; -D_06012218 = 0x06012218; - -// z_demo_ec -D_06013B88 = 0x06013B88; -D_060048F4 = 0x060048F4; -D_0600BD38 = 0x0600BD38; -D_0600B7B8 = 0x0600B7B8; -D_06006C90 = 0x06006C90; -D_0600196C = 0x0600196C; -D_060000F0 = 0x060000F0; -D_06005670 = 0x06005670; -D_06005EA8 = 0x06005EA8; -D_06007150 = 0x06007150; -D_0600164C = 0x0600164C; -D_06007958 = 0x06007958; -D_0600164C = 0x0600164C; -D_0600513C = 0x0600513C; -D_06000330 = 0x06000330; -D_06002254 = 0x06002254; -D_0600BFA8 = 0x0600BFA8; -D_0600C918 = 0x0600C918; -D_060086D0 = 0x060086D0; -D_06006C40 = 0x06006C40; -D_06007FB8 = 0x06007FB8; -D_060095DC = 0x060095DC; -D_06002530 = 0x06002530; -D_06009BB4 = 0x06009BB4; -D_0600A07C = 0x0600A07C; -D_0600A474 = 0x0600A474; -D_06000CD8 = 0x06000CD8; -D_06004258 = 0x06004258; -D_0600AFE0 = 0x0600AFE0; -D_06004658 = 0x06004658; -D_0600AFE0 = 0x0600AFE0; -D_06004868 = 0x06004868; -D_0600FEF0 = 0x0600FEF0; -D_06002FA0 = 0x06002FA0; -D_06003A98 = 0x06003A98; -D_06002FA0 = 0x06002FA0; -D_060002B8 = 0x060002B8; -D_06008D90 = 0x06008D90; -D_06009EE0 = 0x06009EE0; -D_06006930 = 0x06006930; -D_06006220 = 0x06006220; -D_06008D1C = 0x06008D1C; -D_06009234 = 0x06009234; -D_06004390 = 0x06004390; -D_06004350 = 0x06004350; -D_060076C0 = 0x060076C0; -D_06007AC0 = 0x06007AC0; -D_06005F20 = 0x06005F20; -D_06006920 = 0x06006920; -D_060004C8 = 0x060004C8; -D_06005BD0 = 0x06005BD0; -D_06005AC0 = 0x06005AC0; -D_06005990 = 0x06005990; -D_06005880 = 0x06005880; -D_06009198 = 0x06009198; -D_06009430 = 0x06009430; -D_06009690 = 0x06009690; -D_060035D8 = 0x060035D8; -D_0600DE80 = 0x0600DE80; -D_06003770 = 0x06003770; - -// z_en_test -D_0600316C = 0x0600316C; -D_06007C28 = 0x06007C28; -D_0600C438 = 0x0600C438; -D_06001C20 = 0x06001C20; -D_060081B4 = 0x060081B4; -D_060026D4 = 0x060026D4; -D_0600E2B0 = 0x0600E2B0; -D_0600B00C = 0x0600B00C; -D_0600B4E4 = 0x0600B4E4; -D_0600BE4C = 0x0600BE4C; -D_06001978 = 0x06001978; -D_0600A324 = 0x0600A324; -D_0600A99C = 0x0600A99C; -D_0600A99C = 0x0600A99C; -D_06000444 = 0x06000444; -D_06008604 = 0x06008604; -D_06001420 = 0x06001420; -D_06009A90 = 0x06009A90; - -// z_en_tk -D_06001144 = 0x06001144; -D_06001FA8 = 0x06001FA8; -D_06002F84 = 0x06002F84; -D_0600ACE0 = 0x0600ACE0; -D_0600BC90 = 0x0600BC90; -D_0600BCA0 = 0x0600BCA0; -D_0600BE40 = 0x0600BE40; - // z_arms_hook D_0602B288 = 0x0602B288; D_0602AFF0 = 0x0602AFF0; -// z_bg_bombwall -D_050041B0 = 0x050041B0; -D_05003FC0 = 0x05003FC0; -D_05004088 = 0x05004088; - -// z_bg_dy_yoseizo -D_06008698 = 0x06008698; -D_0601C450 = 0x0601C450; -D_060031C0 = 0x060031C0; -D_0601D514 = 0x0601D514; -D_06001DF0 = 0x06001DF0; -D_060069E8 = 0x060069E8; -D_06007CA8 = 0x06007CA8; -D_06004344 = 0x06004344; -D_06005E60 = 0x06005E60; -D_0600092C = 0x0600092C; -D_060058D8 = 0x060058D8; -D_06005860 = 0x06005860; -D_06005810 = 0x06005810; - -// z_obj_elevator -D_06000180 = 0x06000180; -D_06000360 = 0x06000360; - -// z_obj_lightswitch -D_06000260 = 0x06000260; -D_06000398 = 0x06000398; -D_06000408 = 0x06000408; -D_06000420 = 0x06000420; -D_06000C20 = 0x06000C20; -D_06001420 = 0x06001420; - // z_en_part -D_06001300 = 0x06001300; -D_06001700 = 0x06001700; -D_06001900 = 0x06001900; -D_06001F00 = 0x06001F00; -D_06002100 = 0x06002100; -D_06002FF0 = 0x06002FF0; D_06015380 = 0x06015380; // z_bg_pushbox D_06000000 = 0x06000000; D_06000350 = 0x06000350; -// z_en_ru1 -D_06000690 = 0x06000690; -D_06000E54 = 0x06000E54; -D_06001488 = 0x06001488; -D_06002058 = 0x06002058; -D_06002990 = 0x06002990; -D_06002EC0 = 0x06002EC0; -D_06003608 = 0x06003608; -D_06003784 = 0x06003784; -D_06004074 = 0x06004074; -D_06004350 = 0x06004350; -D_06004648 = 0x06004648; -D_06004BF0 = 0x06004BF0; -D_060063F4 = 0x060063F4; -D_06006B9C = 0x06006B9C; -D_06007534 = 0x06007534; -D_060078E4 = 0x060078E4; -D_06008100 = 0x06008100; -D_06008AA8 = 0x06008AA8; -D_06009060 = 0x06009060; -D_060097B8 = 0x060097B8; -D_06012700 = 0x06012700; -D_06012E94 = 0x06012E94; -D_06013A64 = 0x06013A64; - -// z_bg_mjin -D_06000140 = 0x06000140; -D_06000330 = 0x06000330; -D_06000330_ = 0x06000330; -D_06000658 = 0x06000658; - -// z_en_lightbox -D_06000B70 = 0x06000B70; -D_06001F10 = 0x06001F10; - -// z_en_daiku -D_06007958 = 0x06007958; - -// z_en_dog -D_06007290 = 0x06007290; -D_06001368 = 0x06001368; -D_06000D78 = 0x06000D78; -D_06000278 = 0x06000278; - -// z_obj_bombiwa -D_060009E0 = 0x060009E0; - -// z_bg_treemouth -D_060009D0 = 0x060009D0; -D_06000E94 = 0x06000E94; - -// z_bg_toki_swd -D_06001BD0 = 0x06001BD0; - -// z_bg_zg -D_060011D4 = 0x060011D4; -D_06001080 = 0x06001080; - -// z_en_ds -D_06004768 = 0x06004768; -D_0600039C = 0x0600039C; - -// z_en_owl -D_0600C1C4 = 0x0600C1C4; -D_06001168 = 0x06001168; -D_06003F18 = 0x06003F18; -D_060100B0 = 0x060100B0; -D_060015CC = 0x060015CC; -D_0600C8A0 = 0x0600C8A0; -D_0600C684 = 0x0600C684; - -// z_en_kakasi -// z_en_kakasi2 -// z_en_kakasi3 -D_060065B0 = 0x060065B0; -D_06000214 = 0x06000214; - -// z_en_kz -D_060086D0 = 0x060086D0; - -// z_bg_spot05_soko -D_06000918 = 0x06000918; -D_060012C0 = 0x060012C0; - -// z_en_ani -D_060000F0 = 0x060000F0; -D_060067B8 = 0x060067B8; -D_060076EC = 0x060076EC; -D_060070F0 = 0x060070F0; - -// z_bg_heavy_block -D_0600169C = 0x0600169C; -D_060013C0 = 0x060013C0; -D_06001A30 = 0x06001A30; -D_060018A0 = 0x060018A0; - -// z_bg_ddan_kd -D_06004F30 = 0x06004F30; -D_060048A8 = 0x060048A8; - -// z_en_floormas -D_06002158 = 0x06002158; -D_060039B0 = 0x060039B0; - -// z_en_bx -D_060022F0 = 0x060022F0; - // code_800AD920 D_0E000000 = 0x0E000000; // z_vismono D_0F000000 = 0x0F000000; -// z_door_shutter -D_0601EDD0 = 0x0601EDD0; -D_06012FD0 = 0x06012FD0; - -// en_reeba -D_060001E4 = 0x060001E4; -D_06001EE8 = 0x06001EE8; - -// z_en_dha -D_06000BD8 = 0x06000BD8; -D_060015B0 = 0x060015B0; - -// z_en_hata -D_060000C0 = 0x060000C0; -D_06000444 = 0x06000444; -D_06002FD0 = 0x06002FD0; - -// z_en_sb -D_0600004C = 0x0600004C; -D_060000B4 = 0x060000B4; -D_06000124 = 0x06000124; -D_06000194 = 0x06000194; -D_06002BF0 = 0x06002BF0; -D_06002C8C = 0x06002C8C; - -// z_en_hintnuts -D_06000168 = 0x06000168; -D_060014E0 = 0x060014E0; -D_060023B8 = 0x060023B8; -D_060024CC = 0x060024CC; -D_060026C4 = 0x060026C4; -D_06002894 = 0x06002894; -D_060029BC = 0x060029BC; -D_06002B90 = 0x06002B90; -D_06002E84 = 0x06002E84; -D_06002F7C = 0x06002F7C; -D_06003128 = 0x06003128; - // z_en_guest +D_060000F0 = 0x060000F0; D_060042AC = 0x060042AC; D_060059B0 = 0x060059B0; -// z_obj_oshijiki -D_05004E98 = 0x05004E98; -D_05003350 = 0x05003350; -D_05003B50 = 0x05003B50; -D_05004350 = 0x05004350; -D_05004CD0 = 0x05004CD0; - -// z_en_heishi1 -D_06005880 = 0x06005880; -D_06005C30 = 0x06005C30; -D_0600BAC8 = 0x0600BAC8; - -// z_en_box -D_06000128 = 0x06000128; -D_0600024C = 0x0600024C; -D_0600043C = 0x0600043C; -D_060006F0 = 0x060006F0; -D_06000AE8 = 0x06000AE8; -D_060010C0 = 0x060010C0; -D_06001678 = 0x06001678; -D_060047D8 = 0x060047D8; -D_06005FC8 = 0x06005FC8; - -// z_en_butte -D_05002470 = 0x05002470; -D_050036F0 = 0x050036F0; - -// z_Bg_Spot16_Bombstone -D_06000C20 = 0x06000C20; -D_060009E0 = 0x060009E0; - -// z_Bg_Spot16_Doughnut -D_06000660 = 0x06000660; -D_06000FC0 = 0x06000FC0; - -// z_en_poh -D_060001A8 = 0x060001A8; -D_0600020C = 0x0600020C; -D_060004EC = 0x060004EC; -D_06000570 = 0x06000570; -D_06000FE4 = 0x06000FE4; -D_060011C4 = 0x060011C4; -D_06006F90 = 0x06006F90; -D_060009DC = 0x060009DC; -D_060050D0 = 0x060050D0; -D_06000A60 = 0x06000A60; -D_06004638 = 0x06004638; -D_06004498 = 0x06004498; -D_06004530 = 0x06004530; -D_06004530 = 0x06004530; -D_06004498 = 0x06004498; -D_06004498 = 0x06004498; -D_06004530 = 0x06004530; - -// z_en_po_field -D_06000924 = 0x06000924; -D_06006A30 = 0x06006A30; -D_06000F9C = 0x06000F9C; -D_06000608 = 0x06000608; -D_06000454 = 0x06000454; -D_06001360 = 0x06001360; -D_06004BA0 = 0x06004BA0; -D_060059F0 = 0x060059F0; -D_06005900 = 0x06005900; -D_06005620 = 0x06005620; -D_060066D0 = 0x060066D0; -D_06004CC0 = 0x06004CC0; -D_060023B0 = 0x060023B0; - -// z_en_po_desert -D_06006A30 = 0x06006A30; -D_06000924 = 0x06000924; -D_06001360 = 0x06001360; -D_06004BA0 = 0x06004BA0; -D_06004CC0 = 0x06004CC0; - -// z_en_po_sisters -D_060065C8 = 0x060065C8; -D_060014CC = 0x060014CC; -D_06000D40 = 0x06000D40; -D_06000114 = 0x06000114; -D_060008C0 = 0x060008C0; -D_06000A54 = 0x06000A54; -D_0600119C = 0x0600119C; -D_06000680 = 0x06000680; -D_060027B0 = 0x060027B0; -D_060046E0 = 0x060046E0; - -// z_en_po_relay -D_0600BE40 = 0x0600BE40; -D_06003768 = 0x06003768; -D_0600B838 = 0x0600B838; -D_0600BBA0 = 0x0600BBA0; - -// z_en_nb -D_060181C8 = 0x060181C8; -D_06009694 = 0x06009694; -D_0600274C = 0x0600274C; -D_06002B4C = 0x06002B4C; -D_06000410 = 0x06000410; -D_06001E7C = 0x06001E7C; -D_06001350 = 0x06001350; -D_06001104 = 0x06001104; -D_06008BD0 = 0x06008BD0; -D_060046A8 = 0x060046A8; -D_06003954 = 0x06003954; -D_06004030 = 0x06004030; -D_06002DBC = 0x06002DBC; -D_060035A8 = 0x060035A8; -D_06006320 = 0x06006320; -D_0600D8E8 = 0x0600D8E8; -D_06013158 = 0x06013158; -D_06000BC0 = 0x06000BC0; -D_06005CA4 = 0x06005CA4; -D_06005614 = 0x06005614; -D_06004BB4 = 0x06004BB4; -D_06006E78 = 0x06006E78; -D_06004E60 = 0x06004E60; -D_06004BB4 = 0x06004BB4; -D_06009238 = 0x06009238; - // z_eff_ss_g_magma2 D_06025A90 = 0x06025A90; // z_eff_ss_dead_dd D_01000000 = 0x01000000; -// z_eff_ss_ice_smoke -D_060030A0 = 0x060030A0; -D_06003158 = 0x06003158; - -// z_en_fhg_fire -D_0600FAA0 = 0x0600FAA0; -D_0600FCF8 = 0x0600FCF8; -D_060105E0 = 0x060105E0; +// z_eff_ss_fhg_flash D_06012160 = 0x06012160; // z_en_ik @@ -747,299 +166,16 @@ D_0601E178 = 0x0601E178; D_060203D8 = 0x060203D8; D_060205C0 = 0x060205C0; - -// z_obj_dekujr -D_060030D0 = 0x060030D0; -D_060032D8 = 0x060032D8; - - // z_en_okarina_Tag D_02003C80 = 0x02003C80; D_02005020 = 0x02005020; -// z_en_okuta -D_06000344 = 0x06000344; -D_060008FC = 0x060008FC; -D_06000AC0 = 0x06000AC0; -D_06000DDC = 0x06000DDC; -D_06003380 = 0x06003380; -D_06003660 = 0x06003660; -D_06003910 = 0x06003910; -D_06003C64 = 0x06003C64; - - -// z_bg_mori_hineri -D_060054B8 = 0x060054B8; -D_06003490 = 0x06003490; -D_060043D0 = 0x060043D0; -D_06006078 = 0x06006078; -D_06000AE8 = 0x06000AE8; -D_06001678 = 0x06001678; - -// z_bg_haka_tubo -D_060108B8 = 0x060108B8; -D_0600FE40 = 0x0600FE40; - -// z_bg_po_syokudai -D_060003A0 = 0x060003A0; - -//z_bg_ice_shutter -D_06002854 = 0x6002854; -D_06002740 = 0x6002740; - -// z_en_bubble -D_06001000 = 0x06001000; - -// z_bg_ingate -D_060011B8 = 0x060011B8; -D_06001040 = 0x06001040; - -// z_bg_haka_water -D_06001E50 = 0x06001E50; -D_06002010 = 0x06002010; - -// z_en_niw_lady -D_0600A630 = 0x0600A630; -D_060007D0 = 0x060007D0; -D_06000718 = 0x06000718; -D_06009F94 = 0x06009F94; - -// z_bg_gnd_darkmeiro -D_0600C080 = 0x0600C080; -D_060088B0 = 0x060088B0; -D_0600BEC0 = 0x0600BEC0; - -// z_en_torch2 -D_06004764 = 0x06004764; - -// z_en_ssh -D_06000304 = 0x06000304; -D_060052E0 = 0x060052E0; -D_060046C0 = 0x060046C0; -D_06004080 = 0x06004080; -D_06004DE8 = 0x06004DE8; - -// z_en_st -D_06005298 = 0x06005298; -D_06000304 = 0x06000304; -D_06005B98 = 0x06005B98; -D_060055A8 = 0x060055A8; - -// z_en_dy_extra -D_0601BFB0 = 0x0601BFB0; -D_0601C160 = 0x0601C160; - -// z_en_crow -D_060010C0 = 0x060010C0; -D_060000F0 = 0x060000F0; - -// z_en_rl -D_06007B38 = 0x06007B38; -D_06000A3C = 0x06000A3C; -D_06000830 = 0x06000830; -D_0600040C = 0x0600040C; - -// z_en_dh -D_06007E88 = 0x06007E88; -D_06005880 = 0x06005880; -D_06003A8C = 0x06003A8C; -D_06004658 = 0x06004658; -D_06002148 = 0x06002148; -D_06003D6C = 0x06003D6C; -D_060032BC = 0x060032BC; -D_06001A3C = 0x06001A3C; -D_0600375C = 0x0600375C; -D_06007FC0 = 0x06007FC0; - -// z_en_takara_man -D_06004FE0 = 0x06004FE0; -D_06000498 = 0x06000498; - -// z_bg_menkuri_eye -D_06002D20 = 0x06002D20; - -// z_en_gm -D_060002B8 = 0x060002B8; -D_0600FEF0 = 0x0600FEF0; -D_0600DE80 = 0x0600DE80; - -// z_bg_spot03_taki -D_06000C98 = 0x06000C98; -D_06000800 = 0x06000800; -D_06000990 = 0x06000990; -D_06000B20 = 0x06000B20; -D_06000BC0 = 0x06000BC0; -D_06001580 = 0x06001580; - -// z_bg_po_event -D_06007860 = 0x06007860; -D_060075A0 = 0x060075A0; -D_060079E0 = 0x060079E0; -D_06006830 = 0x06006830; -D_06006D60 = 0x06006D60; -D_06007230 = 0x06007230; - -// z_bg_mori_idomizu -D_060049D0 = 0x060049D0; - -// z_bg_mori_hashigo -D_060037D8 = 0x060037D8; -D_060036B0 = 0x060036B0; -D_06004770 = 0x06004770; - -// z_bg_mori_bigst -D_0600221C = 0x0600221C; -D_06001E50 = 0x06001E50; - -// z_bg_mori_hashira4 -D_06001AF8 = 0x06001AF8; -D_060089E0 = 0x060089E0; - -//z_boss_dodongo -D_06003CF8 = 0x06003CF8; -D_0601B310 = 0x0601B310; -D_0600F0D8 = 0x0600F0D8; -D_030021D8 = 0x030021D8; -D_06008EEC = 0x06008EEC; -D_06017410 = 0x06017410; -D_0601CAE0 = 0x0601CAE0; -D_06008EEC = 0x06008EEC; -D_060061D4 = 0x060061D4; -D_0600DF38 = 0x0600DF38; -D_0600E848 = 0x0600E848; -D_06004E0C = 0x06004E0C; -D_060042A8 = 0x060042A8; -D_06009D10 = 0x06009D10; -D_0601D934 = 0x0601D934; -D_06002D0C = 0x06002D0C; -D_060042A8 = 0x060042A8; -D_06009D50 = 0x06009D50; -D_06009DD0 = 0x06009DD0; -D_06001074 = 0x06001074; -// z_obj_timeblock -D_06000980 = 0x06000980; -D_06000B30 = 0x06000B30; - -// z_bg_ddan_jd -D_06003CE0 = 0x06003CE0; -D_060037B8 = 0x060037B8; - // z_en_a_keep or en_a_obj -D_040394B0 = 0x040394B0; -D_0403A120 = 0x0403A120; -D_0403A480 = 0x0403A480; -D_0403A7F0 = 0x0403A7F0; D_06000730 = 0x06000730; // z_en_kusa D_060002E0 = 0x60002E0; -// z_bg_ice_turara -D_060023D0 = 0x060023D0; -D_06002594 = 0x06002594; - -// z_bg_dy_yoseizo -D_0600092C = 0x0600092C; -D_06001DF0 = 0x06001DF0; -D_060031C0 = 0x060031C0; -D_06004344 = 0x06004344; -D_06005810 = 0x06005810; -D_06005860 = 0x06005860; -D_06005868 = 0x06005868; -D_060058D8 = 0x060058D8; -D_06005E60 = 0x06005E60; -D_060069E8 = 0x060069E8; -D_06007CA8 = 0x06007CA8; -D_06008698 = 0x06008698; -D_0601C450 = 0x0601C450; -D_0601D514 = 0x0601D514; - -// z_bg_gnd_firemeiro -D_0600E210 = 0x0600E210; -D_0600ECD8 = 0x0600ECD8; - -// z_bg_gnd_iceblock -D_06004420 = 0x06004420; -D_06004618 = 0x06004618; - -// z_bg_haka_gate -D_0600F1B0 = 0x0600F1B0; -D_06010A10 = 0x06010A10; -D_06010C10 = 0x06010C10; -D_06010E10 = 0x06010E10; -D_060131C4 = 0x060131C4; -D_0600A938 = 0x0600A938; - -// z_bg_haka_sgami -D_0600BF20 = 0x0600BF20; -D_060021F0 = 0x060021F0; - -// z_bg_haka_ship -D_06005A70 = 0x06005A70; -D_0600D330 = 0x0600D330; -D_0600E408 = 0x0600E408; -D_0600E910 = 0x0600E910; -D_0600ED7C = 0x0600ED7C; - -// z_bg_haka_zou -D_06005E30 = 0x06005E30; -D_06006F70 = 0x06006F70; - -// z_bg_ice_objects -D_06000190 = 0x06000190; -D_060003F0 = 0x060003F0; - -// z_bg_ice_shelter -D_060006F0 = 0x060006F0; -D_060012A0 = 0x060012A0; -D_06001C1C = 0x06001C1C; -D_06002640 = 0x06002640; -D_06002920 = 0x06002920; - -// z_bg_jya_haheniron -D_06000880 = 0x06000880; - -// z_bg_jya_ironobj -D_06000880 = 0x06000880; - -// z_bg_relay_objects -D_060001A0 = 0x060001A0; -D_060003C4 = 0x060003C4; -D_06001AB0 = 0x06001AB0; -D_060025FC = 0x060025FC; - -// z_bg_spot00_hanebasi -D_060000C0 = 0x060000C0; -D_06000280 = 0x06000280; -D_06000430 = 0x06000430; -D_060005E0 = 0x060005E0; - -// z_bg_spot02_objects -D_060013F0 = 0x060013F0; -D_060126F0 = 0x060126F0; -D_060128D8 = 0x060128D8; -D_06012BA4 = 0x06012BA4; -D_06012D30 = 0x06012D30; -D_060133EC = 0x060133EC; - -// z_bg_spot07_taki -D_06000460 = 0x06000460; -D_06000BE0 = 0x06000BE0; -D_06001CF0 = 0x06001CF0; -D_06001F68 = 0x06001F68; -D_06002590 = 0x06002590; -D_06003210 = 0x06003210; -D_060032D8 = 0x060032D8; -D_060038FC = 0x060038FC; - -// z_bg_toki_hikari -D_06000880 = 0x06000880; -D_060009C0 = 0x060009C0; -D_06000A10 = 0x06000A10; -D_06007E20 = 0x06007E20; -D_06007EE0 = 0x06007EE0; -D_06008190 = 0x06008190; - // z_boss_ganon D_02006C18 = 0x02006C18; D_02007418 = 0x02007418; @@ -1089,6 +225,7 @@ D_06010514 = 0x06010514; D_060114E8 = 0x060114E8; // z_boss_ganon2 +D_06000BFC = 0x06000BFC; D_06000EA0 = 0x06000EA0; D_0600A8E0 = 0x0600A8E0; D_060147E0 = 0x060147E0; @@ -1097,150 +234,6 @@ D_0601E988 = 0x0601E988; D_0601EA08 = 0x0601EA08; D_06021A90 = 0x06021A90; -// z_boss_tw -D_060004A4 = 0x060004A4; -D_06000AAC = 0x06000AAC; -D_060012A4 = 0x060012A4; -D_060017E0 = 0x060017E0; -D_06001D10 = 0x06001D10; -D_0600230C = 0x0600230C; -D_06003614 = 0x06003614; -D_06003E34 = 0x06003E34; -D_06004548 = 0x06004548; -D_0600578C = 0x0600578C; -D_06006530 = 0x06006530; -D_06006F28 = 0x06006F28; -D_060070E0 = 0x060070E0; -D_06007688 = 0x06007688; -D_06007CA8 = 0x06007CA8; -D_060088C8 = 0x060088C8; -D_06009398 = 0x06009398; -D_0600E6C4 = 0x0600E6C4; -D_06012B38 = 0x06012B38; -D_06012CE0 = 0x06012CE0; -D_06013310 = 0x06013310; -D_060134B8 = 0x060134B8; -D_06013AE8 = 0x06013AE8; -D_06013D68 = 0x06013D68; -D_06013E98 = 0x06013E98; -D_06013F98 = 0x06013F98; -D_06014070 = 0x06014070; -D_06014158 = 0x06014158; -D_06018FC0 = 0x06018FC0; -D_06019938 = 0x06019938; -D_06019D40 = 0x06019D40; -D_0601A430 = 0x0601A430; -D_0601A438 = 0x0601A438; -D_0601A528 = 0x0601A528; -D_0601A5A8 = 0x0601A5A8; -D_0601A790 = 0x0601A790; -D_0601A998 = 0x0601A998; -D_0601AA50 = 0x0601AA50; -D_0601AB00 = 0x0601AB00; -D_0601AB08 = 0x0601AB08; -D_0601BC00 = 0x0601BC00; -D_0601C1C0 = 0x0601C1C0; -D_0601CEE0 = 0x0601CEE0; -D_0601DBE8 = 0x0601DBE8; -D_0601DDF0 = 0x0601DDF0; -D_0601E020 = 0x0601E020; -D_0601E0E0 = 0x0601E0E0; -D_0601E2C0 = 0x0601E2C0; -D_0601E3A0 = 0x0601E3A0; -D_0601E9F0 = 0x0601E9F0; -D_0601EC68 = 0x0601EC68; -D_0601EEB0 = 0x0601EEB0; -D_0601F238 = 0x0601F238; -D_0601F390 = 0x0601F390; -D_0601F608 = 0x0601F608; -D_0601F888 = 0x0601F888; -D_060216DC = 0x060216DC; -D_06022700 = 0x06022700; -D_06023750 = 0x06023750; -D_06024374 = 0x06024374; -D_060244B4 = 0x060244B4; -D_0602D890 = 0x0602D890; -D_0602D940 = 0x0602D940; -D_0602E170 = 0x0602E170; -D_06032020 = 0x06032020; -D_06032BF8 = 0x06032BF8; -D_060338F0 = 0x060338F0; -D_060343B4 = 0x060343B4; -D_06035030 = 0x06035030; -D_06035988 = 0x06035988; -D_06036FBC = 0x06036FBC; -D_06038E2C = 0x06038E2C; -D_0603A2D0 = 0x0603A2D0; - -// z_boss_va -D_06000024 = 0x06000024; -D_06000FA0 = 0x06000FA0; -D_06001230 = 0x06001230; -D_06004E70 = 0x06004E70; -D_06005184 = 0x06005184; -D_06008BB8 = 0x06008BB8; -D_06008D70 = 0x06008D70; -D_06008F08 = 0x06008F08; -D_06008F70 = 0x06008F70; -D_06009430 = 0x06009430; -D_06009468 = 0x06009468; -D_0600948C = 0x0600948C; -D_06011738 = 0x06011738; -D_06011768 = 0x06011768; -D_060128B8 = 0x060128B8; -D_06012948 = 0x06012948; -D_06012BA0 = 0x06012BA0; -D_06012C50 = 0x06012C50; -D_060135B0 = 0x060135B0; -D_06013638 = 0x06013638; -D_060156A0 = 0x060156A0; -D_06015710 = 0x06015710; -D_06015B18 = 0x06015B18; -D_060162AC = 0x060162AC; -D_060164B0 = 0x060164B0; -D_060166A8 = 0x060166A8; -D_06017498 = 0x06017498; -D_06017694 = 0x06017694; -D_060177F4 = 0x060177F4; -D_06017FC8 = 0x06017FC8; -D_06018150 = 0x06018150; -D_06018870 = 0x06018870; -D_06018A68 = 0x06018A68; -D_06018B90 = 0x06018B90; -D_06018D18 = 0x06018D18; -D_060199A0 = 0x060199A0; - -// z_demo_6k -D_06001040 = 0x06001040; -D_06001190 = 0x06001190; -D_060022B0 = 0x060022B0; -D_060035E0 = 0x060035E0; -D_060039D0 = 0x060039D0; - -// z_demo_ext -D_0600FAA0 = 0x0600FAA0; - -// z_demo_ik -D_0600035C = 0x0600035C; -D_06000380 = 0x06000380; -D_06000634 = 0x06000634; -D_06000660 = 0x06000660; -D_060008DC = 0x060008DC; -D_06000C6C = 0x06000C6C; -D_06000C90 = 0x06000C90; -D_06000F0C = 0x06000F0C; -D_06016BE0 = 0x06016BE0; -D_06016CD8 = 0x06016CD8; -D_06016F88 = 0x06016F88; -D_06017028 = 0x06017028; -D_06017170 = 0x06017170; -D_0601EE60 = 0x0601EE60; -D_06000F30 = 0x06000F30; -D_0601EB14 = 0x0601EB14; -D_0601EB40 = 0x0601EB40; -D_0601EE34 = 0x0601EE34; -D_06000900 = 0x06000900; - // z_demo_kankyo D_06000080 = 0x06000080; D_06000DE0 = 0x06000DE0; @@ -1248,214 +241,9 @@ D_06007440 = 0x06007440; D_06007578 = 0x06007578; D_06008390 = 0x06008390; -// z_demo_kekkai -D_06004930 = 0x06004930; -D_06004F00 = 0x06004F00; -D_06005A30 = 0x06005A30; -D_06005CB0 = 0x06005CB0; - -// z_door_killer -D_06001BC8 = 0x06001BC8; - -// z_efc_erupc -D_06001720 = 0x06001720; -D_06002570 = 0x06002570; -D_06002760 = 0x06002760; -D_060027D8 = 0x060027D8; - -// z_en_am -D_06000118 = 0x06000118; -D_06000238 = 0x06000238; -D_0600033C = 0x0600033C; -D_06005948 = 0x06005948; -D_06005B3C = 0x06005B3C; - -// z_en_ba -D_06000890 = 0x06000890; -D_06001D80 = 0x06001D80; - -// z_en_bb -D_06000184 = 0x06000184; -D_06000444 = 0x06000444; -D_06001A30 = 0x06001A30; - -// z_en_bdfire -D_0601D950 = 0x0601D950; - -// z_en_bigokuta -D_06000444 = 0x06000444; -D_06000A74 = 0x06000A74; -D_06000D1C = 0x06000D1C; -D_060014B8 = 0x060014B8; -D_06001CA4 = 0x06001CA4; -D_06006BC0 = 0x06006BC0; - -// z_en_brob -D_06000290 = 0x06000290; -D_060015D8 = 0x060015D8; -D_06001678 = 0x06001678; -D_06001750 = 0x06001750; -D_06001958 = 0x06001958; -D_06001A70 = 0x06001A70; - -// z_en_bw -D_06000228 = 0x06000228; -D_060020F0 = 0x060020F0; -D_060021A0 = 0x060021A0; -D_06002250 = 0x06002250; - -// z_en_cs -D_0602AF70 = 0x0602AF70; - -// z_en_daiku_kakariko -D_06007958 = 0x06007958; - -// z_en_diving_game -D_0600219C = 0x0600219C; -D_06002FE8 = 0x06002FE8; -D_0600BFA8 = 0x0600BFA8; - -// z_en_dnt_jiji -D_06000560 = 0x06000560; -D_06000944 = 0x06000944; -D_06000A70 = 0x06000A70; -D_06000BD0 = 0x06000BD0; -D_06000DF8 = 0x06000DF8; -D_060012B0 = 0x060012B0; -D_06002310 = 0x06002310; -D_060033E0 = 0x060033E0; -D_060037C0 = 0x060037C0; - -// z_en_dnt_nomal -D_06000168 = 0x06000168; -D_0600031C = 0x0600031C; -D_06000430 = 0x06000430; -D_060006CC = 0x060006CC; -D_06000894 = 0x06000894; -D_06000B70 = 0x06000B70; -D_060014E0 = 0x060014E0; -D_06001B00 = 0x06001B00; -D_060023B8 = 0x060023B8; -D_060024CC = 0x060024CC; -D_060026C4 = 0x060026C4; -D_06002AF0 = 0x06002AF0; -D_06002E1C = 0x06002E1C; -D_06002E84 = 0x06002E84; -D_06003128 = 0x06003128; - -// z_en_dodojr -D_060004A0 = 0x060004A0; -D_060005F0 = 0x060005F0; -D_06000724 = 0x06000724; -D_06000860 = 0x06000860; -D_060009D4 = 0x060009D4; -D_060020E0 = 0x060020E0; - -// z_en_encount2 -D_06000DE0 = 0x06000DE0; - -// z_en_fire_rock -D_06000DE0 = 0x06000DE0; - -// z_en_fr -D_060011C0 = 0x060011C0; -D_06001534 = 0x06001534; -D_0600B498 = 0x0600B498; -D_060007BC = 0x060007BC; - -// z_en_gb -D_0600049C = 0x0600049C; -D_0600C0B0 = 0x0600C0B0; -D_0600C220 = 0x0600C220; -D_0600C2D0 = 0x0600C2D0; -D_0600C8EC = 0x0600C8EC; - -// z_en_ge1 -D_06000228 = 0x06000228; -D_06000330 = 0x06000330; -D_0600A048 = 0x0600A048; -D_0600A498 = 0x0600A498; - -// z_en_ge2 -D_06008968 = 0x06008968; -D_06009ED4 = 0x06009ED4; - -// z_en_go -D_06004930 = 0x06004930; -D_0600BD80 = 0x0600BD80; -D_0600C140 = 0x0600C140; -D_0600CE80 = 0x0600CE80; -D_0600DE80 = 0x0600DE80; -D_0600FD40 = 0x0600FD40; -D_0600FD50 = 0x0600FD50; -D_0600FEF0 = 0x0600FEF0; -D_06010590 = 0x06010590; - -// z_en_go2 -D_06000750 = 0x06000750; -D_06000D5C = 0x06000D5C; -D_0600161C = 0x0600161C; -D_06001A00 = 0x06001A00; -D_060021D0 = 0x060021D0; -D_060029A8 = 0x060029A8; -D_06002D80 = 0x06002D80; -D_06003768 = 0x06003768; -D_060038E4 = 0x060038E4; -D_06004930 = 0x06004930; -D_0600BD80 = 0x0600BD80; -D_0600C140 = 0x0600C140; -D_0600CE80 = 0x0600CE80; -D_0600D280 = 0x0600D280; -D_0600D680 = 0x0600D680; -D_0600DA80 = 0x0600DA80; -D_0600DE80 = 0x0600DE80; -D_0600E680 = 0x0600E680; -D_0600FD40 = 0x0600FD40; -D_0600FD50 = 0x0600FD50; -D_0600FEF0 = 0x0600FEF0; -D_06010590 = 0x06010590; - -// z_en_g_switch -D_060017C0 = 0x060017C0; -D_06001960 = 0x06001960; - -// z_en_horse -D_02000230 = 0x02000230; -D_02002AC0 = 0x02002AC0; -D_06006530 = 0x06006530; - -// z_en_hs -D_06000304 = 0x06000304; -D_06000528 = 0x06000528; -D_060005C0 = 0x060005C0; -D_06006260 = 0x06006260; - // z_en_hy -D_06000BFC = 0x06000BFC; -D_06000FE4 = 0x06000FE4; -D_060012E8 = 0x060012E8; -D_06002160 = 0x06002160; -D_0600265C = 0x0600265C; -D_060033B4 = 0x060033B4; D_06005BC8 = 0x06005BC8; -// z_en_in -D_060003B4 = 0x060003B4; -D_06001BE0 = 0x06001BE0; -D_060034D0 = 0x060034D0; -D_06007A20 = 0x06007A20; -D_06007BF8 = 0x06007BF8; -D_06013B88 = 0x06013B88; -D_06013D60 = 0x06013D60; -D_06014CA8 = 0x06014CA8; -D_06015814 = 0x06015814; -D_0601646C = 0x0601646C; -D_06018C38 = 0x06018C38; - -// z_en_kanban -D_06000C30 = 0x06000C30; -D_06001630 = 0x06001630; - // z_en_ko D_06006A60 = 0x06006A60; D_06007830 = 0x06007830; @@ -1463,165 +251,20 @@ D_06007D94 = 0x06007D94; D_0600879C = 0x0600879C; D_06008F6C = 0x06008F6C; -// z_en_mk -D_06000368 = 0x06000368; -D_06000724 = 0x06000724; -D_06000AC0 = 0x06000AC0; -D_06000D88 = 0x06000D88; -D_06005DF0 = 0x06005DF0; - // z_en_mm -D_06005E18 = 0x06005E18; D_0602CA38 = 0x0602CA38; -// z_en_mm2 -D_06005E18 = 0x06005E18; - -// z_en_mu -D_060003F4 = 0x060003F4; -D_06004F70 = 0x06004F70; - -// z_en_m_thunder -D_04012570 = 0x04012570; -D_04012690 = 0x04012690; -D_04012AF0 = 0x04012AF0; -D_04012C10 = 0x04012C10; -D_04013610 = 0x04013610; - // z_en_ossan D_060000F0 = 0x060000F0; -D_060000FC = 0x060000FC; -D_060002E4 = 0x060002E4; -D_06000338 = 0x06000338; -D_060004A8 = 0x060004A8; -D_0600065C = 0x0600065C; -D_0600078C = 0x0600078C; -D_06002820 = 0x06002820; -D_06004258 = 0x06004258; -D_06004658 = 0x06004658; -D_06004868 = 0x06004868; -D_06009B38 = 0x06009B38; -D_0600BFA8 = 0x0600BFA8; -D_0600DE80 = 0x0600DE80; -D_0600FEF0 = 0x0600FEF0; // z_en_sa D_02005730 = 0x02005730; D_02010E20 = 0x02010E20; -// z_en_shopnuts -D_060001EC = 0x060001EC; -D_0600039C = 0x0600039C; -D_06000764 = 0x06000764; -D_06000BA0 = 0x06000BA0; -D_0600139C = 0x0600139C; -D_06003B68 = 0x06003B68; -D_060041A8 = 0x060041A8; -D_06004574 = 0x06004574; - -// z_en_stream -D_06000950 = 0x06000950; - -// z_en_sw -D_06000304 = 0x06000304; -D_06003FB0 = 0x06003FB0; -D_060043D8 = 0x060043D8; -D_060045C0 = 0x060045C0; -D_06004658 = 0x06004658; -D_060046F0 = 0x060046F0; -D_06004788 = 0x06004788; -D_06004820 = 0x06004820; -D_060048B8 = 0x060048B8; -D_06004950 = 0x06004950; -D_060049E8 = 0x060049E8; -D_06005298 = 0x06005298; - -// z_en_syateki_man -D_06000338 = 0x06000338; -D_06007E28 = 0x06007E28; -D_06009B38 = 0x06009B38; - -// z_en_ta -D_060017E8 = 0x060017E8; -D_06001C94 = 0x06001C94; -D_06006DC0 = 0x06006DC0; -D_0600B7B8 = 0x0600B7B8; -D_0600BF38 = 0x0600BF38; -D_0600C48C = 0x0600C48C; -D_0600C858 = 0x0600C858; -D_0600CD50 = 0x0600CD50; -D_0600CF28 = 0x0600CF28; -D_0600E3D8 = 0x0600E3D8; - -// z_en_tite -D_0600083C = 0x0600083C; -D_06000A14 = 0x06000A14; -D_06000C70 = 0x06000C70; -D_060012E4 = 0x060012E4; -D_06001300 = 0x06001300; -D_06001700 = 0x06001700; -D_06001900 = 0x06001900; -D_06001B00 = 0x06001B00; -D_06001F00 = 0x06001F00; -D_06002100 = 0x06002100; -D_06003A20 = 0x06003A20; - -// z_en_toryo -D_06007150 = 0x06007150; - -// z_en_tp -D_06000000 = 0x06000000; -D_060008D0 = 0x060008D0; -D_06000C68 = 0x06000C68; - -// z_en_tr -D_060013CC = 0x060013CC; -D_06001CDC = 0x06001CDC; -D_060035CC = 0x060035CC; -D_06003FC8 = 0x06003FC8; -D_060049C8 = 0x060049C8; -D_0600C530 = 0x0600C530; -D_06011688 = 0x06011688; - -// z_en_trap -D_06001400 = 0x06001400; - // z_en_viewer D_01000000 = 0x01000000; -D_06000450 = 0x06000450; -D_060005B4 = 0x060005B4; -D_060008A0 = 0x060008A0; -D_06000BC8 = 0x06000BC8; -D_06000F54 = 0x06000F54; -D_06001410 = 0x06001410; -D_060014F4 = 0x060014F4; -D_06001D28 = 0x06001D28; -D_06002574 = 0x06002574; -D_06002928 = 0x06002928; -D_060029CC = 0x060029CC; -D_06003284 = 0x06003284; -D_06003428 = 0x06003428; -D_06003D84 = 0x06003D84; -D_0600420C = 0x0600420C; -D_06004260 = 0x06004260; -D_06004534 = 0x06004534; -D_060048B0 = 0x060048B0; -D_060048FC = 0x060048FC; -D_0600504C = 0x0600504C; -D_060050A8 = 0x060050A8; -D_06007210 = 0x06007210; -D_0600A4E0 = 0x0600A4E0; D_0600BE90 = 0x0600BE90; -D_0600D0D8 = 0x0600D0D8; -D_0600E1A8 = 0x0600E1A8; -D_0600F178 = 0x0600F178; -D_0600F378 = 0x0600F378; -D_0600F578 = 0x0600F578; -D_0600F778 = 0x0600F778; -D_0600F788 = 0x0600F788; -D_06011348 = 0x06011348; D_060114E8 = 0x060114E8; -D_060119E8 = 0x060119E8; // z_en_wf D_06004638 = 0x06004638; @@ -1634,9 +277,6 @@ D_060098C8 = 0x060098C8; D_06009B20 = 0x06009B20; D_0600A4AC = 0x0600A4AC; -// z_en_wood02 -D_06000700 = 0x06000700; - // z_en_zf D_06006690 = 0x06006690; D_06008138 = 0x06008138; @@ -1653,52 +293,9 @@ D_06014E60 = 0x06014E60; D_060157F8 = 0x060157F8; D_06016388 = 0x06016388; -// z_en_zl4 -D_02000104 = 0x02000104; -D_02000444 = 0x02000444; -D_02003994 = 0x02003994; -D_0600E038 = 0x0600E038; -D_0600F0A4 = 0x0600F0A4; -D_0600F894 = 0x0600F894; -D_06010DF8 = 0x06010DF8; -D_060125E4 = 0x060125E4; -D_06012E58 = 0x06012E58; -D_06015F14 = 0x06015F14; -D_060169B4 = 0x060169B4; -D_06016D08 = 0x06016D08; -D_0601805C = 0x0601805C; -D_06018898 = 0x06018898; -D_0601910C = 0x0601910C; -D_0601A2FC = 0x0601A2FC; -D_0601AAE0 = 0x0601AAE0; -D_0601B874 = 0x0601B874; -D_0601BCF0 = 0x0601BCF0; -D_0601CE08 = 0x0601CE08; - -// z_en_zo -D_06000598 = 0x06000598; -D_06000D48 = 0x06000D48; -D_060022F0 = 0x060022F0; -D_06002350 = 0x06002350; -D_060024A0 = 0x060024A0; -D_06002510 = 0x06002510; -D_06002F10 = 0x06002F10; -D_0600BFA8 = 0x0600BFA8; -D_0600BFC0 = 0x0600BFC0; -D_0600C028 = 0x0600C028; - // z_item_shield D_060224F8 = 0x060224F8; // z_object_kankyo D_01000000 = 0x01000000; -D_06005FF0 = 0x06005FF0; D_06009620 = 0x06009620; - -// z_obj_hamishi -D_0500A3B8 = 0x0500A3B8; -D_0500A5E8 = 0x0500A5E8; - - - -