fix some nonmatching functions (#284)

* fix some nonmatching functions

* delete trailing whitespace

1 files changed, 67 insertions, 349 deletions

diff --git a/src/mail.c b/src/mail.c
index a0a47e98f..1bd4e73dc 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -31,10 +31,10 @@ struct MailLayout
 struct Unk2000000
 {
     /* 0x00*/ u8 words[8][27];
-    /* 0xEC*/ u8 varD8[20];
+    /* 0xD8*/ u8 varD8[20];
     /* 0xEC*/ MainCallback varEC;
     /* 0xF0*/ MainCallback varF0;
-    /* 0xFF*/ struct MailStruct *varF4;
+    /* 0xF4*/ struct MailStruct *varF4;
     /* 0xF8*/ u8 varF8;
     /* 0xF9*/ u8 varF9;
     /* 0xFA*/ u8 varFA;
@@ -61,7 +61,9 @@ struct MailGraphics
     u16 color12;
 };
 
-extern struct Unk2000000 unk_2000000;
+extern u8 ewram[];
+#define ewram0 (*(struct Unk2000000 *)(ewram))
+
 extern struct MailGraphics gMailGraphicsTable[];
 extern u16 gUnknown_083E562C[][2];
 
@@ -71,8 +73,7 @@ extern struct MailLayout gUnknown_083E57A4[];
 extern u8 gOtherText_From[];
 
 static u8 sub_80F8A28(void);
-// static void sub_80F8D50(void);
-// static u8 *sub_80F8D7C(u8 *dest, u8 *src);
+static void sub_80F8D50(void);
 static void sub_80F8DA0(void);
 static void sub_80F8E80(void);
 static void sub_80F8F18(void);
@@ -81,222 +82,69 @@ static void sub_80F8F58(void);
 static void sub_80F8F78(void);
 static void sub_80F8FB4(void);
 
-#ifdef NONMATCHING
 void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2)
 {
     u16 mailDesign;
     u8 buffer[4];
-    u8 local1;
-
-    unk_2000000.varFF = GAME_LANGUAGE;
 
-    // Compiler uses [sub 1], while asm uses [ptr + FE]
-    unk_2000000.varFE = 1;
-    unk_2000000.var104 = (MainCallback)sub_80EB3FC;
-    unk_2000000.var108 = (MainCallback)ConvertEasyChatWordsToString;
+    ewram0.varFF = GAME_LANGUAGE;
+    ewram0.var100 = 1;
+    ewram0.var104 = (MainCallback)sub_80EB3FC;
+    ewram0.var108 = (MainCallback)ConvertEasyChatWordsToString;
 
     mailDesign = arg0->itemId - ITEM_ORANGE_MAIL;
 
     if (mailDesign <= 11)
     {
-        unk_2000000.varFA = arg0->itemId - ITEM_ORANGE_MAIL;
+        ewram0.varFA = arg0->itemId - ITEM_ORANGE_MAIL;
     }
     else
     {
-        unk_2000000.varFA = 0;
+        ewram0.varFA = 0;
         arg2 = FALSE;
     }
 
-    switch (unk_2000000.var100)
+    switch (ewram0.var100)
     {
     case 0:
     default:
-        unk_2000000.var10C = &gUnknown_083E5730[unk_2000000.varFA];
+        ewram0.var10C = &gUnknown_083E5730[ewram0.varFA];
         break;
 
     case 1:
-        unk_2000000.var10C = &gUnknown_083E57A4[unk_2000000.varFA];
+        ewram0.var10C = &gUnknown_083E57A4[ewram0.varFA];
         break;
     }
 
     if (((sub_80A2D64(arg0->species, buffer) << 16) + 0xFFFF0000) <= (410 << 16))
     {
-        switch (unk_2000000.varFA)
+        switch (ewram0.varFA)
         {
         case 6:
-            unk_2000000.varFB = 1;
+            ewram0.varFB = 1;
             break;
 
         case 9:
-            unk_2000000.varFB = 2;
+            ewram0.varFB = 2;
             break;
 
         default:
-            unk_2000000.varFB = 0;
+            ewram0.varFB = 0;
             break;
         }
     }
     else
     {
-        unk_2000000.varFB = 0;
+        ewram0.varFB = 0;
     }
 
 
-    unk_2000000.varF4 = arg0;
-    unk_2000000.varEC = arg1;
-    unk_2000000.varF8 = arg2;
+    ewram0.varF4 = arg0;
+    ewram0.varEC = arg1;
+    ewram0.varF8 = arg2;
 
     SetMainCallback2(sub_80F8D50);
 }
