diff --git a/include/functions.h b/include/functions.h index d7afc136..26291a9f 100644 --- a/include/functions.h +++ b/include/functions.h @@ -586,7 +586,7 @@ void Object_58_Initialize(Object_58*); // fox_radio s32 func_800BA7BC(u16*, s32); -void func_800BA808(u16*, RadioCharacterId); +void Radio_PlayMessage(u16*, RadioCharacterId); void func_800BB388(void); void func_800BB5D0(void); diff --git a/include/sf64object.h b/include/sf64object.h index 91bc26ed..53f860c8 100644 --- a/include/sf64object.h +++ b/include/sf64object.h @@ -245,6 +245,7 @@ typedef struct { #define DMG_BEAM 1 #define DMG_NONE 0 #define DMG_BOMB -1 +#define DMG_UNK_100 100 typedef struct { /* 0x000 */ Object obj; diff --git a/linker_scripts/us/symbol_addrs_engine.txt b/linker_scripts/us/symbol_addrs_engine.txt index eb4315ce..c0a78841 100644 --- a/linker_scripts/us/symbol_addrs_engine.txt +++ b/linker_scripts/us/symbol_addrs_engine.txt @@ -129,7 +129,7 @@ gCurrentMsgPri = 0x800D4A70; func_800BA760 = 0x800BA760; func_800BA7BC = 0x800BA7BC; -func_800BA808 = 0x800BA808; +Radio_PlayMessage = 0x800BA808; func_800BAAE8 = 0x800BAAE8; func_800BB388 = 0x800BB388; func_800BB5D0 = 0x800BB5D0; diff --git a/src/main/fox_360.c b/src/main/fox_360.c index 900b7dd4..af017c9b 100644 --- a/src/main/fox_360.c +++ b/src/main/fox_360.c @@ -89,7 +89,7 @@ void func_8002E3E0(Actor* actor) { bool func_8002E4F8(u16* msg, RadioCharacterId rcid) { if ((gRadioState == 0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) { - func_800BA808(msg, rcid); + Radio_PlayMessage(msg, rcid); return true; } else { return false; @@ -437,7 +437,7 @@ void func_8002F3E0(void) { void func_8002F5F4(u16* msg, RadioCharacterId character) { if ((D_80178300 == 0) && (gActors[0].state == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) { - func_800BA808(msg, character); + Radio_PlayMessage(msg, character); } } @@ -456,7 +456,7 @@ void func_8002F69C(Actor* actor) { D_8015F904--; if ((D_8015F904 == 0) && (gCurrentLevel != LEVEL_BOLSE) && ((D_80177CD0[0] + D_80177CD0[1] + D_80177CD0[2] + D_80177CD0[3]) == 1)) { - func_800BA808(gMsg_ID_19465, RCID_FOX); + Radio_PlayMessage(gMsg_ID_19465, RCID_FOX); } } if (((D_8015F928 + 100) == (0, D_800C9B4C)) && (gCurrentLevel != LEVEL_VENOM_2)) { @@ -625,7 +625,7 @@ void func_8002FEF0(Actor* actor) { func_8001AF40(0); D_800CFF90 = 0; D_80161690 = 0; - func_800BA808(gMsg_ID_20230, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20230, RCID_ROB64); D_8015F900 = 160; } if (D_8015F900 != 0) { @@ -839,7 +839,7 @@ void func_8003088C(Actor* actor) { func_i4_80199900(actor, 1); if (actor->unk_0D4 == 1) { if (gActors[8].obj.status == OBJ_ACTIVE) { - func_800BA808(gMsg_ID_16140, RCID_KATT); + Radio_PlayMessage(gMsg_ID_16140, RCID_KATT); } BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10); gHitCount += 11; @@ -847,16 +847,16 @@ void func_8003088C(Actor* actor) { } else { switch (actor->unk_0D4) { case 102: - func_800BA808(gMsg_ID_16170, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_16170, RCID_FALCO); break; case 103: - func_800BA808(gMsg_ID_16180, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_16180, RCID_SLIPPY); break; case 104: - func_800BA808(gMsg_ID_16175, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_16175, RCID_PEPPY); break; case 109: - func_800BA808(gMsg_ID_16185, RCID_KATT); + Radio_PlayMessage(gMsg_ID_16185, RCID_KATT); break; } } @@ -967,13 +967,13 @@ void func_8003088C(Actor* actor) { if ((D_80177CD0[0] + D_80177CD0[1] + D_80177CD0[2] + D_80177CD0[3]) == 0) { switch (actor->unk_0D4) { case 102: - func_800BA808(gMsg_ID_9438, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_9438, RCID_FALCO); break; case 103: - func_800BA808(gMsg_ID_9436, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_9436, RCID_SLIPPY); break; case 104: - func_800BA808(gMsg_ID_9437, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_9437, RCID_PEPPY); break; } } else { @@ -1049,7 +1049,7 @@ void func_8003088C(Actor* actor) { if (actor->unk_0D4 == 1) { if ((gCurrentLevel == LEVEL_KATINA) && (actor->unk_0B6 == 1) && (D_8015F920 == 0)) { D_8015F920 = 1; - func_800BA808(gMsg_ID_18015, RCID_BILL); + Radio_PlayMessage(gMsg_ID_18015, RCID_BILL); } else if (actor->unk_0E4 == 8) { func_8002F5F4(gMsg_ID_20084, RCID_KATT); } else if (actor->unk_0E4 == 9) { @@ -1090,7 +1090,7 @@ void func_8003088C(Actor* actor) { if (gTeamShields[1] >= 90) { func_8002F5F4(gMsg_ID_9130, RCID_FALCO); } else { - func_800BA808(gMsg_ID_9151, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_9151, RCID_FALCO); } if ((D_800CA234 == NULL) || (gTeamShields[actor->unk_0E4] <= 50)) { D_800CA234 = actor; @@ -1101,7 +1101,7 @@ void func_8003088C(Actor* actor) { if (gTeamShields[2] >= 90) { func_8002F5F4(gMsg_ID_9140, RCID_SLIPPY); } else { - func_800BA808(gMsg_ID_9152, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_9152, RCID_SLIPPY); } if ((D_800CA234 == NULL) || (gTeamShields[actor->unk_0E4] <= 50)) { D_800CA234 = actor; @@ -1112,7 +1112,7 @@ void func_8003088C(Actor* actor) { if (gTeamShields[3] >= 90) { func_8002F5F4(gMsg_ID_9150, RCID_PEPPY); } else { - func_800BA808(gMsg_ID_9153, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_9153, RCID_PEPPY); } if ((D_800CA234 == NULL) || (gTeamShields[actor->unk_0E4] <= 50)) { D_800CA234 = actor; @@ -1285,33 +1285,33 @@ void func_800319AC(Actor* this) { break; case 1: if (gPlayer[0].shields < (Play_GetMaxShields() / 2)) { - func_800BA808(gMsg_ID_20298, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20298, RCID_FALCO); } else if (Rand_ZeroOne() < 0.5f) { - func_800BA808(gMsg_ID_20280, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20280, RCID_FALCO); } else { - func_800BA808(gMsg_ID_20301, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20301, RCID_FALCO); } break; case 2: if (gPlayer[0].shields < (Play_GetMaxShields() / 2)) { - func_800BA808(gMsg_ID_20297, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20297, RCID_SLIPPY); } else if (Rand_ZeroOne() < 0.5f) { - func_800BA808(gMsg_ID_20282, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20282, RCID_SLIPPY); } else { - func_800BA808(gMsg_ID_20300, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20300, RCID_SLIPPY); } break; case 3: if (gPlayer[0].shields < (Play_GetMaxShields() / 2)) { - func_800BA808(gMsg_ID_20296, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20296, RCID_PEPPY); } else if (Rand_ZeroOne() < 0.5f) { - func_800BA808(gMsg_ID_20281, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20281, RCID_PEPPY); } else { - func_800BA808(gMsg_ID_20299, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20299, RCID_PEPPY); } break; case 9: - func_800BA808(gMsg_ID_18120, RCID_BILL); + Radio_PlayMessage(gMsg_ID_18120, RCID_BILL); break; } } @@ -1324,13 +1324,13 @@ void func_800319AC(Actor* this) { gTeamShields[this->unk_0E4] = 1; switch (this->unk_0E4) { case 1: - func_800BA808(gMsg_ID_20220, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20220, RCID_FALCO); break; case 2: - func_800BA808(gMsg_ID_20222, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20222, RCID_SLIPPY); break; case 3: - func_800BA808(gMsg_ID_20221, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20221, RCID_PEPPY); break; } this->fwork[29] = 5.0f; diff --git a/src/main/fox_beam.c b/src/main/fox_beam.c index 6eab0d3e..4d592ce8 100644 --- a/src/main/fox_beam.c +++ b/src/main/fox_beam.c @@ -2208,13 +2208,13 @@ void func_8003D54C(PlayerShot* shot, s32 index) { } while (gTeamShields[teamId] <= 0); switch (teamId) { case 1: - func_800BA808(gMsg_ID_7100, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_7100, RCID_FALCO); break; case 2: - func_800BA808(gMsg_ID_15252, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_15252, RCID_SLIPPY); break; case 3: - func_800BA808(gMsg_ID_17160, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_17160, RCID_PEPPY); break; } } diff --git a/src/main/fox_demo.c b/src/main/fox_demo.c index cb670225..5b511199 100644 --- a/src/main/fox_demo.c +++ b/src/main/fox_demo.c @@ -136,18 +136,18 @@ void func_80048AC0(s32 teamId) { if (teamId == 1) { if (gTeamShields[1] < 0x40) { - func_800BA808(gMsg_ID_20303, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20303, RCID_FALCO); return; } if ((s32) (Play_GetMaxShields() * 0.8f) < gPlayer[0].shields) { - func_800BA808(gMsg_ID_20017, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20017, RCID_FALCO); return; } if ((s32) (Play_GetMaxShields() * 0.3f) < gPlayer[0].shields) { - func_800BA808(gMsg_ID_20019, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20019, RCID_FALCO); return; } - func_800BA808(gMsg_ID_20018, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20018, RCID_FALCO); return; } @@ -156,28 +156,28 @@ void func_80048AC0(s32 teamId) { if (teamShield > 160) { switch (teamId) { case 2: - func_800BA808(gMsg_ID_20011, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20011, RCID_SLIPPY); break; case 3: - func_800BA808(gMsg_ID_20012, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20012, RCID_PEPPY); break; } } else if (teamShield > 64) { switch (teamId) { case 2: - func_800BA808(gMsg_ID_20013, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20013, RCID_SLIPPY); break; case 3: - func_800BA808(gMsg_ID_20014, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20014, RCID_PEPPY); break; } } else { switch (teamId) { case 2: - func_800BA808(gMsg_ID_20015, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20015, RCID_SLIPPY); break; case 3: - func_800BA808(gMsg_ID_20016, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20016, RCID_PEPPY); break; } } @@ -833,10 +833,10 @@ void func_8004AAF4(Player* player) { if (gCsFrameCount == 37) { D_80177E84 = 1; if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { - func_800BA808(gMsg_ID_19466, RCID_FOX); + Radio_PlayMessage(gMsg_ID_19466, RCID_FOX); func_8001D444(0, 0x803DU, 0, 0xFFU); } else if (gCurrentLevel != LEVEL_TRAINING) { - func_800BA808(gMsg_ID_20180, RCID_FOX); + Radio_PlayMessage(gMsg_ID_20180, RCID_FOX); if (gCurrentLevel == LEVEL_SECTOR_Y) { func_8001D444(0, D_800C9E90[gCurrentLevel], 0, 2); } else { @@ -1235,30 +1235,30 @@ void func_8004B368(Player* player) { break; case 410: - func_800BA808(gMsg_ID_2335, RCID_FOX); + Radio_PlayMessage(gMsg_ID_2335, RCID_FOX); break; case 550: if ((gTeamShields[2] == (-1)) || (gTeamShields[2] == 0)) { - func_800BA808(gMsg_ID_20333, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20333, RCID_ROB64); } else { - func_800BA808(gMsg_ID_2300, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2300, RCID_SLIPPY); } break; case 682: if ((gTeamShields[3] == -1) || (gTeamShields[3] == 0)) { - func_800BA808(gMsg_ID_20332, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20332, RCID_ROB64); } else { - func_800BA808(gMsg_ID_2310, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_2310, RCID_PEPPY); } break; case 816: if ((gTeamShields[1] == (-1)) || (gTeamShields[1] == 0)) { - func_800BA808(gMsg_ID_20331, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20331, RCID_ROB64); } else { - func_800BA808(gMsg_ID_2320, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_2320, RCID_FALCO); } break; } @@ -1644,7 +1644,7 @@ void func_8004D440(Player* player) { if (!gVersusMode) { if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { - func_800BA808(gMsg_ID_20318, RCID_FOX); + Radio_PlayMessage(gMsg_ID_20318, RCID_FOX); } else { if ((gCurrentLevel != LEVEL_TRAINING) && ((gTeamShields[1] > 0) || (gTeamShields[2] > 0) || (gTeamShields[3] > 0))) { @@ -1654,15 +1654,15 @@ void func_8004D440(Player* player) { switch (teamId) { case 1: - func_800BA808(gMsg_ID_20090, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20090, RCID_FALCO); break; case 2: - func_800BA808(gMsg_ID_20092, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20092, RCID_SLIPPY); break; case 3: - func_800BA808(gMsg_ID_20091, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20091, RCID_PEPPY); break; } } diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c index e81bce60..69324c7d 100644 --- a/src/main/fox_enmy.c +++ b/src/main/fox_enmy.c @@ -1647,7 +1647,7 @@ void func_80066254(Actor* actor) { switch (D_80161A62) { case 9: if (gCurrentLevel == LEVEL_KATINA) { - func_800BA808(gMsg_ID_18031, RCID_BILL); + Radio_PlayMessage(gMsg_ID_18031, RCID_BILL); } /* fallthrough */ case 4: @@ -1680,11 +1680,11 @@ void func_80066254(Actor* actor) { Audio_PlaySfx(0x4900000C, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } else if (actor->unk_044 == 24) { if (gTeamShields[3] > 0) { - func_800BA808(gMsg_ID_20261, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20261, RCID_PEPPY); } else if (gTeamShields[2] > 0) { - func_800BA808(gMsg_ID_20263, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20263, RCID_SLIPPY); } else if (gTeamShields[1] > 0) { - func_800BA808(gMsg_ID_20262, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20262, RCID_FALCO); } } else if (Rand_ZeroOne() <= D_800CFE5C[actor->unk_044]) { func_800660F0(actor); diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c index 0928d56f..ab4002ba 100644 --- a/src/main/fox_enmy2.c +++ b/src/main/fox_enmy2.c @@ -9,7 +9,7 @@ void func_80187530(Actor*); // figure out which one later void func_8006A7B0(u16* msg, s32 character) { (void) "Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n"; if ((gRadioState == 0) || (D_80177D68 != character)) { - func_800BA808(msg, character); + Radio_PlayMessage(msg, character); } } @@ -1235,7 +1235,7 @@ void func_8006D36C(Actor* actor) { case 0xF000: temp_v0_4 = Message_PtrFromId(temp_s1[actor->unk_0E6 + 1]); if ((temp_v0_4 != NULL) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) { - func_800BA808(temp_v0_4, temp_s1[actor->unk_0E6] & 0x1FF); + Radio_PlayMessage(temp_v0_4, temp_s1[actor->unk_0E6] & 0x1FF); } actor->unk_0E6 += 2; func_8006D36C(actor); @@ -1972,13 +1972,13 @@ bool func_800700A4(Actor* actor) { switch (actor->iwork[12]) { case 1: - func_800BA808(gMsg_ID_20220, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20220, RCID_FALCO); break; case 2: - func_800BA808(gMsg_ID_20222, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20222, RCID_SLIPPY); break; case 3: - func_800BA808(gMsg_ID_20221, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20221, RCID_PEPPY); break; } gTeamShields[actor->iwork[12]] = -1; diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index a91f127e..5abd4190 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -4128,15 +4128,15 @@ bool func_80091368(Actor* actor) { switch (actor->unk_0E4) { case 1: - func_800BA808(gMsg_ID_20220, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20220, RCID_FALCO); break; case 3: - func_800BA808(gMsg_ID_20221, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20221, RCID_PEPPY); break; case 2: - func_800BA808(gMsg_ID_20222, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20222, RCID_SLIPPY); break; } gTeamShields[actor->unk_0E4] = -1; @@ -4431,13 +4431,13 @@ bool func_80091F00(Actor* actor) { if ((actor->unk_0D0 == 3) && (actor->unk_0D4 == 1)) { switch (actor->unk_0E4) { case 1: - func_800BA808(gMsg_ID_20210, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20210, RCID_FALCO); break; case 3: - func_800BA808(gMsg_ID_20200, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20200, RCID_PEPPY); break; case 2: - func_800BA808(gMsg_ID_20190, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20190, RCID_SLIPPY); break; } } @@ -4445,13 +4445,13 @@ bool func_80091F00(Actor* actor) { if ((actor->unk_0D0 != 3) && (actor->unk_0D4 == 1)) { switch (actor->unk_0E4) { case 1: - func_800BA808(gMsg_ID_20060, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20060, RCID_FALCO); break; case 3: - func_800BA808(gMsg_ID_20070, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20070, RCID_PEPPY); break; case 2: - func_800BA808(gMsg_ID_20080, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20080, RCID_SLIPPY); break; } } @@ -4459,13 +4459,13 @@ bool func_80091F00(Actor* actor) { if ((actor->unk_0D4 == 2) || (actor->unk_0D4 == 100)) { switch (actor->unk_0E4) { case 1: - func_800BA808(gMsg_ID_20030, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20030, RCID_FALCO); break; case 3: - func_800BA808(gMsg_ID_20040, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20040, RCID_PEPPY); break; case 2: - func_800BA808(gMsg_ID_20050, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20050, RCID_SLIPPY); break; } } @@ -5937,7 +5937,7 @@ void func_80095604(Player* player) { switch (gCsFrameCount) { case 300: - func_800BA808(gMsg_ID_15200, RCID_FOX); + Radio_PlayMessage(gMsg_ID_15200, RCID_FOX); break; case 400: @@ -5949,34 +5949,34 @@ void func_80095604(Player* player) { break; case 520: - func_800BA808(gMsg_ID_15253, RCID_FOX); + Radio_PlayMessage(gMsg_ID_15253, RCID_FOX); break; case 600: shield = gTeamShields[3]; gTeamShields[3] = 1; - func_800BA808(gMsg_ID_15210, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_15210, RCID_PEPPY); gTeamShields[3] = shield; break; case 680: shield = gTeamShields[2]; gTeamShields[2] = 1; - func_800BA808(gMsg_ID_15220, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_15220, RCID_SLIPPY); gTeamShields[2] = shield; break; case 760: shield = gTeamShields[1]; gTeamShields[1] = 1; - func_800BA808(gMsg_ID_15230, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_15230, RCID_FALCO); gTeamShields[1] = shield; break; case 840: shield = gTeamShields[2]; gTeamShields[2] = 1; - func_800BA808(gMsg_ID_15240, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_15240, RCID_SLIPPY); gTeamShields[2] = shield; break; diff --git a/src/main/fox_play.c b/src/main/fox_play.c index 21d1d0a5..abb276dd 100644 --- a/src/main/fox_play.c +++ b/src/main/fox_play.c @@ -1916,7 +1916,7 @@ void func_800A8BA4(Player* player) { actor->unk_046 = 2; D_80177E80++; if (D_80177E80 == 3) { - func_800BA808(gMsg_ID_5504, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_5504, RCID_FALCO); } Audio_PlaySfx(D_800CFF54[D_80177E80], gPlayer[0].sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); @@ -5185,23 +5185,23 @@ void func_800B46F8(Player* player) { switch (teamId) { case 1: if (Rand_ZeroOne() < 0.5f) { - func_800BA808(gMsg_ID_20306, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20306, RCID_FALCO); } else { - func_800BA808(gMsg_ID_20309, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20309, RCID_FALCO); } break; case 2: if (Rand_ZeroOne() < 0.5f) { - func_800BA808(gMsg_ID_20305, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20305, RCID_SLIPPY); } else { - func_800BA808(gMsg_ID_20308, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20308, RCID_SLIPPY); } break; case 3: if (Rand_ZeroOne() < 0.5f) { - func_800BA808(gMsg_ID_20304, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20304, RCID_PEPPY); } else { - func_800BA808(gMsg_ID_20307, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20307, RCID_PEPPY); } break; } diff --git a/src/main/fox_radio.c b/src/main/fox_radio.c index d7f1d576..4e0c38ac 100644 --- a/src/main/fox_radio.c +++ b/src/main/fox_radio.c @@ -36,7 +36,7 @@ s32 func_800BA7BC(u16* msg, s32 priority) { } } -void func_800BA808(u16* msg, RadioCharacterId character) { +void Radio_PlayMessage(u16* msg, RadioCharacterId character) { s32 var_v1; s32 temp_v0; s32 priority; diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c index 5308c7ca..b56a7ff3 100644 --- a/src/overlays/ovl_i1/fox_co.c +++ b/src/overlays/ovl_i1/fox_co.c @@ -148,7 +148,7 @@ void func_i1_80187AC8(Boss* boss) { } else { func_8007A6F0(&boss->obj.pos, 0x29034003); } - func_800BA808(gMsg_ID_2270, RCID_BOSS_CORNERIA); + Radio_PlayMessage(gMsg_ID_2270, RCID_BOSS_CORNERIA); if (boss->swork[29] <= 0) { boss->swork[10] = 1000; boss->info.hitbox[1 + 0] = 100000.0f; @@ -176,7 +176,7 @@ void func_i1_80187AC8(Boss* boss) { } gPlayer[0].unk_114 = 0.0f; } - func_800BA808(gMsg_ID_2280, RCID_BOSS_CORNERIA); + Radio_PlayMessage(gMsg_ID_2280, RCID_BOSS_CORNERIA); func_80042EC0(boss); gBossFrameCount = 100000; return; @@ -439,11 +439,11 @@ void func_i1_80188A18(Boss* boss) { } if ((gBossFrameCount >= 801) && !(gBossFrameCount & 0x1FF)) { if (D_80177B6C < 2) { - func_800BA808(gMsg_ID_20237, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20237, RCID_PEPPY); } else if (D_801615D0.z > 0.0f) { - func_800BA808(gMsg_ID_2233, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_2233, RCID_FALCO); } else { - func_800BA808(gMsg_ID_2282, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_2282, RCID_PEPPY); } } } @@ -495,13 +495,13 @@ void func_i1_80188D50(Boss* boss) { switch (temp_ft3) { case 1: - func_800BA808(gMsg_ID_7100, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_7100, RCID_FALCO); break; case 2: - func_800BA808(gMsg_ID_15252, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_15252, RCID_SLIPPY); break; case 3: - func_800BA808(gMsg_ID_17160, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_17160, RCID_PEPPY); break; } } @@ -594,26 +594,26 @@ void func_i1_80189058(Boss* boss) { switch (gBossFrameCount) { case 20: - func_800BA808(gMsg_ID_2240, RCID_BOSS_CORNERIA); + Radio_PlayMessage(gMsg_ID_2240, RCID_BOSS_CORNERIA); break; case 160: - func_800BA808(gMsg_ID_2250, RCID_BOSS_CORNERIA); + Radio_PlayMessage(gMsg_ID_2250, RCID_BOSS_CORNERIA); break; case 330: - func_800BA808(gMsg_ID_2225, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2225, RCID_SLIPPY); break; case 486: gShowBossHealth = 1; break; case 500: - func_800BA808(gMsg_ID_2260, RCID_BOSS_CORNERIA); + Radio_PlayMessage(gMsg_ID_2260, RCID_BOSS_CORNERIA); break; case 900: - func_800BA808(gMsg_ID_2230, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_2230, RCID_PEPPY); break; case 3840: if (boss->state < 5) { - func_800BA808(gMsg_ID_2230, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_2230, RCID_PEPPY); } break; } @@ -809,11 +809,11 @@ void func_i1_80189058(Boss* boss) { func_i1_80188C7C(boss); if ((gGameFrameCount & 0x1FF) == 0) { - func_800BA808(gMsg_ID_2275, RCID_BOSS_CORNERIA); + Radio_PlayMessage(gMsg_ID_2275, RCID_BOSS_CORNERIA); } if ((gGameFrameCount & 0x1FF) == 0x100) { - func_800BA808(gMsg_ID_2220, RCID_BOSS_CORNERIA); + Radio_PlayMessage(gMsg_ID_2220, RCID_BOSS_CORNERIA); } } boss->obj.rot.x = boss->obj.rot.z; @@ -824,10 +824,10 @@ void func_i1_80189058(Boss* boss) { func_i1_80188C7C(boss); if ((gGameFrameCount & 0x1FF) == 0) { - func_800BA808(gMsg_ID_2275, RCID_BOSS_CORNERIA); + Radio_PlayMessage(gMsg_ID_2275, RCID_BOSS_CORNERIA); } if ((gGameFrameCount & 0x1FF) == 0x100) { - func_800BA808(gMsg_ID_2220, RCID_BOSS_CORNERIA); + Radio_PlayMessage(gMsg_ID_2220, RCID_BOSS_CORNERIA); } } boss->obj.rot.x = -boss->obj.rot.z; @@ -1709,10 +1709,10 @@ void func_i1_8018C19C(Boss* boss) { if (boss->timer_050 == 350) { func_800182F4(0x102800FF); func_800182F4(0x112800FF); - func_800BA808(gMsg_ID_2290, RCID_BOSS_CORNERIA2); + Radio_PlayMessage(gMsg_ID_2290, RCID_BOSS_CORNERIA2); } if (boss->timer_050 == 180) { - func_800BA808(gMsg_ID_2298, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_2298, RCID_PEPPY); boss->timer_052 = 350; } if (boss->timer_050 == 0) { @@ -1742,7 +1742,7 @@ void func_i1_8018C19C(Boss* boss) { boss->timer_050 = 75; boss->timer_054 = 0; boss->fwork[8] = 0.0f; - func_800BA808(gMsg_ID_2291, RCID_BOSS_CORNERIA2); + Radio_PlayMessage(gMsg_ID_2291, RCID_BOSS_CORNERIA2); boss->swork[4]++; } break; @@ -1771,7 +1771,7 @@ void func_i1_8018C19C(Boss* boss) { Audio_PlaySfx(0x2940201A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } if ((boss->swork[5] == 0) && ((gBosses[2].state == 0) || (gBosses[3].state == 0))) { - func_800BA808(gMsg_ID_2292, RCID_BOSS_CORNERIA2); + Radio_PlayMessage(gMsg_ID_2292, RCID_BOSS_CORNERIA2); } boss->swork[5]++; boss->swork[5] &= 3; @@ -1804,11 +1804,11 @@ void func_i1_8018C19C(Boss* boss) { boss->swork[2] = 0; boss->fwork[8] = 0.0f; if ((boss->swork[4] == 0) && (gBosses[1].state == 0)) { - func_800BA808(gMsg_ID_2291, RCID_BOSS_CORNERIA2); + Radio_PlayMessage(gMsg_ID_2291, RCID_BOSS_CORNERIA2); } if ((boss->swork[4] == 2) && (boss->swork[7] == 0) && ((gBosses[3].state == 0) || (gBosses[2].state == 0) || (gBosses[1].state == 0))) { - func_800BA808(gMsg_ID_2299, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_2299, RCID_PEPPY); boss->swork[7]++; } boss->swork[4]++; @@ -1852,7 +1852,7 @@ void func_i1_8018C19C(Boss* boss) { boss->swork[9]++; Audio_PlaySfx(0x31034025, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); if (boss->swork[6] == 0) { - func_800BA808(gMsg_ID_2293, RCID_BOSS_CORNERIA2); + Radio_PlayMessage(gMsg_ID_2293, RCID_BOSS_CORNERIA2); } boss->swork[6]++; boss->swork[6] &= 1; @@ -1894,7 +1894,7 @@ void func_i1_8018C19C(Boss* boss) { Audio_PlaySfx(0x2940D09A, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); D_Timer_80161A60 = 8; gShowBossHealth = false; - func_800BA808(gMsg_ID_2294, RCID_BOSS_CORNERIA2); + Radio_PlayMessage(gMsg_ID_2294, RCID_BOSS_CORNERIA2); boss->health = 1; boss->timer_056 = 150; boss->state = 8; @@ -1950,7 +1950,7 @@ void func_i1_8018C19C(Boss* boss) { } boss->health--; boss->fwork[8] = 0.0f; - func_800BA808(gMsg_ID_2296, RCID_BOSS_CORNERIA2); + Radio_PlayMessage(gMsg_ID_2296, RCID_BOSS_CORNERIA2); } else { Math_SmoothStepToF(&boss->obj.rot.y, 0.0f, 0.1f, boss->fwork[8], 0.00001f); sp78.x = 0.0f; @@ -1961,7 +1961,7 @@ void func_i1_8018C19C(Boss* boss) { boss->vel.y = sp6C.y; boss->vel.z = sp6C.z - D_80177D08; if (boss->timer_056 == 60) { - func_800BA808(gMsg_ID_2295, RCID_FOX); + Radio_PlayMessage(gMsg_ID_2295, RCID_FOX); } } } else { @@ -2031,7 +2031,7 @@ void func_i1_8018C19C(Boss* boss) { } if (gBossFrameCount == 430) { - func_800BA808(gMsg_ID_2225, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2225, RCID_SLIPPY); } if (gBossFrameCount == 586) { gShowBossHealth = true; @@ -2063,9 +2063,9 @@ void func_i1_8018DDAC(Boss* boss) { if (boss->health <= 0) { gBosses[0].swork[8]--; if (gBosses[0].swork[8] != 0) { - func_800BA808(gMsg_ID_15130, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_15130, RCID_FALCO); } else { - func_800BA808(gMsg_ID_7085, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_7085, RCID_FALCO); } boss->info.unk_10 = 300.0f; gBosses[0].fwork[14] = 25.0f; @@ -2157,9 +2157,9 @@ void func_i1_8018E290(Boss* boss) { if (boss->health <= 0) { gBosses[0].swork[8]--; if (gBosses[0].swork[8] != 0) { - func_800BA808(gMsg_ID_15130, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_15130, RCID_FALCO); } else { - func_800BA808(gMsg_ID_7085, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_7085, RCID_FALCO); } boss->info.unk_10 = 300.0f; gBosses[0].fwork[15] = 0.0f; @@ -2250,9 +2250,9 @@ void func_i1_8018E76C(Boss* boss) { if (boss->health <= 0) { gBosses[0].swork[8]--; if (gBosses[0].swork[8] != 0) { - func_800BA808(gMsg_ID_15130, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_15130, RCID_FALCO); } else { - func_800BA808(gMsg_ID_7085, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_7085, RCID_FALCO); } boss->info.unk_10 = 300.0f; gBosses[0].fwork[15] = 0.0f; @@ -2696,7 +2696,7 @@ void func_i1_8018F880(Player* player) { } if (player->timer_1F8 == 270) { D_80178300 = 0; - func_800BA808(gMsg_ID_2005, RCID_FOX); + Radio_PlayMessage(gMsg_ID_2005, RCID_FOX); } if (player->timer_1F8 == 180) { Audio_PlaySfx(0x09000007, player->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); @@ -2728,7 +2728,7 @@ void func_i1_8018F880(Player* player) { D_801779B8 = player->pos.y + 10.0f; D_801779C0 = player->unk_138 + 10.0f; if (player->timer_1F8 == 20) { - func_800BA808(gMsg_ID_2010, RCID_FOX); + Radio_PlayMessage(gMsg_ID_2010, RCID_FOX); } if (player->timer_1F8 == 0) { player->unk_1D0 = 3; @@ -2772,7 +2772,7 @@ void func_i1_8018F880(Player* player) { player->timer_1F8 = 5; } if (player->timer_1F8 == 80) { - func_800BA808(gMsg_ID_2020, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_2020, RCID_FALCO); } if (player->timer_1F8 < 100) { Math_SmoothStepToF(&actor0->fwork[19], 50.0f, 0.1f, 3.0f, 0.01f); @@ -2815,7 +2815,7 @@ void func_i1_8018F880(Player* player) { actor0->obj.pos.z = player->unk_138 + 240.0f; } if (player->timer_1F8 == 80) { - func_800BA808(gMsg_ID_2030, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_2030, RCID_PEPPY); } actor2->fwork[20] = 0.0f; if ((D_801782F8 != 0) && (gGameFrameCount & 2)) { @@ -2838,7 +2838,7 @@ void func_i1_8018F880(Player* player) { D_80177A48[3] = 0.0f; } if (player->timer_1F8 == 80) { - func_800BA808(gMsg_ID_2040, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2040, RCID_SLIPPY); player->pos.x = 0.1f; } if (player->timer_1F8 < 100) { @@ -2865,7 +2865,7 @@ void func_i1_8018F880(Player* player) { Math_SmoothStepToF(&D_80177A48[8], 10.0f, 0.1f, 0.7f, 0.0f); } if (player->timer_1F8 == 200) { - func_800BA808(gMsg_ID_2050, RCID_FOX); + Radio_PlayMessage(gMsg_ID_2050, RCID_FOX); } player->wings.unk_30 = 0.0f; if ((D_801782F8 != 0) && (gGameFrameCount & 2)) { @@ -3204,27 +3204,27 @@ void func_i1_80191160(Player* player) { } break; case 410: - func_800BA808(gMsg_ID_2335, RCID_FOX); + Radio_PlayMessage(gMsg_ID_2335, RCID_FOX); break; case 550: if ((gTeamShields[2] == -1) || (gTeamShields[2] == 0)) { - func_800BA808(gMsg_ID_20333, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20333, RCID_ROB64); } else { - func_800BA808(gMsg_ID_2300, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2300, RCID_SLIPPY); } break; case 682: if ((gTeamShields[3] == -1) || (gTeamShields[3] == 0)) { - func_800BA808(gMsg_ID_20332, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20332, RCID_ROB64); } else { - func_800BA808(gMsg_ID_2310, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_2310, RCID_PEPPY); } break; case 816: if ((gTeamShields[1] == -1) || (gTeamShields[1] == 0)) { - func_800BA808(gMsg_ID_20331, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20331, RCID_ROB64); } else { - func_800BA808(gMsg_ID_2320, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_2320, RCID_FALCO); } break; case 1150: diff --git a/src/overlays/ovl_i1/fox_tr.c b/src/overlays/ovl_i1/fox_tr.c index f62c7234..f4922c2b 100644 --- a/src/overlays/ovl_i1/fox_tr.c +++ b/src/overlays/ovl_i1/fox_tr.c @@ -36,7 +36,7 @@ void func_i1_80198968(Item* item) { Audio_PlaySfx(0x49008025, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); D_80177E80++; if ((item->obj.rot.x != 0.0f) && (D_80177E80 >= 100)) { - func_800BA808(gMsg_ID_20330, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20330, RCID_ROB64); } } break; diff --git a/src/overlays/ovl_i1/fox_tr360.c b/src/overlays/ovl_i1/fox_tr360.c index 7e09f6ec..ac2f3523 100644 --- a/src/overlays/ovl_i1/fox_tr360.c +++ b/src/overlays/ovl_i1/fox_tr360.c @@ -223,7 +223,7 @@ void func_i1_8019949C(void) { D_80177C8C = 1; } if (D_i1_8019AE50[D_80177C8C].unk != 0) { - func_800BA808(D_i1_8019AE50[D_80177C8C].msg, RCID_TRAINING); + Radio_PlayMessage(D_i1_8019AE50[D_80177C8C].msg, RCID_TRAINING); D_80177C78 = D_i1_8019AE50[D_80177C8C].unk; } else { D_80161690 = 80; @@ -237,6 +237,6 @@ void func_i1_8019949C(void) { D_800CFF90 = 0; D_80161690 = 0; // This is ROB 64. Keep up the good work. - func_800BA808(gMsg_ID_20329, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20329, RCID_ROB64); } } diff --git a/src/overlays/ovl_i2/fox_me.c b/src/overlays/ovl_i2/fox_me.c index b2e29218..ad4630e5 100644 --- a/src/overlays/ovl_i2/fox_me.c +++ b/src/overlays/ovl_i2/fox_me.c @@ -411,7 +411,7 @@ void func_i2_80188344(Boss* boss) { Audio_KillSfx(boss->sfxPos); if (boss->swork[1] == 0) { boss->swork[1]++; - func_800BA808(gMsg_ID_3315, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_3315, RCID_PEPPY); } boss->swork[0] = 0; @@ -533,7 +533,7 @@ void func_i2_80188A40(Boss* boss) { gBosses[i].obj.pos.z = boss->obj.pos.z; Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id); - func_800BA808(gMsg_ID_3300, RCID_BOSS_METEO); + Radio_PlayMessage(gMsg_ID_3300, RCID_BOSS_METEO); Audio_PlaySfx(0x3102505AU, boss->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } @@ -878,13 +878,13 @@ void func_i2_8018978C(Boss* boss) { func_i2_801892F0(boss, boss->dmgPart); boss->swork[20] += 1; if (boss->swork[20] == 2) { - func_800BA808(gMsg_ID_17160, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_17160, RCID_PEPPY); } if (boss->swork[20] == 3) { - func_800BA808(gMsg_ID_3371, RCID_BOSS_METEO); + Radio_PlayMessage(gMsg_ID_3371, RCID_BOSS_METEO); } if (boss->swork[20] == 4) { - func_800BA808(gMsg_ID_3320, RCID_BOSS_METEO); + Radio_PlayMessage(gMsg_ID_3320, RCID_BOSS_METEO); } } } else { @@ -1130,7 +1130,7 @@ void func_i2_8018978C(Boss* boss) { boss->state = 3; boss->timer_050 = 50; boss->timer_058 = 100; - func_800BA808(gMsg_ID_3310, RCID_BOSS_METEO); + Radio_PlayMessage(gMsg_ID_3310, RCID_BOSS_METEO); } break; @@ -1216,7 +1216,7 @@ void func_i2_8018978C(Boss* boss) { } boss->obj.rot.z += ((0.0f - boss->obj.rot.z) * boss->fwork[10]); if (boss->timer_050 == 100) { - func_800BA808(gMsg_ID_3321, RCID_BOSS_METEO); + Radio_PlayMessage(gMsg_ID_3321, RCID_BOSS_METEO); } if (boss->timer_050 == 0) { boss->state = 5; @@ -1305,7 +1305,7 @@ void func_i2_8018978C(Boss* boss) { boss->fwork[22] = 0.0f; boss->fwork[23] = 0.0f; gCsFrameCount = 0; - func_800BA808(gMsg_ID_3322, RCID_BOSS_METEO); + Radio_PlayMessage(gMsg_ID_3322, RCID_BOSS_METEO); func_800182F4(0x100100FF); func_800182F4(0x110100FF); } else { @@ -1319,19 +1319,19 @@ void func_i2_8018978C(Boss* boss) { case 8: gCsFrameCount++; if (gCsFrameCount == 130) { - func_800BA808(gMsg_ID_3330, RCID_BOSS_METEO); + Radio_PlayMessage(gMsg_ID_3330, RCID_BOSS_METEO); } if (gCsFrameCount == 300) { PRINTF("msg_03340\n"); - func_800BA808(gMsg_ID_3340, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_3340, RCID_FALCO); } if (gCsFrameCount == 400) { func_8001D444(0U, 0x8041U, 0U, 0xFFU); if (gTeamShields[1] > 0) { - func_800BA808(gMsg_ID_3345, RCID_BOSS_METEO); + Radio_PlayMessage(gMsg_ID_3345, RCID_BOSS_METEO); } else { - func_800BA808(gMsg_ID_3350, RCID_BOSS_METEO); + Radio_PlayMessage(gMsg_ID_3350, RCID_BOSS_METEO); } } @@ -1413,10 +1413,10 @@ void func_i2_8018978C(Boss* boss) { case 20: if (boss->timer_052 == 230) { - func_800BA808(gMsg_ID_3370, RCID_BOSS_METEO); + Radio_PlayMessage(gMsg_ID_3370, RCID_BOSS_METEO); } if (boss->timer_052 == 90) { - func_800BA808(gMsg_ID_3360, RCID_FOX); + Radio_PlayMessage(gMsg_ID_3360, RCID_FOX); } if (!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) { @@ -1481,7 +1481,7 @@ void func_i2_8018978C(Boss* boss) { } if (gBossFrameCount == 250) { - func_800BA808(gMsg_ID_2225, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2225, RCID_SLIPPY); } if (gBossFrameCount == 406) { gShowBossHealth = true; @@ -2090,18 +2090,18 @@ void func_i2_8018CD8C(Player* player) { switch (gCsFrameCount) { case 500: if ((gTeamShields[2] > 0) && (gTeamShields[3] > 0)) { - func_800BA808(gMsg_ID_3005, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_3005, RCID_SLIPPY); } break; case 600: if ((gTeamShields[2] > 0) && (gTeamShields[3] > 0)) { - func_800BA808(gMsg_ID_3010, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_3010, RCID_PEPPY); } break; case 700: - func_800BA808(gMsg_ID_3015, RCID_FOX); + Radio_PlayMessage(gMsg_ID_3015, RCID_FOX); break; } @@ -2365,16 +2365,16 @@ void func_i2_8018E084(Player* player) { break; case 450: - func_800BA808(gMsg_ID_20010, RCID_FOX); + Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); break; case 538: switch (gTeamShields[2]) { case -1: - func_800BA808(gMsg_ID_20333, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20333, RCID_ROB64); break; case 0: - func_800BA808(gMsg_ID_20345, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20345, RCID_ROB64); break; default: func_80048AC0(2); @@ -2385,10 +2385,10 @@ void func_i2_8018E084(Player* player) { case 685: switch (gTeamShields[3]) { case -1: - func_800BA808(gMsg_ID_20332, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20332, RCID_ROB64); break; case 0: - func_800BA808(gMsg_ID_20344, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); break; default: func_80048AC0(3); @@ -2399,10 +2399,10 @@ void func_i2_8018E084(Player* player) { case 831: switch (gTeamShields[1]) { case -1: - func_800BA808(gMsg_ID_20331, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20331, RCID_ROB64); break; case 0: - func_800BA808(gMsg_ID_20340, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20340, RCID_ROB64); break; default: func_80048AC0(1); diff --git a/src/overlays/ovl_i2/fox_sx.c b/src/overlays/ovl_i2/fox_sx.c index bfbc3cc7..aee1321a 100644 --- a/src/overlays/ovl_i2/fox_sx.c +++ b/src/overlays/ovl_i2/fox_sx.c @@ -53,7 +53,7 @@ void func_i2_8018F030(void) { actor->iwork[11] = 1; actor->unk_0E4 = 2; Object_SetInfo(&actor->info, actor->obj.id); - func_800BA808(gMsg_ID_5475, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_5475, RCID_SLIPPY); break; } } @@ -119,7 +119,7 @@ void func_i2_8018F330(Actor* actor) { actor->vel.x = 10.0f; actor->vel.y = -10.0f; actor->vel.z = 30.0f; - func_800BA808(gMsg_ID_4111, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_4111, RCID_SLIPPY); func_8007A6F0(&actor->obj.pos, 0x2903A008); gBosses[0].swork[6] = 0; gTeamShields[2] = -2; @@ -135,7 +135,7 @@ void func_i2_8018F330(Actor* actor) { case 2: if (actor->timer_0BC == 100) { - func_800BA808(gMsg_ID_20294, RCID_FOX); + Radio_PlayMessage(gMsg_ID_20294, RCID_FOX); } actor->obj.rot.x += 5.5f; @@ -354,15 +354,15 @@ void func_i2_80190078(Boss* boss) { switch (gBossFrameCount) { case 175: - func_800BA808(gMsg_ID_5473, RCID_FOX); + Radio_PlayMessage(gMsg_ID_5473, RCID_FOX); break; case 300: - func_800BA808(gMsg_ID_5492, RCID_BOSS_SECTORX); + Radio_PlayMessage(gMsg_ID_5492, RCID_BOSS_SECTORX); break; case 400: - func_800BA808(gMsg_ID_2225, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2225, RCID_SLIPPY); break; case 556: @@ -370,7 +370,7 @@ void func_i2_80190078(Boss* boss) { break; case 540: - func_800BA808(gMsg_ID_5493, RCID_BOSS_SECTORX); + Radio_PlayMessage(gMsg_ID_5493, RCID_BOSS_SECTORX); break; } @@ -473,7 +473,7 @@ void func_i2_80190078(Boss* boss) { boss->fwork[0] = 0.0f; boss->unk_04C = 0; - func_800BA808(gMsg_ID_5499, RCID_BOSS_SECTORX); + Radio_PlayMessage(gMsg_ID_5499, RCID_BOSS_SECTORX); func_8007BFFC(boss->obj.pos.x, boss->obj.pos.y + 300.0f, boss->obj.pos.z, 0.0f, 0.0f, 0.0f, 10.0f, 50); @@ -609,7 +609,7 @@ void func_i2_80190078(Boss* boss) { boss->fwork[0] = 0.0f; boss->swork[1] = 1; boss->swork[0] = 1; - func_800BA808(gMsg_ID_5494, RCID_BOSS_SECTORX); + Radio_PlayMessage(gMsg_ID_5494, RCID_BOSS_SECTORX); } break; @@ -681,7 +681,7 @@ void func_i2_80190078(Boss* boss) { if (boss->swork[3] <= 250) { boss->state = 4; boss->timer_050 = 100; - func_800BA808(gMsg_ID_5495, RCID_BOSS_SECTORX); + Radio_PlayMessage(gMsg_ID_5495, RCID_BOSS_SECTORX); boss->fwork[44] = 0.0f; boss->fwork[43] = 0.0f; boss->fwork[42] = 0.0f; @@ -713,7 +713,7 @@ void func_i2_80190078(Boss* boss) { if (boss->timer_050 == 0) { boss->state = 5; boss->timer_050 = 100; - func_800BA808(gMsg_ID_5496, RCID_FOX); + Radio_PlayMessage(gMsg_ID_5496, RCID_FOX); } break; @@ -824,7 +824,7 @@ void func_i2_80190078(Boss* boss) { case 7: if (boss->timer_052 == 1) { - func_800BA808(gMsg_ID_15252, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_15252, RCID_SLIPPY); } boss->fwork[41] = 20.0; boss->fwork[2] = -400.0f; @@ -859,14 +859,14 @@ void func_i2_80190078(Boss* boss) { boss->unk_04C = 0; boss->health = 300; func_8001D9E0(0, D_800C9E90[gCurrentLevel], 1121, 25, 255); - func_800BA808(gMsg_ID_19205, RCID_FOX); + Radio_PlayMessage(gMsg_ID_19205, RCID_FOX); boss->timer_052 = 100; } break; case 8: if (boss->timer_052 == 1) { - func_800BA808(gMsg_ID_5497, RCID_BOSS_SECTORX); + Radio_PlayMessage(gMsg_ID_5497, RCID_BOSS_SECTORX); } boss->fwork[41] = 0.0f; boss->fwork[2] = gPlayer[0].pos.y; @@ -916,13 +916,13 @@ void func_i2_80190078(Boss* boss) { Audio_PlaySfx(0x2902401C, boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } } else if (boss->timer_050 == 1) { - func_800BA808(gMsg_ID_20267, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20267, RCID_PEPPY); } break; case 9: if (boss->timer_050 == 1) { - func_800BA808(gMsg_ID_5492, RCID_BOSS_SECTORX); + Radio_PlayMessage(gMsg_ID_5492, RCID_BOSS_SECTORX); } boss->fwork[1] = -2000.0f; boss->fwork[2] = gPlayer[0].pos.y; @@ -940,7 +940,7 @@ void func_i2_80190078(Boss* boss) { boss->fwork[0] = 0.0f; boss->fwork[42] = 0.0f; if (boss->swork[10] == 0) { - func_800BA808(gMsg_ID_5474, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_5474, RCID_FALCO); } boss->swork[10] = 1; } @@ -979,7 +979,7 @@ void func_i2_80190078(Boss* boss) { boss->timer_050 = 400; boss->fwork[42] = boss->fwork[43] = boss->fwork[44] = boss->unk_078.y = 0.0f; boss->swork[9] = Rand_ZeroOne() * 1.9f; - func_800BA808(gMsg_ID_5498, RCID_BOSS_SECTORX); + Radio_PlayMessage(gMsg_ID_5498, RCID_BOSS_SECTORX); } } else { boss->state = 85; @@ -1846,17 +1846,17 @@ void func_i2_80194728(Player* player) { if (gTeamShields[2] != -2) { switch (gCsFrameCount) { case 140: - func_800BA808(gMsg_ID_20010, RCID_FOX); + Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); break; case 228: switch (gTeamShields[2]) { case -1: - func_800BA808(gMsg_ID_20339, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64); break; case 0: - func_800BA808(gMsg_ID_20345, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20345, RCID_ROB64); break; default: @@ -1868,11 +1868,11 @@ void func_i2_80194728(Player* player) { case 375: switch (gTeamShields[3]) { case -1: - func_800BA808(gMsg_ID_20338, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20338, RCID_ROB64); break; case 0: - func_800BA808(gMsg_ID_20344, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); break; default: @@ -1885,11 +1885,11 @@ void func_i2_80194728(Player* player) { func_80048AC0(1); switch (gTeamShields[1]) { case -1: - func_800BA808(gMsg_ID_20337, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); break; case 0: - func_800BA808(gMsg_ID_20343, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20343, RCID_ROB64); break; default: @@ -1901,25 +1901,25 @@ void func_i2_80194728(Player* player) { } else { switch (gCsFrameCount) { case 140: - func_800BA808(gMsg_ID_5500, RCID_FOX); + Radio_PlayMessage(gMsg_ID_5500, RCID_FOX); break; case 270: - func_800BA808(gMsg_ID_5503, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_5503, RCID_ROB64); break; case 423: switch (gTeamShields[3]) { case -1: - func_800BA808(gMsg_ID_20338, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20338, RCID_ROB64); break; case 0: - func_800BA808(gMsg_ID_20344, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); break; default: - func_800BA808(gMsg_ID_5501, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_5501, RCID_PEPPY); break; } break; @@ -1928,15 +1928,15 @@ void func_i2_80194728(Player* player) { func_80048AC0(1); switch (gTeamShields[1]) { case -1: - func_800BA808(gMsg_ID_20337, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); break; case 0: - func_800BA808(gMsg_ID_20343, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20343, RCID_ROB64); break; default: - func_800BA808(gMsg_ID_5502, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_5502, RCID_FALCO); break; } break; diff --git a/src/overlays/ovl_i3/fox_a6.c b/src/overlays/ovl_i3/fox_a6.c index 3130d7bd..bebc1a4e 100644 --- a/src/overlays/ovl_i3/fox_a6.c +++ b/src/overlays/ovl_i3/fox_a6.c @@ -577,7 +577,7 @@ void func_i3_80187944(Boss* bossA6) { if (bossA6->health <= 0) { bossA6->health = 0; func_80042EC0(bossA6); - func_800BA808(gMsg_ID_15252, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_15252, RCID_SLIPPY); D_8017796C = -1; D_8015F984 = (D_80177D20 * 0.00004f) + 0.5f; Audio_PlaySfx(0x2940D09A, bossA6->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); @@ -914,7 +914,7 @@ void func_i3_80187944(Boss* bossA6) { } } else { if ((bossA6->swork[A6_SWK_36] == 3) && (D_i3_801C2250[A6_BSS_29] == 0)) { - func_800BA808(gMsg_ID_7084, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_7084, RCID_PEPPY); bossA6->swork[A6_SWK_36] = 4; D_i3_801C2250[A6_BSS_29]++; D_i3_801C2250[A6_BSS_29] &= 1; @@ -954,7 +954,7 @@ void func_i3_80187944(Boss* bossA6) { Math_SmoothStepToF(&bossA6->fwork[A6_FWK_29], 255.0f, 1.0f, 10.0f, 0.0001f); if ((bossA6->swork[A6_SWK_36] == 2) && (bossA6->fwork[A6_FWK_0] == 0.0f) && (D_i3_801C2250[A6_BSS_30] == 0)) { - func_800BA808(gMsg_ID_7083, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_7083, RCID_PEPPY); bossA6->swork[A6_SWK_36] = 3; D_i3_801C2250[A6_BSS_30]++; D_i3_801C2250[A6_BSS_30] &= 1; @@ -1007,11 +1007,11 @@ void func_i3_80187944(Boss* bossA6) { if (D_i3_801C2250[A6_BSS_33] == 15) { if (D_i3_801C2250[A6_BSS_32] == 0) { if (gTeamShields[1] > 0) { - func_800BA808(gMsg_ID_20315, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20315, RCID_FALCO); } else if (gTeamShields[2] > 0) { - func_800BA808(gMsg_ID_20316, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_20316, RCID_SLIPPY); } else if (gTeamShields[3] > 0) { - func_800BA808(gMsg_ID_20317, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20317, RCID_PEPPY); } } D_i3_801C2250[A6_BSS_32]++; @@ -1175,7 +1175,7 @@ void func_i3_80187944(Boss* bossA6) { A6_HIT_4(bossA6, 2)->y.offset = bossA6->vwork[A6_VWK_6].y; A6_HIT_4(bossA6, 2)->x.offset = bossA6->vwork[A6_VWK_6].x; if (gBossFrameCount == 600) { - func_800BA808(gMsg_ID_2225, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2225, RCID_SLIPPY); } if (gBossFrameCount == 756) { gShowBossHealth = 1; @@ -1906,9 +1906,9 @@ void func_i3_8018C54C(Boss* bossA6) { } if (bossA6->timer_058 == 1) { if (bossA6->swork[A6_SWK_25] == 2) { - func_800BA808(gMsg_ID_7085, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_7085, RCID_FALCO); } else if (bossA6->swork[A6_SWK_25] == 1) { - func_800BA808(gMsg_ID_7086, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_7086, RCID_SLIPPY); } } if (bossA6->swork[A6_SWK_22] != D_i3_801BF310[j]) { @@ -1935,7 +1935,7 @@ void func_i3_8018C54C(Boss* bossA6) { } else { Math_SmoothStepToF(&bossA6->fwork[A6_FWK_29], 0.0f, 1.0f, 10.0f, 0.0001f); if ((bossA6->timer_054 == 0) && (bossA6->swork[A6_SWK_36] == 4) && (D_i3_801C2250[A6_BSS_31] == 0)) { - func_800BA808(gMsg_ID_7087, 0x1E); + Radio_PlayMessage(gMsg_ID_7087, 0x1E); bossA6->swork[A6_SWK_36] = 5; D_i3_801C2250[A6_BSS_31]++; D_i3_801C2250[A6_BSS_31] &= 1; @@ -2302,7 +2302,7 @@ void func_i3_8018DF74(Player* player) { func_8001D444(0, 0x33, 0, 0xFF); break; case 40: - func_800BA808(gMsg_ID_7005, RCID_CAIMAN_AREA6); + Radio_PlayMessage(gMsg_ID_7005, RCID_CAIMAN_AREA6); break; case 155: sp5C.x = player->pos.x; @@ -2329,7 +2329,7 @@ void func_i3_8018DF74(Player* player) { func_i3_8018D4E0(&gActors[1]); break; case 210: - func_800BA808(gMsg_ID_7006, RCID_CAIMAN_AREA6); + Radio_PlayMessage(gMsg_ID_7006, RCID_CAIMAN_AREA6); break; case 240: gActors[2].state = 3; @@ -2344,7 +2344,7 @@ void func_i3_8018DF74(Player* player) { gActors[8].state = 3; break; case 360: - func_800BA808(gMsg_ID_7011, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_7011, RCID_FALCO); break; case 430: gActors[5].state = 16; @@ -2679,7 +2679,7 @@ void func_i3_8018ED78(Player* player) { D_80177830 = 0; break; case 940: /* switch 1 */ - func_800BA808(gMsg_ID_7093, RCID_FOX); + Radio_PlayMessage(gMsg_ID_7093, RCID_FOX); break; case 1070: /* switch 1 */ gActors[1].fwork[29] = 5.0f; diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c index eaa83fbe..1f8c0577 100644 --- a/src/overlays/ovl_i3/fox_so.c +++ b/src/overlays/ovl_i3/fox_so.c @@ -1056,7 +1056,7 @@ void func_i3_801A10F4(Player* player) { D_8017835C = 8; Math_SmoothStepToF(D_80177A48, 0.02f, 1.0f, 0.0000003f, 0.0f); if (gCsFrameCount == 525) { - func_800BA808(gMsg_ID_10010, RCID_FOX); + Radio_PlayMessage(gMsg_ID_10010, RCID_FOX); } if (gCsFrameCount == 550) { Object_Kill(&gActors[5].obj, gActors[5].sfxPos); @@ -1270,7 +1270,7 @@ void func_i3_801A1F80(Boss* bossSO) { bossSO->fwork[SO_FWK_0] = 0.01f; } if ((gBossFrameCount == 100) && (gTeamShields[3] != 0)) { - func_800BA808(gMsg_ID_10300, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_10300, RCID_PEPPY); } } @@ -1574,11 +1574,11 @@ void func_i3_801A3128(Boss* bossSO) { if (D_i3_801C2740[2] & 1) { if (D_i3_801C2740[2] & 2) { if (gTeamShields[3] > 0) { - func_800BA808(gMsg_ID_20317, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20317, RCID_PEPPY); } } else { if (gTeamShields[1] > 0) { - func_800BA808(gMsg_ID_20271, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20271, RCID_FALCO); } } } @@ -1598,7 +1598,7 @@ void func_i3_801A3128(Boss* bossSO) { bossSO->fwork[SO_FWK_0] = 0.01f; if ((Rand_ZeroOne() >= 0.4f) && (gTeamShields[3] > 0) && (bossSO->swork[SO_SWK_2] != 0) && (bossSO->swork[SO_SWK_3] != 0)) { - func_800BA808(gMsg_ID_10320, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_10320, RCID_PEPPY); } } if (bossSO->swork[SO_SWK_11] == 50) { @@ -1830,7 +1830,7 @@ void func_i3_801A3C4C(Boss* bossSO) { } bossSO->fwork[SO_FWK_31] = 0.0f; bossSO->fwork[SO_FWK_3] = 2400.0f; - func_800BA808(gMsg_ID_15252, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_15252, RCID_SLIPPY); } } @@ -1989,7 +1989,7 @@ void func_i3_801A48B8(Boss* bossSO) { bossSO->unk_04C = 0; bossSO->fwork[SO_FWK_0] = 0.01f; if (((bossSO->swork[SO_SWK_2] > 0) || (bossSO->swork[SO_SWK_3] > 0)) && (gTeamShields[2] > 0)) { - func_800BA808(gMsg_ID_7086, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_7086, RCID_SLIPPY); } } @@ -2306,13 +2306,13 @@ void func_i3_801A5B3C(Boss* bossSO) { bossSO->swork[SO_SWK_10]--; } if ((gBossFrameCount == 200) && (gTeamShields[1] != 0)) { - func_800BA808(gMsg_ID_10310, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_10310, RCID_FALCO); } if ((gBossFrameCount == 300) && (gTeamShields[2] != 0)) { - func_800BA808(gMsg_ID_4092, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_4092, RCID_SLIPPY); } if ((gBossFrameCount == 450) && (gTeamShields[3] != 0)) { - func_800BA808(gMsg_ID_10320, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_10320, RCID_PEPPY); } if (bossSO->health != 0) { Math_SmoothStepToF(&bossSO->obj.pos.z, gPlayer[0].unk_138 - bossSO->fwork[SO_FWK_3], 1.0f, 60.0f, 1.0f); @@ -3039,15 +3039,15 @@ void func_i3_801A7930(Player* player) { D_80177840 = 100; break; case 640: - func_800BA808(gMsg_ID_20010, RCID_FOX); + Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); break; case 728: switch (gTeamShields[2]) { case 0: - func_800BA808(gMsg_ID_20345, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20345, RCID_ROB64); break; case -1: - func_800BA808(gMsg_ID_20339, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64); break; default: func_80048AC0(2); @@ -3057,10 +3057,10 @@ void func_i3_801A7930(Player* player) { case 875: switch (gTeamShields[3]) { case 0: - func_800BA808(gMsg_ID_20344, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); break; case -1: - func_800BA808(gMsg_ID_20338, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20338, RCID_ROB64); break; default: func_80048AC0(3); @@ -3070,10 +3070,10 @@ void func_i3_801A7930(Player* player) { case 1021: switch (gTeamShields[1]) { case 0: - func_800BA808(gMsg_ID_20343, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20343, RCID_ROB64); break; case -1: - func_800BA808(gMsg_ID_20337, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); break; default: func_80048AC0(1); diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c index 14a306ad..01d8cc22 100644 --- a/src/overlays/ovl_i3/fox_zo.c +++ b/src/overlays/ovl_i3/fox_zo.c @@ -2099,7 +2099,7 @@ void func_i3_80194A84(Boss* bossZO) { } if (((bossZO->state == 2) || (bossZO->state == 3) || (bossZO->state == 8)) && (gPlayer[0].timer_220 == 2)) { if (bossZO->swork[ZO_SWK_8] == 0) { - func_800BA808(gMsg_ID_6068, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6068, RCID_BOSS_ZONESS); } bossZO->swork[ZO_SWK_8]++; if (bossZO->swork[ZO_SWK_8] >= 5) { @@ -2166,7 +2166,7 @@ void func_i3_80194A84(Boss* bossZO) { Math_SmoothStepToF(&bossZO->fwork[ZO_FWK_4], 1.0f, 0.1f, 10.0f, 0.0f); if (bossZO->timer_050 == 0) { if (bossZO->swork[ZO_SWK_3] == 0) { - func_800BA808(gMsg_ID_6069, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6069, RCID_BOSS_ZONESS); bossZO->swork[ZO_SWK_3]++; } Math_SmoothStepToF(&sZoFwork[ZO_BSF_1], sZoFwork[ZO_BSF_74], 0.1f, 2.0f, 0.00001f); @@ -2201,15 +2201,15 @@ void func_i3_80194A84(Boss* bossZO) { if ((sZoSwork[ZO_BSS_7] == 1) && (sZoSwork[ZO_BSS_19] == 0)) { sZoFwork[ZO_BSF_74] = 230.0f; sZoFwork[ZO_BSF_75] = -230.0f; - func_800BA808(gMsg_ID_6071, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6071, RCID_BOSS_ZONESS); } if ((sZoSwork[ZO_BSS_7] == 1) && (sZoSwork[ZO_BSS_25] != 0) && (sZoSwork[ZO_BSS_29] == 0) && (sZoSwork[ZO_BSS_19] != 0)) { - func_800BA808(gMsg_ID_6081, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_6081, RCID_PEPPY); sZoSwork[ZO_BSS_34] = 333; } if ((sZoSwork[ZO_BSS_7] == 1) && (sZoSwork[ZO_BSS_25] == 0) && (sZoSwork[ZO_BSS_19] != 0)) { - func_800BA808(gMsg_ID_6072, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6072, RCID_BOSS_ZONESS); sZoSwork[ZO_BSS_34] = 333; sZoSwork[ZO_BSS_25]++; } @@ -2279,7 +2279,7 @@ void func_i3_80194A84(Boss* bossZO) { func_i3_80198ECC(bossZO); } if ((sZoSwork[ZO_BSS_32] == 0) && (sZoSwork[ZO_BSS_34] == 1) && (sZoSwork[ZO_BSS_24] == 0)) { - func_800BA808(gMsg_ID_6080, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_6080, RCID_PEPPY); sZoSwork[ZO_BSS_34] = 500; } if (sZoSwork[ZO_BSS_4] == 0) { @@ -2291,7 +2291,7 @@ void func_i3_80194A84(Boss* bossZO) { if (bossZO->swork[ZO_SWK_7] == 0) { bossZO->swork[ZO_SWK_7]++; bossZO->swork[ZO_SWK_7] &= 1; - func_800BA808(gMsg_ID_6078, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6078, RCID_BOSS_ZONESS); } if (bossZO->timer_056 == 0) { bossZO->timer_056 = 100; @@ -2513,7 +2513,7 @@ void func_i3_80194A84(Boss* bossZO) { func_8007D0E0(((Rand_ZeroOne() - 0.5f) * 200.0f) + sZoFwork[ZO_BSF_55_X], ((Rand_ZeroOne() - 0.2f) * 800.0f) + sZoFwork[ZO_BSF_55_Y], sZoFwork[ZO_BSF_55_Z], 10.0f); if (bossZO->timer_050 == 30) { - func_800BA808(gMsg_ID_6079, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6079, RCID_BOSS_ZONESS); } if (bossZO->timer_050 == 0) { gEffects[98].obj.status = gEffects[99].obj.status = OBJ_FREE; @@ -2573,7 +2573,7 @@ void func_i3_80194A84(Boss* bossZO) { } } else if ((bossZO->swork[ZO_SWK_5] == 0) && (bossZO->swork[ZO_SWK_6] < 2)) { if (sZoSwork[ZO_BSS_33] == 0) { - func_800BA808(gMsg_ID_6077, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6077, RCID_BOSS_ZONESS); sZoSwork[ZO_BSS_27] = 3; } sZoSwork[ZO_BSS_33]++; @@ -2586,12 +2586,12 @@ void func_i3_80194A84(Boss* bossZO) { } } if ((sZoSwork[ZO_BSS_27] == 0) && (sZoSwork[ZO_BSS_18] == 400) && (sZoSwork[ZO_BSS_8] != 0)) { - func_800BA808(gMsg_ID_6074, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6074, RCID_BOSS_ZONESS); sZoSwork[ZO_BSS_27] = 1; bossZO->swork[ZO_SWK_6] = 30; } if ((sZoSwork[ZO_BSS_26] == 0) && (sZoSwork[ZO_BSS_18] == 200) && (sZoSwork[ZO_BSS_27] == 3)) { - func_800BA808(gMsg_ID_6075, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6075, RCID_BOSS_ZONESS); sZoSwork[ZO_BSS_26]++; bossZO->timer_050 = 100; } @@ -2603,7 +2603,7 @@ void func_i3_80194A84(Boss* bossZO) { } } else { if (sZoSwork[ZO_BSS_28] == 0) { - func_800BA808(gMsg_ID_6073, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6073, RCID_BOSS_ZONESS); sZoSwork[ZO_BSS_28]++; } sZoFwork[ZO_BSF_25] = 0.0f; @@ -2885,7 +2885,7 @@ void func_i3_80194A84(Boss* bossZO) { if (sZoSwork[ZO_BSS_13] < 2) { bossZO->swork[ZO_SWK_14] = 30; sZoSwork[ZO_BSS_13] = 1; - func_800BA808(gMsg_ID_6090, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6090, RCID_BOSS_ZONESS); spD8.x = sZoFwork[ZO_BSF_52_X]; spD8.y = sZoFwork[ZO_BSF_52_Y]; spD8.z = sZoFwork[ZO_BSF_52_Z]; @@ -3055,7 +3055,7 @@ void func_i3_80194A84(Boss* bossZO) { } } if (gBossFrameCount == 530) { - func_800BA808(gMsg_ID_2225, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2225, RCID_SLIPPY); } if (gBossFrameCount == 686) { gShowBossHealth = 1; @@ -3264,11 +3264,11 @@ void func_i3_80198F3C(Boss* bossZO, s32 arg1, s32 arg2) { void func_i3_8019907C(Boss* bossZO) { if ((sZoSwork[ZO_BSS_9] == 0) && (sZoSwork[ZO_BSS_10] == 0)) { if ((sZoSwork[ZO_BSS_31] == 0) && (sZoSwork[ZO_BSS_30] != 0)) { - func_800BA808(gMsg_ID_6082, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_6082, RCID_PEPPY); sZoSwork[ZO_BSS_34] = 333; } if (sZoSwork[ZO_BSS_30] == 0) { - func_800BA808(gMsg_ID_6076, RCID_BOSS_ZONESS); + Radio_PlayMessage(gMsg_ID_6076, RCID_BOSS_ZONESS); sZoSwork[ZO_BSS_34] = 333; sZoSwork[ZO_BSS_30]++; } @@ -4746,15 +4746,15 @@ void func_i3_8019D76C(Player* player) { D_80177840 = 100; break; case 380: - func_800BA808(gMsg_ID_20010, RCID_FOX); + Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); break; case 468: switch (gTeamShields[2]) { case 0: - func_800BA808(gMsg_ID_20345, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20345, RCID_ROB64); break; case -1: - func_800BA808(gMsg_ID_20339, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64); break; default: func_80048AC0(2); @@ -4764,16 +4764,16 @@ void func_i3_8019D76C(Player* player) { case 603: switch (gTeamShields[3]) { case 0: - func_800BA808(gMsg_ID_20344, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); break; case -1: - func_800BA808(gMsg_ID_20338, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20338, RCID_ROB64); break; default: if (D_80161684 == 0) { func_80048AC0(3); } else { - func_800BA808(gMsg_ID_6100, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_6100, RCID_PEPPY); } break; } @@ -4781,13 +4781,13 @@ void func_i3_8019D76C(Player* player) { case 738: switch (gTeamShields[1]) { case 0: - func_800BA808(gMsg_ID_20343, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20343, RCID_ROB64); break; case -1: - func_800BA808(gMsg_ID_20337, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); break; default: - func_800BA808(gMsg_ID_6101, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_6101, RCID_FALCO); break; } break; diff --git a/src/overlays/ovl_i4/fox_sz.c b/src/overlays/ovl_i4/fox_sz.c index e22b78dc..b6516cf4 100644 --- a/src/overlays/ovl_i4/fox_sz.c +++ b/src/overlays/ovl_i4/fox_sz.c @@ -1,55 +1,1851 @@ -#include "common.h" +#include "global.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_80199900.s") +s32 D_i4_801A0560; +s32 D_i4_801A0564; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_80199B18.s") +Vec3f D_i4_8019F4C0[] = { 0.0f, 0.0f, 35000.0f, -2000.0f, 0.0f, 35000.0f, 2000.0f, 0.0f, 35000.0f }; +Vec3f D_i4_8019F4E4[] = { -700.0f, -200.0f, 200.0f, 500.0f, 200.0f, -300.0f, + 300.0f, -300.0f, -200.0f, 200.0f, 400.0f, 500.0f }; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_80199BDC.s") +extern Gfx D_6001A10[]; +extern Gfx D_60045E0[]; +extern f32 D_6009230[]; +extern s32 D_80161710; + +void func_8002EE34(void); +void func_8002FC00(Actor*); + +void func_i4_80199900(Actor* actor, s32 arg1) { + s32 i; + + PRINTF("MISS_MOVE_TIME %d\n"); + PRINTF("Enm->time0 %d\n"); + PRINTF("time0 %d\n"); + PRINTF("Demo_Time=%d\n"); + + D_Timer_80161A60 = 8; + + Object_Kill(&actor->obj, actor->sfxPos); + func_8007A6F0(&actor->obj.pos, 0x2903A060); + + for (i = 0; i < 20; i++) { + func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + func_80079618(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + } + + func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 20.0f, 30); + func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f, 5); + + if (arg1 != 0) { + D_i4_801A0560++; + if ((D_i4_801A0560 >= 6) && + ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_5))) { + gCsFrameCount = 0; + gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; + gPlayer[0].unk_1D0 = 1000; + gActors[0].state = 6; + gPlayer[0].timer_1F8 = 30; + Audio_PlaySfx(0x11030010U, gActors[0].sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + Audio_PlaySfx(0x31024059U, gActors[0].sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_800182F4(0x100100FF); + func_800182F4(0x110100FF); + } + + if ((D_i4_801A0560 == 3) && (D_800D3180[8] != 0)) { + D_800C9B4C = D_8015F928 + 110; + } + } +} + +void func_i4_80199B18(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale) { + Effect_Initialize(effect); + effect->obj.status = OBJ_INIT; + effect->obj.id = OBJ_EFFECT_339; + + effect->obj.pos.x = xPos; + effect->obj.pos.y = yPos; + effect->obj.pos.z = zPos; + + effect->vel.x = xVel; + effect->vel.y = yVel; + effect->vel.z = zVel; + + effect->scale2 = scale; + effect->scale1 = 0.5f; + + effect->unk_4C = 2; + effect->obj.rot.z = Rand_ZeroOne() * 360.0f; + + Object_SetInfo(&effect->info, effect->obj.id); + + effect->unk_44 = 255; + effect->unk_46 = 2; +} + +void func_i4_80199BDC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale) { + s32 i; + + for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { + if (gEffects[i].obj.status == 0) { + func_i4_80199B18(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale); + break; + } + } +} + +// https://decomp.me/scratch/FVgio +#ifdef NON_MATCHING +void func_i4_80199C60(Actor* actor) { + s32 pad[2]; + f32 var_fa0; + f32 var_fv1; + + switch (++actor->iwork[9]) { + case 600: + Radio_PlayMessage(gMsg_ID_16080, RCID_ROB64); + break; + + case 1000: + Radio_PlayMessage(gMsg_ID_16085, RCID_ROB64); + break; + + case 1200: + Radio_PlayMessage(gMsg_ID_16090, RCID_ROB64); + break; + } + + var_fv1 = gBosses[0].obj.pos.x - actor->obj.pos.x; + var_fa0 = gBosses[0].obj.pos.z - actor->obj.pos.z; + __sinf((gGameFrameCount * M_DTOR)); + + if (0) { + ; + } + if (var_fv1) { + ; + } + if (var_fa0) { + ; + } + + if (actor->unk_0E4 < 100) { + var_fv1 = __sinf(((f32) ((actor->index * 45) + gGameFrameCount)) * M_DTOR) * 5000.0f; + var_fa0 = __cosf(((f32) ((actor->index * 45) + (gGameFrameCount * 2))) * M_DTOR) * 5000.0f; + } else { + var_fa0 = 0.0f; + var_fv1 = 0.0f; + } + + actor->fwork[4] = (gBosses[0].obj.pos.x + var_fv1) + 400.0f; + actor->fwork[5] = (gBosses[0].obj.pos.y + var_fa0) + 100.0f; + // temp_fv0 = fabsf(actor->fwork[4] - actor->obj.pos.x); + actor->fwork[6] = gBosses[0].obj.pos.z; + actor->fwork[3] = 1.4f; + + if (((fabsf(actor->fwork[4] - actor->obj.pos.x) < 800.0f) && + (fabsf(actor->fwork[5] - actor->obj.pos.y) < 800.0f)) && + (fabsf(actor->fwork[6] - actor->obj.pos.z) < 800.0f)) { + func_i4_80199900(actor, 0); + D_80178480 = 0x19; + gBosses[0].dmgType = DMG_UNK_100; + if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_5)) { + gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; + gPlayer[0].unk_1D0 = 0; + gActors[0].state = -31072; + return; + } + } + + if (((fabsf(actor->fwork[6] - actor->obj.pos.z) < 2000.0f) && + (((gPlayer[0].camEye.z < 0.0f) || (D_801615D0.y < 0.0f)) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_10))) && + (((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_10)) || + (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_5))) { + gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; + gPlayer[0].unk_1D0 = 100; + gActors[0].state = -31072; + } +} +#else #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_80199C60.s") +#endif -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_80199FCC.s") +void func_i4_80199FCC(Actor* actor, s32 arg1) { + Actor_Initialize(actor); + actor->obj.status = OBJ_INIT; + actor->obj.id = OBJ_ACTOR_197; + actor->unk_0E4 = 200; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019A0F8.s") + actor->obj.pos.x = D_i4_8019F4C0[arg1].x; + actor->obj.pos.y = D_i4_8019F4C0[arg1].y; + actor->obj.pos.z = D_i4_8019F4C0[arg1].z; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019A1D0.s") + actor->state = 5; + actor->unk_0F4.y = 180.0f; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019A2F4.s") + Object_SetInfo(&actor->info, actor->obj.id); -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019A3E8.s") + actor->health = 250; + actor->info.drawType = 2; + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6009230); + actor->fwork[1] = 25.0f; + actor->fwork[29] = 2.0f; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019AA9C.s") + Audio_PlaySfx(0x3103A061U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); +} -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019AB8C.s") +void func_i4_8019A0F8(Actor* actor, s32 arg1) { + Actor_Initialize(actor); + actor->obj.status = OBJ_INIT; + actor->obj.id = OBJ_ACTOR_197; + actor->unk_0E4 = arg1 + 13; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019B48C.s") + actor->obj.pos.x = gActors[10].obj.pos.x + D_i4_8019F4E4[arg1].x; + actor->obj.pos.y = gActors[10].obj.pos.y + D_i4_8019F4E4[arg1].y; + actor->obj.pos.z = gActors[10].obj.pos.z + D_i4_8019F4E4[arg1].z; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019B568.s") + actor->state = 5; + actor->unk_0F4.y = 180.0f; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019B630.s") + Object_SetInfo(&actor->info, actor->obj.id); -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019B75C.s") + actor->fwork[1] = gActors[10].fwork[1]; + actor->iwork[11] = 1; +} -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019B888.s") +void func_i4_8019A1D0(void) { + Actor* actor = &gActors[8]; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019BA64.s") + Actor_Initialize(actor); + actor->obj.status = OBJ_ACTIVE; + actor->obj.id = OBJ_ACTOR_197; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019C574.s") + actor->obj.pos.x = 0.0f; + actor->obj.pos.y = 4500.0f; + actor->obj.pos.z = 30000.0f; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019C70C.s") + actor->unk_0E4 = 8; + actor->unk_0E6 = 12; + actor->health = 10000; + actor->unk_0F4.y = 180.0f; + actor->state = 0; + actor->timer_0BC = 250; + actor->unk_0F4.x = -20.0f; + actor->iwork[11] = 1; + actor->obj.rot.z = 90.0f; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019C85C.s") + Object_SetInfo(&actor->info, actor->obj.id); -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019DD20.s") + actor->info.unk_1C = 0.0f; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019E234.s") + Audio_PlaySfx(0x31000011U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); +} -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019E3A8.s") +void func_i4_8019A2F4(Actor* actor) { + if (D_8015F928 == D_800C9B4C) { + func_i4_8019A1D0(); + gCsFrameCount = 0; + actor->timer_0BC = 400; + actor->state = 3; + gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019E454.s") + func_8001D4AC(0x36U, 0x14U, 0xAU, 0xAU); + func_8002EE34(); -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019E98C.s") + gPlayer[0].camEye.x = 250.0f; + gPlayer[0].camEye.y = 2500.0f; + gPlayer[0].camEye.z = 25000.0f; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019EA68.s") + gPlayer[0].camAt.x = gActors[8].obj.pos.x; + gPlayer[0].camAt.y = gActors[8].obj.pos.y; + gPlayer[0].camAt.z = gActors[8].obj.pos.z; + D_i4_801A0564 = 1; + } +} -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/D_i4_801A00C0.s") +void func_i4_8019A3E8(Actor* actor) { + s32 i; + Vec3f sp40; + Vec3f sp34; + Actor* actorPtr; + + if (D_8015F928 >= 0) { + if (gTeamShields[1] > 0) { + if (gActors[1].iwork[2] == 0) { + if (gActors[10].obj.status == 2) { + if (gActors[1].unk_0E6 != 10) { + Radio_PlayMessage(gMsg_ID_16040, RCID_FALCO); + } + gActors[1].unk_0E6 = 10; + } else { + gActors[1].unk_0E6 = 13; + } + } else { + gActors[1].unk_0E6 = -1; + } + } + + if (gTeamShields[3] > 0) { + if (gActors[3].iwork[2] == 0) { + if (gActors[12].obj.status == 2) { + if (gActors[3].unk_0E6 != 12) { + Radio_PlayMessage(gMsg_ID_16046, RCID_PEPPY); + } + gActors[3].unk_0E6 = 12; + } else { + gActors[3].unk_0E6 = 15; + } + } else { + gActors[3].unk_0E6 = -1; + } + } + + if (D_i4_801A0564 != 0) { + if (gActors[11].obj.status == 2) { + if (gActors[8].unk_0E6 != 11) { + Radio_PlayMessage(gMsg_ID_16135, RCID_KATT); + } + gActors[8].unk_0E6 = 11; + } else { + gActors[8].unk_0E6 = -1; + } + } else if (gTeamShields[2] > 0) { + if (gActors[2].iwork[2] == 0) { + if (gActors[11].obj.status == 2) { + if (gActors[2].unk_0E6 != 11) { + Radio_PlayMessage(gMsg_ID_16047, RCID_SLIPPY); + } + gActors[2].unk_0E6 = 11; + } else { + gActors[2].unk_0E6 = 14; + } + } else { + gActors[2].unk_0E6 = -1; + } + } + } + + if (D_8015F928 == 100) { + Radio_PlayMessage(gMsg_ID_16030, RCID_FALCO); + } + + if (((actor->timer_0C0 == 0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) && + ((D_8015F928 < 200) || ((D_8015F928 > 4000) && (D_8015F928 < 4200)))) { + actor->timer_0C0 = 5; + actorPtr = &gActors[13]; + sp40.x = 0.0f; + sp40.y = 0.0f; + sp40.z = -17000.0f; + + for (i = 0; i < 20; i++, actorPtr++) { + if (actorPtr->obj.status == 0) { + Actor_Initialize(actorPtr); + actorPtr->obj.status = OBJ_ACTIVE; + actorPtr->obj.id = OBJ_ACTOR_197; + Matrix_RotateY(gCalcMatrix, (actor->unk_04E * 18.0f) * 0.017453292f, 0); + Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp40, &sp34); + + actorPtr->obj.pos.x = sp34.x; + actorPtr->obj.pos.y = (Rand_ZeroOne() * 1000.0f) + 300.0f; + actorPtr->obj.pos.z = sp34.z; + + actorPtr->unk_0F4.y = actor->unk_04E * 18.0f; + actorPtr->state = 3; + actorPtr->unk_0E4 = i + 13; + actorPtr->unk_0E6 = -1; + + if (D_8015F928 >= 0) { + if (((i + 13) == 23) || ((i + 13) == 24)) { + actorPtr->unk_0E6 = 2; + actorPtr->state = 2; + } + if ((i + 13) == 25) { + actorPtr->unk_0E6 = 0; + actorPtr->state = 2; + } + if (((i + 13) == 26) || ((i + 13) == 27)) { + actorPtr->unk_0E6 = 3; + actorPtr->state = 2; + } + if ((i + 13) == 28) { + actorPtr->unk_0E6 = 1; + actorPtr->state = 2; + } + } + actorPtr->health = 24; + actorPtr->iwork[11] = 1; + actorPtr->unk_044 = 2; + actorPtr->timer_0C2 = 30; + Object_SetInfo(&actorPtr->info, actorPtr->obj.id); + Audio_PlaySfx(0x31000011U, actorPtr->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + actor->unk_04E++; + break; + } + } + } + + switch (D_8015F928) { + case 5850: + Radio_PlayMessage(gMsg_ID_16110, RCID_ROB64); + break; + + case 6000: + func_i4_80199FCC(&gActors[12], 2); + func_i4_80199FCC(&gActors[11], 1); + func_i4_80199FCC(&gActors[10], 0); + D_80161710 = 580; + break; + + case 3850: + Radio_PlayMessage(gMsg_ID_16100, RCID_ROB64); + break; + + case 4000: + func_i4_80199FCC(&gActors[11], 1); + func_i4_80199FCC(&gActors[10], 0); + D_80161710 = 580; + break; + + case 2000: + D_80161710 = 490; + func_i4_80199FCC(&gActors[10], 0); + + gActors[10].fwork[1] = 10.0f; + gActors[10].obj.pos.z = 25000.0f; + + func_i4_8019A0F8(&gActors[13], 0); + func_i4_8019A0F8(&gActors[14], 1); + func_i4_8019A0F8(&gActors[15], 2); + func_i4_8019A0F8(&gActors[16], 3); + + gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; + actor->state = 10; + actor->fwork[10] = 0.0f; + gPlayer[0].unk_034 = 15.0f; + + gPlayer[0].camEye.x = gActors[10].obj.pos.x - 25000.0f; + gPlayer[0].camEye.y = gActors[10].obj.pos.y; + gPlayer[0].camEye.z = gActors[10].obj.pos.z; + + gPlayer[0].camAt.x = gActors[10].obj.pos.x; + gPlayer[0].camAt.y = gActors[10].obj.pos.y; + gPlayer[0].camAt.z = gActors[10].obj.pos.z; + + actor->timer_0BC = 10000; + D_80178340 = D_80178358 = 255; + D_80178348 = D_80178350 = D_80178354 = 0; + func_8001D444(0U, 0x801FU, 0U, 0xFFU); + break; + } + + func_8002FC00(actor); + func_i4_8019A2F4(actor); +} + +bool func_i4_8019AA9C(Player* player) { + if (player->state_1C8 == PLAYERSTATE_1C8_3) { + if ((player->unk_114 > 30.0f) && (player->unk_114 < 150.0f) && (fabsf(player->pos.x - 1270.0f) < 450.0f) && + (fabsf(player->pos.y - 265.0f) < 100.0f) && (fabsf(player->unk_138) < 172.0f)) { + player->state_1C8 = PLAYERSTATE_1C8_10; + player->unk_1D0 = 0; + gActors[0].state = 20; + D_8015F928--; + return true; + } + } + return false; +} + +void func_i4_8019AB8C(Actor* actor) { + s32 i; + Player* player; + Actor* actor8; + s32 pad; + f32 D_i4_8019F514[5] = { -200.0f, -100.0f, -0.0f, 100.0f, 200.0f }; + + player = &gPlayer[0]; + + switch ((s32) actor->state) { + case 0: + D_i4_801A0564 = D_i4_801A0560 = 0; + D_8015F914 = 63.0f; + D_8015F918 = 255.0f; + D_8015F91C = 158.0f; + D_80161A44 = 30000.0f; + D_8015F928 = 0; + actor->state = 2; + if (D_8015F924 != 0) { + gHitCount = gSavedHitCount; + } + D_800C9B4C = 1000000; + + case 2: + if (func_i4_8019AA9C(player) == 0) { + func_i4_8019A3E8(actor); + switch (actor->timer_0BE) { + case 548: + Radio_PlayMessage(gMsg_ID_16050, RCID_ROB64); + break; + + case 385: + Radio_PlayMessage(gMsg_ID_16055, RCID_ROB64); + break; + + case 235: + Radio_PlayMessage(gMsg_ID_16060, RCID_FOX); + break; + + case 130: + break; + } + } + break; + + case 20: + D_8015F928--; + break; + + case 3: + actor8 = &gActors[8]; + gCsFrameCount++; + if (gCsFrameCount == 3) { + func_80078E50(actor8->obj.pos.x, actor8->obj.pos.y, actor8->obj.pos.z, 30.0f); + } + player->camEye.x += actor8->vel.x * 0.23f; + player->camEye.y += actor8->vel.y * 0.23f; + player->camEye.z += actor8->vel.z * 0.23f; + + Math_SmoothStepToF(&player->camAt.x, actor8->obj.pos.x, 1.0f, 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, actor8->obj.pos.y, 1.0f, 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, actor8->obj.pos.z, 1.0f, 20000.0f, 0); + Math_SmoothStepToF(&player->unk_034, 0, 1.0f, 1000.0f, 0); + + switch (actor->timer_0BC) { + case 370: + Radio_PlayMessage(gMsg_ID_16120, RCID_KATT); + break; + + case 261: + Radio_PlayMessage(gMsg_ID_16125, RCID_FALCO); + break; + + case 140: + gRadioState = 0; + Radio_PlayMessage(gMsg_ID_16130, RCID_KATT); + break; + + case 260: + actor8->fwork[7] = 360.0f; + actor8->fwork[8] = 0.0f; + break; + + case 230: + actor8->fwork[7] = 0.0f; + actor8->fwork[8] = 359.999f; + break; + } + + if (actor->timer_0BC == 70) { + actor->state = 2; + player->state_1C8 = PLAYERSTATE_1C8_3; + func_800B7184(player, 1); + player->unk_014 = 0.0f; + } + break; + + case 6: + gActors[1].unk_0E6 = 0; + gActors[1].state = 2; + gActors[2].unk_0E6 = 0; + gActors[2].state = 2; + gActors[3].unk_0E6 = 0; + gActors[3].state = 2; + + for (i = 10; i < ARRAY_COUNT(gActors); i++) { + gActors[i].unk_0E6 = -1; + gActors[i].state = 3; + } + break; + + case 10: + D_80178340 = D_80178358 = 0; + switch (actor->timer_0BC) { + case 9800: + Audio_PlaySfx(0x09000002U, gActors[10].sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + gActors[10].fwork[29] = 12.0f; + break; + + case 9780: + gActors[13].unk_0E6 = -1; + gActors[13].state = 3; + break; + + case 9740: + gActors[14].unk_0E6 = -1; + gActors[14].state = 3; + break; + + case 9730: + gActors[15].unk_0E6 = -1; + gActors[15].state = 3; + break; + + case 9710: + gActors[16].unk_0E6 = -1; + gActors[16].state = 3; + break; + } + + Math_SmoothStepToF(&player->camAt.x, gActors[10].obj.pos.x, 0.2, 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gActors[10].obj.pos.y, 0.2, 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gActors[10].obj.pos.z, 0.2, 500.0f, 0.0f); + + if (actor->timer_0BC < 9800) { + Math_SmoothStepToF(&gActors[10].fwork[1], 80.0f, 0.1, 10.0f, 0); + Math_SmoothStepToF(&gActors[10].fwork[29], 3.0f, 0.1, 1.0f, 0); + } else { + Math_SmoothStepToF(&actor->fwork[10], 700.0f, 1, 5.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gActors[10].obj.pos.x - 300.0f, 0.07f, actor->fwork[10], 0); + Math_SmoothStepToF(&player->camEye.y, gActors[10].obj.pos.y, 0.07f, actor->fwork[10], 0); + Math_SmoothStepToF(&player->camEye.z, gActors[10].obj.pos.z + 500.0f, 0.05f, 50.0f, 0); + Math_SmoothStepToF(&gActors[10].fwork[29], 2.0f, 0.1f, 1.0f, 0); + } + + if (actor->timer_0BC < 9680) { + actor->state = 2; + player->state_1C8 = PLAYERSTATE_1C8_3; + func_800B7184(player, 1); + player->unk_014 = 0.0f; + gActors[10].fwork[1] = 25.0f; + gActors[10].fwork[29] = 5.0f; + gActors[10].obj.pos.z = 35000.0f; + gActors[10].iwork[9] = 0; + gPlayer[0].unk_034 = 0.0f; + actor->timer_0BE = 550; + } + break; + + case 100000: + break; + } + + if (!(gGameFrameCount & 24)) { + Math_SmoothStepToF(&D_8015F914, 63.0f, 1.0f, 9.450001f, 0); + Math_SmoothStepToF(&D_8015F918, 255.0f, 1.0f, 35.25f, 0); + Math_SmoothStepToF(&D_8015F91C, 158.0f, 1.0f, 21.6f, 0); + } else { + Math_SmoothStepToF(&D_8015F914, 0.0f, 1.0f, 3.15f, 0); + Math_SmoothStepToF(&D_8015F918, 20.0f, 1.0f, 11.75f, 0); + Math_SmoothStepToF(&D_8015F91C, 14.0f, 1.0f, 7.2000003f, 0); + } +} + +Vec3f D_i4_8019F528[] = { + { 1000.0f, 1000.0f, 1000.0f }, { 0.0f, -700.0f, 1500.0f }, { 2000.0f, -500.0f, 2500.0f }, + { -500.0f, 500.0f, -3000.0f }, { -2000.0f, -1000.0f, -1000.0f }, { -1000.0f, 1700.0f, -1500.0f }, + { 2000.0f, 2500.0f, -2500.0f }, +}; + +void func_i4_8019B48C(void) { + Actor* actor = &gActors[1]; + s32 i; + + for (i = 0; i < ARRAY_COUNT(D_i4_8019F528); i++, actor++) { + Actor_Initialize(actor); + actor->obj.status = OBJ_INIT; + actor->obj.id = OBJ_ACTOR_195; + actor->unk_0B6 = 25; + actor->obj.pos.x = D_i4_8019F528[i].x; + actor->obj.pos.y = D_i4_8019F528[i].y; + actor->obj.pos.z = D_i4_8019F528[i].z; + actor->obj.rot.y = Rand_ZeroOne() * 360.0f; + actor->vel.x = 5.0f; + Object_SetInfo(&actor->info, actor->obj.id); + } +} + +void func_i4_8019B568(void) { + Actor* actor = &gActors[0]; + + Actor_Initialize(actor); + actor->obj.status = OBJ_INIT; + actor->obj.id = OBJ_ACTOR_195; + + actor->obj.pos.x = 5000.0f; + actor->obj.pos.y = 0.0f; + actor->obj.pos.z = 0.0f; + + actor->obj.rot.y = 270.0f; + actor->unk_0B6 = 1; + actor->vel.x = -20.0f; + Object_SetInfo(&actor->info, actor->obj.id); + Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); +} +Vec3f D_i4_8019F57C[] = { + { 150.0f, 150.0f, 50.0f }, { -150.0f, -150.0f, 50.0f }, { -150.0f, 150.0f, 50.0f }, { 150.0f, -150.0f, 50.0f } +}; + +f32 D_i4_8019F5AC[] = { -30.0f, 20.0f, 30.0f, -40.0f }; + +void func_i4_8019B630(Actor* actor, s32 index) { + Actor_Initialize(actor); + actor->obj.status = OBJ_ACTIVE; + actor->obj.id = OBJ_ACTOR_195; + + actor->obj.pos.x = gPlayer[0].camEye.x + D_i4_8019F57C[index].x; + actor->obj.pos.y = gPlayer[0].camEye.y + D_i4_8019F57C[index].y; + actor->obj.pos.z = gPlayer[0].camEye.z + D_i4_8019F57C[index].z; + + actor->vel.z = -30.0f; + actor->vel.y = -10.0f; + + actor->obj.rot.y = 180.0f; + actor->obj.rot.x = 10.0f; + actor->obj.rot.z = D_i4_8019F5AC[index]; + + actor->unk_0B6 = 26; + actor->iwork[11] = 1; + Object_SetInfo(&actor->info, actor->obj.id); + Audio_PlaySfx(0x31000011U, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); +} + +Vec3f D_i4_8019F5BC[] = { + { 200.0f, 0.0f, 0.0f }, { 200.0f, 0.0f, 0.0f }, { 200.0f, 0.0f, 0.0f }, { 200.0f, 0.0f, 0.0f } +}; + +void func_i4_8019B75C(Actor* actor, s32 arg1) { + Actor* newActor = &gActors[0]; + + Actor_Initialize(actor); + actor->obj.status = OBJ_ACTIVE; + actor->obj.id = OBJ_ACTOR_195; + + actor->obj.pos.x = D_i4_8019F5BC[arg1].x + newActor->obj.pos.x; + actor->obj.pos.y = newActor->obj.pos.y - 500.0f; + actor->obj.pos.z = D_i4_8019F5BC[arg1].z + newActor->obj.pos.z; + + actor->vel.x = -D_80161A54; + actor->obj.rot.y = 270.0f; + + Object_SetInfo(&actor->info, actor->obj.id); + + Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + actor->fwork[29] = 5.0f; +} + +Vec3f D_i4_8019F5EC[] = { + { 0.0f, 20000.0f, 0.0f }, { -1000.0f, 100.0f, 500.0f }, { -1300.0f, -50.0f, 0.0f }, { -1600.0f, 50.0f, -500.0f } +}; + +void func_i4_8019B888(void) { + s32 i; + Actor* actor; + + for (i = 0, actor = &gActors[0]; i < 4; i++, actor++) { + if ((i <= 0) || (gTeamShields[i] > 0)) { + Actor_Initialize(actor); + actor->obj.status = OBJ_ACTIVE; + actor->obj.id = OBJ_ACTOR_197; + Object_SetInfo(&actor->info, actor->obj.id); + if (i == 0) { + actor->unk_0E4 = 1000; + } else { + actor->obj.pos.x = gPlayer[0].pos.x + D_i4_8019F5EC[i].x; + actor->obj.pos.y = gPlayer[0].pos.y + D_i4_8019F5EC[i].y; + actor->obj.pos.z = gPlayer[0].pos.z + D_i4_8019F5EC[i].z; + actor->unk_0E4 = i; + actor->state = 2; + actor->unk_0F4.y = 270.0f; + actor->health = 255; + actor->iwork[11] = 1; + Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CC01C); + actor->info.unk_16 = 0; + actor->info.unk_1C = 0.0f; + } + } + } +} + +void func_i4_8019BA64(Player* player) { + s32 i; + s32 j; + Vec3f sp74; + Vec3f sp68; + Actor* actor = gActors; + + D_8015F928 = 0; + + switch (player->unk_1D0) { + case 0: + gCsFrameCount = 0; + + player->unk_1D0++; + + func_i4_8019B568(); + func_i4_8019B48C(); + + D_80177978 = 0.0f; + D_80177980 = 0.0f; + D_80177988 = 6000.0f; + D_801779A0 = 2500.0f; + D_801779B8 = 0.0f; + D_801779C0 = 0.0f; + D_80177A48[0] = 1.0f; + + player->unk_234 = 0; + player->unk_0D0 = 0.0f; + player->unk_034 = -20.0f; + + D_80161A44 = 30000.0f; + + case 1: + if (gCsFrameCount < 7) { + D_80178340 = 255; + } + + D_801779A0 -= 10.0f; + D_80177988 -= 7.0f; + + if (gCsFrameCount == 320) { + actor = &actor[0]; + player->unk_1D0 = 2; + actor->vel.x = -10.0f; + actor->obj.pos.x = 1000.0f; + D_80177978 = 0.0f; + D_80177980 = 0.0f; + D_80177988 = 17000.0f; + D_801779A0 = 0.0f; + D_801779B8 = 0.0f; + D_801779C0 = 0.0f; + D_80178340 = 255; + } + break; + + case 2: + D_80178340 = 0; + player->unk_034 += 0.05f; + + for (i = 30; i < 34; i++) { + Math_SmoothStepToF(&gActors[i].vel.x, -5.0f, 0.1f, 0.1, 0.0f); + Math_SmoothStepToF(&gActors[i].vel.y, 5.0f, 0.1f, 0.1, 0.0f); + Math_SmoothStepToF(&gActors[i].obj.rot.x, -10.0f, 0.1f, 0.2f, 0.0f); + Math_SmoothStepToF(&gActors[i].obj.rot.z, 0.0f, 0.1f, 0.3f, 0.0f); + } + + if (gCsFrameCount == 500) { + gCsFrameCount = 520; + + player->unk_1D0++; + + actor->vel.x = 0.0f; + + actor->obj.pos.z = 0.0f; + actor->obj.pos.y = 0.0f; + actor->obj.pos.x = 0.0f; + + player->unk_034 = 0.0f; + + player->camEye.x = D_80177978 = actor->obj.pos.x - 2800.0f; + player->camEye.y = D_80177980 = actor->obj.pos.y + 1400.0f; + player->camEye.z = D_80177988 = actor->obj.pos.z + 700.0f; + + player->camAt.x = D_801779A0 = actor->obj.pos.x - 1000.0f; + player->camAt.y = D_801779B8 = actor->obj.pos.y; + player->camAt.z = D_801779C0 = actor->obj.pos.z; + + D_80177A48[0] = 0.0f; + D_80178340 = 255; + + for (i = 0; i < 4; i++) { + Object_Kill(&gActors[i + 30].obj, gActors[i + 30].sfxPos); + } + + player->pos.x = actor->obj.pos.x + 200.0f; + player->pos.y = actor->obj.pos.y - 480.0f; + player->pos.z = actor->obj.pos.z; + + func_8001D444(0U, 0x33U, 0U, 0xFFU); + } + break; + + case 3: + D_80178340 = 0; + D_80177978 = -1250.0f; + D_80177980 = -395.0f; + + D_801779A0 = player->pos.x; + D_801779B8 = player->pos.y; + D_801779C0 = player->pos.z; + + Math_SmoothStepToF(D_80177A48, 0.05f, 1.0f, 0.0005f, 0.0f); + + gActors[30].obj.rot.x -= 0.65f; + gActors[31].obj.rot.x -= 0.65f; + gActors[32].obj.rot.x -= 0.65f; + gActors[30].iwork[11] = 2; + gActors[31].iwork[11] = 2; + gActors[32].iwork[11] = 2; + gActors[30].obj.rot.y += 0.5f; + gActors[31].obj.rot.y -= 0.4f; + gActors[32].obj.rot.y += 0.6f; + gActors[30].vel.z += 0.325f; + gActors[31].vel.z -= 0.26f; + gActors[32].vel.z += 0.39000002f; + gActors[30].obj.rot.z += 0.2f; + gActors[31].obj.rot.z -= 0.3f; + gActors[32].obj.rot.z -= 0.3f; + gActors[30].vel.y += 0.4f; + gActors[31].vel.y += 0.27f; + gActors[32].vel.y += 0.4f; + + if (gCsFrameCount > 760) { + player->unk_0E4 += 0.25f; + } + + if (gCsFrameCount > 765) { + D_80177988 += 3.0f; + Math_SmoothStepToF(D_80177A48, 0.9f, 1.0f, 0.07f, 0.0f); + } else { + D_80177988 = 0.0f; + } + + if (gCsFrameCount == 800) { + for (i = 0; i < ARRAY_COUNT(gActors); i++) { + Object_Kill(&gActors[i].obj, gActors[i].sfxPos); + } + func_i4_8019EA68(); + func_i4_8019B888(); + } + + if (gCsFrameCount == 0x334) { + func_8001A838(0x49000014U); + player->state_1C8 = PLAYERSTATE_1C8_3; + player->unk_01C = player->unk_018 = player->unk_014 = 0.f; + func_8001D444(0U, D_80177C90, 0U, 0xFFU); + D_80177838 = 0x32; + } + break; + } + + switch (gCsFrameCount) { + case 20: + Audio_PlaySfx(0x49000014U, D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + + case 330: + Radio_PlayMessage(gMsg_ID_16010, RCID_ROB64); + break; + + case 80: + break; + + case 370: + func_i4_8019B630(&gActors[30], 0); + break; + + case 390: + func_i4_8019B630(&gActors[31], 1); + break; + + case 405: + func_i4_8019B630(&gActors[32], 2); + break; + + case 425: + func_i4_8019B630(&gActors[33], 3); + break; + + case 560: + Radio_PlayMessage(gMsg_ID_16020, RCID_FOX); + break; + + case 700: + if (gTeamShields[2] > 0) { + func_i4_8019B75C(&gActors[30], 0); + } + break; + + case 720: + if (gTeamShields[1] > 0) { + func_i4_8019B75C(&gActors[31], 1); + } + break; + + case 740: + if (gTeamShields[3] > 0) { + func_i4_8019B75C(&gActors[32], 2); + } + break; + + case 760: + player->unk_194 = 5.0f; + player->unk_190 = 5.0f; + player->unk_114 = 90.0f; + player->unk_0D0 = D_80161A54; + player->unk_234 = 1; + Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + } + + Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + player->unk_114 + 180.0f) * 0.017453292f, 0); + Matrix_RotateX(gCalcMatrix, -(player->unk_0E4 * 0.017453292f), 1); + + sp74.x = 0.0f; + sp74.y = 0.0f; + sp74.z = player->unk_0D0; + + Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp74, &sp68); + + player->vel.x = sp68.x; + player->vel.z = sp68.z; + player->vel.y = sp68.y; + + player->pos.x += player->vel.x; + player->pos.y += player->vel.y; + player->pos.z += player->vel.z; + + player->unk_138 = player->pos.z; + player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; + + Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 50000.0f, 0); +} + +f32 D_i4_8019F61C[] = { -300.0f, 350.0f, -50.0f, 800.0f }; + +f32 D_i4_8019F62C[] = { 0.0f, -30.0f, -90.0f, -550.0f }; + +f32 D_i4_8019F63C[] = { -200.0f, -250.0f, -500.0f, 5000.0f }; + +void func_i4_8019C574(Actor* actor, s32 index) { + f32 var_fv0 = 1.0f; + + if (D_80177B8C == 0) { + var_fv0 = -1.0f; + } + + Actor_Initialize(actor); + actor->obj.status = OBJ_INIT; + actor->obj.id = OBJ_ACTOR_195; + + actor->obj.pos.x = D_i4_8019F61C[index] * var_fv0; + actor->obj.pos.y = D_i4_8019F62C[index]; + actor->obj.pos.z = D_i4_8019F63C[index]; + + actor->fwork[0] = gPlayer[0].unk_0D0; + actor->unk_0F4.y = gPlayer[0].unk_0E8; + + Object_SetInfo(&actor->info, actor->obj.id); + + if (index < 3) { + actor->iwork[11] = 1; + Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } else { + actor->unk_0B6 = 1; + actor->fwork[0] = 20.0f; + + Audio_PlaySfx(0x11030010U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + Audio_PlaySfx(0x31024059U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } +} + +void func_i4_8019C70C(void) { + Actor* actor = &gActors[8]; + + Actor_Initialize(actor); + actor->obj.status = OBJ_INIT; + actor->obj.id = OBJ_ACTOR_195; + + actor->obj.pos.x = gBosses[0].obj.pos.x + 700.0f; + actor->obj.pos.y = gBosses[0].obj.pos.y - 1000.0f; + actor->obj.pos.z = gBosses[0].obj.pos.z - 1000.0f; + + actor->unk_0F4.y = 180.0f; + actor->unk_0F4.x = 20.0f; + + actor->obj.rot.x = -20.0f; + actor->obj.rot.y = 180.0f; + actor->obj.rot.y = 2.0f * actor->obj.rot.y; + actor->obj.rot.z = -actor->unk_0F4.z; + + actor->fwork[0] = 30.0f; + actor->unk_0B6 = 24; + actor->iwork[11] = 1; + actor->state = 10; + actor->timer_0BC = 130; + + Object_SetInfo(&actor->info, actor->obj.id); + Audio_PlaySfx(0x3100000CU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); +} + +void func_i4_8019C85C(Player* player) { + s32 i; + Vec3f src; + Vec3f dest; + Actor* actor0 = &gActors[0]; + Actor* actor1 = &gActors[1]; + Actor* actor2 = &gActors[2]; + Actor* actor3 = &gActors[3]; + Boss* boss0 = &gBosses[0]; + f32 var_fv1 = 1.0f; + + if (D_80177B8C == 0) { + var_fv1 = -1.0f; + } + + Math_SmoothStepToF(&player->unk_110, 0.0f, 0.1f, 1.5f, 0.0f); + + switch (player->unk_1D0) { + case 1000: + Math_SmoothStepToF(&player->unk_0E8, -40.0f, 0.1f, 2.5f, 0); + Math_SmoothStepToF(&player->unk_0EC, -60.0f, 0.2f, 5.0f, 0); + Math_SmoothStepToF(&player->unk_0E4, 0, 0.1f, 2.5f, 0); + if (player->timer_1F8 == 0) { + player->unk_1D0 = 1001; + player->timer_1F8 = 100; + Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + player->unk_194 = 5.0f; + player->unk_190 = 5.0f; + D_80161A44 = 30000.0f; + } + break; + + case 1001: + player->unk_190 = 2.0f; + + Math_SmoothStepToF(&player->unk_0E4, 15.0f, 0.1f, 0.4f, 0); + Math_SmoothStepToF(&player->unk_0EC, 40.0f, 0.2f, 5.0f, 0); + Math_SmoothStepToF(&player->unk_0E8, 120.0f, 0.1f, 2.0f, 0); + + player->unk_0D0 += 1.0f; + if (player->unk_0D0 >= 70.0f) { + player->unk_0D0 = 70.0f; + } + + if (player->timer_1F8 == 0) { + gPlayer[0].unk_1D0 = 0; + } + break; + + case 100: + D_80177978 = boss0->obj.pos.x; + D_80177980 = boss0->obj.pos.y; + D_80177988 = boss0->obj.pos.z + 4000.0f; + + D_801779A0 = boss0->obj.pos.x; + D_801779B8 = boss0->obj.pos.y; + D_801779C0 = boss0->obj.pos.z; + + D_80177A48[0] = 1.0f; + D_80161A44 = 30000.0f; + + player->unk_234 = 0; + player->unk_0D0 = 0.0f; + player->unk_034 = 0.0f; + + if (boss0->state != 0) { + player->unk_1D0 = 0; + } + break; + + case 0: + gCsFrameCount = 0; + + player->unk_234 = 0; + + D_80177978 = boss0->obj.pos.x; + D_80177980 = boss0->obj.pos.y; + D_80177988 = boss0->obj.pos.z + 4000.0f; + + D_80177A48[0] = 1.0f; + + player->unk_1D0 = 1; + + D_80161A44 = 30000.0f; + + player->timer_1F8 = 550; + player->unk_0D0 = 0.0f; + player->unk_034 = 0.0f; + + D_80178358 = 255; + D_80178340 = D_80178358; + + for (i = 0; i < ARRAY_COUNT(gActors); i++) { + Object_Kill(&gActors[i].obj, gActors[i].sfxPos); + } + Audio_PlaySfx(0x31024059U, boss0->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + + case 1: + D_80178358 = 0; + D_80178340 = 0; + + Math_SmoothStepToAngle(&boss0->unk_078.x, 20.0f, 0.03f, boss0->fwork[1], 0.0f); + Math_SmoothStepToAngle(&boss0->unk_078.y, 180.0f, 0.03f, boss0->fwork[2], 0.0f); + Math_SmoothStepToAngle(&boss0->unk_078.z, 30.0f, 0.03f, boss0->fwork[3], 0.0f); + Math_SmoothStepToF(boss0->fwork, 20.0f, 0.05f, 0.3f, 0.0f); + Math_SmoothStepToF(&boss0->fwork[1], 0.07f, 1.0f, 0.07f, 0.0f); + Math_SmoothStepToF(&boss0->fwork[2], 0.5f, 1.0f, 0.05f, 0.0f); + Math_SmoothStepToF(&boss0->fwork[3], 0.7f, 1.0f, 0.7f, 0.0f); + + if ((gCsFrameCount == 100) && (D_80177B8C != 0)) { + func_8001D444(0U, 0x26U, 0U, 0xFFU); + } + + if ((gCsFrameCount == 210) && (D_80177B8C != 0)) { + D_80177840 = 100; + D_80177930 = 1; + } + + if ((gCsFrameCount == 230) && (D_i4_801A0564 != 0)) { + func_i4_8019C70C(); + } + + D_801779A0 = boss0->obj.pos.x; + D_801779B8 = boss0->obj.pos.y + (2.0f * D_8017847C); + D_801779C0 = boss0->obj.pos.z; + + if (player->timer_1F8 == 0) { + player->unk_1D0 = 2; + } + break; + + case 2: + D_80178358 = 0; + D_80178340 = 0; + + if (player->timer_1F8 == 0) { + if (D_80177B8C == 0) { + func_800182F4(0x103200FF); + func_800182F4(0x113200FF); + } + + gCsFrameCount = 1280; + + player->unk_1D0 = 10; + player->timer_1F8 = 1000; + + func_8001CA24(0U); + Audio_KillSfx(player->sfxPos); + func_800A6148(); + + player->pos.x = 0.0f; + player->pos.y = 0.0f; + player->pos.z = 0.0f; + + player->unk_0E4 = 0.0f; + player->unk_234 = 1; + player->unk_0E8 = 180.0f; + player->unk_0EC = 0.0f; + player->unk_114 = 0.0f; + player->unk_4D8 = 0.0f; + player->unk_0D0 = 40.0f; + + D_80177978 = 0.0f - (200.0f * var_fv1); + D_80177980 = player->pos.y; + D_80177988 = player->pos.z + 12000.0f; + D_801779A0 = player->pos.x; + D_801779B8 = player->pos.y; + D_801779C0 = player->pos.z; + + if (gTeamShields[1] > 0) { + func_i4_8019C574(actor1, 0); + } + if (gTeamShields[2] > 0) { + func_i4_8019C574(actor3, 1); + } + if (gTeamShields[3] > 0) { + func_i4_8019C574(actor2, 2); + } + func_i4_8019C574(actor0, 3); + D_80178340 = D_80178358 = 255; + } + break; + + case 10: + D_80178340 = D_80178358 = 0; + D_801779A0 = player->pos.x; + D_801779B8 = player->pos.y; + D_801779C0 = player->pos.z; + + if (gCsFrameCount == 1620) { + player->unk_1D0 += 1; + D_80177A48[0] = 0.0f; + D_80177A48[1] = 0.0f; + D_80177A48[2] = 0.0f; + D_80177A48[3] = 300.0f; + + for (i = 0; i < 200; i++) { + gObjects58[i].obj.status = OBJ_FREE; + } + } + break; + + case 11: + Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); + D_80177A48[1] += D_80177A48[2] * var_fv1; + + src.x = -800.0f * var_fv1; + src.y = D_80177A48[3]; + src.z = 0.0f; + + Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); + + Math_SmoothStepToF(&player->unk_0D0, 0, 0.05f, 1.0f, 0); + Math_SmoothStepToF(&actor1->fwork[0], 0, 0.05f, 1.0f, 0); + Math_SmoothStepToF(&actor3->fwork[0], 0, 0.05f, 1.0f, 0); + Math_SmoothStepToF(&actor2->fwork[0], 0.0f, 0.05f, 1.0f, 0); + Math_SmoothStepToF(&actor0->fwork[0], 0.0f, 0.05f, 1.0f, 0); + Math_SmoothStepToF(D_80177A48, 0.02f, 1.0f, 0.001f, 0); + + if (gCsFrameCount > 2000) { + Math_SmoothStepToF(&D_80177A48[3], 50.0f, 0.05f, 1.5f, 0); + } + + if (gCsFrameCount < 2330) { + Math_SmoothStepToF(&D_80177A48[2], 0.5f, 1.0f, 0.008f, 0); + } else { + Math_SmoothStepToF(&D_80177A48[2], 0.0f, 1.0f, 0.002f, 0); + } + + if (gCsFrameCount > 2510) { + player->unk_0D0 += 2.0f; + player->unk_0E4 += 0.1f; + player->unk_190 = 2.0f; + } + + if (gCsFrameCount > 2550) { + Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.005f, 0); + } else { + D_80177978 = actor0->obj.pos.x - (800.0f * var_fv1) + dest.x; + D_80177980 = actor0->obj.pos.y + 550.0f + dest.y; + D_80177988 = actor0->obj.pos.z + 2430.0f + dest.z; + } + + D_801779A0 = actor0->obj.pos.x - (800.0f * var_fv1); + D_801779B8 = actor0->obj.pos.y + 550.0f; + D_801779C0 = actor0->obj.pos.z + 2430.0f - 250.0f; + + if (gCsFrameCount == 2660) { + func_8001DBD0(50); + } + + if (gCsFrameCount > 2710) { + D_80178358 = 255; + D_80178348 = D_80178350 = D_80178354 = 0; + D_8017835C = 8; + if (D_80178340 == 255) { + player->state_1C8 = PLAYERSTATE_1C8_6; + player->timer_1F8 = 0; + D_8017837C = 4; + D_800D3180[18] = Play_CheckMedalStatus(100) + 1; + } + } + break; + } + + if (D_80177B8C != 0) { + switch (gCsFrameCount) { + case 1729: + Radio_PlayMessage(gMsg_ID_16250, RCID_ROB64); + break; + + case 1847: + switch (gTeamShields[1]) { + case -1: + Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); + break; + + case 0: + Radio_PlayMessage(gMsg_ID_20343, RCID_ROB64); + break; + + default: + Radio_PlayMessage(gMsg_ID_16260, RCID_FALCO); + break; + } + break; + + case 1984: + switch (gTeamShields[3]) { + case -1: + Radio_PlayMessage(gMsg_ID_20338, RCID_ROB64); + break; + + case 0: + Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); + break; + + default: + Radio_PlayMessage(gMsg_ID_16270, RCID_PEPPY); + break; + } + break; + + case 2130: + switch (gTeamShields[2]) { + case -1: + Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64); + break; + + case 0: + Radio_PlayMessage(gMsg_ID_20345, RCID_ROB64); + break; + + default: + Radio_PlayMessage(gMsg_ID_16280, RCID_SLIPPY); + break; + } + + break; + } + + } else { + switch (gCsFrameCount) { + case 1729: + Radio_PlayMessage(gMsg_ID_16210, RCID_ROB64); + break; + + case 1847: + switch (gTeamShields[1]) { + case -1: + Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); + break; + + case 0: + Radio_PlayMessage(gMsg_ID_20343, RCID_ROB64); + break; + + default: + Radio_PlayMessage(gMsg_ID_16220, RCID_FALCO); + break; + } + break; + + case 1984: + switch (gTeamShields[3]) { + case -1: + Radio_PlayMessage(gMsg_ID_20338, RCID_ROB64); + break; + + case 0: + Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); + break; + + default: + Radio_PlayMessage(gMsg_ID_16230, RCID_PEPPY); + break; + } + break; + + case 2130: + switch (gTeamShields[2]) { + case -1: + Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64); + break; + + case 0: + Radio_PlayMessage(gMsg_ID_20345, RCID_ROB64); + break; + + default: + Radio_PlayMessage(gMsg_ID_16240, RCID_SLIPPY); + break; + } + break; + } + } + switch (gCsFrameCount) { + case 1640: + Radio_PlayMessage(gMsg_ID_16200, RCID_FOX); + break; + + case 2277: + D_80177830 = 1; + break; + + case 2477: + D_80177830 = 0; + break; + + case 1370: + if (D_80177B8C != 0) { + D_80177930 = 1; + } else { + func_8001D444(0U, 0x31U, 0U, 0xFFU); + D_80177930 = 0; + } + break; + + case 1560: + if (D_80177B8C == 0) { + D_80177840 = 100; + } + break; + + case 1700: + player->unk_204 = gLevelType; + break; + + case 2450: + actor2->state = 1; + break; + + case 2470: + actor3->state = 1; + break; + + case 2490: + gActors[1].state = 1; + break; + + case 2510: + Audio_PlaySfx(0x09000002U, player->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + player->unk_190 = player->unk_194 = 5.0f; + break; + + case 2550: + gActors[0].state = 1; + break; + } + + Matrix_RotateY(gCalcMatrix, ((player->unk_114 + player->unk_0E8) + 180.0f) * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, -(((player->unk_120 + player->unk_0E4) + player->unk_4D8) * M_DTOR), 1); + + src.x = 0.0f; + src.y = 0.0f; + src.z = player->unk_0D0 + player->unk_110; + + Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); + + player->vel.x = dest.x; + player->vel.z = dest.z; + player->vel.y = dest.y; + + player->pos.x += player->vel.x; + player->pos.y += player->vel.y; + player->pos.z += player->vel.z; + + player->unk_138 = player->pos.z; + player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; + + Math_SmoothStepToF(&player->unk_130, 0.0f, 0.1f, 15.0f, 0.0f); + Math_SmoothStepToF(&player->unk_12C, 0.0f, 0.1f, 15.0f, 0.0f); + Math_SmoothStepToF(&player->unk_034, 0.0f, 0.1f, 3.0f, 0.0f); + Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 0.1f, 20.0f, 0.0f); + + if (player->unk_1D0 >= 1000) { + if (player->pos.y < 700.0f) { + Math_SmoothStepToF(&player->pos.y, 700.0f, 0.1f, 10.0f, 0.0f); + } + func_800B7184(player, 0); + player->camEye.x += player->vel.x * 0.1f; + player->camEye.y += player->vel.y * 0.1f; + player->camEye.z += player->vel.z * 0.1f; + } else { + Math_SmoothStepToF(&player->camEye.x, D_80177978, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, D_80177980, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, D_80177988, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, D_801779A0, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, D_801779B8, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, D_801779C0, D_80177A48[0], 50000.0f, 0.0f); + } + + player->unk_088 += 10.0f; + player->unk_080 = -__sinf(player->unk_088 * M_DTOR) * 0.3f; + player->unk_0F4 += 8.0f; + player->unk_0F0 = __sinf(player->unk_0F4 * M_DTOR); +} + +void func_i4_8019DD20(Actor* actor) { + Vec3f src; + Vec3f dest; + + switch (actor->state) { + case 1: + actor->state = 2; + Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + actor->fwork[29] = 5.0f; + + case 2: + actor->iwork[11] = 2; + actor->fwork[0] += 2.0f; + actor->unk_0F4.x += actor->fwork[1]; + Math_SmoothStepToF(&actor->fwork[1], 0.1f, 1.0f, 0.01f, 0.0f); + break; + + case 10: + if (actor->timer_0BC == 0) { + actor->state = 11; + } + break; + + case 11: + Math_SmoothStepToF(&actor->unk_0F4.x, 215.0f, 0.1f, 7.0f, 0.0f); + Math_SmoothStepToF(actor->fwork, 10.0f, 0.1f, 1.5f, 0.0f); + Math_SmoothStepToAngle(&actor->unk_0F4.y, 140.0f, 0.1f, 1.0f, 0.0f); + if (actor->unk_0F4.x > 180.0f) { + actor->state = 12; + } + break; + + case 12: + Math_SmoothStepToAngle(&actor->unk_0F4.x, 218.0f, 0.1f, 7.0f, 0.0f); + Math_SmoothStepToAngle(&actor->unk_0F4.y, 147.0f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&actor->unk_0F4.z, 170.0f, 0.03f, 3.0f, 0.0f); + Math_SmoothStepToF(actor->fwork, 20.0f, 0.1f, 1.0f, 0.0f); + break; + } + + if (actor->unk_0B6 == 24) { + switch (gCsFrameCount) { + case 290: + if (gTeamShields[1] > 0) { + Radio_PlayMessage(gMsg_ID_16150, RCID_KATT); + } + break; + + case 430: + Audio_PlaySfx(0x09000002U, actor->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + actor->fwork[29] = 8.0f; + break; + + case 400: + if (D_80177B8C != 0) { + Radio_PlayMessage(gMsg_ID_16160, RCID_KATT); + } else { + Radio_PlayMessage(gMsg_ID_16165, RCID_KATT); + } + break; + } + + if (gCsFrameCount > 430) { + actor->fwork[29] = 3.0f; + Math_SmoothStepToF(&actor->unk_0F4.z, 500.0f, 0.1f, 20.0f, 0.0f); + Math_SmoothStepToF(actor->fwork, 40.0f, 0.1f, 3.0f, 0.0f); + + if ((gCsFrameCount < 460) && !(gCsFrameCount & 3)) { + Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1); + Matrix_RotateZ(gCalcMatrix, actor->obj.rot.z * M_DTOR, 1); + src.x = 0.0f; + src.y = 70.0f; + src.z = -70.0f; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); + func_80078E50(actor->obj.pos.x + dest.x, actor->obj.pos.y + dest.y, actor->obj.pos.z + dest.z, 3.1f); + } + } + } + + Matrix_RotateY(gCalcMatrix, (actor->unk_0F4.y + 180.0f) * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, -(actor->unk_0F4.x * M_DTOR), 1); + + src.x = 0.0f; + src.y = 0.0f; + src.z = actor->fwork[0]; + + Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); + + actor->vel.x = dest.x; + actor->vel.y = dest.y; + actor->vel.z = dest.z; + + actor->obj.rot.x = -actor->unk_0F4.x; + actor->obj.rot.y = actor->unk_0F4.y + 180.0f; + actor->obj.rot.z = -actor->unk_0F4.z; +} + +void func_i4_8019E234(Actor* actor) { + s32 i; + + actor->obj.rot.x += actor->unk_0F4.x; + actor->obj.rot.y += actor->unk_0F4.y; + + if (actor->unk_0D0 != 0) { + actor->timer_0C6 = 20; + actor->unk_0D0 = 0; + actor->health -= actor->damage; + Audio_PlaySfx(0x2903300EU, actor->sfxPos, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + if (actor->health <= 0) { + func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 10); + func_80066254(actor); + BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2); + gHitCount += 3; + D_80177850 = 15; + for (i = 0; i < 6; i++) { + func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + } + Object_Kill(&actor->obj, actor->sfxPos); + func_8007A6F0(&actor->obj.pos, 0x1903400F); + } + } +} + +void func_i4_8019E3A8(Actor* actor) { + gSPDisplayList(gMasterDisp++, D_6001A10); + gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); + RCP_SetupDL(&gMasterDisp, 0x39); + gSPDisplayList(gMasterDisp++, D_60045E0); + gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); +} + +Vec3f D_i4_8019F64C[] = { { 612.0f, 409.0f, 386.0f }, { 1027.0f, 141.0f, 383.0f }, { 375.0f, 292.0f, 380.0f }, + { -4.0f, 80.0f, 380.0f }, { 314.0f, 80.0f, 385.0f }, { 565.0f, 300.0f, 385.0f }, + { 600.0f, 385.0f, 380.0f }, { 776.0f, 245.0f, 384.0f }, { 376.0f, 123.0f, 384.0f }, + { 428.0f, 174.0f, 383.0f }, { 722.0f, 306.0f, 383.0f }, { 530.0f, 380.0f, 385.0f } }; + +void func_i4_8019E454(Boss* boss) { + s32 i; + s32 j; + f32 x; + f32 y; + f32 z; + Vec3f src; + Vec3f dest; + + if (boss->dmgType == DMG_UNK_100) { + boss->dmgType = 0; + boss->timer_050 = 10; + boss->timer_052 = 60; + boss->state = 1; + Audio_PlaySfx(0x1900404FU, boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + + if (boss->timer_050 == 1) { + D_80177B8C = 0; + } + + if (boss->timer_050 == 5) { + x = boss->obj.pos.x + 400.0f; + y = boss->obj.pos.y + 200.0f; + z = boss->obj.pos.z + 1000.0f; + + for (i = 0; i < 25; i++) { + func_800794CC(x + ((Rand_ZeroOne() - 0.5f) * 300.0f), y + ((Rand_ZeroOne() - 0.5f) * 100.0f), z, 2.0f); + func_80079618(x + ((Rand_ZeroOne() - 0.5f) * 300.0f), y + ((Rand_ZeroOne() - 0.5f) * 100.0f), z, 2.0f); + } + func_8007BFFC(x, y, z, 0.0f, 0.0f, 0.0f, 20.0f, 30); + } + + if (boss->timer_052 != 0) { + for (j = 0; j < 1; j++) { + i = Rand_ZeroOne() * 11.99f; + func_i4_80199BDC(D_i4_8019F64C[i].x + boss->obj.pos.x, D_i4_8019F64C[i].y + boss->obj.pos.y, + D_i4_8019F64C[i].z + boss->obj.pos.z, (Rand_ZeroOne() - 0.5f) * 5.0f, + (Rand_ZeroOne() - 0.5f) * 5.0f, 10.0f, (Rand_ZeroOne() * 2.0f) + 4.0f); + } + } + + Matrix_RotateY(gCalcMatrix, (boss->unk_078.y + 180.0f) * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, -(boss->unk_078.x * M_DTOR), 1); + + src.x = 0.0f; + src.y = 0.0f; + src.z = boss->fwork[0]; + + Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); + + boss->vel.x = dest.x; + boss->vel.y = dest.y; + boss->vel.z = dest.z; + + boss->obj.rot.x = -boss->unk_078.x; + boss->obj.rot.y = boss->unk_078.y + 180.0f; + boss->obj.rot.z = -boss->unk_078.z; + + if (D_80177B8C == 0) { + Matrix_RotateY(gCalcMatrix, (boss->obj.rot.y - 270.0f) * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, boss->obj.rot.x * M_DTOR, 1); + Matrix_RotateZ(gCalcMatrix, boss->obj.rot.z * M_DTOR, 1); + Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_i4_8019F64C[(s32) (Rand_ZeroOne() * 11.99f)], &dest); + func_8007C484(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, boss->vel.x, + boss->vel.y, boss->vel.z, (Rand_ZeroOne() * 0.1f) + 0.15f, 0); + if (((gGameFrameCount % 7) == 0) && (Rand_ZeroOne() < 0.5f)) { + func_i4_80199BDC(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, boss->vel.x, + boss->vel.y, boss->vel.z + 5.0f, (2.0f * Rand_ZeroOne()) + 4.0f); + } + } +} + +void func_i4_8019E98C(Boss* boss) { + gSPFogPosition(gMasterDisp++, gFogNear, 1005); + func_800515C4(); +} + +void func_i4_8019EA68(void) { + s32 i; + s32 j; + Actor* actor; + Object_58* obj58; + Boss* boss = &gBosses[0]; + + D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); + + Rand_SetSeed(1, 0x7148, 0x2694); + + for (obj58 = gObjects58, i = 0; i < 1000; i++) { + if (D_80178310[i].id < 0) { + break; + } + + if (D_80178310[i].id < 161) { + Object_58_Initialize(obj58); + obj58->obj.status = OBJ_ACTIVE; + obj58->obj.id = D_80178310[i].id; + obj58->obj.pos.x = D_80178310[i].xPos; + obj58->obj.pos.y = D_80178310[i].yPos; + obj58->obj.pos.z = -D_80178310[i].zPos1; + obj58->obj.rot.y = D_80178310[i].rot.y; + Object_SetInfo(&obj58->info, obj58->obj.id); + obj58++; + } + } + + for (j = 50, actor = &gActors[j], i = 0; i < 1000; i++) { + if (D_80178310[i].id < 0) { + break; + } + + if ((D_80178310[i].id >= 176) && (D_80178310[i].id < 292)) { + Actor_Initialize(actor); + actor->obj.status = OBJ_INIT; + actor->obj.id = D_80178310[i].id; + actor->obj.pos.x = D_80178310[i].xPos; + actor->obj.pos.y = D_80178310[i].yPos; + actor->obj.pos.z = -D_80178310[i].zPos1; + actor->health = 24; + actor->unk_0F4.x = (Rand_ZeroOne() - 0.5f) * 4.0f; + actor->unk_0F4.y = (Rand_ZeroOne() - 0.5f) * 4.0f; + Object_SetInfo(&actor->info, actor->obj.id); + actor->unk_044 = 1; + + if (j++ >= 60) { + break; + } + actor++; + } + } + + Boss_Initialize(boss); + boss->obj.status = OBJ_INIT; + + boss->obj.pos.x = 0.0f; + boss->obj.pos.y = 0.0f; + boss->obj.pos.z = 0.0f; + + boss->unk_078.y = 90.0f; + + boss->obj.rot.x = -boss->unk_078.x; + boss->obj.rot.y = boss->unk_078.y + 180.0f; + boss->obj.rot.z = -boss->unk_078.z; + + boss->obj.id = OBJ_BOSS_313; + Object_SetInfo(&boss->info, boss->obj.id); + Audio_PlaySfx(0x11030010U, boss->sfxPos, 0U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); +} diff --git a/src/overlays/ovl_i5/fox_ti_cs.c b/src/overlays/ovl_i5/fox_ti_cs.c index a3f6c323..79433f0f 100644 --- a/src/overlays/ovl_i5/fox_ti_cs.c +++ b/src/overlays/ovl_i5/fox_ti_cs.c @@ -88,7 +88,7 @@ void func_i5_8018769C(Player* player) { D_80177988 = actor->obj.pos.z - 750.0f; if (gCsFrameCount == 330) { - func_800BA808(gMsg_ID_4113, RCID_FOX); + Radio_PlayMessage(gMsg_ID_4113, RCID_FOX); } if (gCsFrameCount == 430) { @@ -436,25 +436,25 @@ void func_i5_801882CC(Player* player) { break; case 160: - func_800BA808(gMsg_ID_20010, RCID_FOX); + Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); break; case 248: - func_800BA808(gMsg_ID_4100, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_4100, RCID_SLIPPY); break; case 380: switch (gTeamShields[1]) { case -1: - func_800BA808(gMsg_ID_20331, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20331, RCID_ROB64); break; case 0: - func_800BA808(gMsg_ID_20343, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20343, RCID_ROB64); break; default: - func_800BA808(gMsg_ID_4101, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_4101, RCID_FALCO); break; } @@ -463,21 +463,21 @@ void func_i5_801882CC(Player* player) { case 525: switch (gTeamShields[3]) { case -1: - func_800BA808(gMsg_ID_20332, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20332, RCID_ROB64); break; case 0: - func_800BA808(gMsg_ID_20344, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); break; default: - func_800BA808(gMsg_ID_4102, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_4102, RCID_PEPPY); break; } break; case 671: - func_800BA808(gMsg_ID_4103, RCID_FOX); + Radio_PlayMessage(gMsg_ID_4103, RCID_FOX); break; case 1200: diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c index 2e709e63..c1672aa5 100644 --- a/src/overlays/ovl_i6/fox_andross.c +++ b/src/overlays/ovl_i6/fox_andross.c @@ -622,16 +622,16 @@ void func_i6_801893B8(Actor* actor) { actor->unk_04E++; switch (actor->unk_04E) { case 200: - func_800BA808(gMsg_ID_8250, RCID_ANDROSS_RED); + Radio_PlayMessage(gMsg_ID_8250, RCID_ANDROSS_RED); return; case 400: - func_800BA808(gMsg_ID_8255, RCID_ANDROSS_RED); + Radio_PlayMessage(gMsg_ID_8255, RCID_ANDROSS_RED); return; case 600: - func_800BA808(gMsg_ID_8260, RCID_ANDROSS_RED); + Radio_PlayMessage(gMsg_ID_8260, RCID_ANDROSS_RED); return; case 800: - func_800BA808(gMsg_ID_19325, RCID_ANDROSS_RED); + Radio_PlayMessage(gMsg_ID_19325, RCID_ANDROSS_RED); break; } } @@ -647,7 +647,7 @@ void func_i6_80189470(Actor* actor) { (fabsf(actor->obj.pos.x - gPlayer[0].pos.x) < 9000.0f) && (fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 9000.0f)) { D_80177AB0 = 7; - func_800BA808(gMsg_ID_19370, RCID_JAMES); + Radio_PlayMessage(gMsg_ID_19370, RCID_JAMES); func_800182F4(0x101400FF); func_800182F4(0x111400FF); } @@ -968,7 +968,7 @@ void func_i6_80189B70(Boss* boss) { Math_SmoothStepToF(&gPlayer[0].unk_034, 0.0f, 0.5f, 0.5f, 0.0f); if (gCsFrameCount == 50) { - func_800BA808(gMsg_ID_19335, RCID_ANDROSS_RED); + Radio_PlayMessage(gMsg_ID_19335, RCID_ANDROSS_RED); } if (gCsFrameCount == 200) { gBossActive = 0; @@ -1003,14 +1003,14 @@ void func_i6_80189B70(Boss* boss) { switch (gCsFrameCount) { case 30: gRadioState = 0; - func_800BA808(gMsg_ID_20318, RCID_FOX); + Radio_PlayMessage(gMsg_ID_20318, RCID_FOX); gPlayer[0].timer_220 = 200; break; case 350: - func_800BA808(gMsg_ID_19468, RCID_JAMES); + Radio_PlayMessage(gMsg_ID_19468, RCID_JAMES); break; case 500: - func_800BA808(gMsg_ID_19350, RCID_FOX); + Radio_PlayMessage(gMsg_ID_19350, RCID_FOX); D_8015F924 = 1; break; case 600: @@ -1049,16 +1049,16 @@ void func_i6_80189B70(Boss* boss) { D_80177CA4 = gHitCount; break; case 800: - func_800BA808(gMsg_ID_19340, RCID_JAMES); + Radio_PlayMessage(gMsg_ID_19340, RCID_JAMES); break; case 1000: func_8001D400(0); break; case 1300: - func_800BA808(gMsg_ID_19355, RCID_JAMES); + Radio_PlayMessage(gMsg_ID_19355, RCID_JAMES); break; case 1800: - func_800BA808(gMsg_ID_19360, RCID_JAMES); + Radio_PlayMessage(gMsg_ID_19360, RCID_JAMES); break; } if (gCsFrameCount > 600) { @@ -2795,7 +2795,7 @@ void func_i6_8018DBF0(Boss* boss) { Object_Kill(&boss->obj, boss->sfxPos); D_80177AB0 = 3; func_i6_80189098(boss); - func_800BA808(gMsg_ID_19330, RCID_ANDROSS_RED); + Radio_PlayMessage(gMsg_ID_19330, RCID_ANDROSS_RED); break; } Math_SmoothStepToF(&D_800C9C30, 0.0f, 1.0f, 0.3f, 0.0f); @@ -3932,20 +3932,20 @@ void func_i6_80193C4C(Player* player) { if (D_800D2F68 != 0) { switch (gCsFrameCount) { case 400: - func_800BA808(gMsg_ID_19400, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_19400, RCID_PEPPY); break; case 500: - func_800BA808(gMsg_ID_19410, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_19410, RCID_SLIPPY); break; case 600: - func_800BA808(gMsg_ID_19420, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_19420, RCID_FALCO); break; case 800: - func_800BA808(gMsg_ID_19430, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_19430, RCID_PEPPY); break; case 900: if (gTeamShields[3] > 0) { - func_800BA808(gMsg_ID_19440, RCID_FOX); + Radio_PlayMessage(gMsg_ID_19440, RCID_FOX); } break; case 1050: @@ -3964,13 +3964,13 @@ void func_i6_80193C4C(Player* player) { } else { switch (gCsFrameCount) { case 400: - func_800BA808(gMsg_ID_8300, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_8300, RCID_PEPPY); break; case 500: - func_800BA808(gMsg_ID_8310, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_8310, RCID_SLIPPY); break; case 600: - func_800BA808(gMsg_ID_8320, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_8320, RCID_FALCO); gCsFrameCount += 230; break; case 1050: diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c index bff5b193..ad76425b 100644 --- a/src/overlays/ovl_i6/fox_sy.c +++ b/src/overlays/ovl_i6/fox_sy.c @@ -494,7 +494,7 @@ void func_i6_80199438(Boss* boss) { boss->fwork[0] = 0.0f; } if (gCsFrameCount == 61) { - func_800BA808(gMsg_ID_14360, RCID_BOSS_SECTORY); + Radio_PlayMessage(gMsg_ID_14360, RCID_BOSS_SECTORY); } if (gCsFrameCount >= 80) { boss->fwork[0] = 1.0f; @@ -509,7 +509,7 @@ void func_i6_80199438(Boss* boss) { D_80177978 = boss->obj.pos.x + sp68.x; D_80177988 = boss->obj.pos.z + sp68.z; if ((boss->timer_058 == 40) && gBosses[1].obj.status == OBJ_FREE && gBosses[2].obj.status == OBJ_FREE) { - func_800BA808(gMsg_ID_14360, RCID_BOSS_SECTORY); + Radio_PlayMessage(gMsg_ID_14360, RCID_BOSS_SECTORY); } if (boss->timer_058 > 85) { boss->fwork[0] = 0.0f; @@ -959,7 +959,7 @@ void func_i6_8019AEEC(Boss* boss) { gPlayer[0].camAt.y = 300.0f; gPlayer[0].camAt.z = boss->obj.pos.z; gPlayer[0].unk_034 = 0.0f; - func_800BA808(gMsg_ID_14300, RCID_BOSS_SECTORY); + Radio_PlayMessage(gMsg_ID_14300, RCID_BOSS_SECTORY); func_i6_801A0510(&gActors[59], 7); gActors[59].obj.pos.y = boss->obj.pos.y - 202.0f; gActors[59].obj.pos.x = boss->obj.pos.x; @@ -1032,7 +1032,7 @@ void func_i6_8019AEEC(Boss* boss) { func_800B63BC(&gPlayer[0], 1); gPlayer[0].unk_014 = 0.0f; boss->swork[34]++; - func_800BA808(gMsg_ID_14310, RCID_BOSS_SECTORY); + Radio_PlayMessage(gMsg_ID_14310, RCID_BOSS_SECTORY); gBossFrameCount = 0; } } @@ -1510,7 +1510,7 @@ void func_i6_8019C888(Boss* boss) { } } if ((gBossFrameCount == 250) && (gTeamShields[2] != 0) && (boss->swork[34] == 0)) { - func_800BA808(gMsg_ID_2225, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2225, RCID_SLIPPY); } if ((gBossFrameCount == 620) && (boss->swork[34] == 0)) { gShowBossHealth = 1; @@ -1526,7 +1526,7 @@ void func_i6_8019C888(Boss* boss) { boss->swork[30]++; if (boss->swork[30] > 300 && ((ABS(D_801615D0.z) + ABS(D_801615D0.x)) < 3500.0f) && (gRadioState == 0)) { if (gTeamShields[3] > 0) { - func_800BA808(gMsg_ID_2282, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_2282, RCID_PEPPY); } boss->swork[30] = 150; } @@ -1534,7 +1534,7 @@ void func_i6_8019C888(Boss* boss) { if (boss->swork[30] > 100) { if ((((ABS(D_801615D0.z) + ABS(D_801615D0.x)) < 500.0f) && gTeamShields[1] > 0)) { - func_800BA808(gMsg_ID_2233, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_2233, RCID_FALCO); } } if (D_801615D0.x > 0.0f) { @@ -2054,23 +2054,23 @@ void func_i6_8019EE60(Player* player) { break; case 580: if (gHitCount >= 100) { - func_800BA808(gMsg_ID_14370, RCID_FOX); + Radio_PlayMessage(gMsg_ID_14370, RCID_FOX); } else { - func_800BA808(gMsg_ID_20010, RCID_FOX); + Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); } break; case 725: if (gTeamShields[2] != -1) { if (gTeamShields[2] == 0) { - func_800BA808(gMsg_ID_20345, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20345, RCID_ROB64); break; } } else { - func_800BA808(gMsg_ID_20333, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20333, RCID_ROB64); break; } if (gHitCount >= 100) { - func_800BA808(gMsg_ID_2305, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_2305, RCID_SLIPPY); } else { func_80048AC0(2); } @@ -2079,15 +2079,15 @@ void func_i6_8019EE60(Player* player) { case 872: if (gTeamShields[3] != -1) { if (gTeamShields[3] == 0) { - func_800BA808(gMsg_ID_20344, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); break; } } else { - func_800BA808(gMsg_ID_20332, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20332, RCID_ROB64); break; } if (gHitCount >= 100) { - func_800BA808(gMsg_ID_20261, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_20261, RCID_PEPPY); } else { func_80048AC0(3); } @@ -2095,15 +2095,15 @@ void func_i6_8019EE60(Player* player) { case 1018: if (gTeamShields[1] != -1) { if (gTeamShields[1] == 0) { - func_800BA808(gMsg_ID_20340, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20340, RCID_ROB64); break; } } else { - func_800BA808(gMsg_ID_20331, RCID_ROB64); + Radio_PlayMessage(gMsg_ID_20331, RCID_ROB64); break; } if (gHitCount >= 100) { - func_800BA808(gMsg_ID_20262, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_20262, RCID_FALCO); } else { func_80048AC0(1); } diff --git a/src/overlays/ovl_i6/fox_ve2.c b/src/overlays/ovl_i6/fox_ve2.c index 5df15012..288e72fa 100644 --- a/src/overlays/ovl_i6/fox_ve2.c +++ b/src/overlays/ovl_i6/fox_ve2.c @@ -93,7 +93,7 @@ void func_i6_80196314(Actor* actor) { } } if (D_8015F928 == 80) { - func_800BA808(gMsg_ID_19010, RCID_FOX); + Radio_PlayMessage(gMsg_ID_19010, RCID_FOX); } break; case 2: @@ -148,22 +148,22 @@ void func_i6_80196314(Actor* actor) { switch (D_8015F908) { case 860: - func_800BA808(gMsg_ID_19200, RCID_WOLF); + Radio_PlayMessage(gMsg_ID_19200, RCID_WOLF); break; case 760: - func_800BA808(gMsg_ID_19210, RCID_LEON); + Radio_PlayMessage(gMsg_ID_19210, RCID_LEON); break; case 620: - func_800BA808(gMsg_ID_19220, RCID_PIGMA); + Radio_PlayMessage(gMsg_ID_19220, RCID_PIGMA); break; case 480: - func_800BA808(gMsg_ID_19230, RCID_ANDREW); + Radio_PlayMessage(gMsg_ID_19230, RCID_ANDREW); break; case 350: - func_800BA808(gMsg_ID_19240, RCID_FOX); + Radio_PlayMessage(gMsg_ID_19240, RCID_FOX); break; case 220: - func_800BA808(gMsg_ID_19250, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_19250, RCID_FALCO); break; } } @@ -431,16 +431,16 @@ void func_i6_80196D88(Player* player) { break; } if (player->timer_1FC == 150) { - func_800BA808(gMsg_ID_8215, RCID_FOX); + Radio_PlayMessage(gMsg_ID_8215, RCID_FOX); func_8001D444(0, 0x803E, 0, 0xFF); } if (player->timer_1FC == 1) { if ((gTeamShields[2] > 0) || (gTeamShields[1] > 0) || (gTeamShields[3] > 0)) { - func_800BA808(gMsg_ID_8230, RCID_FALCO); - func_800BA808(gMsg_ID_8220, RCID_PEPPY); - func_800BA808(gMsg_ID_8240, RCID_SLIPPY); + Radio_PlayMessage(gMsg_ID_8230, RCID_FALCO); + Radio_PlayMessage(gMsg_ID_8220, RCID_PEPPY); + Radio_PlayMessage(gMsg_ID_8240, RCID_SLIPPY); } else { - func_800BA808(gMsg_ID_8205, RCID_FOX); + Radio_PlayMessage(gMsg_ID_8205, RCID_FOX); } } D_801779A0 = player->pos.x; diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index e54e2e7e..6faacd2b 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -1116,7 +1116,7 @@ void func_menu_8018994C(void) { if (D_menu_801B82B8 == 638) { Audio_PlaySfx(0x11030010, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_PlaySfx(0x31024059, D_menu_801B8658.unk_24, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_800BA808(gMsg_ID_60, RCID_ROB64_TITLE); + Radio_PlayMessage(gMsg_ID_60, RCID_ROB64_TITLE); } if (D_menu_801B82B8 == 838) { diff --git a/yamls/us/overlays.yaml b/yamls/us/overlays.yaml index bfe21f77..4dd6d573 100644 --- a/yamls/us/overlays.yaml +++ b/yamls/us/overlays.yaml @@ -91,7 +91,7 @@ - [0xE69230, data, fox_fo] - [0xE69310, data, fox_bo] - [0xE69540, data, fox_ka] - - [0xE69910, data, fox_sz] + - [0xE69910, .data, fox_sz] - [0xE69B30, .rodata, fox_i4] - [0xE69B70, .rodata, fox_fo] - [0xE69D70, .rodata, fox_bo] @@ -100,7 +100,7 @@ - { start: 0xE6A810, type: .bss, vram: 0x801A03C0, name: fox_i4 } - { type: bss, vram: 0x801A03D0, name: fox_bo } - { type: bss, vram: 0x801A0540, name: fox_ka } - - { type: bss, vram: 0x801A0560, name: fox_sz } + - { type: .bss, vram: 0x801A0560, name: fox_sz } - name: ovl_i5 type: code