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

Add comment to Arrow_Ice xml and update DL names (#605) 

* Add comment to Arrow_Ice xml and update DL names

* Update asset names

* Improve texture names
This commit is contained in:
Tom Overton 2022-02-13 16:14:58 -08:00 committed by GitHub
parent 9e9b84cb2c
commit 009ad45f48
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

11
assets/xml/overlays/ovl_Arrow_Ice.xml
View File

@ -1,11 +1,12 @@
<Root>
<!-- Ice Arrow assets -->
<File Name="ovl_Arrow_Ice" BaseAddress="0x80922430" RangeStart="0x980" RangeEnd="0x1DA0">
<Texture Name="sIceArrow1Tex" OutName="ice_tex_1" Format="ia8" Width="32" Height="64" Offset="0x980"/>
<Texture Name="sIceArrow2Tex" OutName="ice_tex_2" Format="ia8" Width="32" Height="64" Offset="0x1180"/>
<Array Name="sIceArrowVtx" Count="43" Offset="0x1980">
<Texture Name="gIceArrowTex" OutName="ice_arrow" Format="ia8" Width="32" Height="64" Offset="0x980"/>
<Texture Name="gIceArrowMaskTex" OutName="ice_arrow_mask" Format="ia8" Width="32" Height="64" Offset="0x1180"/>
<Array Name="gIceArrowVtx" Count="43" Offset="0x1980">
<Vtx/>
</Array>
<DList Name="sIceArrowDL" Offset="0x1C30"/>
<DList Name="sIceArrowVtxDL" Offset="0x1CE0"/>
<DList Name="gIceArrowMaterialDL" Offset="0x1C30"/>
<DList Name="gIceArrowModelDL" Offset="0x1CE0"/>
</File>
</Root>

4
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View File

@ -228,11 +228,11 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Scale(this->radius * 0.2f, this->height * 3.0f, this->radius * 0.2f, MTXMODE_APPLY);
Matrix_InsertTranslation(0.0f, -700.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sIceArrowDL);
gSPDisplayList(POLY_XLU_DISP++, gIceArrowMaterialDL);
gSPDisplayList(POLY_XLU_DISP++,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 128, 32, 1,
511 - (stateFrames * 10) % 512, 511 - (stateFrames * 10) % 512, 4, 16));
gSPDisplayList(POLY_XLU_DISP++, sIceArrowVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gIceArrowModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}