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

6
src/CCW/code_160.c
View File

@@ -68,9 +68,9 @@ void func_803865F4(Actor *this, s32 next_state) {
func_8025AABC(COMUSIC_4B_CCW_ZUBBA_FIGHT);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_80324E38(0.0f, 3);
timed_setCameraToNode(2.0f, 4);
timed_setStaticCameraToNode(2.0f, 4);
timedFunc_set_1(2.0f, (GenMethod_1)CCW_func_80386550, (s32) this->marker);
func_80324E88(4.0f);
timed_exitStaticCamera(4.0f);
func_80324E38(4.0f, 0);
}
}
@@ -162,7 +162,7 @@ void func_8038687C(Actor *this) {
if (local->unk0 != NULL) {
other = marker_getActor(local->unk0);
func_8024C5CC(sp78);
viewport_getPosition(sp78);
sp6C[0] = this->position[0] - sp78[0];
sp6C[1] = this->position[1] - sp78[1];
sp6C[2] = this->position[2] - sp78[2];

6
src/CCW/code_1B20.c
View File

@@ -61,17 +61,17 @@ void func_80387F64(Actor *this, s32 next_state){
if (map_get() == MAP_43_CCW_SPRING) {
func_80324E38(0.0f, 3);
}
timed_setCameraToNode(0.0f, 0);
timed_setStaticCameraToNode(0.0f, 0);
for( phi_f22 = 0.0f; phi_f22 <= 1.0f; phi_f22 += 0.1) {
timed_playSfx(phi_f22 * 5.7, 0x2C, phi_f22 * 0.3 + 0.7, (s32) (32000.0f - phi_f22 * 5000.0f));
}
if (local->unk0->unkA != 0) {
timed_setCameraToNode(6.0f, 1);
timed_setStaticCameraToNode(6.0f, 1);
timedFunc_set_0(6.1f, func_80387F10);
timedFunc_set_2(8.0f, func_80387F38, (s32) this->marker, 3);
} else {
if (map_get() == MAP_43_CCW_SPRING) {
func_80324E88(7.0f);
timed_exitStaticCamera(7.0f);
func_80324E38(7.0f, 0);
}
timedFunc_set_2(7.0f, func_80387F38, (s32) this->marker, 3);

8
src/CCW/code_2270.c
View File

@@ -55,7 +55,7 @@ void CCW_func_8038868C(Actor *this, s32 next_state) {
func_80335924(local->unk4, ASSET_100_ANIM_GOBI_SPIT, 0.0f, 3.0f);
func_80335A8C(local->unk4, 2);
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, (map_get() == MAP_44_CCW_SUMMER) ? 1 : 2);
timed_setStaticCameraToNode(0.0f, (map_get() == MAP_44_CCW_SUMMER) ? 1 : 2);
timed_playSfx(0.05f, SFX_84_GOBI_CRYING, 1.1f, 32000);
timed_playSfx(0.8f, SFX_4B_GULPING, 0.8f, 28000);
timed_playSfx(1.4f, SFX_4B_GULPING, 0.8f, 28000);
@@ -68,7 +68,7 @@ void CCW_func_8038868C(Actor *this, s32 next_state) {
if (next_state == 4) {
func_80335924(this->unk148, ASSET_176_ANIM_GOBI_YAWN, 0.5f, 4.0f);
func_80335A8C(this->unk148, 2);
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
}
if (next_state == 5) {
@@ -76,14 +76,14 @@ void CCW_func_8038868C(Actor *this, s32 next_state) {
func_80311480((s32) local->unk0->unk6, 4, NULL, NULL, NULL, NULL);
}
func_80335924(this->unk148, ASSET_FD_ANIM_GOBI2_GETTING_UP, 0.23f, 0.5f);
timed_setCameraToNode(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 3);
}
if (next_state == 6) {
func_80335924(this->unk148, ASSET_F8_ANIM_GOBI_RUNNING, 0.1f, 0.71f);
func_80335A8C(this->unk148, 1);
}
if (next_state == 7) {
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
marker_despawn(this->marker);
}

4
src/CCW/code_3050.c
View File

@@ -19,8 +19,8 @@ void func_80389440(Actor *this, s32 next_state) {
func_80335924(this->unk148, 0x187, 0.0f, 2.0f);
func_80335A8C(this->unk148, 2);
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 2);
func_80324E88(8.0f);
timed_setStaticCameraToNode(0.0f, 2);
timed_exitStaticCamera(8.0f);
func_80324E38(8.0f, 0);
}
this->state = next_state;

8
src/CCW/code_3310.c
View File

@@ -103,7 +103,7 @@ f32 D_8038FDE0[3];
/* .code */
void func_80389700(ActorMarker *marker, enum asset_e text_id, s32 arg2) {
func_80324E88(0.5f);
timed_exitStaticCamera(0.5f);
func_80324E38(0.5f, 0);
}
@@ -144,8 +144,8 @@ void func_803897B8(Actor *this, s32 next_state) {
func_80335924(this->unk148, local->unk0->unkE, 0.2f, 8.0f);
func_80335A8C(this->unk148, 2);
func_80324E38(0.5f, 3);
timed_setCameraToNode(0.5f, local->unk0->unk24);
func_80324E88(16.5f);
timed_setStaticCameraToNode(0.5f, local->unk0->unk24);
timed_exitStaticCamera(16.5f);
func_80324E38(16.5f, 0);
local->unk8 = local->unk0->unk10;
}
@@ -261,7 +261,7 @@ void CCW_func_80389BFC(Actor *this) {
){
this->unk138_24 = TRUE;
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, local->unk0->unk24);
timed_setStaticCameraToNode(0.0f, local->unk0->unk24);
func_80324DBC(0.0f, local->unk0->unk28, 6, NULL, this->marker, func_80389700, NULL);
}
local->unkC[0] = (s32) sp4C[0];

2
src/CCW/code_4530.c
View File

@@ -50,7 +50,7 @@ void func_8038A950(Actor *this, s32 next_state) {
func_80335924(this->unk148, 0x19A, 0.0f, 7.0f);
func_80335A8C(this->unk148, 2);
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0);
timed_setStaticCameraToNode(0.0f, 0);
}
if (next_state == 4) {
mapSpecificFlags_set(5, 1);

4
src/CCW/code_4960.c
View File

@@ -31,7 +31,7 @@ void func_8038AD50(Actor *this, s32 next_state) {
func_80311480(0xCDD, 0, NULL, NULL, NULL, NULL);
if (this->state == 1) {
mapSpecificFlags_set(6, 0);
timed_setCameraToNode(0.0f, 1);
timed_setStaticCameraToNode(0.0f, 1);
}
func_80335924(this->unk148, 0x21D, 0.2f, 0.5f);
func_80335A8C(this->unk148, 1);
@@ -41,7 +41,7 @@ void func_8038AD50(Actor *this, s32 next_state) {
func_80335A8C(this->unk148, 2);
}
if (next_state == 4) {
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
marker_despawn(this->marker);
}

4
src/CCW/code_5540.c
View File

@@ -48,7 +48,7 @@ void chnabnut_setState(Actor *this, s32 next_state) {
func_80335924(this->unk148, ASSET_22D_ANIM_NABNUT_BACKFLIP, 0.2f, 3.13f);
func_80335A8C(this->unk148, 2);
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0xB);
timed_setStaticCameraToNode(0.0f, 0xB);
func_80311480(0xCCC, 0x20, this->position, NULL, NULL, NULL);
}
@@ -65,7 +65,7 @@ void chnabnut_setState(Actor *this, s32 next_state) {
if (next_state == NABNUT_STATE_6_DESPAWN) {
func_80324E38(0.0f, 0);
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
marker_despawn(this->marker);
}

4
src/CCW/code_7120.c
View File

@@ -77,9 +77,9 @@ void func_8038D6D8(Actor *this, s32 next_state) {
FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.7f, 15000);
FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.9f, 15000);
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.5f, 3);
timed_setStaticCameraToNode(0.5f, 3);
timedFunc_set_2(0.5f, levelSpecificFlags_set, 0x25, TRUE);
func_80324E88(4.0f);
timed_exitStaticCamera(4.0f);
func_80324E38(4.0f, 0);
local->unk0 = 0.5f;
marker_despawn(this->marker);