summaryrefslogtreecommitdiff
path: root/src/use_pokeblock.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-10 16:38:27 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-10 16:38:27 +0100
commit37ae6a7758d0f16394f31c367f5c1eb86d34327f (patch)
tree7bb49a63ef7eddaedd1e8cf7cba9649a4f02488f /src/use_pokeblock.c
parentfb30acbc30518469e98a72f4e6df0fb9dd835344 (diff)
move more pokeblock data to C and label
Diffstat (limited to 'src/use_pokeblock.c')
-rw-r--r--src/use_pokeblock.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 64d1cb4a5..1a210b101 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -37,12 +37,6 @@ struct UsePokeblockStruct
struct UsePokeblockSubStruct info;
};
-extern struct UsePokeblockStruct *gUnknown_0203BCAC;
-extern struct UsePokeblockSubStruct *gUnknown_0203BC90;
-extern struct Pokeblock *gUnknown_0203BC98;
-extern void (*gUnknown_0203BC94)(void);
-extern u8 gPokeblockMonId;
-
extern u16 gKeyRepeatStartDelay;
// this file's functions
@@ -64,6 +58,17 @@ void sub_8167BA0(u16 arg0, u8 copyToVramMode);
extern const struct BgTemplate gUnknown_085DFCCC[4];
extern const struct WindowTemplate gUnknown_085DFCDC[];
+// ram variables
+EWRAM_DATA struct UsePokeblockSubStruct *gUnknown_0203BC90 = NULL;
+EWRAM_DATA void (*gUnknown_0203BC94)(void) = NULL;
+EWRAM_DATA struct Pokeblock *gUnknown_0203BC98 = NULL;
+EWRAM_DATA u8 gPokeblockMonId = 0;
+EWRAM_DATA s16 gPokeblockGain = 0;
+EWRAM_DATA void *gUnknown_0203BCA0 = NULL;
+EWRAM_DATA void *gUnknown_0203BCA4 = NULL;
+EWRAM_DATA void *gUnknown_0203BCA8 = NULL;
+EWRAM_DATA struct UsePokeblockStruct *gUnknown_0203BCAC = NULL;
+
void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void))
{
gUnknown_0203BCAC = AllocZeroed(0x806C);