fix merge conflicts

2019-11-26 13:55:24 -07:00
parent d1142b4290 19ecb1631b
commit 31d8bfb048
222 changed files with 17265 additions and 27793 deletions
@@ -4,9 +4,6 @@
 #include "global.h"
 #include "menu_helpers.h"

-#define MENU_NOTHING_CHOSEN -2
-#define MENU_B_PRESSED -1
-
 #define INDEX_CANCEL -2

 extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];