sub_815DA54

4 files changed, 67 insertions, 194 deletions

diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s
index 4cb4a6ea1..8082a016a 100644
--- a/asm/trainer_tower.s
+++ b/asm/trainer_tower.s
@@ -5,196 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_815DA54
-sub_815DA54: @ 815DA54
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	bl sub_815DC8C
-	ldr r5, _0815DBC4 @ =gUnknown_203F45C
-	movs r0, 0x40
-	bl AllocZeroed
-	str r0, [r5]
-	ldr r0, _0815DBC8 @ =0x00004001
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	mov r10, r0
-	ldr r0, [r5]
-	ldr r1, _0815DBCC @ =gUnknown_203F458
-	ldr r1, [r1]
-	ldrb r3, [r1]
-	lsls r2, r3, 5
-	subs r2, r3
-	lsls r2, 5
-	adds r2, 0xC
-	adds r1, r2
-	mov r2, r10
-	lsls r6, r2, 2
-	adds r4, r6, r2
-	lsls r4, 3
-	add r4, r10
-	lsls r4, 3
-	adds r2, r4, 0x4
-	adds r1, r2
-	movs r2, 0xB
-	bl StringCopyN
-	movs r0, 0
-	mov r9, r0
-	str r6, [sp]
-	mov r12, r4
-	mov r1, r10
-	adds r1, 0x1
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r1
-	lsls r5, r0, 3
-_0815DAB8:
-	ldr r0, _0815DBC4 @ =gUnknown_203F45C
-	ldr r0, [r0]
-	mov r8, r0
-	mov r1, r9
-	lsls r4, r1, 1
-	mov r2, r8
-	adds r2, 0xC
-	adds r2, r4
-	ldr r0, _0815DBCC @ =gUnknown_203F458
-	ldr r3, [r0]
-	ldrb r1, [r3]
-	lsls r0, r1, 5
-	subs r0, r1
-	lsls r0, 5
-	add r0, r12
-	adds r7, r3, 0
-	adds r7, 0x2A
-	adds r0, r7, r0
-	ldrh r0, [r0]
-	strh r0, [r2]
-	mov r2, r8
-	adds r2, 0x18
-	adds r2, r4
-	ldrb r1, [r3]
-	lsls r0, r1, 5
-	subs r0, r1
-	lsls r0, 5
-	add r0, r12
-	adds r6, r3, 0
-	adds r6, 0x36
-	adds r0, r6, r0
-	ldrh r0, [r0]
-	strh r0, [r2]
-	ldrb r1, [r3]
-	lsls r0, r1, 5
-	subs r0, r1
-	lsls r2, r0, 5
-	adds r0, r3, r2
-	ldrb r0, [r0, 0xE]
-	cmp r0, 0x1
-	bne _0815DB2E
-	mov r1, r8
-	adds r1, 0x24
-	adds r1, r4
-	adds r0, r5, r2
-	adds r0, r7, r0
-	ldrh r0, [r0]
-	strh r0, [r1]
-	mov r2, r8
-	adds r2, 0x30
-	adds r2, r4
-	ldrb r1, [r3]
-	lsls r0, r1, 5
-	subs r0, r1
-	lsls r0, 5
-	adds r0, r5, r0
-	adds r0, r6, r0
-	ldrh r0, [r0]
-	strh r0, [r2]
-_0815DB2E:
-	movs r2, 0x2
-	add r12, r2
-	adds r5, 0x2
-	movs r0, 0x1
-	add r9, r0
-	mov r1, r9
-	cmp r1, 0x5
-	ble _0815DAB8
-	ldr r2, _0815DBC4 @ =gUnknown_203F45C
-	ldr r3, [r2]
-	ldr r0, _0815DBCC @ =gUnknown_203F458
-	ldr r1, [r0]
-	ldrb r2, [r1]
-	lsls r0, r2, 5
-	subs r0, r2
-	lsls r0, 5
-	adds r1, r0
-	ldrb r0, [r1, 0xE]
-	adds r3, 0x3C
-	strb r0, [r3]
-	ldr r1, _0815DBC4 @ =gUnknown_203F45C
-	ldr r4, [r1]
-	ldr r2, _0815DBCC @ =gUnknown_203F458
-	ldr r3, [r2]
-	ldr r1, [sp]
-	add r1, r10
-	lsls r1, 3
-	add r1, r10
-	lsls r1, 3
-	ldrb r2, [r3]
-	lsls r0, r2, 5
-	subs r0, r2
-	lsls r0, 5
-	adds r0, r1, r0
-	adds r3, r0
-	ldrb r0, [r3, 0x1B]
-	adds r4, 0x3D
-	strb r0, [r4]
-	ldr r0, _0815DBC4 @ =gUnknown_203F45C
-	ldr r4, [r0]
-	ldr r2, _0815DBCC @ =gUnknown_203F458
-	ldr r3, [r2]
-	ldrb r2, [r3]
-	lsls r0, r2, 5
-	subs r0, r2
-	lsls r0, 5
-	adds r1, r0
-	adds r3, r1
-	ldrb r0, [r3, 0x1C]
-	adds r4, 0x3E
-	strb r0, [r4]
-	ldr r0, _0815DBD0 @ =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r2, _0815DBD4 @ =0x00003d34
-	adds r1, r0, r2
-	ldr r2, [r1]
-	lsls r1, r2, 1
-	adds r1, r2
-	lsls r1, 2
-	ldr r2, _0815DBD8 @ =0x00003d38
-	adds r1, r2
-	adds r0, r1
-	bl SetVBlankCounter1Ptr
-	bl sub_815DD2C
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815DBC4: .4byte gUnknown_203F45C
-_0815DBC8: .4byte 0x00004001
-_0815DBCC: .4byte gUnknown_203F458
-_0815DBD0: .4byte gSaveBlock1Ptr
-_0815DBD4: .4byte 0x00003d34
-_0815DBD8: .4byte 0x00003d38
-	thumb_func_end sub_815DA54
-
 	thumb_func_start sub_815DBDC
 sub_815DBDC: @ 815DBDC
 	push {r4,lr}
