diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/trader.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/trader.c')
| -rw-r--r-- | src/trader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/trader.c b/src/trader.c index f081d7e95..e23efb4ce 100644 --- a/src/trader.c +++ b/src/trader.c @@ -109,7 +109,7 @@ void sub_8133BE4(u8 taskId, u8 decorationId) void Task_HandleGetDecorationMenuInput(u8 taskId) { struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader; - s8 input = ProcessMenuInput(); + s8 input = Menu_ProcessInput(); switch (input) { |