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

initial commit of rock object_ishi documentation (#1340) 

Co-authored-by: MegaIDK <pc@DESKTOP-37QIOUU.localdomain>
This commit is contained in:
MegaIDK 2023-07-27 21:16:46 -03:00 committed by GitHub
parent eb6b837d65
commit 6f7d6cc47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
<Root>
<!-- Object for small rocks -->
<File Name="object_ishi" Segment="6">
<Texture Name="object_ishi_Tex_0001B0" OutName="tex_0001B0" Format="rgba16" Width="32" Height="32" Offset="0x1B0" />
<DList Name="object_ishi_DL_0009B0" Offset="0x9B0" />
<Texture Name="gSmallRockTex" OutName="small_rock" Format="rgba16" Width="32" Height="32" Offset="0x1B0" />
<DList Name="gSmallRockDL" Offset="0x9B0" />
</File>
</Root>

4
src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
View File

@ -180,7 +180,7 @@ void func_8095D804(Actor* thisx, PlayState* play) {
if (!ENISHI_GET_8(&this->actor)) {
phi_s4 = gameplay_field_keep_DL_0066B0;
} else {
phi_s4 = object_ishi_DL_0009B0;
phi_s4 = gSmallRockDL;
}
temp = D_8095F6E8[ENISHI_GET_8(&this->actor)];
@ -761,5 +761,5 @@ void func_8095F61C(Actor* thisx, PlayState* play) {
}
void func_8095F654(Actor* thisx, PlayState* play) {
Gfx_DrawDListOpa(play, object_ishi_DL_0009B0);
Gfx_DrawDListOpa(play, gSmallRockDL);
}