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

Merge branch 'master' into banjo-kazooie-var_renames

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-01 15:31:34 -05:00
parent 011bea824c 9cb645df24
commit 35a2c13ea9
402 changed files with 8000 additions and 7857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/FP/ch/bearcub.c
View File

@@ -51,7 +51,7 @@ void func_8038A1F0(Actor **this_ptr, enum marker_e carried_obj_marker_id, enum a
func_8028F31C((*this_ptr)->position, 600.0f, actor_id, this_ptr);
if(!func_80329530(*this_ptr, 400)) return;
if(carriedObj_getMarkerId() != carried_obj_marker_id) return;
if(bacarry_get_markerId() != carried_obj_marker_id) return;
if(!func_8028FC34()) return;
func_8028FA34(arg3, *this_ptr);
@@ -72,7 +72,7 @@ void func_8038A274(Actor *this){
void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){
if(text_id == 0xc19){
func_802BAFE4(0x25);
jiggySpawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74);
jiggy_spawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
func_8025A6EC(COMUSIC_5B_FP_IGLOO_HAPPY, 25000);
func_8025A58C(0, 4000);
@@ -111,7 +111,7 @@ void func_8038A384(Actor *this){
if( jiggyscore_isCollected(JIGGY_2E_FP_PRESENTS)
|| func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)
){
func_80328B8C(this, 2, randf2(0.0f, 0.9f), 1);
subaddie_set_state_with_direction(this, 2, randf2(0.0f, 0.9f), 1);
}
}//L8038A4E4
@@ -153,7 +153,7 @@ void func_8038A384(Actor *this){
break;
}
if(levelSpecificFlags_get(D_80391E80[sp3C].unk0)){
func_80328B8C(this, 2, 0.001f, 1);
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
if(sp38 == 0xc19){
func_80311480(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL);
}

10
src/FP/ch/boggy1.c
View File

@@ -47,14 +47,14 @@ Actor *func_803875E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_803876A4(Actor *this){
func_80328B8C(this, 2, 0.0001f, 1);
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
actor_playAnimationOnce(this);
FUNC_8030E8B4(SFX_8E_GRUNTLING_DAMAGE, 1.0f, 32000, this->position, 1250, 2500);
}
void func_803876F8(Actor *this){
this->marker->propPtr->unk8_3 = FALSE;
func_80328B8C(this, 5, 0.0001f, 1);
subaddie_set_state_with_direction(this, 5, 0.0001f, 1);
this->unk48 = 0.0f;
func_80343DEC(this);
}
@@ -73,10 +73,10 @@ void func_803877A8(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if(arg2 == 1){
jiggySpawn(JIGGY_2A_FP_BOGGY_1, this->velocity);
jiggy_spawn(JIGGY_2A_FP_BOGGY_1, this->velocity);
}
else if(arg2 == 2){
func_80328B8C(this, 4, 0.0001f, 1);
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
actor_loopAnimation(this);
actor_collisionOff(this);
}
@@ -178,7 +178,7 @@ void func_8038794C(Actor *this){
}//L80387CF4
if(actor_animationIsAt(this, 0.9999f)){
func_80328B8C(this, 3, 0.0001f, 1);
subaddie_set_state_with_direction(this, 3, 0.0001f, 1);
actor_loopAnimation(this);
}
break;

37
src/FP/ch/boggy2.c
View File

@@ -3,7 +3,8 @@
#include "variables.h"
extern void func_8028E668(f32[3], f32, f32, f32);
extern Actor *func_80328230(enum actor_e id, f32 pos[3], f32 rot[3]);
extern NodeProp *cubeList_findNodePropByActorId(enum actor_e, s32[3]);
extern f32 func_8038BE20(f32 arg0[3]);
typedef struct {
@@ -90,7 +91,7 @@ Actor *func_80388740(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void FP_func_803888E4(Actor *this){
static f32 D_80391D0C[3] = {1842.0f, 658.0f, 5758.0f};
static f32 D_80391D18[3] = {1463.0f, 635.0f, 5193.0f};
func_80328B8C(this, 0xC, 0.0001f, 1);
subaddie_set_state_with_direction(this, 0xC, 0.0001f, 1);
if(!jiggyscore_isSpawned(JIGGY_30_FP_BOGGY_2)){
if(mapSpecificFlags_get(5)){
func_80324DBC(0.1f, 0xc06, 0x2a, D_80391D18, this->marker, func_80388D70, NULL);
@@ -115,7 +116,7 @@ void FP_func_803888E4(Actor *this){
void func_80388A50(Actor *this){
ActorLocal_FP_2350 *local = (ActorLocal_FP_2350 *)&this->local;
func_80328B8C(this, 2, 0.0001f, 1);
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
timed_setStaticCameraToNode(0.0f, 4);
local->unk18 = 0;
}
@@ -206,7 +207,7 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
local->unk4 = partEmitMgr_newEmitter(16);
func_80388EE8(local->unk0);
func_80388EE8(local->unk4);
func_80328B8C(this, 4, 0.0001f, 1);
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
local->unk14 = (local->unk19 == 2) ? 1.0f : 0.0f;
this->marker->unk40_23 = TRUE;
break;
@@ -217,10 +218,10 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
mapSpecificFlags_set(6, TRUE);
break;
case 0:
func_80328B8C(this, 1, 0.0001f, 1);
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
break;
default:
func_80328B8C(this, 1, 0.0001f, 1);
subaddie_set_state_with_direction(this, 1, 0.0001f, 1);
break;
}
break;
@@ -432,7 +433,7 @@ void func_803896FC(Actor *this){
local->unk19 = 1;
this->unk38_31 = 2;
this->unk4C = 600.0f;
func_80328B8C(this, 11, 0.0001f, 1);
subaddie_set_state_with_direction(this, 11, 0.0001f, 1);
}
else{
local->unk19 = 1;
@@ -445,10 +446,10 @@ void func_803896FC(Actor *this){
if(!func_8038A1A0(this->marker)){
switch(this->unk38_31){
case 1://L80389920
func_80328B8C(this, 9, 0.0001f, 1);
subaddie_set_state_with_direction(this, 9, 0.0001f, 1);
break;
case 2://L80389938
func_80328B8C(this, 10, 0.0001f, 1);
subaddie_set_state_with_direction(this, 10, 0.0001f, 1);
break;
}
}//L80389950
@@ -500,9 +501,9 @@ void func_803896FC(Actor *this){
local->unk14 = 0.0f;
if( randf() < 0.02 && sp58 < 0.0){
if(randf() < 0.5)
func_80328B8C(this, 5, 0.0001f, 1);
subaddie_set_state_with_direction(this, 5, 0.0001f, 1);
else
func_80328B8C(this, 6, 0.0001f, 1);
subaddie_set_state_with_direction(this, 6, 0.0001f, 1);
}//L80389C18
func_803893E4(this, sp58, local->unk19);
@@ -516,7 +517,7 @@ void func_803896FC(Actor *this){
case 5:// L80389C80
case 6:// L80389C80
if(actor_animationIsAt(this, 0.9999f) || sp58 >= 0.0){
func_80328B8C(this, 4, 0.0001f, 1);
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
}//L80389CC8
func_803893E4(this, sp58, local->unk19);
@@ -528,7 +529,7 @@ void func_803896FC(Actor *this){
case 7:// L80389D34
if(actor_animationIsAt(this, 0.9999f)){
func_80328B8C(this, 4, 0.0001f, 1);
subaddie_set_state_with_direction(this, 4, 0.0001f, 1);
}//L80389D60
func_803893E4(this, sp58, local->unk19);
func_80388F90(this);
@@ -556,7 +557,7 @@ void func_803896FC(Actor *this){
func_80388F90(this);
}
if(actor_animationIsAt(this, 0.9999f)){
func_80328B8C(this, 11, 0.0001f, 1);
subaddie_set_state_with_direction(this, 11, 0.0001f, 1);
}
break;
@@ -567,7 +568,7 @@ void func_803896FC(Actor *this){
}
if(actor_animationIsAt(this, 0.9999f)){
func_80328B8C(this, 11, 0.0001f, 1);
subaddie_set_state_with_direction(this, 11, 0.0001f, 1);
}
break;
@@ -629,10 +630,10 @@ void func_8038A0E4(UNK_TYPE(s32) arg0, ActorMarker *marker){
if(actor){
if(actor->state != 7){
func_80328B8C(actor, 7, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 7, 0.0001f, 1);
}
else{
func_80328B8C(actor, 4, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 4, 0.0001f, 1);
}
};
}
@@ -641,7 +642,7 @@ void func_8038A150(UNK_TYPE(s32) arg0, ActorMarker *marker){
Actor *actor = marker_getActor(marker);
if(actor && actor->state != 8){
func_80328B8C(actor, 8, 0.0001f, 1);
subaddie_set_state_with_direction(actor, 8, 0.0001f, 1);
};
}

2
src/FP/ch/racesled.c
View File

@@ -31,7 +31,7 @@ Actor *chRaceSled_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void __chRaceSled_setState(Actor *this, s32 next_state){
if(this->state != 1 || next_state != 1){
func_80328A84(this, next_state);
subaddie_set_state(this, next_state);
switch(next_state){
case 1: //L8038697C
this->unk10_12 = TRUE;

2
src/FP/ch/scarfsled.c
View File

@@ -21,7 +21,7 @@ ActorInfo chScarfSled = {
/* .code */
void __chScarfSled_setState(Actor *this, s32 next_state){
func_80328A84(this, next_state);
subaddie_set_state(this, next_state);
if(next_state == 2){
mapSpecificFlags_set(0xB, TRUE);

4
src/FP/ch/snowmanbutton.c
View File

@@ -50,7 +50,7 @@ void FP_func_80386BEC(Actor *this){
ParticleEmitter *pCtrl = partEmitMgr_newEmitter(12);
player_getPosition(plyr_pos);
func_80328B8C(this, 2, 0.01f, 1);
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
actor_collisionOff(this);
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
FUNC_8030E624(SFX_90_SWITCH_PRESS, 1.0f, 32000);
@@ -93,7 +93,7 @@ void FP_func_80386CF8(Actor *this){
break;
case 2:
if(actor_animationIsAt(this, 0.99f)){
func_80328B8C(this, 3, 0.99f, 0);
subaddie_set_state_with_direction(this, 3, 0.99f, 0);
}
break;
case 3:

14
src/FP/ch/twinkly.c
View File

@@ -3,6 +3,8 @@
#include "variables.h"
extern Actor *func_802EBAE0(UNK_TYPE(s32), f32 position[3], f32 rotation[3], f32 scale, UNK_TYPE(s32), UNK_TYPE(s32), UNK_TYPE(s32), f32, UNK_TYPE(s32));
extern Struct70s *func_8034C2C4(ActorMarker *marker, s32 arg1);
Actor *func_8038C0B0(ActorMarker *marker, UNK_TYPE(s32) arg1, f32 arg2, UNK_TYPE(s32) arg3);
Actor *func_8038C1F8(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_8038C9A0(Actor *this);
@@ -42,7 +44,7 @@ ActorInfo D_80391FF4 = { MARKER_203_TWINKLY_RED, ACTOR_335_TWINKLY_RED, ASSET_44
0, 0, 1.0f, 0
};
s32 FP_D_80392018[4] = {0, 0, 0, func_8038C0B0};
Struct6Cs FP_D_80392018 = {NULL, NULL, NULL, (void*)func_8038C0B0};
struct43s D_80392028 = {
{{-200.0f, 200.0f, -200.0f}, {200.0f, 400.0f, 200.0f}},
{{ 0.0f, -800.0f, 0.0f}, { 0.0f, -800.0f, 0.0f}},
@@ -242,7 +244,7 @@ void func_8038C8F0(ActorMarker *marker){
void func_8038C94C(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
func_80328A84(this, 6);
subaddie_set_state(this, 6);
__spawnQueue_add_1((GenFunction_1)func_8038C8F0, reinterpret_cast(s32, this->marker));
}
}
@@ -261,7 +263,7 @@ void func_8038C9A0(Actor *this){
this->marker->unk18 = &FP_D_80392018;
this->unk38_31 = 0;
if(0.0f != other->velocity[0]){
func_80328A84(this, 4);
subaddie_set_state(this, 4);
this->unk1C[1] = this->position_y + 50.0f;
this->unk1C[2] = this->position_y;
}
@@ -286,7 +288,7 @@ void func_8038C9A0(Actor *this){
switch(this->state){
case 1:// 8038CB2C
if(!func_8038C718(this, 0)){
func_80328B8C(this, 2, 0.001f, 1);
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
func_8038C428(this, D_80392088, randf2(20.0f, 24.0f));
this->unk60 = this->yaw;
}
@@ -311,7 +313,7 @@ void func_8038C9A0(Actor *this){
if(!func_8038C718(this, 0.0f)){
if(func_8038C844(this->position, D_80392088)){
func_80328B8C(this, 3, 0.001f, 1);
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
func_8038C428(this, D_80392094, 0.0f);
}
else{
@@ -341,7 +343,7 @@ void func_8038C9A0(Actor *this){
else{
func_80311480(0xc25, 0x2b, this->position, this->marker, func_8038C94C, NULL);
}
func_80328A84(this, 5);
subaddie_set_state(this, 5);
this->pitch -= 3.0f;
}
break;

16
src/FP/ch/twinklybox.c
View File

@@ -268,7 +268,7 @@ void func_8038D5C8(ActorMarker *this_marker, ActorMarker *other_marker){
func_8024BD08(0);
this->unk1C[2] = 428571.0f;
func_8025AEA0(0x68, (s32)this->unk1C[2]);
func_80328B8C(this, 3, 0.001f, 1);
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
actor_playAnimationOnce(this);
this->velocity[0] = 1.0f;
}//L8038D6B8
@@ -303,7 +303,7 @@ void func_8038D6C8(Actor *this){
this->unk1C[0] = -1.0f;
func_8028F8F8(7, FALSE);
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -1){
func_80328B8C(this, 3, 0.001f, 1);
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
actor_playAnimationOnce(this);
this->velocity[0] = 1.0f;
}
@@ -320,9 +320,9 @@ void func_8038D6C8(Actor *this){
break;
if(!(func_8023DB5C() & 1))
func_80328B8C(this, 2, 0.001f, 1);
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
else
func_80328B8C(this, 2, 0.999f, 0);
subaddie_set_state_with_direction(this, 2, 0.999f, 0);
actor_playAnimationOnce(this);
this->velocity[2] = randf2(1.4f, 2.0f);
@@ -335,7 +335,7 @@ void func_8038D6C8(Actor *this){
if( ( sp20 == TRUE && actor_animationIsAt(this, 0.999f) )
|| ( sp20 == FALSE && actor_animationIsAt(this, 0.001f) )
){
func_80328B8C(this, 1, 0.001f, 0);
subaddie_set_state_with_direction(this, 1, 0.001f, 0);
actor_playAnimationOnce(this);
break;
}
@@ -362,7 +362,7 @@ void func_8038D6C8(Actor *this){
timed_exitStaticCamera(0.0f);
func_8028F784(0);
func_80328B8C(this, 4, 0.999f, 1);
subaddie_set_state_with_direction(this, 4, 0.999f, 1);
actor_playAnimationOnce(this);
item_set(ITEM_0_HOURGLASS_TIMER, 80*60 - 1);
item_set(ITEM_6_HOURGLASS, TRUE);
@@ -381,7 +381,7 @@ void func_8038D6C8(Actor *this){
func_8025AEA0(COMUSIC_68_TWINKLY_MINIGAME, (s32)this->unk1C[2]);
if(item_getCount(ITEM_24_TWINKLY_SCORE) == 0){
func_80328B8C(this, 1, 0.001f, 1);
subaddie_set_state_with_direction(this, 1, 0.001f, 1);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_8038D3D8();
func_80324E38(0.0f, 3);
@@ -393,7 +393,7 @@ void func_8038D6C8(Actor *this){
}
if(item_empty(ITEM_6_HOURGLASS)){
func_80328B8C(this, 1, 0.001f, 0);
subaddie_set_state_with_direction(this, 1, 0.001f, 0);
actor_playAnimationOnce(this);
this->unk38_31 = 0;
item_set(ITEM_6_HOURGLASS, FALSE);

14
src/FP/ch/twinklymuncher.c
View File

@@ -35,23 +35,23 @@ Actor *func_8038DD70(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_8038DDC8(Actor *this){
actor_collisionOn(this);
func_80328B8C(this, 2, 0.03f, 1);
subaddie_set_state_with_direction(this, 2, 0.03f, 1);
actor_playAnimationOnce(this);
}
void func_8038DE08(Actor *this){
func_80328B8C(this, 3, 0.03f, 1);
subaddie_set_state_with_direction(this, 3, 0.03f, 1);
actor_loopAnimation(this);
}
void func_8038DE40(Actor *this){
func_80328B8C(this, 4, 0.03f, 1);
subaddie_set_state_with_direction(this, 4, 0.03f, 1);
actor_playAnimationOnce(this);
}
void func_8038DE78(Actor *this){
actor_collisionOff(this);
func_80328B8C(this, 5, 0.03f, 1);
subaddie_set_state_with_direction(this, 5, 0.03f, 1);
actor_playAnimationOnce(this);
}
@@ -93,7 +93,7 @@ Actor *func_8038DF34(Actor *this){
void func_8038E040(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
timed_exitStaticCamera(0.5f);
func_80328B8C(this, 7, 0.03f, 1);
subaddie_set_state_with_direction(this, 7, 0.03f, 1);
actor_playAnimationOnce(this);
}
@@ -129,7 +129,7 @@ void func_8038E094(Actor *this){
timed_setStaticCameraToNode(0.5f, 0xd);
func_80311480(ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);
this->velocity[0] = 1.0f;
func_80328B8C(this, 6, 0.03f, 1);
subaddie_set_state_with_direction(this, 6, 0.03f, 1);
actor_loopAnimation(this);
}
}
@@ -214,7 +214,7 @@ void func_8038E094(Actor *this){
case 5: //L8038E644
this->marker->propPtr->unk8_3 = TRUE;
if(actor_animationIsAt(this, 0.97f)){
func_80328B8C(this, 1, 0.97f, 0);
subaddie_set_state_with_direction(this, 1, 0.97f, 0);
actor_playAnimationOnce(this);
this->unk60 = 0.0f;
}

32
src/FP/ch/wozza.c
View File

@@ -49,19 +49,19 @@ Actor *func_8038F210(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_8038F274(void){
UNK_TYPE(s32) v0 = func_8034C528(0x191);
if(v0){
func_8034DE60(v0, 0.0f, -500.0f, 0.2f, 1);
Struct70s *v0 = func_8034C528(0x191);
if(v0 != NULL){
func_8034DE60(&v0->type_6D, 0.0f, -500.0f, 0.2f, 1);
}
}
void func_8038F2B8(Actor *this){
func_80328B8C(this, 3, 0.02f, 1);
subaddie_set_state_with_direction(this, 3, 0.02f, 1);
actor_loopAnimation(this);
}
void func_8038F2F0(Actor *this){
func_80328B8C(this, 11, 0.02f, 1);
subaddie_set_state_with_direction(this, 11, 0.02f, 1);
actor_loopAnimation(this);
func_8038F274();
}
@@ -96,14 +96,14 @@ void func_8038F3F4(ActorMarker *marker){
}
void func_8038F41C(Actor *this){
func_80328B8C(this, 1, 0.02f, 1);
subaddie_set_state_with_direction(this, 1, 0.02f, 1);
actor_loopAnimation(this);
}
void func_8038F454(Actor *this){
if(!mapSpecificFlags_get(7) && func_8028ECAC() != BSGROUP_A_FLYING && func_80329530(this, 1000) ){
mapSpecificFlags_set(7, TRUE);
func_80328A84(this, 2);
subaddie_set_state(this, 2);
actor_loopAnimation(this);
timed_setStaticCameraToNode(0.0f, 0x2e);
func_80324DBC(0.0f, 0xc1b, 0x2a, this->position, this->marker, func_8038F330, NULL);
@@ -115,12 +115,12 @@ void func_8038F454(Actor *this){
}
void func_8038F528(Actor *this){
func_80328B8C(this, 4, 0.02f, 1);
subaddie_set_state_with_direction(this, 4, 0.02f, 1);
actor_loopAnimation(this);
}
void func_8038F560(Actor *this){
func_80328B8C(this, 7, 0.02f, 1);
subaddie_set_state_with_direction(this, 7, 0.02f, 1);
actor_loopAnimation(this);
}
@@ -149,7 +149,7 @@ bool func_8038F5D4(Actor *this, f32 arg1[3], f32 arg2, f32 arg3, s32 arg4){
bool FP_func_8038F6C4(Actor *this, f32 arg1[3], f32 arg2){
s32 dTheta;
func_80328C64(this, func_803297C8(this, arg1));
subaddie_set_ideal_yaw(this, func_803297C8(this, arg1));
func_80328FB0(this, arg2);
dTheta = this->yaw - this->yaw_ideal;
if(-arg2 <= dTheta && dTheta <= arg2){
@@ -223,7 +223,7 @@ void FP_func_8038F7AC(Actor *this){
}
if(func_80329530(this, 1300) && player_getTransformation() == TRANSFORM_4_WALRUS){
func_80328B8C(this, 8, 0.02f, 1);
subaddie_set_state_with_direction(this, 8, 0.02f, 1);
actor_loopAnimation(this);
break;
}
@@ -252,7 +252,7 @@ void FP_func_8038F7AC(Actor *this){
}
if(func_8038F5D4(this, local->unk0, 30.0f, 12.0f, 0x3C)){
func_80328B8C(this, 5, 0.02f, 1);
subaddie_set_state_with_direction(this, 5, 0.02f, 1);
actor_playAnimationOnce(this);
}
break;
@@ -260,7 +260,7 @@ void FP_func_8038F7AC(Actor *this){
case 5: //L8038FB50
FP_func_8038F6C4(this, local->unk18, 1.0f);
if(0.97 < animctrl_getAnimTimer(this->animctrl)){
func_80328B8C(this, 6, 0.02f, 1);
subaddie_set_state_with_direction(this, 6, 0.02f, 1);
actor_loopAnimation(this);
}
break;
@@ -309,7 +309,7 @@ void FP_func_8038F7AC(Actor *this){
if(mapSpecificFlags_get(8)){
if(FP_func_8038F6C4(this, D_803925AC, 9.0f)){
func_80328B8C(this, 9, 0.02f, 1);
subaddie_set_state_with_direction(this, 9, 0.02f, 1);
actor_playAnimationOnce(this);
}
break;
@@ -331,7 +331,7 @@ void FP_func_8038F7AC(Actor *this){
case 9: //L8038FE14
FP_func_8038F6C4(this, D_803925AC, 9.0f);
if(0.97 < animctrl_getAnimTimer(this->animctrl)){
func_80328B8C(this, 10, 0.02f, 1);
subaddie_set_state_with_direction(this, 10, 0.02f, 1);
actor_loopAnimation(this);
}
break;
@@ -342,7 +342,7 @@ void FP_func_8038F7AC(Actor *this){
case 11: //L8038FE84
if(func_8038F5D4(this, local->unk24, 30.0f, 12.0f, 0x3C)){
func_80328A84(this, 12);
subaddie_set_state(this, 12);
}
break;

4
src/FP/ch/wozzasjig.c
View File

@@ -51,7 +51,7 @@ void func_8038FF54(Actor *this){
other = marker_getActor(this->unk100);
if(this->state != 9){
if(other->state == 9){
func_80328B8C(this, 9, 0.01f, 1);
subaddie_set_state_with_direction(this, 9, 0.01f, 1);
actor_playAnimationOnce(this);
}
else{
@@ -75,7 +75,7 @@ void func_8038FF54(Actor *this){
sp40[1] = (f32)(s32)sp40[1];
sp40[2] = (f32)(s32)sp40[2];
func_802C8F70(this->yaw + 90.0f);
jiggySpawn(JIGGY_32_FP_WOZZA, sp40);
jiggy_spawn(JIGGY_32_FP_WOZZA, sp40);
levelSpecificFlags_set(0x26, TRUE);
marker_despawn(this->marker);
}

10
src/FP/ch/xmastree.c
View File

@@ -47,7 +47,7 @@ void __chXmasTree_80386F3C(void){
}
void __chXmasTree_80386F84(Actor * this){
func_80328A84(this, 2);
subaddie_set_state(this, 2);
__chXmasTree_80386EF4(this, 0);
}
@@ -123,7 +123,7 @@ void chXmasTree_update(Actor *this){
case 2: // L80387294
if(!mapSpecificFlags_get(2)) break;
func_80328A84(this, 3);
subaddie_set_state(this, 3);
this->unk60 = 2.0f;
func_8025A6EC(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000);
func_802BAFE4(0x1A);
@@ -148,7 +148,7 @@ void chXmasTree_update(Actor *this){
}
else{//L803873BC
if(func_802BB270()){
func_80328A84(this, 4);
subaddie_set_state(this, 4);
__chXmasTree_80386EF4(this, 1);
item_set(ITEM_0_HOURGLASS_TIMER, 3600 - 1);
item_set(ITEM_6_HOURGLASS, TRUE);
@@ -159,7 +159,7 @@ void chXmasTree_update(Actor *this){
case 4: // L80387400
if(mapSpecificFlags_get(3)){
func_80328A84(this, 6);
subaddie_set_state(this, 6);
__chXmasTree_80386EF4(this, 1);
item_set(ITEM_6_HOURGLASS, FALSE);
tmp_a0 = this->unk44_31;
@@ -172,7 +172,7 @@ void chXmasTree_update(Actor *this){
}
else{//L80387470
if(item_empty(ITEM_6_HOURGLASS)){
func_80328A84(this, 5);
subaddie_set_state(this, 5);
mapSpecificFlags_set(2, FALSE);
this->unk60 = 0.1f;
if(!func_8038BFA0()){

6
src/FP/ch/xmastreestar.c
View File

@@ -104,14 +104,14 @@ void func_8038ECD8(Actor *this){
if(!mapSpecificFlags_get(2)) break;
if(mapSpecificFlags_get(3)) break;
func_80328A84(this, 2);
subaddie_set_state(this, 2);
this->unk38_31 = 0;
break;
case 2://L8038EF5C
if(!local->unk1A) return;
if(item_empty(ITEM_6_HOURGLASS)){
func_80328A84(this, 1);
subaddie_set_state(this, 1);
}
else{
this->marker->collidable = TRUE;
@@ -136,7 +136,7 @@ void func_8038ECD8(Actor *this){
}//L8038F090
if(!(this->unk38_31 < 3)){
func_80328A84(this, 1);
subaddie_set_state(this, 1);
mapSpecificFlags_set(3, 1);
}
}

8
src/FP/ch/xmastreeswitch.c
View File

@@ -28,7 +28,7 @@ Actor *func_8038E720(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_8038E774(Actor *this){
func_80328B8C(this, 2, 0.05f, 1);
subaddie_set_state_with_direction(this, 2, 0.05f, 1);
actor_playAnimationOnce(this);
this->marker->collidable = TRUE;
this->unk38_31 = 0;
@@ -70,7 +70,7 @@ void func_8038E940(Actor *this){
if(jiggyscore_isCollected(JIGGY_2F_FP_XMAS_TREE) || levelSpecificFlags_get(0x29)){
this->marker->propPtr->unk8_3 = TRUE;
this->marker->collidable = FALSE;
func_80328B8C(this, 3, 0.95f, 0);
subaddie_set_state_with_direction(this, 3, 0.95f, 0);
return;
}//L8038E9B8
@@ -79,7 +79,7 @@ void func_8038E940(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
this->marker->collidable = FALSE;
marker_setCollisionScripts(this->marker, NULL, func_8038E7CC, NULL);
func_80328B8C(this, 1, 0.05f, 1);
subaddie_set_state_with_direction(this, 1, 0.05f, 1);
this->unk38_31 = 0;
this->unk60 = 0.0f;
}//L8038EA3C
@@ -98,7 +98,7 @@ void func_8038E940(Actor *this){
if(this->unk38_31 < 3)
break;
func_80328B8C(this, 3, 0.05f, 1);
subaddie_set_state_with_direction(this, 3, 0.05f, 1);
actor_playAnimationOnce(this);
FUNC_8030E624(SFX_416, 0.8f, 32000);
this->marker->collidable = FALSE;