ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #251 from Diegoisawesome/master

Browse Source 
Use song constants
This commit is contained in:
Diegoisawesome 2018-05-11 00:53:58 -05:00 committed by GitHub
commit 3e93615e38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_main.c
View File

@ -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);
}

2
src/battle_script_commands.c
View File

@ -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++;
}

4
src/egg_hatch.c
View File

@ -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
}

2
src/pokemon_summary_screen.c
View File

@ -1825,7 +1825,7 @@ void sub_81C174C(u8 taskId)
}
else
{
PlaySE(0x20);
PlaySE(SE_HAZURE);
sub_81C18F4(taskId);
}
}

3
src/title_screen.c
View File

@ -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: