dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Evan committed 2019-11-26 13:55:24 -07:00
2 parents d1142b4290 19ecb1631b
commit 31d8bfb048
222 files changed
+17265 -27793
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/shop.h
-3
View File
@@ -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];