Merge branch 'fight_docu' into 'master'

Fight and other docu See merge request banjo.decomp/banjo-kazooie!85
2024-10-08 05:54:59 +00:00
parent ea4b9ab1a6 cd336b9b58
commit 2710315cb0
223 changed files with 2692 additions and 2652 deletions
--- a/decompressed.pal.yaml
+++ b/decompressed.pal.yaml
@@ -2241,7 +2241,7 @@ segments:
 #   # follows_vram: core2
 #   # exclusive_ram_id: overlay
 #   # subsegments:
-#   # - [0x10A6FD0, c, code_0] #DONE
+#   # - [0x10A6FD0, c, fight] #DONE
 #   # - [0x10A7150, c, chfinalboss] 
 #   # - [0x10ACEA0, c, chbossjinjo] #DONE
 #   # - [0x10ADE60, c, chbossjinjobase] #DONE
@@ -2272,7 +2272,7 @@ segments:
 #   # - [0x10B31F0, .rodata, code_9850]
 #   # - [0x10B3200, .rodata, chjinjonator]
 #   # - [0x10B3310, .rodata, chbossshadow]
-#   # - [0x10B3320, .bss, code_0]
+#   # - [0x10B3320, .bss, fight]
 #   # - [0x10B3320, .bss, chfinalboss]
 #   # - [0x10B3320, .bss, chspellfireball]
 #   # - [0x10B3320, .bss, chjinjonator]
--- a/decompressed.us.v10.yaml
+++ b/decompressed.us.v10.yaml
@@ -2239,7 +2239,7 @@ segments:
  follows_vram: core2
  exclusive_ram_id: overlay
  subsegments:
-  - [0x10A6FD0, c, code_0] #DONE
+  - [0x10A6FD0, c, fight] #DONE
  - [0x10A7150, c, chfinalboss] 
  - [0x10ACEA0, c, chbossjinjo] #DONE
  - [0x10ADE60, c, chbossjinjobase] #DONE
@@ -2270,7 +2270,7 @@ segments:
  - [0x10B31F0, .rodata, chgreenblast]
  - [0x10B3200, .rodata, chjinjonator]
  - [0x10B3310, .rodata, chbossshadow]
-  - [0x10B3320, .bss, code_0]
+  - [0x10B3320, .bss, fight]
  - [0x10B3320, .bss, chfinalboss]
  - [0x10B3320, .bss, chspellfireball]
  - [0x10B3320, .bss, chjinjonator]
