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

animation struct documentation

Browse Source
This commit is contained in:
Banjo Kazooie
2023-03-12 23:11:39 -05:00
parent 7dd7a0b60c
commit af75d8b32d
293 changed files with 2031 additions and 1986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/ch/badShad.c
View File

@@ -136,7 +136,7 @@ void func_802D729C(Actor *actor, f32 arg1){
return;
}
if(!actor->unk104){
__spawnQueue_add_2((GenMethod_2)func_802D71A0, (s32) actor->marker, reinterpret_cast(s32, arg1));
__spawnQueue_add_2((GenFunction_2)func_802D71A0, (s32) actor->marker, reinterpret_cast(s32, arg1));
return;
}

6
src/core2/ch/beehive.c
View File

@@ -14,7 +14,7 @@ ActorAnimationInfo D_803672C0[] ={
ActorInfo D_803672E0 = {0x50, ACTOR_12_BEEHIVE, ASSET_364_MODEL_BEEHIVE,
1, D_803672C0,
func_802CE8D4, func_80326224, func_80325888,
func_802CE8D4, func_80326224, actor_draw,
0, 0x333, 0.0f, 0
};
@@ -27,8 +27,8 @@ void func_802CE7E0(ActorMarker *marker, ActorMarker *other){
actor_playAnimationOnce(actor);
marker->collidable = FALSE;
actor->unk138_27 = 3;
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
actor->marker->propPtr->unk8_3 = 0;
func_803115C4(ASSET_D96_DIALOG_BEEHIVE_MEET);
func_803115C4(ASSET_DA6_TEXT_BEEHIVE_WITH_BEES);

2
src/core2/ch/bigbutt.c
View File

@@ -341,7 +341,7 @@ Actor *func_802C6E84(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
f32 sp40[3];
actor = func_80325888(marker, gfx, mtx, vtx);
actor = actor_draw(marker, gfx, mtx, vtx);
if(marker->unk14_21){
f32 sp34[3] = {0.0f, 4.0f, -15.0f};
f32 sp28[3];

20
src/core2/ch/bottlesbonus.c
View File

@@ -45,7 +45,7 @@ typedef struct{
}Struct_core2_560F0_2;
extern void item_set(enum item_e, s32);
extern void func_80325794(ActorMarker *);
extern void actor_postdrawMethod(ActorMarker *);
extern void func_8024CE60(f32, f32);
Actor *chBottlesBonus_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -171,8 +171,8 @@ Actor *chBottlesBonus_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx)
gDPSetTextureFilter((*gfx)++, G_TF_POINT);
gSPSegment((*gfx)++, 0x04, osVirtualToPhysical(sp50));
modelRender_preDraw((GenMethod_1)func_803253A0, (s32)sp6C);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)marker);
modelRender_preDraw((GenFunction_1)actor_predrawMethod, (s32)sp6C);
modelRender_postDraw((GenFunction_1)actor_postdrawMethod, (s32)marker);
modelRender_draw(gfx, mtx, sp60, NULL, D_80368250, sp54, func_80330B1C(marker));
gDPSetTextureFilter((*gfx)++, G_TF_BILERP);
@@ -269,7 +269,7 @@ f32 chBottlesBonus_func_802DD804(f32 arg0) {
return sinf(M_PI * arg0 / 2);
}
void chBottlesBonus_func_802DD8AC(s32 arg0, s32 arg1) {
void chBottlesBonus_func_802DD8AC(BoneTransformList *arg0, s32 arg1) {
s32 i;
f32 spD8[3];
f32 spD4;
@@ -289,7 +289,7 @@ void chBottlesBonus_func_802DD8AC(s32 arg0, s32 arg1) {
D_8037DEB0 = 1;
for(i = 0; i < 20; i++){
func_8033A57C(arg0, D_80368254[i], D_8037DEC4[i].unkC);
func_8033A670(arg0, D_80368254[i], D_8037DEC4[i].unk1C);
boneTransformList_getBoneScale(arg0, D_80368254[i], D_8037DEC4[i].unk1C);
chBottlesBonus_func_802DD778(arg0, i, D_8037DEC4[i].unk0);
chBottlesBonusCursor_func_802DF460(i + 20, chBottlesBonusMarker, D_8037DEC4[i].unk0);
}
@@ -300,9 +300,9 @@ void chBottlesBonus_func_802DD8AC(s32 arg0, s32 arg1) {
D_8037DEB4 = 1;
for(i = 0; i < 20; i++){
func_8033A57C(arg0, D_80368254[i], D_8037DEB8[i].unkC);
func_8033A670(arg0, D_80368254[i], D_8037DEB8[i].unk1C);
boneTransformList_getBoneScale(arg0, D_80368254[i], D_8037DEB8[i].unk1C);
chBottlesBonus_func_802DD778(arg0, i, D_8037DEB8[i].unk0);
func_80345250(D_8037DEC0[i].unkC, D_8037DEB8[i].unkC);
vec4f_clone(D_8037DEC0[i].unkC, D_8037DEB8[i].unkC);
D_8037DEC0[i].unk0[0] = D_8037DEB8[i].unk0[0];
D_8037DEC0[i].unk0[1] = D_8037DEB8[i].unk0[1];
D_8037DEC0[i].unk0[2] = D_8037DEB8[i].unk0[2];
@@ -337,7 +337,7 @@ void chBottlesBonus_func_802DD8AC(s32 arg0, s32 arg1) {
D_8037DEC0[i].unk1C[1] = D_8037DEBC[i].unk1C[1];
D_8037DEC0[i].unk1C[2] = D_8037DEBC[i].unk1C[2];
func_80345250(D_8037DEC0[i].unkC, D_8037DEBC[i].unkC);
vec4f_clone(D_8037DEC0[i].unkC, D_8037DEBC[i].unkC);
break;
case 2://L802DDD9C
chBottlesBonus_func_802DD484(spD8, spD4, 1.0f, 0.2);
@@ -352,7 +352,7 @@ void chBottlesBonus_func_802DD8AC(s32 arg0, s32 arg1) {
D_8037DEC0[i].unk1C[0] = D_8037DEBC[i].unk1C[0];
D_8037DEC0[i].unk1C[1] = D_8037DEBC[i].unk1C[1];
D_8037DEC0[i].unk1C[2] = D_8037DEBC[i].unk1C[2];
func_80345250(D_8037DEC0[i].unkC, D_8037DEBC[i].unkC);
vec4f_clone(D_8037DEC0[i].unkC, D_8037DEBC[i].unkC);
chBottlesBonusCursor_func_802DF460(40 + i, chBottlesBonusMarker, D_803681A0);
break;
@@ -375,7 +375,7 @@ void chBottlesBonus_func_802DD8AC(s32 arg0, s32 arg1) {
spD8[0] = spD8[0] * D_8037DEBC[i].unk1C[0];
spD8[1] = spD8[1] * D_8037DEBC[i].unk1C[1];
spD8[2] = spD8[2] * D_8037DEBC[i].unk1C[2];
func_8033A928(arg0, D_80368254[i], spD8);
boneTransformList_setBoneScale(arg0, D_80368254[i], spD8);
chBottlesBonus_func_802DD6E0(arg0, i, D_8037DEBC[i].unk0);
D_8037DEC8[i] += spD0;
D_8037DF18[i] += spD0;

14
src/core2/ch/bottlesbonuscursor.c
View File

@@ -15,7 +15,7 @@ extern void func_8025AABC(enum comusic_e);
extern f32 func_8024E420(s32, s32, s32);
extern f32 func_8033DDB8(void);
extern void chBottlesBonus_func_802DEA50(s32);
extern void func_80325794(ActorMarker *);
extern void actor_postdrawMethod(ActorMarker *);
extern void chBottlesBonus_completedPuzzle(void);
@@ -124,7 +124,7 @@ bool chBottlesBonusCursor_checkPuzzleCompletion(void) {
for(i = 0; i < 20 && D_8037E5C0.is_completed != 0; i++){
if((D_8037E248[i].state != 3)
|| (i != D_8037E248[i].piece_id)
|| !func_803454D0(chBottlesBonus_func_802DEAF8(i))
|| !vec4f_isAlmostZero(chBottlesBonus_func_802DEAF8(i))
) {
D_8037E5C0.is_completed = FALSE;
}
@@ -146,8 +146,8 @@ void chBottlesBonusCursor_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
f32 sp3C;
this = marker_getActorAndRotation(chBottlesBonusSursorMarker, &rotation);
modelRender_preDraw((GenMethod_1)func_803253A0, (s32)this);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)chBottlesBonusSursorMarker);
modelRender_preDraw((GenFunction_1)actor_predrawMethod, (s32)this);
modelRender_postDraw((GenFunction_1)actor_postdrawMethod, (s32)chBottlesBonusSursorMarker);
modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
actor_setOpacity(this, 0xB9);
func_8024E030(this->position, D_8037E5C0.unk18);
@@ -177,7 +177,7 @@ ActorMarker *chBottlesBonusCursor_spawn(void){
void chBottlesBonusCursor_func_802DF928(s32 indx) {
f32 rotation_3d[3];
func_80345250(D_8037E248[indx].unk1C, D_8037E248[indx].unkC);
vec4f_clone(D_8037E248[indx].unk1C, D_8037E248[indx].unkC);
rotation_3d[0] = D_8037E248[indx].rotation;
rotation_3d[1] = 0.0f;
rotation_3d[2] = 0.0f;
@@ -312,7 +312,7 @@ void chBottlesBonusCursor_update(Actor *this) {
) {
if (D_8037E248[D_8037E5B8 - 41].state == 3) {
if( D_8037E5B8 - 41 != D_8037E248[D_8037E5B8 - 41].piece_id
|| !func_803454D0(chBottlesBonus_func_802DEAF8(D_8037E5B8 - 41))
|| !vec4f_isAlmostZero(chBottlesBonus_func_802DEAF8(D_8037E5B8 - 41))
) {
D_8037E5C0.unk0 = D_8037E5B8 - 41;
chBottlesBonus_func_802DEA50(D_8037E5C0.unk0);
@@ -341,7 +341,7 @@ void chBottlesBonusCursor_update(Actor *this) {
if ((D_8037E5B8 >= 21) && (D_8037E5B8 < 41)) {
held_piece->state = 3;
held_piece->piece_id = D_8037E5B8 - 21;
if ((D_8037E5C0.unk0 == held_piece->piece_id) && func_803454D0(chBottlesBonus_func_802DEAF8(D_8037E5C0.unk0))) {
if ((D_8037E5C0.unk0 == held_piece->piece_id) && vec4f_isAlmostZero(chBottlesBonus_func_802DEAF8(D_8037E5C0.unk0))) {
sp44 = COMUSIC_2B_DING_B;
func_80328B8C(this, 6, 0.0f, 1);
actor_playAnimationOnce(this);

8
src/core2/ch/clankerwhipcrack.c
View File

@@ -8,17 +8,17 @@ void func_803567EC(Actor *this);
ActorInfo D_80372810 = {
MARKER_1A7_CLANKER_WHIPCRACK, ACTOR_28A_CLANKER_WHIPCRACK, ASSET_432_MODEL_CLANKER_WHIPCRACK,
0, NULL,
func_803567EC, NULL, func_80325888,
func_803567EC, NULL, actor_draw,
0, 0, 0.0f, 0
};
/* .code */
void func_80356770(Actor *this, s32 next_state){
if(next_state == 1)
func_80335924(this->unk148, ASSET_15C_ANIM_CLANKER_WHIPCRACK_IDLE, 0.5f, 1.0f);
skeletalAnim_set(this->unk148, ASSET_15C_ANIM_CLANKER_WHIPCRACK_IDLE, 0.5f, 1.0f);
if(next_state == 2)
func_80335924(this->unk148, ASSET_15D_ANIM_CLANKER_WHIPCRACK_ATTACK, 0.5f, 1.0f);
skeletalAnim_set(this->unk148, ASSET_15D_ANIM_CLANKER_WHIPCRACK_ATTACK, 0.5f, 1.0f);
this->state = next_state;
}
@@ -44,7 +44,7 @@ void func_803567EC(Actor *this){
}
if(this->state == 2){
func_8033568C(this->unk148, &sp44, &sp40);
skeletalAnim_getProgressRange(this->unk148, &sp44, &sp40);
if(sp44 < 0.13 && 0.13 <= sp40)
func_8030E9C4(SFX_6A_FLAGPOLE_WOBBLE, randf2(0.9f, 1.0f), 14000, this->position, 500.0f, 1000.0f);

26
src/core2/ch/clucker.c
View File

@@ -55,9 +55,9 @@ void func_80357264(Actor *this, s32 next_state){
this->marker->unk14_20 = MARKER_1D0_CLUCKER_B;
actor_collisionOff(this);
if(next_state == 1 || next_state == 2){
func_80335924(this->unk148, ASSET_184_ANIM_CLUCKER_ATTACK_SHORT, 0.0f, 2.5f);
func_80335A74(this->unk148, 0.99f);
func_80335A8C(this->unk148, 4);
skeletalAnim_set(this->unk148, ASSET_184_ANIM_CLUCKER_ATTACK_SHORT, 0.0f, 2.5f);
skeletalAnim_setProgress(this->unk148, 0.99f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_4_STOPPED);
if(this->state == 4){
if(local->unk0 == 2){
local->unk4 = randf2(0.5f, 0.75f);
@@ -82,10 +82,10 @@ void func_80357264(Actor *this, s32 next_state){
actor_collisionOn(this);
local->unk0 = (local->unk0 + 1) % 3;
if(local->unk0 < 2)
func_80335924(this->unk148, ASSET_184_ANIM_CLUCKER_ATTACK_SHORT, 0.0f, randf2( 0.6f, 1.0f));
skeletalAnim_set(this->unk148, ASSET_184_ANIM_CLUCKER_ATTACK_SHORT, 0.0f, randf2( 0.6f, 1.0f));
else
func_80335924(this->unk148, ASSET_185_ANIM_CLUCKER_ATTACK_LONG, 0.0f, randf2( 2.3f, 2.7f));
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_185_ANIM_CLUCKER_ATTACK_LONG, 0.0f, randf2( 2.3f, 2.7f));
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
func_8030E6A4(SFX_4A_CLUCKER_AHH, randf2(0.85f, 0.95f), 32000);
}
@@ -100,7 +100,7 @@ void func_80357264(Actor *this, s32 next_state){
func_80324E38(2.0f, 0);
}//L80357518
func_8030E6D4(SFX_1E_HITTING_AN_ENEMY_2);
func_80335924(this->unk148, ASSET_186_ANIM_CLUCKER_DIE, 0.05f, 2.0f);
skeletalAnim_set(this->unk148, ASSET_186_ANIM_CLUCKER_DIE, 0.05f, 2.0f);
}//L80357540
this->state = next_state;
@@ -120,7 +120,7 @@ Actor *func_803575B8(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8033A45C(3, (this->state == 5)? 1 : 0);
func_8033A45C(4, (this->state == 0 || this->state == 1 || this->state == 6)? 0 : 1);
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void func_8035765C(Actor *this){
@@ -174,8 +174,8 @@ void func_8035765C(Actor *this){
}
if(this->state == 4){
func_8033568C(this->unk148, &sp4C, &sp48);
if(func_8033567C(this->unk148) == 0x185){
skeletalAnim_getProgressRange(this->unk148, &sp4C, &sp48);
if(skeletalAnim_getAnimId(this->unk148) == 0x185){
if(sp4C < 0.58 && 0.58 <= sp48){
this->marker->unk14_20 = MARKER_1D0_CLUCKER_B;
}
@@ -206,13 +206,13 @@ void func_8035765C(Actor *this){
func_8030E6D4(SFX_2_CLAW_SWIPE);
}
}//L80357B30
if(func_80335794(this->unk148) > 0){
if(skeletalAnim_getLoopCount(this->unk148) > 0){
func_80357264(this, 2);
}
}//L80357B48
if(this->state == 5){
func_8033568C(this->unk148, &sp44, &sp40);
skeletalAnim_getProgressRange(this->unk148, &sp44, &sp40);
if(sp44 < 0.1 && 0.1 <= sp40){
func_8030E6A4(SFX_68_CLUCKER_AAEEGHH, randf2(1.0f, 1.1f), 32000);
}
@@ -220,7 +220,7 @@ void func_8035765C(Actor *this){
if(sp44 < 0.7 && 0.7 <= sp40){
func_8030E6D4(SFX_61_CARTOONY_FALL);
}
if(func_80335794(this->unk148) > 0){
if(skeletalAnim_getLoopCount(this->unk148) > 0){
func_80357264(this, 6);
}
}

24
src/core2/ch/code_CFA60.c
View File

@@ -25,9 +25,9 @@ void func_803569F0(Actor *this, s32 next_state){
this->marker->unk14_20 = 0x1cf;
actor_collisionOff(this);
if(next_state == 1 || next_state == 2){
func_80335924(this->unk148, ASSET_15A_ANIM_GRILL_CHOMPA_ATTACK, 0, 2.5f);
func_80335A74(this->unk148, 0.99f);
func_80335A8C(this->unk148, 4);
skeletalAnim_set(this->unk148, ASSET_15A_ANIM_GRILL_CHOMPA_ATTACK, 0, 2.5f);
skeletalAnim_setProgress(this->unk148, 0.99f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_4_STOPPED);
if(this->state == 4){
local->unk0 = randf2(0.5f, 1.0f);
}
@@ -44,15 +44,15 @@ void func_803569F0(Actor *this, s32 next_state){
if(next_state == 4){
this->marker->unk14_20 = 0x29;
actor_collisionOn(this);
func_80335924(this->unk148, ASSET_15A_ANIM_GRILL_CHOMPA_ATTACK, 0, randf2(2.3f, 2.7f));
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_15A_ANIM_GRILL_CHOMPA_ATTACK, 0, randf2(2.3f, 2.7f));
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
func_8030E760(0x3ef, 1.1f, 25000);
func_8030E760(0x3ef, 1.1f, 25000);
}//L80356B90
if(next_state == 5){
func_8030E760(SFX_1E_HITTING_AN_ENEMY_2, 1.0f, 32000);
func_80335924(this->unk148, ASSET_15B_ANIM_GRILL_CHOMPA_DIE, 0.05f, 2.0f);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_15B_ANIM_GRILL_CHOMPA_DIE, 0.05f, 2.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
}
this->state = next_state;
}
@@ -73,7 +73,7 @@ Actor *func_80356C50(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
else{
func_8033A45C(3, (actor->state == 1 || actor->state == 6)? 0:1);
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
}
@@ -121,7 +121,7 @@ void func_80356CCC(Actor *this){
}
}//L80356EAC
if(this->state == 4){
func_8033568C(this->unk148, &sp4C, &sp48);
skeletalAnim_getProgressRange(this->unk148, &sp4C, &sp48);
if(sp4C < 0.59 && 0.59 <= sp48){
this->marker->unk14_20 = 0x1cf;
}
@@ -137,19 +137,19 @@ void func_80356CCC(Actor *this){
if(sp4C < 0.9 && 0.9 <= sp48){
func_8030E760(SFX_2_CLAW_SWIPE, 1.0f, 32000);
}
if(func_80335794(this->unk148) > 0){
if(skeletalAnim_getLoopCount(this->unk148) > 0){
func_803569F0(this, 2);
}
}//L80357078
if(this->state == 5){
func_8033568C(this->unk148, &sp44, &sp40);
skeletalAnim_getProgressRange(this->unk148, &sp44, &sp40);
if(sp44 < 0.1 && 0.1 <= sp40){
func_8030E760(SFX_D7_GRABBA_DEATH, 1.0f, 32000);
}
if(sp44 < 0.7 && 0.7 <= sp40){
func_8030E760(SFX_A_BANJO_LANDING_05, 0.8f, 32000);
}
if(func_80335794(this->unk148) > 0){
if(skeletalAnim_getLoopCount(this->unk148) > 0){
func_803569F0(this, 6);
}
}//L8035713C

2
src/core2/ch/collectible.c
View File

@@ -78,7 +78,7 @@ void func_802D8C98(Actor *this, s32 arg1) {
bool chCollectible_collectItem(Actor* actor, enum file_progress_e arg1, enum asset_e dialogId, enum comusic_e sfxId, enum item_e itemId, f32 arg5){
func_8025A6EC(sfxId,32000);
timedFunc_set_1(0.75f, (GenMethod_1)func_8035644C, arg1);
timedFunc_set_1(0.75f, (GenFunction_1)func_8035644C, arg1);
if(!func_802FADD4(0x1b)){
item_inc(itemId);
} else {

8
src/core2/ch/crab.c
View File

@@ -179,7 +179,7 @@ void __chCrab_die(ActorMarker *marker, ActorMarker *other){
is_black_snippet = this->modelCacheIndex == ACTOR_F2_BLACK_SNIPPET;
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 32750, this->position, 950, 1900);
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 28000, this->position, 950, 1900);
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
this->unk60 = 5.0f;
marker->collidable = FALSE;
this->unk138_27 = 1;
@@ -399,6 +399,6 @@ void chCrab_update(Actor *this) {
}
/* .data */
ActorInfo D_803670B8 = { MARKER_13_SNIPPET, ACTOR_67_SNIPPET, ASSET_358_SNIPPET, 0x1, chCrabAnimations, chCrab_update, func_80326224, func_80325888, 1900, 0, 0.8f, 0};
ActorInfo D_803670DC = { MARKER_DD_BLACK_SNIPPET, ACTOR_F2_BLACK_SNIPPET, ASSET_566_MODEL_BLACK_SNIPPET, 0x1, chCrabAnimations, chCrab_update, func_80326224, func_80325888, 1900, 0, 0.8f, 0};
ActorInfo D_80367100 = { MARKER_13_SNIPPET, ACTOR_F5_MUTIE_SNIPPET, ASSET_38F_MODEL_MUTIE_SNIPPET, 0x1, chCrabMutantAnimations, chCrab_update, func_80326224, func_80325888, 1900, 0, 0.8f, 0};
ActorInfo D_803670B8 = { MARKER_13_SNIPPET, ACTOR_67_SNIPPET, ASSET_358_SNIPPET, 0x1, chCrabAnimations, chCrab_update, func_80326224, actor_draw, 1900, 0, 0.8f, 0};
ActorInfo D_803670DC = { MARKER_DD_BLACK_SNIPPET, ACTOR_F2_BLACK_SNIPPET, ASSET_566_MODEL_BLACK_SNIPPET, 0x1, chCrabAnimations, chCrab_update, func_80326224, actor_draw, 1900, 0, 0.8f, 0};
ActorInfo D_80367100 = { MARKER_13_SNIPPET, ACTOR_F5_MUTIE_SNIPPET, ASSET_38F_MODEL_MUTIE_SNIPPET, 0x1, chCrabMutantAnimations, chCrab_update, func_80326224, actor_draw, 1900, 0, 0.8f, 0};

2
src/core2/ch/firefx.c
View File

@@ -10,7 +10,7 @@ void chfirefx_update(Actor *this);
ActorInfo gChFireFxInfo = {
MARKER_256_FIRE_FX, ACTOR_383_FIRE_FX, ASSET_526_SPRITE_FIRE,
0, NULL,
chfirefx_update, func_80326224, func_80325888,
chfirefx_update, func_80326224, actor_draw,
0, 0, 0.0f, 0
};

18
src/core2/ch/flotsam.c
View File

@@ -58,7 +58,7 @@ void func_8035C080(Actor *this, s32 next_state){
local->unkD = next_state;
if(next_state == 1){
func_80335924(this->unk148, 0, 0.0f, 0.0f);
skeletalAnim_set(this->unk148, 0, 0.0f, 0.0f);
this->yaw = local->unk34[0];
}
if( next_state == 3
@@ -66,7 +66,7 @@ void func_8035C080(Actor *this, s32 next_state){
|| next_state == 7
|| next_state == 6
){
func_80335924(this->unk148, ASSET_132_ANIM_FLOTSAM_MOVE, 0.1f, 0.7f);
skeletalAnim_set(this->unk148, ASSET_132_ANIM_FLOTSAM_MOVE, 0.1f, 0.7f);
local->unk10[0] = this->position_x;
local->unk10[1] = this->position_y;
local->unk10[2] = this->position_z;
@@ -176,8 +176,8 @@ void func_8035C080(Actor *this, s32 next_state){
func_802F9EC4(sp38, this->position, 0x5dc, 0x9c4);
func_802F9F80(sp38, 0.0f, 2.0f, 2.0f);
func_802FA060(sp38, 0x6590, 0x6d60, 500.0f);
func_80335924(this->unk148, ASSET_189_ANIM_FLOTSAM_DIE, 0.1f, 4.0f);
func_80335A8C(this->unk148, 2);
skeletalAnim_set(this->unk148, ASSET_189_ANIM_FLOTSAM_DIE, 0.1f, 4.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
local->pCtrl_8 = particleEmitter_new(20);
particleEmitter_setSprite(local->pCtrl_8, ASSET_70E_SPRITE_SMOKE_2);
particleEmitter_setStartingFrameRange(local->pCtrl_8, 0, 7);
@@ -214,7 +214,7 @@ Actor* func_8035C71C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(this->state == 0) return this;
if(this->state == 8){
sp5C = func_803356A0(this->unk148);
sp5C = skeletalAnim_getBoneTransformList(this->unk148);
if(sp5C){
sp40[0] = 0.0f;
sp40[1] = 0.0f;
@@ -224,7 +224,7 @@ Actor* func_8035C71C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
sp34[0] = 1.0 - local->unk0*0.5;
sp34[1] = 1.0 - local->unk0*0.5;
sp34[2] = 1.0 - local->unk0*0.5;
func_8033A928(sp5C, 3, sp34);
boneTransformList_setBoneScale(sp5C, 3, sp34);
}
}
@@ -232,7 +232,7 @@ Actor* func_8035C71C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_8033A450(func_80329934());
}
func_80325888(marker, gfx, mtx, vtx);
actor_draw(marker, gfx, mtx, vtx);
if(local->pCtrl_8 && this->marker->unk14_21){
func_8034A174(func_80329934(), 5, sp28);
@@ -296,7 +296,7 @@ void func_8035C8F4(Actor *this){
ml_interpolate_vec3f(this->position, local->unk10, local->unk1C, local->unk0);
this->position_y += 100.0f*sinf(local->unk0*3.141592654);
this->yaw = local->unk0*(local->unk34[2] - local->unk34[1]) + local->unk34[1];
if(func_80335794(this->unk148) > 0){
if(skeletalAnim_getLoopCount(this->unk148) > 0){
if(ml_distance_vec3f(this->position, local->unk28) < 10.0f){
func_8035C080(this, 1);
}
@@ -326,7 +326,7 @@ void func_8035C8F4(Actor *this){
if(this->state == 8){
local->unk0 += 0.25*sp34;
if(func_80335794(this->unk148) > 0)
if(skeletalAnim_getLoopCount(this->unk148) > 0)
marker_despawn(this->marker);
}
}

26
src/core2/ch/gameSelect.c
View File

@@ -118,7 +118,7 @@ Actor *func_802C4360(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
else{
modelRender_setEnvColor(0x64, 0x64, 0x64, 0xFF);
}
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
Actor *func_802C4464(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
@@ -302,7 +302,7 @@ void func_802C4C14(Actor *this){
return;
if(!this->initialized){
__spawnQueue_add_1((GenMethod_1)func_802C4BB4, reinterpret_cast(s32, this->marker));
__spawnQueue_add_1((GenFunction_1)func_802C4BB4, reinterpret_cast(s32, this->marker));
func_802C7318(this);
this->unk130 = func_802C71F0;
if(sp84 == 0){
@@ -352,7 +352,7 @@ void func_802C4C14(Actor *this){
case 1://L802C4F10
if(sp84 == 1){
func_8030E510(SFX_136_GAMEBOY_STARTUP, 15000);
timedFunc_set_3(0.25f, (GenMethod_3)comusic_8025AB44, COMUSIC_73_GAMEBOY, -1, 2000);
timedFunc_set_3(0.25f, (GenFunction_3)comusic_8025AB44, COMUSIC_73_GAMEBOY, -1, 2000);
func_8025A58C(0, 2000);
}
else{
@@ -394,19 +394,19 @@ void func_802C4C14(Actor *this){
if(animctrl_isStopped(this->animctrl)){
chBottlesBonus_func_802DEB80();
if(!gameFile_isNotEmpty(sp84)){
timedFunc_set_3(0.0f, (GenMethod_3)func_802E4078, MAP_85_CS_SPIRAL_MOUNTAIN_3, 0, 1);
timedFunc_set_3(0.0f, (GenFunction_3)func_802E4078, MAP_85_CS_SPIRAL_MOUNTAIN_3, 0, 1);
}
else{//L802C511C
sp44 = 0.0f;
if(this->state == 4 && (sp84 == 0 || sp84 == 1))
sp44 = 0.25f;
if(func_802DA498() && fileProgressFlag_get(FILEPROG_BD_ENTER_LAIR_CUTSCENE)){
timedFunc_set_2(sp44, (GenMethod_2)func_8031FB14, 0, 0);
timedFunc_set_2(sp44, (GenFunction_2)func_8031FB14, 0, 0);
}
else{//L802C5188
timedFunc_set_2(sp44, (GenMethod_2)func_8031F678, 0, 0);
timedFunc_set_2(sp44, (GenFunction_2)func_8031F678, 0, 0);
}//L802C51A0
timedFunc_set_1(sp44, (GenMethod_1)func_80335110, 1);
timedFunc_set_1(sp44, (GenFunction_1)func_80335110, 1);
}//L802C51B8
this->state = 6;
}
@@ -430,17 +430,17 @@ void func_802C4C14(Actor *this){
case 0://L802C52B8
func_8030E510(SFX_31_BANJO_OHHWAAOOO, 28000);
func_8030E540(SFX_135_CARTOONY_SPRING);
timedFunc_set_2(0.4f, (GenMethod_2)func_8030E510, SFX_13A_GLASS_BREAKING_7, 0x7fff);
timedFunc_set_2(0.9f, (GenMethod_2)func_8030E510, SFX_150_PORCELAIN_CRASH, 0x7fff);
timedFunc_set_2(1.0f, (GenMethod_2)func_8030E510, SFX_151_CAT_MEOW, 0x7fff);
timedFunc_set_2(0.4f, (GenFunction_2)func_8030E510, SFX_13A_GLASS_BREAKING_7, 0x7fff);
timedFunc_set_2(0.9f, (GenFunction_2)func_8030E510, SFX_150_PORCELAIN_CRASH, 0x7fff);
timedFunc_set_2(1.0f, (GenFunction_2)func_8030E510, SFX_151_CAT_MEOW, 0x7fff);
break;
case 1://L802C5320
timedFunc_set_2(0.4f, (GenMethod_2)func_8030E510, SFX_31_BANJO_OHHWAAOOO, 28000);
timedFunc_set_2(0.2f, (GenMethod_2)func_8030E510, SFX_E_SHOCKSPRING_BOING, 28000);
timedFunc_set_2(0.4f, (GenFunction_2)func_8030E510, SFX_31_BANJO_OHHWAAOOO, 28000);
timedFunc_set_2(0.2f, (GenFunction_2)func_8030E510, SFX_E_SHOCKSPRING_BOING, 28000);
func_8030E540(SFX_2D_KABOING);
break;
case 2://L802C5364
timedFunc_set_2(0.15f, (GenMethod_2)func_8030E510, SFX_32_BANJO_EGHEE, 28000);
timedFunc_set_2(0.15f, (GenFunction_2)func_8030E510, SFX_32_BANJO_EGHEE, 28000);
func_8030E510(SFX_3F6_UNKNOWN, 28000);
func_8030E540(SFX_8F_SNOWBALL_FLYING);
break;

4
src/core2/ch/ghost.c
View File

@@ -26,14 +26,14 @@ ActorAnimationInfo D_80372BE0[] ={
ActorInfo D_80372C18 = { //TEEHEE
MARKER_99_TEEHEE, ACTOR_CA_TEEHEE, ASSET_3CB_MODEL_TEEHEE,
0x1, D_80372BE0,
func_8035B900, func_80326224, func_80325888,
func_8035B900, func_80326224, actor_draw,
6500, 0, 0.9f, 0
};
ActorInfo D_80372C3C = { //PURPLE_TEEHEE (inside tumblar)
MARKER_296_TEEHEE_PURPLE, ACTOR_3C1_PURPLE_TEEHEE, ASSET_564_MODEL_PURPLE_TEEHEE,
0x1, D_80372BE0,
func_8035B900, func_8035BD48, func_80325888,
func_8035B900, func_8035BD48, actor_draw,
6500, 0, 0.9f, 0
};

2
src/core2/ch/gloop.c
View File

@@ -25,7 +25,7 @@ ActorInfo chGloop = {
/* .code */
Actor *chgloop_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = func_80325888(marker, gfx, mtx, vtx);
Actor *this = actor_draw(marker, gfx, mtx, vtx);
if(!marker->unk14_21)
return this;

6
src/core2/ch/gravestone.c
View File

@@ -6,7 +6,7 @@
Actor *func_8035ECA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_8035F138(Actor *this);
extern void func_80325794(ActorMarker *);
extern void actor_postdrawMethod(ActorMarker *);
extern f32 func_80257204(f32, f32, f32, f32);
typedef struct {
@@ -50,8 +50,8 @@ Actor *func_8035ECA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
local = (ActorLocal_core2_D7D10 *)&this->local;
func_8033A45C(3, (s32) this->velocity[1]);
func_8033A45C(4, local->unk0);
modelRender_preDraw( (GenMethod_1)func_803253A0, (s32)this);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)marker);
modelRender_preDraw( (GenFunction_1)actor_predrawMethod, (s32)this);
modelRender_postDraw((GenFunction_1)actor_postdrawMethod, (s32)marker);
modelRender_draw(gfx, mtx, this->position, rotation, this->scale, D_80373008, func_803257B4(marker));
return this;
}

4
src/core2/ch/icecube.c
View File

@@ -42,7 +42,7 @@ s32 D_80372BD4[3] = {200, 200, 255};
Actor *chicecube_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *actor = marker_getActor(marker);
func_8033A45C(3, actor->unk38_31);
actor = func_80325888(marker, gfx, mtx, vtx);
actor = actor_draw(marker, gfx, mtx, vtx);
return actor;
}
@@ -226,7 +226,7 @@ void __chicecube_die(ActorMarker *marker, ActorMarker *other_marker){
func_8035A04C(actor->position, 12, ASSET_505_MODEL_ICECUBE_CHUNK, actor->scale);
func_8035A228(actor->position, 6, ASSET_700_SPRITE_DUST, actor->scale);
if(actor->unkF4_8 != 1){
__spawnQueue_add_1((GenMethod_1)__chicecube_spawnHalfCubes, reinterpret_cast(s32, actor->marker));
__spawnQueue_add_1((GenFunction_1)__chicecube_spawnHalfCubes, reinterpret_cast(s32, actor->marker));
}
marker_despawn(actor->marker);
}

14
src/core2/ch/jiggy.c
View File

@@ -62,8 +62,8 @@ void func_802C7AB0(ActorMarker * arg0, u32 arg1){
}
void func_802C7AF8(u32 x, u32 y, u32 z, u32 arg3){
__spawnQueue_add_4((GenMethod_4)func_802C41D8, ACTOR_4C_STEAM, x, y, z);
__spawnQueue_add_4((GenMethod_4)func_802C41D8, ACTOR_14F_DESTROYED_JIGGY, x, y, z);
__spawnQueue_add_4((GenFunction_4)func_802C41D8, ACTOR_4C_STEAM, x, y, z);
__spawnQueue_add_4((GenFunction_4)func_802C41D8, ACTOR_14F_DESTROYED_JIGGY, x, y, z);
mapSpecificFlags_set(arg3, 1);
}
@@ -80,10 +80,10 @@ void func_802C7B8C(Actor *this, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5
actor_collisionOff(this);
func_802BAFE4(arg3);
func_80356520(arg6);
timedFunc_set_4(0.6f, (GenMethod_4)func_802C7AF8, (s32)this->position[0], (s32)this->position[1], (s32)this->position[2], arg4);
timedFunc_set_2(0.6f, (GenMethod_2)func_802C7AB0, (s32)this->marker, arg5);
timedFunc_set_0(1.0f, (GenMethod_0)func_802BE720);
timedFunc_set_1(3.9f, (GenMethod_1)func_802C7B6C, arg4);
timedFunc_set_4(0.6f, (GenFunction_4)func_802C7AF8, (s32)this->position[0], (s32)this->position[1], (s32)this->position[2], arg4);
timedFunc_set_2(0.6f, (GenFunction_2)func_802C7AB0, (s32)this->marker, arg5);
timedFunc_set_0(1.0f, (GenFunction_0)func_802BE720);
timedFunc_set_1(3.9f, (GenFunction_1)func_802C7B6C, arg4);
mapSpecificFlags_set(arg1, 1);
}
}
@@ -109,7 +109,7 @@ Actor *chjiggy_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3){
func_8033A280(10.0f);
func_8033A244(30000.0f);
}
thisActor = func_80325888(this, gdl, mptr, arg3);
thisActor = actor_draw(this, gdl, mptr, arg3);
}
return thisActor;
}

2
src/core2/ch/jigsawdance.c
View File

@@ -34,7 +34,7 @@ Actor *__chJigsawDance_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3
return thisActor;
}
else{
return func_80325888(this, gdl, mptr, arg3);
return actor_draw(this, gdl, mptr, arg3);
}
}

10
src/core2/ch/jinjo.c
View File

@@ -24,11 +24,11 @@ ActorAnimationInfo chJinjoAnimations[] = {
{ASSET_31_ANIM_JINJO_JUMP, 0.75f}
};
ActorInfo chJinjoBlue = { MARKER_5A_JINJO_BLUE, ACTOR_60_JINJO_BLUE, ASSET_3C0_MODEL_JINJO_BLUE, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, func_80325888, 0, 0, 0.0f, 0};
ActorInfo chJinjoGreen = { MARKER_5B_JINJO_GREEN, ACTOR_62_JINJO_GREEN, ASSET_3C2_MODEL_JINJO_GREEN, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, func_80325888, 0, 0, 0.0f, 0};
ActorInfo chJinjoYellow = { MARKER_5E_JINJO_YELLOW, ACTOR_5E_JINJO_YELLOW, ASSET_3BB_MODEL_JINJO_YELLOW, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, func_80325888, 0, 0, 0.0f, 0};
ActorInfo chJinjoPink = { MARKER_5D_JINJO_PINK, ACTOR_61_JINJO_PINK, ASSET_3C1_MODEL_JINJO_PINK, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, func_80325888, 0, 0, 0.0f, 0};
ActorInfo chJinjoOrange = { MARKER_5C_JINJO_ORANGE, ACTOR_5F_JINJO_ORANGE, ASSET_3BC_MODEL_JINJO_ORANGE, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, func_80325888, 0, 0, 0.0f, 0};
ActorInfo chJinjoBlue = { MARKER_5A_JINJO_BLUE, ACTOR_60_JINJO_BLUE, ASSET_3C0_MODEL_JINJO_BLUE, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoGreen = { MARKER_5B_JINJO_GREEN, ACTOR_62_JINJO_GREEN, ASSET_3C2_MODEL_JINJO_GREEN, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoYellow = { MARKER_5E_JINJO_YELLOW, ACTOR_5E_JINJO_YELLOW, ASSET_3BB_MODEL_JINJO_YELLOW, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoPink = { MARKER_5D_JINJO_PINK, ACTOR_61_JINJO_PINK, ASSET_3C1_MODEL_JINJO_PINK, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chJinjoOrange = { MARKER_5C_JINJO_ORANGE, ACTOR_5F_JINJO_ORANGE, ASSET_3BC_MODEL_JINJO_ORANGE, 0x1, chJinjoAnimations, chJinjo_update, func_80326224, actor_draw, 0, 0, 0.0f, 0};
enum asset_e __chJinjo_getMeetDialogId(enum marker_e marker_id){
switch(marker_id){

4
src/core2/ch/mole.c
View File

@@ -107,7 +107,7 @@ Actor *func_802D94B4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(actor->state != 1 && actor->state != 5){
func_8033A45C(3, 0);
func_8033A45C(4, 0);
actor = func_80325888(marker, gfx, mtx, vtx);
actor = actor_draw(marker, gfx, mtx, vtx);
}
return actor;
@@ -325,7 +325,7 @@ void func_802D9D60(Actor *this){
this->unk38_0 = TRUE;
nodeprop_getPosition(node_prop, this->unk1C);
}
__spawnQueue_add_1((GenMethod_1)func_802D9C54, reinterpret_cast(s32, this->marker));
__spawnQueue_add_1((GenFunction_1)func_802D9C54, reinterpret_cast(s32, this->marker));
this->marker->propPtr->unk8_3 = FALSE;
this->marker->collidable = FALSE;
this->initialized = TRUE;

2
src/core2/ch/molehill.c
View File

@@ -42,7 +42,7 @@ Actor *func_802DA560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *actor = marker_getActor(marker);
ActorLocal_MoleHill * local = (ActorLocal_MoleHill *) &actor->local;
if(actor->unk16C_4){
actor = func_80325888(marker, gfx, mtx, vtx);
actor = actor_draw(marker, gfx, mtx, vtx);
func_8034A174(actor->marker->unk44, 5, actor->velocity);
func_8034A174(actor->marker->unk44, 6, actor->unk1C);
func_8034A174(actor->marker->unk44, 7, local->unk4);

6
src/core2/ch/overlaynocontroller.c
View File

@@ -3,7 +3,7 @@
#include "variables.h"
extern Actor *func_8032813C(enum actor_e, f32[3], s32);
extern void func_80325794(ActorMarker *marker);
extern void actor_postdrawMethod(ActorMarker *marker);
Actor *chOverlayNoController_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void chOverlayNoController_update(Actor *this);
@@ -35,8 +35,8 @@ Actor *chOverlayNoController_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vt
actor = marker_getActor(marker);
modelRender_preDraw((GenMethod_1)func_803253A0, (s32)actor);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)marker);
modelRender_preDraw((GenFunction_1)actor_predrawMethod, (s32)actor);
modelRender_postDraw((GenFunction_1)actor_postdrawMethod, (s32)marker);
func_8024E258();
{sp58[0] = 0.0f; sp58[1] = 0.0f; sp58[2] = 1312.5f;};
{sp4C[0] = 0.0f; sp4C[1] = 0.0f; sp4C[2] = 0.0f;};

8
src/core2/ch/overlaypressstart.c
View File

@@ -3,8 +3,8 @@
#include "variables.h"
extern void func_80328B8C(Actor *, s32, f32, s32);
extern void func_803253A0(Actor *);
extern void func_80325794(ActorMarker *);
extern void actor_predrawMethod(Actor *);
extern void actor_postdrawMethod(ActorMarker *);
extern Actor *func_8032813C(enum actor_e id, f32[3], s32);
@@ -45,8 +45,8 @@ Actor *chOverlayPressStart_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx
if(D_8037DE84)
return actor;
modelRender_preDraw((GenMethod_1)func_803253A0, (s32)actor);
modelRender_postDraw((GenMethod_1)func_80325794, (s32)marker);
modelRender_preDraw((GenFunction_1)actor_predrawMethod, (s32)actor);
modelRender_postDraw((GenFunction_1)actor_postdrawMethod, (s32)marker);
func_8024E258();
{sp58[0] = 0.0f; sp58[1] = 0.0f; sp58[2] = 1312.5f;};
{sp4C[0] = 0.0f; sp4C[1] = 0.0f; sp4C[2] = 0.0f;};

4
src/core2/ch/shrapnel.c
View File

@@ -112,7 +112,7 @@ void chShrapnel_explode(ActorMarker *marker, ActorMarker *other_marker) {
this = marker_getActor(marker);
FUNC_8030E8B4(SFX_1B_EXPLOSION_1, 1.0f, 32736, this->position, 1250, 2500);
__spawnQueue_add_1((GenMethod_1)chShrapnel_spawnExplodeActor, reinterpret_cast(s32, this));
__spawnQueue_add_1((GenFunction_1)chShrapnel_spawnExplodeActor, reinterpret_cast(s32, this));
chShrapnel_emitExplosion(this);
chShrapnel_emitSmoke(this);
chShrapnel_emitBodyParts(this, ASSET_53A_MODEL_SHRAPNAL_PIECE_EYE, 2);
@@ -194,6 +194,6 @@ void chshrapnel_update(Actor *this) {
ActorInfo chShrapnelDescription = {
MARKER_65_SHRAPNEL, ACTOR_56_SHRAPNEL, ASSET_3EC_MODEL_SHRAPNEL,
0x1, chShrapnelAnimations,
chshrapnel_update, func_80326224, func_80325888,
chshrapnel_update, func_80326224, actor_draw,
2500, 0x333, 0.0f, 0
};

2
src/core2/ch/snowball.c
View File

@@ -29,7 +29,7 @@ f32 D_8037E640[3];
Actor *chSnowball_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
Actor *this;
this = func_80325888(marker, gfx, mtx, vtx);
this = actor_draw(marker, gfx, mtx, vtx);
if (marker->unk14_21 && this->state != 2) {
func_8033E73C(marker, 5, func_80329904);
func_8033E3F0(0xD, marker->unk14_21);

6
src/core2/ch/snowman.c
View File

@@ -51,7 +51,7 @@ Actor *chSnowman_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
local = (ActorLocal_chSirSlush *)&actor->local;
func_8033A45C(1, local->unk9);
func_8033A45C(2, local->unkA);
func_80325888(marker, gfx, mtx, vtx);
actor_draw(marker, gfx, mtx, vtx);
}
void __chSnowman_spawnSnowball(ActorMarker *marker){
@@ -186,7 +186,7 @@ void __chSnowman_deathCallback(ActorMarker *marker, ActorMarker *other_marker){
FUNC_8030E8B4(SFX_3EA_UNKNOWN, 1.0f, 30000, actor->position, 1500, 4500);
FUNC_8030E8B4(SFX_2F_ORANGE_SPLAT, 1.0f, 30000, actor->position, 1500, 4500);
__spawnQueue_add_1((GenMethod_1)__chSnowman_spawnHat, (s32)actor->marker);
__spawnQueue_add_1((GenFunction_1)__chSnowman_spawnHat, (s32)actor->marker);
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK)
fp_sirslushgame_decRemaining();
__chSnowman_spawnSnowballParticles(actor->position, 0xC);
@@ -312,7 +312,7 @@ void chSnowman_update(Actor *this){
&& local->unkB
){
func_8030E878(SFX_8F_SNOWBALL_FLYING, randf2(0.95f, 1.05f), 30000, this->position, 800.0f, 3050.0f);
__spawnQueue_add_1((GenMethod_1)__chSnowman_spawnSnowball, (s32)this->marker);
__spawnQueue_add_1((GenFunction_1)__chSnowman_spawnSnowball, (s32)this->marker);
local->unk9 = FALSE;
}

2
src/core2/ch/snowmanhat.c
View File

@@ -8,7 +8,7 @@ void chSnowmanHat_update(Actor *this);
ActorInfo chSnowmanHat = {
MARKER_B3_SIR_SLUSH_HAT, ACTOR_126_SIR_SLUSH_HAT, ASSET_379_MODEL_SIRSLUSH_HAT,
0x1, NULL,
chSnowmanHat_update, func_80326224, func_80325888,
chSnowmanHat_update, func_80326224, actor_draw,
4500, 0, 1.0f, 0
};

2
src/core2/ch/soundsource.c
View File

@@ -115,7 +115,7 @@ void func_802D096C(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
}
void func_802D09B8(Actor *this, s32 arg1){
__spawnQueue_add_4((GenMethod_4)func_802D096C,
__spawnQueue_add_4((GenFunction_4)func_802D096C,
reinterpret_cast(s32, this->position[0]),
reinterpret_cast(s32, this->position[1]),
reinterpret_cast(s32, this->position[2]),

2
src/core2/ch/termite.c
View File

@@ -237,6 +237,6 @@ void chTermite_update(Actor *this) {
ActorInfo chTermite = {
MARKER_4_TERMITE, ACTOR_5_TERMITE, ASSET_350_MODEL_TERMITE,
0x1, chTermiteAnimations,
chTermite_update, func_80326224, func_80325888,
chTermite_update, func_80326224, actor_draw,
2000, 0, 0.0f, 0
};

2
src/core2/ch/trainers.c
View File

@@ -28,7 +28,7 @@ Actor *chtrainers_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
if( !this->unk10_12 )
return this;
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}

2
src/core2/ch/wadingboots.c
View File

@@ -29,7 +29,7 @@ Actor *chwadingboots_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(!this->unk10_12) return this;
return func_80325888(marker, gfx, mtx, vtx);
return actor_draw(marker, gfx, mtx, vtx);
}
void chwadingboots_update(Actor *this){

8
src/core2/ch/whipcrack.c
View File

@@ -8,7 +8,7 @@ void chwhipcrack_update(Actor *this);
ActorInfo D_80373100 = {
MARKER_1C5_WHIPCRACK, ACTOR_30F_WHIPCRACK, ASSET_4FD_MODEL_WHIPCRACK,
0, NULL,
chwhipcrack_update, NULL, func_80325888,
chwhipcrack_update, NULL, actor_draw,
0, 0, 0.0f, 0
};
@@ -69,10 +69,10 @@ void __chwhipcrack_spawnSmoke(Actor *this, s32 cnt){
void __chwhipcrack_setState(Actor *this, s32 next_state){
if(next_state == 1)
func_80335924(this->unk148, ASSET_22A_ANIM_WHIPCRACK_IDLE, 0.5f, 1.0f);
skeletalAnim_set(this->unk148, ASSET_22A_ANIM_WHIPCRACK_IDLE, 0.5f, 1.0f);
if(next_state == 2)
func_80335924(this->unk148, ASSET_229_ANIM_WHIPCRACK_ATTACK, 0.5f, 1.0f);
skeletalAnim_set(this->unk148, ASSET_229_ANIM_WHIPCRACK_ATTACK, 0.5f, 1.0f);
if(next_state == 3){
__chwhipcrack_spawnPieces(this, ASSET_4FE_MODEL_WHIPCRACK_PART_1, 4);
@@ -113,7 +113,7 @@ void chwhipcrack_update(Actor *this){
}
if(this->state == 2){
func_8033568C(this->unk148, &sp44, &sp40);
skeletalAnim_getProgressRange(this->unk148, &sp44, &sp40);
if((sp44 < 0.13) && (0.13 <= sp40)){
func_8030E878(SFX_69_WHIPCRACK_CREAKING, randf2(1.05f, 1.1f), 15000, this->position, 500.0f, 1000.0f);
}