Merge branch 'master' into doc-tilesets

2020-02-16 11:18:30 -05:00
parent 1d006c2661 51b7b11a55
commit 659afd708b
68 changed files with 1716 additions and 1745 deletions
@@ -4,11 +4,10 @@
 #include "menu.h"
 #include "text_window.h"
 #include "strings.h"
+#include "constants/coins.h"

 EWRAM_DATA static u8 sCoinsWindowId = 0;

-#define MAX_COINS 9999
-
 u16 GetCoins(void)
 {
    return gSaveBlock1Ptr->coins ^ gSaveBlock2Ptr->encryptionKey;