double-colon global labels in preproc; misc other stuff

3 files changed, 8 insertions, 8 deletions

diff --git a/src/link.c b/src/link.c
index 64e33fdfc..5a194e449 100644
--- a/src/link.c
+++ b/src/link.c
@@ -25,7 +25,7 @@ struct LinkTestBGInfo
     u32 dummy_C;
 };
 
-extern void gpu_pal_apply(const u16 *, u16, u32);
+extern void LoadPalette(const u16 *, u16, u32);
 extern void sub_8071C4C(const struct WindowConfig *);
 extern u16 Random(void);
 extern void SeedRng(u16);
@@ -201,7 +201,7 @@ void Task_DestroySelf(u8 taskId)
 
 static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
 {
-    gpu_pal_apply(sLinkTestDigitPalette, 16 * paletteNum, 32);
+    LoadPalette(sLinkTestDigitPalette, 16 * paletteNum, 32);
     DmaCopy16(3, sLinkTestDigitTiles, BG_CHAR_ADDR(charBaseBlock), 0x220);
 
     gLinkTestBGInfo.screenBaseBlock = screenBaseBlock;
@@ -223,7 +223,7 @@ static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charB
 
 static void InitLinkTestBG_Unused(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
 {
-    gpu_pal_apply(sLinkTestDigitPalette, 16 * paletteNum, 32);
+    LoadPalette(sLinkTestDigitPalette, 16 * paletteNum, 32);
     DmaCopy16(3, sLinkTestDigitTiles, BG_CHAR_ADDR(charBaseBlock), 0x220);
 
     gLinkTestBGInfo.screenBaseBlock = screenBaseBlock;
@@ -1223,7 +1223,7 @@ void CB2_LinkError(void)
     ResetSpriteData();
     FreeAllSpritePalettes();
     pal_fade_control_reset_maybe();
-    rboxid_80040B8(0, 0, 2);
+    FillPalette(0, 0, 2);
     ResetTasks();
     SetVBlankCallback(VBlankCB_LinkTest);
     SetUpWindowConfig(&gWindowConfig_81E7198);
diff --git a/src/sprite.c b/src/sprite.c
index ebe1648fa..b96f264a3 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -51,7 +51,7 @@ struct OamDimensions
     s8 height;
 };
 
-void gpu_pal_apply(u16 *, u16, u32);
+void LoadPalette(u16 *, u16, u32);
 void sub_814A590(void);
 
 static void UpdateOamCoords(void);
@@ -1668,7 +1668,7 @@ void LoadSpritePalettes(struct SpritePalette *palettes)
 
 static void DoLoadSpritePalette(u16 *src, u16 paletteOffset)
 {
-    gpu_pal_apply(src, paletteOffset + 0x100, 32);
+    LoadPalette(src, paletteOffset + 0x100, 32);
 }
 
 u8 AllocSpritePalette(u16 tag)
diff --git a/src/text.c b/src/text.c
index c6455f1f0..276a2ccfb 100644
--- a/src/text.c
+++ b/src/text.c
@@ -117,7 +117,7 @@ struct ShiftAmount
     u32 right;
 };
 
-extern void gpu_pal_apply(const u16 *, u16, u32);
+extern void LoadPalette(const u16 *, u16, u32);
 extern void sub_8075474(u16);
 extern void audio_play(u16);
 extern u8 mplay_has_finished_maybe(void);
@@ -1800,7 +1800,7 @@ static void ClearBGMem(struct WindowConfig *winConfig)
 
 void LoadFontDefaultPalette(struct WindowConfig *winConfig)
 {
-    gpu_pal_apply(gFontDefaultPalette, 16 * winConfig->paletteNum, 32);
+    LoadPalette(gFontDefaultPalette, 16 * winConfig->paletteNum, 32);
 }
 
 void SetUpWindowConfig(struct WindowConfig *winConfig)