Leahnaya/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-04-26 00:37:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename PlayRumble function

Browse Source
This commit is contained in:
Retnuhytnuob 2026-02-28 12:58:53 -06:00
parent f8a935cdd4
commit 1a1d6120ee
23 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -10,7 +10,7 @@ void sub_10C0(void);
void sub_111C(void);
int sub_1170(void);
void sub_1198(void);
void playRumbleType(int arg0);
void PlayRumble(int arg0);
void sub_11E4(int arg0);
void sub_11F0(int arg0);
void sub_11FC(void);

8
src/board_process2.c
View File

@ -302,7 +302,7 @@ void sub_4DFA0(void)
{
gCurrentPinballGame->unk128 = 4;
m4aSongNumStart(SE_TILT_TRIGGERED);
playRumbleType(8);
PlayRumble(8);
}
}
}
@ -314,7 +314,7 @@ void sub_4DFA0(void)
{
gCurrentPinballGame->unk128 = 4;
m4aSongNumStart(SE_TILT_TRIGGERED);
playRumbleType(8);
PlayRumble(8);
}
}
@ -325,7 +325,7 @@ void sub_4DFA0(void)
{
gCurrentPinballGame->unk128 = 4;
m4aSongNumStart(SE_TILT_TRIGGERED);
playRumbleType(8);
PlayRumble(8);
}
}
}
@ -428,7 +428,7 @@ void sub_4E2F8(void)
gCurrentPinballGame->unk163 = 3;
if (gCurrentPinballGame->unk20)
{
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->ball->velocity.y = -590;
gCurrentPinballGame->ball->velocity.x = 0;
m4aSongNumStart(SE_UNKNOWN_0xCD);

16
src/board_process3_dusclops.c
View File

@ -442,7 +442,7 @@ void DuskullPhase_ProcessEntityLogic(void) {
gCurrentPinballGame->scoreAddedInFrame = 100000;
gCurrentPinballGame->bonusModeHitCount++; // Number hit
m4aSongNumStart(SE_DUSKULL_DEATH_CRY); //Duskull Death cry
playRumbleType(7);
PlayRumble(7);
break;
case DUSKULL_ENTITY_STATE_DYING:
if (DuskullFramesetData[gCurrentPinballGame->minionFramesetIx[i]][1] > gCurrentPinballGame->minionStateTimer[i])
@ -681,7 +681,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
gCurrentPinballGame->unk129 = 0;
gCurrentPinballGame->unk128 = 1;
m4aSongNumStart(SE_DUSCLOPS_MOVE);
playRumbleType(8);
PlayRumble(8);
}
if (gCurrentPinballGame->unk3E2 == DUSCLOPS_FRAME_INTRO_FOOTSTEP_RIGHT)
@ -689,7 +689,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
gCurrentPinballGame->unk129 = 1;
gCurrentPinballGame->unk128 = 1;
m4aSongNumStart(SE_DUSCLOPS_MOVE);
playRumbleType(8);
PlayRumble(8);
}
}
@ -781,7 +781,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
gCurrentPinballGame->unk129 = 0;
gCurrentPinballGame->unk128 = 1;
m4aSongNumStart(SE_DUSCLOPS_MOVE);
playRumbleType(8);
PlayRumble(8);
}
if (gCurrentPinballGame->unk3E2 == DUSCLOPS_FRAME_RIGHT_FOOT_LANDS)
@ -789,7 +789,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
gCurrentPinballGame->unk129 = 1;
gCurrentPinballGame->unk128 = 1;
m4aSongNumStart(SE_DUSCLOPS_MOVE);
playRumbleType(8);
PlayRumble(8);
}
}
@ -844,7 +844,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
m4aSongNumStart(SE_DUSCLOPS_HIT); //Dusclops hit
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_NONE;
playRumbleType(7);
PlayRumble(7);
break;
}
case DUSCLOPS_ENTITY_STATE_HIT_STUN:
@ -896,7 +896,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
gCurrentPinballGame->unk5AC = Sqrt(gCurrentPinballGame->unk5AC * 4) / 2;
gCurrentPinballGame->unk5B0 = ArcTan2(-tempVector.x, tempVector.y);
playRumbleType(13);
PlayRumble(13);
break;
}
case DUSCLOPS_ENTITY_STATE_ABSORBED_BALL:
@ -914,7 +914,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
gCurrentPinballGame->ball->velocity.y = 300;
gCurrentPinballGame->ball->unk0 = 0;
m4aSongNumStart(SE_DUSCLOPS_BALL_LAUNCH); //Dusclops launch ball
playRumbleType(8);
PlayRumble(8);
}
if (gCurrentPinballGame->unk3E2 == DUSCLOPS_FRAME_ABSOLB_LAUNCH)

