summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKDSKardabox <bollygame94@gmail.com>2018-02-13 09:16:38 +0530
committerKDSKardabox <bollygame94@gmail.com>2018-02-13 09:16:38 +0530
commit7b360b2e338e4f2a008374a0114367dadf728484 (patch)
tree4463240dfa4b3a6ee1ab3c206b00a728ce14dc40
parent54922641af2712a8108c327ee3ce104c41a10a52 (diff)
Review fixes
-rw-r--r--include/text.h22
-rw-r--r--src/birch_pc.c23
-rw-r--r--src/smokescreen.c2
3 files changed, 23 insertions, 24 deletions
diff --git a/include/text.h b/include/text.h
index e073c3762..fde02cf2d 100644
--- a/include/text.h
+++ b/include/text.h
@@ -249,4 +249,26 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese);
u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese);
void DecompressGlyphFont9(u16 glyphId);
+extern const u8 gBirchDexRatingText_LessThan10[];
+extern const u8 gBirchDexRatingText_LessThan20[];
+extern const u8 gBirchDexRatingText_LessThan30[];
+extern const u8 gBirchDexRatingText_LessThan40[];
+extern const u8 gBirchDexRatingText_LessThan50[];
+extern const u8 gBirchDexRatingText_LessThan60[];
+extern const u8 gBirchDexRatingText_LessThan70[];
+extern const u8 gBirchDexRatingText_LessThan80[];
+extern const u8 gBirchDexRatingText_LessThan90[];
+extern const u8 gBirchDexRatingText_LessThan100[];
+extern const u8 gBirchDexRatingText_LessThan110[];
+extern const u8 gBirchDexRatingText_LessThan120[];
+extern const u8 gBirchDexRatingText_LessThan130[];
+extern const u8 gBirchDexRatingText_LessThan140[];
+extern const u8 gBirchDexRatingText_LessThan150[];
+extern const u8 gBirchDexRatingText_LessThan160[];
+extern const u8 gBirchDexRatingText_LessThan170[];
+extern const u8 gBirchDexRatingText_LessThan180[];
+extern const u8 gBirchDexRatingText_LessThan190[];
+extern const u8 gBirchDexRatingText_LessThan200[];
+extern const u8 gBirchDexRatingText_DexCompleted[];
+
#endif // GUARD_TEXT_H
diff --git a/src/birch_pc.c b/src/birch_pc.c
index 4b0025504..a682d15d9 100644
--- a/src/birch_pc.c
+++ b/src/birch_pc.c
@@ -3,33 +3,12 @@
#include "field_message_box.h"
#include "pokedex.h"
#include "constants/species.h"
+#include "text.h"
extern u16 gSpecialVar_0x8004;
extern u16 gSpecialVar_0x8005;
extern u16 gSpecialVar_0x8006;
-extern const u8 gBirchDexRatingText_LessThan10[];
-extern const u8 gBirchDexRatingText_LessThan20[];
-extern const u8 gBirchDexRatingText_LessThan30[];
-extern const u8 gBirchDexRatingText_LessThan40[];
-extern const u8 gBirchDexRatingText_LessThan50[];
-extern const u8 gBirchDexRatingText_LessThan60[];
-extern const u8 gBirchDexRatingText_LessThan70[];
-extern const u8 gBirchDexRatingText_LessThan80[];
-extern const u8 gBirchDexRatingText_LessThan90[];
-extern const u8 gBirchDexRatingText_LessThan100[];
-extern const u8 gBirchDexRatingText_LessThan110[];
-extern const u8 gBirchDexRatingText_LessThan120[];
-extern const u8 gBirchDexRatingText_LessThan130[];
-extern const u8 gBirchDexRatingText_LessThan140[];
-extern const u8 gBirchDexRatingText_LessThan150[];
-extern const u8 gBirchDexRatingText_LessThan160[];
-extern const u8 gBirchDexRatingText_LessThan170[];
-extern const u8 gBirchDexRatingText_LessThan180[];
-extern const u8 gBirchDexRatingText_LessThan190[];
-extern const u8 gBirchDexRatingText_LessThan200[];
-extern const u8 gBirchDexRatingText_DexCompleted[];
-
bool16 ScriptGetPokedexInfo(void)
{
if (gSpecialVar_0x8004 == 0) // is national dex not present?
diff --git a/src/smokescreen.c b/src/smokescreen.c
index 4b0e5d759..9b37cd234 100644
--- a/src/smokescreen.c
+++ b/src/smokescreen.c
@@ -4,10 +4,8 @@
#include "sprite.h"
#include "util.h"
-
static void sub_8075370(struct Sprite *);
-
u8 sub_807521C(s16 x, s16 y, u8 a3)
{
u8 mainSpriteId;