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

Rename display lists properly

This commit is contained in:
JordanLongstaff 2025-12-05 17:40:33 -05:00
parent 979ade1b5a
commit f41b09ea8e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
assets/xml/objects/object_maruta.xml
View File

@ -3,14 +3,14 @@
<Texture Name="object_maruta_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
<Texture Name="object_maruta_Tex_000800" OutName="tex_000800" Format="rgba16" Width="32" Height="32" Offset="0x800" />
<Texture Name="object_maruta_Tex_001000" OutName="tex_001000" Format="rgba16" Width="32" Height="32" Offset="0x1000" />
<DList Name="object_maruta_DL_BottomLeftBigChunk" Offset="0x2220" /> <!-- Original name is "parts_1_model" -->
<DList Name="object_maruta_DL_BottomRightBigChunk" Offset="0x23D0" /> <!-- Original name is "parts_2_model" -->
<DList Name="object_maruta_DL_BottomLeftCornerChunk" Offset="0x2568" /> <!-- Original name is "parts_3_model" -->
<DList Name="object_maruta_DL_BottomRightCornerChunk" Offset="0x2660" /> <!-- Original name is "parts_4_model" -->
<DList Name="object_maruta_DL_TopLeftCornerChunk" Offset="0x2758" /> <!-- Original name is "parts_5_model" -->
<DList Name="object_maruta_DL_TopRightCornerChunk" Offset="0x2850" /> <!-- Original name is "parts_6_model" -->
<DList Name="object_maruta_DL_TopLeftBigChunk" Offset="0x2948" /> <!-- Original name is "parts_7_model" -->
<DList Name="object_maruta_DL_TopRightBigChunk" Offset="0x2AE0" /> <!-- Original name is "parts_8_model" -->
<DList Name="object_maruta_DL_Whole" Offset="0x2EC0" /> <!-- Original name is "kiretenaimaruta_model" -->
<DList Name="gPracticeLogBottomLeftBigChunkDL" Offset="0x2220" /> <!-- Original name is "parts_1_model" -->
<DList Name="gPracticeLogBottomRightBigChunkDL" Offset="0x23D0" /> <!-- Original name is "parts_2_model" -->
<DList Name="gPracticeLogBottomLeftCornerChunkDL" Offset="0x2568" /> <!-- Original name is "parts_3_model" -->
<DList Name="gPracticeLogBottomRightCornerChunkDL" Offset="0x2660" /> <!-- Original name is "parts_4_model" -->
<DList Name="gPracticeLogTopLeftCornerChunkDL" Offset="0x2758" /> <!-- Original name is "parts_5_model" -->
<DList Name="gPracticeLogTopRightCornerChunkDL" Offset="0x2850" /> <!-- Original name is "parts_6_model" -->
<DList Name="gPracticeLogTopLeftBigChunkDL" Offset="0x2948" /> <!-- Original name is "parts_7_model" -->
<DList Name="gPracticeLogTopRightBigChunkDL" Offset="0x2AE0" /> <!-- Original name is "parts_8_model" -->
<DList Name="gPracticeLogWhole" Offset="0x2EC0" /> <!-- Original name is "kiretenaimaruta_model" -->
</File>
</Root>

10
src/overlays/actors/ovl_En_Maruta/z_en_maruta.c
View File

@ -47,10 +47,10 @@ ActorProfile En_Maruta_Profile = {
};
Gfx* sDisplayLists[] = {
object_maruta_DL_BottomLeftBigChunk, object_maruta_DL_BottomRightBigChunk,
object_maruta_DL_BottomLeftCornerChunk, object_maruta_DL_BottomRightCornerChunk,
object_maruta_DL_TopLeftCornerChunk, object_maruta_DL_TopRightCornerChunk,
object_maruta_DL_TopLeftBigChunk, object_maruta_DL_TopRightBigChunk,
gPracticeLogBottomLeftBigChunkDL, gPracticeLogBottomRightBigChunkDL,
gPracticeLogBottomLeftCornerChunkDL, gPracticeLogBottomRightCornerChunkDL,
gPracticeLogTopLeftCornerChunkDL, gPracticeLogTopRightCornerChunkDL,
gPracticeLogTopLeftBigChunkDL, gPracticeLogTopRightBigChunkDL,
};
u8 sFragmentsByShape[] = {
@ -723,7 +723,7 @@ void EnMaruta_Draw(Actor* thisx, PlayState* play) {
if (this->shape == ENMARUTA_SHAPE_WHOLE) {
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, object_maruta_DL_Whole);
gSPDisplayList(POLY_OPA_DISP++, gPracticeLogWhole);
} else {
translate = sTranslationVectorsToRecoilAxis[this->shape];