summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-14 12:22:44 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-14 12:22:44 +0800
commit277726fd5e8c6da021206deeecb163f40073ff3c (patch)
tree83118f5e14dc7c2248a259f09a0e42213cfa0ce0
parent6e2ae504b86d0b72c797d441d7ea204bc7d5e2d3 (diff)
interpret filler with empty agbstring
-rw-r--r--include/data2.h7
-rw-r--r--src/pokemon.c2
2 files changed, 3 insertions, 6 deletions
diff --git a/include/data2.h b/include/data2.h
index 96250f7db..5601fc16c 100644
--- a/include/data2.h
+++ b/include/data2.h
@@ -31,11 +31,11 @@ extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
+extern const struct OamData gUnknown_824F010;
+extern const struct OamData gUnknown_824F018;
extern const union AnimCmd *const gUnknown_82349BC[];
-
extern const union AffineAnimCmd *const gUnknown_82348C8[];
extern const union AffineAnimCmd *const gUnknown_8234944[];
-
extern const struct SpriteFrameImage gUnknown_8234698[];
extern const struct SpriteFrameImage gUnknown_82346B8[];
extern const struct SpriteFrameImage gUnknown_82346D8[];
@@ -47,7 +47,4 @@ extern const struct SpriteFrameImage gUnknown_8234788[];
extern const struct SpriteFrameImage gUnknown_82347A8[];
extern const struct SpriteFrameImage gUnknown_82347C8[];
-extern const struct OamData gUnknown_824F010;
-extern const struct OamData gUnknown_824F018;
-
#endif // GUARD_DATA2_H
diff --git a/src/pokemon.c b/src/pokemon.c
index d9e404a83..f4150d5b6 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -136,7 +136,7 @@ const u8 gStatStageRatios[][2] =
{ 108, 120 },
};
-static const u8 filler = 0xFF;
+static const u8 sFiller = _("");
static const u8 sHoldEffectToType[][2] =
{