summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2020-09-21 00:28:50 -0500
committerSeth Barberee <seth.barberee@gmail.com>2020-09-21 00:28:50 -0500
commitf3845bdeddd7fce3eab967922b664c540736c829 (patch)
tree1de258d04b9d00e41b900ca3dfffa36f5d0926a9 /src
parent2f88c03e87af934f892e7433d385731c3f206d78 (diff)
more decomping of funcs
Diffstat (limited to 'src')
-rw-r--r--src/code_80118A4.c44
-rw-r--r--src/save1.c44
2 files changed, 85 insertions, 3 deletions
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);
+}