diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_main.c | 4 | ||||
| -rw-r--r-- | src/battle_script_commands.c | 2 | ||||
| -rw-r--r-- | src/egg_hatch.c | 4 | ||||
| -rw-r--r-- | src/pokemon_summary_screen.c | 2 | ||||
| -rw-r--r-- | src/title_screen.c | 3 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 70eebed85..495aa3302 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1830,7 +1830,7 @@ static void FreeRestoreBattleData(void) gScanlineEffect.state = 3; gMain.inBattle = 0; ZeroEnemyPartyMons(); - m4aSongNumStop(0x5A); + m4aSongNumStop(SE_HINSI); FreeMonSpritesGfx(); FreeBattleSpritesData(); FreeBattleResources(); @@ -5224,7 +5224,7 @@ static void ReturnFromBattleToOverworld(void) SetRoamerInactive(); } - m4aSongNumStop(0x5A); + m4aSongNumStop(SE_HINSI); SetMainCallback2(gMain.savedCallback); } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index d1a18e38f..c382daaf4 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3357,7 +3357,7 @@ static void atk23_getexp(void) if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp && !gBattleStruct->wildVictorySong) { BattleStopLowHpSound(); - PlayBGM(0x161); + PlayBGM(MUS_KACHI2); gBattleStruct->wildVictorySong++; } diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 08767c68f..8914d6ff3 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -574,10 +574,10 @@ static void Task_EggHatchPlayBGM(u8 taskID) play_some_sound(); } if (gTasks[taskID].data[0] == 1) - PlayBGM(376); + PlayBGM(MUS_ME_SHINKA); if (gTasks[taskID].data[0] > 60) { - PlayBGM(377); + PlayBGM(MUS_SHINKA); DestroyTask(taskID); // UB: task is destroyed, yet the value is incremented } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index f77b7c38c..4ce4cca5b 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1825,7 +1825,7 @@ void sub_81C174C(u8 taskId) } else { - PlaySE(0x20); + PlaySE(SE_HAZURE); sub_81C18F4(taskId); } } diff --git a/src/title_screen.c b/src/title_screen.c index 4e25c8152..15a0482dc 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -19,6 +19,7 @@ #include "gpu_regs.h" #include "trig.h" #include "constants/rgb.h" +#include "constants/songs.h" #define VERSION_BANNER_SHAPE 1 #define VERSION_BANNER_RIGHT_TILEOFFSET 64 @@ -574,7 +575,7 @@ void CB2_InitTitleScreen(void) | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_OBJWIN_ON); - m4aSongNumStart(0x19D); + m4aSongNumStart(MUS_TITLE3); gMain.state = 5; break; case 5: |