Leahnaya/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-03-21 17:24:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into naming_flipperstate

Browse Source
This commit is contained in:
WhenGryphonsFly 2025-09-20 12:07:50 -05:00 committed by GitHub
commit d5396c0400
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
29 changed files with 985 additions and 985 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/board_process3_dusclops.c
View File

@ -700,7 +700,7 @@ void sub_34450(void)
if (gCurrentPinballGame->unk3E6 > 0)
{
if (gCurrentPinballGame->unk3E6 > 64)
gCurrentPinballGame->unk3E6 -= 1;
gCurrentPinballGame->unk3E6--;
else
gCurrentPinballGame->unk3E6 -= 2;

12
src/board_process3_ruby.c
View File

@ -83,7 +83,7 @@ void RubyBoardProcess_3B_19B10(void)
sub_19FA0();
if (gCurrentPinballGame->unk29C != 0)
{
gCurrentPinballGame->unk29C -= 1;
gCurrentPinballGame->unk29C--;
if (gCurrentPinballGame->unk29C == 0)
{
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
@ -105,7 +105,7 @@ void sub_19B90(void)
{
case 0:
gUnknown_086AD4C4[gCurrentPinballGame->unk13]();
gCurrentPinballGame->unk16 += 1;
gCurrentPinballGame->unk16++;
break;
case 1:
gUnknown_086AD4E8[gCurrentPinballGame->unk13]();
@ -168,7 +168,7 @@ void sub_19CC8(void)
{
if (gCurrentPinballGame->unk6EE != 0)
{
gCurrentPinballGame->unk6EE -= 1;
gCurrentPinballGame->unk6EE--;
}
else
{
@ -224,7 +224,7 @@ void sub_19E10(void)
sub_1DA74();
if (gCurrentPinballGame->unk2A0 != 0)
{
gCurrentPinballGame->unk2A0 -= 1;
gCurrentPinballGame->unk2A0--;
if (gCurrentPinballGame->unk2A0 == 0)
{
randNum = Random();
@ -291,7 +291,7 @@ void sub_19E10(void)
if (gCurrentPinballGame->unk1328 != 0)
{
gCurrentPinballGame->unk1328 -= 1;
gCurrentPinballGame->unk1328--;
if (gCurrentPinballGame->unk1328 == 0)
{
gCurrentPinballGame->unk1330 = gCurrentPinballGame->unk1334;
@ -307,7 +307,7 @@ void sub_19F70(void)
sub_1FF0C();
if (gCurrentPinballGame->unk600 != 0)
{
gCurrentPinballGame->unk600 -= 1;
gCurrentPinballGame->unk600--;
}
}

4
src/board_process7.c
View File

@ -400,12 +400,12 @@ void BonusBoardProcess_7B_12BF8()
{
if (gCurrentPinballGame->unk5F7 == 0 && gCurrentPinballGame->ballUpgradeCounter != 0)
{
gCurrentPinballGame->ballUpgradeCounter -= 1;
gCurrentPinballGame->ballUpgradeCounter--;
if (gCurrentPinballGame->ballUpgradeCounter == 0)
{
if (gCurrentPinballGame->ballUpgradeType > BALL_UPGRADE_TYPE_POKE_BALL)
{
gCurrentPinballGame->ballUpgradeType -= 1;
gCurrentPinballGame->ballUpgradeType--;
if (gCurrentPinballGame->ballUpgradeType > BALL_UPGRADE_TYPE_POKE_BALL)
{
gCurrentPinballGame->ballUpgradeCounter = 60 * 60;

2
src/debug_menu.c
View File

@ -919,7 +919,7 @@ void sub_48190(void)
if (value / 100000000 > 0)
{
value -= 100000000;
var4 += 1;
var4++;
}
gCurrentPinballGame->unk6B8 = var4;

4
src/high_scores.c
View File

@ -211,7 +211,7 @@ void HighScore_State1_D20C(void)
}
break;
case 1:
gUnknown_0201A4B8 -= 1;
gUnknown_0201A4B8--;
// TODO: FAKEMATCH - Seth
temp = gUnknown_02002858.unk18;
@ -248,7 +248,7 @@ void HighScore_State1_D20C(void)
break;
}
gUnknown_02002858.unk18 += 1;
gUnknown_02002858.unk18++;
sub_E860();
}

4
src/intro.c
View File

@ -302,7 +302,7 @@ void sub_978C(void)
if (gUnknown_0202BF10 >= gUnknown_086A77A8[gUnknown_0202C5A8][gUnknown_0202A578][1])
{
m4aSongNumStart(gUnknown_086A77A8[gUnknown_0202C5A8][gUnknown_0202A578][0]);
gUnknown_0202A578 = gUnknown_0202A578 + 1;
gUnknown_0202A578++;
}
}
}
@ -430,7 +430,7 @@ void sub_9AB8(void)
gUnknown_0201A450[3].unk2 -= 0xD;
gUnknown_0202ADA0[0x12] -= 0x10;
gUnknown_0202ADA0[0x13] += 1;
gUnknown_0202ADA0[0x13]++;
gUnknown_0202ADA0[0x6] -= 0x10;
gUnknown_0201A450[2].unk0 -= 0xE;

4
src/pokedex.c
View File

@ -409,7 +409,7 @@ void Pokedex_State5_45A4(void)
m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100);
}
}
gUnknown_0202BEF4 = gUnknown_0202BEF4 + 1;
gUnknown_0202BEF4++;
if (0x1e < gUnknown_0202BEF4)
{
gUnknown_0202BEF4 = 0;
@ -706,7 +706,7 @@ void Pokedex_State9_4BB4(void)
gMain.subState = POKEDEX_STATE_LOAD_GRAPHICS;
break;
}
gUnknown_0201B120 += 1;
gUnknown_0201B120++;
}
void Pokedex_State11_4C80(void)

6
src/rom_1A0F4.c
View File

@ -17,13 +17,13 @@ void sub_1A0F4(void)
gCurrentPinballGame->unk5FA = 1;
if (gCurrentPinballGame->unkEA != 0)
{
gCurrentPinballGame->unkEA -= 1;
gCurrentPinballGame->unkEA--;
}
else if (gCurrentPinballGame->unkEE == 0)
{
if (gCurrentPinballGame->unkEC != 0)
{
gCurrentPinballGame->unkEC -= 1;
gCurrentPinballGame->unkEC--;
}
else
{
@ -42,7 +42,7 @@ void sub_1A0F4(void)
}
else if (gCurrentPinballGame->unkEC != 0)
{
gCurrentPinballGame->unkEC -= 1;
gCurrentPinballGame->unkEC--;
}
else
{

4
src/rom_1A98C.c
View File

@ -43,7 +43,7 @@ void sub_1A98C(void)
void sub_1A9E8(void)
{
if (gCurrentPinballGame->unk26 > 0)
gCurrentPinballGame->unk26 -= 1;
gCurrentPinballGame->unk26--;
switch (gCurrentPinballGame->unk25)
{
@ -355,7 +355,7 @@ void sub_1AFD4(void)
{
gCurrentPinballGame->ball->unk0 = 1;
gCurrentPinballGame->unk1F = 1;
gCurrentPinballGame->unk28 = gCurrentPinballGame->unk28 - 1;
gCurrentPinballGame->unk28--;
gCurrentPinballGame->ball->velocity.x = 0;
gCurrentPinballGame->ball->velocity.y = 0;
gCurrentPinballGame->ball->positionQ0.x = 0xDC;

2
src/rom_27E08.c
View File

@ -3522,7 +3522,7 @@ void sub_27E08(void)
{
gCurrentPinballGame->unk724 = 4200;
}
gCurrentPinballGame->unk29A += 1;
gCurrentPinballGame->unk29A++;
DmaCopy16(3, gUnknown_081C0064, (void *)PLTT + 0x180, 0x20);

2
src/rom_31BE8.c
View File

@ -55,7 +55,7 @@ void sub_31498(void)
{
if (gCurrentPinballGame->unk345 < 3)
{
gCurrentPinballGame->unk345 = gCurrentPinballGame->unk345 + 1;
gCurrentPinballGame->unk345++;
gCurrentPinballGame->unk3C = 20000;
m4aSongNumStart(SE_UNKNOWN_0xDE);
}

2
src/rom_4F258.c
View File

@ -24,7 +24,7 @@ extern struct SongHeader gUnknown_0869F664;
void sub_4E814(void)
{
gCurrentPinballGame->unk734 = (gCurrentPinballGame->unk70C % 40) / 20;
gCurrentPinballGame->unk70C = gCurrentPinballGame->unk70C + 1;
gCurrentPinballGame->unk70C++;
sub_4EA44();
if (gCurrentPinballGame->unk6A < 232)
{

4
src/rom_50AD4.c
View File

@ -33,12 +33,12 @@ void sub_4F2B8(void)
{
if (gCurrentPinballGame->unk72C < gUnknown_086B08C4[gCurrentPinballGame->unk72B - 1])
{
gCurrentPinballGame->unk72C = gCurrentPinballGame->unk72C + 1;
gCurrentPinballGame->unk72C++;
}
else
{
gCurrentPinballGame->unk72C = 0;
gCurrentPinballGame->unk72B = gCurrentPinballGame->unk72B - 1;
gCurrentPinballGame->unk72B--;
}
}
}