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

All Changes

Browse Source
This commit is contained in:
Moses Troyer
2025-08-16 17:15:49 +00:00
committed by Banjo Kazooie
parent fd208f77ca
commit c2dd933d22
389 changed files with 7824 additions and 6965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ Struct_FP_3E00 D_80391E80[] ={
void func_8038A1F0(Actor **this_ptr, enum marker_e carried_obj_marker_id, enum actor_e actor_id, enum actor_e arg3){
player_setCarryObjectPoseInHorizontalRadius((*this_ptr)->position, 600.0f, actor_id, this_ptr);
if (!func_80329530(*this_ptr, 400)) {
if (!subaddie_playerIsWithinSphereAndActive(*this_ptr, 400)) {
return;
}
@@ -79,10 +79,10 @@ void func_8038A274(Actor *this){
void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){
if(text_id == 0xc19){
func_802BAFE4(0x25);
gcStaticCamera_activate(0x25);
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);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
coMusicPlayer_playMusic(COMUSIC_5B_FP_IGLOO_HAPPY, 25000);
func_8025A58C(0, 4000);
core1_ce60_incOrDecCounter(FALSE);
}
@@ -134,13 +134,13 @@ void func_8038A384(Actor *this){
switch(this->state){
case 1://L8038A5B0
if(!levelSpecificFlags_get(LEVEL_FLAG_19_FP_UNKNOWN) && func_80329530(this, 0xfa)){
if(!levelSpecificFlags_get(LEVEL_FLAG_19_FP_UNKNOWN) && subaddie_playerIsWithinSphereAndActive(this, 0xfa)){
if(player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT){
if(sp34 == 0
&& !jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)
&& !jiggyscore_isSpawned(JIGGY_2C_FP_BOGGY_3)
){
if (gcdialog_showText(ASSET_C1A_DIALOG_UNKNOWN, 0x2a, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_C1A_DIALOG_UNKNOWN, 0x2a, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_19_FP_UNKNOWN, TRUE);
}
}
@@ -164,23 +164,23 @@ void func_8038A384(Actor *this){
if(levelSpecificFlags_get(D_80391E80[sp3C].unk0)){
subaddie_set_state_with_direction(this, 2, 0.001f, 1);
if (sp38 == ASSET_C19_DIALOG_UNKNOWN) {
gcdialog_showText(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL);
gcdialog_showDialog(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL);
}
else {
gcdialog_showText(sp38, 0x3, this->position, this->marker, func_8038A318, NULL);
gcdialog_showDialog(sp38, 0x3, this->position, this->marker, func_8038A318, NULL);
}
}
else{//L8038A73C
func_8038A1F0(&this, D_80391E80[sp3C].unk4, D_80391E80[sp3C].unk8, D_80391E80[sp3C].unkC);
if( actor_animationIsAt(this, 0.45f)
&& !func_803114B0()
&& !gcdialog_hasCurrentTextId()
){
func_8030E878(SFX_B1_BOGGY_KID_CRYING, randf2(0.9f, 1.1f), 32000, this->position, 150.0f, 700.0f);
}
}//L8038A7DC
break;
case 2://L8038A7C0
if(!func_803114B0()){
if(!gcdialog_hasCurrentTextId()){
func_8038A274(this);
}
break;

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

@@ -49,7 +49,7 @@ Actor *func_803875E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_803876A4(Actor *this){
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);
sfx_playFadeShorthandDefault(SFX_8E_GRUNTLING_DAMAGE, 1.0f, 32000, this->position, 1250, 2500);
}
void func_803876F8(Actor *this){
@@ -86,7 +86,7 @@ void func_80387828(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if (text_id == 0xc00) {
gcdialog_showText(ASSET_C2B_DIALOG_UNKNOWN, 0xf, NULL, this->marker, NULL, func_803877A8);
gcdialog_showDialog(ASSET_C2B_DIALOG_UNKNOWN, 0xf, NULL, this->marker, NULL, func_803877A8);
}
}
@@ -147,9 +147,9 @@ void func_8038794C(Actor *this){
break;
}//L80387B38
if(!this->has_met_before && func_80329530(this, 0x1f4)){
if(!this->has_met_before && subaddie_playerIsWithinSphereAndActive(this, 0x1f4)){
if(!player_movementGroup() || player_movementGroup() == BSGROUP_8_TROT){
if (gcdialog_showText(ASSET_BFF_DIALOG_UNKNOWN, 0x2a, this->position, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_BFF_DIALOG_UNKNOWN, 0x2a, this->position, NULL, NULL, NULL)) {
for (i = 0; i < 5; i++) {
timedFunc_set_1(D_80391BEC[i], (GenFunction_1) func_8038787C, (s32) this->marker);
}
@@ -162,19 +162,19 @@ void func_8038794C(Actor *this){
case 2://L80387BEC
func_8028FC8C(this->position);
if(actor_animationIsAt(this, 0.1f)){
FUNC_8030E8B4(SFX_F6_BLUBBER_TALKING_2, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_F6_BLUBBER_TALKING_2, 1.0f, 32000, this->position, 1250, 2500);
}
else if(actor_animationIsAt(this, 0.24f)){//L80387C2C
FUNC_8030E8B4(SFX_A0_COUGHING, 0.7f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_A0_COUGHING, 0.7f, 32000, this->position, 1250, 2500);
}
else if(actor_animationIsAt(this, 0.52f)){//L80387C60
FUNC_8030E8B4(SFX_A0_COUGHING, 0.67f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_A0_COUGHING, 0.67f, 32000, this->position, 1250, 2500);
}
else if(actor_animationIsAt(this, 0.61f)){//L80387C94
FUNC_8030E8B4(SFX_A0_COUGHING, 0.64f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_A0_COUGHING, 0.64f, 32000, this->position, 1250, 2500);
}
else if(actor_animationIsAt(this, 0.69f)){//L80387CC8
FUNC_8030E8B4(SFX_A0_COUGHING, 0.61f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_A0_COUGHING, 0.61f, 32000, this->position, 1250, 2500);
}//L80387CF4
if(actor_animationIsAt(this, 0.9999f)){

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

@@ -124,10 +124,10 @@ void func_80388A50(Actor *this){
void func_80388A94(Actor *this){
func_80388A50(this);
if(mapSpecificFlags_get(6)){
gcdialog_showText(ASSET_C0A_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C0A_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
}
else{
gcdialog_showText(ASSET_C09_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C09_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
}
}
@@ -136,15 +136,15 @@ void func_80388B18(Actor *this, u8 arg1){
if(player_getTransformation() == TRANSFORM_4_WALRUS){
func_80388A50(this);
if(mapSpecificFlags_get(5)){
gcdialog_showText(ASSET_C05_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C05_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else{
gcdialog_showText(ASSET_C02_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C02_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
}
else{//L80388BB8
if(!volatileFlag_get(VOLATILE_FLAG_B3)){
if(gcdialog_showText(ASSET_C01_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
if(gcdialog_showDialog(ASSET_C01_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
volatileFlag_set(VOLATILE_FLAG_B3, TRUE);
func_80388A50(this);
}
@@ -154,7 +154,7 @@ void func_80388B18(Actor *this, u8 arg1){
else{//L80388C08
if(player_getTransformation() == TRANSFORM_4_WALRUS){
if(!volatileFlag_get(VOLATILE_FLAG_B4)){
if(gcdialog_showText(ASSET_C08_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
if(gcdialog_showDialog(ASSET_C08_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
volatileFlag_set(VOLATILE_FLAG_B4, TRUE);
func_80388A50(this);
}
@@ -180,12 +180,12 @@ bool FP_func_80388CA0(Actor *this){
if(player_movementGroup() != BSGROUP_0_NONE && player_movementGroup() != BSGROUP_8_TROT)
return FALSE;
if( !func_80329530(this, 1100) ){
if( !subaddie_playerIsWithinSphereAndActive(this, 1100) ){
local->unk18 = TRUE;
}
sp20 = this->unk10_12;
this->unk10_12 = func_80329530(this, 0x1C2);
this->unk10_12 = subaddie_playerIsWithinSphereAndActive(this, 0x1C2);
return (sp20 == 0 && this->unk10_12 && local->unk18);
}
@@ -199,7 +199,7 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
case 0xc06:
case 0xc28:
case 0xc29://L80388DC4
func_8025A6EC(COMUSIC_3A_FP_BOGGY_RACE, 25000);
coMusicPlayer_playMusic(COMUSIC_3A_FP_BOGGY_RACE, 25000);
func_8025A58C(0, 4000);
core1_ce60_incOrDecCounter(FALSE);
func_802BE720();
@@ -262,7 +262,7 @@ void func_80388F90(Actor *this){
func_8030DB04(this->unk44_31, 32000, this->position, 1000.0f, 4000.0f);
sfxsource_playSfxAtVolume(this->unk44_31, local->unk8);
func_8030E2C4(this->unk44_31);
sfxSource_func_8030E2C4(this->unk44_31);
}
bool func_80388FE8(Actor *this, f32 arg1, f32 arg2){
@@ -467,24 +467,24 @@ void func_803896FC(Actor *this){
else if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && player_movementGroup() == BSGROUP_C_WALRUS_SLED){
FP_func_803888E4(this);
}
else if( func_80329530(this, 0x1C2)
else if( subaddie_playerIsWithinSphereAndActive(this, 0x1C2)
&& player_movementGroup() == BSGROUP_0_NONE
&& func_8028F20C()
&& func_8028EFC8()
&& sp3C[FACE_BUTTON(BUTTON_B)] == 1
&& !func_803114B0()
&& !gcdialog_hasCurrentTextId()
){
if( local->unk19 == 1
&& player_getTransformation() != TRANSFORM_4_WALRUS
&& volatileFlag_get(VOLATILE_FLAG_B3)
){
gcdialog_showText(ASSET_C01_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C01_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else if( local->unk19 == 2){
if( player_getTransformation() == TRANSFORM_4_WALRUS
&& volatileFlag_get(VOLATILE_FLAG_B4)
){
gcdialog_showText(ASSET_C08_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C08_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else if( player_getTransformation() != TRANSFORM_4_WALRUS){
func_80388A94(this);

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

@@ -26,7 +26,7 @@ Actor *func_80390290(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(this->unk38_31) return this;
if(func_803114C4() == 0xC1F || func_803114C4() == 0xC1E){
if(gcdialog_getCurrentTextId() == 0xC1F || gcdialog_getCurrentTextId() == 0xC1E){
sp18 = 1;
}
func_8033A45C(1, 0);
@@ -73,18 +73,18 @@ void func_80390388(Actor *this){
this->has_met_before = TRUE;
}
if( func_80329530(this, 0xFA)
if( subaddie_playerIsWithinSphereAndActive(this, 0xFA)
&& (player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT)
){
if(0.0f == this->unk1C[0] && func_80390334()){
if(gcdialog_showText(ASSET_C1F_DIALOG_UNKNOWN, 0xb, this->position, NULL, NULL, NULL)){
if(gcdialog_showDialog(ASSET_C1F_DIALOG_BOGGY_NEEDS_SLEEP, 0xb, this->position, NULL, NULL, NULL)){
this->has_met_before = TRUE;
this->unk1C[0] = 1.0f;
}
}
else{
if( !this->has_met_before ){
if(gcdialog_showText(ASSET_C1E_DIALOG_UNKNOWN, 0x2b, this->position, NULL, NULL, NULL)){
if(gcdialog_showDialog(ASSET_C1E_DIALOG_BOGGY_LOOK_FOR_PRESENTS, 0x2b, this->position, NULL, NULL, NULL)){
this->has_met_before = TRUE;
}
}

12
src/FP/ch/cavewozza.c
View File

@@ -49,11 +49,11 @@ void func_80390630(Actor *this){
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 1.0f);
if(!func_803114B0()){
if(!gcdialog_hasCurrentTextId()){
if( actor_animationIsAt(this, 0.09f)
|| actor_animationIsAt(this, 0.19f)
){
FUNC_8030E8B4(SFX_88_WOZZA_NOISE, 1.0f, 22000, this->position, 500, 2000);
sfx_playFadeShorthandDefault(SFX_88_WOZZA_NOISE, 1.0f, 22000, this->position, 500, 2000);
}
if( actor_animationIsAt(this, 0.68f)
@@ -62,21 +62,21 @@ void func_80390630(Actor *this){
|| actor_animationIsAt(this, 0.92f)
){
FUNC_8030E8B4(SFX_3F2_UNKNOWN, 0.8f, 24000, this->position, 500, 2000);
sfx_playFadeShorthandDefault(SFX_3F2_UNKNOWN, 0.8f, 24000, this->position, 500, 2000);
}
}
if (func_80329530(this, 350)) {
if (subaddie_playerIsWithinSphereAndActive(this, 350)) {
if (player_getTransformation() == TRANSFORM_4_WALRUS) {
if (!levelSpecificFlags_get(LEVEL_FLAG_31_FP_UNKNOWN)) {
if (gcdialog_showText(ASSET_C27_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_C27_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_31_FP_UNKNOWN, TRUE);
}
}
}
else {
if (!levelSpecificFlags_get(LEVEL_FLAG_32_FP_UNKNOWN)) {
if (gcdialog_showText(ASSET_C26_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_C26_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_32_FP_UNKNOWN, TRUE);
}
}

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

@@ -58,7 +58,7 @@ void __chScarfSled_func_8038655C(Actor *this){
this->unk10_12 = FALSE;
if(!tmp_bool){
if(tmp != 0){
func_8030E6A4(SFX_19_BANJO_LANDING_08, func_8030E200(this->unk44_31), 0x55f0);
gcsfx_playWithPitch(SFX_19_BANJO_LANDING_08, func_8030E200(this->unk44_31), 0x55f0);
}
}
else{
@@ -67,7 +67,7 @@ void __chScarfSled_func_8038655C(Actor *this){
func_8030E0FC(this->unk44_31, 0.9f, 1.5f, 1.2f);
}
this->unk10_12 = TRUE;
func_8030E2C4(*((u8*)this + 0x44));
sfxSource_func_8030E2C4(*((u8*)this + 0x44));
}
}

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

@@ -52,7 +52,7 @@ void FP_func_80386BEC(Actor *this){
player_getPosition(plyr_pos);
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
actor_collisionOff(this);
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
FUNC_8030E624(SFX_90_SWITCH_PRESS, 1.0f, 32000);
maSnowButton_decRemaining();
particleEmitter_setRGB(pCtrl, D_80391B44);
@@ -78,7 +78,7 @@ void FP_func_80386CF8(Actor *this){
if(!this->initialized){
this->initialized = TRUE;
this->pitch += (f32)(this->unkF4_8 - 1);
this->pitch += (f32)(this->actorTypeSpecificField - 1);
}
if(!this->volatile_initialized){

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

@@ -106,7 +106,7 @@ void func_8038C260(f32 position[3], s32 count, enum asset_e model_id){
particleEmitter_setFade(pCtrl, 0.0f, 0.3f);
particleEmitter_func_802EF9F8(pCtrl, 0.6f);
particleEmitter_func_802EFA18(pCtrl, 0);
func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_setSfx(pCtrl, SFX_7B_ICE_BREAKING_1, 8000);
particleEmitter_emitN(pCtrl, count);
}
@@ -232,10 +232,10 @@ void func_8038C8F0(ActorMarker *marker){
s32 pad;
this = marker_getActor(reinterpret_cast(ActorMarker *, marker));
other = marker_getActor(this->unk100);
other = marker_getActor(this->partnerActor);
muncher = actor_spawnWithYaw_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392070, 170);
muncher->unk100 = other->marker;
muncher->unkF4_8 = 1;
muncher->partnerActor = other->marker;
muncher->actorTypeSpecificField = 1;
if(pad);
}
@@ -255,7 +255,7 @@ void func_8038C9A0(Actor *this){
if(this->marker->id == 0x200){
sp30 = func_8034C2C4(this->marker, 0x190);
}
other = marker_getActor(this->unk100);
other = marker_getActor(this->partnerActor);
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
@@ -279,7 +279,7 @@ void func_8038C9A0(Actor *this){
if(1.0f == other->unk1C[1]){
func_8038C398(this->position, this->marker->id);
FUNC_8030E8B4(SFX_7B_ICE_BREAKING_1, 1.0f, 32000, this->position, 0x6d6, 0xdac);\
sfx_playFadeShorthandDefault(SFX_7B_ICE_BREAKING_1, 1.0f, 32000, this->position, 0x6d6, 0xdac);\
marker_despawn(this->marker);
return;
}
@@ -326,7 +326,7 @@ void func_8038C9A0(Actor *this){
if(other->unk38_31 != 0){
other->unk38_31--;
}
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
marker_despawn(this->marker);
}
break;
@@ -336,11 +336,11 @@ void func_8038C9A0(Actor *this){
if(this->unk1C[1] <= this->position_y){
this->position_y = this->unk1C[1];
if(!fileProgressFlag_get(FILEPROG_82_MET_TWINKLIES)){
gcdialog_showText(0xc12, 0x2a, this->position, this->marker, func_8038C94C, NULL);
gcdialog_showDialog(0xc12, 0x2a, this->position, this->marker, func_8038C94C, NULL);
fileProgressFlag_set(FILEPROG_82_MET_TWINKLIES, TRUE);
}
else{
gcdialog_showText(0xc25, 0x2b, this->position, this->marker, func_8038C94C, NULL);
gcdialog_showDialog(0xc25, 0x2b, this->position, this->marker, func_8038C94C, NULL);
}
subaddie_set_state(this, 5);
this->pitch -= 3.0f;

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

@@ -176,8 +176,8 @@ void func_8038D294(ActorMarker *marker){
func_8038CF54(this->position, 12, ASSET_4D4_MODEL_TWINKLY_BOX_PAPER_SHARD);
func_8038D01C(this->position, 12, ASSET_700_SPRITE_DUST);
this->velocity[1] = 0.0f;
FUNC_8030E8B4(SFX_30_MAGIC_POOF, 1.0f, 32000, this->position, 1000, 3500);
gcdialog_showText(0xc13, 0, NULL, NULL, NULL, NULL);
sfx_playFadeShorthandDefault(SFX_30_MAGIC_POOF, 1.0f, 32000, this->position, 1000, 3500);
gcdialog_showDialog(0xc13, 0, NULL, NULL, NULL, NULL);
}
void func_8038D324(Actor *this){
@@ -210,9 +210,9 @@ void func_8038D41C(ActorMarker *marker){
Actor *actor;
actor = actor_spawnWithYaw_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392354, 170);
actor->unk100 = _marker;
actor->partnerActor = _marker;
actor = actor_spawnWithYaw_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392360, 170);
actor->unk100 = _marker;
actor->partnerActor = _marker;
if(pad[0]);
}
@@ -233,7 +233,7 @@ void func_8038D474(ActorMarker *marker){
}
actor->unk1C[0] += 1.0;
child = spawn_child_actor(D_8039236C[(s32)actor->unk1C[0]], &actor);
child->unk100 = actor->marker;
child->partnerActor = actor->marker;
}
void func_8038D51C(ActorMarker *marker){
@@ -263,7 +263,7 @@ void func_8038D5C8(ActorMarker *this_marker, ActorMarker *other_marker){
func_8028F490(D_8039237C);
func_8028F8F8(7, 1);
this->unk1C[1] = 0.0f;
func_8025A6EC(COMUSIC_68_TWINKLY_MINIGAME, 25000);
coMusicPlayer_playMusic(COMUSIC_68_TWINKLY_MINIGAME, 25000);
func_8025A58C(0, 4000);
core1_ce60_incOrDecCounter(FALSE);
this->unk1C[2] = 428571.0f;
@@ -316,7 +316,7 @@ void func_8038D6C8(Actor *this){
switch (this->state)
{
case 1: //L8038D89C
if(!func_80329530(this, 800))
if(!subaddie_playerIsWithinSphereAndActive(this, 800))
break;
if(!(globalTimer_getTime() & 1))
@@ -346,7 +346,7 @@ void func_8038D6C8(Actor *this){
|| actor_animationIsAt(this, 0.63f)
|| actor_animationIsAt(this, 0.81f)
){
FUNC_8030E8B4(SFX_98_DEAF_THUD, 1.0f, 32000, this->position, 400, 2000);
sfx_playFadeShorthandDefault(SFX_98_DEAF_THUD, 1.0f, 32000, this->position, 400, 2000);
}
break;
@@ -382,7 +382,7 @@ void func_8038D6C8(Actor *this){
func_8025AEA0(COMUSIC_68_TWINKLY_MINIGAME, (s32)this->unk1C[2]);
if(item_getCount(ITEM_24_TWINKLY_SCORE) == 0){
subaddie_set_state_with_direction(this, 1, 0.001f, 1);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_8038D3D8();
func_80324E38(0.0f, 3);
timedFunc_set_1(1.3f, (GenFunction_1)func_8038D51C, (s32)this->marker);
@@ -397,7 +397,7 @@ void func_8038D6C8(Actor *this){
actor_playAnimationOnce(this);
this->unk38_31 = 0;
item_set(ITEM_6_HOURGLASS, FALSE);
func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000);
coMusicPlayer_playMusic(COMUSIC_3C_MINIGAME_LOSS, 28000);
func_8028F8F8(7, FALSE);
this->unk1C[1] = 1.0f;
func_8038D3D8();
@@ -426,7 +426,7 @@ bool func_8038DD14(void){
bool func_8038DD34(ActorMarker *marker){
Actor *this = marker_getActor(marker);
if(func_80329530(this, 800))
if(subaddie_playerIsWithinSphereAndActive(this, 800))
return TRUE;
return FALSE;
}

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

@@ -59,8 +59,8 @@ void func_8038DEB8(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
if(this->state != 1 && this->state != 5){
func_8038DE78(this);
FUNC_8030E8B4(SFX_87_TANKTUP_OOOHW, 1.6f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 26000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_87_TANKTUP_OOOHW, 1.6f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 26000, this->position, 1250, 2500);
}
}
@@ -108,10 +108,10 @@ void func_8038E094(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
anctrl_setAnimTimer(this->anctrl, 0.99999f);
this->lifetime_value = 0.0f;
if(this->unkF4_8 == 1){
if(this->actorTypeSpecificField == 1){
func_8038DDC8(this);
}
if(this->unkF4_8 == 2){
if(this->actorTypeSpecificField == 2){
if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -2){
func_8038DDC8(this);
}
@@ -121,13 +121,13 @@ void func_8038E094(Actor *this){
}
}
}//L8038E180
if(this->unk100){
sp38 = marker_getActor(this->unk100);
if(this->partnerActor){
sp38 = marker_getActor(this->partnerActor);
if(sp38->unk1C[1] == 1.0f){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){
if(this->actorTypeSpecificField == 1 && !fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){
if(this->state != 6 && this->state != 7 && 0.0f == this->velocity[0]){
timed_setStaticCameraToNode(0.5f, 0xd);
gcdialog_showText(ASSET_C15_DIALOG_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);
gcdialog_showDialog(ASSET_C15_DIALOG_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);
this->velocity[0] = 1.0f;
subaddie_set_state_with_direction(this, 6, 0.03f, 1);
actor_loopAnimation(this);
@@ -173,10 +173,10 @@ void func_8038E094(Actor *this){
}
if(actor_animationIsAt(this, 0.15f))
FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1250, 2500);
if(actor_animationIsAt(this, 0.35f))
FUNC_8030E8B4(SFX_C4_TWINKLY_MUNCHER_GRR, 1.2f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_C4_TWINKLY_MUNCHER_GRR, 1.2f, 32000, this->position, 1250, 2500);
if(actor_animationIsAt(this, 0.97f))
func_8038DE08(this);
@@ -197,11 +197,11 @@ void func_8038E094(Actor *this){
if(sp38 && sp38->marker->id == this->unk38_31){
if(actor_animationIsAt(this, 0.23)){
func_8038C398(sp38->position, sp38->marker->id);
FUNC_8030E8B4(SFX_110_TWINKLY_DEATH, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_27_JINJO_HI, 1.6f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_110_TWINKLY_DEATH, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_27_JINJO_HI, 1.6f, 32000, this->position, 1250, 2500);
func_80324D54(0.35f, SFX_110_TWINKLY_DEATH, 1.0f, 32000, this->position, 1250.0f, 2500.0f);
marker_despawn(sp38->marker);
if( !mapSpecificFlags_get(0xa) && gcdialog_showText(0xc16, 0, NULL, NULL, NULL, NULL)){
if( !mapSpecificFlags_get(0xa) && gcdialog_showDialog(0xc16, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(0xa, TRUE);
}
}

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

@@ -101,7 +101,7 @@ void func_8038F41C(Actor *this){
}
void func_8038F454(Actor *this){
if(!mapSpecificFlags_get(7) && player_movementGroup() != BSGROUP_A_FLYING && func_80329530(this, 1000) ){
if(!mapSpecificFlags_get(7) && player_movementGroup() != BSGROUP_A_FLYING && subaddie_playerIsWithinSphereAndActive(this, 1000) ){
mapSpecificFlags_set(7, TRUE);
subaddie_set_state(this, 2);
actor_loopAnimation(this);
@@ -136,7 +136,7 @@ bool func_8038F5D4(Actor *this, f32 arg1[3], f32 arg2, f32 arg3, s32 arg4){
this->yaw_ideal = (f32) func_803297C8(this, arg1);
func_80328FB0(this, arg3);
if(actor_animationIsAt(this, 0.9f)){
FUNC_8030E8B4(SFX_3F2_UNKNOWN, 0.8f, 24000, this->position, 500, 2000);
sfx_playFadeShorthandDefault(SFX_3F2_UNKNOWN, 0.8f, 24000, this->position, 500, 2000);
}
this->actor_specific_1_f = (1.0f- sp24)*arg2;
func_80329054(this, 2);
@@ -164,8 +164,8 @@ void FP_func_8038F758(ActorMarker *marker){
s32 pad;
jiggy->yaw = this->yaw;
this->unk100 = jiggy->marker;
jiggy->unk100 = this->marker;
this->partnerActor = jiggy->marker;
jiggy->partnerActor = this->marker;
}
@@ -222,13 +222,13 @@ void FP_func_8038F7AC(Actor *this){
break;
}
if(func_80329530(this, 1300) && player_getTransformation() == TRANSFORM_4_WALRUS){
if(subaddie_playerIsWithinSphereAndActive(this, 1300) && player_getTransformation() == TRANSFORM_4_WALRUS){
subaddie_set_state_with_direction(this, 8, 0.02f, 1);
actor_loopAnimation(this);
break;
}
if(func_80329530(this, 1000) && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){
if(subaddie_playerIsWithinSphereAndActive(this, 1000) && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){
func_8038F454(this);
break;
}
@@ -246,7 +246,7 @@ void FP_func_8038F7AC(Actor *this){
break;
case 4: //L8038FAD0
if(!func_80329530(this, 2000) && player_movementGroup() != BSGROUP_A_FLYING){
if(!subaddie_playerIsWithinSphereAndActive(this, 2000) && player_movementGroup() != BSGROUP_A_FLYING){
func_8038F560(this);
break;
}
@@ -267,13 +267,13 @@ void FP_func_8038F7AC(Actor *this){
case 6: //L8038FBA8
FP_func_8038F6C4(this, local->unk18, 1.0f);
if( func_80329530(this, 1700) ) break;
if( subaddie_playerIsWithinSphereAndActive(this, 1700) ) break;
if( player_movementGroup() == BSGROUP_A_FLYING ) break;
func_8038F560(this);
if(!local->unk30){
if(gcdialog_showText(0xc1d, 0x20, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(0xc1d, 0x20, NULL, NULL, NULL, NULL)){
local->unk30 = TRUE;
}
}
@@ -283,7 +283,7 @@ void FP_func_8038F7AC(Actor *this){
if(!FP_func_8038F6C4(this, local->unkC, 4.5f))
break;
if(func_80329530(this, 1000) || player_movementGroup() == BSGROUP_A_FLYING){
if(subaddie_playerIsWithinSphereAndActive(this, 1000) || player_movementGroup() == BSGROUP_A_FLYING){
func_8038F528(this);
break;
}
@@ -299,8 +299,8 @@ void FP_func_8038F7AC(Actor *this){
break;
}
if(func_80329530(this, 500) && !this->has_met_before){
if(gcdialog_showText(0xc1c, 0xAA, this->position, this->marker, func_8038F330, func_8038F3C4)){
if(subaddie_playerIsWithinSphereAndActive(this, 500) && !this->has_met_before){
if(gcdialog_showDialog(0xc1c, 0xAA, this->position, this->marker, func_8038F330, func_8038F3C4)){
timed_setStaticCameraToNode(0.0f, 0x2E);
this->has_met_before = TRUE;
}
@@ -317,13 +317,13 @@ void FP_func_8038F7AC(Actor *this){
func_8038F598(this, 2.0f);
if(!func_803114B0()){
if(!gcdialog_hasCurrentTextId()){
if( actor_animationIsAt(this, 0.02f)
|| actor_animationIsAt(this, 0.14f)
|| actor_animationIsAt(this, 0.28f)
|| actor_animationIsAt(this, 0.42f)
){
FUNC_8030E8B4(SFX_88_WOZZA_NOISE, 1.0f, 32000, this->position, 500, 2000);
sfx_playFadeShorthandDefault(SFX_88_WOZZA_NOISE, 1.0f, 32000, this->position, 500, 2000);
}
}
break;

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

@@ -47,8 +47,8 @@ void func_8038FF54(Actor *this){
this->marker->propPtr->unk8_3 = FALSE;
actor_collisionOff(this);
if(this->unk100){
other = marker_getActor(this->unk100);
if(this->partnerActor){
other = marker_getActor(this->partnerActor);
if(this->state != 9){
if(other->state == 9){
subaddie_set_state_with_direction(this, 9, 0.01f, 1);

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

@@ -43,7 +43,7 @@ void __chXmasTree_80386F3C(void){
levelSpecificFlags_set(LEVEL_FLAG_29_FP_UNKNOWN, TRUE);
func_803228D8();
volatileFlag_set(VOLATILE_FLAG_E, 1);
func_802E4078(MAP_53_FP_CHRISTMAS_TREE, 1, 0);
transitionToMap(MAP_53_FP_CHRISTMAS_TREE, 1, 0);
}
void __chXmasTree_80386F84(Actor * this){
@@ -67,9 +67,9 @@ void __chXmasTree_spawnStar(void *marker){
void __chXmasTree_80387038(Actor *this){
if(func_8030E3FC(this->unk44_31))
func_8030E394(this->unk44_31);
sfxSource_triggerCallbackByIndex(this->unk44_31);
sfxsource_playSfxAtVolume(this->unk44_31, randf2(0.9f, 1.1f));
func_8030E2C4(this->unk44_31);
sfxSource_func_8030E2C4(this->unk44_31);
}
void __chXmasTree_8038709C(Actor *this){
@@ -95,7 +95,7 @@ void chXmasTree_update(Actor *this){
if(this->unk44_31 == 0){
this->unk44_31 = sfxsource_createSfxsourceAndReturnIndex();
sfxsource_setSfxId(this->unk44_31, SFX_415_UNKNOWN);
func_8030DD14(this->unk44_31, 3);
sfxSource_setunk43_7ByIndex(this->unk44_31, 3);
sfxsource_setSampleRate(this->unk44_31, 28000);
}
__spawnQueue_add_0(__chXmasTree_spawnSwitch);
@@ -126,9 +126,9 @@ void chXmasTree_update(Actor *this){
subaddie_set_state(this, 3);
this->lifetime_value = 2.0f;
func_8025A6EC(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000);
func_802BAFE4(0x1A);
gcdialog_showText(0xC14, 0, NULL, NULL, NULL, NULL);
coMusicPlayer_playMusic(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000);
gcStaticCamera_activate(0x1A);
gcdialog_showDialog(0xC14, 0, NULL, NULL, NULL, NULL);
break;
case 3: // L803872F0
@@ -178,8 +178,8 @@ void chXmasTree_update(Actor *this){
this->lifetime_value = 0.1f;
if(!maSlalom_isActive()){
if(!mapSpecificFlags_get(9) || mapSpecificFlags_get(1)){
func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000);
func_802BAFE4(0x1a);
coMusicPlayer_playMusic(COMUSIC_3C_MINIGAME_LOSS, 28000);
gcStaticCamera_activate(0x1a);
this->lifetime_value = 2.0f;
}
}

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

@@ -61,7 +61,7 @@ void func_80390D58(f32 position[3]){
void func_80390E78(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
FUNC_8030E8B4(SFX_96_HOTSAND_EEL_HISS, 1.0f, 32000, this->position, 1000, 2000);
sfx_playFadeShorthandDefault(SFX_96_HOTSAND_EEL_HISS, 1.0f, 32000, this->position, 1000, 2000);
}
void func_80390EB0(Actor *this){
@@ -71,7 +71,7 @@ void func_80390EB0(Actor *this){
marker_setCollisionScripts(this->marker, func_80390E78, NULL, NULL);
}
if(viewport_func_8024DB50(this->position, 150.0f) || func_80329530(this, 1200))
if(viewport_func_8024DB50(this->position, 150.0f) || subaddie_playerIsWithinSphereAndActive(this, 1200))
{
if( !(globalTimer_getTime() & 3) && randf() < 0.2){
func_80390C70(this->position);

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

@@ -38,7 +38,7 @@ void func_80390944(f32 position[3], s32 cnt, enum asset_e model_id){
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_80392754);
particleEmitter_func_802EF9F8(pCtrl, 0.6f);
particleEmitter_func_802EFA18(pCtrl, 0);
func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_setSfx(pCtrl, SFX_7B_ICE_BREAKING_1, 8000);
particleEmitter_emitN(pCtrl, cnt);
}
@@ -65,14 +65,14 @@ void func_80390ABC(ActorMarker *marker){
func_80390944(this->position, 0xA, 0x4D3);
func_80390A30(this->position, 6, ASSET_700_SPRITE_DUST);
func_8030E6D4(SFX_B6_GLASS_BREAKING_1);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
this->unk38_31 = 1;
}
void func_80390B2C(ActorMarker *marker){
Actor *this = marker_getActor(marker);
func_803228D8();
func_802E4078(MAP_27_FP_FREEZEEZY_PEAK, 0xd, 0);
transitionToMap(MAP_27_FP_FREEZEEZY_PEAK, 0xd, 0);
marker_despawn(this->marker);
}

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

@@ -42,7 +42,7 @@ void func_8038EC5C(Actor *this){
this->unk38_31++;
this->lifetime_value = 0.33f;
if(this->unk38_31 < 4){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
}
}

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

@@ -40,7 +40,7 @@ void func_8038E7CC(ActorMarker *this_marker, ActorMarker *other_marker){
if(this->state == 2){
this->unk38_31++;
if(this->unk38_31 < 4){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
}
}
}

8
src/FP/code_19E0.c
View File

@@ -127,7 +127,7 @@ void func_803881AC(Actor *this){
if(0.0f == this->velocity_x)
return;
}else{
if(!func_80329530(this, 2000) && !maSlolam_WithinRadiusOfBoggy(this->position, 2000))
if(!subaddie_playerIsWithinSphereAndActive(this, 2000) && !maSlolam_WithinRadiusOfBoggy(this->position, 2000))
return;
this->marker->collidable = TRUE;
this->unk124_6 = TRUE;
@@ -142,11 +142,11 @@ void func_803881AC(Actor *this){
}
if( 1.0f == this->velocity_x && func_80387EE4(this)){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
maSlalom_setPlayerGate(this->unkF4_8);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
maSlalom_setPlayerGate(this->actorTypeSpecificField);
}
if(func_80388000(this)){
maSlalom_setBoggyGate(this->unkF4_8);
maSlalom_setBoggyGate(this->actorTypeSpecificField);
}
}

2
src/FP/code_1FF0.c
View File

@@ -70,7 +70,7 @@ void func_80388584(Actor *this){
}
}
else{//L80388694
if(!func_80329530(this, 2000)&& !maSlolam_WithinRadiusOfBoggy(this->position, 2000))
if(!subaddie_playerIsWithinSphereAndActive(this, 2000)&& !maSlolam_WithinRadiusOfBoggy(this->position, 2000))
return;
this->marker->collidable = TRUE;
this->unk124_6 = TRUE;

2
src/FP/code_B4D0.c
View File

@@ -35,6 +35,6 @@ void func_8039195C(void){
void func_80391994(void){
if(map_get() == MAP_7F_FP_WOZZAS_CAVE){
func_8030DB04(Me.sound, 22000, Me.position, 400.0f, 1200.0f);
func_8030E2C4(Me.sound);
sfxSource_func_8030E2C4(Me.sound);
}
}

18
src/FP/ma/slalom.c
View File

@@ -107,8 +107,8 @@ void __maSlalom_spawnGate(s32 indx, s32 arg1){
a1->unk38_31 = 1;
a2->unk38_31 = 1;
a1->unkF4_8 = indx + 1;
a2->unkF4_8 = indx + 1;
a1->actorTypeSpecificField = indx + 1;
a2->actorTypeSpecificField = indx + 1;
meActiveFlags[indx].marker = a1->marker;
meDummyFlags[indx].marker = a2->marker;
@@ -279,7 +279,7 @@ void maSlalom_win(void){
player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 2.0f);
}
func_8028F918(1);
func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 28000);
coMusicPlayer_playMusic(COMUSIC_3B_MINIGAME_VICTORY, 28000);
FP_func_8038AB60(0);
func_8038ABDC();
timed_setStaticCameraToNode(0.0f, 1);
@@ -293,7 +293,7 @@ void maSlalom_lose(void){
pntBoggy = marker_getActor(Me.boggyLink);
pntBoggy->unk38_31 = 1;
func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000);
coMusicPlayer_playMusic(COMUSIC_3C_MINIGAME_LOSS, 28000);
FP_func_8038AB60(0);
func_8038ABDC();
if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
@@ -407,7 +407,7 @@ void maSlalom_linkActiveFlag(ActorMarker *marker){
Actor *actor = marker_getActor(marker);
s32 num;
num = actor->unkF4_8 - 1;
num = actor->actorTypeSpecificField - 1;
if(num < NUM_GATES){
meActiveFlags[num].marker = actor->marker;
meActiveFlags[num].position[0] = actor->position[0];
@@ -421,7 +421,7 @@ void maSlalom_linkDummyFlag(ActorMarker *marker){
Actor *actor = marker_getActor(marker);
s32 num;
num = actor->unkF4_8 - 1;
num = actor->actorTypeSpecificField - 1;
if(num < NUM_GATES){
meDummyFlags[num].marker = actor->marker;
meDummyFlags[num].position[0] = actor->position[0];
@@ -538,7 +538,7 @@ void maSlalom_setBoggyGate(s32 gate_num){
FP_func_8038AB60(0);
if(!player_isDead()){
func_8028F918(2);
gcdialog_showText(0xc10, 0x20, NULL, NULL, maSlalom_dialogCallback, NULL);
gcdialog_showDialog(0xc10, 0x20, NULL, NULL, maSlalom_dialogCallback, NULL);
}//L8038BD40
Me.state = MA_SLALOM_STATE_4_LOSE;
break;
@@ -546,7 +546,7 @@ void maSlalom_setBoggyGate(s32 gate_num){
case 3:
if(!Me.hasBeenThreeBehind && !player_isDead()){
Me.hasBeenThreeBehind = 1;
gcdialog_showText(0xc0f, 0x20, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xc0f, 0x20, NULL, NULL, NULL, NULL);
}//L8038BD94
func_8025AEA0(0x3a, 0x411aa);
break;
@@ -554,7 +554,7 @@ void maSlalom_setBoggyGate(s32 gate_num){
case 2:
if(!Me.hasBeenTwoBehind && !player_isDead()){
Me.hasBeenTwoBehind = 1;
gcdialog_showText(0xc0e, 0x20, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xc0e, 0x20, NULL, NULL, NULL, NULL);
}//L8038BDF0
func_8025AEA0(0x3a, 0x493e0);
break;

4
src/FP/ma/snowbutton.c
View File

@@ -47,7 +47,7 @@ void maSnowButton_update(void){
case MA_SNOW_BUTTON_STATE_1_ACTIVE:
if(Me.remainingButtonCount <= 0){
Me.state = MA_SNOW_BUTTON_STATE_2_WIN;
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
Me.delay = 0;
}
break;
@@ -56,7 +56,7 @@ void maSnowButton_update(void){
if(!(Me.delay < 30)){
if(Me.jiggySpawnerExists){
func_802BAFE4(0x11);
gcStaticCamera_activate(0x11);
jiggy_spawn(JIGGY_2D_FP_SNOWMAN_BUTTONS, Me.spawn_pos);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, Me.spawn_pos[0]),

2
src/FP/ma/snowy.c
View File

@@ -58,7 +58,7 @@ void maSnowy_update(void){
case MA_SNOWY_STATE_2_WIN:
if(Me.delay >= 75){
if(Me.jiggySpawnerExists){
func_802BAFE4(0x12);
gcStaticCamera_activate(0x12);
jiggy_spawn(JIGGY_31_FP_SIR_SLUSH, Me.spawn_pos);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, Me.spawn_pos[0]),