finish decompiling record_mixing

7 files changed, 83 insertions, 181 deletions

diff --git a/asm/record_mixing.s b/asm/record_mixing.s
deleted file mode 100644
index 4da19f894..000000000
--- a/asm/record_mixing.s
+++ /dev/null
@@ -1,174 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80B9F3C
-sub_80B9F3C: @ 80B9F3C
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r1, 24
-	cmp r1, 0
-	beq _080BA000
-	ldrh r0, [r4]
-	cmp r0, 0
-	beq _080BA000
-	bl GetPocketByItemId
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x5
-	bne _080B9FC8
-	ldrh r0, [r4]
-	movs r1, 0x1
-	bl CheckBagHasItem
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B9FB8
-	ldrh r0, [r4]
-	movs r1, 0x1
-	bl CheckPCHasItem
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B9FB8
-	ldrh r0, [r4]
-	movs r1, 0x1
-	bl AddBagItem
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B9FB8
-	ldr r0, _080B9FA4 @ =0x00004001
-	ldrh r1, [r4]
-	bl VarSet
-	ldr r0, _080B9FA8 @ =gStringVar1
-	ldr r1, _080B9FAC @ =gLinkPlayers + 0x8
-	bl StringCopy
-	ldrh r1, [r4]
-	ldr r0, _080B9FB0 @ =0x00000113
-	cmp r1, r0
-	bne _080BA000
-	ldr r0, _080B9FB4 @ =0x00000853
-	bl FlagSet
-	b _080BA000
-	.align 2, 0
-_080B9FA4: .4byte 0x00004001
-_080B9FA8: .4byte gStringVar1
-_080B9FAC: .4byte gLinkPlayers + 0x8
-_080B9FB0: .4byte 0x00000113
-_080B9FB4: .4byte 0x00000853
-_080B9FB8:
-	ldr r0, _080B9FC4 @ =0x00004001
-	movs r1, 0
-	bl VarSet
-	b _080BA000
-	.align 2, 0
-_080B9FC4: .4byte 0x00004001
-_080B9FC8:
-	ldrh r0, [r4]
-	movs r1, 0x1
-	bl AddBagItem
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080B9FF8
-	ldr r0, _080B9FEC @ =0x00004001
-	ldrh r1, [r4]
-	bl VarSet
-	ldr r0, _080B9FF0 @ =gStringVar1
-	ldr r1, _080B9FF4 @ =gLinkPlayers + 0x8
-	bl StringCopy
-	b _080BA000
-	.align 2, 0
-_080B9FEC: .4byte 0x00004001
-_080B9FF0: .4byte gStringVar1
-_080B9FF4: .4byte gLinkPlayers + 0x8
-_080B9FF8:
-	ldr r0, _080BA008 @ =0x00004001
-	movs r1, 0
-	bl VarSet
-_080BA000:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BA008: .4byte 0x00004001
-	thumb_func_end sub_80B9F3C
-
-	thumb_func_start sub_80BA00C
-sub_80BA00C: @ 80BA00C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	ldr r1, _080BA030 @ =gTasks
-	adds r4, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x5
-	bhi _080BA09C
-	lsls r0, 2
-	ldr r1, _080BA034 @ =_080BA038
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080BA030: .4byte gTasks
-_080BA034: .4byte _080BA038
-	.align 2, 0
-_080BA038:
-	.4byte _080BA086
-	.4byte _080BA086
-	.4byte _080BA050
-	.4byte _080BA05A
-	.4byte _080BA074
-	.4byte _080BA08E
-_080BA050:
-	bl SetSecretBase2Field_9_AndHideBG
-	bl sub_8125E2C
-	b _080BA086
-_080BA05A:
-	bl sub_8125E6C
-	lsls r0, 24
-	cmp r0, 0
-	beq _080BA09C
-	bl ClearSecretBase2Field_9_2
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	movs r1, 0
-	strh r0, [r4, 0x8]
-	strh r1, [r4, 0xA]
-	b _080BA09C
-_080BA074:
-	ldrh r0, [r4, 0xA]
-	adds r0, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xA
-	ble _080BA09C
-	bl sub_800832C
-_080BA086:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _080BA09C
-_080BA08E:
-	ldr r0, _080BA0A4 @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080BA09C
-	adds r0, r2, 0
-	bl DestroyTask
-_080BA09C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BA0A4: .4byte gReceivedRemoteLinkPlayers
-	thumb_func_end sub_80BA00C
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/flags.h b/include/flags.h
index 0e408a833..26a129ea2 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -50,6 +50,7 @@
 #define SYS_BRAILLE_STRENGTH 0x850
 #define SYS_BRAILLE_WAIT     0x851
 #define SYS_BRAILLE_FLY      0x852
+#define SYS_HAS_EON_TICKET   0x853
 
 #define SYS_TV_LATI          0x85D
 
diff --git a/include/record_mixing.h b/include/record_mixing.h
index 036bb469e..e0a56d4b0 100644
--- a/include/record_mixing.h
+++ b/include/record_mixing.h
@@ -28,7 +28,7 @@ u8 sub_80B9C4C(u8 *a);
 
 // ASM
 void sub_80B9C6C(u8 *, u32, u8, void *);
