diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:40:26 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:40:37 -0600 |
| commit | 754e911b4e95205bafa5dc93242da9cee3f2c5c6 (patch) | |
| tree | e544ba9723182224bf99c4fc144654517037296e /src/field/use_pokeblock.c | |
| parent | a753c44277c050fb24aaf97a8947c7f54e0dacd7 (diff) | |
Rename gScript* vars to gSpecialVar_*
Diffstat (limited to 'src/field/use_pokeblock.c')
| -rw-r--r-- | src/field/use_pokeblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index 8155b4216..7253ac901 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -105,7 +105,7 @@ EWRAM_DATA u8 gPokeblockMonID = 0; EWRAM_DATA s16 gPokeblockGain = 0; extern u16 gKeyRepeatStartDelay; -extern u16 gScriptItemId; // FIXME: remove after merge of #349 Pokeblock +extern u16 gSpecialVar_ItemId; // FIXME: remove after merge of #349 Pokeblock static void launch_c3_walk_stairs_and_run_once(void (*const)(void)); static void sub_81361E4(void); @@ -574,7 +574,7 @@ static void sub_81369CC(void) case 5: if (gMain.newKeys & (A_BUTTON | B_BUTTON) && !sub_8136D00()) { - PokeblockClearIfExists((u8)gScriptItemId); + PokeblockClearIfExists((u8)gSpecialVar_ItemId); launch_c3_walk_stairs_and_run_once(sub_8136B44); } break; |