From dfee5deca8e5c6f5b35b75d56e215638b66320b0 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 18 Oct 2018 21:24:37 +0200
Subject: Move Bitmap struct and clear sprite/text files

---
 src/text.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/text.c')

diff --git a/src/text.c b/src/text.c
index ec0d26ab1..84964ffbf 100644
--- a/src/text.c
+++ b/src/text.c
@@ -9,11 +9,11 @@
 #include "window.h"
 #include "text.h"
 #include "blit.h"
+#include "dynamic_placeholder_text_util.h"
 
 extern u8 GetKeypadIconWidth(u8 keypadIconId);
 extern u16 Font6Func(struct TextPrinter *textPrinter);
 extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
-extern u8* DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 a1);
 extern int sub_8197964();
 
 EWRAM_DATA struct TextPrinter gTempTextPrinter = {0};
@@ -24,8 +24,6 @@ static u16 gLastTextBgColor;
 static u16 gLastTextFgColor;
 static u16 gLastTextShadowColor;
 
-extern struct MusicPlayerInfo gMPlayInfo_BGM;
-
 const struct FontInfo *gFonts;
 u8 gUnknown_03002F84;
 u8 gUnknown_03002F90[0x20];
@@ -3170,7 +3168,7 @@ u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32)
             return gGlyphWidthFuncs[i].func;
     }
 
-    return 0;
+    return NULL;
 }
 
 u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
@@ -3181,7 +3179,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
     s32 result;
     int localLetterSpacing;
     u32 lineWidth;
-    u8 *bufferPointer;
+    const u8 *bufferPointer;
     int glyphWidth;
     u32 width;
 
-- 
cgit v1.2.3