-#else
-__attribute__((naked))
-void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2)
-{
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    sub sp, 0x4\n\
-    adds r4, r0, 0\n\
-    adds r6, r1, 0\n\
-    lsls r2, 24\n\
-    lsrs r5, r2, 24\n\
-    ldr r2, _080F8958 @ =0x02000000\n\
-    adds r1, r2, 0\n\
-    adds r1, 0xFF\n\
-    movs r0, 0x2\n\
-    strb r0, [r1]\n\
-    adds r0, 0xFE\n\
-    adds r1, r2, r0\n\
-    movs r0, 0x1\n\
-    strb r0, [r1]\n\
-    movs r0, 0x82\n\
-    lsls r0, 1\n\
-    adds r1, r2, r0\n\
-    ldr r0, _080F895C @ =sub_80EB3FC\n\
-    str r0, [r1]\n\
-    movs r0, 0x84\n\
-    lsls r0, 1\n\
-    adds r1, r2, r0\n\
-    ldr r0, _080F8960 @ =ConvertEasyChatWordsToString\n\
-    str r0, [r1]\n\
-    ldrh r1, [r4, 0x20]\n\
-    adds r0, r1, 0\n\
-    subs r0, 0x79\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    cmp r0, 0xB\n\
-    bhi _080F8964\n\
-    subs r1, 0x79\n\
-    adds r0, r2, 0\n\
-    adds r0, 0xFA\n\
-    strb r1, [r0]\n\
-    b _080F896E\n\
-    .align 2, 0\n\
-_080F8958: .4byte 0x02000000\n\
-_080F895C: .4byte sub_80EB3FC\n\
-_080F8960: .4byte ConvertEasyChatWordsToString\n\
-_080F8964:\n\
-    adds r1, r2, 0\n\
-    adds r1, 0xFA\n\
-    movs r0, 0\n\
-    strb r0, [r1]\n\
-    movs r5, 0\n\
-_080F896E:\n\
-    ldr r1, _080F8994 @ =0x02000000\n\
-    movs r2, 0x80\n\
-    lsls r2, 1\n\
-    adds r0, r1, r2\n\
-    ldrb r0, [r0]\n\
-    cmp r0, 0\n\
-    beq _080F8980\n\
-    cmp r0, 0x1\n\
-    beq _080F899C\n\
-_080F8980:\n\
-    movs r0, 0x86\n\
-    lsls r0, 1\n\
-    adds r2, r1, r0\n\
-    adds r0, r1, 0\n\
-    adds r0, 0xFA\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 3\n\
-    ldr r1, _080F8998 @ =gUnknown_083E5730\n\
-    b _080F89AC\n\
-    .align 2, 0\n\
-_080F8994: .4byte 0x02000000\n\
-_080F8998: .4byte gUnknown_083E5730\n\
-_080F899C:\n\
-    movs r0, 0x86\n\
-    lsls r0, 1\n\
-    adds r2, r1, r0\n\
-    adds r0, r1, 0\n\
-    adds r0, 0xFA\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 3\n\
-    ldr r1, _080F89DC @ =gUnknown_083E57A4\n\
-_080F89AC:\n\
-    adds r0, r1\n\
-    str r0, [r2]\n\
-    ldrh r0, [r4, 0x1E]\n\
-    mov r1, sp\n\
-    bl sub_80A2D64\n\
-    lsls r0, 16\n\
-    ldr r1, _080F89E0 @ =0xffff0000\n\
-    adds r0, r1\n\
-    movs r1, 0xCD\n\
-    lsls r1, 17\n\
-    cmp r0, r1\n\
-    bhi _080F89F8\n\
-    ldr r0, _080F89E4 @ =0x02000000\n\
-    adds r1, r0, 0\n\
-    adds r1, 0xFA\n\
-    ldrb r2, [r1]\n\
-    adds r1, r0, 0\n\
-    cmp r2, 0x6\n\
-    beq _080F89E8\n\
-    cmp r2, 0x9\n\
-    beq _080F89F0\n\
-    b _080F89FA\n\
-    .align 2, 0\n\
-_080F89DC: .4byte gUnknown_083E57A4\n\
-_080F89E0: .4byte 0xffff0000\n\
-_080F89E4: .4byte 0x02000000\n\
-_080F89E8:\n\
-    adds r2, r1, 0\n\
-    adds r2, 0xFB\n\
-    movs r0, 0x1\n\
-    b _080F8A00\n\
-_080F89F0:\n\
-    adds r2, r1, 0\n\
-    adds r2, 0xFB\n\
-    movs r0, 0x2\n\
-    b _080F8A00\n\
-_080F89F8:\n\
-    ldr r1, _080F8A20 @ =0x02000000\n\
-_080F89FA:\n\
-    adds r2, r1, 0\n\
-    adds r2, 0xFB\n\
-    movs r0, 0\n\
-_080F8A00:\n\
-    strb r0, [r2]\n\
-    adds r0, r1, 0\n\
-    adds r0, 0xF4\n\
-    str r4, [r0]\n\
-    subs r0, 0x8\n\
-    str r6, [r0]\n\
-    adds r0, 0xC\n\
-    strb r5, [r0]\n\
-    ldr r0, _080F8A24 @ =sub_80F8D50\n\
-    bl SetMainCallback2\n\
-    add sp, 0x4\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_080F8A20: .4byte 0x02000000\n\
-_080F8A24: .4byte sub_80F8D50\n\
-    .syntax divided\n");
-}
-
-#endif
 
 #define RETURN_UP_STATE break
 #define RETURN_SKIP_STATE return FALSE
