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

object_ladder (#1419) 

* naming

* Original naming

* removed comments

* comments
This commit is contained in:
Nuss 2023-10-09 04:05:12 +02:00 committed by GitHub
parent ab4c207be4
commit e174672223
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
assets/xml/objects/object_ladder.xml
View File

@ -1,13 +1,23 @@
<Root> <Root>
<!-- Object for Wooden Ladder -->
<File Name="object_ladder" Segment="6"> <File Name="object_ladder" Segment="6">
<DList Name="object_ladder_DL_0000A0" Offset="0xA0" /> <!-- Original name is "m2_HASIGO_45_model" --> <!-- Wooden Ladder with 12 Rungs -->
<Collision Name="object_ladder_Colheader_0001D8" Offset="0x1D8" /> <!-- Original name is "m2_HASIGO_45_bgdatainfo" --> <DList Name="gWoodenLadder12RungDL" Offset="0xA0" /> <!-- Original name is "m2_HASIGO_45_model" -->
<DList Name="object_ladder_DL_0002D0" Offset="0x2D0" /> <!-- Original name is "m2_HASIGO_60_model" --> <Collision Name="gWoodenLadder12RungCol" Offset="0x1D8" /> <!-- Original name is "m2_HASIGO_45_bgdatainfo" -->
<Collision Name="object_ladder_Colheader_000408" Offset="0x408" /> <!-- Original name is "m2_HASIGO_60_bgdatainfo" -->
<DList Name="object_ladder_DL_000500" Offset="0x500" /> <!-- Original name is "m2_HASIGO_75_model" --> <!-- Wooden Ladder with 16 Rungs -->
<Collision Name="object_ladder_Colheader_000638" Offset="0x638" /> <!-- Original name is "m2_HASIGO_75_bgdatainfo" --> <DList Name="gWoodenLadder16RungDL" Offset="0x2D0" /> <!-- Original name is "m2_HASIGO_60_model" -->
<DList Name="object_ladder_DL_000730" Offset="0x730" /> <!-- Original name is "m2_HASIGO_90_model" --> <Collision Name="gWoodenLadder16RungCol" Offset="0x408" /> <!-- Original name is "m2_HASIGO_60_bgdatainfo" -->
<Collision Name="object_ladder_Colheader_000868" Offset="0x868" /> <!-- Original name is "m2_HASIGO_90_bgdatainfo" -->
<Texture Name="object_ladder_Tex_0008A0" OutName="tex_0008A0" Format="rgba16" Width="32" Height="32" Offset="0x8A0" /> <!-- Wooden Ladder with 20 Rungs -->
<DList Name="gWoodenLadder20RungDL" Offset="0x500" /> <!-- Original name is "m2_HASIGO_75_model" -->
<Collision Name="gWoodenLadder20RungCol" Offset="0x638" /> <!-- Original name is "m2_HASIGO_75_bgdatainfo" -->
<!-- Wooden Ladder with 24 Rungs -->
<DList Name="gWoodenLadder24RungDL" Offset="0x730" /> <!-- Original name is "m2_HASIGO_90_model" -->
<Collision Name="gWoodenLadder24RungCol" Offset="0x868" /> <!-- Original name is "m2_HASIGO_90_bgdatainfo" -->
<!-- Wooden Ladder Texture -->
<Texture Name="gWoodenLadderTex" OutName="wooden_ladder" Format="rgba16" Width="32" Height="32" Offset="0x8A0" />
</File> </File>
</Root> </Root>

16
src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c
View File

@ -37,10 +37,10 @@ static InitChainEntry sInitChain[] = {
}; };
static Gfx* sLadderDLists[] = { static Gfx* sLadderDLists[] = {
object_ladder_DL_0000A0, // 12 Rung gWoodenLadder12RungDL,
object_ladder_DL_0002D0, // 16 Rung gWoodenLadder16RungDL,
object_ladder_DL_000500, // 20 Rung gWoodenLadder20RungDL,
object_ladder_DL_000730, // 24 Rung gWoodenLadder24RungDL,
}; };
void BgLadder_Init(Actor* thisx, PlayState* play) { void BgLadder_Init(Actor* thisx, PlayState* play) {
@ -55,13 +55,13 @@ void BgLadder_Init(Actor* thisx, PlayState* play) {
size = thisx->params; size = thisx->params;
if (size == LADDER_SIZE_12RUNG) { if (size == LADDER_SIZE_12RUNG) {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_ladder_Colheader_0001D8); DynaPolyActor_LoadMesh(play, &this->dyna, &gWoodenLadder12RungCol);
} else if (size == LADDER_SIZE_16RUNG) { } else if (size == LADDER_SIZE_16RUNG) {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_ladder_Colheader_000408); DynaPolyActor_LoadMesh(play, &this->dyna, &gWoodenLadder16RungCol);
} else if (size == LADDER_SIZE_20RUNG) { } else if (size == LADDER_SIZE_20RUNG) {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_ladder_Colheader_000638); DynaPolyActor_LoadMesh(play, &this->dyna, &gWoodenLadder20RungCol);
} else if (size == LADDER_SIZE_24RUNG) { } else if (size == LADDER_SIZE_24RUNG) {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_ladder_Colheader_000868); DynaPolyActor_LoadMesh(play, &this->dyna, &gWoodenLadder24RungCol);
} else { } else {
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);
return; return;