diff --git a/include/global.h b/include/global.h
index c47bd2d15..68428a3a0 100644
--- a/include/global.h
+++ b/include/global.h
@@ -737,8 +737,9 @@ struct SaveBlock1
     /*0x3A48*/ u8 filler_3a48[4];
     /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH];
     /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS];
-    /*0x3A94*/ u8 filler3A94[0x2A4];
-               u32 unkArray[4][3];
+    /*0x3A94*/ u8 filler3A94[0x2A0];
+    /*0x3D34*/ u32 unkArrayIdx;
+    /*0x3D38*/ u32 unkArray[4][3];
 };
 
 extern struct SaveBlock1* gSaveBlock1Ptr;
diff --git a/include/main.h b/include/main.h
index adbf1fb5d..3fb254c95 100644
--- a/include/main.h
+++ b/include/main.h
@@ -65,6 +65,7 @@ void InitFlashTimer(void);
 void DoSoftReset(void);
 void ClearPokemonCrySongs(void);
 void RestoreSerialTimer3IntrHandlers(void);
+void SetVBlankCounter1Ptr(u32 *ptr);
 
 extern const char RomHeaderGameCode[4];
 extern const char RomHeaderSoftwareVersion;
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index f1526dfc0..1df4dddcd 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "main.h"
 #include "constants/flags.h"
 #include "constants/vars.h"
 #include "malloc.h"
@@ -18,17 +19,43 @@ struct UnkStruct_8479D34
     u8 flags3[8];
 };
 
