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

naming (#1425)

This commit is contained in:
Nuss 2023-10-09 02:39:15 +02:00 committed by GitHub
parent 5dced7a09b
commit 808f60a1fa
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_kzsaku.xml
View File

@ -1,7 +1,8 @@
<Root> <Root>
<!-- Object for Underwater grate -->
<File Name="object_kzsaku" Segment="6"> <File Name="object_kzsaku" Segment="6">
<DList Name="object_kzsaku_DL_000040" Offset="0x40" /> <!-- Original name is "kz_saku_model" --> <DList Name="gUnderwaterGrateDL" Offset="0x40" /> <!-- Original name is "kz_saku_model" -->
<Texture Name="object_kzsaku_Tex_0000D0" OutName="tex_0000D0" Format="ia8" Width="32" Height="128" Offset="0xD0" /> <Texture Name="gUnderwaterGrateTex" OutName="underwater_grate" Format="ia8" Width="32" Height="128" Offset="0xD0" />
<Collision Name="object_kzsaku_Colheader_001118" Offset="0x1118" /> <!-- Original name is "z2_30_saku_bgdatainfo" --> <Collision Name="gUnderwaterGrateCol" Offset="0x1118" /> <!-- Original name is "z2_30_saku_bgdatainfo" -->
</File> </File>
</Root> </Root>

4
src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c
View File

@ -42,7 +42,7 @@ void ObjKzsaku_Init(Actor* thisx, PlayState* play) {
Actor_SetScale(&this->dyna.actor, 1.0f); Actor_SetScale(&this->dyna.actor, 1.0f);
DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS);
CollisionHeader_GetVirtual(&object_kzsaku_Colheader_001118, &col); CollisionHeader_GetVirtual(&gUnderwaterGrateCol, &col);
this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, col); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, col);
@ -124,7 +124,7 @@ void ObjKzsaku_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx); Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_kzsaku_DL_000040); gSPDisplayList(POLY_OPA_DISP++, gUnderwaterGrateDL);
CLOSE_DISPS(play->state.gfxCtx); CLOSE_DISPS(play->state.gfxCtx);
} }