Address review comments

2020-02-10 11:11:25 -05:00
parent 78caeff45b
commit c0373e9e93
8 changed files with 329 additions and 319 deletions
@@ -145,10 +145,10 @@ u16 rfu_initializeAPI(u32 *APIBuffer, u16 buffByteSize, IntrFunc *sioIntrTable_p
            return ERR_RFU_API_BUFF_SIZE;
    }
    gRfuLinkStatus = (void *)APIBuffer + 0;
-    gRfuStatic = (void *)APIBuffer + 0xb4;
-    gRfuFixed = (void *)APIBuffer + 0xdc;
-    gRfuSlotStatusNI[0] = (void *)APIBuffer + 0x1bc;
-    gRfuSlotStatusUNI[0] = (void *)APIBuffer + 0x37c;
+    gRfuStatic = (void *)APIBuffer + 0xb4; // + sizeof(*gRfuLinkStatus)
+    gRfuFixed = (void *)APIBuffer + 0xdc; // + sizeof(*gRfuStatic)
+    gRfuSlotStatusNI[0] = (void *)APIBuffer + 0x1bc; // + sizeof(*gRfuFixed)
+    gRfuSlotStatusUNI[0] = (void *)APIBuffer + 0x37c; // + sizeof(*gRfuSlotStatusNI[0])
    for (i = 1; i < RFU_CHILD_MAX; ++i)
    {
        gRfuSlotStatusNI[i] = &gRfuSlotStatusNI[i - 1][1];
@@ -1995,7 +1995,7 @@ static void rfu_STC_UNI_receive(u8 bm_slot_id, const struct RfuLocalStruct *llsf
            if (UNI_recv->newDataFlag)
            {
                UNI_recv->errorCode = ERR_RECV_UNK;
-                goto _081E2F0E;
+                goto force_tail_merge;
            }
        }
        else
@@ -2010,7 +2010,7 @@ static void rfu_STC_UNI_receive(u8 bm_slot_id, const struct RfuLocalStruct *llsf
        UNI_recv->newDataFlag = 1;
        UNI_recv->state = 0;
    }
-_081E2F0E:
+force_tail_merge:
    if (UNI_recv->errorCode)
        gRfuStatic->recvErrorFlag |= 16 << bm_slot_id;
 }
