sub_804DC88

2 files changed, 140 insertions, 478 deletions

diff --git a/asm/trade.s b/asm/trade.s
index caadad6ee..4221e3c1b 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -5395,483 +5395,6 @@ _0804DAD0: .4byte gEnemyParty
 
 .section .text.sub_804DB2C
 
-	thumb_func_start sub_804DC88
-sub_804DC88: @ 804DC88
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r1, _0804DCA8 @ =gMain
-	ldr r2, _0804DCAC @ =0x0000043c
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r2, r1, 0
-	cmp r0, 0x65
-	bls _0804DC9C
-	b _0804E11A
-_0804DC9C:
-	lsls r0, 2
-	ldr r1, _0804DCB0 @ =_0804DCB4
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0804DCA8: .4byte gMain
-_0804DCAC: .4byte 0x0000043c
-_0804DCB0: .4byte _0804DCB4
-	.align 2, 0
-_0804DCB4:
-	.4byte _0804DE4C
-	.4byte _0804DE9C
-	.4byte _0804DF14
-	.4byte _0804E11A
-	.4byte _0804DFE0
-	.4byte _0804E078
-	.4byte _0804E0A0
-	.4byte _0804E0BC
-	.4byte _0804E0E4
-	.4byte _0804E10C
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E008
-	.4byte _0804E034
-	.4byte _0804E04C
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804DF54
-	.4byte _0804DF7C
-	.4byte _0804DF9C
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804E11A
-	.4byte _0804DEB4
-	.4byte _0804DEF4
-_0804DE4C:
-	ldr r5, _0804DE88 @ =gUnknown_03004828
-	ldr r0, _0804DE8C @ =0x0201f000
-	str r0, [r5]
-	ldr r1, _0804DE90 @ =0x0000043c
-	adds r2, r1
-	ldrb r1, [r2]
-	adds r1, 0x1
-	strb r1, [r2]
-	adds r0, 0x4
-	movs r1, 0x13
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x1D
-	bl ZeroFillWindowRect
-	ldr r4, _0804DE94 @ =gStringVar4
-	ldr r1, _0804DE98 @ =gOtherText_LinkStandby2
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	ldr r1, [r5]
-	adds r0, r1, 0x4
-	adds r1, 0x34
-	ldrb r2, [r1]
-	movs r1, 0xF
-	str r1, [sp]
-	adds r1, r4, 0
-	b _0804DF3E
-	.align 2, 0
-_0804DE88: .4byte gUnknown_03004828
-_0804DE8C: .4byte 0x0201f000
-_0804DE90: .4byte 0x0000043c
-_0804DE94: .4byte gStringVar4
-_0804DE98: .4byte gOtherText_LinkStandby2
-_0804DE9C:
-	bl sub_80084A4
-	ldr r0, _0804DEAC @ =gMain
-	ldr r2, _0804DEB0 @ =0x0000043c
-	adds r0, r2
-	movs r2, 0
-	movs r1, 0x64
-	b _0804DFEE
-	.align 2, 0
-_0804DEAC: .4byte gMain
-_0804DEB0: .4byte 0x0000043c
-_0804DEB4:
-	ldr r0, _0804DEE8 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r3, r0, 0
-	adds r3, 0xC0
-	ldr r0, [r3]
-	adds r0, 0x1
-	str r0, [r3]
-	cmp r0, 0xB4
-	bls _0804DED2
-	ldr r1, _0804DEEC @ =0x0000043c
-	adds r0, r2, r1
-	movs r2, 0
-	movs r1, 0x65
-	strb r1, [r0]
-	str r2, [r3]
-_0804DED2:
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804DEDE
-	b _0804E11A
-_0804DEDE:
-	ldr r0, _0804DEF0 @ =gMain
-	ldr r2, _0804DEEC @ =0x0000043c
-	adds r0, r2
-	b _0804DF06
-	.align 2, 0
-_0804DEE8: .4byte gUnknown_03004828
-_0804DEEC: .4byte 0x0000043c
-_0804DEF0: .4byte gMain
-_0804DEF4:
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804DF00
-	b _0804E11A
-_0804DF00:
-	ldr r0, _0804DF0C @ =gMain
-	ldr r1, _0804DF10 @ =0x0000043c
-	adds r0, r1
-_0804DF06:
-	movs r1, 0x2
-	strb r1, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804DF0C: .4byte gMain
-_0804DF10: .4byte 0x0000043c
-_0804DF14:
-	ldr r0, _0804DF48 @ =0x0000043c
-	adds r1, r2, r0
-	movs r0, 0x32
-	strb r0, [r1]
-	ldr r4, _0804DF4C @ =gUnknown_03004828
-	ldr r0, [r4]
-	adds r0, 0x4
-	movs r1, 0x13
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x1D
-	bl ZeroFillWindowRect
-	ldr r2, [r4]
-	adds r0, r2, 0x4
-	ldr r1, _0804DF50 @ =gSystemText_Saving
-	adds r2, 0x34
-	ldrb r2, [r2]
-	movs r3, 0xF
-	str r3, [sp]
-_0804DF3E:
-	movs r3, 0x2
-	bl sub_8003460
-	b _0804E11A
-	.align 2, 0
-_0804DF48: .4byte 0x0000043c
-_0804DF4C: .4byte gUnknown_03004828
-_0804DF50: .4byte gSystemText_Saving
-_0804DF54:
-	bl SetSecretBase2Field_9_AndHideBG
-	movs r0, 0x15
-	bl IncrementGameStat
-	bl sub_8125D80
-	ldr r1, _0804DF74 @ =gMain
-	ldr r2, _0804DF78 @ =0x0000043c
-	adds r1, r2
-	ldrb r0, [r1]
-	adds r0, 0x1
-	movs r2, 0
-	strb r0, [r1]
-	b _0804DFF0
-	.align 2, 0
-_0804DF74: .4byte gMain
-_0804DF78: .4byte 0x0000043c
-_0804DF7C:
-	ldr r0, _0804DF94 @ =gUnknown_03004828
-	ldr r1, [r0]
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x5
-	beq _0804DF8E
-	b _0804E11A
-_0804DF8E:
-	ldr r0, _0804DF98 @ =0x0000043c
-	adds r1, r2, r0
-	b _0804E0FA
-	.align 2, 0
-_0804DF94: .4byte gUnknown_03004828
-_0804DF98: .4byte 0x0000043c
-_0804DF9C:
-	bl sub_8125DA8
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	beq _0804DFC0
-	bl ClearSecretBase2Field_9_2
-	ldr r0, _0804DFB8 @ =gMain
-	ldr r1, _0804DFBC @ =0x0000043c
-	adds r0, r1
-	movs r1, 0x4
-	strb r1, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804DFB8: .4byte gMain
-_0804DFBC: .4byte 0x0000043c
-_0804DFC0:
-	ldr r0, _0804DFD4 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0xC0
-	str r1, [r0]
-	ldr r0, _0804DFD8 @ =gMain
-	ldr r2, _0804DFDC @ =0x0000043c
-	adds r0, r2
-	movs r1, 0x33
-	strb r1, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804DFD4: .4byte gUnknown_03004828
-_0804DFD8: .4byte gMain
-_0804DFDC: .4byte 0x0000043c
-_0804DFE0:
-	bl sub_8125DDC
-	ldr r0, _0804DFFC @ =gMain
-	ldr r1, _0804E000 @ =0x0000043c
-	adds r0, r1
-	movs r2, 0
-	movs r1, 0x28
-_0804DFEE:
-	strb r1, [r0]
-_0804DFF0:
-	ldr r0, _0804E004 @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r0, 0xC0
-	str r2, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804DFFC: .4byte gMain
-_0804E000: .4byte 0x0000043c
-_0804E004: .4byte gUnknown_03004828
-_0804E008:
-	ldr r0, _0804E02C @ =gUnknown_03004828
-	ldr r0, [r0]
-	adds r1, r0, 0
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x32
-	bhi _0804E01C
-	b _0804E11A
-_0804E01C:
-	movs r0, 0
-	str r0, [r1]
-	ldr r0, _0804E030 @ =0x0000043c
-	adds r1, r2, r0
-	movs r0, 0x29
-	strb r0, [r1]
-	b _0804E11A
-	.align 2, 0
-_0804E02C: .4byte gUnknown_03004828
-_0804E030: .4byte 0x0000043c
-_0804E034:
-	bl sub_80084A4
-	ldr r0, _0804E044 @ =gMain
-	ldr r1, _0804E048 @ =0x0000043c
-	adds r0, r1
-	movs r1, 0x2A
-	strb r1, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804E044: .4byte gMain
-_0804E048: .4byte 0x0000043c
-_0804E04C:
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	beq _0804E11A
-	bl sub_8125E04
-	ldr r1, _0804E06C @ =gSoftResetDisabled
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, _0804E070 @ =gMain
-	ldr r2, _0804E074 @ =0x0000043c
-	adds r0, r2
-	movs r1, 0x5
-	strb r1, [r0]
-	b _0804E11A
-	.align 2, 0
-_0804E06C: .4byte gSoftResetDisabled
-_0804E070: .4byte gMain
-_0804E074: .4byte 0x0000043c
-_0804E078:
-	ldr r0, _0804E098 @ =gUnknown_03004828
-	ldr r1, [r0]
-	adds r1, 0xC0
-	ldr r0, [r1]
-	adds r0, 0x1
-	str r0, [r1]
-	cmp r0, 0x3C
-	bls _0804E11A
-	ldr r0, _0804E09C @ =0x0000043c
-	adds r1, r2, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	bl sub_80084A4
-	b _0804E11A
-	.align 2, 0
-_0804E098: .4byte gUnknown_03004828
-_0804E09C: .4byte 0x0000043c
-_0804E0A0:
-	bl sub_8007ECC
-	lsls r0, 24
-	cmp r0, 0
-	beq _0804E11A
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	b _0804E0F4
-_0804E0BC:
-	ldr r0, _0804E0D8 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0804E11A
-	movs r0, 0x3
-	bl FadeOutBGM
-	ldr r1, _0804E0DC @ =gMain
-	ldr r0, _0804E0E0 @ =0x0000043c
-	adds r1, r0
-	b _0804E0FA
-	.align 2, 0
-_0804E0D8: .4byte gPaletteFade
-_0804E0DC: .4byte gMain
-_0804E0E0: .4byte 0x0000043c
-_0804E0E4:
-	bl IsBGMStopped
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0804E11A
-	bl sub_800832C
-_0804E0F4:
-	ldr r1, _0804E104 @ =gMain
-	ldr r2, _0804E108 @ =0x0000043c
-	adds r1, r2
-_0804E0FA:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _0804E11A
-	.align 2, 0
-_0804E104: .4byte gMain
-_0804E108: .4byte 0x0000043c
-_0804E10C:
-	ldr r0, _0804E13C @ =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0804E11A
-	ldr r0, _0804E140 @ =sub_804E144
-	bl SetMainCallback2
-_0804E11A:
-	bl HasLinkErrorOccurred
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804E128
-	bl RunTasks
-_0804E128:
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804E13C: .4byte gReceivedRemoteLinkPlayers
-_0804E140: .4byte sub_804E144
-	thumb_func_end sub_804DC88
-
 	thumb_func_start sub_804E144
 sub_804E144: @ 804E144
 	push {lr}
