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

identified/labeled camera functions

Browse Source
This commit is contained in:
Banjo Kazooie
2023-03-10 21:52:35 -06:00
parent 13728811aa
commit 7f3dd5aa12
164 changed files with 1583 additions and 1522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/BGS/ch/code_2270.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
void func_80324E88(f32);
void timed_exitStaticCamera(f32);
void BGS_func_803888E4(Actor *this, s32 arg1);
typedef struct{
@@ -93,7 +93,7 @@ void func_80388784(ActorMarker *this, enum asset_e text_id, s32 arg2){
break;
case 0xc7b:
timedFunc_set_0(0.0f, BGS_func_8038868C);
func_80324E88(2.5f);
timed_exitStaticCamera(2.5f);
func_80324E38(2.5f, 0);
break;
}
@@ -159,7 +159,7 @@ void BGS_func_803888E4(Actor *this, s32 arg1){
unqPtr->unk0 = 0;
vector_clear(unqPtr->unk4);
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.5f, 0);
timed_setStaticCameraToNode(0.5f, 0);
tmpf = 0.5f;
i = 0;
prev_member = 0;
@@ -172,7 +172,7 @@ void BGS_func_803888E4(Actor *this, s32 arg1){
prev_member = rand2;
}//L80388B7C
func_80324E88(tmpf += 2.5);
timed_exitStaticCamera(tmpf += 2.5);
if(!unqPtr->unkA && !func_803203FC(2)){
func_80324DBC(tmpf + 0.5, 0xc73, 0xe, this->position, this->marker, func_80388784, 0);
unqPtr->unkA = 1;
@@ -189,7 +189,7 @@ void BGS_func_803888E4(Actor *this, s32 arg1){
unqPtr->unk0 = 0;
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.5f, 0);
timed_setStaticCameraToNode(0.5f, 0);
tmpf = 0.5f;
for(j = 0; j < vector_size(unqPtr->unk4); j++){
s1 = (Struct_BGS_2270_0s *)vector_at(unqPtr->unk4,j);
@@ -197,7 +197,7 @@ void BGS_func_803888E4(Actor *this, s32 arg1){
timedFunc_set_2(tmpf, (GenMethod_2)func_803886B4, reinterpret_cast(s32, this->marker), s1->unk0);
timedFunc_set_2(tmpf + 0.1, (GenMethod_2)func_803886B4, reinterpret_cast(s32, this->marker), 0);
}
func_80324E88(tmpf += 2.5);
timed_exitStaticCamera(tmpf += 2.5);
func_80324E38(tmpf + 0.6,0);
vector_clear(unqPtr->unk4);
this->state = 0x05;
@@ -207,7 +207,7 @@ void BGS_func_803888E4(Actor *this, s32 arg1){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
}
func_80324E38(0.5f, 3);
timed_setCameraToNode(1.5f, 1);
timed_setStaticCameraToNode(1.5f, 1);
func_80324DBC(2.0f, D_8039085C[unqPtr->unkA++], 0xF, this->position, this->marker, func_80388784, 0);
}
}

4
src/BGS/ch/croctus.c
View File

@@ -96,12 +96,12 @@ void func_80387E68(ActorMarker *caller, enum asset_e text_id, s32 arg2){
func_80326310(this);
bgs_D_803907B8[this->unkF4_8]->propPtr->unk8_4 = TRUE;
timedFunc_set_1(1.1f, (GenMethod_1)func_80387E00, reinterpret_cast(s32, bgs_D_803907B8[this->unkF4_8]));
timed_setCameraToNode(0.8f, 9);
timed_setStaticCameraToNode(0.8f, 9);
func_80324DBC(3.4f, 0xC87, 0xE, NULL, NULL, func_80387E68, NULL);
__spawnQueue_add_2((GenMethod_2) func_80387D18, reinterpret_cast(s32, this->marker), 0x46);
}
else{
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_8028F918(0);
}
}

6
src/BGS/ch/frogminigame.c
View File

@@ -6,7 +6,7 @@
void chfrogminigame_update(Actor *);
void chFrogMinigame_setState(Actor * arg0, u32 next_state);
void func_8025A58C(u32, u32);
void func_80324E88(f32);
void timed_exitStaticCamera(f32);
ActorInfo chFrogMinigame = {MARKER_C4_YELLOW_FLIBBIT_CTRL, ACTOR_136_YELLOW_FLIBBIT_CONTROLLER, 0x00,
@@ -97,9 +97,9 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){
}
if(next_state == 5){
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0x27);
timed_setStaticCameraToNode(0.0f, 0x27);
timedFunc_set_0(0.2f, __chFrogMinigame_spawnJiggy);
func_80324E88(3.0f);
timed_exitStaticCamera(3.0f);
func_80324E38(3.0f, 0);
next_state = 6;
}

6
src/BGS/ch/tanktup.c
View File

@@ -4,7 +4,7 @@
#include "prop.h"
void func_80324E88(f32);
void timed_exitStaticCamera(f32);
void timedFunc_set_2(f32, void(*)(s32, s32), s32, s32);
@@ -72,7 +72,7 @@ s32 func_8038F570(s16 *arg0){
}
void func_8038F5E4(ActorMarker *marker, enum asset_e text_id, s32 arg2){
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
}
void func_8038F610(Actor *this) {
@@ -195,7 +195,7 @@ void func_8038F6A4(Actor *this)
case 3:
if (actor_animationIsAt(this, 0.1f) != 0)
{
timed_setCameraToNode(0.0f, 0xD);
timed_setStaticCameraToNode(0.0f, 0xD);
}
if (actor_animationIsAt(this, 0.55f) != 0)
{

10
src/BGS/code_3420.c
View File

@@ -111,7 +111,7 @@ void BGS_func_80389850(Actor *this, s32 arg1) {
break;
}
}
func_802BAE6C(sp94, sp88);
ncStaticCamera_setPositionAndRotation(sp94, sp88);
}
void func_80389B48(ActorMarker *marker, enum asset_e text_id, s32 arg2){
@@ -146,7 +146,7 @@ void func_80389BF8(ActorMarker *marker, enum asset_e text_id, s32 arg2) {
this = marker_getActor(marker);
local = (ActorLocal_BGS_3420 *)&this->local;
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
local->unkC--;
func_8038A068(this, 7);
@@ -166,7 +166,7 @@ void BGS_func_80389CD8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
Actor *this;
this = marker_getActor(marker);
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
func_8038A068(this, 5);
}
@@ -190,7 +190,7 @@ void func_80389DF8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
Actor *this;
this = marker_getActor(marker);
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
func_8038A068(this, 1);
}
@@ -212,7 +212,7 @@ void func_80389EAC(ActorMarker *marker, enum asset_e text_id, s32 arg2){
this = marker_getActor(marker);
local = (ActorLocal_BGS_3420 *)&this->local;
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
local->unkC = 3;
func_8038A068(this, 1);

2
src/BGS/code_9750.c
View File

@@ -3,7 +3,7 @@
#include "variables.h"
void func_80324E88(f32);
void timed_exitStaticCamera(f32);
void timedFunc_set_2(f32, void(*)(s32, s32), s32, s32);
void func_8028E668(f32[3], f32, f32, f32);