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

8
src/SM/ch/attacktutorial.c
View File

@@ -5,7 +5,7 @@
/* chAttackTutorial - controls bottle teaching moves in spiral*/
//external
void func_80324E88(f32);
void timed_exitStaticCamera(f32);
void func_8028F918(s32);
//public
@@ -64,7 +64,7 @@ void func_80387288(ActorMarker *marker, enum asset_e text_id, s32 arg2){
chAttackTutorial_setState(actor, 2);
break;
}//L803872FC
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
}
void chAttackTutorial_setState(Actor * this, s32 arg1){
@@ -170,7 +170,7 @@ void func_80387690(ActorMarker *marker, enum asset_e text_id, s32 arg2){
chAttackTutorial_setState(actor, 3);
break;
}
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
}//*/
void func_80387764(ActorMarker * marker){
@@ -211,7 +211,7 @@ void func_80387764(ActorMarker * marker){
sp34 = 0xE12;
}//L80387898
if(temp_a2){
timed_setCameraToNode(0.0f, 6);
timed_setStaticCameraToNode(0.0f, 6);
}//L803878B0
func_80311480(sp34, sp2C, actor->unk1C, actor->marker, func_80387690, NULL);

12
src/SM/code_2990.c
View File

@@ -7,7 +7,7 @@ Actor *func_802D94B4(ActorMarker*, Gfx**, Mtx**, Vtx**);
void func_8028E668(f32*, f32, f32, f32);
void func_80328FB0(Actor *, f32);
void func_8030DA44(u8);
void func_80324E88(f32);
void timed_exitStaticCamera(f32);
void func_80328B8C(Actor *, s32, f32, s32);
//static types
@@ -93,10 +93,10 @@ void func_80388EB0(void){
void func_80388F24(Actor *this){
if(this->unkF4_8 == 1 && !mapSpecificFlags_get(1)){
timed_setCameraToNode(0.0f, 0x12);
timed_setStaticCameraToNode(0.0f, 0x12);
}
else{ //L80388F68
timed_setCameraToNode(0.0f, D_8038AFB4[this->unkF4_8 -1].unk4);
timed_setStaticCameraToNode(0.0f, D_8038AFB4[this->unkF4_8 -1].unk4);
}
}
@@ -169,13 +169,13 @@ void func_80389214(ActorMarker *marker, enum asset_e text_id, s32 arg2){
Actor *actor = marker_getActor(marker);
switch(arg2){
case 3:
timed_setCameraToNode(0.0f, 2);
timed_setStaticCameraToNode(0.0f, 2);
break;
case 4:
mapSpecificFlags_set(4,1);
break;
case 5:
timed_setCameraToNode(0.0f, 0x12);
timed_setStaticCameraToNode(0.0f, 0x12);
break;
case 6:
func_8025A70C(COMUSIC_2B_DING_B);
@@ -196,7 +196,7 @@ void func_803892C8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
}//L8038933C
else{
if( !(text_id == 0xdf3 || text_id == 0xe1f || text_id == 0xe1d) ){
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
}
switch(text_id){
case 0xd38:

6
src/SM/code_4070.c
View File

@@ -4,7 +4,7 @@
//extern
Actor *func_802D94B4(ActorMarker *, Gfx **, Mtx **, Vtx**);
void func_80324E88(f32);
void timed_exitStaticCamera(f32);
//public
void SM_func_8038A5D8(Actor *this);
@@ -19,7 +19,7 @@ ActorInfo D_8038B0B0 = { 0x1ED, 0x3B9, 0, 1, NULL,
/* .code */
void func_8038A460(Actor *this){
timed_setCameraToNode(0.0f,4);
timed_setStaticCameraToNode(0.0f,4);
}
void func_8038A488(ActorMarker *caller, enum asset_e text_id, s32 arg2){
@@ -27,7 +27,7 @@ void func_8038A488(ActorMarker *caller, enum asset_e text_id, s32 arg2){
if(text_id == 0xdf9 || text_id == 0xe12){
func_8038A4DC(actor, 3);
}
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
}
void func_8038A4DC(Actor *this, s32 arg1){