pret/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-10-06 07:45:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Trailing whitespace

Browse Source
This commit is contained in:
Eduardo Quezada
2025-02-02 22:20:04 -03:00
committed by Marcus Huderle
parent 7e1ad27f38
commit e85aba751f
13 changed files with 109 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+1 -1
View File
@@ -35,7 +35,7 @@ jobs:
- name: Build pokepinballrs
run: make -j$(nproc)\
- name: Webhook
if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
env:
data/mon_locations.inc
+2 -2
View File
@@ -140,7 +140,7 @@ gWildMonLocations:: @ 0x08055A84
.2byte SPECIES_NONE
@ granite cave sapphire two arrows
.2byte SPECIES_LUNATONE
.2byte SPECIES_LUNATONE
.2byte SPECIES_MAKUHITA
.2byte SPECIES_GRIMER
.2byte SPECIES_SHELGON
@@ -211,7 +211,7 @@ gWildMonLocations:: @ 0x08055A84
@ lake three arrows
.2byte SPECIES_MUDKIP
.2byte SPECIES_MARILL
.2byte SPECIES_MARILL
.2byte SPECIES_LOMBRE
.2byte SPECIES_BARBOACH
.2byte SPECIES_CORPHISH
src/ereader.c
+9 -9
View File
@@ -237,7 +237,7 @@ void sub_304C(void)
}
void sub_3208(void)
{
{
gUnknown_0201A44C++;
if (8 < gUnknown_0201A44C) {
gUnknown_0201A44C = 0;
@@ -418,7 +418,7 @@ void sub_377C(void)
{
s32 iVar2;
s32 iVar4;
for(iVar2 = 0; iVar2 < 3; iVar2++)
{
for(iVar4 = 0; iVar4 < 0x18; iVar4++)
@@ -461,7 +461,7 @@ void sub_38A0(s8 arg0, u16 arg1)
s16 GetEReaderCardIndex(void)
{
s32 uVar1;
if (gUnknown_0202BEEC == 0x1f52)
{
return 0;
@@ -495,7 +495,7 @@ void sub_394C(void)
s32 iVar7;
const struct SpriteSet *puVar8;
struct OamDataSimple *test2;
puVar9 = &gUnknown_0200B3B8[gUnknown_0202A58C];
puVar5 = &gUnknown_0200B3B8[gUnknown_0202BEC0];
puVar9->available = gUnknown_0202C584;
@@ -546,7 +546,7 @@ void sub_3AB4(void) {
s32 iVar7;
const struct SpriteSet *puVar8;
struct OamDataSimple *test2;
puVar9 = &gUnknown_0200B3B8[gUnknown_0202A58C];
puVar5 = &gUnknown_0200B3B8[gUnknown_0202BEC0];
puVar9->available = gUnknown_0202C584;
@@ -595,7 +595,7 @@ void sub_3C1C(void)
{
s32 i;
s32 j;
gUnknown_0202A564 = 0;
gUnknown_02019C20 = 0;
gUnknown_0202ADE8 = 0;
@@ -617,7 +617,7 @@ void sub_3C1C(void)
s32 sub_3C78(void)
{
s32 i;
if (gUnknown_02019C20)
{
gUnknown_0202C5F0[0] = 0xDFDF;
@@ -648,7 +648,7 @@ s16 sub_3CD8(void)
if (!(JOY_NEW(A_BUTTON)))
{
// TODO I can buy goto end being the actual label, but there is no way they wrote this segment like this
// TODO I can buy goto end being the actual label, but there is no way they wrote this segment like this
goto fakematch;
}
if (gUnknown_0202A564 == 0)
@@ -662,7 +662,7 @@ s16 sub_3CD8(void)
goto end;
}
}
if (gUnknown_02019C20 == 0)
{
if (gUnknown_0201A4D0[0][0] == 0xFEDC)
src/gbplayer.c
+5 -5
View File
@@ -585,7 +585,7 @@ u32 sub_1668(u32 arg1, u32 arg2)
u8 uVar1;
u32 uVar2;
u32 uVar3;
uVar2 = (arg1 & 0xFFFFFF) << 4;
arg2 = (arg2 << 0x1C);
uVar2 |= arg2;
@@ -608,7 +608,7 @@ u32 sub_16A0(u8 param_1)
uVar3 = gUnknown_02002818 >> 0x1C;
cVar1 = sub_170C();
if (cVar1) return 1;
switch (param_1)
{
@@ -650,7 +650,7 @@ u32 sub_170C(void)
++uVar2; --uVar2;
uVar3 = gUnknown_02002818 % 16;
uVar4 = uVar2 >> 0x18;
for (uVar1 = 6; uVar1 != 0; uVar1--)
{
uVar5 = uVar2 >> (4 * (uVar1 - 1));
@@ -673,7 +673,7 @@ u32 sub_1748(u8 param_1)
u32 uVar1;
u32 uVar2;
u32 param_3;
switch (param_1)
{
case 2:
@@ -710,7 +710,7 @@ u32 sub_1748(u8 param_1)
u32 sub_17D8(u32 arg1)
{
u32 retVal;
switch (gUnknown_02019BEC)
{
case 0:
src/high_scores.c
+2 -2
View File
@@ -996,8 +996,8 @@ void sub_DF68(void)
void sub_E0C4(void)
{
sub_02B4();
m4aMPlayAllStop();
sub_0D10();
m4aMPlayAllStop();
sub_0D10();
SetMainGameState(gUnknown_02002858.unk24);
}
src/intro.c
+15 -15
View File
@@ -193,7 +193,7 @@ void sub_9498(void) {
REG_DISPCNT |= (DISPCNT_BG2_ON);
REG_BG3CNT = 0x1f03;
REG_DISPCNT |= (DISPCNT_BG3_ON);
DmaCopy16(3, gUnknown_080B9CC0, 0x0600d000, BG_SCREEN_SIZE);
DmaCopy16(3, gUnknown_080BC4C0, 0x0600d800, 0x1000);
DmaCopy16(3, gUnknown_080BB4C0, 0x0600e800 , 0x1000);
@@ -266,10 +266,10 @@ void sub_96A8(void)
void sub_978C(void)
{
sub_9CB8();
if (gUnknown_0201A450[0].unk8 == 0x24) {
gUnknown_0201A450[0].unkA++;
if (0x1b < gUnknown_0201A450[0].unkA) {
gUnknown_0201A450[0].unkA = 0;
gUnknown_0202A578 = 0;
@@ -278,12 +278,12 @@ void sub_978C(void)
}
else {
gUnknown_0201A450[0].unkA++;
if (1 < gUnknown_0201A450[0].unkA) {
gUnknown_0201A450[0].unkA = 0;
gUnknown_0201A450[0].unk8++;
}
if (gUnknown_0202BF10 >= gUnknown_086A77A8[gUnknown_0202C5A8][gUnknown_0202A578][1]) {
m4aSongNumStart(gUnknown_086A77A8[gUnknown_0202C5A8][gUnknown_0202A578][0]);
gUnknown_0202A578 = gUnknown_0202A578 + 1;
@@ -415,7 +415,7 @@ void sub_999C(void)
gUnknown_0202C790++;
}
}
sub_9E90();
}
@@ -602,7 +602,7 @@ void sub_9E90(void)
puVar1->baseX = gUnknown_0201A450[1].unk0;
puVar1->baseY = gUnknown_0201A450[1].unk2;
p = &gUnknown_086A769C[gUnknown_0201A450[1].unk8]->count;
for (i = 0;
i < *p;
i++)
@@ -831,7 +831,7 @@ void sub_A628(void)
{
gUnknown_0202ADA0[0x0] = 0x2C;
gUnknown_0202ADA0[0x1] = 0xFF8E;
gUnknown_0201A450[0].unk0 = 0xFFD4;
gUnknown_0201A450[0].unk2 = 0x72;
@@ -989,7 +989,7 @@ void sub_A968(void)
DmaCopy16(3, gUnknown_080E1F40, (void *) 0x6000000, 0x4000);
DmaCopy16(3, gUnknown_080E1540, PLTT, 0x60);
gMain.unk16 = REG_DISPCNT;
sub_AAA8();
gMain.unk2E8[0].unk0 = gUnknown_0202ADA0[0x0];
gMain.unk2E8[0].unk2 = gUnknown_0202ADA0[0x1];
@@ -1190,7 +1190,7 @@ void sub_AE74(void)
gMain.unk2E8[1].unk2 = gUnknown_0202ADA0[0x7];
gMain.unk2E8[2].unk0 = gUnknown_0202ADA0[0xC];
gMain.unk2E8[2].unk2 = gUnknown_0202ADA0[0xD];
gUnknown_0202ADA0[0x10]++;
if (9 < gUnknown_0202ADA0[0x10])
{
@@ -1262,7 +1262,7 @@ void sub_B0E8(void)
struct SpriteGroup *mainSg0;
struct SpriteGroup *mainSg2;
int i;
gMain.blendControl = 0xF10;
gMain.blendAlpha = BLDALPHA_BLEND(8, 8);
REG_BLDCNT = gMain.blendControl;
@@ -1505,7 +1505,7 @@ void sub_B7A0(void)
ClearSprites();
DmaFill32(3, 0, OAM, 0x400);
DmaFill16(3, 0, OBJ_VRAM0, 0x5000);
sub_10480();
sub_10544();
gUnknown_0202C790++;
@@ -1532,7 +1532,7 @@ void sub_B7F8(void)
spriteGroups[3]->available = gUnknown_0201A450[3].unkC;
spriteGroups[4]->available = gUnknown_0201A450[4].unkC;
spriteGroups[5]->available = gUnknown_0201A450[5].unkC;
LoadSpriteSets(gUnknown_086A7A78, 0x12, &gMain.spriteGroups[0]);
for (i = 0; i < 6; i++)
{
@@ -2118,7 +2118,7 @@ void sub_BED0(void)
void sub_C018(void)
{
int remainder;
gUnknown_0202ADA0[0x12]--;
gUnknown_0202ADA0[0x13]--;
@@ -2304,7 +2304,7 @@ void sub_C3D0(void)
void sub_C450(void)
{
sub_C4F0();
if ((gUnknown_0202BF10 % 2) == 0)
{
gUnknown_0201A450[1].unk0++;
src/link.c
+5 -5
View File
@@ -136,7 +136,7 @@ static void EnableSerial(void)
REG_IME = 0;
REG_IE |= INTR_FLAG_SERIAL;
REG_IME = gLinkSavedIme;
REG_SIOMLT_SEND = 0; // TODO correct register name?
*((u64 *) REG_ADDR_SIOMULTI0) = 0;
CpuFill32(0, &gLink, sizeof(gLink));
@@ -172,7 +172,7 @@ static void sub_19CC(void) // TODO
{
CpuSet(gOamBuffer, (void *) 0x7000000, 0x200);
REG_DISPCNT = gMain.unk16;
REG_BG0HOFS = gMain.unk2E8[0].unk0;
REG_BG0VOFS = gMain.unk2E8[0].unk2;
REG_BG1HOFS = gMain.unk2E8[1].unk0;
@@ -320,7 +320,7 @@ static void CheckMasterOrSlave(void)
{
u32 terminals;
terminals = *(vu32 *)REG_ADDR_SIOCNT & (SIO_MULTI_SD | SIO_MULTI_SI);
if (terminals == SIO_MULTI_SD && gLink.localId == 0)
{
gLink.isMaster = 8;
@@ -349,7 +349,7 @@ static void EnqueueSendCmd(u16 *sendCmd)
gLinkSavedIme = REG_IME;
REG_IME = 0;
if (gLink.sendQueue.count < QUEUE_CAPACITY)
{
offset = gLink.sendQueue.pos + gLink.sendQueue.count;
@@ -546,7 +546,7 @@ static bool8 DoHandshake(void)
gLink.handshakeAsMaster = FALSE;
*(u64 *)gLink.handshakeBuffer = REG_SIOMLT_RECV;
//REG_SIOMLT_RECV = 0;
for (i = 0; i < MAX_LINK_PLAYERS; i++)
{
if ((gLink.handshakeBuffer[i] & ~0x3) == (SLAVE_HANDSHAKE & ~3) || gLink.handshakeBuffer[i] == MASTER_HANDSHAKE)
src/pokedex.c
+30 -34
View File
@@ -50,7 +50,7 @@ void PokedexMain(void)
void LoadPokedexGraphics(void)
{
ResetSomeGraphicsRelatedStuff();
REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_FORCED_BLANK | DISPCNT_OBJ_ON;
REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_16COLOR | BGCNT_SCREENBASE(0) | BGCNT_TXT256x256;
REG_DISPCNT |= DISPCNT_BG1_ON;
@@ -58,9 +58,9 @@ void LoadPokedexGraphics(void)
REG_DISPCNT |= DISPCNT_BG2_ON;
REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3) | BGCNT_16COLOR | BGCNT_SCREENBASE(2) | BGCNT_TXT256x256;
REG_DISPCNT |= DISPCNT_BG3_ON;
gMain.unk16 = REG_DISPCNT;
DmaCopy16(3, gUnknown_08082720, (void *)BG_CHAR_ADDR(1), 0x4400);
DmaCopy16(3, gUnknown_08087B40, (void *)BG_CHAR_ADDR(3), 0x1400);
DmaCopy16(3, gUnknown_08089760, (void *)BG_PLTT, BG_PLTT_SIZE);
@@ -69,7 +69,7 @@ void LoadPokedexGraphics(void)
DmaCopy16(3, gUnknown_08088F60, (void *)BG_SCREEN_ADDR(2), BG_SCREEN_SIZE);
DmaCopy16(3, gUnknown_08089960, (void *)OBJ_PLTT, OBJ_PLTT_SIZE);
DmaCopy16(3, gUnknown_08089B60, (void *)OBJ_VRAM0, 0x6C20);
sub_3FAC();
sub_6BEC(gUnknown_0202BEB8, gUnknown_0201A514);
sub_681C(gUnknown_0202ADE0);
@@ -78,26 +78,26 @@ void LoadPokedexGraphics(void)
sub_6F78(gUnknown_0202ADE0);
sub_8974(gUnknown_0202ADE0);
sub_8A78(gUnknown_0202ADE0);
gUnknown_02019C40[0x134] = 0x59;
DmaCopy16(3, gUnknown_03005C00, (void *)BG_SCREEN_ADDR(0), BG_SCREEN_SIZE);
DmaCopy16(3, gUnknown_02019C40, (void *)BG_SCREEN_ADDR(1), BG_SCREEN_SIZE);
sub_51FC();
sub_0CBC();
sub_024C();
// Must be `= 1` to match, cannot be `++`
gMain.subState = 1;
m4aSongNumStart(MUS_POKEDEX);
}
void sub_3FAC(void)
{
s32 i;
gUnknown_0202ADE0 = 0;
gUnknown_0202C5B0 = 0;
gUnknown_0201A448 = 0;
@@ -113,10 +113,10 @@ void sub_3FAC(void)
gUnknown_0202BEF4 = 0;
gUnknown_0202A588 = 1;
gUnknown_0202A55C = 1;
gUnknown_0202A568[0] = 0;
gUnknown_0202A568[1] = 0;
gUnknown_0202BF14 = 0;
gUnknown_0202A558 = 0;
gUnknown_0202BEE0 = 0;
@@ -259,13 +259,9 @@ void sub_4150(void)
}
if (sub_8A78(gUnknown_0202ADE0) == 1)
{
gUnknown_0202A588 = 1;
}
else
{
gUnknown_0202A588 = 0;
}
gUnknown_0202A55C = 1;
gUnknown_0202A568[0] = 0;
@@ -340,7 +336,7 @@ void sub_4428(void)
gUnknown_02019C40[0x20*(gUnknown_0202A558 + 9) + i] = gUnknown_0805C780[i];
gUnknown_02019C40[0x20*(gUnknown_0202A558 + 10) + i] = gUnknown_0805C7C0[i];
}
gUnknown_0202A558++;
gUnknown_02019C40[0x134] = 0x59;
DmaCopy16(3, gUnknown_03005C00, (void *)BG_SCREEN_ADDR(0), BG_SCREEN_SIZE);
@@ -364,13 +360,13 @@ void sub_4428(void)
sub_5291C(gSpeciesInfo[gUnknown_0202ADE0].mainSeriesIndexNumber, 0, 0x7F, 10);
gMain.subState = 5;
}
}
void sub_45A4(void)
{
u16 var0;
if (gUnknown_0202C5E8 < 0x51)
{
gUnknown_0202C5E8++;
@@ -407,7 +403,7 @@ void sub_45A4(void)
gUnknown_02019C28 = gUnknown_0202C794;
}
}
if (JOY_NEW(A_BUTTON))
{
if (gUnknown_0202ADE0 < BONUS_SPECIES_START)
@@ -505,7 +501,7 @@ void sub_45A4(void)
void sub_4860(void)
{
s32 i;
for (i = 0; i < 0x20; i++)
{
gUnknown_02019C40[0x20 * (0x11 - gUnknown_0202A558) + i] = gUnknown_0805C7C0[i];
@@ -549,7 +545,7 @@ void sub_49A8(void)
void sub_49D0(void)
{
s16 var0;
sub_599C();
if (JOY_NEW(B_BUTTON))
@@ -607,7 +603,7 @@ void sub_49D0(void)
void sub_4B10(void)
{
gUnknown_0201A444++;
if (2 < gUnknown_0201A444) {
gUnknown_0201A444 = 0;
gMain.subState = 6;
@@ -617,7 +613,7 @@ void sub_4B10(void)
void sub_4B34(void)
{
s32 iVar1;
sub_599C();
gUnknown_0201B120++;
@@ -628,7 +624,7 @@ void sub_4B34(void)
gUnknown_0202BEFC = 0;
gUnknown_0202BF04 = 1;
gUnknown_0202A588 = 1;
sub_2568();
DisableSerial();
@@ -636,7 +632,7 @@ void sub_4B34(void)
{
gUnknown_0202A390[iVar1] = gUnknown_0202A1C0[iVar1];
}
sub_02B4();
m4aMPlayAllStop();
sub_0D10();
@@ -647,7 +643,7 @@ void sub_4B34(void)
void sub_4BB4(void)
{
s32 index;
sub_599C();
switch(gUnknown_0201B120)
{
@@ -663,7 +659,7 @@ void sub_4BB4(void)
gUnknown_0201B120 = 0;
gUnknown_0202BEC4 = 0;
gUnknown_0202BEFC = 0;
gUnknown_0202BF04 = 1;
gUnknown_0202BF04 = 1;
gUnknown_0202A588 = 1;
for(index = 0; index < 0xE1; index++)
{
@@ -686,7 +682,7 @@ void sub_4BB4(void)
void sub_4C80(void)
{
s32 i;
sub_51FC();
if (JOY_NEW(A_BUTTON))
@@ -721,8 +717,8 @@ void sub_4C80(void)
gUnknown_0202BF04 = 1;
gUnknown_0202A588 = 1;
gMain.subState = 1;
}
}
@@ -762,7 +758,7 @@ static void sub_4D74(void)
gUnknown_0202ADE0--;
m4aSongNumStart(SE_SELECT);
}
gUnknown_0202C58C = 9;
}
else
@@ -770,7 +766,7 @@ static void sub_4D74(void)
m4aSongNumStart(SE_SELECT);
gUnknown_0202A57C--;
gUnknown_0202ADE0--;
gUnknown_0202C58C = 9;
}
@@ -926,7 +922,7 @@ u8 sub_5134(void)
{
if (gUnknown_086A61BC[gUnknown_0202ADE0] < 100)
return 1;
return 2;
}
src/pokedex_end.c
+5 -9
View File
@@ -14,7 +14,7 @@ void sub_8974(s32 arg0)
s32 quotient;
s16 remainder;
s16 var1;
if (var0 != -1)
{
if (var0 < 100)
@@ -23,7 +23,7 @@ void sub_8974(s32 arg0)
quotient = var0 / 5;
remainder = var0 % 5;
var1 = (s16) var0;
sub_10708(___ + remainder * 0xD80, (void *)(OBJ_VRAM0 + 0x3800), 0x6C, 1);
}
else
@@ -32,7 +32,7 @@ void sub_8974(s32 arg0)
quotient = (var0 - 100) / 6;
remainder = (var0 - 100) / 6;
var1 = (s16) var0;
sub_10708((void *)(gMonHatchSpriteGroupGfx[var1] + remainder * 0x10E0), (void *)(OBJ_VRAM0 + 0x4800), 0x87, 1);
}
}
@@ -41,16 +41,12 @@ void sub_8974(s32 arg0)
s16 sub_8A78(s32 arg0)
{
s16 var0 = (s16) arg0;
if ((gUnknown_0202A1C0[var0] == 4) && (gUnknown_086A61BC[var0] != -1))
{
gUnknown_0202A588 = 1;
}
else
{
gUnknown_0202A588 = 0;
}
return gUnknown_0202A588;
}
src/rom_1068C.c
+1 -1
View File
@@ -111,7 +111,7 @@ void sub_10860(void (*func)(void))
void ClearSomeArray(void)
{
int i;
for (i = 0; i < HIGH_SCORE_NAME_LENGTH; i++)
gUnknown_0201A500[i] = 0;
}
src/rom_2414.c
+2 -2
View File
@@ -17,12 +17,12 @@ void sub_24DC(void)
{
REG_RCNT = 0;
REG_SIOCNT = 0;
REG_SIOMLT_SEND = 0;
REG_SIOMULTI0 = 0;
REG_SIOMLT_SEND = 0;
REG_SIOMULTI0 = 0;
REG_SIOMULTI0 = 0;
REG_SIOMULTI1 = 0;
REG_SIOMULTI2 = 0;
src/rom_31F6C.c
+31 -31
View File
@@ -62,7 +62,7 @@ void sub_31F6C(void)
if (gCurrentPinballGame->caughtMonCount == 0)
weight = 0;
break;
case SPECIES_CLAMPERL:
weight = gCommonAndEggWeights[gMain_saveData.pokedexFlags[SPECIES_CLAMPERL]];
evolutionWeight = gCommonAndEggWeights[gMain_saveData.pokedexFlags[SPECIES_HUNTAIL]];
@@ -222,7 +222,7 @@ void sub_32484(void)
gCurrentPinballGame->unk12E = 0;
for (i = 0; i < 0x19; i++)
{
{
currentSpecies = gUnknown_086A4A38[gMain.selectedField][i];
if (currentSpecies == SPECIES_ODDISH)
@@ -250,7 +250,7 @@ void sub_32484(void)
break;
}
}
currentSpecies = gUnknown_086A4A38[gMain.selectedField][i];
if (gCurrentPinballGame->caughtMonCount == 0)
{
@@ -275,16 +275,16 @@ void sub_325E0(void)
{
s16 i;
u32 rand;
rand = GetTimeAdjustedRandom();
if (gMain.eReaderBonus[EREADER_ENCOUNTER_RATE_UP_CARD])
rand %= 100;
else
rand %= 50;
if (gCurrentPinballGame->unk59E == SPECIES_PICHU)
rand = 1;
if ((rand == 0 && gCurrentPinballGame->caughtMonCount >= 5) || gCurrentPinballGame->forcePichuEgg)
{
gCurrentPinballGame->unk598 = SPECIES_PICHU;
@@ -293,12 +293,12 @@ void sub_325E0(void)
{
rand = GetTimeAdjustedRandom();
rand %= gCurrentPinballGame->unk12E;
for (i = 0; i < 25 && gCurrentPinballGame->unk130[i] <= rand; i++);
gCurrentPinballGame->unk598 = gUnknown_086A4A38[gMain.selectedField][i];
}
gCurrentPinballGame->unk59E = gCurrentPinballGame->unk598;
}
@@ -307,16 +307,16 @@ void sub_326F4(void)
gCurrentPinballGame->catchModeArrows = 2;
gCurrentPinballGame->unk1E5 = 0;
gCurrentPinballGame->unk1E6 = 1;
sub_1F2A4();
sub_21B0C();
sub_1F59C();
sub_300D8();
sub_30178();
gCurrentPinballGame->unk1D8 = 0x100;
gCurrentPinballGame->unk1DA = 0x100;
sub_30480();
sub_304C8();
sub_31144();
@@ -329,12 +329,12 @@ void sub_3276C(void)
{
sub_19B90();
sub_327C0();
if (!gMain.unkF)
sub_328C8();
sub_32DF8();
if (gCurrentPinballGame->unk29C)
{
gCurrentPinballGame->unk29C--;
@@ -346,17 +346,17 @@ void sub_3276C(void)
void sub_327C0(void)
{
s32 temp;
sub_4F814();
sub_1A0F4();
sub_2CA9C();
if (gCurrentPinballGame->unk68 < 0x5a)
{
sub_304C8();
sub_31498();
}
if (gCurrentPinballGame->unk13 < 3)
{
if ((gCurrentPinballGame->unk344 & 0xFFFF00) == 0x300)
@@ -372,7 +372,7 @@ void sub_327C0(void)
{
gCurrentPinballGame->unk728 = 0;
}
if (gCurrentPinballGame->unk68 < 0x96)
{
sub_2E6AC();
@@ -391,28 +391,28 @@ void sub_327C0(void)
{
sub_1F59C();
}
sub_308DC();
if (0x76 < gCurrentPinballGame->unk68)
{
sub_2F504();
sub_30EB4();
}
sub_2CE80();
if (0xA8 < gCurrentPinballGame->unk68)
sub_2D104();
sub_203CC();
sub_21B0C();
sub_1D128();
sub_31B30();
if (gCurrentPinballGame->unk194)
sub_225F0();
sub_472E4();
}
@@ -421,14 +421,14 @@ void sub_328C8(void)
sub_300D8();
sub_32968();
sub_1F2A4();
if (gCurrentPinballGame->unk600)
gCurrentPinballGame->unk600--;
sub_2F26C();
sub_2E67C();
sub_31144();
if (!(gMain.unkF & 0x20))
sub_2F79C();
}
@@ -449,7 +449,7 @@ void sub_32914(void)
sub_1C560();
break;
}
gCurrentPinballGame->unk26 = 0x3C;
}
}
@@ -458,7 +458,7 @@ void sub_32968(void)
{
if (gCurrentPinballGame->unk26)
gCurrentPinballGame->unk26--;
switch (gCurrentPinballGame->unk25)
{
case 1:
src/util.c
+1 -1
View File
@@ -209,7 +209,7 @@ u8 *sub_06CC(int arg0, u8 *arg1, int arg2, s16 arg3)
{
if (arg2 < 2)
break;
arg2--;
if (arg0 < sub_0780(10, arg2))
{