diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-30 23:50:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 23:50:49 -0600 |
| commit | 153ddde3b90c893b47d5c844b2a58c707038e6b4 (patch) | |
| tree | 8e3e5ab774b89399bf91e9ca110f270fa9bfffde /src/field/item_menu.c | |
| parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) | |
| parent | c21bde059812ed521952512e4d800038e0e1deb7 (diff) | |
Merge pull request #502 from huderlem/misc_ports
Misc ports from pokeemerald
Diffstat (limited to 'src/field/item_menu.c')
| -rw-r--r-- | src/field/item_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 4e283ffe9..e9b8b24d3 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -153,7 +153,7 @@ static const u8 *sPopupMenuActionList; // common void (*gFieldItemUseCallback)(u8) = NULL; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern struct PocketScrollState gBagPocketScrollStates[]; extern struct ItemSlot *gCurrentBagPocketItemSlots; // selected pocket item slots extern const u8 Event_NoRegisteredItem[]; @@ -4499,7 +4499,7 @@ u8 CreateBerrySprite(u8 berryId, s16 x, s16 y) static void SpriteCB_BerrySprite(struct Sprite *sprite) { - sprite->pos2.y = -gUnknown_030041B4; + sprite->pos2.y = -gBattle_BG1_Y; } void sub_80A7DD4(void) |