Skip to content

Commit 8443c3f

Browse files
committed
Allow music to work in adventure mode (#52)
1 parent c7c7212 commit 8443c3f

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

source/melee.lua

+11-1
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,25 @@ MENU_CLASSIC_MODE = 0x03
6262

6363
MENU_ADVENTURE_MODE = 0x04
6464

65+
MENU_ADVENTURE_MUSHROOM_KINGDOM_INTRO = 0x00
66+
MENU_ADVENTURE_MUSHROOM_KINGDOM = 0x01
67+
MENU_ADVENTURE_MUSHROOM_KINGDOM_LUIGI = 0x02
68+
MENU_ADVENTURE_MUSHROOM_KINGDOM_BATTLE = 0x03
69+
70+
MENU_ADVENTURE_MUSHROOM_KONGO_JUNGLE_INTRO = 0x08
71+
MENU_ADVENTURE_MUSHROOM_KONGO_JUNGLE_TINY_BATTLE = 0x09
72+
MENU_ADVENTURE_MUSHROOM_KONGO_JUNGLE_GIANT_BATTLE = 0x0A
73+
6574
MENU_ADVENTURE_UNDERGROUND_MAZE_INTRO = 0x10
6675
MENU_ADVENTURE_UNDERGROUND_MAZE = 0x11
76+
MENU_ADVENTURE_HYRULE_TEMPLE_BATTLE = 0x12
6777

6878
MENU_ADVENTURE_BRINSTAR_INTRO = 0x18
6979
MENU_ADVENTURE_BRINSTAR = 0x19
7080

7181
MENU_ADVENTURE_ESCAPE_ZEBES_INTRO = 0x1A
7282
MENU_ADVENTURE_ESCAPE_ZEBES = 0x1B
73-
MENU_ADVENTURE_ESCAPE_ZEBES_END = 0x1C
83+
MENU_ADVENTURE_ESCAPE_ZEBES_ESCAPE = 0x1C
7484

7585
MENU_ADVENTURE_GREEN_GREENS_INTRO = 0x20
7686
MENU_ADVENTURE_GREEN_GREENS_KIRBY_BATTLE = 0x21

source/music.lua

+25
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,31 @@ function music.isInGame()
9898
-- Odd = playing the match
9999
return memory.menu_minor % 2 == 1
100100
end
101+
if memory.menu_major == MENU_ADVENTURE_MODE then
102+
return
103+
memory.menu_minor == MENU_ADVENTURE_MUSHROOM_KINGDOM or
104+
memory.menu_minor == MENU_ADVENTURE_MUSHROOM_KINGDOM_BATTLE or
105+
memory.menu_minor == MENU_ADVENTURE_MUSHROOM_KONGO_JUNGLE_TINY_BATTLE or
106+
memory.menu_minor == MENU_ADVENTURE_MUSHROOM_KONGO_JUNGLE_GIANT_BATTLE or
107+
memory.menu_minor == MENU_ADVENTURE_UNDERGROUND_MAZE or
108+
memory.menu_minor == MENU_ADVENTURE_HYRULE_TEMPLE_BATTLE or
109+
memory.menu_minor == MENU_ADVENTURE_BRINSTAR or
110+
memory.menu_minor == MENU_ADVENTURE_ESCAPE_ZEBES or
111+
memory.menu_minor == MENU_ADVENTURE_GREEN_GREENS_KIRBY_BATTLE or
112+
memory.menu_minor == MENU_ADVENTURE_GREEN_GREENS_KIRBY_TEAM_BATTLE or
113+
memory.menu_minor == MENU_ADVENTURE_GREEN_GREENS_GIANT_KIRBY_BATTLE or
114+
memory.menu_minor == MENU_ADVENTURE_CORNARIA_BATTLE_1 or
115+
memory.menu_minor == MENU_ADVENTURE_CORNARIA_BATTLE_2 or
116+
memory.menu_minor == MENU_ADVENTURE_CORNARIA_BATTLE_3 or
117+
memory.menu_minor == MENU_ADVENTURE_POKEMON_STADIUM_BATTLE or
118+
memory.menu_minor == MENU_ADVENTURE_FZERO_GRAND_PRIX_RACE or
119+
memory.menu_minor == MENU_ADVENTURE_FZERO_GRAND_PRIX_BATTLE or
120+
memory.menu_minor == MENU_ADVENTURE_ONETT_BATTLE or
121+
memory.menu_minor == MENU_ADVENTURE_ICICLE_MOUNTAIN_CLIMB or
122+
memory.menu_minor == MENU_ADVENTURE_BATTLEFIELD_BATTLE or
123+
memory.menu_minor == MENU_ADVENTURE_BATTLEFIELD_METAL_BATTLE or
124+
memory.menu_minor == MENU_ADVENTURE_FINAL_DESTINATION_BATTLE
125+
end
101126
if memory.menu_major == MENU_TARGET_TEST then
102127
return memory.menu_minor == MENU_TARGET_TEST_INGAME
103128
end

0 commit comments

Comments
 (0)