36
src/board_process3_groudon.c
View File

@ -282,7 +282,7 @@ void sub_3B7C4(void)
{
MPlayStart(&gMPlayInfo_SE1, &se_unk_118);
gCurrentPinballGame->scoreAddedInFrame = 500000;
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->bonusModeHitCount++;
if (gCurrentPinballGame->bonusModeHitCount >= gCurrentPinballGame->legendaryHitsRequired)
gCurrentPinballGame->unk3DC = 6;
@ -338,7 +338,7 @@ void sub_3B7C4(void)
gCurrentPinballGame->unk4CA = 31;
gCurrentPinballGame->unk4C9 = gCurrentPinballGame->unk3E4 / 110;
m4aSongNumStart(SE_GROUDON_STEP);
playRumbleType(8);
PlayRumble(8);
}
if (gCurrentPinballGame->unk3E4 == 160 || gCurrentPinballGame->unk3E4 == 380)
@ -346,7 +346,7 @@ void sub_3B7C4(void)
gCurrentPinballGame->unk4CA = 31;
gCurrentPinballGame->unk4C9 = gCurrentPinballGame->unk3E4 / 110;
m4aSongNumStart(SE_GROUDON_STEP);
playRumbleType(8);
PlayRumble(8);
}
if (gCurrentPinballGame->unk3E4 == 490)
@ -354,7 +354,7 @@ void sub_3B7C4(void)
gCurrentPinballGame->unk4CA = 31;
gCurrentPinballGame->unk4C9 = 4;
m4aSongNumStart(SE_UNKNOWN_0x11A);
playRumbleType(8);
PlayRumble(8);
}
}
@ -373,7 +373,7 @@ void sub_3B7C4(void)
{
gCurrentPinballGame->unk4C8 = 60;
MPlayStart(&gMPlayInfo_SE1, &se_unk_11b);
playRumbleType(13);
PlayRumble(13);
}
}
@ -586,7 +586,7 @@ void sub_3B7C4(void)
gCurrentPinballGame->unk129 = 0;
gCurrentPinballGame->unk128 = 1;
gCurrentPinballGame->unk4C8 = 60;
playRumbleType(13);
PlayRumble(13);
MPlayStart(&gMPlayInfo_SE1, &se_unk_11b);
}
}
@ -696,7 +696,7 @@ void sub_3B7C4(void)
gCurrentPinballGame->unk4CA = 31;
gCurrentPinballGame->unk4C9 = 6;
m4aSongNumStart(SE_GROUDON_STEP);
playRumbleType(8);
PlayRumble(8);
}
}
@ -707,7 +707,7 @@ void sub_3B7C4(void)
gCurrentPinballGame->unk4CA = 31;
gCurrentPinballGame->unk4C9 = 5;
m4aSongNumStart(SE_GROUDON_STEP);
playRumbleType(8);
PlayRumble(8);
}
}
}
@ -1096,7 +1096,7 @@ void sub_3CBC4(void)
gCurrentPinballGame->unk482 = 10;
gMain.spriteGroups[24].available = 1;
gCurrentPinballGame->unk486 = 612;
playRumbleType(9);
PlayRumble(9);
}
gCurrentPinballGame->unk488.x += (Cos(gCurrentPinballGame->unk484) * 40) / 20000;
@ -1202,7 +1202,7 @@ void sub_3CBC4(void)
if (gCurrentPinballGame->unk4D8[i] == 0)
{
m4aSongNumStart(SE_GROUDON_BOULDER_LAND);
playRumbleType(7);
PlayRumble(7);
}
if (gCurrentPinballGame->unk4D8[i] < 5)
@ -1234,7 +1234,7 @@ void sub_3CBC4(void)
if (gCurrentPinballGame->unk4D8[i] == 1)
{
m4aSongNumStart(SE_GROUDON_BOULDER_LAND);
playRumbleType(7);
PlayRumble(7);
}
if (gCurrentPinballGame->unk4D8[i] < 5)
@ -1264,7 +1264,7 @@ void sub_3CBC4(void)
if (gCurrentPinballGame->unk4D8[i] == 1)
{
m4aSongNumStart(SE_GROUDON_BOULDER_LAND);
playRumbleType(7);
PlayRumble(7);
}
if (gCurrentPinballGame->unk4D8[i] < 5)
@ -1294,7 +1294,7 @@ void sub_3CBC4(void)
if (gCurrentPinballGame->unk4D8[i] == 1)
{
m4aSongNumStart(SE_GROUDON_BOULDER_LAND);
playRumbleType(7);
PlayRumble(7);
}
if (gCurrentPinballGame->unk4D8[i] < 3)
@ -1383,7 +1383,7 @@ void sub_3CBC4(void)
{
m4aSongNumStart(SE_GROUDON_BALL_HIT_FIRE);
gCurrentPinballGame->unk48C[i] = 3;
playRumbleType(7);
PlayRumble(7);
}
}
break;
@ -1402,7 +1402,7 @@ void sub_3CBC4(void)
{
m4aSongNumStart(SE_GROUDON_BALL_HIT_FIRE);
gCurrentPinballGame->unk48C[i] = 5;
playRumbleType(7);
PlayRumble(7);
}
}
break;
@ -1421,7 +1421,7 @@ void sub_3CBC4(void)
{
m4aSongNumStart(SE_GROUDON_BALL_HIT_FIRE);
gCurrentPinballGame->unk48C[i] = 7;
playRumbleType(7);
PlayRumble(7);
}
}
break;
@ -1450,7 +1450,7 @@ void sub_3CBC4(void)
}
m4aSongNumStart(SE_GROUDON_BALL_HIT_FIRE);
playRumbleType(7);
PlayRumble(7);
}
}
break;
@ -1636,7 +1636,7 @@ void sub_3CBC4(void)
gCurrentPinballGame->unk5B0 = ArcTan2(-tempVector.x, tempVector.y);
gCurrentPinballGame->ball->velocity.x = (Cos(gCurrentPinballGame->unk5B0) * -400) / 20000;
gCurrentPinballGame->ball->velocity.y = (Sin(gCurrentPinballGame->unk5B0) * 400) / 20000;
playRumbleType(9);
PlayRumble(9);
}
}