@@ -363,31 +211,31 @@ static u8 sub_80F8A28(void)
         RETURN_UP_STATE;
 
     case 11:
-        LoadPalette(gMailGraphicsTable[unk_2000000.varFA].palette, 0, 16 * 2);
+        LoadPalette(gMailGraphicsTable[ewram0.varFA].palette, 0, 16 * 2);
         RETURN_UP_STATE;
 
     case 12:
-        LZ77UnCompVram(gMailGraphicsTable[unk_2000000.varFA].tileMap, (void *)(VRAM + 0x4000));
+        LZ77UnCompVram(gMailGraphicsTable[ewram0.varFA].tileMap, (void *)(VRAM + 0x4000));
         RETURN_UP_STATE;
 
     case 13:
-        LZ77UnCompVram(gMailGraphicsTable[unk_2000000.varFA].tiles, (void *)(VRAM));
+        LZ77UnCompVram(gMailGraphicsTable[ewram0.varFA].tiles, (void *)(VRAM));
 
-        gPlttBufferUnfaded[241] = gMailGraphicsTable[unk_2000000.varFA].color10;
-        gPlttBufferUnfaded[248] = gMailGraphicsTable[unk_2000000.varFA].color12;
+        gPlttBufferUnfaded[241] = gMailGraphicsTable[ewram0.varFA].color10;
+        gPlttBufferUnfaded[248] = gMailGraphicsTable[ewram0.varFA].color12;
         gPlttBufferUnfaded[10] = gUnknown_083E562C[gSaveBlock2.playerGender][0];
         gPlttBufferUnfaded[11] = gUnknown_083E562C[gSaveBlock2.playerGender][1];
         RETURN_UP_STATE;
 
     case 14:
