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

document core2/ch/bubble.c

Browse Source
This commit is contained in:
Banjo Kazooie
2023-01-21 20:27:01 -06:00
parent c004632915
commit 36e34b9c1c
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core2/code_3ECE0.c → src/core2/ch/bubble.c
View File

@@ -6,18 +6,18 @@ typedef struct {
s32 unk0;
}ActorLocal_Core2_3ECE0;
void func_802C5DDC(Actor *this);
void chBubble_update(Actor *this);
extern void func_802F32C4(s32, f32[3], f32, ActorMarker *, void(*)(f32[3], f32, ActorMarker *));
/* .data */
ActorInfo D_80365FE0 = {
0x6B, 0xE7, 0x704,
0, NULL, func_802C5DDC, func_80326224, func_80325340,
ActorInfo chBubble = {
MARKER_6B_GLOOPBUBBLE, ACTOR_E7_GLOOP_BUBBLE, ASSET_704_SPRITE_BUBBLE,
0, NULL, chBubble_update, func_80326224, func_80325340,
0, 0, 0.0f, 0
};
/* .code */
int func_802C5C70(f32 arg0[3], f32 arg1, ActorMarker *marker){
int __chBubble_func_802C5C70(f32 arg0[3], f32 arg1, ActorMarker *marker){
s32 pad2C;
Actor *this = marker_getActor(marker);
ActorLocal_Core2_3ECE0 *local = (ActorLocal_Core2_3ECE0 *) &this->local;
@@ -38,11 +38,11 @@ int func_802C5C70(f32 arg0[3], f32 arg1, ActorMarker *marker){
return sp1C;
}
void func_802C5D54(Actor *this){
void __chBubble_freeCallback(Actor *this){
func_8030E988(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 100.0f, 3000.0f);
}
void func_802C5DA0(ActorMarker *this_marker, ActorMarker *other_marker){
void __chBubble_collisionCallback(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
ActorLocal_Core2_3ECE0 *local = (ActorLocal_Core2_3ECE0 *) &this->local;
local->unk0 = 1;
@@ -50,12 +50,12 @@ void func_802C5DA0(ActorMarker *this_marker, ActorMarker *other_marker){
}
void func_802C5DDC(Actor *this){
void chBubble_update(Actor *this){
if(!this->initialized){
this->initialized = TRUE;
marker_setCollisionScripts(this->marker, func_802C5DA0, NULL, NULL);
marker_setFreeMethod(this->marker, func_802C5D54);
func_802F32C4(func_8032994C(), this->position, 200.0f, this->marker, func_802C5C70);
marker_setCollisionScripts(this->marker, __chBubble_collisionCallback, NULL, NULL);
marker_setFreeMethod(this->marker, __chBubble_freeCallback);
func_802F32C4(func_8032994C(), this->position, 200.0f, this->marker, __chBubble_func_802C5C70);
this->unk60 = 10.0f;
}
}

4
src/core2/spawnqueue.c
View File

@@ -21,7 +21,7 @@ extern ActorInfo D_80365F00; //banjo.cooking
extern ActorInfo D_80365F60;
extern ActorInfo D_80365F84; //turbotrainers
extern ActorInfo D_80365FB0; //shrapnel
extern ActorInfo D_80365FE0;
extern ActorInfo chBubble;
extern ActorInfo D_80366090; //bigbutt
extern ActorInfo D_803660B4; //brownbull
extern ActorInfo D_803662A8; //jiggy
@@ -250,7 +250,7 @@ void spawnQueue_reset(void){
spawnableActorList_add(&D_80367A50, actor_new, 0x0000004); //chbadshad
spawnableActorList_add(&D_803685A0, actor_new, 0x0000040); //mumbotoken
spawnableActorList_add(&D_80367F30, actor_new, 0x0000400);
spawnableActorList_add(&D_80365FE0, actor_new, 0x0000004);
spawnableActorList_add(&chBubble, actor_new, 0x0000004);
spawnableActorList_add(&chGloop, actor_new, 0x000008A); //gloop
spawnableActorList_add(&D_80366F20, actor_new, 0x0000000); //chshockjump
spawnableActorList_add(&D_80366F44, actor_new, 0x0000000); //flight_pad