+struct UnkSubstruct_203F458_000C_004
+{
+    /* 0x004 */ u8 unk_000[11];
+    /* 0x00F */ u8 unk_00B;
+    /* 0x010 */ u8 unk_00C;
+    /* 0x011 */ u8 unk_00D[13];
+    /* 0x01A */ u16 unk_01A[6];
+    /* 0x026 */ u16 unk_026[6];
+    /* 0x032 */ u8 filler_032[0x116];
+}; // size: 328
+
+struct UnkSubstruct_203F458_000C
+{
+    /* 0x000 */ u8 filler_000[2];
+    /* 0x002 */ u8 unk_002;
+    /* 0x003 */ u8 unk_003;
+    /* 0x004 */ struct UnkSubstruct_203F458_000C_004 unk_004[3];
+    /* 0x3DC */ u8 filler_3DC[4];
+};
+
 struct UnkStruct_203F458
 {
-    /* 0x0000 */ u8 filler_0000[0x1F0C];
+    /* 0x0000 */ u8 unk_0000;
+    /* 0x0001 */ u8 filler_0001[11];
+    /* 0x000C */ struct UnkSubstruct_203F458_000C unk_000C[8];
 };
 
 struct UnkStruct_203F45C
 {
     /* 0x00 */ u8 unk_00[11];
-    /* 0x0B */ u8 filler_0B[49];
+    /* 0x0C */ u16 unk_0C[6];
+    /* 0x18 */ u16 unk_18[6];
+    /* 0x24 */ u16 unk_24[6];
+    /* 0x30 */ u16 unk_30[6];
     /* 0x3C */ u8 unk_3C;
     /* 0x3D */ u8 unk_3D;
+    /* 0x3E */ u8 unk_3E;
 };
 
 EWRAM_DATA struct UnkStruct_203F458 * gUnknown_203F458 = NULL;
@@ -184,3 +211,37 @@ u8 sub_815DA3C(void)
 {
     return gFacilityClassToPicIndex[gUnknown_203F45C->unk_3D];
 }
+
+void sub_815DA54(void)
+{
+    u16 r10;
+    s32 r9;
+
+    sub_815DC8C();
+    gUnknown_203F45C = AllocZeroed(sizeof(*gUnknown_203F45C));
+    r10 = VarGet(VAR_0x4001);
+    StringCopyN(gUnknown_203F45C->unk_00, gUnknown_203F458->unk_000C[gUnknown_203F458->unk_0000].unk_004[r10].unk_000, 11);
+
+    for (r9 = 0; r9 < 6; r9++)
+    // r6 = r10 * 4
+    // r12 = r10 * 328
+    // r5 = (r10 + 1) * 328
+    {
+        // r8 = *gUnknown_203F45C
+        // r4 = r9 * 2
+        gUnknown_203F45C->unk_0C[r9] = gUnknown_203F458->unk_000C[gUnknown_203F458->unk_0000].unk_004[r10].unk_01A[r9];
+        gUnknown_203F45C->unk_18[r9] = gUnknown_203F458->unk_000C[gUnknown_203F458->unk_0000].unk_004[r10].unk_026[r9];
+
+        if (gUnknown_203F458->unk_000C[gUnknown_203F458->unk_0000].unk_002 == 1)
+        {
+            gUnknown_203F45C->unk_24[r9] = gUnknown_203F458->unk_000C[gUnknown_203F458->unk_0000].unk_004[r10 + 1].unk_01A[r9];
+            gUnknown_203F45C->unk_30[r9] = gUnknown_203F458->unk_000C[gUnknown_203F458->unk_0000].unk_004[r10 + 1].unk_026[r9];
+        }
+    }
+
+    gUnknown_203F45C->unk_3C = gUnknown_203F458->unk_000C[gUnknown_203F458->unk_0000].unk_002;
+    gUnknown_203F45C->unk_3D = gUnknown_203F458->unk_000C[gUnknown_203F458->unk_0000].unk_004[r10].unk_00B;
+    gUnknown_203F45C->unk_3E = gUnknown_203F458->unk_000C[gUnknown_203F458->unk_0000].unk_004[r10].unk_00C;
+    SetVBlankCounter1Ptr(gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx]);
+    sub_815DD2C();
+}