diff --git a/src/CCW/code_160.c b/src/CCW/code_160.c index 160a2af9..5cf55c23 100644 --- a/src/CCW/code_160.c +++ b/src/CCW/code_160.c @@ -132,7 +132,7 @@ void func_8038687C(Actor *this) { if(!this->volatile_initialized) { this->volatile_initialized = TRUE; this->marker->propPtr->unk8_3 = TRUE; - local->unk0 = 1; + reinterpret_cast(s32, local->unk0) = 1; local->unk4 = 0; local->unk8 = 0; local->unkC = 0.0f; diff --git a/src/CCW/code_1B20.c b/src/CCW/code_1B20.c index e80eaf1c..f2de6732 100644 --- a/src/CCW/code_1B20.c +++ b/src/CCW/code_1B20.c @@ -68,13 +68,13 @@ void func_80387F64(Actor *this, s32 next_state){ if (local->unk0->unkA != 0) { timed_setStaticCameraToNode(6.0f, 1); timedFunc_set_0(6.1f, func_80387F10); - timedFunc_set_2(8.0f, func_80387F38, (s32) this->marker, 3); + timedFunc_set_2(8.0f, (GenFunction_2)func_80387F38, (s32) this->marker, 3); } else { if (map_get() == MAP_43_CCW_SPRING) { timed_exitStaticCamera(7.0f); func_80324E38(7.0f, 0); } - timedFunc_set_2(7.0f, func_80387F38, (s32) this->marker, 3); + timedFunc_set_2(7.0f, (GenFunction_2)func_80387F38, (s32) this->marker, 3); } } diff --git a/src/CCW/code_2B00.c b/src/CCW/code_2B00.c index c6737e0f..fdff16c8 100644 --- a/src/CCW/code_2B00.c +++ b/src/CCW/code_2B00.c @@ -151,8 +151,8 @@ void func_80389268(Actor *this) { switch (this->state) { /* irregular */ case 1: if (levelSpecificFlags_get(this->unk10_12 + 7)) { - timedFunc_set_1(0.05f, func_803891B0, (s32) this->marker); - timedFunc_set_1(4.0f, func_8038921C, (s32) this->marker); + timedFunc_set_1(0.05f, (GenFunction_1)func_803891B0, (s32) this->marker); + timedFunc_set_1(4.0f, (GenFunction_1)func_8038921C, (s32) this->marker); subaddie_set_state(this, 2); } break; diff --git a/src/CCW/code_3310.c b/src/CCW/code_3310.c index 601cf9d9..6b905198 100644 --- a/src/CCW/code_3310.c +++ b/src/CCW/code_3310.c @@ -168,12 +168,12 @@ void func_803897B8(Actor *this, s32 next_state) { func_8028F784(0); skeletalAnim_set(this->unk148, local->unk0->unk1C, 0.2f, 6.0f); skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_1_LOOP); - skeletalAnim_setCallback_1(this->unk148, 0.2f, func_80389740, this->marker); - skeletalAnim_setCallback_1(this->unk148, 0.3f, func_80389740, this->marker); - skeletalAnim_setCallback_1(this->unk148, 0.4f, func_80389740, this->marker); - skeletalAnim_setCallback_1(this->unk148, 0.72f, func_80389740, this->marker); - skeletalAnim_setCallback_1(this->unk148, 0.82f, func_80389740, this->marker); - skeletalAnim_setCallback_1(this->unk148, 0.92f, func_80389740, this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.2f, (GenFunction_1)func_80389740, (s32)this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.3f, (GenFunction_1)func_80389740, (s32)this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.4f, (GenFunction_1)func_80389740, (s32)this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.72f, (GenFunction_1)func_80389740, (s32)this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.82f, (GenFunction_1)func_80389740, (s32)this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.92f, (GenFunction_1)func_80389740, (s32)this->marker); local->unk8 = local->unk0->unk20; } this->state = next_state; diff --git a/src/CCW/code_50D0.c b/src/CCW/code_50D0.c index 501637dd..dc55433e 100644 --- a/src/CCW/code_50D0.c +++ b/src/CCW/code_50D0.c @@ -66,14 +66,14 @@ void func_8038B6DC(ActorMarker *marker) { skeletalAnim_clearCallbacks(this->unk148); phi_f20 = randf2(0.1f, 0.3f); for(i = 0; i < 3; i++){ - skeletalAnim_setCallback_1(this->unk148, phi_f20, func_8038B610, this->marker); + skeletalAnim_setCallback_1(this->unk148, phi_f20, (GenFunction_1)func_8038B610, (s32)this->marker); phi_f20 += randf2(0.15f, 0.3f); if(0.85 < phi_f20) break; } - skeletalAnim_setCallback_1(this->unk148, 0.35f, func_8038B4C0, this->marker); - skeletalAnim_setCallback_1(this->unk148, 0.63f, func_8038B58C, this->marker); - skeletalAnim_setCallback_1(this->unk148, 0.9f, func_8038B6DC, this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.35f, (GenFunction_1)func_8038B4C0, (s32)this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.63f, (GenFunction_1)func_8038B58C, (s32)this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.9f, (GenFunction_1)func_8038B6DC, (s32)this->marker); } void func_8038B814(Actor *this, s32 next_state) { diff --git a/src/CCW/code_5BF0.c b/src/CCW/code_5BF0.c index d2db3f6d..00d826ca 100644 --- a/src/CCW/code_5BF0.c +++ b/src/CCW/code_5BF0.c @@ -47,15 +47,15 @@ void CCW_func_8038C16C(Actor *this, s32 next_state) { if (next_state == 2) { if (this->marker->id == 0x1CA) { skeletalAnim_set(this->unk148, 0x22E, 0.2f, 3.53f); - skeletalAnim_setCallback_1(this->unk148, 0.1f, func_8038C0E8, this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.1f, (GenFunction_1)func_8038C0E8, (s32)this->marker); } if (this->marker->id == 0x1C7) { skeletalAnim_set(this->unk148, 0x230, 0.2f, 4.0f); } if (this->marker->id == 0x1CB) { skeletalAnim_set(this->unk148, 0x1A2, 0.2f, 4.0f); - skeletalAnim_setCallback_1(this->unk148, 0.3f, func_8038BFE0, this->marker); - skeletalAnim_setCallback_1(this->unk148, 0.65f, func_8038C064, this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.3f, (GenFunction_1)func_8038BFE0, (s32)this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.65f, (GenFunction_1)func_8038C064, (s32)this->marker); } if (this->marker->id == 0x1C8) { skeletalAnim_set(this->unk148, 0x231, 0.2f, 4.0f); diff --git a/src/CCW/code_61E0.c b/src/CCW/code_61E0.c index 0e348d76..fcab4dd8 100644 --- a/src/CCW/code_61E0.c +++ b/src/CCW/code_61E0.c @@ -32,8 +32,8 @@ void CCW_func_8038C6A0(Actor *this, s32 next_state) { local = (ActorLocal_CCW_61E0 *)&this->local; if (next_state == 1) { skeletalAnim_set(this->unk148, 0x25B, 0.0f, 1.0f); - skeletalAnim_setCallback_1(this->unk148, 0.5f, CCW_func_8038C5D0, this->marker); - skeletalAnim_setCallback_1(this->unk148, 0.7f, CCW_func_8038C638, this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.5f, (GenFunction_1)CCW_func_8038C5D0, (s32)this->marker); + skeletalAnim_setCallback_1(this->unk148, 0.7f, (GenFunction_1)CCW_func_8038C638, (s32)this->marker); } if (next_state == 3) { local->unk0[0] = this->position[0]; diff --git a/src/CCW/code_6620.c b/src/CCW/code_6620.c index 535d1bc2..6a0d691b 100644 --- a/src/CCW/code_6620.c +++ b/src/CCW/code_6620.c @@ -60,7 +60,7 @@ void func_8038CB40(Actor *this, s32 next_state) { if (next_state == 1) { skeletalAnim_set(this->unk148, 0x289, 0.2f, 1.1f); for(i = 0; i < 10; i++){ - skeletalAnim_setCallback_1(this->unk148, randf(), func_8038CA10, (s32)this->marker); + skeletalAnim_setCallback_1(this->unk148, randf(), (GenFunction_1)func_8038CA10, (s32)this->marker); } } this->state = next_state; diff --git a/src/CCW/code_7BF0.c b/src/CCW/code_7BF0.c index ff9f4d97..d828d014 100644 --- a/src/CCW/code_7BF0.c +++ b/src/CCW/code_7BF0.c @@ -29,7 +29,7 @@ void CCW_func_8038E034(Actor* actor) { subaddie_set_state_with_direction(actor, 2, 0.001f, 1); } -void func_8038E060(s32 arg0, ActorMarker *marker){ +void func_8038E060(BoneTransformList *arg0, ActorMarker *marker){ Actor *this; f32 sp28[3]; s32 pad24; @@ -61,7 +61,7 @@ void func_8038E0C8(Actor *this) { if (!this->volatile_initialized) { this->volatile_initialized = TRUE; - func_8028746C(this->anctrl, func_8038E060); + func_8028746C(this->anctrl, (GenFunction_2)func_8038E060); func_8028748C(this->anctrl, (s32) this->marker); this->marker->propPtr->unk8_3 = TRUE; this->unk1C[0] = 0.0f; diff --git a/src/RBB/ch/anchorswitch.c b/src/RBB/ch/anchorswitch.c index 352a75a4..cbd771a7 100644 --- a/src/RBB/ch/anchorswitch.c +++ b/src/RBB/ch/anchorswitch.c @@ -29,7 +29,7 @@ void __chAnchorSwitch_setState(Actor *this, s32 arg1){ this->state = arg1; } -void __chAnchorSwitch_press(ActorMarker *marker, s32 arg1){ +void __chAnchorSwitch_press(ActorMarker *marker, ActorMarker *arg1){ Actor *actor = marker_getActor(marker); __chAnchorSwitch_setState(actor, 2); }