-        if (unk_2000000.varF8 != 0)
+        if (ewram0.varF8 != 0)
         {
             sub_80F8DA0();
         }
         RETURN_UP_STATE;
 
     case 15:
-        if (unk_2000000.varF8 != 0)
+        if (ewram0.varF8 != 0)
         {
             sub_80F8E80();
         }
@@ -400,18 +248,18 @@ static u8 sub_80F8A28(void)
     {
         u16 local1;
 
-        local1 = sub_809D4A8(unk_2000000.varF4->species);
+        local1 = sub_809D4A8(ewram0.varF4->species);
 
-        switch (unk_2000000.varFB)
+        switch (ewram0.varFB)
         {
         case 1:
             sub_809D580(local1);
-            unk_2000000.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 96, 128, 0);
+            ewram0.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 96, 128, 0);
             break;
 
         case 2:
             sub_809D580(local1);
-            unk_2000000.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 40, 128, 0);
+            ewram0.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 40, 128, 0);
             break;
         }
         RETURN_UP_STATE;
@@ -432,7 +280,7 @@ static u8 sub_80F8A28(void)
         REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
         BeginNormalPaletteFade(-1, 0, 16, 0, 0);
         gPaletteFade.bufferTransferDisabled = 0;
-        unk_2000000.varF0 = sub_80F8F58;
+        ewram0.varF0 = sub_80F8F58;
         return TRUE;
 
     default:
@@ -443,7 +291,7 @@ static u8 sub_80F8A28(void)
     return FALSE;
 }
 
-void sub_80F8D50(void)
+static void sub_80F8D50(void)
 {
     do
     {
@@ -455,7 +303,7 @@ void sub_80F8D50(void)
     } while (sub_80F9344() != 1);
 }
 
-u8 *sub_80F8D7C(u8 *dest, u8 *src)
+static u8 *sub_80F8D7C(u8 *dest, u8 *src)
 {
     u16 length;
 
@@ -467,163 +315,33 @@ u8 *sub_80F8D7C(u8 *dest, u8 *src)
     return dest + length;
 }
 
-#ifdef NONMATCHING
 static void sub_80F8DA0(void)
 {
-    u8 local0;
-
-    local0 = unk_2000000.var10C->var0;
+    u16 i;
+    u8 r6;
+    u8 *ptr;
 
-    // No idea what's happening in this loop.
-    if (local0 <= 0)
+    r6 = 0;
+    for (i = 0; i < ewram0.var10C->var0; i++)
     {
-        u8 i;
-        u8 i2 = 0;
-
-        for (i = 0; i < unk_2000000.var10C->var0; i++)
-        {
-            ConvertEasyChatWordsToString(unk_2000000.words[i], &unk_2000000.varF4->words[i2],
-                ((*unk_2000000.var10C->var4)[i] << 28) >> 30, 1);
-            i2 += ((*unk_2000000.var10C->var4)[i] << 28) >> 30;
-        }
+        ConvertEasyChatWordsToString(ewram0.words[i], &ewram0.varF4->words[r6], ewram0.var10C->var4[i].unk_0_2, 1);
+        r6 += ewram0.var10C->var4[i].unk_0_2;
     }
-
-    if (unk_2000000.var100 == 0)
+    ptr = ewram0.varD8;
+    if (ewram0.var100 == 0)
     {
-        u8 *ptr;
-        u16 length;
-
-        ptr = sub_80F8D7C(unk_2000000.varD8, unk_2000000.varF4->playerName);
+        ptr = sub_80F8D7C(ptr, ewram0.varF4->playerName);
         StringCopy(ptr, gOtherText_From);
+        ewram0.varF9 = ewram0.var10C->var2 - StringLength(ewram0.varD8);
 
-        length = StringLength(unk_2000000.varD8);
-
-        unk_2000000.varF9 = unk_2000000.var10C->var2 - length;
     }
     else
     {
-        u8 *ptr;
-
-        ptr = StringCopy(unk_2000000.varD8, gOtherText_From);
-        sub_80F8D7C(ptr, unk_2000000.varF4->playerName);
-
-        unk_2000000.varF9 = unk_2000000.var10C->var2;
+        ptr = StringCopy(ptr, gOtherText_From);
+        sub_80F8D7C(ptr, ewram0.varF4->playerName);
+        ewram0.varF9 = ewram0.var10C->var2;
     }
 }
