summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-06-30 09:44:28 -0400
committerscnorton <scnorton@biociphers.org>2017-06-30 09:44:28 -0400
commit282cae4a9fbd019a973fb6618337d29a61f97f42 (patch)
tree59df01a9cc602f3ed0c9209fe35110491287ce29
parenta07701d4e1f115c5ed1686419c12f9bdcfda6aca (diff)
Address review items by Marijn vd Werf
-rwxr-xr-xsrc/use_pokeblock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 40c960cf9..ce83bc1c2 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -22,8 +22,8 @@
#define GFX_TAG_CONDITIONUPDOWN 0
#ifdef GERMAN
-const u16 ConditionUpDownPalette[16];
-const u32 ConditionUpDownTiles[0x80];
+extern const u16 ConditionUpDownPalette[16];
+extern const u32 ConditionUpDownTiles[0x80];
#else
const u16 ConditionUpDownPalette[] = INCBIN_U16("graphics/misc/condition_up_down.gbapal");
const u32 ConditionUpDownTiles[] = INCBIN_U32("graphics/misc/condition_up_down.4bpp");
@@ -108,7 +108,7 @@ extern struct Pokeblock *gUnknown_0203930C;
extern u8 gUnknown_02039310;
extern u16 gKeyRepeatStartDelay;
-extern u16 gScriptItemId; // remove after merge of #349 Pokeblock
+extern u16 gScriptItemId; // FIXME: remove after merge of #349 Pokeblock
void launch_c3_walk_stairs_and_run_once(void (*const)(void));
void sub_81361E4(void);