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

DmChar08 OK (#1085) 

* progress

* progress

* about to merge data. probably a bad idea

* matches with ZAPD

* docs

* done for now

* progress

* about to merge data. probably a bad idea

* matches with ZAPD

* docs

* done for now

* Fix makefile and add non matching to spec

* did some git stuff

* Git being a problem as usual

* format

* PR fixes

* PR fixes

* PR fixes

* Merge master and fixes

* going to merge play

* merged in the big one

* docs

* PR fixes

* format

* Clean up

* transition

* Better init

* Glitchy animations

* PR

* Format

* PR comments

* Missed one

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* fix conflicts

* Fix conflicts

* format

* PR

Co-authored-by: louist103 <louist103@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Derek Hensley 2022-10-06 17:46:58 -07:00 committed by GitHub
parent 589925ce3e
commit 8e6843f04e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1230 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
assets/xml/objects/object_kamejima.xml
View File

@ -1,81 +1,99 @@
<Root> <Root>
<!-- Assest for the giant turtle and wave he creates -->
<File Name="object_kamejima" Segment="6"> <File Name="object_kamejima" Segment="6">
<Array Name="object_kamejima_Vtx_000000" Count="20" Offset="0x0"> <!-- Turtle Wave -->
<Array Name="gTurtleWaveVtx" Count="20" Offset="0x0">
<Vtx/> <Vtx/>
</Array> </Array>
<DList Name="object_kamejima_DL_000140" Offset="0x140" /> <DList Name="gTurtleWaveDL" Offset="0x140" />
<Texture Name="object_kamejima_Tex_0002D8" OutName="tex_0002D8" Format="i8" Width="32" Height="64" Offset="0x2D8" /> <Texture Name="gTurtleWaveUnusedTex" OutName="turtle_wave_unused" Format="i8" Width="32" Height="64" Offset="0x2D8" />
<Texture Name="object_kamejima_Tex_000AD8" OutName="tex_000AD8" Format="i8" Width="64" Height="64" Offset="0xAD8" /> <Texture Name="gTurtleWaveTex" OutName="turtle_wave" Format="i8" Width="64" Height="64" Offset="0xAD8" />
<TextureAnimation Name="object_kamejima_Matanimheader_001AF0" Offset="0x1AF0" /> <TextureAnimation Name="gTurtleWaveTexAnim" Offset="0x1AF0" />
<Collision Name="object_kamejima_Colheader_002328" Offset="0x2328" />
<!-- <Blob Name="object_kamejima_Blob_002354" Size="0x1C" Offset="0x2354" /> -->
<Collision Name="object_kamejima_Colheader_002470" Offset="0x2470" /> <!-- Turtle -->
<Collision Name="object_kamejima_Colheader_002E04" Offset="0x2E04" /> <Collision Name="gTurtleZoraCapeAsleepCol" Offset="0x2328" />
<Animation Name="object_kamejima_Anim_003980" Offset="0x3980" /> <TextureAnimation Name="gTurtleEmptyTexAnim" Offset="0x2360"/>
<Animation Name="object_kamejima_Anim_0047B8" Offset="0x47B8" /> <Collision Name="gTurtleZoraCapeAwakeCol" Offset="0x2470" />
<Animation Name="object_kamejima_Anim_0048B0" Offset="0x48B0" /> <Collision Name="gTurtleUnusedCol" Offset="0x2E04" />
<DList Name="object_kamejima_DL_004E70" Offset="0x4E70" />
<Texture Name="object_kamejima_TLUT_005248" OutName="tlut_005248" Format="rgba16" Width="16" Height="16" Offset="0x5248" /> <Animation Name="gTurtleGlitchy1Anim" Offset="0x3980" />
<Texture Name="object_kamejima_Tex_005448" OutName="tex_005448" Format="ci8" Width="32" Height="32" Offset="0x5448" /> <Animation Name="gTurtleCoughAnim" Offset="0x47B8" />
<Texture Name="object_kamejima_Tex_005848" OutName="tex_005848" Format="ci8" Width="64" Height="32" Offset="0x5848" /> <Animation Name="gTurtleIdleAnim" Offset="0x48B0" />
<!-- <Blob Name="object_kamejima_Blob_006050" Size="0x10" Offset="0x6050" /> -->
<Animation Name="object_kamejima_Anim_006980" Offset="0x6980" /> <DList Name="gTurtleAsleepDL" Offset="0x4E70" /> <!-- When asleep, the turtle looks like a giant rock -->
<DList Name="object_kamejima_DL_008760" Offset="0x8760" />
<DList Name="object_kamejima_DL_008E18" Offset="0x8E18" /> <Texture Name="gTurtleAsleepTLUT" OutName="turtle_asleep_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5248" />
<DList Name="object_kamejima_DL_0090E8" Offset="0x90E8" /> <Texture Name="gTurtleAsleepGrassTex" OutName="turtle_asleep_grass" Format="ci8" Width="32" Height="32" Offset="0x5448" />
<DList Name="object_kamejima_DL_009278" Offset="0x9278" /> <Texture Name="gTurtleAsleepGrassDirtTex" OutName="turtle_asleep_grass_dirt" Format="ci8" Width="64" Height="32" Offset="0x5848" />
<DList Name="object_kamejima_DL_0093E8" Offset="0x93E8" />
<DList Name="object_kamejima_DL_0096B8" Offset="0x96B8" /> <Animation Name="gTurtleSwimAnim" Offset="0x6980" />
<DList Name="object_kamejima_DL_009848" Offset="0x9848" />
<DList Name="object_kamejima_DL_0099B8" Offset="0x99B8" /> <DList Name="gTurtleShellDL" Offset="0x8760" />
<DList Name="object_kamejima_DL_009C38" Offset="0x9C38" /> <DList Name="gTurtleFrontLeftUpperFlipperDL" Offset="0x8E18" />
<DList Name="object_kamejima_DL_009E38" Offset="0x9E38" /> <DList Name="gTurtleFrontLeftLowerFlipperDL" Offset="0x90E8" />
<DList Name="object_kamejima_DL_009F18" Offset="0x9F18" /> <DList Name="gTurtleFrontLeftEndFlipperDL" Offset="0x9278" />
<DList Name="object_kamejima_DL_00A118" Offset="0xA118" /> <DList Name="gTurtleFrontRightUpperFlipperDL" Offset="0x93E8" />
<DList Name="object_kamejima_DL_00A4B8" Offset="0xA4B8" /> <DList Name="gTurtleFrontRightLowerFlipperDL" Offset="0x96B8" />
<DList Name="object_kamejima_DL_00A7C8" Offset="0xA7C8" /> <DList Name="gTurtleFrontRightEndFlipperDL" Offset="0x9848" />
<Texture Name="object_kamejima_TLUT_00AAD8" OutName="tlut_00AAD8" Format="rgba16" Width="16" Height="16" Offset="0xAAD8" /> <DList Name="gTurtleBackRightFlipperDL" Offset="0x99B8" />
<Texture Name="object_kamejima_TLUT_00ACD8" OutName="tlut_00ACD8" Format="rgba16" Width="16" Height="16" Offset="0xACD8" /> <DList Name="gTurtleBackLeftFlipperDL" Offset="0x9C38" />
<Texture Name="object_kamejima_Tex_00AED8" OutName="tex_00AED8" Format="ci8" Width="32" Height="32" Offset="0xAED8" /> <DList Name="gTurtleTailDL" Offset="0x9E38" />
<Texture Name="object_kamejima_Tex_00B2D8" OutName="tex_00B2D8" Format="ci8" Width="16" Height="16" Offset="0xB2D8" /> <DList Name="gTurtleNeckDL" Offset="0x9F18" />
<Texture Name="object_kamejima_Tex_00B3D8" OutName="tex_00B3D8" Format="ci8" Width="16" Height="32" Offset="0xB3D8" /> <DList Name="gTurtleHeadDL" Offset="0xA118" />
<Texture Name="object_kamejima_Tex_00B5D8" OutName="tex_00B5D8" Format="ci8" Width="64" Height="32" Offset="0xB5D8" /> <DList Name="gTurtleUpperMouthDL" Offset="0xA4B8" />
<Texture Name="object_kamejima_Tex_00BDD8" OutName="tex_00BDD8" Format="ci8" Width="16" Height="16" Offset="0xBDD8" /> <DList Name="gTurtleLowerMouthDL" Offset="0xA7C8" />
<!-- <Blob Name="object_kamejima_Blob_00BED8" Size="0x1800" Offset="0xBED8" /> -->
<Texture Name="object_kamejima_Tex_00D6D8" OutName="tex_00D6D8" Format="ci8" Width="16" Height="16" Offset="0xD6D8" /> <Texture Name="gTurtleSkinTLUT" OutName="turtle_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xAAD8" />
<Texture Name="object_kamejima_Tex_00D7D8" OutName="tex_00D7D8" Format="ci8" Width="32" Height="64" Offset="0xD7D8" /> <Texture Name="gTurtleTLUT" OutName="turtle_tlut" Format="rgba16" Width="16" Height="16" Offset="0xACD8" />
<Texture Name="object_kamejima_Tex_00DFD8" OutName="tex_00DFD8" Format="ci8" Width="32" Height="32" Offset="0xDFD8" /> <Texture Name="gTurtleNostrilTex" OutName="turtle_nostril" Format="ci8" Width="32" Height="32" Offset="0xAED8" />
<Texture Name="object_kamejima_Tex_00E3D8" OutName="tex_00E3D8" Format="ci8" Width="16" Height="32" Offset="0xE3D8" /> <Texture Name="gTurtleInsideUpperMouthTex" OutName="turtle_inside_upper_mouth" Format="ci8" Width="16" Height="16" Offset="0xB2D8" />
<Limb Name="object_kamejima_Standardlimb_00E5D8" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_01" Offset="0xE5D8" /> <Texture Name="gTurtleInsideLowerMouthTex" OutName="turtle_inside_lower_mouth" Format="ci8" Width="16" Height="32" Offset="0xB3D8"/>
<Limb Name="object_kamejima_Standardlimb_00E5E4" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_02" Offset="0xE5E4" /> <Texture Name="gTurtleSpottedSkinTex" OutName="turtle_spotted_skin" Format="ci8" Width="64" Height="32" Offset="0xB5D8"/>
<Limb Name="object_kamejima_Standardlimb_00E5F0" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_03" Offset="0xE5F0" /> <Texture Name="gTurtleSkinTex" OutName="turtle_skin" Format="ci8" Width="16" Height="16" Offset="0xBDD8" />
<Limb Name="object_kamejima_Standardlimb_00E5FC" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_04" Offset="0xE5FC" /> <Texture Name="gTurtleEyeOpenStraightTex" OutName="turtle_eye_open_straight" Format="ci8" Width="32" Height="32" Offset="0xBED8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E608" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_05" Offset="0xE608" /> <Texture Name="gTurtleEyeHalfStraightTex" OutName="turtle_eye_half_straight" Format="ci8" Width="32" Height="32" Offset="0xC2D8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E614" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_06" Offset="0xE614" /> <Texture Name="gTurtleEyeClosedTex" OutName="turtle_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xC6D8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E620" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_07" Offset="0xE620" /> <Texture Name="gTurtleEyeHalfLeftTex" OutName="turtle_eye_half_left" Format="ci8" Width="32" Height="32" Offset="0xCAD8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E62C" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_08" Offset="0xE62C" /> <Texture Name="gTurtleEyeOpenRightTex" OutName="turtle_eye_half_right" Format="ci8" Width="32" Height="32" Offset="0xCED8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E638" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_09" Offset="0xE638" /> <Texture Name="gTurtleEyeOpenLeftTex" OutName="turtle_eye_half_left_2" Format="ci8" Width="32" Height="32" Offset="0xD2D8" TlutOffset="0xAAD8"/>
<Limb Name="object_kamejima_Standardlimb_00E644" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0A" Offset="0xE644" />
<Limb Name="object_kamejima_Standardlimb_00E650" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0B" Offset="0xE650" /> <Texture Name="gTurtleHeadTex" OutName="turtle_head" Format="ci8" Width="16" Height="16" Offset="0xD6D8"/>
<Limb Name="object_kamejima_Standardlimb_00E65C" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0C" Offset="0xE65C" /> <Texture Name="gTurtleShellGrassTex" OutName="turtle_shell_grass" Format="ci8" Width="32" Height="64" Offset="0xD7D8" />
<Limb Name="object_kamejima_Standardlimb_00E668" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0D" Offset="0xE668" /> <Texture Name="gTurtleShellScutesTex" OutName="turtle_shell_scutes" Format="ci8" Width="32" Height="32" Offset="0xDFD8"/>
<Limb Name="object_kamejima_Standardlimb_00E674" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0E" Offset="0xE674" /> <Texture Name="gTurtleShellBottomTex" OutName="turtle_shell_bottom" Format="ci8" Width="16" Height="32" Offset="0xE3D8"/>
<Limb Name="object_kamejima_Standardlimb_00E680" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_0F" Offset="0xE680" />
<Limb Name="object_kamejima_Standardlimb_00E68C" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_10" Offset="0xE68C" /> <Limb Name="gTurtleRootLimb" Type="Standard" EnumName="TURTLE_LIMB_ROOT" Offset="0xE5D8" />
<Limb Name="object_kamejima_Standardlimb_00E698" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_11" Offset="0xE698" /> <Limb Name="gTurtleShellLimb" Type="Standard" EnumName="TURTLE_LIMB_SHELL" Offset="0xE5E4" />
<Limb Name="object_kamejima_Standardlimb_00E6A4" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_12" Offset="0xE6A4" /> <Limb Name="gTurtleNeckHeadRootLimb" Type="Standard" EnumName="TURTLE_LIMB_NECK_HEAD_ROOT" Offset="0xE5F0" />
<Limb Name="object_kamejima_Standardlimb_00E6B0" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_13" Offset="0xE6B0" /> <Limb Name="gTurtleNeckLimb" Type="Standard" EnumName="TURTLE_LIMB_NECK" Offset="0xE5FC" />
<Limb Name="object_kamejima_Standardlimb_00E6BC" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_14" Offset="0xE6BC" /> <Limb Name="gTurtleHeadLimb" Type="Standard" EnumName="TURTLE_LIMB_HEAD" Offset="0xE608" />
<Limb Name="object_kamejima_Standardlimb_00E6C8" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_15" Offset="0xE6C8" /> <Limb Name="gTurtleUpperMouthLimb" Type="Standard" EnumName="TURTLE_LIMB_UPPER_MOUTH" Offset="0xE614" />
<Limb Name="object_kamejima_Standardlimb_00E6D4" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_16" Offset="0xE6D4" /> <Limb Name="gTurtleLowerMouthRootLimb" Type="Standard" EnumName="TURTLE_LIMB_LOWER_MOUTH_ROOT" Offset="0xE620" />
<Limb Name="object_kamejima_Standardlimb_00E6E0" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_17" Offset="0xE6E0" /> <Limb Name="gTurtleLowerMouthLimb" Type="Standard" EnumName="TURTLE_LIMB_LOWER_MOUTH" Offset="0xE62C" />
<Skeleton Name="object_kamejima_Skel_00E748" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KAMEJIMA_LIMB_NONE" LimbMax="OBJECT_KAMEJIMA_LIMB_MAX" EnumName="ObjectKamejimaLimb" Offset="0xE748" /> <Limb Name="gTurtleBackLeftFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_LEFT_FLIPPER_ROOT" Offset="0xE638" />
<Animation Name="object_kamejima_Anim_00EF98" Offset="0xEF98" /> <Limb Name="gTurtleBackLeftFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_LEFT_FLIPPER" Offset="0xE644" />
<Animation Name="object_kamejima_Anim_0100CC" Offset="0x100CC" /> <Limb Name="gTurtleBackRightFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_RIGHT_FLIPPER_ROOT" Offset="0xE650" />
<Animation Name="object_kamejima_Anim_010918" Offset="0x10918" /> <Limb Name="gTurtleBackRightFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_BACK_RIGHT_FLIPPER" Offset="0xE65C" />
<Animation Name="object_kamejima_Anim_0119D4" Offset="0x119D4" /> <Limb Name="gTurtleTailRootLimb" Type="Standard" EnumName="TURTLE_TAIL_ROOT_LIMB" Offset="0xE668" />
<Animation Name="object_kamejima_Anim_012260" Offset="0x12260" /> <Limb Name="gTurtleTailLimb" Type="Standard" EnumName="TURTLE_TAIL_LIMB" Offset="0xE674" />
<Animation Name="object_kamejima_Anim_013264" Offset="0x13264" /> <Limb Name="gTurtleTailEndRootLimb" Type="Standard" EnumName="TURTLE_TAIL_END_ROOT_LIMB" Offset="0xE680" />
<Animation Name="object_kamejima_Anim_014E8C" Offset="0x14E8C" /> <Limb Name="gTurtleFrontLeftFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_FLIPPER_ROOT" Offset="0xE68C" />
<Limb Name="gTurtleFrontLeftUpperFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_UPPER_FLIPPER" Offset="0xE698" />
<Limb Name="gTurtleFrontLeftLowerFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_LOWER_FLIPPER" Offset="0xE6A4" />
<Limb Name="gTurtleFrontLeftEndFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_LEFT_END_FLIPPER" Offset="0xE6B0" />
<Limb Name="gTurtleFrontRightFlipperRootLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_FLIPPER_ROOT" Offset="0xE6BC" />
<Limb Name="gTurtleFrontRightUpperFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_UPPER_FLIPPER" Offset="0xE6C8" />
<Limb Name="gTurtleFrontRightLowerFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_LOWER_FLIPPER" Offset="0xE6D4" />
<Limb Name="gTurtleFrontRightEndFlipperLimb" Type="Standard" EnumName="TURTLE_LIMB_FRONT_RIGHT_END_FLIPPER" Offset="0xE6E0" />
<Skeleton Name="gTurtleSkel" Type="Flex" LimbType="Standard" LimbNone="TURTLE_LIMB_NONE" LimbMax="TURTLE_LIMB_MAX" EnumName="TurtleLimb" Offset="0xE748" />
<Animation Name="gTurtleGlitchy2Anim" Offset="0xEF98" />
<Animation Name="gTurtleSpeak1Anim" Offset="0x100CC" />
<Animation Name="gTurtleGlitchyRaiseHeadAnim" Offset="0x10918" />
<Animation Name="gTurtleSpeak2Anim" Offset="0x119D4" />
<Animation Name="gTurtleFloatAnim" Offset="0x12260" />
<Animation Name="gTurtleGlitchyLookAroundAnim" Offset="0x13264" />
<Animation Name="gTurtleYawnAnim" Offset="0x14E8C" />
</File> </File>
</Root> </Root>

17
assets/xml/overlays/ovl_Dm_Char08.xml Normal file
View File

@ -0,0 +1,17 @@
<Root>
<File Name="ovl_Dm_Char08" BaseAddress="0x80AAF050" RangeStart="0x2320" RangeEnd="0x266C">
<Array Name="sTurtleGreatBayTempleColPolygons" Count="19" Offset="0x2350">
<CollisionPoly/>
</Array>
<Array Name="sTurtleGreatBayTempleColPolygons2" Count="19" Offset="0x2480">
<CollisionPoly/>
</Array>
<Array Name="sTurtleGreatBayTempleColVertices" Count="12" Offset="0x25B0">
<Vector Type="s16" Dimensions="3" />
</Array>
<Array Name="sTurtleGreatBayTempleColVertices2" Count="12" Offset="0x25F8">
<Vector Type="s16" Dimensions="3" />
</Array>
<Collision Name="sTurtleGreatBayTempleCol" Offset="0x2640"/>
</File>
</Root>

1
include/functions.h
View File

@ -882,6 +882,7 @@ void func_800C636C(PlayState* play, DynaCollisionContext* dyna, s32 bgId);
void func_800C63C4(PlayState* play, DynaCollisionContext* dyna, s32 bgId); void func_800C63C4(PlayState* play, DynaCollisionContext* dyna, s32 bgId);
void func_800C641C(PlayState* play, DynaCollisionContext* dyna, s32 bgId); void func_800C641C(PlayState* play, DynaCollisionContext* dyna, s32 bgId);
void func_800C6474(PlayState* play, DynaCollisionContext* dyna, s32 bgId); void func_800C6474(PlayState* play, DynaCollisionContext* dyna, s32 bgId);
void func_800C6554(PlayState* play, DynaCollisionContext* dyna);
void DynaPoly_DeleteBgActor(PlayState* play, DynaCollisionContext* dyna, s32 bgId); void DynaPoly_DeleteBgActor(PlayState* play, DynaCollisionContext* dyna, s32 bgId);
void BgCheck_CalcWaterboxDimensions(Vec3f* minPos, Vec3f* maxXPos, Vec3f* maxZPos, Vec3s* minPosOut, s16* xLength, s16* zLength); void BgCheck_CalcWaterboxDimensions(Vec3f* minPos, Vec3f* maxXPos, Vec3f* maxZPos, Vec3s* minPosOut, s16* xLength, s16* zLength);
void DynaPoly_ExpandSRT(PlayState* play, DynaCollisionContext* dyna, s32 bgId, s32* vtxStartIndex, s32* polyStartIndex, s32* waterBoxStartIndex); void DynaPoly_ExpandSRT(PlayState* play, DynaCollisionContext* dyna, s32 bgId, s32* vtxStartIndex, s32* polyStartIndex, s32* waterBoxStartIndex);

3
spec
View File

@ -3108,8 +3108,7 @@ beginseg
name "ovl_Dm_Char08" name "ovl_Dm_Char08"
compress compress
include "build/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.o" include "build/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.o"
include "build/data/ovl_Dm_Char08/ovl_Dm_Char08.data.o" include "build/src/overlays/actors/ovl_Dm_Char08/ovl_Dm_Char08_reloc.o"
include "build/data/ovl_Dm_Char08/ovl_Dm_Char08.reloc.o"
endseg endseg
beginseg beginseg

1097
src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
View File

File diff suppressed because it is too large Load Diff

32
src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h
View File

@ -8,10 +8,36 @@ struct DmChar08;
typedef void (*DmChar08ActionFunc)(struct DmChar08*, PlayState*); typedef void (*DmChar08ActionFunc)(struct DmChar08*, PlayState*);
typedef struct DmChar08 { typedef struct DmChar08 {
/* 0x000 */ Actor actor; /* 0x000 */ DynaPolyActor dyna;
/* 0x144 */ char unk_144[0x5C]; /* 0x15C */ SkelAnime skelAnime;
/* 0x1A0 */ DmChar08ActionFunc actionFunc; /* 0x1A0 */ DmChar08ActionFunc actionFunc;
/* 0x1A4 */ char unk_1A4[0x68]; /* 0x1A4 */ Actor* palmTree1;
/* 0x1A8 */ Actor* palmTree2;
/* 0x1AC */ Vec3f tree1Pos;
/* 0x1B8 */ Vec3f tree2Pos;
/* 0x1C4 */ Vec3f bubblePos;
/* 0x1D0 */ Vec3f focusPos;
/* 0x1DC */ UNK_TYPE1 unk_1DC[8];
/* 0x1E4 */ f32 targetYPos;
/* 0x1E8 */ UNK_TYPE1 unk_1E8[8];
/* 0x1F0 */ f32 unk_1F0;
/* 0x1F4 */ s16 unk_1F4;
/* 0x1F6 */ s16 unk_1F6;
/* 0x1F6 */ s16 blinkTimer;
/* 0x1FA */ s16 unk_1FA;
/* 0x1FC */ u16 unk_1FC;
/* 0x1FE */ u8 bubbleCount;
/* 0x1FF */ u8 unk_1FF;
/* 0x200 */ u8 eyeMode;
/* 0x201 */ u8 eyeIndex;
/* 0x202 */ u8 animIndex;
/* 0x203 */ u8 unk_203;
/* 0x204 */ UNK_TYPE1 unk_204;
/* 0x205 */ u8 alpha;
/* 0x206 */ u8 unk_206;
/* 0x207 */ u8 unk_207;
/* 0x208 */ u8 unk_208;
/* 0x209 */ u8 dynapolyInitialized;
} DmChar08; // size = 0x20C } DmChar08; // size = 0x20C
extern const ActorInit Dm_Char08_InitVars; extern const ActorInit Dm_Char08_InitVars;

6
src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c
View File

@ -56,7 +56,7 @@ void EffKamejimaWave_Init(Actor* thisx, PlayState* play) {
this->actionFunc = func_80BCEC6C; this->actionFunc = func_80BCEC6C;
sVtxAlpha = 255; sVtxAlpha = 255;
} }
D_80BCF1C4 = Lib_SegmentedToVirtual(object_kamejima_Matanimheader_001AF0); D_80BCF1C4 = Lib_SegmentedToVirtual(gTurtleWaveTexAnim);
} }
void EffKamejimaWave_Destroy(Actor* thisx, PlayState* play) { void EffKamejimaWave_Destroy(Actor* thisx, PlayState* play) {
@ -137,7 +137,7 @@ void EffKamejimaWave_Update(Actor* thisx, PlayState* play) {
} }
void EffKamejimaWave_SetVtxAlpha(u8 alpha) { void EffKamejimaWave_SetVtxAlpha(u8 alpha) {
Vtx* vtx = Lib_SegmentedToVirtual(&object_kamejima_Vtx_000000); Vtx* vtx = Lib_SegmentedToVirtual(&gTurtleWaveVtx);
vtx[2].v.cn[3] = alpha; vtx[2].v.cn[3] = alpha;
vtx[6].v.cn[3] = alpha; vtx[6].v.cn[3] = alpha;
@ -165,7 +165,7 @@ void EffKamejimaWave_Draw(Actor* thisx, PlayState* play) {
AnimatedMat_Draw(play, D_80BCF1C4); AnimatedMat_Draw(play, D_80BCF1C4);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, primColor.r, primColor.g, primColor.b, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, primColor.r, primColor.g, primColor.b, 255);
gDPSetEnvColor(POLY_XLU_DISP++, envColor.r, envColor.g, envColor.b, 255); gDPSetEnvColor(POLY_XLU_DISP++, envColor.r, envColor.g, envColor.b, 255);
gSPDisplayList(POLY_XLU_DISP++, object_kamejima_DL_000140); gSPDisplayList(POLY_XLU_DISP++, gTurtleWaveDL);
CLOSE_DISPS(play->state.gfxCtx); CLOSE_DISPS(play->state.gfxCtx);
} }

20
tools/disasm/functions.txt
View File

@ -11629,12 +11629,12 @@
0x80AAEABC:("DmChar07_DoNothing",), 0x80AAEABC:("DmChar07_DoNothing",),
0x80AAEACC:("DmChar07_Update",), 0x80AAEACC:("DmChar07_Update",),
0x80AAEAF0:("DmChar07_Draw",), 0x80AAEAF0:("DmChar07_Draw",),
0x80AAF050:("func_80AAF050",), 0x80AAF050:("DmChar08_UpdateEyes",),
0x80AAF15C:("func_80AAF15C",), 0x80AAF15C:("DmChar08_ChangeAnimation",),
0x80AAF1F8:("DmChar08_Init",), 0x80AAF1F8:("DmChar08_Init",),
0x80AAF5D8:("DmChar08_Destroy",), 0x80AAF5D8:("DmChar08_Destroy",),
0x80AAF610:("func_80AAF610",), 0x80AAF610:("DmChar08_WaitForSong",),
0x80AAF79C:("func_80AAF79C",), 0x80AAF79C:("DmChar08_SetupAppearCs",),
0x80AAF884:("func_80AAF884",), 0x80AAF884:("func_80AAF884",),
0x80AAF8F4:("func_80AAF8F4",), 0x80AAF8F4:("func_80AAF8F4",),
0x80AAFA18:("func_80AAFA18",), 0x80AAFA18:("func_80AAFA18",),
@ -11642,19 +11642,19 @@
0x80AAFAE4:("func_80AAFAE4",), 0x80AAFAE4:("func_80AAFAE4",),
0x80AAFB04:("func_80AAFB04",), 0x80AAFB04:("func_80AAFB04",),
0x80AAFB94:("func_80AAFB94",), 0x80AAFB94:("func_80AAFB94",),
0x80AAFBA4:("func_80AAFBA4",), 0x80AAFBA4:("DmChar08_SpawnBubbles",),
0x80AAFCCC:("func_80AAFCCC",), 0x80AAFCCC:("func_80AAFCCC",),
0x80AAFE78:("func_80AAFE78",), 0x80AAFE78:("DmChar08_DoNothing",),
0x80AAFE88:("func_80AAFE88",), 0x80AAFE88:("func_80AAFE88",),
0x80AB01E8:("func_80AB01E8",), 0x80AB01E8:("func_80AB01E8",),
0x80AB023C:("func_80AB023C",), 0x80AB023C:("func_80AB023C",),
0x80AB032C:("func_80AB032C",), 0x80AB032C:("func_80AB032C",),
0x80AB096C:("func_80AB096C",), 0x80AB096C:("func_80AB096C",),
0x80AB0A10:("func_80AB0A10",), 0x80AB0A10:("DmChar08_UpdateCollision",),
0x80AB0CC8:("DmChar08_Update",), 0x80AB0CC8:("DmChar08_Update",),
0x80AB0E3C:("func_80AB0E3C",), 0x80AB0E3C:("DmChar08_OverrideLimbDraw",),
0x80AB0E7C:("func_80AB0E7C",), 0x80AB0E7C:("DmChar08_PostLimbDraw",),
0x80AB0F90:("func_80AB0F90",), 0x80AB0F90:("DmChar08_TransformLimbDraw",),
0x80AB1124:("DmChar08_Draw",), 0x80AB1124:("DmChar08_Draw",),
0x80AB1E10:("DmChar09_ChangeAnim",), 0x80AB1E10:("DmChar09_ChangeAnim",),
0x80AB1EAC:("DmChar09_Init",), 0x80AB1EAC:("DmChar09_Init",),

30
tools/disasm/variables.txt
View File

@ -12659,21 +12659,21 @@
0x80AAE960:("Dm_Char06_InitVars","UNK_TYPE1","",0x1), 0x80AAE960:("Dm_Char06_InitVars","UNK_TYPE1","",0x1),
0x80AAEFF0:("Dm_Char07_InitVars","UNK_TYPE1","",0x1), 0x80AAEFF0:("Dm_Char07_InitVars","UNK_TYPE1","",0x1),
0x80AB1370:("Dm_Char08_InitVars","UNK_TYPE1","",0x1), 0x80AB1370:("Dm_Char08_InitVars","UNK_TYPE1","",0x1),
0x80AB1390:("D_80AB1390","UNK_TYPE1","",0x1), 0x80AB1390:("D_80AB1390","CamData","",0x8),
0x80AB1398:("D_80AB1398","UNK_TYPE1","",0x1), 0x80AB1398:("D_80AB1398","SurfaceType","",0x8),
0x80AB13A0:("D_80AB13A0","UNK_TYPE1","",0x1), 0x80AB13A0:("D_80AB13A0","CollisionPoly","19",0xCC),
0x80AB14D0:("D_80AB14D0","UNK_TYPE1","",0x1), 0x80AB14D0:("sTurtleGreatBayTempleColPolygons2","CollisionPoly[]","19",0xCC),
0x80AB1600:("D_80AB1600","UNK_TYPE2","",0x2), 0x80AB1600:("D_80AB1600","Vec3s[]","12",0x48),
0x80AB1648:("D_80AB1648","UNK_TYPE2","",0x2), 0x80AB1648:("D_80AB1648","Vec3s[]","12",0x48),
0x80AB1690:("D_80AB1690","UNK_TYPE1","",0x1), 0x80AB1690:("sTurtleGreatBayTempleCol","CollisionHeader","",0x2C),
0x80AB16A8:("D_80AB16A8","UNK_PTR","",0x4), 0x80AB16A8:("D_80AB16A8","UNK_PTR","",0x4),
0x80AB16BC:("D_80AB16BC","UNK_TYPE1","",0x1), 0x80AB16BC:("sLargeTurtleAnimationInfo","AnimationInfo[]","0x7",0xE0),
0x80AB1764:("D_80AB1764","UNK_TYPE1","",0x1), 0x80AB1764:("sInitChain","InitChainEntry","",0x1),
0x80AB1770:("D_80AB1770","UNK_TYPE2","",0x2), 0x80AB1770:("D_80AB1770","s16","",0x2),
0x80AB1774:("D_80AB1774","UNK_TYPE1","",0x1), 0x80AB1774:("sLargeTurtleBubblePrimColor","Color_RGBA8","",0x4),
0x80AB1778:("D_80AB1778","UNK_TYPE1","",0x1), 0x80AB1778:("sLargeTurtleBubbleEnvColor","Color_RGBA8","",0x4),
0x80AB177C:("D_80AB177C","UNK_TYPE4","",0x4), 0x80AB177C:("sLargeTurtleBubbelAccel","Vec3f","",0xC),
0x80AB1788:("D_80AB1788","UNK_TYPE1","",0x1), 0x80AB1788:("sLargeTurtleEyeTextures","TexturePtr","9",0x1),
0x80AB17B0:("jtbl_80AB17B0","UNK_PTR","",0x4), 0x80AB17B0:("jtbl_80AB17B0","UNK_PTR","",0x4),
0x80AB17C8:("D_80AB17C8","f32","",0x4), 0x80AB17C8:("D_80AB17C8","f32","",0x4),
0x80AB17CC:("D_80AB17CC","f32","",0x4), 0x80AB17CC:("D_80AB17CC","f32","",0x4),
@ -14305,7 +14305,7 @@
0x80B3FE50:("D_80B3FE50","f32","",0x4), 0x80B3FE50:("D_80B3FE50","f32","",0x4),
0x80B3FE54:("D_80B3FE54","f32","",0x4), 0x80B3FE54:("D_80B3FE54","f32","",0x4),
0x80B3FE58:("D_80B3FE58","UNK_TYPE1","",0x1), 0x80B3FE58:("D_80B3FE58","UNK_TYPE1","",0x1),
0x80B3FE70:("D_80B3FE70","UNK_TYPE1","",0x1), 0x80B3FE70:("sEyeTextures","TexturePtr[]","0x9",0x4),
0x80B3FE90:("D_80B3FE90","f32","",0x4), 0x80B3FE90:("D_80B3FE90","f32","",0x4),
0x80B3FE94:("D_80B3FE94","f32","",0x4), 0x80B3FE94:("D_80B3FE94","f32","",0x4),
0x80B40760:("Bg_Goron_Oyu_InitVars","UNK_TYPE1","",0x1), 0x80B40760:("Bg_Goron_Oyu_InitVars","UNK_TYPE1","",0x1),