Match LoadOverlayNoInitAsync

2 files changed, 13 insertions, 45 deletions

diff --git a/arm9/Makefile b/arm9/Makefile
index 0e545de6..797e6987 100644
--- a/arm9/Makefile
+++ b/arm9/Makefile
@@ -91,13 +91,13 @@ OBJCOPY := $(CROSS)objcopy
 
 # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o
 ASFLAGS = -proc arm5te -i ..
-CFLAGS = -O4,p -proc arm946e -fp soft -lang c99 -Cpp_exceptions off -ir ../include -ir ../include-mw -ir lib/include -interworking -DFS_IMPLEMENT
+CFLAGS = -O4,p -proc arm946e -fp soft -lang c99 -Cpp_exceptions off -ir ../include -ir ../include-mw -ir lib/include -interworking -DFS_IMPLEMENT -enum int
 LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m _start
 
 ####################### Other Tools #########################
 
 # DS TOOLS
-SHA1SUM = sha1sum
+SHA1SUM = sha1sum --quiet
 JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc$(EXE)
 GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx$(EXE)
 SCANINC = $(TOOLS_DIR)/scaninc/scaninc$(EXE)
@@ -151,7 +151,6 @@ ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS))
 
 # TODO: Move out to lib/Makefile
 build/lib/src/%.o: MWCCVERSION = 1.2/sp2p3
-build/lib/src/%.o: CFLAGS += -enum int
 build/src/FUN_020910A4.o: MWCCVERSION = 1.2/sp2p3
 
 ####################### Everything Else ######################
diff --git a/arm9/src/poke_overlay.c b/arm9/src/poke_overlay.c
index 9a81ea83..105881d8 100644
--- a/arm9/src/poke_overlay.c
+++ b/arm9/src/poke_overlay.c
@@ -188,47 +188,16 @@ THUMB_FUNC BOOL LoadOverlayNoInit(MIProcessor target, FSOverlayID id)
     return TRUE;
 }
 
-//THUMB_FUNC BOOL LoadOverlayNoInitAsync(MIProcessor target, FSOverlayID id)
-//{
-//    FSOverlayInfo info;
-//    FSFile file;
-//    if (!FS_LoadOverlayInfo(&info, target, id))
-//        return FALSE;
-//    FS_InitFile(&file);
-//    FS_LoadOverlayImageAsync(&info, &file);
-//    FS_WaitAsync(&file);
-//    FS_CloseFile(&file);
-//    FS_StartOverlay(&info);
-//    return TRUE;
-//}
-
-THUMB_FUNC asm BOOL LoadOverlayNoInitAsync(MIProcessor target, FSOverlayID id)
+THUMB_FUNC BOOL LoadOverlayNoInitAsync(MIProcessor target, FSOverlayID id)
 {
-    push {lr}
-    sub sp, #0x74
-    add r3, r0, #0x0
-    add r2, r1, #0x0
-    add r0, sp, #0x0
-    add r1, r3, #0x0
-    bl FS_LoadOverlayInfo
-    cmp r0, #0x0
-    bne _020061C2
-    add sp, #0x74
-    mov r0, #0x0
-    pop {pc}
-_020061C2:
-    add r0, sp, #0x2c
-    bl FS_InitFile
-    add r0, sp, #0x0
-    add r1, sp, #0x2c
-    bl FS_LoadOverlayImageAsync
-    add r0, sp, #0x2c
-    bl FS_WaitAsync
-    add r0, sp, #0x2c
-    bl FS_CloseFile
-    add r0, sp, #0x0
-    bl FS_StartOverlay
-    mov r0, #0x1
-    add sp, #0x74
-    pop {pc}
+    FSOverlayInfo info;
+    FSFile file;
+    if (!FS_LoadOverlayInfo(&info, target, id))
+        return FALSE;
+    FS_InitFile(&file);
+    FS_LoadOverlayImageAsync(&info, &file);
+    FS_WaitAsync(&file);
+    FS_CloseFile(&file);
+    FS_StartOverlay(&info);
+    return TRUE;
 }