summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_2.c8
-rw-r--r--src/battle/battle_setup.c36
-rw-r--r--src/battle/pokeball.c2
-rw-r--r--src/berry_blender.c6
-rw-r--r--src/bike.c4
-rw-r--r--src/cable_car.c2
-rw-r--r--src/cable_club.c4
-rw-r--r--src/contest.c2
-rw-r--r--src/credits.c4
-rw-r--r--src/data/battle_strings_en.h4
-rw-r--r--src/debug/sound_check_menu.c252
-rw-r--r--src/evolution_scene.c20
-rw-r--r--src/field_effect.c2
-rw-r--r--src/hall_of_fame.c2
-rw-r--r--src/main_menu.c2
-rw-r--r--src/mauville_man.c2
-rw-r--r--src/move_tutor_menu.c4
-rw-r--r--src/overworld.c24
-rw-r--r--src/party_menu.c2
-rw-r--r--src/pokemon_3.c30
-rw-r--r--src/roulette.c4
-rw-r--r--src/slot_machine.c14
-rw-r--r--src/sound.c24
-rw-r--r--src/trade.c6
24 files changed, 230 insertions, 230 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 79d60125e..11ddd6b71 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -6339,7 +6339,7 @@ void HandleEndTurn_BattleWon(void)
{
case TRAINER_CLASS_ELITE_FOUR:
case TRAINER_CLASS_CHAMPION:
- PlayBGM(BGM_KACHI5);
+ PlayBGM(MUS_KACHI5);
break;
case TRAINER_CLASS_TEAM_AQUA:
case TRAINER_CLASS_TEAM_MAGMA:
@@ -6347,13 +6347,13 @@ void HandleEndTurn_BattleWon(void)
case TRAINER_CLASS_AQUA_LEADER:
case TRAINER_CLASS_MAGMA_ADMIN:
case TRAINER_CLASS_MAGMA_LEADER:
- PlayBGM(BGM_KACHI4);
+ PlayBGM(MUS_KACHI4);
break;
case TRAINER_CLASS_LEADER:
- PlayBGM(BGM_KACHI3);
+ PlayBGM(MUS_KACHI3);
break;
default:
- PlayBGM(BGM_KACHI1);
+ PlayBGM(MUS_KACHI1);
break;
}
}
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index f53959cc2..8c5f68902 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -587,7 +587,7 @@ void ScrSpecial_StartRayquazaBattle(void)
ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
- CreateBattleStartTask(B_TRANSITION_BLUR, BGM_BATTLE34);
+ CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE34);
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
@@ -598,9 +598,9 @@ void ScrSpecial_StartGroudonKyogreBattle(void)
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
if (gGameVersion == VERSION_RUBY)
- CreateBattleStartTask(B_TRANSITION_SHARDS, BGM_BATTLE34); // GROUDON
+ CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_BATTLE34); // GROUDON
else
- CreateBattleStartTask(B_TRANSITION_RIPPLE, BGM_BATTLE34); // KYOGRE
+ CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_BATTLE34); // KYOGRE
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
@@ -610,7 +610,7 @@ void ScrSpecial_StartRegiBattle(void)
ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
- CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, BGM_BATTLE36);
+ CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_BATTLE36);
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
@@ -1172,46 +1172,46 @@ void PlayTrainerEncounterMusic(void)
switch (sub_803FC58(gTrainerBattleOpponent))
{
case TRAINER_ENCOUNTER_MUSIC_MALE:
- music = BGM_BOYEYE;
+ music = MUS_BOYEYE;
break;
case TRAINER_ENCOUNTER_MUSIC_FEMALE:
- music = BGM_GIRLEYE;
+ music = MUS_GIRLEYE;
break;
case TRAINER_ENCOUNTER_MUSIC_GIRL:
- music = BGM_SYOUJOEYE;
+ music = MUS_SYOUJOEYE;
break;
case TRAINER_ENCOUNTER_MUSIC_INTENSE:
- music = BGM_HAGESHII;
+ music = MUS_HAGESHII;
break;
case TRAINER_ENCOUNTER_MUSIC_COOL:
- music = BGM_KAKKOII;
+ music = MUS_KAKKOII;
break;
case TRAINER_ENCOUNTER_MUSIC_AQUA:
- music = BGM_AQA_0;
+ music = MUS_AQA_0;
break;
case TRAINER_ENCOUNTER_MUSIC_MAGMA:
- music = BGM_MGM0;
+ music = MUS_MGM0;
break;
case TRAINER_ENCOUNTER_MUSIC_SWIMMER:
- music = BGM_SWIMEYE;
+ music = MUS_SWIMEYE;
break;
case TRAINER_ENCOUNTER_MUSIC_TWINS:
- music = BGM_HUTAGO;
+ music = MUS_HUTAGO;
break;
case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR:
- music = BGM_SITENNOU;
+ music = MUS_SITENNOU;
break;
case TRAINER_ENCOUNTER_MUSIC_HIKER:
- music = BGM_YAMA_EYE;
+ music = MUS_YAMA_EYE;
break;
case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER:
- music = BGM_INTER_V;
+ music = MUS_INTER_V;
break;
case TRAINER_ENCOUNTER_MUSIC_RICH:
- music = BGM_TEST;
+ music = MUS_TEST;
break;
default:
- music = BGM_AYASII;
+ music = MUS_AYASII;
}
PlayNewMapMusic(music);
}
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index be2adbf1b..c619141a1 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -815,7 +815,7 @@ static void sub_8046FBC(struct Sprite *sprite)
{
gDoingBattleAnim = 0;
m4aMPlayAllStop();
- PlaySE(BGM_FANFA5);
+ PlaySE(MUS_FANFA5);
}
else if (sprite->data[4] == 315)
{
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 4531ea546..8bf669a92 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1245,7 +1245,7 @@ static void sub_804E9F8(void)
{
gBerryBlenderData->field_178 = GetCurrentMapMusic();
}
- PlayBGM(BGM_CYCLING);
+ PlayBGM(MUS_CYCLING);
break;
case 100:
Menu_DrawStdWindowFrame(0, 13, 29, 19);
@@ -1507,7 +1507,7 @@ static void sub_804F378(void)
{
gBerryBlenderData->field_178 = GetCurrentMapMusic();
}
- PlayBGM(BGM_CYCLING);
+ PlayBGM(MUS_CYCLING);
PlaySE(SE_MOTER);
Blender_ControlHitPitch();
break;
@@ -3524,7 +3524,7 @@ static void sub_8052BD0(u8 taskID)
{
if (gTasks[taskID].data[0] == 0)
{
- PlayFanfare(BGM_FANFA1);
+ PlayFanfare(MUS_FANFA1);
gTasks[taskID].data[0]++;
}
if (IsFanfareTaskInactive())
diff --git a/src/bike.c b/src/bike.c
index f0f996b6b..41090a375 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -1001,8 +1001,8 @@ void GetOnOffBike(u8 var)
else
{
SetPlayerAvatarTransitionFlags(var);
- Overworld_SetSavedMusic(BGM_CYCLING);
- Overworld_ChangeMusicTo(BGM_CYCLING);
+ Overworld_SetSavedMusic(MUS_CYCLING);
+ Overworld_ChangeMusicTo(MUS_CYCLING);
}
}
diff --git a/src/cable_car.c b/src/cable_car.c
index bae6f020a..7dcd8db1b 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -386,7 +386,7 @@ static void CableCarMainCallback_Setup(void)
break;
case 7:
BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0));
- FadeInNewBGM(BGM_ROPEWAY, 1);
+ FadeInNewBGM(MUS_ROPEWAY, 1);
sub_8123FBC(1);
gMain.state++;
break;
diff --git a/src/cable_club.c b/src/cable_club.c
index 0da23c5f3..1e1f0af07 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -766,9 +766,9 @@ static void sub_808382C(u8 taskId)
break;
case 5:
if (gLinkPlayers[0].trainerId & 1)
- current_map_music_set__default_for_battle(BGM_BATTLE32);
+ current_map_music_set__default_for_battle(MUS_BATTLE32);
else
- current_map_music_set__default_for_battle(BGM_BATTLE20);
+ current_map_music_set__default_for_battle(MUS_BATTLE20);
switch (gSpecialVar_0x8004)
{
diff --git a/src/contest.c b/src/contest.c
index fcadd8ae1..9dff08ea7 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -1584,7 +1584,7 @@ void sub_80AC2CC(u8 taskId)
{
case 0:
sub_80B1EA8(-1, 1);
- PlayFanfare(BGM_ME_ZANNEN);
+ PlayFanfare(MUS_ME_ZANNEN);
gTasks[taskId].data[10]++;
break;
case 1:
diff --git a/src/credits.c b/src/credits.c
index b99bc56bd..1a810492b 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -497,7 +497,7 @@ void sub_81439D0(void)
SetVBlankCallback(vblank_8143948);
- m4aSongNumStart(BGM_THANKFOR);
+ m4aSongNumStart(MUS_THANKFOR);
SetMainCallback2(sub_814395C);
gUnknown_02039325 = 0;
@@ -741,7 +741,7 @@ static void task_a_8144080(u8 taskIdA)
}
if (gTasks[taskIdA].data[TDA_0] == 6840)
- m4aSongNumStart(BGM_END);
+ m4aSongNumStart(MUS_END);
gTasks[taskIdA].data[TDA_0] -= 1;
}
diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h
index 67eb70ee1..7ae5467dd 100644
--- a/src/data/battle_strings_en.h
+++ b/src/data/battle_strings_en.h
@@ -747,8 +747,8 @@ const u8 BattleText_BallBrokeOhNo[] = _("Oh, no!\nThe POKéMON broke free!");
const u8 BattleText_BallBrokeAppeared[] = _("Aww!\nIt appeared to be caught!");
const u8 BattleText_BallBrokeAlmost[] = _("Aargh!\nAlmost had it!");
const u8 BattleText_BallBrokeSoClose[] = _("Shoot!\nIt was so close, too!");
-const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}\p");
-const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}{PAUSE 127}");
+const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}\p");
+const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}");
const u8 BattleText_GiveNickname[] = _("Give a nickname to the\ncaptured {STRING 3}?");
const u8 BattleText_SentToPC[] = _("{STRING 3} was sent to\n{STRING 35} PC.");
const u8 BattleText_Someone[] = _("someone’s");
diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index 1fcf52f38..d57c699da 100644
--- a/src/debug/sound_check_menu.c
+++ b/src/debug/sound_check_menu.c
@@ -19,7 +19,7 @@
// window selections
enum
{
- BGM_WINDOW,
+ MUS_WINDOW,
SE_WINDOW
};
@@ -151,7 +151,7 @@ void CB2_StartSoundCheckMenu(void)
SetMainCallback2(CB2_SoundCheckMenu);
REG_DISPCNT = 0x7140;
taskId = CreateTask(Task_InitSoundCheckMenu, 0);
- gTasks[taskId].tWindowSelected = BGM_WINDOW;
+ gTasks[taskId].tWindowSelected = MUS_WINDOW;
gTasks[taskId].tBgmIndex = 0;
gTasks[taskId].tSeIndex = 0;
gTasks[taskId].data[3] = 0;
@@ -196,7 +196,7 @@ extern const u8 *const gSENames[];
void sub_80BA384(u8 taskId) // Task_HandleDrawingSoundCheckMenuText
{
HighlightSelectedWindow(gTasks[taskId].tWindowSelected);
- PrintSoundNumber(gTasks[taskId].tBgmIndex + BGM_STOP, 7, 8); // print by BGM index
+ PrintSoundNumber(gTasks[taskId].tBgmIndex + MUS_STOP, 7, 8); // print by BGM index
sub_80BA79C(gBGMNames[gTasks[taskId].tBgmIndex], 11, 8);
PrintSoundNumber(gTasks[taskId].tSeIndex, 7, 15);
sub_80BA79C(gSENames[gTasks[taskId].tSeIndex], 11, 15);
@@ -247,19 +247,19 @@ bool8 Task_ProcessSoundCheckMenuInput(u8 taskId)
{
if (gTasks[taskId].tBgmIndex != 0)
{
- m4aSongNumStop(gTasks[taskId].data[3] + BGM_STOP);
- m4aSongNumStart(gTasks[taskId].tBgmIndex + BGM_STOP);
+ m4aSongNumStop(gTasks[taskId].data[3] + MUS_STOP);
+ m4aSongNumStart(gTasks[taskId].tBgmIndex + MUS_STOP);
gTasks[taskId].data[3] = gTasks[taskId].tBgmIndex;
}
else
{
- m4aSongNumStop(gTasks[taskId].data[3] + BGM_STOP);
+ m4aSongNumStop(gTasks[taskId].data[3] + MUS_STOP);
gTasks[taskId].data[3] = 0;
}
}
else if (gTasks[taskId].tBgmIndex != 0)
{
- m4aSongNumStart(gTasks[taskId].tBgmIndex + BGM_STOP);
+ m4aSongNumStart(gTasks[taskId].tBgmIndex + MUS_STOP);
gTasks[taskId].data[3] = gTasks[taskId].tBgmIndex;
}
}
@@ -346,7 +346,7 @@ void HighlightSelectedWindow(u8 windowType)
{
switch (windowType)
{
- case BGM_WINDOW:
+ case MUS_WINDOW:
default:
REG_WIN1H = WIN_RANGE(17, 223);
REG_WIN1V = WIN_RANGE(41, 87);
@@ -819,124 +819,124 @@ void sub_80BB1D4(void)
}
#define SOUND_LIST_BGM \
- X(BGM_STOP, "STOP") \
- X(BGM_TETSUJI, "TETSUJI") \
- X(BGM_FIELD13, "FIELD13") \
- X(BGM_KACHI22, "KACHI22") \
- X(BGM_KACHI2, "KACHI2") \
- X(BGM_KACHI3, "KACHI3") \
- X(BGM_KACHI5, "KACHI5") \
- X(BGM_PCC, "PCC") \
- X(BGM_NIBI, "NIBI") \
- X(BGM_SUIKUN, "SUIKUN") \
- X(BGM_DOORO1, "DOORO1") \
- X(BGM_DOORO_X1, "DOORO-X1") \
- X(BGM_DOORO_X3, "DOORO-X3") \
- X(BGM_MACHI_S2, "MACHI-S2") \
- X(BGM_MACHI_S4, "MACHI-S4") \
- X(BGM_GIM, "GIM") \
- X(BGM_NAMINORI, "NAMINORI") \
- X(BGM_DAN01, "DAN01") \
- X(BGM_FANFA1, "FANFA1") \
- X(BGM_ME_ASA, "ME-ASA") \
- X(BGM_ME_BACHI, "ME-BACHI") \
- X(BGM_FANFA4, "FANFA4") \
- X(BGM_FANFA5, "FANFA5") \
- X(BGM_ME_WAZA, "ME-WAZA") \
- X(BGM_BIJYUTU, "BIJYUTU") \
- X(BGM_DOORO_X4, "DOORO-X4") \
- X(BGM_FUNE_KAN, "FUNE-KAN") \
- X(BGM_ME_SHINKA, "ME-SHINKA") \
- X(BGM_SHINKA, "SHINKA") \
- X(BGM_ME_WASURE, "ME-WASURE") \
- X(BGM_SYOUJOEYE, "SYOUJOEYE") \
- X(BGM_BOYEYE, "BOYEYE") \
- X(BGM_DAN02, "DAN02") \
- X(BGM_MACHI_S3, "MACHI-S3") \
- X(BGM_ODAMAKI, "ODAMAKI") \
- X(BGM_B_TOWER, "B-TOWER") \
- X(BGM_SWIMEYE, "SWIMEYE") \
- X(BGM_DAN03, "DAN03") \
- X(BGM_ME_KINOMI, "ME-KINOMI") \
- X(BGM_ME_TAMA, "ME-TAMA") \
- X(BGM_ME_B_BIG, "ME-B-BIG") \
- X(BGM_ME_B_SMALL, "ME-B-SMALL") \
- X(BGM_ME_ZANNEN, "ME-ZANNEN") \
- X(BGM_BD_TIME, "BD-TIME") \
- X(BGM_TEST1, "TEST1") \
- X(BGM_TEST2, "TEST2") \
- X(BGM_TEST3, "TEST3") \
- X(BGM_TEST4, "TEST4") \
- X(BGM_TEST, "TEST") \
- X(BGM_GOMACHI0, "GOMACHI0") \
- X(BGM_GOTOWN, "GOTOWN") \
- X(BGM_POKECEN, "POKECEN") \
- X(BGM_NEXTROAD, "NEXTROAD") \
- X(BGM_GRANROAD, "GRANROAD") \
- X(BGM_CYCLING, "CYCLING") \
- X(BGM_FRIENDLY, "FRIENDLY") \
- X(BGM_MISHIRO, "MISHIRO") \
- X(BGM_TOZAN, "TOZAN") \
- X(BGM_GIRLEYE, "GIRLEYE") \
- X(BGM_MINAMO, "MINAMO") \
- X(BGM_ASHROAD, "ASHROAD") \
- X(BGM_EVENT0, "EVENT0") \
- X(BGM_DEEPDEEP, "DEEPDEEP") \
- X(BGM_KACHI1, "KACHI1") \
- X(BGM_TITLE3, "TITLE3") \
- X(BGM_DEMO1, "DEMO1") \
- X(BGM_GIRL_SUP, "GIRL-SUP") \
- X(BGM_HAGESHII, "HAGESHII") \
- X(BGM_KAKKOII, "KAKKOII") \
- X(BGM_KAZANBAI, "KAZANBAI") \
- X(BGM_AQA_0, "AQA-0") \
- X(BGM_TSURETEK, "TSURETEK") \
- X(BGM_BOY_SUP, "BOY-SUP") \
- X(BGM_RAINBOW, "RAINBOW") \
- X(BGM_AYASII, "AYASII") \
- X(BGM_KACHI4, "KACHI4") \
- X(BGM_ROPEWAY, "ROPEWAY") \
- X(BGM_CASINO, "CASINO") \
- X(BGM_HIGHTOWN, "HIGHTOWN") \
- X(BGM_SAFARI, "SAFARI") \
- X(BGM_C_ROAD, "C-ROAD") \
- X(BGM_AJITO, "AJITO") \
- X(BGM_M_BOAT, "M-BOAT") \
- X(BGM_M_DUNGON, "M-DUNGON") \
- X(BGM_FINECITY, "FINECITY") \
- X(BGM_MACHUPI, "MACHUPI") \
- X(BGM_P_SCHOOL, "P-SCHOOL") \
- X(BGM_DENDOU, "DENDOU") \
- X(BGM_TONEKUSA, "TONEKUSA") \
- X(BGM_MABOROSI, "MABOROSI") \
- X(BGM_CON_FAN, "CON-FAN") \
- X(BGM_CONTEST0, "CONTEST0") \
- X(BGM_MGM0, "MGM0") \
- X(BGM_T_BATTLE, "T-BATTLE") \
- X(BGM_OOAME, "OOAME") \
- X(BGM_HIDERI, "HIDERI") \
- X(BGM_RUNECITY, "RUNECITY") \
- X(BGM_CON_K, "CON-K") \
- X(BGM_EIKOU_R, "EIKOU-R") \
- X(BGM_KARAKURI, "KARAKURI") \
- X(BGM_HUTAGO, "HUTAGO") \
- X(BGM_SITENNOU, "SITENNOU") \
- X(BGM_YAMA_EYE, "YAMA-EYE") \
- X(BGM_CONLOBBY, "CONLOBBY") \
- X(BGM_INTER_V, "INTER-V") \
- X(BGM_DAIGO, "DAIGO") \
- X(BGM_THANKFOR, "THANKFOR") \
- X(BGM_END, "END") \
- X(BGM_BATTLE27, "BATTLE27") \
- X(BGM_BATTLE31, "BATTLE31") \
- X(BGM_BATTLE20, "BATTLE20") \
- X(BGM_BATTLE32, "BATTLE32") \
- X(BGM_BATTLE33, "BATTLE33") \
- X(BGM_BATTLE36, "BATTLE36") \
- X(BGM_BATTLE34, "BATTLE34") \
- X(BGM_BATTLE35, "BATTLE35") \
- X(BGM_BATTLE38, "BATTLE38") \
- X(BGM_BATTLE30, "BATTLE30")
+ X(MUS_STOP, "STOP") \
+ X(MUS_TETSUJI, "TETSUJI") \
+ X(MUS_FIELD13, "FIELD13") \
+ X(MUS_KACHI22, "KACHI22") \
+ X(MUS_KACHI2, "KACHI2") \
+ X(MUS_KACHI3, "KACHI3") \
+ X(MUS_KACHI5, "KACHI5") \
+ X(MUS_PCC, "PCC") \
+ X(MUS_NIBI, "NIBI") \
+ X(MUS_SUIKUN, "SUIKUN") \
+ X(MUS_DOORO1, "DOORO1") \
+ X(MUS_DOORO_X1, "DOORO-X1") \
+ X(MUS_DOORO_X3, "DOORO-X3") \
+ X(MUS_MACHI_S2, "MACHI-S2") \
+ X(MUS_MACHI_S4, "MACHI-S4") \
+ X(MUS_GIM, "GIM") \
+ X(MUS_NAMINORI, "NAMINORI") \
+ X(MUS_DAN01, "DAN01") \
+ X(MUS_FANFA1, "FANFA1") \
+ X(MUS_ME_ASA, "ME-ASA") \
+ X(MUS_ME_BACHI, "ME-BACHI") \
+ X(MUS_FANFA4, "FANFA4") \
+ X(MUS_FANFA5, "FANFA5") \
+ X(MUS_ME_WAZA, "ME-WAZA") \
+ X(MUS_BIJYUTU, "BIJYUTU") \
+ X(MUS_DOORO_X4, "DOORO-X4") \
+ X(MUS_FUNE_KAN, "FUNE-KAN") \
+ X(MUS_ME_SHINKA, "ME-SHINKA") \
+ X(MUS_SHINKA, "SHINKA") \
+ X(MUS_ME_WASURE, "ME-WASURE") \
+ X(MUS_SYOUJOEYE, "SYOUJOEYE") \
+ X(MUS_BOYEYE, "BOYEYE") \
+ X(MUS_DAN02, "DAN02") \
+ X(MUS_MACHI_S3, "MACHI-S3") \
+ X(MUS_ODAMAKI, "ODAMAKI") \
+ X(MUS_B_TOWER, "B-TOWER") \
+ X(MUS_SWIMEYE, "SWIMEYE") \
+ X(MUS_DAN03, "DAN03") \
+ X(MUS_ME_KINOMI, "ME-KINOMI") \
+ X(MUS_ME_TAMA, "ME-TAMA") \
+ X(MUS_ME_B_BIG, "ME-B-BIG") \
+ X(MUS_ME_B_SMALL, "ME-B-SMALL") \
+ X(MUS_ME_ZANNEN, "ME-ZANNEN") \
+ X(MUS_BD_TIME, "BD-TIME") \
+ X(MUS_TEST1, "TEST1") \
+ X(MUS_TEST2, "TEST2") \
+ X(MUS_TEST3, "TEST3") \
+ X(MUS_TEST4, "TEST4") \
+ X(MUS_TEST, "TEST") \
+ X(MUS_GOMACHI0, "GOMACHI0") \
+ X(MUS_GOTOWN, "GOTOWN") \
+ X(MUS_POKECEN, "POKECEN") \
+ X(MUS_NEXTROAD, "NEXTROAD") \
+ X(MUS_GRANROAD, "GRANROAD") \
+ X(MUS_CYCLING, "CYCLING") \
+ X(MUS_FRIENDLY, "FRIENDLY") \
+ X(MUS_MISHIRO, "MISHIRO") \
+ X(MUS_TOZAN, "TOZAN") \
+ X(MUS_GIRLEYE, "GIRLEYE") \
+ X(MUS_MINAMO, "MINAMO") \
+ X(MUS_ASHROAD, "ASHROAD") \
+ X(MUS_EVENT0, "EVENT0") \
+ X(MUS_DEEPDEEP, "DEEPDEEP") \
+ X(MUS_KACHI1, "KACHI1") \
+ X(MUS_TITLE3, "TITLE3") \
+ X(MUS_DEMO1, "DEMO1") \
+ X(MUS_GIRL_SUP, "GIRL-SUP") \
+ X(MUS_HAGESHII, "HAGESHII") \
+ X(MUS_KAKKOII, "KAKKOII") \
+ X(MUS_KAZANBAI, "KAZANBAI") \
+ X(MUS_AQA_0, "AQA-0") \
+ X(MUS_TSURETEK, "TSURETEK") \
+ X(MUS_BOY_SUP, "BOY-SUP") \
+ X(MUS_RAINBOW, "RAINBOW") \
+ X(MUS_AYASII, "AYASII") \
+ X(MUS_KACHI4, "KACHI4") \
+ X(MUS_ROPEWAY, "ROPEWAY") \
+ X(MUS_CASINO, "CASINO") \
+ X(MUS_HIGHTOWN, "HIGHTOWN") \
+ X(MUS_SAFARI, "SAFARI") \
+ X(MUS_C_ROAD, "C-ROAD") \
+ X(MUS_AJITO, "AJITO") \
+ X(MUS_M_BOAT, "M-BOAT") \
+ X(MUS_M_DUNGON, "M-DUNGON") \
+ X(MUS_FINECITY, "FINECITY") \
+ X(MUS_MACHUPI, "MACHUPI") \
+ X(MUS_P_SCHOOL, "P-SCHOOL") \
+ X(MUS_DENDOU, "DENDOU") \
+ X(MUS_TONEKUSA, "TONEKUSA") \
+ X(MUS_MABOROSI, "MABOROSI") \
+ X(MUS_CON_FAN, "CON-FAN") \
+ X(MUS_CONTEST0, "CONTEST0") \
+ X(MUS_MGM0, "MGM0") \
+ X(MUS_T_BATTLE, "T-BATTLE") \
+ X(MUS_OOAME, "OOAME") \
+ X(MUS_HIDERI, "HIDERI") \
+ X(MUS_RUNECITY, "RUNECITY") \
+ X(MUS_CON_K, "CON-K") \
+ X(MUS_EIKOU_R, "EIKOU-R") \
+ X(MUS_KARAKURI, "KARAKURI") \
+ X(MUS_HUTAGO, "HUTAGO") \
+ X(MUS_SITENNOU, "SITENNOU") \
+ X(MUS_YAMA_EYE, "YAMA-EYE") \
+ X(MUS_CONLOBBY, "CONLOBBY") \
+ X(MUS_INTER_V, "INTER-V") \
+ X(MUS_DAIGO, "DAIGO") \
+ X(MUS_THANKFOR, "THANKFOR") \
+ X(MUS_END, "END") \
+ X(MUS_BATTLE27, "BATTLE27") \
+ X(MUS_BATTLE31, "BATTLE31") \
+ X(MUS_BATTLE20, "BATTLE20") \
+ X(MUS_BATTLE32, "BATTLE32") \
+ X(MUS_BATTLE33, "BATTLE33") \
+ X(MUS_BATTLE36, "BATTLE36") \
+ X(MUS_BATTLE34, "BATTLE34") \
+ X(MUS_BATTLE35, "BATTLE35") \
+ X(MUS_BATTLE38, "BATTLE38") \
+ X(MUS_BATTLE30, "BATTLE30")
#define SOUND_LIST_SE \
X(SE_STOP, "STOP") \
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 48d5dd82c..182f85d8d 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -567,14 +567,14 @@ static void Task_EvolutionScene(u8 taskID)
case 3: // wait for cry, play tu du SE
if (IsCryFinished())
{
- PlaySE(BGM_ME_SHINKA);
+ PlaySE(MUS_ME_SHINKA);
gTasks[taskID].tState++;
}
break;
case 4: // play evolution music and fade screen black
if (!IsSEPlaying())
{
- PlayNewMapMusic(BGM_SHINKA);
+ PlayNewMapMusic(MUS_SHINKA);
gTasks[taskID].tState++;
BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0));
}
@@ -642,7 +642,7 @@ static void Task_EvolutionScene(u8 taskID)
{
StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo);
Text_InitWindow8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15);
- PlayBGM(BGM_FANFA5);
+ PlayBGM(MUS_FANFA5);
gTasks[taskID].tState++;
SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
CalculateMonStats(mon);
@@ -719,7 +719,7 @@ static void Task_EvolutionScene(u8 taskID)
if (gUnknown_03004210.state == 0 && !IsSEPlaying())
{
sub_8024CEC();
- PlayFanfare(BGM_FANFA1);
+ PlayFanfare(MUS_FANFA1);
StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]);
Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
@@ -908,15 +908,15 @@ static void Task_TradeEvolutionScene(u8 taskID)
case 2:
if (IsCryFinished())
{
- m4aSongNumStop(BGM_SHINKA);
- PlaySE(BGM_ME_SHINKA);
+ m4aSongNumStop(MUS_SHINKA);
+ PlaySE(MUS_ME_SHINKA);
gTasks[taskID].tState++;
}
break;
case 3:
if (!IsSEPlaying())
{
- PlayBGM(BGM_SHINKA);
+ PlayBGM(MUS_SHINKA);
gTasks[taskID].tState++;
BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0));
}
@@ -984,7 +984,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
{
StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo);
Text_InitWindow8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
- PlayFanfare(BGM_FANFA5);
+ PlayFanfare(MUS_FANFA5);
gTasks[taskID].tState++;
SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
CalculateMonStats(mon);
@@ -1016,7 +1016,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
}
else
{
- PlayBGM(BGM_SHINKA);
+ PlayBGM(MUS_SHINKA);
Text_InitWindow8002EB0(&gUnknown_03004828->window, gOtherText_LinkStandby2, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
gTasks[taskID].tState++;
}
@@ -1033,7 +1033,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
if (gUnknown_03004828->window.state == 0 && !IsSEPlaying())
{
sub_8024CEC();
- PlayFanfare(BGM_FANFA1);
+ PlayFanfare(MUS_FANFA1);
StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]);
Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
diff --git a/src/field_effect.c b/src/field_effect.c
index 91794a07a..98b43aa22 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -918,7 +918,7 @@ void PokeballGlowEffect_1(struct Sprite *sprite)
sprite->data[3] = 0;
if (sprite->data[5])
{
- PlayFanfare(BGM_ME_ASA);
+ PlayFanfare(MUS_ME_ASA);
}
}
}
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 5bd0d229b..2536f4898 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -451,7 +451,7 @@ static bool8 sub_8141E64(void)
if (!gPaletteFade.active)
{
SetMainCallback2(CB2_HallOfFame);
- PlayBGM(BGM_DENDOU);
+ PlayBGM(MUS_DENDOU);
return 0;
}
break;
diff --git a/src/main_menu.c b/src/main_menu.c
index 886995b16..93d9be77a 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -774,7 +774,7 @@ static void Task_NewGameSpeech1(u8 taskId)
gTasks[taskId].data[3] = 0xFF;
gTasks[taskId].tFrameCounter = 216; //Wait 3.6 seconds (216 frames) before starting speech
- PlayBGM(BGM_DOORO_X4);
+ PlayBGM(MUS_DOORO_X4);
}
static void Task_NewGameSpeech2(u8 taskId)
diff --git a/src/mauville_man.c b/src/mauville_man.c
index e22809242..bfdfe9cf1 100644
--- a/src/mauville_man.c
+++ b/src/mauville_man.c
@@ -745,7 +745,7 @@ static void Task_BardSong(u8 taskId)
case 3:
if (gStringVar4[task->tCharIndex] == EOS)
{
- FadeInNewBGM(BGM_POKECEN, 6);
+ FadeInNewBGM(MUS_POKECEN, 6);
m4aMPlayFadeOutTemporarily(&gMPlay_SE2, 2);
EnableBothScriptContexts();
DestroyTask(taskId);
diff --git a/src/move_tutor_menu.c b/src/move_tutor_menu.c
index 7e1365391..0ecc82a72 100644
--- a/src/move_tutor_menu.c
+++ b/src/move_tutor_menu.c
@@ -602,13 +602,13 @@ static void MoveTutorMain(void)
PrintMainMoveTutorMenuText(gOtherText_ForgotOrDidNotLearnMove);
#endif
sMoveTutorMenu->state = 31;
- PlayFanfare(BGM_FANFA1);
+ PlayFanfare(MUS_FANFA1);
}
break;
case 31:
if (Menu_UpdateWindowText())
{
- PlayFanfare(BGM_FANFA1);
+ PlayFanfare(MUS_FANFA1);
sMoveTutorMenu->state = 32;
}
break;
diff --git a/src/overworld.c b/src/overworld.c
index 6a44afb04..579d119b0 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -50,9 +50,9 @@
#include "wild_encounter.h"
#ifdef SAPPHIRE
-#define LEGENDARY_MUSIC BGM_OOAME // Heavy Rain
+#define LEGENDARY_MUSIC MUS_OOAME // Heavy Rain
#else
-#define LEGENDARY_MUSIC BGM_HIDERI // Drought
+#define LEGENDARY_MUSIC MUS_HIDERI // Drought
#endif
struct UnkTVStruct
@@ -831,7 +831,7 @@ static u16 GetLocationMusic(struct WarpData *warp)
if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
return LEGENDARY_MUSIC;
else if (IsInfiltratedWeatherInstitute(warp) == TRUE)
- return BGM_TOZAN;
+ return MUS_TOZAN;
else
return Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum)->music;
}
@@ -844,7 +844,7 @@ u16 GetCurrLocationDefaultMusic(void)
if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE111)
&& gSaveBlock1.location.mapNum == MAP_NUM(ROUTE111)
&& GetSav1Weather() == 8)
- return BGM_ASHROAD;
+ return MUS_ASHROAD;
music = GetLocationMusic(&gSaveBlock1.location);
if (music != 0x7FFF)
@@ -854,9 +854,9 @@ u16 GetCurrLocationDefaultMusic(void)
else
{
if (gSaveBlock1.pos.x < 24)
- return BGM_DOORO_X1;
+ return MUS_DOORO_X1;
else
- return BGM_GRANROAD;
+ return MUS_GRANROAD;
}
}
@@ -871,9 +871,9 @@ u16 GetWarpDestinationMusic(void)
{
if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAUVILLE_CITY)
&& gSaveBlock1.location.mapNum == MAP_NUM(MAUVILLE_CITY))
- return BGM_DOORO_X1;
+ return MUS_DOORO_X1;
else
- return BGM_GRANROAD;
+ return MUS_GRANROAD;
}
}
@@ -891,9 +891,9 @@ void Overworld_PlaySpecialMapMusic(void)
if (gSaveBlock1.savedMusic)
music = gSaveBlock1.savedMusic;
else if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER)
- music = BGM_DEEPDEEP;
+ music = MUS_DEEPDEEP;
else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
- music = BGM_NAMINORI;
+ music = MUS_NAMINORI;
}
if (music != GetCurrentMapMusic())
@@ -918,10 +918,10 @@ void sub_8053F0C(void)
u16 currentMusic = GetCurrentMapMusic();
if (newMusic != LEGENDARY_MUSIC)
{
- if (currentMusic == BGM_DEEPDEEP || currentMusic == BGM_NAMINORI)
+ if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI)
return;
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
- newMusic = BGM_NAMINORI;
+ newMusic = MUS_NAMINORI;
}
if (newMusic != currentMusic)
{
diff --git a/src/party_menu.c b/src/party_menu.c
index a39300825..a4b7b0ffa 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -3975,7 +3975,7 @@ void Task_TeamMonTMMove3(u8 taskId)
{
if (gUnknown_0202E8F6 == 0)
{
- PlayFanfare(BGM_FANFA1);
+ PlayFanfare(MUS_FANFA1);
gTasks[taskId].func = Task_TeamMonTMMove4;
}
}
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index c6eda8bca..30e9503cd 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1108,48 +1108,48 @@ void ClearBattleMonForms(void)
gBattleMonForms[i] = 0;
}
-u16 GetBGM_ForBattle(void)
+u16 GetMUS_ForBattle(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
- return BGM_BATTLE34;
+ return MUS_BATTLE34;
if (gBattleTypeFlags & BATTLE_TYPE_REGI)
- return BGM_BATTLE36;
+ return MUS_BATTLE36;
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
- return BGM_BATTLE20;
+ return MUS_BATTLE20;
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{
switch (gTrainers[gTrainerBattleOpponent].trainerClass)
{
case 2:
case 0x31:
- return BGM_BATTLE30;
+ return MUS_BATTLE30;
case 3:
case 4:
case 0x32:
case 0x33:
- return BGM_BATTLE31;
+ return MUS_BATTLE31;
case 0x19:
- return BGM_BATTLE32;
+ return MUS_BATTLE32;
case 0x20:
- return BGM_BATTLE33;
+ return MUS_BATTLE33;
case 0x2E:
if (!StringCompare(gTrainers[gTrainerBattleOpponent].trainerName, BattleText_Wally))
- return BGM_BATTLE20;
- return BGM_BATTLE35;
+ return MUS_BATTLE20;
+ return MUS_BATTLE35;
case 0x18:
- return BGM_BATTLE38;
+ return MUS_BATTLE38;
default:
- return BGM_BATTLE20;
+ return MUS_BATTLE20;
}
}
- return BGM_BATTLE27;
+ return MUS_BATTLE27;
}
void sub_80408BC(void)
{
ResetMapMusic();
m4aMPlayAllStop();
- PlayBGM(GetBGM_ForBattle());
+ PlayBGM(GetMUS_ForBattle());
}
void current_map_music_set__default_for_battle(u16 song)
@@ -1159,7 +1159,7 @@ void current_map_music_set__default_for_battle(u16 song)
if (song)
PlayNewMapMusic(song);
else
- PlayNewMapMusic(GetBGM_ForBattle());
+ PlayNewMapMusic(GetMUS_ForBattle());
}
const u8 *GetMonSpritePal(struct Pokemon *mon)
diff --git a/src/roulette.c b/src/roulette.c
index ab60e089a..c8804a543 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -1055,13 +1055,13 @@ void sub_8116638(u8 taskid)
case 0x2:
if (gTasks[taskid].data[0x2] == 0xC)
{
- PlayFanfare(BGM_ME_B_BIG);
+ PlayFanfare(MUS_ME_B_BIG);
Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13);
Menu_PrintText(&gUnknown_081C41A5, 0x1, 0xF);
}
else
{
- PlayFanfare(BGM_ME_B_SMALL);
+ PlayFanfare(MUS_ME_B_SMALL);
Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13);
Menu_PrintText(&gUnknown_081C4199, 0x1, 0xF);
}
diff --git a/src/slot_machine.c b/src/slot_machine.c
index ccd7e4353..3de87e0f7 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -927,17 +927,17 @@ bool8 sub_81020C8(struct Task *task)
}
if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED)))
{
- PlayFanfare(BGM_ME_B_BIG);
+ PlayFanfare(MUS_ME_B_BIG);
sub_8104CAC(6);
}
else if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_MIXED))
{
- PlayFanfare(BGM_ME_B_BIG);
+ PlayFanfare(MUS_ME_B_BIG);
sub_8104CAC(5);
}
else
{
- PlayFanfare(BGM_ME_B_SMALL);
+ PlayFanfare(MUS_ME_B_SMALL);
sub_8104CAC(2);
}
if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_MIXED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED)))
@@ -2682,7 +2682,7 @@ static void sub_810437C(struct Task *task)
sub_810545C();
sub_8102680();
StopMapMusic();
- PlayNewMapMusic(BGM_BD_TIME);
+ PlayNewMapMusic(MUS_BD_TIME);
}
static void sub_81043EC(struct Task *task)
@@ -2818,7 +2818,7 @@ static void sub_81046C0(struct Task *task)
{
task->data[4] = 0xa0;
StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 5);
- PlayFanfare(BGM_ME_ZANNEN);
+ PlayFanfare(MUS_ME_ZANNEN);
}
else
{
@@ -2830,7 +2830,7 @@ static void sub_81046C0(struct Task *task)
sub_8104098();
eSlotMachine->pikaPower = 0;
}
- PlayFanfare(BGM_ME_B_SMALL);
+ PlayFanfare(MUS_ME_B_SMALL);
}
}
}
@@ -2906,7 +2906,7 @@ static void sub_81048CC(struct Task *task)
task->data[4] = 4;
task->data[5] = 0;
StopMapMusic();
- PlayFanfare(BGM_ME_ZANNEN);
+ PlayFanfare(MUS_ME_ZANNEN);
PlaySE(SE_W153);
}
diff --git a/src/sound.c b/src/sound.c
index 159ad3f70..5b41acbc6 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -44,18 +44,18 @@ extern struct ToneData voicegroup_84549C0[];
static const struct Fanfare sFanfares[] =
{
- { BGM_FANFA1, 80 },
- { BGM_FANFA4, 160 },
- { BGM_FANFA5, 220 },
- { BGM_ME_WAZA, 220 },
- { BGM_ME_ASA, 160 },
- { BGM_ME_BACHI, 340 },
- { BGM_ME_WASURE, 180 },
- { BGM_ME_KINOMI, 120 },
- { BGM_ME_TAMA, 710 },
- { BGM_ME_B_BIG, 250 },
- { BGM_ME_B_SMALL, 150 },
- { BGM_ME_ZANNEN, 160 },
+ { MUS_FANFA1, 80 },
+ { MUS_FANFA4, 160 },
+ { MUS_FANFA5, 220 },
+ { MUS_ME_WAZA, 220 },
+ { MUS_ME_ASA, 160 },
+ { MUS_ME_BACHI, 340 },
+ { MUS_ME_WASURE, 180 },
+ { MUS_ME_KINOMI, 120 },
+ { MUS_ME_TAMA, 710 },
+ { MUS_ME_B_BIG, 250 },
+ { MUS_ME_B_SMALL, 150 },
+ { MUS_ME_ZANNEN, 160 },
};
static void Task_Fanfare(u8 taskId);
diff --git a/src/trade.c b/src/trade.c
index 8d7f5b1fc..50de29b7f 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1208,7 +1208,7 @@ static void sub_8047EC0(void)
sub_8048C70();
gMain.state ++;
nullsub_5(7, 0);
- PlayBGM(BGM_P_SCHOOL);
+ PlayBGM(MUS_P_SCHOOL);
break;
case 14:
sub_804ACF4(1);
@@ -4812,7 +4812,7 @@ static bool8 sub_804C29C(void)
gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[0]].y_offset;
gUnknown_03004828->unk_00c4 ++;
gUnknown_03004828->unk_0124 = GetCurrentMapMusic();
- PlayBGM(BGM_SHINKA);
+ PlayBGM(MUS_SHINKA);
break;
case 1:
if (gUnknown_03004828->bg2hofs > 0)
@@ -5195,7 +5195,7 @@ static bool8 sub_804C29C(void)
case 68:
if (++ gUnknown_03004828->unk_00c0 == 4)
{
- PlayFanfare(BGM_FANFA5);
+ PlayFanfare(MUS_FANFA5);
}
if (gUnknown_03004828->unk_00c0 == 0xf0)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 15:04:46 +0000