Merge branch 'master' into doc-tilesets

This commit is contained in:
GriffinR authored and GitHub committed 2020-02-16 11:18:30 -05:00
commit 659afd708b
68 files changed
+1716 -1745

No files matched your search

+1 -2
View File
@@ -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;