diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 10:14:31 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 10:14:31 -0500 |
| commit | a5ee2c14fda450ca67985805b8bc71e66dfcf622 (patch) | |
| tree | 9f874dbe25d28bf81e9375da5731889b9b466b07 /src/item_menu.c | |
| parent | 91fa5faf4acf617db0625992b2caf116e64f0888 (diff) | |
| parent | e8add87bf3ccc3563a3d4fa94e109251f4a06eea (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# include/menu_specialized.h
Diffstat (limited to 'src/item_menu.c')
| -rwxr-xr-x | src/item_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/item_menu.c b/src/item_menu.c index 81bc120a8..8edf6f279 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -447,7 +447,7 @@ static EWRAM_DATA struct TempWallyStruct *gUnknown_0203CE80 = 0; extern u8 *const gPocketNamesStringsTable[]; extern u8* gReturnToXStringsTable[]; -extern const u8 EventScript_2736B3[]; +extern const u8 EventScript_SelectWithoutRegisteredItem[]; extern const u16 gUnknown_0860F074[]; void ResetBagScrollPositions(void) @@ -1900,7 +1900,7 @@ bool8 UseRegisteredKeyItemOnField(void) else gSaveBlock1Ptr->registeredItem = ITEM_NONE; } - ScriptContext1_SetupScript(EventScript_2736B3); + ScriptContext1_SetupScript(EventScript_SelectWithoutRegisteredItem); return TRUE; } |