mirror of
https://github.com/HarbourMasters/Starship
synced 2026-09-09 12:44:02 -04:00
Actor Docs (#270)
* Docs * actor timer_04C -> work_04C * Actor & Boss unk_04A -> work_04A * actor & boss unk_048 -> work_048 * actor & boss unk_046 -> work_046 * boss unk_044 -> work_044 * actor event docs * ActorEvent docs * name all Event Actor IDs * EVID names in EventActorInfo comments * refactor EVC_PASSED_ALL_RINGS by @inspectredc * clarification comment * some option docs * audio enums and macros * some audio renamings
This commit is contained in:
committed by
GitHub
parent
669fff8759
commit
e82019fa2b
@@ -4,7 +4,7 @@
|
||||
#include "sf64audio_provisional.h"
|
||||
|
||||
extern s32 spectrumAnalyzerMode;
|
||||
extern bool D_menu_801B9320;
|
||||
extern bool sMusicPlaying;
|
||||
extern s32 D_menu_801B9244;
|
||||
extern OptionId D_menu_801B9124;
|
||||
extern s32 D_menu_801B912C;
|
||||
@@ -163,11 +163,11 @@ void Jukebox_Update(void) {
|
||||
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
|
||||
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
|
||||
AUDIO_PLAY_SFX(sfx, sfxSource, 4);
|
||||
D_menu_801B9320 = true;
|
||||
sMusicPlaying = true;
|
||||
}
|
||||
|
||||
if (contPress->button & B_BUTTON) {
|
||||
if (!D_menu_801B9320) {
|
||||
if (!sMusicPlaying) {
|
||||
AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
|
||||
AUDIO_PLAY_BGM(NA_BGM_SELECT);
|
||||
gDrawMode = DRAW_NONE;
|
||||
@@ -180,7 +180,7 @@ void Jukebox_Update(void) {
|
||||
Audio_KillSfxBySource(sfxSource);
|
||||
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
|
||||
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
|
||||
D_menu_801B9320 = false;
|
||||
sMusicPlaying = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -345,7 +345,7 @@ void Spawner(void) {
|
||||
sObjType++;
|
||||
switch (sObjType) {
|
||||
case OBJ_SPAWN_EVENT:
|
||||
sObjId = EVID_0;
|
||||
sObjId = EVID_VENOM_FIGHTER_1;
|
||||
break;
|
||||
case OBJ_SPAWN_SCENERY:
|
||||
sObjId = OBJ_SCENERY_CO_STONE_ARCH;
|
||||
|
||||
Reference in New Issue
Block a user