summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2020-09-26 18:30:40 -0500
committerSeth Barberee <seth.barberee@gmail.com>2020-09-26 18:30:40 -0500
commit93ed78878789a60e9c3e7e0566f3dc8f7ed1f7d2 (patch)
tree4773f15dfb3d0dfae8102f20acb04ceb752bb807 /src
parentfdc874029ee28bc182671215bcedfa02987af7d3 (diff)
more decomping
Diffstat (limited to 'src')
-rw-r--r--src/code_8092334.c24
-rw-r--r--src/save1.c75
2 files changed, 98 insertions, 1 deletions
diff --git a/src/code_8092334.c b/src/code_8092334.c
index cb9acff..88a9c5a 100644
--- a/src/code_8092334.c
+++ b/src/code_8092334.c
@@ -4,6 +4,10 @@ extern u32 gUnformattedTypeStrings[]; // unformatted type names
extern u32 gFormattedTypeStrings[]; // formatted type names
extern u8 gUnknown_810AC7C[];
extern u8 gUnknown_810AC6A[];
+extern u8 *gUnknown_810B4C8[];
+extern u8 *gUnknown_810B988[];
+extern u32 gUnknown_2038C28;
+extern u32 *gUnknown_203B468;
u32 GetUnformattedTypeString(u8 type)
{
@@ -24,3 +28,23 @@ u8 sub_8092364(u8 r0)
{
return gUnknown_810AC6A[r0];
}
+
+void sub_8092374(char *r0, u8 r1)
+{
+ strncpy(r0, gUnknown_810B4C8[r1], 0x50);
+}
+
+u8 *sub_8092390(u8 r0)
+{
+ return gUnknown_810B988[r0];
+}
+
+void sub_80923A0(void)
+{
+ gUnknown_203B468 = &gUnknown_2038C28;
+}
+
+u32 *sub_80923B0(void)
+{
+ return &gUnknown_2038C28;
+}
diff --git a/src/save1.c b/src/save1.c
index 1063c66..5b8ad19 100644
--- a/src/save1.c
+++ b/src/save1.c
@@ -9,6 +9,28 @@ struct UnkSaveStruct1
/* 0xA */ u8 unkA;
};
+struct UnkStruct
+{
+ /* 0x0 */ u8 unk0;
+ /* 0x1 */ u8 unk1;
+ /* 0x2 */ u8 unk2;
+ /* 0x3 */ u8 unk3;
+ /* 0x4 */ u8 unk4;
+ /* 0x5 */ u32 unk5;
+ /* 0x9 */ u32 unk9;
+ /* 0xD */ u32 unkD;
+ /* 0x12 */ u32 unk11;
+ /* 0x16 */ u32 unk15;
+ /* 0x1A */ u32 unk19;
+ /* 0x1E */ u32 unk1D;
+ /* 0x24 */ u32 unk24;
+ /* 0x28 */ u8 unk28;
+ /* 0x29 */ u8 unk29;
+ /* 0x2A */ u8 unk2A;
+ /* 0x2B */ u8 unk2B;
+ /* 0x2C */ u8 unk2C;
+};
+
extern void MemoryFree(void *);
extern void sub_8011860();
extern void xxx_draw_string_80144C4();
@@ -24,7 +46,8 @@ 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 u32 sub_8012AE8(void);
+extern void nullsub_34(struct UnkStruct *r0);
extern struct UnkSaveStruct1 *gUnknown_203B46C;
@@ -55,3 +78,53 @@ void sub_8012A18()
xxx_call_update_bg_sound_input();
ResetSprites(0);
}
+
+u32 sub_8012A64(struct UnkStruct *r0, u32 r1)
+{
+ if(r0 == NULL)
+ {
+ return sub_8012AE8();
+ }
+ if(r1 != -1)
+ {
+ nullsub_34(r0);
+ }
+ if(r0->unk1 != 0)
+ {
+ r0->unk1 = 0;
+ return 1;
+ }
+ if(r0->unk2 == 0)
+ {
+ return sub_8012AE8();
+ }
+ r0->unk2 = r0->unk1;
+ return 2;
+}
+
+// TODO match that one line
+//u32 GetKeyPress(struct UnkStruct *r0)
+//{
+// if(r0 == NULL)
+// {
+// return sub_8012AE8();
+// }
+// // TODO it's not a struct access..
+// if(r0->unk29 != 0)
+// {
+// return 1;
+// }
+// if(r0->unk2A != 0)
+// {
+// return 2;
+// }
+// if(r0->unk2C != 0)
+// {
+// return 9;
+// }
+// if(r0->unk2B == 0)
+// {
+// return sub_8012AE8();
+// }
+// return 0xA;
+//}