diff --git a/src/trade.c b/src/trade.c
index 2d045d3b5..8eb9983c8 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -25,6 +25,9 @@
 #include "rom_8077ABC.h"
 #include "daycare.h"
 #include "event_data.h"
+#include "strings.h"
+#include "load_save.h"
+#include "save.h"
 #include "trade.h"
 
 #ifdef ENGLISH
@@ -116,7 +119,10 @@ struct UnkStructF {
 };
 
 struct TradeEwramSubstruct2 {
-    /*0x0000*/ u8 filler_0000[0x9c];
+    /*0x0000*/ u8 filler_0000;
+    /*0x0004*/ struct Window window;
+    /*0x0034*/ u8 unk_0034;
+    /*0x0035*/ u8 filler_0035[0x67];
     /*0x009c*/ u8 unk_009c;
     /*0x009d*/ u8 unk_009d;
     /*0x009e*/ u16 linkData[13];
@@ -124,6 +130,7 @@ struct TradeEwramSubstruct2 {
     /*0x00b9*/ u8 unk_00b9;
     /*0x00ba*/ u8 filler_00ba[3];
     /*0x00bd*/ u8 unk_00bd;
+    /*0x00c0*/ u32 unk_00c0;
 };
 
 struct TradeEwramStruct {
@@ -186,6 +193,7 @@ void sub_804A51C(u8, u8, u8, u8, u8, u8);
 /*static*/ void sub_804BB78(void);
 /*static*/ void sub_804D63C(void);
 /*static*/ bool8 sub_804B2B0(void);
+/*static*/ void sub_804E144(void);
 
 extern u8 gUnknown_020297D8[2];
 extern u8 *gUnknown_020296CC[13];
@@ -3225,3 +3233,134 @@ void sub_804DC18(void)
     BuildOamBuffer();
     UpdatePaletteFade();
 }
+
+void sub_804DC88(void)
+{
+    switch (gMain.state)
+    {
+        case 0:
+            gUnknown_03004828 = &ewram_2010000.unk_0f000;
+            gMain.state ++;
+            ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
+            StringExpandPlaceholders(gStringVar4, gOtherText_LinkStandby2);
+            sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->unk_0034, 2, 15);
+            break;
+        case 1:
+            sub_80084A4();
+            gMain.state = 100;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 100:
+            if (++ gUnknown_03004828->unk_00c0 > 180)
+            {
+                gMain.state = 101;
+                gUnknown_03004828->unk_00c0 = 0;
+            }
+            if (sub_8007ECC())
+            {
+                gMain.state = 2;
+            }
+            break;
+        case 101:
+            if (sub_8007ECC())
+            {
+                gMain.state = 2;
+            }
+            break;
+        case 2:
+            gMain.state = 50;
+            ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19);
+            sub_8003460(&gUnknown_03004828->window, gSystemText_Saving, gUnknown_03004828->unk_0034, 2, 15);
+            break;
+        case 50:
+            SetSecretBase2Field_9_AndHideBG();
+            IncrementGameStat(GAME_STAT_POKEMON_TRADES);
+            sub_8125D80();
+            gMain.state ++;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 51:
+            if (++ gUnknown_03004828->unk_00c0 == 5)
+            {
+                gMain.state ++;
+            }
+            break;
+        case 52:
+            if (sub_8125DA8())
+            {
+                ClearSecretBase2Field_9_2();
+                gMain.state = 4;
+            }
+            else
+            {
+                gUnknown_03004828->unk_00c0 = 0;
+                gMain.state = 51;
+            }
+            break;
+        case 4:
+            sub_8125DDC();
+            gMain.state = 40;
+            gUnknown_03004828->unk_00c0 = 0;
+            break;
+        case 40:
+            if (++ gUnknown_03004828->unk_00c0 > 50)
+            {
+                gUnknown_03004828->unk_00c0 = 0;
+                gMain.state = 41;
+            }
+            break;
+        case 41:
+            sub_80084A4();
+            gMain.state = 42;
+            break;
+        case 42:
+            if (sub_8007ECC())
+            {
+                sub_8125E04();
+                gSoftResetDisabled = FALSE;
+                gMain.state = 5;
+            }
+            break;
+        case 5:
+            if (++ gUnknown_03004828->unk_00c0 > 60)
+            {
+                gMain.state ++;
+                sub_80084A4();
+            }
+            break;
+        case 6:
+            if (sub_8007ECC())
+            {
+                BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+                gMain.state ++;
+            }
+            break;
+        case 7:
+            if (!gPaletteFade.active)
+            {
+                FadeOutBGM(3);
+                gMain.state ++;
+            }
+            break;
+        case 8:
+            if (IsBGMStopped() == TRUE)
+            {
+                sub_800832C();
+                gMain.state ++;
+            }
+            break;
+        case 9:
+            if (!gReceivedRemoteLinkPlayers)
+            {
+                SetMainCallback2(sub_804E144);
+            }
+            break;
+    }
+    if (!HasLinkErrorOccurred())
+    {
+        RunTasks();
+    }
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}