From a6af6eb32379a0cc734cc14792ddce3e8c0a8fd2 Mon Sep 17 00:00:00 2001 From: "banjo.decomp" Date: Sun, 20 Oct 2024 19:13:29 -0500 Subject: [PATCH] Docuement core2/anseq.c --- decompressed.pal.yaml | 6 +- decompressed.us.v10.yaml | 6 +- include/prop.h | 2 +- include/structs.h | 19 +- src/MMM/code_3420.c | 76 +-- src/SM/code_0.c | 16 +- src/core2/anseq.c | 222 +++++++++ src/core2/code_1930.c | 222 --------- src/core2/code_9B990.c | 2 +- src/core2/code_DAAA0.c | 26 +- src/cutscenes/code_0.c | 982 +++++++++++++++++++-------------------- 11 files changed, 789 insertions(+), 790 deletions(-) create mode 100644 src/core2/anseq.c delete mode 100644 src/core2/code_1930.c diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index 7a9cad8a..5dabd06e 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -507,7 +507,7 @@ segments: - [0xF79CA0, c, anim/sprite] - [0xF7A2B0, c, animcache] - [0xF7A720, c, code_1550] - - [0xF7AB00, c, code_1930] + - [0xF7AB00, c, anseq] - [0xF7B410, c, code_2240] - [0xF7BA60, c, ba/anim] - [0xF7C650, c, snackerctl] @@ -1123,7 +1123,7 @@ segments: # - [0x1042790, .data, code_DC4B0] - [0x1066790, .rodata, animctrl] - [0x10667C0, .rodata, anim/sprite] - - [0x10667D0, .rodata, code_1930] + - [0x10667D0, .rodata, anseq] - [0x10667F0, .rodata, ba/anim] - [0x1066860, .rodata, snackerctl] - [0x1066870, .rodata, code_39D0] @@ -1376,7 +1376,7 @@ segments: - [0x0106C980, .bss, anim/sprite] - [0x0106C980, .bss, animcache] - [0x0106C980, .bss, code_1550] - - [0x0106C980, .bss, code_1930] + - [0x0106C980, .bss, anseq] - [0x0106C980, .bss, ba/anim] - [0x0106C980, .bss, snackerctl] - [0x0106C980, .bss, code_39D0] diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index 6e3084ec..e39d9bb0 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -508,7 +508,7 @@ segments: - [0xF56430, c, anim/sprite] - [0xF56A40, c, animcache] - [0xF56EB0, c, code_1550] - - [0xF57290, c, code_1930] + - [0xF57290, c, anseq] - [0xF57BA0, c, code_2240] - [0xF581F0, c, ba/anim] - [0xF58DE0, c, snackerctl] @@ -1122,7 +1122,7 @@ segments: - [0x1042790, .data, code_DC4B0] - [0x10427C0, ".rodata", animctrl] - [0x10427F0, .rodata, anim/sprite] - - [0x1042800, .rodata, code_1930] + - [0x1042800, .rodata, anseq] - [0x1042880, .rodata, ba/anim] - [0x1042890, .rodata, snackerctl] - [0x10428A0, .rodata, code_39D0] @@ -1374,7 +1374,7 @@ segments: - [0x1048560, .bss, anim/sprite] - [0x1048560, .bss, animcache] - [0x1048560, .bss, code_1550] - - [0x1048560, .bss, code_1930] + - [0x1048560, .bss, anseq] - [0x1048560, .bss, ba/anim] - [0x1048560, .bss, snackerctl] - [0x1048560, .bss, code_39D0] diff --git a/include/prop.h b/include/prop.h index 7e334b57..27093012 100644 --- a/include/prop.h +++ b/include/prop.h @@ -255,7 +255,7 @@ typedef struct actor_s{ f32 scale; /* 0x12C */ struct actor_info_s *actor_info; void (* unk130)(struct actor_s *); - vector(struct2s) **unk134; //vector //saved marker->dieFunc + vector(AnSeqElement) **unk134; //vector //saved marker->dieFunc u32 unk138_31:1; u32 unk138_30:1; u32 unk138_29:1; diff --git a/include/structs.h b/include/structs.h index 1232d677..9e3af8a7 100644 --- a/include/structs.h +++ b/include/structs.h @@ -150,15 +150,14 @@ typedef struct struct_0_s{ //floor } struct0; //geo(used for floor) typedef struct struct_2_s{ - f32 unk0; - u8 unk4; //argument_count - u8 unk5; - u8 pad6[2]; - u32 unk8; - s32 unkC; - s32 unk10; - void *unk14; //function_ptr -} struct2s; + f32 duration; + u8 argCount; + u8 activationFrameDelay; + s32 arg0; + s32 arg1; + s32 arg2; + void *funcPtr; +} AnSeqElement; typedef struct struct_3_s{ u32 unk0; @@ -563,7 +562,7 @@ typedef struct { typedef struct struct_63_s{ s16 unk0; // u8 pad2[2]; - void (*unk4)(vector(struct2s) **, struct actorMarker_s *); + void (*unk4)(vector(AnSeqElement) **, struct actorMarker_s *); } Struct63s; typedef struct struct_64_s{ diff --git a/src/MMM/code_3420.c b/src/MMM/code_3420.c index d2b65b20..6f88463d 100644 --- a/src/MMM/code_3420.c +++ b/src/MMM/code_3420.c @@ -136,7 +136,7 @@ u8 D_8038C1D4[] = {0xA, 0x12, 0xF, 0x9, 0xE, 0xD, 0x9, 0x11, 0xB, 0xF, 0, 0}; f32 D_8038C1E0[3] = {0.0f, 3250.0f, -3200.0f}; //jiggy spawn position /* .bss */ -struct { +static struct { s32 unk0; ActorMarker *motzhand_marker; Struct_MMM_3420_0 *unk8; @@ -144,11 +144,11 @@ struct { u8 pattern; //u8 padE[2]; u8 *unk10; -}D_8038C4F0; +}Me; /* .code */ void MMM_func_80389810(ActorMarker *caller, enum asset_e text_id, s32 arg2) { - switch (D_8038C4F0.state) { + switch (Me.state) { case 2: organMinigame_setState(3); return; @@ -196,8 +196,8 @@ void organMinigame_setState(s32 next_state){ func_8028F8F8(1, FALSE); if (next_state == 2) { - if (D_8038C4F0.pattern == 0) { - D_8038C4F0.pattern = 1; + if (Me.pattern == 0) { + Me.pattern = 1; gcdialog_showText(ASSET_AD3_DIALOG_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL); } else {//L80389A84 @@ -206,39 +206,39 @@ void organMinigame_setState(s32 next_state){ }//L80389A9C if(next_state == 3){ - D_8038C4F0.unk0 = 0; - if(D_8038C4F0.pattern == 1){ - D_8038C4F0.unk10 = D_8038C1CC; + Me.unk0 = 0; + if(Me.pattern == 1){ + Me.unk10 = D_8038C1CC; } else{ - D_8038C4F0.unk10 = D_8038C1D4; + Me.unk10 = D_8038C1D4; } func_8028F8F8(1, TRUE); - func_803876C8(D_8038C4F0.motzhand_marker, D_8038C4F0.pattern); + func_803876C8(Me.motzhand_marker, Me.pattern); }//L80389AF4 if(next_state == 4){ gcdialog_showText(ASSET_ADD_DIALOG_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL); - func_80387720(D_8038C4F0.motzhand_marker); + func_80387720(Me.motzhand_marker); } if(next_state == 5){ - D_8038C4F0.pattern++; + Me.pattern++; gcdialog_showText(ASSET_AD4_DIALOG_UNKNOWN, 4, NULL, NULL, MMM_func_80389810, NULL); - func_80387720(D_8038C4F0.motzhand_marker); + func_80387720(Me.motzhand_marker); } if(next_state == 6){ MMM_func_803898C8(); timedFunc_set_0(1.25f, func_803899BC); - func_80387654(D_8038C4F0.motzhand_marker); + func_80387654(Me.motzhand_marker); } - D_8038C4F0.state = next_state; + Me.state = next_state; } s32 func_80389BBC(void){ - return D_8038C4F0.unk8->unk4; + return Me.unk8->unk4; } //organCtrl_getKeyPosition @@ -279,12 +279,12 @@ void MMM_func_80389CD8() {} void func_80389CE0() {} int func_80389CE8(s32 arg0, s32 arg1, s32 arg2){ - if(D_8038C4F0.state == 3){ - if(*D_8038C4F0.unk10 == arg2){ - D_8038C4F0.unk0--; - D_8038C4F0.unk10++; - if(*D_8038C4F0.unk10 == 0){ - if(D_8038C4F0.pattern == 1){ + if(Me.state == 3){ + if(*Me.unk10 == arg2){ + Me.unk0--; + Me.unk10++; + if(*Me.unk10 == 0){ + if(Me.pattern == 1){ organMinigame_setState(5); } else{ @@ -305,7 +305,7 @@ void func_80389D9C(s32 key_id){ s32 sp24; sp24 = D_8038C198[key_id].unk1; MMM_func_8038B6D4(func_803517B8(sp24), func_803517E8(sp24)); - D_8038C4F0.unk0++; + Me.unk0++; } // organ game/higgy in church? @@ -314,13 +314,13 @@ void code3420_handleOrganGame(s32 arg0, s32 arg1) { f32 key_position[3]; bool is_black_key; - D_8038C4F0.unk8 = &D_8038BF20; + Me.unk8 = &D_8038BF20; func_80250170(0, 0x6A, 0); - D_8038C4F0.state = 0; + Me.state = 0; if ((map_get() == MAP_1C_MMM_CHURCH) && (arg1 == 2)) { - D_8038C4F0.motzhand_marker = NULL; - D_8038C4F0.pattern = 0; + Me.motzhand_marker = NULL; + Me.pattern = 0; key_position[0] = -1345.0f; key_position[1] = 1150.0f; @@ -355,7 +355,7 @@ void code3420_handleOrganGame(s32 arg0, s32 arg1) { } -void organMinigame_update(void){ +void maOrgan_update(void){ UNK_TYPE(u32) sp4C; f32 motzhand_dist; Actor *motzhand; @@ -363,28 +363,28 @@ void organMinigame_update(void){ f32 plyr_pos[3]; Actor *motzhand_2; - if (D_8038C4F0.state == 0) { + if (Me.state == 0) { return; } if(func_802501A0(0, 0x6A, &sp4C)){ func_80250170(0, 0x6A, 0); - D_8038C4F0.unk8++; - if(D_8038C4F0.unk8->unk4 == -1){ - D_8038C4F0.unk8 = &D_8038BF20[10]; + Me.unk8++; + if(Me.unk8->unk4 == -1){ + Me.unk8 = &D_8038BF20[10]; } }//L8038A02C - if(D_8038C4F0.state == 1 && D_8038C4F0.motzhand_marker == NULL){ + if(Me.state == 1 && Me.motzhand_marker == NULL){ sp38[0] = sp38[1] = sp38[2] = 0.0f; motzhand = actorArray_findClosestActorFromActorId(sp38, ACTOR_3A_MOTZHAND, -1, &motzhand_dist); - D_8038C4F0.motzhand_marker = motzhand->marker; + Me.motzhand_marker = motzhand->marker; }//L8038A078 - if(D_8038C4F0.state == 1 || D_8038C4F0.state == 3){ - if(func_8038769C(D_8038C4F0.motzhand_marker)){ + if(Me.state == 1 || Me.state == 3){ + if(func_8038769C(Me.motzhand_marker)){ player_getPosition(plyr_pos); - motzhand_2 = marker_getActor(D_8038C4F0.motzhand_marker); + motzhand_2 = marker_getActor(Me.motzhand_marker); if( ml_vec3f_distance(motzhand_2->position, plyr_pos) < 400.0f && motzhand_2->position_y - 50.0f <= plyr_pos[1] ){ @@ -393,7 +393,7 @@ void organMinigame_update(void){ } }//L8038A104 - if(D_8038C4F0.state == 3 && D_8038C4F0.unk0 >= 3){ + if(Me.state == 3 && Me.unk0 >= 3){ organMinigame_setState(4); } } diff --git a/src/SM/code_0.c b/src/SM/code_0.c index aa19f7d5..82fdb939 100644 --- a/src/SM/code_0.c +++ b/src/SM/code_0.c @@ -2,20 +2,20 @@ #include "functions.h" #include "variables.h" -extern void func_80288F78(Actor*, f32, s32); +extern void anSeq_func_80288F78(Actor*, f32, s32); /* .code */ void SM_func_803863F0(Actor *this, s32 arg1) { - func_80288F78(this, 0.20f, 0xF280FA); + anSeq_func_80288F78(this, 0.20f, 0xF280FA); } void SM_func_80386420(Actor *arg0, s32 arg1) { - func_80288F78(arg0, 0.20f, 0x3ED803E); - func_80288F78(arg0, 0.35f, 0x3ED8C3E); - func_80288F78(arg0, 0.71f, 0x21F336); - func_80288F78(arg0, 0.79f, 0x21F336); - func_80288F78(arg0, 0.80f, 0x3ED8C3E); - func_80288F78(arg0, 0.87f, 0x21F336); + anSeq_func_80288F78(arg0, 0.20f, 0x3ED803E); + anSeq_func_80288F78(arg0, 0.35f, 0x3ED8C3E); + anSeq_func_80288F78(arg0, 0.71f, 0x21F336); + anSeq_func_80288F78(arg0, 0.79f, 0x21F336); + anSeq_func_80288F78(arg0, 0.80f, 0x3ED8C3E); + anSeq_func_80288F78(arg0, 0.87f, 0x21F336); } /* .data */ diff --git a/src/core2/anseq.c b/src/core2/anseq.c new file mode 100644 index 00000000..c536ed14 --- /dev/null +++ b/src/core2/anseq.c @@ -0,0 +1,222 @@ +#include +#include "functions.h" +#include "variables.h" + +extern void rumbleManager_80250E6C(f32, f32); +extern void func_802BB360(s32, f32); +extern void func_802BB378(s32, f32, f32); +extern void func_802BB3AC(s32, f32); +extern void func_8031B908(s32, s32, s32, f32); + + +/* .bss */ +s32 s_activationFrameDelay; + +/* .code */ +void __anSeq_func_802888C0(s32 arg0, s32 arg1) +{ + u8 sp1C[3]; + f32 f0; + sp1C[0] = (arg0 >> 16) & 0xFF; + sp1C[1] = (arg0 >> 8) & 0xFF; + sp1C[2] = (arg0 >> 0) & 0xFF; + f0 = reinterpret_cast(f32, arg1); + func_8031B908(sp1C[0], sp1C[1], sp1C[2], f0); +} + +void __anSeq_func_80288914(s32 arg0, s32 arg1, s32 arg2){ + f32 f0 = reinterpret_cast(f32, arg1); + f32 f2 = reinterpret_cast(f32, arg2); + func_802BB378(arg0, f0, f2); +} + +void __anSeq_func_8028894C(s32 arg0, s32 arg1, s32 arg2){ + f32 f0 = reinterpret_cast(f32, arg1); + f32 f2 = reinterpret_cast(f32, arg2); + func_802BB3DC(arg0, f0, f2); +} + +void __anSeq_func_8028984(s32 arg0, s32 arg1){ + f32 f0 = reinterpret_cast(f32, arg1); + func_802BB360(arg0, f0); + func_802BB3AC(arg0, 1.0f); + func_802BB3C4(arg0); +} + +void __anSeq_func_80289C8(s32 arg0, s32 arg1){ + f32 f0 = reinterpret_cast(f32, arg1); + func_802BB3AC(arg0, f0); +} + +void __anSeq_func_80289F4(s32 arg0) { + s32 sp18; + s32 temp_t6; + s32 phi_a3; + + phi_a3 = arg0 >> 0x10; + if( !(phi_a3 == 0xF2 && map_get() == MAP_91_FILE_SELECT && func_802C5A30() != 0) + && !((phi_a3 == 0x21 || phi_a3 == 0x3ED) && map_get() == MAP_91_FILE_SELECT && (func_802C5A30() == 1)) + ){ + func_8030E6A4(phi_a3, (f32) ((f64) ((arg0 >> 8) & 0xFF) * 0.0078125), (s32) ((f64) (arg0 & 0xFF) * 128.0)); + } +} + + +void __anSeq_func_8028AE0(s32 arg0){ + func_8025A6EC((u16) (arg0 >> 16), (u16)arg0 - 1); +} + +void __anSeq_func_8028B14(enum sfx_e arg0){ + func_8025A7DC(arg0); +} + +void __anSeq_func_80288B34(s32 arg0, s32 arg1){ + f32 f12 = reinterpret_cast(f32, arg0); + f32 f14 = reinterpret_cast(f32, arg1); + rumbleManager_80250E6C(f12, f14); +} + +void __anSeq_func_80288B60(s32 arg0, s32 arg1, s32 arg2){ + f32 f12 = reinterpret_cast(f32, arg0); + f32 f14 = reinterpret_cast(f32, arg1); + f32 f0 = reinterpret_cast(f32, arg2); + rumbleManager_80250D94(f12, f14, f0); +} + +void __anSeq_updateStep(vector(AnSeqElement) **ppAnSeq, AnSeqElement *pStep){ + if(pStep->activationFrameDelay){ + if(pStep->activationFrameDelay == 0xFF) + return; + + pStep->activationFrameDelay -= 1; + if(pStep->activationFrameDelay) + return; + + pStep->activationFrameDelay = 0xFF; + } + + switch(pStep->argCount){ + case 0:// 80288BF8 + ((void (*)(void)) pStep->funcPtr)(); + break; + case 1:// 80288C0C + ((void (*)(s32)) pStep->funcPtr)(pStep->arg0); + break; + case 2:// 80288C24 + ((void (*)(s32, s32)) pStep->funcPtr)(pStep->arg0, pStep->arg1); + break; + case 3:// 80288C40 + ((void (*)(s32, s32, s32)) pStep->funcPtr)(pStep->arg0, pStep->arg1, pStep->arg2); + break; + case 4:// 80288C5C + ((void (*)(void*)) pStep->funcPtr)(&pStep->arg0); + break; + } +} + +void anSeq_clear(vector(AnSeqElement) **ppAnSeq){ + vector_clear(*ppAnSeq); +} + +AnSeqElement * __anSeq_pushStep( vector(AnSeqElement) **ppAnSeq, f32 duration, s32 arg_cnt, void *funcPtr, s32 arg0, s32 arg1, s32 arg2){ + AnSeqElement *ptr = (AnSeqElement *) vector_pushBackNew(ppAnSeq); + ptr->duration = duration; + ptr->argCount = arg_cnt; + ptr->funcPtr = funcPtr; + ptr->arg0 = arg0; + ptr->arg1 = arg1; + ptr->arg2 = arg2; + ptr->activationFrameDelay = s_activationFrameDelay; + s_activationFrameDelay = 0; + return ptr; +} + +void anSeq_PushStep_0Arg(vector(AnSeqElement) **ppAnSeq, f32 duration, void *func_ptr){ + __anSeq_pushStep(ppAnSeq, duration, 0, func_ptr, 0, 0, 0); +} + +void anSeq_PushStep_1Arg(vector(AnSeqElement) **ppAnSeq, f32 duration, void *func_ptr, s32 arg0){ + __anSeq_pushStep(ppAnSeq, duration, 1, func_ptr, arg0, 0, 0); +} + +void anSeq_PushStep_2Arg(vector(AnSeqElement) **ppAnSeq, f32 duration, void *func_ptr, s32 arg0, s32 arg4){ + __anSeq_pushStep(ppAnSeq, duration, 2, func_ptr, arg0, arg4, 0); +} + +void anSeq_PushStep_3Arg(vector(AnSeqElement) **ppAnSeq, f32 duration, void *func_ptr, s32 arg0, s32 arg4, s32 arg5){ + __anSeq_pushStep(ppAnSeq, duration, 3, func_ptr, arg0, arg4, arg5); +} + +void anSeq_PushStep_ManyArg(vector(AnSeqElement) **ppAnSeq, f32 duration, void *func_ptr, void* arg_ptr, s32 arg_size){ + AnSeqElement *out = __anSeq_pushStep(ppAnSeq, duration, 4, func_ptr, 0, 0, 0); + memcpy(&out->arg0, arg_ptr, arg_size); +} + +void anSeq_func_80288E68(vector(AnSeqElement) **ppAnSeq, f32 duration, s32 arg2, s32 arg3, s32 arg4){ + anSeq_PushStep_3Arg(ppAnSeq, duration, __anSeq_func_80288914, arg2, arg3, arg4); +} + +void func_80288EB0(vector(AnSeqElement) **ppAnSeq, f32 duration, s32 arg2, s32 arg3, s32 arg4){ + anSeq_PushStep_3Arg(ppAnSeq, duration, __anSeq_func_8028894C, arg2, arg3, arg4); +} + +void anSeq_func_80288EF8(vector(AnSeqElement) **ppAnSeq, f32 duration, s32 arg2, s32 arg3){ + anSeq_PushStep_2Arg(ppAnSeq, duration, __anSeq_func_8028984, arg2, arg3); +} + +void anSeq_func_80288F38(vector(AnSeqElement) **ppAnSeq, f32 duration, s32 arg2, s32 arg3){ + anSeq_PushStep_2Arg(ppAnSeq, duration, __anSeq_func_80289C8, arg2, arg3); +} + +void anSeq_func_80288F78(vector(AnSeqElement) **ppAnSeq, f32 duration, s32 arg2){ + anSeq_PushStep_1Arg(ppAnSeq, duration, __anSeq_func_80289F4, arg2); +} + +void anSeq_func_80288FA8(vector(AnSeqElement) **ppAnSeq, f32 duration, enum sfx_e sfx_id){ + anSeq_PushStep_1Arg(ppAnSeq, duration, __anSeq_func_8028B14, sfx_id); +} + +void anSeq_func_80288FD8(vector(AnSeqElement) **ppAnSeq, f32 duration, s32 arg2){ + anSeq_PushStep_1Arg(ppAnSeq, duration, __anSeq_func_8028AE0, arg2); +} + +void anSeq_func_80289008(vector(AnSeqElement) **ppAnSeq, f32 duration, s32 arg2, s32 arg3){ + do{ + anSeq_PushStep_2Arg(ppAnSeq, duration, __anSeq_func_80288B34, arg2, arg3); + }while(0); +} + +void anSeq_func_80289048(vector(AnSeqElement) **ppAnSeq, f32 duration, s32 arg2, s32 arg3, s32 arg4){ + do{ + anSeq_PushStep_3Arg(ppAnSeq, duration, __anSeq_func_80288B60, arg2, arg3, arg4); + }while(0); +} + +void anSeq_func_80289090(vector(AnSeqElement) **ppAnSeq, f32 duration, s32 arg2, f32 arg3){ + anSeq_PushStep_2Arg(ppAnSeq, duration, __anSeq_func_802888C0, arg2, reinterpret_cast(s32, arg3)); +} + +void anSeq_free(vector(AnSeqElement)** ppAnSeq){ + vector_free(*ppAnSeq); + free(ppAnSeq); +} + +vector(AnSeqElement) **anSeq_new(void){ + vector(AnSeqElement) **ptr = (vector(AnSeqElement) **)malloc(sizeof(vector(AnSeqElement) **)); + *ptr = vector_new(sizeof(AnSeqElement), 2); + anSeq_clear(ptr); + return ptr; +} + + +void anSeq_setActivationFrameDelay(vector(AnSeqElement) **ppAnSeq, s32 arg1){ + s_activationFrameDelay = arg1; +} + +void anSeq_update(vector(AnSeqElement) **ppAnSeq, AnimCtrl *pAnCtl){ + AnSeqElement *iPtr; + for(iPtr = vector_getBegin(*ppAnSeq); iPtr != (AnSeqElement*)vector_getEnd(*ppAnSeq); iPtr++){ + if(animctrl_isAt(pAnCtl, iPtr->duration)) + __anSeq_updateStep(ppAnSeq, iPtr); + } +} diff --git a/src/core2/code_1930.c b/src/core2/code_1930.c deleted file mode 100644 index 100a791e..00000000 --- a/src/core2/code_1930.c +++ /dev/null @@ -1,222 +0,0 @@ -#include -#include "functions.h" -#include "variables.h" - - - - -extern void rumbleManager_80250E6C(f32, f32); -extern void func_802BB360(s32, f32); -extern void func_802BB378(s32, f32, f32); -extern void func_802BB3AC(s32, f32); -extern void func_8031B908(s32, s32, s32, f32); - -/* .bss */ -s32 D_8037BF10; - -/* .code */ -void func_802888C0(s32 arg0, s32 arg1) -{ - u8 sp1C[3]; - f32 f0; - sp1C[0] = (arg0 >> 16) & 0xFF; - sp1C[1] = (arg0 >> 8) & 0xFF; - sp1C[2] = (arg0 >> 0) & 0xFF; - f0 = reinterpret_cast(f32, arg1); - func_8031B908(sp1C[0], sp1C[1], sp1C[2], f0); -} - -void func_80288914(s32 arg0, s32 arg1, s32 arg2){ - f32 f0 = reinterpret_cast(f32, arg1); - f32 f2 = reinterpret_cast(f32, arg2); - func_802BB378(arg0, f0, f2); -} - -void func_8028894C(s32 arg0, s32 arg1, s32 arg2){ - f32 f0 = reinterpret_cast(f32, arg1); - f32 f2 = reinterpret_cast(f32, arg2); - func_802BB3DC(arg0, f0, f2); -} - -void func_80288984(s32 arg0, s32 arg1){ - f32 f0 = reinterpret_cast(f32, arg1); - func_802BB360(arg0, f0); - func_802BB3AC(arg0, 1.0f); - func_802BB3C4(arg0); -} - -void func_802889C8(s32 arg0, s32 arg1){ - f32 f0 = reinterpret_cast(f32, arg1); - func_802BB3AC(arg0, f0); -} - -void func_802889F4(s32 arg0) { - s32 sp18; - s32 temp_t6; - s32 phi_a3; - - phi_a3 = arg0 >> 0x10; - if( !(phi_a3 == 0xF2 && map_get() == MAP_91_FILE_SELECT && func_802C5A30() != 0) - && !((phi_a3 == 0x21 || phi_a3 == 0x3ED) && map_get() == MAP_91_FILE_SELECT && (func_802C5A30() == 1)) - ){ - func_8030E6A4(phi_a3, (f32) ((f64) ((arg0 >> 8) & 0xFF) * 0.0078125), (s32) ((f64) (arg0 & 0xFF) * 128.0)); - } -} - - -void func_80288AE0(s32 arg0){ - func_8025A6EC((u16) (arg0 >> 16), (u16)arg0 - 1); -} - -void func_80288B14(enum sfx_e arg0){ - func_8025A7DC(arg0); -} - -void func_80288B34(s32 arg0, s32 arg1){ - f32 f12 = reinterpret_cast(f32, arg0); - f32 f14 = reinterpret_cast(f32, arg1); - rumbleManager_80250E6C(f12, f14); -} - -void func_80288B60(s32 arg0, s32 arg1, s32 arg2){ - f32 f12 = reinterpret_cast(f32, arg0); - f32 f14 = reinterpret_cast(f32, arg1); - f32 f0 = reinterpret_cast(f32, arg2); - rumbleManager_80250D94(f12, f14, f0); -} - -void func_80288B98(vector(struct2s) **arg0, struct2s *arg1){ - if(arg1->unk5){ - if(arg1->unk5 == 0xFF) - return; - if(--arg1->unk5) - return; - - arg1->unk5 = 0xFF; - } - - switch(arg1->unk4){ - case 0:// 80288BF8 - ((void (*)(void)) arg1->unk14)(); - break; - case 1:// 80288C0C - ((void (*)(s32)) arg1->unk14)(arg1->unk8); - break; - case 2:// 80288C24 - ((void (*)(s32, s32)) arg1->unk14)(arg1->unk8, arg1->unkC); - break; - case 3:// 80288C40 - ((void (*)(s32, s32, s32)) arg1->unk14)(arg1->unk8, arg1->unkC, arg1->unk10); - break; - case 4:// 80288C5C - ((void (*)(u8*)) arg1->unk14)((u8*)&arg1->unk8); - break; - } -} - -void func_80288C7C(vector(struct2s) **arg0){ - vector_clear(*arg0); -} - -s32 func_80288C9C( vector(struct2s) **arg0, f32 arg1, s32 arg_cnt, void *funcPtr, s32 arg4, s32 arg5, s32 arg6){ - struct2s *ptr = (struct2s *) vector_pushBackNew(arg0); - ptr->unk0 = arg1; - ptr->unk4 = arg_cnt; - ptr->unk14 = funcPtr; - ptr->unk8 = arg4; - ptr->unkC = arg5; - ptr->unk10 = arg6; - ptr->unk5 = D_8037BF10; - D_8037BF10 = 0; - -} - -void func_80288D08(vector(struct2s) **arg0, f32 arg1, void *arg2){ - func_80288C9C(arg0, arg1, 0, arg2, 0, 0, 0); -} - -void func_80288D40(vector(struct2s) **arg0, f32 arg1, void *arg2, s32 arg3){ - func_80288C9C(arg0, arg1, 1, arg2, arg3, 0, 0); -} - -void func_80288D84(vector(struct2s) **arg0, f32 arg1, void *arg2, s32 arg3, s32 arg4){ - func_80288C9C(arg0, arg1, 2, arg2, arg3, arg4, 0); -} - -void func_80288DCC(vector(struct2s) **arg0, f32 arg1, void *arg2, s32 arg3, s32 arg4, s32 arg5){ - func_80288C9C(arg0, arg1, 3, arg2, arg3, arg4, arg5); -} - -void func_80288E18(vector(struct2s) **arg0, f32 arg1, void *func_ptr, void* arg_ptr, s32 arg_size){ - s32 out = func_80288C9C(arg0, arg1, 4, func_ptr, 0, 0, 0); - memcpy(out + 8, arg_ptr, arg_size); -} - -void func_80288E68(vector(struct2s) **arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4){ - func_80288DCC(arg0, arg1, func_80288914, arg2, arg3, arg4); -} - -void func_80288EB0(vector(struct2s) **arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4){ - func_80288DCC(arg0, arg1, func_8028894C, arg2, arg3, arg4); -} - -void func_80288EF8(vector(struct2s) **arg0, f32 arg1, s32 arg2, s32 arg3){ - func_80288D84(arg0, arg1, func_80288984, arg2, arg3); -} - -void func_80288F38(vector(struct2s) **arg0, f32 arg1, s32 arg2, s32 arg3){ - func_80288D84(arg0, arg1, func_802889C8, arg2, arg3); -} - -void func_80288F78(vector(struct2s) **arg0, f32 arg1, s32 arg2){ - func_80288D40(arg0, arg1, func_802889F4, arg2); -} - -void func_80288FA8(vector(struct2s) **arg0, f32 arg1, enum sfx_e sfx_id){ - func_80288D40(arg0, arg1, func_80288B14, sfx_id); -} - -void func_80288FD8(vector(struct2s) **arg0, f32 arg1, s32 arg2){ - func_80288D40(arg0, arg1, func_80288AE0, arg2); -} - -void func_80289008(vector(struct2s) **arg0, f32 arg1, s32 arg2, s32 arg3){ - do{ - func_80288D84(arg0, arg1, func_80288B34, arg2, arg3); - }while(0); -} - -void func_80289048(vector(struct2s) **arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4){ - do{ - func_80288DCC(arg0, arg1, func_80288B60, arg2, arg3, arg4); - }while(0); -} - -void func_80289090(vector(struct2s) **arg0, f32 arg1, s32 arg2, s32 arg3){ - func_80288D84(arg0, arg1, func_802888C0, arg2, arg3); -} - -void func_802890D0(VLA** arg0){ - vector_free(*arg0); - free(arg0); -} - -vector(struct2s) **func_802890FC(void){ - vector(struct2s) **ptr = (vector(struct2s) **)malloc(sizeof(vector(struct2s) **)); - *ptr = vector_new(sizeof(struct2s), 2); - func_80288C7C(ptr); - return ptr; -} - - -void func_8028913C(vector(struct2s) **arg0, s32 arg1){ - D_8037BF10 = arg1; -} - -void func_8028914C(vector(struct2s) **arg0, AnimCtrl *arg1){ - struct2s *iPtr; - for(iPtr = vector_getBegin(*arg0); iPtr != (struct2s*)vector_getEnd(*arg0); iPtr++){ - if(animctrl_isAt(arg1, iPtr->unk0)) - func_80288B98(arg0, iPtr); - } -} diff --git a/src/core2/code_9B990.c b/src/core2/code_9B990.c index 48f7029a..aa122359 100644 --- a/src/core2/code_9B990.c +++ b/src/core2/code_9B990.c @@ -149,7 +149,7 @@ void overlay_mmm_init(void){ void __overlay_mmm_update(void){ func_8038966C(); - organMinigame_update(); + maOrgan_update(); func_8038AA44(); } diff --git a/src/core2/code_DAAA0.c b/src/core2/code_DAAA0.c index 6d2f0049..de831483 100644 --- a/src/core2/code_DAAA0.c +++ b/src/core2/code_DAAA0.c @@ -3,9 +3,9 @@ #include "functions.h" #include "variables.h" -extern void func_80288C7C(VLA**); -extern void func_80288D84(s32, f32, void (*)(s32,s32), s32, s32); -extern void func_80288DCC(s32 , f32, void (*)(s32, s32,s32), s32, s32, s32); +extern void anSeq_clear(VLA**); +extern void anSeq_PushStep_2Arg(s32, f32, void (*)(s32,s32), s32, s32); +extern void anSeq_PushStep_3Arg(s32 , f32, void (*)(s32, s32,s32), s32, s32, s32); //TODO import from cutscenes/code_0.h extern Struct63s D_8038D904[]; @@ -148,32 +148,32 @@ void func_80361BD0(s32 arg0, s32 arg1, s32 arg2){ } void func_80361C24(s32 arg0, f32 arg1, ActorMarker * arg2, f32 arg3){ - func_80288D84(arg0, arg1, func_80361B68, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3)); + anSeq_PushStep_2Arg(arg0, arg1, func_80361B68, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3)); } void func_80361C64(s32 arg0, f32 arg1, ActorMarker * arg2, s32 arg3, s32 arg4){ - func_80288DCC(arg0, arg1, func_80361B98, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3), arg4); + anSeq_PushStep_3Arg(arg0, arg1, func_80361B98, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3), arg4); } void func_80361CAC(s32 arg0, f32 arg1, ActorMarker *arg2, f32 arg3){ - func_80288DCC(arg0, arg1, func_80361BD0, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3), 1); + anSeq_PushStep_3Arg(arg0, arg1, func_80361BD0, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3), 1); } void func_80361CF4(s32 arg0, f32 arg1, ActorMarker *arg2, f32 arg3){ - func_80288DCC(arg0, arg1, func_80361BD0, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3), 2); + anSeq_PushStep_3Arg(arg0, arg1, func_80361BD0, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3), 2); } void func_80361D3C(s32 arg0, f32 arg1, s32 arg2, s32 arg3){ - func_80288D84(arg0, arg1, func_80361AB0, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3)); + anSeq_PushStep_2Arg(arg0, arg1, func_80361AB0, reinterpret_cast(s32, arg2), reinterpret_cast(s32, arg3)); } void func_80361D7C(s32 arg0, f32 arg1, struct ActorMarker *arg2, s32 arg3, u32 arg4){ - func_80288DCC(arg0, arg1, func_80361AE0, reinterpret_cast(s32, arg2), arg3, arg4); + anSeq_PushStep_3Arg(arg0, arg1, func_80361AE0, reinterpret_cast(s32, arg2), arg3, arg4); } void func_80361DC4(Actor *this){ if(this->unk134){ - func_802890D0(this->unk134); + anSeq_free(this->unk134); } this->unk134 = NULL; @@ -188,7 +188,7 @@ void func_80361E10(Actor *this) { for(phi_v0 = 0; phi_v0 < 0x20; phi_v0++){ if(D_803731E0[phi_v0].unk0 == this->modelCacheIndex){ this->unk108 = &D_803731E0[phi_v0]; - this->unk134 = func_802890FC(); + this->unk134 = anSeq_new(); this->unk160 = func_8032479C(); this->unk10C = 0; return; @@ -219,7 +219,7 @@ void func_80361EE0(Actor *this) { sp28 = animctrl_getIndex(this->animctrl); if (sp28 != this->unk10C) { this->unk10C = sp28; - func_80288C7C(this->unk134); + anSeq_clear(this->unk134); for(sp20 = sp24->unk4; sp20->unk4 != NULL; sp20++){ if (sp28 == sp20->unk0) { sp20->unk4(this->unk134, this->marker); @@ -227,6 +227,6 @@ void func_80361EE0(Actor *this) { } } } - func_8028914C(this->unk134, this->animctrl); + anSeq_update(this->unk134, this->animctrl); } } diff --git a/src/cutscenes/code_0.c b/src/cutscenes/code_0.c index 18a8916b..c37d4531 100644 --- a/src/cutscenes/code_0.c +++ b/src/cutscenes/code_0.c @@ -3,26 +3,26 @@ #include "variables.h" -extern void func_80288D08(vector(struct2s) **, f32, void(*)(void)); -extern void func_80288D40(vector(struct2s) **, f32, void(*)(s32), s32); -extern void func_80288D84(vector(struct2s) **, f32, void(*)(s32,s32), s32, s32); -extern void func_80288EB0(vector(struct2s) **, f32, s32, f32, f32); -extern void func_80288EF8(vector(struct2s) **, f32, s32, f32); -extern void func_80288F38(vector(struct2s) **, f32, s32, f32); -extern void func_80288E68(vector(struct2s) **, f32, s32, f32, f32); -extern void func_80288F78(vector(struct2s) **, f32, u32); -extern void func_80288FA8(vector(struct2s) **, f32, s32); -extern void func_80288FD8(vector(struct2s) **, f32, u32); -extern void func_80289090(vector(struct2s) **, f32, u32, f32); +extern void anSeq_PushStep_0Arg(vector(AnSeqElement) **, f32, void(*)(void)); +extern void anSeq_PushStep_1Arg(vector(AnSeqElement) **, f32, void(*)(s32), s32); +extern void anSeq_PushStep_2Arg(vector(AnSeqElement) **, f32, void(*)(s32,s32), s32, s32); +extern void func_80288EB0(vector(AnSeqElement) **, f32, s32, f32, f32); +extern void anSeq_func_80288EF8(vector(AnSeqElement) **, f32, s32, f32); +extern void anSeq_func_80288F38(vector(AnSeqElement) **, f32, s32, f32); +extern void anSeq_func_80288E68(vector(AnSeqElement) **, f32, s32, f32, f32); +extern void anSeq_func_80288F78(vector(AnSeqElement) **, f32, u32); +extern void anSeq_func_80288FA8(vector(AnSeqElement) **, f32, s32); +extern void anSeq_func_80288FD8(vector(AnSeqElement) **, f32, u32); +extern void anSeq_func_80289090(vector(AnSeqElement) **, f32, u32, f32); extern void func_802EFF5C(ParticleEmitter*, f32, f32, f32); extern void func_802EFF7C(ParticleEmitter*, f32, f32, f32); extern void func_802EFF9C(ParticleEmitter*, f32); extern void func_802F9E44(s32, f32, f32, f32, f32); -extern void func_80361C24(vector(struct2s) **, f32, ActorMarker *, s32); -extern void func_80361C64(vector(struct2s) **, f32, ActorMarker *, s32, s32); -extern void func_80361CF4(vector(struct2s) **, f32, ActorMarker *, f32); -extern void func_80361D7C(vector(struct2s) **, f32, ActorMarker *, s32, u32); -extern void func_80361CAC(vector(struct2s) **, f32, ActorMarker *, f32); +extern void func_80361C24(vector(AnSeqElement) **, f32, ActorMarker *, s32); +extern void func_80361C64(vector(AnSeqElement) **, f32, ActorMarker *, s32, s32); +extern void func_80361CF4(vector(AnSeqElement) **, f32, ActorMarker *, f32); +extern void func_80361D7C(vector(AnSeqElement) **, f32, ActorMarker *, s32, u32); +extern void func_80361CAC(vector(AnSeqElement) **, f32, ActorMarker *, f32); /* .code */ void cutscenes_func_803863F0(void){ func_8025A2D8(); @@ -656,190 +656,190 @@ void func_803881CC(s32 arg0) { } } -void func_803882D4(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.0952f, (SFX_AD_CATERPILLAR_SQUEAK << 0x10) | (0x80 << 8) | 0x75); - func_80288F78(arg0, 0.5279f, (SFX_AD_CATERPILLAR_SQUEAK << 0x10) | (0x8C << 8) | 0x94); - func_8028913C(arg0, 1); - func_80288F78(arg0, 0.55f, (SFX_C5_TWINKLY_POP << 0x10) | (0x80 << 8 )| 0xFA); - func_80288F78(arg0, 0.8658f, (SFX_CC_PAUSEMENU_ENTER_SUBMENU << 0x10) | (0xD9 << 8) | 0xFA); - func_80288F78(arg0, 0.9485f, (SFX_2F_ORANGE_SPLAT << 0x10) | (0x8C << 8) | 0xC3); +void func_803882D4(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.0952f, (SFX_AD_CATERPILLAR_SQUEAK << 0x10) | (0x80 << 8) | 0x75); + anSeq_func_80288F78(arg0, 0.5279f, (SFX_AD_CATERPILLAR_SQUEAK << 0x10) | (0x8C << 8) | 0x94); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_func_80288F78(arg0, 0.55f, (SFX_C5_TWINKLY_POP << 0x10) | (0x80 << 8 )| 0xFA); + anSeq_func_80288F78(arg0, 0.8658f, (SFX_CC_PAUSEMENU_ENTER_SUBMENU << 0x10) | (0xD9 << 8) | 0xFA); + anSeq_func_80288F78(arg0, 0.9485f, (SFX_2F_ORANGE_SPLAT << 0x10) | (0x8C << 8) | 0xC3); } -void func_8038837C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.03f, (SFX_12A_GRUNTY_AH << 0x10) | (0x8C << 8) | 0xFA); +void func_8038837C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.03f, (SFX_12A_GRUNTY_AH << 0x10) | (0x8C << 8) | 0xFA); } -void cutscenes_func_803883AC(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.0282f, (SFX_12A_GRUNTY_AH << 0x10) | (0x8C << 8) | 0xFA); - func_80288F78(arg0, 0.6107f, (SFX_20_METAL_CLANK_1 << 0x10) | (0x73 << 8) | 0x75); - func_80288F78(arg0, 0.6107f, (SFX_F9_GRUNTLING_NOISE_1 << 0x10) | (0x53 << 8) | 0x4E); - func_80288F78(arg0, 0.6664f, (SFX_20_METAL_CLANK_1 << 0x10) | (0x80 << 8) | 0x75); - func_80288F78(arg0, 0.6664f, (SFX_F9_GRUNTLING_NOISE_1 << 0x10) | (0x59 << 8) | 0x4E); - func_80288F78(arg0, 0.7421f, (SFX_20_METAL_CLANK_1 << 0x10) | (0x79 << 8) | 0x75); - func_80288F78(arg0, 0.7421f, (SFX_F9_GRUNTLING_NOISE_1 << 0x10) | (0x55 << 8) | 0x4E); - func_80288F78(arg0, 0.9772f, (SFX_2_CLAW_SWIPE << 0x10) | (0x79 << 8) | 0x4E); +void cutscenes_func_803883AC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.0282f, (SFX_12A_GRUNTY_AH << 0x10) | (0x8C << 8) | 0xFA); + anSeq_func_80288F78(arg0, 0.6107f, (SFX_20_METAL_CLANK_1 << 0x10) | (0x73 << 8) | 0x75); + anSeq_func_80288F78(arg0, 0.6107f, (SFX_F9_GRUNTLING_NOISE_1 << 0x10) | (0x53 << 8) | 0x4E); + anSeq_func_80288F78(arg0, 0.6664f, (SFX_20_METAL_CLANK_1 << 0x10) | (0x80 << 8) | 0x75); + anSeq_func_80288F78(arg0, 0.6664f, (SFX_F9_GRUNTLING_NOISE_1 << 0x10) | (0x59 << 8) | 0x4E); + anSeq_func_80288F78(arg0, 0.7421f, (SFX_20_METAL_CLANK_1 << 0x10) | (0x79 << 8) | 0x75); + anSeq_func_80288F78(arg0, 0.7421f, (SFX_F9_GRUNTLING_NOISE_1 << 0x10) | (0x55 << 8) | 0x4E); + anSeq_func_80288F78(arg0, 0.9772f, (SFX_2_CLAW_SWIPE << 0x10) | (0x79 << 8) | 0x4E); } -void func_80388490(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.025f, (SFX_6_BANJO_LANDING_02 << 0x10) | (0x99 << 8) | 0x36); - func_80288F78(arg0, 0.52f, (SFX_6_BANJO_LANDING_02 << 0x10) | (0x73 << 8) | 0x36); +void func_80388490(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.025f, (SFX_6_BANJO_LANDING_02 << 0x10) | (0x99 << 8) | 0x36); + anSeq_func_80288F78(arg0, 0.52f, (SFX_6_BANJO_LANDING_02 << 0x10) | (0x73 << 8) | 0x36); } -void func_803884DC(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_803884DC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 4, 0); - func_8028913C(arg0, 1); - func_80288D08(arg0, 0.01f, func_8038684C); - func_8028913C(arg0, 7); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_0Arg(arg0, 0.01f, func_8038684C); + anSeq_setActivationFrameDelay(arg0, 7); func_80288EB0(arg0, 0.02f, 0, 35.0f, 0.8f); - func_8028913C(arg0, 7); - func_80288D40(arg0, 0.02f, func_80386C34, reinterpret_cast(s32, arg1)); - func_8028913C(arg0, 0xB); - func_80288D40(arg0, 0.5f, func_80386AC8, reinterpret_cast(s32, arg1)); - func_8028913C(arg0, 0xB); - func_80288D40(arg0, 0.7f, func_80386DA0, reinterpret_cast(s32, arg1)); - func_8028913C(arg0, 5); - func_80288F78(arg0, 0.149f, (SFX_17C_GRUNTY_FALLING_OFF_1 << 0x10) | (0x80 << 8) | 0xFA); - func_8028913C(arg0, 0xB); - func_80288F78(arg0, 0.2f, (SFX_17D_GRUNTY_FALLING_OFF_2 << 0x10) | (0x80 << 8) | 0xFA); + anSeq_setActivationFrameDelay(arg0, 7); + anSeq_PushStep_1Arg(arg0, 0.02f, func_80386C34, reinterpret_cast(s32, arg1)); + anSeq_setActivationFrameDelay(arg0, 0xB); + anSeq_PushStep_1Arg(arg0, 0.5f, func_80386AC8, reinterpret_cast(s32, arg1)); + anSeq_setActivationFrameDelay(arg0, 0xB); + anSeq_PushStep_1Arg(arg0, 0.7f, func_80386DA0, reinterpret_cast(s32, arg1)); + anSeq_setActivationFrameDelay(arg0, 5); + anSeq_func_80288F78(arg0, 0.149f, (SFX_17C_GRUNTY_FALLING_OFF_1 << 0x10) | (0x80 << 8) | 0xFA); + anSeq_setActivationFrameDelay(arg0, 0xB); + anSeq_func_80288F78(arg0, 0.2f, (SFX_17D_GRUNTY_FALLING_OFF_2 << 0x10) | (0x80 << 8) | 0xFA); } -void cutscenes_func_80388660(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void cutscenes_func_80388660(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 4, 0); - func_8028913C(arg0, 1); - func_80288D08(arg0, 0.01f, func_803868B8); - func_8028913C(arg0, 1); - func_80288F78(arg0, 0.149f, 0x017C80FAU); - func_80288F78(arg0, 0.79f, 0x280C3U); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_0Arg(arg0, 0.01f, func_803868B8); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_func_80288F78(arg0, 0.149f, 0x017C80FAU); + anSeq_func_80288F78(arg0, 0.79f, 0x280C3U); } -void func_80388734(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_80388734(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 4, 0); } -void func_803887A0(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_803887A0(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 3, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 4, 1); } -void func_80388814(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_80388814(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 4, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.001f, arg1, 5, 1); - func_80288F78(arg0, 0.016f, 0x87955U); - func_80288F78(arg0, 0.18f, 0x88C55U); - func_80288F78(arg0, 0.34f, 0x88055U); - func_80288F78(arg0, 0.498f, 0x88655U); - func_80288F78(arg0, 0.68f, 0x88C55U); - func_80288F78(arg0, 0.831f, 0x87955U); + anSeq_func_80288F78(arg0, 0.016f, 0x87955U); + anSeq_func_80288F78(arg0, 0.18f, 0x88C55U); + anSeq_func_80288F78(arg0, 0.34f, 0x88055U); + anSeq_func_80288F78(arg0, 0.498f, 0x88655U); + anSeq_func_80288F78(arg0, 0.68f, 0x88C55U); + anSeq_func_80288F78(arg0, 0.831f, 0x87955U); } -void func_80388920(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_80388920(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.021f, arg1, 4, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.021f, arg1, 5, 1); - func_80288F78(arg0, 0.49f, 0x8D93EU); - func_80288F78(arg0, 0.99f, 0x8C03EU); + anSeq_func_80288F78(arg0, 0.49f, 0x8D93EU); + anSeq_func_80288F78(arg0, 0.99f, 0x8C03EU); } -void func_803889CC(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_803889CC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.05f, arg1, 4, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.05f, arg1, 5, 1); - func_8028913C(arg0, 1); - func_80288D08(arg0, 0.05f, func_80386504); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_0Arg(arg0, 0.05f, func_80386504); } -void func_80388A6C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_80388A6C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.02f, arg1, 4, 2); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.02f, arg1, 5, 2); func_80361D7C(arg0, 0.13f, arg1, 5, 0x4CA675U); func_80361D7C(arg0, 0.48f, arg1, 5, 0x4CA675U); func_80361D7C(arg0, 0.57f, arg1, 5, 0x4CA675U); } -void func_80388B58(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_80388B58(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.021f, arg1, 4, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.021f, arg1, 5, 1); } -void func_80388BCC(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_80388BCC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.021f, arg1, 4, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.021f, arg1, 5, 1); } -void func_80388C40(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.151f, 0x5D59C3U); - func_80288F78(arg0, 0.5662f, 0x5E59C3U); - func_80288D40(arg0, 0.56f, func_803880C8, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.71f, func_803880C8, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.86f, func_803880C8, reinterpret_cast(s32, arg1)); +void func_80388C40(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.151f, 0x5D59C3U); + anSeq_func_80288F78(arg0, 0.5662f, 0x5E59C3U); + anSeq_PushStep_1Arg(arg0, 0.56f, func_803880C8, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.71f, func_803880C8, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.86f, func_803880C8, reinterpret_cast(s32, arg1)); } -void func_80388CE4(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.16f, 0x01054CC3U); - func_80288F78(arg0, 0.7496f, 0x01054CC3U); +void func_80388CE4(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.16f, 0x01054CC3U); + anSeq_func_80288F78(arg0, 0.7496f, 0x01054CC3U); } -void func_80388D30(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.0257f, (SFX_6B_LOCKUP_OPENING << 0x10) | (0x40 << 8) | 0xFF); - func_80288F78(arg0, 0.6287f, (SFX_6C_LOCKUP_CLOSING << 0x10) | (0x80 << 8) | 0xFA); - func_80288F78(arg0, 0.7126f, (SFX_3F_CAULDRON_SQEAK_1 << 0x10) | (0x99 << 8) | 0x65); - func_80288F78(arg0, 0.77f, (SFX_40_CAULDRON_SQEAK_2 << 0x10) | (0x99 << 8) | 0x65); - func_80288F78(arg0, 0.8079f, (SFX_3F_CAULDRON_SQEAK_1 << 0x10) | (0x99 << 8) | 0x65); - func_80288F78(arg0, 0.9142f, (SFX_40_CAULDRON_SQEAK_2 << 0x10) | (0x99 << 8) | 0x65); +void func_80388D30(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.0257f, (SFX_6B_LOCKUP_OPENING << 0x10) | (0x40 << 8) | 0xFF); + anSeq_func_80288F78(arg0, 0.6287f, (SFX_6C_LOCKUP_CLOSING << 0x10) | (0x80 << 8) | 0xFA); + anSeq_func_80288F78(arg0, 0.7126f, (SFX_3F_CAULDRON_SQEAK_1 << 0x10) | (0x99 << 8) | 0x65); + anSeq_func_80288F78(arg0, 0.77f, (SFX_40_CAULDRON_SQEAK_2 << 0x10) | (0x99 << 8) | 0x65); + anSeq_func_80288F78(arg0, 0.8079f, (SFX_3F_CAULDRON_SQEAK_1 << 0x10) | (0x99 << 8) | 0x65); + anSeq_func_80288F78(arg0, 0.9142f, (SFX_40_CAULDRON_SQEAK_2 << 0x10) | (0x99 << 8) | 0x65); } -void func_80388DE4(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.0145f, 0x6B73FFU); - func_80288F78(arg0, 0.6245f, 0x6C80FAU); +void func_80388DE4(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.0145f, 0x6B73FFU); + anSeq_func_80288F78(arg0, 0.6245f, 0x6C80FAU); } -void func_80388E30(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_80388E30(vector(AnSeqElement) **arg0, ActorMarker *arg1) { f32 sp2C; sp2C = 0.8f; - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 0); - func_8028913C(arg0, 1); - func_80288D84(arg0, 0.01f, func_80386A90, reinterpret_cast(s32, arg1), reinterpret_cast(s32, sp2C)); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_2Arg(arg0, 0.01f, func_80386A90, reinterpret_cast(s32, arg1), reinterpret_cast(s32, sp2C)); } -void func_80388EE0(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_80388EE0(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 0); - func_80288F78(arg0, 0.1667f, 0xC680FFU); - func_80288F78(arg0, 0.4114f, 0x2C80FFU); - func_80288F78(arg0, 0.8132f, 0xC580FFU); + anSeq_func_80288F78(arg0, 0.1667f, 0xC680FFU); + anSeq_func_80288F78(arg0, 0.4114f, 0x2C80FFU); + anSeq_func_80288F78(arg0, 0.8132f, 0xC580FFU); } -void func_80388F9C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_80388F9C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 0); func_80361D7C(arg0, 0.2452f, arg1, 5, 0x6F804EU); func_80361D7C(arg0, 0.2858f, arg1, 5, 0x6F804EU); @@ -849,78 +849,78 @@ void func_80388F9C(vector(struct2s) **arg0, ActorMarker *arg1) { func_80361D7C(arg0, 0.7384f, arg1, 5, 0x6F804EU); } -void func_803890CC(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_803890CC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 1); func_80361D7C(arg0, 0.08f, arg1, 5, 0x6DB375U); - func_80288D40(arg0, 0.08f, cutscenes_func_80387560, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.08f, cutscenes_func_80387560, reinterpret_cast(s32, arg1)); func_80361D7C(arg0, 0.2f, arg1, 5, 0x6DB375U); - func_80288D40(arg0, 0.2f, cutscenes_func_80387560, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.2f, cutscenes_func_80387560, reinterpret_cast(s32, arg1)); func_80361D7C(arg0, 0.3f, arg1, 5, 0x6DB375U); - func_80288D40(arg0, 0.3f, cutscenes_func_80387560, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.3f, cutscenes_func_80387560, reinterpret_cast(s32, arg1)); } -void cutscenes_func_80389204(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void cutscenes_func_80389204(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 2); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 1); func_80361D7C(arg0, 0.08f, arg1, 5, 0x6DB34EU); - func_80288D40(arg0, 0.08f, func_80387680, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.08f, func_80387680, reinterpret_cast(s32, arg1)); func_80361D7C(arg0, 0.2f, arg1, 5, 0x6DB34EU); - func_80288D40(arg0, 0.2f, func_80387680, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.2f, func_80387680, reinterpret_cast(s32, arg1)); func_80361D7C(arg0, 0.3f, arg1, 5, 0x6DB34EU); - func_80288D40(arg0, 0.3f, func_80387680, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.3f, func_80387680, reinterpret_cast(s32, arg1)); } -void func_8038933C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288FD8(arg0, 0.1f, 0xA60000U); - func_8028913C(arg0, 1); +void func_8038933C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288FD8(arg0, 0.1f, 0xA60000U); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 2, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 1); func_80361D7C(arg0, 0.3f, arg1, 5, 0xB4B3EAU); func_80361D7C(arg0, 0.6f, arg1, 5, 0x1F809CU); func_80361D7C(arg0, 0.65f, arg1, 5, 0x98A675U); func_80361D7C(arg0, 0.81f, arg1, 5, 0x98A675U); func_80361D7C(arg0, 0.93f, arg1, 5, 0x98A675U); - func_80288FA8(arg0, 0.99f, 0xA6); + anSeq_func_80288FA8(arg0, 0.99f, 0xA6); } -void func_80389498(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288D40(arg0, 0.06f, func_80386EF8, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.06f, 0x03F9B3FAU); +void func_80389498(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_PushStep_1Arg(arg0, 0.06f, func_80386EF8, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.06f, 0x03F9B3FAU); } -void func_803894E8(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.1961f, 0x98A6A4U); - func_80288F78(arg0, 0.2914f, 0x98A6A4U); - func_80288F78(arg0, 0.3741f, 0x98A6A4U); - func_80288F78(arg0, 0.4627f, 0x98A6A4U); - func_80288F78(arg0, 0.5551f, 0x98A6A4U); - func_80288F78(arg0, 0.6374f, 0x98A6A4U); - func_80288F78(arg0, 0.7178f, 0x98A6A4U); - func_80288F78(arg0, 0.8202f, 0x98A6A4U); - func_80288F78(arg0, 0.9137f, 0x98A6A4U); +void func_803894E8(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.1961f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.2914f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.3741f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.4627f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.5551f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.6374f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.7178f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.8202f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.9137f, 0x98A6A4U); } -void func_803895CC(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.204f, 0x98A6A4U); - func_80288F78(arg0, 0.304f, 0x98A6A4U); - func_80288F78(arg0, 0.3977f, 0x98A6A4U); - func_80288F78(arg0, 0.5139f, 0x98A6A4U); - func_80288F78(arg0, 0.6923f, 0x98A6A4U); - func_80288F78(arg0, 0.9106f, 0x8B80FAU); - func_80288F78(arg0, 0.9109f, 0x8B80FAU); +void func_803895CC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.204f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.304f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.3977f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.5139f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.6923f, 0x98A6A4U); + anSeq_func_80288F78(arg0, 0.9106f, 0x8B80FAU); + anSeq_func_80288F78(arg0, 0.9109f, 0x8B80FAU); } -void func_80389698(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.0221f, 0x4480FAU); +void func_80389698(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.0221f, 0x4480FAU); } -void func_803896C8(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_803896C8(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.001f, arg1, 1, 1); func_80361C64(arg0, 0.023f, arg1, 6, 1); func_80361C64(arg0, 0.023f, arg1, 5, 0); @@ -930,43 +930,43 @@ void func_803896C8(vector(struct2s) **arg0, ActorMarker *arg1) { func_80361C24(arg0, 0.31f, arg1, 6); func_80288EB0(arg0, 0.3209f, 0, 30.0f, 0.4f); func_80361C64(arg0, 0.66f, arg1, 5, 1); - func_80288D40(arg0, 0.66f, func_80387E9C, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.66f, 0x3080FAU); + anSeq_PushStep_1Arg(arg0, 0.66f, func_80387E9C, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.66f, 0x3080FAU); func_80361C24(arg0, 0.65f, arg1, 7); } -void cutscenes_func_80389850(vector(struct2s) **arg0, ActorMarker *arg1) { +void cutscenes_func_80389850(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.36f, arg1, 7, 0); func_80361C64(arg0, 0.618f, arg1, 7, 1); func_80361C64(arg0, 0.696f, arg1, 5, 1); } -void cutscenes_func_803898C8(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void cutscenes_func_803898C8(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.03f, arg1, 7, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.03f, arg1, 5, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.03f, arg1, 4, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.03f, arg1, 6, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.03f, arg1, 8, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.1f, arg1, 9, 1); - func_80288F78(arg0, 0.08f, 0x6080C3U); - func_80288F78(arg0, 0.35f, 0x280D2U); - func_80288D40(arg0, 0.45f, func_803877A0, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.45f, 0x03ED8027U); - func_80288D40(arg0, 0.55f, func_803877A0, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.55f, 0x03ED8027U); - func_80288D40(arg0, 0.65f, func_803877A0, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.65f, 0x03ED8027U); - func_80288D40(arg0, 0.75f, func_803877A0, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.75f, 0x03ED8027U); + anSeq_func_80288F78(arg0, 0.08f, 0x6080C3U); + anSeq_func_80288F78(arg0, 0.35f, 0x280D2U); + anSeq_PushStep_1Arg(arg0, 0.45f, func_803877A0, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.45f, 0x03ED8027U); + anSeq_PushStep_1Arg(arg0, 0.55f, func_803877A0, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.55f, 0x03ED8027U); + anSeq_PushStep_1Arg(arg0, 0.65f, func_803877A0, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.65f, 0x03ED8027U); + anSeq_PushStep_1Arg(arg0, 0.75f, func_803877A0, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.75f, 0x03ED8027U); } -void func_80389AD0(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_80389AD0(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.03f, arg1, 7, 0); func_80361C64(arg0, 0.03f, arg1, 5, 0); func_80361C64(arg0, 0.03f, arg1, 4, 0); @@ -974,239 +974,239 @@ void func_80389AD0(vector(struct2s) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.03f, arg1, 8, 0); } -void func_80389B84(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.001f, 0x1F73D2U); - func_80288D40(arg0, 0.001f, func_80387D88, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.001f, 0x8299D2U); - func_80288F78(arg0, 0.003f, 0x66CCFAU); +void func_80389B84(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.001f, 0x1F73D2U); + anSeq_PushStep_1Arg(arg0, 0.001f, func_80387D88, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.001f, 0x8299D2U); + anSeq_func_80288F78(arg0, 0.003f, 0x66CCFAU); func_80288EB0(arg0, 0.001f, 2, 50.0f, 0.5f); } -void func_80389C30(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288D40(arg0, 0.1f, func_80387C64, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.2f, func_80387C64, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.3f, func_80387C64, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.4f, func_80387C64, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.5f, func_80387C64, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.6f, func_80387C64, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.7f, func_80387C64, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.8f, func_80387C64, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.9f, func_80387C64, reinterpret_cast(s32, arg1)); +void func_80389C30(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_PushStep_1Arg(arg0, 0.1f, func_80387C64, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.2f, func_80387C64, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.3f, func_80387C64, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.4f, func_80387C64, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.5f, func_80387C64, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.6f, func_80387C64, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.7f, func_80387C64, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.8f, func_80387C64, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.9f, func_80387C64, reinterpret_cast(s32, arg1)); } -void func_80389D34(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_80389D34(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.02f, arg1, 1, 0); } -void func_80389D78(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288D08(arg0, 0.01f, func_803864AC); - func_80288D08(arg0, 0.0f, func_803865F0); - func_80288F78(arg0, 0.9f, 0x7F80EAU); +void func_80389D78(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_PushStep_0Arg(arg0, 0.01f, func_803864AC); + anSeq_PushStep_0Arg(arg0, 0.0f, func_803865F0); + anSeq_func_80288F78(arg0, 0.9f, 0x7F80EAU); func_80288EB0(arg0, 0.9f, 0, 5.0f, 0.8f); } -void func_80389DFC(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288D08(arg0, 0.01f, func_803864AC); - func_80288D08(arg0, 0.01f, func_803865F0); - func_80288D40(arg0, 0.8f, func_803872B4, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.9f, 0x7F80EAU); +void func_80389DFC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_PushStep_0Arg(arg0, 0.01f, func_803864AC); + anSeq_PushStep_0Arg(arg0, 0.01f, func_803865F0); + anSeq_PushStep_1Arg(arg0, 0.8f, func_803872B4, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.9f, 0x7F80EAU); func_80288EB0(arg0, 0.9f, 0, 5.0f, 0.8f); } -void cutscenes_func_80389EA8(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void cutscenes_func_80389EA8(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.023f, arg1, 1, 1); - func_8028913C(arg0, 2); - func_80288EF8(arg0, 0.6f, 0, 0.1f); - func_8028913C(arg0, 2); - func_80288E68(arg0, 0.6f, 0, 8.0f, 8.0f); - func_80289090(arg0, 0.2f, 0xFF0000U, 0.4f); - func_80289090(arg0, 0.2f, 0xFF00U, 0.4f); - func_80289090(arg0, 0.2f, 0xFFU, 0.4f); - func_80289090(arg0, 0.2f, 0xFFFFFFU, 0.4f); - func_80288D40(arg0, 0.4f, func_8038702C, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.4f, func_80387170, reinterpret_cast(s32, arg1)); - func_8028913C(arg0, 5); - func_80288F38(arg0, 0.95f, 0, 0.8f); + anSeq_setActivationFrameDelay(arg0, 2); + anSeq_func_80288EF8(arg0, 0.6f, 0, 0.1f); + anSeq_setActivationFrameDelay(arg0, 2); + anSeq_func_80288E68(arg0, 0.6f, 0, 8.0f, 8.0f); + anSeq_func_80289090(arg0, 0.2f, 0xFF0000U, 0.4f); + anSeq_func_80289090(arg0, 0.2f, 0x00FF00U, 0.4f); + anSeq_func_80289090(arg0, 0.2f, 0x0000FFU, 0.4f); + anSeq_func_80289090(arg0, 0.2f, 0xFFFFFFU, 0.4f); + anSeq_PushStep_1Arg(arg0, 0.4f, func_8038702C, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.4f, func_80387170, reinterpret_cast(s32, arg1)); + anSeq_setActivationFrameDelay(arg0, 5); + anSeq_func_80288F38(arg0, 0.95f, 0, 0.8f); } -void func_8038A018(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_8038A018(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.023f, arg1, 1, 0); } -void func_8038A05C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_8038A05C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.02f, arg1, 1, 0); } -void cutscenes_func_8038A0A0(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288D08(arg0, 0.01f, func_803864AC); - func_80288D08(arg0, 0.0f, func_803865F0); - func_80288F78(arg0, 0.8f, 0xB1C075U); - func_80288F78(arg0, 0.95f, 0xB1B375U); - func_80288F78(arg0, 0.97f, 0x7F80EAU); +void cutscenes_func_8038A0A0(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_PushStep_0Arg(arg0, 0.01f, func_803864AC); + anSeq_PushStep_0Arg(arg0, 0.0f, func_803865F0); + anSeq_func_80288F78(arg0, 0.8f, 0xB1C075U); + anSeq_func_80288F78(arg0, 0.95f, 0xB1B375U); + anSeq_func_80288F78(arg0, 0.97f, 0x7F80EAU); func_80288EB0(arg0, 0.97f, 0, 5.0f, 0.8f); } -void func_8038A15C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288D08(arg0, 0.01f, func_803864AC); - func_80288D08(arg0, 0.01f, func_803865F0); - func_80288D40(arg0, 0.01f, func_80387364, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.15f, func_80387364, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.3f, func_80387364, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.5f, func_80387364, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.97f, 0x7F80EAU); +void func_8038A15C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_PushStep_0Arg(arg0, 0.01f, func_803864AC); + anSeq_PushStep_0Arg(arg0, 0.01f, func_803865F0); + anSeq_PushStep_1Arg(arg0, 0.01f, func_80387364, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.15f, func_80387364, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.3f, func_80387364, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.5f, func_80387364, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.97f, 0x7F80EAU); func_80288EB0(arg0, 0.97f, 0, 5.0f, 0.8f); } -void func_8038A254(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038A254(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.001f, arg1, 1, 1); - func_80288D40(arg0, 0.4f, func_8038702C, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.4f, func_80387170, reinterpret_cast(s32, arg1)); - func_8028913C(arg0, 3); - func_80288F78(arg0, 0.5f, 0x041B809CU); + anSeq_PushStep_1Arg(arg0, 0.4f, func_8038702C, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.4f, func_80387170, reinterpret_cast(s32, arg1)); + anSeq_setActivationFrameDelay(arg0, 3); + anSeq_func_80288F78(arg0, 0.5f, 0x041B809CU); } -void cutscenes_func_8038A2F0(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void cutscenes_func_8038A2F0(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.023f, arg1, 1, 0); } -void func_8038A334(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038A334(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 1, 0); func_80288EB0(arg0, 0.1f, 0, 3.0f, 0.8f); - func_80288F78(arg0, 0.1f, 0x9880C3U); + anSeq_func_80288F78(arg0, 0.1f, 0x9880C3U); func_80288EB0(arg0, 0.13f, 0, 3.0f, 0.8f); - func_80288F78(arg0, 0.13f, 0x9880C3U); + anSeq_func_80288F78(arg0, 0.13f, 0x9880C3U); func_80288EB0(arg0, 0.35f, 0, 3.0f, 0.8f); - func_80288F78(arg0, 0.35f, 0x9880C3U); + anSeq_func_80288F78(arg0, 0.35f, 0x9880C3U); func_80288EB0(arg0, 0.39f, 0, 3.0f, 0.8f); - func_80288F78(arg0, 0.391f, 0x9880C3U); + anSeq_func_80288F78(arg0, 0.391f, 0x9880C3U); func_80288EB0(arg0, 0.43f, 0, 3.0f, 0.8f); - func_80288F78(arg0, 0.43f, 0x9880C3U); + anSeq_func_80288F78(arg0, 0.43f, 0x9880C3U); func_80288EB0(arg0, 0.46f, 0, 3.0f, 0.8f); - func_80288F78(arg0, 0.46f, 0x9880C3U); + anSeq_func_80288F78(arg0, 0.46f, 0x9880C3U); func_80288EB0(arg0, 0.7f, 0, 3.0f, 0.8f); - func_80288F78(arg0, 0.7f, 0x9880C3U); + anSeq_func_80288F78(arg0, 0.7f, 0x9880C3U); func_80288EB0(arg0, 0.78f, 0, 3.0f, 0.8f); - func_80288F78(arg0, 0.78f, 0x9880C3U); + anSeq_func_80288F78(arg0, 0.78f, 0x9880C3U); func_80288EB0(arg0, 0.93f, 0, 3.0f, 0.8f); - func_80288F78(arg0, 0.93f, 0x9880C3U); + anSeq_func_80288F78(arg0, 0.93f, 0x9880C3U); } -void cutscenes_func_8038A54C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.23f, 0x013973A4U); - func_80288F78(arg0, 0.36f, 0x01398CA4U); - func_80288D08(arg0, 0.53f, func_80386668); - func_80288F78(arg0, 0.53f, 0x013980A4U); +void cutscenes_func_8038A54C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.23f, 0x013973A4U); + anSeq_func_80288F78(arg0, 0.36f, 0x01398CA4U); + anSeq_PushStep_0Arg(arg0, 0.53f, func_80386668); + anSeq_func_80288F78(arg0, 0.53f, 0x013980A4U); } -void func_8038A5C8(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.0511f, 0x6594EU); - func_80288F78(arg0, 0.53f, 0x6804EU); - func_8028913C(arg0, 1); - func_80288F78(arg0, 0.6636f, 0xFA4C7DU); - func_8028913C(arg0, 8); - func_80288F78(arg0, 0.6636f, 0xFA4C7DU); - func_8028913C(arg0, 0xF); - func_80288F78(arg0, 0.6636f, 0xFA4C7DU); - func_8028913C(arg0, 0x17); - func_80288F78(arg0, 0.6636f, 0xFA4C7DU); - func_8028913C(arg0, 0x1F); - func_80288F78(arg0, 0.6636f, 0xFA4C7DU); +void func_8038A5C8(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.0511f, 0x6594EU); + anSeq_func_80288F78(arg0, 0.53f, 0x6804EU); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_func_80288F78(arg0, 0.6636f, 0xFA4C7DU); + anSeq_setActivationFrameDelay(arg0, 8); + anSeq_func_80288F78(arg0, 0.6636f, 0xFA4C7DU); + anSeq_setActivationFrameDelay(arg0, 0xF); + anSeq_func_80288F78(arg0, 0.6636f, 0xFA4C7DU); + anSeq_setActivationFrameDelay(arg0, 0x17); + anSeq_func_80288F78(arg0, 0.6636f, 0xFA4C7DU); + anSeq_setActivationFrameDelay(arg0, 0x1F); + anSeq_func_80288F78(arg0, 0.6636f, 0xFA4C7DU); } -void func_8038A6D0(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 3); - func_80288F78(arg0, 0.05f, 0xFA4C7DU); - func_8028913C(arg0, 0xA); - func_80288F78(arg0, 0.05f, 0xFA467DU); +void func_8038A6D0(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 3); + anSeq_func_80288F78(arg0, 0.05f, 0xFA4C7DU); + anSeq_setActivationFrameDelay(arg0, 0xA); + anSeq_func_80288F78(arg0, 0.05f, 0xFA467DU); } -void func_8038A734(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.18f, 0xD3595DU); - func_80288F78(arg0, 0.31f, 0xD3605DU); - func_80288F78(arg0, 0.49f, 0xD3595DU); - func_80288F78(arg0, 0.65f, 0xD3605DU); - func_80288F78(arg0, 0.83f, 0xD3595DU); - func_80288F78(arg0, 0.99f, 0xD3605DU); +void func_8038A734(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.18f, 0xD3595DU); + anSeq_func_80288F78(arg0, 0.31f, 0xD3605DU); + anSeq_func_80288F78(arg0, 0.49f, 0xD3595DU); + anSeq_func_80288F78(arg0, 0.65f, 0xD3605DU); + anSeq_func_80288F78(arg0, 0.83f, 0xD3595DU); + anSeq_func_80288F78(arg0, 0.99f, 0xD3605DU); } -void func_8038A7E8(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288D08(arg0, 0.01f, func_803866E0); - func_80288F78(arg0, 0.23f, 0x013973A4U); - func_80288F78(arg0, 0.36f, 0x01398CA4U); - func_80288F78(arg0, 0.53f, 0x013980A4U); +void func_8038A7E8(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_PushStep_0Arg(arg0, 0.01f, func_803866E0); + anSeq_func_80288F78(arg0, 0.23f, 0x013973A4U); + anSeq_func_80288F78(arg0, 0.36f, 0x01398CA4U); + anSeq_func_80288F78(arg0, 0.53f, 0x013980A4U); } -void cutscenes_func_8038A864(vector(struct2s) **arg0, ActorMarker *arg1) { +void cutscenes_func_8038A864(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361CF4(arg0, 0.001f, arg1, 0.7f); - func_8028913C(arg0, 2); - func_80288D40(arg0, 0.7f, func_80386578, reinterpret_cast(s32, arg1)); - func_8028913C(arg0, 2); - func_80288F78(arg0, 0.7f, 0x0416736DU); - func_8028913C(arg0, 3); - func_80288F78(arg0, 0.6f, 0x0416736DU); - func_8028913C(arg0, 4); - func_80288F78(arg0, 0.6f, 0x0416736DU); + anSeq_setActivationFrameDelay(arg0, 2); + anSeq_PushStep_1Arg(arg0, 0.7f, func_80386578, reinterpret_cast(s32, arg1)); + anSeq_setActivationFrameDelay(arg0, 2); + anSeq_func_80288F78(arg0, 0.7f, 0x0416736DU); + anSeq_setActivationFrameDelay(arg0, 3); + anSeq_func_80288F78(arg0, 0.6f, 0x0416736DU); + anSeq_setActivationFrameDelay(arg0, 4); + anSeq_func_80288F78(arg0, 0.6f, 0x0416736DU); func_80361CAC(arg0, 0.6f, arg1, 0.7f); } -void func_8038A954(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.53f, 0x6995DU); - func_80288F78(arg0, 0.99f, 0x6B35DU); +void func_8038A954(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.53f, 0x6995DU); + anSeq_func_80288F78(arg0, 0.99f, 0x6B35DU); } -void func_8038A9A0(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.377f, 0x014280FAU); +void func_8038A9A0(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.377f, 0x014280FAU); } -void func_8038A9D0(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038A9D0(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80288EB0(arg0, 0.001f, 0, 6.0f, 0.4f); - func_80288F78(arg0, 0.001f, 0x9880B3U); + anSeq_func_80288F78(arg0, 0.001f, 0x9880B3U); func_80288EB0(arg0, 0.5069f, 0, 6.0f, 0.4f); - func_80288F78(arg0, 0.5069f, 0x988CB3U); + anSeq_func_80288F78(arg0, 0.5069f, 0x988CB3U); } -void func_8038AA64(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.05f, 0xFB999CU); - func_80288F78(arg0, 0.12f, 0x2809CU); - func_80288F78(arg0, 0.33f, 0x2869CU); - func_80288F78(arg0, 0.65f, 0xFB939CU); - func_80288F78(arg0, 0.75f, 0x2799CU); +void func_8038AA64(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.05f, 0xFB999CU); + anSeq_func_80288F78(arg0, 0.12f, 0x2809CU); + anSeq_func_80288F78(arg0, 0.33f, 0x2869CU); + anSeq_func_80288F78(arg0, 0.65f, 0xFB939CU); + anSeq_func_80288F78(arg0, 0.75f, 0x2799CU); } -void func_8038AAFC(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.28f, 0x908CFAU); - func_80288D08(arg0, 0.4f, func_80386750); - func_80288D08(arg0, 0.4f, func_803867D0); +void func_8038AAFC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.28f, 0x908CFAU); + anSeq_PushStep_0Arg(arg0, 0.4f, func_80386750); + anSeq_PushStep_0Arg(arg0, 0.4f, func_803867D0); } -void cutscenes_func_8038AB60(vector(struct2s) **arg0, ActorMarker *arg1) { +void cutscenes_func_8038AB60(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361D7C(arg0, 0.21f, arg1, 5, 0x96804EU); func_80361D7C(arg0, 0.43f, arg1, 5, 0x96864EU); func_80361D7C(arg0, 0.65f, arg1, 5, 0x96884EU); func_80361D7C(arg0, 0.8f, arg1, 5, 0x012D889CU); - func_80288D40(arg0, 0.98f, func_80387424, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.98f, func_80387424, reinterpret_cast(s32, arg1)); func_80361D7C(arg0, 0.99f, arg1, 5, 0x9680C3U); } -void func_8038AC54(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_8038AC54(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 2); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 5, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 6, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 7, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 9, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 8, 1); func_80361D7C(arg0, 0.06f, arg1, 5, 0x03EA809CU); func_80361D7C(arg0, 0.12f, arg1, 5, 0x4E9E9CU); @@ -1222,283 +1222,283 @@ void func_8038AC54(vector(struct2s) **arg0, ActorMarker *arg1) { func_80361D7C(arg0, 0.65f, arg1, 5, 0x4C809CU); } -void func_8038AF5C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_8038AF5C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 8, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 2); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 5, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 6, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 7, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 9, 0); } -void func_8038B098(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038B098(vector(AnSeqElement) **arg0, ActorMarker *arg1) { f32 sp34 = 0.8f; - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 2); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 5, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 6, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 7, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 9, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 8, 1); - func_8028913C(arg0, 1); - func_80288D84(arg0, 0.01f, func_80386A90, reinterpret_cast(s32,arg1), reinterpret_cast(s32, sp34)); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_2Arg(arg0, 0.01f, func_80386A90, reinterpret_cast(s32,arg1), reinterpret_cast(s32, sp34)); } -void func_8038B214(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288FD8(arg0, 0.03f, 0xA40000U); - func_8028913C(arg0, 1); +void func_8038B214(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288FD8(arg0, 0.03f, 0xA40000U); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 2); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 5, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 6, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 7, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 9, 1); - func_80288F78(arg0, 0.21f, 0x3780C3U); - func_80288F78(arg0, 0.04f, 0x018F80FAU); + anSeq_func_80288F78(arg0, 0.21f, 0x3780C3U); + anSeq_func_80288F78(arg0, 0.04f, 0x018F80FAU); func_80288EB0(arg0, 0.59f, 0, 10.0f, 0.95f); - func_80288F78(arg0, 0.59f, 0x1180C3U); - func_80288F78(arg0, 0.59f, 0xD80C3U); - func_80288F78(arg0, 0.6f, 0x3680C3U); - func_80288FA8(arg0, 0.99f, 0xA4); + anSeq_func_80288F78(arg0, 0.59f, 0x1180C3U); + anSeq_func_80288F78(arg0, 0.59f, 0xD80C3U); + anSeq_func_80288F78(arg0, 0.6f, 0x3680C3U); + anSeq_func_80288FA8(arg0, 0.99f, 0xA4); } -void func_8038B404(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288FD8(arg0, 0.03f, 0xA70000U); - func_8028913C(arg0, 1); +void func_8038B404(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288FD8(arg0, 0.03f, 0xA70000U); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 4, 2); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 5, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 6, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 7, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.01f, arg1, 9, 1); func_80361D7C(arg0, 0.4f, arg1, 5, 0x218CFAU); func_80361D7C(arg0, 0.49f, arg1, 5, 0x2193FAU); func_80361D7C(arg0, 0.58f, arg1, 5, 0x2195FAU); func_80361D7C(arg0, 0.66f, arg1, 5, 0x6280FAU); - func_80288FA8(arg0, 0.73f, 0xA7); - func_80288FD8(arg0, 0.73f, 0x570000U); + anSeq_func_80288FA8(arg0, 0.73f, 0xA7); + anSeq_func_80288FD8(arg0, 0.73f, 0x570000U); } -void func_8038B5FC(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); +void func_8038B5FC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.0f, arg1, 3, 0); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.0f, arg1, 4, 2); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.0f, arg1, 5, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.0f, arg1, 6, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.0f, arg1, 7, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.0f, arg1, 9, 1); - func_8028913C(arg0, 1); + anSeq_setActivationFrameDelay(arg0, 1); func_80361C64(arg0, 0.0f, arg1, 8, 1); } -void func_8038B744(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038B744(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 6, 0); func_80361C64(arg0, 0.01f, arg1, 4, 0); func_80361C64(arg0, 0.01f, arg1, 5, 0); } -void func_8038B7B4(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038B7B4(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 6, 0); func_80361C64(arg0, 0.01f, arg1, 4, 0); func_80361C64(arg0, 0.01f, arg1, 5, 0); - func_80288FD8(arg0, 0.03f, 0xA50000); - func_80288EF8(arg0, 0.07f, 2, 5.0f); - func_80288F78(arg0, 0.1f, 0x013159EAU); - func_80288F38(arg0, 0.51f, 2, 0.8f); - func_80288F78(arg0, 0.97f, 0x1F809CU); - func_80288FA8(arg0, 0.99f, 0xA5); + anSeq_func_80288FD8(arg0, 0.03f, 0xA50000); + anSeq_func_80288EF8(arg0, 0.07f, 2, 5.0f); + anSeq_func_80288F78(arg0, 0.1f, 0x013159EAU); + anSeq_func_80288F38(arg0, 0.51f, 2, 0.8f); + anSeq_func_80288F78(arg0, 0.97f, 0x1F809CU); + anSeq_func_80288FA8(arg0, 0.99f, 0xA5); } -void func_8038B8B8(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038B8B8(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 6, 0); func_80361C64(arg0, 0.01f, arg1, 4, 1); func_80361C64(arg0, 0.01f, arg1, 5, 1); - func_80288F78(arg0, 0.09f, 0x288075U); - func_80288F78(arg0, 0.12f, 0x288075U); - func_80288F78(arg0, 0.15f, 0x287975U); - func_80288F78(arg0, 0.18f, 0x287975U); - func_80288D40(arg0, 0.4f, func_803878A4, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.09f, 0x288075U); + anSeq_func_80288F78(arg0, 0.12f, 0x288075U); + anSeq_func_80288F78(arg0, 0.15f, 0x287975U); + anSeq_func_80288F78(arg0, 0.18f, 0x287975U); + anSeq_PushStep_1Arg(arg0, 0.4f, func_803878A4, reinterpret_cast(s32, arg1)); } -void func_8038B9B4(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038B9B4(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 6, 0); func_80361C64(arg0, 0.01f, arg1, 4, 1); func_80361C64(arg0, 0.01f, arg1, 5, 1); - func_80288F78(arg0, 0.068f, 0x6180C3U); - func_80288F78(arg0, 0.66f, 0x1F8075U); + anSeq_func_80288F78(arg0, 0.068f, 0x6180C3U); + anSeq_func_80288F78(arg0, 0.66f, 0x1F8075U); func_80288EB0(arg0, 0.66f, 0, 20.0f, 0.8f); - func_80288D40(arg0, 0.7f, func_803878A4, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.76f, 0x1F8075U); - func_80288D40(arg0, 0.77f, cutscenes_func_803879E0, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.86f, cutscenes_func_803879E0, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.7f, func_803878A4, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.76f, 0x1F8075U); + anSeq_PushStep_1Arg(arg0, 0.77f, cutscenes_func_803879E0, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.86f, cutscenes_func_803879E0, reinterpret_cast(s32, arg1)); func_80288EB0(arg0, 0.86f, 0, 20.0f, 0.9f); - func_80288D40(arg0, 0.96f, cutscenes_func_803879E0, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.96f, cutscenes_func_803879E0, reinterpret_cast(s32, arg1)); } -void func_8038BB30(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038BB30(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 6, 0); func_80361C64(arg0, 0.01f, arg1, 4, 1); func_80361C64(arg0, 0.01f, arg1, 5, 1); - func_80288F78(arg0, 0.3f, 0x698075U); - func_80288F78(arg0, 0.6f, 0x698675U); - func_80288F78(arg0, 0.94f, 0x697975U); + anSeq_func_80288F78(arg0, 0.3f, 0x698075U); + anSeq_func_80288F78(arg0, 0.6f, 0x698675U); + anSeq_func_80288F78(arg0, 0.94f, 0x697975U); } -void func_8038BBF8(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038BBF8(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 6, 1); - func_80288F78(arg0, 0.5f, 0x21809CU); + anSeq_func_80288F78(arg0, 0.5f, 0x21809CU); func_80288EB0(arg0, 0.5f, 0, 5.0f, 0.9f); - func_80288F78(arg0, 0.56f, 0x21839CU); + anSeq_func_80288F78(arg0, 0.56f, 0x21839CU); func_80288EB0(arg0, 0.56f, 0, 5.0f, 0.9f); - func_80288F78(arg0, 0.65f, 0x217C9CU); + anSeq_func_80288F78(arg0, 0.65f, 0x217C9CU); func_80288EB0(arg0, 0.65f, 0, 5.0f, 0.9f); - func_80288F78(arg0, 0.76f, 0xD3739CU); - func_80288F78(arg0, 0.83f, 0xD3799CU); - func_80288F78(arg0, 0.9f, 0xD3669CU); + anSeq_func_80288F78(arg0, 0.76f, 0xD3739CU); + anSeq_func_80288F78(arg0, 0.83f, 0xD3799CU); + anSeq_func_80288F78(arg0, 0.9f, 0xD3669CU); } -void func_8038BD2C(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038BD2C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 6, 0); func_80361C64(arg0, 0.01f, arg1, 4, 0); func_80361C64(arg0, 0.01f, arg1, 5, 0); } -void func_8038BD9C(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038BD9C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 6, 1); func_80361C64(arg0, 0.01f, arg1, 4, 1); func_80361C64(arg0, 0.01f, arg1, 5, 1); - func_80288F78(arg0, 0.85f, 0x666C3U); + anSeq_func_80288F78(arg0, 0.85f, 0x666C3U); } -void func_8038BE30(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038BE30(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 6, 1); - func_80288F78(arg0, 0.32f, 0x03F280C3U); - func_80288F78(arg0, 0.4f, 0x1F8055U); - func_80288F78(arg0, 0.44f, 0x03F280C3U); - func_80288F78(arg0, 0.5f, 0x1F8655U); - func_80288F78(arg0, 0.54f, 0x03F280C3U); - func_80288F78(arg0, 0.6f, 0x1F7955U); - func_80288F78(arg0, 0.82f, 0x280FAU); - func_80288F78(arg0, 0.87f, 0x7805DU); - func_80288F78(arg0, 0.92f, 0x7865DU); - func_80288F78(arg0, 0.96f, 0x7805DU); + anSeq_func_80288F78(arg0, 0.32f, 0x03F280C3U); + anSeq_func_80288F78(arg0, 0.4f, 0x1F8055U); + anSeq_func_80288F78(arg0, 0.44f, 0x03F280C3U); + anSeq_func_80288F78(arg0, 0.5f, 0x1F8655U); + anSeq_func_80288F78(arg0, 0.54f, 0x03F280C3U); + anSeq_func_80288F78(arg0, 0.6f, 0x1F7955U); + anSeq_func_80288F78(arg0, 0.82f, 0x280FAU); + anSeq_func_80288F78(arg0, 0.87f, 0x7805DU); + anSeq_func_80288F78(arg0, 0.92f, 0x7865DU); + anSeq_func_80288F78(arg0, 0.96f, 0x7805DU); } -void func_8038BF5C(vector(struct2s) **arg0, ActorMarker *arg1) { +void func_8038BF5C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 4, 1); - func_8028913C(arg0, 1); - func_80288D08(arg0, 0.05f, func_80386924); - func_80288D40(arg0, 0.05f, func_80387B58, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.15f, func_80387B58, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.25f, func_80387B58, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.35f, func_80387B58, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.45f, func_80387B58, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.55f, func_80387B58, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.65f, func_80387B58, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.75f, func_80387B58, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.85f, func_80387B58, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.95f, func_80387B58, reinterpret_cast(s32, arg1)); - func_8028913C(arg0, 0x14); - func_80288D08(arg0, 0.05f, cutscenes_func_80386A00); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_0Arg(arg0, 0.05f, func_80386924); + anSeq_PushStep_1Arg(arg0, 0.05f, func_80387B58, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.15f, func_80387B58, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.25f, func_80387B58, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.35f, func_80387B58, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.45f, func_80387B58, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.55f, func_80387B58, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.65f, func_80387B58, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.75f, func_80387B58, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.85f, func_80387B58, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.95f, func_80387B58, reinterpret_cast(s32, arg1)); + anSeq_setActivationFrameDelay(arg0, 0x14); + anSeq_PushStep_0Arg(arg0, 0.05f, cutscenes_func_80386A00); } -void cutscenes_func_8038C0DC(vector(struct2s) **arg0, ActorMarker *arg1) { +void cutscenes_func_8038C0DC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { func_80361C64(arg0, 0.01f, arg1, 4, 1); - func_8028913C(arg0, 1); - func_80288D08(arg0, 0.02f, func_80386990); - func_80288F78(arg0, 0.25f, 0x8C80C3U); - func_80288F78(arg0, 0.66f, 0x8C86C3U); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_0Arg(arg0, 0.02f, func_80386990); + anSeq_func_80288F78(arg0, 0.25f, 0x8C80C3U); + anSeq_func_80288F78(arg0, 0.66f, 0x8C86C3U); } -void cutscenes_func_8038C16C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.2f, 0x17808CU); +void cutscenes_func_8038C16C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.2f, 0x17808CU); } -void func_8038C19C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); - func_80288D08(arg0, 0.02f, cutscenes_func_803863F0); - func_8028913C(arg0, 1); - func_80288D08(arg0, 0.97f, func_80386410); +void func_8038C19C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_0Arg(arg0, 0.02f, cutscenes_func_803863F0); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_0Arg(arg0, 0.97f, func_80386410); } -void func_8038C200(vector(struct2s) **arg0, ActorMarker *arg1) { - func_8028913C(arg0, 1); - func_80288D08(arg0, 0.02f, func_8038645C); - func_8028913C(arg0, 1); - func_80288D08(arg0, 0.97f, func_80386484); +void func_8038C200(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_0Arg(arg0, 0.02f, func_8038645C); + anSeq_setActivationFrameDelay(arg0, 1); + anSeq_PushStep_0Arg(arg0, 0.97f, func_80386484); } -void func_8038C264(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.2f, (SFX_98_DEAF_THUD << 0x10) | (0x80 << 8) | 0x8C); - func_80288F78(arg0, 0.27f, (SFX_98_DEAF_THUD << 0x10) | (0x86 << 8) | 0x8C); - func_80288F78(arg0, 0.5f, (SFX_98_DEAF_THUD << 0x10) | (0x79 << 8) | 0x8C); - func_80288F78(arg0, 0.65f, (SFX_98_DEAF_THUD << 0x10) | (0x86 << 8) | 0x8C); - func_80288F78(arg0, 0.9f, (SFX_98_DEAF_THUD << 0x10) | (0x80 << 8) | 0x8C); - func_80288F78(arg0, 0.95f, (SFX_98_DEAF_THUD << 0x10) | (0x79 << 8) | 0x8C); +void func_8038C264(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.2f, (SFX_98_DEAF_THUD << 0x10) | (0x80 << 8) | 0x8C); + anSeq_func_80288F78(arg0, 0.27f, (SFX_98_DEAF_THUD << 0x10) | (0x86 << 8) | 0x8C); + anSeq_func_80288F78(arg0, 0.5f, (SFX_98_DEAF_THUD << 0x10) | (0x79 << 8) | 0x8C); + anSeq_func_80288F78(arg0, 0.65f, (SFX_98_DEAF_THUD << 0x10) | (0x86 << 8) | 0x8C); + anSeq_func_80288F78(arg0, 0.9f, (SFX_98_DEAF_THUD << 0x10) | (0x80 << 8) | 0x8C); + anSeq_func_80288F78(arg0, 0.95f, (SFX_98_DEAF_THUD << 0x10) | (0x79 << 8) | 0x8C); } -void func_8038C314(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.14f, 0x3F803EU); - func_80288F78(arg0, 0.75f, 0x40803EU); +void func_8038C314(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.14f, 0x3F803EU); + anSeq_func_80288F78(arg0, 0.75f, 0x40803EU); } -void func_8038C35C(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.09f, 0xD0668CU); - func_80288F78(arg0, 0.25f, 0xD0338CU); - func_80288F78(arg0, 0.84f, 0x3F868CU); +void func_8038C35C(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.09f, 0xD0668CU); + anSeq_func_80288F78(arg0, 0.25f, 0xD0338CU); + anSeq_func_80288F78(arg0, 0.84f, 0x3F868CU); } -void func_8038C3BC(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288FD8(arg0, 0.01f, 0x430000); - func_80288D08(arg0, 0.4f, func_80386434); +void func_8038C3BC(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288FD8(arg0, 0.01f, 0x430000); + anSeq_PushStep_0Arg(arg0, 0.4f, func_80386434); } -void func_8038C404(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288F78(arg0, 0.74f, 0x1580FAU); - func_80288D40(arg0, 0.74f, func_80387FC0, reinterpret_cast(s32, arg1)); +void func_8038C404(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_func_80288F78(arg0, 0.74f, 0x1580FAU); + anSeq_PushStep_1Arg(arg0, 0.74f, func_80387FC0, reinterpret_cast(s32, arg1)); } -void cutscenes_func_8038C454(vector(struct2s) **arg0, ActorMarker *arg1) { - func_80288D40(arg0, 0.2f, func_803881CC, reinterpret_cast(s32, arg1)); - func_80288F78(arg0, 0.2f, 0x1E808CU); - func_80288D40(arg0, 0.3f, func_803881CC, reinterpret_cast(s32, arg1)); - func_80288D40(arg0, 0.35f, func_803881CC, reinterpret_cast(s32, arg1)); +void cutscenes_func_8038C454(vector(AnSeqElement) **arg0, ActorMarker *arg1) { + anSeq_PushStep_1Arg(arg0, 0.2f, func_803881CC, reinterpret_cast(s32, arg1)); + anSeq_func_80288F78(arg0, 0.2f, 0x1E808CU); + anSeq_PushStep_1Arg(arg0, 0.3f, func_803881CC, reinterpret_cast(s32, arg1)); + anSeq_PushStep_1Arg(arg0, 0.35f, func_803881CC, reinterpret_cast(s32, arg1)); } /* .h */