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

Rename song constants using Japanese sound test menu

Browse Source
This commit is contained in:
PikalaxALT
2019-10-09 20:02:59 -04:00
parent 734cada66a
commit 855c052be0
530 changed files with 1293 additions and 1405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_controller_player.c
+6 -6
View File
@@ -807,7 +807,7 @@ static void sub_802F610(void)
{
if (gReceivedRemoteLinkPlayers == 0)
{
m4aSongNumStop(SE_T_OOAME);
m4aSongNumStop(SE_HINSI);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(sub_8011A1C);
@@ -816,7 +816,7 @@ static void sub_802F610(void)
}
else if (IsLinkTaskFinished())
{
m4aSongNumStop(SE_T_OOAME);
m4aSongNumStop(SE_HINSI);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(sub_8011A1C);
@@ -838,7 +838,7 @@ void sub_802F6A8(void)
}
else
{
m4aSongNumStop(SE_T_OOAME);
m4aSongNumStop(SE_HINSI);
gMain.inBattle = 0;
gMain.callback1 = gPreBattleCallback1;
SetMainCallback2(gMain.savedCallback);
@@ -1087,7 +1087,7 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId)
exp -= currLvlExp;
expToNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLvlExp;
SetBattleBarStruct(battlerId, gHealthboxSpriteIds[battlerId], expToNextLvl, exp, -gainedExp);
PlaySE(SE_U);
PlaySE(SE_EXP);
gTasks[taskId].func = sub_80300F4;
}
@@ -1113,7 +1113,7 @@ static void sub_80300F4(u8 taskId)
u16 species;
s32 expOnNextLvl;
m4aSongNumStop(SE_U);
m4aSongNumStop(SE_EXP);
level = GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL);
currExp = GetMonData(&gPlayerParty[monId], MON_DATA_EXP);
species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
@@ -1227,7 +1227,7 @@ static void sub_80303A8(u8 taskId)
++data[15];
break;
case 2:
PlaySE(SE_T_KAMI2);
PlaySE(SE_REGI);
if (IsMonGettingExpSentOut())
sub_811E5B8(sprite->pos1.x + sprite->pos2.x,
sprite->pos1.y + sprite->pos2.y,
src/battle_gfx_sfx_util.c
+4 -4
View File
@@ -820,7 +820,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId)
if (!gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong)
{
if (!gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong)
PlaySE(SE_T_OOAME);
PlaySE(SE_HINSI);
gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 1;
}
}
@@ -828,9 +828,9 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId)
{
gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 0;
if (!IsDoubleBattle())
m4aSongNumStop(SE_T_OOAME);
m4aSongNumStop(SE_HINSI);
else if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong)
m4aSongNumStop(SE_T_OOAME);
m4aSongNumStop(SE_HINSI);
}
}
@@ -841,7 +841,7 @@ void BattleStopLowHpSound(void)
gBattleSpritesDataPtr->battlerData[playerBattler].lowHpSong = 0;
if (IsDoubleBattle())
gBattleSpritesDataPtr->battlerData[playerBattler ^ BIT_FLANK].lowHpSong = 0;
m4aSongNumStop(SE_T_OOAME);
m4aSongNumStop(SE_HINSI);
}
// not used
src/battle_script_commands.c
+1 -1
View File
@@ -3165,7 +3165,7 @@ static void atk23_getexp(void)
&& !gBattleStruct->wildVictorySong)
{
BattleStopLowHpSound();
PlayBGM(BGM_FRLG_KACHI_WILD_POKEMON);
PlayBGM(MUS_WIN_YASEI);
++gBattleStruct->wildVictorySong;
}
if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP))
src/battle_transition.c
+1 -1
View File
@@ -2756,7 +2756,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_C_MAKU_U);
PlaySE(SE_BT_START);
++sTransitionStructPtr->vblankDma;
return FALSE;
}
src/berry_pouch.c
+2 -2
View File
@@ -704,7 +704,7 @@ static void BerryPouchMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen
{
if (onInit != TRUE)
{
PlaySE(SE_W287B);
PlaySE(SE_BAG1);
StartBerryPouchSpriteWobbleAnim();
}
DestroyItemMenuIcon(sResources->itemMenuIconId ^ 1);
@@ -1381,7 +1381,7 @@ static void Task_SellYes(u8 taskId)
static void Task_SellBerries_PlaySfxAndRemoveBerries(u8 taskId)
{
s16 * data = gTasks[taskId].data;
PlaySE(SE_CASHIER);
PlaySE(SE_SHOP);
RemoveBagItem(gSpecialVar_ItemId, data[8]);
AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]);
sub_809C09C(gSpecialVar_ItemId, data[8], 2);
src/daycare.c
+1 -1
View File
@@ -2142,7 +2142,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite)
sprite->data[0]++;
if (!gPaletteFade.active)
{
PlaySE(SE_JIHANKI);
PlaySE(SE_TAMAGO);
sprite->invisible = TRUE;
sprite->callback = SpriteCB_Egg_5;
sprite->data[0] = 0;
src/fame_checker.c
+5 -5
View File
@@ -448,7 +448,7 @@ void UseFameChecker(MainCallback savedCallback)
sFameCheckerData->listMenuTopIdx2 = 0;
sFameCheckerData->listMenuDrawnSelIdx = 0;
sFameCheckerData->viewingFlavorText = FALSE;
PlaySE(SE_W202);
PlaySE(SE_W129);
SetMainCallback2(MainCB2_LoadFameChecker);
}
@@ -559,11 +559,11 @@ static void Task_TopMenuHandleInput(u8 taskId)
cursorPos = FameCheckerGetCursorY();
if (TryExitPickMode(taskId) == TRUE)
{
PlaySE(SE_W100);
PlaySE(SE_W199);
}
else if (cursorPos != sFameCheckerData->numUnlockedPersons - 1) // anything but CANCEL
{
PlaySE(SE_W100);
PlaySE(SE_W199);
FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 88, 32);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC);
UpdateInfoBoxTilemap(2, 4);
@@ -748,7 +748,7 @@ static void FC_MoveSelectorCursor(u8 taskId, s8 dx, s8 dy)
{
u8 i;
s16 *data = gTasks[taskId].data;
PlaySE(SE_W155);
PlaySE(SE_W207B);
gSprites[data[0]].pos1.x += dx;
gSprites[data[0]].pos1.y += dy;
for (i = 0; i < 6; i++)
@@ -826,7 +826,7 @@ static bool8 SetMessageSelectorIconObjMode(u8 spriteId, u8 objMode)
static void Task_StartToCloseFameChecker(u8 taskId)
{
PlaySE(SE_W202);
PlaySE(SE_W129);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gTasks[taskId].func = Task_DestroyAssetsAndCloseFameChecker;
}
src/field_fadetransition.c
+2 -2
View File
@@ -305,7 +305,7 @@ static void sub_807DF94(void)
Overworld_PlaySpecialMapMusic();
pal_fill_for_maplights();
sub_8111CF0();
PlaySE(SE_RU_GASHIN);
PlaySE(SE_TK_WARPOUT);
CreateTask(sub_807E31C, 10);
ScriptContext2_Enable();
}
@@ -713,7 +713,7 @@ static void sub_807E784(u8 taskId)
case 0:
player_bitmagic();
ScriptContext2_Enable();
PlaySE(SE_FU_ZUZUZU);
PlaySE(SE_TK_WARPIN);
sub_805DAB0();
task->data[0]++;
break;
src/fldeff_poison.c
+1 -1
View File
@@ -29,7 +29,7 @@ static void Task_FieldPoisonEffect(u8 taskId)
void FldEffPoison_Start(void)
{
PlaySE(SE_DAUGI);
PlaySE(SE_DOKU);
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_W145);
PlaySE(SE_W088);
FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
EnableBothScriptContexts();
}
src/fldeff_sweetscent.c
+1 -1
View File
@@ -51,7 +51,7 @@ static void StartSweetScentFieldEffect(void)
{
u8 taskId;
PlaySE(SE_W260);
PlaySE(SE_W230);
gUnknown_203AAB0 = (u8 *)Alloc(0x400);
CpuFastSet(gPlttBufferUnfaded, gUnknown_203AAB0, 0x100);
CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100);
src/help_system.c
+3 -3
View File
@@ -59,12 +59,12 @@ u8 RunHelpSystemCallback(void)
{
if (!sub_812B45C() || !gHelpSystemEnabled)
{
PlaySE(SE_HELP_ERR);
PlaySE(SE_HELP_NG);
return 0;
}
m4aMPlayStop(&gMPlayInfo_SE1);
m4aMPlayStop(&gMPlayInfo_SE2);
PlaySE(SE_HELP_OPEN);
PlaySE(SE_HELP_OP);
if (!gUnknown_203F174)
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x80);
SaveCallbacks();
@@ -112,7 +112,7 @@ u8 RunHelpSystemCallback(void)
case 5:
if (!sub_812BB9C(&gHelpSystemListMenu, gHelpSystemListMenuItems))
{
PlaySE(SE_HELP_CLOSE);
PlaySE(SE_HELP_CL);
sVideoState.state = 6;
}
break;
src/intro.c
+2 -2
View File
@@ -738,7 +738,7 @@ static void sub_80ECC3C(struct IntroSequenceData * this)
switch (this->field_0004)
{
case 0:
PlaySE(BGM_FRLG_GAMEFREAK_LOGO);
PlaySE(MUS_TITLEROG);
sub_80EDC40();
this->field_0012 = 0;
this->field_0004++;
@@ -907,7 +907,7 @@ static void sub_80ECEA4(struct IntroSequenceData * this)
case 3:
if (!gPaletteFade.active)
{
m4aSongNumStart(BGM_FRLG_OPENING);
m4aSongNumStart(MUS_DEMO);
this->field_0012 = 0;
this->field_0004++;
}
src/item_pc.c
+1 -1
View File
@@ -379,7 +379,7 @@ static bool8 ItemPc_DoGfxSetup(void)
{
sub_80A0A48(0, 0, 0);
ItemPc_SetInitializedFlag(1);
PlaySE(SE_PC_LOGON);
PlaySE(SE_PC_LOGIN);
}
gMain.state++;
break;
src/item_use.c
+2 -2
View File
@@ -496,7 +496,7 @@ void FieldUseFunc_SuperRepel(u8 taskId)
{
if (VarGet(VAR_REPEL_STEP_COUNT) == 0)
{
PlaySE(SE_RU_GASYAN);
PlaySE(SE_TU_SAA);
gTasks[taskId].func = sub_80A19E8;
}
else
@@ -551,7 +551,7 @@ void sub_80A1B48(u8 taskId)
{
if (++gTasks[taskId].data[8] > 7)
{
PlaySE(SE_PN_ON);
PlaySE(SE_BIDORO);
DisplayItemMessageInBag(taskId, 2, gStringVar4, sub_810A1F8);
}
}
src/itemfinder.c
+2 -2
View File
@@ -170,7 +170,7 @@ static void Task_ItemfinderResponseSoundsAndAnims(u8 taskId)
}
else
{
PlaySE(SE_TOY_F);
PlaySE(SE_DAUGI);
CreateArrowSprite(tDingNum, direction);
tDingNum++;
tNumDingsRemaining--;
@@ -191,7 +191,7 @@ static void Task_ItemfinderUnderfootSoundsAndAnims(u8 taskId)
}
else
{
PlaySE(SE_TOY_F);
PlaySE(SE_DAUGI);
tStartSpriteId = CreateStarSprite();
tDingNum++;
tNumDingsRemaining--;
src/mevent.c
+1 -1
View File
@@ -192,7 +192,7 @@ u32 sub_8143770(u8 * r4, u16 * r5)
case 2:
if (GetLinkPlayerCount_2() == 2)
{
PlaySE(SE_TOY_G);
PlaySE(SE_PINPON);
CheckShouldAdvanceLinkState();
*r5 = 0;
*r4 = 3;
src/mystery_gift_menu.c
+1 -1
View File
@@ -428,7 +428,7 @@ bool32 HandleMysteryGiftOrEReaderSetup(s32 mg_or_ereader)
case 3:
ShowBg(0);
ShowBg(3);
PlayBGM(BGM_FRLG_MYSTERY_GIFT);
PlayBGM(MUS_OKURIMONO);
SetVBlankCallback(vblankcb_mystery_gift_e_reader_run);
EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL);
return TRUE;
src/oak_speech.c
+5 -5
View File
@@ -561,7 +561,7 @@ static void Task_OaksSpeech1(u8 taskId)
ShowBg(0);
ShowBg(1);
SetVBlankCallback(VBlankCB_NewGameOaksSpeech);
PlayBGM(BGM_FRLG_GAME_EXPLANATION_START);
PlayBGM(MUS_SOUSA);
gTasks[taskId].func = Task_OaksSpeech2;
gMain.state = 0;
return;
@@ -715,7 +715,7 @@ static void Task_OakSpeech6(u8 taskId)
data[3]--;
else
{
PlayBGM(BGM_FRLG_GAME_EXPLANATION_MIDDLE);
PlayBGM(MUS_SEKAIKAN);
ClearTopBarWindow();
TopBarWindowPrintString(gText_ABUTTONNext, 0, 1);
sOakSpeechResources->unk_0008 = MallocAndDecompress(sNewGameAdventureIntroTilemap, &sp14);
@@ -817,7 +817,7 @@ static void Task_OakSpeech7(u8 taskId)
break;
case 4:
sub_8006398(gTasks[taskId].data[5]);
PlayBGM(BGM_FRLG_GAME_EXPLANATION_END);
PlayBGM(MUS_SEIBETU);
data[15] = 24;
gMain.state++;
break;
@@ -876,7 +876,7 @@ static void Task_OakSpeech9(u8 taskId)
CreateNidoranFSprite(taskId);
LoadOaksSpeechTrainerPic(3, 0);
CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 1);
PlayBGM(BGM_FRLG_ROUTE_24);
PlayBGM(MUS_OPENING);
BeginNormalPaletteFade(0xFFFFFFFF, 5, 16, 0, RGB_BLACK);
data[3] = 80;
ShowBg(2);
@@ -1409,7 +1409,7 @@ static void Task_OakSpeech39(u8 taskId)
if (sOakSpeechResources->unk_0012 % 20 == 0)
{
if (sOakSpeechResources->unk_0012 == 40)
PlaySE(SE_FU_ZUZUZU);
PlaySE(SE_TK_WARPIN);
r0 = data[2];
data[2] -= 32;
x = sub_80D8B90(r0 - 8);
src/slot_machine.c
+2 -2
View File
@@ -734,7 +734,7 @@ static void MainTask_SlotsGameLoop(u8 taskId)
{
sSlotMachineState->bet++;
TakeCoins(1);
PlaySE(SE_T_KAMI2);
PlaySE(SE_REGI);
sub_8141148(8, 0);
sub_8141148(2, 1);
data[0] = 1;
@@ -752,7 +752,7 @@ static void MainTask_SlotsGameLoop(u8 taskId)
sSlotMachineState->bet += GetCoins();
SetCoins(0);
}
PlaySE(SE_T_KAMI2);
PlaySE(SE_REGI);
sub_8141148(8, 0);
sub_8141148(2, 1);
data[0] = 1;
src/sound.c
+3 -3
View File
@@ -53,9 +53,9 @@ static const struct Fanfare sFanfares[] = {
{ MUS_ME_B_BIG, 250 },
{ MUS_ME_B_SMALL, 150 },
{ MUS_ME_ZANNEN, 160 },
{ BGM_FRLG_FLUTE, 450 },
{ BGM_FRLG_ME_KEYITEM, 170 },
{ BGM_FRLG_ME_POKEDEX_EVAL, 196 }
{ MUS_POKEFUE, 450 },
{ MUS_FAN5, 170 },
{ MUS_FAN2, 196 }
};
extern u16 SpeciesToCryId(u16);
src/ss_anne.c
+2 -2
View File
@@ -83,7 +83,7 @@ void Special_SSAnneDepartureCutscene(void)
{
u8 taskId;
PlaySE(SE_SHIP_HORN);
PlaySE(SE_KITEKI);
taskId = CreateTask(Task_SSAnneInit, 8);
gTasks[taskId].data[0] = 50;
}
@@ -118,7 +118,7 @@ static void Task_SSAnneRun(u8 taskId)
boatObject = &gMapObjects[mapObjectId];
if (gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x < -120)
{
PlaySE(SE_SHIP_HORN);
PlaySE(SE_KITEKI);
gTasks[taskId].func = Task_SSAnneFinish;
}
else
src/teachy_tv.c
+4 -4
View File
@@ -503,7 +503,7 @@ static void TeachyTvMainCallback(void)
gTasks[taskId].data[0] = TeachyTvSetupWindow();
gTasks[taskId].data[1] = TeachyTvSetupObjEventAndOam();
TeachyTvSetupScrollIndicatorArrowPair();
PlayNewMapMusic(BGM_FRLG_TEACHY_TV);
PlayNewMapMusic(MUS_TVNOIZE);
TeachyTvSetWindowRegs();
}
ScheduleBgCopyTilemapToVram(0);
@@ -779,7 +779,7 @@ static void TTVcmd_TransitionRenderBg2TeachyTvGraphicInitNpcPos(u8 taskId)
ScheduleBgCopyTilemapToVram(2);
data[2] = 0;
++data[3];
PlayNewMapMusic(BGM_FRLG_FOLLOW_ME);
PlayNewMapMusic(MUS_ANNAI);
}
}
@@ -1060,7 +1060,7 @@ static void TTVcmd_End(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (data[2] == 0)
PlayNewMapMusic(BGM_FRLG_TEACHY_TV);
PlayNewMapMusic(MUS_TVNOIZE);
TeachyTvBg2AnimController();
if (++data[2] > 63)
{
@@ -1227,7 +1227,7 @@ static void TeachyTvRestorePlayerPartyCallback(void)
if (gBattleOutcome == B_OUTCOME_DREW)
SetTeachyTvControllerModeToResume();
else
PlayNewMapMusic(BGM_FRLG_FOLLOW_ME);
PlayNewMapMusic(MUS_ANNAI);
CB2_ReturnToTeachyTV();
}
src/text.c
+3 -2
View File
@@ -12,6 +12,7 @@
#include "window.h"
#include "graphics.h"
#include "dynamic_placeholder_text_util.h"
#include "constants/songs.h"
extern u8 gGlyphInfo[0x90];
extern const struct OamData gOamData_83AC9D0;
@@ -552,7 +553,7 @@ bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
result = TRUE;
PlaySE(5);
PlaySE(SE_SELECT);
}
}
return result;
@@ -570,7 +571,7 @@ bool16 TextPrinterWait(struct TextPrinter *textPrinter)
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
result = TRUE;
PlaySE(5);
PlaySE(SE_SELECT);
}
}
return result;
src/title_screen.c
+1 -1
View File
@@ -285,7 +285,7 @@ void CB2_InitTitleScreen(void)
sTitleScreenTimerTaskId = CreateTask(Task_TitleScreenTimer, 2);
SetVBlankCallback(VBlankCB);
SetMainCallback2(CB2_TitleScreenRun);
m4aSongNumStart(BGM_FRLG_TITLE);
m4aSongNumStart(MUS_TITLE);
}
return;
}
src/tm_case.c
+1 -1
View File
@@ -1104,7 +1104,7 @@ static void Task_DoSaleOfTMs(u8 taskId)
{
s16 * data = gTasks[taskId].data;
PlaySE(0xF8);
PlaySE(SE_SHOP);
RemoveBagItem(gSpecialVar_ItemId, data[8]);
AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]);
sub_809C09C(gSpecialVar_ItemId, data[8], 2);
src/unk_815F138.c
+4 -4
View File
@@ -75,7 +75,7 @@ bool32 sub_815F2AC(u8 spriteId)
// fallthrough
case 1:
if (sprite->data[2] == 0)
PlaySE(SE_TRACK_STOP);
PlaySE(SE_KON2);
if (++sprite->data[2] >= 20)
{
sprite->data[2] = 0;
@@ -167,7 +167,7 @@ void sub_815F470(struct Sprite * sprite)
sprite->pos2.y = data[5] >> 4;
if (sprite->pos2.y >= 0)
{
PlaySE(SE_TRACK_STOP);
PlaySE(SE_KON2);
sprite->pos2.y = 0;
data[0]++;
}
@@ -176,7 +176,7 @@ void sub_815F470(struct Sprite * sprite)
data[1] += 12;
if (data[1] >= 128)
{
PlaySE(SE_TRACK_STOP);
PlaySE(SE_KON2);
data[1] = 0;
data[0]++;
}
@@ -187,7 +187,7 @@ void sub_815F470(struct Sprite * sprite)
data[1] += 16;
if (data[1] >= 128)
{
PlaySE(SE_TRACK_STOP);
PlaySE(SE_KON2);
data[1] = 0;
data[0]++;
}
src/vs_seeker.c
+1 -1
View File
@@ -836,7 +836,7 @@ static void Task_VsSeeker_2(u8 taskId)
if (data[2] != 2 && --data[1] == 0)
{
PlaySE(SE_BASABASA);
PlaySE(SE_C_PIKON);
data[1] = 11;
data[2]++;
}