add sfx to pokedex

g3headers

@@ -1 +1 @@
-Subproject commit ef2af052b8e5436da9efb035e06ee091b8d53e69
+Subproject commit 97a084e3bbd1cfc31adf94c50a045c35e1044fa0

sots-private

@@ -1 +1 @@
-Subproject commit 9591179a8d396b2343650dc1058a63b6288cea7b
+Subproject commit a62fe65e951ad5a563755d48d628f0607ab09d39

src/include/sound.h

@@ -36,30 +36,6 @@
 
 #include "types.h"
 
-typedef struct music_player_area music_player_area;
-typedef struct music_player_track music_player_track;
-typedef struct song_header song_header;
-
-typedef struct
-{
-    music_player_area *ma;
-    music_player_track *ta;
-    u32 tn;
-} m_play_table;
-
-typedef struct
-{
-    song_header *so;
-    u16 ms, me;
-} song_table;
-
-extern m_play_table mplay_table[];
-extern song_table _songtable[];
-void m4aSongNumStart(u16 songid);
-void MPlayStart_rev01(music_player_area *ma, song_header *so);
-void MPlayContinue(music_player_area *ma);
-void MPlayAllStop(void);
-
 // battle and map related stuff
 void current_map_music_set(u16);
 void current_map_music_set_to_zero(void);

src/music/battle_music_lookup.c

@@ -5,8 +5,8 @@
 #include <battle_common.h>
 #include <pokemon.h>
 #include <agb_debug.h>
-#include <sound.h>
 #include <config/core.h>
+#include <pokeagb/core/m4a.h>
 
 #define SONG_ID_SKIP_PLAY 0xFFFF
 

src/pokedex/pokedex.c

@@ -365,19 +365,22 @@ void pdex_try_advance(u8 reverse) {
     if (reverse) {
         if (pokedex_context->cursor_position_internal > 0) {
             pokedex_context->cursor_position_internal--;
+            m4aSongNumStart(600);
         } else if ((pokedex_context->cursor_position_top) > (pokedex_context->first_seen)) {
             pdex_fill_previous_slot();
             pokedex_context->cursor_position_top--;
-
             pdex_hardware_scroll(true);
+            m4aSongNumStart(600);
         }
     } else {
         if (pokedex_context->cursor_position_internal < 7) {
             pokedex_context->cursor_position_internal++;
+            m4aSongNumStart(600);
         } else if (pokedex_context->cursor_position_top < (PDEX_LAST_SHOWN - 7)) {
             pdex_fill_next_slot();
             pokedex_context->cursor_position_top++;
             pdex_hardware_scroll(false);
+            m4aSongNumStart(600);
         }
     }
 
@@ -432,9 +435,11 @@ void pdex_loop(u8 tid) {
         if(super.buttons_new & KEY_A)
         {
             pokedex_context->state = 15;
+            m4aSongNumStart(5);
         }
         if (super.buttons_new & KEY_B) {
             pokedex_context->state = 10;
+            m4aSongNumStart(601);
         }
         if ((super.buttons_new & KEY_DOWN) || (super.buttons_held & KEY_DOWN)) {
             pdex_try_advance(false);
@@ -502,4 +507,4 @@ void pdex_load(void) {
     pokedex_context->state = 0;
     task_add(pdex_loop, 0);
     set_callback2(pdex_cb_handler);
-}
+}

src/pokedex/pokedex_region.c

@@ -162,28 +162,38 @@ void region_loop(u8 tid) {
     case 3:
         switch (super.buttons_new) {
         case KEY_RIGHT:
-            if (pokedex_context->region_selected < 6)
+            if (pokedex_context->region_selected < 6) {
                 pokedex_context->region_selected++;
+                m4aSongNumStart(102);
+            }
             break;
         case KEY_DOWN:
-            if (pokedex_context->region_selected < 3)
+            if (pokedex_context->region_selected < 3) {
                 pokedex_context->region_selected += 3;
+                m4aSongNumStart(102);
+            }
             break;
         case KEY_LEFT:
-            if (pokedex_context->region_selected > 0)
+            if (pokedex_context->region_selected > 0) {
                 pokedex_context->region_selected--;
+                m4aSongNumStart(102);
+            }
             break;
         case KEY_UP:
-            if ((pokedex_context->region_selected > 2) && (pokedex_context->region_selected < 6))
+            if ((pokedex_context->region_selected > 2) && (pokedex_context->region_selected < 6)) {
                 pokedex_context->region_selected -= 3;
+                m4aSongNumStart(102);
+            }
             break;
         case KEY_A:
             fade_screen(0xFFFFFFFF, PDEX_FADEIN_SPD, 0, 16, 0x0000);
             pokedex_context->state = 10;
+            m4aSongNumStart(5);
             break;
         case KEY_B:
             fade_screen(0xFFFFFFFF, PDEX_FADEIN_SPD, 0, 16, 0x0000);
             pokedex_context->state = 11;
+            m4aSongNumStart(601);
         default:
             break;
         }
@@ -220,4 +230,4 @@ void region_select_load(void) {
     region_select_load_gfx();
     task_add(region_loop, 0);
     set_callback2(pdex_cb_handler);
-}
+}