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

Document object_ma2 (Cremia) (#950) 

* Document object_ma2 (Cremia)

* Clarify what the box is for

* Use CREMIA_LIMB_MAX in Invadepoh
This commit is contained in:
Tom Overton 2022-07-23 11:26:45 -07:00 committed by GitHub
parent fba92d828a
commit 40bfef9f02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 159 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
assets/xml/objects/object_ma2.xml
View File

@ -1,85 +1,101 @@
<Root>
<!-- Assets for Cremia -->
<File Name="object_ma2" Segment="6">
<Animation Name="object_ma2_Anim_000CC0" Offset="0xCC0" />
<Animation Name="object_ma2_Anim_001FD0" Offset="0x1FD0" />
<Animation Name="object_ma2_Anim_0030B4" Offset="0x30B4" />
<Animation Name="object_ma2_Anim_003D54" Offset="0x3D54" />
<Animation Name="object_ma2_Anim_004370" Offset="0x4370" />
<Animation Name="object_ma2_Anim_005314" Offset="0x5314" />
<DList Name="gCremiaWoodenBox" Offset="0x5430" />
<Texture Name="object_ma2_Tex_0054E0" OutName="tex_0054E0" Format="rgba16" Width="32" Height="64" Offset="0x54E0" />
<Animation Name="object_ma2_Anim_0070EC" Offset="0x70EC" />
<Animation Name="object_ma2_Anim_007E28" Offset="0x7E28" />
<Animation Name="object_ma2_Anim_0093E8" Offset="0x93E8" />
<Animation Name="object_ma2_Anim_00A174" Offset="0xA174" />
<Animation Name="object_ma2_Anim_00AF7C" Offset="0xAF7C" />
<DList Name="object_ma2_DL_00E170" Offset="0xE170" />
<DList Name="object_ma2_DL_00E370" Offset="0xE370" />
<DList Name="object_ma2_DL_00E4E0" Offset="0xE4E0" />
<DList Name="object_ma2_DL_00E6E8" Offset="0xE6E8" />
<DList Name="object_ma2_DL_00E7F0" Offset="0xE7F0" />
<DList Name="object_ma2_DL_00E8B0" Offset="0xE8B0" />
<DList Name="object_ma2_DL_00E940" Offset="0xE940" />
<DList Name="object_ma2_DL_00EA20" Offset="0xEA20" />
<DList Name="object_ma2_DL_00EB30" Offset="0xEB30" />
<DList Name="object_ma2_DL_00EBC0" Offset="0xEBC0" />
<DList Name="object_ma2_DL_00ECA0" Offset="0xECA0" />
<DList Name="object_ma2_DL_00EDB0" Offset="0xEDB0" />
<DList Name="object_ma2_DL_00F108" Offset="0xF108" />
<DList Name="object_ma2_DL_00F5A0" Offset="0xF5A0" />
<DList Name="object_ma2_DL_00F6E8" Offset="0xF6E8" />
<DList Name="object_ma2_DL_00F8F8" Offset="0xF8F8" />
<DList Name="object_ma2_DL_00F9E0" Offset="0xF9E0" />
<DList Name="object_ma2_DL_00FBA8" Offset="0xFBA8" />
<DList Name="object_ma2_DL_00FDB0" Offset="0xFDB0" />
<DList Name="object_ma2_DL_00FE98" Offset="0xFE98" />
<Texture Name="object_ma2_TLUT_010018" OutName="tlut_010018" Format="rgba16" Width="16" Height="16" Offset="0x10018" />
<Texture Name="object_ma2_Tex_010218" OutName="tex_010218" Format="rgba16" Width="8" Height="8" Offset="0x10218" />
<Texture Name="object_ma2_Tex_010298" OutName="tex_010298" Format="rgba16" Width="8" Height="8" Offset="0x10298" />
<Texture Name="object_ma2_Tex_010318" OutName="tex_010318" Format="ci8" Width="64" Height="16" Offset="0x10318" />
<Texture Name="object_ma2_Tex_010718" OutName="tex_010718" Format="rgba16" Width="16" Height="16" Offset="0x10718" />
<Texture Name="object_ma2_Tex_010918" OutName="tex_010918" Format="ci8" Width="16" Height="16" Offset="0x10918" />
<Texture Name="object_ma2_Tex_010A18" OutName="tex_010A18" Format="ci8" Width="8" Height="8" Offset="0x10A18" />
<Texture Name="object_ma2_Tex_010A58" OutName="tex_010A58" Format="rgba16" Width="16" Height="32" Offset="0x10A58" />
<Texture Name="object_ma2_Tex_010E58" OutName="tex_010E58" Format="ci8" Width="16" Height="16" Offset="0x10E58" />
<Texture Name="object_ma2_Tex_010F58" OutName="tex_010F58" Format="ci8" Width="8" Height="16" Offset="0x10F58" />
<Texture Name="object_ma2_Tex_010FD8" OutName="tex_010FD8" Format="ci8" Width="32" Height="16" Offset="0x10FD8" />
<Texture Name="object_ma2_Tex_0111D8" OutName="tex_0111D8" Format="ci8" Width="16" Height="32" Offset="0x111D8" />
<Texture Name="object_ma2_Tex_0113D8" OutName="tex_0113D8" Format="ci8" Width="16" Height="16" Offset="0x113D8" />
<Texture Name="object_ma2_Tex_0114D8" OutName="tex_0114D8" Format="rgba16" Width="16" Height="32" Offset="0x114D8" />
<Texture Name="object_ma2_Tex_0118D8" OutName="tex_0118D8" Format="rgba16" Width="16" Height="16" Offset="0x118D8" />
<Texture Name="object_ma2_Tex_011AD8" OutName="tex_011AD8" Format="rgba16" Width="32" Height="32" Offset="0x11AD8" />
<Texture Name="object_ma2_Tex_0122D8" OutName="tex_0122D8" Format="rgba16" Width="32" Height="32" Offset="0x122D8" />
<Texture Name="object_ma2_Tex_012AD8" OutName="tex_012AD8" Format="rgba16" Width="32" Height="32" Offset="0x12AD8" />
<Texture Name="object_ma2_Tex_0132D8" OutName="tex_0132D8" Format="rgba16" Width="32" Height="32" Offset="0x132D8" />
<Texture Name="object_ma2_Tex_013AD8" OutName="tex_013AD8" Format="rgba16" Width="32" Height="32" Offset="0x13AD8" />
<Texture Name="object_ma2_Tex_0142D8" OutName="tex_0142D8" Format="rgba16" Width="32" Height="32" Offset="0x142D8" />
<Texture Name="object_ma2_Tex_014AD8" OutName="tex_014AD8" Format="rgba16" Width="32" Height="16" Offset="0x14AD8" />
<Texture Name="object_ma2_Tex_014ED8" OutName="tex_014ED8" Format="rgba16" Width="32" Height="16" Offset="0x14ED8" />
<Texture Name="object_ma2_Tex_0152D8" OutName="tex_0152D8" Format="rgba16" Width="32" Height="16" Offset="0x152D8" />
<Texture Name="object_ma2_Tex_0156D8" OutName="tex_0156D8" Format="rgba16" Width="32" Height="16" Offset="0x156D8" />
<Limb Name="object_ma2_Standardlimb_015AD8" Type="Standard" EnumName="OBJECT_MA2_LIMB_01" Offset="0x15AD8" />
<Limb Name="object_ma2_Standardlimb_015AE4" Type="Standard" EnumName="OBJECT_MA2_LIMB_02" Offset="0x15AE4" />
<Limb Name="object_ma2_Standardlimb_015AF0" Type="Standard" EnumName="OBJECT_MA2_LIMB_03" Offset="0x15AF0" />
<Limb Name="object_ma2_Standardlimb_015AFC" Type="Standard" EnumName="OBJECT_MA2_LIMB_04" Offset="0x15AFC" />
<Limb Name="object_ma2_Standardlimb_015B08" Type="Standard" EnumName="OBJECT_MA2_LIMB_05" Offset="0x15B08" />
<Limb Name="object_ma2_Standardlimb_015B14" Type="Standard" EnumName="OBJECT_MA2_LIMB_06" Offset="0x15B14" />
<Limb Name="object_ma2_Standardlimb_015B20" Type="Standard" EnumName="OBJECT_MA2_LIMB_07" Offset="0x15B20" />
<Limb Name="object_ma2_Standardlimb_015B2C" Type="Standard" EnumName="OBJECT_MA2_LIMB_08" Offset="0x15B2C" />
<Limb Name="object_ma2_Standardlimb_015B38" Type="Standard" EnumName="OBJECT_MA2_LIMB_09" Offset="0x15B38" />
<Limb Name="object_ma2_Standardlimb_015B44" Type="Standard" EnumName="OBJECT_MA2_LIMB_0A" Offset="0x15B44" />
<Limb Name="object_ma2_Standardlimb_015B50" Type="Standard" EnumName="OBJECT_MA2_LIMB_0B" Offset="0x15B50" />
<Limb Name="object_ma2_Standardlimb_015B5C" Type="Standard" EnumName="OBJECT_MA2_LIMB_0C" Offset="0x15B5C" />
<Limb Name="object_ma2_Standardlimb_015B68" Type="Standard" EnumName="OBJECT_MA2_LIMB_0D" Offset="0x15B68" />
<Limb Name="object_ma2_Standardlimb_015B74" Type="Standard" EnumName="OBJECT_MA2_LIMB_0E" Offset="0x15B74" />
<Limb Name="object_ma2_Standardlimb_015B80" Type="Standard" EnumName="OBJECT_MA2_LIMB_0F" Offset="0x15B80" />
<Limb Name="object_ma2_Standardlimb_015B8C" Type="Standard" EnumName="OBJECT_MA2_LIMB_10" Offset="0x15B8C" />
<Limb Name="object_ma2_Standardlimb_015B98" Type="Standard" EnumName="OBJECT_MA2_LIMB_11" Offset="0x15B98" />
<Limb Name="object_ma2_Standardlimb_015BA4" Type="Standard" EnumName="OBJECT_MA2_LIMB_12" Offset="0x15BA4" />
<Limb Name="object_ma2_Standardlimb_015BB0" Type="Standard" EnumName="OBJECT_MA2_LIMB_13" Offset="0x15BB0" />
<Limb Name="object_ma2_Standardlimb_015BBC" Type="Standard" EnumName="OBJECT_MA2_LIMB_14" Offset="0x15BBC" />
<Limb Name="object_ma2_Standardlimb_015BC8" Type="Standard" EnumName="OBJECT_MA2_LIMB_15" Offset="0x15BC8" />
<Skeleton Name="object_ma2_Skel_015C28" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MA2_LIMB_NONE" LimbMax="OBJECT_MA2_LIMB_MAX" EnumName="object_ma2_Limbs" Offset="0x15C28" />
<Animation Name="object_ma2_Anim_016720" Offset="0x16720" />
<!-- Cremia Animations -->
<Animation Name="gCremiaSpreadArmsLoopAnim" Offset="0xCC0" /> <!-- Original name is "kl_aogu" ("to look up") -->
<Animation Name="gCremiaHugStartAnim" Offset="0x1FD0" /> <!-- Original name is "kl_dakisime" ("to hug someone close") -->
<Animation Name="gCremiaHugLoopAnim" Offset="0x30B4" /> <!-- Original name is "kl_dakisime_loop" -->
<Animation Name="gCremiaSittingLookDownAnim" Offset="0x3D54" /> <!-- Original name is "kl_gakkurisuwari" ("heartbroken" + "sitting") -->
<Animation Name="gCremiaClapAnim" Offset="0x4370" /> <!-- Original name is "kl_hakusyu_loop" ("applause") -->
<Animation Name="gCremiaThinkAnim" Offset="0x5314" /> <!-- Original name is "kl_kangaeru" ("thinking/contemplating") -->
<!-- Cremia's Wooden Box DisplayList and Textures. She sits on it when petting the cows in the barn. -->
<DList Name="gCremiaWoodenBoxDL" Offset="0x5430" />
<Texture Name="gCremiaWoodenBoxTex" OutName="cremia_wooden_box" Format="rgba16" Width="32" Height="64" Offset="0x54E0" />
<!-- Cremia Animations -->
<Animation Name="gCremiaSittingAnim" Offset="0x70EC" /> <!-- Original name is "kl_suwari" ("sitting") -->
<Animation Name="gCremiaSittingPetCowAnim" Offset="0x7E28" /> <!-- Original name is "kl_usinades" ("cow" + "stroke" + first letter of "sitting"?) -->
<Animation Name="gCremiaPetCowAnim" Offset="0x93E8" /> <!-- Original name is "kl_usinadet" -->
<Animation Name="gCremiaIdleAnim" Offset="0xA174" /> <!-- Original name is "kl_wait" -->
<Animation Name="gCremiaSpreadArmsStartAnim" Offset="0xAF7C" /> <!-- Original name is "kl_wait2aogu" -->
<!-- Cremia Limb DisplayLists -->
<DList Name="gCremiaDress1DL" Offset="0xE170" />
<DList Name="gCremiaDress2DL" Offset="0xE370" />
<DList Name="gCremiaDress3DL" Offset="0xE4E0" />
<DList Name="gCremiaDress4DL" Offset="0xE6E8" />
<DList Name="gCremiaPelvisDL" Offset="0xE7F0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
<DList Name="gCremiaRightThighDL" Offset="0xE8B0" /> <!-- Renders a single triangle instead of a normal-looking limb -->
<DList Name="gCremiaRightShinDL" Offset="0xE940" />
<DList Name="gCremiaRightFootDL" Offset="0xEA20" />
<DList Name="gCremiaLeftThighDL" Offset="0xEB30" /> <!-- Renders a single triangle instead of a normal-looking limb -->
<DList Name="gCremiaLeftShinDL" Offset="0xEBC0" />
<DList Name="gCremiaLeftFootDL" Offset="0xECA0" />
<DList Name="gCremiaTorsoDL" Offset="0xEDB0" />
<DList Name="gCremiaHeadDL" Offset="0xF108" />
<DList Name="gCremiaHairEndDL" Offset="0xF5A0" />
<DList Name="gCremiaRightUpperArmDL" Offset="0xF6E8" />
<DList Name="gCremiaRightForearmDL" Offset="0xF8F8" />
<DList Name="gCremiaRightHandDL" Offset="0xF9E0" />
<DList Name="gCremiaLeftUpperArmDL" Offset="0xFBA8" />
<DList Name="gCremiaLeftForearmDL" Offset="0xFDB0" />
<DList Name="gCremiaLeftHandDL" Offset="0xFE98" />
<!-- Cremia Textures -->
<Texture Name="gCremiaTLUT" OutName="cremia_tlut" Format="rgba16" Width="16" Height="16" Offset="0x10018" />
<Texture Name="gCremiaSkinArmsTex" OutName="cremia_skin_arms" Format="rgba16" Width="8" Height="8" Offset="0x10218" />
<Texture Name="gCremiaSkinHeadTex" OutName="cremia_skin_head" Format="rgba16" Width="8" Height="8" Offset="0x10298" />
<Texture Name="gCremiaBootTex" OutName="cremia_boot" Format="ci8" Width="64" Height="16" Offset="0x10318" />
<Texture Name="gCremiaEarTex" OutName="cremia_ear" Format="rgba16" Width="16" Height="16" Offset="0x10718" />
<Texture Name="gCremiaHairTex" OutName="cremia_hair" Format="ci8" Width="16" Height="16" Offset="0x10918" />
<Texture Name="gCremiaShawlTex" OutName="cremia_shawl" Format="ci8" Width="8" Height="8" Offset="0x10A18" />
<Texture Name="gCremiaBroochTex" OutName="cremia_brooch" Format="rgba16" Width="16" Height="32" Offset="0x10A58" />
<Texture Name="gCremiaShirtTex" OutName="cremia_shirt" Format="ci8" Width="16" Height="16" Offset="0x10E58" />
<Texture Name="gCremiaSleevesTex" OutName="cremia_sleeves" Format="ci8" Width="8" Height="16" Offset="0x10F58" />
<Texture Name="gCremiaBeltTex" OutName="cremia_belt" Format="ci8" Width="32" Height="16" Offset="0x10FD8" />
<Texture Name="gCremiaDressPatternTex" OutName="cremia_dress_pattern" Format="ci8" Width="16" Height="32" Offset="0x111D8" />
<Texture Name="gCremiaDressTex" OutName="cremia_dress" Format="ci8" Width="16" Height="16" Offset="0x113D8" />
<Texture Name="gCremiaApronTex" OutName="cremia_apron" Format="rgba16" Width="16" Height="32" Offset="0x114D8" />
<Texture Name="gCremiaHandTex" OutName="cremia_hand" Format="rgba16" Width="16" Height="16" Offset="0x118D8" />
<Texture Name="gCremiaEyeOpenTex" OutName="cremia_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x11AD8" />
<Texture Name="gCremiaEyeHalfTex" OutName="cremia_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x122D8" />
<Texture Name="gCremiaEyeClosedTex" OutName="cremia_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x12AD8" />
<Texture Name="gCremiaEyeHappyTex" OutName="cremia_eye_happy" Format="rgba16" Width="32" Height="32" Offset="0x132D8" />
<Texture Name="gCremiaEyeAngryTex" OutName="cremia_eye_angry" Format="rgba16" Width="32" Height="32" Offset="0x13AD8" />
<Texture Name="gCremiaEyeSadTex" OutName="cremia_eye_sad" Format="rgba16" Width="32" Height="32" Offset="0x142D8" />
<Texture Name="gCremiaMouthNormalTex" OutName="cremia_mouth_normal" Format="rgba16" Width="32" Height="16" Offset="0x14AD8" />
<Texture Name="gCremiaMouthSlightSmileTex" OutName="cremia_mouth_slight_smile" Format="rgba16" Width="32" Height="16" Offset="0x14ED8" />
<Texture Name="gCremiaMouthFrownTex" OutName="cremia_mouth_frown" Format="rgba16" Width="32" Height="16" Offset="0x152D8" />
<Texture Name="gCremiaMouthHangingOpenTex" OutName="cremia_mouth_hanging_open" Format="rgba16" Width="32" Height="16" Offset="0x156D8" />
<!-- Cremia Limbs -->
<Limb Name="gCremiaRootLimb" Type="Standard" EnumName="CREMIA_LIMB_ROOT" Offset="0x15AD8" />
<Limb Name="gCremiaTorsoLimb" Type="Standard" EnumName="CREMIA_LIMB_TORSO" Offset="0x15AE4" />
<Limb Name="gCremiaLeftUpperArmLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_UPPER_ARM" Offset="0x15AF0" />
<Limb Name="gCremiaLeftForearmLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_FOREARM" Offset="0x15AFC" />
<Limb Name="gCremiaLeftHandLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_HAND" Offset="0x15B08" />
<Limb Name="gCremiaRightUpperArmLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_UPPER_ARM" Offset="0x15B14" />
<Limb Name="gCremiaRightForearmLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_FOREARM" Offset="0x15B20" />
<Limb Name="gCremiaRightHandLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_HAND" Offset="0x15B2C" />
<Limb Name="gCremiaHeadLimb" Type="Standard" EnumName="CREMIA_LIMB_HEAD" Offset="0x15B38" />
<Limb Name="gCremiaHairEndLimb" Type="Standard" EnumName="CREMIA_LIMB_HAIR_END" Offset="0x15B44" />
<Limb Name="gCremiaPelvisLimb" Type="Standard" EnumName="CREMIA_LIMB_PELVIS" Offset="0x15B50" />
<Limb Name="gCremiaLeftThighLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_THIGH" Offset="0x15B5C" />
<Limb Name="gCremiaLeftShinLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_SHIN" Offset="0x15B68" />
<Limb Name="gCremiaLeftFootLimb" Type="Standard" EnumName="CREMIA_LIMB_LEFT_FOOT" Offset="0x15B74" />
<Limb Name="gCremiaRightThighLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_THIGH" Offset="0x15B80" />
<Limb Name="gCremiaRightShinLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_SHIN" Offset="0x15B8C" />
<Limb Name="gCremiaRightFootLimb" Type="Standard" EnumName="CREMIA_LIMB_RIGHT_FOOT" Offset="0x15B98" />
<Limb Name="gCremiaDress1Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_1" Offset="0x15BA4" />
<Limb Name="gCremiaDress2Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_2" Offset="0x15BB0" />
<Limb Name="gCremiaDress3Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_3" Offset="0x15BBC" />
<Limb Name="gCremiaDress4Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_4" Offset="0x15BC8" />
<!-- Cremia Skeleton -->
<Skeleton Name="gCremiaSkel" Type="Flex" LimbType="Standard" LimbNone="CREMIA_LIMB_NONE" LimbMax="CREMIA_LIMB_MAX" EnumName="CremiaLimbs" Offset="0x15C28" />
<!-- Cremia Animation -->
<Animation Name="gCremiaWalkAnim" Offset="0x16720" /> <!-- Original name is "kl_walk" -->
</File>
</Root>

33
src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
View File

@ -268,16 +268,15 @@ static TexturePtr sRomaniMouthTextures[] = {
static s8 D_80B4E968 = 0;
static TexturePtr D_80B4E96C[] = {
object_ma2_Tex_011AD8, object_ma2_Tex_0122D8, object_ma2_Tex_012AD8,
object_ma2_Tex_0132D8, object_ma2_Tex_013AD8, object_ma2_Tex_0142D8,
static TexturePtr sCremiaEyeTextures[] = {
gCremiaEyeOpenTex, gCremiaEyeHalfTex, gCremiaEyeClosedTex, gCremiaEyeHappyTex, gCremiaEyeAngryTex, gCremiaEyeSadTex,
};
static TexturePtr D_80B4E984[] = {
object_ma2_Tex_014AD8,
object_ma2_Tex_014ED8,
object_ma2_Tex_0152D8,
object_ma2_Tex_0156D8,
static TexturePtr sCremiaMouthTextures[] = {
gCremiaMouthNormalTex,
gCremiaMouthSlightSmileTex,
gCremiaMouthFrownTex,
gCremiaMouthHangingOpenTex,
};
static s8 D_80B4E994 = 0;
@ -1214,11 +1213,11 @@ void func_80B44FEC(void) {
if (!D_80B4E994) {
D_80B4E994 = true;
for (i = 0, iter = D_80B4E96C; i < ARRAY_COUNT(D_80B4E96C); i++, iter++) {
for (i = 0, iter = sCremiaEyeTextures; i < ARRAY_COUNT(sCremiaEyeTextures); i++, iter++) {
*iter = Lib_SegmentedToVirtual(*iter);
}
for (i = 0, iter = D_80B4E984; i < ARRAY_COUNT(D_80B4E984); i++, iter++) {
for (i = 0, iter = sCremiaMouthTextures; i < ARRAY_COUNT(sCremiaMouthTextures); i++, iter++) {
*iter = Lib_SegmentedToVirtual(*iter);
}
}
@ -3721,7 +3720,7 @@ void func_80B4BA84(Actor* thisx, PlayState* play) {
void func_80B4BBE0(EnInvadepoh* this) {
AlienBehaviorInfo* substruct = &this->behaviorInfo;
Animation_MorphToLoop(&this->skelAnime, &object_ma2_Anim_016720, -6.0f);
Animation_MorphToLoop(&this->skelAnime, &gCremiaWalkAnim, -6.0f);
substruct->unk26.x = 0;
substruct->unk26.y = 0;
substruct->unk26.z = 0;
@ -3802,7 +3801,7 @@ void func_80B4BC4C(EnInvadepoh* this, PlayState* play) {
void func_80B4BFFC(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
Animation_MorphToLoop(&this->skelAnime, &object_ma2_Anim_00A174, -6.0f);
Animation_MorphToLoop(&this->skelAnime, &gCremiaIdleAnim, -6.0f);
this->behaviorInfo.unk4C = 0;
this->actionFunc = func_80B4C058;
}
@ -3834,7 +3833,7 @@ void func_80B4C058(EnInvadepoh* this, PlayState* play) {
void func_80B4C1BC(EnInvadepoh* this) {
this->behaviorInfo.unk30 = 0.08f;
this->behaviorInfo.unk2C = 2000;
Animation_MorphToLoop(&this->skelAnime, &object_ma2_Anim_00A174, -6.0f);
Animation_MorphToLoop(&this->skelAnime, &gCremiaIdleAnim, -6.0f);
this->behaviorInfo.unk4C = 0;
this->actionFunc = func_80B4C218;
}
@ -3874,8 +3873,8 @@ void func_80B4C3A0(Actor* thisx, PlayState* play) {
this->actor.objBankIndex = this->bankIndex;
Actor_SetObjectDependency(play, &this->actor);
func_80B44FEC();
SkelAnime_InitFlex(play, &this->skelAnime, &object_ma2_Skel_015C28, &object_ma2_Anim_016720, this->jointTable,
this->morphTable, 22);
SkelAnime_InitFlex(play, &this->skelAnime, &gCremiaSkel, &gCremiaWalkAnim, this->jointTable, this->morphTable,
CREMIA_LIMB_MAX);
func_80B45C04(&this->behaviorInfo, D_80B4EBDC, 1, D_80B4EC08, 0, &gZeroVec3s, 100, 0.03f, 0.3f, 0.03f);
this->actor.textId = 0x33CD;
if (currentTime < 0xD5A0) {
@ -4598,8 +4597,8 @@ void func_80B4E7BC(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
func_8012C28C(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x09, D_80B4E984[this->behaviorInfo.unk10.unkF]);
gSPSegment(POLY_OPA_DISP++, 0x08, D_80B4E96C[this->behaviorInfo.unk0.unkF]);
gSPSegment(POLY_OPA_DISP++, 0x09, sCremiaMouthTextures[this->behaviorInfo.unk10.unkF]);
gSPSegment(POLY_OPA_DISP++, 0x08, sCremiaEyeTextures[this->behaviorInfo.unk0.unkF]);
SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
func_80B4E6E4, func_80B4E784, &this->actor);
CLOSE_DISPS(play->state.gfxCtx);

73
src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
View File

@ -5,7 +5,7 @@
*/
#include "z_en_ma_yto.h"
#include "objects/object_ma2/object_ma2.h"
#include "overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8 | ACTOR_FLAG_100000 | ACTOR_FLAG_2000000)
@ -106,30 +106,41 @@ static CollisionCheckInfoInit2 sColChkInfoInit2 = {
};
static AnimationSpeedInfo sAnimationInfo[] = {
{ &object_ma2_Anim_00A174, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_00A174, 1.0f, ANIMMODE_LOOP, -6.0f }, //
{ &object_ma2_Anim_00AF7C, 1.0f, ANIMMODE_ONCE, 0.0f }, { &object_ma2_Anim_00AF7C, 1.0f, ANIMMODE_ONCE, -6.0f }, //
{ &object_ma2_Anim_000CC0, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_000CC0, 1.0f, ANIMMODE_LOOP, -6.0f }, //
{ &object_ma2_Anim_016720, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_016720, 1.0f, ANIMMODE_LOOP, -8.0f }, //
{ &object_ma2_Anim_005314, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_005314, 1.0f, ANIMMODE_LOOP, -8.0f }, //
{ &object_ma2_Anim_0093E8, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_0093E8, 1.0f, ANIMMODE_LOOP, -10.0f }, //
{ &object_ma2_Anim_007E28, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_007E28, 1.0f, ANIMMODE_LOOP, -8.0f }, //
{ &object_ma2_Anim_0070EC, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_0070EC, 1.0f, ANIMMODE_LOOP, -8.0f }, //
{ &object_ma2_Anim_003D54, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_003D54, 1.0f, ANIMMODE_LOOP, -8.0f }, //
{ &object_ma2_Anim_001FD0, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_001FD0, 1.0f, ANIMMODE_LOOP, -8.0f }, //
{ &object_ma2_Anim_0030B4, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_0030B4, 1.0f, ANIMMODE_LOOP, -8.0f }, //
{ &object_ma2_Anim_004370, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_ma2_Anim_004370, 1.0f, ANIMMODE_LOOP, -8.0f }, //
{ &gCremiaIdleAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaIdleAnim, 1.0f, ANIMMODE_LOOP, -6.0f },
{ &gCremiaSpreadArmsStartAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gCremiaSpreadArmsStartAnim, 1.0f, ANIMMODE_ONCE, -6.0f },
{ &gCremiaSpreadArmsLoopAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaSpreadArmsLoopAnim, 1.0f, ANIMMODE_LOOP, -6.0f },
{ &gCremiaWalkAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaWalkAnim, 1.0f, ANIMMODE_LOOP, -8.0f },
{ &gCremiaThinkAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaThinkAnim, 1.0f, ANIMMODE_LOOP, -8.0f },
{ &gCremiaPetCowAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaPetCowAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
{ &gCremiaSittingPetCowAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaSittingPetCowAnim, 1.0f, ANIMMODE_LOOP, -8.0f },
{ &gCremiaSittingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaSittingAnim, 1.0f, ANIMMODE_LOOP, -8.0f },
{ &gCremiaSittingLookDownAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaSittingLookDownAnim, 1.0f, ANIMMODE_LOOP, -8.0f },
{ &gCremiaHugStartAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaHugStartAnim, 1.0f, ANIMMODE_LOOP, -8.0f },
{ &gCremiaHugLoopAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaHugLoopAnim, 1.0f, ANIMMODE_LOOP, -8.0f },
{ &gCremiaClapAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gCremiaClapAnim, 1.0f, ANIMMODE_LOOP, -8.0f },
};
static TexturePtr sMouthTextures[] = {
object_ma2_Tex_014AD8,
object_ma2_Tex_014ED8,
object_ma2_Tex_0152D8,
object_ma2_Tex_0156D8,
gCremiaMouthNormalTex,
gCremiaMouthSlightSmileTex,
gCremiaMouthFrownTex,
gCremiaMouthHangingOpenTex,
};
static TexturePtr sEyesTextures[] = {
object_ma2_Tex_011AD8, object_ma2_Tex_0122D8, object_ma2_Tex_012AD8,
object_ma2_Tex_0132D8, object_ma2_Tex_013AD8, object_ma2_Tex_0142D8,
gCremiaEyeOpenTex, gCremiaEyeHalfTex, gCremiaEyeClosedTex, gCremiaEyeHappyTex, gCremiaEyeAngryTex, gCremiaEyeSadTex,
};
void EnMaYto_Init(Actor* thisx, PlayState* play) {
@ -157,8 +168,7 @@ void EnMaYto_Init(Actor* thisx, PlayState* play) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &object_ma2_Skel_015C28, NULL, this->jointTable, this->morphTable,
MA2_LIMB_MAX);
SkelAnime_InitFlex(play, &this->skelAnime, &gCremiaSkel, NULL, this->jointTable, this->morphTable, CREMIA_LIMB_MAX);
EnMaYto_InitAnimation(this, play);
Collider_InitCylinder(play, &this->collider);
@ -432,7 +442,7 @@ void EnMaYto_DefaultDialogueHandler(EnMaYto* this, PlayState* play) {
}
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, 0x3000, 0x100);
if (this->textId == 0x3395 && this->skelAnime.animation == &object_ma2_Anim_00AF7C &&
if (this->textId == 0x3395 && this->skelAnime.animation == &gCremiaSpreadArmsStartAnim &&
Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
EnMaYto_ChangeAnim(this, 4);
}
@ -1049,7 +1059,7 @@ void EnMaYto_WarmFuzzyFeelingCs(EnMaYto* this, PlayState* play) {
}
Cutscene_ActorTranslateAndYaw(&this->actor, play, csActionIndex);
if (D_80B915F0 == 2 && this->skelAnime.animation == &object_ma2_Anim_001FD0 &&
if (D_80B915F0 == 2 && this->skelAnime.animation == &gCremiaHugStartAnim &&
Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
EnMaYto_ChangeAnim(this, 20);
}
@ -1425,20 +1435,19 @@ s32 EnMaYto_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f*
EnMaYto* this = THIS;
Vec3s sp4;
if (limbIndex == MA2_LIMB_HEAD) {
if (limbIndex == CREMIA_LIMB_HEAD) {
sp4 = this->unk_1D8.unk_08;
rot->x += sp4.y;
rot->z += sp4.x;
} else if (limbIndex == MA2_LIMB_TORSO) {
if (this->skelAnime.animation != &object_ma2_Anim_007E28 &&
this->skelAnime.animation != &object_ma2_Anim_003D54) {
} else if (limbIndex == CREMIA_LIMB_TORSO) {
if (this->skelAnime.animation != &gCremiaSittingPetCowAnim &&
this->skelAnime.animation != &gCremiaSittingLookDownAnim) {
sp4 = this->unk_1D8.unk_0E;
rot->x += sp4.y;
if (this->skelAnime.animation == &object_ma2_Anim_00A174 ||
this->skelAnime.animation == &object_ma2_Anim_0070EC ||
this->skelAnime.animation == &object_ma2_Anim_003D54) {
if (this->skelAnime.animation == &gCremiaIdleAnim || this->skelAnime.animation == &gCremiaSittingAnim ||
this->skelAnime.animation == &gCremiaSittingLookDownAnim) {
rot->z += sp4.x;
}
}
@ -1449,7 +1458,7 @@ s32 EnMaYto_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f*
void EnMaYto_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
EnMaYto* this = THIS;
if (limbIndex == MA2_LIMB_HEAD) {
if (limbIndex == CREMIA_LIMB_HEAD) {
Matrix_MultZero(&this->actor.focus.pos);
}
}
@ -1461,7 +1470,7 @@ void EnMaYto_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
if (this->type == MA_YTO_TYPE_BARN && (gSaveContext.save.weekEventReg[22] & 1)) { // Aliens defeated
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gCremiaWoodenBox);
gSPDisplayList(POLY_OPA_DISP++, gCremiaWoodenBoxDL);
}
func_8012C28C(play->state.gfxCtx);

32
src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h
View File

@ -2,38 +2,12 @@
#define Z_EN_MA_YTO_H
#include "global.h"
#include "overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h"
#include "objects/object_ma2/object_ma2.h"
struct EnMaYto;
typedef void (*EnMaYtoActionFunc)(struct EnMaYto*, PlayState*);
typedef enum {
/* 00 */ MA2_LIMB_NONE,
/* 01 */ MA2_LIMB_ROOT,
/* 02 */ MA2_LIMB_TORSO,
/* 03 */ MA2_LIMB_ARM_LEFT,
/* 04 */ MA2_LIMB_FOREARM_LEFT,
/* 05 */ MA2_LIMB_HAND_LEFT,
/* 06 */ MA2_LIMB_ARM_RIGHT,
/* 07 */ MA2_LIMB_FOREARM_RIGHT,
/* 08 */ MA2_LIMB_HAND_RIGHT,
/* 09 */ MA2_LIMB_HEAD,
/* 10 */ MA2_LIMB_HAIR,
/* 11 */ MA2_LIMB_PELVIS,
/* 12 */ MA2_LIMB_TIGHT_LEFT,
/* 13 */ MA2_LIMB_LEG_LEFT,
/* 14 */ MA2_LIMB_FOOT_LEFT,
/* 15 */ MA2_LIMB_TIGHT_RIGHT,
/* 16 */ MA2_LIMB_LEG_RIGHT,
/* 17 */ MA2_LIMB_FOOT_RIGHT,
/* 18 */ MA2_LIMB_DRESS_0,
/* 19 */ MA2_LIMB_DRESS_1,
/* 20 */ MA2_LIMB_DRESS_2,
/* 21 */ MA2_LIMB_DRESS_3,
/* 22 */ MA2_LIMB_MAX
} ObjectMa2Limbs;
typedef struct EnMaYto {
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
@ -42,8 +16,8 @@ typedef struct EnMaYto {
/* 0x1D8 */ struct_800BD888_arg1 unk_1D8;
/* 0x200 */ s32 unk200; // unused
/* 0x204 */ s32 type;
/* 0x208 */ Vec3s jointTable[MA2_LIMB_MAX];
/* 0x28C */ Vec3s morphTable[MA2_LIMB_MAX];
/* 0x208 */ Vec3s jointTable[CREMIA_LIMB_MAX];
/* 0x28C */ Vec3s morphTable[CREMIA_LIMB_MAX];
/* 0x310 */ s16 unk310; // state?
/* 0x312 */ UNK_TYPE1 unk_312[0x2];
/* 0x314 */ s16 currentAnim; // Used only in DefaultWait

4
tools/disasm/variables.txt
View File

@ -14351,8 +14351,8 @@
0x80B4E944:("sRomaniEyeTextures","UNK_TYPE4","",0x4),
0x80B4E958:("sRomaniMouthTextures","UNK_TYPE4","",0x4),
0x80B4E968:("D_80B4E968","UNK_TYPE1","",0x1),
0x80B4E96C:("D_80B4E96C","UNK_TYPE4","",0x4),
0x80B4E984:("D_80B4E984","UNK_TYPE4","",0x4),
0x80B4E96C:("sCremiaEyeTextures","UNK_TYPE4","",0x4),
0x80B4E984:("sCremiaMouthTextures","UNK_TYPE4","",0x4),
0x80B4E994:("D_80B4E994","UNK_TYPE1","",0x1),
0x80B4E998:("D_80B4E998","UNK_TYPE1","",0x1),
0x80B4E99C:("D_80B4E99C","UNK_TYPE1","",0x1),