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

documentations

Browse Source 
- spawnableActorList_add: decode flags
- add some prototypes in functions.h
- ActorMarker: docu unk8 (drawFunc) and unk14_20 (id)
This commit is contained in:
mariob92
2024-09-07 21:51:24 +02:00
parent c8598c2677
commit f1dea250de
61 changed files with 738 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core2/ch/bigbutt.c
View File

@@ -314,11 +314,11 @@ void func_802C6240(Actor *this){
break;
}//L802C6D1C
if(this->state == 0xe){
if(this->marker->unk14_20 != 0x29e)
this->marker->unk14_20 = 0x29e;
if(this->marker->id != 0x29e)
this->marker->id = 0x29e;
}else{//L802C6D60
if(this->marker->unk14_20 != 3)
this->marker->unk14_20 = 3;
if(this->marker->id != 3)
this->marker->id = 3;
}
}

8
src/core2/ch/clucker.c
View File

@@ -52,7 +52,7 @@ void func_80357264(Actor *this, s32 next_state){
f32 sp38;
s32 pad34;
this->marker->unk14_20 = MARKER_1D0_CLUCKER_B;
this->marker->id = MARKER_1D0_CLUCKER_B;
actor_collisionOff(this);
if(next_state == 1 || next_state == 2){
skeletalAnim_set(this->unk148, ASSET_184_ANIM_CLUCKER_ATTACK_SHORT, 0.0f, 2.5f);
@@ -78,7 +78,7 @@ void func_80357264(Actor *this, s32 next_state){
local->unk4 = 0.2f;
if(next_state == 4){
this->marker->unk14_20 = MARKER_1B2_CLUCKER_A;
this->marker->id = MARKER_1B2_CLUCKER_A;
actor_collisionOn(this);
local->unk0 = (local->unk0 + 1) % 3;
if(local->unk0 < 2)
@@ -177,7 +177,7 @@ void func_8035765C(Actor *this){
skeletalAnim_getProgressRange(this->unk148, &sp4C, &sp48);
if(skeletalAnim_getAnimId(this->unk148) == 0x185){
if(sp4C < 0.58 && 0.58 <= sp48){
this->marker->unk14_20 = MARKER_1D0_CLUCKER_B;
this->marker->id = MARKER_1D0_CLUCKER_B;
}
if(sp4C < 0.05 && 0.05 <= sp48){
FUNC_8030E624(SFX_2_CLAW_SWIPE, 0.9f, 32000);
@@ -194,7 +194,7 @@ void func_8035765C(Actor *this){
}
else{//L803579F0
if(sp4C < 0.63 && 0.63 <= sp48){
this->marker->unk14_20 = MARKER_1D0_CLUCKER_B;
this->marker->id = MARKER_1D0_CLUCKER_B;
}
if(sp4C < 0.1 && 0.1 <= sp48){
FUNC_8030E624(SFX_2_CLAW_SWIPE, 0.9f, 32000);

6
src/core2/ch/code_CFA60.c
View File

@@ -22,7 +22,7 @@ ActorInfo D_80372840 = {
void func_803569F0(Actor *this, s32 next_state){
ActorLocal_Core2_CFA60 *local = (ActorLocal_Core2_CFA60 *)&this->local;
this->marker->unk14_20 = 0x1cf;
this->marker->id = 0x1cf;
actor_collisionOff(this);
if(next_state == 1 || next_state == 2){
skeletalAnim_set(this->unk148, ASSET_15A_ANIM_GRILL_CHOMPA_ATTACK, 0, 2.5f);
@@ -42,7 +42,7 @@ void func_803569F0(Actor *this, s32 next_state){
local->unk0 = 0.2f;
}
if(next_state == 4){
this->marker->unk14_20 = 0x29;
this->marker->id = 0x29;
actor_collisionOn(this);
skeletalAnim_set(this->unk148, ASSET_15A_ANIM_GRILL_CHOMPA_ATTACK, 0, randf2(2.3f, 2.7f));
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
@@ -123,7 +123,7 @@ void func_80356CCC(Actor *this){
if(this->state == 4){
skeletalAnim_getProgressRange(this->unk148, &sp4C, &sp48);
if(sp4C < 0.59 && 0.59 <= sp48){
this->marker->unk14_20 = 0x1cf;
this->marker->id = 0x1cf;
}
if(sp4C < 0.5 && 0.5 <= sp48){
func_8030E760(SFX_2_CLAW_SWIPE, 0.9f, 32000);

4
src/core2/ch/collectible.c
View File

@@ -53,7 +53,7 @@ void chCollectible_setState(Actor *arg0, s32 next_state){
void func_802D8C98(Actor *this, s32 arg1) {
s32 phi_v0;
switch (this->marker->unk14_20)
switch (this->marker->id)
{
case MARKER_60_BLUE_EGG_COLLECTIBLE:
phi_v0 = TRUE;
@@ -143,7 +143,7 @@ void chCollectible_update(Actor *this) {
u32 temp_v0;
if (!this->initialized) {
if (this->marker->unk14_20 != 0x60) {
if (this->marker->id != 0x60) {
func_8032AA58(this, 0.56f);
}
this->unk10_12 = -1;

16
src/core2/ch/crab.c
View File

@@ -81,13 +81,13 @@ void __chCrab_ow(ActorMarker *marker, ActorMarker *other) {
this->unk60 = 3.0f;
subaddie_set_state(this, 6);
actor_playAnimationOnce(this);
if (marker->unk14_20 == MARKER_13_SNIPPET) {
if (marker->id == MARKER_13_SNIPPET) {
FUNC_8030E8B4(SFX_6E_VILE_EGH, 2.0f, 26000, this->position, 950, 1900);
marker->unk14_20 = MARKER_16B_SNIPPET_UPSIDEDOWN;
marker->id = MARKER_16B_SNIPPET_UPSIDEDOWN;
}
if (marker->unk14_20 == MARKER_DD_BLACK_SNIPPET) {
if (marker->id == MARKER_DD_BLACK_SNIPPET) {
FUNC_8030E8B4(SFX_6E_VILE_EGH, 2.0f, 26000, this->position, 950, 1900);
marker->unk14_20 = MARKER_DE_BLACK_SNIPPET_UPSIDEDOWN;
marker->id = MARKER_DE_BLACK_SNIPPET_UPSIDEDOWN;
}
}
@@ -357,11 +357,11 @@ void chCrab_update(Actor *this) {
if (this->unk60 == 0.0f) {
subaddie_set_state(this, 7);
actor_playAnimationOnce(this);
if (this->marker->unk14_20 == 0x16B) {
this->marker->unk14_20 = MARKER_13_SNIPPET;
if (this->marker->id == 0x16B) {
this->marker->id = MARKER_13_SNIPPET;
}
if (this->marker->unk14_20 == 0xDE) {
this->marker->unk14_20 = MARKER_DD_BLACK_SNIPPET;
if (this->marker->id == 0xDE) {
this->marker->id = MARKER_DD_BLACK_SNIPPET;
}
}
break;

6
src/core2/ch/gameSelect.c
View File

@@ -114,7 +114,7 @@ f32 D_8037DD34;
/* .code */
Actor *func_802C4360(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
s32 sp1C = marker->unk14_20 - 0xe4;
s32 sp1C = marker->id - 0xe4;
func_8033A45C(3, sp1C);
func_8033A45C(1, 1);
func_8033A45C(4, 1);
@@ -284,7 +284,7 @@ void func_802C4BB4(ActorMarker *marker){
s32 sp20;
Actor *other;
f32 sp18;
sp20 = marker->unk14_20 - 0xe4;
sp20 = marker->id - 0xe4;
this = marker_getActor(marker);
sp18 = this->scale;
other = func_8032813C(sp20 + 0x198, this->position, (s32)this->yaw);
@@ -308,7 +308,7 @@ void func_802C4C14(Actor *this){
s32 tmp_a2_2;
f32 sp34[3];
sp84 = this->marker->unk14_20 - 0xe4;
sp84 = this->marker->id - 0xe4;
sp80 = (sp84 == D_80365E00);
sp50 = time_getDelta();
if(chGameSelectBottomZoombox == NULL)

4
src/core2/ch/jinjo.c
View File

@@ -46,11 +46,11 @@ void __chJinjo_802CDBA8(ActorMarker *this, ActorMarker *other){
if(actorPtr->state < 5){
if(!fileProgressFlag_get(FILEPROG_E_JINJO_TEXT)){
func_80311480(__chJinjo_getMeetDialogId(actorPtr->marker->unk14_20), 4, 0, 0, 0, 0);
func_80311480(__chJinjo_getMeetDialogId(actorPtr->marker->id), 4, 0, 0, 0, 0);
fileProgressFlag_set(FILEPROG_E_JINJO_TEXT, 1);
}
subaddie_set_state_with_direction(actorPtr, 6, 0.0f , -1);
if(item_adjustByDiffWithHud(ITEM_12_JINJOS, 1 << (this->unk14_20 + 6) ) == 0x1f)
if(item_adjustByDiffWithHud(ITEM_12_JINJOS, 1 << (this->id + 6) ) == 0x1f)
localPtr->unk4 = 1;
actor_loopAnimation(actorPtr);
this->collidable = 0;

6
src/core2/ch/mole.c
View File

@@ -123,7 +123,7 @@ Actor *func_802D94B4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_802D9530(Actor *this){
Actor *other = subaddie_getLinkedActor(this);
if(this->unk100 && other){
if(this->unk100->unk14_20 == 0xB8)
if(this->unk100->id == 0xB8)
subaddie_set_state_with_direction(other, 3, 0.0001f, 1);
}
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
@@ -248,7 +248,7 @@ int chmole_learnAbility(Actor *this){
void func_802D9ADC(Actor *this){
Actor *other = subaddie_getLinkedActor(this);
if(this->unk100 && other && this->unk100->unk14_20 == 0xB8){
if(this->unk100 && other && this->unk100->id == 0xB8){
subaddie_set_state_with_direction(other, 2, 0.0001f, 1);
}
this->marker->propPtr->unk8_3 = 1;
@@ -339,7 +339,7 @@ void chmole_update(Actor *this){
this->unk100 = (other) ? other->marker : NULL;
if(this->unk100){
other = subaddie_getLinkedActor(this);
if(other && this->unk100->unk14_20 == 0xB8){
if(other && this->unk100->id == 0xB8){
subaddie_set_state(other, 1);
}
}

4
src/core2/ch/snowman.c
View File

@@ -172,10 +172,10 @@ int __chSnowman_isPlayerInAttackRange(Actor *this, s32 min_distance, s32 max_dis
int __chSnowman_func_802E1F70(ActorMarker *marker, s32 arg1){
if(marker->unk40_31 == 0xB){
marker->unk14_20 = 0x287;
marker->id = 0x287;
}
else{
marker->unk14_20 = MARKER_B1_SIR_SLUSH;
marker->id = MARKER_B1_SIR_SLUSH;
}
return TRUE;
}