@@ -115,7 +115,7 @@ u8 rfu_LMAN_establishConnection(u8 parent_child, u16 connect_period, u16 name_ac
    u8 i;
    u16 *serial_list;

-    if (lman.state != LMAN_STATE_READY && (lman.state != LMAN_STATE_WAIT_RECV_CHILD_NAME || parent_child != 1))
+    if (lman.state != LMAN_STATE_READY && (lman.state != LMAN_STATE_WAIT_RECV_CHILD_NAME || parent_child != MODE_PARENT))
    {
        lman.param[0] = 1;
        rfu_LMAN_occureCallback(LMAN_MSG_LMAN_API_ERROR_RETURN, 1);
@@ -143,14 +143,14 @@ u8 rfu_LMAN_establishConnection(u8 parent_child, u16 connect_period, u16 name_ac
    if (parent_child > 1)
    {
        lman.pcswitch_flag = 1;
-        parent_child = 1;
+        parent_child = MODE_PARENT;
        connect_period = 0;
    }
    else
    {
        lman.pcswitch_flag = 0;
    }
-    if (parent_child != 0)
+    if (parent_child != MODE_CHILD)
    {
        lman.state = LMAN_STATE_START_SEARCH_CHILD;
    }
@@ -332,7 +332,7 @@ static bool8 rfu_LMAN_linkWatcher(u16 REQ_commandID)
        if (lman.linkRecovery_enable)
        {
            lman.linkRecovery_start_flag = 1;
-            if (lman.parent_child == 0 && reason == REASON_DISCONNECTED)
+            if (lman.parent_child == MODE_CHILD && reason == REASON_DISCONNECTED)
            {
                lman.linkRecovery_start_flag = 4;
            }
@@ -846,7 +846,7 @@ static void rfu_LMAN_REQ_callback(u16 reqCommandId, u16 reqResult)
                        lman.linkRecoveryTimer.count[i] = 0;
                    }
                }
-                if (lman.parent_child == 0)
+                if (lman.parent_child == MODE_CHILD)
                {
                    lman.state = lman.next_state = LMAN_STATE_READY;
                }
@@ -1145,7 +1145,7 @@ static void rfu_LMAN_CHILD_checkSendChildName2(void)

 static void rfu_LMAN_CHILD_linkRecoveryProcess(void)
 {
-    if (lman.parent_child == 0 && lman.linkRecovery_start_flag == 1)
+    if (lman.parent_child == MODE_CHILD && lman.linkRecovery_start_flag == 1)
    {
        lman.state_bak[0] = lman.state;
        lman.state_bak[1] = lman.next_state;
@@ -892,7 +892,7 @@ void RecordMixTrainerNames(void)
        s32 connectedTrainerRecordIndices[5];
        struct TrainerNameRecord *newRecords = AllocZeroed(20 * sizeof(struct TrainerNameRecord));

-        // Check if we alsendy have a record saved for connected trainers.
+        // Check if we already have a record saved for connected trainers.
        for (i = 0; i < GetLinkPlayerCount(); i++)
        {
            connectedTrainerRecordIndices[i] = -1;
@@ -913,7 +913,7 @@ void RecordMixTrainerNames(void)
            {
                CopyTrainerRecord(&newRecords[nextSpace], (u16)gLinkPlayers[i].trainerId, gLinkPlayers[i].name);

-                // If we alsendy had a record for this trainer, wipe it so that the next step doesn't duplicate it.
+                // If we already had a record for this trainer, wipe it so that the next step doesn't duplicate it.
                if (connectedTrainerRecordIndices[i] >= 0)
                {
                    ZeroName(gSaveBlock1Ptr->trainerNameRecords[connectedTrainerRecordIndices[i]].trainerName);
@@ -44,17 +44,19 @@ struct MEventScreenMgr

 static EWRAM_DATA struct MEventScreenMgr * sMEventScreenData = NULL;

-void sub_8145A98(void);
-void sub_8145D18(u8 whichWindow);
-void sub_8146060(void);
-void sub_81461D8(void);
+static void sub_8145A98(void);
+static void sub_8145D18(u8 whichWindow);
+static void sub_8146060(void);
+static void sub_81461D8(void);

-const u8 gUnknown_8467068[][3] = {
+static const u8 gUnknown_8467068[][3] = {
    {0, 2, 3},
    {0, 1, 2}
 };
-const u8 ALIGNED(4) sTextYCoords[3] = {7, 4, 7};
-const struct WindowTemplate sWindowTemplates[] = {
+
+static const u8 ALIGNED(4) sTextYCoords[3] = {7, 4, 7};
+
+static const struct WindowTemplate sWindowTemplates[] = {
    {
        .bg = 1,
        .tilemapLeft = 1,
@@ -81,38 +83,39 @@ const struct WindowTemplate sWindowTemplates[] = {
        .baseBlock = 0x130}
 };

-const u16 gCard0Pal[] = INCBIN_U16("data/graphics/mevent/pal_46708C.gbapal");
+static const u16 gCard0Pal[] = INCBIN_U16("data/graphics/mevent/pal_46708C.gbapal");
 const u16 gCard1Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670AC.gbapal");
 const u16 gCard2Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670CC.gbapal");
 const u16 gCard3Pal[] = INCBIN_U16("data/graphics/mevent/pal_4670EC.gbapal");
 const u16 gCard4Pal[] = INCBIN_U16("data/graphics/mevent/pal_46710C.gbapal");
 const u16 gCard5Pal[] = INCBIN_U16("data/graphics/mevent/pal_46712C.gbapal");
-const u16 gCard6Pal[] = INCBIN_U16("data/graphics/mevent/pal_46714C.gbapal");
-const u16 gCard7Pal[] = INCBIN_U16("data/graphics/mevent/pal_46716C.gbapal");
-const u8 sCard0Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46718C.4bpp.lz");
-const u8 sCard0Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467288.bin.lz");
-const u8 sCard1Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46737C.4bpp.lz");
-const u8 sCard1Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467470.bin.lz");
-const u8 sCard2Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467558.4bpp.lz");
-const u8 sCard2Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46762C.bin.lz");
-const u8 sCard6Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467700.4bpp.lz");
-const u8 sCard6Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467934.bin.lz");
-const u8 sCard7Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467A7C.4bpp.lz");
-const u8 sCard7Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467CAC.bin.lz");
-const u16 gUnknown_8467DF4[] = INCBIN_U16("data/graphics/mevent/pal_467DF4.gbapal");
-const u16 gUnknown_8467E14[] = INCBIN_U16("data/graphics/mevent/pal_467E14.gbapal");
-const u16 gUnknown_8467E34[] = INCBIN_U16("data/graphics/mevent/pal_467E34.gbapal");
-const u16 gUnknown_8467E54[] = INCBIN_U16("data/graphics/mevent/pal_467E54.gbapal");
-const u16 gUnknown_8467E74[] = INCBIN_U16("data/graphics/mevent/pal_467E74.gbapal");
-const u16 gUnknown_8467E94[] = INCBIN_U16("data/graphics/mevent/pal_467E94.gbapal");
-const u16 gUnknown_8467EB4[] = INCBIN_U16("data/graphics/mevent/pal_467EB4.gbapal");
-const u16 gUnknown_8467ED4[] = INCBIN_U16("data/graphics/mevent/pal_467ED4.gbapal");
-const u32 gUnknown_8467EF4[] = INCBIN_U32("data/graphics/mevent/gfx_467EF4.4bpp.lz");
+static const u16 gCard6Pal[] = INCBIN_U16("data/graphics/mevent/pal_46714C.gbapal");
+static const u16 gCard7Pal[] = INCBIN_U16("data/graphics/mevent/pal_46716C.gbapal");
+static const u8 sCard0Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46718C.4bpp.lz");
+static const u8 sCard0Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467288.bin.lz");
+static const u8 sCard1Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46737C.4bpp.lz");
+static const u8 sCard1Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467470.bin.lz");
+static const u8 sCard2Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467558.4bpp.lz");
+static const u8 sCard2Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46762C.bin.lz");
+static const u8 sCard6Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467700.4bpp.lz");
+static const u8 sCard6Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467934.bin.lz");
+static const u8 sCard7Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_467A7C.4bpp.lz");
+static const u8 sCard7Map[] = INCBIN_U8("data/graphics/mevent/tilemap_467CAC.bin.lz");
+static const u16 gUnknown_8467DF4[] = INCBIN_U16("data/graphics/mevent/pal_467DF4.gbapal");
+static const u16 gUnknown_8467E14[] = INCBIN_U16("data/graphics/mevent/pal_467E14.gbapal");
+static const u16 gUnknown_8467E34[] = INCBIN_U16("data/graphics/mevent/pal_467E34.gbapal");
+static const u16 gUnknown_8467E54[] = INCBIN_U16("data/graphics/mevent/pal_467E54.gbapal");
+static const u16 gUnknown_8467E74[] = INCBIN_U16("data/graphics/mevent/pal_467E74.gbapal");
+static const u16 gUnknown_8467E94[] = INCBIN_U16("data/graphics/mevent/pal_467E94.gbapal");
+static const u16 gUnknown_8467EB4[] = INCBIN_U16("data/graphics/mevent/pal_467EB4.gbapal");
+static const u16 gUnknown_8467ED4[] = INCBIN_U16("data/graphics/mevent/pal_467ED4.gbapal");
+static const u32 gUnknown_8467EF4[] = INCBIN_U32("data/graphics/mevent/gfx_467EF4.4bpp.lz");

-const struct CompressedSpriteSheet sShadowSpriteSheet = {
+static const struct CompressedSpriteSheet sShadowSpriteSheet = {
    gUnknown_8467EF4, 0x100, 0x8000
 };
-const struct SpritePalette sShadowSpritePalettes[] = {
+
+static const struct SpritePalette sShadowSpritePalettes[] = {
    {gUnknown_8467DF4, 0x8000},
    {gUnknown_8467E14, 0x8000},
    {gUnknown_8467E34, 0x8000},
@@ -122,10 +125,12 @@ const struct SpritePalette sShadowSpritePalettes[] = {
    {gUnknown_8467EB4, 0x8000},
    {gUnknown_8467ED4, 0x8000}
 };
-const struct SpriteTemplate sShadowSpriteTemplate = {
+
+static const struct SpriteTemplate sShadowSpriteTemplate = {
    0x8000, 0x8000, &gOamData_AffineOff_ObjNormal_32x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 };
-const struct UnkStruct_8467FB8 sCardGfxPtrs[8] = {
+
+static const struct UnkStruct_8467FB8 sCardGfxPtrs[8] = {
    {1, 0, 0, 0, sCard0Gfx, sCard0Map, gCard0Pal},
    {1, 0, 0, 1, sCard1Gfx, sCard1Map, gCard1Pal},
    {1, 0, 0, 2, sCard2Gfx, sCard2Map, gCard2Pal},
@@ -172,7 +177,7 @@ s32 FadeToWonderCardMenu(void)
    switch(sMEventScreenData->state)
    {
        case 0:
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
            break;
        case 1:
            if (UpdatePaletteFade())
@@ -216,7 +221,7 @@ s32 FadeToWonderCardMenu(void)
            ShowBg(2);
            gPaletteFade.bufferTransferDisabled = FALSE;
            sub_8146060();
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
            UpdatePaletteFade();
            break;
        default:
@@ -236,7 +241,7 @@ s32 FadeOutFromWonderCard(bool32 flag)
    switch (sMEventScreenData->state)
    {
        case 0:
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
            break;
        case 1:
            if (UpdatePaletteFade())
@@ -266,7 +271,7 @@ s32 FadeOutFromWonderCard(bool32 flag)
            break;
        case 6:
            CopyBgTilemapBufferToVram(0);
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
            break;
        default:
            if (UpdatePaletteFade())
@@ -278,7 +283,7 @@ s32 FadeOutFromWonderCard(bool32 flag)
    return 0;
 }

-void sub_8145A98(void)
+static void sub_8145A98(void)
 {
    u16 i = 0;
    u16 r6;
@@ -346,7 +351,7 @@ void sub_8145A98(void)
    }
 }

-void sub_8145D18(u8 whichWindow)
+static void sub_8145D18(u8 whichWindow)
 {
    s8 sp0C = 0;
    s32 windowId = sMEventScreenData->windowIds[whichWindow];
@@ -401,7 +406,7 @@ void sub_8145D18(u8 whichWindow)
    CopyWindowToVram(windowId, 3);
 }

-void sub_8146060(void)
+static void sub_8146060(void)
 {
    u8 r7 = 0;
    sMEventScreenData->monIconId = 0xFF;
@@ -428,7 +433,7 @@ void sub_8146060(void)
    }
 }

-void sub_81461D8(void)
+static void sub_81461D8(void)
 {
    u8 r6 = 0;
    if (sMEventScreenData->monIconId != 0xFF)
@@ -28,40 +28,40 @@ struct UnkStruct_203F3CC
    /*03a4*/ u8 buffer_03A4[0x1000];
 };

-EWRAM_DATA struct UnkStruct_203F3CC * sWork = NULL;
+static EWRAM_DATA struct UnkStruct_203F3CC * sWork = NULL;

-void sub_8146980(void);
-void sub_8146A30(void);
-void sub_8146B58(void);
+static void sub_8146980(void);
+static void sub_8146A30(void);
+static void sub_8146B58(void);

-const u8 sTextPals[][3] = {
+static const u8 sTextPals[][3] = {
    {0, 2, 3},
    {0, 1, 2}
 };
-const struct WindowTemplate gUnknown_8468040[] = {
+static const struct WindowTemplate gUnknown_8468040[] = {
    {0, 1, 0, 28,  3, 15, 0x000},
    {2, 1, 3, 28, 20, 15, 0x000}
 };
-const struct ScrollArrowsTemplate sScrollArrowsTemplate = {
+static const struct ScrollArrowsTemplate sScrollArrowsTemplate = {
    0x02, 0xe8, 0x18, 0x03, 0xe8, 0x98,
    0x0000, 0x0002, 0x1000, 0x1000, 0x0,
 };

-const u16 sNews1Pal[] = INCBIN_U16("data/graphics/mevent/pal_468060.gbapal");
-const u16 sNews6Pal[] = INCBIN_U16("data/graphics/mevent/pal_468080.gbapal");
-const u16 sNews7Pal[] = INCBIN_U16("data/graphics/mevent/pal_4680A0.gbapal");
-const u8 sNews0Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_4680C0.4bpp.lz");
-const u8 sNews0Map[] = INCBIN_U8("data/graphics/mevent/tilemap_468140.bin.lz");
-const u8 sNews1Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46821C.4bpp.lz");
-const u8 sNews1Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46824C.bin.lz");
-const u8 sNews2Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46830C.4bpp.lz");
-const u8 sNews2Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46837C.bin.lz");
-const u8 sNews6Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_468448.4bpp.lz");
-const u8 sNews6Map[] = INCBIN_U8("data/graphics/mevent/tilemap_4684D8.bin.lz");
-const u8 sNews7Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_4685B4.4bpp.lz");
-const u8 sNews7Map[] = INCBIN_U8("data/graphics/mevent/tilemap_468644.bin.lz");
+static const u16 sNews1Pal[] = INCBIN_U16("data/graphics/mevent/pal_468060.gbapal");
+static const u16 sNews6Pal[] = INCBIN_U16("data/graphics/mevent/pal_468080.gbapal");
+static const u16 sNews7Pal[] = INCBIN_U16("data/graphics/mevent/pal_4680A0.gbapal");
+static const u8 sNews0Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_4680C0.4bpp.lz");
+static const u8 sNews0Map[] = INCBIN_U8("data/graphics/mevent/tilemap_468140.bin.lz");
+static const u8 sNews1Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46821C.4bpp.lz");
+static const u8 sNews1Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46824C.bin.lz");
+static const u8 sNews2Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_46830C.4bpp.lz");
+static const u8 sNews2Map[] = INCBIN_U8("data/graphics/mevent/tilemap_46837C.bin.lz");
+static const u8 sNews6Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_468448.4bpp.lz");
+static const u8 sNews6Map[] = INCBIN_U8("data/graphics/mevent/tilemap_4684D8.bin.lz");
+static const u8 sNews7Gfx[] = INCBIN_U8("data/graphics/mevent/gfx_4685B4.4bpp.lz");
+static const u8 sNews7Map[] = INCBIN_U8("data/graphics/mevent/tilemap_468644.bin.lz");

-const struct UnkStruct_8467FB8 sBgSpecs[] = {
+static const struct UnkStruct_8467FB8 sBgSpecs[] = {
    {1, 0, 0, 0, sNews0Gfx, sNews0Map, sNews1Pal},
    {1, 0, 0, 0, sNews1Gfx, sNews1Map, gCard1Pal},
    {1, 0, 0, 0, sNews2Gfx, sNews2Map, gCard2Pal},
@@ -105,7 +105,7 @@ s32 FadeToWonderNewsMenu(void)
    switch (sWork->state)
    {
    case 0:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
        break;
    case 1:
        if (UpdatePaletteFade())
@@ -114,10 +114,10 @@ s32 FadeToWonderNewsMenu(void)
        ChangeBgY(1, 0, 0);
        ChangeBgY(2, 0, 0);
        ChangeBgY(3, 0, 0);
-        SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
-        SetGpuReg(REG_OFFSET_WIN0V, 0x1A98);
-        SetGpuReg(REG_OFFSET_WININ, 0x1F);
-        SetGpuReg(REG_OFFSET_WINOUT, 0x1B);
+        SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240));
+        SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(26, 152));
+        SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ);
+        SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ);
        SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
        break;
    case 2:
@@ -158,7 +158,7 @@ s32 FadeToWonderNewsMenu(void)
        ShowBg(3);
        gPaletteFade.bufferTransferDisabled = FALSE;
        sWork->menuIndicatorsId = AddScrollIndicatorArrowPair(&sWork->scrollArrowsTemplate, &sWork->scrollOffset);
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
        UpdatePaletteFade();
        break;
    default:
@@ -179,7 +179,7 @@ s32 FadeOutFromWonderNews(bool32 flag)
    switch (sWork->state)
    {
    case 0:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
        break;
    case 1:
        if (UpdatePaletteFade())
@@ -223,7 +223,7 @@ s32 FadeOutFromWonderNews(bool32 flag)
        MG_DrawCheckerboardPattern();
        CopyBgTilemapBufferToVram(0);
        CopyBgTilemapBufferToVram(3);
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
        break;
    default:
        if (UpdatePaletteFade())
@@ -294,7 +294,7 @@ u32 MENews_GetInput(u16 input)
        return 3;
 }

-void sub_8146980(void)
+static void sub_8146980(void)
 {
    u8 i = 0;
    memcpy(sWork->title, sWork->wonderNews.unk_04, 40);
@@ -310,7 +310,7 @@ void sub_8146980(void)
    sWork->scrollArrowsTemplate.fullyDownThreshold = sWork->numMails;
 }

-void sub_8146A30(void)
+static void sub_8146A30(void)
 {
    u8 i = 0;
    s32 x;
@@ -330,7 +330,7 @@ void sub_8146A30(void)
    CopyWindowToVram(sWork->windowIds[1], 3);
 }

-void sub_8146B58(void)
+static void sub_8146B58(void)
 {
    u16 r4 = sWork->unk_01C2_1;
    r4 <<= 8;
@@ -181,7 +181,7 @@ static void CB2_InitWirelessCommunicationScreen(void)
    SetGpuReg(REG_OFFSET_DISPCNT, 0);
    sWCSS = AllocZeroed(sizeof(*sWCSS));
    SetVBlankCallback(NULL);
-    ResetBgsAndClearDma3BusyFlags(0);
+    ResetBgsAndClearDma3BusyFlags(FALSE);
    InitBgsFromTemplates(0, sBGTemplates, NELEMS(sBGTemplates));
    SetBgTilemapBuffer(1, Alloc(0x800));
    SetBgTilemapBuffer(0, Alloc(0x800));
@@ -250,9 +250,9 @@ static void PrintHeaderTexts(void)
    s32 i;
    u32 width;

-    FillWindowPixelBuffer(0, 0);
-    FillWindowPixelBuffer(1, 0);
-    FillWindowPixelBuffer(2, 0);
+    FillWindowPixelBuffer(0, PIXEL_FILL(0));
+    FillWindowPixelBuffer(1, PIXEL_FILL(0));
+    FillWindowPixelBuffer(2, PIXEL_FILL(0));
    width = 0xC0 - GetStringWidth(3, sHeaderTextPtrs[0], 0);
    WCSS_AddTextPrinterParameterized(0, 3, sHeaderTextPtrs[0], width / 2, 6, 3);
    for (i = 0; i < 3; i++)
@@ -289,7 +289,7 @@ static void Task_WirelessCommunicationScreen(u8 taskId)
    case 3:
        if (UpdateCommunicationCounts(sWCSS->counts, sWCSS->lastCounts, sWCSS->activities, sWCSS->rfuTaskId))
        {
-            FillWindowPixelBuffer(2, 0x00);
+            FillWindowPixelBuffer(2, PIXEL_FILL(0));
            for (i = 0; i < 4; i++)
            {
                ConvertIntToDecimalStringN(gStringVar4, sWCSS->counts[i], STR_CONV_MODE_RIGHT_ALIGN, 2);