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

Yasi descriptive names (#831) 

* Cleaned up yasi by giving symbols descriptive names

* renamed variables to palm tree

* Adding descriptive comment to root of xml asset file

Co-authored-by: MrPolymorph <{ID}+{username}@users.noreply.github.com>
This commit is contained in:
Kristopher Early 2022-06-19 02:29:44 +01:00 committed by GitHub
parent ec43a32c26
commit e729f10442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
assets/xml/objects/object_obj_yasi.xml
View File

@ -1,11 +1,12 @@
<Root>
<!-- Object for the Palm Tree(s) found at the Great Bay Coast -->
<File Name="object_obj_yasi" Segment="6">
<DList Name="object_obj_yasi_DL_000360" Offset="0x360" />
<Texture Name="object_obj_yasi_TLUT_000630" OutName="tlut_000630" Format="rgba16" Width="4" Height="4" Offset="0x630" />
<Texture Name="object_obj_yasi_Tex_000650" OutName="tex_000650" Format="ci4" Width="32" Height="128" Offset="0x650" />
<Texture Name="object_obj_yasi_Tex_000E50" OutName="tex_000E50" Format="rgba16" Width="16" Height="16" Offset="0xE50" />
<Texture Name="object_obj_yasi_Tex_001050" OutName="tex_001050" Format="rgba16" Width="16" Height="16" Offset="0x1050" />
<Texture Name="object_obj_yasi_Tex_001250" OutName="tex_001250" Format="rgba16" Width="8" Height="8" Offset="0x1250" />
<Collision Name="object_obj_yasi_Colheader_001428" Offset="0x1428" />
<DList Name="gPalmTreeDL" Offset="0x360" />
<Texture Name="gPalmTreeTLUT" OutName="palm_tree_tlut" Format="rgba16" Width="4" Height="4" Offset="0x630" />
<Texture Name="gPalmTreeFrondTex" OutName="palm_tree_frond_tex" Format="ci4" Width="32" Height="128" Offset="0x650" />
<Texture Name="gPalmTreeDekuNutTex" OutName="palm_tree_deku_nut_tex" Format="rgba16" Width="16" Height="16" Offset="0xE50" />
<Texture Name="gPalmTreeScarredWoodTex" OutName="palm_tree_scarred_wood_tex" Format="rgba16" Width="16" Height="16" Offset="0x1050" />
<Texture Name="gPalmTreeWoodTex" OutName="palm_tree_wood_tex" Format="rgba16" Width="8" Height="8" Offset="0x1250" />
<Collision Name="gPalmTreeCol" Offset="0x1428" />
</File>
</Root>

6
src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
View File

@ -42,11 +42,11 @@ void ObjYasi_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_obj_yasi_Colheader_001428);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &gPalmTreeCol);
this->dyna.actor.home.rot.y = 0;
if (OBJYASI_IS_WIDE(thisx)) {
if (PALM_TREE_IS_WIDE(thisx)) {
this->dyna.actor.scale.x = 0.2f;
this->dyna.actor.scale.z = 0.2f;
}
@ -97,5 +97,5 @@ void ObjYasi_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY);
Gfx_DrawDListOpa(globalCtx, object_obj_yasi_DL_000360);
Gfx_DrawDListOpa(globalCtx, gPalmTreeDL);
}

2
src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h
View File

@ -11,6 +11,6 @@ typedef struct ObjYasi {
extern const ActorInit Obj_Yasi_InitVars;
#define OBJYASI_IS_WIDE(thisx) ((thisx)->params & 1)
#define PALM_TREE_IS_WIDE(thisx) ((thisx)->params & 1)
#endif // Z_OBJ_YASI_H