more decomping of funcs

4 files changed, 85 insertions, 102 deletions

diff --git a/asm/code_80118A4.s b/asm/code_80118A4.s
index 139f972..e96623d 100644
--- a/asm/code_80118A4.s
+++ b/asm/code_80118A4.s
@@ -5,78 +5,6 @@
 
 	.text	
 
-	thumb_func_start sub_80118C4
-sub_80118C4:
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r4, 0
-	bl sub_800BFD0
-	ldr r0, _080118E8
-	adds r1, r4, 0
-	bl sub_800C3F8
-	ldr r0, _080118EC
-	adds r1, r4, 0
-	bl sub_800C3F8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080118E8: .4byte 0x000003e6
-_080118EC: .4byte 0x000003e5
-	thumb_func_end sub_80118C4
-
-	thumb_func_start sub_80118F0
-sub_80118F0:
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	bl sub_800BDFC
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80118F0
-
-	thumb_func_start sub_8011900
-sub_8011900:
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, 16
-	lsrs r1, 16
-	bl sub_800BE8C
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8011900
-
-	thumb_func_start sub_8011914
-sub_8011914:
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	bl sub_800BF48
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8011914
-
-	thumb_func_start sub_8011924
-sub_8011924:
-	push {lr}
-	bl sub_800BF80
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8011924
-
-	thumb_func_start sub_8011930
-sub_8011930:
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	bl sub_800BFD0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8011930
-
 	thumb_func_start sub_8011940
 sub_8011940:
 	push {r4,lr}
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index e389dc9..2588ea3 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -5,33 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8012A18
-sub_8012A18:
-	push {lr}
-	bl sub_8011860
-	bl xxx_draw_string_80144C4
-	ldr r0, _08012A60
-	ldr r0, [r0]
-	ldrb r0, [r0, 0xA]
-	bl nullsub_8
-	bl sub_8005180
-	bl sub_80060EC
-	bl sub_800CB20
-	bl sub_800485C
-	bl CopySpritesToOam
-	bl sub_8005304
-	bl TransferBGPaletteBuffer
-	bl xxx_call_update_bg_vram
-	bl sub_8009908
-	bl xxx_call_update_bg_sound_input
-	movs r0, 0
-	bl ResetSprites
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08012A60: .4byte gUnknown_203B46C
-	thumb_func_end sub_8012A18
-
 	thumb_func_start sub_8012A64
 sub_8012A64:
 	push {r4,lr}
diff --git a/src/code_80118A4.c b/src/code_80118A4.c
index 34569d0..3881ba8 100644
--- a/src/code_80118A4.c
+++ b/src/code_80118A4.c
@@ -1,9 +1,15 @@
 #include "global.h"
 
-extern void sub_8011924(void);
+void sub_8011924(void);
+
+extern void sub_800BDFC(u16 r0);
+extern void sub_800BE8C(u16 r0, u16 r1);
+extern void sub_800BF48(u16 r0);
+extern void sub_800BF80(void);
+extern void sub_800BFD0(u16 r0);
+extern void sub_800C3F8(u16 r0, u16 r1);
 extern void sub_801199C(u16 r0);
-extern void sub_800BFD0(u8 r0);
-extern void sub_800C3F8(u16 r0, u8 r1);
+extern void sub_800C068(u16 r0);
 
 void sub_80118A4(void)
 {
@@ -11,3 +17,35 @@ void sub_80118A4(void)
     sub_801199C(0x3e6);
     sub_801199C(0x3e5);
 }
+
+void sub_80118C4(u16 r0)
+{
+    sub_800BFD0(r0);
+    sub_800C3F8(0x3e6, r0);
+    sub_800C3F8(0x3e5, r0);
+}
+
+void sub_80118F0(u16 r0)
+{
+    sub_800BDFC(r0);
+}
+
+void sub_8011900(u16 r0, u16 r1)
+{
+    sub_800BE8C(r0, r1);
+}
+
+void sub_8011914(u16 r0)
+{
+    sub_800BF48(r0);
+}
+
+void sub_8011924()
+{
+    sub_800BF80();
+}
+
+void sub_8011930(u16 r0)
+{
+    sub_800BFD0(r0);
+}
diff --git a/src/save1.c b/src/save1.c
index b7de6c6..1063c66 100644
--- a/src/save1.c
+++ b/src/save1.c
@@ -1,6 +1,32 @@
 #include "global.h"
 
+
+struct UnkSaveStruct1
+{
+    /* 0x0 */ u32 unk0;
+    /* 0x4 */ u32 unk4;
+    /* 0x8 */ u16 unk8;
+    /* 0xA */ u8 unkA;
+};
+
 extern void MemoryFree(void *);
+extern void sub_8011860();
+extern void xxx_draw_string_80144C4();
+extern void nullsub_8(u8);
+extern void sub_8005180();
+extern void sub_80060EC();
+extern void sub_800CB20();
+extern void sub_800485C();
+extern void CopySpritesToOam();
+extern void sub_8005304();
+extern void TransferBGPaletteBuffer();
+extern void xxx_call_update_bg_vram();
+extern void sub_8009908();
+extern void xxx_call_update_bg_sound_input();
+extern void ResetSprites(u8 r0);
+
+
+extern struct UnkSaveStruct1 *gUnknown_203B46C;
 
 extern u8 *gUnknown_203B194;
 
@@ -11,3 +37,21 @@ void sub_80129FC()
         gUnknown_203B194 = NULL;
     }
 }
+
+void sub_8012A18()
+{
+    sub_8011860();
+    xxx_draw_string_80144C4();
+    nullsub_8(gUnknown_203B46C->unkA);
+    sub_8005180();
+    sub_80060EC();
+    sub_800CB20();
+    sub_800485C();
+    CopySpritesToOam();
+    sub_8005304();
+    TransferBGPaletteBuffer();
+    xxx_call_update_bg_vram();
+    sub_8009908();
+    xxx_call_update_bg_sound_input();
+    ResetSprites(0);
+}