Incorporated fixes from upstream

src/frontier_pass.c

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

src/wireless_communication_status_screen.c

@@ -392,7 +392,7 @@ static u32 CountPlayersInGroupAndGetActivity(struct RfuPlayer * player, u32 * gr
 
     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.
         // In theory the only activity with this group type (ACTIVITY_SEARCH) wouldn't
         // satisfy the condition below, but not necessarily.