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

documentation: core2/ba/physics

Browse Source
This commit is contained in:
Banjo Kazooie
2024-06-16 22:36:36 -05:00
parent 8fe5c3b4d1
commit 092de6aae3
208 changed files with 2342 additions and 2163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fight/chbossjinjo.c
View File

@@ -5,7 +5,7 @@
extern void viewport_getPosition(f32 (*)[3]);
extern void func_80328B8C(Actor *, s32, f32, s32);
extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
extern void func_80386654(f32 arg0, f32 (*arg1)[4], f32 (*arg2)[4]);
extern void func_80324CFC(f32, enum comusic_e, s32);
extern void func_80387470(Actor *, f32 [3], f32, f32, f32, f32, f32);
@@ -208,7 +208,7 @@ void func_8038C840(Actor *this){
case 1: //8038C92C
animctrl_setAnimTimer(this->animctrl, 0.0f);
if(this->unk60 < 0.0)
func_80328B8C(this, 2, 0.001f, 1);
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
else//L8038C974
this->unk60 -= sp74;
@@ -219,7 +219,7 @@ void func_8038C840(Actor *this){
func_8030E878(SFX_105_EYRIE_YAWN, randf2(0.95f, 1.05f), 32000, this->position, 1000.0f, 5000.0f);
if(actor_animationIsAt(this, 0.999f)){
func_80328B8C(this, 3, 0.001f, 1);
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
func_8030E878(0x3ee, randf2(0.95f, 1.05f), 32000, this->position, 5000.0f, 12000.0f);
}
break;
@@ -289,14 +289,14 @@ void func_8038C840(Actor *this){
if(sp48){
if(actor_animationIsAt(this, 0.96f)){
func_80328B8C(this, 4, 0.0f, -1);
subaddie_set_state_with_direction(this, 4, 0.0f, -1);
actor_playAnimationOnce(this);
}
}
else{//L8038CD68
if(actor_animationIsAt(this, 0.9f)){
animctrl_setSmoothTransition(this->animctrl, FALSE);
func_80328B8C(this, 5, 0.001f, 1);
subaddie_set_state_with_direction(this, 5, 0.001f, 1);
FUNC_8030E8B4(SFX_135_CARTOONY_SPRING, 1.0f, 32000, this->position, 10000, 16000);
func_80324D54(0.1f, SFX_C1_BUZZBOMB_ATTACK, 0.85f, 32000, this->position, 5000.0f, 12000.0f);
func_8034A174(this->marker->unk44, 0x1f, this->position);
@@ -356,7 +356,7 @@ void func_8038D014(Actor *this){
this->alpha_124_19 = 0x7d;
actor_setOpacity(this, this->alpha_124_19);
this->scale = (f64)this->scale + this->scale;
func_80328B8C(this, 5, 0.001f, 1);
subaddie_set_state_with_direction(this, 5, 0.001f, 1);
func_80343DEC(this);
}//L8038D0B8

4
src/fight/chbossjinjobase.c
View File

@@ -66,7 +66,7 @@ void func_8038D428(ActorMarker *arg0, ActorMarker *arg1) {
func_8025A70C(COMUSIC_2B_DING_B);
temp_v0->unk38_31++;
if (temp_v0->unk38_31 >= 3) {
func_80328A84(temp_v0, 3);
subaddie_set_state(temp_v0, 3);
chstonejinjo_breakOpen(temp_v0->unk100);
func_8038D3DC(temp_v0, 0x19A, -100.0f, 0.0f, 1.2f);
func_80324D54(1.2f, SFX_90_SWITCH_PRESS, 1.0f, 32000, temp_v0->position, 1000.0f, 2000.0f);
@@ -158,7 +158,7 @@ void func_8038D568(Actor *this){
}
else{//L8038D8E0
func_80328A84(this, 2);
subaddie_set_state(this, 2);
func_8030DA44(this->unk44_31);
this->unk44_31 = 0;
func_8030DA44(local->unk0);

24
src/fight/chfinalboss.c
View File

@@ -691,7 +691,7 @@ void chfinalboss_setPhase(ActorMarker *this, u32 phase_id)
switch(phase_id)
{
case 0:
func_80328B8C(actor, 1, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 1, 0.0001f, 1);
timed_setStaticCameraToNode(0.0f, 0);
timed_exitStaticCamera(2.0f);
timed_setStaticCameraToNode(2.0f, 1);
@@ -699,7 +699,7 @@ void chfinalboss_setPhase(ActorMarker *this, u32 phase_id)
return;
case 1:
func_80328B8C(actor, 2, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 2, 0.0001f, 1);
func_8030E878(SFX_EA_GRUNTY_LAUGH_1, randf2(0.95f, 1.05f), 32000, actor->position, 5000.0f, 12000.0f);
local->unk5 = 0x0;
actor->unk1C_x = D_803927D0[(local->unk5)][0];
@@ -717,7 +717,7 @@ void chfinalboss_setPhase(ActorMarker *this, u32 phase_id)
return;
case 2:
func_80328B8C(actor, 0xE, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 0xE, 0.0001f, 1);
local->unk5 = 0x8;
actor->unk1C_x = D_803927D0[(local->unk5)][0];
actor->unk1C_y = D_803927D0[(local->unk5)][1];
@@ -727,7 +727,7 @@ void chfinalboss_setPhase(ActorMarker *this, u32 phase_id)
case 3:
func_80328B8C(actor, 0x15, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 0x15, 0.0001f, 1);
local->unk5 = 0xC;
actor->unk1C_x = D_803927D0[(local->unk5)][0];
actor->unk1C_y = D_803927D0[(local->unk5)][1];
@@ -736,7 +736,7 @@ void chfinalboss_setPhase(ActorMarker *this, u32 phase_id)
return;
case 4:
func_80328B8C(actor, 0x1C, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 0x1C, 0.0001f, 1);
local->unk5 = 0x10;
actor->unk1C_x = D_803927D0[(local->unk5)][0];
actor->unk1C_y = D_803927D0[(local->unk5)][1];
@@ -906,7 +906,7 @@ void chfinalboss_phase1_setState(Actor *this, s32 next_state) {
sp40 = func_8023DB5C();
sp3C = animctrl_getAnimTimer(this->animctrl);
local->phase = 1;
func_80328B8C(this, next_state, 0.0001f, 1);
subaddie_set_state_with_direction(this, next_state, 0.0001f, 1);
actor_loopAnimation(this);
func_80386600(this->marker, 0);
if (next_state != 9) {
@@ -1201,7 +1201,7 @@ void chfinalboss_phase2_setState(Actor *this, s32 arg1){
local = (ActorLocal_fight_180 *)&this->local;
sp28 = func_8023DB5C();
local->phase = 2;
func_80328B8C(this, arg1, 0.0001f, 1);
subaddie_set_state_with_direction(this, arg1, 0.0001f, 1);
actor_loopAnimation(this);
switch (arg1) {
case 14:
@@ -1382,7 +1382,7 @@ void chfinalboss_phase3_setState(Actor *this, s32 arg1) {
local = (ActorLocal_fight_180 *)&this->local;
local->phase = 3;
func_80328B8C(this, arg1, 0.0001f, 1);
subaddie_set_state_with_direction(this, arg1, 0.0001f, 1);
switch (arg1) {
case 21:
if((local->unk5 + 1) < 0x10) {
@@ -1584,7 +1584,7 @@ void chfinalboss_phase4_setState(Actor *this, s32 arg1) {
local = (ActorLocal_fight_180 *)&this->local;
sp48 = animctrl_getAnimTimer(this->animctrl);
local->phase = 4;
func_80328B8C(this, arg1, 0.0001f, 1);
subaddie_set_state_with_direction(this, arg1, 0.0001f, 1);
switch (arg1) {
case 28:
animctrl_setAnimTimer(this->animctrl, sp48);
@@ -1847,10 +1847,10 @@ void chfinalboss_phase4_update(ActorMarker *marker) {
}
}
void func_80328B8C(Actor *, s32, f32, s32);
void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
void func_8038AC50(ActorMarker *arg0) {
func_80328B8C(marker_getActor(arg0), 0x24, 0.0001f, 1);
subaddie_set_state_with_direction(marker_getActor(arg0), 0x24, 0.0001f, 1);
}
void chfinalboss_phase5_setState(Actor *this, s32 next_state) {
@@ -1863,7 +1863,7 @@ void chfinalboss_phase5_setState(Actor *this, s32 next_state) {
local = (ActorLocal_fight_180 *)&this->local;
sp28 = 0x12;
local->phase = 5;
func_80328B8C(this, next_state, 0.0001f, 1);
subaddie_set_state_with_direction(this, next_state, 0.0001f, 1);
switch (next_state) {
case 35:
func_80311480(randi2(0, 5) + 0x114F, 4, NULL, NULL, NULL, NULL);

24
src/fight/chjinjonator.c
View File

@@ -3,7 +3,7 @@
#include "variables.h"
extern f32 func_8038C288(void);
extern void func_80328B8C(Actor *, s32, f32, s32);
extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
extern void func_80324CFC(f32, s32, s32);
extern void func_802F9E44(s32, f32, f32, f32, f32);
extern void func_80387470(Actor *, f32 [3], f32, f32, f32, f32, f32);
@@ -132,7 +132,7 @@ void chjinjonator_spawnAttackParticles(Actor *this, s32 arg1){
void chjinjonator_803903C4(Actor *this){
animctrl_setSmoothTransition(this->animctrl, FALSE);
func_80328B8C(this, 7, 0.001f, 1);
subaddie_set_state_with_direction(this, 7, 0.001f, 1);
actor_loopAnimation(this);
}
@@ -183,7 +183,7 @@ void chjinjonator_update(Actor *this){
animctrl_setAnimTimer(this->animctrl, 0.0f);
this->unk60 -= sp58;
if(this->unk60 < 0.0){
func_80328B8C(this, 2, 0.001f, 1);
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
actor_playAnimationOnce(this);
}
break;
@@ -199,7 +199,7 @@ void chjinjonator_update(Actor *this){
}
if(actor_animationIsAt(this, 0.999f)){
func_80328B8C(this, 3, 0.001f, 1);
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
actor_playAnimationOnce(this);
func_8030E394(this->unk44_31);
func_8030DA44(this->unk44_31);
@@ -216,7 +216,7 @@ void chjinjonator_update(Actor *this){
}//L803907A0
if(320.0f == this->position_y){
func_80328B8C(this, 4, 0.001f, 1);
subaddie_set_state_with_direction(this, 4, 0.001f, 1);
actor_loopAnimation(this);
local->unk4 = func_8038C288();
}
@@ -224,7 +224,7 @@ void chjinjonator_update(Actor *this){
case 4: //803907D4
chjinjonator_80390278(this);
func_80328B8C(this, 5, 0.001f, 1);
subaddie_set_state_with_direction(this, 5, 0.001f, 1);
actor_playAnimationOnce(this);
break;
@@ -232,7 +232,7 @@ void chjinjonator_update(Actor *this){
chjinjonator_80390278(this);
if(actor_animationIsAt(this, 0.998f)){
animctrl_setSmoothTransition(this->animctrl, FALSE);
func_80328B8C(this, 6, 0.0001f, 1);
subaddie_set_state_with_direction(this, 6, 0.0001f, 1);
actor_loopAnimation(this);
if(this->unk44_31 == 0){
local->unk18 = 0.1f;
@@ -314,7 +314,7 @@ void chjinjonator_update(Actor *this){
}
if(actor_animationIsAt(this, 0.999f)){
func_80328B8C(this, 0xA, 0.001f, 1);
subaddie_set_state_with_direction(this, 0xA, 0.001f, 1);
actor_loopAnimation(this);
local->unk20 = 0xE;
}
@@ -332,7 +332,7 @@ void chjinjonator_update(Actor *this){
if(local->unk20 <= 0){
s32 text_id;
func_80328B8C(this, 0xB, 0.001f, 1);
subaddie_set_state_with_direction(this, 0xB, 0.001f, 1);
actor_playAnimationOnce(this);
func_802BB41C(0);
text_id = 0x115e + randi2(0,5);
@@ -345,7 +345,7 @@ void chjinjonator_update(Actor *this){
FUNC_8030E624(SFX_17B_AIRPLANE_FALLING, 1.0f, 32000);
FUNC_8030E624(SFX_147_GRUNTY_SPELL_ATTACK_2, 1.0f, 32000);
animctrl_setSmoothTransition(this->animctrl, 0);
func_80328B8C(this, 0xC, 0.001f, 1);
subaddie_set_state_with_direction(this, 0xC, 0.001f, 1);
actor_playAnimationOnce(this);
this->velocity[2] = 0.0f;
this->velocity[1] = 0.0f;
@@ -389,10 +389,10 @@ void chjinjonator_attack(ActorMarker *marker, s32 hit_count, bool mirrored) {
animctrl_setSmoothTransition(temp_s0->animctrl, 1);
actor_playAnimationOnce(temp_s0);
if (&D_8039203C[hit_count] >= D_80392060) {
func_80328B8C(temp_s0, 9, 0.001f, 1);
subaddie_set_state_with_direction(temp_s0, 9, 0.001f, 1);
return;
}
func_80328B8C(temp_s0, 8, 0.001f, 1);
subaddie_set_state_with_direction(temp_s0, 8, 0.001f, 1);
animctrl_setDuration(temp_s0->animctrl, (f32) (1.75 - 0.11 * local->unk24));
}

4
src/fight/chjinjonatorbase.c
View File

@@ -86,7 +86,7 @@ void func_8038E120(ActorMarker * marker, ActorMarker *arg1){
remaining = local->unk0[0] + local->unk0[1] + local->unk0[2] + local->unk0[3];
if( remaining <= 0){
func_8038C148();
func_80328A84(actor, 3);
subaddie_set_state(actor, 3);
chstonejinjo_breakOpen(actor->unk100);
}
}//L8038E24C
@@ -185,7 +185,7 @@ void chjinjonatorbase_update(Actor *this){
other->position_z = sp38[2] + other->position_z;
}
else{//L8038E6FC
func_80328A84(this, 2);
subaddie_set_state(this, 2);
FUNC_8030E624(SFX_7F_HEAVYDOOR_SLAM, 0.8f, 32000);
func_8030E394(this->unk44_31);
func_8030DA44(this->unk44_31);

2
src/fight/chspellfireball.c
View File

@@ -214,7 +214,7 @@ void func_8038F084(ActorMarker *marker){
chbossjinjo_spawnParticles(actor, 0x712, ASSET_6C3_SPRITE_SMOKE_GREEN, 1.6f);
}
local->unk0 = 0.66f;
func_80328A84(actor, 2);
subaddie_set_state(actor, 2);
}//L8038F39C
}

6
src/fight/chstonejinjo.c
View File

@@ -4,7 +4,7 @@
#include "fight.h"
extern Actor *actorArray_findActorFromActorId();
extern void func_80328B8C(Actor*, s32, f32, s32);
extern void subaddie_set_state_with_direction(Actor*, s32, f32, s32);
extern f32 chbossjinjo_8038D268(void);
void chstonejinjo_update(Actor *);
@@ -100,7 +100,7 @@ void chstonejinjo_update(Actor *this) {
}
}
if (actor_animationIsAt(this, 0.999f)) {
func_80328B8C(this, 3, 0.99999f, 1);
subaddie_set_state_with_direction(this, 3, 0.99999f, 1);
actor_playAnimationOnce(this);
func_80326310(this);
}
@@ -116,7 +116,7 @@ void chstonejinjo_breakOpen(ActorMarker *marker){
f32 sp24[3];
if(actor->state != 2){
func_80328B8C(actor, 2, 0.0f, 1);
subaddie_set_state_with_direction(actor, 2, 0.0f, 1);
actor_playAnimationOnce(actor);
animctrl_setDuration(actor->animctrl, actor->unk1C[0]);
SPAWNQUEUE_ADD_1(chstonejinjo_spawnJinjo, actor->marker);