4
src/board_process3_kecleon.c
View File

@ -616,7 +616,7 @@ void sub_35D54(void)
gCurrentPinballGame->scoreAddedInFrame = 500000;
gCurrentPinballGame->bonusModeHitCount++;
MPlayStart(&gMPlayInfo_SE1, &se_unk_101);
playRumbleType(7);
PlayRumble(7);
break;
case 12:
if (gUnknown_086AE718[gCurrentPinballGame->unk3E2][1] > gCurrentPinballGame->unk3E4)
@ -1135,7 +1135,7 @@ void sub_37850(void)
if (gCurrentPinballGame->unk40C == 40)
{
m4aSongNumStart(SE_KECLEON_TREE_HIT);
playRumbleType(7);
PlayRumble(7);
}
if (var0 < 0)

12
src/board_process3_kyogre.c
View File

@ -262,7 +262,7 @@ void sub_38A20(void)
if (gCurrentPinballGame->unk452 == 4)
{
MPlayStart(&gMPlayInfo_SE1, &se_unk_10a);
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->scoreAddedInFrame = 500000;
gCurrentPinballGame->bonusModeHitCount++;
if (gCurrentPinballGame->bonusModeHitCount >= gCurrentPinballGame->legendaryHitsRequired &&
@ -606,7 +606,7 @@ void sub_38A20(void)
gCurrentPinballGame->unk3DC = 12;
gCurrentPinballGame->boardEntityCollisionMode = 2;
MPlayStart(&gMPlayInfo_SE1, &se_unk_10b);
playRumbleType(8);
PlayRumble(8);
}
break;
case 12:
@ -645,7 +645,7 @@ void sub_38A20(void)
if (gCurrentPinballGame->unk3E2 == 72)
{
MPlayStart(&gMPlayInfo_SE1, &se_unk_10c);
playRumbleType(8);
PlayRumble(8);
}
}
break;
@ -1048,7 +1048,7 @@ void sub_39A40(void)
gCurrentPinballGame->unk452 == 0 && squaredMagnitude < 400)
{
m4aSongNumStart(SE_UNKNOWN_0x113);
playRumbleType(12);
PlayRumble(12);
gCurrentPinballGame->unk1F = 1;
gCurrentPinballGame->unk458[i] = 0;
gCurrentPinballGame->unk441[i] = 3;
@ -1096,7 +1096,7 @@ void sub_39A40(void)
{
gCurrentPinballGame->unk458[i]++;
if (gCurrentPinballGame->unk458[i] % 9 == 0)
playRumbleType(12);
PlayRumble(12);
}
else
{
@ -1259,7 +1259,7 @@ void sub_39A40(void)
gCurrentPinballGame->unk448 = 0;
gCurrentPinballGame->unk454 = 0;
if (!gMain.spriteGroups[16].available)
playRumbleType(8);
PlayRumble(8);
gMain.spriteGroups[16].available = 1;
}

14
src/board_process3_rayquaza.c
View File

@ -258,7 +258,7 @@ void sub_3EDF0(void)
m4aSongNumStart(SE_RAYQUAZA_HIT);
gCurrentPinballGame->scoreAddedInFrame = 1000000;
gCurrentPinballGame->bonusModeHitCount++;
playRumbleType(7);
PlayRumble(7);
if (gCurrentPinballGame->bonusModeHitCount >= gCurrentPinballGame->legendaryHitsRequired && gCurrentPinballGame->unk3DC != 6)
gCurrentPinballGame->unk3DC = 9;
}
@ -1090,14 +1090,14 @@ void sub_40288(void)
yy = tempVector.y * tempVector.y;
squaredMagnitude = xx + yy;
playRumbleType(8);
PlayRumble(8);
if (gCurrentPinballGame->unk441[0] < 3 && gCurrentPinballGame->unk441[1] < 3 &&
gCurrentPinballGame->unk388 == 0 && squaredMagnitude < 200)
{
gMain.spriteGroups[36].available = 1;
gCurrentPinballGame->unk486 = 600;
m4aSongNumStart(SE_UNKNOWN_0x12A);
playRumbleType(9);
PlayRumble(9);
}
}
}
@ -1286,7 +1286,7 @@ void sub_40288(void)
gCurrentPinballGame->unk520.x = gCurrentPinballGame->unk45C[i].x;
gCurrentPinballGame->unk520.y = gCurrentPinballGame->unk45C[i].y;
m4aSongNumStart(SE_UNKNOWN_0x12B);
playRumbleType(13);
PlayRumble(13);
}
}
@ -1362,7 +1362,7 @@ void sub_40288(void)
gCurrentPinballGame->ball->velocity.x = 0;
gCurrentPinballGame->unk441[i] = 0;
gCurrentPinballGame->unk5FA = 0;
playRumbleType(8);
PlayRumble(8);
}
gCurrentPinballGame->unk458[i]++;
@ -1687,7 +1687,7 @@ void sub_417F8(void)
if (gCurrentPinballGame->unk441[0] < 3 && gCurrentPinballGame->unk441[1] < 3 && gCurrentPinballGame->unk388 == 0)
{
gCurrentPinballGame->ball->velocity.x += 500;
playRumbleType(13);
PlayRumble(13);
}
}
@ -1716,7 +1716,7 @@ void sub_417F8(void)
if (gCurrentPinballGame->unk441[0] < 3 && gCurrentPinballGame->unk441[1] < 3 && gCurrentPinballGame->unk388 == 0)
{
gCurrentPinballGame->ball->velocity.x -= 500;
playRumbleType(13);
PlayRumble(13);
}
}

