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

Document object_stream (#553) 

* Document XML

* Finish documentation

* Add file header comment

* Single line comment styling
This commit is contained in:
Tom Overton 2022-01-03 23:19:15 -08:00 committed by GitHub
parent e7ba2c507d
commit be952305d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
<Root>
<!-- Used for the unused water vortex actor. -->
<File Name="object_stream" Segment="6">
<Texture Name="object_stream_Tex_000000" OutName="tex_000000" Format="i4" Width="64" Height="64" Offset="0x0" />
<DList Name="object_stream_DL_000950" Offset="0x950" />
<Texture Name="gWaterVortexTex" OutName="water_vortex" Format="i4" Width="64" Height="64" Offset="0x0" />
<DList Name="gWaterVortexDL" Offset="0x950" />
</File>
</Root>

5
src/overlays/actors/ovl_En_Stream/z_en_stream.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_stream.h"
#include "objects/object_stream/object_stream.h"
#define FLAGS 0x00000010
@ -33,8 +34,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 20, ICHAIN_STOP),
};
extern Gfx D_06000950[];
void EnStream_SetupAction(EnStream* this, EnStreamActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
@ -144,7 +143,7 @@ void EnStream_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPSegment(&gfx[1], 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 30, -multipliedFrames, 64, 64, 1, multipliedFrames,
-multipliedFrames, 64, 64));
gSPDisplayList(&gfx[2], D_06000950);
gSPDisplayList(&gfx[2], gWaterVortexDL);
POLY_XLU_DISP = &gfx[3];
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

5
tools/ZAPDConfigs/MM/Config.xml
View File

@ -4,10 +4,5 @@
<ObjectList File="ObjectList_MM.txt"/>
<ExternalXMLFolder Path="assets/xml/"/>
<!--
!TODO: uncomment this line when the gameplay_keep XML is merged
-->
<!--
<ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
-->
</Root>

4
undefined_syms.txt
View File

@ -3395,10 +3395,6 @@ D_0600D640 = 0x0600D640;
D_06006C18 = 0x06006C18;
D_0600D640 = 0x0600D640;
// ovl_En_Stream
D_06000950 = 0x06000950;
// ovl_En_Suttari
D_0600071C = 0x0600071C;