kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

doc ch/snowmanhat.c

Browse Source
This commit is contained in:
Banjo Kazooie
2023-01-22 21:15:07 -06:00
parent 99b2cad21d
commit 60ff89403a
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
decompressed.us.v10.yaml
View File

@@ -701,7 +701,7 @@ segments:
- [0xFAF6A0, c, code_59D40] #DONE - [0xFAF6A0, c, code_59D40] #DONE
- [0xFB0490, c, ch/snowman] #DONE - [0xFB0490, c, ch/snowman] #DONE
- [0xFB1000, c, ch/snowball] #DONE - [0xFB1000, c, ch/snowball] #DONE
- [0xFB16F0, c, code_5BD90] #DONE - [0xFB16F0, c, ch/snowmanhat] #DONE
- [0xFB1810, c, code_5BEB0] - [0xFB1810, c, code_5BEB0]
- [0xFB1BA0, c, code_5C240] #DONE - [0xFB1BA0, c, code_5C240] #DONE
- [0xFB21D0, c, code_5C870] #DONE - [0xFB21D0, c, code_5C870] #DONE
@@ -997,7 +997,7 @@ segments:
- [0x1036FA0, .data, code_59D40] - [0x1036FA0, .data, code_59D40]
- [0x1037020, .data, ch/snowman] - [0x1037020, .data, ch/snowman]
- [0x10370E0, .data, ch/snowball] - [0x10370E0, .data, ch/snowball]
- [0x1037190, .data, code_5BD90] - [0x1037190, .data, ch/snowmanhat]
- [0x10371C0, .data, code_5C870] - [0x10371C0, .data, code_5C870]
- [0x1037200, .data, code_5DBC0] - [0x1037200, .data, code_5DBC0]
- [0x1037220, .data, code_66D90] - [0x1037220, .data, code_66D90]

1
include/enums.h
View File

@@ -3794,6 +3794,7 @@ enum marker_e{
MARKER_B0_MAGIC_CARPET_2, MARKER_B0_MAGIC_CARPET_2,
MARKER_B1_SIR_SLUSH, MARKER_B1_SIR_SLUSH,
MARKER_B2_SNOWBALL, MARKER_B2_SNOWBALL,
MARKER_B3_SIR_SLUSH_HAT,
MARKER_B5_RED_FEATHER_COLLECTABLE = 0xB5, MARKER_B5_RED_FEATHER_COLLECTABLE = 0xB5,

10
src/core2/code_5BD90.c → src/core2/ch/snowmanhat.c
View File

@@ -2,18 +2,18 @@
#include "functions.h" #include "functions.h"
#include "variables.h" #include "variables.h"
void func_802E2D20(Actor *this); void chSnowmanHat_update(Actor *this);
/* .data */ /* .data */
ActorInfo D_803687C0 = { ActorInfo chSnowmanHat = {
0xB3, 0x126, 0x379, MARKER_B3_SIR_SLUSH_HAT, ACTOR_126_SIR_SLUSH_HAT, ASSET_379_MODEL_SIRSLUSH_HAT,
0x1, NULL, 0x1, NULL,
func_802E2D20, func_80326224, func_80325888, chSnowmanHat_update, func_80326224, func_80325888,
4500, 0, 1.0f, 0 4500, 0, 1.0f, 0
}; };
/* code */ /* code */
void func_802E2D20(Actor *this){ void chSnowmanHat_update(Actor *this){
switch(this->state){ switch(this->state){
case 1: case 1:
this->position[0] += this->velocity[0]; this->position[0] += this->velocity[0];

4
src/core2/spawnqueue.c
View File

@@ -123,7 +123,7 @@ extern ActorInfo D_803685A0; //mumbotoken
extern ActorInfo D_80368620; //snacker extern ActorInfo D_80368620; //snacker
extern ActorInfo chSnowman; //sirslush extern ActorInfo chSnowman; //sirslush
extern ActorInfo chSnowball; //snowball extern ActorInfo chSnowball; //snowball
extern ActorInfo D_803687C0; //sir_slush_hat extern ActorInfo chSnowmanHat; //sir_slush_hat
extern ActorInfo D_80372810; extern ActorInfo D_80372810;
extern ActorInfo D_80372840; //grillchompa extern ActorInfo D_80372840; //grillchompa
extern ActorInfo D_80372870; //clucker extern ActorInfo D_80372870; //clucker
@@ -289,7 +289,7 @@ void spawnQueue_reset(void){
spawnableActorList_add(&D_803677F0, actor_new, 0x8680); spawnableActorList_add(&D_803677F0, actor_new, 0x8680);
spawnableActorList_add(&D_803731B0, actor_new, 0x0); spawnableActorList_add(&D_803731B0, actor_new, 0x0);
spawnableActorList_add(&chSnowball, actor_new, 0x100044);//snowball 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(&gChDripsInfo, actor_new, 0x400);//water_drops
spawnableActorList_add(&D_80372BA4, actor_new, 0x2020141);//ice_cube spawnableActorList_add(&D_80372BA4, actor_new, 0x2020141);//ice_cube
spawnableActorList_add(&D_8036804C, actor_new, 0x508604);//GAME_OVER spawnableActorList_add(&D_8036804C, actor_new, 0x508604);//GAME_OVER