4
src/board_process3_sapphire.c
View File

@ -263,7 +263,7 @@ void sub_32B74(void)
gCurrentPinballGame->scoreAddedInFrame = 50000;
m4aSongNumStart(SE_UNKNOWN_0xD5);
playRumbleType(8);
PlayRumble(8);
}
void sub_32BE4(void)
@ -345,7 +345,7 @@ void sub_32BE4(void)
gCurrentPinballGame->ball->unk6 = 0;
gCurrentPinballGame->ball->velocity.x = -0x66;
gCurrentPinballGame->ball->velocity.y = 0xC8;
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->ball->unk6 = 0;
gCurrentPinballGame->ball->positionQ0.x = 0xAB;
gCurrentPinballGame->ball->positionQ0.y = 0xD4;

12
src/board_process3_spheal.c
View File

@ -293,7 +293,7 @@ void sub_43500(void)
{
MPlayStart(&gMPlayInfo_SE1, &se_unk_13c);
gCurrentPinballGame->scoreAddedInFrame = 5000;
playRumbleType(8);
PlayRumble(8);
}
switch (gCurrentPinballGame->minionState[i])
@ -561,7 +561,7 @@ void sub_4387C(void)
}
}
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->unk54F[i] = 0;
gCurrentPinballGame->scoreAddedInFrame = 3000;
break;
@ -1024,7 +1024,7 @@ void sub_44F3C(void)
gCurrentPinballGame->ball->velocity.x = -0x60;
gCurrentPinballGame->ball->velocity.y = 0x54;
gCurrentPinballGame->ball->oamPriority = 3;
playRumbleType(7);
PlayRumble(7);
}
if (gCurrentPinballGame->unk591 == 2)
@ -1143,7 +1143,7 @@ void sub_45164(void)
gCurrentPinballGame->unk24 = 0;
gCurrentPinballGame->unk7E = 0;
m4aSongNumStart(SE_UNKNOWN_0xE5);
playRumbleType(7);
PlayRumble(7);
}
gCurrentPinballGame->ball->positionQ1.x = gCurrentPinballGame->ball->positionQ0.x * 2;
@ -1278,7 +1278,7 @@ void sub_455D0(void)
{
gCurrentPinballGame->unk533[i]++;
MPlayStart(&gMPlayInfo_SE1, &se_unk_13d);
playRumbleType(7);
PlayRumble(7);
if (gCurrentPinballGame->unk533[i] < 3)
{
gCurrentPinballGame->ball->positionQ8.y = 0x6500;
@ -1349,7 +1349,7 @@ void sub_455D0(void)
gCurrentPinballGame->ball->velocity.y = -gCurrentPinballGame->ball->velocity.y / 3;
gCurrentPinballGame->ball->velocity.x = 0;
if (gCurrentPinballGame->unk533[i] == 1)
playRumbleType(7);
PlayRumble(7);
}
else
{

8
src/board_process4.c
View File

@ -127,7 +127,7 @@ void sub_195C4(void)
gCurrentPinballGame->unk1334[0].velocity.x = gCurrentPinballGame->unk60.x;
gCurrentPinballGame->unk1334[0].velocity.y = gCurrentPinballGame->unk60.y;
gCurrentPinballGame->unk5C = 0;
playRumbleType(7);
PlayRumble(7);
}
flipper->unk2 = flipper->position / 2 + 1;
flipper->position += 4;
@ -144,7 +144,7 @@ void sub_195C4(void)
gCurrentPinballGame->unk1334[0].velocity.x = gCurrentPinballGame->unk60.x;
gCurrentPinballGame->unk1334[0].velocity.y = gCurrentPinballGame->unk60.y;
gCurrentPinballGame->unk5C = 0;
playRumbleType(7);
PlayRumble(7);
}
flipper->position -= 2;
}
@ -243,7 +243,7 @@ void sub_19894(void)
gCurrentPinballGame->unk1334[0].velocity.x = gCurrentPinballGame->unk60.x;
gCurrentPinballGame->unk1334[0].velocity.y = gCurrentPinballGame->unk60.y;
gCurrentPinballGame->unk5C = 0;
playRumbleType(7);
PlayRumble(7);
}
flipper->unk2 = flipper->position / 2 + 1;
flipper->position += 4;
@ -260,7 +260,7 @@ void sub_19894(void)
gCurrentPinballGame->unk1334[0].velocity.x = gCurrentPinballGame->unk60.x;
gCurrentPinballGame->unk1334[0].velocity.y = gCurrentPinballGame->unk60.y;
gCurrentPinballGame->unk5C = 0;
playRumbleType(7);
PlayRumble(7);
}
flipper->position -= 2;
}

