mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
Document objects used with En_Fall (fall, fall2, lodmoon, moonston) (#558)
* Document lodmoon * Document moonston * Document the open-mouth moon part of fall2 * Document object_fall * Move flags to .c * palette -> tlut * File header comment * OPEN_DISPS/CLOSE_DISPS spacing * Lots more spacing * Add spaces after breaks * Better describe the subtypes * More fixes * Be a little more specific in fireball comments * Respond to Elliptic's second review * I need to stop forgetting to run ./format.sh * Single line comment styling * Preserve ordering
This commit is contained in:
Tom Overton
@@ -1,31 +1,56 @@
|
||||
<Root>
|
||||
<!--
|
||||
Contains the high-detail moon used in cutscenes and in Termina Field,
|
||||
the debris that rises from the ground as the moon is crashing, the
|
||||
ball of fire that surrounds the moon when it is crashing, and the ring
|
||||
of fire that expands outward when the moon is almost done crashing.
|
||||
-->
|
||||
<File Name="object_fall" Segment="6">
|
||||
<DList Name="object_fall_DL_000190" Offset="0x190" />
|
||||
<DList Name="object_fall_DL_000198" Offset="0x198" />
|
||||
<DList Name="object_fall_DL_000220" Offset="0x220" />
|
||||
<Texture Name="object_fall_Tex_000260" OutName="tex_000260" Format="i8" Width="16" Height="16" Offset="0x260" />
|
||||
<DList Name="object_fall_DL_000420" Offset="0x420" />
|
||||
<DList Name="object_fall_DL_000428" Offset="0x428" />
|
||||
<DList Name="object_fall_DL_000490" Offset="0x490" />
|
||||
<DList Name="object_fall_DL_000498" Offset="0x498" />
|
||||
<Array Name="object_fall_Vtx_0004C0" Count="209" Offset="0x4C0">
|
||||
<!-- Debris -->
|
||||
<DList Name="gMoonEmptyDL1" Offset="0x190" /> <!-- Was likely going to be used with gMoonDebrisModel1DL before they made all debris use the same material -->
|
||||
<DList Name="gMoonDebrisMaterialDL" Offset="0x198" />
|
||||
<DList Name="gMoonDebrisModel1DL" Offset="0x220" />
|
||||
<Texture Name="gMoonDebrisTex" OutName="moon_debris" Format="i8" Width="16" Height="16" Offset="0x260" />
|
||||
<DList Name="gMoonEmptyDL2" Offset="0x420" /> <!-- Was likely going to be used with gMoonDebrisModel2DL before they made all debris use the same material -->
|
||||
<DList Name="gMoonDebrisModel2DL" Offset="0x428" />
|
||||
<DList Name="gMoonEmptyDL3" Offset="0x490" /> <!-- Was likely going to be used with gMoonDebrisModel3DL before they made all debris use the same material -->
|
||||
<DList Name="gMoonDebrisModel3DL" Offset="0x498" />\
|
||||
|
||||
<!-- Fireball Vertices -->
|
||||
<Array Name="gMoonFireballVtx" Count="209" Offset="0x4C0">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<DList Name="object_fall_DL_0011D0" Offset="0x11D0" />
|
||||
<Texture Name="object_fall_Tex_001688" OutName="tex_001688" Format="i8" Width="64" Height="64" Offset="0x1688" />
|
||||
<Texture Name="object_fall_Tex_002688" OutName="tex_002688" Format="i4" Width="64" Height="64" Offset="0x2688" />
|
||||
<Texture Name="object_fall_Tex_002E88" OutName="tex_002E88" Format="i4" Width="64" Height="64" Offset="0x2E88" />
|
||||
<DList Name="object_fall_DL_003C30" Offset="0x3C30" />
|
||||
<Texture Name="object_fall_Tex_003E28" OutName="tex_003E28" Format="i8" Width="32" Height="64" Offset="0x3E28" />
|
||||
<Texture Name="object_fall_Tex_004628" OutName="tex_004628" Format="i8" Width="32" Height="64" Offset="0x4628" />
|
||||
<TextureAnimation Name="object_fall_Matanimheader_004E38" Offset="0x4E38" />
|
||||
<TextureAnimation Name="object_fall_Matanimheader_004E58" Offset="0x4E58" />
|
||||
<DList Name="object_fall_DL_0077F0" Offset="0x77F0" />
|
||||
<Texture Name="object_fall_TLUT_0082F8" OutName="tlut_0082F8" Format="rgba16" Width="4" Height="4" Offset="0x82F8" />
|
||||
<Texture Name="object_fall_TLUT_008318" OutName="tlut_008318" Format="rgba16" Width="4" Height="4" Offset="0x8318" />
|
||||
<Texture Name="object_fall_Tex_008338" OutName="tex_008338" Format="rgba16" Width="32" Height="32" Offset="0x8338" />
|
||||
<Texture Name="object_fall_Tex_008B38" OutName="tex_008B38" Format="rgba16" Width="64" Height="32" Offset="0x8B38" />
|
||||
<Texture Name="object_fall_Tex_009B38" OutName="tex_009B38" Format="ci4" Width="64" Height="64" Offset="0x9B38" />
|
||||
<Texture Name="object_fall_Tex_00A338" OutName="tex_00A338" Format="ci4" Width="64" Height="64" Offset="0xA338" />
|
||||
|
||||
<!-- Fireball DisplayList -->
|
||||
<DList Name="gMoonFireballDL" Offset="0x11D0" />
|
||||
|
||||
<!-- Fireball Textures -->
|
||||
<Texture Name="gMoonFireballFlecksTex" OutName="moon_fireball_flecks" Format="i8" Width="64" Height="64" Offset="0x1688" />
|
||||
<Texture Name="gMoonFireballFlamesTex" OutName="moon_fireball_flames" Format="i4" Width="64" Height="64" Offset="0x2688" />
|
||||
<Texture Name="gMoonFireballMaskTex" OutName="moon_fireball_mask" Format="i4" Width="64" Height="64" Offset="0x2E88" />
|
||||
|
||||
<!-- Fire Ring DisplayList -->
|
||||
<DList Name="gMoonFireRingDL" Offset="0x3C30" />
|
||||
|
||||
<!-- Fire Ring Textures -->
|
||||
<Texture Name="gMoonFireRingFlamesTex" OutName="moon_fire_ring_flames" Format="i8" Width="32" Height="64" Offset="0x3E28" />
|
||||
<Texture Name="gMoonFireRingMaskTex" OutName="moon_fire_ring_mask" Format="i8" Width="32" Height="64" Offset="0x4628" />
|
||||
|
||||
<!-- Fire Ring Texture Animation -->
|
||||
<TextureAnimation Name="gMoonFireRingTexAnim" Offset="0x4E38" />
|
||||
|
||||
<!-- Unused Fireball Texture Animation -->
|
||||
<TextureAnimation Name="gMoonUnusedFireballTexAnim" Offset="0x4E58" /> <!-- Almost certainly scrapped for just doing the TwoTexScrolls manually in EnFall_Fireball_Draw -->
|
||||
|
||||
<!-- Moon DisplayList -->
|
||||
<DList Name="gMoonDL" Offset="0x77F0" />
|
||||
|
||||
<!-- Moon Textures -->
|
||||
<Texture Name="gMoonFarSideTLUT" OutName="moon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x82F8" />
|
||||
<Texture Name="gMoonFaceTLUT" OutName="moon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x8318" />
|
||||
<Texture Name="gMoonEyeTex" OutName="moon_eye" Format="rgba16" Width="32" Height="32" Offset="0x8338" />
|
||||
<Texture Name="gMoonTeethTex" OutName="moon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x8B38" />
|
||||
<Texture Name="gMoonFarSideTex" OutName="moon_far_side" Format="ci4" Width="64" Height="64" Offset="0x9B38" />
|
||||
<Texture Name="gMoonFaceTex" OutName="moon_face" Format="ci4" Width="64" Height="64" Offset="0xA338" />
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
<Root>
|
||||
<!--
|
||||
Open-mouth version of the moon and the "warp beam" that emerges from the
|
||||
moon's mouth, both used in the cutscene before warping to the moon.
|
||||
-->
|
||||
<File Name="object_fall2" Segment="6">
|
||||
<DList Name="object_fall2_DL_002970" Offset="0x2970" />
|
||||
<Texture Name="object_fall2_TLUT_0034A8" OutName="tlut_0034A8" Format="rgba16" Width="4" Height="4" Offset="0x34A8" />
|
||||
<Texture Name="object_fall2_TLUT_0034C8" OutName="tlut_0034C8" Format="rgba16" Width="4" Height="4" Offset="0x34C8" />
|
||||
<Texture Name="object_fall2_Tex_0034E8" OutName="tex_0034E8" Format="rgba16" Width="32" Height="32" Offset="0x34E8" />
|
||||
<Texture Name="object_fall2_Tex_003CE8" OutName="tex_003CE8" Format="ci4" Width="64" Height="64" Offset="0x3CE8" />
|
||||
<Texture Name="object_fall2_Tex_0044E8" OutName="tex_0044E8" Format="ci4" Width="64" Height="64" Offset="0x44E8" />
|
||||
<Texture Name="object_fall2_Tex_004CE8" OutName="tex_004CE8" Format="rgba16" Width="64" Height="32" Offset="0x4CE8" />
|
||||
<DList Name="gOpenMouthMoonDL" Offset="0x2970" />
|
||||
<Texture Name="gOpenMouthMoonFarSideTLUT" OutName="open_mouth_moon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x34A8" />
|
||||
<Texture Name="gOpenMouthMoonFaceTLUT" OutName="open_mouth_moon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x34C8" />
|
||||
<Texture Name="gOpenMouthMoonEyesTex" OutName="open_mouth_moon_eyes" Format="rgba16" Width="32" Height="32" Offset="0x34E8" />
|
||||
<Texture Name="gOpenMouthMoonFarSideTex" OutName="open_mouth_moon_far_side" Format="ci4" Width="64" Height="64" Offset="0x3CE8" />
|
||||
<Texture Name="gOpenMouthMoonFaceTex" OutName="open_mouth_moon_face" Format="ci4" Width="64" Height="64" Offset="0x44E8" />
|
||||
<Texture Name="gOpenMouthMoonTeethTex" OutName="open_mouth_moon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x4CE8" />
|
||||
<!-- <Blob Name="object_fall2_Blob_005CE8" Size="0x228" Offset="0x5CE8" /> -->
|
||||
<DList Name="object_fall2_DL_006E00" Offset="0x6E00" />
|
||||
<DList Name="object_fall2_DL_006EF0" Offset="0x6EF0" />
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
<Root>
|
||||
<!-- Low detail version of the moon used during gameplay (except in Termina Field) -->
|
||||
<File Name="object_lodmoon" Segment="6">
|
||||
<DList Name="object_lodmoon_DL_0010E0" Offset="0x10E0" />
|
||||
<DList Name="object_lodmoon_DL_001158" Offset="0x1158" />
|
||||
<Texture Name="object_lodmoon_TLUT_0015D8" OutName="tlut_0015D8" Format="rgba16" Width="4" Height="4" Offset="0x15D8" />
|
||||
<Texture Name="object_lodmoon_TLUT_0015F8" OutName="tlut_0015F8" Format="rgba16" Width="4" Height="4" Offset="0x15F8" />
|
||||
<Texture Name="object_lodmoon_Tex_001618" OutName="tex_001618" Format="rgba16" Width="32" Height="32" Offset="0x1618" />
|
||||
<Texture Name="object_lodmoon_Tex_001E18" OutName="tex_001E18" Format="rgba16" Width="64" Height="32" Offset="0x1E18" />
|
||||
<Texture Name="object_lodmoon_Tex_002E18" OutName="tex_002E18" Format="ci4" Width="64" Height="64" Offset="0x2E18" />
|
||||
<Texture Name="object_lodmoon_Tex_003618" OutName="tex_003618" Format="ci4" Width="64" Height="64" Offset="0x3618" />
|
||||
<DList Name="gLodmoonEyesDL" Offset="0x10E0" />
|
||||
<DList Name="gLodmoonMoonDL" Offset="0x1158" />
|
||||
<Texture Name="gLodmoonFaceTLUT" OutName="lodmoon_face_tlut" Format="rgba16" Width="4" Height="4" Offset="0x15D8" />
|
||||
<Texture Name="gLodmoonFarSideTLUT" OutName="lodmoon_far_side_tlut" Format="rgba16" Width="4" Height="4" Offset="0x15F8" />
|
||||
<Texture Name="gLodmoonEyesTex" OutName="lodmoon_eyes" Format="rgba16" Width="32" Height="32" Offset="0x1618" />
|
||||
<Texture Name="gLodmoonTeethTex" OutName="lodmoon_teeth" Format="rgba16" Width="64" Height="32" Offset="0x1E18" />
|
||||
<Texture Name="gLodmoonFaceTex" OutName="lodmoon_face" Format="ci4" Width="64" Height="64" Offset="0x2E18" />
|
||||
<Texture Name="gLodmoonFarSideTex" OutName="lodmoon_far_side" Format="ci4" Width="64" Height="64" Offset="0x3618" />
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
<Root>
|
||||
<!--
|
||||
The Moon's Tear that can be seen falling from the telescope,
|
||||
along with its associated fire trail.
|
||||
-->
|
||||
<File Name="object_moonston" Segment="6">
|
||||
<DList Name="object_moonston_DL_000400" Offset="0x400" />
|
||||
<DList Name="object_moonston_DL_0004C8" Offset="0x4C8" />
|
||||
<Texture Name="object_moonston_Tex_000608" OutName="tex_000608" Format="i8" Width="32" Height="32" Offset="0x608" />
|
||||
<Texture Name="object_moonston_Tex_000A08" OutName="tex_000A08" Format="i8" Width="32" Height="64" Offset="0xA08" />
|
||||
<TextureAnimation Name="object_moonston_Matanimheader_001220" Offset="0x1220" />
|
||||
<DList Name="gFallingMoonsTearDL" Offset="0x400" />
|
||||
<DList Name="gFallingMoonsTearFireDL" Offset="0x4C8" />
|
||||
<Texture Name="gFallingMoonsTearTex" OutName="falling_moons_tear" Format="i8" Width="32" Height="32" Offset="0x608" />
|
||||
<Texture Name="gFallingMoonsTearFireTex" OutName="falling_moons_tear_fire" Format="i8" Width="32" Height="64" Offset="0xA08" />
|
||||
<TextureAnimation Name="gFallingMoonsTearTexAnim" Offset="0x1220" />
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,9 +6,6 @@
|
||||
#define EN_FALL_SCALE(thisx) ((thisx)->params & 0x7F)
|
||||
#define EN_FALL_TYPE(thisx) (((thisx)->params & 0xF80) >> 7)
|
||||
|
||||
#define EN_FALL_FLAG_FIRE_BALL_INTENSIFIES (1 << 0)
|
||||
#define EN_FALL_FLAG_FIRE_RING_APPEARS (1 << 1)
|
||||
|
||||
typedef enum {
|
||||
/* 0 */ EN_FALL_TYPE_TERMINA_FIELD_MOON,
|
||||
/* 1 */ EN_FALL_TYPE_TITLE_SCREEN_MOON,
|
||||
@@ -37,19 +34,19 @@ typedef struct EnFall {
|
||||
/* 0x14C */ f32 scale;
|
||||
/* 0x150 */ union {
|
||||
f32 eyeGlowIntensity;
|
||||
f32 fireBallIntensity;
|
||||
f32 fireballIntensity;
|
||||
f32 fireRingAlpha;
|
||||
};
|
||||
/* 0x154 */ u16 flags;
|
||||
/* 0x158 */ union {
|
||||
s32 fireBallAlpha;
|
||||
s32 fireballAlpha;
|
||||
s32 activeDebrisParticleCount;
|
||||
};
|
||||
/* 0x15C */ union {
|
||||
s16 fireBallYTexScroll1;
|
||||
s16 fireballYTexScroll1;
|
||||
s16 fireWallYScale;
|
||||
};
|
||||
/* 0x15E */ s16 fireBallYTexScroll2;
|
||||
/* 0x15E */ s16 fireballYTexScroll2;
|
||||
/* 0x160 */ EnFallActionFunc actionFunc;
|
||||
} EnFall; // size = 0x164
|
||||
|
||||
|
||||
@@ -10920,7 +10920,7 @@
|
||||
0x80A6CD38:("EnFall_ClockTowerOrTitleScreenMoon_PerformCutsceneActions",),
|
||||
0x80A6CD74:("EnFall_Moon_PerformDefaultActions",),
|
||||
0x80A6CECC:("EnFall_MoonsTear_Initialize",),
|
||||
0x80A6CF60:("EnFall_DoNothing",),
|
||||
0x80A6CF60:("EnFall_MoonsTear_DoNothing",),
|
||||
0x80A6CF70:("EnFall_MoonsTear_Fall",),
|
||||
0x80A6D0DC:("EnFall_Update",),
|
||||
0x80A6D100:("EnFall_FireBall_SetPerVertexAlpha",),
|
||||
|
||||
Reference in New Issue
Block a user