diff options
| author | Henny022p <info@henny022.de> | 2021-03-23 00:33:29 +0100 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2021-03-23 00:33:29 +0100 |
| commit | cc206a73abd20eac777914a095963bb1395ceea4 (patch) | |
| tree | 6ebc120adbe4f12926a8247bf821b30e4945c707 /include | |
| parent | 5cebf089fd0b34e017aeb36d540bfce051a4969c (diff) | |
naming and moving stuff
Diffstat (limited to 'include')
| -rw-r--r-- | include/audio.h | 7 | ||||
| -rw-r--r-- | include/functions.h | 1 | ||||
| -rw-r--r-- | include/gba/m4a.h | 8 | ||||
| -rw-r--r-- | include/structures.h | 17 |
4 files changed, 32 insertions, 1 deletions
diff --git a/include/audio.h b/include/audio.h index ad600283..06d80d67 100644 --- a/include/audio.h +++ b/include/audio.h @@ -1,6 +1,10 @@ #ifndef AUDIO_H #define AUDIO_H +#include "global.h" + +#define NUM_BGM 99 + typedef enum { SFX_NONE, BGM_CASTLE_TOURNAMENT, @@ -258,4 +262,7 @@ typedef enum { SONG_RESET_UNK = 0x80100000, } Sound; +#define SOUND_REQ_ALL_STOP 0x80010000 +void SoundReq(u32 arg); + #endif // AUDIO_H diff --git a/include/functions.h b/include/functions.h index 5c62cced..74c0471e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -11,7 +11,6 @@ #include "structures.h" // Identified - to be sorted into header files -extern void SoundReq(u32); extern void ShowNPCDialogue(Entity*, Dialog*); extern void DoFade(u32, u32); extern u32 CheckKinstoneFused(u32); diff --git a/include/gba/m4a.h b/include/gba/m4a.h index d27cafdd..745bc801 100644 --- a/include/gba/m4a.h +++ b/include/gba/m4a.h @@ -60,4 +60,12 @@ typedef struct MusicPlayer { extern const MusicPlayer gMPlayTable[]; extern const Song gSongTable[]; +void m4aSongNumStart(u16 n); +void m4aSongNumStartOrContinue(u16 n); +void m4aSongNumStop(u16 n); +void m4aMPlayAllStop(void); +void m4aMPlayTempoControl(MusicPlayerInfo* mplayInfo, u16 tempo); +void m4aSoundVSyncOn(void); +void m4aSoundVSyncOff(void); + #endif // GUARD_M4A_INTERNAL_H diff --git a/include/structures.h b/include/structures.h index d47ee7a1..f35da59f 100644 --- a/include/structures.h +++ b/include/structures.h @@ -182,6 +182,23 @@ typedef struct { extern EntityHandler gUnk_03003DC0; +typedef struct struct_02021EE0 { + u16 unk_00; + u8 unk_02; + u8 unk_03; + u16 unk_04; + s16 unk_06; + s16 unk_08; + s16 unk_0a; + u16 unk_0c; + u16 unk_0e; + u16 unk_10; + u16 unk_12; + u16 currentBgm; +} struct_02021EE0; + +extern struct_02021EE0 gUnk_02021EE0; + extern u8 gUnk_02022740[]; extern u8 gUnk_02034490[]; |