mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-10 02:35:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link m_mscore_ovl

Browse Source
This commit is contained in:
Cuyler36
2024-10-28 02:50:45 -04:00
parent 316bcc1fb5
commit 68f332edbf
9 changed files with 653 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/audio_defs.h
+16 -4
View File
@@ -52,11 +52,22 @@ typedef enum audio_sound_effects {
NA_SE_DRAWER_SHUT = 0x3A,
NA_SE_ITEM_GET = 0x40,
NA_SE_NOTE_G_LOW = MONO(0x42),
NA_SE_NOTE_A_LOW = MONO(0x43),
NA_SE_NOTE_B_LOW = MONO(0x44),
NA_SE_NOTE_C_LOW = MONO(0x45),
NA_SE_NOTE_D_LOW = MONO(0x46),
NA_SE_NOTE_E_LOW = MONO(0x47),
NA_SE_NOTE_F_LOW = MONO(0x48),
NA_SE_NOTE_G = MONO(0x49),
NA_SE_NOTE_A = MONO(0x4A),
NA_SE_NOTE_B = MONO(0x4B),
NA_SE_NOTE_C = MONO(0x4C),
NA_SE_NOTE_D = MONO(0x4D),
NA_SE_NOTE_E = MONO(0x4E),
NA_SE_NOTE_RANDOM = MONO(0x4F),
NA_SE_47 = 0x47,
NA_SE_MONEY0 = 0x49,
NA_SE_MONEY1,
NA_SE_MONEY2,
NA_SE_COIN,
NA_SE_COIN = 0x4C,
NA_SE_TEMOCHI_KAZAGURUMA,
NA_SE_REGISTER = 0x50,
@@ -101,6 +112,7 @@ typedef enum audio_sound_effects {
NA_SE_HANABI2 = HANABI(0x111),
NA_SE_HANABI3 = HANABI(0x112),
NA_SE_EAT = 0x113,
NA_SE_114 = 0x114,
NA_SE_11B = 0x11B,
NA_SE_WEAR = 0x11C,
include/m_bgm.h
+1 -1
View File
@@ -12,7 +12,7 @@ extern "C" {
enum {
mBGM_PAUSE_0,
mBGM_PAUSE_1,
mBGM_PAUSE_2,
mBGM_PAUSE_MSCORE,
mBGM_PAUSE_NOTICE,
mBGM_PAUSE_4,
mBGM_PAUSE_STOP,
include/m_mscore_ovl.h
+13
View File
@@ -2,11 +2,24 @@
#define M_MSCORE_OVL_H
#include "types.h"
#include "m_mscore_ovl_h.h"
#include "m_submenu.h"
#ifdef __cplusplus
extern "C" {
#endif
struct mscore_ovl_s {
u8 melody[16];
int cursor_idx;
int anim_frame;
int wait_timer;
s16 menu_idx;
s16 scale_dir;
f32 scale;
u8* unused_segment_p; // only used in DnM
};
extern void mMS_mscore_ovl_construct(Submenu* submenu);
extern void mMS_mscore_ovl_destruct(Submenu* submenu);
extern void mMS_mscore_ovl_set_proc(Submenu* submenu);
include/m_mscore_ovl_h.h
+2
View File
@@ -7,6 +7,8 @@
extern "C" {
#endif
typedef struct mscore_ovl_s mMS_Ovl_c;
#ifdef __cplusplus
}
#endif
include/m_submenu_ovl.h
+2 -1
View File
@@ -37,6 +37,7 @@
#include "m_gba_ovl_h.h"
#include "m_cpedit_ovl_h.h"
#include "m_cpwarning_ovl_h.h"
#include "m_mscore_ovl_h.h"
#ifdef __cplusplus
extern "C" {
@@ -187,7 +188,7 @@ struct submenu_overlay_s {
/* 0x9A4 */ mEE_Ovl_c* editEndChk_ovl;
/* 0x9A8 */ mWR_Ovl_c* warning_ovl;
/* 0x9AC */ mRP_Ovl_c* repay_ovl;
/* 0x9B0 */ void* _9B0;
/* 0x9B0 */ mMS_Ovl_c* mscore_ovl;
/* 0x9B4 */ mMP_Overlay_c* map_ovl;
/* 0x9B8 */ mNT_Ovl_c* notice_ovl;
/* 0x9BC */ mBR_Ovl_c* birthday_ovl;