fix missing menu sounds

RenaKunisaki · Apr 3, 2021 · d108531 · d108531
1 parent 51ef4de
commit d108531
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/amethyst/src/menu.c b/amethyst/src/menu.c
@@ -74,6 +74,7 @@ void genericMenu_run(Menu *self) {
             while(self->items[sel].name) sel++;
         }
         self->selected = sel - 1;
+        audioPlaySound(NULL, MENU_MOVE_SOUND);
     }
     else if(controllerStates[0].stickY < -MENU_ANALOG_STICK_THRESHOLD
     ||      controllerStates[0].substickY < -MENU_CSTICK_THRESHOLD) { //down
@@ -82,6 +83,7 @@ void genericMenu_run(Menu *self) {
         sel++;
         if(!self->items[sel].name) sel = 0;
         self->selected = sel;
+        audioPlaySound(NULL, MENU_MOVE_SOUND);
     }
     else if(controllerStates[0].stickX > MENU_ANALOG_STICK_THRESHOLD
     ||      controllerStates[0].substickX > MENU_CSTICK_THRESHOLD) { //right

diff --git a/amethyst/src/menu.h b/amethyst/src/menu.h
@@ -7,6 +7,7 @@
 #define MENU_TEXTBOX_ID 0x93 //same as game uses for HUD
 #define MENU_LINE_HEIGHT 18
 #define MENU_ADJUST_SOUND 0xF4 //generic adjustment sound effect ID
+#define MENU_MOVE_SOUND 0xF4 //sound ID for moving cursor
 #define MENU_OPEN_SOUND 0xFC //submenu open sound effect ID
 #define MENU_CLOSE_SOUND 0xFC //submenu close sound effect ID
 #define MENU_FAIL_SOUND 0xFD //"can't use this item" sound

diff --git a/amethyst/src/menuMain.c b/amethyst/src/menuMain.c
@@ -4,12 +4,13 @@
 
 void mainMenu_close(const Menu *self) {
     //Close function for main menu
-    DPRINT("Close main menu");
+    //DPRINT("Close main menu");
     menuState = MENU_CLOSING;
     menuAnimFrame = MENU_ANIM_NUM_FRAMES;
     if(!(menuPrevGameFlags & MENU_FLAG_TIME_STOPPED)) timeStop = 0;
     if(!(menuPrevGameFlags & MENU_FLAG_PAUSE_DISABLED)) pauseDisabled = 0;
     activeTimerFlags = menuPrevTimerFlags;
+    audioPlaySound(NULL, MENU_CLOSE_SOUND);
 }
 
 void mainSubMenu_close(const Menu *self) {