diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
commit | 4488bbe9e69a8551cb5bb34e70b8ffb9d8e554db (patch) | |
tree | d9c5a70fd1c4f42dc29f43becd142cc89456f19d /src/battle_main.c | |
parent | c15b50ac686632130512de37d01037bff6e10cd2 (diff) | |
parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) |
Merge branch 'master' into contest
Diffstat (limited to 'src/battle_main.c')
-rw-r--r-- | src/battle_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 55845f2d1..8649209c0 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); } |