diff --git a/assets/xml/objects/object_ladder.xml b/assets/xml/objects/object_ladder.xml index 29ee69b9b4..2fc01e5bfa 100644 --- a/assets/xml/objects/object_ladder.xml +++ b/assets/xml/objects/object_ladder.xml @@ -1,13 +1,23 @@  + - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c index 12cd5d334d..8445e855a2 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -37,10 +37,10 @@ static InitChainEntry sInitChain[] = { }; static Gfx* sLadderDLists[] = { - object_ladder_DL_0000A0, // 12 Rung - object_ladder_DL_0002D0, // 16 Rung - object_ladder_DL_000500, // 20 Rung - object_ladder_DL_000730, // 24 Rung + gWoodenLadder12RungDL, + gWoodenLadder16RungDL, + gWoodenLadder20RungDL, + gWoodenLadder24RungDL, }; void BgLadder_Init(Actor* thisx, PlayState* play) { @@ -55,13 +55,13 @@ void BgLadder_Init(Actor* thisx, PlayState* play) { size = thisx->params; 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) { - DynaPolyActor_LoadMesh(play, &this->dyna, &object_ladder_Colheader_000408); + DynaPolyActor_LoadMesh(play, &this->dyna, &gWoodenLadder16RungCol); } 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) { - DynaPolyActor_LoadMesh(play, &this->dyna, &object_ladder_Colheader_000868); + DynaPolyActor_LoadMesh(play, &this->dyna, &gWoodenLadder24RungCol); } else { Actor_Kill(&this->dyna.actor); return;