summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-02 05:28:14 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-02 05:28:14 +0800
commit402e8a4fc0c0971953370d37679d2c6934377688 (patch)
tree181fdf95967d4cecd6107152194ba81ae36dc7e7
parentb566ae26decaa937c72f608044d8ea604c643260 (diff)
fixed some stuff
-rw-r--r--src/dma3_manager.c2
-rw-r--r--src/reset_save_heap.c2
-rw-r--r--tools/br_ips/br_ips.c1
3 files changed, 2 insertions, 3 deletions
diff --git a/src/dma3_manager.c b/src/dma3_manager.c
index fb75c0963..ec2cb932f 100644
--- a/src/dma3_manager.c
+++ b/src/dma3_manager.c
@@ -16,7 +16,7 @@ static /*IWRAM_DATA*/ struct {
/* 0x0C */ u32 value;
} gDma3Requests[128];
-static bool8 gDma3ManagerLocked;
+static volatile bool8 gDma3ManagerLocked;
static u8 gDma3RequestCursor;
void ClearDma3Requests(void)
diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c
index 8d6e30cbf..428f7b88d 100644
--- a/src/reset_save_heap.c
+++ b/src/reset_save_heap.c
@@ -13,7 +13,7 @@ void sub_8079B7C(void)
u16 imeBackup = REG_IME;
REG_IME = 0;
- RegisterRamReset(0x00000001);
+ RegisterRamReset(RESET_EWRAM);
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_FORCED_BLANK);
REG_IME = imeBackup;
gMain.inBattle = FALSE;
diff --git a/tools/br_ips/br_ips.c b/tools/br_ips/br_ips.c
index 10d9a37c0..64c454a3e 100644
--- a/tools/br_ips/br_ips.c
+++ b/tools/br_ips/br_ips.c
@@ -50,7 +50,6 @@ static int getline(char ** lineptr, size_t * n, FILE * stream) {
return i;
}
-
static void getIncbinsFromFile(hunk_t ** hunks, size_t * num, size_t * maxnum, const char * fname, char ** strbuf, size_t * buffersize) {
// Recursively find incbinned segments and encode them as hunks.
FILE * file = fopen(fname, "r");