summaryrefslogtreecommitdiff
path: root/src/roulette.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/roulette.c')
-rw-r--r--src/roulette.c108
1 files changed, 55 insertions, 53 deletions
diff --git a/src/roulette.c b/src/roulette.c
index f0b484fe8..14ae16556 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -275,7 +275,7 @@ struct RouletteTable
struct Taillow taillow;
u16 ballSpeed;
u16 baseTravelDist;
- float var1C;
+ f32 var1C;
};
struct GridSelection
@@ -340,13 +340,13 @@ static EWRAM_DATA struct Roulette
s16 ballTravelDistFast;
u16 ballTravelDistMed;
u16 ballTravelDistSlow;
- float ballAngle;
- float ballAngleSpeed;
- float ballAngleAccel;
- float ballDistToCenter;
- float ballFallSpeed;
- float ballFallAccel;
- float varA0;
+ f32 ballAngle;
+ f32 ballAngleSpeed;
+ f32 ballAngleAccel;
+ f32 ballDistToCenter;
+ f32 ballFallSpeed;
+ f32 ballFallAccel;
+ f32 varA0;
u8 playTaskId;
u8 spinTaskId;
u8 filler_1[2];
@@ -1968,7 +1968,7 @@ static void ExitRoulette(u8 taskId)
gSpecialVar_0x8004 = TRUE;
else
gSpecialVar_0x8004 = FALSE;
- AlertTVOfNewCoinTotal(GetCoins());
+ TryPutFindThatGamerOnAir(GetCoins());
BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0);
gTasks[taskId].func = Task_ExitRoulette;
}
@@ -2896,7 +2896,9 @@ static const union AnimCmd sAnim_CreditDigit[] =
ANIMCMD_FRAME(18, 0), // 9
// BUG: Animation not terminated properly
// Doesn't matter in practice, the frames are set directly and not looped
- //ANIMCMD_END
+#ifdef BUGFIX
+ ANIMCMD_END
+#endif
};
static const union AnimCmd *const sAnims_CreditDigit[] =
@@ -3630,8 +3632,8 @@ static void ShowHideGridBalls(bool8 hideAll, u8 hideBallId)
else
{
gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].invisible = FALSE;
- gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].pos1.x = (sGridSelections[sRoulette->hitSquares[i]].x + 1) * 8 + 4;
- gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].pos1.y = (sGridSelections[sRoulette->hitSquares[i]].y + 1) * 8 + 3;
+ gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].x = (sGridSelections[sRoulette->hitSquares[i]].x + 1) * 8 + 4;
+ gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].y = (sGridSelections[sRoulette->hitSquares[i]].y + 1) * 8 + 3;
}
}
}
@@ -3646,8 +3648,8 @@ static void ShowHideWinSlotCursor(u8 selectionId)
else
{
gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].invisible = FALSE;
- gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].pos1.x = (sGridSelections[selectionId].x + 2) * 8;
- gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].pos1.y = (sGridSelections[selectionId].y + 2) * 8;
+ gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].x = (sGridSelections[selectionId].x + 2) * 8;
+ gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].y = (sGridSelections[selectionId].y + 2) * 8;
}
}
@@ -3686,8 +3688,8 @@ static void SpriteCB_WheelIcon(struct Sprite *sprite)
angle -= 360;
sin = Sin2(angle);
cos = Cos2(angle);
- sprite->pos2.x = sin * sprite->data[1] >> 12;
- sprite->pos2.y = -cos * sprite->data[1] >> 12;
+ sprite->x2 = sin * sprite->data[1] >> 12;
+ sprite->y2 = -cos * sprite->data[1] >> 12;
matrixNum = sprite->oam.matrixNum;
sin /= 16;
gOamMatrices[matrixNum].d = cos /= 16;
@@ -3843,7 +3845,7 @@ static void SetBallCounterNumLeft(u8 numBalls)
static void SpriteCB_GridSquare(struct Sprite *sprite)
{
- sprite->pos2.x = sRoulette->gridX;
+ sprite->x2 = sRoulette->gridX;
}
static void CreateWheelCenterSprite(void)
@@ -3948,7 +3950,7 @@ static s16 UpdateBallRelativeWheelAngle(struct Sprite *sprite)
static u8 UpdateSlotBelowBall(struct Sprite *sprite)
{
- sRoulette->hitSlot = UpdateBallRelativeWheelAngle(sprite) / (float) DEGREES_PER_SLOT;
+ sRoulette->hitSlot = UpdateBallRelativeWheelAngle(sprite) / (f32)DEGREES_PER_SLOT;
return sRoulette->hitSlot;
}
@@ -3993,12 +3995,12 @@ static void UpdateBallPos(struct Sprite *sprite)
sprite->sBallDistToCenter = sRoulette->ballDistToCenter;
sin = Sin2(sprite->sBallAngle);
cos = Cos2(sprite->sBallAngle);
- sprite->pos2.x = sin * sprite->sBallDistToCenter >> 12;
- sprite->pos2.y = -cos * sprite->sBallDistToCenter >> 12;
+ sprite->x2 = sin * sprite->sBallDistToCenter >> 12;
+ sprite->y2 = -cos * sprite->sBallDistToCenter >> 12;
if (IsSEPlaying())
{
- m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, sprite->pos2.x);
- m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, sprite->pos2.x);
+ m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, sprite->x2);
+ m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, sprite->x2);
}
}
@@ -4011,9 +4013,9 @@ static void SpriteCB_BallLandInSlot(struct Sprite *sprite)
sprite->sBallAngle -= 360;
sin = Sin2(sprite->sBallAngle);
cos = Cos2(sprite->sBallAngle);
- sprite->pos2.x = sin * sprite->sBallDistToCenter >> 12;
- sprite->pos2.y = -cos * sprite->sBallDistToCenter >> 12;
- sprite->pos2.y += gSpriteCoordOffsetY;
+ sprite->x2 = sin * sprite->sBallDistToCenter >> 12;
+ sprite->y2 = -cos * sprite->sBallDistToCenter >> 12;
+ sprite->y2 += gSpriteCoordOffsetY;
}
static void SpriteCB_UnstickBall_ShroomishBallFall(struct Sprite *sprite)
@@ -4050,7 +4052,7 @@ static void SpriteCB_UnstickBall_ShroomishBallFall(struct Sprite *sprite)
static void SpriteCB_UnstickBall_Shroomish(struct Sprite *sprite)
{
- float slotOffset, ballFallDist, ballFallSpeed;
+ f32 slotOffset, ballFallDist, ballFallSpeed;
UpdateBallPos(sprite);
switch (sprite->sBallAngle)
@@ -4096,9 +4098,9 @@ static void SpriteCB_UnstickBall_Shroomish(struct Sprite *sprite)
static void SpriteCB_UnstickBall_TaillowDrop(struct Sprite *sprite)
{
- sprite->pos2.y = (s16)(sprite->data[2] * 0.05f * sprite->data[2]) - 45;
+ sprite->y2 = (s16)(sprite->data[2] * 0.05f * sprite->data[2]) - 45;
sprite->data[2]++;
- if (sprite->data[2] >= DEGREES_PER_SLOT && sprite->pos2.y >= 0)
+ if (sprite->data[2] >= DEGREES_PER_SLOT && sprite->y2 >= 0)
{
LandBall()
sRoulette->ballUnstuck = TRUE;
@@ -4109,11 +4111,11 @@ static void SpriteCB_UnstickBall_TaillowPickUp(struct Sprite *sprite)
{
if (sprite->data[2]++ < 45)
{
- sprite->pos2.y--;
+ sprite->y2--;
if (sprite->data[2] == 45)
{
if (gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]].animCmdIndex == 1)
- sprite->pos2.y++;
+ sprite->y2++;
}
}
else
@@ -4123,9 +4125,9 @@ static void SpriteCB_UnstickBall_TaillowPickUp(struct Sprite *sprite)
if (gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]].animDelayCounter == 0)
{
if (gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]].animCmdIndex == 1)
- sprite->pos2.y++;
+ sprite->y2++;
else
- sprite->pos2.y--;
+ sprite->y2--;
}
}
else
@@ -4233,7 +4235,7 @@ static void SpriteCB_RollBall_TryLand(struct Sprite *sprite)
}
else // fall left
{
- float temp;
+ f32 temp;
sRoulette->ballAngleSpeed = (temp = sRouletteTables[sRoulette->tableId].var1C) * 2.0f;
slotId = (sRoulette->hitSlot + NUM_ROULETTE_SLOTS - 1) % NUM_ROULETTE_SLOTS;
sRoulette->stuckHitSlot = sRoulette->hitSlot;
@@ -4279,7 +4281,7 @@ static void SpriteCB_RollBall_Slow(struct Sprite *sprite)
{
// Reached slot to land in
sRoulette->ballAngleAccel = 0.0f;
- sRoulette->ballAngleSpeed -= (float)(sRouletteTables[sRoulette->tableId].wheelSpeed)
+ sRoulette->ballAngleSpeed -= (f32)(sRouletteTables[sRoulette->tableId].wheelSpeed)
/ (sRouletteTables[sRoulette->tableId].wheelDelay + 1);
sprite->sState = 4;
sprite->callback = SpriteCB_RollBall_TryLand;
@@ -4304,8 +4306,8 @@ static void SpriteCB_RollBall_Medium(struct Sprite *sprite)
if (sRoulette->ballDistToCenter > 40.0f)
return;
- sRoulette->ballFallSpeed = -(4.0f / (float)(sRoulette->ballTravelDistSlow));
- sRoulette->ballAngleAccel = -(sRoulette->ballAngleSpeed / (float)(sRoulette->ballTravelDistSlow));
+ sRoulette->ballFallSpeed = -(4.0f / (f32)(sRoulette->ballTravelDistSlow));
+ sRoulette->ballAngleAccel = -(sRoulette->ballAngleSpeed / (f32)(sRoulette->ballTravelDistSlow));
sprite->animNum = 2;
sprite->animBeginning = TRUE;
sprite->animEnded = FALSE;
@@ -4320,8 +4322,8 @@ static void SpriteCB_RollBall_Fast(struct Sprite *sprite)
return;
m4aSongNumStartOrChange(SE_ROULETTE_BALL2);
- sRoulette->ballFallSpeed = -(20.0f / (float)(sRoulette->ballTravelDistMed));
- sRoulette->ballAngleAccel = ((1.0f - sRoulette->ballAngleSpeed) / (float)(sRoulette->ballTravelDistMed));
+ sRoulette->ballFallSpeed = -(20.0f / (f32)(sRoulette->ballTravelDistMed));
+ sRoulette->ballAngleAccel = ((1.0f - sRoulette->ballAngleSpeed) / (f32)(sRoulette->ballTravelDistMed));
sprite->animNum = 1;
sprite->animBeginning = TRUE;
sprite->animEnded = FALSE;
@@ -4514,8 +4516,8 @@ static void SpriteCB_ShroomishExit(struct Sprite *sprite)
// Delay for screen shaking, then exit left
if (sprite->data[1]++ >= sprite->data[3])
{
- sprite->pos1.x -= 2;
- if (sprite->pos1.x < -16)
+ sprite->x -= 2;
+ if (sprite->x < -16)
{
if (!sRoulette->ballUnstuck)
sRoulette->ballUnstuck = TRUE;
@@ -4558,10 +4560,10 @@ static void SpriteCB_ShroomishShakeScreen(struct Sprite *sprite)
static void SpriteCB_ShroomishFall(struct Sprite *sprite)
{
- float timer;
+ f32 timer;
sprite->data[1]++;
timer = sprite->data[1];
- sprite->pos2.y = timer * 0.039f * timer;
+ sprite->y2 = timer * 0.039f * timer;
sRoulette->shroomishShadowAlpha = sShroomishShadowAlphas[(sRoulette->shroomishShadowTimer - 1) / 2];
if (sRoulette->shroomishShadowTimer < ARRAY_COUNT(sShroomishShadowAlphas) * 2 - 1)
sRoulette->shroomishShadowTimer++;
@@ -4634,9 +4636,9 @@ static void SpriteCB_TaillowShadow_Flash(struct Sprite *sprite)
static void SpriteCB_Taillow_FlyAway(struct Sprite *sprite)
{
- if (sprite->pos1.y > -16)
+ if (sprite->y > -16)
{
- sprite->pos1.y--;
+ sprite->y--;
}
else
{
@@ -4655,9 +4657,9 @@ static void SpriteCB_Taillow_PickUpBall(struct Sprite *sprite)
if (sprite->data[1] >= 0)
{
sprite->data[1]--;
- sprite->pos1.y--;
+ sprite->y--;
if (sprite->data[1] == 0 && sprite->animCmdIndex == 1)
- sprite->pos2.y++;
+ sprite->y2++;
}
else
{
@@ -4667,9 +4669,9 @@ static void SpriteCB_Taillow_PickUpBall(struct Sprite *sprite)
if (sprite->animDelayCounter == 0)
{
if (sprite->animCmdIndex == 1)
- sprite->pos2.y++;
+ sprite->y2++;
else
- sprite->pos2.y--;
+ sprite->y2--;
}
}
else
@@ -4698,10 +4700,10 @@ static void SpriteCB_Taillow_FlyIn(struct Sprite *sprite)
if (sprite->data[1]-- > 7)
{
- sprite->pos1.x += xMoveOffsets[sRoulette->ball->sStuckOnWheelLeft] * 2;
+ sprite->x += xMoveOffsets[sRoulette->ball->sStuckOnWheelLeft] * 2;
if (IsSEPlaying())
{
- s8 pan = -((116 - sprite->pos1.x) / 2);
+ s8 pan = -((116 - sprite->x) / 2);
m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
}
@@ -4710,8 +4712,8 @@ static void SpriteCB_Taillow_FlyIn(struct Sprite *sprite)
{
if (sprite->data[1] >= 0)
{
- sprite->pos1.x += xMoveOffsets[sRoulette->ball->sStuckOnWheelLeft] * yMoveOffsets[7 - sprite->data[1]][0];
- sprite->pos1.y += yMoveOffsets[7 - sprite->data[1]][1];
+ sprite->x += xMoveOffsets[sRoulette->ball->sStuckOnWheelLeft] * yMoveOffsets[7 - sprite->data[1]][0];
+ sprite->y += yMoveOffsets[7 - sprite->data[1]][1];
}
else
{
@@ -4733,7 +4735,7 @@ static void SpriteCB_TaillowShadow_FlyIn(struct Sprite *sprite)
if (sprite->data[1]-- >= 0)
{
- sprite->pos1.x += moveDir[sRoulette->ball->sStuckOnWheelLeft] * 2;
+ sprite->x += moveDir[sRoulette->ball->sStuckOnWheelLeft] * 2;
gSprites[sprite->sMonShadowSpriteId].invisible ^= 1;
}
else
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 03:54:14 +0000