6
src/board_process6.c
View File

@ -407,7 +407,7 @@ void sub_13D24(u16 arg0, struct Vector16 *arg1, struct Vector16 *arg2)
&& gCurrentPinballGame->unk61C == 0
&& gMain.selectedField < MAIN_FIELD_COUNT)
{
playRumbleType(6);
PlayRumble(6);
}
}
@ -796,7 +796,7 @@ u16 sub_14740(struct Vector16 *arg0, u16 *arg1)
res = 1;
m4aSongNumStart(SE_JIRACHI_HIT);
playRumbleType(7);
PlayRumble(7);
}
else
{
@ -822,7 +822,7 @@ u16 sub_14740(struct Vector16 *arg0, u16 *arg1)
res = 1;
m4aSongNumStart(SE_POKEMON_CATCH_HIT);
playRumbleType(7);
PlayRumble(7);
}
}
}

14
src/collision_checks.c
View File

@ -766,7 +766,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
*arg1 = 1;
gCurrentPinballGame->scoreAddedInFrame = 5000;
m4aSongNumStart(SE_UNKNOWN_0xB7);
playRumbleType(7);
PlayRumble(7);
return;
case 13:
if (gCurrentPinballGame->unk2D8 == 0)
@ -787,7 +787,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
m4aSongNumStart(SE_UNKNOWN_0xB7);
gCurrentPinballGame->scoreAddedInFrame = 5000;
playRumbleType(7);
PlayRumble(7);
return;
case 14:
if ((gCurrentPinballGame->unk13 > 2) && (gCurrentPinballGame->unk13 != 5))
@ -804,7 +804,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
m4aSongNumStart(SE_UNKNOWN_0xB7);
gCurrentPinballGame->scoreAddedInFrame = 5000;
playRumbleType(7);
PlayRumble(7);
return;
}
else if (gCurrentPinballGame->unk2DA == 3)
@ -816,7 +816,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
m4aSongNumStart(SE_UNKNOWN_0xB7);
gCurrentPinballGame->unk2D9 = 1;
playRumbleType(7);
PlayRumble(7);
return;
}
}
@ -832,7 +832,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
m4aSongNumStart(SE_UNKNOWN_0xB7);
gCurrentPinballGame->scoreAddedInFrame = 5000;
playRumbleType(7);
PlayRumble(7);
}
break;
@ -1056,7 +1056,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
gCurrentPinballGame->unk36E[1] = 0;
gCurrentPinballGame->unk36A[1] = 1;
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->ball->velocity.x /= 2;
gCurrentPinballGame->ball->velocity.y /= 2;
@ -1079,7 +1079,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
gCurrentPinballGame->unk36E[0] = 0;
gCurrentPinballGame->unk36A[0] = 1;
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->ball->velocity.x /= 2;
gCurrentPinballGame->ball->velocity.y /= 2;

