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

Document object_lotus (lily pad) (#1067)

This commit is contained in:
Tom Overton 2022-09-24 11:28:49 -07:00 committed by GitHub
parent 62502ac22f
commit 4088aea3f7
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_lotus.xml
View File

@ -1,8 +1,9 @@
<Root>
<!-- Assets for Lily Pads -->
<File Name="object_lotus" Segment="6">
<DList Name="object_lotus_DL_000040" Offset="0x40" />
<Texture Name="object_lotus_TLUT_000100" OutName="tlut_000100" Format="rgba16" Width="4" Height="4" Offset="0x100" />
<Texture Name="object_lotus_Tex_000120" OutName="tex_000120" Format="ci4" Width="64" Height="64" Offset="0x120" />
<Collision Name="object_lotus_Colheader_000A20" Offset="0xA20" />
<DList Name="gLilyPadDL" Offset="0x40" /> <!-- Original name is "z2_hasu_model" ("lotus​") -->
<Texture Name="gLilyPadTLUT" OutName="lily_pad_tlut" Format="rgba16" Width="4" Height="4" Offset="0x100" />
<Texture Name="gLilyPadTex" OutName="lily_pad" Format="ci4" Width="64" Height="64" Offset="0x120" />
<Collision Name="gLilyPadCol" Offset="0xA20" />
</File>
</Root>

4
src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
View File

@ -43,7 +43,7 @@ void BgLotus_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(play, &this->dyna, &object_lotus_Colheader_000A20);
DynaPolyActor_LoadMesh(play, &this->dyna, &gLilyPadCol);
this->dyna.actor.floorHeight = BgCheck_EntityRaycastFloor5(&play->colCtx, &thisx->floorPoly, &bgId,
&this->dyna.actor, &this->dyna.actor.world.pos);
this->timer2 = 96;
@ -171,5 +171,5 @@ void BgLotus_Update(Actor* thisx, PlayState* play) {
}
void BgLotus_Draw(Actor* thisx, PlayState* play) {
Gfx_DrawDListOpa(play, object_lotus_DL_000040);
Gfx_DrawDListOpa(play, gLilyPadDL);
}