-#else
-__attribute__((naked))
-static void sub_80F8DA0(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r8\n\
-    push {r7}\n\
-    movs r6, 0\n\
-    movs r5, 0\n\
-    ldr r2, _080F8E3C @ =0x02000000\n\
-    movs r0, 0x86\n\
-    lsls r0, 1\n\
-    adds r1, r2, r0\n\
-    ldr r0, [r1]\n\
-    ldrb r0, [r0]\n\
-    cmp r5, r0\n\
-    bcs _080F8E04\n\
-    mov r8, r2\n\
-    adds r7, r1, 0\n\
-_080F8DBE:\n\
-    lsls r0, r5, 3\n\
-    subs r0, r5\n\
-    lsls r0, 2\n\
-    subs r0, r5\n\
-    add r0, r8\n\
-    mov r1, r8\n\
-    adds r1, 0xF4\n\
-    lsls r2, r6, 1\n\
-    ldr r1, [r1]\n\
-    adds r1, r2\n\
-    ldr r2, [r7]\n\
-    ldr r2, [r2, 0x4]\n\
-    lsls r4, r5, 2\n\
-    adds r2, r4, r2\n\
-    ldr r2, [r2]\n\
-    lsls r2, 28\n\
-    lsrs r2, 30\n\
-    movs r3, 0x1\n\
-    bl ConvertEasyChatWordsToString\n\
-    ldr r1, [r7]\n\
-    ldr r0, [r1, 0x4]\n\
-    adds r4, r0\n\
-    ldr r0, [r4]\n\
-    lsls r0, 28\n\
-    lsrs r0, 30\n\
-    adds r0, r6, r0\n\
-    lsls r0, 24\n\
-    lsrs r6, r0, 24\n\
-    adds r0, r5, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r5, r0, 16\n\
-    ldrb r1, [r1]\n\
-    cmp r5, r1\n\
-    bcc _080F8DBE\n\
-_080F8E04:\n\
-    ldr r2, _080F8E40 @ =0x020000d8\n\
-    adds r4, r2, 0\n\
-    subs r4, 0xD8\n\
-    adds r0, r2, 0\n\
-    adds r0, 0x28\n\
-    ldrb r0, [r0]\n\
-    cmp r0, 0\n\
-    bne _080F8E48\n\
-    ldr r1, [r2, 0x1C]\n\
-    adds r1, 0x12\n\
-    adds r0, r2, 0\n\
-    bl sub_80F8D7C\n\
-    adds r2, r0, 0\n\
-    ldr r1, _080F8E44 @ =gOtherText_From\n\
-    bl StringCopy\n\
-    ldr r0, _080F8E40 @ =0x020000d8\n\
-    bl StringLength\n\
-    movs r2, 0x86\n\
-    lsls r2, 1\n\
-    adds r1, r4, r2\n\
-    ldr r1, [r1]\n\
-    ldrb r1, [r1, 0x2]\n\
-    subs r1, r0\n\
-    b _080F8E6A\n\
-    .align 2, 0\n\
-_080F8E3C: .4byte 0x02000000\n\
-_080F8E40: .4byte 0x020000d8\n\
-_080F8E44: .4byte gOtherText_From\n\
-_080F8E48:\n\
-    ldr r1, _080F8E7C @ =gOtherText_From\n\
-    adds r0, r2, 0\n\
-    bl StringCopy\n\
-    adds r2, r0, 0\n\
-    adds r0, r4, 0\n\
-    adds r0, 0xF4\n\
-    ldr r1, [r0]\n\
-    adds r1, 0x12\n\
-    adds r0, r2, 0\n\
-    bl sub_80F8D7C\n\
-    movs r1, 0x86\n\
-    lsls r1, 1\n\
-    adds r0, r4, r1\n\
-    ldr r0, [r0]\n\
-    ldrb r1, [r0, 0x2]\n\
-_080F8E6A:\n\
-    adds r0, r4, 0\n\
-    adds r0, 0xF9\n\
-    strb r1, [r0]\n\
-    pop {r3}\n\
-    mov r8, r3\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_080F8E7C: .4byte gOtherText_From\n\
-    .syntax divided\n");
-}
-#endif
 
 static void sub_80F8E80(void)
 {
@@ -631,25 +349,25 @@ static void sub_80F8E80(void)
     u8 x;
     u8 y = 0;
 
-    for (pos = 0; pos < unk_2000000.var10C->var0; pos++)
+    for (pos = 0; pos < ewram0.var10C->var0; pos++)
     {
-        if (unk_2000000.words[pos][0] == 0xFF)
+        if (ewram0.words[pos][0] == 0xFF)
         {
             continue;
         }
 
-        if (unk_2000000.words[pos][0] == 0x00)
+        if (ewram0.words[pos][0] == 0x00)
         {
             continue;
         }
 
-        x = unk_2000000.var10C->var4[pos].unk_0_4;
-        y += unk_2000000.var10C->var4[pos].unk_0_0;
-        MenuPrint(unk_2000000.words[pos], unk_2000000.var10C->var3_4 + x, unk_2000000.var10C->var3_0 + y);
+        x = ewram0.var10C->var4[pos].unk_0_4;
+        y += ewram0.var10C->var4[pos].unk_0_0;
+        MenuPrint(ewram0.words[pos], ewram0.var10C->var3_4 + x, ewram0.var10C->var3_0 + y);
         y += 2;
     }
 
-    MenuPrint(unk_2000000.varD8, unk_2000000.varF9, unk_2000000.var10C->var1);
+    MenuPrint(ewram0.varD8, ewram0.varF9, ewram0.var10C->var1);
 }
 
 static void sub_80F8F18(void)
