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

obj_big_fwall (#1435) 

* Big Fire Wall

Big fire wall.xml / Z en encount3.c update

* RingOfFire update
This commit is contained in:
Wimmer 2023-10-13 13:50:00 +02:00 committed by GitHub
parent 2e344b8d15
commit 01d5816417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/xml/objects/object_big_fwall.xml
View File

@ -1,6 +1,7 @@
<Root>
<!-- Ring Of Fire used during Garo's encounters -->
<File Name="object_big_fwall" Segment="6">
<Texture Name="object_big_fwall_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0" />
<DList Name="object_big_fwall_DL_0009A0" Offset="0x9A0" /> <!-- Original name is "big_firewall_modelT" -->
<Texture Name="gRingOfFireTex" OutName="ring_of_fire" Format="i8" Width="32" Height="64" Offset="0x0" />
<DList Name="gRingOfFireDL" Offset="0x9A0" /> <!-- Original name is "big_firewall_modelT" -->
</File>
</Root>

2
src/overlays/actors/ovl_En_Encount3/z_en_encount3.c
View File

@ -199,7 +199,7 @@ void EnEncount3_Draw(Actor* thisx, PlayState* play) {
Matrix_Scale(this->unk168, this->unk174, this->unk168, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_big_fwall_DL_0009A0);
gSPDisplayList(POLY_XLU_DISP++, gRingOfFireDL);
Matrix_Pop();
CLOSE_DISPS(play->state.gfxCtx);