Skip to content

Commit 798ee75

Browse files
committed
Fixed music not working in Slippi netplay (Woops)
1 parent 412b875 commit 798ee75

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

source/melee.lua

+7-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,13 @@ MENU_ALL_STAR_MODE = 0x05
189189

190190
MENU_DEBUG = 0x06
191191
MENU_SOUND_TEST = 0x07
192-
MENU_VS_UNKNOWN = 0x08
192+
193+
MENU_VS_UNKNOWN = 0x08 -- SLIPPI UNRANKED
194+
MENU_VS_UNKNOWN_CSS = 0x00
195+
MENU_VS_UNKNOWN_SSS = 0x01
196+
MENU_VS_UNKNOWN_INGAME = 0x02
197+
MENU_VS_UNKNOWN_POSTGAME = 0x04
198+
193199
MENU_UNKOWN_1 = 0x09
194200
MENU_CAMERA_MODE = 0x0A
195201
MENU_TROPHY_GALLERY = 0x0B

source/modules/games/GALE01-2.lua

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ local player_static_addresses = {
4848
0x80453F10, -- Player 2
4949
0x80454DA0, -- Player 3
5050
0x80455C30, -- Player 4
51+
0x80456AC0, -- Player 5
52+
0x80457950, -- Player 6
5153
}
5254

5355
local player_static_struct = {

source/music.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function music.isInGame()
8484
--return memory.menu_minor % 2 == 0
8585
return true
8686
end
87-
if memory.menu_major == MENU_VS_MODE then
87+
if memory.menu_major == MENU_VS_MODE or memory.menu_major == MENU_VS_UNKNOWN then
8888
return memory.menu_minor == MENU_VS_INGAME
8989
end
9090
if memory.menu_major >= MENU_TRAINING_MODE and memory.menu_major <= MENU_STAMINA_MODE or memory.menu_major == MENU_FIXED_CAMERA_MODE then
@@ -141,7 +141,7 @@ function music.isInMenus()
141141
if memory.menu_major == MENU_MAIN_MENU then
142142
return true
143143
end
144-
if memory.menu_major == MENU_VS_MODE then
144+
if memory.menu_major == MENU_VS_MODE or memory.menu_major == MENU_VS_UNKNOWN then
145145
return memory.menu_minor == MENU_VS_CSS or memory.menu_minor == MENU_VS_SSS
146146
end
147147
if memory.menu_major >= MENU_TRAINING_MODE and memory.menu_major <= MENU_STAMINA_MODE or memory.menu_major == MENU_FIXED_CAMERA_MODE then

0 commit comments

Comments
 (0)