etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 13:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added okey-dokey sound and transition to host menu

Browse source
This commit is contained in:
MysterD 2021-08-14 18:45:25 -07:00
parent f71cb26f64
commit d911c09c25
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/level_update.c
View file

@ -54,6 +54,7 @@ extern s8 sReceivedLoadedActNum;
u8 gRejectInstantWarp = 0; u8 gRejectInstantWarp = 0;
s16 gChangeLevel = -1; s16 gChangeLevel = -1;
s16 gChangeLevelTransition = -1;
s16 gChangeAreaIndex = -1; s16 gChangeAreaIndex = -1;
s16 gChangeActNum = -1; s16 gChangeActNum = -1;
@ -1245,6 +1246,15 @@ s32 update_level(void) {
sTransitionUpdate = NULL; sTransitionUpdate = NULL;
changeLevel = gChangeLevel; changeLevel = gChangeLevel;
gChangeLevel = -1; gChangeLevel = -1;
gChangeLevelTransition = -1;
return changeLevel;
} else if (!gWarpTransition.isActive && sDelayedWarpOp == WARP_OP_NONE && gChangeLevelTransition != -1) {
gHudDisplay.flags = HUD_DISPLAY_NONE;
sTransitionTimer = 0;
sTransitionUpdate = NULL;
changeLevel = gChangeLevelTransition;
gChangeLevel = -1;
gChangeLevelTransition = -1;
return changeLevel; return changeLevel;
} }

9
src/pc/djui/djui_panel_host_message.c
View file

@ -6,6 +6,8 @@
#include "src/pc/configfile.h" #include "src/pc/configfile.h"
#include "pc/utils/misc.h" #include "pc/utils/misc.h"
#include "src/game/level_update.h" #include "src/game/level_update.h"
#include "audio/external.h"
#include "audio_defines.h"
#ifdef DISCORD_SDK #ifdef DISCORD_SDK
static char* sWarningDiscord = "\ static char* sWarningDiscord = "\
@ -40,8 +42,11 @@ void djui_panel_host_message_do_host(struct DjuiBase* caller) {
#endif #endif
network_init(NT_SERVER); network_init(NT_SERVER);
fake_lvl_init_from_save_file(); fake_lvl_init_from_save_file();
extern s16 gChangeLevel; extern s16 gChangeLevelTransition;
gChangeLevel = 16; gChangeLevelTransition = 16;
play_sound(SOUND_MENU_STAR_SOUND_OKEY_DOKEY, gDefaultSoundArgs);
extern void play_transition(s16 transType, s16 time, u8 red, u8 green, u8 blue);
play_transition(0x09, 0x14, 0x00, 0x00, 0x00);
} }
void djui_panel_host_message_create(struct DjuiBase* caller) { void djui_panel_host_message_create(struct DjuiBase* caller) {