From a0cb6c72b6ba7c1b2d2464f3c1ac04354d5d05de Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Jan 2018 21:18:06 -0500 Subject: shop enum --- include/shop.h | 6 +++--- src/field/shop.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/shop.h b/include/shop.h index 76b68d0e9..80602e26c 100644 --- a/include/shop.h +++ b/include/shop.h @@ -20,9 +20,9 @@ enum // shop options enum { - BUY, - SELL, - EXIT + SHOP_BUY, + SHOP_SELL, + SHOP_EXIT }; struct MartInfo diff --git a/src/field/shop.c b/src/field/shop.c index beed50a41..a228ff92f 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -76,8 +76,8 @@ static const struct MenuAction2 sBuySellQuitMenuActions[] = { MartText_Quit2, Task_HandleShopMenuQuit }, }; -static const u8 gMartBuySellOptionList[] = {BUY, SELL, EXIT}; -static const u8 gMartBuyNoSellOptionList[] = {BUY, EXIT}; +static const u8 gMartBuySellOptionList[] = {SHOP_BUY, SHOP_SELL, SHOP_EXIT}; +static const u8 gMartBuyNoSellOptionList[] = {SHOP_BUY, SHOP_EXIT}; static const u16 gUnusedMartArray[] = {0x2, 0x3, 0x4, 0xD, 0x121, 0xE, 0xE, 0xE, 0xE, 0xE, 0xE, 0x0, 0x0}; -- cgit v1.2.3