From 945e00d2897967cb481b94f409390c8fb0dfe358 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Wed, 8 Jul 2020 17:12:08 -0500 Subject: [PATCH] Decompiled unknown_064800.c --- .../unknown_064800/func_80063C00.s | 14 ------------ src/mips1/unknown_064690.c | 1 + src/mips1/unknown_0647A0.c | 1 + src/mips1/unknown_064800.c | 22 ++++++++++++++++++- 4 files changed, 23 insertions(+), 15 deletions(-) delete mode 100644 asm/non_matchings/unknown_064800/func_80063C00.s diff --git a/asm/non_matchings/unknown_064800/func_80063C00.s b/asm/non_matchings/unknown_064800/func_80063C00.s deleted file mode 100644 index 4436d253..00000000 --- a/asm/non_matchings/unknown_064800/func_80063C00.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80063C00 -/* 064800 80063C00 30AE00FF */ andi $t6, $a1, 0xff -/* 064804 80063C04 AFA50004 */ sw $a1, 4($sp) -/* 064808 80063C08 000EC080 */ sll $t8, $t6, 2 -/* 06480C 80063C0C 8C8F0060 */ lw $t7, 0x60($a0) -/* 064810 80063C10 030EC021 */ addu $t8, $t8, $t6 -/* 064814 80063C14 0018C080 */ sll $t8, $t8, 2 -/* 064818 80063C18 01F8C821 */ addu $t9, $t7, $t8 -/* 06481C 80063C1C 93220010 */ lbu $v0, 0x10($t9) -/* 064820 80063C20 03E00008 */ jr $ra -/* 064824 80063C24 00000000 */ nop -/* 064828 80063C28 00000000 */ nop -/* 06482C 80063C2C 00000000 */ nop - diff --git a/src/mips1/unknown_064690.c b/src/mips1/unknown_064690.c index 1d97041d..3460d1d6 100644 --- a/src/mips1/unknown_064690.c +++ b/src/mips1/unknown_064690.c @@ -4,6 +4,7 @@ #include "types.h" #include "macros.h" +/* Size: 0x0C bytes */ typedef struct unk80063BA0 { s16 unk0; s16 unk2; diff --git a/src/mips1/unknown_0647A0.c b/src/mips1/unknown_0647A0.c index 3a90c0b7..a396d57d 100644 --- a/src/mips1/unknown_0647A0.c +++ b/src/mips1/unknown_0647A0.c @@ -4,6 +4,7 @@ #include "types.h" #include "macros.h" +/* Size: 0x0C bytes */ typedef struct unk80063BA0 { s16 unk0; s16 unk2; diff --git a/src/mips1/unknown_064800.c b/src/mips1/unknown_064800.c index 2bf8bcb5..6661d043 100644 --- a/src/mips1/unknown_064800.c +++ b/src/mips1/unknown_064800.c @@ -4,4 +4,24 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_064800/func_80063C00.s") +/* Size: 0x14 bytes */ +typedef struct unk80063C00 { + u32 unk00; + u32 unk04; + u32 unk08; + u32 unk0C; + u8 unk10; + u8 unk11; + u8 unk12; + u8 unk13; +} unk80063C00; + +/* Unknown size */ +typedef struct unk80063C00_2 { + u8 unk00[0x60]; + unk80063C00* unk60; // Array of unk80063C00, unknown number of elements (At most 256). +} unk80063C00_2; + +u8 func_80063C00(unk80063C00_2 *arg0, u8 arg1) { + return arg0->unk60[arg1].unk10; +}