diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-30 18:45:14 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-30 18:45:14 -0700 |
| commit | 9b50e911c8f1dff9a35c8ea43fada7401c7c8c76 (patch) | |
| tree | 6c7200a7241a55c7834574a1065e6a7fe0f27794 /src/menu.c | |
| parent | 302e43fd9124a85d65a91e9a1a32635d87941036 (diff) | |
clean up sound code
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/menu.c b/src/menu.c index ab7aae955..ae9213785 100644 --- a/src/menu.c +++ b/src/menu.c @@ -4,6 +4,7 @@ #include "text.h" #include "songs.h" #include "text_window.h" +#include "sound.h" struct Menu { @@ -250,7 +251,7 @@ s8 ProcessMenuInput(void) { if (gMain.newKeys & A_BUTTON) { - audio_play(SE_SELECT); + PlaySE(SE_SELECT); if (gMenu.menu_field_7) sub_8072DEC(); return gMenu.cursorPos; @@ -265,13 +266,13 @@ s8 ProcessMenuInput(void) if (gMain.newKeys & DPAD_UP) { - audio_play(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor(-1); return -2; } else if (gMain.newKeys & DPAD_DOWN) { - audio_play(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor(1); return -2; } @@ -285,7 +286,7 @@ s8 ProcessMenuInputNoWrap(void) if (gMain.newKeys & A_BUTTON) { - audio_play(SE_SELECT); + PlaySE(SE_SELECT); if (gMenu.menu_field_7) sub_8072DEC(); return gMenu.cursorPos; @@ -301,13 +302,13 @@ s8 ProcessMenuInputNoWrap(void) if (gMain.newKeys & DPAD_UP) { if (cursorPos != MoveMenuCursorNoWrap(-1)) - audio_play(SE_SELECT); + PlaySE(SE_SELECT); return -2; } else if (gMain.newKeys & DPAD_DOWN) { if (cursorPos != MoveMenuCursorNoWrap(1)) - audio_play(SE_SELECT); + PlaySE(SE_SELECT); return -2; } @@ -500,7 +501,7 @@ s8 sub_80727CC(void) { if (gMenu.menu_field_7) sub_8072DEC(); - audio_play(SE_SELECT); + PlaySE(SE_SELECT); return GetMenuCursorPos(); } @@ -513,25 +514,25 @@ s8 sub_80727CC(void) if (gMain.newKeys & DPAD_UP) { - audio_play(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(-gMenu.width); return -2; } else if (gMain.newKeys & DPAD_DOWN) { - audio_play(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(gMenu.width); return -2; } else if (gMain.newKeys & DPAD_LEFT) { - audio_play(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(-1); return -2; } else if (gMain.newKeys & DPAD_RIGHT) { - audio_play(SE_SELECT); + PlaySE(SE_SELECT); MoveMenuCursor4(1); return -2; } |