2
src/debug_menu.c
View File

@ -415,7 +415,7 @@ void sub_478D8(void)
{
gCurrentPinballGame->unk5FA = 0;
m4aSongNumStart(SE_UNKNOWN_0x96);
playRumbleType(6);
PlayRumble(6);
}
gCurrentPinballGame->ball->positionQ8.x = (gCurrentPinballGame->unk110 / 100 + 86) << 8;

2
src/gbplayer.c
View File

@ -152,7 +152,7 @@ void sub_1198(void)
gIntrTable[1] = Timer3Intr;
}
void playRumbleType(int arg0)
void PlayRumble(int arg0)
{
if (gMain_saveData.rumbleEnabled)
{

2
src/options.c
View File

@ -284,7 +284,7 @@ void Options_HandleInput(void)
if (gGameBoyPlayerEnabled == TRUE)
{
m4aSongNumStart(SE_MENU_SELECT);
playRumbleType(11);
PlayRumble(11);
if (gOptionsData.unk2E == 0)
gOptionsData.unk2E = 1;

8
src/rom_1A98C.c
View File

@ -77,7 +77,7 @@ void sub_1AA38(void)
m4aSongNumStart(SE_UNKNOWN_0xCE);
gCurrentPinballGame->scoreAddedInFrame = 50000;
playRumbleType(8);
PlayRumble(8);
}
/*
@ -199,7 +199,7 @@ void sub_1AAA0(void)
if (gCurrentPinballGame->unk28 == 18)
{
m4aSongNumStart(194);
playRumbleType(7);
PlayRumble(7);
}
}
else if (gCurrentPinballGame->unk28 > 12)
@ -248,7 +248,7 @@ void sub_1AD84(void)
{
gCurrentPinballGame->unk2DA = 4;
m4aSongNumStart(SE_UNKNOWN_0xB7);
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->unk28 = 500;
}
else if (gCurrentPinballGame->unk2D0 !=0)
@ -1180,7 +1180,7 @@ void sub_1C560(void)
gCurrentPinballGame->unk5F3 = 0;
gCurrentPinballGame->scoreAddedInFrame = 10000;
gCurrentPinballGame->unk5F7 = 1;
playRumbleType(8);
PlayRumble(8);
}
void sub_1C5AC(void)

16
src/rom_201B8.c
View File

@ -390,7 +390,7 @@ void sub_1D5D8(void)
var1 = gUnknown_086AD7C0[gCurrentPinballGame->unk2FD][0];
var0 = gUnknown_086AD7C0[gCurrentPinballGame->unk2FD][2];
m4aSongNumStart(SE_UNKNOWN_0xCF);
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->scoreAddedInFrame = 50000;
break;
case 2:
@ -419,7 +419,7 @@ void sub_1D5D8(void)
var1 = gUnknown_086AD7C0[gCurrentPinballGame->unk2FD][0];
var0 = gUnknown_086AD7C0[gCurrentPinballGame->unk2FD][2];
m4aSongNumStart(SE_UNKNOWN_0xCF);
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->scoreAddedInFrame = 100000;
break;
case 4:
@ -663,7 +663,7 @@ void sub_1DDDC(void)
gCurrentPinballGame->ball->oamPriority = 0;
gCurrentPinballGame->scoreAddedInFrame = 5000;
m4aSongNumStart(SE_UNKNOWN_0xD5);
playRumbleType(7);
PlayRumble(7);
break;
case 3:
if (gUnknown_086AD862[gCurrentPinballGame->unk2A5][1] > gCurrentPinballGame->unk2A6)
@ -790,7 +790,7 @@ void sub_1DDDC(void)
gCurrentPinballGame->unk2A2 = 8;
gCurrentPinballGame->scoreAddedInFrame = 10;
m4aSongNumStart(SE_UNKNOWN_0xB6);
playRumbleType(7);
PlayRumble(7);
if (gCurrentPinballGame->unk724)
gCurrentPinballGame->unk724 = 1;
break;
@ -823,7 +823,7 @@ void sub_1DDDC(void)
MPlayStart(&gMPlayInfo_SE3, &se_unk_d7);
if (gCurrentPinballGame->unk2A6 % 10 == 0)
playRumbleType(12);
PlayRumble(12);
}
break;
case 9:
@ -1053,7 +1053,7 @@ void sub_1EC48(void)
{
gCurrentPinballGame->scoreAddedInFrame = 500;
m4aSongNumStart(SE_UNKNOWN_0xB6);
playRumbleType(7);
PlayRumble(7);
if (gCurrentPinballGame->unk13 == 4 && gCurrentPinballGame->unk17 == 5 && gCurrentPinballGame->unk625 < 6)
{
if (gCurrentPinballGame->unk625 == 0)
@ -1768,7 +1768,7 @@ void sub_1FF0C(void)
gCurrentPinballGame->unk2E3[0] = 0;
gCurrentPinballGame->unk2E3[1] = 0;
gCurrentPinballGame->unk2E2 = 0;
playRumbleType(7);
PlayRumble(7);
m4aSongNumStart(SE_UNKNOWN_0xB7);
gCurrentPinballGame->scoreAddedInFrame = 3000;
gCurrentPinballGame->unk2E5[0] = 0;
@ -2019,7 +2019,7 @@ void sub_203CC(void)
gCurrentPinballGame->scoreAddedInFrame = 4000;
}
playRumbleType(11);
PlayRumble(11);
}
if (gCurrentPinballGame->unk61E >= 100)

2
src/rom_27E08.c
View File

@ -2045,7 +2045,7 @@ void sub_24408(void)
gCurrentPinballGame->ball->velocity.y = -(Sin(angle2) * 160) / 20000;
}
playRumbleType(7);
PlayRumble(7);
}
}
break;

10
src/rom_27F94.c
View File

@ -1862,7 +1862,7 @@ void sub_2AADC(void)
if (gCurrentPinballGame->unk5A6 == 0)
{
m4aMPlayAllStop();
playRumbleType(8);
PlayRumble(8);
}
if (gCurrentPinballGame->unk5A6 == 2)
@ -2061,7 +2061,7 @@ void sub_2AADC(void)
if (temp_r0 > 183)
{
if (temp_r0 == 185)
playRumbleType(6);
PlayRumble(6);
if (temp_r0 == 184)
m4aSongNumStart(158);
@ -2077,7 +2077,7 @@ void sub_2AADC(void)
else if (temp_r0 > 167)
{
if (temp_r0 == 169)
playRumbleType(6);
PlayRumble(6);
if (temp_r0 == 168)
m4aSongNumStart(0x9E);
@ -2095,7 +2095,7 @@ void sub_2AADC(void)
if (temp_r0 > 115)
{
if (temp_r0 == 117)
playRumbleType(6);
PlayRumble(6);
if (temp_r0 == 116)
m4aSongNumStart(0x9E);
@ -2111,7 +2111,7 @@ void sub_2AADC(void)
else if (temp_r0 > 99)
{
if (temp_r0 == 101)
playRumbleType(6);
PlayRumble(6);
if (temp_r0 == 100)
m4aSongNumStart(0x9E);

2
src/rom_2C538.c
View File

@ -128,7 +128,7 @@ void sub_2C538(void)
gCurrentPinballGame->ball->unk6 = 0;
gMain.spriteGroups[68].available = 1;
gCurrentPinballGame->unk302 = 6;
playRumbleType(8);
PlayRumble(8);
}
}
}

8
src/rom_2E67C.c
View File

@ -942,7 +942,7 @@ void sub_2E6AC(void)
gCurrentPinballGame->ball->velocity.y = 0;
gCurrentPinballGame->ball->unk6 = 0;
m4aSongNumStart(SE_UNKNOWN_0xE2);
playRumbleType(7);
PlayRumble(7);
gCurrentPinballGame->scoreAddedInFrame = 100000;
}
@ -1128,7 +1128,7 @@ void sub_2E6AC(void)
gCurrentPinballGame->ball->oamPriority = 3;
gCurrentPinballGame->unk24 = 0;
m4aSongNumStart(SE_UNKNOWN_0xE5);
playRumbleType(7);
PlayRumble(7);
}
gCurrentPinballGame->ball->positionQ1.x = gCurrentPinballGame->ball->positionQ0.x * 2;
@ -1529,7 +1529,7 @@ void sub_2F79C(void)
{
m4aSongNumStart(SE_UNKNOWN_0xE8);
gCurrentPinballGame->scoreAddedInFrame = 10;
playRumbleType(13);
PlayRumble(13);
}
mosaicVal = gUnknown_08137CD6[gCurrentPinballGame->unk368 / 3];
@ -1701,7 +1701,7 @@ void sub_30178(void)
{
gCurrentPinballGame->scoreAddedInFrame = 500;
m4aSongNumStart(SE_UNKNOWN_0xB6);
playRumbleType(7);
PlayRumble(7);
if (gCurrentPinballGame->unk13 == 4 && gCurrentPinballGame->unk17 == 5)
{
if (gCurrentPinballGame->unk625 < 6)

2
src/rom_4F258.c
View File

@ -83,7 +83,7 @@ void sub_4E920(void)
{
m4aSongNumStart(SE_SLINGSHOT_HIT);
gCurrentPinballGame->scoreAddedInFrame = 500;
playRumbleType(7);
PlayRumble(7);
}
}

2
src/rom_50AD4.c
View File

@ -347,7 +347,7 @@ void sub_4F9F0(void)
{
m4aSongNumStart(SE_SLINGSHOT_HIT);
gCurrentPinballGame->scoreAddedInFrame = 500;
playRumbleType(7);
PlayRumble(7);
}
}