diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 01:56:36 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 01:56:36 -0400 |
| commit | d84d94e29a1424dd1d12ff821957bb6b1bc847d6 (patch) | |
| tree | c5ba0778afca66a91f71815cd53fe9abef1bdac6 /src/shop.c | |
| parent | ad2a97935e1c1f4362f0dffa58ef437d191bab4e (diff) | |
| parent | c3cfd6065825ec8ddd5e1782998071518efaa322 (diff) | |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'src/shop.c')
| -rwxr-xr-x | src/shop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shop.c b/src/shop.c index e03e2ab0c..ab7f31c1f 100755 --- a/src/shop.c +++ b/src/shop.c @@ -1,6 +1,6 @@ #include "global.h" #include "bg.h" -#include "data2.h" +#include "data.h" #include "decompress.h" #include "decoration.h" #include "decoration_inventory.h" @@ -918,7 +918,7 @@ static void Task_BuyMenu(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); ExitBuyMenu(taskId); break; |