@@ -661,13 +379,13 @@ static void sub_80F8F18(void)
 
 static void sub_80F8F2C(void)
 {
-    if (unk_2000000.varFB != 0)
+    if (ewram0.varFB != 0)
     {
         AnimateSprites();
         BuildOamBuffer();
     }
 
-    unk_2000000.varF0();
+    ewram0.varF0();
 }
 
 static void sub_80F8F58(void)
@@ -677,7 +395,7 @@ static void sub_80F8F58(void)
     local0 = UpdatePaletteFade();
     if (local0 == 0)
     {
-        unk_2000000.varF0 = sub_80F8F78;
+        ewram0.varF0 = sub_80F8F78;
     }
 }
 
@@ -686,7 +404,7 @@ static void sub_80F8F78(void)
     if (gMain.newKeys & (A_BUTTON | B_BUTTON))
     {
         BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-        unk_2000000.varF0 = sub_80F8FB4;
+        ewram0.varF0 = sub_80F8FB4;
     }
 }
 
@@ -699,18 +417,18 @@ static void sub_80F8FB4(void)
         return;
     }
 
-    SetMainCallback2(unk_2000000.varEC);
-    switch (unk_2000000.varFB)
+    SetMainCallback2(ewram0.varEC);
+    switch (ewram0.varFB)
     {
     case 2:
     case 1:
-        local1 = sub_809D4A8(unk_2000000.varF4->species);
+        local1 = sub_809D4A8(ewram0.varF4->species);
         sub_809D608(local1);
 
-        sub_809D510(&gSprites[unk_2000000.varFC]);
+        sub_809D510(&gSprites[ewram0.varFC]);
         break;
     }
 
-    memset(&unk_2000000, 0, 0x110);
+    memset(&ewram0, 0, 0x110);
     ResetPaletteFade();
 }