--- a/include/core2/particle.h
+++ b/include/core2/particle.h
@@ -15,7 +15,7 @@ void particleEmitter_setParticleCallback(ParticleEmitter *this, void (*arg1)(Par
 void func_802EFA20(ParticleEmitter *this, f32, f32);
 void func_802EFA34(ParticleEmitter *this, f32);
 void func_802EFA40(ParticleEmitter *this, f32 (*)[3]);
-void func_802EFA78(ParticleEmitter *this, s32 arg1);
+void particleEmitter_func_802EFA78(ParticleEmitter *this, s32 arg1);
 void func_802EFF5C(ParticleEmitter *this, f32, f32, f32);
 void func_802EFF7C(ParticleEmitter *this, f32, f32, f32);
 void func_802EFF9C(ParticleEmitter *this, f32);
--- a/include/enums.h
+++ b/include/enums.h
@@ -2092,7 +2092,8 @@ enum actor_e
    ACTOR_3A1_STONE_JINJO,
    ACTOR_3A2_JINJO_STATUE_BASE,
-    ACTOR_3A5_BOSS_JINJO_ORANGE = 0x3A5,
+    ACTOR_3A4_BOSS_JINJO_BASE_IDX = 0x3A4,
    ACTOR_3A5_BOSS_JINJO_ORANGE,
    ACTOR_3A6_BOSS_JINJO_GREEN,
    ACTOR_3A7_BOSS_JINJO_PINK,
    ACTOR_3A8_BOSS_JINJO_YELLOW,
@@ -2101,6 +2102,7 @@ enum actor_e
    ACTOR_3AA_GRUNTY_SPELL_GREEN_ATTACK = 0x3AA,
    ACTOR_3AB_GRUNTY_SPELL_BARRIER,
    ACTOR_3AC_JINJONATOR,
    ACTOR_3AD_JINJONATOR_STATUE_BASE_ACTIVATOR,
    ACTOR_3AF_GRUNTY_SHADOW = 0x3AF,
@@ -3428,10 +3430,10 @@ enum asset_e
    ASSET_553_MODEL_BROOMSTICK_PIECE_SHORT,
    ASSET_554_MODEL_BROOMSTICK_PIECE_LONG,
    ASSET_555_MODEL_BROOMSTICK_PIECE_EYE,
-    // 556 Blast When Yellow Jinjo Hits Gruntilda
+    ASSET_556_MODEL_YELLOW_JINJO_BLAST,
-    // 557 Blast When Orange Jinjo Hits Gruntilda
+    ASSET_557_MODEL_ORANGE_JINJO_BLAST,
-    // 558 Blast When Green Jinjo Hits Gruntilda
+    ASSET_558_MODEL_GREEN_JINJO_BLAST,
-    // 559 Blast When Pink Jinjo Hits Gruntilda
+    ASSET_559_MODEL_PINK_JINJO_BLAST,
    // 55a BK World Entry/Exit Pad
    // 55b FP Boggy's Igloo
    ASSET_55C_MODEL_PRESS_START_OVERLAY = 0x55C,
@@ -4260,6 +4262,48 @@ enum asset_e
    ASSET_10E7_TEXT_UNKNOWN = 0x10E7,
    ASSET_10ED_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_1 = 0x10ED,
    ASSET_10EE_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_2,
    ASSET_10EF_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_3,
    ASSET_10F0_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_4,
    ASSET_10F1_TEXT_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_5,
    ASSET_10F2_TEXT_FINALBOSS_PHASE_1_OPTION_1 = 0x10F2,
    ASSET_10F3_TEXT_FINALBOSS_PHASE_1_OPTION_2,
    ASSET_10F4_TEXT_FINALBOSS_PHASE_1_OPTION_3,
    ASSET_10F5_TEXT_FINALBOSS_PHASE_1_OPTION_4,
    ASSET_10F6_TEXT_FINALBOSS_PHASE_1_OPTION_5,
    ASSET_110B_TEXT_FINALBOSS_PHASE_2_OPTION_1 = 0x110B,
    ASSET_110C_TEXT_FINALBOSS_PHASE_2_OPTION_2,
    ASSET_110D_TEXT_FINALBOSS_PHASE_2_OPTION_3,
    ASSET_110E_TEXT_FINALBOSS_PHASE_2_OPTION_4,
    ASSET_110F_TEXT_FINALBOSS_PHASE_2_OPTION_5,
    ASSET_111D_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_1 = 0x111D,
    ASSET_111E_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_2,
    ASSET_111F_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_3,
    ASSET_1120_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_4,
    ASSET_1121_TEXT_FINALBOSS_PHASE_2_HIT_PLAYER_OPTION_5,
    ASSET_1122_TEXT_FINALBOSS_PHASE_3_OPTION_1 = 0x1122,
    ASSET_1123_TEXT_FINALBOSS_PHASE_3_OPTION_2,
    ASSET_1124_TEXT_FINALBOSS_PHASE_3_OPTION_3,
    ASSET_1125_TEXT_FINALBOSS_PHASE_3_OPTION_4,
    ASSET_1126_TEXT_FINALBOSS_PHASE_3_OPTION_5,
    ASSET_113B_TEXT_FINALBOSS_PHASE_4_OPTION_1 = 0x113B,
    ASSET_113C_TEXT_FINALBOSS_PHASE_4_OPTION_2,
    ASSET_113D_TEXT_FINALBOSS_PHASE_4_OPTION_3,
    ASSET_113E_TEXT_FINALBOSS_PHASE_4_OPTION_4,
    ASSET_113F_TEXT_FINALBOSS_PHASE_4_OPTION_5,
    ASSET_1154_TEXT_FINALBOSS_PHASE_5_OPTION_1 = 0x1154,
    ASSET_1155_TEXT_FINALBOSS_PHASE_5_OPTION_2,
    ASSET_1156_TEXT_FINALBOSS_PHASE_5_OPTION_3,
    ASSET_1157_TEXT_FINALBOSS_PHASE_5_OPTION_4,
    ASSET_1158_TEXT_FINALBOSS_PHASE_5_OPTION_5,
    ASSET_146B_MODEL_TTC_TREASURE_TROVE_COVE_OPA = 0x146B,
    ASSET_146C_MODEL_TTC_TREASURE_TROVE_COVE_XLU,
    ASSET_146D_MODEL_TTC_NIPPERS_SHELL_OPA,
--- a/include/functions.h
+++ b/include/functions.h
@@ -203,19 +203,19 @@ void func_8030DA44(u8);
 void particleEmitter_emitInVolume(ParticleEmitter *, f32[3], f32[3], s32);
 ParticleEmitter *particleEmitter_new(u32 capacity);
-void particleEmitter_setParticleAccelerationRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
+void particleEmitter_setAccelerationRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
-void func_802EF9F8(ParticleEmitter *, f32);
+void particleEmitter_func_802EF9F8(ParticleEmitter *, f32);
-void func_802EFA18(ParticleEmitter *, s32);
+void particleEmitter_func_802EFA18(ParticleEmitter *, s32);
 void particleEmitter_setFade(ParticleEmitter *, f32, f32);
 void particleEmitter_setDrawMode(ParticleEmitter *, s32);
 void particleEmitter_setStartingFrameRange(ParticleEmitter *this, s32 arg1, s32 arg2);
 void particleEmitter_setParticleFramerateRange(ParticleEmitter *, f32, f32);
-void particleEmitter_setParticleSpawnPositionRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
+void particleEmitter_setSpawnPositionRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
 void particleEmitter_setStartingScaleRange(ParticleEmitter *, f32, f32);
 void particleEmitter_setFinalScaleRange(ParticleEmitter *, f32, f32);
 void particleEmitter_setScaleAndLifetimeRanges(ParticleEmitter *, ParticleScaleAndLifetimeRanges *);
-void particleEmitter_setVelocityAndAccelerationRanges(ParticleEmitter *, struct41s *);
+void particleEmitter_setVelocityAndAccelerationRanges(ParticleEmitter *, ParticleSettingsVelocityAcceleration *);
-void particleEmitter_setPositionAndVelocityRanges(ParticleEmitter *this, struct42s *arg1);
+void particleEmitter_setPositionAndVelocityRanges(ParticleEmitter *this, ParticleSettingsVelocityPosition *arg1);
 void particleEmitter_setAngularVelocityRange(ParticleEmitter *, f32, f32, f32, f32, f32, f32);
 void particleEmitter_setSpawnIntervalRange(ParticleEmitter *, f32, f32);
 void particleEmitter_setParticleLifeTimeRange(ParticleEmitter *, f32, f32);
@@ -499,7 +499,7 @@ void actor_playAnimationOnce(Actor *);
 void actor_loopAnimation(Actor *);
 /* used in fight */
-void func_80326224(Actor *this);
+void actor_update_func_80326224(Actor *this);
 void func_802F9FD0(s32, f32, f32, f32);
 void func_80324D54(f32, enum sfx_e, f32, s32, f32 [3], f32, f32);
@@ -526,7 +526,7 @@ extern void subaddie_set_state_forward(Actor *, s32);
 extern BKModelBin *marker_loadModelBin(ActorMarker *this);
 extern Struct70s *func_8034C2C4(ActorMarker *marker, s32 arg1);
-extern void func_80326310(Actor *this);
+extern void func_80326310(Actor *this); // actor_setBlendStateFadeOut ??
 extern ActorMarker *marker_init(s32 *pos, MarkerDrawFunc draw_func, int arg2, int marker_id, int arg4);
 extern s32 asset_getFlag(enum asset_e arg0);
 extern void spawnableActorList_add(ActorInfo *arg0, Actor *(*arg1)(s32[3], s32, ActorInfo *, u32), u32 arg2);
--- a/include/prop.h
+++ b/include/prop.h
@@ -168,7 +168,7 @@ typedef struct actor_s{
    TUPLE(f32, unk1C);
    f32 actor_specific_1_f; //used in cheggs
    TUPLE(f32, velocity);
-    u32  unk38_31:10;
+    u32  unk38_31:10; // hit count for jinjo base in fight
    u32  unk38_21:9;
    u32  unk38_13:9;
    u32  stored_animctrl_playbackType_:3; //animctrlPlaybackType
@@ -230,10 +230,10 @@ typedef struct actor_s{
    u32 unkF4_22:1;
    u32 initialized:1; //unkF4_21;
    u32 unkF4_20:12;
-    u32 unkF4_8:9;
+    u32 unkF4_8:9; // jinjo id in final fight
    f32 stored_animctrl_subrangeMin; //animCtrl_SubRangeStart
    f32 stored_animctrl_subrangeMax; //animCtrl_SubRangeEnd
-    ActorMarker *unk100;
+    ActorMarker *unk100; // child actor marker ?
    ActorMarker *unk104;
    Struct62s *unk108;
    // void ( *unk108)(struct actorMarker_s *, s32); //saved from marker->collisionFunc
--- a/include/structs.h
+++ b/include/structs.h
@@ -384,41 +384,41 @@ typedef struct particle_scale_and_lifetime_ranges_s{
 } ParticleScaleAndLifetimeRanges;
 typedef struct struct_32_s{
-    f32 unk0[3];
+    f32 min[3];
-    f32 unkC[3];
+    f32 max[3];
-} struct32s;
+} ParticleSettingsVelocity;
 typedef struct struct_33_s{
-    f32 unk0[3];
+    f32 min[3];
-    f32 unkC[3];
+    f32 max[3];
-} struct33s;
+} ParticleSettingsAcceleration;
 typedef struct struct_34_s{
-    f32 unk0[3];
+    f32 min[3];
-    f32 unkC[3];
+    f32 max[3];
-} struct34s;
+} ParticleSettingsSpawnPosition;
 typedef struct struct_40_s{
-    ParticleScaleAndLifetimeRanges unk0;
+    ParticleScaleAndLifetimeRanges scale_and_lifetime;
-    f32 unk28;
+    f32 drawmode;
-    f32 unk2C;
+    f32 count;
-} struct40s;
+} ParticleSettingsScaleAndLifetimeDrawModeEmitCount;
 typedef struct struct_41_s{
-    struct32s unk0;
+    ParticleSettingsVelocity velocity;
-    struct33s unk18;
+    ParticleSettingsAcceleration acceleration;
-} struct41s;
+} ParticleSettingsVelocityAcceleration;
 typedef struct struct_42_s{
-    struct32s unk0;
+    ParticleSettingsVelocity velocity;
-    struct34s unk18;
+    ParticleSettingsSpawnPosition spawn_position;
-} struct42s;
+} ParticleSettingsVelocityPosition;
 typedef struct struct_43_s{
-    struct32s unk0;
+    ParticleSettingsVelocity velocity;
-    struct33s unk18;
+    ParticleSettingsAcceleration acceleration;
-    struct34s unk30;
+    ParticleSettingsSpawnPosition spawn_position;
-} struct43s;
+} ParticleSettingsVelocityAccelerationPosition;
 typedef struct {
    u32 unk0_31:11;
--- a/level_symbols.us.v10.txt
+++ b/level_symbols.us.v10.txt
@@ -17,7 +17,7 @@ lair_func_8038CD48 = 0x8038CD48;
 lair_func_8038CF18 = 0x8038CF18;
 lair_func_8038E0B0 = 0x8038E0B0;
 lair_func_8038E768 = 0x8038E768;
-fight_func_803863F0 = 0x803863F0;
+fight_addSpawnableActors = 0x803863F0;
 cutscene_func_8038C4E0 = 0x8038C4E0;
 chmole_learnedAllSpiralMountainAbilities = 0x802DA498;
--- a/src/BGS/ch/bigalligator.c
+++ b/src/BGS/ch/bigalligator.c
@@ -10,7 +10,7 @@ void func_8038FCB0(Actor *);
 /* .data */
 ActorInfo D_80390D70 = {MARKER_DC_BIG_ALLIGATOR, ACTOR_F6_BIG_ALLIGATOR, ASSET_397_MODEL_BIG_ALLIGATOR, 0x01, NULL,
-    func_8038FCB0, func_80326224, actor_draw,
+    func_8038FCB0, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
--- a/src/BGS/ch/code_8A60.c
+++ b/src/BGS/ch/code_8A60.c
@@ -18,8 +18,8 @@ ActorAnimationInfo D_80390B90[] = {
    {ASSET_D5_ANIM_SWITCH_UP, 0.5f},
    {ASSET_D5_ANIM_SWITCH_UP, 1e+8f}
 };
-ActorInfo D_80390BD8 = {MARKER_F5_BGS_ELEVATED_WALKWAY_SWITCH, ACTOR_14E_BGS_ELEVATED_WALKWAY_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH, 1, D_80390B90, func_8038EEA4, func_80326224, actor_draw, 0, 0, 0.0f, 0}; 
+ActorInfo D_80390BD8 = {MARKER_F5_BGS_ELEVATED_WALKWAY_SWITCH, ACTOR_14E_BGS_ELEVATED_WALKWAY_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH, 1, D_80390B90, func_8038EEA4, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0}; 
-ActorInfo D_80390BFC = {MARKER_FD_BGS_MAZE_SWITCH,             ACTOR_1FB_BGS_MAZE_SWITCH,             ASSET_3F5_BGS_JIGGY_SWITCH, 1, D_80390B90, func_8038F06C, func_80326224, actor_draw, 0, 0, 0.0f, 0};
+ActorInfo D_80390BFC = {MARKER_FD_BGS_MAZE_SWITCH,             ACTOR_1FB_BGS_MAZE_SWITCH,             ASSET_3F5_BGS_JIGGY_SWITCH, 1, D_80390B90, func_8038F06C, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
 void func_8038EE50(void){
    f32 sp24[3];
--- a/src/BGS/ch/croctus.c
+++ b/src/BGS/ch/croctus.c
@@ -31,7 +31,7 @@ ActorAnimationInfo D_803907CC[] = {
 };
 ActorInfo D_80390804 ={MARKER_FC_CROCTUS, ACTOR_1FA_CROCTUS, ASSET_425_MODEL_CROCTUS,
    1, D_803907CC,
-    func_80387FD4, func_80326224, func_8038860C,
+    func_80387FD4, actor_update_func_80326224, func_8038860C,
    0, 0, 0.0f, 0
 };
--- a/src/BGS/ch/leafboat.c
+++ b/src/BGS/ch/leafboat.c
@@ -88,7 +88,7 @@ void func_8038FD9C(Actor *this){
    switch(this->state){
        case 1:
            if(this->marker->unk2C_2)
-                func_80326224(this);
+                actor_update_func_80326224(this);
            this->marker->propPtr->unk8_3 = 1;
            this->unk1C[0] = 1.0f;
            this->alpha_124_19 = 0xff;
@@ -99,7 +99,7 @@ void func_8038FD9C(Actor *this){
        case 2:
            if(this->marker->unk2C_2)
-                func_80326224(this);
+                actor_update_func_80326224(this);
            this->marker->propPtr->unk8_3 = 1;
            this->unk1C[0] = 1.0f;
@@ -118,7 +118,7 @@ void func_8038FD9C(Actor *this){
            break;
        case 3:
            if (this->marker->unk2C_2) {
-                func_80326224(this);
+                actor_update_func_80326224(this);
            }
            this->marker->propPtr->unk8_3 = FALSE;
            this->unk1C[0] = 0.0f;
--- a/src/BGS/ch/mudhut.c
+++ b/src/BGS/ch/mudhut.c
@@ -27,7 +27,7 @@ ActorAnimationInfo D_80390B30[4] = {
 u32 D_80390B50[6] = {0xA, 0xA, 0xB, 0xA, 0xA, 0xC};
 ActorInfo D_80390B68 = {MARKER_D5_BGS_MUD_HUT, ACTOR_C_MUD_HUT, ASSET_7D8_MODEL_MM_HUT_TOP, 0x01, D_80390B30,
-    chmudhut_update, func_80326224, chmudhut_draw,
+    chmudhut_update, actor_update_func_80326224, chmudhut_draw,
    0, 0, 0.0f, 0
 };
--- a/src/BGS/ch/pinkegg.c
+++ b/src/BGS/ch/pinkegg.c
@@ -28,27 +28,27 @@ ActorAnimationInfo D_803906D8[4] = {
 };
 ActorInfo D_803906F8 = {MARKER_6E_PINK_EGG_LARGEST, ACTOR_5B_PINK_EGG_LARGEST, ASSET_380_MODEL_PINK_EGG_LARGEST, 0x01, D_803906D8,
-    chpinkegg_update, func_80326224, chpinkegg_draw,
+    chpinkegg_update, actor_update_func_80326224, chpinkegg_draw,
    0, 0x2CC, 6.0f, 0
 };
 ActorInfo D_8039071C = {MARKER_D6_PINK_EGG_LARGE, ACTOR_ED_PINK_EGG_LARGE, ASSET_381_MODEL_PINK_EGG_LARGE, 0x01, D_803906D8,
-    chpinkegg_update, func_80326224, chpinkegg_draw,
+    chpinkegg_update, actor_update_func_80326224, chpinkegg_draw,
    0, 0x2CC, 5.0f, 0
 };
 ActorInfo D_80390740 = {MARKER_D7_PINK_EGG_MEDIUM, ACTOR_EE_PINK_EGG_MEDIUM, ASSET_382_MODEL_PINK_EGG_MEDIUM, 0x01, D_803906D8,
-    chpinkegg_update, func_80326224, chpinkegg_draw,
+    chpinkegg_update, actor_update_func_80326224, chpinkegg_draw,
    0, 0x2CC, 4.0f, 0
 };
 ActorInfo D_80390764 = {MARKER_D8_PINK_EGG_SMALL, ACTOR_EF_PINK_EGG_SMALL, ASSET_383_MODEL_PINK_EGG_SMALL, 0x01, D_803906D8,
-    chpinkegg_update, func_80326224, chpinkegg_draw,
+    chpinkegg_update, actor_update_func_80326224, chpinkegg_draw,
    0, 0x2CC, 3.0f, 0
 };
 ActorInfo D_80390788 = {MARKER_D9_PINK_EGG_SMALLEST, ACTOR_F0_PINK_EGG_SMALLEST, ASSET_384_MODEL_PINK_EGG_SMALLEST, 0x01, D_803906D8,
-    chpinkegg_update, func_80326224, chpinkegg_draw,
+    chpinkegg_update, actor_update_func_80326224, chpinkegg_draw,
    0, 0x2CC, 2.0f, 0
 };
--- a/src/BGS/ch/tanktup.c
+++ b/src/BGS/ch/tanktup.c
@@ -29,7 +29,7 @@ ActorAnimationInfo BGS_D_80390C20[] = {
 };
 ActorInfo D_80390C40 = {MARKER_6C_TANKTUP, ACTOR_E8_TANKTUP, ASSET_3EE_TANKTUP, 0x01, BGS_D_80390C20,
-    func_8038F6A4, func_80326224, actor_draw,
+    func_8038F6A4, actor_update_func_80326224, actor_draw,
    0, 0x80, 0.0f, 0
 };
--- a/src/BGS/code_9750.c
+++ b/src/BGS/code_9750.c
@@ -17,7 +17,7 @@ ActorAnimationInfo D_80390C70[3] = {
 };
 ActorInfo D_80390C88 = {MARKER_6D_TANKTUP_LEG, ACTOR_E9_TANKTUP_LEG_FL, ASSET_3EF_MODEL_TANKTUP_LEG_FL, 0x01, D_80390C70,
-    func_8038FBF8, func_80326224, actor_draw,
+    func_8038FBF8, actor_update_func_80326224, actor_draw,
    0, 0x166, 0.0f, 0
 };
 u8 pad_80390CCC[4] = {0};
@@ -29,7 +29,7 @@ ActorAnimationInfo BGS_D_80390CB0[3] = {
 };
 ActorInfo D_80390CC8 = {MARKER_6D_TANKTUP_LEG, ACTOR_EA_TANKTUP_LEG_BL, ASSET_3F0_MODEL_TANKTUP_LEG_BL, 0x01, BGS_D_80390CB0,
-    func_8038FBF8, func_80326224, actor_draw,
+    func_8038FBF8, actor_update_func_80326224, actor_draw,
    0, 0x166, 0.0f, 0
 };
 u8 pad_80390CEC[4] = {0};
@@ -41,7 +41,7 @@ ActorAnimationInfo BGS_D_80390CF0[3] = {
 };
 ActorInfo D_80390D08 = {MARKER_6D_TANKTUP_LEG, ACTOR_EB_TANKTUP_LEG_FR, ASSET_3F1_MODEL_TANKTUP_LEG_FR, 0x01, BGS_D_80390CF0,
-    func_8038FBF8, func_80326224, actor_draw,
+    func_8038FBF8, actor_update_func_80326224, actor_draw,
    0, 0x166, 0.0f, 0
 };
 u8 pad_80390C2C[4] = {0};
@@ -53,7 +53,7 @@ ActorAnimationInfo D_80390C30[3] = {
 };
 ActorInfo D_80390D48 = {MARKER_6D_TANKTUP_LEG, ACTOR_EC_TANKTUP_LEG_BR, ASSET_3F2_MODEL_TANKTUP_LEG_BR, 0x01, D_80390C30,
-    func_8038FBF8, func_80326224, actor_draw,
+    func_8038FBF8, actor_update_func_80326224, actor_draw,
    0, 0x166, 0.0f, 0
 };
--- a/src/CC/ch/tooth.c
+++ b/src/CC/ch/tooth.c
@@ -29,14 +29,14 @@ Struct_CC_1120_0 D_80389B50[] = {
 ActorInfo D_80389B90 = {
    0x4E, ACTOR_101_CLANKER_TOKEN_TOOTH, ASSET_891_MODEL_CLANKER_TOKEN_TOOTH_OPEN, 
    0, NULL, 
-    chTooth_update, func_80326224, actor_draw, 
+    chTooth_update, actor_update_func_80326224, actor_draw, 
    0, 0, 0.0f, 0
 };
 ActorInfo D_80389BB4 = {
    0x4F, ACTOR_102_CLANKER_JIGGY_TOOTH, ASSET_893_MODEL_CLANKER_JIGGY_TOOTH_OPEN, 
    0, NULL, 
-    chTooth_update, func_80326224, actor_draw, 
+    chTooth_update, actor_update_func_80326224, actor_draw, 
    0, 0, 0.0f, 0
 };
--- a/src/CC/code_0.c
+++ b/src/CC/code_0.c
@@ -15,7 +15,7 @@ void func_803864D4(Actor *this);
 /* .data */
 ActorInfo D_80389AA0 = {
    MARKER_4B_CC_SCREW, ACTOR_43_CLACKER_SCREW, ASSET_890_MODEL_SCREW, 0, NULL, 
-    func_803864D4, func_80326224 , actor_draw,  
+    func_803864D4, actor_update_func_80326224 , actor_draw,  
    0, 0, 0.0f, 0
 };
--- a/src/CC/code_530.c
+++ b/src/CC/code_530.c
@@ -23,7 +23,7 @@ void func_80386B28(Actor* this);
 /* .data */
 ActorInfo D_80389AD0 = {
    MARKER_4A_CC_KEY, ACTOR_3C_CC_KEY, ASSET_429_MODEL_CC_KEY, 0, NULL,
-    func_80386B28, func_80326224, actor_draw,
+    func_80386B28, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
--- a/src/CC/code_BF0.c
+++ b/src/CC/code_BF0.c
@@ -14,14 +14,14 @@ void func_803870F8(Actor *this);
 extern ActorInfo D_80389B00 = {
    MARKER_4C_CLANKER_TOKEN_TOOTH_EXT, ACTOR_44_CLANKER_TOKEN_TOOTH_EXTERIOR, ASSET_309_MODEL_CLANKER_TOKEN_TOOTH_EXTERIOR, 
    0, NULL,
-    func_803870F8, func_80326224, actor_draw,
+    func_803870F8, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
 extern ActorInfo D_80389B24 = {
    MARKER_4D_CLANKER_JIGGY_TOOTH_EXT, ACTOR_45_CLANKER_JIGGY_TOOTH_EXTERIOR, ASSET_30A_MODEL_CLANKER_JIGGY_TOOTH_EXTERIOR, 
    0, NULL,
-    func_803870F8, func_80326224, actor_draw,
+    func_803870F8, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
--- a/src/CCW/ch/grublinhood.c
+++ b/src/CCW/ch/grublinhood.c
@@ -57,13 +57,13 @@ ActorAnimationInfo chGrublinHood_animations[] = {
 ActorInfo chGrublinHood = {
    MARKER_1E2_GRUBLIN_HOOD, ACTOR_375_GRUBLIN_HOOD, ASSET_52C_MODEL_GRUBLIN_HOOD,
    0x1, chGrublinHood_animations,
-    chgrublinhood_update, func_80326224, chgrublinhood_draw,
+    chgrublinhood_update, actor_update_func_80326224, chgrublinhood_draw,
    2500, 0, 1.0f, 0
 };
 /* .code */
 void __chgrublinhood_emitHat(ParticleEmitter *pCtrl, Actor *actor, enum asset_e model_id){
-    static struct43s D_8038F9AC = {
+    static ParticleSettingsVelocityAccelerationPosition D_8038F9AC = {
        {{-200.0f,   200.0f, -200.0f}, {200.0f,   400.0f, 200.0f}},
        {{   0.0f, -1800.0f,    0.0f}, {  0.0f, -1800.0f,   0.0f}},
        {{ -50.0f,   200.0f,  -50.0f}, { 50.0f,   400.0f,  50.0f}}
@@ -74,7 +74,7 @@ void __chgrublinhood_emitHat(ParticleEmitter *pCtrl, Actor *actor, enum asset_e
        -600.0f, -600.0f, -600.0f, 
         600.0f,  600.0f,  600.0f
    );
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8038F9AC);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8038F9AC);
    particleEmitter_emitN(pCtrl, 1);
 }
--- a/src/CCW/ch/vacationtexttrigger.c
+++ b/src/CCW/ch/vacationtexttrigger.c
@@ -11,7 +11,7 @@ void chVacationTextTrigger_update(Actor* this);
 ActorInfo gChVacationTextTrigger = { 
    MARKER_1E3_VACATION_TEXT_TRIGGER, ACTOR_374_VACATION_TEXT_TRIGGER, 0x0,
    0x0, NULL,
-    chVacationTextTrigger_update, func_80326224, func_80325340, 
+    chVacationTextTrigger_update, actor_update_func_80326224, func_80325340, 
    0, 0, 0.0f, 0
 };
--- a/src/CCW/code_2270.c
+++ b/src/CCW/code_2270.c
@@ -208,7 +208,7 @@ void chGobiCCW_update(Actor *this) {
    }
    if (this->state == 6) {
-        func_80326224(this);
+        actor_update_func_80326224(this);
        if (0.99 < (f64) this->unk48) {
            CCW_func_8038868C(this, 7);
        }
--- a/src/CCW/code_2B00.c
+++ b/src/CCW/code_2B00.c
@@ -29,14 +29,14 @@ ActorAnimationInfo D_8038ED20[] = {
    {ASSET_D4_ANIM_SWITCH_DOWN, 100000000.0f}
 };
-ActorInfo D_8038ED50 = { 0x133, 0x1E3, 0x52E, 0x1,       NULL, func_80389268, func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0};
+ActorInfo D_8038ED50 = { 0x133, 0x1E3, 0x52E, 0x1,       NULL, func_80389268, actor_update_func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0};
-ActorInfo D_8038ED74 = { 0x132, 0x1E2, 0x4F5, 0x5, D_8038ED20, func_80388FD4, func_80326224, actor_draw, 0, 0, 0.0f, 0};
+ActorInfo D_8038ED74 = { 0x132, 0x1E2, 0x4F5, 0x5, D_8038ED20, func_80388FD4, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
-ActorInfo D_8038ED98 = { 0x131, 0x16D, 0x52E, 0x1,       NULL, func_80389268, func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0};
+ActorInfo D_8038ED98 = { 0x131, 0x16D, 0x52E, 0x1,       NULL, func_80389268, actor_update_func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0};
-ActorInfo D_8038EDBC = { 0x130, 0x16C, 0x4F6, 0x5, D_8038ED20, func_80388FD4, func_80326224, actor_draw, 0, 0, 0.0f, 0};
+ActorInfo D_8038EDBC = { 0x130, 0x16C, 0x4F6, 0x5, D_8038ED20, func_80388FD4, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
-ActorInfo D_8038EDE0 = { 0x12F, 0x16B, 0x52E, 0x1,       NULL, func_80389268, func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0};
+ActorInfo D_8038EDE0 = { 0x12F, 0x16B, 0x52E, 0x1,       NULL, func_80389268, actor_update_func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0};
-ActorInfo D_8038EE04 = { 0x12E, 0x16A, 0x4F7, 0x5, D_8038ED20, func_80388FD4, func_80326224, actor_draw, 0, 0, 0.0f, 0};
+ActorInfo D_8038EE04 = { 0x12E, 0x16A, 0x4F7, 0x5, D_8038ED20, func_80388FD4, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
-ActorInfo D_8038EE28 = { 0x12D, 0x169, 0x52E, 0x1,       NULL, func_80389268, func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0};
+ActorInfo D_8038EE28 = { 0x12D, 0x169, 0x52E, 0x1,       NULL, func_80389268, actor_update_func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0};
-ActorInfo D_8038EE4C = { 0x12C, 0x168, 0x4F8, 0x5, D_8038ED20, func_80388FD4, func_80326224, actor_draw, 0, 0, 0.0f, 0};
+ActorInfo D_8038EE4C = { 0x12C, 0x168, 0x4F8, 0x5, D_8038ED20, func_80388FD4, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
 /* .code */
 s32 func_80388EF0(Actor *this){
--- a/src/CCW/code_4960.c
+++ b/src/CCW/code_4960.c
@@ -76,7 +76,7 @@ void func_8038AEBC(Actor *this) {
        }
    }
    if (this->state == 2) {
-        func_80326224(this);
+        actor_update_func_80326224(this);
        skeletalAnim_getProgressRange(this->unk148, &sp38, &sp34);
        for(iPtr = &D_8038F254[0]; iPtr->unk0 > 0.0f; iPtr++){
             if ((sp38 < iPtr->unk0) && (iPtr->unk0 <= sp34)) {
@@ -92,7 +92,7 @@ void func_8038AEBC(Actor *this) {
        }
    }
    if (this->state == 3) {
-        func_80326224(this);
+        actor_update_func_80326224(this);
        skeletalAnim_getProgressRange(this->unk148, &sp30, &sp2C);
        if ((sp30 <= 0.5) && (sp2C >= 0.5)) {
            jiggy_spawn(JIGGY_49_CCW_EYRIE, this->position);
--- a/src/CCW/code_5540.c
+++ b/src/CCW/code_5540.c
@@ -161,7 +161,7 @@ void chnabnut_update(Actor *this) {
        chnabnut_setState(this, NABNUT_STATE_5_EXIT);
    }
    if (this->state == NABNUT_STATE_5_EXIT) {
-        func_80326224(this);
+        actor_update_func_80326224(this);
        func_8028FC8C(this->position);
        if (0.99 < this->unk48) {
            chnabnut_setState(this, NABNUT_STATE_6_DESPAWN);
--- a/src/CCW/code_6620.c
+++ b/src/CCW/code_6620.c
@@ -47,7 +47,7 @@ void func_8038CA10(ActorMarker *marker) {
            pCtrl = func_802EDD8C(local->unk4, 0.0f, this->position[1] + 500.0f);
            particleEmitter_setStartingScaleRange(pCtrl, 0.04f, 0.05f);
            particleEmitter_setFinalScaleRange(pCtrl, 0.18f, 0.2f);
-            particleEmitter_setParticleSpawnPositionRange(pCtrl, -10.0f, 0.0f, -10.0f, 10.0f, 20.0f, 10.0f);
+            particleEmitter_setSpawnPositionRange(pCtrl, -10.0f, 0.0f, -10.0f, 10.0f, 20.0f, 10.0f);
            particleEmitter_setParticleVelocityRange(pCtrl, 0.0f, 31.0f, 0.0f, 0.0f, 37.0f, 0.0f);
            particleEmitter_emitN(pCtrl, 1);
        }
--- a/src/CCW/code_6AC0.c
+++ b/src/CCW/code_6AC0.c
@@ -133,7 +133,7 @@ void func_8038CFB4(Actor *this) {
    }
    if (this->state == 3) {
-        func_80326224(this);
+        actor_update_func_80326224(this);
        if (0.99 < (f64) this->unk48) {
            func_8038CEB0(this, 4);
        }
--- a/src/CCW/code_7120.c
+++ b/src/CCW/code_7120.c
@@ -19,7 +19,7 @@ ActorInfo D_8038F640 = {
 /* .code */
 void CCW_func_8038D510(Actor *this) {
    static s32 D_8038F664[3] = {0xDE, 0xA7, 0x71};
-    static struct42s D_8038F670 = {
+    static ParticleSettingsVelocityPosition D_8038F670 = {
        {{  0.0f,  50.0f,   0.0f}, { 70.0f, 100.0f,  70.0f}},
        {{100.0f, 100.0f, 100.0f}, {150.0f, 400.0f, 200.0f}}
    };
@@ -39,7 +39,7 @@ void CCW_func_8038D510(Actor *this) {
 }
 void func_8038D5DC(Actor *this) {
-    static struct43s D_8038F6A0 ={
+    static ParticleSettingsVelocityAccelerationPosition D_8038F6A0 ={
        {{-100.0f,  -50.0f, -100.0f}, {100.0f,   50.0f, 100.0f}},
        {{   0.0f, -800.0f,    0.0f}, {  0.0f, -800.0f,   0.0f}},
        {{-100.0f,    0.0f, -200.0f}, {100.0f,  400.0f, 200.0f}}
@@ -48,8 +48,8 @@ void func_8038D5DC(Actor *this) {
    ParticleEmitter *pCtrl;
    pCtrl = partEmitMgr_newEmitter(30);
-    func_802EF9F8(pCtrl, 0.6f);
+    particleEmitter_func_802EF9F8(pCtrl, 0.6f);
-    func_802EFA18(pCtrl, 3);
+    particleEmitter_func_802EFA18(pCtrl, 3);
    particleEmitter_setModel(pCtrl, 0x896);
    particleEmitter_setPosition(pCtrl, this->position);
    particleEmitter_setStartingScaleRange(pCtrl, 0.05f, 0.3f);
@@ -59,7 +59,7 @@ void func_8038D5DC(Actor *this) {
    );
    particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
    particleEmitter_setParticleLifeTimeRange(pCtrl, 10.0f, 10.0f);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8038F6A0);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8038F6A0);
    particleEmitter_emitN(pCtrl, 30);
 }
--- a/src/CCW/code_76C0.c
+++ b/src/CCW/code_76C0.c
@@ -65,16 +65,16 @@ void CCW_func_8038DB0C(Actor *this);
 void func_8038DAB0(Actor *this);
 /* .data */
-ActorInfo D_8038F720 = { 0x239, 0x25F, 0x4FC, 0x1, NULL, func_802D3D54, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_8038F720 = { 0x239, 0x25F, 0x4FC, 0x1, NULL, func_802D3D54, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_8038F744 = { 0x236, 0x260, 0x4F9, 0x1, NULL, func_802D3D54, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_8038F744 = { 0x236, 0x260, 0x4F9, 0x1, NULL, func_802D3D54, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_8038F768 = { 0x237, 0x261, 0x4FA, 0x1, NULL, func_802D3D54, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_8038F768 = { 0x237, 0x261, 0x4FA, 0x1, NULL, func_802D3D54, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_8038F78C = { 0x238, 0x262, 0x4FB, 0x1, NULL, func_802D3D54, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_8038F78C = { 0x238, 0x262, 0x4FB, 0x1, NULL, func_802D3D54, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_8038F7B0 = { 0x243, 0x2E6, 0x533, 0x1, NULL, func_802D3D54, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_8038F7B0 = { 0x243, 0x2E6, 0x533, 0x1, NULL, func_802D3D54, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_8038F7D4 = { 0x263, 0x2E7, 0x518, 0x1, NULL, func_8038DAB0, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_8038F7D4 = { 0x263, 0x2E7, 0x518, 0x1, NULL, func_8038DAB0, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_8038F7F8 = { 0x21E, 0x233, 0x3B3, 0x1, NULL, func_802D3D74, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_8038F7F8 = { 0x21E, 0x233, 0x3B3, 0x1, NULL, func_802D3D74, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_8038F81C = { 0x26B, 0x2DE, 0x531, 0x1, NULL, CCW_func_8038DB0C, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_8038F81C = { 0x26B, 0x2DE, 0x531, 0x1, NULL, CCW_func_8038DB0C, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_8038F840 = { 0x26C, 0x2DD, 0x53E, 0x1, NULL, CCW_func_8038DB0C, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_8038F840 = { 0x26C, 0x2DD, 0x53E, 0x1, NULL, CCW_func_8038DB0C, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_8038F864 = { 0x26D, 0x2DC, 0x53F, 0x1, NULL, CCW_func_8038DB0C, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_8038F864 = { 0x26D, 0x2DC, 0x53F, 0x1, NULL, CCW_func_8038DB0C, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
 ActorInfo D_8038F888 = { 0x1CC, 0x318, 0x0,   0x0, NULL, func_80325F84, NULL, func_80325340, 0, 0, 0.0f, 0};
--- a/src/CCW/code_7BC0.c
+++ b/src/CCW/code_7BC0.c
@@ -12,7 +12,7 @@ ActorAnimationInfo D_8038F8B0[] = {
 ActorInfo D_8038F8C0 = { 0x251, 0x37E, 0x506,
    0x1, D_8038F8B0,
-    func_8038DFB0, func_80326224, actor_draw, 
+    func_8038DFB0, actor_update_func_80326224, actor_draw, 
    0, 0, 0.0f, 0
 };
--- a/src/CCW/code_7BF0.c
+++ b/src/CCW/code_7BF0.c
@@ -15,7 +15,7 @@ ActorAnimationInfo D_8038F8F0[] = {
 ActorInfo D_8038F908 = { 
    MARKER_1F9_SNARE_BEAR, ACTOR_1E9_SNARE_BEAR, ASSET_440_MODEL_SNAREBEAR,
    0x1, D_8038F8F0,
-    func_8038E0C8, func_80326224, actor_draw,
+    func_8038E0C8, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
--- a/src/FP/ch/bearcub.c
+++ b/src/FP/ch/bearcub.c
@@ -23,19 +23,19 @@ ActorAnimationInfo D_80391DF0[] = {
 ActorInfo D_80391E08 = { MARKER_1FA_POLAR_BEAR_CUB_BLUE, ACTOR_1EA_POLAR_BEAR_CUB_BLUE, ASSET_44C_MODEL_POLAR_BEAR_CUB_BLUE, 
    0x1, D_80391DF0, 
-    func_8038A384, func_80326224, actor_draw, 
+    func_8038A384, actor_update_func_80326224, actor_draw, 
    2500, 0, 1.2f, 0
 };
 ActorInfo FP_D_80391E2C = { MARKER_1FB_POLAR_BEAR_CUB_GREEN, ACTOR_1EB_POLAR_BEAR_CUB_GREEN, ASSET_44D_MODEL_POLAR_BEAR_CUB_GREEN, 
    0x1, D_80391DF0, 
-    func_8038A384, func_80326224, actor_draw, 
+    func_8038A384, actor_update_func_80326224, actor_draw, 
    2500, 0, 1.2f, 0
 };
 ActorInfo D_80391E50 = { MARKER_1FC_POLAR_BEAR_CUB_RED, ACTOR_1EC_POLAR_BEAR_CUB_RED, ASSET_44E_MODEL_POLAR_BEAR_CUB_RED, 
    0x1, D_80391DF0, 
-    func_8038A384, func_80326224, actor_draw, 
+    func_8038A384, actor_update_func_80326224, actor_draw, 
    2500, 0, 1.2f, 0
 };
--- a/src/FP/ch/boggy2.c
+++ b/src/FP/ch/boggy2.c
@@ -237,7 +237,7 @@ void func_80388EE8(ParticleEmitter *pCtrl){
        {0.3f, 0.45f},
        0.0f, 0.01f
    };
-    static struct42s D_80391D58 = {
+    static ParticleSettingsVelocityPosition D_80391D58 = {
        {{-10.0f, 10.0f, -10.0f}, {10.0f, 240.0f, 10.0f}}, /*position*/
        {{0.0f, 0.0f, 0.0f}, {0.0f, 20.0f, 0.0f}}          /*velocity*/
    };
--- a/src/FP/ch/boggy3.c
+++ b/src/FP/ch/boggy3.c
@@ -13,7 +13,7 @@ ActorAnimationInfo D_80392680[] = {
 ActorInfo D_80392690 = { 0x20D, 0x33D, 0x38A,
    0x1, D_80392680,
-    func_80390388, func_80326224, func_80390290,
+    func_80390388, actor_update_func_80326224, func_80390290,
    2500, 0, 1.0f, 0
 };
--- a/src/FP/ch/cavewozza.c
+++ b/src/FP/ch/cavewozza.c
@@ -14,7 +14,7 @@ extern ActorAnimationInfo D_803926F0[]= {
 extern ActorInfo D_80392700 = { MARKER_20F_WOZZA_IN_CAVE, ACTOR_33F_WOZZA_IN_CAVE, ASSET_494_MODEL_WOZZA,
    0x1, D_803926F0,
-    func_80390630, func_80326224, actor_draw,
+    func_80390630, actor_update_func_80326224, actor_draw,
    2500, 0, 1.6f, 0
 };
--- a/src/FP/ch/present.c
+++ b/src/FP/ch/present.c
@@ -12,19 +12,19 @@ ActorAnimationInfo D_803924A0[] = {
 ActorInfo D_803924B0 = { MARKER_208_BLUE_PRESENT, ACTOR_33A_BLUE_PRESENT, ASSET_47F_MODEL_XMAS_GIFT_BLUE, 
    0x1, D_803924A0,
-    func_8038F144, func_80326224, func_8038F0F0,
+    func_8038F144, actor_update_func_80326224, func_8038F0F0,
    2500, 0, 1.2f, 0
 };
 ActorInfo D_803924D4 = { MARKER_209_GREEN_PRESENT, ACTOR_33B_GREEN_PRESENT, ASSET_480_MODEL_XMAS_GIFT_GREEN, 
    0x1, D_803924A0,
-    func_8038F144, func_80326224, func_8038F0F0,
+    func_8038F144, actor_update_func_80326224, func_8038F0F0,
    2500, 0, 1.2f, 0
 };
 ActorInfo D_803924F8 = { MARKER_20A_RED_PRESENT, ACTOR_33C_RED_PRESENT, ASSET_481_MODEL_XMAS_GIFT_RED, 
    0x1, D_803924A0,
-    func_8038F144, func_80326224, func_8038F0F0,
+    func_8038F144, actor_update_func_80326224, func_8038F0F0,
    2500, 0, 1.2f, 0
 };
--- a/src/FP/ch/snowmanbutton.c
+++ b/src/FP/ch/snowmanbutton.c
@@ -16,7 +16,7 @@ ActorAnimationInfo FP_D_80391A90[] ={
 ActorInfo FP_D_80391AB0 = { 
    MARKER_B9_FP_SNOWMAN_BUTTON, ACTOR_116_FP_SNOWMAN_BUTTON, ASSET_421_MODEL_FP_SNOWMAN_BUTTON, 
    0x1, FP_D_80391A90, 
-    FP_func_80386CF8, func_80326224, func_80386B80, 
+    FP_func_80386CF8, actor_update_func_80326224, func_80386B80, 
    0, 0x800, 0.0f, 0
 };
@@ -28,7 +28,7 @@ ParticleScaleAndLifetimeRanges D_80391AD4 = {
    0.0f, 0.01f, 
 };
-struct43s D_80391AFC = {
+ParticleSettingsVelocityAccelerationPosition D_80391AFC = {
    {{-300.0f, 350.0f, -300.0f}, {300.0f, 800.0f, 300.0f}},
    {{0.0f, -800.0f, 0.0f}, {0.0f, -800.0f, 0.0f}},
    {{-50.0f, -50.0f, -50.0f}, {50.0f, 50.0f, 50.0f}}
@@ -58,7 +58,7 @@ void FP_func_80386BEC(Actor *this){
    particleEmitter_setRGB(pCtrl, D_80391B44);
    particleEmitter_setSprite(pCtrl, ASSET_700_SPRITE_DUST);
    particleEmitter_setPosition(pCtrl, plyr_pos);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80391AFC);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80391AFC);
    particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_80391AD4);
    particleEmitter_emitN(pCtrl, 12);
 }
--- a/src/FP/ch/twinkly.c
+++ b/src/FP/ch/twinkly.c
@@ -21,30 +21,30 @@ ActorAnimationInfo D_80391F50[] = {
 ActorInfo D_80391F88 = { MARKER_200_TWINKLY_BLUE, ACTOR_332_TWINKLY_BLUE, ASSET_448_MODEL_TWINKLY_BLUE,
    0x1, D_80391F50,
-    func_8038C9A0, func_80326224, func_8038C1F8,
+    func_8038C9A0, actor_update_func_80326224, func_8038C1F8,
    0, 0, 1.0f, 0
 };
 ActorInfo D_80391FAC = { MARKER_201_TWINKLY_GREEN, ACTOR_333_TWINKLY_GREEN, ASSET_449_MODEL_TWINKLY_GREEN,
    0x1, D_80391F50,
-    func_8038C9A0, func_80326224, func_8038C1F8,
+    func_8038C9A0, actor_update_func_80326224, func_8038C1F8,
    0, 0, 1.0f, 0
 };
 ActorInfo D_80391FD0 = { MARKER_202_TWINKLY_ORANGE, ACTOR_334_TWINKLY_ORANGE, ASSET_44A_MODEL_TWINKLY_ORANGE,
    0x1, D_80391F50,
-    func_8038C9A0, func_80326224, func_8038C1F8,
+    func_8038C9A0, actor_update_func_80326224, func_8038C1F8,
    0, 0, 1.0f, 0
 };
 ActorInfo D_80391FF4 = { MARKER_203_TWINKLY_RED, ACTOR_335_TWINKLY_RED, ASSET_44B_MODEL_TWINKLY_RED,
    0x1, D_80391F50,
-    func_8038C9A0, func_80326224, func_8038C1F8,
+    func_8038C9A0, actor_update_func_80326224, func_8038C1F8,
    0, 0, 1.0f, 0
 };
 Struct6Cs FP_D_80392018 = {NULL, NULL, NULL, (void*)func_8038C0B0};
-struct43s D_80392028 = {
+ParticleSettingsVelocityAccelerationPosition D_80392028 = {
    {{-200.0f,  200.0f, -200.0f}, {200.0f,  400.0f, 200.0f}}, 
    {{   0.0f, -800.0f,    0.0f}, {  0.0f, -800.0f,   0.0f}}, 
    {{ -15.0f,  -15.0f,  -15.0f}, { 15.0f,   15.0f,  15.0f}}
@@ -95,7 +95,7 @@ void func_8038C260(f32 position[3], s32 count, enum asset_e model_id){
    pCtrl = partEmitMgr_newEmitter(count);
    particleEmitter_setModel(pCtrl, model_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80392028);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80392028);
    particleEmitter_setAngularVelocityRange(pCtrl,
        400.0f, 400.0f, 400.0f,
        800.0f, 800.0f, 800.0f
@@ -104,8 +104,8 @@ void func_8038C260(f32 position[3], s32 count, enum asset_e model_id){
    particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.02f);
    particleEmitter_setParticleLifeTimeRange(pCtrl, 1.5f, 1.5f);
    particleEmitter_setFade(pCtrl, 0.0f, 0.3f);
-    func_802EF9F8(pCtrl, 0.6f);
+    particleEmitter_func_802EF9F8(pCtrl, 0.6f);
-    func_802EFA18(pCtrl, 0);
+    particleEmitter_func_802EFA18(pCtrl, 0);
    func_802EFA20(pCtrl, 1.0f, 1.3f);
    particleEmitter_setSfx(pCtrl, SFX_7B_ICE_BREAKING_1, 8000);
    particleEmitter_emitN(pCtrl, count);
--- a/src/FP/ch/twinklybox.c
+++ b/src/FP/ch/twinklybox.c
@@ -19,7 +19,7 @@ ActorAnimationInfo D_803920C0[] ={
 ActorInfo D_803920E8 = { 0x204, 0x336, 0x442,
    0x1, D_803920C0,
-    func_8038D6C8, func_80326224, FP_func_8038CED0,
+    func_8038D6C8, actor_update_func_80326224, FP_func_8038CED0,
    0, 0, 0.0f, 0
 };
@@ -42,7 +42,7 @@ void func_8038CF54(f32 position[3], s32 count, enum asset_e model_id){
        0.0f,  
        0.7f
    };
-    static struct43s D_80392134 = {
+    static ParticleSettingsVelocityAccelerationPosition D_80392134 = {
        {{-200.0f, 200.0f, -200.0f}, {200.0f, 400.0f, 200.0f}},
        {{   0.0f, -800.0f,    0.0f}, {  0.0f, -800.0f,   0.0f}},
        {{-100.0f,    0.0f, -100.0f}, {100.0f,  100.0f, 100.0f}}
@@ -52,14 +52,14 @@ void func_8038CF54(f32 position[3], s32 count, enum asset_e model_id){
    pCtrl = partEmitMgr_newEmitter(count);
    particleEmitter_setModel(pCtrl, model_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80392134);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80392134);
    particleEmitter_setAngularVelocityRange(pCtrl,
        100.0f, 100.0f, 100.0f,
        200.0f, 200.0f, 200.0f
    );
    particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8039210C);
-    func_802EF9F8(pCtrl, 0.6f);
+    particleEmitter_func_802EF9F8(pCtrl, 0.6f);
-    func_802EFA18(pCtrl, 3);
+    particleEmitter_func_802EFA18(pCtrl, 3);
    particleEmitter_emitN(pCtrl, count);
 }
@@ -73,7 +73,7 @@ void func_8038D01C(f32 position[3], s32 count, enum asset_e sprite_id){
        0.01f
    };
    static s32 D_803921A4[3] = { 0xDC, 0xDC, 0xE6};
-    static struct43s D_803921B0 = {
+    static ParticleSettingsVelocityAccelerationPosition D_803921B0 = {
        {{-200.0f, 0.0f, -200.0f}, {200.0f, 200.0f, 200.0f}},
        {{  0.0f, -10.0f,   0.0f}, { 0.0f, -10.0f,  0.0f}},
        {{-50.0f,   0.0f, -50.0f}, {50.0f, 200.0f, 50.0f}}
@@ -85,7 +85,7 @@ void func_8038D01C(f32 position[3], s32 count, enum asset_e sprite_id){
    particleEmitter_setRGB(pCtrl, D_803921A4);
    particleEmitter_setSprite(pCtrl, sprite_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_803921B0);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_803921B0);
    particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8039217C);
    particleEmitter_emitN(pCtrl, count);
 }
@@ -99,7 +99,7 @@ void func_8038D0A8(f32 position[3], s32 count, enum asset_e model_id){
        0.0f, 0.3f
    };
-    static struct43s D_80392220 = {
+    static ParticleSettingsVelocityAccelerationPosition D_80392220 = {
        {{-300.0f, 400.0f, -300.0f}, {300.0f, 800.0f, 300.0f}},
        {{  0.0f, -800.0f,  0.0f}, { 0.0f, -800.0f,  0.0f}},
        {{-80.0f,  80.0f, -80.0f}, {80.0f,   80.0f, 80.0f}}
@@ -109,14 +109,14 @@ void func_8038D0A8(f32 position[3], s32 count, enum asset_e model_id){
    pCtrl = partEmitMgr_newEmitter(count);
    particleEmitter_setModel(pCtrl, model_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80392220);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80392220);
    particleEmitter_setAngularVelocityRange(pCtrl,
        200.0f, 200.0f, 200.0f,
        300.0f, 300.0f, 300.0f
    );
    particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_803921F8);
-    func_802EF9F8(pCtrl, 0.2f);
+    particleEmitter_func_802EF9F8(pCtrl, 0.2f);
-    func_802EFA18(pCtrl, 2);
+    particleEmitter_func_802EFA18(pCtrl, 2);
    particleEmitter_emitN(pCtrl, count);
 }
@@ -129,7 +129,7 @@ void func_8038D170(f32 position[3], s32 count, enum asset_e sprite_id){
        0.0f,
        0.3f
    };
-    static struct43s D_80392290 = {
+    static ParticleSettingsVelocityAccelerationPosition D_80392290 = {
        {{-300.0f, 400.0f, -300.0f}, {300.0f, 800.0f, 300.0f}},
        {{  0.0f, -800.0f,   0.0f}, { 0.0f, -800.0f,  0.0f}},
        {{-80.0f,   80.0f, -80.0f}, {80.0f,   80.0f, 80.0f}}
@@ -139,10 +139,10 @@ void func_8038D170(f32 position[3], s32 count, enum asset_e sprite_id){
    pCtrl = partEmitMgr_newEmitter(count);
    particleEmitter_setSprite(pCtrl, sprite_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_80392290);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_80392290);
    particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_80392268);
-    func_802EF9F8(pCtrl, 0.2f);
+    particleEmitter_func_802EF9F8(pCtrl, 0.2f);
-    func_802EFA18(pCtrl, 2);
+    particleEmitter_func_802EFA18(pCtrl, 2);
    particleEmitter_emitN(pCtrl, count);
 }
@@ -155,7 +155,7 @@ void func_8038D208(f32 position[3], s32 count, enum asset_e sprite_id){
        0.0f, 0.01f
    };
    static s32 D_80392300[3] = { 0xDC, 0xDC, 0xE6};
-    static struct43s D_8039230C = {
+    static ParticleSettingsVelocityAccelerationPosition D_8039230C = {
        {{-100.0f, 0.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
        {{0.0f, -10.0f, 0.0f}, {0.0f, -10.0f, 0.0f}},
        {{-80.0f, 0.0f, -80.0f}, {50.0f, 200.0f, 80.0f}}
@@ -166,7 +166,7 @@ void func_8038D208(f32 position[3], s32 count, enum asset_e sprite_id){
    particleEmitter_setRGB(pCtrl, D_80392300);
    particleEmitter_setSprite(pCtrl, sprite_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8039230C);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8039230C);
    particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_803922D8);
    particleEmitter_emitN(pCtrl, count);
 }
--- a/src/FP/ch/twinklymuncher.c
+++ b/src/FP/ch/twinklymuncher.c
@@ -21,7 +21,7 @@ extern ActorAnimationInfo D_80392390[] ={
 extern ActorInfo D_803923D0 = { MARKER_205_TWINKLY_MUNCHER, ACTOR_337_TWINKLY_MUNCHER, ASSET_496_MODEL_TWINKLY_MUNCHER, 
    0x1, D_80392390,
-    func_8038E094, func_80326224, func_8038DD70,
+    func_8038E094, actor_update_func_80326224, func_8038DD70,
    2500, 0, 1.0f, 0
 };
--- a/src/FP/ch/wozza.c
+++ b/src/FP/ch/wozza.c
@@ -32,7 +32,7 @@ ActorAnimationInfo D_80392520[] ={
 ActorInfo D_80392588 = { MARKER_20B_WOZZA, ACTOR_1F3_WOZZA, ASSET_494_MODEL_WOZZA, 
    0x1, D_80392520,
-    FP_func_8038F7AC, func_80326224, func_8038F210,
+    FP_func_8038F7AC, actor_update_func_80326224, func_8038F210,
    0, 0, 1.6f, 0
 };
--- a/src/FP/ch/wozzasjig.c
+++ b/src/FP/ch/wozzasjig.c
@@ -24,7 +24,7 @@ ActorAnimationInfo D_803925C0[] = {
 ActorInfo D_80392628 = { MARKER_20C_WOZZAS_JIGGY, ACTOR_1F4_WOZZAS_JIGGY, ASSET_495_MODEL_WOZZAS_JIGGY,
    0x1, D_803925C0,
-    func_8038FF54, func_80326224, func_8038FF00,
+    func_8038FF54, actor_update_func_80326224, func_8038FF00,
    0, 0, 0.0f, 0
 };
@@ -85,7 +85,7 @@ void func_8038FF54(Actor *this){
            particleEmitter_setSprite(sp3C, ASSET_713_SPRITE_SPARKLE_YELLOW);
            particleEmitter_setStartingFrameRange(sp3C, 1, 6);
            particleEmitter_setPosition(sp3C, sp40);
-            particleEmitter_setParticleSpawnPositionRange(sp3C,
+            particleEmitter_setSpawnPositionRange(sp3C,
                0.0f, 20.0f, 0.0f,
                0.0f, 20.0f, 0.0f
            );
@@ -93,7 +93,7 @@ void func_8038FF54(Actor *this){
                -180.0f,   0.0f, -180.0f,
                 180.0f, 280.0f,  180.0f
            );
-            particleEmitter_setParticleAccelerationRange(sp3C,
+            particleEmitter_setAccelerationRange(sp3C,
                0.0f, -60.0f, 0.0f,
                0.0f, -90.0f, 0.0f
            );
--- a/src/FP/ch/xmastree.c
+++ b/src/FP/ch/xmastree.c
@@ -9,7 +9,7 @@ void chXmasTree_update(Actor *this);
 ActorInfo chXmasTree = { 
    MARKER_BA_XMAS_TREE, ACTOR_15F_XMAS_TREE, ASSET_488_MODEL_XMAS_TREE, 
    0x1, NULL, 
-    chXmasTree_update, func_80326224, chXmasTree_draw,
+    chXmasTree_update, actor_update_func_80326224, chXmasTree_draw,
    0, 0, 0.0f, 0
 };
--- a/src/FP/ch/xmastreeeggtoll.c
+++ b/src/FP/ch/xmastreeeggtoll.c
@@ -8,13 +8,13 @@ void func_80390EB0(Actor *this);
 /* .data */
 ActorInfo FP_D_80392840 = { MARKER_245_XMAS_TREE_EGG_TOLL, ACTOR_353_XMAS_TREE_EGG_TOLL, ASSET_402_MODEL_EGG_TOLL,
    0x0, NULL,
-    func_80390EB0, func_80326224, func_80325340,
+    func_80390EB0, actor_update_func_80326224, func_80325340,
    2000, 0, 0.0f, 0
 };
 /* .code */
 void func_80390C70(f32 position[3]){
-    static struct40s FP_D_80392864 = {{{1.7f, 2.0f}, {2.4f, 2.7f}, {0.0f, 0.01f}, {4.0f, 7.0f}, 0.3f, 0.7f}, 4.0f, 1.0f};
+    static ParticleSettingsScaleAndLifetimeDrawModeEmitCount FP_D_80392864 = {{{1.7f, 2.0f}, {2.4f, 2.7f}, {0.0f, 0.01f}, {4.0f, 7.0f}, 0.3f, 0.7f}, 4.0f, 1.0f};
    static s32 D_80392894[3] = {0xFF, 0XFF, 0xFF};
    ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1);
@@ -23,7 +23,7 @@ void func_80390C70(f32 position[3]){
    particleEmitter_setRGB(pCtrl, D_80392894);
    particleEmitter_setAlpha(pCtrl, 0x41);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setParticleSpawnPositionRange(pCtrl,
+    particleEmitter_setSpawnPositionRange(pCtrl,
        -40.0f, 110.0f, -40.0f,
         40.0f, 110.0f,  40.0f
    );
@@ -35,7 +35,7 @@ void func_80390C70(f32 position[3]){
 }
 void func_80390D58(f32 position[3]){
-    static struct40s D_803928A0 = {{{0.05f, 0.1f}, {0.1f, 0.2f}, {0.0f, 0.01f}, {0.9f, 1.3f}, 0.3f, 0.7f}, 4.0f, 1.0f};
+    static ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_803928A0 = {{{0.05f, 0.1f}, {0.1f, 0.2f}, {0.0f, 0.01f}, {0.9f, 1.3f}, 0.3f, 0.7f}, 4.0f, 1.0f};
    static s32 D_803928D0[3] = {0xFF, 0xFF, 0xFF};
    ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1);
@@ -44,7 +44,7 @@ void func_80390D58(f32 position[3]){
    particleEmitter_setRGB(pCtrl, D_803928D0);
    particleEmitter_setAlpha(pCtrl, 0xFF);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setParticleSpawnPositionRange(pCtrl,
+    particleEmitter_setSpawnPositionRange(pCtrl,
        -40.0f, 50.0,-40.0f,
         40.0f, 70.0, 40.0f
    );
@@ -52,7 +52,7 @@ void func_80390D58(f32 position[3]){
        -40.0f, 120.0,-40.0f,
         40.0f, 180.0, 40.0f
    );
-    particleEmitter_setParticleAccelerationRange(pCtrl, 
+    particleEmitter_setAccelerationRange(pCtrl, 
        0.0f,  -60.0f, 0.0f,
        0.0f, -100.0f, 0.0f
    );
--- a/src/FP/ch/xmastreeice.c
+++ b/src/FP/ch/xmastreeice.c
@@ -8,7 +8,7 @@ void func_80390BDC(Actor *this);
 /* .data */
 ActorInfo D_80392730 = { 0x210, 0x340, 0x4D2,
    0x0, NULL,
-    func_80390BDC, func_80326224, func_803908F0,
+    func_80390BDC, actor_update_func_80326224, func_803908F0,
    0, 0, 1.0f, 0
 };
@@ -22,7 +22,7 @@ Actor *func_803908F0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
 void func_80390944(f32 position[3], s32 cnt, enum asset_e model_id){
    static ParticleScaleAndLifetimeRanges D_80392754 = {{0.2f, 0.4f}, {-1.0f, -1.0f}, {0.0f, 0.02f}, {2.2f, 2.2f}, 0.0f, 0.3f};
-    static struct43s D_8039277C = {
+    static ParticleSettingsVelocityAccelerationPosition D_8039277C = {
        {{-300.0f,   350.0f, -300.0f}, {300.0f,   600.0f, 300.0f}}, /*position*/
        {{   0.0f, -1000.0f,    0.0f}, {  0.0f, -1000.0f,   0.0f}}, /*velocitcy*/
        {{-100.0f,     0.0f, -100.0f}, {100.0f,   200.0f, 100.0f}}  /*acceleration*/
@@ -30,14 +30,14 @@ void func_80390944(f32 position[3], s32 cnt, enum asset_e model_id){
    ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
    particleEmitter_setModel(pCtrl, model_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8039277C);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8039277C);
    particleEmitter_setAngularVelocityRange(pCtrl,
        100.0f, 100.0f, 100.0f, 
        250.0f, 250.0f, 250.0f
    );
    particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_80392754);
-    func_802EF9F8(pCtrl, 0.6f);
+    particleEmitter_func_802EF9F8(pCtrl, 0.6f);
-    func_802EFA18(pCtrl, 0);
+    particleEmitter_func_802EFA18(pCtrl, 0);
    func_802EFA20(pCtrl, 1.0f, 1.3f);
    particleEmitter_setSfx(pCtrl, SFX_7B_ICE_BREAKING_1, 8000);
    particleEmitter_emitN(pCtrl, cnt);
@@ -45,7 +45,7 @@ void func_80390944(f32 position[3], s32 cnt, enum asset_e model_id){
 void func_80390A30(f32 position[3], s32 cnt, enum asset_e sprite_id){
    static ParticleScaleAndLifetimeRanges D_803927C4 = {{0.6f, 0.8f}, {1.0f, 1.4f}, {0.0f, 0.01f}, {1.2f, 1.8f}, 0.0f, 0.01f};
-    static struct43s D_803927EC = {
+    static ParticleSettingsVelocityAccelerationPosition D_803927EC = {
        {{-200.0f,   0.0f, -200.0f}, {200.0f, 200.0f, 200.0f}}, /*position*/
        {{   0.0f, -10.0f,    0.0f}, {  0.0f, -10.0f,   0.0f}}, /*velocitcy*/
        {{ -50.0f,   0.0f,  -50.0f}, { 50.0f, 200.0f,  50.0f}}  /*acceleration*/
@@ -55,7 +55,7 @@ void func_80390A30(f32 position[3], s32 cnt, enum asset_e sprite_id){
    particleEmitter_setRGB(pCtrl, D_80392834);
    particleEmitter_setSprite(pCtrl, sprite_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_803927EC);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_803927EC);
    particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_803927C4);
    particleEmitter_emitN(pCtrl, cnt);
 }
--- a/src/FP/ch/xmastreestar.c
+++ b/src/FP/ch/xmastreestar.c
@@ -17,7 +17,7 @@ void func_8038ECD8(Actor *this);
 /* .data */
 ActorInfo D_80392470 = { 0x207, 0x339, 0x426, 
    0x1, NULL,
-    func_8038ECD8, func_80326224, func_8038EBD0,
+    func_8038ECD8, actor_update_func_80326224, func_8038EBD0,
    0, 0, 0.0f, 0
 };
--- a/src/FP/ch/xmastreeswitch.c
+++ b/src/FP/ch/xmastreeswitch.c
@@ -15,7 +15,7 @@ ActorAnimationInfo D_80392400[] = {
 ActorInfo D_80392420 = { 0x206, 0x338, 0x486, 
    0x1, D_80392400, 
-    func_8038E940, func_80326224, func_8038E720, 
+    func_8038E940, actor_update_func_80326224, func_8038E720, 
    4500, 0, 0.0f, 0
 };
@@ -50,11 +50,11 @@ void func_8038E840(f32 position[3], s32 cnt, enum asset_e sprite_id){
    ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
    particleEmitter_setSprite(pCtrl, sprite_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setParticleSpawnPositionRange(pCtrl,
+    particleEmitter_setSpawnPositionRange(pCtrl,
        -100.0f, -80.0f, -70.0f,
         100.0f, 100.0f,  70.0f
    );
-    particleEmitter_setParticleAccelerationRange(pCtrl, 
+    particleEmitter_setAccelerationRange(pCtrl, 
        0.0f, -200.0f, 0.0f,
        0.0f, -200.0f, 0.0f
    );
--- a/src/FP/code_19E0.c
+++ b/src/FP/code_19E0.c
@@ -23,7 +23,7 @@ ActorAnimationInfo D_80391C00[] = {
 ActorInfo D_80391C18 = { 
    0x125, 0x161, 0x38b, 
    0x1, D_80391C00, 
-    func_803881AC, func_80326224, func_80387DD0,
+    func_803881AC, actor_update_func_80326224, func_80387DD0,
    0, 0, 0.35f, 0
 };
--- a/src/FP/code_1FF0.c
+++ b/src/FP/code_1FF0.c
@@ -18,7 +18,7 @@ ActorAnimationInfo D_80391C40[] = {
 ActorInfo D_80391C58 = { 
    0x126, 0x162, 0x38B, 
    0x1, D_80391C40, 
-    func_80388584, func_80326224, func_803883E0, 
+    func_80388584, actor_update_func_80326224, func_803883E0, 
    0, 0, 0.35f, 0
 };
--- a/src/FP/code_A1C0.c
+++ b/src/FP/code_A1C0.c
@@ -7,7 +7,7 @@ void func_803905B0(Actor *this);
 /* .data */
 ActorInfo D_803926C0 = { 0x20E, 0x33E, 0x49C,
    0x1, NULL,
-    func_803905B0, func_80326224, func_80325340,
+    func_803905B0, actor_update_func_80326224, func_80325340,
    0, 0, 0.0f, 0
 };
--- a/src/FP/code_ABD0.c
+++ b/src/FP/code_ABD0.c
@@ -45,24 +45,24 @@ void func_8039180C(Actor *this);
 void func_80391894(Actor *this);
 /* .data */
-ActorInfo FP_D_803928E0 = { 0x247, 0x355, 0x4E5, 0x0, NULL, func_80391040, func_80326224, actor_draw, 3000, 0, 0.0f, 0};
+ActorInfo FP_D_803928E0 = { 0x247, 0x355, 0x4E5, 0x0, NULL, func_80391040, actor_update_func_80326224, actor_draw, 3000, 0, 0.0f, 0};
-ActorInfo D_80392904 = { 0x248, 0x356, 0x4E6, 0x0, NULL, func_80391040, func_80326224, actor_draw, 3000, 0, 0.0f, 0};
+ActorInfo D_80392904 = { 0x248, 0x356, 0x4E6, 0x0, NULL, func_80391040, actor_update_func_80326224, actor_draw, 3000, 0, 0.0f, 0};
-ActorInfo D_80392928 = { 0x249, 0x357, 0x4E7, 0x0, NULL, func_80391040, func_80326224, actor_draw, 3000, 0, 0.0f, 0};
+ActorInfo D_80392928 = { 0x249, 0x357, 0x4E7, 0x0, NULL, func_80391040, actor_update_func_80326224, actor_draw, 3000, 0, 0.0f, 0};
-ActorInfo D_8039294C = { 0x24A, 0x358, 0x4E8, 0x0, NULL, func_80391040, func_80326224, actor_draw, 3000, 0, 0.0f, 0};
+ActorInfo D_8039294C = { 0x24A, 0x358, 0x4E8, 0x0, NULL, func_80391040, actor_update_func_80326224, actor_draw, 3000, 0, 0.0f, 0};
-ActorInfo D_80392970 = { 0x21F, 0x22B, 0x4C4, 0x1, NULL, func_80391180, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392970 = { 0x21F, 0x22B, 0x4C4, 0x1, NULL, func_80391180, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392994 = { 0x220, 0x22C, 0x4C5, 0x1, NULL, func_80391180, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392994 = { 0x220, 0x22C, 0x4C5, 0x1, NULL, func_80391180, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_803929B8 = { 0x221, 0x22D, 0x4C6, 0x1, NULL, FP_func_80391254, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_803929B8 = { 0x221, 0x22D, 0x4C6, 0x1, NULL, FP_func_80391254, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_803929DC = { 0x222, 0x22E, 0x4C6, 0x1, NULL, FP_func_80391254, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_803929DC = { 0x222, 0x22E, 0x4C6, 0x1, NULL, FP_func_80391254, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392A00 = { 0x223, 0x22F, 0x4C6, 0x1, NULL, FP_func_80391254, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392A00 = { 0x223, 0x22F, 0x4C6, 0x1, NULL, FP_func_80391254, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392A24 = { 0x24B, 0x35D, 0x4E9, 0x1, NULL, func_803912EC, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392A24 = { 0x24B, 0x35D, 0x4E9, 0x1, NULL, func_803912EC, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392A48 = { 0x24C, 0x35E, 0x4EC, 0x1, NULL, func_803912EC, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392A48 = { 0x24C, 0x35E, 0x4EC, 0x1, NULL, func_803912EC, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392A6C = { 0x24D, 0x35F, 0x4EA, 0x1, NULL, func_803912EC, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392A6C = { 0x24D, 0x35F, 0x4EA, 0x1, NULL, func_803912EC, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392A90 = { 0x24E, 0x360, 0x4EB, 0x1, NULL, func_803912EC, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392A90 = { 0x24E, 0x360, 0x4EB, 0x1, NULL, func_803912EC, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392AB4 = { 0x23D, 0x253, 0x512, 0x1, NULL, func_8039180C, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392AB4 = { 0x23D, 0x253, 0x512, 0x1, NULL, func_8039180C, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392AD8 = { 0x23E, 0x254, 0x513, 0x1, NULL, func_80391894, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392AD8 = { 0x23E, 0x254, 0x513, 0x1, NULL, func_80391894, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392AFC = { 0x286, 0x3AE, 0x55B, 0x1, NULL, func_80391180, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392AFC = { 0x286, 0x3AE, 0x55B, 0x1, NULL, func_80391180, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392B20 = { 0x21D, 0x229, 0x4C3, 0x1, NULL, func_80391180, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392B20 = { 0x21D, 0x229, 0x4C3, 0x1, NULL, func_80391180, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
-ActorInfo D_80392B44 = { 0x289, 0x3B0, 0x56A, 0x1, NULL, func_80391180, func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
+ActorInfo D_80392B44 = { 0x289, 0x3B0, 0x56A, 0x1, NULL, func_80391180, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0};
 /* .code */
 int func_80390FC0(void){
--- a/src/GV/ch/ancientone.c
+++ b/src/GV/ch/ancientone.c
@@ -28,7 +28,7 @@ ActorAnimationInfo chAncientOneAnimations[] = {
 ActorInfo chAncientOne = { MARKER_F4_ANCIENT_ONE, ACTOR_147_ANCIENT_ONE, ASSET_3E8_MODEL_ANCIENT_ONE, 
    0x1, chAncientOneAnimations, 
-    chAncientOne_update, func_80326224, chAncientOne_draw, 
+    chAncientOne_update, actor_update_func_80326224, chAncientOne_draw, 
    0, 0x100, 0.0f, 0
 };
--- a/src/GV/ch/gobi1.c
+++ b/src/GV/ch/gobi1.c
@@ -202,7 +202,7 @@ void chGobi1_update(Actor *this){
    }//L80387830
    if(this->state == 4){
-        func_80326224(this);
+        actor_update_func_80326224(this);
        tmp_s1 = func_8033A12C(marker_loadModelBin(this->marker));
        if(tmp_s1){
            player_getPosition(sp54);
--- a/src/GV/ch/gobi2.c
+++ b/src/GV/ch/gobi2.c
@@ -224,7 +224,7 @@ void chGobi2_update(Actor *this){
    }
    if(this->state == 6){
-        func_80326224(this);
+        actor_update_func_80326224(this);
    }
    if(this->state == 8){
--- a/src/GV/ch/gobi3.c
+++ b/src/GV/ch/gobi3.c
@@ -143,7 +143,7 @@ void chGobi3_update(Actor *this){
    }
    if(this->state == 4){
-        func_80326224(this);
+        actor_update_func_80326224(this);
        if(timedFuncQueue_is_empty())
            chGobi3_setState(this, 6);
    }
--- a/src/GV/ch/gobirock.c
+++ b/src/GV/ch/gobirock.c
@@ -17,7 +17,7 @@ Actor *chGobiRock_draw(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx
 /* .data */
 ActorInfo chGobiRock = { MARKER_BE_GOBI_ROCK, ACTOR_130_GOBI_ROCK, ASSET_3E4_MODEL_GOBI_ROCK, 
    0, NULL, 
-    chGobiRock_update, func_80326224, chGobiRock_draw, 
+    chGobiRock_update, actor_update_func_80326224, chGobiRock_draw, 
    0, 0x533, 0.0f, 0
 };
--- a/src/GV/ch/gobirope.c
+++ b/src/GV/ch/gobirope.c
@@ -8,7 +8,7 @@ void chGobiRope_update(Actor *this);
 /* .data */
 ActorInfo chGobiRope = { MARKER_BD_GOBI_ROPE, ACTOR_12F_GOBI_ROPE, ASSET_3E3_MODEL_GOBI_ROPE, 
    0, NULL, 
-    chGobiRope_update, func_80326224, actor_draw, 
+    chGobiRope_update, actor_update_func_80326224, actor_draw, 
    0, 0x533, 0.0f, 0
 };
--- a/src/GV/ch/histup.c
+++ b/src/GV/ch/histup.c
@@ -21,7 +21,7 @@ ActorAnimationInfo D_803912E0[] = {
 };
 ActorInfo D_80391318 = { MARKER_AA_HISTUP, ACTOR_11C_HISTUP, ASSET_3DE_MODEL_HISTUP, 
    0x1, D_803912E0, 
-    func_8038DBDC, func_80326224, func_8038DA18, 
+    func_8038DBDC, actor_update_func_80326224, func_8038DA18, 
    2500, 0, 1.7f, 0
 };
--- a/src/GV/ch/sarcophagus.c
+++ b/src/GV/ch/sarcophagus.c
@@ -20,13 +20,13 @@ ActorAnimationInfo chSarcophagusAnimations[] = {
 ActorInfo chSarcophagus = { MARKER_A8_GV_MAZE_SARCOPHAGUS, ACTOR_11A_GV_MAZE_SARCOPHAGUS, ASSET_33D_MODEL_SARCOPHAGUS, 
    0x1, chSarcophagusAnimations, 
-    chSarcophagus_update, func_80326224, actor_draw, 
+    chSarcophagus_update, actor_update_func_80326224, actor_draw, 
    2500, 0, 0.0f, 0
 };
 ActorInfo chSNSSarcophagus = { MARKER_23B_GV_SNS_SARCOPHAGUS, ACTOR_244_GV_SNS_SARCOPHAGUS, ASSET_33D_MODEL_SARCOPHAGUS, 
    0x1, chSarcophagusAnimations, 
-    chSarcophagus_updateSNS, func_80326224, actor_draw, 
+    chSarcophagus_updateSNS, actor_update_func_80326224, actor_draw, 
    0, 0, 0.0f, 0
 };
--- a/src/GV/ch/toots.c
+++ b/src/GV/ch/toots.c
@@ -14,7 +14,7 @@ ActorAnimationInfo chTootsAnimations[] = {
 ActorInfo chToots = { MARKER_1F4_TOOTS, ACTOR_1E4_TOOTS, ASSET_434_MODEL_TOOTS, 
    0x1, chTootsAnimations, 
-    chtoots_update, func_80326224, actor_draw, 
+    chtoots_update, actor_update_func_80326224, actor_draw, 
    2000, 0, 0.5f, 0
 };
--- a/src/GV/code_2EE0.c
+++ b/src/GV/code_2EE0.c
@@ -13,7 +13,7 @@ extern ActorAnimationInfo D_80390DC0[]={
 extern ActorInfo GV_D_80390DD0 = { MARKER_AF_MAGIC_CARPET_SHADOW, ACTOR_122_MAGIC_CARPET_SHADOW, ASSET_3E7_MODEL_MAGIC_CARPET_SHADOW, 
    0x1, D_80390DC0, 
-    func_8038938C, func_80326224, func_803892D0, 
+    func_8038938C, actor_update_func_80326224, func_803892D0, 
    2500, 0, 0.0f, 0
 };
--- a/src/GV/code_3630.c
+++ b/src/GV/code_3630.c
@@ -16,7 +16,7 @@ ActorAnimationInfo D_80390EA0[] = {
 ActorInfo D_80390ED0 = { MARKER_A9_RUBEE, ACTOR_11B_RUBEE, ASSET_3DD_MODEL_RUBEE, 
    0x2, D_80390EA0,
-    func_80389B1C, func_80326224, actor_draw,
+    func_80389B1C, actor_update_func_80326224, actor_draw,
    2500, 0, 1.6f, 0
 };
--- a/src/GV/code_3BB0.c
+++ b/src/GV/code_3BB0.c
@@ -8,11 +8,11 @@ void GV_func_8038A084(Actor *this);
 /* .data */
 ActorInfo D_80390F40 = { 0x24F, 0x37C, 0x0, 
    0, NULL, 
-    GV_func_8038A084, func_80326224, func_80325340, 
+    GV_func_8038A084, actor_update_func_80326224, func_80325340, 
    2000, 0, 0.0f, 0
 };
-struct40s D_80390F64 = {
+ParticleSettingsScaleAndLifetimeDrawModeEmitCount D_80390F64 = {
    {   {2.5f, 2.8f},
        {4.0f, 5.0f},
        {0.0f, 0.01f},
@@ -33,7 +33,7 @@ void func_80389FA0(f32 position[3]){
    particleEmitter_setRGB(pCtrl, D_80390F94);
    particleEmitter_setAlpha(pCtrl, 100);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setParticleSpawnPositionRange( pCtrl, 
+    particleEmitter_setSpawnPositionRange( pCtrl, 
        -700.0f, 0.0f, -700.0f, 
         700.0f, 0.0f,  700.0f
    );
--- a/src/GV/code_4740.c
+++ b/src/GV/code_4740.c
@@ -22,12 +22,12 @@ ActorAnimationInfo D_80391040[] ={
 ActorInfo D_80391098 = { MARKER_AD_SLAPPA, ACTOR_120_SLAPPA, ASSET_376_MODEL_SLAPPA, 
    0x1, D_80391040, 
-    func_8038B124, func_80326224, actor_draw, 
+    func_8038B124, actor_update_func_80326224, actor_draw, 
    0, 0, 0.0f, 0
 };
 s32 D_803910BC[3] = {175, 100, 0};
 s32 D_803910C8[3] = {175, 140, 0};
-struct43s D_803910D4 = {
+ParticleSettingsVelocityAccelerationPosition D_803910D4 = {
    {{-120.0f, 550.0f, -120.0f}, {120.0f, 950.0f, 120.0f}},
    {{0.0f, -1400.0f, 0.0f}, {0.0f, -1400.0f, 0.0f}},
    {{-100.0f, 0.0f, -100.0f}, {100.0f, 30.0f, 100.0f}}
@@ -53,7 +53,7 @@ void func_8038AB30(ParticleEmitter *pCtrl, f32 position[3], s32 cnt){
 void func_8038ABD8(f32 position[3], s32 cnt){
    ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
    func_8038AB30(pCtrl, position, cnt);
-    particleEmitter_setParticleSpawnPositionRange(pCtrl, 
+    particleEmitter_setSpawnPositionRange(pCtrl, 
        -40.0f, -5.0f, -40.0f,
        60.0f, 20.0f, 60.0f
    );
@@ -71,7 +71,7 @@ void func_8038ABD8(f32 position[3], s32 cnt){
 void func_8038ACEC(f32 pos[3], s32 cnt){
    ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
    func_8038AB30(pCtrl, pos, cnt);
-    particleEmitter_setParticleSpawnPositionRange(pCtrl, 
+    particleEmitter_setSpawnPositionRange(pCtrl, 
        -80.0f, 20.0f, -80.0f,
        120.0f, 120.0f, 120.0f
    );
@@ -90,10 +90,10 @@ void func_8038ADFC(f32 pos[3], s32 cnt){
    ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
    particleEmitter_setModel(pCtrl, 0x389);
    particleEmitter_setPosition(pCtrl, pos);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_803910D4);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_803910D4);
    particleEmitter_setAngularVelocityRange(pCtrl, -500.0f, -500.0f, -500.0f, 500.0f, 500.0f, 500.0f);
-    func_802EF9F8(pCtrl, 0.6f);
+    particleEmitter_func_802EF9F8(pCtrl, 0.6f);
-    func_802EFA18(pCtrl, 2);
+    particleEmitter_func_802EFA18(pCtrl, 2);
    particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
    particleEmitter_setDrawMode(pCtrl, 2);
    particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
--- a/src/GV/code_5570.c
+++ b/src/GV/code_5570.c
@@ -26,7 +26,7 @@ ActorAnimationInfo D_80391120[] ={
 ActorInfo D_80391158 = { MARKER_A6_GRABBA, ACTOR_118_GRABBA, ASSET_371_MODEL_GRABBA, 
    0x1, D_80391120, 
-    GV_func_8038BEA0, func_80326224, actor_draw, 
+    GV_func_8038BEA0, actor_update_func_80326224, actor_draw, 
    0, 0, 0.0f, 0
 };
@@ -122,7 +122,7 @@ void func_8038BBFC(ParticleEmitter *pCtrl, f32 position[3], s32 cnt){
 void func_8038BC7C(f32 position[3], s32 cnt){
    ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
    func_8038BBFC(pCtrl, position, cnt);
-    particleEmitter_setParticleSpawnPositionRange(pCtrl,
+    particleEmitter_setSpawnPositionRange(pCtrl,
        -60.0f,  0.0f, -60.0f,
         60.0f, 30.0f,  60.0f
    );
@@ -140,7 +140,7 @@ void func_8038BC7C(f32 position[3], s32 cnt){
 void func_8038BD8C(f32 position[3], s32 cnt){
    ParticleEmitter *pCtrl = partEmitMgr_newEmitter(cnt);
    func_8038BBFC(pCtrl, position, cnt);
-    particleEmitter_setParticleSpawnPositionRange(pCtrl,
+    particleEmitter_setSpawnPositionRange(pCtrl,
        -40.0f,  0.0f, -40.0f,
         40.0f, 30.0f,  40.0f
    );
--- a/src/GV/code_61E0.c
+++ b/src/GV/code_61E0.c
@@ -17,7 +17,7 @@ ActorAnimationInfo D_80391190[] = {
 ActorInfo D_803911C0 = { 0xAC, 0x11E, 0x3E5,
    0, D_80391190,
-    GV_func_8038C658, func_80326224, GV_func_8038C5D0,
+    GV_func_8038C658, actor_update_func_80326224, GV_func_8038C5D0,
    0, 0, 0.0f, 0
 };
--- a/src/GV/code_6370.c
+++ b/src/GV/code_6370.c
@@ -24,19 +24,19 @@ Actor *func_8038CC40(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
 u8 D_803911F0[3] =  {0, 1, 2};
 ActorInfo D_803911F4 = { 0xBB, 0x285, 0x3E6, 
    0, NULL,
-    func_8038CC98, func_80326224, func_8038CC40,
+    func_8038CC98, actor_update_func_80326224, func_8038CC40,
    0, 0, 0.0f, 0
 };
 ActorInfo D_80391218 = { 0xBB, 0x286, 0x3E6, 
    0, NULL,
-    func_8038CC98, func_80326224, func_8038CC40,
+    func_8038CC98, actor_update_func_80326224, func_8038CC40,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8039123C = { 0xBB, 0x287, 0x3E6, 
    0, NULL,
-    func_8038CC98, func_80326224, func_8038CC40,
+    func_8038CC98, actor_update_func_80326224, func_8038CC40,
    0, 0, 0.0f, 0
 };
--- a/src/GV/code_7060.c
+++ b/src/GV/code_7060.c
@@ -16,7 +16,7 @@ ActorAnimationInfo D_80391290[] = {
 };
 ActorInfo D_803912B8 = { MARKER_F9_JINXY, ACTOR_1F7_JINXY, ASSET_422_MODEL_JINXY, 
    0x1, D_80391290, 
-    func_8038D47C, func_80326224, actor_draw, 
+    func_8038D47C, actor_update_func_80326224, actor_draw, 
    0, 0, 0.0f, 0
 };
--- a/src/GV/code_7FC0.c
+++ b/src/GV/code_7FC0.c
@@ -11,13 +11,13 @@ ActorAnimationInfo GV_D_80391380[] = {
 };
 ActorInfo GV_D_80391390 = { 0xFA, 0x1F8, 0x423,
    0x1, GV_D_80391380,
-    func_8038E3B0, func_80326224, actor_draw,
+    func_8038E3B0, actor_update_func_80326224, actor_draw,
    0, 0x100, 0.0f, 0
 };
 ActorInfo D_803913B4 = { 0xFB, 0x1F9, 0x424,
    0x1, GV_D_80391380,
-    func_8038E3B0, func_80326224, actor_draw,
+    func_8038E3B0, actor_update_func_80326224, actor_draw,
    0, 0x100, 0.0f, 0
 };
--- a/src/GV/code_7FF0.c
+++ b/src/GV/code_7FF0.c
@@ -82,25 +82,25 @@ ActorAnimationInfo D_803913E0[] = {
 ActorInfo D_80391428 = { MARKER_EC_GV_SUN_SWITCH, ACTOR_13F_GV_SUN_SWITCH, ASSET_400_MODEL_SUN_SWITCH, 
    0x1, D_803913E0, 
-    chSunSwitch_update, func_80326224, actor_draw,
+    chSunSwitch_update, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8039144C = { MARKER_F1_GV_STAR_SWITCH, ACTOR_144_GV_STAR_SWITCH, ASSET_3D7_MODEL_STAR_SWITCH, 
    0x1, D_803913E0, 
-    chStarSwitch_update, func_80326224, actor_draw,
+    chStarSwitch_update, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
 ActorInfo D_80391470 = { MARKER_F2_HONEYCOMB_SWITCH, ACTOR_145_HONEYCOMB_SWITCH, ASSET_438_MODEL_HONEYCOMB_SWITCH, 
    0x1, D_803913E0, 
-    chHoneycombSwitch_update, func_80326224, actor_draw,
+    chHoneycombSwitch_update, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
 ActorInfo D_80391494 = { MARKER_23C_GV_SNS_SWITCH, ACTOR_245_GV_SNS_SWITCH, ASSET_515_MODEL_GV_SNS_SWITCH, 
    0x1, D_803913E0, 
-    func_8038EF14, func_80326224, actor_draw,
+    func_8038EF14, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
@@ -118,31 +118,31 @@ ActorInfo D_803914DC = { MARKER_ED_GV_SUN_DOOR, ACTOR_140_GV_SUN_DOOR, ASSET_3FF
 ActorInfo GV_D_80391500 = { MARKER_F0_GV_KAZOOIE_DOOR, ACTOR_143_GV_KAZOOIE_DOOR, ASSET_3D9_MODEL_GV_KAZOOIE_DOOR, 
    0x1, 0x0, 
-    chKazooieDoor_update, func_80326224, func_80325F2C,
+    chKazooieDoor_update, actor_update_func_80326224, func_80325F2C,
    0, 0, 0.0f, 0
 };
 ActorInfo GV_D_80391524 = { MARKER_EF_GV_STAR_HATCH, ACTOR_142_GV_STAR_HATCH, ASSET_3DB_MODEL_GV_STAR_HATCH, 
    0x1, 0x0, 
-    func_8038E648, func_80326224, func_80325F2C,
+    func_8038E648, actor_update_func_80326224, func_80325F2C,
    0, 0, 0.0f, 0
 };
 ActorInfo D_80391548 = { MARKER_F3_GV_KAZOOIE_TARGET, ACTOR_146_GV_KAZOOIE_TARGET, ASSET_3E2_MODEL_GV_KAZOOIE_TARGET, 
    0x1, 0x0, 
-    chKazooieTarget_update, func_80326224, actor_drawFullDepth,
+    chKazooieTarget_update, actor_update_func_80326224, actor_drawFullDepth,
    0, 0x400, 0.0f, 0
 };
 ActorInfo D_8039156C = { MARKER_F8_GV_KAZOOIE_DOOR, ACTOR_1F5_GV_KAZOOIE_DOOR, ASSET_3D9_MODEL_GV_KAZOOIE_DOOR, 
    0x1, 0x0, 
-    func_8038E97C, func_80326224, func_80325F2C,
+    func_8038E97C, actor_update_func_80326224, func_80325F2C,
    0, 0, 0.0f, 0
 };
 ActorInfo D_80391590 = { MARKER_23A_GV_SNS_CHAMBER_DOOR, ACTOR_243_GV_SNS_CHAMBER_DOOR, ASSET_514_MODEL_GV_SNS_CHAMBER_DOOR, 
    0x1, 0x0, 
-    func_8038E914, func_80326224, func_80325F2C, 
+    func_8038E914, actor_update_func_80326224, func_80325F2C, 
    0, 0, 0.0f, 0
 };
--- a/src/MM/ch/chimpystump.c
+++ b/src/MM/ch/chimpystump.c
@@ -23,7 +23,7 @@ enum chchimpystump_state_e {
 ActorInfo chchimpystump = {
    MARKER_95_CHIMPY_STUMP, ACTOR_C5_CHIMPY_STUMP, ASSET_3C8_MODEL_CHIMPY_STUMP,
    1, NULL,
-    chchimpystump_update, func_80326224, actor_drawFullDepth,
+    chchimpystump_update, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
--- a/src/MM/ch/conga.c
+++ b/src/MM/ch/conga.c
@@ -46,7 +46,7 @@ ActorAnimationInfo chCongaAnimations[9] = {
 ActorInfo chcongaInfo = { MARKER_7_CONGA, ACTOR_8_CONGA, ASSET_35C_MODEL_CONGA,
    1, chCongaAnimations,
-    func_803876D0, func_80326224, actor_draw,
+    func_803876D0, actor_update_func_80326224, actor_draw,
    0, 0x333, 0.0f, 0
 };
--- a/src/MM/ch/grublin.c
+++ b/src/MM/ch/grublin.c
@@ -42,7 +42,7 @@ ActorAnimationInfo chGrublinAnimations[11] = {
 ActorInfo chgrublinInfo = { MARKER_5_GRUBLIN, ACTOR_6_GRUBLIN, ASSET_3C5_MODEL_GRUBLIN,
    1, chGrublinAnimations,
-    func_80388A80, func_80326224, actor_draw,
+    func_80388A80, actor_update_func_80326224, actor_draw,
    2500, 0, 1.0f, 0
 };
--- a/src/MM/ch/hut.c
+++ b/src/MM/ch/hut.c
@@ -117,6 +117,6 @@ void mm_resetHuts(void) {
 ActorInfo chhutInfo = {
    MARKER_51_MM_HUT, ACTOR_9_MM_HUT, ASSET_7D7_MODEL_MM_HUT,
    0, chhutAnimations,
-    chhut_update, func_80326224, chhut_draw,
+    chhut_update, actor_update_func_80326224, chhut_draw,
    0, 0x100, 0.0f, 0
 };
--- a/src/MM/ch/juju.c
+++ b/src/MM/ch/juju.c
@@ -34,7 +34,7 @@ enum chjuju_animation_state_e {
 ActorInfo chjujuInfo = {
    MARKER_67_JUJU, ACTOR_59_JUJU, ASSET_2E6_MODEL_JUJU,
    0, NULL,
-    chjuju_update, func_80326224, chjuju_draw,
+    chjuju_update, actor_update_func_80326224, chjuju_draw,
    0, 0, 0.0f, 0
 };
--- a/src/MM/ch/jujuhitbox.c
+++ b/src/MM/ch/jujuhitbox.c
@@ -24,7 +24,7 @@ void chjujuhitbox_setJuju(Actor *this, s32 slave_id, Actor *slavePtr);
 ActorInfo chjujuhitboxInfo = {
    MARKER_67_JUJU, ACTOR_11_JUJU_CTRL, 0,
    3, NULL,
-    chjujuhitbox_update, func_80326224, chjujuhitbox_draw,
+    chjujuhitbox_update, actor_update_func_80326224, chjujuhitbox_draw,
    0, 0, 0.0f, 0
 };
--- a/src/MM/ch/orange.c
+++ b/src/MM/ch/orange.c
@@ -19,7 +19,7 @@ enum chorange_state_e {
 ActorInfo chorangeInfo = {
    MARKER_C_ORANGE_PROJECTILE, ACTOR_14_ORANGE_PROJECTILE, ASSET_2D2_MODEL_ORANGE,
    1, NULL,
-    chorange_update, func_80326224, chorange_draw,
+    chorange_update, actor_update_func_80326224, chorange_draw,
    0, 0, 0.6f, 0
 };
--- a/src/MM/ch/orangepad.c
+++ b/src/MM/ch/orangepad.c
@@ -3,7 +3,7 @@
 #include "variables.h"
 /* extern functions */
-void func_80326224(Actor *);
+void actor_update_func_80326224(Actor *);
 void func_80329904(ActorMarker *, s32, void *);
 extern void func_802EFA20(ParticleEmitter *, f32, f32);
@@ -14,7 +14,7 @@ void chorangepad_update(Actor *);
 ActorInfo chorangepadInfo = {
    MARKER_66_ORANGE_PAD, ACTOR_57_ORANGE_PAD, ASSET_2EB_MODEL_ORANGE_PAD,
    0, NULL,
-    chorangepad_update, func_80326224, actor_draw,
+    chorangepad_update, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
@@ -66,12 +66,12 @@ void func_80386444(ActorMarker *marker) {
        particleEmitter_setStartingScaleRange(p_ctrl, 0.09f, 0.19f);
        particleEmitter_setFinalScaleRange(p_ctrl, 0.0f, 0.0f);
        particleEmitter_setParticleVelocityRange(p_ctrl, -200.0f, 500.0f, -200.0f, 200.0f, 700.0f, 200.0f);
-        particleEmitter_setParticleAccelerationRange(p_ctrl, 0.0f, -1200.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
+        particleEmitter_setAccelerationRange(p_ctrl, 0.0f, -1200.0f, 0.0f, 0.0f, -1200.0f, 0.0f);
        particleEmitter_setAngularVelocityRange(p_ctrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
        particleEmitter_setSpawnIntervalRange(p_ctrl, 0.0f, 0.01f);
        particleEmitter_setParticleLifeTimeRange(p_ctrl, 4.0f, 4.0f);
-        func_802EF9F8(p_ctrl, 0.01f);
+        particleEmitter_func_802EF9F8(p_ctrl, 0.01f);
-        func_802EFA18(p_ctrl, 3);
+        particleEmitter_func_802EFA18(p_ctrl, 3);
        func_802EFA20(p_ctrl, 1.0f, 1.3f);
        particleEmitter_emitN(p_ctrl, 30);
    }
--- a/src/MMM/ch/loggo.c
+++ b/src/MMM/ch/loggo.c
@@ -16,7 +16,7 @@ ActorAnimationInfo chLoggoAnimations[] = {
 ActorInfo chLoggo = {
    MARKER_252_LOGGO, ACTOR_37F_LOGGO, ASSET_519_MODEL_LOGGO, 
    0x1, chLoggoAnimations, 
-    chLoggo_update, func_80326224, actor_draw, 
+    chLoggo_update, actor_update_func_80326224, actor_draw, 
    1000, 0, 0.0f, 0
 };
--- a/src/MMM/ch/motzhand.c
+++ b/src/MMM/ch/motzhand.c
@@ -17,7 +17,7 @@ Actor *chMotzhand_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
 ActorInfo chMotzhand = {
    MARKER_49_MOTZHAND, ACTOR_3A_MOTZHAND, ASSET_88C_MODEL_MOTZHAND,
    0x0, NULL,
-    chmotzhand_update, func_80326224, chMotzhand_draw,
+    chmotzhand_update, actor_update_func_80326224, chMotzhand_draw,
    0, 0, 0.0f, 0
 };
--- a/src/MMM/ch/napper.c
+++ b/src/MMM/ch/napper.c
@@ -218,7 +218,7 @@ void chnapper_update(Actor *this){
    }//L80387154
    if(this->state == 4){
-        func_80326224(this);
+        actor_update_func_80326224(this);
        if(0.99 <= this->unk48)
            marker_despawn(this->marker);
    }
--- a/src/MMM/code_16B0.c
+++ b/src/MMM/code_16B0.c
@@ -118,7 +118,7 @@ void func_80387D48(ActorMarker *marker){
 void func_80387DF8(f32 position[3], s32 count, enum asset_e sprite_id) {
    static s32 D_8038BAF4[3] = {0xB4, 0xFF, 0x8C};
    static ParticleScaleAndLifetimeRanges D_8038BB00 = {{0.2f, 0.4f}, {1.8f, 2.8f}, {0.0f, 0.15f}, {0.7f, 1.2f}, 0.0f, 0.01f};
-    static struct43s D_8038BB28 = {
+    static ParticleSettingsVelocityAccelerationPosition D_8038BB28 = {
        {{-150.0f,  250.0f, -150.0f}, {150.0f,  300.0f, 150.0f}},
        {{   0.0f, -600.0f,    0.0f}, {  0.0f, -600.0f,   0.0f}},
        {{ -50.0f,  -50.0f,  -50.0f}, { 50.0f,   50.0f,  50.0f}}
@@ -129,14 +129,14 @@ void func_80387DF8(f32 position[3], s32 count, enum asset_e sprite_id) {
    particleEmitter_setRGB(pCtrl, D_8038BAF4);
    particleEmitter_setSprite(pCtrl, sprite_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8038BB28);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8038BB28);
    particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038BB00);
    particleEmitter_emitN(pCtrl, count);
 }
 void func_80387E84(f32 position[3], s32 count, enum asset_e model_id) {
    static ParticleScaleAndLifetimeRanges D_8038BB70 = {{1.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 0.0f}, {3.2f, 3.2f}, 0.0f, 0.45f};
-    static struct43s D_8038BB98 = {
+    static ParticleSettingsVelocityAccelerationPosition D_8038BB98 = {
        {{-90.0f,   300.0f, -90.0f}, {90.0f,   660.0f, 90.0f}},
        {{  0.0f, -1200.0f,   0.0f}, { 0.0f, -1200.0f,  0.0f}},
        {{-50.0f,     0.0f, -50.0f}, {50.0f,    50.0f, 50.0f}}
@@ -146,10 +146,10 @@ void func_80387E84(f32 position[3], s32 count, enum asset_e model_id) {
    pCtrl = partEmitMgr_newEmitter(count);
    particleEmitter_setModel(pCtrl, model_id);
    particleEmitter_setPosition(pCtrl, position);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8038BB98);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8038BB98);
    particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
-    func_802EF9F8(pCtrl, 0.4f);
+    particleEmitter_func_802EF9F8(pCtrl, 0.4f);
-    func_802EFA18(pCtrl, 3);
+    particleEmitter_func_802EFA18(pCtrl, 3);
    func_802EFA20(pCtrl, 1.0f, 1.3f);
    particleEmitter_setSfx(pCtrl, SFX_2F_ORANGE_SPLAT, 16000);
    particleEmitter_setDrawMode(pCtrl, 2);
--- a/src/MMM/code_2040.c
+++ b/src/MMM/code_2040.c
@@ -63,98 +63,98 @@ ActorAnimationInfo D_8038BBE0[] = {
 ActorInfo D_8038BC28 = {
    0x9C, 0x109, 0x3CD,
    0x1, NULL,
-    func_802D3D54, func_80326224, actor_drawFullDepth,
+    func_802D3D54, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BC4C = {
    0x9E, 0x10B, 0x3CF,
    0x1, NULL,
-    func_802D3D54, func_80326224, actor_drawFullDepth,
+    func_802D3D54, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BC70 = {
    0x9A,  0xCB, 0x3CC,
    0x1, NULL,
-    func_802D3D54, func_80326224, actor_drawFullDepth,
+    func_802D3D54, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BC94 = {
    0xA2, 0x114, 0x3D3,
    0x1, NULL,
-    func_80388BDC, func_80326224, actor_drawFullDepth,
+    func_80388BDC, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BCB8 = {
    0xE7, 0x265, 0x4DA,
    0x1, NULL,
-    func_80389004, func_80326224, actor_drawFullDepth,
+    func_80389004, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BCDC = {
    0x9D, 0x10A, 0x3CE,
    0x1, NULL,
-    func_80389004, func_80326224, actor_drawFullDepth,
+    func_80389004, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BD00 = {
    0xD3, 0x191, 0x50B,
    0x1, NULL,
-    func_80389060, func_80326224, actor_drawFullDepth,
+    func_80389060, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BD24 = {
 0x123, 0x2E8, 0x4C0,
    0x1, NULL,
-    func_803890B8, func_80326224, actor_drawFullDepth,
+    func_803890B8, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BD48 = {
 0x1F2, 0x2E9, 0x4C1,
    0x1, NULL,
-    func_803890B8, func_80326224, actor_drawFullDepth,
+    func_803890B8, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BD6C = {
 0x1F3, 0x2EA, 0x4C2,
    0x1, NULL,
-    func_803890B8, func_80326224, actor_drawFullDepth,
+    func_803890B8, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BD90 = {
    0xFE, 0x1FD, 0x43D, 
    0x1, D_8038BBE0,
-    func_80388FE4, func_80326224, actor_draw,
+    func_80388FE4, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BDB4 = {
    0x9F, 0x10C, 0x3D0,
    0x1, NULL,
-    func_803888B8, func_80326224, func_80388994,
+    func_803888B8, actor_update_func_80326224, func_80388994,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BDD8 = {
    0xA0, 0x10D, 0x3D1,
    0x1, NULL,
-    func_803888B8, func_80326224, func_80388994,
+    func_803888B8, actor_update_func_80326224, func_80388994,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BDFC = {
    0xFF, 0x1FE, 0x43E,
    0x1, NULL,
-    func_803888B8, func_80326224, func_80388994,
+    func_803888B8, actor_update_func_80326224, func_80388994,
    0, 0, 0.0f, 0
 };
--- a/src/MMM/code_2F60.c
+++ b/src/MMM/code_2F60.c
@@ -15,42 +15,42 @@ ActorAnimationInfo D_8038BE30[] ={
 ActorInfo D_8038BE48 = {
    MARKER_255_PORTRAIT_OF_GRUNTY, ACTOR_382_PORTRAIT_OF_GRUNTY, ASSET_522_MODEL_PORTRAIT_OF_GRUNTY,
    0x1, D_8038BE30, 
-    func_803893A4, func_80326224, func_80389350, 
+    func_803893A4, actor_update_func_80326224, func_80389350, 
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BE6C = {
    MARKER_257_PORTRAIT_OF_BLACKEYE, ACTOR_384_PORTRAIT_OF_BLACKEYE, ASSET_527_MODEL_PORTRAIT_OF_BLACKEYE,
    0x1, D_8038BE30, 
-    func_803893A4, func_80326224, func_80389350, 
+    func_803893A4, actor_update_func_80326224, func_80389350, 
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BE90 = {
    MARKER_258_PORTRAIT_OF_TOWER, ACTOR_385_PORTRAIT_OF_TOWER, ASSET_528_MODEL_PORTRAIT_OF_TOWER,
    0x1, D_8038BE30, 
-    func_803893A4, func_80326224, func_80389350, 
+    func_803893A4, actor_update_func_80326224, func_80389350, 
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BEB4 = {
    MARKER_259_PORTRAIT_OF_TREE_AND_MOON, ACTOR_386_PORTRAIT_OF_TREE_AND_MOON, ASSET_529_MODEL_PORTRAIT_OF_TREE_AND_MOON,
    0x1, D_8038BE30, 
-    func_803893A4, func_80326224, func_80389350, 
+    func_803893A4, actor_update_func_80326224, func_80389350, 
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BED8 = {
    MARKER_25A_PORTRAIT_OF_TEEHEE, ACTOR_387_PORTRAIT_OF_TEEHEE, ASSET_52A_MODEL_PORTRAIT_OF_TEEHEE,
    0x1, D_8038BE30, 
-    func_803893A4, func_80326224, func_80389350, 
+    func_803893A4, actor_update_func_80326224, func_80389350, 
    0, 0, 0.0f, 0
 };
 ActorInfo D_8038BEFC = {
    MARKER_25B_PORTRAIT_OF_MINION, ACTOR_388_PORTRAIT_OF_MINION, ASSET_52B_MODEL_PORTRAIT_OF_MINION,
    0x1, D_8038BE30, 
-    func_803893A4, func_80326224, func_80389350, 
+    func_803893A4, actor_update_func_80326224, func_80389350, 
    0, 0, 0.0f, 0
 };
--- a/src/MMM/code_DC0.c
+++ b/src/MMM/code_DC0.c
@@ -14,7 +14,7 @@ ActorAnimationInfo D_8038BA50[] = {
 ActorInfo D_8038BA68 = {
    MARKER_34_CEMETARY_POT, ACTOR_25_CEMETARY_POT, ASSET_3AE_MODEL_GRAVE_FLOWER_POT, 
    0x1, D_8038BA50, 
-    func_80387280, func_80326224, actor_draw, 
+    func_80387280, actor_update_func_80326224, actor_draw, 
    0, 0, 0.0f, 0
 };
--- a/src/RBB/ch/boombox.c
+++ b/src/RBB/ch/boombox.c
@@ -80,7 +80,7 @@ void func_8038E998(Actor *this){
    particleEmitter_setPosition(other, this->position);
    particleEmitter_setStartingScaleRange(other, 0.25f, 0.75f);
    particleEmitter_setFinalScaleRange(other, 0.75f, 1.75f);
-    particleEmitter_setParticleSpawnPositionRange(other, -50.0f, 25.0f, -50.0f, 50.0f, 25.0f, 50.0f);
+    particleEmitter_setSpawnPositionRange(other, -50.0f, 25.0f, -50.0f, 50.0f, 25.0f, 50.0f);
    particleEmitter_setParticleVelocityRange(other, -50.0f, 100.0f, -50.0f, 50.0f, 200.0f, 50.0f);
    particleEmitter_setParticleLifeTimeRange(other, 0.5f, 1.0f);
    particleEmitter_emitN(other, 2);
@@ -95,7 +95,7 @@ void func_8038EAB4(Actor *this){
    particleEmitter_setDrawMode(other, PART_EMIT_NO_LOOP);
    particleEmitter_setStartingFrameRange(other, 0, 0);
    particleEmitter_setParticleFramerateRange(other, 4.0f, 4.0f);
-    particleEmitter_setParticleSpawnPositionRange(other, 0.0f, 200.0f, 0.0f, 0.0f, 200.0f, 0.0f);
+    particleEmitter_setSpawnPositionRange(other, 0.0f, 200.0f, 0.0f, 0.0f, 200.0f, 0.0f);
    particleEmitter_setPosition(other, this->position);
    particleEmitter_setStartingScaleRange(other, 3.0f, 3.0f);
    particleEmitter_setFinalScaleRange(other, 8.0f, 8.0f);
@@ -113,7 +113,7 @@ void func_8038EC14(Actor *this){
    particleEmitter_setPosition(other, this->position);
    particleEmitter_setStartingScaleRange(other, 1.0f, 1.5f);
    particleEmitter_setFinalScaleRange(other, 2.0f, 3.0f);
-    particleEmitter_setParticleSpawnPositionRange(other, -75.0f, 25.0f, -75.0f, 75.0f, 75.0f, 75.0f);
+    particleEmitter_setSpawnPositionRange(other, -75.0f, 25.0f, -75.0f, 75.0f, 75.0f, 75.0f);
    particleEmitter_setParticleVelocityRange(other, -70.0f, 50.0f, -70.0f, 70.0f, 100.0f, 70.0f);
    particleEmitter_setRGB(other, &RBB_D_80390DD0);
    particleEmitter_setParticleLifeTimeRange(other, 3.0f, 4.0f);
@@ -122,9 +122,9 @@ void func_8038EC14(Actor *this){
 void func_8038ED3C(Actor * actor, s32 arg1){
    ParticleEmitter *other = partEmitMgr_newEmitter(0xa);
-    particleEmitter_setParticleAccelerationRange(other, 0.0f, -800.0f, 0.0f, 0.0f, -800.0f, 0.0f);
+    particleEmitter_setAccelerationRange(other, 0.0f, -800.0f, 0.0f, 0.0f, -800.0f, 0.0f);
-    func_802EF9F8(other, 0.6f);
+    particleEmitter_func_802EF9F8(other, 0.6f);
-    func_802EFA18(other, 3);
+    particleEmitter_func_802EFA18(other, 3);
    particleEmitter_setModel(other, arg1);
    particleEmitter_setPosition(other, actor->position);
    particleEmitter_setStartingScaleRange(other, 0.05f, 0.4f);
--- a/src/RBB/ch/bossboombox.c
+++ b/src/RBB/ch/bossboombox.c
@@ -72,14 +72,14 @@ ActorInfo RBB_D_80390C3C = {
 s32 D_80390C60[3] = {0xDE, 0xA7, 0x71};
-struct41s D_80390C6C = {
+ParticleSettingsVelocityAcceleration D_80390C6C = {
    { {-200.0f, 200.0f, -200.0f}, {200.0f, 500.0f, 200.0f} },
    { {0.0f, -800.0f, 0.0f}, {0.0f, -800.0f, 0.0f} }
 };
 s32 D_80390C9C[3] = {0xDE, 0xA7, 0x71};
-struct43s D_80390CA8 = {
+ParticleSettingsVelocityAccelerationPosition D_80390CA8 = {
    { {-200.0f, 0.0f, -200.0f}, {200.0f, -50.0f, 200.0f} },
    { {0.0f, 200.0f, 0.0f}, {0.0f, 400.0f, 0.0f} },
    { {-10.0f, -10.0f, -10.0f}, {10.0f, 10.0f, 10.0f} }
@@ -106,7 +106,7 @@ void func_8038C39C(Actor *this){
    particleEmitter_setPosition(other, this->position);
    particleEmitter_setStartingScaleRange(other, local->unk0->unk4*1, local->unk0->unk4*3.0f);
    particleEmitter_setFinalScaleRange(other, 3.0f*local->unk0->unk4, local->unk0->unk4*7.0f);
-    particleEmitter_setParticleSpawnPositionRange(other, 
+    particleEmitter_setSpawnPositionRange(other, 
        local->unk0->unk4*-200.0f, local->unk0->unk4*100.0f, local->unk0->unk4*-200.0f,
        local->unk0->unk4*200.0f, local->unk0->unk4*100.0f, local->unk0->unk4*200.0f
    );
@@ -128,7 +128,7 @@ void RBB_func_8038C538(Actor *this){
    particleEmitter_setPosition(other, this->position);
    particleEmitter_setStartingScaleRange(other, local->unk0->unk4*1, local->unk0->unk4*6.0f);
    particleEmitter_setFinalScaleRange(other, 0.5*local->unk0->unk4, local->unk0->unk4*3.0f);
-    particleEmitter_setParticleSpawnPositionRange(other, 
+    particleEmitter_setSpawnPositionRange(other, 
        local->unk0->unk4*-300.0f, local->unk0->unk4*100.0f, local->unk0->unk4*-300.0f,
        local->unk0->unk4*300.0f, local->unk0->unk4*300.0f, local->unk0->unk4*300.0f
    );
@@ -146,11 +146,11 @@ void RBB_func_8038C70C(Actor *this){
    ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local;
    ParticleEmitter *other = partEmitMgr_newEmitter(0xa);
-    func_802EF9F8(other, 0.6f);
+    particleEmitter_func_802EF9F8(other, 0.6f);
-    func_802EFA18(other, 3);
+    particleEmitter_func_802EFA18(other, 3);
    particleEmitter_setDrawMode(other, 4);
    particleEmitter_setModel(other, 0x427);
-    particleEmitter_setParticleSpawnPositionRange(other, 
+    particleEmitter_setSpawnPositionRange(other, 
        local->unk0->unk4 * -300.0f, local->unk0->unk4 * 100.0f, local->unk0->unk4 * -300.0f, 
        local->unk0->unk4 * 300.0f, local->unk0->unk4 * 200.0f, local->unk0->unk4 * 300.0f
    );
@@ -183,7 +183,7 @@ void func_8038C8A8(Actor * this){
    particleEmitter_setPosition(other, sp24);
    particleEmitter_setStartingScaleRange(other, local->unk0->unk4*1, local->unk0->unk4*3.0f);
    particleEmitter_setFinalScaleRange(other, local->unk0->unk4*3.0f, local->unk0->unk4*6.0f);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(other, &D_80390CA8);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(other, &D_80390CA8);
    particleEmitter_setParticleLifeTimeRange(other, 1.0f, 2.0f);
    particleEmitter_setRGB(other, &D_80390C9C);
    particleEmitter_emitN(other, 5);
--- a/src/RBB/ch/dolphin.c
+++ b/src/RBB/ch/dolphin.c
@@ -56,7 +56,7 @@ void func_8038B900(Actor *this){
                other = func_802EDD8C(&sp48, 0.0f, -1300.0f);
                particleEmitter_setStartingScaleRange(other, 0.04f, 0.04f);
                particleEmitter_setFinalScaleRange(other, 0.18f, 0.18f);
-                particleEmitter_setParticleSpawnPositionRange(other, -10.0f, 0.0f, -10.0f, 10.0f, 20.0f, 10.0f);
+                particleEmitter_setSpawnPositionRange(other, -10.0f, 0.0f, -10.0f, 10.0f, 20.0f, 10.0f);
                particleEmitter_setParticleVelocityRange(other, 0.0f, 31.0f, 0.0f, 0.0f, 37.0f, 0.0f);
                particleEmitter_emitN(other, 1);
            }
@@ -105,7 +105,7 @@ void func_8038B900(Actor *this){
        }
        if(this->state == 3){
-            func_80326224(this);
+            actor_update_func_80326224(this);
            if(0.99 < this->unk48){   
                mapSpecificFlags_set(4, FALSE);
                marker_despawn(this->marker);
--- a/src/RBB/ch/whistle.c
+++ b/src/RBB/ch/whistle.c
@@ -77,12 +77,12 @@ void RBB_func_8038B0B8(Actor *this, s32 arg1){
        timed_playSfx(0.1f, local->unk0->unk14, 1.0f, 0x7d00);
        other = partEmitMgr_newEmitter(0xa);
        particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
-        particleEmitter_setParticleAccelerationRange(other, 
+        particleEmitter_setAccelerationRange(other, 
            0.0f, 100.0f, 0.0f,
            0.0f, 250.0f, 0.0f
        );
        particleEmitter_setStartingFrameRange(other, 0, 7);
-        particleEmitter_setParticleSpawnPositionRange(other, 
+        particleEmitter_setSpawnPositionRange(other, 
            -5.0f, -5.0f, 0.0f,
            5.0f, 5.0f, 0.0f
        );
--- a/src/RBB/code_1570.c
+++ b/src/RBB/code_1570.c
@@ -38,7 +38,7 @@ ParticleScaleAndLifetimeRanges D_80390304 = {
 f32 D_8039032C[3] = {3700.0f, -300.0f, -300.0f};  
 f32 D_80390338[3] = {4500.0f, 100.0f, 400.0f}; 
-struct41s D_80390344= {
+ParticleSettingsVelocityAcceleration D_80390344= {
    {{-700.0f, 200.0f, -700.0f}, {700.0f, 500.0f, 700.0f}}, 
    {{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}}
 };
@@ -149,8 +149,8 @@ void func_80387D80(void){
 void func_80387E20(void){
    ParticleEmitter *actor = partEmitMgr_newEmitter(0x19);
-    func_802EF9F8(actor, 0.6f);
+    particleEmitter_func_802EF9F8(actor, 0.6f);
-    func_802EFA18(actor, 3);
+    particleEmitter_func_802EFA18(actor, 3);
    particleEmitter_setModel(actor, 0x427);
    particleEmitter_setStartingScaleRange(actor, 0.05f, 0.4f);
    particleEmitter_setAngularVelocityRange(actor, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
--- a/src/RBB/code_640.c
+++ b/src/RBB/code_640.c
@@ -78,49 +78,49 @@ ActorAnimationInfo D_803900C0[4] = {
 ActorInfo D_803900E0 = {
    0x107, 0x21D, 0x493, 0x1, NULL,
-    func_802D3D54, func_80326224, actor_drawFullDepth,
+    func_802D3D54, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_80390104 = {
    0x108, 0x21C, 0x492, 0x1, NULL,
-    func_802D3D54, func_80326224, actor_drawFullDepth,
+    func_802D3D54, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_80390128 = {
    0x22D, 0x266, 0x4BA, 0x1, NULL,
-    func_802D3D54, func_80326224, actor_drawFullDepth,
+    func_802D3D54, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_8039014C = {
    0x22E, 0x267, 0x4BB, 0x1, NULL,
-    func_802D3D54, func_80326224, actor_drawFullDepth,
+    func_802D3D54, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_80390170 = {
    0x235, 0x23F, 0x4E2, 0x1, NULL,
-    func_802D3D54, func_80326224, actor_drawFullDepth,
+    func_802D3D54, actor_update_func_80326224, actor_drawFullDepth,
    0, 0, 0.0f, 0
 };
 ActorInfo D_80390194 = {
    0x15F, 0x18F, 0x42F, 0x1, D_803900C0,
-    func_80386BF8, func_80326224, actor_draw,
+    func_80386BF8, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };
 ActorInfo D_803901B8 = {
    0x22F, 0x263, 0x4DB, 0x1, NULL,
-    func_80386A7C, func_80326224, func_80386B9C,
+    func_80386A7C, actor_update_func_80326224, func_80386B9C,
    0, 0, 0.0f, 0
 };
 ActorInfo D_803901DC = {
    0x230, 0x264, 0x4DE, 0x1, NULL,
-    func_80386A7C, func_80326224, func_80386B9C,
+    func_80386A7C, actor_update_func_80326224, func_80386B9C,
    0, 0, 0.0f, 0
 };
--- a/src/SM/ch/attacktutorial.c
+++ b/src/SM/ch/attacktutorial.c
@@ -17,7 +17,7 @@ void chAttackTutorial_update(Actor *);
 /* .data */
 ActorInfo D_8038AC20 = { MARKER_12B_ATTACK_TUTORIAL, ACTOR_167_ATTACK_TUTORIAL, 0,
    1, NULL,
-    chAttackTutorial_update, func_80326224, func_80325340,
+    chAttackTutorial_update, actor_update_func_80326224, func_80325340,
    0, 0, 0.0f, 0
 };
--- a/src/SM/ch/vegetables.c
+++ b/src/SM/ch/vegetables.c
@@ -33,12 +33,12 @@ ActorAnimationInfo chCarrotAnimations[5] = {
 };
 ActorInfo D_8038AC78 = { MARKER_12A_TOPPER_A, ACTOR_166_TOPPER_A, MODEL_TOPPER, 1, chCarrotAnimations,
-    func_80388080, func_80326224, func_80387DF4,
+    func_80388080, actor_update_func_80326224, func_80387DF4,
    2000, 0, 1.0f, 0
 };
 ActorInfo D_8038AC9C = { MARKER_1E6_TOPPER_B, ACTOR_TOPPER_B, MODEL_TOPPER, 1, chCarrotAnimations,
-    func_80388080, func_80326224, func_80387DF4,
+    func_80388080, actor_update_func_80326224, func_80387DF4,
    2000, 0, 1.0f, 0
 };
@@ -51,12 +51,12 @@ ActorAnimationInfo chOnionAnimations[5] = {
 };
 ActorInfo D_8038ACE8 = { MARKER_129_BAWL_A, ACTOR_165_BAWL_A, MODEL_BAWL, 1, chOnionAnimations,
-    func_80388080, func_80326224, func_80387DF4,
+    func_80388080, actor_update_func_80326224, func_80387DF4,
    0, 0, 1.0f, 0
 };
 ActorInfo D_8038AD0C = { MARKER_1E7_BAWL_B, ACTOR_BAWL_B, MODEL_BAWL, 1, chOnionAnimations,
-    func_80388080, func_80326224, func_80387DF4,
+    func_80388080, actor_update_func_80326224, func_80387DF4,
    0, 0, 1.0f, 0
 };
@@ -69,12 +69,12 @@ ActorAnimationInfo chCauliflowerAnimations[5] = {
 };
 ActorInfo D_8038AD58 = { MARKER_128_COLLYWOBBLE_A, ACTOR_164_COLLYWOBBLE_A, MODEL_COLLYWOBBLE, 1, chCauliflowerAnimations,
-    func_80388080, func_80326224, func_80387DF4,
+    func_80388080, actor_update_func_80326224, func_80387DF4,
    0, 0, 2.0f, 0
 };
 ActorInfo D_8038AD7C = { MARKER_1E8_COLLYWOBBLE_B, ACTOR_COLLYWOBBLE_B, MODEL_COLLYWOBBLE, 1, chCauliflowerAnimations,
-    func_80388080, func_80326224, func_80387DF4,
+    func_80388080, actor_update_func_80326224, func_80387DF4,
    0, 0, 2.0f, 0
 };
@@ -88,7 +88,7 @@ ParticleScaleAndLifetimeRanges D_8038ADAC = {
    0.0f, 0.01f,
 };
-struct42s D_8038ADD4 = {
+ParticleSettingsVelocityPosition D_8038ADD4 = {
    {{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
    {{-40.0f, -40.0f, -40.0f}, {40.0f, 40.0f, 40.0f}}
 };
@@ -101,7 +101,7 @@ ParticleScaleAndLifetimeRanges D_8038AE04 = {
    0.0f, 0.2f
 };
-struct43s D_8038AE2C = {
+ParticleSettingsVelocityAccelerationPosition D_8038AE2C = {
    {{-100.0f, 200.0f, -100.0f}, {100.0f, 400.0f, 100.0f}}, 
    {{0.0f, -600.0f, 0.0f}, {0.0f, -600.0f, 0.0f}}, 
    {{-80.0f, -80.0f, -80.0f}, {80.0f, 80.0f, 80.0f}}
@@ -115,7 +115,7 @@ ParticleScaleAndLifetimeRanges D_8038AE74 = {
    0.0f, 0.5f
 };
-struct43s D_8038AE9C = {
+ParticleSettingsVelocityAccelerationPosition D_8038AE9C = {
    {{-100.0f, 400.0f, -100.0f}, {100.0f, 600.0f, 100.0f}}, 
    {{0.0f, -600.0f, 0.0f}, {0.0f, -600.0f, 0.0f}}, 
    {{-20.0f, -20.0f, -20.0f}, {20.0f, 20.0f, 20.0f}}
@@ -129,7 +129,7 @@ ParticleScaleAndLifetimeRanges D_8038AEE4 = {
    0.0f, 0.5f
 };
-struct43s D_8038AF0C ={
+ParticleSettingsVelocityAccelerationPosition D_8038AF0C ={
    {{-200.0f, 200.0f, -200.0f}, {200.0f, 600.0f, 200.0f}}, 
    {{0.0f, -900.0f, 0.0f}, {0.0f, -900.0f, 0.0f}}, 
    {{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}, 
@@ -148,39 +148,39 @@ void func_80387910(ParticleEmitter *arg0, f32 *arg1, s32 arg2){
 }
 void func_803879B8(ParticleEmitter *arg0, f32 *arg1, s32 arg2, enum asset_e model_id){
-    func_802EF9F8(arg0, 0.6f);
+    particleEmitter_func_802EF9F8(arg0, 0.6f);
-    func_802EFA18(arg0, 2);
+    particleEmitter_func_802EFA18(arg0, 2);
    particleEmitter_setModel(arg0, model_id);
    particleEmitter_setPosition(arg0, arg1);
    particleEmitter_setDrawMode(arg0, 2);
    particleEmitter_setAngularVelocityRange(arg0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
    particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AE04);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(arg0, &D_8038AE2C);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(arg0, &D_8038AE2C);
    particleEmitter_emitN(arg0, arg2);
 }
 void func_80387A80(ParticleEmitter *arg0, f32 *arg1, s32 arg2, enum asset_e model_id){
-    func_802EF9F8(arg0, 0.6f);
+    particleEmitter_func_802EF9F8(arg0, 0.6f);
-    func_802EFA18(arg0, 3);
+    particleEmitter_func_802EFA18(arg0, 3);
    particleEmitter_setModel(arg0, model_id);
    particleEmitter_setPosition(arg0, arg1);
    particleEmitter_setDrawMode(arg0, 2);
    particleEmitter_setAngularVelocityRange(arg0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
    particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AE74);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(arg0, &D_8038AE9C);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(arg0, &D_8038AE9C);
    particleEmitter_emitN(arg0, arg2);
 }
 void func_80387B48(ParticleEmitter *arg0, f32 arg1[3], s32 arg2, enum asset_e model_id){
-    func_802EF9F8(arg0, 0.7f);
+    particleEmitter_func_802EF9F8(arg0, 0.7f);
-    func_802EFA18(arg0, 4);
+    particleEmitter_func_802EFA18(arg0, 4);
    particleEmitter_setModel(arg0, model_id);
    particleEmitter_setPosition(arg0, arg1);
    particleEmitter_setDrawMode(arg0, 2);
    particleEmitter_setAngularVelocityRange(arg0, 150.0f, -300.0f, -300.0f, 300.0f, 300.0f, -150.0f);
    particleEmitter_setSfx(arg0, SFX_1F_HITTING_AN_ENEMY_3, 8000);
    particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AEE4);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(arg0, &D_8038AF0C);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(arg0, &D_8038AF0C);
    particleEmitter_emitN(arg0, arg2);
 }
--- a/src/SM/code_2990.c
+++ b/src/SM/code_2990.c
@@ -35,7 +35,7 @@ ActorAnimationInfo smMoleAnimations[6] = {
 ActorInfo chSmMole = {
    MARKER_B7_TUTORIAL_BOTTLES, ACTOR_12B_TUTORIAL_BOTTLES, ASSET_387_MODEL_BOTTLES,
    1, smMoleAnimations,
-    chsmmole_Update, func_80326224, func_802D94B4,
+    chsmmole_Update, actor_update_func_80326224, func_802D94B4,
    0, 0, 0.0f, 0
 };
--- a/src/SM/code_3FC0.c
+++ b/src/SM/code_3FC0.c
@@ -17,7 +17,7 @@ ActorAnimationInfo D_8038AFF0[] = {
 ActorInfo D_8038B008 = { 
    0xE1, 0x198, 0x530,
    2, D_8038AFF0,
-    func_8038A3B0, func_80326224, actor_draw,
+    func_8038A3B0, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };//chBanjosBed
@@ -30,7 +30,7 @@ ActorAnimationInfo D_8038B02C[] = {
 ActorInfo D_8038B044 ={
    0xE2, 0x199, 0x52F,
    2, D_8038B02C,
-    func_8038A3B0, func_80326224, actor_draw,
+    func_8038A3B0, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };//chBanjosChair
@@ -43,7 +43,7 @@ ActorAnimationInfo D_8038B068[] = {
 ActorInfo D_8038B080 ={
    0xE3, 0x19A, 0x337,
    2, D_8038B068,
-    func_8038A3B0, func_80326224, actor_draw,
+    func_8038A3B0, actor_update_func_80326224, actor_draw,
    0, 0, 0.0f, 0
 };//chBanjosStove
--- a/src/SM/code_4070.c
+++ b/src/SM/code_4070.c
@@ -12,7 +12,7 @@ void func_8038A4DC(Actor *this, s32 arg1);
 /* .data */
 ActorInfo D_8038B0B0 = { 0x1ED, 0x3B9, 0, 1, NULL,
-    SM_func_8038A5D8, func_80326224, func_80325340,
+    SM_func_8038A5D8, actor_update_func_80326224, func_80325340,
    0, 0, 0.0f, 0
 };
--- a/src/SM/code_44D0.c
+++ b/src/SM/code_44D0.c
@@ -11,7 +11,7 @@ void func_8038A8F8(Actor *this);
 /* .data */
 ActorInfo D_8038B0E0 = { 0x1F0, 0x3BD, 0, 0, NULL,
-    func_8038A8F8, func_80326224, func_80325340,
+    func_8038A8F8, actor_update_func_80326224, func_80325340,
    0, 0, 0.0f, 0
 };
--- a/src/SM/code_5B0.c
+++ b/src/SM/code_5B0.c
@@ -18,18 +18,18 @@ ActorAnimationInfo D_8038AAF0[] = {
 ActorInfo D_8038AB00 = {
    MARKER_135_QUARRIE, ACTOR_16F_QUARRIE, ASSET_42D_MODEL_QUARRIE, 
    1,  NULL,
-    SM_func_80386EF4, func_80326224, actor_drawFullDepth,
+    SM_func_80386EF4, actor_update_func_80326224, actor_drawFullDepth,
    2000, 0, 5.0f, 0
 };
 ActorInfo D_8038AB24 = {
    MARKER_29D_ROCK_TRAPPING_GRUNTY, ACTOR_3CA_ROCK_TRAPPING_GRUNTY, ASSET_47B_MODEL_ROCK,
    1, D_8038AAF0,
-    SM_func_80386A00, func_80326224, actor_drawFullDepth, 
+    SM_func_80386A00, actor_update_func_80326224, actor_drawFullDepth, 
    0, 0, 0.0f, 0
 };
-struct43s D_8038AB48 = {
+ParticleSettingsVelocityAccelerationPosition D_8038AB48 = {
    {{-200.0f, 600.0f, -200.0f}, {200.0f, 800.0f, 200.0f}}, 
    {{0.0f, -1800.0f, 0.0f}, {0.0f, -1800.0f, 0.0f}},
    {{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}
@@ -37,7 +37,7 @@ struct43s D_8038AB48 = {
 s32 D_8038AB90[3] = {0xFF, 0xFF, 0xFF};
-struct43s D_8038AB9C = {
+ParticleSettingsVelocityAccelerationPosition D_8038AB9C = {
    {{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}},
    {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}},
    {{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}
@@ -70,8 +70,8 @@ void SM_func_80386A00(Actor *this) {
 }
 void func_80386B04(ParticleEmitter *p_ctrl, f32 *arg1, s32 arg2, f32 arg3) {
-    func_802EF9F8(p_ctrl, 0.6f);
+    particleEmitter_func_802EF9F8(p_ctrl, 0.6f);
-    func_802EFA18(p_ctrl, 4);
+    particleEmitter_func_802EFA18(p_ctrl, 4);
    particleEmitter_setFade(p_ctrl, 0.00f, 0.75f);
    particleEmitter_setModel(p_ctrl, 0x42E);
    particleEmitter_setPosition(p_ctrl, arg1);
@@ -81,7 +81,7 @@ void func_80386B04(ParticleEmitter *p_ctrl, f32 *arg1, s32 arg2, f32 arg3) {
    particleEmitter_setAngularVelocityRange(p_ctrl, -100.0f, -100.0f, -100.0f, 100.0f, 100.0f, 100.0f);
    particleEmitter_setSpawnIntervalRange(p_ctrl, 0.00f, 0.01f);
    particleEmitter_setParticleLifeTimeRange(p_ctrl, 2.0f, 2.0f);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(p_ctrl, &D_8038AB48);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(p_ctrl, &D_8038AB48);
    particleEmitter_emitN(p_ctrl, arg2);
 }
@@ -95,7 +95,7 @@ void func_80386C2C(ParticleEmitter *p_ctrl, f32 *arg1, s32 arg2, f32 arg3) {
    particleEmitter_setFinalScaleRange(p_ctrl, (arg3 * 1.5), (arg3 * 3.0));
    particleEmitter_setSpawnIntervalRange(p_ctrl, 0.0f, 0.01f);
    particleEmitter_setParticleLifeTimeRange(p_ctrl, 1.5f, 2.0f);
-    particleEmitter_setPositionVelocityAndAccelerationRanges(p_ctrl, &D_8038AB9C);
+    particleEmitter_setVelocityAccelerationAndPositionRanges(p_ctrl, &D_8038AB9C);
    particleEmitter_emitN(p_ctrl, arg2);
 }
--- a/src/SM/code_BF0.c
+++ b/src/SM/code_BF0.c
@@ -8,7 +8,7 @@ void SM_func_80386FE0(Actor *this);
 ActorInfo D_8038ABF0 = {
    0x134, 0x16E, 0,
    1, NULL,
-    SM_func_80386FE0, func_80326224, func_80325340,
+    SM_func_80386FE0, actor_update_func_80326224, func_80325340,
    2000, 0, 0.0f, 0
 };
--- a/Show More
+++ b/Show More