diff options
| -rw-r--r-- | assets/xml/objects/object_lotus.xml | 9 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/assets/xml/objects/object_lotus.xml b/assets/xml/objects/object_lotus.xml index a9835b81b..b9f40033c 100644 --- a/assets/xml/objects/object_lotus.xml +++ b/assets/xml/objects/object_lotus.xml @@ -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> diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c index 6ac4ac866..72a38b21b 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -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); } |