izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

name some anims

Browse Source
This commit is contained in:
angie
2023-10-10 18:05:58 -03:00
parent 23ef0b61f5
commit 5641153b62
8 changed files with 108 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_an1.xml
+7 -6
View File
@@ -1,15 +1,16 @@
<Root>
<File Name="object_an1" Segment="6">
<Animation Name="object_an1_Anim_001090" Offset="0x1090" /> <!-- Original name is "an_ajimi" ("tasting; sampling​") -->
<Animation Name="object_an1_Anim_00144C" Offset="0x144C" /> <!-- Original name is "an_ajimiend" -->
<Animation Name="gAnju1TastingAnim" Offset="0x1090" /> <!-- Original name is "an_ajimi" ("tasting; sampling​") -->
<Animation Name="gAnju1TastingEndAnim" Offset="0x144C" /> <!-- Original name is "an_ajimiend" -->
<Animation Name="object_an1_Anim_001E74" Offset="0x1E74" /> <!-- Original name is "an_aogu" ("to look up") -->
<Animation Name="gAnju1SurprisedAnim" Offset="0x26B4" /> <!-- Original name is "an_bikkuri" ("to be surprised") -->
<Animation Name="gAnju1WaitingWithTrayAnim" Offset="0x341C" /> <!-- Original name is "an_obonwait" ("obon" = "tray") -->
<Animation Name="gAnju1WalkingWithTrayAnim" Offset="0x3EA8" /> <!-- Original name is "an_obonwalk" -->
<Animation Name="gAnju1BowingAnim" Offset="0x544C" /> <!-- Original name is "an_ojigit" ("bow; bowing") -->
<Animation Name="object_an1_Anim_0065C8" Offset="0x65C8" /> <!-- Original name is "an_ryouri" ("cooking") -->
<Animation Name="gAnju1CookingAnim" Offset="0x65C8" /> <!-- Original name is "an_ryouri" ("cooking") -->
<Animation Name="gAnju1SitAnim" Offset="0x71E8" /> <!-- Original name is "an_suwaru" ("to sit") -->
<Animation Name="object_an1_Anim_007E08" Offset="0x7E08" /> <!-- Original name is "an_suzetsubou" ("su" = short for "suwaru", "zetsubou" = "despair; hopelessness​") -->
<Animation Name="gAnju1SittingInDisbelieveAnim" Offset="0x7E08" /> <!-- Original name is "an_suzetsubou" ("su" = short for "suwaru", "zetsubou" = "despair; hopelessness​") -->
<Animation Name="gAnju1IdleAnim" Offset="0x8B6C" /> <!-- Original name is "an_wait" -->
<DList Name="gAnju1Skirt4DL" Offset="0xBC20" />
@@ -41,7 +42,7 @@
<Texture Name="object_an1_Tex_00E5E0" OutName="tex_00E5E0" Format="ci8" Width="16" Height="16" Offset="0xE5E0" />
<Texture Name="gAnju1Mouth00E6E0Tex" OutName="anju_mouth_00E6E0" Format="ci8" Width="32" Height="16" Offset="0xE6E0" TlutOffset="0xDF20" />
<Texture Name="object_an1_Tex_00E8E0" OutName="tex_00E8E0" Format="ci8" Width="8" Height="8" Offset="0xE8E0" />
<Texture Name="gAnju1HandsTex" OutName="anju_hand" Format="ci8" Width="16" Height="16" Offset="0xE920" />
<Texture Name="gAnju1HandTex" OutName="anju_hand" Format="ci8" Width="16" Height="16" Offset="0xE920" />
<Texture Name="object_an1_Tex_00EA20" OutName="tex_00EA20" Format="ci8" Width="32" Height="32" Offset="0xEA20" />
<Texture Name="object_an1_Tex_00EE20" OutName="tex_00EE20" Format="ci8" Width="16" Height="16" Offset="0xEE20" />
<Texture Name="object_an1_Tex_00EF20" OutName="tex_00EF20" Format="ci8" Width="8" Height="16" Offset="0xEF20" />
@@ -91,6 +92,6 @@
<Skeleton Name="gAnju1Skel" Type="Flex" LimbType="Standard" LimbNone="ANJU1_LIMB_NONE" LimbMax="ANJU1_LIMB_MAX" EnumName="Anju1Limb" Offset="0x12618" />
<Animation Name="gAnju1WalkAnim" Offset="0x13048" /> <!-- Original name is "an_walk" -->
<Animation Name="object_an1_Anim_013E1C" Offset="0x13E1C" /> <!-- Original name is "anj_tetunagu_loop" ("joined hands") -->
<Animation Name="gAnju1HoldingHandsAnim" Offset="0x13E1C" /> <!-- Holding hands with Kafei while kneeled --> <!-- Original name is "anj_tetunagu_loop" ("joined hands") -->
</File>
</Root>
assets/xml/objects/object_an4.xml
+12 -9
View File
@@ -1,15 +1,18 @@
<Root>
<!-- Assets for Anju in the Couple's Mask cutscene -->
<File Name="object_an4" Segment="6">
<Animation Name="object_an4_Anim_00041C" Offset="0x41C" /> <!-- Original name is "anj_awase" ("to face; to be opposite (someone)") -->
<Animation Name="object_an4_Anim_0013C8" Offset="0x13C8" /> <!-- Original name is "anj_dakiau" ("to embrace each other​") -->
<Animation Name="object_an4_Anim_002550" Offset="0x2550" /> <!-- Original name is "anj_dakiau_loop" -->
<Animation Name="object_an4_Anim_00353C" Offset="0x353C" /> <!-- Original name is "anj_hanare" ("to be separated; to be apart") -->
<Animation Name="object_an4_Anim_00041C" Offset="0x41C" /> <!-- Not able to see it ingame... --> <!-- Original name is "anj_awase" ("to face; to be opposite (someone)") -->
<Animation Name="object_an4_Anim_0013C8" Offset="0x13C8" /> <!-- Start hugging while kneeled --> <!-- Original name is "anj_dakiau" ("to embrace each other​") -->
<Animation Name="object_an4_Anim_002550" Offset="0x2550" /> <!-- hugging while kneeled --> <!-- Original name is "anj_dakiau_loop" -->
<Animation Name="object_an4_Anim_00353C" Offset="0x353C" /> <!-- Stop hugging while kneeled --> <!-- Original name is "anj_hanare" ("to be separated; to be apart") -->
<Animation Name="object_an4_Anim_004498" Offset="0x4498" /> <!-- Original name is "anj_hanare_loop" -->
<Animation Name="object_an4_Anim_004A78" Offset="0x4A78" /> <!-- Original name is "anj_kaoage" ("raising face") -->
<Animation Name="gAnju4SittingRaiseFaceAnim" Offset="0x4A78" /> <!-- Original name is "anj_kaoage" ("raising face") -->
<Animation Name="object_an4_Anim_00506C" Offset="0x506C" /> <!-- Original name is "anj_kaoage_loop" -->
<Animation Name="object_an4_Anim_0060B4" Offset="0x60B4" /> <!-- Original name is "anj_miseau" ("to show each other​") -->
<Animation Name="object_an4_Anim_006CC0" Offset="0x6CC0" /> <!-- Original name is "anj_mitume_loop" ("to stare (at); to gaze (at)") -->
<Animation Name="object_an4_Anim_007E3C" Offset="0x7E3C" /> <!-- Original name is "anj_omen" ("mask") -->
<Animation Name="object_an4_Anim_0088C0" Offset="0x88C0" /> <!-- Original name is "anj_omen_loop" -->
<Animation Name="object_an4_Anim_0060B4" Offset="0x60B4" /> <!-- Shows Moon Mask to Kafei --> <!-- Original name is "anj_miseau" ("to show each other​") -->
<Animation Name="object_an4_Anim_006CC0" Offset="0x6CC0" /> <!-- Holds the Moon Mask while standing --> <!-- Original name is "anj_mitume_loop" ("to stare (at); to gaze (at)") -->
<Animation Name="object_an4_Anim_007E3C" Offset="0x7E3C" /> <!-- Holds the Moon Mask while kneeling --> <!-- Original name is "anj_omen" ("mask") -->
<Animation Name="object_an4_Anim_0088C0" Offset="0x88C0" /> <!-- Holds the Moon Mask while kneeled --> <!-- Original name is "anj_omen_loop" -->
</File>
</Root>
include/z64cutscene.h
+1 -1
View File
@@ -482,7 +482,7 @@ typedef enum {
/* 0x22A */ CS_CMD_ACTOR_CUE_554,
/* 0x22B */ CS_CMD_ACTOR_CUE_555,
/* 0x22C */ CS_CMD_ACTOR_CUE_556,
/* 0x22D */ CS_CMD_ACTOR_CUE_557,
/* 0x22D */ CS_CMD_ACTOR_CUE_557, // Moon mask cs, Anju
/* 0x22E */ CS_CMD_ACTOR_CUE_558,
/* 0x22F */ CS_CMD_ACTOR_CUE_559,
/* 0x230 */ CS_CMD_ACTOR_CUE_560,
src/overlays/actors/ovl_Dm_An/z_dm_an.c
+14 -14
View File
@@ -53,20 +53,20 @@ typedef enum {
} DmAnAnimation;
static AnimationInfoS sAnimationInfo[DMAN_ANIM_MAX] = {
{ &object_an1_Anim_007E08, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_0
{ &gAnju1SitAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_1
{ &object_an4_Anim_006CC0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_2
{ &object_an1_Anim_013E1C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_3
{ &object_an4_Anim_007E3C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_4
{ &object_an4_Anim_0088C0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_5
{ &object_an4_Anim_0013C8, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_6
{ &object_an4_Anim_002550, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_7
{ &object_an4_Anim_00353C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_8
{ &object_an4_Anim_004498, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_9
{ &object_an4_Anim_0060B4, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_10
{ &object_an4_Anim_00041C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_11
{ &object_an4_Anim_004A78, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_12
{ &object_an4_Anim_00506C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_13
{ &gAnju1SittingInDisbelieveAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_0
{ &gAnju1SitAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_1
{ &object_an4_Anim_006CC0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_2
{ &gAnju1HoldingHandsAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_3
{ &object_an4_Anim_007E3C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_4
{ &object_an4_Anim_0088C0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_5
{ &object_an4_Anim_0013C8, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_6
{ &object_an4_Anim_002550, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_7
{ &object_an4_Anim_00353C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_8
{ &object_an4_Anim_004498, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_9
{ &object_an4_Anim_0060B4, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_10
{ &object_an4_Anim_00041C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_11
{ &gAnju4SittingRaiseFaceAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMAN_ANIM_12
{ &object_an4_Anim_00506C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMAN_ANIM_13
};
s32 DmAn_UpdateSkelAnime(DmAn* this, PlayState* play) {
src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c
+14 -14
View File
@@ -53,20 +53,20 @@ typedef enum {
} DmGmAnimation;
static AnimationInfoS sAnimationInfo[DMGM_ANIM_MAX] = {
{ &object_an1_Anim_007E08, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_0
{ &gAnju1SitAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_1
{ &object_an4_Anim_006CC0, 1.0f, 0, -1, ANIMMODE_LOOP, -4 }, // DMGM_ANIM_2
{ &object_an1_Anim_013E1C, 1.0f, 0, -1, ANIMMODE_LOOP, -4 }, // DMGM_ANIM_3
{ &object_an4_Anim_007E3C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_4
{ &object_an4_Anim_0088C0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_5
{ &object_an4_Anim_0013C8, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_6
{ &object_an4_Anim_002550, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_7
{ &object_an4_Anim_00353C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_8
{ &object_an4_Anim_004498, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_9
{ &object_an4_Anim_0060B4, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_10
{ &object_an4_Anim_00041C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_11
{ &object_an4_Anim_004A78, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_12
{ &object_an4_Anim_00506C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_13
{ &gAnju1SittingInDisbelieveAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_0
{ &gAnju1SitAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_1
{ &object_an4_Anim_006CC0, 1.0f, 0, -1, ANIMMODE_LOOP, -4 }, // DMGM_ANIM_2
{ &gAnju1HoldingHandsAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 }, // DMGM_ANIM_3
{ &object_an4_Anim_007E3C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_4
{ &object_an4_Anim_0088C0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_5
{ &object_an4_Anim_0013C8, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_6
{ &object_an4_Anim_002550, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_7
{ &object_an4_Anim_00353C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_8
{ &object_an4_Anim_004498, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_9
{ &object_an4_Anim_0060B4, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_10
{ &object_an4_Anim_00041C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_11
{ &gAnju4SittingRaiseFaceAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // DMGM_ANIM_12
{ &object_an4_Anim_00506C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // DMGM_ANIM_13
};
s32 DmGm_UpdateSkelAnime(DmGm* this, PlayState* play) {
src/overlays/actors/ovl_En_An/z_en_an.c
+53 -50
View File
@@ -92,7 +92,7 @@ typedef enum AnjuScheduleResult {
/* 61 */ ANJU_SCH_3D,
/* 62 */ ANJU_SCH_3E,
/* 63 */ ANJU_SCH_3F,
/* 64 */ ANJU_SCH_MAX // ?
/* 64 */ ANJU_SCH_MAX
} AnjuScheduleResult;
static u8 sScheduleScript[] = {
@@ -595,7 +595,7 @@ EnDoor* EnAn_FindDoor(PlayState* play, s32 scheduleOutputResult) {
*/
typedef enum EnAnAnimation {
/* -1 */ ENAN_ANIM_NONE = -1,
/* 0 */ ENAN_ANIM_0,
/* 0 */ ENAN_ANIM_HOLDING_HANDS,
/* 1 */ ENAN_ANIM_IDLE,
/* 2 */ ENAN_ANIM_IDLE_MORPH,
/* 3 */ ENAN_ANIM_BOWING,
@@ -606,10 +606,10 @@ typedef enum EnAnAnimation {
/* 8 */ ENAN_ANIM_WALK2, // Duplicate of ENAN_ANIM_WALK
/* 9 */ ENAN_ANIM_SIT,
/* 10 */ ENAN_ANIM_SIT_MORPH,
/* 11 */ ENAN_ANIM_11,
/* 12 */ ENAN_ANIM_12,
/* 13 */ ENAN_ANIM_13,
/* 14 */ ENAN_ANIM_14,
/* 11 */ ENAN_ANIM_SITTING_IN_DISBELIEVE,
/* 12 */ ENAN_ANIM_COOKING,
/* 13 */ ENAN_ANIM_TASTING,
/* 14 */ ENAN_ANIM_TASTING_END,
/* 15 */ ENAN_ANIM_WAITING_WITH_TRAY,
/* 16 */ ENAN_ANIM_WALKING_WITH_TRAY,
@@ -635,29 +635,29 @@ typedef enum EnAnAnimation {
/* 31 */ ENAN_ANIM_31,
/* 32 */ ENAN_ANIM_32,
/* 33 */ ENAN_ANIM_33,
/* 34 */ ENAN_ANIM_34,
/* 34 */ ENAN_ANIM_SITTING_RAISE_FACE,
/* 35 */ ENAN_ANIM_35,
/* 36 */ ENAN_ANIM_MAX
} EnAnAnimation;
static AnimationInfoS sAnimationInfo[ENAN_ANIM_MAX] = {
{ &object_an1_Anim_013E1C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_0
{ &gAnju1IdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_IDLE
{ &gAnju1IdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -6 }, // ENAN_ANIM_IDLE_MORPH
{ &gAnju1BowingAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_BOWING
{ &gAnju1BowingAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -6 }, // ENAN_ANIM_BOWING_MORPH
{ &gAnju1SurprisedAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_SURPRISED
{ &object_an1_Anim_001E74, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_6
{ &gAnju1WalkAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_WALK
{ &gAnju1WalkAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_WALK2
{ &gAnju1SitAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_SIT
{ &gAnju1SitAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -6 }, // ENAN_ANIM_SIT_MORPH
{ &object_an1_Anim_007E08, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_11
{ &object_an1_Anim_0065C8, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_12
{ &object_an1_Anim_001090, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_13
{ &object_an1_Anim_00144C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_14
{ &gAnju1WaitingWithTrayAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_WAITING_WITH_TRAY
{ &gAnju1WalkingWithTrayAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_WALKING_WITH_TRAY
{ &gAnju1HoldingHandsAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_HOLDING_HANDS
{ &gAnju1IdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_IDLE
{ &gAnju1IdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -6 }, // ENAN_ANIM_IDLE_MORPH
{ &gAnju1BowingAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_BOWING
{ &gAnju1BowingAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -6 }, // ENAN_ANIM_BOWING_MORPH
{ &gAnju1SurprisedAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_SURPRISED
{ &object_an1_Anim_001E74, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_6
{ &gAnju1WalkAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_WALK
{ &gAnju1WalkAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_WALK2
{ &gAnju1SitAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_SIT
{ &gAnju1SitAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -6 }, // ENAN_ANIM_SIT_MORPH
{ &gAnju1SittingInDisbelieveAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_SITTING_IN_DISBELIEVE
{ &gAnju1CookingAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_COOKING
{ &gAnju1TastingAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_TASTING
{ &gAnju1TastingEndAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_TASTING_END
{ &gAnju1WaitingWithTrayAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_WAITING_WITH_TRAY
{ &gAnju1WalkingWithTrayAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_WALKING_WITH_TRAY
// ENAN_ANIMOBJ_AN2
{ &object_an2_Anim_0028DC, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_17
@@ -673,17 +673,17 @@ static AnimationInfoS sAnimationInfo[ENAN_ANIM_MAX] = {
{ &gAnju2UmbrellaSitAnim, -1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_24
// ENAN_ANIMOBJ_AN4
{ &object_an4_Anim_006CC0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_25
{ &object_an4_Anim_007E3C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_26
{ &object_an4_Anim_0088C0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_27
{ &object_an4_Anim_0013C8, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_28
{ &object_an4_Anim_002550, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_29
{ &object_an4_Anim_00353C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_30
{ &object_an4_Anim_004498, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_31
{ &object_an4_Anim_0060B4, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_32
{ &object_an4_Anim_00041C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_33
{ &object_an4_Anim_004A78, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_34
{ &object_an4_Anim_00506C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_35
{ &object_an4_Anim_006CC0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_25
{ &object_an4_Anim_007E3C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_26
{ &object_an4_Anim_0088C0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_27
{ &object_an4_Anim_0013C8, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_28
{ &object_an4_Anim_002550, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_29
{ &object_an4_Anim_00353C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_30
{ &object_an4_Anim_004498, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_31
{ &object_an4_Anim_0060B4, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_32
{ &object_an4_Anim_00041C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_33
{ &gAnju4SittingRaiseFaceAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_SITTING_RAISE_FACE
{ &object_an4_Anim_00506C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_35
};
s32 EnAn_UpdateSkel(EnAn* this, PlayState* play) {
@@ -1198,7 +1198,7 @@ s32 func_80B54C5C(Actor* thisx, PlayState* play) {
switch (this->unk_394) {
case 0x0:
EnAn_ChangeAnim(this, play, ENAN_ANIM_13);
EnAn_ChangeAnim(this, play, ENAN_ANIM_TASTING);
this->unk_394++;
break;
@@ -1211,7 +1211,7 @@ s32 func_80B54C5C(Actor* thisx, PlayState* play) {
break;
case 0x2:
EnAn_ChangeAnim(this, play, ENAN_ANIM_14);
EnAn_ChangeAnim(this, play, ENAN_ANIM_TASTING_END);
this->unk_394++;
break;
}
@@ -1437,7 +1437,7 @@ s32 func_80B552E4(EnAn* this, PlayState* play) {
u16 scriptIndex = play->csCtx.scriptIndex;
s32 ret = false;
if ((play->csCtx.state != 0) && (play->sceneId == SCENE_YADOYA) && (gSaveContext.sceneLayer == 0) &&
if ((play->csCtx.state != CS_STATE_IDLE) && (play->sceneId == SCENE_YADOYA) && (gSaveContext.sceneLayer == 0) &&
((scriptIndex == 0) || (scriptIndex == 1))) {
if (!this->forceDraw) {
this->unk_38A = ENAN_FACE_0;
@@ -1530,7 +1530,7 @@ s32 func_80B555C8(EnAn* this, PlayState* play) {
break;
case ANJU_SCH_E:
EnAn_ChangeAnim(this, play, ENAN_ANIM_12);
EnAn_ChangeAnim(this, play, ENAN_ANIM_COOKING);
break;
case ANJU_SCH_15:
@@ -2308,7 +2308,7 @@ s32 func_80B56880(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) {
break;
case ANJU_SCH_E:
EnAn_ChangeAnim(this, play, ENAN_ANIM_12);
EnAn_ChangeAnim(this, play, ENAN_ANIM_COOKING);
SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK);
this->stateFlags |= ENAN_STATE_100 | ENAN_STATE_200;
@@ -2332,7 +2332,7 @@ s32 func_80B56B00(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) {
Math_Vec3s_Copy(&this->actor.world.rot, &this->actor.shape.rot);
if (scheduleOutput->result == ANJU_SCH_C) {
EnAn_ChangeAnim(this, play, ENAN_ANIM_11);
EnAn_ChangeAnim(this, play, ENAN_ANIM_SITTING_IN_DISBELIEVE);
SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK);
this->stateFlags |= ENAN_STATE_100 | ENAN_STATE_200;
@@ -2363,7 +2363,7 @@ s32 func_80B56BC0(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) {
break;
case ANJU_SCH_18:
EnAn_ChangeAnim(this, play, ENAN_ANIM_11);
EnAn_ChangeAnim(this, play, ENAN_ANIM_SITTING_IN_DISBELIEVE);
this->unk_38A = ENAN_FACE_5;
this->faceIndex = ENAN_FACE_5;
this->eyeTimer = 8;
@@ -2384,7 +2384,7 @@ s32 func_80B56CAC(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) {
Math_Vec3s_Copy(&this->actor.shape.rot, &D_80B58EA4);
Math_Vec3s_Copy(&this->actor.world.rot, &this->actor.shape.rot);
EnAn_ChangeAnim(this, play, ENAN_ANIM_0);
EnAn_ChangeAnim(this, play, ENAN_ANIM_HOLDING_HANDS);
SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK);
this->stateFlags |= ENAN_STATE_100 | ENAN_STATE_200;
@@ -2875,18 +2875,18 @@ void EnAn_Talk(EnAn* this, PlayState* play) {
}
}
void func_80B57B48(EnAn* this, PlayState* play) {
void EnAn_HandleCutscene(EnAn* this, PlayState* play) {
s32 animIds[] = {
/* 0 */ ENAN_ANIM_0,
/* 1 */ ENAN_ANIM_11,
/* 2 */ ENAN_ANIM_34,
/* 0 */ ENAN_ANIM_HOLDING_HANDS,
/* 1 */ ENAN_ANIM_SITTING_IN_DISBELIEVE,
/* 2 */ ENAN_ANIM_SITTING_RAISE_FACE,
/* 3 */ ENAN_ANIM_25,
/* 4 */ ENAN_ANIM_26,
/* 5 */ ENAN_ANIM_28,
/* 6 */ ENAN_ANIM_30,
/* 7 */ ENAN_ANIM_32,
/* 8 */ ENAN_ANIM_33,
/* 9 */ ENAN_ANIM_0,
/* 9 */ ENAN_ANIM_HOLDING_HANDS,
};
s32 pad;
@@ -2899,6 +2899,7 @@ void func_80B57B48(EnAn* this, PlayState* play) {
if (this->cueId != (cueId & 0xFF)) {
this->cueId = cueId;
if (this->cueId == 3) {
SET_WEEKEVENTREG(WEEKEVENTREG_87_02);
this->drawMoonMask = true;
@@ -2906,15 +2907,17 @@ void func_80B57B48(EnAn* this, PlayState* play) {
if (this->cueId == 9) {
this->drawMoonMask = false;
}
EnAn_ChangeAnim(this, play, animIds[cueId]);
}
if ((this->animIndex == ENAN_ANIM_26) || (this->animIndex == ENAN_ANIM_28) ||
(this->animIndex == ENAN_ANIM_30) || (this->animIndex == ENAN_ANIM_34)) {
(this->animIndex == ENAN_ANIM_30) || (this->animIndex == ENAN_ANIM_SITTING_RAISE_FACE)) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
EnAn_ChangeAnim(this, play, this->animIndex + 1);
}
}
Cutscene_ActorTranslateAndYaw(&this->actor, play, cueChannel);
}
}
@@ -2967,7 +2970,7 @@ void EnAn_Update(Actor* thisx, PlayState* play) {
}
if ((this->actionFunc != EnAn_Initialize) && !EnAn_CheckTalk(this, play) && func_80B552E4(this, play)) {
func_80B57B48(this, play);
EnAn_HandleCutscene(this, play);
EnAn_UpdateSkel(this, play);
EnAn_UpdateFace(this);
return;
src/overlays/actors/ovl_En_An/z_en_an.h
+6 -6
View File
@@ -75,23 +75,23 @@ typedef struct EnAn {
/* 0x384 */ s16 timePathTimeSpeed;
/* 0x386 */ s16 unk_386; // timer
/* 0x388 */ s16 unk_388; // timer
/* 0x38A */ s16 unk_38A; // face enum
/* 0x38C */ s16 faceIndex; // face enum
/* 0x38A */ s16 unk_38A; // EnAnFace enum
/* 0x38C */ s16 faceIndex; // EnAnFace enum
/* 0x38E */ s16 eyeTimer;
/* 0x390 */ s16 eyeTexIndex;
/* 0x392 */ s16 mouthTexIndex;
/* 0x394 */ s16 unk_394;
/* 0x396 */ s16 dialogueFuncState;
/* 0x398 */ MsgEventFunc msgEventFunc;
/* 0x39C */ s32 animIndex;
/* 0x39C */ s32 animIndex; // EnAnAnimation enum
/* 0x3A0 */ UNK_TYPE1 unk_3A0[0x8];
/* 0x3A8 */ u32 unk_3A8;
/* 0x3AC */ u32 unk_3AC;
/* 0x3A8 */ u32 unk_3A8; // TwoTexScroll
/* 0x3AC */ u32 unk_3AC; // TwoTexScroll
/* 0x3B0 */ s32 forceDraw;
/* 0x3B4 */ s32 drawMoonMask;
/* 0x3B8 */ s32 slotsInitialized;
/* 0x3BC */ s32 unk_3BC;
/* 0x3C0 */ s32 unk_3C0;
/* 0x3C0 */ s32 unk_3C0; // true if ENAN_8000
/* 0x3C4 */ s32 unk_3C4; // set but not read
} EnAn; // size = 0x3C8
tools/disasm/functions.txt
+1 -1
View File
@@ -14061,7 +14061,7 @@
0x80B577F0:("EnAn_Initialize",),
0x80B578F8:("EnAn_FollowSchedule",),
0x80B57A44:("EnAn_Talk",),
0x80B57B48:("func_80B57B48",),
0x80B57B48:("EnAn_HandleCutscene",),
0x80B57C9C:("EnAn_Init",),
0x80B57D70:("EnAn_Destroy",),
0x80B57D9C:("EnAn_Update",),