mirror of
https://github.com/HarbourMasters/Starship
synced 2026-08-18 22:17:34 -04:00
3DS VERSION SfxIds applied to code (#232)
* NA_SE_ARWING_BOOST is everywhere * man, there's just no end of these sfxIds * NA_SE_GREATFOX_ENGINE everywhere * NA_SE_OB_DAMAGE_M, another SfxId with massive usage * massive usage of NA_SE_EN_REFLECT * massive usage of NA_SE_EN_EXPLOSION_S * massive usage of NA_SE_EN_EXPLOSION_M * NA_SE_ARWING_ENGINE_FG * save progress * MISSION ACCOMPLISHED
This commit is contained in:
committed by
GitHub
parent
65cb9e270e
commit
44c9eadbc2
+11
-11
@@ -336,7 +336,7 @@ void func_versus_800BDE44(void) {
|
||||
} else {
|
||||
D_80178810[i] = 0;
|
||||
}
|
||||
AUDIO_PLAY_SFX(0x49004007, gDefaultSfxSource, 4);
|
||||
AUDIO_PLAY_SFX(NA_SE_COUNT_UP, gDefaultSfxSource, 4);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -362,12 +362,12 @@ s32 Versus_UpdateTimer(void) {
|
||||
|
||||
if (D_versus_80178768[1] >= 0) {
|
||||
if ((D_versus_80178768[0] == 0) && (D_versus_80178768[1] < 15) && (D_versus_80178768[1] >= 0)) {
|
||||
AUDIO_PLAY_SFX(0x4900C02A, gDefaultSfxSource, 4);
|
||||
AUDIO_PLAY_SFX(NA_SE_COUNTDOWN, gDefaultSfxSource, 4);
|
||||
}
|
||||
} else {
|
||||
// clang-format off
|
||||
if (D_versus_80178768[0] == 0) {\
|
||||
AUDIO_PLAY_SFX(0x4900D036, gDefaultSfxSource, 4);\
|
||||
AUDIO_PLAY_SFX(NA_SE_TIME_OVER, gDefaultSfxSource, 4);\
|
||||
}
|
||||
// clang-format on
|
||||
D_versus_80178768[1] *= -1;
|
||||
@@ -463,19 +463,19 @@ s32 func_versus_800BE564(void) {
|
||||
}
|
||||
|
||||
if (sUnlockLandmaster && (D_80178780[i] == 0) && (gControllerPress[i].button & B_BUTTON)) {
|
||||
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4);
|
||||
AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
|
||||
D_80178780[i] = 2;
|
||||
}
|
||||
|
||||
if (sUnlockOnFoot && (D_80178780[i] == 0) &&
|
||||
((gControllerPress[i].button & L_CBUTTONS) || (gControllerPress[i].button & D_CBUTTONS) ||
|
||||
(gControllerPress[i].button & U_CBUTTONS) || (gControllerPress[i].button & R_CBUTTONS))) {
|
||||
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4);
|
||||
AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
|
||||
D_80178780[i] = 3;
|
||||
}
|
||||
|
||||
if ((D_80178780[i] == 0) && (gControllerPress[i].button & A_BUTTON)) {
|
||||
AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4);
|
||||
AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
|
||||
D_80178780[i] = 1;
|
||||
}
|
||||
|
||||
@@ -598,10 +598,10 @@ s32 func_versus_800BEF00(void) {
|
||||
if (D_80178794 == 0) {
|
||||
D_80178790--;
|
||||
if (D_80178790 != 0) {
|
||||
AUDIO_PLAY_SFX(0x49000008, gDefaultSfxSource, 4);
|
||||
AUDIO_PLAY_SFX(NA_SE_READY, gDefaultSfxSource, 4);
|
||||
ret = 0;
|
||||
} else {
|
||||
AUDIO_PLAY_SFX(0x49000009, gDefaultSfxSource, 4);
|
||||
AUDIO_PLAY_SFX(NA_SE_GO, gDefaultSfxSource, 4);
|
||||
ret = 1;
|
||||
}
|
||||
D_80178794 = 30;
|
||||
@@ -1131,7 +1131,7 @@ s32 func_versus_800C07C4(void) {
|
||||
}
|
||||
|
||||
// clang-format off
|
||||
if (ret != 0) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); }
|
||||
if (ret != 0) { AUDIO_PLAY_SFX(NA_SE_CURSOR, gDefaultSfxSource, 4); }
|
||||
// clang-format on
|
||||
|
||||
return ret;
|
||||
@@ -1257,7 +1257,7 @@ bool func_versus_800C0D10(void) {
|
||||
if (cont == 4) {
|
||||
D_800D4A90 = 2;
|
||||
} else {
|
||||
AUDIO_PLAY_SFX(0x49004007, gDefaultSfxSource, 4);
|
||||
AUDIO_PLAY_SFX(NA_SE_COUNT_UP, gDefaultSfxSource, 4);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -1308,7 +1308,7 @@ s32 func_versus_800C0E78(void) {
|
||||
bool func_versus_800C107C(s32 playerNum) {
|
||||
D_80178798++;
|
||||
if (D_80178798 == 10) {
|
||||
AUDIO_PLAY_SFX(0x49004007, gDefaultSfxSource, 4);
|
||||
AUDIO_PLAY_SFX(NA_SE_COUNT_UP, gDefaultSfxSource, 4);
|
||||
D_801787B8++;
|
||||
D_80178798 = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user