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

object_icicle (#1421) 

* Naming

* naming

* naming

* top comment
This commit is contained in:
Nuss 2023-10-11 15:44:20 +02:00 committed by GitHub
parent f17e85d1fd
commit 2c182bf7e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/xml/objects/object_icicle.xml
View File

@ -1,7 +1,8 @@
<Root>
<!-- Object for Icicles -->
<File Name="object_icicle" Segment="6">
<DList Name="object_icicle_DL_0000D0" Offset="0xD0" /> <!-- Original name is "ice_turara_model" -->
<Collision Name="object_icicle_Colheader_000294" Offset="0x294" /> <!-- Original name is "ice_turara_bgdatainfo" -->
<Texture Name="object_icicle_Tex_0002C0" OutName="tex_0002C0" Format="i8" Width="64" Height="64" Offset="0x2C0" />
<DList Name="gIcicleDL" Offset="0xD0" /> <!-- Original name is "ice_turara_model" -->
<Collision Name="gIcicleCol" Offset="0x294" /> <!-- Original name is "ice_turara_bgdatainfo" -->
<Texture Name="gIcicleTex" OutName="icicle" Format="i8" Width="64" Height="64" Offset="0x2C0" />
</File>
</Root>

4
src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
View File

@ -69,7 +69,7 @@ void BgIcicle_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(thisx, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(play, &this->dyna, &object_icicle_Colheader_000294);
DynaPolyActor_LoadMesh(play, &this->dyna, &gIcicleCol);
Collider_InitAndSetCylinder(play, &this->collider, thisx, &sCylinderInit);
Collider_UpdateCylinder(thisx, &this->collider);
@ -242,5 +242,5 @@ void BgIcicle_Update(Actor* thisx, PlayState* play) {
}
void BgIcicle_Draw(Actor* thisx, PlayState* play) {
Gfx_DrawDListOpa(play, object_icicle_DL_0000D0);
Gfx_DrawDListOpa(play, gIcicleDL);
}