diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:39:13 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:39:13 -0500 |
| commit | 73c16c109cdb996fa59f5aa63e9f030c21cbe54f (patch) | |
| tree | b0b4b7eefc77441d711105cf036b273f22ce2ec2 /src/field/use_pokeblock.c | |
| parent | 56bf99fd9106b3cc8fac45cc051cbeeec40e34aa (diff) | |
| parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) | |
Merge branch 'master' into slot_machine
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; |