summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNieDzejkob <niedzejkob@gmail.com>2017-05-15 16:19:18 +0200
committerNieDzejkob <niedzejkob@gmail.com>2017-05-21 19:33:00 +0200
commitd0549706007b1a24ffd75ba40594e70dda3ee123 (patch)
treec93b4fd5a53b9897b0ce974d031069434885a622 /include
parent2774cb1bae07fe079c7faf53f697ea78ac8e76d4 (diff)
Rename PlaySE to PlaySoundEffect - wide code is good code, daycare.c renames, match sub_80B92AC in record_mixing
Diffstat (limited to 'include')
-rw-r--r--include/global.h8
-rw-r--r--include/sound.h8
2 files changed, 10 insertions, 6 deletions
diff --git a/include/global.h b/include/global.h
index 957181d45..df95ce529 100644
--- a/include/global.h
+++ b/include/global.h
@@ -464,6 +464,10 @@ struct GabbyAndTyData {
u8 valB;
};
+typedef struct RecordMixing_UnknownStruct {
+ u8 data[0x38];
+} RecordMixing_UnknownStruct;
+
struct SaveBlock1 /* 0x02025734 */
{
/*0x00*/ struct Coords16 pos;
@@ -539,8 +543,8 @@ struct SaveBlock1 /* 0x02025734 */
/*0x2DFC*/ u8 filler_2DFC[0x8];
/*0x2E04*/ SB_Struct sbStruct;
/*0x2F9C*/ struct BoxPokemon daycareData[2];
- /*0x303C*/ u8 filler_303C[0x38];
- /*0x3074*/ u8 filler_3074[0x42];
+ /*0x303C*/ struct RecordMixing_UnknownStruct filler_303C[2];
+ /*0x30AC*/ u8 filler_30AC[0xA];
/*0x30B6*/ u8 filler_30B6;
/*0x30B7*/ u8 filler_30B7[1];
/*0x30B8*/ u8 linkBattleRecords[5][16];
diff --git a/include/sound.h b/include/sound.h
index 283b2b1f9..a720c82b1 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -34,10 +34,10 @@ void StopCry(void);
bool8 IsCryPlayingOrClearCrySongs(void);
bool8 IsCryPlaying(void);
void PlayBGM(u16 songNum);
-void PlaySE(u16 songNum);
-void PlaySE12WithPanning(u16 songNum, s8 pan);
-void PlaySE1WithPanning(u16 songNum, s8 pan);
-void PlaySE2WithPanning(u16 songNum, s8 pan);
+void PlaySoundEffect(u16 songNum);
+void PlaySoundEffect12WithPanning(u16 songNum, s8 pan);
+void PlaySoundEffect1WithPanning(u16 songNum, s8 pan);
+void PlaySoundEffect2WithPanning(u16 songNum, s8 pan);
void SE12PanpotControl(s8 pan);
bool8 IsSEPlaying(void);
bool8 IsBGMPlaying(void);