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

Document object_gs (Gossip Stone) (#1078) 

* Document object_gs (Gossip Stone)

* Fix one of the names
This commit is contained in:
Tom Overton 2022-09-24 11:58:48 -07:00 committed by GitHub
parent 76dc0dd867
commit 6bd4b58eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/xml/objects/object_gs.xml
View File

@ -1,8 +1,9 @@
<Root>
<!-- Assets for the Gossip Stones. -->
<File Name="object_gs" Segment="6">
<Texture Name="object_gs_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0" />
<DList Name="object_gs_DL_000950" Offset="0x950" />
<DList Name="object_gs_DL_0009D0" Offset="0x9D0" />
<DList Name="object_gs_DL_000A60" Offset="0xA60" />
<Texture Name="gGossipStoneTex" OutName="gossip_stone" Format="i8" Width="32" Height="64" Offset="0x0" />
<DList Name="gGossipStoneMaterialDL" Offset="0x950" />
<DList Name="gGossipStoneDL" Offset="0x9D0" />
<DList Name="gGossipStoneBottomModelDL" Offset="0xA60" />
</File>
</Root>

6
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View File

@ -1082,10 +1082,10 @@ void EnGs_Draw(Actor* thisx, PlayState* play) {
}
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_gs_DL_000950);
gSPDisplayList(POLY_OPA_DISP++, gGossipStoneMaterialDL);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->unk_1FA.r, this->unk_1FA.g, this->unk_1FA.b, 255);
gSPDisplayList(POLY_OPA_DISP++, object_gs_DL_0009D0);
gSPDisplayList(POLY_OPA_DISP++, object_gs_DL_000A60);
gSPDisplayList(POLY_OPA_DISP++, gGossipStoneDL);
gSPDisplayList(POLY_OPA_DISP++, gGossipStoneBottomModelDL);
Matrix_Pop();