falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 228d6e8914.

* Revert "Update assets/xml/objects/object_visiblock.xml
"

This reverts commit 53a8786f26.

* Update object_visiblock.xml

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Wimmer 2023-10-13 19:23:09 +02:00 committed by GitHub
parent a03335d325
commit 576cf6964c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/xml/objects/object_visiblock.xml
View File

@ -1,8 +1,9 @@
<Root>
<!-- Object for Lens of Truth Platform -->
<File Name="object_visiblock" Segment="6">
<DList Name="object_visiblock_DL_000140" Offset="0x140" />
<DList Name="object_visiblock_DL_0001E8" Offset="0x1E8" />
<Texture Name="object_visiblock_Tex_0001F0" OutName="tex_0001F0" Format="rgba16" Width="32" Height="32" Offset="0x1F0" />
<Collision Name="object_visiblock_Colheader_000AD0" Offset="0xAD0" />
<DList Name="gLensOfTruthPlatformDL" Offset="0x140" />
<DList Name="gLensOfTruthPlatformEmptyDL" Offset="0x1E8" />
<Texture Name="gLensOfTruthPlatformTex" OutName="lens_of_truth_platform" Format="rgba16" Width="32" Height="32" Offset="0x1F0" />
<Collision Name="gLensOfTruthPlatformCol" Offset="0xAD0" />
</File>
</Root>

4
src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c
View File

@ -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);
}