dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Give songs meaningful english names

Browse Source
This commit is contained in:
GriffinR
2020-08-20 18:02:00 -04:00
parent 6c34effda9
commit 3014241179
1178 changed files with 10482 additions and 10477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/roulette.c
View File

@@ -1522,7 +1522,7 @@ static void Task_HandleBetGridInput(u8 taskId)
}
else
{
m4aSongNumStart(SE_REGI);
m4aSongNumStart(SE_SHOP);
gTasks[taskId].func = Task_PlaceBet;
}
}
@@ -1679,7 +1679,7 @@ static void Task_RollBall(u8 taskId)
gTasks[taskId].tBallNum++;
gTasks[taskId].tTotalBallNum++;
SetBallCounterNumLeft(BALLS_PER_ROUND - gTasks[taskId].tBallNum);
m4aSongNumStart(SE_TAMAKORO);
m4aSongNumStart(SE_ROULETTE_BALL);
gTasks[taskId].func = Task_RecordBallHit;
}
@@ -1804,14 +1804,14 @@ static void Task_PrintSpinResult(u8 taskId)
case 2: // never happens
if (gTasks[taskId].tMultiplier == MAX_MULTIPLIER)
{
PlayFanfare(MUS_ME_B_BIG);
PlayFanfare(MUS_SLOTS_JACKPOT);
DrawStdWindowFrame(sTextWindowId, FALSE);
AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_Jackpot, 0, 1, TEXT_SPEED_FF, NULL);
CopyWindowToVram(sTextWindowId, 3);
}
else
{
PlayFanfare(MUS_ME_B_SMALL);
PlayFanfare(MUS_SLOTS_WIN);
DrawStdWindowFrame(sTextWindowId, FALSE);
AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_ItsAHit, 0, 1, TEXT_SPEED_FF, NULL);
CopyWindowToVram(sTextWindowId, 3);
@@ -1819,7 +1819,7 @@ static void Task_PrintSpinResult(u8 taskId)
break;
case FALSE:
default:
m4aSongNumStart(SE_HAZURE);
m4aSongNumStart(SE_FAILURE);
DrawStdWindowFrame(sTextWindowId, FALSE);
AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_NothingDoing, 0, 1, TEXT_SPEED_FF, NULL);
CopyWindowToVram(sTextWindowId, 3);
@@ -3924,7 +3924,7 @@ static void HideWheelBalls(void)
UpdateBallRelativeWheelAngle(sprite); \
sprite->sBallWheelAngle = (sprite->sBallWheelAngle / DEGREES_PER_SLOT) * DEGREES_PER_SLOT + 15; \
sprite->callback = SpriteCB_BallLandInSlot; \
m4aSongNumStartOrChange(SE_HASHI); \
m4aSongNumStartOrChange(SE_BRIDGE_WALK); \
}
// "wheelAngle" and "sBallAngle" are relative to the screen (e.g. 180 degrees for either is always screen bottom)
@@ -4136,7 +4136,7 @@ static void SpriteCB_UnstickBall_TaillowPickUp(struct Sprite *sprite)
sprite->animEnded = FALSE;
sprite->data[2] = 0;
sprite->callback = SpriteCB_UnstickBall_TaillowDrop;
m4aSongNumStart(SE_NAGERU);
m4aSongNumStart(SE_BALL_THROW);
}
}
}
@@ -4203,7 +4203,7 @@ static void SpriteCB_RollBall_TryLandAdjacent(struct Sprite *sprite)
{
// Ball is stuck, need Shroomish/Taillow to clear ball
sprite->animPaused = TRUE;
m4aSongNumStart(SE_KON);
m4aSongNumStart(SE_BALL_BOUNCE_1);
SetBallStuck(sprite);
}
}
@@ -4224,7 +4224,7 @@ static void SpriteCB_RollBall_TryLand(struct Sprite *sprite)
// Space has already been landed on, try to fall into adjacent space
u8 slotId;
u32 fallRight;
m4aSongNumStart(SE_KON);
m4aSongNumStart(SE_BALL_BOUNCE_1);
fallRight = Random() & 1;
if (fallRight)
{
@@ -4319,7 +4319,7 @@ static void SpriteCB_RollBall_Fast(struct Sprite *sprite)
if (sRoulette->ballDistToCenter > 60.0f)
return;
m4aSongNumStartOrChange(SE_TAMAKORO_E);
m4aSongNumStartOrChange(SE_ROULETTE_BALL2);
sRoulette->ballFallSpeed = -(20.0f / (float)(sRoulette->ballTravelDistMed));
sRoulette->ballAngleAccel = ((1.0f - sRoulette->ballAngleSpeed) / (float)(sRoulette->ballTravelDistMed));
sprite->animNum = 1;
@@ -4573,7 +4573,7 @@ static void SpriteCB_ShroomishFall(struct Sprite *sprite)
gSprites[sprite->sMonShadowSpriteId].data[1] = -2;
gSprites[sprite->sBallShadowSpriteId].invisible = FALSE;
gSprites[sprite->sBallShadowSpriteId].callback = SpriteCB_ShroomishShakeScreen;
m4aSongNumStart(SE_W070);
m4aSongNumStart(SE_M_STRENGTH);
}
}
@@ -4596,7 +4596,7 @@ static void SpriteCB_Shroomish(struct Sprite *sprite)
sprite->invisible = FALSE;
sprite->data[7]++;
m4aSongNumStart(SE_RU_HYUU);
m4aSongNumStart(SE_FALL);
sRoulette->shroomishShadowTimer = 1;
sRoulette->shroomishShadowAlpha = sShroomishShadowAlphas[0];
}
@@ -4643,7 +4643,7 @@ static void SpriteCB_Taillow_FlyAway(struct Sprite *sprite)
sprite->callback = SpriteCallbackDummy;
sprite->invisible = TRUE;
sprite->animPaused = TRUE;
m4aSongNumStop(SE_BASABASA);
m4aSongNumStop(SE_TAILLOW_WING_FLAP);
DestroySprite(sprite);
FreeOamMatrix(gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]].oam.matrixNum);
DestroySprite(&gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]]);
@@ -4674,7 +4674,7 @@ static void SpriteCB_Taillow_PickUpBall(struct Sprite *sprite)
}
else
{
m4aSongNumStart(SE_RU_HYUU);
m4aSongNumStart(SE_FALL);
StartSpriteAnim(sprite, sRoulette->ball->sStuckOnWheelLeft + 4);
sprite->callback = SpriteCB_Taillow_FlyAway;
gSprites[sprite->sMonShadowSpriteId].affineAnimPaused = FALSE;
@@ -4715,7 +4715,7 @@ static void SpriteCB_Taillow_FlyIn(struct Sprite *sprite)
}
else
{
m4aSongNumStartOrChange(SE_BASABASA);
m4aSongNumStartOrChange(SE_TAILLOW_WING_FLAP);
if (sRoulette->ball->sStuckOnWheelLeft == 0)
PlayCry1(SPECIES_TAILLOW, 63);
else
@@ -4770,5 +4770,5 @@ static void SpriteCB_Taillow(struct Sprite *sprite)
}
gSprites[sprite->sMonShadowSpriteId].callback = SpriteCB_TaillowShadow_FlyIn;
gSprites[sprite->sMonSpriteId].callback = SpriteCB_Taillow_FlyIn;
m4aSongNumStart(SE_RU_HYUU);
m4aSongNumStart(SE_FALL);
}