From 576cf6964cf5155ac208e6cebb5f8d5cb53120bd Mon Sep 17 00:00:00 2001 From: Wimmer <71473855+Wimmerrad@users.noreply.github.com> Date: Fri, 13 Oct 2023 19:23:09 +0200 Subject: [PATCH] Obj_visiblock (#1422) * Obj_visiblock Object for the Lens of Truth Platforms * Update assets/xml/objects/object_visiblock.xml DList update Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update assets/xml/objects/object_visiblock.xml Tex outname update Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update z_obj_visiblock.c DList name update * Revert "Update assets/xml/objects/object_visiblock.xml " This reverts commit 228d6e8914d1a9df7f996809bd876b44130ddf86. * Revert "Update assets/xml/objects/object_visiblock.xml " This reverts commit 53a8786f269e60899408946283e2e55513890486. * Update object_visiblock.xml --------- Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> --- assets/xml/objects/object_visiblock.xml | 9 +++++---- src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/assets/xml/objects/object_visiblock.xml b/assets/xml/objects/object_visiblock.xml index d714338fcd..cae0483222 100644 --- a/assets/xml/objects/object_visiblock.xml +++ b/assets/xml/objects/object_visiblock.xml @@ -1,8 +1,9 @@  + - - - - + + + + diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c index 9859d9c0f5..c685f28368 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -39,7 +39,7 @@ void ObjVisiblock_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, 0); - DynaPolyActor_LoadMesh(play, &this->dyna, &object_visiblock_Colheader_000AD0); + DynaPolyActor_LoadMesh(play, &this->dyna, &gLensOfTruthPlatformCol); } void ObjVisiblock_Destroy(Actor* thisx, PlayState* play) { @@ -49,5 +49,5 @@ void ObjVisiblock_Destroy(Actor* thisx, PlayState* play) { } void ObjVisiblock_Draw(Actor* thisx, PlayState* play) { - Gfx_DrawDListXlu(play, object_visiblock_DL_000140); + Gfx_DrawDListXlu(play, gLensOfTruthPlatformDL); }