document core2/ch/snowball.c

decompressed.us.v10.yaml

@@ -699,8 +699,8 @@ segments:
   - [0xFAF340, c, code_599E0] #DONE
   - [0xFAF3E0, c, code_59A80] #DONE
   - [0xFAF6A0, c, code_59D40] #DONE
-  - [0xFB0490, c, ch/code_5AB30] #DONE
+  - [0xFB0490, c, ch/snowman] #DONE
-  - [0xFB1000, c, code_5B6A0] #DONE
+  - [0xFB1000, c, ch/snowball] #DONE
   - [0xFB16F0, c, code_5BD90] #DONE
   - [0xFB1810, c, code_5BEB0]
   - [0xFB1BA0, c, code_5C240] #DONE
@@ -995,8 +995,8 @@ segments:
   - [0x1036E10, .data, code_59780]
   - [0x1036F70, .data, code_59A80]
   - [0x1036FA0, .data, code_59D40]
-  - [0x1037020, .data, ch/code_5AB30]
+  - [0x1037020, .data, ch/snowman]
-  - [0x10370E0, .data, code_5B6A0]
+  - [0x10370E0, .data, ch/snowball]
   - [0x1037190, .data, code_5BD90]
   - [0x10371C0, .data, code_5C870]
   - [0x1037200, .data, code_5DBC0]
@@ -1248,8 +1248,8 @@ segments:
   - [0x1045A00, .rodata, code_599E0]
   - [0x1045A10, .rodata, code_59A80]
   - [0x1045A20, .rodata, code_59D40]
-  - [0x1045A70, .rodata, ch/code_5AB30]
+  - [0x1045A70, .rodata, ch/snowman]
-  - [0x1045AA0, .rodata, code_5B6A0]
+  - [0x1045AA0, .rodata, ch/snowball]
   - [0x1045AD0, .rodata, code_5C240]
   - [0x1045AE0, .rodata, code_5C870]
   - [0x1045B50, .rodata, code_5FD90]
@@ -1500,7 +1500,7 @@ segments:
   - [0x1048560, .bss, ch/bottlesbonuscursor]
   - [0x1048560, .bss, code_59A80]
   - [0x1048560, .bss, code_59D40]
-  - [0x1048560, .bss, code_5B6A0]
+  - [0x1048560, .bss, ch/snowball]
   - [0x1048560, .bss, code_5BEB0]
   - [0x1048560, .bss, code_5C240]
   - [0x1048560, .bss, code_5C870]

include/enums.h

@@ -2597,8 +2597,8 @@ enum asset_e
     ASSET_376_MODEL_SLAPPA,
     ASSET_377_MODEL_SIR_SLUSH,
     ASSET_378_MODEL_SNOWBALL,
-    // 379 Sir Slush Hat
+    ASSET_379_MODEL_SIRSLUSH_HAT,
-    // 37a (Sir Slush Snowball?)
+    ASSET_37A_MODEL_TINY_SNOWBALL,
     // 37b Snowball Fragment
     // 37c Yum-Yum Large Shell Fragment
     // 37d Yum-Yum Eye
@@ -3793,6 +3793,7 @@ enum marker_e{
     MARKER_AF_MAGIC_CARPET_SHADOW = 0xAF,
     MARKER_B0_MAGIC_CARPET_2,
     MARKER_B1_SIR_SLUSH,
+    MARKER_B2_SNOWBALL,
 
     MARKER_B5_RED_FEATHER_COLLECTABLE = 0xB5,
 

src/core2/ch/snowball.c

@@ -9,16 +9,16 @@ extern f32 func_8033229C(ActorMarker *);
 typedef struct{
     s32 unk0;
     s32 unk4;
-}ActorLocal_core2_5B6A0;
+}ActorLocal_chSnowball;
 