-void sub_80B9F3C(void *, u8);
+void sub_80B9F3C(u16 *, u8);
 void sub_80BA00C(u8);
 
 #endif // GUARD_RECORD_MIXING_H
diff --git a/include/save.h b/include/save.h
index 3feaa1f3d..6c47c6f60 100644
--- a/include/save.h
+++ b/include/save.h
@@ -74,7 +74,7 @@ bool8 sub_8125DA8(void);
 u8 sub_8125DDC(void);
 u8 sub_8125E04(void);
 u8 sub_8125E2C(void);
-u8 sub_8125E6C(void);
+bool8 sub_8125E6C(void);
 u8 sub_8125EC8(u8 a1);
 bool8 unref_sub_8125F4C(struct UnkSaveSection *a1);
 u8 unref_sub_8125FA0(void);
diff --git a/ld_script.txt b/ld_script.txt
index a51f50947..897747da8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -168,7 +168,6 @@ SECTIONS {
         src/money.o(.text);
         asm/contest_effect.o(.text);
         src/record_mixing.o(.text);
-        asm/record_mixing.o(.text);
         src/sound_check_menu.o(.text);
         src/secret_base.o(.text);
         asm/secret_base.o(.text_80BC1D0);
diff --git a/src/record_mixing.c b/src/record_mixing.c
index e306669c9..a81b7743a 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -6,12 +6,16 @@
 #include "dewford_trend.h"
 #include "event_data.h"
 #include "fldeff_80C5CD4.h"
+#include "item.h"
+#include "items.h"
+#include "load_save.h"
 #include "link.h"
 #include "mauville_old_man.h"
 #include "menu.h"
 #include "mystery_event_script.h"
 #include "rng.h"
 #include "rom4.h"
+#include "save.h"
 #include "script.h"
 #include "secret_base.h"
 #include "songs.h"
@@ -461,7 +465,6 @@ u8 sub_80B9C4C(u8 *a)
     return r2;
 }
 
-//extern const u8 gUnknown_083D02B4[];
 extern const u8 gUnknown_083D02B4[][2];
 
 #ifdef NONMATCHING
@@ -1004,3 +1007,76 @@ _080B9F38: .4byte 0x00003074\n\
     .syntax divided\n");
 }
 #endif
+
+void sub_80B9F3C(u16 *a, u8 b)
+{
+    if (b != 0 && *a != 0)
+    {
+        if (GetPocketByItemId(*a) == 5)
+        {
+            if (!CheckBagHasItem(*a, 1) && !CheckPCHasItem(*a, 1) && AddBagItem(*a, 1))
+            {
+                VarSet(VAR_0x4001, *a);
+                StringCopy(gStringVar1, gLinkPlayers[0].name);
+                if (*a == ITEM_EON_TICKET)
+                    FlagSet(SYS_HAS_EON_TICKET);
+            }
+            else
+            {
+                VarSet(VAR_0x4001, ITEM_NONE);
+            }
+        }
+        else
+        {
+            if (AddBagItem(*a, 1) == TRUE)
+            {
+                VarSet(VAR_0x4001, *a);
+                StringCopy(gStringVar1, gLinkPlayers[0].name);
+            }
+            else
+            {
+                VarSet(VAR_0x4001, ITEM_NONE);
+            }
+        }
+    }
+}
+
+void sub_80BA00C(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        task->data[0]++;
+        break;
+    case 1:
+        task->data[0]++;
+        break;
+    case 2:
+        SetSecretBase2Field_9_AndHideBG();
+        sub_8125E2C();
+        task->data[0]++;
+        break;
+    case 3:
+        if (sub_8125E6C() != 0)
+        {
+            ClearSecretBase2Field_9_2();
+            task->data[0]++;
+            task->data[1] = 0;
+        }
+        break;
+    case 4:
+        task->data[1]++;
+        if (task->data[1] > 10)
+        {
+            sub_800832C();
+            task->data[0]++;
+        }
+        break;
+    case 5:
+        if (!gReceivedRemoteLinkPlayers)
+            DestroyTask(taskId);
+        break;
+    }
+}
diff --git a/src/save.c b/src/save.c
index 570210fb0..46094746a 100644
--- a/src/save.c
+++ b/src/save.c
@@ -672,9 +672,9 @@ u8 sub_8125E2C(void)
     return 0;
 }
 
-u8 sub_8125E6C(void)
+bool8 sub_8125E6C(void)
 {
-    u8 retVal = 0;
+    u8 retVal = FALSE;
     u16 val = ++gUnknown_03005EB4;
     if (val <= 4)
     {
@@ -684,7 +684,7 @@ u8 sub_8125E6C(void)
     else
     {
         sub_81257F0(val, gSaveSectionLocations);
-        retVal = 1;
+        retVal = TRUE;
     }
     if (gDamagedSaveSectors)
         DoSaveFailedScreen(1);