izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Document object_lotus (lily pad) (#1067)

Browse Source
This commit is contained in:
Tom Overton
2022-09-24 15:28:49 -03:00
committed by GitHub
parent 62502ac22f
commit 4088aea3f7
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_lotus.xml
+5 -4
View File
@@ -1,8 +1,9 @@
<Root> <Root>
<!-- Assets for Lily Pads -->
<File Name="object_lotus" Segment="6"> <File Name="object_lotus" Segment="6">
<DList Name="object_lotus_DL_000040" Offset="0x40" /> <DList Name="gLilyPadDL" Offset="0x40" /> <!-- Original name is "z2_hasu_model" ("lotus​") -->
<Texture Name="object_lotus_TLUT_000100" OutName="tlut_000100" Format="rgba16" Width="4" Height="4" Offset="0x100" /> <Texture Name="gLilyPadTLUT" OutName="lily_pad_tlut" 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" /> <Texture Name="gLilyPadTex" OutName="lily_pad" Format="ci4" Width="64" Height="64" Offset="0x120" />
<Collision Name="object_lotus_Colheader_000A20" Offset="0xA20" /> <Collision Name="gLilyPadCol" Offset="0xA20" />
</File> </File>
</Root> </Root>
src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
+2 -2
View File
@@ -43,7 +43,7 @@ void BgLotus_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain); Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1); 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.floorHeight = BgCheck_EntityRaycastFloor5(&play->colCtx, &thisx->floorPoly, &bgId,
&this->dyna.actor, &this->dyna.actor.world.pos); &this->dyna.actor, &this->dyna.actor.world.pos);
this->timer2 = 96; this->timer2 = 96;
@@ -171,5 +171,5 @@ void BgLotus_Update(Actor* thisx, PlayState* play) {
} }
void BgLotus_Draw(Actor* thisx, PlayState* play) { void BgLotus_Draw(Actor* thisx, PlayState* play) {
Gfx_DrawDListOpa(play, object_lotus_DL_000040); Gfx_DrawDListOpa(play, gLilyPadDL);
} }