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

Incorporated fixes from upstream

Browse source
This commit is contained in:
Eduardo Quezada 2023-02-16 18:20:54 -03:00
parent 7ddebb6671
commit a60b179bcb
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/frontier_pass.c
View file

@ -35,7 +35,7 @@
// after gFrontierPassBg_Pal (by default, gFrontierPassBg_Gfx) as a palette. // after gFrontierPassBg_Pal (by default, gFrontierPassBg_Gfx) as a palette.
// Nothing uses these colors (except the Trainer Card, which correctly writes them) // Nothing uses these colors (except the Trainer Card, which correctly writes them)
// so in practice this bug has no effect on the game. // so in practice this bug has no effect on the game.
#ifdef BUGFIX_ #ifdef BUGFIX
#define NUM_BG_PAL_SLOTS 8 #define NUM_BG_PAL_SLOTS 8
#else #else
#define NUM_BG_PAL_SLOTS 13 #define NUM_BG_PAL_SLOTS 13

2
src/wireless_communication_status_screen.c
View file

@ -392,7 +392,7 @@ static u32 CountPlayersInGroupAndGetActivity(struct RfuPlayer * player, u32 * gr
for (i = 0; i < ARRAY_COUNT(sActivityGroupInfo); i++) for (i = 0; i < ARRAY_COUNT(sActivityGroupInfo); i++)
{ {
#ifdef UBFIX_ #ifdef UBFIX
// GROUPTYPE_NONE is 0xFF, and shouldn't be used as an index into groupCounts. // GROUPTYPE_NONE is 0xFF, and shouldn't be used as an index into groupCounts.
// In theory the only activity with this group type (ACTIVITY_SEARCH) wouldn't // In theory the only activity with this group type (ACTIVITY_SEARCH) wouldn't
// satisfy the condition below, but not necessarily. // satisfy the condition below, but not necessarily.