dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give songs meaningful english names

Browse Source
This commit is contained in:
GriffinR
2020-08-29 03:11:03 -04:00
parent c5839905a1
commit bb56d4a3f4
964 changed files with 8731 additions and 8814 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim_effects_1.c
+5 -5
View File
@@ -3150,14 +3150,14 @@ static void AnimItemStealStep3(struct Sprite* sprite)
sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
if (sprite->pos2.y == 0)
PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
if (MoveAlongLinearPath(sprite))
{
sprite->pos2.y = 0;
sprite->data[0] = 0;
sprite->callback = AnimItemStealStep2;
PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
}
}
@@ -4239,7 +4239,7 @@ static void AnimLockOnTargetStep1(struct Sprite* sprite)
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData6(sprite, AnimLockOnTargetStep2);
sprite->data[5] += 0x100;
PlaySE12WithPanning(SE_W199, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
PlaySE12WithPanning(SE_M_LOCK_ON, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
break;
}
@@ -4326,7 +4326,7 @@ static void AnimLockOnTargetStep4(struct Sprite* sprite)
sprite->data[2]++;
pal = sprite->oam.paletteNum;
LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4);
PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
}
else if (sprite->data[1] == 0)
{
@@ -4803,7 +4803,7 @@ static void AnimSharpenSphereStep(struct Sprite* sprite)
{
sprite->data[4]++;
if (!(sprite->data[4] & 1))
PlaySE12WithPanning(SE_W207B, sprite->data[5]);
PlaySE12WithPanning(SE_M_SWAGGER2, sprite->data[5]);
}
sprite->data[0] = 0;
src/battle_anim_effects_2.c
+3 -3
View File
@@ -1586,7 +1586,7 @@ static void AirCutterProjectileStep1(u8 taskId)
gTasks[taskId].data[gTasks[taskId].data[1] + 13] = spriteId;
gTasks[taskId].data[0] = gTasks[taskId].data[3];
gTasks[taskId].data[1]++;
PlaySE12WithPanning(SE_W059B, BattleAnimAdjustPanning(-SOUND_PAN_TARGET));
PlaySE12WithPanning(SE_M_BLIZZARD2, BattleAnimAdjustPanning(-SOUND_PAN_TARGET));
if (gTasks[taskId].data[1] > 2)
gTasks[taskId].func = AirCutterProjectileStep2;
}
@@ -1784,7 +1784,7 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite)
u16 rand;
s16* ptr;
PlaySE12WithPanning(SE_W030, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
PlaySE12WithPanning(SE_M_HORN_ATTACK, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
sprite->pos1.x += sprite->pos2.x;
sprite->pos1.y += sprite->pos2.y;
sprite->pos2.y = 0;
@@ -2472,7 +2472,7 @@ static void AnimPencil_Step(struct Sprite *sprite)
sprite->pos1.y -= 1;
sprite->data[2]++;
if (sprite->data[2] % 10 == 0)
PlaySE12WithPanning(SE_W166, sprite->data[6]);
PlaySE12WithPanning(SE_M_SKETCH, sprite->data[6]);
}
sprite->data[4] += sprite->data[3];
if (sprite->data[4] > 31)
src/battle_anim_effects_3.c
+10 -10
View File
@@ -1586,7 +1586,7 @@ static void AnimClappingHand_Step(struct Sprite *sprite)
sprite->data[2]++;
if (sprite->data[3] == 0)
{
PlaySE1WithPanning(SE_W227, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
PlaySE1WithPanning(SE_M_ENCORE, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
}
}
}
@@ -1865,7 +1865,7 @@ static void TormentAttacker_Step(u8 taskId)
y = task->data[3] + task->data[5];
spriteId = CreateSprite(&gThoughtBubbleSpriteTemplate, x, y, 6 - task->data[1]);
PlaySE12WithPanning(SE_W118, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
PlaySE12WithPanning(SE_M_METRONOME, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
if (spriteId != MAX_SPRITES)
{
@@ -2312,7 +2312,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
gTasks[taskId].data[11] = gBattle_BG1_Y;
gTasks[taskId].data[0]++;
PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
break;
case 1:
if (gTasks[taskId].data[4]++ > 0)
@@ -2345,7 +2345,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
{
gTasks[taskId].data[3] = 0;
gTasks[taskId].data[0] = 1;
PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
}
break;
case 4:
@@ -4622,7 +4622,7 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId)
if (gSprites[spriteId].pos2.y == 0)
{
PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
gTasks[taskId].data[10] -= 0x800;
gTasks[taskId].data[0]++;
}
@@ -4644,7 +4644,7 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId)
if (gSprites[spriteId].pos2.y == 0)
{
PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
DestroyAnimVisualTask(taskId);
}
break;
@@ -4681,7 +4681,7 @@ static void AnimBlockXStep(struct Sprite *sprite)
sprite->pos2.y += 10;
if (sprite->pos2.y >= 0)
{
PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
sprite->pos2.y = 0;
sprite->data[0]++;
}
@@ -4691,7 +4691,7 @@ static void AnimBlockXStep(struct Sprite *sprite)
sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3);
if (sprite->data[1] > 0x7F)
{
PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
sprite->data[1] = 0;
sprite->pos2.y = 0;
sprite->data[0]++;
@@ -4710,7 +4710,7 @@ static void AnimBlockXStep(struct Sprite *sprite)
case 3:
if (++sprite->data[1] > 8)
{
PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
sprite->data[1] = 0;
sprite->data[0]++;
}
@@ -4991,7 +4991,7 @@ void sub_80E3E84(struct Sprite *sprite)
case 0:
if (gBattleAnimArgs[7] == -1)
{
PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
PlaySE12WithPanning(SE_M_VITAL_THROW, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16;
sprite->data[0] = -32;
sprite->data[7]++;
src/battle_anim_special.c
+12 -12
View File
@@ -798,7 +798,7 @@ static void sub_80EF7EC(u8 taskId)
{
if (gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animCmdIndex == 1)
{
PlaySE12WithPanning(SE_NAGERU, 0);
PlaySE12WithPanning(SE_BALL_THROW, 0);
gSprites[gTasks[taskId].data[0]].callback = sub_80EF8C0;
CreateTask(sub_80EF864, 10);
gTasks[taskId].func = sub_80EF698;
@@ -887,7 +887,7 @@ static void sub_80EFA0C(struct Sprite *sprite)
spriteId = gBattlerSpriteIds[gBattleAnimTarget];
taskId = sprite->data[5];
if (++gTasks[taskId].data[1] == 11)
PlaySE(SE_SUIKOMU);
PlaySE(SE_BALL_TRADE);
switch (gTasks[taskId].data[0])
{
@@ -965,16 +965,16 @@ static void sub_80EFB9C(struct Sprite *sprite)
switch (bounceCount)
{
case 1:
PlaySE(SE_KON);
PlaySE(SE_BALL_BOUNCE_1);
break;
case 2:
PlaySE(SE_KON2);
PlaySE(SE_BALL_BOUNCE_2);
break;
case 3:
PlaySE(SE_KON3);
PlaySE(SE_BALL_BOUNCE_3);
break;
default:
PlaySE(SE_KON4);
PlaySE(SE_BALL_BOUNCE_4);
break;
}
}
@@ -1018,7 +1018,7 @@ static void sub_80EFCA0(struct Sprite *sprite)
StartSpriteAffineAnim(sprite, 1);
gBattleSpritesDataPtr->animationData->field_C = 0;
sprite->callback = sub_80EFCEC;
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
}
}
@@ -1160,7 +1160,7 @@ static void sub_80EFCEC(struct Sprite *sprite)
else
StartSpriteAffineAnim(sprite, 1);
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
}
break;
}
@@ -1191,7 +1191,7 @@ static void sub_80EFFC4(struct Sprite *sprite)
sprite->data[4]++;
if (sprite->data[4] == 40)
{
PlaySE(SE_GETTING);
PlaySE(SE_BALL_CLICK);
BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB_BLACK);
sub_80F01B8(sprite);
}
@@ -1204,7 +1204,7 @@ static void sub_80EFFC4(struct Sprite *sprite)
gDoingBattleAnim = FALSE;
UpdateOamPriorityInAllHealthboxes(1);
m4aMPlayAllStop();
PlaySE(MUS_FAN6);
PlaySE(MUS_CAUGHT_INTRO);
}
else if (sprite->data[4] == 315)
{
@@ -1444,7 +1444,7 @@ u8 LaunchBallStarsTask(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId)
gTasks[taskId].data[3] = priority;
gTasks[taskId].data[4] = subpriority;
gTasks[taskId].data[15] = ballId;
PlaySE(SE_BOWA2);
PlaySE(SE_BALL_OPEN);
return taskId;
}
@@ -2143,7 +2143,7 @@ static void sub_80F181C(u8 taskId)
else
pan = SOUND_PAN_TARGET;
PlaySE12WithPanning(SE_REAPOKE, pan);
PlaySE12WithPanning(SE_SHINY, pan);
}
}
src/battle_anim_utility_funcs.c
+2 -2
View File
@@ -516,9 +516,9 @@ static void sub_80BB2A0(u8 taskId)
gTasks[taskId].data[7] = gBattlerSpriteIds[sAnimStatsChangeData->battler2];
gTasks[taskId].func = sub_80BB4B8;
if (sAnimStatsChangeData->data[0] == 0)
PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER));
PlaySE12WithPanning(SE_M_STAT_INCREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER));
else
PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER));
PlaySE12WithPanning(SE_M_STAT_DECREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER));
}
static void sub_80BB4B8(u8 taskId)
src/battle_bg.c
+1 -1
View File
@@ -924,7 +924,7 @@ void InitLinkBattleVsScreen(u8 taskId)
if (gTasks[taskId].data[5] != 0)
DrawLinkBattleVsScreenOutcomeText();
PlaySE(SE_W231);
PlaySE(SE_M_HARDEN);
DestroyTask(taskId);
gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = FALSE;
gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = FALSE;
src/battle_controller_link_opponent.c
+1 -1
View File
@@ -1200,7 +1200,7 @@ static void LinkOpponentHandleFaintAnimation(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
{
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET);
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
gBattlerControllerFuncs[gActiveBattler] = sub_803AD20;
}
src/battle_controller_link_partner.c
+1 -1
View File
@@ -1111,7 +1111,7 @@ static void LinkPartnerHandleFaintAnimation(void)
{
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8012110;
src/battle_controller_oak_old_man.c
+1 -1
View File
@@ -1638,7 +1638,7 @@ static void OakOldManHandleFaintAnimation(void)
{
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8012110;
src/battle_controller_opponent.c
+1 -1
View File
@@ -1202,7 +1202,7 @@ static void OpponentHandleFaintAnimation(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
{
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET);
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
gBattlerControllerFuncs[gActiveBattler] = sub_803612C;
}
src/battle_controller_player.c
+5 -5
View File
@@ -798,7 +798,7 @@ static void sub_802F610(void)
{
if (!gReceivedRemoteLinkPlayers)
{
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(sub_8011A1C);
@@ -807,7 +807,7 @@ static void sub_802F610(void)
}
else if (IsLinkTaskFinished())
{
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(sub_8011A1C);
@@ -829,7 +829,7 @@ void sub_802F6A8(void)
}
else
{
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
gMain.inBattle = FALSE;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(gMain.savedCallback);
@@ -1217,7 +1217,7 @@ static void sub_80303A8(u8 taskId)
++data[15];
break;
case 2:
PlaySE(SE_REGI);
PlaySE(SE_RS_SHOP);
if (IsMonGettingExpSentOut())
CreateLevelUpVerticalSpritesTask(sprite->pos1.x + sprite->pos2.x,
sprite->pos1.y + sprite->pos2.y,
@@ -2252,7 +2252,7 @@ static void PlayerHandleFaintAnimation(void)
{
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8012110;
src/battle_controller_pokedude.c
+4 -4
View File
@@ -1782,14 +1782,14 @@ static void PokedudeHandleFaintAnimation(void)
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
{
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8012110;
}
else
{
PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET);
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
}
gBattlerControllerFuncs[gActiveBattler] = sub_8156DCC;
@@ -2607,7 +2607,7 @@ static void sub_8159BA8(void)
if (gUnknown_3005EE0[gActiveBattler][3] == 13)
{
BattleStopLowHpSound();
PlayBGM(MUS_WIN_YASEI);
PlayBGM(MUS_VICTORY_WILD);
}
gBattle_BG0_Y = gUnknown_3005EE0[gActiveBattler][4];
sub_80EB524();
@@ -2680,7 +2680,7 @@ static void sub_8159D04(void)
if (gUnknown_3005EE0[gActiveBattler][3] == 13)
{
BattleStopLowHpSound();
PlayBGM(MUS_WIN_YASEI);
PlayBGM(MUS_VICTORY_WILD);
}
sub_80EF0E0(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT));
sub_80EB524();
src/battle_gfx_sfx_util.c
+4 -4
View File
@@ -816,7 +816,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId)
if (!gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong)
{
if (!gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong)
PlaySE(SE_HINSI);
PlaySE(SE_LOW_HEALTH);
gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 1;
}
}
@@ -824,9 +824,9 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId)
{
gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 0;
if (!IsDoubleBattle())
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
else if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong)
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
}
}
@@ -837,7 +837,7 @@ void BattleStopLowHpSound(void)
gBattleSpritesDataPtr->battlerData[playerBattler].lowHpSong = 0;
if (IsDoubleBattle())
gBattleSpritesDataPtr->battlerData[playerBattler ^ BIT_FLANK].lowHpSong = 0;
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
}
// not used
src/battle_interface.c
+3 -3
View File
@@ -1231,7 +1231,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
gTasks[taskId].tBallIconSpriteId(i) = ballIconSpritesIds[i];
gTasks[taskId].tIsBattleStart = isBattleStart;
PlaySE12WithPanning(SE_TB_START, 0);
PlaySE12WithPanning(SE_BALL_TRAY_ENTER, 0);
return taskId;
}
@@ -1421,9 +1421,9 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite)
pan = SOUND_PAN_ATTACKER;
if (sprite->data[7] != 0)
PlaySE2WithPanning(SE_TB_KARA, pan);
PlaySE2WithPanning(SE_BALL_TRAY_EXIT, pan);
else
PlaySE1WithPanning(SE_TB_KON, pan);
PlaySE1WithPanning(SE_BALL_TRAY_BALL, pan);
sprite->callback = SpriteCallbackDummy;
}
src/battle_main.c
+7 -7
View File
@@ -1435,7 +1435,7 @@ void FreeRestoreBattleData(void)
gScanlineEffect.state = 3;
gMain.inBattle = FALSE;
ZeroEnemyPartyMons();
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
FreeMonSpritesGfx();
FreeBattleSpritesData();
FreeBattleResources();
@@ -1647,7 +1647,7 @@ void sub_801182C(struct Sprite *sprite)
{
StartSpriteAffineAnim(sprite, 1);
sprite->callback = sub_80117BC;
PlaySE(SE_BT_START);
PlaySE(SE_MUGSHOT);
}
static void sub_801184C(u8 taskId)
@@ -3661,7 +3661,7 @@ static void HandleEndTurn_BattleWon(void)
else if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER))
{
BattleStopLowHpSound();
PlayBGM(MUS_WIN_TRE);
PlayBGM(MUS_VICTORY_TRAINER);
gBattlescriptCurrInstr = BattleScript_BattleTowerTrainerBattleWon;
}
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
@@ -3672,7 +3672,7 @@ static void HandleEndTurn_BattleWon(void)
{
case CLASS_LEADER_2:
case CLASS_CHAMPION_2:
PlayBGM(MUS_WIN_GYM);
PlayBGM(MUS_VICTORY_GYM_LEADER);
break;
case CLASS_BOSS:
case CLASS_TEAM_ROCKET:
@@ -3680,7 +3680,7 @@ static void HandleEndTurn_BattleWon(void)
case CLASS_ELITE_FOUR_2:
case CLASS_GENTLEMAN_2:
default:
PlayBGM(MUS_WIN_TRE);
PlayBGM(MUS_VICTORY_TRAINER);
break;
}
}
@@ -3858,7 +3858,7 @@ static void ReturnFromBattleToOverworld(void)
#endif // & with B_OUTCOME_WON (1) will return TRUE and deactivates the roamer.
SetRoamerInactive();
}
m4aSongNumStop(SE_HINSI);
m4aSongNumStop(SE_LOW_HEALTH);
SetMainCallback2(gMain.savedCallback);
}
}
@@ -4338,7 +4338,7 @@ static void HandleAction_ThrowRock(void)
static void HandleAction_SafariZoneRun(void)
{
gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
PlaySE(SE_NIGERU);
PlaySE(SE_FLEE);
gCurrentTurnActionNumber = gBattlersCount;
gBattleOutcome = B_OUTCOME_RAN;
}
src/battle_message.c
+11 -11
View File
@@ -311,23 +311,23 @@ static const u8 sText_StatsWontIncrease2[] = _("{B_ATK_NAME_WITH_PREFIX}'s stats
static const u8 sText_StatsWontDecrease2[] = _("{B_DEF_NAME_WITH_PREFIX}'s stats won't\ngo any lower!");
static const u8 sText_CriticalHit[] = _("A critical hit!");
static const u8 sText_OneHitKO[] = _("It's a one-hit KO!");
static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p");
static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p");
static const u8 sText_AndEllipsis[] = _("And…\p");
static const u8 sText_HMMovesCantBeForgotten[] = _("HM moves can't be\nforgotten now.\p");
static const u8 sText_NotVeryEffective[] = _("It's not very effective…");
static const u8 sText_SuperEffective[] = _("It's super effective!");
static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_NIGERU}Got away safely!\p");
static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p");
static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p");
static const u8 sText_WildPkmnFled[] = _("{PLAY_SE SE_NIGERU}Wild {B_BUFF1} fled!");
static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_FLEE}Got away safely!\p");
static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE SE_FLEE}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p");
static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE SE_FLEE}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p");
static const u8 sText_WildPkmnFled[] = _("{PLAY_SE SE_FLEE}Wild {B_BUFF1} fled!");
static const u8 sText_PlayerDefeatedLinkTrainer[] = _("Player defeated\n{B_LINK_OPPONENT1_NAME}!");
static const u8 sText_TwoLinkTrainersDefeated[] = _("Player beat {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!");
static const u8 sText_PlayerLostAgainstLinkTrainer[] = _("Player lost against\n{B_LINK_OPPONENT1_NAME}!");
static const u8 sText_PlayerLostToTwo[] = _("Player lost to {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!");
static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME}!");
static const u8 sText_PlayerBattledToDrawVsTwo[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!");
static const u8 sText_WildFled[] = _("{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} fled!");
static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!");
static const u8 sText_WildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} fled!");
static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!");
static const u8 sText_NoRunningFromTrainers[] = _("No! There's no running\nfrom a TRAINER battle!\p");
static const u8 sText_CantEscape[] = _("Can't escape!\p");
static const u8 sText_EmptyString5[] = _(""); //sText_DontLeaveBirch in pokeem
@@ -375,7 +375,7 @@ static const u8 sText_ThrewSomeBait[] = _("{B_PLAYER_NAME} threw some BAIT\nat t
static const u8 sText_PkmnWatchingCarefully[] = _("{B_OPPONENT_MON1_NAME} is watching\ncarefully!");
static const u8 sText_PkmnIsAngry[] = _("{B_OPPONENT_MON1_NAME} is angry!");
static const u8 sText_PkmnIsEating[] = _("{B_OPPONENT_MON1_NAME} is eating!");
static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE SE_PINPON}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p");
static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE SE_DING_DONG}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p");
static const u8 sText_WildPkmnAppeared[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p");
static const u8 sText_WildPkmnAppeared2[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p");
static const u8 sText_WildPkmnAppearedPause[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!{PAUSE 127}");
@@ -471,8 +471,8 @@ static const u8 sText_ItAppearedCaught[] = _("Aww!\nIt appeared to be caught!");
static const u8 sText_AarghAlmostHadIt[] = _("Aargh!\nAlmost had it!");
static const u8 sText_ShootSoClose[] = _("Shoot!\nIt was so close, too!");
const u8 gUnknown_83FD78A[] = _("よけられた!\nこいつは つかまりそうにないぞ!");
static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_GET_YASEI}\p");
static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_GET_YASEI}{PAUSE 127}");
static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}\p");
static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}{PAUSE 127}");
static const u8 sText_GiveNicknameCaptured[] = _("Give a nickname to the\ncaptured {B_OPPONENT_MON1_NAME}?");
static const u8 sText_PkmnSentToPC[] = _("{B_OPPONENT_MON1_NAME} was sent to\n{B_PC_CREATOR_NAME} PC.");
static const u8 sText_Someones[] = _("someone's");
@@ -1310,7 +1310,7 @@ const u8 *const gTrainerTowerChallengeTypeTexts[NUM_TOWER_CHALLENGE_TYPES] = {
gOtherText_Mixed
};
const u8 gUnknown_83FE9D4[] = _("{PLAY_SE SE_NIGERU}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!"); //
const u8 gUnknown_83FE9D4[] = _("{PLAY_SE SE_FLEE}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!"); //
static const u8 sText_PlayerLostAgainstTrainer1[] = _("Player lost against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!");
static const u8 sText_PlayerBattledToDrawTrainer1[] = _("Player battled to a draw against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!");
src/battle_script_commands.c
+6 -6
View File
@@ -1883,11 +1883,11 @@ static void atk0E_effectivenesssound(void)
switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED)))
{
case MOVE_RESULT_SUPER_EFFECTIVE:
BtlController_EmitPlaySE(0, SE_KOUKA_H);
BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE);
MarkBattlerForControllerExec(gActiveBattler);
break;
case MOVE_RESULT_NOT_VERY_EFFECTIVE:
BtlController_EmitPlaySE(0, SE_KOUKA_L);
BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE);
MarkBattlerForControllerExec(gActiveBattler);
break;
case MOVE_RESULT_DOESNT_AFFECT_FOE:
@@ -1900,17 +1900,17 @@ static void atk0E_effectivenesssound(void)
default:
if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE)
{
BtlController_EmitPlaySE(0, SE_KOUKA_H);
BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE);
MarkBattlerForControllerExec(gActiveBattler);
}
else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE)
{
BtlController_EmitPlaySE(0, SE_KOUKA_L);
BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE);
MarkBattlerForControllerExec(gActiveBattler);
}
else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)))
{
BtlController_EmitPlaySE(0, SE_KOUKA_M);
BtlController_EmitPlaySE(0, SE_EFFECTIVE);
MarkBattlerForControllerExec(gActiveBattler);
}
break;
@@ -3156,7 +3156,7 @@ static void atk23_getexp(void)
&& !gBattleStruct->wildVictorySong)
{
BattleStopLowHpSound();
PlayBGM(MUS_WIN_YASEI);
PlayBGM(MUS_VICTORY_WILD);
++gBattleStruct->wildVictorySong;
}
if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP))
src/battle_setup.c
+11 -11
View File
@@ -250,7 +250,7 @@ void StartRoamerBattle(void)
StopPlayerAvatar();
gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_ROAMER;
CreateBattleStartTask(GetWildBattleTransition(), MUS_VS_DEN);
CreateBattleStartTask(GetWildBattleTransition(), MUS_VS_LEGEND);
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
@@ -344,20 +344,20 @@ void StartLegendaryBattle(void)
switch (species)
{
case SPECIES_MEWTWO:
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_MYU2);
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_MEWTWO);
break;
case SPECIES_DEOXYS:
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_DEO);
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_DEOXYS);
break;
case SPECIES_MOLTRES:
case SPECIES_ARTICUNO:
case SPECIES_ZAPDOS:
case SPECIES_HO_OH:
case SPECIES_LUGIA:
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_DEN);
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_LEGEND);
break;
default:
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE20);
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RS_VS_TRAINER);
break;
}
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
@@ -370,9 +370,9 @@ void StartGroudonKyogreBattle(void)
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
if (gGameVersion == VERSION_FIRE_RED)
CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_BATTLE20);
CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_RS_VS_TRAINER);
else // pointless, exactly the same
CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_BATTLE20);
CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_RS_VS_TRAINER);
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
@@ -382,7 +382,7 @@ void StartRegiBattle(void)
ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE20);
CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RS_VS_TRAINER);
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
@@ -1003,7 +1003,7 @@ void PlayTrainerEncounterMusic(void)
case TRAINER_ENCOUNTER_MUSIC_FEMALE:
case TRAINER_ENCOUNTER_MUSIC_GIRL:
case TRAINER_ENCOUNTER_MUSIC_TWINS:
music = MUS_SHOUJO;
music = MUS_ENCOUNTER_GIRL;
break;
case TRAINER_ENCOUNTER_MUSIC_MALE:
case TRAINER_ENCOUNTER_MUSIC_INTENSE:
@@ -1013,10 +1013,10 @@ void PlayTrainerEncounterMusic(void)
case TRAINER_ENCOUNTER_MUSIC_HIKER:
case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER:
case TRAINER_ENCOUNTER_MUSIC_RICH:
music = MUS_SHOUNEN;
music = MUS_ENCOUNTER_BOY;
break;
default:
music = MUS_ROCKET;
music = MUS_ENCOUNTER_ROCKET;
break;
}
PlayNewMapMusic(music);
src/battle_transition.c
+1 -1
View File
@@ -1899,7 +1899,7 @@ static bool8 BT_Phase2Mugshot_StartSpriteSlide(struct Task *task)
BT_SetSpriteAsOpponentOrPlayer(task->tOpponentSpriteId, FALSE);
BT_SetSpriteAsOpponentOrPlayer(task->tPlayerSpriteId, TRUE);
BT_StartSpriteSlide(task->tOpponentSpriteId);
PlaySE(SE_BT_START);
PlaySE(SE_MUGSHOT);
++sTransitionStructPtr->vblankDma;
return FALSE;
}
src/berry_crush.c
+1 -1
View File
@@ -39,7 +39,7 @@ u32 ExitBerryCrushWithCallback(MainCallback callback)
SetMainCallback2(callback);
if (callback == CB2_ReturnToField)
{
PlayNewMapMusic(MUS_POKECEN);
PlayNewMapMusic(MUS_POKE_CENTER);
SetMainCallback1(CB1_Overworld);
}
src/berry_crush_2.c
+6 -6
View File
@@ -279,7 +279,7 @@ static u32 BerryCrushCommand_SignalReadyToBegin(struct BerryCrushGame * game, UN
case 1:
if (IsLinkTaskFinished())
{
PlayNewMapMusic(MUS_SLOT);
PlayNewMapMusic(MUS_GAME_CORNER);
BerryCrush_RunOrScheduleCommand(BCCMD_AskPickBerry, 1, NULL);
game->gameState = 3;
game->cmdState = 0;
@@ -390,7 +390,7 @@ static u32 BerryCrushCommand_DropBerriesIntoCrusher(struct BerryCrushGame * game
case 2:
game->spritesManager.berrySprites[game->spritesManager.animBerryIdx]->callback = SpriteCB_DropBerryIntoCrusher;
game->spritesManager.berrySprites[game->spritesManager.animBerryIdx]->affineAnimPaused = FALSE;
PlaySE(SE_NAGERU);
PlaySE(SE_BALL_THROW);
break;
case 3:
if (game->spritesManager.berrySprites[game->spritesManager.animBerryIdx]->callback == SpriteCB_DropBerryIntoCrusher)
@@ -416,7 +416,7 @@ static u32 BerryCrushCommand_DropBerriesIntoCrusher(struct BerryCrushGame * game
case 6:
if (!IsLinkTaskFinished())
return 0;
PlaySE(SE_RU_HYUU);
PlaySE(SE_FALL);
BerryCrush_RunOrScheduleCommand(BCCMD_DropLid, 1, NULL);
game->gameState = 5;
game->cmdState = 0;
@@ -438,7 +438,7 @@ static u32 BerryCrushCommand_DropLid(struct BerryCrushGame * game, UNUSED u8 *p
game->spritesManager.unk1 = 4;
game->spritesManager.animBerryIdx = 0;
game->spritesManager.unk2 = gUnknown_846E2F0[game->spritesManager.unk1][0];
PlaySE(SE_W070);
PlaySE(SE_M_STRENGTH);
break;
case 1:
game->vibration = gUnknown_846E2F0[game->spritesManager.unk1][game->spritesManager.animBerryIdx];
@@ -832,7 +832,7 @@ static u32 BerryCrushCommand_FinishGame(struct BerryCrushGame * game, UNUSED u8
{
case 0:
game->gameState = 8;
PlaySE(SE_W070);
PlaySE(SE_M_STRENGTH);
BlendPalettes(0xFFFFFFFF, 8, RGB(31, 31, 0));
game->spritesManager.animBerryIdx = 2;
break;
@@ -889,7 +889,7 @@ static u32 BerryCrushCommand_HandleTimeUp(struct BerryCrushGame * game, u8 *para
{
case 0:
game->gameState = 9;
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
BlendPalettes(0xFFFFFFFF, 8, RGB(31, 0, 0));
game->spritesManager.animBerryIdx = 4;
break;
src/berry_crush_3.c
+2 -2
View File
@@ -777,9 +777,9 @@ void sub_814DC5C(struct BerryCrushGame * game, struct BerryCrushGame_138 * manag
else
{
if (sp4 == 1)
PlaySE(SE_TOY_DANGO);
PlaySE(SE_MUD_BALL);
else
PlaySE(SE_TOY_KABE);
PlaySE(SE_BREAKABLE_DOOR);
game->unk25_2 = 1;
}
src/berry_pouch.c
+1 -1
View File
@@ -704,7 +704,7 @@ static void BerryPouchMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen
{
if (onInit != TRUE)
{
PlaySE(SE_BAG1);
PlaySE(SE_BAG_CURSOR);
StartBerryPouchSpriteWobbleAnim();
}
DestroyItemMenuIcon(sResources->itemMenuIconId ^ 1);
src/cable_club.c
+4 -4
View File
@@ -608,9 +608,9 @@ static void Task_StartWiredCableClubBattle(u8 taskId)
break;
case 5:
if (gLinkPlayers[0].trainerId & 1)
PlayMapChosenOrBattleBGM(MUS_BATTLE32);
PlayMapChosenOrBattleBGM(MUS_RS_VS_GYM_LEADER);
else
PlayMapChosenOrBattleBGM(MUS_BATTLE20);
PlayMapChosenOrBattleBGM(MUS_RS_VS_TRAINER);
switch (gSpecialVar_0x8004)
{
case USING_SINGLE_BATTLE:
@@ -680,9 +680,9 @@ static void Task_StartWirelessCableClubBattle(u8 taskId)
break;
case 7:
if (gLinkPlayers[0].trainerId & 1)
PlayMapChosenOrBattleBGM(MUS_BATTLE32);
PlayMapChosenOrBattleBGM(MUS_RS_VS_GYM_LEADER);
else
PlayMapChosenOrBattleBGM(MUS_BATTLE20);
PlayMapChosenOrBattleBGM(MUS_RS_VS_TRAINER);
gLinkPlayers[0].linkType = LINKTYPE_BATTLE;
switch (gSpecialVar_0x8004)
{
src/daycare.c
+8 -8
View File
@@ -1874,10 +1874,10 @@ static void Task_EggHatchPlayBGM(u8 taskID)
StopMapMusic();
}
if (gTasks[taskID].data[0] == 1)
PlayBGM(MUS_ME_SHINKA);
PlayBGM(MUS_EVOLUTION_INTRO);
if (gTasks[taskID].data[0] > 60)
{
PlayBGM(MUS_SHINKA);
PlayBGM(MUS_EVOLUTION);
DestroyTask(taskID);
// UB: task is destroyed, yet the value is incremented
}
@@ -1932,7 +1932,7 @@ static void CB2_EggHatch_1(void)
DayCare_GetMonNickname(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_HatchedFromEgg);
EggHatchPrintMessage(sEggHatchData->windowId, gStringVar4, 0, 3, 0xFF);
PlayFanfare(MUS_FANFA5);
PlayFanfare(MUS_EVOLVED);
sEggHatchData->CB2_state++;
PutWindowTilemap(sEggHatchData->windowId);
CopyWindowToVram(sEggHatchData->windowId, COPYWIN_BOTH);
@@ -2011,7 +2011,7 @@ static void SpriteCB_Egg_0(struct Sprite* sprite)
sprite->pos2.x = Sin(sprite->data[1], 1);
if (sprite->data[0] == 15)
{
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
StartSpriteAnim(sprite, 1);
CreateRandomEggShardSprite();
}
@@ -2034,7 +2034,7 @@ static void SpriteCB_Egg_1(struct Sprite* sprite)
sprite->pos2.x = Sin(sprite->data[1], 2);
if (sprite->data[0] == 15)
{
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
StartSpriteAnim(sprite, 2);
}
}
@@ -2071,13 +2071,13 @@ static void SpriteCB_Egg_2(struct Sprite* sprite)
sprite->pos2.x = Sin(sprite->data[1], 2);
if (sprite->data[0] == 15)
{
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
StartSpriteAnim(sprite, 2);
CreateRandomEggShardSprite();
CreateRandomEggShardSprite();
}
if (sprite->data[0] == 30)
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
}
}
}
@@ -2104,7 +2104,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite)
sprite->data[0]++;
if (!gPaletteFade.active)
{
PlaySE(SE_TAMAGO);
PlaySE(SE_EGG_HATCH);
sprite->invisible = TRUE;
sprite->callback = SpriteCB_Egg_5;
sprite->data[0] = 0;
src/dodrio_berry_picking.c
+15 -15
View File
@@ -209,7 +209,7 @@ void StartDodrioBerryPicking(u16 a0, MainCallback callback)
sub_8153150();
sub_81529A4(gUnknown_203F3E0->unk24, &gUnknown_203F3E0->unk44, &gUnknown_203F3E0->unk48);
StopMapMusic();
PlayNewMapMusic(MUS_KINOMIKUI);
PlayNewMapMusic(MUS_BERRY_PICK);
}
else
{
@@ -601,7 +601,7 @@ static void sub_8150FDC(void)
if (WaitFanfare(TRUE))
{
sub_8152090(6);
FadeOutAndPlayNewMapMusic(MUS_WIN_YASEI, 4);
FadeOutAndPlayNewMapMusic(MUS_VICTORY_WILD, 4);
}
break;
}
@@ -643,7 +643,7 @@ static void sub_815109C(void)
if (WaitFanfare(TRUE)) {
gUnknown_203F3E0->unk114 = gUnknown_203F3E0->unk4A[gUnknown_203F3E0->multiplayerId][5];
sub_8152090(6);
FadeOutAndPlayNewMapMusic(MUS_WIN_YASEI, 4);
FadeOutAndPlayNewMapMusic(MUS_VICTORY_WILD, 4);
}
break;
}
@@ -898,7 +898,7 @@ static void sub_815159C(void)
gUnknown_203F3E0->unk10++;
break;
case 4:
PlayNewMapMusic(MUS_KINOMIKUI);
PlayNewMapMusic(MUS_BERRY_PICK);
sub_8154540();
gUnknown_203F3E0->unk10++;
break;
@@ -1183,8 +1183,8 @@ static void sub_8151D98(void)
{
if (gUnknown_203F3E0->unk144 == 0)
{
m4aSongNumStop(SE_SEIKAI);
PlaySE(SE_SEIKAI);
m4aSongNumStop(SE_SUCCESS);
PlaySE(SE_SUCCESS);
gUnknown_203F3E0->unk144 = 1;
}
}
@@ -1205,7 +1205,7 @@ static void sub_8151D98(void)
}
else if (gUnknown_203F3E0->unk154 == 1)
{
PlayFanfareByFanfareNum(FANFARE_10); // MUS_ME_ZANNEN
PlayFanfareByFanfareNum(FANFARE_10); // MUS_TOO_BAD
gUnknown_203F3E0->unk154 = 2;
}
}
@@ -1226,8 +1226,8 @@ static void sub_8151E94(void)
{
if (gUnknown_203F3E0->unk144 == 0)
{
m4aSongNumStop(SE_SEIKAI);
PlaySE(SE_SEIKAI);
m4aSongNumStop(SE_SUCCESS);
PlaySE(SE_SUCCESS);
gUnknown_203F3E0->unk144 = 1;
}
}
@@ -1247,7 +1247,7 @@ static void sub_8151E94(void)
{
if (gUnknown_203F3E0->unk148[r4] == 0)
{
PlaySE(SE_FUUSEN1 + ptr->unk0[r4]);
PlaySE(SE_BALLOON_RED + ptr->unk0[r4]);
gUnknown_203F3E0->unk148[r4] = 1;
}
}
@@ -1263,7 +1263,7 @@ static void sub_8151E94(void)
}
else if (gUnknown_203F3E0->unk154 == 1)
{
PlayFanfareByFanfareNum(FANFARE_10); // MUS_ME_ZANNEN
PlayFanfareByFanfareNum(FANFARE_10); // MUS_TOO_BAD
gUnknown_203F3E0->unk154 = 2;
}
}
@@ -1517,7 +1517,7 @@ static void sub_815256C(void)
if (gUnknown_203F3E0->unk148[i] == 0)
{
gUnknown_203F3E0->unk148[i] = 1;
PlaySE(SE_FUUSEN1 + ptr->unk32CC.unk14.unk0[i]);
PlaySE(SE_BALLOON_RED + ptr->unk32CC.unk14.unk0[i]);
}
if (gUnknown_203F3E0->unk40 < 10 || r10 == 1)
{
@@ -2070,19 +2070,19 @@ static void sub_81532B8(void)
{
gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 2;
gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId] = 6;
PlaySE(SE_W204);
PlaySE(SE_M_CHARM);
}
else if (JOY_NEW(DPAD_LEFT))
{
gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 3;
gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId] = 6;
PlaySE(SE_W204);
PlaySE(SE_M_CHARM);
}
else if (JOY_NEW(DPAD_RIGHT))
{
gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 1;
gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId] = 6;
PlaySE(SE_W204);
PlaySE(SE_M_CHARM);
}
else
{
src/dodrio_berry_picking_2.c
+14 -14
View File
@@ -373,7 +373,7 @@ static u32 sub_8153CA0(struct Sprite * sprite)
u8 mod = (++sprite->data[1] / 13) % 4;
if (sprite->data[1] % 13 == 0 && mod != 0)
PlaySE(SE_W204);
PlaySE(SE_M_CHARM);
if (sprite->data[1] >= 104)
{
sprite->data[0] = 0;
@@ -490,7 +490,7 @@ bool32 sub_8153F1C(void)
continue;
gUnknown_203F43C->unkC[i] = 1;
gUnknown_203F43C->unk16[i] = -16;
PlaySE(SE_TK_KASYA);
PlaySE(SE_CLICK);
}
sprite->pos1.y += gUnknown_203F43C->unk16[i];
}
@@ -543,16 +543,16 @@ void sub_81540DC(bool8 invisible)
// Unknown unused data, feel free to remove.
static const u8 sUnused2[] = {
SE_W204,
SE_TOY_C,
SE_TOY_D,
SE_TOY_E,
SE_TOY_F,
SE_TOY_G,
SE_TOY_A,
SE_TOY_B,
SE_TOY_C1,
SE_CARD3
SE_M_CHARM,
SE_NOTE_C,
SE_NOTE_D,
SE_NOTE_E,
SE_NOTE_F,
SE_NOTE_G,
SE_NOTE_A,
SE_NOTE_B,
SE_NOTE_C_HIGH,
SE_CARD_OPEN
};
void sub_8154128(void)
@@ -1268,7 +1268,7 @@ static void sub_8154F80(void)
}
break;
case 9:
PlayNewMapMusic(MUS_FANFA1);
PlayNewMapMusic(MUS_LEVEL_UP);
FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1));
FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1));
strWidth = GetStringWidth(0, gText_AnnouncingPrizes, -1);
@@ -1302,7 +1302,7 @@ static void sub_8154F80(void)
PutWindowTilemap(gUnknown_203F440->unk3008[1]);
}
CopyBgTilemapBufferToVram(0);
FadeOutAndFadeInNewMapMusic(MUS_WIN_YASEI, 20, 10);
FadeOutAndFadeInNewMapMusic(MUS_VICTORY_WILD, 20, 10);
gUnknown_203F440->state++;
break;
case 11:
src/electric.c
+1 -1
View File
@@ -1190,7 +1190,7 @@ static bool8 sub_80AEE74(struct Task *task, u8 taskId)
if (task->data[4] == 0 && task->data[5] > 0)
{
task->data[14] += task->data[15];
PlaySE12WithPanning(SE_W085, task->data[14]);
PlaySE12WithPanning(SE_M_THUNDERBOLT, task->data[14]);
}
if ((task->data[5] < 0 && task->data[7] <= task->data[8])
|| (task->data[5] > 0 && task->data[7] >= task->data[8]))
src/evolution_graphics.c
+5 -5
View File
@@ -272,7 +272,7 @@ static void EvoTask_PreEvoSparkleSet1Init(u8 taskId)
gTasks[taskId].data[15] = 0;
BeginNormalPaletteFade(3 << gTasks[taskId].data[1], 10, 0, 16, RGB_WHITE);
gTasks[taskId].func = EvoTask_CreatePreEvoSparkleSet1;
PlaySE(SE_W025);
PlaySE(SE_M_MEGA_KICK);
}
static void EvoTask_CreatePreEvoSparkleSet1(u8 taskId)
@@ -313,7 +313,7 @@ static void EvoTask_PreEvoSparkleSet2Init(u8 taskId)
SetEvoSparklesMatrices();
gTasks[taskId].data[15] = 0;
gTasks[taskId].func = EvoTask_CreatePreEvoSparklesSet2;
PlaySE(SE_W062B);
PlaySE(SE_M_BUBBLE_BEAM2);
}
static void EvoTask_CreatePreEvoSparklesSet2(u8 taskId)
@@ -350,7 +350,7 @@ static void EvoTask_PostEvoSparklesSet1Init(u8 taskId)
SetEvoSparklesMatrices();
gTasks[taskId].data[15] = 0;
gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet1;
PlaySE(SE_REAPOKE);
PlaySE(SE_SHINY);
}
static void EvoTask_CreatePostEvoSparklesSet1(u8 taskId)
@@ -400,7 +400,7 @@ static void EvoTask_PostEvoSparklesSet2Init(u8 taskId)
CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96);
BeginNormalPaletteFade(0xFFF90F1C, 0, 0, 16, RGB_WHITE);
gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2;
PlaySE(SE_W080);
PlaySE(SE_M_PETAL_DANCE);
}
static void EvoTask_CreatePostEvoSparklesSet2(u8 taskId)
@@ -451,7 +451,7 @@ static void EvoTask_PostEvoSparklesSet2TradeInit(u8 taskId)
CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96);
BeginNormalPaletteFade(0xFFF90F00, 0, 0, 16, RGB_WHITE);
gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2Trade;
PlaySE(SE_W080);
PlaySE(SE_M_PETAL_DANCE);
}
static void EvoTask_CreatePostEvoSparklesSet2Trade(u8 taskId)
src/evolution_scene.c
+10 -10
View File
@@ -641,14 +641,14 @@ static void Task_EvolutionScene(u8 taskId)
case 3:
if (IsCryFinished()) // wait for animation, play tu du SE
{
PlaySE(MUS_ME_SHINKA);
PlaySE(MUS_EVOLUTION_INTRO);
gTasks[taskId].tState++;
}
break;
case 4: // play evolution music and fade screen black
if (!IsSEPlaying())
{
PlayNewMapMusic(MUS_SHINKA);
PlayNewMapMusic(MUS_EVOLUTION);
gTasks[taskId].tState++;
BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
}
@@ -724,7 +724,7 @@ static void Task_EvolutionScene(u8 taskId)
{
StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved);
BattlePutTextOnWindow(gStringVar4, 0);
PlayBGM(MUS_FANFA5);
PlayBGM(MUS_EVOLVED);
gTasks[taskId].tState++;
SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskId].tPostEvoSpecies));
CalculateMonStats(mon);
@@ -816,7 +816,7 @@ static void Task_EvolutionScene(u8 taskId)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BufferMoveToLearnIntoBattleTextBuff2();
PlayFanfare(MUS_FANFA1);
PlayFanfare(MUS_LEVEL_UP);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter
@@ -1021,15 +1021,15 @@ static void Task_TradeEvolutionScene(u8 taskId)
case 2:
if (IsCryFinished())
{
m4aSongNumStop(MUS_SHINKA);
PlaySE(MUS_ME_SHINKA);
m4aSongNumStop(MUS_EVOLUTION);
PlaySE(MUS_EVOLUTION_INTRO);
gTasks[taskId].tState++;
}
break;
case 3:
if (!IsSEPlaying())
{
PlayBGM(MUS_SHINKA);
PlayBGM(MUS_EVOLUTION);
gTasks[taskId].tState++;
BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
}
@@ -1103,7 +1103,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
{
StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved);
DrawTextOnTradeWindow(0, gStringVar4, 1);
PlayFanfare(MUS_FANFA5);
PlayFanfare(MUS_EVOLVED);
gTasks[taskId].tState++;
SetMonData(mon, MON_DATA_SPECIES, (&gTasks[taskId].tPostEvoSpecies));
CalculateMonStats(mon);
@@ -1136,7 +1136,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
}
else
{
PlayBGM(MUS_SHINKA);
PlayBGM(MUS_EVOLUTION);
DrawTextOnTradeWindow(0, gText_CommunicationStandby5, 1);
gTasks[taskId].tState++;
}
@@ -1180,7 +1180,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BufferMoveToLearnIntoBattleTextBuff2();
PlayFanfare(MUS_FANFA1);
PlayFanfare(MUS_LEVEL_UP);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter
src/fame_checker.c
+5 -5
View File
@@ -429,7 +429,7 @@ void UseFameChecker(MainCallback savedCallback)
sFameCheckerData->listMenuTopIdx2 = 0;
sFameCheckerData->listMenuDrawnSelIdx = 0;
sFameCheckerData->viewingFlavorText = FALSE;
PlaySE(SE_W129);
PlaySE(SE_M_SWIFT);
SetMainCallback2(MainCB2_LoadFameChecker);
}
@@ -540,11 +540,11 @@ static void Task_TopMenuHandleInput(u8 taskId)
cursorPos = FameCheckerGetCursorY();
if (TryExitPickMode(taskId) == TRUE)
{
PlaySE(SE_W199);
PlaySE(SE_M_LOCK_ON);
}
else if (cursorPos != sFameCheckerData->numUnlockedPersons - 1) // anything but CANCEL
{
PlaySE(SE_W199);
PlaySE(SE_M_LOCK_ON);
FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 88, 32);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC);
UpdateInfoBoxTilemap(2, 4);
@@ -729,7 +729,7 @@ static void FC_MoveSelectorCursor(u8 taskId, s8 dx, s8 dy)
{
u8 i;
s16 *data = gTasks[taskId].data;
PlaySE(SE_W207B);
PlaySE(SE_M_SWAGGER2);
gSprites[data[0]].pos1.x += dx;
gSprites[data[0]].pos1.y += dy;
for (i = 0; i < 6; i++)
@@ -807,7 +807,7 @@ static bool8 SetMessageSelectorIconObjMode(u8 spriteId, u8 objMode)
static void Task_StartToCloseFameChecker(u8 taskId)
{
PlaySE(SE_W129);
PlaySE(SE_M_SWIFT);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gTasks[taskId].func = Task_DestroyAssetsAndCloseFameChecker;
}
src/field_control_avatar.c
+3 -3
View File
@@ -1067,7 +1067,7 @@ void HandleBoulderFallThroughHole(struct ObjectEvent * object)
{
if (MapGridGetMetatileBehaviorAt(object->currentCoords.x, object->currentCoords.y) == MB_FALL_WARP)
{
PlaySE(SE_RU_HYUU);
PlaySE(SE_FALL);
RemoveObjectEventByLocalIdAndMap(object->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
FlagClear(GetObjectEventFlagByLocalIdAndMap(object->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup));
}
@@ -1123,7 +1123,7 @@ bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior)
{
StoreInitialPlayerAvatarState();
DoDiveWarp();
PlaySE(SE_W291);
PlaySE(SE_M_DIVE);
return TRUE;
}
}
@@ -1133,7 +1133,7 @@ bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior)
{
StoreInitialPlayerAvatarState();
DoDiveWarp();
PlaySE(SE_W291);
PlaySE(SE_M_DIVE);
return TRUE;
}
}
src/field_door.c
+2 -2
View File
@@ -473,9 +473,9 @@ bool8 FieldIsDoorAnimationRunning(void)
u16 GetDoorSoundEffect(int x, int y)
{
if (GetDoorSoundType(sDoorGraphics, x, y) == DOOR_SOUND_NORMAL)
return MUS_W_DOOR;
return SE_DOOR;
else // DOOR_SOUND_SLIDING
return SE_JIDO_DOA;
return SE_SLIDING_DOOR;
}
static s8 GetDoorSoundType(const struct DoorGraphics * gfx, int x, int y)
src/field_effect.c
+19 -19
View File
@@ -861,7 +861,7 @@ static void PokeballGlowEffect_0(struct Sprite * sprite)
gSprites[endSpriteId].data[0] = sprite->data[7];
sprite->data[2]++;
sprite->data[6]--;
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
}
if (sprite->data[6] == 0)
{
@@ -880,7 +880,7 @@ static void PokeballGlowEffect_1(struct Sprite * sprite)
sprite->data[3] = 0;
if (sprite->data[5])
{
PlayFanfare(MUS_ME_ASA);
PlayFanfare(MUS_HEAL);
}
}
}
@@ -1156,7 +1156,7 @@ static bool8 FallWarpEffect_3(struct Task * task)
task->data[1] = 1;
task->data[2] = 0;
gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE;
PlaySE(SE_RU_HYUU);
PlaySE(SE_FALL);
task->data[0]++;
return FALSE;
}
@@ -1186,7 +1186,7 @@ static bool8 FallWarpEffect_4(struct Task * task)
}
if (sprite->pos2.y >= 0)
{
PlaySE(SE_W070);
PlaySE(SE_M_STRENGTH);
objectEvent->triggerGroundEffectsOnStop = TRUE;
objectEvent->landingJump = TRUE;
sprite->pos2.y = 0;
@@ -1309,7 +1309,7 @@ static bool8 EscalatorWarpEffect_2(struct Task * task)
{
task->data[0] = 4;
}
PlaySE(SE_ESUKA);
PlaySE(SE_ESCALATOR);
}
return FALSE;
}
@@ -1740,7 +1740,7 @@ static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent
gFieldEffectArguments[2] = sprite->subpriority - 1;
gFieldEffectArguments[3] = sprite->oam.priority;
FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
PlaySE(SE_W153);
PlaySE(SE_M_EXPLOSION);
task->data[0]++;
return TRUE;
}
@@ -1862,7 +1862,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEv
task->data[0]++;
objectEvent->invisible = FALSE;
CameraObjectReset1();
PlaySE(SE_W091);
PlaySE(SE_M_DIG);
ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST));
}
return FALSE;
@@ -1950,7 +1950,7 @@ static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent *
{
task->data[1]++;
ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastMovementAction(objectEvent->facingDirection));
PlaySE(SE_FU_ZUZUZU);
PlaySE(SE_LAVARIDGE_FALL_WARP);
}
}
return FALSE;
@@ -2052,7 +2052,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task * task)
data[3]++;
if (data[3] == 20)
{
PlaySE(SE_TK_WARPIN);
PlaySE(SE_WARP_IN);
}
}
else if (data[4] == 0 && !sub_80857F0(playerObj, &task->data[5], &task->data[6]))
@@ -2170,7 +2170,7 @@ static bool32 sub_80858A4(struct ObjectEvent * playerObj, s16 *state_p, s16 *y_p
(*y_p) += 4;
if (*y_p >= 0)
{
PlaySE(SE_TK_KASYA);
PlaySE(SE_CLICK);
CameraObjectReset1();
(*state_p)++;
return FALSE;
@@ -2203,7 +2203,7 @@ static void EscapeRopeExitFieldEffect_Step0(struct Task * task)
{
if (IsWeatherNotFadingIn())
{
PlaySE(SE_TK_WARPOUT);
PlaySE(SE_WARP_OUT);
task->data[15] = GetPlayerFacingDirection();
task->data[0]++;
}
@@ -2293,7 +2293,7 @@ static void TeleportFieldEffectTask2(struct Task * task)
task->data[1] = 4;
task->data[2] = 8;
task->data[3] = 1;
PlaySE(SE_TK_WARPIN);
PlaySE(SE_WARP_IN);
}
}
@@ -2379,7 +2379,7 @@ static void TeleportInFieldEffectTask1(struct Task * task)
task->data[2] = 1;
task->data[14] = sprite->subspriteMode;
task->data[15] = GetPlayerFacingDirection();
PlaySE(SE_TK_WARPIN);
PlaySE(SE_WARP_IN);
}
}
@@ -2889,8 +2889,8 @@ u8 FldEff_UseSurf(void)
u8 taskId = CreateTask(Task_FldEffUseSurf, 0xff);
gTasks[taskId].data[15] = gFieldEffectArguments[0];
Overworld_ClearSavedMusic();
if (Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI))
Overworld_ChangeMusicTo(MUS_NAMINORI);
if (Overworld_MusicCanOverrideMapMusic(MUS_SURF))
Overworld_ChangeMusicTo(MUS_SURF);
return FALSE;
}
@@ -3052,7 +3052,7 @@ u8 FldEff_NpcFlyOut(void)
sprite->oam.priority = 1;
sprite->callback = sub_8086D94;
sprite->data[1] = gFieldEffectArguments[0];
PlaySE(SE_W019);
PlaySE(SE_M_FLY);
return spriteId;
}
@@ -3178,7 +3178,7 @@ static void UseFlyEffect_5(struct Task * task)
if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent))
{
task->data[0]++;
PlaySE(SE_W019);
PlaySE(SE_M_FLY);
sub_80871C8(task->data[1]);
}
}
@@ -3816,7 +3816,7 @@ static void Task_FldEffUnk44(u8 taskId)
static void Unk44Effect_0(s16 *data, u8 taskId)
{
u8 newTaskId = CreateTask(sub_8087B14, 90);
PlaySE(SE_T_KAMI2);
PlaySE(SE_THUNDER2);
data[5] = newTaskId;
data[1]++;
}
@@ -3830,7 +3830,7 @@ static void Unk44Effect_1(s16 *data, u8 taskId)
BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE);
BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE);
sub_8087CFC(sprite);
PlaySE(SE_T_KAMI);
PlaySE(SE_THUNDER);
sub_8087BA8(data[5]);
data[3] = 0;
data[1]++;
src/field_effect_helpers.c
+2 -2
View File
@@ -622,7 +622,7 @@ u32 FldEff_Splash(void)
sprite->data[1] = gFieldEffectArguments[1];
sprite->data[2] = gFieldEffectArguments[2];
sprite->pos2.y = (graphicsInfo->height >> 1) - 4;
PlaySE(SE_MIZU);
PlaySE(SE_PUDDLE);
}
return 0;
}
@@ -732,7 +732,7 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite * sprite)
sprite->data[4] = objectEvent->currentCoords.y;
if (!sprite->invisible)
{
PlaySE(SE_MIZU);
PlaySE(SE_PUDDLE);
}
}
}
src/field_fadetransition.c
+6 -6
View File
@@ -305,7 +305,7 @@ static void FieldCB_TeleportWarpIn(void)
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
PlaySE(SE_TK_WARPOUT);
PlaySE(SE_WARP_OUT);
CreateTask(Task_TeleportWarpIn, 10);
ScriptContext2_Enable();
}
@@ -534,7 +534,7 @@ void DoWarp(void)
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
PlaySE(SE_EXIT);
gFieldCallback = FieldCB_DefaultWarpExit;
CreateTask(Task_Teleport2Warp, 10);
}
@@ -644,7 +644,7 @@ void DoCableClubWarp(void)
ScriptContext2_Enable();
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlaySE(SE_KAIDAN);
PlaySE(SE_EXIT);
CreateTask(Task_CableClubWarp, 10);
}
@@ -657,7 +657,7 @@ static void Task_ReturnFromLinkRoomWarp(u8 taskId)
ClearLinkCallback_2();
FadeScreen(FADE_TO_BLACK, 0);
TryFadeOutOldMapMusic();
PlaySE(SE_KAIDAN);
PlaySE(SE_EXIT);
data[0]++;
break;
case 1:
@@ -713,7 +713,7 @@ static void Task_TeleportWarp(u8 taskId)
case 0:
FreezeObjectEvents();
ScriptContext2_Enable();
PlaySE(SE_TK_WARPIN);
PlaySE(SE_WARP_IN);
StartTeleportWarpOutPlayerAnim();
task->data[0]++;
break;
@@ -813,7 +813,7 @@ static void Task_StairWarp(u8 taskId)
PlayRainStoppingSoundEffect();
playerSpr->oam.priority = 1;
sub_807EB64(data[1], &data[2], &data[3]);
PlaySE(SE_KAIDAN);
PlaySE(SE_EXIT);
data[0]++;
}
}
src/field_player_avatar.c
+9 -9
View File
@@ -378,7 +378,7 @@ static bool8 ForcedMovement_SpinDown(void)
static void PlaySpinSound(void)
{
PlaySE(SE_W013B);
PlaySE(SE_M_RAZOR_WIND2);
}
static bool8 ForcedMovement_PushedSouthByCurrent(void)
@@ -901,7 +901,7 @@ void PlayerTurnInPlace(u8 direction)
void PlayerJumpLedge(u8 direction)
{
PlaySE(SE_DANSA);
PlaySE(SE_LEDGE);
PlayerSetAnimId(GetJump2MovementAction(direction), 8);
}
@@ -952,25 +952,25 @@ static void PlayerEndWheelie(u8 direction)
static void PlayerStandingHoppingWheelie(u8 direction)
{
PlaySE(SE_JITE_PYOKO);
PlaySE(SE_BIKE_HOP);
PlayerSetAnimId(GetAcroWheelieHopFaceDirectionMovementAction(direction), 1);
}
static void PlayerMovingHoppingWheelie(u8 direction)
{
PlaySE(SE_JITE_PYOKO);
PlaySE(SE_BIKE_HOP);
PlayerSetAnimId(GetAcroWheelieHopDirectionMovementAction(direction), 2);
}
static void PlayerLedgeHoppingWheelie(u8 direction)
{
PlaySE(SE_JITE_PYOKO);
PlaySE(SE_BIKE_HOP);
PlayerSetAnimId(GetAcroWheelieJumpDirectionMovementAction(direction), 8);
}
static void PlayerAcroTurnJump(u8 direction)
{
PlaySE(SE_JITE_PYOKO);
PlaySE(SE_BIKE_HOP);
PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1);
}
@@ -1432,7 +1432,7 @@ static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject
gFieldEffectArguments[2] = strengthObject->previousElevation;
gFieldEffectArguments[3] = gSprites[strengthObject->spriteId].oam.priority;
FieldEffectStart(FLDEFF_DUST);
PlaySE(SE_W070);
PlaySE(SE_M_STRENGTH);
task->data[0]++;
}
return FALSE;
@@ -1475,7 +1475,7 @@ static bool8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEv
gPlayerAvatar.preventStep = TRUE;
if (ObjectEventClearHeldMovementIfFinished(objectEvent))
{
PlaySE(SE_DANSA);
PlaySE(SE_LEDGE);
sub_805C06C(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection));
task->data[1]++;
if (task->data[1] > 1)
@@ -1514,7 +1514,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct Objec
task->data[1] = objectEvent->movementDirection;
gPlayerAvatar.preventStep = TRUE;
ScriptContext2_Enable();
PlaySE(SE_TK_WARPIN);
PlaySE(SE_WARP_IN);
return TRUE;
}
src/field_specials.c
+8 -8
View File
@@ -473,7 +473,7 @@ void ShakeScreen(void)
gTasks[taskId].tDuration = gSpecialVar_0x8007;
gTasks[taskId].tYtrans = gSpecialVar_0x8004;
SetCameraPanningCallback(NULL);
PlaySE(SE_W070);
PlaySE(SE_M_STRENGTH);
}
static void Task_ShakeScreen(u8 taskId)
@@ -1067,7 +1067,7 @@ void AnimateElevator(void)
data[5] = sElevatorAnimationDuration[nfloors];
SetCameraPanningCallback(NULL);
AnimateElevatorWindowView(nfloors, data[6]);
PlaySE(SE_ELEBETA);
PlaySE(SE_ELEVATOR);
}
static void Task_ElevatorShake(u8 taskId)
@@ -1082,7 +1082,7 @@ static void Task_ElevatorShake(u8 taskId)
SetCameraPanning(0, data[4]);
if (data[2] == data[5])
{
PlaySE(SE_PINPON);
PlaySE(SE_DING_DONG);
DestroyTask(taskId);
EnableBothScriptContexts();
InstallCameraPanAheadCallback();
@@ -2306,7 +2306,7 @@ void CutMoveOpenDottedHoleDoor(void)
{
MapGridSetMetatileIdAt(31, 31, METATILE_SeviiIslands67_DottedHoleDoor_Open);
DrawWholeMapView();
PlaySE(SE_BAN);
PlaySE(SE_BANG);
FlagSet(FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE);
ScriptContext2_Disable();
}
@@ -2404,9 +2404,9 @@ static void MoveDeoxysObject(u8 num)
sub_8083598(10);
TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId);
if (num == 0)
PlaySE(SE_W109);
PlaySE(SE_M_CONFUSE_RAY);
else
PlaySE(SE_DEOMOV);
PlaySE(SE_DEOXYS_MOVE);
CreateTask(Task_WaitDeoxysFieldEffect, 8);
gFieldEffectArguments[0] = 1;
gFieldEffectArguments[1] = 56;
@@ -2532,7 +2532,7 @@ void LoopWingFlapSound(void)
// 8004 = Num flaps
// 8005 = Frame delay between flaps
CreateTask(Task_WingFlapSound, 8);
PlaySE(SE_W017);
PlaySE(SE_M_WING_ATTACK);
}
static void Task_WingFlapSound(u8 taskId)
@@ -2543,7 +2543,7 @@ static void Task_WingFlapSound(u8 taskId)
{
data[0]++;
data[1] = 0;
PlaySE(SE_W017);
PlaySE(SE_M_WING_ATTACK);
}
if (data[0] == gSpecialVar_0x8004 - 1)
DestroyTask(taskId);
src/field_tasks.c
+2 -2
View File
@@ -199,7 +199,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId)
{
x = data[4];
y = data[5];
PlaySE(SE_RU_BARI);
PlaySE(SE_ICE_CRACK);
MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_CrackedIce);
CurrentMapDrawMetatileAt(x, y);
data[1] = 1;
@@ -214,7 +214,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId)
{
x = data[4];
y = data[5];
PlaySE(SE_RU_GASYAN);
PlaySE(SE_ICE_BREAK);
MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_IceHole);
CurrentMapDrawMetatileAt(x, y);
VarSet(VAR_TEMP_1, 1);
src/field_weather.c
+6 -6
View File
@@ -1090,13 +1090,13 @@ void SetRainStrengthFromSoundEffect(u16 soundEffect)
{
switch (soundEffect)
{
case SE_T_KOAME:
case SE_RAIN:
gWeatherPtr->rainStrength = 0;
break;
case SE_T_OOAME:
case SE_DOWNPOUR:
gWeatherPtr->rainStrength = 1;
break;
case SE_T_AME:
case SE_THUNDERSTORM:
gWeatherPtr->rainStrength = 2;
break;
default:
@@ -1114,14 +1114,14 @@ void PlayRainStoppingSoundEffect(void)
switch (gWeatherPtr->rainStrength)
{
case 0:
PlaySE(SE_T_KOAME_E);
PlaySE(SE_RAIN_STOP);
break;
case 1:
PlaySE(SE_T_OOAME_E);
PlaySE(SE_DOWNPOUR_STOP);
break;
case 2:
default:
PlaySE(SE_T_AME_E);
PlaySE(SE_THUNDERSTORM_STOP);
break;
}
}
src/field_weather_effects.c
+5 -5
View File
@@ -444,7 +444,7 @@ void Rain_InitVars(void)
gWeatherPtr->targetRainSpriteCount = 10;
gWeatherPtr->gammaTargetIndex = 3;
gWeatherPtr->gammaStepDelay = 20;
SetRainStrengthFromSoundEffect(SE_T_KOAME);
SetRainStrengthFromSoundEffect(SE_RAIN);
}
void Rain_InitAll(void)
@@ -983,7 +983,7 @@ void Thunderstorm_InitVars(void)
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment
gWeatherPtr->thunderTriggered = FALSE;
SetRainStrengthFromSoundEffect(SE_T_AME);
SetRainStrengthFromSoundEffect(SE_THUNDERSTORM);
}
void Thunderstorm_InitAll(void)
@@ -1011,7 +1011,7 @@ void Downpour_InitVars(void)
gWeatherPtr->gammaTargetIndex = 3;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment
SetRainStrengthFromSoundEffect(SE_T_OOAME);
SetRainStrengthFromSoundEffect(SE_DOWNPOUR);
}
void Downpour_InitAll(void)
@@ -1180,9 +1180,9 @@ static void UpdateThunderSound(void)
return;
if (Random() & 1)
PlaySE(SE_T_KAMI);
PlaySE(SE_THUNDER);
else
PlaySE(SE_T_KAMI2);
PlaySE(SE_THUNDER2);
gWeatherPtr->thunderTriggered = FALSE;
}
src/fire.c
+1 -1
View File
@@ -1034,7 +1034,7 @@ static void sub_80AD690(struct Sprite *sprite)
sprite->data[5] = (sprite->data[5] + 4) & 0xFF;
newData5 = sprite->data[5];
if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0)
PlaySE12WithPanning(SE_W172, gUnknown_2037F24);
PlaySE12WithPanning(SE_M_FLAME_WHEEL, gUnknown_2037F24);
}
else
{
src/fldeff_cut.c
+2 -2
View File
@@ -216,7 +216,7 @@ bool8 FldEff_CutGrass(void)
struct MapPosition *pos;
i = 0;
PlaySE(SE_W015);
PlaySE(SE_M_CUT);
PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
for (i = 0, pos = &gPlayerFacingPosition, neg1 = 0xFFFF; i < 3; i++)
@@ -301,7 +301,7 @@ static void SpriteCallback_CutGrass_Cleanup(struct Sprite * sprite)
static void FieldMoveCallback_CutTree(void)
{
PlaySE(SE_W015);
PlaySE(SE_M_CUT);
FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE);
EnableBothScriptContexts();
}
src/fldeff_flash.c
+1 -1
View File
@@ -183,7 +183,7 @@ static void FieldCallback_Flash(void)
static void FldEff_UseFlash(void)
{
PlaySE(SE_W115);
PlaySE(SE_M_REFLECT);
FlagSet(FLAG_SYS_FLASH_ACTIVE);
ScriptContext1_SetupScript(EventScript_FldEffFlash);
}
src/fldeff_poison.c
+1 -1
View File
@@ -28,7 +28,7 @@ static void Task_FieldPoisonEffect(u8 taskId)
void FldEffPoison_Start(void)
{
PlaySE(SE_DOKU);
PlaySE(SE_FIELD_POISON);
CreateTask(Task_FieldPoisonEffect, 80);
}
src/fldeff_rocksmash.c
+1 -1
View File
@@ -131,7 +131,7 @@ bool8 FldEff_UseRockSmash(void)
static void sub_80C9A60(void)
{
PlaySE(SE_W088);
PlaySE(SE_M_ROCK_THROW);
FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
EnableBothScriptContexts();
}
src/fldeff_softboiled.c
+2 -2
View File
@@ -55,7 +55,7 @@ void Task_TryUseSoftboiledOnPartyMon(u8 taskId)
}
else
{
PlaySE(SE_KAIFUKU);
PlaySE(SE_USE_ITEM);
PartyMenuModifyHP(taskId, r8, -1, GetMonData(&gPlayerParty[r8], MON_DATA_MAX_HP) / 5, sub_80E57E8);
}
}
@@ -63,7 +63,7 @@ void Task_TryUseSoftboiledOnPartyMon(u8 taskId)
static void sub_80E57E8(u8 taskId)
{
PlaySE(SE_KAIFUKU);
PlaySE(SE_USE_ITEM);
PartyMenuModifyHP(taskId, gPartyMenu.slotId2, 1, GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAX_HP) / 5, sub_80E583C);
}
src/fldeff_sweetscent.c
+1 -1
View File
@@ -50,7 +50,7 @@ static void StartSweetScentFieldEffect(void)
{
u8 taskId;
PlaySE(SE_W230);
PlaySE(SE_M_SWEET_SCENT);
gUnknown_203AAB0 = (u8 *)Alloc(0x400);
CpuFastSet(gPlttBufferUnfaded, gUnknown_203AAB0, 0x100);
CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100);
src/ghost.c
+2 -2
View File
@@ -252,7 +252,7 @@ static void sub_80B52D0(struct Sprite *sprite)
return;
if (r0 <= 0)
return;
PlaySE12WithPanning(SE_W109, gUnknown_2037F24);
PlaySE12WithPanning(SE_M_CONFUSE_RAY, gUnknown_2037F24);
}
static void sub_80B5344(struct Sprite *sprite)
@@ -267,7 +267,7 @@ static void sub_80B5344(struct Sprite *sprite)
sprite->data[5] = (sprite->data[5] + 5) & 0xFF;
r0 = sprite->data[5];
if ((r2 == 0 || r2 > 196) && r0 > 0)
PlaySE(SE_W109);
PlaySE(SE_M_CONFUSE_RAY);
if (sprite->data[6] == 0)
{
sprite->invisible = TRUE;
src/hall_of_fame.c
+2 -2
View File
@@ -351,7 +351,7 @@ static bool8 InitHallOfFameScreen(void)
if (!gPaletteFade.active)
{
SetMainCallback2(CB2_HofIdle);
PlayBGM(MUS_DENDOU);
PlayBGM(MUS_HALL_OF_FAME);
return FALSE;
}
break;
@@ -571,7 +571,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId)
}
HallOfFame_PrintWelcomeText(0, 15);
PlaySE(SE_DENDOU);
PlaySE(SE_APPLAUSE);
gTasks[taskId].data[3] = 400;
gTasks[taskId].func = Task_Hof_ApplauseAndConfetti;
}
src/help_system.c
+3 -3
View File
@@ -54,12 +54,12 @@ u8 RunHelpSystemCallback(void)
{
if (!sub_812B45C() || !gHelpSystemEnabled)
{
PlaySE(SE_HELP_NG);
PlaySE(SE_HELP_ERROR);
return 0;
}
m4aMPlayStop(&gMPlayInfo_SE1);
m4aMPlayStop(&gMPlayInfo_SE2);
PlaySE(SE_HELP_OP);
PlaySE(SE_HELP_OPEN);
if (!gUnknown_203F174)
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x80);
SaveCallbacks();
@@ -107,7 +107,7 @@ u8 RunHelpSystemCallback(void)
case 5:
if (!RunHelpMenuSubroutine(&gHelpSystemListMenu, gHelpSystemListMenuItems))
{
PlaySE(SE_HELP_CL);
PlaySE(SE_HELP_CLOSE);
sVideoState.state = 6;
}
break;
src/intro.c
+2 -2
View File
@@ -1036,7 +1036,7 @@ static void IntroCB_GameFreakStar(struct IntroSequenceData * this)
switch (this->state)
{
case 0:
PlaySE(MUS_TITLEROG);
PlaySE(MUS_GAME_FREAK);
GameFreakScene_LoadGfxCreateStar();
this->data[5] = 0;
this->state++;
@@ -1206,7 +1206,7 @@ static void IntroCB_FightScene(struct IntroSequenceData * this)
case 3:
if (!gPaletteFade.active)
{
m4aSongNumStart(MUS_DEMO);
m4aSongNumStart(MUS_INTRO_FIGHT);
this->data[5] = 0;
this->state++;
}
src/item_menu.c
+7 -7
View File
@@ -683,7 +683,7 @@ static void BagListMenuMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMe
{
if (onInit != TRUE)
{
PlaySE(SE_BAG1);
PlaySE(SE_BAG_CURSOR);
sub_8098580();
}
if (sBagMenuDisplay->itemOriginalLocation == 0xFF)
@@ -1136,14 +1136,14 @@ static u8 ProcessPocketSwitchInput(u8 taskId, u8 pocketId)
{
if (pocketId == POCKET_ITEMS - 1)
return 0;
PlaySE(SE_BAG2);
PlaySE(SE_BAG_POCKET);
return 1;
}
if (JOY_NEW(DPAD_RIGHT) || lrState == 2)
{
if (pocketId >= POCKET_POKE_BALLS - 1)
return 0;
PlaySE(SE_BAG2);
PlaySE(SE_BAG_POCKET);
return 2;
}
return 0;
@@ -2115,7 +2115,7 @@ static void Task_Bag_OldManTutorial(u8 taskId)
{
case 102:
case 204:
PlaySE(SE_BAG2);
PlaySE(SE_BAG_POCKET);
SwitchPockets(taskId, 1, FALSE);
break;
case 306:
@@ -2216,7 +2216,7 @@ static void Task_Bag_TeachyTvRegister(u8 taskId)
switch (data[8])
{
case 102:
PlaySE(SE_BAG2);
PlaySE(SE_BAG_POCKET);
SwitchPockets(taskId, 1, FALSE);
break;
case 204:
@@ -2277,7 +2277,7 @@ static void Task_Bag_TeachyTvCatching(u8 taskId)
{
case 102:
case 204:
PlaySE(SE_BAG2);
PlaySE(SE_BAG_POCKET);
SwitchPockets(taskId, 1, FALSE);
break;
case 306:
@@ -2367,7 +2367,7 @@ static void Task_Bag_TeachyTvTMs(u8 taskId)
switch (data[8])
{
case 102:
PlaySE(SE_BAG2);
PlaySE(SE_BAG_POCKET);
SwitchPockets(taskId, 1, 0);
break;
case 204:
src/item_use.c
+4 -4
View File
@@ -276,7 +276,7 @@ void FieldUseFunc_MachBike(u8 taskId)
static void ItemUseOnFieldCB_Bicycle(u8 taskId)
{
if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
PlaySE(SE_JITENSYA);
PlaySE(SE_BIKE_BELL);
StartTransitionToFlipBikeState(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE);
ClearPlayerHeldMovementAndUnfreezeObjectEvents();
ScriptContext2_Disable();
@@ -552,7 +552,7 @@ void FieldUseFunc_SuperRepel(u8 taskId)
{
if (VarGet(VAR_REPEL_STEP_COUNT) == 0)
{
PlaySE(SE_TU_SAA);
PlaySE(SE_REPEL);
gTasks[taskId].func = sub_80A19E8;
}
else
@@ -607,7 +607,7 @@ static void sub_80A1B48(u8 taskId)
{
if (++gTasks[taskId].data[8] > 7)
{
PlaySE(SE_BIDORO);
PlaySE(SE_GLASS_FLUTE);
DisplayItemMessageInBag(taskId, 2, gStringVar4, Task_ReturnToBagFromContextMenu);
}
}
@@ -775,7 +775,7 @@ static void Task_BattleUse_StatBooster_DelayAndPrint(u8 taskId)
if (++data[8] > 7)
{
u16 itemId = gSpecialVar_ItemId;
PlaySE(SE_KAIFUKU);
PlaySE(SE_USE_ITEM);
RemoveBagItem(itemId, 1);
DisplayItemMessageInBag(taskId, 2, Battle_PrintStatBoosterEffectMessage(itemId), Task_BattleUse_StatBooster_WaitButton_ReturnToBattle);
}
src/itemfinder.c
+2 -2
View File
@@ -169,7 +169,7 @@ static void Task_ItemfinderResponseSoundsAndAnims(u8 taskId)
}
else
{
PlaySE(SE_DAUGI);
PlaySE(SE_ITEMFINDER);
CreateArrowSprite(tDingNum, direction);
tDingNum++;
tNumDingsRemaining--;
@@ -190,7 +190,7 @@ static void Task_ItemfinderUnderfootSoundsAndAnims(u8 taskId)
}
else
{
PlaySE(SE_DAUGI);
PlaySE(SE_ITEMFINDER);
tStartSpriteId = CreateStarSprite();
tDingNum++;
tNumDingsRemaining--;
src/learn_move.c
+2 -2
View File
@@ -656,10 +656,10 @@ static void MoveRelearnerStateMachine(void)
case MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE:
StringExpandPlaceholdersAndPrintTextOnWindow7Color2(gText_MonForgotOldMoveAndMonLearnedNewMove);
sMoveRelearner->state = 31;
PlayFanfare(MUS_FANFA1);
PlayFanfare(MUS_LEVEL_UP);
break;
case MENU_STATE_PRINT_TEXT_THEN_FANFARE:
PlayFanfare(MUS_FANFA1);
PlayFanfare(MUS_LEVEL_UP);
sMoveRelearner->state = 32;
break;
case MENU_STATE_WAIT_FOR_FANFARE:
src/mevent.c
+2 -2
View File
@@ -177,7 +177,7 @@ static u32 EReaderReceive(u8 * state_p, u16 * receiveDelay)
case 2:
if (GetLinkPlayerCount_2() == 2)
{
PlaySE(SE_PINPON);
PlaySE(SE_DING_DONG);
CheckShouldAdvanceLinkState();
*receiveDelay = 0;
*state_p = 3;
@@ -443,7 +443,7 @@ static void Task_EReaderComm(u8 taskId)
if (AdvanceDelayTimerCheckTimeout(&data->stateAdvanceDelay, 120))
{
AddTextPrinterToWindow1(gJPText_NewTrainerHasComeToSevii);
PlayFanfare(MUS_FANFA4);
PlayFanfare(MUS_OBTAIN_ITEM);
data->state = 19;
}
break;
src/minigame_countdown.c
+4 -4
View File
@@ -86,7 +86,7 @@ static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId)
// fallthrough
case 1:
if (sprite->data[2] == 0)
PlaySE(SE_KON2);
PlaySE(SE_BALL_BOUNCE_2);
if (++sprite->data[2] >= 20)
{
sprite->data[2] = 0;
@@ -178,7 +178,7 @@ static void SpriteCB_Start(struct Sprite * sprite)
sprite->pos2.y = data[5] >> 4;
if (sprite->pos2.y >= 0)
{
PlaySE(SE_KON2);
PlaySE(SE_BALL_BOUNCE_2);
sprite->pos2.y = 0;
data[0]++;
}
@@ -187,7 +187,7 @@ static void SpriteCB_Start(struct Sprite * sprite)
data[1] += 12;
if (data[1] >= 128)
{
PlaySE(SE_KON2);
PlaySE(SE_BALL_BOUNCE_2);
data[1] = 0;
data[0]++;
}
@@ -198,7 +198,7 @@ static void SpriteCB_Start(struct Sprite * sprite)
data[1] += 16;
if (data[1] >= 128)
{
PlaySE(SE_KON2);
PlaySE(SE_BALL_BOUNCE_2);
data[1] = 0;
data[0]++;
}
src/mystery_gift_menu.c
+2 -2
View File
@@ -421,7 +421,7 @@ bool32 HandleMysteryGiftOrEReaderSetup(s32 mg_or_ereader)
case 3:
ShowBg(0);
ShowBg(3);
PlayBGM(MUS_OKURIMONO);
PlayBGM(MUS_MYSTERY_GIFT);
SetVBlankCallback(vblankcb_mystery_gift_e_reader_run);
EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL);
return TRUE;
@@ -1009,7 +1009,7 @@ bool32 PrintMGSuccessMessage(u8 * state, const u8 * arg1, u16 * arg2)
{
AddTextPrinterToWindow1(arg1);
}
PlayFanfare(MUS_FANFA4);
PlayFanfare(MUS_OBTAIN_ITEM);
*arg2 = 0;
(*state)++;
break;
src/naming_screen.c
+1 -1
View File
@@ -1714,7 +1714,7 @@ static void DeleteTextCharacter(void)
var2 = GetKeyRoleAtCursorPos();
if (var2 == KEY_ROLE_CHAR || var2 == KEY_ROLE_BACKSPACE)
sub_809E518(1, 0, 1);
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
}
static bool8 AppendCharToBuffer_CheckBufferFull(void)
src/oak_speech.c
+5 -5
View File
@@ -568,7 +568,7 @@ static void Task_OaksSpeech1(u8 taskId)
ShowBg(0);
ShowBg(1);
SetVBlankCallback(VBlankCB_NewGameOaksSpeech);
PlayBGM(MUS_SOUSA);
PlayBGM(MUS_NEW_GAME_INSTRUCT);
gTasks[taskId].func = Task_OaksSpeech2;
gMain.state = 0;
return;
@@ -722,7 +722,7 @@ static void Task_OakSpeech6(u8 taskId)
data[3]--;
else
{
PlayBGM(MUS_SEKAIKAN);
PlayBGM(MUS_NEW_GAME_INTRO);
ClearTopBarWindow();
TopBarWindowPrintString(gText_ABUTTONNext, 0, 1);
sOakSpeechResources->unk_0008 = MallocAndDecompress(sNewGameAdventureIntroTilemap, &sp14);
@@ -824,7 +824,7 @@ static void Task_OakSpeech7(u8 taskId)
break;
case 4:
sub_8006398(gTasks[taskId].data[5]);
PlayBGM(MUS_SEIBETU);
PlayBGM(MUS_NEW_GAME_EXIT);
data[15] = 24;
gMain.state++;
break;
@@ -883,7 +883,7 @@ static void Task_OakSpeech9(u8 taskId)
CreateNidoranFSprite(taskId);
LoadOaksSpeechTrainerPic(3, 0);
CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 1);
PlayBGM(MUS_OPENING);
PlayBGM(MUS_ROUTE24);
BeginNormalPaletteFade(0xFFFFFFFF, 5, 16, 0, RGB_BLACK);
data[3] = 80;
ShowBg(2);
@@ -1416,7 +1416,7 @@ static void Task_OakSpeech39(u8 taskId)
if (sOakSpeechResources->unk_0012 % 20 == 0)
{
if (sOakSpeechResources->unk_0012 == 40)
PlaySE(SE_TK_WARPIN);
PlaySE(SE_WARP_IN);
r0 = data[2];
data[2] -= 32;
x = MathUtil_Inv16(r0 - 8);
src/overworld.c
+7 -7
View File
@@ -1023,7 +1023,7 @@ void Overworld_PlaySpecialMapMusic(void)
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM))
{
PlayerGetDestCoords(&x, &y);
if (y - 7 < 11 && gMPlayInfo_BGM.songHeader == &mus_win_gym)
if (y - 7 < 11 && gMPlayInfo_BGM.songHeader == &mus_victory_gym_leader)
{
FadeInBGM(4);
return;
@@ -1034,8 +1034,8 @@ void Overworld_PlaySpecialMapMusic(void)
if (gSaveBlock1Ptr->savedMusic)
music = gSaveBlock1Ptr->savedMusic;
else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI))
music = MUS_NAMINORI;
else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_SURF))
music = MUS_SURF;
if (music != GetCurrentMapMusic())
PlayNewMapMusic(music);
@@ -1070,10 +1070,10 @@ static void Overworld_TryMapConnectionMusicTransition(void)
{
newMusic = GetWarpDestinationMusic();
currentMusic = GetCurrentMapMusic();
if (currentMusic == MUS_NAMINORI)
if (currentMusic == MUS_SURF)
return;
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI))
newMusic = MUS_NAMINORI;
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_SURF))
newMusic = MUS_SURF;
if (newMusic != currentMusic)
{
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
@@ -1192,7 +1192,7 @@ static void ChooseAmbientCrySpecies(void)
bool32 Overworld_MusicCanOverrideMapMusic(u16 music)
{
if (music == MUS_CYCLING || music == MUS_NAMINORI)
if (music == MUS_CYCLING || music == MUS_SURF)
{
if (gMapHeader.regionMapSectionId == MAPSEC_KANTO_VICTORY_ROAD || gMapHeader.regionMapSectionId == MAPSEC_ROUTE_23 || gMapHeader.regionMapSectionId == MAPSEC_INDIGO_PLATEAU)
return FALSE;
src/party_menu.c
+15 -15
View File
@@ -1214,7 +1214,7 @@ static bool8 IsSelectedMonNotEgg(u8 *slotPtr)
{
if (GetMonData(&gPlayerParty[*slotPtr], MON_DATA_IS_EGG) == TRUE)
{
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
return FALSE;
}
return TRUE;
@@ -1225,7 +1225,7 @@ static void HandleChooseMonCancel(u8 taskId, s8 *slotPtr)
switch (gPartyMenu.action)
{
case PARTY_ACTION_SEND_OUT:
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
break;
case PARTY_ACTION_SWITCH:
case PARTY_ACTION_SOFTBOILED:
@@ -1844,7 +1844,7 @@ static void TryEnterMonForMinigame(u8 taskId, u8 slot)
}
else
{
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
DisplayPartyMenuMessage(gText_PkmnCantParticipate, FALSE);
ScheduleBgCopyTilemapToVram(2);
gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
@@ -3809,7 +3809,7 @@ static void CursorCB_Enter(u8 taskId)
return;
}
}
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
DisplayPartyMenuMessage(str, TRUE);
gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
}
@@ -3884,7 +3884,7 @@ static void CursorCB_Register(u8 taskId)
Task_ClosePartyMenu(taskId);
return;
}
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
StringAppend(gStringVar4, gText_PauseUntilPress);
@@ -3902,7 +3902,7 @@ static void CursorCB_Trade1(u8 taskId)
if (stringId != UR_TRADE_MSG_NONE)
{
StringExpandPlaceholders(gStringVar4, sUnionRoomTradeMessages[stringId - 1]);
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
StringAppend(gStringVar4, gText_PauseUntilPress);
@@ -4528,13 +4528,13 @@ void ItemUseCB_MedicineStep(u8 taskId, TaskFunc func)
gPartyMenuUseExitCallback = TRUE;
if (!IsItemFlute(item))
{
PlaySE(SE_KAIFUKU);
PlaySE(SE_USE_ITEM);
if (gPartyMenu.action != PARTY_ACTION_REUSABLE_ITEM)
RemoveBagItem(item, 1);
}
else
{
PlaySE(SE_BIDORO);
PlaySE(SE_GLASS_FLUTE);
}
SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]);
if (gSprites[sPartyMenuBoxes[gPartyMenu.slotId].statusSpriteId].invisible)
@@ -4694,7 +4694,7 @@ static void sub_8125898(u8 taskId, UNUSED TaskFunc func)
ExecuteTableBasedItemEffect_(gPartyMenu.slotId, gSpecialVar_ItemId, (u8)gPartyMenu.data1);
gPartyMenuUseExitCallback = TRUE;
ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, mon, gSpecialVar_ItemId, 0xFFFF);
PlaySE(SE_KAIFUKU);
PlaySE(SE_USE_ITEM);
RemoveBagItem(gSpecialVar_ItemId, 1);
move = GetMonData(mon, gPartyMenu.data1 + MON_DATA_MOVE1);
StringCopy(gStringVar1, gMoveNames[move]);
@@ -4725,7 +4725,7 @@ static void TryUsePPItem(u8 taskId)
gPartyMenuUseExitCallback = TRUE;
mon = &gPlayerParty[ptr->slotId];
ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, mon, item, 0xFFFF);
PlaySE(SE_KAIFUKU);
PlaySE(SE_USE_ITEM);
RemoveBagItem(item, 1);
move = GetMonData(mon, MON_DATA_MOVE1 + *moveSlot);
StringCopy(gStringVar1, gMoveNames[move]);
@@ -4851,7 +4851,7 @@ static void Task_DoLearnedMoveFanfareAfterText(u8 taskId)
{
if (IsPartyMenuTextPrinterActive() != TRUE)
{
PlayFanfare(MUS_FANFA1);
PlayFanfare(MUS_LEVEL_UP);
gTasks[taskId].func = Task_LearnNextMoveOrClosePartyMenu;
}
}
@@ -5260,7 +5260,7 @@ static void UseSacredAsh(u8 taskId)
gTasks[taskId].func = Task_SacredAshLoop;
return;
}
PlaySE(SE_KAIFUKU);
PlaySE(SE_USE_ITEM);
if (sPartyMenuInternal->tHadEffect == 0)
sSacredAshQuestLogMonBackup = mon;
SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]);
@@ -5778,7 +5778,7 @@ static void Task_ValidateChosenHalfParty(u8 taskId)
if (msgId != 0xFF)
{
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
DisplayPartyMenuStdMessage(msgId);
gTasks[taskId].func = Task_ContinueChoosingHalfParty;
}
@@ -5791,7 +5791,7 @@ static void Task_ValidateChosenHalfParty(u8 taskId)
}
else
{
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
DisplayPartyMenuStdMessage(PARTY_MSG_NO_MON_FOR_BATTLE);
gTasks[taskId].func = Task_ContinueChoosingHalfParty;
}
@@ -6300,7 +6300,7 @@ static void Task_MultiPartnerPartySlideIn(u8 taskId)
if (gMultiPartnerParty[i - MULTI_PARTY_SIZE].species != SPECIES_NONE)
AnimateSelectedPartyIcon(sPartyMenuBoxes[i].monSpriteId, 0);
}
PlaySE(SE_W231); // The Harden SE plays once the partners party mons have slid on screen
PlaySE(SE_M_HARDEN); // The Harden SE plays once the partners party mons have slid on screen
gTasks[taskId].func = Task_WaitAfterMultiPartnerPartySlideIn;
}
}
src/pokeball.c
+10 -10
View File
@@ -421,7 +421,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
gSprites[ballSpriteId].oam.affineParam = taskId;
gTasks[taskId].tOpponentBattler = gBattlerTarget;
gTasks[taskId].func = TaskDummy;
PlaySE(SE_NAGERU);
PlaySE(SE_BALL_THROW);
}
static void SpriteCB_TestBallThrow(struct Sprite *sprite)
@@ -477,7 +477,7 @@ static void sub_804AD00(struct Sprite *sprite)
{
sprite->data[5]++;
if (sprite->data[5] == 11)
PlaySE(SE_SUIKOMU);
PlaySE(SE_BALL_TRADE);
if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded)
{
@@ -528,16 +528,16 @@ static void sub_804ADEC(struct Sprite *sprite)
switch (sprite->data[3] >> 8)
{
case 1:
PlaySE(SE_KON);
PlaySE(SE_BALL_BOUNCE_1);
break;
case 2:
PlaySE(SE_KON2);
PlaySE(SE_BALL_BOUNCE_2);
break;
case 3:
PlaySE(SE_KON3);
PlaySE(SE_BALL_BOUNCE_3);
break;
default:
PlaySE(SE_KON4);
PlaySE(SE_BALL_BOUNCE_4);
break;
}
}
@@ -579,7 +579,7 @@ static void sub_804AEE4(struct Sprite *sprite)
sprite->affineAnimPaused = TRUE;
StartSpriteAffineAnim(sprite, 1);
sprite->callback = sub_804AF24;
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
}
}
@@ -649,7 +649,7 @@ static void sub_804AF24(struct Sprite *sprite)
else
StartSpriteAffineAnim(sprite, 1);
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
}
break;
}
@@ -880,7 +880,7 @@ static void sub_804B5C8(struct Sprite *sprite)
{
gDoingBattleAnim = FALSE;
m4aMPlayAllStop();
PlaySE(MUS_FAN6);
PlaySE(MUS_CAUGHT_INTRO);
}
else if (sprite->data[4] == 315)
{
@@ -1139,7 +1139,7 @@ static void sub_804BCF8(struct Sprite *sprite)
sprite->data[5]++;
if (sprite->data[5] == 11)
PlaySE(SE_SUIKOMU);
PlaySE(SE_BALL_TRADE);
r1 = sprite->data[0];
if (gSprites[r1].affineAnimEnded)
src/pokedex_screen.c
+2 -2
View File
@@ -2067,7 +2067,7 @@ bool8 sub_81052D0(u8 a0)
FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 32, 20);
gUnknown_203ACF0->field_03 = 0;
gUnknown_203ACF0->field_02++;
PlaySE(SE_TB_START);
PlaySE(SE_BALL_TRAY_ENTER);
break;
case 5:
if (gUnknown_203ACF0->field_03 < 10)
@@ -2086,7 +2086,7 @@ bool8 sub_81052D0(u8 a0)
CpuFastCopy(GetBgTilemapBuffer(1), &gUnknown_203ACF0->field_5C[2 * BG_SCREEN_SIZE / 2], BG_SCREEN_SIZE);
gUnknown_203ACF0->field_03 = 9;
gUnknown_203ACF0->field_02++;
PlaySE(SE_TB_START);
PlaySE(SE_BALL_TRAY_ENTER);
break;
case 7:
if (gUnknown_203ACF0->field_03 != 0)
src/pokemon_jump.c
+2 -2
View File
@@ -201,7 +201,7 @@ static void sub_81478BC(struct Sprite *sprite)
sprite->invisible = FALSE;
case 1:
case 2:
PlaySE(SE_KON);
PlaySE(SE_BALL_BOUNCE_1);
StartSpriteAnim(sprite, sprite->data[2]);
break;
case 3:
@@ -223,7 +223,7 @@ static void sub_81478BC(struct Sprite *sprite)
static void sub_81479D4(u8 taskId)
{
s16 *data = gTasks[taskId].data;
PlaySE(SE_KON);
PlaySE(SE_BALL_BOUNCE_1);
gSprites[data[13]].callback = sub_81478BC;
gSprites[data[13]].invisible = FALSE;
gTasks[taskId].data[0] = 3;
src/pokemon_jump_2.c
+4 -4
View File
@@ -431,7 +431,7 @@ static void sub_8147DA0(u8 taskId)
case 2:
if (!sub_8149D68() && IsNotWaitingForBGMStop() == TRUE)
{
FadeOutAndPlayNewMapMusic(MUS_JUMP, 8);
FadeOutAndPlayNewMapMusic(MUS_POKE_JUMP, 8);
gUnknown_203F3D4->unk8++;
}
break;
@@ -1577,7 +1577,7 @@ static void sub_81492B8(void)
gUnknown_203F3D4->unk83AC->unk10 = 0;
}
static const u16 gUnknown_846B6AC[] = {SE_REGI, SE_REAPOKE, SE_W234, SE_EXCELLENT};
static const u16 gUnknown_846B6AC[] = {SE_RS_SHOP, SE_SHINY, SE_M_MORNING_SUN, SE_POKE_JUMP_SUCCESS};
static void sub_81492D8(void)
{
@@ -1654,9 +1654,9 @@ static void sub_814937C(void)
}
if (whichSound & 0x2)
PlaySE(SE_NAWAMISS);
PlaySE(SE_POKE_JUMP_FAILURE);
else if (whichSound & 0x1)
PlaySE(SE_DANSA);
PlaySE(SE_LEDGE);
}
static const s8 gUnknown_846B6B4[][48] =
src/pokemon_jump_4.c
+1 -1
View File
@@ -527,7 +527,7 @@ void sub_814A468(u16 itemId, u16 quantity)
gUnknown_203F3D8->unk12 = sub_814A754(4, 8, 22, 4);
AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL);
CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX);
gUnknown_203F3D8->unk14 = MUS_FANFA1;
gUnknown_203F3D8->unk14 = MUS_LEVEL_UP;
gUnknown_203F3D8->unkD = 0;
}
src/pokemon_jump_5.c
+1 -1
View File
@@ -534,7 +534,7 @@ static void sub_814B1CC(struct Sprite *sprite)
switch (sprite->data[0])
{
case 0:
PlaySE(SE_JITE_PYOKO);
PlaySE(SE_BIKE_HOP);
sprite->data[1] = 0;
sprite->data[0]++;
// fall through
src/pokemon_special_anim.c
+2 -2
View File
@@ -339,7 +339,7 @@ static void Task_ForgetMove(u8 taskId)
ptr->delayTimer++;
if (ptr->delayTimer > 30)
{
PlaySE(SE_W255);
PlaySE(SE_M_SPIT_UP);
PSA_PrintMessage(PSA_TEXT_FORGET_POOF);
PSA_DarkenMonSprite();
ptr->state++;
@@ -560,7 +560,7 @@ static void Task_MachineSet(u8 taskId)
case 8:
if (!PSA_IsMessagePrintTaskActive())
{
PlayFanfare(MUS_FANFA1);
PlayFanfare(MUS_LEVEL_UP);
ptr->cancelDisabled = TRUE;
ptr->state++;
}
src/pokemon_special_anim_scene.c
+7 -7
View File
@@ -528,7 +528,7 @@ bool8 PSA_UseTM_RunZoomOutAnim(void)
if (scene->field_0004 > 0)
{
scene->field_0004 = 0;
PlaySE(SE_W025);
PlaySE(SE_M_MEGA_KICK);
BeginNormalPaletteFade(0x00000001, 2, 0, 12, RGB(8, 13, 31));
PSAScene_SeedRandomInTask(scene);
scene->state++;
@@ -560,7 +560,7 @@ bool8 PSA_UseTM_RunZoomOutAnim(void)
}
break;
case 8:
PlaySE(SE_EXPMAX);
PlaySE(SE_EXP_MAX);
DestroySprite(scene->itemIconSprite);
scene->state++;
break;
@@ -584,7 +584,7 @@ bool8 PSA_UseTM_RunMachineSetWobble(void)
{
case 0:
MachineSetWobbleInit();
PlaySE(SE_MU_PACHI);
PlaySE(SE_SWITCH);
scene->state++;
break;
case 1:
@@ -730,7 +730,7 @@ static void Task_ZoomAnim(u8 taskId)
case 1:
if (!IsZoomSpriteCBActive(sprite))
{
PlaySE(SE_TB_KARA);
PlaySE(SE_BALL_TRAY_EXIT);
MonSpriteZoom_UpdateYPos(sprite, tCurrCloseness);
if (tHasItemSprite)
ItemSpriteZoom_UpdateYPos((void *)GetWordTaskArg(taskId, tOff_ItemSprite), tCurrCloseness);
@@ -933,7 +933,7 @@ static void Task_ItemUseOnMonAnim(u8 taskId)
if (tTimer > 20)
{
tTimer = 0;
PlaySE(SE_W207B);
PlaySE(SE_M_SWAGGER2);
sprite->invisible = FALSE;
if (!tSuppressDots)
LoadOutwardSpiralDotsGfx();
@@ -949,7 +949,7 @@ static void Task_ItemUseOnMonAnim(u8 taskId)
StartSpriteAffineAnim(sprite, tCloseness);
BeginNormalPaletteFade(0x10000 << IndexOfSpritePaletteTag(1), -2, 0, 12, tBlendColor);
tState = 2;
PlaySE(SE_W208);
PlaySE(SE_M_MILK_DRINK);
}
break;
case 2:
@@ -968,7 +968,7 @@ static void Task_ItemUseOnMonAnim(u8 taskId)
if (!tSuppressDots)
CreateSprites_UseItem_OutwardSpiralDots(taskId, data, sprite);
if (tData7 == 0)
PlaySE(SE_W179);
PlaySE(SE_M_REVERSAL);
tData7++;
if (tData7 > 2)
tState = 4;
src/pokemon_storage_system_3.c
+9 -9
View File
@@ -769,7 +769,7 @@ static void Cb_MainPSS(u8 taskId)
gPSSData->state = 7;
break;
case 24:
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
break;
}
break;
@@ -815,12 +815,12 @@ static void Cb_MainPSS(u8 taskId)
}
break;
case 4:
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
PrintStorageActionText(PC_TEXT_LAST_POKE);
gPSSData->state = 6;
break;
case 5:
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL);
gPSSData->state = 6;
break;
@@ -1034,17 +1034,17 @@ static void Cb_OnSelectedMon(u8 taskId)
}
break;
case 3:
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
PrintStorageActionText(PC_TEXT_LAST_POKE);
gPSSData->state = 6;
break;
case 5:
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG);
gPSSData->state = 6;
break;
case 4:
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL);
gPSSData->state = 6;
break;
@@ -1472,7 +1472,7 @@ static void Cb_ItemToBag(u8 taskId)
case 0:
if (!AddBagItem(gPSSData->cursorMonItem, 1))
{
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
PrintStorageActionText(PC_TEXT_BAG_FULL);
gPSSData->state = 3;
}
@@ -1922,7 +1922,7 @@ static void Cb_OnCloseBoxPressed(u8 taskId)
case 0:
if (IsMonBeingMoved())
{
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
PrintStorageActionText(PC_TEXT_HOLDING_POKE);
gPSSData->state = 1;
}
@@ -1983,7 +1983,7 @@ static void Cb_OnBPressed(u8 taskId)
case 0:
if (IsMonBeingMoved())
{
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
PrintStorageActionText(PC_TEXT_HOLDING_POKE);
gPSSData->state = 1;
}
src/pokemon_summary_screen.c
+1 -1
View File
@@ -3838,7 +3838,7 @@ static void sub_81393D4(u8 taskId)
}
else
{
PlaySE(SE_HAZURE);
PlaySE(SE_FAILURE);
sMonSummaryScreen->unk3288 = 5;
}
}
src/psychic.c
+1 -1
View File
@@ -1051,7 +1051,7 @@ static void AnimPsychoBoost(struct Sprite *sprite)
case 1:
if (sprite->affineAnimEnded)
{
PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(-64));
PlaySE12WithPanning(SE_M_TELEPORT, BattleAnimAdjustPanning(-64));
ChangeSpriteAffineAnim(sprite, 1);
++sprite->data[0];
}
src/region_map.c
+15 -15
View File
@@ -1614,11 +1614,11 @@ static void PlaySEForSelectedMapsec(void)
{
if ((GetSelectedMapsecType(LAYER_MAP) != MAPSECTYPE_ROUTE && GetSelectedMapsecType(LAYER_MAP) != MAPSECTYPE_NONE)
|| (GetSelectedMapsecType(LAYER_DUNGEON) != MAPSECTYPE_ROUTE && GetSelectedMapsecType(LAYER_DUNGEON) != MAPSECTYPE_NONE))
PlaySE(SE_Z_SCROLL);
PlaySE(SE_DEX_SCROLL);
if (GetMapCursorX() == SWITCH_BUTTON_X && GetMapCursorY() == SWITCH_BUTTON_Y && GetRegionMapPermission(MAPPERM_HAS_SWITCH_BUTTON) == TRUE)
PlaySE(SE_W255);
PlaySE(SE_M_SPIT_UP);
else if (GetMapCursorX() == CANCEL_BUTTON_X && GetMapCursorY() == CANCEL_BUTTON_Y)
PlaySE(SE_W255);
PlaySE(SE_M_SPIT_UP);
}
}
@@ -2234,19 +2234,19 @@ static bool8 HandleSwitchMapInput(void)
data.bottom = sSwitchMapMenu->highlight.bottom = sSwitchMapMenu->highlight.top + 32;
if (JOY_NEW(DPAD_UP) && sSwitchMapMenu->currentSelection != 0)
{
PlaySE(SE_BAG1);
PlaySE(SE_BAG_CURSOR);
sSwitchMapMenu->currentSelection--;
changedSelection = TRUE;
}
if (JOY_NEW(DPAD_DOWN) && sSwitchMapMenu->currentSelection < sSwitchMapMenu->maxSelection)
{
PlaySE(SE_BAG1);
PlaySE(SE_BAG_CURSOR);
sSwitchMapMenu->currentSelection++;
changedSelection = TRUE;
}
if (JOY_NEW(A_BUTTON) && sSwitchMapMenu->blendY == (BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2))
{
PlaySE(SE_W129);
PlaySE(SE_M_SWIFT);
sSwitchMapMenu->chosenRegion = sSwitchMapMenu->currentSelection;
return TRUE;
}
@@ -2828,7 +2828,7 @@ static void Task_MapOpenAnim(u8 taskId)
if (!gPaletteFade.active)
{
sMapOpenCloseAnim->openState++;
PlaySE(SE_CARD3);
PlaySE(SE_CARD_OPEN);
}
break;
case 6:
@@ -2872,8 +2872,8 @@ static void Task_MapOpenAnim(u8 taskId)
FillBgTilemapBufferRect(1, 0x03F, 29, 1, 1, 1, 0x2);
FillBgTilemapBufferRect(1, 0x03D, 2, 1, 26, 1, 0x2);
CopyBgTilemapBufferToVram(1);
m4aSongNumStop(SE_CARD3);
PlaySE(SE_HI_TURUN);
m4aSongNumStop(SE_CARD_OPEN);
PlaySE(SE_ROTATING_GATE);
sMapOpenCloseAnim->openState++;
break;
case 12:
@@ -3043,7 +3043,7 @@ static void Task_MapCloseAnim(u8 taskId)
case 6:
sub_80C2B9C();
sub_80C2B48();
PlaySE(SE_CARD2);
PlaySE(SE_CARD_FLIPPING);
sMapOpenCloseAnim->closeState++;
break;
case 7:
@@ -3237,14 +3237,14 @@ static u8 HandleRegionMapInput(void)
if (sMapCursor->x == CANCEL_BUTTON_X
&& sMapCursor->y == CANCEL_BUTTON_Y)
{
PlaySE(SE_W063B);
PlaySE(SE_M_HYPER_BEAM2);
input = MAP_INPUT_CANCEL;
}
if (sMapCursor->x == SWITCH_BUTTON_X
&& sMapCursor->y == SWITCH_BUTTON_Y
&& GetRegionMapPermission(MAPPERM_HAS_SWITCH_BUTTON) == TRUE)
{
PlaySE(SE_W063B);
PlaySE(SE_M_HYPER_BEAM2);
input = MAP_INPUT_SWITCH;
}
}
@@ -4373,7 +4373,7 @@ static void Task_FlyMap(u8 taskId)
break;
case MAP_INPUT_MOVE_END:
if (GetSelectedMapsecType(LAYER_MAP) == MAPSECTYPE_VISITED)
PlaySE(SE_Z_PAGE);
PlaySE(SE_DEX_PAGE);
else
PlaySEForSelectedMapsec();
ResetCursorSnap();
@@ -4382,7 +4382,7 @@ static void Task_FlyMap(u8 taskId)
DrawDungeonNameBox();
if (GetMapCursorX() == CANCEL_BUTTON_X && GetMapCursorY() == CANCEL_BUTTON_Y)
{
PlaySE(SE_W255);
PlaySE(SE_M_SPIT_UP);
PrintTopBarTextRight(gText_RegionMap_AButtonCancel);
}
else if (GetSelectedMapsecType(LAYER_MAP) == MAPSECTYPE_VISITED || GetSelectedMapsecType(LAYER_MAP) == MAPSECTYPE_UNKNOWN)
@@ -4405,7 +4405,7 @@ static void Task_FlyMap(u8 taskId)
sFlyMap->state++;
break;
default:
PlaySE(SE_KAIFUKU);
PlaySE(SE_USE_ITEM);
sFlyMap->selectedDestination = TRUE;
sFlyMap->state++;
break;
src/rock.c
+2 -2
View File
@@ -607,7 +607,7 @@ static void sub_80B4D00(u8 taskId)
task->data[11] = 20;
++task->data[0];
}
PlaySE12WithPanning(SE_W029, task->data[13]);
PlaySE12WithPanning(SE_M_HEADBUTT, task->data[13]);
break;
case 1:
if (--task->data[11] == 0)
@@ -636,7 +636,7 @@ static void sub_80B4D00(u8 taskId)
task->data[9] = 0;
sub_80B4E70(task);
task->data[13] += task->data[14];
PlaySE12WithPanning(SE_W091, task->data[13]);
PlaySE12WithPanning(SE_M_DIG, task->data[13]);
}
if (--task->data[8] == 0)
{
src/seagallop.c
+2 -2
View File
@@ -236,7 +236,7 @@ static void CB2_SetUpSeagallopScene(void)
case 7:
SetDispcnt();
SetVBlankCallback(VBlankCB_SeaGallop);
PlaySE(SE_NAMINORI);
PlaySE(SE_SHIP);
CreateFerrySprite();
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
SetGpuReg(REG_OFFSET_WININ, 0x3F);
@@ -316,7 +316,7 @@ static void Task_Seagallop_3(void)
warpInfo = sSeag[gSpecialVar_0x8006];
SetWarpDestination(warpInfo[0], warpInfo[1], -1, warpInfo[2], warpInfo[3]);
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
PlaySE(SE_EXIT);
gFieldCallback = FieldCB_DefaultWarpExit;
WarpIntoMap();
SetMainCallback2(CB2_LoadMap);
src/slot_machine.c
+5 -5
View File
@@ -883,7 +883,7 @@ static void MainTask_SlotsGameLoop(u8 taskId)
{
sSlotMachineState->bet++;
RemoveCoins(1);
PlaySE(SE_REGI);
PlaySE(SE_RS_SHOP);
SetSlotMachineSetupTask(SLOTTASK_SHOW_AMOUNTS, 0);
SetSlotMachineSetupTask(SLOTTASK_UPDATE_LINE_LIGHTS, 1);
data[0] = 1;
@@ -901,7 +901,7 @@ static void MainTask_SlotsGameLoop(u8 taskId)
sSlotMachineState->bet += GetCoins();
SetCoins(0);
}
PlaySE(SE_REGI);
PlaySE(SE_RS_SHOP);
SetSlotMachineSetupTask(SLOTTASK_SHOW_AMOUNTS, 0);
SetSlotMachineSetupTask(SLOTTASK_UPDATE_LINE_LIGHTS, 1);
data[0] = 1;
@@ -941,7 +941,7 @@ static void MainTask_SlotsGameLoop(u8 taskId)
{
if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_JYUNI);
PlaySE(SE_CONTEST_PLACE);
StopCurrentReel(sSlotMachineState->currentReel, sSlotMachineState->currentReel);
PressReelButton(sSlotMachineState->currentReel, 0);
data[0] = 4;
@@ -1099,9 +1099,9 @@ static void MainTask_WinHandlePayout(u8 taskId)
{
case 0:
if (sSlotMachineState->slotRewardClass == SLOT_PAYOUT_ROCKET || sSlotMachineState->slotRewardClass == SLOT_PAYOUT_7)
PlayFanfare(MUS_ME_B_BIG);
PlayFanfare(MUS_SLOTS_JACKPOT);
else
PlayFanfare(MUS_ME_B_SMALL);
PlayFanfare(MUS_SLOTS_WIN);
SetSlotMachineSetupTask(SLOTTASK_SHOW_AMOUNTS, 0);
SetSlotMachineSetupTask(SLOTTASK_ANIM_WIN, 1);
data[1] = 8;
src/sound.c
+14 -14
View File
@@ -41,20 +41,20 @@ extern struct ToneData gCryTable[];
extern struct ToneData gCryTable2[];
static const struct Fanfare sFanfares[] = {
[FANFARE_00] = { MUS_FANFA1, 80 },
[FANFARE_01] = { MUS_FANFA4, 160 },
[FANFARE_02] = { MUS_FANFA5, 220 },
[FANFARE_03] = { MUS_ME_WAZA, 220 },
[FANFARE_04] = { MUS_ME_ASA, 160 },
[FANFARE_05] = { MUS_ME_BACHI, 340 },
[FANFARE_06] = { MUS_ME_WASURE, 180 },
[FANFARE_07] = { MUS_ME_KINOMI, 120 },
[FANFARE_08] = { MUS_ME_B_BIG, 250 },
[FANFARE_09] = { MUS_ME_B_SMALL, 150 },
[FANFARE_10] = { MUS_ME_ZANNEN, 160 },
[FANFARE_POKEFLUTE] = { MUS_POKEFUE, 450 },
[FANFARE_KEY_ITEM] = { MUS_FAN5, 170 },
[FANFARE_DEX_EVAL] = { MUS_FAN2, 196 }
[FANFARE_00] = { MUS_LEVEL_UP, 80 },
[FANFARE_01] = { MUS_OBTAIN_ITEM, 160 },
[FANFARE_02] = { MUS_EVOLVED, 220 },
[FANFARE_03] = { MUS_OBTAIN_TMHM, 220 },
[FANFARE_04] = { MUS_HEAL, 160 },
[FANFARE_05] = { MUS_OBTAIN_BADGE, 340 },
[FANFARE_06] = { MUS_MOVE_DELETED, 180 },
[FANFARE_07] = { MUS_OBTAIN_BERRY, 120 },
[FANFARE_08] = { MUS_SLOTS_JACKPOT, 250 },
[FANFARE_09] = { MUS_SLOTS_WIN, 150 },
[FANFARE_10] = { MUS_TOO_BAD, 160 },
[FANFARE_POKEFLUTE] = { MUS_POKE_FLUTE, 450 },
[FANFARE_KEY_ITEM] = { MUS_OBTAIN_KEY_ITEM, 170 },
[FANFARE_DEX_EVAL] = { MUS_DEX_RATING, 196 }
};
extern u16 SpeciesToCryId(u16);
src/ss_anne.c
+2 -2
View File
@@ -83,7 +83,7 @@ void DoSSAnneDepartureCutscene(void)
{
u8 taskId;
PlaySE(SE_KITEKI);
PlaySE(SE_SS_ANNE_HORN);
taskId = CreateTask(Task_SSAnneInit, 8);
gTasks[taskId].data[0] = 50;
}
@@ -118,7 +118,7 @@ static void Task_SSAnneRun(u8 taskId)
boatObject = &gObjectEvents[objectEventId];
if (gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x < -120)
{
PlaySE(SE_KITEKI);
PlaySE(SE_SS_ANNE_HORN);
gTasks[taskId].func = Task_SSAnneFinish;
}
else
src/strings.c
+3 -3
View File
@@ -282,7 +282,7 @@ const u8 gText_PkmnNeedsToReplaceMove[] = _("{STR_VAR_1} wants to learn the\nmov
const u8 gText_StopLearningMove2[] = _("Stop trying to teach\n{STR_VAR_2}?");
const u8 gText_MoveNotLearned[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
const u8 gText_WhichMoveToForget[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}");
const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 0x0F}2, and{PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}");
const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 0x0F}2, and{PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}");
const u8 gText_PkmnAlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
const u8 gText_PkmnHPRestoredByVar2[] = _("{STR_VAR_1}'s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}");
const u8 gText_PkmnCuredOfPoison[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}");
@@ -1025,7 +1025,7 @@ const u8 gText_SpacePoints[] = _(" points");
const u8 gText_CommunicationStandby3[] = _("Communication standby…");
ALIGNED(4) const u8 gText_BerryCrush_AreYouReady[] = _("Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p");
ALIGNED(4) const u8 gText_BerryCrush_WaitForOthersToChooseBerry[] = _("Please wait while each member\nchooses a BERRY.");
ALIGNED(4) const u8 gText_BerryCrush_GainedXUnitsOfPowder[] = _("{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p");
ALIGNED(4) const u8 gText_BerryCrush_GainedXUnitsOfPowder[] = _("{PAUSE_MUSIC}{PLAY_BGM MUS_LEVEL_UP}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p");
ALIGNED(4) const u8 gText_BerryCrush_RecordingGameResults[] = _("Recording your game results in the\nsave file.\nPlease wait.");
ALIGNED(4) const u8 gText_BerryCrush_WantToPlayAgain[] = _("Want to play BERRY CRUSH again?");
ALIGNED(4) const u8 gText_BerryCrush_NoBerries[] = _("You have no BERRIES.\nThe game will be canceled.");
@@ -1258,7 +1258,7 @@ const u8 gText_TeachMoveQues[] = _("Teach {STR_VAR_2}?");
const u8 gText_MonLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}.");
const u8 gText_MonIsTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?");
const u8 gText_StopLearningMove[] = _("Stop learning {STR_VAR_2}?");
const u8 gText_1_2_and_Poof[] = _("{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p");
const u8 gText_1_2_and_Poof[] = _("{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p");
const u8 gText_MonForgotOldMoveAndMonLearnedNewMove[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd‥\p{STR_VAR_1}\nlearned {STR_VAR_2}.");
const u8 gText_GiveUpTryingToTeachNewMove[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?");
const u8 gText_WhichMoveShouldBeForgotten[] = _("Which move should be forgotten?\p");
src/teachy_tv.c
+4 -4
View File
@@ -485,7 +485,7 @@ static void TeachyTvMainCallback(void)
gTasks[taskId].data[0] = TeachyTvSetupWindow();
gTasks[taskId].data[1] = TeachyTvSetupObjEventAndOam();
TeachyTvSetupScrollIndicatorArrowPair();
PlayNewMapMusic(MUS_TVNOIZE);
PlayNewMapMusic(MUS_TEACHY_TV_MENU);
TeachyTvSetWindowRegs();
}
ScheduleBgCopyTilemapToVram(0);
@@ -761,7 +761,7 @@ static void TTVcmd_TransitionRenderBg2TeachyTvGraphicInitNpcPos(u8 taskId)
ScheduleBgCopyTilemapToVram(2);
data[2] = 0;
++data[3];
PlayNewMapMusic(MUS_ANNAI);
PlayNewMapMusic(MUS_FOLLOW_ME);
}
}
@@ -1042,7 +1042,7 @@ static void TTVcmd_End(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (data[2] == 0)
PlayNewMapMusic(MUS_TVNOIZE);
PlayNewMapMusic(MUS_TEACHY_TV_MENU);
TeachyTvBg2AnimController();
if (++data[2] > 63)
{
@@ -1209,7 +1209,7 @@ static void TeachyTvRestorePlayerPartyCallback(void)
if (gBattleOutcome == B_OUTCOME_DREW)
SetTeachyTvControllerModeToResume();
else
PlayNewMapMusic(MUS_ANNAI);
PlayNewMapMusic(MUS_FOLLOW_ME);
CB2_ReturnToTeachyTV();
}
src/trade.c
+1 -1
View File
@@ -943,7 +943,7 @@ static void CB2_ReturnFromLinkTrade2(void)
sTradeMenuResourcesPtr->bg3hofs = 0;
SetTradeMenuOptionActiveFlags();
gMain.state++;
PlayBGM(MUS_SLOT);
PlayBGM(MUS_GAME_CORNER);
break;
case 15:
ComputePartyTradeableFlags(1);
src/trade_scene.c
+20 -20
View File
@@ -597,7 +597,7 @@ static void SpriteCB_TradeGlowCable(struct Sprite * sprite)
sprite->data[0]++;
if (sprite->data[0] == 10)
{
PlaySE(SE_BOWA);
PlaySE(SE_BALL);
sprite->data[0] = 0;
}
}
@@ -610,7 +610,7 @@ static void SpriteCB_TradeGlowWireless(struct Sprite * sprite)
sprite->data[0]++;
if (sprite->data[0] == 10)
{
PlaySE(SE_W207B);
PlaySE(SE_M_SWAGGER2);
sprite->data[0] = 0;
}
}
@@ -652,7 +652,7 @@ static void SpriteCB_TradeGBAScreen(struct Sprite * sprite)
sprite->data[0]++;
if (sprite->data[0] == 15)
{
PlaySE(SE_W107);
PlaySE(SE_M_MINIMIZE);
sprite->data[0] = 0;
}
}
@@ -1274,7 +1274,7 @@ static bool8 DoTradeAnim_Cable(void)
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[sTradeData->tradeSpecies[0]].y_offset;
sTradeData->state++;
sTradeData->cachedMapMusic = GetCurrentMapMusic();
PlayNewMapMusic(MUS_SHINKA);
PlayNewMapMusic(MUS_EVOLUTION);
break;
case 1:
if (sTradeData->bg2hofs > 0)
@@ -1434,7 +1434,7 @@ static bool8 DoTradeAnim_Cable(void)
case 32:
if (!gPaletteFade.active)
{
PlaySE(SE_TK_WARPOUT);
PlaySE(SE_WARP_OUT);
sTradeData->state++;
}
gSprites[sTradeData->tradeGlow1SpriteId].pos2.y -= 3;
@@ -1488,7 +1488,7 @@ static bool8 DoTradeAnim_Cable(void)
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.y += 3;
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -160 && gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y >= -163)
{
PlaySE(SE_TK_WARPIN);
PlaySE(SE_WARP_IN);
}
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -222)
{
@@ -1585,7 +1585,7 @@ static bool8 DoTradeAnim_Cable(void)
DestroySprite(&gSprites[sTradeData->gbaScreenSpriteId]);
SetTradeSequenceBgGpuRegs(6);
sTradeData->state++;
PlaySE(SE_W028);
PlaySE(SE_M_SAND_ATTACK);
}
break;
case 51:
@@ -1693,7 +1693,7 @@ static bool8 DoTradeAnim_Cable(void)
case 68:
if (++sTradeData->timer == 10)
{
PlayFanfare(MUS_FANFA5);
PlayFanfare(MUS_EVOLVED);
}
if (sTradeData->timer == 250)
{
@@ -1771,7 +1771,7 @@ static bool8 DoTradeAnim_Wireless(void)
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[sTradeData->tradeSpecies[0]].y_offset;
sTradeData->state++;
sTradeData->cachedMapMusic = GetCurrentMapMusic();
PlayNewMapMusic(MUS_SHINKA);
PlayNewMapMusic(MUS_EVOLUTION);
break;
case 1:
if (sTradeData->bg2hofs > 0)
@@ -1936,7 +1936,7 @@ static bool8 DoTradeAnim_Wireless(void)
case 32:
if (!gPaletteFade.active)
{
PlaySE(SE_TK_WARPOUT);
PlaySE(SE_WARP_OUT);
sTradeData->state++;
}
gSprites[sTradeData->tradeGlow1SpriteId].pos2.y -= 3;
@@ -1991,7 +1991,7 @@ static bool8 DoTradeAnim_Wireless(void)
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.y += 3;
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -160 && gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y >= -163)
{
PlaySE(SE_TK_WARPIN);
PlaySE(SE_WARP_IN);
}
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -222)
{
@@ -2106,7 +2106,7 @@ static bool8 DoTradeAnim_Wireless(void)
DestroySprite(&gSprites[sTradeData->gbaScreenSpriteId]);
SetTradeSequenceBgGpuRegs(6);
sTradeData->state++;
PlaySE(SE_W028);
PlaySE(SE_M_SAND_ATTACK);
}
break;
case 51:
@@ -2214,7 +2214,7 @@ static bool8 DoTradeAnim_Wireless(void)
case 68:
if (++sTradeData->timer == 10)
{
PlayFanfare(MUS_FANFA5);
PlayFanfare(MUS_EVOLVED);
}
if (sTradeData->timer == 250)
{
@@ -2352,11 +2352,11 @@ static void SpriteCB_TradePokeball_Outbound(struct Sprite * sprite)
{
sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]];
if (sprite->data[0] == 22)
PlaySE(SE_KON);
PlaySE(SE_BALL_BOUNCE_1);
sprite->data[0]++;
if (sprite->data[0] == 44)
{
PlaySE(SE_W025);
PlaySE(SE_M_MEGA_KICK);
sprite->callback = SpriteCB_TradePokeball_Outbound2;
sprite->data[0] = 0;
BeginNormalPaletteFade(1 << (sprite->oam.paletteNum + 16), -1, 0, 16, RGB_WHITEALPHA);
@@ -2389,17 +2389,17 @@ static void SpriteCB_TradePokeball_Inbound(struct Sprite * sprite)
{
sprite->data[2]++;
sprite->data[0] = 22;
PlaySE(SE_KON);
PlaySE(SE_BALL_BOUNCE_1);
}
}
else
{
if (sprite->data[0] == 66)
PlaySE(SE_KON2);
PlaySE(SE_BALL_BOUNCE_2);
if (sprite->data[0] == 92)
PlaySE(SE_KON3);
PlaySE(SE_BALL_BOUNCE_3);
if (sprite->data[0] == 107)
PlaySE(SE_KON4);
PlaySE(SE_BALL_BOUNCE_4);
sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]];
sprite->data[0]++;
if (sprite->data[0] == 108)
@@ -2791,7 +2791,7 @@ static void Task_AnimateWirelessSignal(u8 taskId)
LoadPalette(&sWirelessSignalAnimPals_Inbound[r2], 0x30, 0x20);
}
if (sWirelessSignalAnimParams[data[0]][0] == 0 && data[1] == 0)
PlaySE(SE_W215);
PlaySE(SE_M_HEAL_BELL);
if (data[1] == sWirelessSignalAnimParams[data[0]][1])
{
data[0]++;
src/trainer_card.c
+6 -6
View File
@@ -543,7 +543,7 @@ static void Task_TrainerCard(u8 taskId)
case 8:
if (!UpdatePaletteFade() && !IsDma3ManagerBusyWithBgCopy())
{
PlaySE(SE_CARD3);
PlaySE(SE_CARD_OPEN);
sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_FRONT;
}
break;
@@ -564,7 +564,7 @@ static void Task_TrainerCard(u8 taskId)
{
SetHelpContext(HELPCONTEXT_TRAINER_CARD_BACK);
FlipTrainerCard();
PlaySE(SE_CARD1);
PlaySE(SE_CARD_FLIP);
sTrainerCardDataPtr->mainState = STATE_WAIT_FLIP_TO_BACK;
}
else if (JOY_NEW(B_BUTTON))
@@ -583,7 +583,7 @@ static void Task_TrainerCard(u8 taskId)
case STATE_WAIT_FLIP_TO_BACK:
if (IsCardFlipTaskActive() && Overworld_LinkRecvQueueLengthMoreThan2() != TRUE)
{
PlaySE(SE_CARD3);
PlaySE(SE_CARD_OPEN);
sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_BACK;
}
break;
@@ -604,7 +604,7 @@ static void Task_TrainerCard(u8 taskId)
SetHelpContext(HELPCONTEXT_TRAINER_CARD_FRONT);
FlipTrainerCard();
sTrainerCardDataPtr->mainState = STATE_WAIT_FLIP_TO_FRONT;
PlaySE(SE_CARD1);
PlaySE(SE_CARD_FLIP);
}
}
else if (JOY_NEW(A_BUTTON))
@@ -642,7 +642,7 @@ static void Task_TrainerCard(u8 taskId)
if (IsCardFlipTaskActive() && Overworld_LinkRecvQueueLengthMoreThan2() != TRUE)
{
sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_FRONT;
PlaySE(SE_CARD3);
PlaySE(SE_CARD_OPEN);
}
break;
}
@@ -1787,7 +1787,7 @@ static bool8 Task_SetCardFlipped(struct Task* task)
sTrainerCardDataPtr->onBack ^= 1;
task->tFlipState++;
sTrainerCardDataPtr->allowDMACopy = TRUE;
PlaySE(SE_CARD2);
PlaySE(SE_CARD_FLIPPING);
return FALSE;
}
src/trainer_tower.c
+14 -14
View File
@@ -376,20 +376,20 @@ static const u16 sPrizeList[] = {
};
static const u16 sTrainerTowerEncounterMusic[] = {
[TRAINER_ENCOUNTER_MUSIC_MALE] = MUS_SHOUNEN,
[TRAINER_ENCOUNTER_MUSIC_FEMALE] = MUS_SHOUJO,
[TRAINER_ENCOUNTER_MUSIC_GIRL] = MUS_SHOUJO,
[TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS] = MUS_ROCKET,
[TRAINER_ENCOUNTER_MUSIC_INTENSE] = MUS_SHOUNEN,
[TRAINER_ENCOUNTER_MUSIC_COOL] = MUS_SHOUNEN,
[TRAINER_ENCOUNTER_MUSIC_AQUA] = MUS_ROCKET,
[TRAINER_ENCOUNTER_MUSIC_MAGMA] = MUS_ROCKET,
[TRAINER_ENCOUNTER_MUSIC_SWIMMER] = MUS_SHOUNEN,
[TRAINER_ENCOUNTER_MUSIC_TWINS] = MUS_SHOUJO,
[TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR] = MUS_SHOUNEN,
[TRAINER_ENCOUNTER_MUSIC_HIKER] = MUS_SHOUNEN,
[TRAINER_ENCOUNTER_MUSIC_INTERVIEWER] = MUS_SHOUNEN,
[TRAINER_ENCOUNTER_MUSIC_RICH] = MUS_SHOUNEN
[TRAINER_ENCOUNTER_MUSIC_MALE] = MUS_ENCOUNTER_BOY,
[TRAINER_ENCOUNTER_MUSIC_FEMALE] = MUS_ENCOUNTER_GIRL,
[TRAINER_ENCOUNTER_MUSIC_GIRL] = MUS_ENCOUNTER_GIRL,
[TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS] = MUS_ENCOUNTER_ROCKET,
[TRAINER_ENCOUNTER_MUSIC_INTENSE] = MUS_ENCOUNTER_BOY,
[TRAINER_ENCOUNTER_MUSIC_COOL] = MUS_ENCOUNTER_BOY,
[TRAINER_ENCOUNTER_MUSIC_AQUA] = MUS_ENCOUNTER_ROCKET,
[TRAINER_ENCOUNTER_MUSIC_MAGMA] = MUS_ENCOUNTER_ROCKET,
[TRAINER_ENCOUNTER_MUSIC_SWIMMER] = MUS_ENCOUNTER_BOY,
[TRAINER_ENCOUNTER_MUSIC_TWINS] = MUS_ENCOUNTER_GIRL,
[TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR] = MUS_ENCOUNTER_BOY,
[TRAINER_ENCOUNTER_MUSIC_HIKER] = MUS_ENCOUNTER_BOY,
[TRAINER_ENCOUNTER_MUSIC_INTERVIEWER] = MUS_ENCOUNTER_BOY,
[TRAINER_ENCOUNTER_MUSIC_RICH] = MUS_ENCOUNTER_BOY
};
static const u8 sSingleBattleChallengeMonIdxs[][2] = {
src/union_room.c
+6 -6
View File
@@ -1351,14 +1351,14 @@ static void Task_TryJoinLinkGroup(u8 taskId)
{
AskToJoinRfuGroup(data, id);
data->state = 5;
PlaySE(SE_PN_ON);
PlaySE(SE_POKENAV_ON);
}
else
{
// Postgame flags not both set
StringCopy(gStringVar4, gUnknown_8457608[var - 1]);
data->state = 18;
PlaySE(SE_PN_ON);
PlaySE(SE_POKENAV_ON);
}
}
else
@@ -2344,7 +2344,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
RedrawListMenu(data->listTaskId);
IntlConvPartnerUname(gStringVar1, data->field_0->arr[data->leaderId]);
CreateTask_RfuReconnectWithParent(data->field_0->arr[data->leaderId].gname_uname.uname, ReadAsU16(data->field_0->arr[data->leaderId].gname_uname.gname.unk_00.playerTrainerId));
PlaySE(SE_PN_ON);
PlaySE(SE_POKENAV_ON);
data->state = 4;
}
else
@@ -2505,7 +2505,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0);
CreateTask_RfuReconnectWithParent(data->field_0->arr[0].gname_uname.uname, ReadAsU16(data->field_0->arr[0].gname_uname.gname.unk_00.playerTrainerId));
PlaySE(SE_PN_ON);
PlaySE(SE_POKENAV_ON);
data->state = 4;
}
else
@@ -2796,7 +2796,7 @@ static void Task_RunUnionRoom(u8 taskId)
switch (HandlePlayerListUpdate())
{
case 1:
PlaySE(SE_TOY_C);
PlaySE(SE_NOTE_C);
case 2:
ScheduleUnionRoomPlayerRefresh(data);
break;
@@ -3068,7 +3068,7 @@ static void Task_RunUnionRoom(u8 taskId)
data->state = 16;
break;
case 11:
PlaySE(SE_PINPON);
PlaySE(SE_DING_DONG);
sub_80F8FA0();
data->state = 12;
data->recvActivityRequest[0] = 0;
src/vs_seeker.c
+1 -1
View File
@@ -779,7 +779,7 @@ static void Task_VsSeeker_2(u8 taskId)
if (data[2] != 2 && --data[1] == 0)
{
PlaySE(SE_C_PIKON);
PlaySE(SE_CONTEST_MONS_TURN);
data[1] = 11;
data[2]++;
}