diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:14:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:14:21 -0400 |
| commit | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (patch) | |
| tree | d90353c1a06b199c585fdc258c049583392dc09f /src/slot_machine.c | |
| parent | eb4bcc89cd149ae1a5e43f2aef0dddf5a69bb23c (diff) | |
| parent | ee72696b5340b5578941aeb5d03bca6099e26538 (diff) | |
Merge pull request #1146 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'src/slot_machine.c')
| -rw-r--r-- | src/slot_machine.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/slot_machine.c b/src/slot_machine.c index 8669b543b..9d19fc9a7 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -1220,7 +1220,7 @@ static bool8 SlotAction_HandleBetInput(struct Task *task) sSlotMachine->coins -= (MAX_BET - sSlotMachine->bet); sSlotMachine->bet = MAX_BET; sSlotMachine->state = SLOT_ACTION_START_SPIN; - PlaySE(SE_REGI); + PlaySE(SE_SHOP); } else // you didn't have enough coins to bet the max { @@ -1232,7 +1232,7 @@ static bool8 SlotAction_HandleBetInput(struct Task *task) // Increase bet if (JOY_NEW(DPAD_DOWN) && sSlotMachine->coins != 0) { - PlaySE(SE_REGI); + PlaySE(SE_SHOP); LightenBetTiles(sSlotMachine->bet); sSlotMachine->coins--; sSlotMachine->bet++; @@ -1335,7 +1335,7 @@ static bool8 SlotAction_AwaitReelStop(struct Task *task) { if (JOY_NEW(A_BUTTON)) { - PlaySE(SE_JYUNI); + PlaySE(SE_CONTEST_PLACE); StopSlotReel(sSlotMachine->currReel); PressStopReelButton(sSlotMachine->currReel); sSlotMachine->state = SLOT_ACTION_AWAIT_ALL_REELS_STOP; @@ -1381,17 +1381,17 @@ static bool8 SlotAction_CheckMatches(struct Task *task) } if (sSlotMachine->matchedSymbols & ((1 << MATCHED_777_BLUE) | (1 << MATCHED_777_RED))) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); CreateDigitalDisplayScene(DIG_DISPLAY_BONUS_BIG); } else if (sSlotMachine->matchedSymbols & (1 << MATCHED_777_MIXED)) { - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); CreateDigitalDisplayScene(DIG_DISPLAY_BONUS_REG); } else { - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); CreateDigitalDisplayScene(DIG_DISPLAY_WIN); } // if you matched 777... @@ -3098,7 +3098,7 @@ static void ReelTime_Init(struct Task *task) CreateReelTimeNumberGapSprite(); GetReeltimeDraw(); StopMapMusic(); - PlayNewMapMusic(MUS_BD_TIME); + PlayNewMapMusic(MUS_ROULETTE); } static void ReelTime_WindowEnter(struct Task *task) @@ -3240,7 +3240,7 @@ static void ReelTime_PikachuReact(struct Task *task) { task->data[4] = 0xa0; StartSpriteAnimIfDifferent(&gSprites[sSlotMachine->reelTimePikachuSpriteId], 5); - PlayFanfare(MUS_ME_ZANNEN); + PlayFanfare(MUS_TOO_BAD); } else { @@ -3252,7 +3252,7 @@ static void ReelTime_PikachuReact(struct Task *task) ResetPikaPowerBolts(); sSlotMachine->pikaPower = 0; } - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); } } } @@ -3328,8 +3328,8 @@ static void ReelTime_ExplodeMachine(struct Task *task) task->data[4] = 4; task->data[5] = 0; StopMapMusic(); - PlayFanfare(MUS_ME_ZANNEN); - PlaySE(SE_W153); + PlayFanfare(MUS_TOO_BAD); + PlaySE(SE_M_EXPLOSION); } static void ReelTime_WaitExplode(struct Task *task) |