diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
| commit | 46023e742c7704c449ae7ec9c2a592cd923f40e6 (patch) | |
| tree | 9f6c6591e60f83003f6abccb5a28cfb3004ad2ab /src/field/use_pokeblock.c | |
| parent | cb674ce14dc43f99dd76f456e69ab8a90cc3d506 (diff) | |
| parent | 2bd2dd1db7252a928a84cd65ea0510ed1533fa9b (diff) | |
Merge branch 'master' into german_debug
Conflicts:
asm/pokemon_storage_system.s
data/pokemon_storage_system.s
src/pokemon/pokemon_1.c
src/pokemon/pokemon_storage_system.c
sym_common.txt
sym_ewram.txt
Diffstat (limited to 'src/field/use_pokeblock.c')
| -rw-r--r-- | src/field/use_pokeblock.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index 42020c49a..8ea93aab8 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -104,7 +104,6 @@ static EWRAM_DATA struct Pokeblock *gUnknown_0203930C = NULL; EWRAM_DATA u8 gPokeblockMonID = 0; EWRAM_DATA s16 gPokeblockGain = 0; -extern u16 gKeyRepeatStartDelay; extern u16 gSpecialVar_ItemId; // FIXME: remove after merge of #349 Pokeblock static void launch_c3_walk_stairs_and_run_once(void (*const)(void)); |