summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/asm/unk_0206015C.s233
-rw-r--r--arm9/global.inc1
-rw-r--r--arm9/src/unk_0206015C.c113
-rw-r--r--include/unk_0206015C.h60
4 files changed, 174 insertions, 233 deletions
diff --git a/arm9/asm/unk_0206015C.s b/arm9/asm/unk_0206015C.s
deleted file mode 100644
index 296e65c5..00000000
--- a/arm9/asm/unk_0206015C.s
+++ /dev/null
@@ -1,233 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .extern gMain
-
- .text
-
- thumb_func_start FUN_0206015C
-FUN_0206015C: ; 0x0206015C
- push {r3-r5, lr}
- add r5, r0, #0x0
- mov r0, #0xb
- mov r1, #0x10
- bl AllocFromHeapAtEnd
- add r4, r0, #0x0
- mov r0, #0xb
- bl MOD06_02244DB0
- str r0, [r4, #0x0]
- mov r0, #0xb
- add r1, r5, #0x0
- bl MOD06_02245114
- str r0, [r4, #0x4]
- mov r0, #0x0
- strb r0, [r4, #0xc]
- strb r0, [r4, #0xd]
- ldr r0, [r5, #0x10]
- ldr r1, _02060190 ; =FUN_02060194
- add r2, r4, #0x0
- bl FUN_0204640C
- pop {r3-r5, pc}
- nop
-_02060190: .word FUN_02060194
-
- thumb_func_start FUN_02060194
-FUN_02060194: ; 0x02060194
- push {r3-r7, lr}
- sub sp, #0x10
- add r5, r0, #0x0
- bl FUN_02046528
- add r6, r0, #0x0
- add r0, r5, #0x0
- bl FUN_0204652C
- add r4, r0, #0x0
- ldrb r0, [r4, #0xc]
- cmp r0, #0x8
- bls _020601B0
- b _02060332
-_020601B0:
- add r0, r0, r0
- add r0, pc
- ldrh r0, [r0, #0x6]
- lsl r0, r0, #0x10
- asr r0, r0, #0x10
- add pc, r0
-_020601BC: ; jump table (using 16-bit offset)
- .short _020601CE - _020601BC - 2; case 0
- .short _020601F2 - _020601BC - 2; case 1
- .short _020601FE - _020601BC - 2; case 2
- .short _02060226 - _020601BC - 2; case 3
- .short _02060232 - _020601BC - 2; case 4
- .short _020602A2 - _020601BC - 2; case 5
- .short _020602F0 - _020601BC - 2; case 6
- .short _020602FC - _020601BC - 2; case 7
- .short _02060312 - _020601BC - 2; case 8
-_020601CE:
- add r0, r6, #0x0
- mov r1, #0x1
- bl FUN_0206367C
- ldrb r0, [r4, #0xd]
- ldr r1, [r4, #0x4]
- bl MOD06_02245198
- ldr r0, [r4, #0x4]
- bl MOD06_022451F0
- str r0, [r4, #0x8]
- add r0, r5, #0x0
- bl FUN_0204AFC8
- mov r0, #0x1
- strb r0, [r4, #0xc]
- b _02060332
-_020601F2:
- add r0, r5, #0x0
- bl FUN_0204AF3C
- mov r0, #0x2
- strb r0, [r4, #0xc]
- b _02060332
-_020601FE:
- ldr r0, [r6, #0xc]
- bl SavArray_Flags_get
- ldrb r1, [r4, #0xd]
- cmp r1, #0x0
- bne _02060210
- bl FUN_0205F1C4
- b _02060218
-_02060210:
- cmp r1, #0x5
- bne _02060218
- bl FUN_0205F1D4
-_02060218:
- ldr r1, [r4, #0x8]
- add r0, r5, #0x0
- bl FUN_02049160
- mov r0, #0x3
- strb r0, [r4, #0xc]
- b _02060332
-_02060226:
- add r0, r5, #0x0
- bl FUN_0204AF84
- mov r0, #0x4
- strb r0, [r4, #0xc]
- b _02060332
-_02060232:
- ldr r0, [r6, #0x38]
- bl FUN_020553A0
- ldrb r1, [r4, #0xd]
- add r7, r0, #0x0
- add r1, r1, #0x1
- strb r1, [r4, #0xd]
- ldrb r1, [r4, #0xd]
- cmp r1, #0x5
- bhi _02060290
- add r0, r6, #0x0
- bl MOD06_02245088
- add r6, r0, #0x0
- add r0, r7, #0x0
- mov r1, #0x1
- bl FUN_0205889C
- ldr r0, [r4, #0x0]
- add r1, r6, #0x0
- bl MOD06_02244DC4
- ldr r0, [r4, #0x0]
- bl MOD06_02244EF8
- mov r0, #0x0
- strb r0, [r4, #0xe]
- ldr r0, _02060338 ; =0x00000679
- bl FUN_020054C8
- mov r0, #0x0
- str r0, [sp, #0x0]
- mov r0, #0x6
- str r0, [sp, #0x4]
- mov r0, #0x1
- str r0, [sp, #0x8]
- mov r0, #0xb
- str r0, [sp, #0xc]
- ldr r3, _0206033C ; =0x0000FFFF
- add r0, r5, #0x0
- mov r1, #0x3
- mov r2, #0x11
- bl FUN_0204C1B4
- mov r0, #0x5
- strb r0, [r4, #0xc]
- b _02060332
-_02060290:
- mov r1, #0x0
- bl FUN_0205889C
- add r0, r5, #0x0
- bl FUN_0204B00C
- mov r0, #0x8
- strb r0, [r4, #0xc]
- b _02060332
-_020602A2:
- ldrb r0, [r4, #0xe]
- add r0, r0, #0x1
- strb r0, [r4, #0xe]
- ldrb r0, [r4, #0xe]
- cmp r0, #0x3c
- bhs _020602B8
- ldr r0, _02060340 ; =gMain
- ldr r1, [r0, #0x48]
- mov r0, #0x1
- tst r0, r1
- beq _02060332
-_020602B8:
- ldrb r0, [r4, #0xd]
- ldr r1, [r4, #0x4]
- bl MOD06_02245198
- ldr r0, [r4, #0x4]
- bl MOD06_022451F0
- str r0, [r4, #0x8]
- ldr r0, _02060338 ; =0x00000679
- bl FUN_020054C8
- mov r0, #0x0
- str r0, [sp, #0x0]
- mov r0, #0x6
- str r0, [sp, #0x4]
- mov r0, #0x1
- str r0, [sp, #0x8]
- mov r0, #0xb
- str r0, [sp, #0xc]
- ldr r3, _0206033C ; =0x0000FFFF
- add r0, r5, #0x0
- mov r1, #0x3
- mov r2, #0x10
- bl FUN_0204C1B4
- mov r0, #0x6
- strb r0, [r4, #0xc]
- b _02060332
-_020602F0:
- ldr r0, [r4, #0x0]
- bl MOD06_02244F18
- mov r0, #0x7
- strb r0, [r4, #0xc]
- b _02060332
-_020602FC:
- ldr r0, [r4, #0x0]
- bl MOD06_02244F24
- cmp r0, #0x0
- beq _02060332
- ldr r0, [r4, #0x0]
- bl MOD06_02244F2C
- mov r0, #0x1
- strb r0, [r4, #0xc]
- b _02060332
-_02060312:
- add r0, r6, #0x0
- mov r1, #0x0
- bl FUN_0206367C
- ldr r0, [r4, #0x4]
- bl MOD06_02245190
- ldr r0, [r4, #0x0]
- bl MOD06_02244DBC
- add r0, r4, #0x0
- bl FreeToHeap
- add sp, #0x10
- mov r0, #0x1
- pop {r3-r7, pc}
-_02060332:
- mov r0, #0x0
- add sp, #0x10
- pop {r3-r7, pc}
- .balign 4
-_02060338: .word 0x00000679
-_0206033C: .word 0x0000FFFF
-_02060340: .word gMain
diff --git a/arm9/global.inc b/arm9/global.inc
index 9df9973e..a944a1b1 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -4633,6 +4633,7 @@
.extern FUN_020600DC
.extern FUN_02060144
.extern FUN_0206015C
+.extern FUN_02060194
.extern FUN_02060344
.extern FUN_020603B0
.extern FUN_020603C8
diff --git a/arm9/src/unk_0206015C.c b/arm9/src/unk_0206015C.c
new file mode 100644
index 00000000..07076506
--- /dev/null
+++ b/arm9/src/unk_0206015C.c
@@ -0,0 +1,113 @@
+#include "unk_0206015C.h"
+
+THUMB_FUNC void FUN_0206015C(struct UnkSavStruct80 *savStruct)
+{
+ struct UnkStruct_0206015C *unkStruct = AllocFromHeapAtEnd(0xb, 0x10);
+ unkStruct->unk0 = MOD06_02244DB0(0xb);
+ unkStruct->unk4 = MOD06_02245114(0xb, savStruct);
+ unkStruct->unkC = 0;
+ unkStruct->unkD = 0;
+
+ FUN_0204640C(savStruct->unk10, FUN_02060194, (u32 *)unkStruct);
+}
+
+THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C *unkStruct0)
+{
+ struct UnkSavStruct80 *savStruct = FUN_02046528(unkStruct0);
+ struct UnkStruct_0204652C *unkStruct1 = (struct UnkStruct_0204652C *)FUN_0204652C(unkStruct0);
+
+ switch (unkStruct1->action)
+ {
+ case 0:
+ FUN_0206367C(savStruct, 1);
+ MOD06_02245198(unkStruct1->unkD, unkStruct1->unk4);
+ unkStruct1->unk8 = MOD06_022451F0(unkStruct1->unk4);
+ FUN_0204AFC8(unkStruct0);
+ unkStruct1->action = 1;
+ break;
+
+ case 1:
+ FUN_0204AF3C(unkStruct0);
+ unkStruct1->action = 2;
+ break;
+
+ case 2:
+ struct ScriptState *scrState = SavArray_Flags_get(savStruct->saveBlock2);
+ u8 unkD = unkStruct1->unkD;
+ if (unkD == 0)
+ {
+ FUN_0205F1C4(scrState);
+ }
+ else if (unkD == 5)
+ {
+ FUN_0205F1D4(scrState);
+ }
+ FUN_02049160(unkStruct0, unkStruct1->unk8);
+ unkStruct1->action = 3;
+ break;
+
+ case 3:
+ FUN_0204AF84(unkStruct0);
+ unkStruct1->action = 4;
+ break;
+
+ case 4:
+ u32 unk0 = FUN_020553A0(savStruct->unk38);
+ unkStruct1->unkD += 1;
+ if (unkStruct1->unkD <= 5)
+ {
+ void *unkAddr = MOD06_02245088(savStruct);
+ FUN_0205889C(unk0, 1);
+ MOD06_02244DC4(unkStruct1->unk0, unkAddr);
+ MOD06_02244EF8(unkStruct1->unk0);
+ unkStruct1->unkE = 0;
+ FUN_020054C8(1657);
+ FUN_0204C1B4(unkStruct0, 0x3, 0x11, 0x0000FFFF, 0, 6, 1, 0xb);
+ unkStruct1->action = 5;
+ }
+ else
+ {
+ FUN_0205889C(unk0, 0);
+ FUN_0204B00C(unkStruct0);
+ unkStruct1->action = 8;
+ }
+ break;
+
+ case 5:
+ unkStruct1->unkE += 1;
+ if (unkStruct1->unkE < 0x3c && !(gMain.unk48 & 1))
+ break;
+
+ MOD06_02245198(unkStruct1->unkD, unkStruct1->unk4);
+ unkStruct1->unk8 = MOD06_022451F0(unkStruct1->unk4);
+
+ FUN_020054C8(1657);
+ FUN_0204C1B4(unkStruct0, 0x3, 0x10, 0x0000FFFF, 0, 6, 1, 0xb);
+ unkStruct1->action = 6;
+ break;
+
+ case 6:
+ MOD06_02244F18(unkStruct1->unk0);
+ unkStruct1->action = 7;
+ break;
+
+ case 7:
+ if (MOD06_02244F24(unkStruct1->unk0))
+ {
+ MOD06_02244F2C(unkStruct1->unk0);
+ unkStruct1->action = 1;
+ }
+ break;
+
+ case 8:
+ FUN_0206367C(savStruct, 0);
+ MOD06_02245190(unkStruct1->unk4);
+ MOD06_02244DBC(unkStruct1->unk0);
+ FreeToHeap(unkStruct1);
+ return 1;
+
+ default:
+ break;
+ }
+ return 0;
+} \ No newline at end of file
diff --git a/include/unk_0206015C.h b/include/unk_0206015C.h
new file mode 100644
index 00000000..75d75c53
--- /dev/null
+++ b/include/unk_0206015C.h
@@ -0,0 +1,60 @@
+#include "global.h"
+#include "script.h"
+#include "main.h"
+#include "unk_0204639C.h"
+#include "heap.h"
+#include "event_data.h"
+
+/* Note to future reader, there might be some errors
+ in the return type / parameters. They are right for this code
+ but they might not be for every code, please do not blindly
+ trust these prototypes if you are decompiling these functions. */
+extern THUMB_FUNC u32 MOD06_02244DB0(u32);
+extern THUMB_FUNC void MOD06_02244DBC(void*);
+extern THUMB_FUNC void MOD06_02244DC4(void*, void*);
+extern THUMB_FUNC void MOD06_02244EF8(void*);
+extern THUMB_FUNC void MOD06_02244F18(void*);
+extern THUMB_FUNC BOOL MOD06_02244F24(void*);
+extern THUMB_FUNC void MOD06_02244F2C(void*);
+extern THUMB_FUNC void* MOD06_02245088(struct UnkSavStruct80 * savStruct);
+extern THUMB_FUNC u32 MOD06_02245114(u32, struct UnkSavStruct80*);
+extern THUMB_FUNC void MOD06_02245190(u32);
+extern THUMB_FUNC void MOD06_02245198(u8, u32);
+extern THUMB_FUNC u32 MOD06_022451F0(u32);
+
+extern THUMB_FUNC void FUN_020054C8(u32);
+extern THUMB_FUNC void FUN_02049160(struct UnkStruct_0204639C*, u32);
+extern THUMB_FUNC void FUN_0204AF84(struct UnkStruct_0204639C*);
+extern THUMB_FUNC void FUN_0204AF3C(struct UnkStruct_0204639C *);
+extern THUMB_FUNC void FUN_0204AFC8(struct UnkStruct_0204639C *);
+extern THUMB_FUNC void FUN_0204B00C(struct UnkStruct_0204639C *);
+extern THUMB_FUNC void FUN_0204C1B4(struct UnkStruct_0204639C*, u32,u32,u32,u32,u32,u32,u32);
+extern THUMB_FUNC u32 FUN_020553A0(u32);
+extern THUMB_FUNC void FUN_0205889C(u32, u32);
+extern THUMB_FUNC void FUN_0205F1C4(struct ScriptState *);
+extern THUMB_FUNC void FUN_0205F1D4(struct ScriptState *);
+extern THUMB_FUNC void FUN_0206367C(struct UnkSavStruct80 *, u32);
+
+
+struct UnkStruct_0206015C
+{
+ u32 unk0;
+ u32 unk4;
+ u32 unk8;
+ u8 unkC;
+ u8 unkD;
+};
+
+struct UnkStruct_0204652C
+{
+ void* unk0;
+ u32 unk4;
+ u32 unk8;
+ u8 action;
+ u8 unkD; // some kind of counter?
+ u8 unkE; // some kind of counter?
+};
+
+THUMB_FUNC void FUN_0206015C(struct UnkSavStruct80* savStruct);
+THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C * unkStruct0);
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 04:49:03 +0000