diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index d218eebf..25002b0c 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -701,7 +701,7 @@ segments: - [0xFAF6A0, c, code_59D40] #DONE - [0xFB0490, c, ch/snowman] #DONE - [0xFB1000, c, ch/snowball] #DONE - - [0xFB16F0, c, code_5BD90] #DONE + - [0xFB16F0, c, ch/snowmanhat] #DONE - [0xFB1810, c, code_5BEB0] - [0xFB1BA0, c, code_5C240] #DONE - [0xFB21D0, c, code_5C870] #DONE @@ -997,7 +997,7 @@ segments: - [0x1036FA0, .data, code_59D40] - [0x1037020, .data, ch/snowman] - [0x10370E0, .data, ch/snowball] - - [0x1037190, .data, code_5BD90] + - [0x1037190, .data, ch/snowmanhat] - [0x10371C0, .data, code_5C870] - [0x1037200, .data, code_5DBC0] - [0x1037220, .data, code_66D90] diff --git a/include/enums.h b/include/enums.h index 170d93ad..2144f103 100644 --- a/include/enums.h +++ b/include/enums.h @@ -3794,6 +3794,7 @@ enum marker_e{ MARKER_B0_MAGIC_CARPET_2, MARKER_B1_SIR_SLUSH, MARKER_B2_SNOWBALL, + MARKER_B3_SIR_SLUSH_HAT, MARKER_B5_RED_FEATHER_COLLECTABLE = 0xB5, diff --git a/src/core2/code_5BD90.c b/src/core2/ch/snowmanhat.c similarity index 76% rename from src/core2/code_5BD90.c rename to src/core2/ch/snowmanhat.c index f480b43e..aa3196ff 100644 --- a/src/core2/code_5BD90.c +++ b/src/core2/ch/snowmanhat.c @@ -2,18 +2,18 @@ #include "functions.h" #include "variables.h" -void func_802E2D20(Actor *this); +void chSnowmanHat_update(Actor *this); /* .data */ -ActorInfo D_803687C0 = { - 0xB3, 0x126, 0x379, +ActorInfo chSnowmanHat = { + MARKER_B3_SIR_SLUSH_HAT, ACTOR_126_SIR_SLUSH_HAT, ASSET_379_MODEL_SIRSLUSH_HAT, 0x1, NULL, - func_802E2D20, func_80326224, func_80325888, + chSnowmanHat_update, func_80326224, func_80325888, 4500, 0, 1.0f, 0 }; /* code */ -void func_802E2D20(Actor *this){ +void chSnowmanHat_update(Actor *this){ switch(this->state){ case 1: this->position[0] += this->velocity[0]; diff --git a/src/core2/spawnqueue.c b/src/core2/spawnqueue.c index 1a7e4c67..2e28e9b9 100644 --- a/src/core2/spawnqueue.c +++ b/src/core2/spawnqueue.c @@ -123,7 +123,7 @@ extern ActorInfo D_803685A0; //mumbotoken extern ActorInfo D_80368620; //snacker extern ActorInfo chSnowman; //sirslush extern ActorInfo chSnowball; //snowball -extern ActorInfo D_803687C0; //sir_slush_hat +extern ActorInfo chSnowmanHat; //sir_slush_hat extern ActorInfo D_80372810; extern ActorInfo D_80372840; //grillchompa extern ActorInfo D_80372870; //clucker @@ -289,7 +289,7 @@ void spawnQueue_reset(void){ spawnableActorList_add(&D_803677F0, actor_new, 0x8680); spawnableActorList_add(&D_803731B0, actor_new, 0x0); spawnableActorList_add(&chSnowball, actor_new, 0x100044);//snowball - spawnableActorList_add(&D_803687C0, actor_new, 0x4);//sir_slush_hat + spawnableActorList_add(&chSnowmanHat, actor_new, 0x4);//sir_slush_hat spawnableActorList_add(&gChDripsInfo, actor_new, 0x400);//water_drops spawnableActorList_add(&D_80372BA4, actor_new, 0x2020141);//ice_cube spawnableActorList_add(&D_8036804C, actor_new, 0x508604);//GAME_OVER