-Actor *func_802E2630(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
+Actor *chSnowball_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
-void func_802E28D0(Actor *this);
+void chSnowball_update(Actor *this);
 
 /* .data */
-ActorInfo D_80368710 = { 
+ActorInfo chSnowball = { 
-    0xB2, 0x125, ASSET_378_MODEL_SNOWBALL, 
+    MARKER_B2_SNOWBALL, ACTOR_125_SNOWBALL, ASSET_378_MODEL_SNOWBALL, 
     0x1, NULL, 
-    func_802E28D0, func_80326224, func_802E2630, 
+    chSnowball_update, func_80326224, chSnowball_draw, 
     0, 0x800, 0.8f, 0
 };
 
@@ -26,7 +26,7 @@ ActorInfo D_80368710 = {
 f32 D_8037E640[3];
 
 /* .code */
-Actor *func_802E2630(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
+Actor *chSnowball_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
     Actor *this;
 
     this = func_80325888(marker, gfx, mtx, vtx);
@@ -37,7 +37,7 @@ Actor *func_802E2630(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
     return this;
 }
 
-void func_802E26A4(f32 position[3]) {
+void __chSnowball_spawnPieces(f32 position[3]) {
     static struct31s D_80368734 = {{0.65f, 1.1}, {0.0f, 0.0f}, {0.0f, 0.01f}, {0.8f, 0.8f}, 0.0f, 0.5f};
     static struct43s D_8036875C = {
         {{-220.0f,  210.0f, -220.0f}, {280.0f,  460.0f, 280.0f}},
@@ -48,7 +48,7 @@ void func_802E26A4(f32 position[3]) {
 
      
     pCtrl = partEmitList_pushNew(8);
-    particleEmitter_setModel(pCtrl, 0x37A);
+    particleEmitter_setModel(pCtrl, ASSET_37A_MODEL_TINY_SNOWBALL);
     particleEmitter_setPosition(pCtrl, position);
     particleEmitter_setPositionVelocityAndAccelerationRanges(pCtrl, &D_8036875C);
     func_802EFE24(pCtrl, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
@@ -56,9 +56,9 @@ void func_802E26A4(f32 position[3]) {
     particleEmitter_emitN(pCtrl, 8);
 }
 
-void func_802E2748(Actor *this, s32 arg1) {
+void __chSnowball_collisionCallback(Actor *this, bool water_collision) {
     static f32 D_803687A4[4] = {0.2f, 0.3f, 1.0f, 1.2f};
-    if (arg1 != 0) {
+    if (water_collision) {
         D_8037E640[0] = this->position[0];
         D_8037E640[1] = this->position[1];
         D_8037E640[2] = this->position[2];
@@ -74,24 +74,24 @@ void func_802E2748(Actor *this, s32 arg1) {
     }
     else{
         func_8030E878(SFX_2F_ORANGE_SPLAT, 1.0f, 32000, this->position, 1250.0f, 2500.0f);
-        func_802E26A4(this->position);
+        __chSnowball_spawnPieces(this->position);
         marker_despawn(this->marker);
     }
 }
 
-void func_802E28A4(ActorMarker *marker, ActorMarker *other_marker){
+void __chSnowball_actorCollisionCallback(ActorMarker *marker, ActorMarker *other_marker){
     Actor *this;
 
     this = marker_getActor(marker);
-    func_802E2748(this, 0);
+    __chSnowball_collisionCallback(this, 0);
 }
 
-void func_802E28D0(Actor *this) {
+void chSnowball_update(Actor *this) {
     f32 sp7C[3];
     f32 sp70[3];
     f32 sp64[3];
     f32 sp58[3];
-    ActorLocal_core2_5B6A0 *local = (ActorLocal_core2_5B6A0 *)&this->local; 
+    ActorLocal_chSnowball *local = (ActorLocal_chSnowball *)&this->local; 
     BKCollisionTri *temp_v0_3;
     s32 phi_a1;
     s32 i;
@@ -103,7 +103,7 @@ void func_802E28D0(Actor *this) {
 
 
     if(!this->initialized){
-        marker_setCollisionScripts(this->marker, NULL, NULL, func_802E28A4);
+        marker_setCollisionScripts(this->marker, NULL, NULL, __chSnowball_actorCollisionCallback);
         if(local->unk0 == 0){
             player_getPosition(this->unk1C);
             local->unk0 = 1;
@@ -144,7 +144,7 @@ void func_802E28D0(Actor *this) {
         if (local->unk4 >= 6) {
             temp_v0_3 = func_80320C94(sp64, this->position, func_8033229C(this->marker) * 1.2, sp70, 5, 0);
             if (temp_v0_3 != 0) {
-                func_802E2748(this, *((u32*)temp_v0_3 + 2) & 0x20000);
+                __chSnowball_collisionCallback(this, *((u32*)temp_v0_3 + 2) & 0x20000);
                 return;
             }
         }

src/core2/ch/snowman.c

@@ -18,42 +18,32 @@ typedef struct {
     u8 unkB;
 } ActorLocal_chSirSlush;
 
-Actor *func_802E1AC0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); //chSirSlush_draw
+Actor *chSnowman_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); //chSirSlush_draw
-void func_802E20E8(Actor *this); //chSirSlush_update
+void chSnowman_update(Actor *this); //chSirSlush_update
 
 /* .data */
-ActorAnimationInfo D_80368650[] = {
+ActorAnimationInfo chSnowmanAnimations[] = {
     {0, 0.0f},
     {ASSET_108_ANIM_SIR_SLUSH_IDLE,   0.8f},
     {ASSET_109_ANIM_SIR_SLUSH_ATTACK, 4.0f},
     {ASSET_220_ANIM_SIR_SLUSH_DIE,    1.6f}
 };
 
-ActorInfo D_80368670 = { 
+enum chsnowman_state_e{
+    CHSNOWMAN_STATE_1_IDLE = 1,
+    CHSNOWMAN_STATE_2_ATTACK,
+    CHSNOWMAN_STATE_3_DIE
+};
+
+ActorInfo chSnowman = { 
     MARKER_B1_SIR_SLUSH, ACTOR_124_SIR_SLUSH, ASSET_377_MODEL_SIR_SLUSH,
-    1, D_80368650,
+    CHSNOWMAN_STATE_1_IDLE, chSnowmanAnimations,
-    func_802E20E8, func_80326224, func_802E1AC0,
+    chSnowman_update, func_80326224, chSnowman_draw,
     0, 0x199, 0.0f, 0
 };
 
-struct31s D_80368694 = {
-    {0.4f, 1.55f},
-    {0.0f, 0.0f},
-    {0.0f, 0.01f},
-    {4.0f, 4.0f},
-    0.0f, 0.3f
-};
-
-struct43s D_803686BC = {
-    {{-250.0f, 600.0f, -250.0f}, {350.0f, 960.0f, 350.0f}},
-    {{0.0f, -1200.0f, 0.0f}, {0.0f, -1200.0f, 0.0f}},
-    {{-80.0f, 0.0f, -80.0f}, {80.0f, 200.0f, 80.0f}}
-};
-
-f32 D_80368704[3] = {350.0f, 600.0f, 65.0f};
-
 /* .code */
-Actor *func_802E1AC0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
+Actor *chSnowman_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
     Actor *actor;
     ActorLocal_chSirSlush *local;
 
@@ -64,29 +54,29 @@ Actor *func_802E1AC0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
     func_80325888(marker, gfx, mtx, vtx);
 }
 
-void func_802E1B24(ActorMarker *marker){
+void __chSnowman_spawnSnowball(ActorMarker *marker){
     Actor *actor;
     Actor *other;
-    f32 sp1C[3];
+    f32 player_position[3];
     ActorMarker *m = *(ActorMarker **)▮
 
     actor = marker_getActor(m);
     other = spawn_child_actor(ACTOR_125_SNOWBALL, &actor);
     if(m->unk14_21){
-        func_8034A174(m->unk44, 5, sp1C);
+        func_8034A174(m->unk44, 5, player_position);
     }
     else{
-        sp1C[0] = actor->position[0];
+        player_position[0] = actor->position[0];
-        sp1C[1] = actor->position[1];
+        player_position[1] = actor->position[1];
-        sp1C[2] = actor->position[2];
+        player_position[2] = actor->position[2];
-        sp1C[1] += 150.0f;
+        player_position[1] += 150.0f;
     }
-    other->position[0] = sp1C[0];
+    other->position[0] = player_position[0];
-    other->position[1] = sp1C[1];
+    other->position[1] = player_position[1];
-    other->position[2] = sp1C[2];
+    other->position[2] = player_position[2];
 }
 
-void func_802E1BD0(ActorMarker *marker){
+void __chSnowman_spawnHat(ActorMarker *marker){
     Actor *actor;
     Actor *other;
     f32 sp2C[3];
@@ -113,7 +103,20 @@ void func_802E1BD0(ActorMarker *marker){
     other->velocity[1] = 30.0f;
 }
 
-void func_802E1CB8(f32 position[3], s32 count){
+void __chSnowman_spawnSnowballParticles(f32 position[3], s32 count){
+    static struct31s D_80368694 = {
+        {0.4f, 1.55f},
+        {0.0f, 0.0f},
+        {0.0f, 0.01f},
+        {4.0f, 4.0f},
+        0.0f, 0.3f
+    };
+    static struct43s D_803686BC = {
+        {{-250.0f, 600.0f, -250.0f}, {350.0f, 960.0f, 350.0f}},
+        {{0.0f, -1200.0f, 0.0f}, {0.0f, -1200.0f, 0.0f}},
+        {{-80.0f, 0.0f, -80.0f}, {80.0f, 200.0f, 80.0f}}
+    };
+
     ParticleEmitter *particleSpawner = partEmitList_pushNew(count);
 
     particleEmitter_setModel(particleSpawner, ASSET_378_MODEL_SNOWBALL);
@@ -128,91 +131,91 @@ void func_802E1CB8(f32 position[3], s32 count){
     particleEmitter_emitN(particleSpawner, count);
 }
 
-void func_802E1DA0(Actor *this){
+void __chSnowman_enterIdle(Actor *this){
     ActorLocal_chSirSlush *local = (ActorLocal_chSirSlush *) &this->local;
-    func_80328B8C(this, 1, 0.01f, 1);
+    func_80328B8C(this, CHSNOWMAN_STATE_1_IDLE, 0.01f, 1);
     actor_loopAnimation(this);
     local->unk4 = 0.4f;
 }
 
-void func_802E1DE8(Actor *this){
+void __chSnowman_enterDeath(Actor *this){
-    func_80328B8C(this, 3, 0.01f, 1);
+    func_80328B8C(this, CHSNOWMAN_STATE_3_DIE, 0.01f, 1);
     actor_playAnimationOnce(this);
 }
 
-void func_802E1E20(Actor *this, f32 arg1){
+void __chSnowman_setYawTarget(Actor *this, f32 max_rotation){
     this->yaw_ideal = func_80329784(this);
     func_80328FB0(this, 6.0f);
 }
 
-int func_802E1E5C(Actor *this, s32 arg1){
+bool __chSnowman_isYawNearYawTarget(Actor *this, s32 max_angle_degree){
-    f32 f0;
+    f32 dYaw;
-    f0 = this->yaw - this->yaw_ideal;
+    dYaw = this->yaw - this->yaw_ideal;
-    if((f0 < arg1) && (-arg1 < f0)){
+    if((dYaw < max_angle_degree) && (-max_angle_degree < dYaw)){
-        return 1;
+        return TRUE;
     }
-    return 0;
+    return FALSE;
 }
 
-int func_802E1EB4(Actor *this, s32 arg1, s32 arg2){
+int __chSnowman_isPlayerInAttackRange(Actor *this, s32 min_distance, s32 max_distance){
-    f32 sp1C[3];
+    f32 player_position[3];
     if(this->unkF4_8 == 0x33){
-        player_getPosition(sp1C);
+        player_getPosition(player_position);
-        if( (this->position[1] + 500.0f < sp1C[1]) || (sp1C[1] < this->position[1] - 500.0f))
+        if( (this->position[1] + 500.0f < player_position[1]) || (player_position[1] < this->position[1] - 500.0f))
             return 0;
     }//L802E1F28
-    if(func_80329530(this, arg2) && !func_80329530(this, arg1)){
+    if(func_80329530(this, max_distance) && !func_80329530(this, min_distance)){
         return 1;
     }
     return 0;
 }
 
-int func_802E1F70(ActorMarker *marker, s32 arg1){
+int __chSnowman_func_802E1F70(ActorMarker *marker, s32 arg1){
     if(marker->unk40_31 == 0xB){
         marker->unk14_20 = 0x287;
     }
     else{
-        marker->unk14_20 = 0xB1;
+        marker->unk14_20 = MARKER_B1_SIR_SLUSH;
     }
-    return 1;
+    return TRUE;
 }
 
-void func_802E1FD0(ActorMarker *marker, ActorMarker *other_marker){
+void __chSnowman_deathCallback(ActorMarker *marker, ActorMarker *other_marker){
     Actor *actor = marker_getActor(marker);
     FUNC_8030E8B4(SFX_15_METALLIC_HIT_2, 1.0f, 30000, actor->position, 1500, 4500);
     FUNC_8030E8B4(SFX_3EA_UNKNOWN, 1.0f, 30000, actor->position, 1500, 4500);
     FUNC_8030E8B4(SFX_2F_ORANGE_SPLAT, 1.0f, 30000, actor->position, 1500, 4500);
 
-    __spawnQueue_add_1((GenMethod_1)func_802E1BD0, (s32)actor->marker);
+    __spawnQueue_add_1((GenMethod_1)__chSnowman_spawnHat, (s32)actor->marker);
     if(map_get() == MAP_27_FP_FREEZEEZY_PEAK)
         func_8038A978();
-    func_802E1CB8(actor->position, 0xC);
+    __chSnowman_spawnSnowballParticles(actor->position, 0xC);
     marker_despawn(actor->marker);
 }
 
-int func_802E208C(void){
+int __chSnowman_CCW_playerInProtectedZone(void){
-    f32 sp1C[3];
+    static f32 ccw_no_attack_zone[3] = {350.0f, 600.0f, 65.0f};
+    f32 player_position[3];
     if(map_get() == MAP_46_CCW_WINTER){
-        player_getPosition(sp1C);
+        player_getPosition(player_position);
-        if(func_802592C4(sp1C, D_80368704, 900.0f))
+        if(func_802592C4(player_position, ccw_no_attack_zone, 900.0f))
             return 1;
     }
     return 0;
 }
 
-//chSirSlush_update
+void chSnowman_update(Actor *this){
-void func_802E20E8(Actor *this){
     ActorLocal_chSirSlush *local = (ActorLocal_chSirSlush *) &this->local;
-    f32 sp38;
+    f32 dt;
 
 
-    sp38 = time_getDelta();
+    dt = time_getDelta();
     if(!this->unk16C_4){
         this->unk16C_4 = TRUE;
         this->marker->propPtr->unk8_3 = 0;
         actor_collisionOn(this);
-        marker_setCollisionScripts(this->marker, NULL, NULL, func_802E1FD0);
+        marker_setCollisionScripts(this->marker, NULL, NULL, __chSnowman_deathCallback);
-        func_803300C0(this->marker, func_802E1F70);
+        func_803300C0(this->marker, __chSnowman_func_802E1F70);
         local->unk9 = 0;
         local->unkA = 1;
         local->unkB = 0;
@@ -244,12 +247,12 @@ void func_802E20E8(Actor *this){
         local->unkB = 1;
     }//L802E2280
     switch(this->state){
-        case 1://L802E22B0
+        case CHSNOWMAN_STATE_1_IDLE://L802E22B0
             local->unk9 = FALSE;
             local->unkA = 1;
-            func_802E1E20(this, 6.0f);
+            __chSnowman_setYawTarget(this, 6.0f);
-            if(!func_80329530(this, 0xC4E)){
+            if(!func_80329530(this, 3150)){
-                func_802E1DE8(this);
+                __chSnowman_enterDeath(this);
             }
             else if( 
                 map_get() != MAP_27_FP_FREEZEEZY_PEAK
@@ -260,36 +263,36 @@ void func_802E20E8(Actor *this){
                     if( (func_8023DB5C() & 1)
                         || func_8028ECAC() == BSGROUP_A_FLYING
                     ){//L802E236C
-                        local->unk4 -= sp38;
+                        local->unk4 -= dt;
                     }
                 }
                 else{//L802E2380
-                    if( func_802E1EB4(this, 0x1f4, 0xabe)
+                    if( __chSnowman_isPlayerInAttackRange(this, 500, 2750)
-                        && func_802E1E5C(this, 3)
+                        && __chSnowman_isYawNearYawTarget(this, 3)
                         && func_8028EE84() != BSWATERGROUP_2_UNDERWATER
-                        && !func_802E208C()
+                        && !__chSnowman_CCW_playerInProtectedZone()
                     ){
-                        func_80328B8C(this, 2, 0.01f, 1);
+                        func_80328B8C(this, CHSNOWMAN_STATE_2_ATTACK, 0.01f, 1);
                         actor_playAnimationOnce(this);
                     }
                 }
             }
             break;
-        case 2://L802E23E8
+        case CHSNOWMAN_STATE_2_ATTACK://L802E23E8
-            if(!func_80329530(this, 0xC4E)){
+            if(!func_80329530(this, 3150)){
-                func_802E1DE8(this);
+                __chSnowman_enterDeath(this);
             }//L802E240C
             else if( 
                 0.98 < animctrl_getAnimTimer(this->animctrl)
-                || !func_802E1EB4(this, 0x1f4, 0xabe)
+                || !__chSnowman_isPlayerInAttackRange(this, 500, 2750)
                 || func_8028EE84() == BSWATERGROUP_2_UNDERWATER
-                || func_802E208C()
+                || __chSnowman_CCW_playerInProtectedZone()
             ){
-                func_802E1DA0(this);
+                __chSnowman_enterIdle(this);
             }
             else{
                 if(animctrl_getAnimTimer(this->animctrl) < 0.45){
-                    func_802E1E20(this, 6.0f);
+                    __chSnowman_setYawTarget(this, 6.0f);
                 }
                 if( actor_animationIsAt(this, 0.19f)
                     || actor_animationIsAt(this, 0.28f)
@@ -309,15 +312,15 @@ void func_802E20E8(Actor *this){
                     && local->unkB
                 ){
                     func_8030E878(SFX_8F_SNOWBALL_FLYING, randf2(0.95f, 1.05f), 30000, this->position, 800.0f, 3050.0f);
-                    __spawnQueue_add_1((GenMethod_1)func_802E1B24, (s32)this->marker);
+                    __spawnQueue_add_1((GenMethod_1)__chSnowman_spawnSnowball, (s32)this->marker);
                     local->unk9 = FALSE;
                 }
                 
             }
             break;
-        case 3://L802E2604
+        case CHSNOWMAN_STATE_3_DIE://L802E2604
-            if(func_80329530(this, 0xC4E)){
+            if(func_80329530(this, 3150)){
-                func_802E1DA0(this);
+                __chSnowman_enterIdle(this);
             }
             break;
     }

src/core2/spawnqueue.c

@@ -121,8 +121,8 @@ extern ActorInfo D_8036854C;
 extern ActorInfo D_80368570;
 extern ActorInfo D_803685A0; //mumbotoken
 extern ActorInfo D_80368620; //snacker
-extern ActorInfo D_80368670; //sirslush
+extern ActorInfo chSnowman; //sirslush
-extern ActorInfo D_80368710; //snowball
+extern ActorInfo chSnowball; //snowball
 extern ActorInfo D_803687C0; //sir_slush_hat
 extern ActorInfo D_80372810;
 extern ActorInfo D_80372840; //grillchompa
@@ -288,7 +288,7 @@ void spawnQueue_reset(void){
     spawnableActorList_add(&D_803677CC, actor_new, 0x8680);//mumbo_transform_pad
     spawnableActorList_add(&D_803677F0, actor_new, 0x8680);
     spawnableActorList_add(&D_803731B0, actor_new, 0x0);
-    spawnableActorList_add(&D_80368710, actor_new, 0x100044);//snowball
+    spawnableActorList_add(&chSnowball, actor_new, 0x100044);//snowball
     spawnableActorList_add(&D_803687C0, actor_new, 0x4);//sir_slush_hat
     spawnableActorList_add(&gChDripsInfo, actor_new, 0x400);//water_drops
     spawnableActorList_add(&D_80372BA4, actor_new, 0x2020141);//ice_cube
@@ -349,7 +349,7 @@ void spawnQueue_reset(void){
     spawnableActorList_addIfMapVisited(&D_80367100, actor_new, 0x3001021, MAP_7_TTC_TREASURE_TROVE_COVE); //mutie_snippet
     spawnableActorList_addIfMapVisited(&D_80372870, actor_new, 0x2800820, MAP_40_CCW_HUB); //clucker
     spawnableActorList_addIfMapVisited(&D_803728A0, actor_new, 0x2000981, MAP_12_GV_GOBIS_VALLEY); //scarab
-    spawnableActorList_addIfMapVisited(&D_80368670, actor_new, 0x2000460, MAP_27_FP_FREEZEEZY_PEAK); //sirslush
+    spawnableActorList_addIfMapVisited(&chSnowman, actor_new, 0x2000460, MAP_27_FP_FREEZEEZY_PEAK); //sirslush
     switch(loaded_asm_file){
         default:
             break;