atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change array count of pointer value to array count of the first element

Browse source
This commit is contained in:
PokeCodec 2020-08-30 10:24:51 -04:00
parent 70e2b28c80
commit 5504ceada3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gflib/bg.c
View file

@ -34,7 +34,7 @@ struct BgConfig2
u32 unk_3:18; u32 unk_3:18;
void* tilemap; void* tilemap;
s32 bg_x; // Maybe unsigned, but game treats it as if it is signed a lot s32 bg_x; // Maybe unsigned, but game treats it as if it is signed a LOT.
s32 bg_y; // Same for this variable. s32 bg_y; // Same for this variable.
}; };

6
src/wireless_communication_status_screen.c
View file

@ -237,7 +237,7 @@ static void PrintHeaderTexts(void)
FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(1, PIXEL_FILL(0));
FillWindowPixelBuffer(2, PIXEL_FILL(0)); FillWindowPixelBuffer(2, PIXEL_FILL(0));
WCSS_AddTextPrinterParameterized(0, 1, sHeaderTexts[0], GetStringCenterAlignXOffset(1, sHeaderTexts[0], 0xC0), 6, COLORMODE_GREEN); WCSS_AddTextPrinterParameterized(0, 1, sHeaderTexts[0], GetStringCenterAlignXOffset(1, sHeaderTexts[0], 0xC0), 6, COLORMODE_GREEN);
for (i = 0; i < NUM_GROUPTYPES; i++) for (i = 0; i < (int)ARRAY_COUNT(sHeaderTexts[0]) - 1; i++)
{ {
WCSS_AddTextPrinterParameterized(1, 1, sHeaderTexts[i + 1], 0, 30 * i + 8, COLORMODE_WHITE_LGRAY); WCSS_AddTextPrinterParameterized(1, 1, sHeaderTexts[i + 1], 0, 30 * i + 8, COLORMODE_WHITE_LGRAY);
} }
@ -362,12 +362,12 @@ static u32 CountPlayersInGroupAndGetActivity(struct UnkStruct_x20 * unk20, u32 *
{ {
if (group_players(i) == 0) if (group_players(i) == 0)
{ {
k = 0; k = 0; //Should just be 1 without the increment after the loop ends but that doesn't match.
for (j = 0; j < RFU_CHILD_MAX; j++) for (j = 0; j < RFU_CHILD_MAX; j++)
{ {
if (unk20->gname_uname.gname.child_sprite_gender[j] != 0) k++; if (unk20->gname_uname.gname.child_sprite_gender[j] != 0) k++;
} }
k++; k++; //See above comment.
groupCounts[group_type(i)] += k; groupCounts[group_type(i)] += k;
} }
else else