Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 12:59:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

object_comb (#1420)

Browse Source 
* naming

* OutName
This commit is contained in:
Nuss 2023-10-07 06:47:03 +02:00 committed by GitHub
parent a980067bd8
commit 43df8f4454
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/xml/objects/object_comb.xml
View File

@ -1,8 +1,12 @@
<Root>
<!-- Object for Beehive -->
<File Name="object_comb" Segment="6">
<Texture Name="object_comb_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
<DList Name="object_comb_DL_000CB0" Offset="0xCB0" /> <!-- Original name is "hatisu_model" ("hive; beehive") -->
<Texture Name="object_comb_Tex_000E10" OutName="tex_000E10" Format="rgba16" Width="16" Height="16" Offset="0xE10" />
<DList Name="object_comb_DL_001040" Offset="0x1040" /> <!-- Original name is "hatisu_hahen_model" ("hahen" = "fragment; broken piece") -->
<!-- Beehive -->
<Texture Name="gBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x0" />
<DList Name="gBeehiveDL" Offset="0xCB0" /> <!-- Original name is "hatisu_model" ("hive; beehive") -->
<!-- Beehive Fragment -->
<Texture Name="gBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0xE10" />
<DList Name="gBeehiveFragmentDL" Offset="0x1040" /> <!-- Original name is "hatisu_hahen_model" ("hahen" = "fragment; broken piece") -->
</File>
</Root>

8
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
View File

@ -127,7 +127,7 @@ void func_8098CEAC(ObjComb* this, PlayState* play) {
phi_v0 = 0x20;
}
EffectSsKakera_Spawn(play, &spD0, &spC4, &spD0, phi_s0, phi_v0, phi_s1, 4, 0, temp_f10, 0, 0, 60, -1,
OBJECT_COMB, object_comb_DL_001040);
OBJECT_COMB, gBeehiveFragmentDL);
}
spD0.x = this->actor.world.pos.x;
@ -185,7 +185,7 @@ void func_8098D19C(ObjComb* this, PlayState* play) {
}
EffectSsKakera_Spawn(play, &spD0, &spC4, &spD0, phi_s0, phi_v0, phi_s1, 4, 0, temp_f8, 0, 0, 60, -1,
OBJECT_COMB, object_comb_DL_001040);
OBJECT_COMB, gBeehiveFragmentDL);
}
spD0.x = this->actor.world.pos.x;
@ -236,7 +236,7 @@ void func_8098D47C(ObjComb* this, PlayState* play) {
}
EffectSsKakera_Spawn(play, &spC8, &spBC, &spC8, phi_s0, phi_v0, 40, 0, 0, temp_f10, 0, 0, 80, -1, OBJECT_COMB,
object_comb_DL_001040);
gBeehiveFragmentDL);
}
}
@ -566,7 +566,7 @@ void ObjComb_Draw(Actor* thisx, PlayState* play) {
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_comb_DL_000CB0);
gSPDisplayList(POLY_OPA_DISP++, gBeehiveDL);
Collider_UpdateSpheres(0, &this->collider);