From 8c09deee827efd0863d4990867f887400f1745a1 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Thu, 13 Jul 2017 15:43:03 -0500
Subject: decompile stuff

---
 src/record_mixing.c | 156 +++++++++++++++++++++++-----------------------------
 1 file changed, 70 insertions(+), 86 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index e1a72cf2e..169d8f168 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -10,6 +10,7 @@
 #include "mauville_old_man.h"
 #include "menu.h"
 #include "mystery_event_script.h"
+#include "rng.h"
 #include "rom4.h"
 #include "script.h"
 #include "secret_base.h"
@@ -86,7 +87,6 @@ void RecordMixing_ReceiveExchangePacket(u32 a)
     sub_80BFD44((u8 *)unk_2008000.tvShows, sizeof(struct PlayerRecords), a);
     sub_80C0514(unk_2008000.filler1004, sizeof(struct PlayerRecords), a);
     sub_80B9B1C(unk_2008000.filler1044, sizeof(struct PlayerRecords), a);
-    //UB: Too many arguments for function "sub_80FA4E4"
     sub_80FA4E4(unk_2008000.easyChatPairs, sizeof(struct PlayerRecords), a);
     sub_80B9C6C(&unk_2008000.filler10AC, sizeof(struct PlayerRecords), a, unk_2008000.tvShows);
     sub_80B9B70(unk_2008000.filler1124, sizeof(struct PlayerRecords), a);
@@ -430,93 +430,26 @@ u8 sub_80B9BBC(u16 *a)
     return a[16];
 }
 
-#undef NONMATCHING
-#ifdef NONMATCHING
-
-void sub_80B9BC4(struct RecordMixing_UnknownStruct *a, size_t b, u8 c[][2], u8 d, u8 e)
-{
-    struct RecordMixing_UnknownStructSub *offA;
-    struct RecordMixing_UnknownStructSub *offB;
-    struct RecordMixing_UnknownStructSub v0;
-    v0 = (offA = ((struct RecordMixing_UnknownStruct *)(b * c[d][0] + (u32)&a))->data)[c[d][1]];
-    offA[c[d][1]] = (offB = ((struct RecordMixing_UnknownStruct *)(b * c[e][0] + (u32)&a))->data)[c[e][1]];
-    offB[c[e][1]] = v0;
-    //ToDo: Figure out what this strange stack usage is
-}
-
-#else
-__attribute__((naked))
-void sub_80B9BC4(struct RecordMixing_UnknownStruct *a, size_t b, u8 c[][2], u8 d, u8 e)
+// TODO: clean this up
+void sub_80B9BC4(u8 *a, size_t b, u8 *c, u8 d, u8 e)
 {
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    mov r6, r10\n\
-    mov r5, r9\n\
-    mov r4, r8\n\
-    push {r4-r6}\n\
-    sub sp, 0x38\n\
-    mov r8, r0\n\
-    mov r10, r1\n\
-    mov r9, r2\n\
-    adds r4, r3, 0\n\
-    ldr r5, [sp, 0x54]\n\
-    lsls r4, 24\n\
-    lsls r5, 24\n\
-    lsrs r5, 24\n\
-    lsrs r4, 23\n\
-    add r4, r9\n\
-    ldrb r0, [r4]\n\
-    mov r6, r10\n\
-    muls r6, r0\n\
-    add r6, r8\n\
-    ldrb r0, [r4, 0x1]\n\
-    lsls r1, r0, 3\n\
-    subs r1, r0\n\
-    lsls r1, 3\n\
-    adds r1, r6, r1\n\
-    mov r0, sp\n\
-    movs r2, 0x38\n\
-    bl memcpy\n\
-    lsls r5, 1\n\
-    add r5, r9\n\
-    ldrb r0, [r5]\n\
-    mov r1, r10\n\
-    muls r1, r0\n\
-    adds r0, r1, 0\n\
-    add r8, r0\n\
-    ldrb r1, [r4, 0x1]\n\
-    lsls r0, r1, 3\n\
-    subs r0, r1\n\
-    lsls r0, 3\n\
-    adds r6, r0\n\
-    ldrb r0, [r5, 0x1]\n\
-    lsls r1, r0, 3\n\
-    subs r1, r0\n\
-    lsls r1, 3\n\
-    add r1, r8\n\
-    adds r0, r6, 0\n\
-    movs r2, 0x38\n\
-    bl memcpy\n\
-    ldrb r1, [r5, 0x1]\n\
-    lsls r0, r1, 3\n\
-    subs r0, r1\n\
-    lsls r0, 3\n\
-    add r8, r0\n\
-    mov r0, r8\n\
-    mov r1, sp\n\
-    movs r2, 0x38\n\
-    bl memcpy\n\
-    add sp, 0x38\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .syntax divided\n");
+    struct RecordMixing_UnknownStructSub sp0;
+    struct RecordMixing_UnknownStructSub *r8;
+    struct RecordMixing_UnknownStructSub *r6 = (struct RecordMixing_UnknownStructSub *)(a + b * c[d * 2]);
+    
+    {
+        struct RecordMixing_UnknownStructSub *src = r6 + c[2 * d + 1];
+        
+        memcpy(&sp0, src, 0x38);
+    }
+    
+    r8 = (struct RecordMixing_UnknownStructSub *)(a + c[e * 2] * b);
+    r6 += c[d * 2 + 1];
+    memcpy(r6, r8 + c[e * 2 + 1], 0x38);
+    
+    r8 += c[e * 2 + 1];
+    memcpy(r8, &sp0, 0x38);
 }
-#endif
 
 u8 sub_80B9C4C(u8 *a)
 {
@@ -528,3 +461,54 @@ u8 sub_80B9C4C(u8 *a)
     return r2;
 }
 
+void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
+{
+    u8 sp0[0x58];
+    u8 sp3C;
+    u16 sp40 = Random();
+    u8 r8;
+    u16 i;  // r3
+    u16 r7;
+    struct RecordMixing_UnknownStruct *r6;
+    
+    SeedRng(gLinkPlayers[0].trainerId);
+    r8 = GetLinkPlayerCount();
+    for (i = 0; i < 4; i++)
+    {
+        sp0[4 + i] = 0xFF;
+        sp0[8 + i] = 0;
+        sp0[0x1C + i * 2 + 0] = 0;
+        sp0[0x1C + i * 2 + 1] = 0;
+    }
+    sp3C = 0;
+    for (i = 0; i < r8; i++)
+    {
+        r6 = (struct RecordMixing_UnknownStruct *)(a + b * i);
+        if (r6->unk70 != 0)
+        {
+            for (r7 = 0; r7 < r6->unk70; r7++)
+            {
+                if (r6->unk74[r7] == 0)
+                    sp0[0x1C + i * 2 + r7] = 1;
+            }
+        }
+        //_080B9D3C
+    }
+    //_080B9D46
+    r7 = 0;
+    for (i = 0; i < r8; i++)
+    {
+        r6 = (struct RecordMixing_UnknownStruct *)(a + b * i);
+        if (sp0[0x1C + i * 2 + 0] == 1 || sp0[0x1C + i * 2 + 1] == 1)
+            sp3C++;
+        while (1)
+        {
+            if (sp0[0x1C + i * 2 + 0] == 1 || sp0[0x1C + i * 2 + 1] == 0)
+            {
+                sp0[0x24] = i;
+                sp0[0x25] = 0;
+            }
+        }
+    }
+    //_080B9E3E
+}
-- 
cgit v1.2.3


From e7cac5f7b3974d8aa181016fe603fb945fc25405 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Thu, 13 Jul 2017 23:20:40 -0500
Subject: sub_80B9C6C sucks

---
 src/record_mixing.c | 536 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 514 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 169d8f168..e306669c9 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -88,7 +88,7 @@ void RecordMixing_ReceiveExchangePacket(u32 a)
     sub_80C0514(unk_2008000.filler1004, sizeof(struct PlayerRecords), a);
     sub_80B9B1C(unk_2008000.filler1044, sizeof(struct PlayerRecords), a);
     sub_80FA4E4(unk_2008000.easyChatPairs, sizeof(struct PlayerRecords), a);
-    sub_80B9C6C(&unk_2008000.filler10AC, sizeof(struct PlayerRecords), a, unk_2008000.tvShows);
+    sub_80B9C6C((u8 *)&unk_2008000.filler10AC, sizeof(struct PlayerRecords), a, unk_2008000.tvShows);
     sub_80B9B70(unk_2008000.filler1124, sizeof(struct PlayerRecords), a);
     sub_80B9F3C(unk_2008000.filler11C8, a);
 }
@@ -436,17 +436,17 @@ void sub_80B9BC4(u8 *a, size_t b, u8 *c, u8 d, u8 e)
     struct RecordMixing_UnknownStructSub sp0;
     struct RecordMixing_UnknownStructSub *r8;
     struct RecordMixing_UnknownStructSub *r6 = (struct RecordMixing_UnknownStructSub *)(a + b * c[d * 2]);
-    
+
     {
         struct RecordMixing_UnknownStructSub *src = r6 + c[2 * d + 1];
-        
+
         memcpy(&sp0, src, 0x38);
     }
-    
+
     r8 = (struct RecordMixing_UnknownStructSub *)(a + c[e * 2] * b);
     r6 += c[d * 2 + 1];
     memcpy(r6, r8 + c[e * 2 + 1], 0x38);
-    
+
     r8 += c[e * 2 + 1];
     memcpy(r8, &sp0, 0x38);
 }
@@ -461,24 +461,34 @@ u8 sub_80B9C4C(u8 *a)
     return r2;
 }
 
+//extern const u8 gUnknown_083D02B4[];
+extern const u8 gUnknown_083D02B4[][2];
+
+#ifdef NONMATCHING
 void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
 {
-    u8 sp0[0x58];
+    u8 r8;
+    u8 sp4[4];
+    u8 sp8[4];
+    void *spC[4];
+    u8 sp1C[4][2];
+    u8 sp24[4][2];
     u8 sp3C;
     u16 sp40 = Random();
-    u8 r8;
     u16 i;  // r3
     u16 r7;
+    u8 r1;
     struct RecordMixing_UnknownStruct *r6;
-    
+
+    //asm("":::"r8");
     SeedRng(gLinkPlayers[0].trainerId);
     r8 = GetLinkPlayerCount();
     for (i = 0; i < 4; i++)
     {
-        sp0[4 + i] = 0xFF;
-        sp0[8 + i] = 0;
-        sp0[0x1C + i * 2 + 0] = 0;
-        sp0[0x1C + i * 2 + 1] = 0;
+        sp4[i] = 0xFF;
+        sp8[i] = 0;
+        sp1C[i][0] = 0;
+        sp1C[i][1] = 0;
     }
     sp3C = 0;
     for (i = 0; i < r8; i++)
@@ -489,26 +499,508 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
             for (r7 = 0; r7 < r6->unk70; r7++)
             {
                 if (r6->unk74[r7] == 0)
-                    sp0[0x1C + i * 2 + r7] = 1;
+                    sp1C[i][r7] = 1;
             }
         }
         //_080B9D3C
     }
     //_080B9D46
-    r7 = 0;
-    for (i = 0; i < r8; i++)
+    for (r7 = 0, i = 0; i < r8; i++)
     {
         r6 = (struct RecordMixing_UnknownStruct *)(a + b * i);
-        if (sp0[0x1C + i * 2 + 0] == 1 || sp0[0x1C + i * 2 + 1] == 1)
+        if (sp1C[i][0] == 1 || sp1C[i][1] == 1)
             sp3C++;
-        while (1)
+        if (sp1C[i][0] == 1 && sp1C[i][1] == 0)
         {
-            if (sp0[0x1C + i * 2 + 0] == 1 || sp0[0x1C + i * 2 + 1] == 0)
-            {
-                sp0[0x24] = i;
-                sp0[0x25] = 0;
-            }
+            sp24[r7][0] = i;
+            sp24[r7][1] = 0;
+            r7++;
+        }
+        else if (sp1C[i][0] == 0 && sp1C[i][1] == 1)
+        {
+            sp24[r7][0] = i;
+            sp24[r7][1] = 0;
+            r7++;
+        }
+        //else if (sp1C[i][0] == 1 + 1 && sp1C[i][1] + 1 == 1 + 1)
+        else if (sp1C[i][0] == 1 && sp1C[i][1] == 1)
+        {
+            u8 r4, r1;
+
+            sp24[r7][0] = i;
+            r4 = sub_80B9BBC((u16 *)&r6->data[0]);
+            r1 = sub_80B9BBC((u16 *)&r6->data[1]);
+
+            asm("");
+            if (r4 == 0 && r1 != 0)
+                sp24[r7][1] = 1;
+            else if ((r4 == 0 && r1 == 0) || (r4 != 0 && r1 != 0))
+                sp24[r7][1] = Random() % 2;
+            else
+                sp24[r7][1] = 0;
+            /*
+            if (r4 == 0 && r1 != 0)
+                sp24[r7][1] = 1;
+            else if ((r4 == 0 && r1 == 0) || (r4 != 0 && r1 != 0))
+                sp24[r7][1] = Random() % 2;
+            else
+                sp24[r7][1] = 0;
+            */
+
+            /*
+            if (r4 == 0 && r1 != 0)
+                sp24[r7][1] = 1;
+            else if ((r4 == 0 && r1 == 0) || (r4 != 0 && r1 != 0))
+                //sp24[r7][1] = ((Random() << 16) >> 16) % 2;
+                sp24[r7][1] = Random() % 2;
+            else
+                sp24[r7][1] = 0;
+            */
+          //_080B9E2C:
+            r7++;
         }
     }
     //_080B9E3E
+    for (i = 0; i < 4; i++)
+    {
+        r6 = (struct RecordMixing_UnknownStruct *)a + b * c;
+        spC[i] = r6;
+    }
+    r1 = sub_80B9C4C(d) % 3;
+    switch (sp3C)
+    {
+    case 2:
+        sub_80B9BC4(a, b, (u8 *)sp24, 0, 1);
+        break;
+    case 3:
+        {
+            u8 var1 = gUnknown_083D02B4[r1][0];
+            u8 var2 = gUnknown_083D02B4[r1][1];
+            sub_80B9BC4(a, b, (u8 *)sp24, var1, var2);
+        }
+        break;
+    case 4:
+        {
+            u8 *r6 = (u8 *)sp24;
+            u8 var1 = gUnknown_083D02B4[r1][0];
+            u8 var2 = gUnknown_083D02B4[r1][1];
+            sub_80B9BC4(a, b, r6, var1, var2);
+        }
+        {
+            u8 *r6 = (u8 *)sp24;
+            u8 var1 = gUnknown_083D02B4[r1][2];
+            u8 var2 = gUnknown_083D02B4[r1][3];
+            sub_80B9BC4(a, b, r6, var1, var2);
+        }
+        break;
+    }
+    /*
+    switch (sp3C)
+    {
+        u8 var1;
+        u8 var2;
+
+    case 2:
+        sub_80B9BC4(a, b, (u8 *)sp24, 0, 1);
+        break;
+    case 3:
+        var1 = gUnknown_083D02B4[r1 * 2 + 0];
+        var2 = gUnknown_083D02B4[r1 * 2 + 1];
+        sub_80B9BC4(a, b, (u8 *)sp24, var1, var2);
+        break;
+    case 4:
+        {
+            var1 = gUnknown_083D02B4[r1 * 2 + 0];
+            var2 = gUnknown_083D02B4[r1 * 2 + 1];
+            sub_80B9BC4(a, b, (u8 *)sp24, var1, var2);
+
+            var1 = gUnknown_083D02B4[r1 * 2 + 2 + 0];
+            var2 = gUnknown_083D02B4[r1 * 2 + 2 + 1];
+            sub_80B9BC4(a, b, (u8 *)sp24, var1, var2);
+        }
+        break;
+    }
+    */
+    //_080B9EF0
+    //memcpy(&gSaveBlock1.filler_303C.data[0], a + b * c, 0x38);
+    //memcpy(&gSaveBlock1.filler_303C.data[1], a + b * c + 0x38, 0x38);
+    r6 = (struct RecordMixing_UnknownStruct *)(a + b * c);
+    gSaveBlock1.filler_303C.data[0] = r6->data[0];
+    gSaveBlock1.filler_303C.data[1] = r6->data[1];
+    //memcpy(&gSaveBlock1.filler_303C.data[0], &r6->data[0], 0x38);
+    //memcpy(&gSaveBlock1.filler_303C.data[1], &r6->data[1], 0x38);
+    SeedRng(sp40);
+}
+#else
+__attribute__((naked))
+void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x58\n\
+    str r0, [sp, 0x2C]\n\
+    str r1, [sp, 0x30]\n\
+    str r3, [sp, 0x38]\n\
+    lsls r2, 24\n\
+    lsrs r2, 24\n\
+    str r2, [sp, 0x34]\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    str r0, [sp, 0x40]\n\
+    ldr r0, _080B9DA8 @ =gLinkPlayers\n\
+    ldrh r0, [r0, 0x4]\n\
+    bl SeedRng\n\
+    bl GetLinkPlayerCount\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r8, r0\n\
+    movs r3, 0\n\
+    add r0, sp, 0x1C\n\
+    mov r9, r0\n\
+    movs r1, 0x1D\n\
+    add r1, sp\n\
+    mov r10, r1\n\
+    mov r2, sp\n\
+    adds r2, 0xC\n\
+    str r2, [sp, 0x4C]\n\
+    movs r7, 0xFF\n\
+    add r4, sp, 0x8\n\
+    movs r2, 0\n\
+    mov r6, r9\n\
+    mov r5, r10\n\
+_080B9CBC:\n\
+    mov r1, sp\n\
+    adds r1, r3\n\
+    adds r1, 0x4\n\
+    ldrb r0, [r1]\n\
+    orrs r0, r7\n\
+    strb r0, [r1]\n\
+    adds r0, r4, r3\n\
+    strb r2, [r0]\n\
+    lsls r1, r3, 1\n\
+    adds r0, r6, r1\n\
+    strb r2, [r0]\n\
+    adds r1, r5, r1\n\
+    strb r2, [r1]\n\
+    adds r0, r3, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r3, r0, 16\n\
+    cmp r3, 0x3\n\
+    bls _080B9CBC\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x3C]\n\
+    movs r3, 0\n\
+    mov r1, r8\n\
+    lsls r0, r1, 16\n\
+    lsrs r1, r0, 16\n\
+    str r0, [sp, 0x50]\n\
+    ldr r4, [sp, 0x30]\n\
+    ldr r0, [sp, 0x34]\n\
+    adds r2, r4, 0\n\
+    muls r2, r0\n\
+    str r2, [sp, 0x48]\n\
+    ldr r2, [sp, 0x3C]\n\
+    cmp r2, r1\n\
+    bcs _080B9D46\n\
+    mov r8, r1\n\
+_080B9D00:\n\
+    ldr r4, [sp, 0x30]\n\
+    adds r0, r4, 0\n\
+    muls r0, r3\n\
+    ldr r1, [sp, 0x2C]\n\
+    adds r6, r1, r0\n\
+    ldr r0, [r6, 0x70]\n\
+    cmp r0, 0\n\
+    beq _080B9D3C\n\
+    movs r7, 0\n\
+    cmp r7, r0\n\
+    bcs _080B9D3C\n\
+    adds r4, r6, 0\n\
+    adds r4, 0x74\n\
+    mov r2, r9\n\
+    lsls r1, r3, 1\n\
+    movs r5, 0x1\n\
+_080B9D20:\n\
+    lsls r0, r7, 1\n\
+    adds r0, r4, r0\n\
+    ldrh r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _080B9D30\n\
+    adds r0, r7, r1\n\
+    adds r0, r2, r0\n\
+    strb r5, [r0]\n\
+_080B9D30:\n\
+    adds r0, r7, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r7, r0, 16\n\
+    ldr r0, [r6, 0x70]\n\
+    cmp r7, r0\n\
+    bcc _080B9D20\n\
+_080B9D3C:\n\
+    adds r0, r3, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r3, r0, 16\n\
+    cmp r3, r8\n\
+    bcc _080B9D00\n\
+_080B9D46:\n\
+    movs r7, 0\n\
+    movs r3, 0\n\
+    ldr r2, [sp, 0x50]\n\
+    cmp r2, 0\n\
+    beq _080B9E3E\n\
+    mov r4, sp\n\
+    adds r4, 0x24\n\
+    str r4, [sp, 0x44]\n\
+    movs r0, 0x25\n\
+    add r0, sp\n\
+    mov r8, r0\n\
+_080B9D5C:\n\
+    ldr r1, [sp, 0x30]\n\
+    adds r0, r1, 0\n\
+    muls r0, r3\n\
+    ldr r2, [sp, 0x2C]\n\
+    adds r6, r2, r0\n\
+    lsls r1, r3, 1\n\
+    mov r4, r9\n\
+    adds r0, r4, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x1\n\
+    beq _080B9D7C\n\
+    mov r2, r10\n\
+    adds r0, r2, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x1\n\
+    bne _080B9D86\n\
+_080B9D7C:\n\
+    ldr r0, [sp, 0x3C]\n\
+    adds r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    str r0, [sp, 0x3C]\n\
+_080B9D86:\n\
+    mov r4, r9\n\
+    adds r0, r4, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x1\n\
+    bne _080B9DAC\n\
+    mov r2, r10\n\
+    adds r0, r2, r1\n\
+    ldrb r2, [r0]\n\
+    cmp r2, 0\n\
+    bne _080B9DAC\n\
+_080B9D9A:\n\
+    lsls r1, r7, 1\n\
+    ldr r4, [sp, 0x44]\n\
+    adds r0, r4, r1\n\
+    strb r3, [r0]\n\
+    add r1, r8\n\
+    strb r2, [r1]\n\
+    b _080B9E2C\n\
+    .align 2, 0\n\
+_080B9DA8: .4byte gLinkPlayers\n\
+_080B9DAC:\n\
+    mov r2, r9\n\
+    adds r0, r2, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _080B9DC0\n\
+    mov r4, r10\n\
+    adds r0, r4, r1\n\
+    ldrb r2, [r0]\n\
+    cmp r2, 0x1\n\
+    beq _080B9D9A\n\
+_080B9DC0:\n\
+    mov r2, r9\n\
+    adds r0, r2, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x1\n\
+    bne _080B9E32\n\
+    mov r4, r10\n\
+    adds r0, r4, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x1\n\
+    bne _080B9E32\n\
+    lsls r5, r7, 1\n\
+    ldr r1, [sp, 0x44]\n\
+    adds r0, r1, r5\n\
+    strb r3, [r0]\n\
+    adds r0, r6, 0\n\
+    str r3, [sp, 0x54]\n\
+    bl sub_80B9BBC\n\
+    adds r4, r0, 0\n\
+    lsls r4, 24\n\
+    lsrs r4, 24\n\
+    adds r0, r6, 0\n\
+    adds r0, 0x38\n\
+    bl sub_80B9BBC\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+    ldr r3, [sp, 0x54]\n\
+    cmp r4, 0\n\
+    bne _080B9E0A\n\
+    cmp r1, 0\n\
+    beq _080B9E0E\n\
+    mov r2, r8\n\
+    adds r1, r2, r5\n\
+    movs r0, 0x1\n\
+    strb r0, [r1]\n\
+    b _080B9E2C\n\
+_080B9E0A:\n\
+    cmp r1, 0\n\
+    beq _080B9E26\n\
+_080B9E0E:\n\
+    str r3, [sp, 0x54]\n\
+    bl Random\n\
+    mov r4, r8\n\
+    adds r2, r4, r5\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    movs r1, 0x1\n\
+    ands r0, r1\n\
+    strb r0, [r2]\n\
+    ldr r3, [sp, 0x54]\n\
+    b _080B9E2C\n\
+_080B9E26:\n\
+    mov r2, r8\n\
+    adds r0, r2, r5\n\
+    strb r1, [r0]\n\
+_080B9E2C:\n\
+    adds r0, r7, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r7, r0, 16\n\
+_080B9E32:\n\
+    adds r0, r3, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r3, r0, 16\n\
+    ldr r4, [sp, 0x50]\n\
+    cmp r0, r4\n\
+    bcc _080B9D5C\n\
+_080B9E3E:\n\
+    movs r3, 0\n\
+    ldr r1, [sp, 0x48]\n\
+    lsls r0, r1, 4\n\
+    subs r0, r1\n\
+    lsls r0, 3\n\
+    ldr r2, [sp, 0x2C]\n\
+    adds r6, r2, r0\n\
+    ldr r1, [sp, 0x4C]\n\
+_080B9E4E:\n\
+    lsls r0, r3, 2\n\
+    adds r0, r1, r0\n\
+    str r6, [r0]\n\
+    adds r0, r3, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r3, r0, 16\n\
+    cmp r3, 0x3\n\
+    bls _080B9E4E\n\
+    ldr r0, [sp, 0x38]\n\
+    bl sub_80B9C4C\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    movs r1, 0x3\n\
+    bl __umodsi3\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+    ldr r4, [sp, 0x3C]\n\
+    cmp r4, 0x3\n\
+    beq _080B9E9C\n\
+    cmp r4, 0x3\n\
+    bgt _080B9E82\n\
+    cmp r4, 0x2\n\
+    beq _080B9E8A\n\
+    b _080B9EF0\n\
+_080B9E82:\n\
+    ldr r0, [sp, 0x3C]\n\
+    cmp r0, 0x4\n\
+    beq _080B9EBC\n\
+    b _080B9EF0\n\
+_080B9E8A:\n\
+    add r2, sp, 0x24\n\
+    movs r0, 0x1\n\
+    str r0, [sp]\n\
+    ldr r0, [sp, 0x2C]\n\
+    ldr r1, [sp, 0x30]\n\
+    movs r3, 0\n\
+    bl sub_80B9BC4\n\
+    b _080B9EF0\n\
+_080B9E9C:\n\
+    ldr r0, _080B9EB8 @ =gUnknown_083D02B4\n\
+    lsls r1, 1\n\
+    adds r2, r1, r0\n\
+    ldrb r3, [r2]\n\
+    adds r0, 0x1\n\
+    adds r1, r0\n\
+    ldrb r0, [r1]\n\
+    add r2, sp, 0x24\n\
+    str r0, [sp]\n\
+    ldr r0, [sp, 0x2C]\n\
+    ldr r1, [sp, 0x30]\n\
+    bl sub_80B9BC4\n\
+    b _080B9EF0\n\
+    .align 2, 0\n\
+_080B9EB8: .4byte gUnknown_083D02B4\n\
+_080B9EBC:\n\
+    add r6, sp, 0x24\n\
+    ldr r4, _080B9F2C @ =gUnknown_083D02BA\n\
+    lsls r5, r1, 2\n\
+    adds r0, r5, r4\n\
+    ldrb r3, [r0]\n\
+    adds r0, r4, 0x1\n\
+    adds r0, r5, r0\n\
+    ldrb r0, [r0]\n\
+    str r0, [sp]\n\
+    ldr r0, [sp, 0x2C]\n\
+    ldr r1, [sp, 0x30]\n\
+    adds r2, r6, 0\n\
+    bl sub_80B9BC4\n\
+    adds r0, r4, 0x2\n\
+    adds r0, r5, r0\n\
+    ldrb r3, [r0]\n\
+    adds r4, 0x3\n\
+    adds r5, r4\n\
+    ldrb r0, [r5]\n\
+    str r0, [sp]\n\
+    ldr r0, [sp, 0x2C]\n\
+    ldr r1, [sp, 0x30]\n\
+    adds r2, r6, 0\n\
+    bl sub_80B9BC4\n\
+_080B9EF0:\n\
+    ldr r1, [sp, 0x2C]\n\
+    ldr r2, [sp, 0x48]\n\
+    adds r6, r1, r2\n\
+    ldr r4, _080B9F30 @ =gSaveBlock1\n\
+    ldr r1, _080B9F34 @ =0x0000303c\n\
+    adds r0, r4, r1\n\
+    adds r1, r6, 0\n\
+    movs r2, 0x38\n\
+    bl memcpy\n\
+    ldr r2, _080B9F38 @ =0x00003074\n\
+    adds r4, r2\n\
+    adds r1, r6, 0\n\
+    adds r1, 0x38\n\
+    adds r0, r4, 0\n\
+    movs r2, 0x38\n\
+    bl memcpy\n\
+    ldr r0, [sp, 0x40]\n\
+    bl SeedRng\n\
+    add sp, 0x58\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_080B9F2C: .4byte gUnknown_083D02BA\n\
+_080B9F30: .4byte gSaveBlock1\n\
+_080B9F34: .4byte 0x0000303c\n\
+_080B9F38: .4byte 0x00003074\n\
+    .syntax divided\n");
 }
+#endif
-- 
cgit v1.2.3


From 5f5c80818653e135e5cda11ce430bde7cbcd62c1 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Thu, 13 Jul 2017 23:55:40 -0500
Subject: finish decompiling record_mixing

---
 src/record_mixing.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/save.c          |  6 ++---
 2 files changed, 80 insertions(+), 4 deletions(-)

(limited to 'src')

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);
-- 
cgit v1.2.3


From 2b39d8f7d763311c69a31dab366f696626c01d36 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Fri, 14 Jul 2017 01:48:30 -0500
Subject: clean up a bit

---
 src/record_mixing.c | 298 +++++++++++++++++++++++++++-------------------------
 1 file changed, 156 insertions(+), 142 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index a81b7743a..a92743fdb 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -25,25 +25,37 @@
 #include "task.h"
 #include "tv.h"
 
+extern u8 ewram[];
+#define unk_2018000 (*(struct PlayerRecords *)(ewram + 0x18000))
+#define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000))
+
+extern struct RecordMixing_UnknownStruct gUnknown_02038738;
+
+extern void *const recordMixingSecretBases;
+extern void *const recordMixingTvShows;
+extern void *const gUnknown_083D0274;
+extern void *const gUnknown_083D0278;
+extern void *const recordMixingEasyChatPairs;
+extern struct RecordMixing_UnknownStruct *const gUnknown_083D0280;
+extern void *const gUnknown_083D0284;
 
-extern void *recordMixingSecretBases;
-extern void *recordMixingTvShows;
-extern void *gUnknown_083D0274;
-extern void *gUnknown_083D0278;
-extern void *recordMixingEasyChatPairs;
-extern void *gUnknown_083D0284;
-extern u8 gUnknown_083D0288[2];
-extern u8 gUnknown_083D028A[2][3];
-extern u8 gUnknown_083D0290[9][4];
-
-extern struct RecordMixing_UnknownStruct gUnknown_02038738;  //Don't know what type this points to
-extern struct RecordMixing_UnknownStruct *gUnknown_083D0280;
 extern u16 gSpecialVar_0x8005;
 extern u32 gUnknown_03005D2C;
 extern u8 gUnknown_03000718;
 extern u8 gUnknown_0300071C[];
 extern bool8 gReceivedRemoteLinkPlayers;
 
+// I can't define these here or else RecordMixing_PrepareExchangePacket gets optimized.
+/*
+void *const recordMixingSecretBases = &gSaveBlock1.secretBases;
+void *const recordMixingTvShows = &gSaveBlock1.tvShows;
+void *const gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
+void *const gUnknown_083D0278 = &gSaveBlock1.oldMan;
+void *const recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
+struct RecordMixing_UnknownStruct *const gUnknown_083D0280 = &gUnknown_02038738;
+void *const gUnknown_083D0284 = &gSaveBlock2.filler_A8;
+*/
+
 #define BUFFER_CHUNK_SIZE 200
 
 void sub_80B929C(void)
@@ -51,7 +63,8 @@ void sub_80B929C(void)
     sub_8083A84(Task_RecordMixing_Main);
 }
 
-struct PlayerRecords {
+struct PlayerRecords
+{
     struct SecretBaseRecord secretBases[20];
     TVShow tvShows[25];
     u8 filler1004[0x40];
@@ -62,9 +75,6 @@ struct PlayerRecords {
     u16 filler11C8[0x34];
 };
 
-extern struct PlayerRecords unk_2008000;
-extern struct PlayerRecords unk_2018000;
-
 void RecordMixing_PrepareExchangePacket(void)
 {
     sub_80BC300();
@@ -72,14 +82,14 @@ void RecordMixing_PrepareExchangePacket(void)
 
     memcpy(unk_2018000.secretBases, recordMixingSecretBases, sizeof(unk_2018000.secretBases));
     memcpy(unk_2018000.tvShows, recordMixingTvShows, sizeof(unk_2018000.tvShows));
-    memcpy(unk_2018000.filler1004, gUnknown_083D0274, 0x40);
-    memcpy(unk_2018000.filler1044, gUnknown_083D0278, 0x40);
-    memcpy(unk_2018000.easyChatPairs, recordMixingEasyChatPairs, 0x28);
+    memcpy(unk_2018000.filler1004, gUnknown_083D0274, sizeof(unk_2008000.filler1004));
+    memcpy(unk_2018000.filler1044, gUnknown_083D0278, sizeof(unk_2008000.filler1044));
+    memcpy(unk_2018000.easyChatPairs, recordMixingEasyChatPairs, sizeof(unk_2018000.easyChatPairs));
     gUnknown_02038738.data[0] = gSaveBlock1.filler_303C.data[0];
     gUnknown_02038738.data[1] = gSaveBlock1.filler_303C.data[1];
     sub_8041324(gSaveBlock1.daycareData, &gUnknown_02038738);
     memcpy(&unk_2018000.filler10AC, gUnknown_083D0280, sizeof(struct RecordMixing_UnknownStruct));
-    memcpy(unk_2018000.filler1124, gUnknown_083D0284, 0xA4);
+    memcpy(unk_2018000.filler1124, gUnknown_083D0284, sizeof(unk_2018000.filler1124));
 
     if (GetMultiplayerId() == 0)
         unk_2018000.filler11C8[0] = sub_8126338();
@@ -97,64 +107,71 @@ void RecordMixing_ReceiveExchangePacket(u32 a)
     sub_80B9F3C(unk_2008000.filler11C8, a);
 }
 
+#define tCounter data[0]
+
 void Task_RecordMixing_SoundEffect(u8 taskId)
 {
-    gTasks[taskId].data[0]++;
-    if (gTasks[taskId].data[0] == 50)
+    gTasks[taskId].tCounter++;
+    if (gTasks[taskId].tCounter == 50)
     {
         PlaySE(SE_W213);
-        gTasks[taskId].data[0] = 0;
+        gTasks[taskId].tCounter = 0;
     }
 }
 
-#define TD_STATE 0
+#undef tCounter
+
+
+#define tState        data[0]
+#define tSndEffTaskId data[15]
+
 void Task_RecordMixing_Main(u8 taskId)
 {
-    s16 *taskData = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
 
-    switch (taskData[TD_STATE])
+    switch (tState)
     {
     case 0:        // init
         sub_8007270(gSpecialVar_0x8005);
-        VarSet(0x4000, 1);
+        VarSet(VAR_0x4000, 1);
         gUnknown_03000718 = 0;
         RecordMixing_PrepareExchangePacket();
         CreateRecordMixingSprite();
-        taskData[TD_STATE] = 1;
-        taskData[10] = CreateTask(sub_80B95F0, 0x50);
-        taskData[15] = CreateTask(Task_RecordMixing_SoundEffect, 0x51);
+        tState = 1;
+        data[10] = CreateTask(sub_80B95F0, 0x50);
+        tSndEffTaskId = CreateTask(Task_RecordMixing_SoundEffect, 0x51);
         break;
     case 1:        // wait for sub_80B95F0
-        if (!gTasks[taskData[10]].isActive)
+        if (!gTasks[data[10]].isActive)
         {
-            taskData[TD_STATE] = 2;
+            tState = 2;
             FlagSet(SYS_MIX_RECORD);
             DestroyRecordMixingSprite();
-            DestroyTask(taskData[15]);
+            DestroyTask(tSndEffTaskId);
         }
         break;
     case 2:
-        taskData[10] = CreateTask(sub_80BA00C, 10);
-        taskData[TD_STATE] = 3;
+        data[10] = CreateTask(sub_80BA00C, 10);
+        tState = 3;
         PlaySE(SE_W226);
         break;
     case 3:        // wait for sub_80BA00C
-        if (!gTasks[taskData[10]].isActive)
+        if (!gTasks[data[10]].isActive)
         {
-            taskData[TD_STATE] = 4;
-            taskData[10] = sub_8083664();
+            tState = 4;
+            data[10] = sub_8083664();
             sub_80720B0();
             MenuPrint(gOtherText_MixingComplete, 2, 15);
-            taskData[8] = 0;
+            data[8] = 0;
         }
         break;
     case 4:        // wait 60 frames
-        taskData[8]++;
-        if (taskData[8] > 60)
-            taskData[TD_STATE] = 5;
+        data[8]++;
+        if (data[8] > 60)
+            tState = 5;
         break;
     case 5:
-        if (!gTasks[taskData[10]].isActive)
+        if (!gTasks[data[10]].isActive)
         {
             sub_8055588();
             MenuZeroFillScreen();
@@ -169,14 +186,14 @@ void sub_80B95F0(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    switch (task->data[TD_STATE])
+    switch (task->tState)
     {
     case 0:
         sub_80B9A78();
         MenuDisplayMessageBox();
         MenuPrint(gOtherText_MixingRecordsWithFriend, 2, 15);
         task->data[8] = 0x708;
-        task->data[TD_STATE] = 400;
+        task->tState = 400;
         ClearLinkCallback_2();
         break;
     case 100:        // wait 20 frames
@@ -184,48 +201,48 @@ void sub_80B95F0(u8 taskId)
         if (task->data[12] > 20)
         {
             task->data[12] = 0;
-            task->data[TD_STATE] = 101;
+            task->tState = 101;
         }
         break;
     case 101:
-    {
-        u8 players = GetLinkPlayerCount_2();
-
-        if (IsLinkMaster() == 1)
         {
-            if (players == sub_800820C())
+            u8 players = GetLinkPlayerCount_2();
+
+            if (IsLinkMaster() == 1)
             {
-                PlaySE(0x15);
-                task->data[TD_STATE] = 201;
-                task->data[12] = 0;
+                if (players == sub_800820C())
+                {
+                    PlaySE(SE_PIN);
+                    task->tState = 201;
+                    task->data[12] = 0;
+                }
+            }
+            else
+            {
+                PlaySE(SE_BOO);
+                task->tState = 301;
             }
-        }
-        else
-        {
-            PlaySE(0x16);
-            task->data[TD_STATE] = 301;
         }
         break;
-    }
     case 201:
         if (sub_800820C() == GetLinkPlayerCount_2())
         {
             if (++task->data[12] > GetLinkPlayerCount_2() * 30)
             {
                 sub_8007F4C();
-                task->data[TD_STATE] = 1;
+                task->tState = 1;
             }
         }
         break;
     case 301:
         if (sub_800820C() == GetLinkPlayerCount_2())
-            task->data[TD_STATE] = 1;
+            task->tState = 1;
         break;
     case 400:        // wait 20 frames
         task->data[12]++;
         if (task->data[12] > 20)
         {
-            task->data[TD_STATE] = 1;
+            task->tState = 1;
             task->data[12] = 0;
         }
         break;
@@ -233,31 +250,30 @@ void sub_80B95F0(u8 taskId)
         if (gReceivedRemoteLinkPlayers)
         {
             ConvertIntToDecimalStringN(gStringVar1, GetMultiplayerId_(), 2, 2);
-            task->data[TD_STATE] = 5;
+            task->tState = 5;
         }
         break;
     case 2:
-    {
-        u8 subTaskId;
-
-        task->data[6] = GetLinkPlayerCount_2();
-        task->data[TD_STATE] = 0;
-        task->data[5] = GetMultiplayerId_();
-        task->func = Task_RecordMixing_SendPacket;
-        StorePtrInTaskData(&unk_2018000, &task->data[2]);
-        subTaskId = CreateTask(Task_RecordMixing_CopyReceiveBuffer, 0x50);
-        task->data[10] = subTaskId;
-        gTasks[subTaskId].data[0] = taskId;
-        //StorePtrInTaskData((void*)0x2008000, &gTasks[subTaskId].data[5]);
-        StorePtrInTaskData((u8 *)&unk_2018000 - 0x10000, &gTasks[subTaskId].data[5]);
+        {
+            u8 subTaskId;
+
+            task->data[6] = GetLinkPlayerCount_2();
+            task->tState = 0;
+            task->data[5] = GetMultiplayerId_();
+            task->func = Task_RecordMixing_SendPacket;
+            StorePtrInTaskData(&unk_2018000, &task->data[2]);
+            subTaskId = CreateTask(Task_RecordMixing_CopyReceiveBuffer, 0x50);
+            task->data[10] = subTaskId;
+            gTasks[subTaskId].data[0] = taskId;
+            StorePtrInTaskData((u8 *)&unk_2008000, &gTasks[subTaskId].data[5]);
+        }
         break;
-    }
     case 5:        // wait 60 frames
         task->data[10]++;
         if (task->data[10] > 60)
         {
             task->data[10] = 0;
-            task->data[TD_STATE] = 2;
+            task->tState = 2;
         }
         break;
     }
@@ -268,29 +284,29 @@ void Task_RecordMixing_SendPacket(u8 taskId)
     struct Task *task = &gTasks[taskId];
     // does this send the data 24 times?
 
-    switch (task->data[TD_STATE])
+    switch (task->tState)
     {
     case 0: //Copy record data to send buffer
-    {
-        void *recordData = (u8 *)LoadPtrFromTaskData(&task->data[2]) + BUFFER_CHUNK_SIZE * task->data[4];
+        {
+            void *recordData = (u8 *)LoadPtrFromTaskData(&task->data[2]) + BUFFER_CHUNK_SIZE * task->data[4];
 
-        memcpy(gBlockSendBuffer, recordData, BUFFER_CHUNK_SIZE);
-        task->data[TD_STATE]++;
+            memcpy(gBlockSendBuffer, recordData, BUFFER_CHUNK_SIZE);
+            task->tState++;
+        }
         break;
-    }
     case 1:
         if (GetMultiplayerId() == 0)
             sub_8007E9C(1);
-        task->data[TD_STATE]++;
+        task->tState++;
         break;
     case 2:
         break;
     case 3:
         task->data[4]++;
         if ((u16)task->data[4] == 24)
-            task->data[TD_STATE]++;
+            task->tState++;
         else
-            task->data[TD_STATE] = 0;
+            task->tState = 0;
         break;
     case 4:
         if (!gTasks[task->data[10]].isActive)
@@ -329,7 +345,6 @@ void Task_RecordMixing_CopyReceiveBuffer(u8 taskId)
         }
         gTasks[task->data[0]].data[0]++;
     }
-    //_080B998A
     if (handledPlayers == GetLinkPlayerCount())
         DestroyTask(taskId);
 }
@@ -357,15 +372,15 @@ void Task_RecordMixing_SendPacket_SwitchToReceive(u8 taskId)
     gUnknown_03000718 = 1;
 }
 
-void *LoadPtrFromTaskData(u16 *ptr)
+void *LoadPtrFromTaskData(u16 *taskData)
 {
-    return (void *)(*ptr | *(ptr + 1) << 16);
+    return (void *)(taskData[0] | (taskData[1] << 16));
 }
 
-void StorePtrInTaskData(void *ptr, u16 *data)
+void StorePtrInTaskData(void *ptr, u16 *taskData)
 {
-    *data = (u32)ptr;
-    *(data + 1) = (u32)ptr >> 16;
+    taskData[0] = (u32)ptr;
+    taskData[1] = (u32)ptr >> 16;
 }
 
 u8 GetMultiplayerId_(void)
@@ -383,6 +398,27 @@ void sub_80B9A78(void)
     gUnknown_03005D2C = sizeof(struct PlayerRecords);
 }
 
+const u8 gUnknown_083D0288[2] = {1, 0};
+
+const u8 gUnknown_083D028A[2][3] =
+{
+    {1, 2, 0},
+    {2, 0, 1},
+};
+
+const u8 gUnknown_083D0290[9][4] =
+{
+    {1, 0, 3, 2},
+    {3, 0, 1, 2},
+    {2, 0, 3, 1},
+    {1, 3, 0, 2},
+    {2, 3, 0, 1},
+    {3, 2, 0, 1},
+    {1, 2, 3, 0},
+    {2, 3, 1, 0},
+    {3, 2, 1, 0},
+};
+
 void sub_80B9A88(u8 *a)
 {
     u32 i;
@@ -434,25 +470,18 @@ u8 sub_80B9BBC(u16 *a)
     return a[16];
 }
 
-// TODO: clean this up
-void sub_80B9BC4(u8 *a, size_t b, u8 *c, u8 d, u8 e)
+void sub_80B9BC4(u8 *a, size_t b, u8 c[][2], u8 d, u8 e)
 {
-    struct RecordMixing_UnknownStructSub sp0;
-    struct RecordMixing_UnknownStructSub *r8;
-    struct RecordMixing_UnknownStructSub *r6 = (struct RecordMixing_UnknownStructSub *)(a + b * c[d * 2]);
-
-    {
-        struct RecordMixing_UnknownStructSub *src = r6 + c[2 * d + 1];
-
-        memcpy(&sp0, src, 0x38);
-    }
+    struct RecordMixing_UnknownStructSub *r6 = (struct RecordMixing_UnknownStructSub *)(a + b * c[d][0]);
+    struct RecordMixing_UnknownStructSub *src = r6 + c[d][1];
+    struct RecordMixing_UnknownStructSub sp0 = *src;
+    struct RecordMixing_UnknownStructSub *r8 = (struct RecordMixing_UnknownStructSub *)(a + b * c[e][0]);
 
-    r8 = (struct RecordMixing_UnknownStructSub *)(a + c[e * 2] * b);
-    r6 += c[d * 2 + 1];
-    memcpy(r6, r8 + c[e * 2 + 1], 0x38);
+    r6 += c[d][1];
+    *r6 = *(r8 + c[e][1]);
 
-    r8 += c[e * 2 + 1];
-    memcpy(r8, &sp0, 0x38);
+    r8 += c[e][1];
+    *r8 = sp0;
 }
 
 u8 sub_80B9C4C(u8 *a)
@@ -465,7 +494,19 @@ u8 sub_80B9C4C(u8 *a)
     return r2;
 }
 
-extern const u8 gUnknown_083D02B4[][2];
+const u8 gUnknown_083D02B4[][2] =
+{
+    {0, 1},
+    {1, 2},
+    {2, 0},
+};
+
+const u8 gUnknown_083D02BA[3][4] =
+{
+    {0, 1, 2, 3},
+    {0, 2, 1, 3},
+    {0, 3, 2, 1},
+};
 
 #ifdef NONMATCHING
 void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
@@ -585,45 +626,18 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     case 4:
         {
             u8 *r6 = (u8 *)sp24;
-            u8 var1 = gUnknown_083D02B4[r1][0];
-            u8 var2 = gUnknown_083D02B4[r1][1];
+            u8 var1 = gUnknown_083D02BA[r1][0];
+            u8 var2 = gUnknown_083D02BA[r1][1];
             sub_80B9BC4(a, b, r6, var1, var2);
         }
         {
             u8 *r6 = (u8 *)sp24;
-            u8 var1 = gUnknown_083D02B4[r1][2];
-            u8 var2 = gUnknown_083D02B4[r1][3];
+            u8 var1 = gUnknown_083D02BA[r1][2];
+            u8 var2 = gUnknown_083D02BA[r1][3];
             sub_80B9BC4(a, b, r6, var1, var2);
         }
         break;
     }
-    /*
-    switch (sp3C)
-    {
-        u8 var1;
-        u8 var2;
-
-    case 2:
-        sub_80B9BC4(a, b, (u8 *)sp24, 0, 1);
-        break;
-    case 3:
-        var1 = gUnknown_083D02B4[r1 * 2 + 0];
-        var2 = gUnknown_083D02B4[r1 * 2 + 1];
-        sub_80B9BC4(a, b, (u8 *)sp24, var1, var2);
-        break;
-    case 4:
-        {
-            var1 = gUnknown_083D02B4[r1 * 2 + 0];
-            var2 = gUnknown_083D02B4[r1 * 2 + 1];
-            sub_80B9BC4(a, b, (u8 *)sp24, var1, var2);
-
-            var1 = gUnknown_083D02B4[r1 * 2 + 2 + 0];
-            var2 = gUnknown_083D02B4[r1 * 2 + 2 + 1];
-            sub_80B9BC4(a, b, (u8 *)sp24, var1, var2);
-        }
-        break;
-    }
-    */
     //_080B9EF0
     //memcpy(&gSaveBlock1.filler_303C.data[0], a + b * c, 0x38);
     //memcpy(&gSaveBlock1.filler_303C.data[1], a + b * c + 0x38, 0x38);
-- 
cgit v1.2.3


From 9a1e58c43617f8fadf2bc56a86e5eb6101644351 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Fri, 14 Jul 2017 02:13:18 -0500
Subject: formatting

---
 src/trainer_card.c | 300 ++++++++++++++++++-----------------------------------
 1 file changed, 101 insertions(+), 199 deletions(-)

(limited to 'src')

diff --git a/src/trainer_card.c b/src/trainer_card.c
index 876a3b426..77ddb72a1 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -171,38 +171,38 @@ static void sub_8093174(void)
     case 0:
         sub_8093534();
         sub_8093688();
-        gMain.state += 1;
+        gMain.state++;
         break;
     case 1:
         sub_8093598();
-        gMain.state += 1;
+        gMain.state++;
         break;
     case 2:
         sub_80935EC();
-        gMain.state += 1;
+        gMain.state++;
         break;
     case 3:
         sub_8093610();
         sub_80937A4();
-        gMain.state += 1;
+        gMain.state++;
         break;
     case 4:
         sub_80937BC();
-        gMain.state += 1;
+        gMain.state++;
     case 5:
         if (MultistepInitMenuWindowContinue() == FALSE)
         {
             return;
         }
-        gMain.state += 1;
+        gMain.state++;
         break;
     case 6:
         sub_80937F0();
-        gMain.state += 1;
+        gMain.state++;
         break;
     case 7:
         sub_80937D8();
-        gMain.state += 1;
+        gMain.state++;
         break;
     case 8:
         nullsub_15();
@@ -376,22 +376,22 @@ static u8 sub_80934F4(struct TrainerCard *trainerCard)
 
     if (trainerCard->firstHallOfFameA != 0 || trainerCard->firstHallOfFameB != 0 || trainerCard->firstHallOfFameC != 0)
     {
-        value += 1;
+        value++;
     }
 
     if (trainerCard->var_3)
     {
-        value += 1;
+        value++;
     }
 
     if (trainerCard->battleTowerLosses > 49)
     {
-        value += 1;
+        value++;
     }
 
     if (trainerCard->var_4)
     {
-        value += 1;
+        value++;
     }
 
     return value;
@@ -470,21 +470,14 @@ static void sub_8093688(void)
     u8 i;
 
     sub_8093324();
-
-    ewram0.var_0 = FALSE;
-    ewram0.var_3 = FALSE;
+    ewram0.var_0 = 0;
+    ewram0.var_3 = 0;
     ewram0.var_4 = FALSE;
-
     ewram0.var_2 = ewram0.var_64.stars;
-
-    ewram0.var_5 = FALSE;
-    ewram0.var_6 = FALSE;
-
+    ewram0.var_5 = 0;
+    ewram0.var_6 = 0;
     for (i = 0; i < 4; i++)
-    {
         sub_80EB3FC(ewram0.var_20[i], ewram0.var_64.var_28[i]);
-    }
-
     sub_80936D4();
 }
 
@@ -497,61 +490,43 @@ void sub_80936D4(void)
     ewram0.var_b = 0;
     ewram0.var_c = 0;
     ewram0.var_d = 0;
-
     memset(ewram0.var_e, 0, sizeof(ewram0.var_e));
 
     if (ewram0.var_64.hasPokedex)
-    {
-        ewram0.var_7 += 1;
-    }
+        ewram0.var_7++;
 
-    if (ewram0.var_64.firstHallOfFameA != 0 || ewram0.var_64.firstHallOfFameB != 0 ||
-        ewram0.var_64.firstHallOfFameC != 0)
-    {
-        ewram0.var_8 += 1;
-    }
+    if (ewram0.var_64.firstHallOfFameA != 0
+     || ewram0.var_64.firstHallOfFameB != 0
+     || ewram0.var_64.firstHallOfFameC != 0)
+        ewram0.var_8++;
 
     if (ewram0.var_64.linkBattleWins != 0 || ewram0.var_64.linkBattleLosses != 0)
-    {
-        ewram0.var_9 += 1;
-    }
+        ewram0.var_9++;
 
     if (ewram0.var_64.battleTowerWins != 0 || ewram0.var_64.battleTowerLosses != 0)
-    {
-        ewram0.var_a += 1;
-    }
+        ewram0.var_a++;
 
     if (ewram0.var_64.contestsWithFriends != 0)
-    {
-        ewram0.var_b += 1;
-    }
+        ewram0.var_b++;
 
     if (ewram0.var_64.pokeblocksWithFriends != 0)
-    {
-        ewram0.var_c += 1;
-    }
+        ewram0.var_c++;
 
     if (ewram0.var_64.pokemonTrades != 0)
-    {
-        ewram0.var_d += 1;
-    }
+        ewram0.var_d++;
 
     if (!ewram0.var_1)
     {
         u32 badgeFlag;
-        int i;
+        int i = 0;
 
-        i = 0;
         badgeFlag = BADGE01_GET;
         while (1)
         {
             if (FlagGet(badgeFlag))
-            {
-                ewram0.var_e[i] += 1;
-            }
-
-            badgeFlag += 1;
-            i += 1;
+                ewram0.var_e[i]++;
+            badgeFlag++;
+            i++;
             if (badgeFlag > BADGE08_GET)
             {
                 break;
@@ -616,14 +591,14 @@ bool8 sub_8093864(struct Task *task)
     ewram0.var_6 = gSaveBlock2.playTimeVBlanks;
     sub_80939A4();
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
-    ewram0.var_0 += 1;
+    ewram0.var_0++;
     return FALSE;
 }
 
 bool8 sub_80938A8(struct Task *task)
 {
     if (!gPaletteFade.active)
-        ewram0.var_0 += 1;
+        ewram0.var_0++;
     return FALSE;
 }
 
@@ -639,16 +614,14 @@ bool8 sub_80938CC(struct Task *task)
         if (ewram0.var_3 != 0)
         {
             ewram0.var_0 = 5;
-            return TRUE;
         }
         else
         {
             ewram0.var_3 ^= 1;
             ewram0.var_0 = 3;
-            return TRUE;
         }
+        return TRUE;
     }
-
     return FALSE;
 }
 
@@ -656,19 +629,14 @@ bool8 sub_8093918(struct Task *task)
 {
     sub_8093A28();
     PlaySE(SE_CARD);
-
-    ewram0.var_0 += 1;
-
+    ewram0.var_0++;
     return FALSE;
 }
 
 bool8 sub_8093938(struct Task *task)
 {
     if (sub_8093A48())
-    {
         ewram0.var_0 = 2;
-    }
-
     return FALSE;
 }
 
@@ -676,17 +644,14 @@ bool8 sub_8093954(struct Task *task)
 {
     sub_80939C0();
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-    ewram0.var_0 += 1;
+    ewram0.var_0++;
     return FALSE;
 }
 
 bool8 sub_8093980(struct Task *task)
 {
     if (!gPaletteFade.active)
-    {
         SetMainCallback2((MainCallback)ewram0.var_60);
-    }
-
     return FALSE;
 }
 
@@ -698,28 +663,22 @@ static void sub_80939A4(void)
 
 static void sub_80939C0(void)
 {
-    u8 taskId;
-
-    taskId = FindTaskIdByFunc(sub_80939DC);
+    u8 taskId = FindTaskIdByFunc(sub_80939DC);
 
     if (taskId != 0xFF)
-    {
         DestroyTask(taskId);
-    }
 }
 
 static void sub_80939DC(u8 taskId)
 {
     u8 buffer[32];
-    struct Task *task;
-    task = &gTasks[taskId];
+    struct Task *task = &gTasks[taskId];
 
     if (ewram0.var_5 != task->data[TD_1])
     {
         task->data[TD_1] = ewram0.var_5;
         task->data[TD_0] ^= TRUE;
     }
-
     TrainerCard_Front_PrintPlayTime(buffer, task->data[TD_0]);
     MenuPrint(buffer, 10, 12);
 }
@@ -750,12 +709,12 @@ bool8 sub_8093AA0(struct Task *task)
 {
     s32 i;
 
-    ewram0.var_4 = 0;
+    ewram0.var_4 = FALSE;
     dp12_8087EA4();
     for (i = 0; i < ARRAY_COUNT(gUnknown_03004DE0.unk780); i++)
         gUnknown_03004DE0.unk780[i] = -4;
     SetHBlankCallback(sub_8093D7C);
-    ewram0.var_4 = 1;
+    ewram0.var_4 = TRUE;
     task->data[0]++;
     return FALSE;
 }
@@ -916,14 +875,9 @@ bool8 sub_8093C0C(struct TrainerCard *trainerCard)
 {
     sub_80939C0();
     sub_8093DAC();
-
     if (!ewram0.var_3)
-    {
         sub_80939A4();
-    }
-
-    trainerCard->firstHallOfFameB += 1;
-
+    trainerCard->firstHallOfFameB++;
     return TRUE;
 }
 
@@ -1084,10 +1038,8 @@ bool8 sub_8093D50(void)
     ewram0.var_4 = FALSE;
     SetHBlankCallback(NULL);
     sub_8093E04();
-
     taskId = FindTaskIdByFunc(sub_8093A68);
     DestroyTask(taskId);
-
     return FALSE;
 }
 
@@ -1123,13 +1075,9 @@ _08093DA8: .4byte 0x4000012 @ REG_BG0VOFS\n\
 static void sub_8093DAC(void)
 {
     if (ewram0.var_3)
-    {
         sub_8093DEC();
-    }
     else
-    {
         sub_8093DC8();
-    }
 }
 
 static void sub_8093DC8(void)
@@ -1239,11 +1187,8 @@ void sub_8093EA0(void)
     LoadPalette(gUnknown_083B5EF8[ewram0.var_2], 0, 48 * 2);
     LoadPalette(gBadgesPalette, 48, 16 * 2);
     LoadPalette(gUnknown_083B5F4C, 64, 16 * 2);
-
     if (ewram0.var_64.gender != MALE)
-    {
         LoadPalette(gUnknown_083B5F0C, 16, 16 * 2);
-    }
 }
 
 static void sub_8093EF8(void)
@@ -1609,11 +1554,12 @@ static void TrainerCard_Front_PrintPokedexCount(void)
     if (ewram0.var_7 == FALSE)
     {
         sub_8094110();
-        return;
     }
-
-    ConvertIntToDecimalStringN(buffer, ewram0.var_64.pokedexSeen, STR_CONV_MODE_LEFT_ALIGN, 3);
-    MenuPrint_RightAligned(buffer, 16, 10);
+    else
+    {
+        ConvertIntToDecimalStringN(buffer, ewram0.var_64.pokedexSeen, STR_CONV_MODE_LEFT_ALIGN, 3);
+        MenuPrint_RightAligned(buffer, 16, 10);
+    }
 }
 
 static void TrainerCard_Front_PrintPlayTime(u8 *arg1, s16 colon)
@@ -1624,13 +1570,11 @@ static void TrainerCard_Front_PrintPlayTime(u8 *arg1, s16 colon)
 
     playTimeHours = gSaveBlock2.playTimeHours;
     playTimeMinutes = gSaveBlock2.playTimeMinutes;
-
     if (ewram0.var_1 != 0)
     {
         playTimeHours = ewram0.var_64.playTimeHours;
         playTimeMinutes = ewram0.var_64.playTimeMinutes;
     }
-
     FormatPlayTime(buffer, playTimeHours, playTimeMinutes, colon);
     sub_8072C74(arg1, buffer, 48, 1);
 }
@@ -1639,24 +1583,22 @@ static void sub_809429C(void)
 {
     u8 *str;
 
-    if (ewram0.var_1 == FALSE)
+    if (ewram0.var_1 != 0)
     {
-        return;
+        str = gStringVar1;
+        str = StringCopy(str, ewram0.var_20[0]);
+        str[0] = 00;
+        str++;
+        str = StringCopy(str, ewram0.var_20[1]);
+        MenuPrint(gStringVar1, 2, 14);
+
+        str = gStringVar1;
+        str = StringCopy(str, ewram0.var_20[2]);
+        str[0] = 00;
+        str++;
+        str = StringCopy(str, ewram0.var_20[3]);
+        MenuPrint(gStringVar1, 2, 16);
     }
-
-    str = gStringVar1;
-    str = StringCopy(str, ewram0.var_20[0]);
-    str[0] = 00;
-    str++;
-    str = StringCopy(str, ewram0.var_20[1]);
-    MenuPrint(gStringVar1, 2, 14);
-
-    str = gStringVar1;
-    str = StringCopy(str, ewram0.var_20[2]);
-    str[0] = 00;
-    str++;
-    str = StringCopy(str, ewram0.var_20[3]);
-    MenuPrint(gStringVar1, 2, 16);
 }
 
 static void TrainerCard_Back_PrintName(void)
@@ -1678,152 +1620,115 @@ static void TrainerCard_Back_PrintName(void)
 
 static void TrainerCard_Back_PrintHallOfFameTime_Label(void)
 {
-    if (ewram0.var_8 == FALSE)
-    {
-        return;
-    }
-
-    MenuPrint(gOtherText_FirstHOF, 3, 5);
+    if (ewram0.var_8 != 0)
+        MenuPrint(gOtherText_FirstHOF, 3, 5);
 }
 
 static void TrainerCard_Back_PrintHallOfFameTime(void)
 {
     u8 *str;
 
-    if (ewram0.var_8 == FALSE)
+    if (ewram0.var_8 != 0)
     {
-        return;
+        str = gStringVar1;
+        str = ConvertIntToDecimalStringN(str, ewram0.var_64.firstHallOfFameA, STR_CONV_MODE_RIGHT_ALIGN, 3);
+        str = StringCopy(str, gUnknown_083B5EF4);
+        str = ConvertIntToDecimalStringN(str, ewram0.var_64.firstHallOfFameB, STR_CONV_MODE_LEADING_ZEROS, 2);
+        str = StringCopy(str, gUnknown_083B5EF4);
+        str = ConvertIntToDecimalStringN(str, ewram0.var_64.firstHallOfFameC, STR_CONV_MODE_LEADING_ZEROS, 2);
+        MenuPrint_RightAligned(gStringVar1, 28, 5);
     }
-
-    str = gStringVar1;
-    str = ConvertIntToDecimalStringN(str, ewram0.var_64.firstHallOfFameA, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    str = StringCopy(str, gUnknown_083B5EF4);
-    str = ConvertIntToDecimalStringN(str, ewram0.var_64.firstHallOfFameB, STR_CONV_MODE_LEADING_ZEROS, 2);
-    str = StringCopy(str, gUnknown_083B5EF4);
-    str = ConvertIntToDecimalStringN(str, ewram0.var_64.firstHallOfFameC, STR_CONV_MODE_LEADING_ZEROS, 2);
-
-    MenuPrint_RightAligned(gStringVar1, 28, 5);
 }
 
 static void TrainerCard_Back_PrintLinkBattlesLabel(void)
 {
-    if (ewram0.var_9 == FALSE)
-    {
-        return;
-    }
-
-    MenuPrint(gOtherText_LinkCableBattles, 3, 7);
+    if (ewram0.var_9 != 0)
+        MenuPrint(gOtherText_LinkCableBattles, 3, 7);
 }
 
 static void TrainerCard_Back_PrintLinkBattles(void)
 {
     u8 buffer[16];
 
-    if (ewram0.var_9 == FALSE)
+    if (ewram0.var_9 != 0)
     {
-        return;
-    }
+        ConvertIntToDecimalString(buffer, ewram0.var_64.linkBattleWins);
+        MenuPrint_RightAligned(buffer, 22, 7);
 
-    ConvertIntToDecimalString(buffer, ewram0.var_64.linkBattleWins);
-    MenuPrint_RightAligned(buffer, 22, 7);
-
-    ConvertIntToDecimalString(buffer, ewram0.var_64.linkBattleLosses);
-    MenuPrint_RightAligned(buffer, 28, 7);
+        ConvertIntToDecimalString(buffer, ewram0.var_64.linkBattleLosses);
+        MenuPrint_RightAligned(buffer, 28, 7);
+    }
 }
 
 static void TrainerCard_Back_PrintBattleTower_Label(void)
 {
-    if (ewram0.var_a == FALSE)
-    {
-        return;
-    }
-
-    MenuPrint(gOtherText_BattleTowerWinRecord, 3, 15);
+    if (ewram0.var_a != 0)
+        MenuPrint(gOtherText_BattleTowerWinRecord, 3, 15);
 }
 
 static void TrainerCard_Back_PrintBattleTower(void)
 {
     u8 buffer[16];
 
-    if (ewram0.var_a == FALSE)
+    if (ewram0.var_a != 0)
     {
-        return;
-    }
-
-    sub_8072C44(buffer, ewram0.var_64.battleTowerWins, 24, 1);
-    MenuPrint_PixelCoords(buffer, 112, 120, 0);
+        sub_8072C44(buffer, ewram0.var_64.battleTowerWins, 24, 1);
+        MenuPrint_PixelCoords(buffer, 112, 120, 0);
 
-    sub_8072C44(buffer, ewram0.var_64.battleTowerLosses, 24, 1);
-    MenuPrint_PixelCoords(buffer, 149, 120, 0);
+        sub_8072C44(buffer, ewram0.var_64.battleTowerLosses, 24, 1);
+        MenuPrint_PixelCoords(buffer, 149, 120, 0);
+    }
 }
 
 static void TrainerCard_Back_PrintLinkContests_Label(void)
 {
-    if (ewram0.var_b == FALSE)
-    {
-        return;
-    }
-
-    MenuPrint(gOtherText_ContestRecord, 3, 13);
+    if (ewram0.var_b != 0)
+        MenuPrint(gOtherText_ContestRecord, 3, 13);
 }
 
 static void TrainerCard_Back_PrintLinkContests(void)
 {
     u8 buffer[8];
 
-    if (ewram0.var_b == FALSE)
+    if (ewram0.var_b != 0)
     {
-        return;
+        ConvertIntToDecimalStringN(buffer, ewram0.var_64.contestsWithFriends, STR_CONV_MODE_RIGHT_ALIGN, 3);
+        MenuPrint_RightAligned(buffer, 28, 13);
     }
-
-    ConvertIntToDecimalStringN(buffer, ewram0.var_64.contestsWithFriends, STR_CONV_MODE_RIGHT_ALIGN, 3);
-    MenuPrint_RightAligned(buffer, 28, 13);
 }
 
 static void TrainerCard_Back_PrintLinkPokeblocks_Label(void)
 {
-    if (ewram0.var_c == FALSE)
-    {
-        return;
-    }
-
-    MenuPrint(gOtherText_MixingRecord, 3, 11);
+    if (ewram0.var_c != 0)
+        MenuPrint(gOtherText_MixingRecord, 3, 11);
 }
 
 static void TrainerCard_Back_PrintLinkPokeblocks(void)
 {
     u8 buffer[8];
 
-    if (ewram0.var_c == FALSE)
+    if (ewram0.var_c != 0)
     {
-        return;
+        ConvertIntToDecimalStringN(buffer, ewram0.var_64.pokeblocksWithFriends, STR_CONV_MODE_RIGHT_ALIGN, 5);
+        MenuPrint_RightAligned(buffer, 28, 11);
     }
-
-    ConvertIntToDecimalStringN(buffer, ewram0.var_64.pokeblocksWithFriends, STR_CONV_MODE_RIGHT_ALIGN, 5);
-    MenuPrint_RightAligned(buffer, 28, 11);
 }
 
 static void TrainerCard_Back_PrintPokemonTrades_Label(void)
 {
-    if (ewram0.var_d == FALSE)
-    {
-        return;
-    }
-
-    MenuPrint(gOtherText_TradeRecord, 3, 9);
+    if (ewram0.var_d != 0)
+        MenuPrint(gOtherText_TradeRecord, 3, 9);
 }
 
 static void TrainerCard_Back_PrintPokemonTrades(void)
 {
     u8 buffer[8];
 
-    if (ewram0.var_d == FALSE)
+    if (ewram0.var_d != 0)
     {
-        return;
+        ConvertIntToDecimalStringN(buffer, ewram0.var_64.pokemonTrades, STR_CONV_MODE_RIGHT_ALIGN, 5);
+        MenuPrint_RightAligned(buffer, 28, 9);
     }
-
-    ConvertIntToDecimalStringN(buffer, ewram0.var_64.pokemonTrades, STR_CONV_MODE_RIGHT_ALIGN, 5);
-    MenuPrint_RightAligned(buffer, 28, 9);
 }
 
 void unref_sub_8094588(u16 left, u16 top)
@@ -1831,9 +1736,6 @@ void unref_sub_8094588(u16 left, u16 top)
     const u8 *text = gOtherText_Boy;
 
     if (gSaveBlock2.playerGender == FEMALE)
-    {
         text = gOtherText_Girl;
-    }
-
-    MenuPrint(text, (u8)left, (u8)top);
+    MenuPrint(text, left, top);
 }
-- 
cgit v1.2.3


From 5dddba1eeba45b5f9a5aff8e3751df1d6e7d9d89 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Fri, 14 Jul 2017 15:43:19 -0500
Subject: finish decompiling trainer_card (except two functions)

---
 src/trainer_card.c | 607 +++++++++++++++++++----------------------------------
 1 file changed, 217 insertions(+), 390 deletions(-)

(limited to 'src')

diff --git a/src/trainer_card.c b/src/trainer_card.c
index 77ddb72a1..f7afd9cec 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -3,6 +3,7 @@
 #include "easy_chat.h"
 #include "event_data.h"
 #include "field_effect.h"
+#include "graphics.h"
 #include "link.h"
 #include "main.h"
 #include "menu.h"
@@ -54,22 +55,55 @@ extern struct TrainerCard gTrainerCards[4];
 
 struct UnknownStruct1
 {
-    u8 filler0[0x780];
+    u16 filler0[0x3C0];
     u16 unk780[160];
 };
 extern struct UnknownStruct1 gUnknown_03004DE0;
 
-extern u8 gUnknown_083B5EF4[];
-extern u16 *gUnknown_083B5EF8[5];
-extern u16 gUnknown_083B5F0C[];
-extern u16 gBadgesPalette[];
-extern u16 gUnknown_083B5F4C[];
+extern const u8 gBadgesTiles[];
+extern const u16 gUnknown_083B5F0C[];
+extern const u16 gBadgesPalette[];
+extern const u16 gUnknown_083B5F4C[];
+extern const u16 gUnknown_083B5F6C[];
+extern const u16 gUnknown_083B5F8C[][4];
+
+const u8 gBadgesTiles[] = INCBIN_U8("graphics/trainer_card/badges.4bpp");
+// XXX: what is this?
+u8 *const ewram_ = ewram;
+
+bool8 sub_8093864(struct Task *);
+bool8 sub_80938A8(struct Task *);
+bool8 sub_80938CC(struct Task *);
+bool8 sub_8093918(struct Task *);
+bool8 sub_8093938(struct Task *);
+bool8 sub_8093954(struct Task *);
+bool8 sub_8093980(struct Task *);
+
+bool8 (*const gUnknown_083B5EBC[])(struct Task *) =
+{
+    sub_8093864,
+    sub_80938A8,
+    sub_80938CC,
+    sub_8093918,
+    sub_8093938,
+    sub_8093954,
+    sub_8093980,
+};
 
-extern u16 gUnknown_08E8CFC0[];
-extern u16 gUnknown_08E8D9C0[];
+bool8 sub_8093AA0(struct Task *);
+bool8 sub_8093AF0(struct Task *);
+bool8 sub_8093C0C(struct Task *);
+bool8 sub_8093C38(struct Task *);
+bool8 sub_8093D50(struct Task *);
 
-extern bool8 (*const gUnknown_083B5EBC[])(struct Task *);
-extern bool8 (*const gUnknown_083B5ED8[])(struct Task *);
+bool8 (*const gUnknown_083B5ED8[])(struct Task *) =
+{
+    sub_8093AA0,
+    sub_8093AF0,
+    sub_8093C0C,
+    sub_8093C38,
+    sub_8093D50,
+};
 
 // FIXME: Other signature than on save_menu_util.h
 void FormatPlayTime(u8 *playtime, u16 hours, u16 minutes, s16 colon);
@@ -190,11 +224,8 @@ static void sub_8093174(void)
         sub_80937BC();
         gMain.state++;
     case 5:
-        if (MultistepInitMenuWindowContinue() == FALSE)
-        {
-            return;
-        }
-        gMain.state++;
+        if (MultistepInitMenuWindowContinue())
+            gMain.state++;
         break;
     case 6:
         sub_80937F0();
@@ -719,8 +750,56 @@ bool8 sub_8093AA0(struct Task *task)
     return FALSE;
 }
 
+/*
+bool8 sub_8093AF0(struct Task *task)
+{
+    u32 r7;
+    u16 r9;
+    u32 r6;
+    u32 r5;
+    u32 r4;
+    u32 r10;
+    u32 sp0;
+    s16 i;
+
+    ewram0.var_4 = 0;
+    task->data[1] += 3;
+    if (task->data[1] > 79)
+        task->data[1] = 79;
+
+    r7 = task->data[1];
+    r9 = 160 - r7;
+    r4 = r9 - r7;
+    r6 = -r7 << 16;
+    r5 = (160 << 16) / r4;
+    r5 -= 1 << 16;
+    r10 = r5 * r4 + r6;
+    sp0 = r5 / r4;
+    r5 *= 2;
+
+    for (i = 0; i < r7; i++)
+    {
+        gUnknown_03004DE0.filler0[i] = -4 - (u32)i;
+    }
+    //_08093B74
+    for (; i < r9; i++)
+    {
+        u16 var = r6 >> 16;
+        r6 += r5;
+        r5 -= sp0;
+        gUnknown_03004DE0.filler0[i] = -4 + var;
+    }
+    for (; i < 160; i++)
+        gUnknown_03004DE0.filler0[i] = -4 + (u16)(r10 >> 16);
+    ewram0.var_4 = 1;
+    if (task->data[1] > 0x4A)
+        task->data[0]++;
+    return FALSE;
+}
+*/
+
 __attribute__((naked))
-bool8 sub_8093AF0()
+bool8 sub_8093AF0(struct Task *task)
 {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
@@ -871,18 +950,18 @@ _08093C08: .4byte 0x0000fffc\n\
     .syntax divided\n");
 }
 
-bool8 sub_8093C0C(struct TrainerCard *trainerCard)
+bool8 sub_8093C0C(struct Task *task)
 {
     sub_80939C0();
     sub_8093DAC();
     if (!ewram0.var_3)
         sub_80939A4();
-    trainerCard->firstHallOfFameB++;
+    task->data[0]++;
     return TRUE;
 }
 
 __attribute__((naked))
-bool8 sub_8093C38()
+bool8 sub_8093C38(struct Task *task)
 {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
@@ -1031,7 +1110,7 @@ _08093D4C: .4byte 0x0000fffc\n\
     .syntax divided\n");
 }
 
-bool8 sub_8093D50(void)
+bool8 sub_8093D50(struct Task *task)
 {
     u8 taskId;
 
@@ -1043,33 +1122,13 @@ bool8 sub_8093D50(void)
     return FALSE;
 }
 
-__attribute__((naked))
 void sub_8093D7C(void)
 {
-    asm(".syntax unified\n\
-    ldr r1, _08093DA0 @ =gUnknown_03004DE0\n\
-    ldr r0, _08093DA4 @ =REG_VCOUNT\n\
-    ldrh r2, [r0]\n\
-    movs r0, 0xFF\n\
-    ands r0, r2\n\
-    lsls r0, 1\n\
-    movs r2, 0xF0\n\
-    lsls r2, 3\n\
-    adds r1, r2\n\
-    adds r0, r1\n\
-    ldrh r1, [r0]\n\
-    ldr r0, _08093DA8 @ =REG_BG0VOFS\n\
-    strh r1, [r0]\n\
-    adds r0, 0x4\n\
-    strh r1, [r0]\n\
-    adds r0, 0x4\n\
-    strh r1, [r0]\n\
-    bx lr\n\
-    .align 2, 0\n\
-_08093DA0: .4byte gUnknown_03004DE0\n\
-_08093DA4: .4byte 0x4000006 @ REG_VCOUNT\n\
-_08093DA8: .4byte 0x4000012 @ REG_BG0VOFS\n\
-    .syntax divided\n");
+    u16 bgVOffset = gUnknown_03004DE0.unk780[REG_VCOUNT & 0xFF];
+
+    REG_BG0VOFS = bgVOffset;
+    REG_BG1VOFS = bgVOffset;
+    REG_BG2VOFS = bgVOffset;
 }
 
 static void sub_8093DAC(void)
@@ -1099,89 +1158,48 @@ static void sub_8093DEC(void)
     sub_8094188();
 }
 
-__attribute__((naked))
-static void sub_8093E04()
+static void sub_8093E04(void)
 {
-    asm(".syntax unified\n\
-    ldr r0, _08093E20 @ =REG_BG0VOFS\n\
-    ldr r2, _08093E24 @ =0x0000fffc\n\
-    adds r1, r2, 0\n\
-    strh r1, [r0]\n\
-    adds r0, 0x2\n\
-    movs r2, 0\n\
-    strh r2, [r0]\n\
-    adds r0, 0x2\n\
-    strh r1, [r0]\n\
-    adds r0, 0x2\n\
-    strh r2, [r0]\n\
-    adds r0, 0x2\n\
-    strh r1, [r0]\n\
-    bx lr\n\
-    .align 2, 0\n\
-_08093E20: .4byte 0x4000012 @ REG_BG0VOFS\n\
-_08093E24: .4byte 0x0000fffc\n\
-    .syntax divided\n");
+    REG_BG0VOFS = -4;
+    REG_BG1HOFS = 0;
+    REG_BG1VOFS = -4;
+    REG_BG2HOFS = 0;
+    REG_BG2VOFS = -4;
 }
 
-__attribute__((naked))
 static void sub_8093E28(void)
 {
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    bl sub_8093EA0\n\
-    ldr r0, _08093E84 @ =gUnknown_083B5F6C\n\
-    movs r1, 0xE0\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    ldr r3, _08093E88 @ =gMenuTrainerCard_Gfx\n\
-    movs r4, 0xC0\n\
-    lsls r4, 19\n\
-    movs r5, 0xA4\n\
-    lsls r5, 5\n\
-    ldr r1, _08093E8C @ =0x040000d4\n\
-    ldr r6, _08093E90 @ =0x80000800\n\
-    movs r2, 0x80\n\
-    lsls r2, 5\n\
-    movs r7, 0x80\n\
-    lsls r7, 24\n\
-_08093E4E:\n\
-    str r3, [r1]\n\
-    str r4, [r1, 0x4]\n\
-    str r6, [r1, 0x8]\n\
-    ldr r0, [r1, 0x8]\n\
-    adds r3, r2\n\
-    adds r4, r2\n\
-    subs r5, r2\n\
-    cmp r5, r2\n\
-    bhi _08093E4E\n\
-    str r3, [r1]\n\
-    str r4, [r1, 0x4]\n\
-    lsrs r0, r5, 1\n\
-    orrs r0, r7\n\
-    str r0, [r1, 0x8]\n\
-    ldr r0, [r1, 0x8]\n\
-    ldr r1, _08093E94 @ =gBadgesTiles\n\
-    ldr r2, _08093E98 @ =0x06001480\n\
-    ldr r0, _08093E8C @ =0x040000d4\n\
-    str r1, [r0]\n\
-    str r2, [r0, 0x4]\n\
-    ldr r1, _08093E9C @ =0x80000200\n\
-    str r1, [r0, 0x8]\n\
-    ldr r0, [r0, 0x8]\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08093E84: .4byte gUnknown_083B5F6C\n\
-_08093E88: .4byte gMenuTrainerCard_Gfx\n\
-_08093E8C: .4byte 0x040000d4\n\
-_08093E90: .4byte 0x80000800\n\
-_08093E94: .4byte gBadgesTiles\n\
-_08093E98: .4byte 0x06001480\n\
-_08093E9C: .4byte 0x80000200\n\
-    .syntax divided\n");
+    const u8 *src;
+    u8 *dst;
+    u32 size;
+
+    sub_8093EA0();
+    LoadPalette(gUnknown_083B5F6C, 0xE0, 32);
+    src = gMenuTrainerCard_Gfx;
+    dst = (void *)VRAM;
+    size = 0x1480;
+    while (1)
+    {
+        DmaCopy16(3, src, dst, 0x1000);
+        src += 0x1000;
+        dst += 0x1000;
+        size -= 0x1000;
+        if (size <= 0x1000)
+        {
+            DmaCopy16(3, src, dst, size);
+            break;
+        }
+    }
+    {
+        const void *src = gBadgesTiles;
+        void *dst = (void *)(VRAM + 0x1480);
+
+        DmaCopy16(3, src, dst, 0x400);
+    }
 }
 
+extern const u16 *const gUnknown_083B5EF8[];
+
 void sub_8093EA0(void)
 {
     LoadPalette(gUnknown_083B5EF8[ewram0.var_2], 0, 48 * 2);
@@ -1196,36 +1214,32 @@ static void sub_8093EF8(void)
     LoadTrainerGfx_TrainerCard(ewram0.var_64.gender, 80, (void *)(VRAM + 0x1880));
 }
 
-__attribute__((naked))
 static void sub_8093F14(void)
 {
-    asm(".syntax unified\n\
-    push {lr}\n\
-    sub sp, 0x8\n\
-    ldr r0, _08093F3C @ =gUnknown_083B5EEC\n\
-    ldr r1, [r0, 0x4]\n\
-    ldr r0, [r0]\n\
-    str r0, [sp]\n\
-    str r1, [sp, 0x4]\n\
-    ldr r0, _08093F40 @ =0x02000000\n\
-    ldrb r0, [r0, 0x1]\n\
-    lsls r0, 2\n\
-    add r0, sp\n\
-    ldr r0, [r0]\n\
-    ldr r1, _08093F44 @ =0x06004800\n\
-    movs r2, 0xA0\n\
-    lsls r2, 1\n\
-    bl CpuFastSet\n\
-    add sp, 0x8\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08093F3C: .4byte gUnknown_083B5EEC\n\
-_08093F40: .4byte 0x02000000\n\
-_08093F44: .4byte 0x06004800\n\
-    .syntax divided\n");
+    const void *arr[] = {gUnknown_08E8CAC0, gUnknown_08E8D4C0};
+
+    CpuFastSet(arr[ewram0.var_1], (void *)(VRAM + 0x4800), 0x140);
 }
 
+// I don't really know where to put the data. It's in such a weird order.
+
+const u8 gUnknown_083B5EF4[] = _(" : ");
+
+const u16 *const gUnknown_083B5EF8[] =
+{
+    gMenuTrainerCard0Star_Pal,
+    gMenuTrainerCard1Star_Pal,
+    gMenuTrainerCard2Star_Pal,
+    gMenuTrainerCard3Star_Pal,
+    gMenuTrainerCard4Star_Pal,
+};
+
+const u16 gUnknown_083B5F0C[] = INCBIN_U16("graphics/trainer_card/83B5F0C.gbapal");
+const u16 gBadgesPalette[] = INCBIN_U16("graphics/trainer_card/badges.gbapal");
+const u16 gUnknown_083B5F4C[] = INCBIN_U16("graphics/trainer_card/83B5F4C.gbapal");
+const u16 gUnknown_083B5F6C[] = INCBIN_U16("graphics/trainer_card/83B5F6C.gbapal");
+const u16 gUnknown_083B5F8C[][4] = INCBIN_U16("graphics/trainer_card/83B5F8C_map.bin");
+
 static void sub_8093F48(void)
 {
     CpuFastSet(gUnknown_08E8CFC0, (void *)(VRAM + 0x4800), 320);
@@ -1236,266 +1250,79 @@ static void sub_8093F64(void)
     CpuFastSet(gUnknown_08E8D9C0, (void *)(VRAM + 0x5000), 320);
 }
 
-__attribute__((naked))
 static void sub_8093F80(void)
 {
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    movs r5, 0xC4\n\
-    ldr r7, _08093FCC @ =0x06004000\n\
-    movs r1, 0x5\n\
-    movs r0, 0xA0\n\
-    lsls r0, 7\n\
-    adds r6, r0, 0\n\
-_08093F8E:\n\
-    movs r0, 0x13\n\
-    lsls r3, r1, 16\n\
-    asrs r4, r3, 11\n\
-_08093F94:\n\
-    lsls r2, r0, 16\n\
-    asrs r2, 16\n\
-    adds r1, r4, r2\n\
-    lsls r1, 1\n\
-    adds r1, r7\n\
-    adds r0, r5, 0\n\
-    orrs r0, r6\n\
-    strh r0, [r1]\n\
-    adds r2, 0x1\n\
-    lsls r2, 16\n\
-    adds r0, r5, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r5, r0, 16\n\
-    lsrs r0, r2, 16\n\
-    asrs r2, 16\n\
-    cmp r2, 0x1A\n\
-    ble _08093F94\n\
-    movs r1, 0x80\n\
-    lsls r1, 9\n\
-    adds r0, r3, r1\n\
-    lsrs r1, r0, 16\n\
-    asrs r0, 16\n\
-    cmp r0, 0xC\n\
-    ble _08093F8E\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08093FCC: .4byte 0x06004000\n\
-    .syntax divided\n");
+    u16 r5 = 0xC4;
+    u16 *ptr = (u16 *)(VRAM + 0x4000);
+    s16 i;
+    s16 j;
+
+    for (i = 5; i < 13; i++)
+    {
+        for (j = 19; j < 27; j++, r5++)
+            ptr[i * 32 + j] = r5 | 0x5000;
+    }
 }
 
-__attribute__((naked))
 static void sub_8093FD0(void)
 {
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    ldr r4, _0809402C @ =0x06004000\n\
-    movs r2, 0xF\n\
-    ldr r0, _08094030 @ =0x02000000\n\
-    ldrb r0, [r0, 0x2]\n\
-    adds r0, 0xF\n\
-    cmp r2, r0\n\
-    bge _08094002\n\
-    movs r6, 0xC0\n\
-    lsls r6, 1\n\
-    ldr r1, _08094034 @ =0x0000408f\n\
-    adds r5, r1, 0\n\
-    adds r3, r0, 0\n\
-_08093FEA:\n\
-    lsls r1, r2, 16\n\
-    asrs r1, 16\n\
-    lsls r0, r1, 1\n\
-    adds r0, r4\n\
-    adds r0, r6\n\
-    strh r5, [r0]\n\
-    adds r1, 0x1\n\
-    lsls r1, 16\n\
-    lsrs r2, r1, 16\n\
-    asrs r1, 16\n\
-    cmp r1, r3\n\
-    blt _08093FEA\n\
-_08094002:\n\
-    lsls r1, r2, 16\n\
-    asrs r0, r1, 16\n\
-    cmp r0, 0x12\n\
-    bgt _08094024\n\
-    movs r3, 0xC0\n\
-    lsls r3, 1\n\
-    movs r2, 0\n\
-_08094010:\n\
-    asrs r0, r1, 16\n\
-    lsls r1, r0, 1\n\
-    adds r1, r4\n\
-    adds r1, r3\n\
-    strh r2, [r1]\n\
-    adds r0, 0x1\n\
-    lsls r1, r0, 16\n\
-    asrs r0, r1, 16\n\
-    cmp r0, 0x12\n\
-    ble _08094010\n\
-_08094024:\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_0809402C: .4byte 0x06004000\n\
-_08094030: .4byte 0x02000000\n\
-_08094034: .4byte 0x0000408f\n\
-    .syntax divided\n");
+    u16 *ptr = (u16 *)(VRAM + 0x4000);
+    s16 i = 15;
+    s16 var = 15 + ewram0.var_2;
+
+    while (i < var)
+    {
+        ptr[6 * 32 + i] = 0x408F;
+        i++;
+    }
+    while (i < 0x13)
+    {
+        ptr[6 * 32 + i] = 0;
+        i++;
+    }
 }
 
-__attribute__((naked))
 static void sub_8094038(void)
 {
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r9\n\
-    mov r6, r8\n\
-    push {r6,r7}\n\
-    ldr r1, _080940D0 @ =0x02000000\n\
-    ldrb r0, [r1, 0x1]\n\
-    cmp r0, 0\n\
-    bne _080940C2\n\
-    ldr r0, _080940D4 @ =0x06004000\n\
-    mov r9, r0\n\
-    movs r0, 0\n\
-    movs r2, 0x4\n\
-    adds r1, 0xE\n\
-    mov r8, r1\n\
-    ldr r7, _080940D8 @ =gUnknown_083B5F8C\n\
-    movs r1, 0xC0\n\
-    lsls r1, 6\n\
-    adds r6, r1, 0\n\
-    adds r1, r7, 0x6\n\
-    mov r12, r1\n\
-_08094060:\n\
-    lsls r0, 16\n\
-    asrs r4, r0, 16\n\
-    mov r1, r8\n\
-    adds r0, r4, r1\n\
-    ldrb r0, [r0]\n\
-    lsls r5, r2, 16\n\
-    cmp r0, 0\n\
-    beq _080940AE\n\
-    asrs r1, r5, 15\n\
-    add r1, r9\n\
-    movs r2, 0xF0\n\
-    lsls r2, 2\n\
-    adds r3, r1, r2\n\
-    lsls r2, r4, 3\n\
-    adds r0, r2, r7\n\
-    ldrh r0, [r0]\n\
-    orrs r0, r6\n\
-    strh r0, [r3]\n\
-    ldr r0, _080940DC @ =0x000003c2\n\
-    adds r3, r1, r0\n\
-    adds r0, r7, 0x2\n\
-    adds r0, r2, r0\n\
-    ldrh r0, [r0]\n\
-    orrs r0, r6\n\
-    strh r0, [r3]\n\
-    movs r0, 0x80\n\
-    lsls r0, 3\n\
-    adds r3, r1, r0\n\
-    adds r0, r7, 0x4\n\
-    adds r0, r2, r0\n\
-    ldrh r0, [r0]\n\
-    orrs r0, r6\n\
-    strh r0, [r3]\n\
-    ldr r0, _080940E0 @ =0x00000402\n\
-    adds r1, r0\n\
-    add r2, r12\n\
-    ldrh r0, [r2]\n\
-    orrs r0, r6\n\
-    strh r0, [r1]\n\
-_080940AE:\n\
-    adds r1, r4, 0x1\n\
-    lsls r1, 16\n\
-    movs r2, 0xC0\n\
-    lsls r2, 10\n\
-    adds r0, r5, r2\n\
-    lsrs r2, r0, 16\n\
-    lsrs r0, r1, 16\n\
-    asrs r1, 16\n\
-    cmp r1, 0x7\n\
-    ble _08094060\n\
-_080940C2:\n\
-    pop {r3,r4}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_080940D0: .4byte 0x02000000\n\
-_080940D4: .4byte 0x06004000\n\
-_080940D8: .4byte gUnknown_083B5F8C\n\
-_080940DC: .4byte 0x000003c2\n\
-_080940E0: .4byte 0x00000402\n\
-    .syntax divided\n");
+    if (ewram0.var_1 == 0)
+    {
+        u16 *ptr = (u16 *)(VRAM + 0x4000);
+        s16 i;
+        s16 r2;
+
+        for (i = 0, r2 = 4; i < 8; i++, r2 += 3)
+        {
+            if (ewram0.var_e[i] != 0)
+            {
+                ptr[15 * 32 + r2 + 0] = gUnknown_083B5F8C[i][0] | 0x3000;
+                ptr[15 * 32 + r2 + 1] = gUnknown_083B5F8C[i][1] | 0x3000;
+                ptr[16 * 32 + r2 + 0] = gUnknown_083B5F8C[i][2] | 0x3000;
+                ptr[16 * 32 + r2 + 1] = gUnknown_083B5F8C[i][3] | 0x3000;
+            }
+        }
+    }
 }
 
-__attribute__((naked))
-static void sub_80940E4()
+static void sub_80940E4(void)
 {
-    asm(".syntax unified\n\
-    push {r4,lr}\n\
-    movs r2, 0\n\
-    ldr r1, _08094108 @ =0x06004000\n\
-    movs r4, 0\n\
-    ldr r3, _0809410C @ =0x000003ff\n\
-_080940EE:\n\
-    strh r4, [r1]\n\
-    lsls r0, r2, 16\n\
-    movs r2, 0x80\n\
-    lsls r2, 9\n\
-    adds r0, r2\n\
-    adds r1, 0x2\n\
-    lsrs r2, r0, 16\n\
-    asrs r0, 16\n\
-    cmp r0, r3\n\
-    ble _080940EE\n\
-    pop {r4}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08094108: .4byte 0x06004000\n\
-_0809410C: .4byte 0x000003ff\n\
-    .syntax divided\n");
+    s16 i;
+    u16 *ptr;
+
+    for (i = 0, ptr = (u16 *)(VRAM + 0x4000); i < 0x400; i++, ptr++)
+        *ptr = 0;
 }
 
-__attribute__((naked))
-static void sub_8094110()
+static void sub_8094110(void)
 {
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    ldr r6, _0809413C @ =0x06004800\n\
-    movs r2, 0x3\n\
-    movs r5, 0xA0\n\
-    lsls r5, 2\n\
-    movs r3, 0x1\n\
-    movs r4, 0xB0\n\
-    lsls r4, 2\n\
-_08094120:\n\
-    lsls r0, r2, 1\n\
-    adds r0, r6\n\
-    adds r1, r0, r5\n\
-    strh r3, [r1]\n\
-    adds r0, r4\n\
-    strh r3, [r0]\n\
-    adds r0, r2, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    cmp r2, 0x10\n\
-    bls _08094120\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_0809413C: .4byte 0x06004800\n\
-    .syntax divided\n");
-}
+    u16 *ptr = (u16 *)(VRAM + 0x4800);
+    u16 i;
 
+    for (i = 3; i < 17; i++)
+    {
+        ptr[10 * 32 + i] = 1;
+        ptr[11 * 32 + i] = 1;
+    }
+}
 
 static void sub_8094140(void)
 {
-- 
cgit v1.2.3


From 48407f4c37e39f2792e469ee18ab743b01f84316 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Fri, 14 Jul 2017 17:24:36 -0500
Subject: decompile sub_80FA8EC - sub_80FAB60

---
 src/region_map.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 155 insertions(+)
 create mode 100644 src/region_map.c

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
new file mode 100644
index 000000000..301c3c082
--- /dev/null
+++ b/src/region_map.c
@@ -0,0 +1,155 @@
+#include "global.h"
+#include "palette.h"
+#include "sprite.h"
+
+struct UnknownStruct1
+{
+    u8 filler0[0x14];
+    u16 unk14;
+    u8 unk16;
+    u8 filler17[1];
+    u8 (*unk18)(void);
+    struct Sprite *unk1C;
+    struct Sprite *unk20;
+    u8 filler24[0x30];
+    u16 unk54;
+    u16 unk56;
+    u16 unk58;
+    u16 unk5A;
+    s16 unk5C;
+    s16 unk5E;
+    u8 filler60[4];
+    u16 unk64;
+    u16 unk66;
+    u8 filler68[8];
+    u16 unk70;
+    u16 unk72;
+    u16 unk74;
+    u16 unk76;
+    u8 unk78;
+    u8 unk79;
+    u8 unk7A;
+    u8 filler7B[3];
+    u8 unk7E;
+    u8 filler7F[0x101];
+    u8 unk180[0x100];
+    u8 unk280[0x100];
+};
+
+extern struct UnknownStruct1 *gUnknown_020388CC;
+
+const u16 gPokenavCursor_Pal[] = INCBIN_U16("graphics/pokenav/cursor.gbapal");
+const u8 gUnknown_083E5AF0[] = INCBIN_U8("graphics/pokenav/cursor_small.4bpp.lz");
+const u8 gUnknown_083E5B34[] = INCBIN_U8("graphics/pokenav/cursor_large.4bpp.lz");
+const u16 gRegionMapBrendanIconPalette[] = INCBIN_U16("graphics/pokenav/brendan_icon.gbapal");
+const u8 gRegionMapBrendanIconTiles[] = INCBIN_U8("graphics/pokenav/brendan_icon.4bpp");
+const u16 gRegionMapMayIconPalette[] = INCBIN_U16("graphics/pokenav/may_icon.gbapal");
+const u8 gRegionMapMayIconTiles[] = INCBIN_U8("graphics/pokenav/may_icon.4bpp");
+const u16 gUnknown_083E5D60[] = INCBIN_U16("graphics/pokenav/region_map.gbapal");
+const u8 gUnknown_083E5DA0[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz");
+const u8 gUnknown_083E6B04[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz");
+
+void sub_80FA904(struct UnknownStruct1 *, u8);
+bool8 sub_80FA940(void);
+u8 sub_80FAB78(void);
+u8 sub_80FAD04(void);
+void sub_80FB170();
+void sub_80FB260(void);
+void sub_80FB32C(void);
+u16 sub_80FB758();
+u16 sub_80FB9C0(u16);
+void sub_80FBA18();
+void sub_80FBFB4();
+
+void sub_80FA8EC(struct UnknownStruct1 *a, u8 b)
+{
+    sub_80FA904(a, b);
+    while (sub_80FA940())
+        ;
+}
+
+void sub_80FA904(struct UnknownStruct1 *a, u8 b)
+{
+    gUnknown_020388CC = a;
+    gUnknown_020388CC->unk79 = 0;
+    gUnknown_020388CC->unk78 = b;
+    gUnknown_020388CC->unk18 = (b == 0) ? sub_80FAB78 : sub_80FAD04;
+}
+
+bool8 sub_80FA940(void)
+{
+    switch (gUnknown_020388CC->unk79)
+    {
+    case 0:
+        LZ77UnCompVram(gUnknown_083E5DA0, (void *)(VRAM + 0x8000));
+        break;
+    case 1:
+        LZ77UnCompVram(gUnknown_083E6B04, (void *)(VRAM + 0xE000));
+        break;
+    case 2:
+        LoadPalette(gUnknown_083E5D60, 0x70, 0x60);  // Why isn't this the right size?
+        break;
+    case 3:
+        LZ77UnCompWram(gUnknown_083E5AF0, gUnknown_020388CC->unk180);
+        break;
+    case 4:
+        LZ77UnCompWram(gUnknown_083E5B34, gUnknown_020388CC->unk280);
+        break;
+    case 5:
+        sub_80FB32C();
+        gUnknown_020388CC->unk74 = gUnknown_020388CC->unk54;
+        gUnknown_020388CC->unk76 = gUnknown_020388CC->unk56;
+        gUnknown_020388CC->unk16 = sub_80FB758(gUnknown_020388CC->unk14);
+        gUnknown_020388CC->unk14 = sub_80FB9C0(gUnknown_020388CC->unk14);
+        sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16);
+        break;
+    case 6:
+        if (gUnknown_020388CC->unk78 == 0)
+        {
+            sub_80FB170(0, 0, 0, 0, 0x100, 0x100, 0);
+        }
+        else
+        {
+            gUnknown_020388CC->unk5C = gUnknown_020388CC->unk54 * 8 - 0x34;
+            gUnknown_020388CC->unk5E = gUnknown_020388CC->unk56 * 8 - 0x44;
+            gUnknown_020388CC->unk64 = gUnknown_020388CC->unk54;
+            gUnknown_020388CC->unk66 = gUnknown_020388CC->unk56;
+            sub_80FB170(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E, 0x38, 0x48, 0x80, 0x80, 0);
+        }
+        break;
+    case 7:
+        sub_80FBA18();
+        sub_80FB260();
+        gUnknown_020388CC->unk1C = NULL;
+        gUnknown_020388CC->unk20 = NULL;
+        gUnknown_020388CC->unk7A = 0;
+        gUnknown_020388CC->unk7E = 0;
+        REG_BG2CNT = 0xBC8A;
+        gUnknown_020388CC->unk79++;
+    default:
+        return FALSE;
+    }
+    gUnknown_020388CC->unk79++;
+    return TRUE;
+}
+
+void sub_80FAB10(void)
+{
+    if (gUnknown_020388CC->unk1C != NULL)
+    {
+        DestroySprite(gUnknown_020388CC->unk1C);
+        FreeSpriteTilesByTag(gUnknown_020388CC->unk58);
+        FreeSpritePaletteByTag(gUnknown_020388CC->unk5A);
+    }
+    if (gUnknown_020388CC->unk20 != NULL)
+    {
+        DestroySprite(gUnknown_020388CC->unk20);
+        FreeSpriteTilesByTag(gUnknown_020388CC->unk70);
+        FreeSpritePaletteByTag(gUnknown_020388CC->unk72);
+    }
+}
+
+u8 sub_80FAB60(void)
+{
+    return gUnknown_020388CC->unk18();
+}
-- 
cgit v1.2.3


From 1cc8e50292621ab30332d192782fd8a1e855ea51 Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Fri, 14 Jul 2017 08:14:10 -0700
Subject: decompile field_screen_effect and unknown_task

---
 src/field_screen_effect.c | 339 ++++++++++++++++++++++++++++++++++++++++++++++
 src/unknown_task.c        | 255 ++++++++++++++++++++++++++++++++++
 2 files changed, 594 insertions(+)
 create mode 100644 src/field_screen_effect.c
 create mode 100644 src/unknown_task.c

(limited to 'src')

diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
new file mode 100644
index 000000000..c6bd8cb77
--- /dev/null
+++ b/src/field_screen_effect.c
@@ -0,0 +1,339 @@
+#include "global.h"
+#include "field_camera.h"
+#include "menu.h"
+#include "palette.h"
+#include "rom4.h"
+#include "script.h"
+#include "task.h"
+#include "text.h"
+#include "unknown_task.h"
+
+struct UnknownStruct1
+{
+    u8 filler0[0x14];
+    u8 unk14;
+    u8 filler15[0xB];
+};
+extern struct UnknownStruct1 gUnknown_03004DC0;
+
+extern u16 gUnknown_03004DE0[][0x3C0];
+
+const static u16 gUnknown_0839ACDC[] = { 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0 };
+
+const s32 gUnknown_0839ACE8 = 4;
+
+const static u32 gUnknown_0839ACEC[3] =
+{
+    REG_ADDR_WIN0H,
+    ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
+    1
+};
+
+static void sub_808136C(u16 *dest, u32 a2, s32 a3, s32 a4)
+{
+    if (a2 <= 0xA0)
+    {
+        if (a3 < 0)
+            a3 = 0;
+        if (a3 > 255)
+            a3 = 255;
+        if (a4 < 0)
+            a4 = 0;
+        if (a4 > 255)
+            a4 = 255;
+        dest[a2] = (a3 << 8) | a4;
+    }
+}
+
+static void sub_8081398(u16 *dest, s32 a2, s32 a3, s32 a4)
+{
+    s32 v1 = a4;
+    s32 v2 = a4;
+    s32 v3 = 0;
+    while (v1 >= v3)
+    {
+        sub_808136C(dest, a3 - v3, a2 - v1, a2 + v1);
+        sub_808136C(dest, a3 + v3, a2 - v1, a2 + v1);
+        sub_808136C(dest, a3 - v1, a2 - v3, a2 + v3);
+        sub_808136C(dest, a3 + v1, a2 - v3, a2 + v3);
+        v2 -= (v3 * 2) - 1;
+        v3++;
+        if (v2 < 0)
+        {
+            v2 += 2 * (v1 - 1);
+            v1--;
+        }
+    }
+}
+
+static void sub_8081424(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    switch (data[0])
+    {
+    case 0:
+        sub_8081398(&gUnknown_03004DE0[gUnknown_03004DC0.unk14][0], data[1], data[2], data[3]);
+        data[0] = 1;
+        break;
+    case 1:
+        sub_8081398(&gUnknown_03004DE0[gUnknown_03004DC0.unk14][0], data[1], data[2], data[3]);
+        data[0] = 0;
+        data[3] += data[5];
+        if (data[3] > data[4])
+        {
+            if (data[6] == 1)
+            {
+                remove_some_task();
+                data[0] = 2;
+            }
+            else
+            {
+                DestroyTask(taskId);
+            }
+        }
+        break;
+    case 2:
+        dp12_8087EA4();
+        DestroyTask(taskId);
+        break;
+    }
+}
+
+static void sub_80814E8(u8 taskId)
+{
+    if (!FuncIsActiveTask(sub_8081424))
+    {
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+    }
+}
+
+static void sub_8081510(void)
+{
+    if (!FuncIsActiveTask(sub_80814E8))
+        CreateTask(sub_80814E8, 80);
+}
+
+static u8 sub_8081534(s32 a1, s32 a2, s32 a3, s32 a4, s32 a5, u8 a6)
+{
+    u8 taskId = CreateTask(sub_8081424, 80);
+    s16 *data = gTasks[taskId].data;
+
+    data[3] = a3;
+    data[4] = a4;
+    data[1] = a1;
+    data[2] = a2;
+    data[6] = a5;
+
+    if (a3 < a4)
+        data[5] = a6;
+    else
+        data[5] = -a6;
+
+    return taskId;
+}
+
+void sub_8081594(u8 a1)
+{
+    u8 index = sav1_get_flash_used_on_map();
+    u8 value = 0;
+    if (!a1)
+        value = 1;
+    sub_8081534(120, 80, gUnknown_0839ACDC[index], gUnknown_0839ACDC[a1], value, 1);
+    sub_8081510();
+    ScriptContext2_Enable();
+}
+
+void sub_80815E0(u8 a1)
+{
+    if (a1)
+    {
+        sub_8081398(&gUnknown_03004DE0[0][0], 120, 80, gUnknown_0839ACDC[a1]);
+        CpuFastSet(&gUnknown_03004DE0[0], &gUnknown_03004DE0[1], 480);
+    }
+}
+
+static void sub_808161C(u8 a1)
+{
+    int i;
+    u16 color[1];
+
+    if (!a1)
+        color[0] = 0x1F;
+    else
+        color[0] = 0x7C00;
+
+    for (i = 0; i < 16; i++)
+    {
+        LoadPalette(color, 0xF0 + i, 2);
+    }
+}
+
+static bool8 sub_8081658(u16 a1)
+{
+    u8 lo = REG_BLDALPHA & 0xFF;
+    u8 hi = REG_BLDALPHA >> 8;
+
+    if (a1)
+    {
+        if (lo)
+        {
+            lo--;
+        }
+    }
+    else
+    {
+        if (hi < 0x10)
+        {
+            hi++;
+        }
+    }
+
+    REG_BLDALPHA = (hi << 8) | lo;
+
+    if (lo == 0 && hi == 0x10)
+    {
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static void sub_80816A8(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    switch (data[0])
+    {
+    case 0:
+        data[6] = REG_DISPCNT;
+        data[7] = REG_BLDCNT;
+        data[8] = REG_BLDALPHA;
+        data[9] = REG_WININ;
+        data[10] = REG_WINOUT;
+        REG_DISPCNT &= 0xBFFF;
+        REG_BLDCNT |= gUnknown_081E29E8[0];
+        REG_BLDALPHA = 1804;
+        REG_WININ = 63;
+        REG_WINOUT = 30;
+        sub_8081398(&gUnknown_03004DE0[0][0], data[2], data[3], 1);
+        CpuFastSet(&gUnknown_03004DE0[0], &gUnknown_03004DE0[1], 480);
+        sub_80895F8(gUnknown_0839ACEC[0], gUnknown_0839ACEC[1], gUnknown_0839ACEC[2]);
+        data[0] = 1;
+        break;
+    case 1:
+        MenuFillWindowRectWithBlankTile(0, 0, 29, 19);
+        sub_808161C(data[1]);
+        sub_8081534(data[2], data[3], 1, 160, 1, 2);
+        data[0] = 2;
+        break;
+    case 2:
+        if (!FuncIsActiveTask(sub_8081424))
+        {
+            EnableBothScriptContexts();
+            data[0] = 3;
+        }
+        break;
+    case 3:
+        InstallCameraPanAheadCallback();
+        SetCameraPanningCallback(NULL);
+        data[5] = 0;
+        data[4] = 4;
+        data[0] = 4;
+        break;
+    case 4:
+        data[4]--;
+        if (!data[4])
+        {
+            s32 panning;
+            data[4] = 4;
+            data[5] ^= 1;
+            if (data[5])
+                panning = 4;
+            else
+                panning = -4;
+            SetCameraPanning(0, panning);
+        }
+        break;
+    case 6:
+        InstallCameraPanAheadCallback();
+        data[4] = 8;
+        data[0] = 7;
+        break;
+    case 7:
+        data[4]--;
+        if (!data[4])
+        {
+            data[4] = 8;
+            data[5] ^= 1;
+            if (sub_8081658(data[5]) == TRUE)
+                data[0] = 5;
+        }
+        break;
+    case 5:
+        MenuZeroFillWindowRect(0, 0, 29, 19);
+        LoadFontDefaultPalette(&gWindowConfig_81E6CE4);
+        REG_WIN0H = 255;
+        REG_DISPCNT = data[6];
+        REG_BLDCNT = data[7];
+        REG_BLDALPHA = data[8];
+        REG_WININ = data[9];
+        REG_WINOUT = data[10];
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+        break;
+    }
+}
+
+void sub_80818A4(void)
+{
+    u8 taskId = CreateTask(sub_80816A8, 80);
+    s16 *data = gTasks[taskId].data;
+
+    if (gScriptResult == 0)
+    {
+        data[1] = 0;
+        data[2] = 104;
+    }
+    else if (gScriptResult == 1)
+    {
+        data[1] = 1;
+        data[2] = 104;
+    }
+    else if (gScriptResult == 2)
+    {
+        data[1] = 0;
+        data[2] = 120;
+    }
+    else
+    {
+        data[1] = 1;
+        data[2] = 120;
+    }
+
+    data[3] = 80;
+}
+
+void sub_80818FC(void)
+{
+    u8 taskId = FindTaskIdByFunc(sub_80816A8);
+    gTasks[taskId].data[0] = 6;
+}
+
+static void task50_0807F0C8(u8);
+
+void sub_8081924(void)
+{
+    sub_8054044();
+    CreateTask(task50_0807F0C8, 80);
+}
+
+static void task50_0807F0C8(u8 taskId)
+{
+    if (sub_8054034() == TRUE)
+    {
+        DestroyTask(taskId);
+        EnableBothScriptContexts();
+    }
+}
diff --git a/src/unknown_task.c b/src/unknown_task.c
new file mode 100644
index 000000000..81b89ef92
--- /dev/null
+++ b/src/unknown_task.c
@@ -0,0 +1,255 @@
+#include "global.h"
+#include "data2.h"
+#include "task.h"
+#include "trig.h"
+
+struct UnknownStruct1
+{
+    void *src[2];
+    void *dest;
+    u32 unkC;
+    void (*unk10)(void);
+    u8 srcBank;
+    u8 unk15;
+    u8 unk16;
+    u8 unk17;
+    u8 taskId;
+    u8 filler19[0x7];
+};
+
+struct UnknownStruct2
+{
+    void *dest;
+    u32 control;
+    u8 unk8;
+    u8 unk9;
+};
+
+static void sub_80896F4(void);
+static void sub_8089714(void);
+
+extern u16 gUnknown_030041B0;
+extern u16 gUnknown_030041B4;
+extern u16 gUnknown_030041B8;
+extern u16 gUnknown_03004280;
+extern u16 gUnknown_03004288;
+extern u16 gUnknown_030042A0;
+extern u16 gUnknown_030042A4;
+extern u16 gUnknown_030042C0;
+
+extern u8 gUnknown_0202FFA4;
+
+extern struct UnknownStruct1 gUnknown_03004DC0;
+
+extern u16 gUnknown_03004DE0[][0x3C0];
+
+void remove_some_task(void)
+{
+    gUnknown_03004DC0.unk15 = 0;
+    DmaStop(0);
+    if (gUnknown_03004DC0.taskId != 0xFF)
+    {
+        DestroyTask(gUnknown_03004DC0.taskId);
+        gUnknown_03004DC0.taskId = 0xFF;
+    }
+}
+
+void dp12_8087EA4(void)
+{
+    CpuFill16(0, gUnknown_03004DE0, 0x780 * 2);
+    gUnknown_03004DC0.src[0] = 0;
+    gUnknown_03004DC0.src[1] = 0;
+    gUnknown_03004DC0.dest = 0;
+    gUnknown_03004DC0.unkC = 0;
+    gUnknown_03004DC0.srcBank = 0;
+    gUnknown_03004DC0.unk15 = 0;
+    gUnknown_03004DC0.unk16 = 0;
+    gUnknown_03004DC0.unk17 = 0;
+    gUnknown_03004DC0.taskId = 0xFF;
+}
+
+void sub_80895F8(struct UnknownStruct2 unk)
+{
+    if (unk.control == (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1))
+    {
+        gUnknown_03004DC0.src[0] = &gUnknown_03004DE0[0][1];
+        gUnknown_03004DC0.src[1] = &gUnknown_03004DE0[1][1];
+        gUnknown_03004DC0.unk10 = sub_80896F4;
+    }
+    else
+    {
+        gUnknown_03004DC0.src[0] = &gUnknown_03004DE0[0][2];
+        gUnknown_03004DC0.src[1] = &gUnknown_03004DE0[1][2];
+        gUnknown_03004DC0.unk10 = sub_8089714;
+    }
+
+    gUnknown_03004DC0.unkC = unk.control;
+    gUnknown_03004DC0.dest = unk.dest;
+    gUnknown_03004DC0.unk15 = unk.unk8;
+    gUnknown_03004DC0.unk16 = unk.unk9;
+    gUnknown_03004DC0.unk17 = unk.unk9;
+}
+
+void sub_8089668(void)
+{
+    if (gUnknown_03004DC0.unk15)
+    {
+        if (gUnknown_03004DC0.unk15 == 3)
+        {
+            gUnknown_03004DC0.unk15 = 0;
+            DmaStop(0);
+            gUnknown_0202FFA4 = 1;
+        }
+        else
+        {
+            DmaStop(0);
+            DmaSet(0, gUnknown_03004DC0.src[gUnknown_03004DC0.srcBank], gUnknown_03004DC0.dest, gUnknown_03004DC0.unkC);
+            gUnknown_03004DC0.unk10();
+            gUnknown_03004DC0.srcBank ^= 1;
+        }
+    }
+}
+
+static void sub_80896F4(void)
+{
+    u16 *dest = (u16 *)gUnknown_03004DC0.dest;
+    u16 *src = (u16 *)&gUnknown_03004DE0[gUnknown_03004DC0.srcBank];
+    *dest = *src;
+}
+
+static void sub_8089714(void)
+{
+    u32 *dest = (u32 *)gUnknown_03004DC0.dest;
+    u32 *src = (u32 *)&gUnknown_03004DE0[gUnknown_03004DC0.srcBank];
+    *dest = *src;
+}
+
+static void task00_for_dp12(u8 taskId)
+{
+    int value = 0;
+
+    if (gUnknown_0202FFA4)
+    {
+        DestroyTask(taskId);
+        gUnknown_03004DC0.taskId = 0xFF;
+    }
+    else
+    {
+        if (gTasks[taskId].data[7])
+        {
+            switch (gTasks[taskId].data[6])
+            {
+            case 0x0:
+                value = gUnknown_030042A4;
+                break;
+            case 0x2:
+                value = gUnknown_030042A0;
+                break;
+            case 0x4:
+                value = gUnknown_030042C0;
+                break;
+            case 0x6:
+                value = gUnknown_030041B4;
+                break;
+            case 0x8:
+                value = gUnknown_03004288;
+                break;
+            case 0xA:
+                value = gUnknown_03004280;
+                break;
+            case 0xC:
+                value = gUnknown_030041B0;
+                break;
+            case 0xE:
+                value = gUnknown_030041B8;
+                break;
+            }
+        }
+        if (gTasks[taskId].data[4])
+        {
+            int i;
+            int offset;
+            gTasks[taskId].data[4]--;
+            offset = gTasks[taskId].data[3] + 320;
+            for (i = gTasks[taskId].data[0]; i < gTasks[taskId].data[1]; i++)
+            {
+                gUnknown_03004DE0[gUnknown_03004DC0.srcBank][i] = gUnknown_03004DE0[0][offset] + value;
+                offset++;
+            }
+        }
+        else
+        {
+            int i;
+            int offset;
+            gTasks[taskId].data[4] = gTasks[taskId].data[5];
+            offset = gTasks[taskId].data[3] + 320;
+            for (i = gTasks[taskId].data[0]; i < gTasks[taskId].data[1]; i++)
+            {
+                gUnknown_03004DE0[gUnknown_03004DC0.srcBank][i] = gUnknown_03004DE0[0][offset] + value;
+                offset++;
+            }
+            gTasks[taskId].data[3]++;
+            if (gTasks[taskId].data[3] == gTasks[taskId].data[2])
+            {
+                gTasks[taskId].data[3] = 0;
+            }
+        }
+    }
+}
+
+static void sub_80898FC(u16 *a1, u8 a2, u8 a3, u8 a4)
+{
+    u16 i = 0;
+    u8 offset = 0;
+
+    while (i < 0x100)
+    {
+        a1[i] = (gSineTable[offset] * a3) / 256;
+        offset += a2;
+        i++;
+    }
+}
+
+u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7)
+{
+    int i;
+    int offset;
+    struct UnknownStruct2 unk;
+    u8 taskId;
+
+    dp12_8087EA4();
+
+    unk.dest = (void *)(REG_ADDR_BG0HOFS + a6);
+    unk.control = ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1;
+    unk.unk8 = 1;
+    unk.unk9 = 0;
+
+    sub_80895F8(unk);
+
+    taskId = CreateTask(task00_for_dp12, 0);
+
+    gTasks[taskId].data[0] = a1;
+    gTasks[taskId].data[1] = a2;
+    gTasks[taskId].data[2] = 256 / a3;
+    gTasks[taskId].data[3] = 0;
+    gTasks[taskId].data[4] = a5;
+    gTasks[taskId].data[5] = a5;
+    gTasks[taskId].data[6] = a6;
+    gTasks[taskId].data[7] = a7;
+
+    gUnknown_03004DC0.taskId = taskId;
+    gUnknown_0202FFA4 = 0;
+
+    sub_80898FC(&gUnknown_03004DE0[0][320], a3, a4, a2 - a1);
+
+    offset = 320;
+
+    for (i = a1; i < a2; i++)
+    {
+        gUnknown_03004DE0[0][i] = gUnknown_03004DE0[0][offset];
+        gUnknown_03004DE0[1][i] = gUnknown_03004DE0[0][offset];
+        offset++;
+    }
+
+    return taskId;
+}
-- 
cgit v1.2.3


From 9013ffe84a12a8d81d32fb8125687988bd2ba8ca Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Fri, 14 Jul 2017 21:14:00 -0500
Subject: decompile sub_80FAB78 - sub_80FAFC0

---
 src/region_map.c | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 264 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 301c3c082..0a50da51e 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "main.h"
 #include "palette.h"
 #include "sprite.h"
 
@@ -11,25 +12,37 @@ struct UnknownStruct1
     u8 (*unk18)(void);
     struct Sprite *unk1C;
     struct Sprite *unk20;
-    u8 filler24[0x30];
-    u16 unk54;
-    u16 unk56;
+    u8 filler24[0x18];
+    s32 unk3C;
+    s32 unk40;
+    s32 unk44;
+    s32 unk48;
+    s32 unk4C;
+    u32 unk50;
+    u16 unk54;  // cursor x
+    u16 unk56;  // cursor y
     u16 unk58;
     u16 unk5A;
     s16 unk5C;
     s16 unk5E;
-    u8 filler60[4];
+    s16 unk60;
+    s16 unk62;
     u16 unk64;
     u16 unk66;
-    u8 filler68[8];
+    u16 unk68;
+    u16 unk6A;
+    u16 unk6C;
+    u16 unk6E;
     u16 unk70;
     u16 unk72;
     u16 unk74;
     u16 unk76;
     u8 unk78;
     u8 unk79;
-    u8 unk7A;
-    u8 filler7B[3];
+    s8 unk7A;
+    s8 unk7B;  // movement delta horizontal
+    s8 unk7C;  // movement delta vertical
+    u8 unk7D;
     u8 unk7E;
     u8 filler7F[0x101];
     u8 unk180[0x100];
@@ -52,13 +65,21 @@ const u8 gUnknown_083E6B04[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz
 void sub_80FA904(struct UnknownStruct1 *, u8);
 bool8 sub_80FA940(void);
 u8 sub_80FAB78(void);
+u8 _swiopen(void);
 u8 sub_80FAD04(void);
-void sub_80FB170();
+u8 sub_80FADE4(void);
+void sub_80FB170(int, int, int, int, u16, u16, int);
+void sub_80FB238();
 void sub_80FB260(void);
+u16 GetRegionMapSectionAt();
 void sub_80FB32C(void);
 u16 sub_80FB758();
 u16 sub_80FB9C0(u16);
 void sub_80FBA18();
+void sub_80FBB3C();
+void sub_80FBCA0(void);
+void sub_80FBDF8(void);
+void sub_80FBE24(void);
 void sub_80FBFB4();
 
 void sub_80FA8EC(struct UnknownStruct1 *a, u8 b)
@@ -153,3 +174,238 @@ u8 sub_80FAB60(void)
 {
     return gUnknown_020388CC->unk18();
 }
+
+u8 sub_80FAB78(void)
+{
+    u8 r4 = 0;
+
+    gUnknown_020388CC->unk7B = 0;
+    gUnknown_020388CC->unk7C = 0;
+    if ((gMain.heldKeys & DPAD_UP) && gUnknown_020388CC->unk56 > 2)
+    {
+        gUnknown_020388CC->unk7C = -1;
+        r4 = 1;
+    }
+    if ((gMain.heldKeys & DPAD_DOWN) && gUnknown_020388CC->unk56 < 16)
+    {
+        gUnknown_020388CC->unk7C = 1;
+        r4 = 1;
+    }
+    if ((gMain.heldKeys & DPAD_LEFT) && gUnknown_020388CC->unk54 > 1)
+    {
+        gUnknown_020388CC->unk7B = -1;
+        r4 = 1;
+    }
+    if ((gMain.heldKeys & DPAD_RIGHT) && gUnknown_020388CC->unk54 < 0x1C)
+    {
+        gUnknown_020388CC->unk7B = 1;
+        r4 = 1;
+    }
+    if (gMain.newKeys & A_BUTTON)
+        r4 = 4;
+    else if (gMain.newKeys & B_BUTTON)
+        r4 = 5;
+    if (r4 == 1)
+    {
+        gUnknown_020388CC->unk7A = 4;
+        gUnknown_020388CC->unk18 = _swiopen;
+    }
+    return r4;
+}
+
+u8 _swiopen(void)
+{
+    u16 r4;
+
+    if (gUnknown_020388CC->unk7A != 0)
+        return 2;
+
+    if (gUnknown_020388CC->unk7B > 0)
+        gUnknown_020388CC->unk54++;
+
+    if (gUnknown_020388CC->unk7B < 0)
+        gUnknown_020388CC->unk54--;
+
+    if (gUnknown_020388CC->unk7C > 0)
+        gUnknown_020388CC->unk56++;
+
+    if (gUnknown_020388CC->unk7C < 0)
+        gUnknown_020388CC->unk56--;
+
+    r4 = GetRegionMapSectionAt(gUnknown_020388CC->unk54, gUnknown_020388CC->unk56);
+    gUnknown_020388CC->unk16 = sub_80FB758(r4);
+    if (r4 != gUnknown_020388CC->unk14)
+    {
+        gUnknown_020388CC->unk14 = r4;
+        sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16);
+    }
+    sub_80FBA18();
+    gUnknown_020388CC->unk18 = sub_80FAB78;
+    return 3;
+}
+
+u8 sub_80FAD04(void)
+{
+    u8 r4 = 0;
+    gUnknown_020388CC->unk6A = 0;
+    gUnknown_020388CC->unk68 = 0;
+    if ((gMain.heldKeys & 0x40) && gUnknown_020388CC->unk5E > -0x34)
+    {
+        gUnknown_020388CC->unk68 = -1;
+        r4 = 1;
+    }
+    if ((gMain.heldKeys & 0x80) && gUnknown_020388CC->unk5E < 0x3C)
+    {
+        gUnknown_020388CC->unk68 = 1;
+        r4 = 1;
+    }
+    if ((gMain.heldKeys & 0x20) && gUnknown_020388CC->unk5C > -0x2C)
+    {
+        gUnknown_020388CC->unk6A = -1;
+        r4 = 1;
+    }
+    if ((gMain.heldKeys & 0x10) && gUnknown_020388CC->unk5C < 0xAC)
+    {
+        gUnknown_020388CC->unk6A = 1;
+        r4 = 1;
+    }
+    if (gMain.newKeys & A_BUTTON)
+        r4 = 4;
+    if (gMain.newKeys & B_BUTTON)
+        r4 = 5;
+    if (r4 == 1)
+    {
+        gUnknown_020388CC->unk18 = sub_80FADE4;
+        gUnknown_020388CC->unk6C = 0;
+    }
+    return r4;
+}
+
+u8 sub_80FADE4(void)
+{
+    gUnknown_020388CC->unk5E += gUnknown_020388CC->unk68;
+    gUnknown_020388CC->unk5C += gUnknown_020388CC->unk6A;
+    sub_80FB238(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E);
+    gUnknown_020388CC->unk6C++;
+    if (gUnknown_020388CC->unk6C == 8)
+    {
+        u16 r3 = (gUnknown_020388CC->unk5C + 0x2C) / 8 + 1;
+        u16 r1 = (gUnknown_020388CC->unk5E + 0x34) / 8 + 2;
+
+        if (r3 != gUnknown_020388CC->unk64 || r1 != gUnknown_020388CC->unk66)
+        {
+            u16 r4;
+
+            gUnknown_020388CC->unk64 = r3;
+            gUnknown_020388CC->unk66 = r1;
+            r4 = GetRegionMapSectionAt(r3, r1);
+            gUnknown_020388CC->unk16 = sub_80FB758(r4);
+            if (r4 != gUnknown_020388CC->unk14)
+            {
+                gUnknown_020388CC->unk14 = r4;
+                sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16);
+            }
+            sub_80FBA18();
+        }
+        gUnknown_020388CC->unk6C = 0;
+        gUnknown_020388CC->unk18 = sub_80FAD04;
+        return 3;
+    }
+    return 2;
+}
+
+void sub_80FAEC4(void)
+{
+    if (gUnknown_020388CC->unk78 == 0)
+    {
+        gUnknown_020388CC->unk5E = 0;
+        gUnknown_020388CC->unk5C = 0;
+        gUnknown_020388CC->unk40 = 0;
+        gUnknown_020388CC->unk3C = 0;
+        gUnknown_020388CC->unk60 = gUnknown_020388CC->unk54 * 8 - 0x34;
+        gUnknown_020388CC->unk62 = gUnknown_020388CC->unk56 * 8 - 0x44;
+        gUnknown_020388CC->unk44 = (gUnknown_020388CC->unk60 << 8) / 16;
+        gUnknown_020388CC->unk48 = (gUnknown_020388CC->unk62 << 8) / 16;
+        gUnknown_020388CC->unk64 = gUnknown_020388CC->unk54;
+        gUnknown_020388CC->unk66 = gUnknown_020388CC->unk56;
+        gUnknown_020388CC->unk4C = 0x10000;
+        gUnknown_020388CC->unk50 = -0x800;
+    }
+    else
+    {
+        gUnknown_020388CC->unk3C = gUnknown_020388CC->unk5C * 256;
+        gUnknown_020388CC->unk40 = gUnknown_020388CC->unk5E * 256;
+        gUnknown_020388CC->unk60 = 0;
+        gUnknown_020388CC->unk62 = 0;
+        gUnknown_020388CC->unk44 = -(gUnknown_020388CC->unk3C / 16);
+        gUnknown_020388CC->unk48 = -(gUnknown_020388CC->unk40 / 16);
+        gUnknown_020388CC->unk54 = gUnknown_020388CC->unk64;
+        gUnknown_020388CC->unk56 = gUnknown_020388CC->unk66;
+        gUnknown_020388CC->unk4C = 0x8000;
+        gUnknown_020388CC->unk50 = 0x800;
+    }
+    gUnknown_020388CC->unk6E = 0;
+    sub_80FBCA0();
+    sub_80FBDF8();
+}
+
+u8 sub_80FAFC0(void)
+{
+    u8 r4;
+
+    if (gUnknown_020388CC->unk6E > 15)
+        return 0;
+    gUnknown_020388CC->unk6E++;
+    if (gUnknown_020388CC->unk6E == 16)
+    {
+        gUnknown_020388CC->unk44 = 0;
+        gUnknown_020388CC->unk48 = 0;
+        gUnknown_020388CC->unk5C = gUnknown_020388CC->unk60;
+        gUnknown_020388CC->unk5E = gUnknown_020388CC->unk62;
+        gUnknown_020388CC->unk4C = (gUnknown_020388CC->unk78 == 0) ? 0x8000 : 0x10000;
+        gUnknown_020388CC->unk78 = (gUnknown_020388CC->unk78 == 0) ? 1 : 0;
+        gUnknown_020388CC->unk18 = (gUnknown_020388CC->unk78 == 0) ? sub_80FAB78 : sub_80FAD04;
+        sub_80FBB3C(gUnknown_020388CC->unk58, gUnknown_020388CC->unk5A);
+        sub_80FBE24();
+        r4 = 0;
+    }
+    else
+    {
+        gUnknown_020388CC->unk3C += gUnknown_020388CC->unk44;
+        gUnknown_020388CC->unk40 += gUnknown_020388CC->unk48;
+        gUnknown_020388CC->unk5C = gUnknown_020388CC->unk3C >> 8;
+        gUnknown_020388CC->unk5E = gUnknown_020388CC->unk40 >> 8;
+        gUnknown_020388CC->unk4C += gUnknown_020388CC->unk50;
+        if ((gUnknown_020388CC->unk44 < 0 && gUnknown_020388CC->unk5C < gUnknown_020388CC->unk60)
+         || (gUnknown_020388CC->unk44 > 0 && gUnknown_020388CC->unk5C > gUnknown_020388CC->unk60))
+        {
+            gUnknown_020388CC->unk5C = gUnknown_020388CC->unk60;
+            gUnknown_020388CC->unk44 = 0;
+        }
+        if ((gUnknown_020388CC->unk48 < 0 && gUnknown_020388CC->unk5E < gUnknown_020388CC->unk62)
+         || (gUnknown_020388CC->unk48 > 0 && gUnknown_020388CC->unk5E > gUnknown_020388CC->unk62))
+        {
+            gUnknown_020388CC->unk5E = gUnknown_020388CC->unk62;
+            gUnknown_020388CC->unk48 = 0;
+        }
+        if (gUnknown_020388CC->unk78 == 0)
+        {
+            if (gUnknown_020388CC->unk4C < 0x8000)
+            {
+                gUnknown_020388CC->unk4C = 0x8000;
+                gUnknown_020388CC->unk50 = 0;
+            }
+        }
+        else
+        {
+            if (gUnknown_020388CC->unk4C > 0x10000)
+            {
+                gUnknown_020388CC->unk4C = 0x10000;
+                gUnknown_020388CC->unk50 = 0;
+            }
+        }
+        r4 = 1;
+    }
+    sub_80FB170(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E, 0x38, 0x48, gUnknown_020388CC->unk4C >> 8, gUnknown_020388CC->unk4C >> 8, 0);
+    return r4;
+}
-- 
cgit v1.2.3


From 563d7591e46475e5429ef594b6058de7451f9ed4 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sat, 15 Jul 2017 01:45:56 -0500
Subject: decompile sub_80FB170 - sub_80FB32C

---
 src/data/region_map_names_de.h |  79 ++++++++++
 src/data/region_map_names_en.h |  79 ++++++++++
 src/region_map.c               | 330 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 483 insertions(+), 5 deletions(-)
 create mode 100644 src/data/region_map_names_de.h
 create mode 100644 src/data/region_map_names_en.h

(limited to 'src')

diff --git a/src/data/region_map_names_de.h b/src/data/region_map_names_de.h
new file mode 100644
index 000000000..10f53c8ba
--- /dev/null
+++ b/src/data/region_map_names_de.h
@@ -0,0 +1,79 @@
+const u8 gMapName_LittlerootTown[] = _("WURZELHEIM");
+const u8 gMapName_OldaleTown[] = _("ROSALTSTADT");
+const u8 gMapName_DewfordTown[] = _("FAUSTAUHAVEN");
+const u8 gMapName_LavaridgeTown[] = _("BAD LAVASTADT");
+const u8 gMapName_FallarborTown[] = _("LAUBWECHSEL{NAME_END}FELD");
+const u8 gMapName_VerdanturfTown[] = _("WIESENFLUR");
+const u8 gMapName_PacifidlogTown[] = _("FLOSSBRUNN");
+const u8 gMapName_PetalburgCity[] = _("BLÜTENBURG{NAME_END} CITY");
+const u8 gMapName_SlateportCity[] = _("GRAPHITPORT{NAME_END} CITY");
+const u8 gMapName_MauvilleCity[] = _("MALVENFROH{NAME_END} CITY");
+const u8 gMapName_RustboroCity[] = _("METAROST{NAME_END} CITY");
+const u8 gMapName_FortreeCity[] = _("BAUMHAUSEN{NAME_END} CITY");
+const u8 gMapName_LilycoveCity[] = _("SEEGRASULB{NAME_END} CITY");
+const u8 gMapName_MossdeepCity[] = _("MOOSBACH{NAME_END} CITY");
+const u8 gMapName_SootopolisCity[] = _("XENEROVILLE");
+const u8 gMapName_EverGrandeCity[] = _("PRACHTPOLIS{NAME_END} CITY");
+const u8 gMapName_Route101[] = _("ROUTE 101");
+const u8 gMapName_Route102[] = _("ROUTE 102");
+const u8 gMapName_Route103[] = _("ROUTE 103");
+const u8 gMapName_Route104[] = _("ROUTE 104");
+const u8 gMapName_Route105[] = _("ROUTE 105");
+const u8 gMapName_Route106[] = _("ROUTE 106");
+const u8 gMapName_Route107[] = _("ROUTE 107");
+const u8 gMapName_Route108[] = _("ROUTE 108");
+const u8 gMapName_Route109[] = _("ROUTE 109");
+const u8 gMapName_Route110[] = _("ROUTE 110");
+const u8 gMapName_Route111[] = _("ROUTE 111");
+const u8 gMapName_Route112[] = _("ROUTE 112");
+const u8 gMapName_Route113[] = _("ROUTE 113");
+const u8 gMapName_Route114[] = _("ROUTE 114");
+const u8 gMapName_Route115[] = _("ROUTE 115");
+const u8 gMapName_Route116[] = _("ROUTE 116");
+const u8 gMapName_Route117[] = _("ROUTE 117");
+const u8 gMapName_Route118[] = _("ROUTE 118");
+const u8 gMapName_Route119[] = _("ROUTE 119");
+const u8 gMapName_Route120[] = _("ROUTE 120");
+const u8 gMapName_Route121[] = _("ROUTE 121");
+const u8 gMapName_Route122[] = _("ROUTE 122");
+const u8 gMapName_Route123[] = _("ROUTE 123");
+const u8 gMapName_Route124[] = _("ROUTE 124");
+const u8 gMapName_Route125[] = _("ROUTE 125");
+const u8 gMapName_Route126[] = _("ROUTE 126");
+const u8 gMapName_Route127[] = _("ROUTE 127");
+const u8 gMapName_Route128[] = _("ROUTE 128");
+const u8 gMapName_Route129[] = _("ROUTE 129");
+const u8 gMapName_Route130[] = _("ROUTE 130");
+const u8 gMapName_Route131[] = _("ROUTE 131");
+const u8 gMapName_Route132[] = _("ROUTE 132");
+const u8 gMapName_Route133[] = _("ROUTE 133");
+const u8 gMapName_Route134[] = _("ROUTE 134");
+const u8 gMapName_Underwater[] = _("UNTERWASSER");
+const u8 gMapName_GraniteCave[] = _("GRANITHÖHLE");
+const u8 gMapName_MtChimney[] = _("SCHLOTBERG");
+const u8 gMapName_SafariZone[] = _("SAFARI-ZONE");
+const u8 gMapName_BattleTower[] = _("DUELLTURM");
+const u8 gMapName_PetalburgWoods[] = _("BLÜTENBURGWALD");
+const u8 gMapName_RusturfTunnel[] = _("METAFLURTUNNEL");
+const u8 gMapName_AbandonedShip[] = _("SCHIFFSWRACK");
+const u8 gMapName_NewMauville[] = _("NEU MALVENFROH");
+const u8 gMapName_MeteorFalls[] = _("METEORFÄLLE");
+const u8 gMapName_MtPyre[] = _("PYROBERG");
+const u8 gMapName_EvilTeamHideout[] = _("{EVIL_TEAM}s VERSTECK");
+const u8 gMapName_ShoalCave[] = _("KÜSTENHÖHLE");
+const u8 gMapName_SeafloorCavern[] = _("TIEFSEEHÖHLE");
+const u8 gMapName_VictoryRoad[] = _("SIEGESSTRASSE");
+const u8 gMapName_MirageIsland[] = _("WUNDEREILAND");
+const u8 gMapName_CaveOfOrigin[] = _("URZEITHÖHLE");
+const u8 gMapName_SouthernIsland[] = _("INSEL IM SÜDEN");
+const u8 gMapName_FieryPath[] = _("FEURIGER PFAD");
+const u8 gMapName_JaggedPass[] = _("STEILPASS");
+const u8 gMapName_SealedChamber[] = _("SIEGELKAMMER");
+const u8 gMapName_ScorchedSlab[] = _("SONNENGROTTE");
+const u8 gMapName_IslandCave[] = _("INSELHÖHLE");
+const u8 gMapName_DesertRuins[] = _("WÜSTENRUINE");
+const u8 gMapName_AncientTomb[] = _("GRABMAL");
+const u8 gMapName_InsideOfTruck[] = _("IM MÖBELWAGEN");
+const u8 gMapName_SkyPillar[] = _("HIMMELTURM");
+const u8 gMapName_SecretBase[] = _("GEHEIMBASIS");
+const u8 gMapName_None[] = _("");
diff --git a/src/data/region_map_names_en.h b/src/data/region_map_names_en.h
new file mode 100644
index 000000000..9dde3d71a
--- /dev/null
+++ b/src/data/region_map_names_en.h
@@ -0,0 +1,79 @@
+const u8 gMapName_LittlerootTown[] = _("LITTLEROOT{NAME_END} TOWN");
+const u8 gMapName_OldaleTown[] = _("OLDALE{NAME_END} TOWN");
+const u8 gMapName_DewfordTown[] = _("DEWFORD{NAME_END} TOWN");
+const u8 gMapName_LavaridgeTown[] = _("LAVARIDGE{NAME_END} TOWN");
+const u8 gMapName_FallarborTown[] = _("FALLARBOR{NAME_END} TOWN");
+const u8 gMapName_VerdanturfTown[] = _("VERDANTURF{NAME_END} TOWN");
+const u8 gMapName_PacifidlogTown[] = _("PACIFIDLOG{NAME_END} TOWN");
+const u8 gMapName_PetalburgCity[] = _("PETALBURG{NAME_END} CITY");
+const u8 gMapName_SlateportCity[] = _("SLATEPORT{NAME_END} CITY");
+const u8 gMapName_MauvilleCity[] = _("MAUVILLE{NAME_END} CITY");
+const u8 gMapName_RustboroCity[] = _("RUSTBORO{NAME_END} CITY");
+const u8 gMapName_FortreeCity[] = _("FORTREE{NAME_END} CITY");
+const u8 gMapName_LilycoveCity[] = _("LILYCOVE{NAME_END} CITY");
+const u8 gMapName_MossdeepCity[] = _("MOSSDEEP{NAME_END} CITY");
+const u8 gMapName_SootopolisCity[] = _("SOOTOPOLIS{NAME_END} CITY");
+const u8 gMapName_EverGrandeCity[] = _("EVER GRANDE{NAME_END} CITY");
+const u8 gMapName_Route101[] = _("ROUTE 101");
+const u8 gMapName_Route102[] = _("ROUTE 102");
+const u8 gMapName_Route103[] = _("ROUTE 103");
+const u8 gMapName_Route104[] = _("ROUTE 104");
+const u8 gMapName_Route105[] = _("ROUTE 105");
+const u8 gMapName_Route106[] = _("ROUTE 106");
+const u8 gMapName_Route107[] = _("ROUTE 107");
+const u8 gMapName_Route108[] = _("ROUTE 108");
+const u8 gMapName_Route109[] = _("ROUTE 109");
+const u8 gMapName_Route110[] = _("ROUTE 110");
+const u8 gMapName_Route111[] = _("ROUTE 111");
+const u8 gMapName_Route112[] = _("ROUTE 112");
+const u8 gMapName_Route113[] = _("ROUTE 113");
+const u8 gMapName_Route114[] = _("ROUTE 114");
+const u8 gMapName_Route115[] = _("ROUTE 115");
+const u8 gMapName_Route116[] = _("ROUTE 116");
+const u8 gMapName_Route117[] = _("ROUTE 117");
+const u8 gMapName_Route118[] = _("ROUTE 118");
+const u8 gMapName_Route119[] = _("ROUTE 119");
+const u8 gMapName_Route120[] = _("ROUTE 120");
+const u8 gMapName_Route121[] = _("ROUTE 121");
+const u8 gMapName_Route122[] = _("ROUTE 122");
+const u8 gMapName_Route123[] = _("ROUTE 123");
+const u8 gMapName_Route124[] = _("ROUTE 124");
+const u8 gMapName_Route125[] = _("ROUTE 125");
+const u8 gMapName_Route126[] = _("ROUTE 126");
+const u8 gMapName_Route127[] = _("ROUTE 127");
+const u8 gMapName_Route128[] = _("ROUTE 128");
+const u8 gMapName_Route129[] = _("ROUTE 129");
+const u8 gMapName_Route130[] = _("ROUTE 130");
+const u8 gMapName_Route131[] = _("ROUTE 131");
+const u8 gMapName_Route132[] = _("ROUTE 132");
+const u8 gMapName_Route133[] = _("ROUTE 133");
+const u8 gMapName_Route134[] = _("ROUTE 134");
+const u8 gMapName_Underwater[] = _("UNDERWATER");
+const u8 gMapName_GraniteCave[] = _("GRANITE CAVE");
+const u8 gMapName_MtChimney[] = _("MT. CHIMNEY");
+const u8 gMapName_SafariZone[] = _("SAFARI ZONE");
+const u8 gMapName_BattleTower[] = _("BATTLE TOWER");
+const u8 gMapName_PetalburgWoods[] = _("PETALBURG WOODS");
+const u8 gMapName_RusturfTunnel[] = _("RUSTURF TUNNEL");
+const u8 gMapName_AbandonedShip[] = _("ABANDONED SHIP");
+const u8 gMapName_NewMauville[] = _("NEW MAUVILLE");
+const u8 gMapName_MeteorFalls[] = _("METEOR FALLS");
+const u8 gMapName_MtPyre[] = _("MT. PYRE");
+const u8 gMapName_EvilTeamHideout[] = _("{EVIL_TEAM} HIDEOUT");
+const u8 gMapName_ShoalCave[] = _("SHOAL CAVE");
+const u8 gMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN");
+const u8 gMapName_VictoryRoad[] = _("VICTORY ROAD");
+const u8 gMapName_MirageIsland[] = _("MIRAGE ISLAND");
+const u8 gMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN");
+const u8 gMapName_SouthernIsland[] = _("SOUTHERN ISLAND");
+const u8 gMapName_FieryPath[] = _("FIERY PATH");
+const u8 gMapName_JaggedPass[] = _("JAGGED PASS");
+const u8 gMapName_SealedChamber[] = _("SEALED CHAMBER");
+const u8 gMapName_ScorchedSlab[] = _("SCORCHED SLAB");
+const u8 gMapName_IslandCave[] = _("ISLAND CAVE");
+const u8 gMapName_DesertRuins[] = _("DESERT RUINS");
+const u8 gMapName_AncientTomb[] = _("ANCIENT TOMB");
+const u8 gMapName_InsideOfTruck[] = _("INSIDE OF TRUCK");
+const u8 gMapName_SkyPillar[] = _("SKY PILLAR");
+const u8 gMapName_SecretBase[] = _("SECRET BASE");
+const u8 gMapName_None[] = _("");
diff --git a/src/region_map.c b/src/region_map.c
index 0a50da51e..07c88ccd3 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1,7 +1,9 @@
 #include "global.h"
 #include "main.h"
 #include "palette.h"
+#include "rom4.h"
 #include "sprite.h"
+#include "trig.h"
 
 struct UnknownStruct1
 {
@@ -12,7 +14,12 @@ struct UnknownStruct1
     u8 (*unk18)(void);
     struct Sprite *unk1C;
     struct Sprite *unk20;
-    u8 filler24[0x18];
+    s32 unk24;
+    s32 unk28;
+    u32 unk2C;
+    u32 unk30;
+    u32 unk34;
+    u32 unk38;
     s32 unk3C;
     s32 unk40;
     s32 unk44;
@@ -44,7 +51,8 @@ struct UnknownStruct1
     s8 unk7C;  // movement delta vertical
     u8 unk7D;
     u8 unk7E;
-    u8 filler7F[0x101];
+    u8 unk7F;
+    u8 filler80[0x100];
     u8 unk180[0x100];
     u8 unk280[0x100];
 };
@@ -62,17 +70,142 @@ const u16 gUnknown_083E5D60[] = INCBIN_U16("graphics/pokenav/region_map.gbapal")
 const u8 gUnknown_083E5DA0[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz");
 const u8 gUnknown_083E6B04[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz");
 
+const u8 gRegionMapSections[] =
+{
+    0x58, 0x1D, 0x1D, 0x04, 0x1C, 0x1C, 0x1C, 0x1C, 0x1A, 0x58, 0x58, 0x22, 0x0B, 0x23, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
+    0x58, 0x1D, 0x58, 0x58, 0x58, 0x58, 0x38, 0x38, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
+    0x1E, 0x1D, 0x58, 0x58, 0x58, 0x58, 0x38, 0x38, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x58, 0x58, 0x39, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
+    0x1E, 0x58, 0x58, 0x58, 0x58, 0x03, 0x1B, 0x1B, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x24, 0x24, 0x24, 0x24, 0x0C, 0x0C, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0x58, 0x58,
+    0x1E, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x58, 0x58, 0x58, 0x25, 0x58, 0x58, 0x58, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0x58, 0x58,
+    0x0A, 0x1F, 0x1F, 0x1F, 0x1F, 0x58, 0x58, 0x58, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x58, 0x58, 0x58, 0x25, 0x58, 0x58, 0x58, 0x27, 0x27, 0x27, 0x27, 0x0D, 0x0D, 0x58, 0x58,
+    0x0A, 0x58, 0x58, 0x58, 0x05, 0x20, 0x20, 0x20, 0x09, 0x09, 0x21, 0x21, 0x26, 0x26, 0x26, 0x26, 0x26, 0x58, 0x58, 0x58, 0x29, 0x29, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x58,
+    0x13, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x29, 0x0E, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x58,
+    0x13, 0x58, 0x58, 0x58, 0x12, 0x12, 0x12, 0x12, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x29, 0x29, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x0F,
+    0x13, 0x07, 0x11, 0x11, 0x01, 0x58, 0x58, 0x58, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x2B, 0x2B, 0x2B, 0x2B, 0x0F,
+    0x14, 0x58, 0x58, 0x58, 0x10, 0x58, 0x58, 0x58, 0x08, 0x31, 0x31, 0x31, 0x30, 0x30, 0x30, 0x2F, 0x2F, 0x06, 0x2E, 0x2E, 0x2E, 0x2D, 0x2D, 0x2D, 0x2C, 0x2C, 0x58, 0x58,
+    0x14, 0x58, 0x58, 0x58, 0x00, 0x58, 0x58, 0x58, 0x08, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
+    0x14, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x18, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x3A, 0x58, 0x58, 0x58, 0x58, 0x58,
+    0x15, 0x15, 0x15, 0x58, 0x58, 0x58, 0x58, 0x58, 0x18, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
+    0x58, 0x58, 0x02, 0x16, 0x16, 0x16, 0x17, 0x17, 0x18, 0x58, 0x58, 0x58, 0x49, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
+};
+
+#if ENGLISH
+#include "data/region_map_names_en.h"
+#elif GERMAN
+#include "data/region_map_names_de.h"
+#endif
+
+struct RegionMapLocation
+{
+    u8 x, y;
+    u8 width, height;
+    const u8 *name;
+};
+
+const struct RegionMapLocation gRegionMapLocations[] =
+{
+    { 4, 11, 1, 1, gMapName_LittlerootTown},
+    { 4,  9, 1, 1, gMapName_OldaleTown},
+    { 2, 14, 1, 1, gMapName_DewfordTown},
+    { 5,  3, 1, 1, gMapName_LavaridgeTown},
+    { 3,  0, 1, 1, gMapName_FallarborTown},
+    { 4,  6, 1, 1, gMapName_VerdanturfTown},
+    {17, 10, 1, 1, gMapName_PacifidlogTown},
+    { 1,  9, 1, 1, gMapName_PetalburgCity},
+    { 8, 10, 1, 2, gMapName_SlateportCity},
+    { 8,  6, 2, 1, gMapName_MauvilleCity},
+    { 0,  5, 1, 2, gMapName_RustboroCity},
+    {12,  0, 1, 1, gMapName_FortreeCity},
+    {18,  3, 2, 1, gMapName_LilycoveCity},
+    {24,  5, 2, 1, gMapName_MossdeepCity},
+    {21,  7, 1, 1, gMapName_SootopolisCity},
+    {27,  8, 1, 2, gMapName_EverGrandeCity},
+    { 4, 10, 1, 1, gMapName_Route101},
+    { 2,  9, 2, 1, gMapName_Route102},
+    { 4,  8, 4, 1, gMapName_Route103},
+    { 0,  7, 1, 3, gMapName_Route104},
+    { 0, 10, 1, 3, gMapName_Route105},
+    { 0, 13, 2, 1, gMapName_Route106},
+    { 3, 14, 3, 1, gMapName_Route107},
+    { 6, 14, 2, 1, gMapName_Route108},
+    { 8, 12, 1, 3, gMapName_Route109},
+    { 8,  7, 1, 3, gMapName_Route110},
+    { 8,  0, 1, 6, gMapName_Route111},
+    { 6,  3, 2, 1, gMapName_Route112},
+    { 4,  0, 4, 1, gMapName_Route113},
+    { 1,  0, 2, 3, gMapName_Route114},
+    { 0,  2, 1, 3, gMapName_Route115},
+    { 1,  5, 4, 1, gMapName_Route116},
+    { 5,  6, 3, 1, gMapName_Route117},
+    {10,  6, 2, 1, gMapName_Route118},
+    {11,  0, 1, 6, gMapName_Route119},
+    {13,  0, 1, 4, gMapName_Route120},
+    {14,  3, 4, 1, gMapName_Route121},
+    {16,  4, 1, 2, gMapName_Route122},
+    {12,  6, 5, 1, gMapName_Route123},
+    {20,  3, 4, 3, gMapName_Route124},
+    {24,  3, 2, 2, gMapName_Route125},
+    {20,  6, 3, 3, gMapName_Route126},
+    {23,  6, 3, 3, gMapName_Route127},
+    {23,  9, 4, 1, gMapName_Route128},
+    {24, 10, 2, 1, gMapName_Route129},
+    {21, 10, 3, 1, gMapName_Route130},
+    {18, 10, 3, 1, gMapName_Route131},
+    {15, 10, 2, 1, gMapName_Route132},
+    {12, 10, 3, 1, gMapName_Route133},
+    { 9, 10, 3, 1, gMapName_Route134},
+    {20,  3, 4, 3, gMapName_Underwater},
+    {20,  6, 3, 3, gMapName_Underwater},
+    {23,  6, 3, 3, gMapName_Underwater},
+    {23,  9, 4, 1, gMapName_Underwater},
+    {21,  7, 1, 1, gMapName_Underwater},
+    { 1, 13, 1, 1, gMapName_GraniteCave},
+    { 6,  2, 1, 1, gMapName_MtChimney},
+    {16,  2, 1, 1, gMapName_SafariZone},
+    {22, 12, 1, 1, gMapName_BattleTower},
+    { 0,  8, 1, 1, gMapName_PetalburgWoods},
+    { 2,  5, 1, 1, gMapName_RusturfTunnel},
+    { 6, 14, 1, 1, gMapName_AbandonedShip},
+    { 8,  7, 1, 1, gMapName_NewMauville},
+    { 0,  3, 1, 1, gMapName_MeteorFalls},
+    { 1,  2, 1, 1, gMapName_MeteorFalls},
+    {16,  4, 1, 1, gMapName_MtPyre},
+    {19,  3, 1, 1, gMapName_EvilTeamHideout},
+    {24,  4, 1, 1, gMapName_ShoalCave},
+    {24,  9, 1, 1, gMapName_SeafloorCavern},
+    {24,  9, 1, 1, gMapName_Underwater},
+    {27,  9, 1, 1, gMapName_VictoryRoad},
+    {17, 10, 1, 1, gMapName_MirageIsland},
+    {21,  7, 1, 1, gMapName_CaveOfOrigin},
+    {12, 14, 1, 1, gMapName_SouthernIsland},
+    { 6,  3, 1, 1, gMapName_FieryPath},
+    { 7,  3, 1, 1, gMapName_FieryPath},
+    { 6,  3, 1, 1, gMapName_JaggedPass},
+    { 7,  2, 1, 1, gMapName_JaggedPass},
+    {11, 10, 1, 1, gMapName_SealedChamber},
+    {11, 10, 1, 1, gMapName_Underwater},
+    {13,  0, 1, 1, gMapName_ScorchedSlab},
+    {0,  10, 1, 1, gMapName_IslandCave},
+    { 8,  3, 1, 1, gMapName_DesertRuins},
+    {13,  2, 1, 1, gMapName_AncientTomb},
+    { 0,  0, 1, 1, gMapName_InsideOfTruck},
+    {19, 10, 1, 1, gMapName_SkyPillar},
+    { 0,  0, 1, 1, gMapName_SecretBase},
+    { 0,  0, 1, 1, gMapName_None},
+};
+
 void sub_80FA904(struct UnknownStruct1 *, u8);
 bool8 sub_80FA940(void);
 u8 sub_80FAB78(void);
 u8 _swiopen(void);
 u8 sub_80FAD04(void);
 u8 sub_80FADE4(void);
-void sub_80FB170(int, int, int, int, u16, u16, int);
-void sub_80FB238();
+void sub_80FB170(s16, s16, s16, s16, u16, u16, u8);
+void sub_80FB238(s16, s16);
 void sub_80FB260(void);
-u16 GetRegionMapSectionAt();
+u16 GetRegionMapSectionAt(u16, u16);
 void sub_80FB32C(void);
+void sub_80FB600(void);
 u16 sub_80FB758();
 u16 sub_80FB9C0(u16);
 void sub_80FBA18();
@@ -409,3 +542,190 @@ u8 sub_80FAFC0(void)
     sub_80FB170(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E, 0x38, 0x48, gUnknown_020388CC->unk4C >> 8, gUnknown_020388CC->unk4C >> 8, 0);
     return r4;
 }
+
+void sub_80FB170(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 g)
+{
+    s32 var1;
+    s32 var2;
+    s32 var3;
+    s32 var4;
+    
+    gUnknown_020388CC->unk2C = e * gSineTable[g + 64] >> 8;
+    gUnknown_020388CC->unk30 = e * -gSineTable[g] >> 8;
+    gUnknown_020388CC->unk34 = f * gSineTable[g] >> 8;
+    gUnknown_020388CC->unk38 = f * gSineTable[g + 64] >> 8;
+    
+    var1 = (a << 8) + (c << 8);
+    var2 = d * gUnknown_020388CC->unk34 + gUnknown_020388CC->unk2C * c;
+    gUnknown_020388CC->unk24 = var1 - var2;
+    
+    var3 = (b << 8) + (d << 8);
+    var4 = gUnknown_020388CC->unk38 * d + gUnknown_020388CC->unk30 * c;
+    gUnknown_020388CC->unk28 = var3 - var4;
+    
+    gUnknown_020388CC->unk7D = 1;
+}
+
+void sub_80FB238(s16 a, s16 b)
+{
+    gUnknown_020388CC->unk24 = 0x1C00 + (a << 8);
+    gUnknown_020388CC->unk28 = 0x2400 + (b << 8);
+    gUnknown_020388CC->unk7D = 1;
+}
+
+void sub_80FB260(void)
+{
+    if (gUnknown_020388CC->unk7D != 0)
+    {
+        REG_BG2PA = gUnknown_020388CC->unk2C;
+        REG_BG2PB = gUnknown_020388CC->unk34;
+        REG_BG2PC = gUnknown_020388CC->unk30;
+        REG_BG2PD = gUnknown_020388CC->unk38;
+        REG_BG2X = gUnknown_020388CC->unk24;
+        REG_BG2Y = gUnknown_020388CC->unk28;
+        gUnknown_020388CC->unk7D = 0;
+    }
+}
+
+void sub_80FB2A4(s16 a, s16 b)
+{
+    sub_80FB170(a, b, 0x38, 0x48, 0x100, 0x100, 0);
+    sub_80FB260();
+    if (gUnknown_020388CC->unk20 != NULL)
+    {
+        gUnknown_020388CC->unk20->pos2.x = -a;
+        gUnknown_020388CC->unk20->pos2.y = -b;
+    }
+}
+
+u16 GetRegionMapSectionAt(u16 x, u16 y)
+{
+    
+    if (y < 2 || y > 16 || x < 1 || x > 0x1C)
+        return 0x58;
+    y -= 2;
+    x -= 1;
+    return gRegionMapSections[x + y * 28];
+}
+
+void sub_80FB32C(void)
+{
+    struct MapHeader *mapHeader;
+    u16 mapWidth;
+    u16 mapHeight;
+    u16 x;
+    u16 y;
+    u16 r1;
+    u16 r9;
+    
+    if (gSaveBlock1.location.mapGroup == 0x19 && (gSaveBlock1.location.mapNum == 0x29 || gSaveBlock1.location.mapNum == 0x2A || gSaveBlock1.location.mapNum == 0x2B))
+    {
+        sub_80FB600();
+        return;
+    }
+    
+    switch (get_map_light_level_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) - 1)
+    {
+    default:
+    case 0:
+    case 1:
+    case 2:
+    case 4:
+    case 5:
+        gUnknown_020388CC->unk14 = gMapHeader.name;
+        gUnknown_020388CC->unk7F = 0;
+        mapWidth = gMapHeader.mapData->width;
+        mapHeight = gMapHeader.mapData->height;
+        x = gSaveBlock1.pos.x;
+        y = gSaveBlock1.pos.y;
+        if (gUnknown_020388CC->unk14 == 0x45)
+            gUnknown_020388CC->unk7F = 1;
+        break;
+    case 3:
+    case 6:
+        mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp4.mapGroup, gSaveBlock1.warp4.mapNum);
+        gUnknown_020388CC->unk14 = mapHeader->name;
+        gUnknown_020388CC->unk7F = 1;
+        mapWidth = mapHeader->mapData->width;
+        mapHeight = mapHeader->mapData->height;
+        x = gSaveBlock1.warp4.x;
+        y = gSaveBlock1.warp4.y;
+        break;
+    case 8:
+        mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum);
+        gUnknown_020388CC->unk14 = mapHeader->name;
+        gUnknown_020388CC->unk7F = 1;
+        mapWidth = mapHeader->mapData->width;
+        mapHeight = mapHeader->mapData->height;
+        x = gSaveBlock1.warp2.x;
+        y = gSaveBlock1.warp2.y;
+        break;
+    case 7:
+        {
+            struct WarpData *r4;
+            
+            gUnknown_020388CC->unk14 = gMapHeader.name;
+            if (gUnknown_020388CC->unk14 != 0x57)
+            {
+                r4 = &gSaveBlock1.warp4;
+                mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
+            }
+            else
+            {
+                r4 = &gSaveBlock1.warp2;
+                mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
+                gUnknown_020388CC->unk14 = mapHeader->name;
+            }
+            gUnknown_020388CC->unk7F = 0;
+            mapWidth = mapHeader->mapData->width;
+            mapHeight = mapHeader->mapData->height;
+            x = r4->x;
+            y = r4->y;
+        }
+        break;
+    }
+    r9 = x;
+    r1 = mapWidth / gRegionMapLocations[gUnknown_020388CC->unk14].width;
+    if (r1 == 0)
+        r1 = 1;
+    x /= r1;
+    if (x >= gRegionMapLocations[gUnknown_020388CC->unk14].width)
+        x = gRegionMapLocations[gUnknown_020388CC->unk14].width - 1;
+    r1 = mapHeight / gRegionMapLocations[gUnknown_020388CC->unk14].height;
+    if (r1 == 0)
+        r1 = 1;
+    y /= r1;
+    if (y >= gRegionMapLocations[gUnknown_020388CC->unk14].height)
+        y = gRegionMapLocations[gUnknown_020388CC->unk14].height - 1;
+    switch (gUnknown_020388CC->unk14)
+    {
+    case 0x1D:
+        if (y != 0)
+            x = 0;
+        break;
+    case 0x29:
+    case 0x33:
+        x = 0;
+        if (gSaveBlock1.pos.x > 32)
+            x = 1;
+        if (gSaveBlock1.pos.x > 0x33)
+            x++;
+        y = 0;
+        if (gSaveBlock1.pos.y > 0x25)
+            y = 1;
+        if (gSaveBlock1.pos.y > 0x38)
+            y++;
+        break;
+    case 0x24:
+        x = 0;
+        if (r9 > 14)
+            x = 1;
+        if (r9 > 0x1C)
+            x++;
+        if (r9 > 0x36)
+            x++;
+        break;
+    }
+    gUnknown_020388CC->unk54 = gRegionMapLocations[gUnknown_020388CC->unk14].x + x + 1;
+    gUnknown_020388CC->unk56 = gRegionMapLocations[gUnknown_020388CC->unk14].y + y + 2;
+}
-- 
cgit v1.2.3


From 944b907a2624c1cd5144e8fffe224b509676b844 Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Sat, 15 Jul 2017 00:46:25 -0700
Subject: decompile battle_records

---
 src/battle_records.c     | 316 ++++++++++++++++++++++++++++++++++++++++++++++-
 src/menu.c               |   2 +-
 src/unknown_debug_menu.c |   4 +-
 3 files changed, 317 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/battle_records.c b/src/battle_records.c
index cf86787f0..368debec1 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -1,7 +1,244 @@
 #include "global.h"
 #include "battle_records.h"
+#include "game_stat.h"
+#include "link.h"
 #include "menu.h"
+#include "rom4.h"
+#include "string_util.h"
 #include "strings2.h"
+#include "trainer_card.h"
+
+extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
+extern u8 gBattleOutcome;
+
+static void sub_810FF78(struct LinkBattleRecord *record)
+{
+    CpuFill16(0, record, sizeof(struct LinkBattleRecord));
+    record->name[0] = 0xFF;
+    record->trainerId = 0;
+    record->wins = 0;
+    record->losses = 0;
+    record->draws = 0;
+}
+
+static void InitLinkBattleRecords_(struct LinkBattleRecord *records)
+{
+    int i;
+    for (i = 0; i < 5; i++)
+    {
+        sub_810FF78(records + i);
+    }
+    SetGameStat(GAME_STAT_LINK_BATTLE_WINS, 0);
+    SetGameStat(GAME_STAT_LINK_BATTLE_LOSSES, 0);
+    SetGameStat(GAME_STAT_LINK_BATTLE_DRAWS, 0);
+}
+
+static int sub_810FFDC(struct LinkBattleRecord *record)
+{
+    return record->wins + record->losses + record->draws;
+}
+
+static int sub_810FFEC(struct LinkBattleRecord *records, u8 *name, u16 trainerId)
+{
+    int i;
+
+    for (i = 0; i < 5; i++)
+    {
+        memcpy(gStringVar1, records[i].name, 7);
+        gStringVar1[7] = EOS;
+        if (!StringCompareWithoutExtCtrlCodes(gStringVar1, name) && records[i].trainerId == trainerId)
+            return i;
+    }
+
+    return 5;
+}
+
+static void sub_811003C(struct LinkBattleRecord *records)
+{
+    int i, j;
+
+    for (i = 4; i > 0; i--)
+    {
+        for (j = i - 1; j >= 0; j--)
+        {
+            int totalBattlesI = sub_810FFDC(records + i);
+            int totalBattlesJ = sub_810FFDC(records + j);
+
+            if (totalBattlesI > totalBattlesJ)
+            {
+                struct LinkBattleRecord temp = *(records + i);
+                *(records + i) = *(records + j);
+                *(records + j) = temp;
+            }
+        }
+    }
+}
+
+static void sub_81100B8(struct LinkBattleRecord *record, int battleOutcome)
+{
+    switch (battleOutcome)
+    {
+    case 1:
+        record->wins++;
+        if (record->wins > 9999)
+            record->wins = 9999;
+        break;
+    case 2:
+        record->losses++;
+        if (record->losses > 9999)
+            record->losses = 9999;
+        break;
+    case 3:
+        record->draws++;
+        if (record->draws > 9999)
+            record->draws = 9999;
+        break;
+    }
+}
+
+static void sub_811011C(int battleOutcome)
+{
+    u8 stat;
+
+    switch (battleOutcome)
+    {
+    case 1:
+        stat = GAME_STAT_LINK_BATTLE_WINS;
+        break;
+    case 2:
+        stat = GAME_STAT_LINK_BATTLE_LOSSES;
+        break;
+    case 3:
+        stat = GAME_STAT_LINK_BATTLE_DRAWS;
+        break;
+    default:
+        return;
+    }
+
+    if (GetGameStat(stat) < 9999)
+        IncrementGameStat(stat);
+}
+
+static void sub_8110158(struct LinkBattleRecord *records, u8 *name, u16 trainerId, int battleOutcome, u8 language)
+{
+    int index;
+    sub_811011C(battleOutcome);
+    sub_811003C(records);
+    index = sub_810FFEC(records, name, trainerId);
+    if (index == 5)
+    {
+        index = 4;
+        sub_810FF78(records + index);
+        if (language == LANGUAGE_JAPANESE)
+        {
+            records[index].name[0] = EXT_CTRL_CODE_BEGIN;
+            records[index].name[1] = 0x15;
+            StringCopyN(records[index].name + 2, name, 5);
+        }
+        else
+        {
+            StringCopyN(records[index].name, name, 7);
+        }
+
+        // needed block to match
+        {
+            struct LinkBattleRecord *record = records + index;
+            record->trainerId = trainerId;
+        }
+    }
+    sub_81100B8(records + index, battleOutcome);
+    sub_811003C(records);
+}
+
+void InitLinkBattleRecords(void)
+{
+    InitLinkBattleRecords_(gSaveBlock1.linkBattleRecords);
+}
+
+static void IncWins(int id)
+{
+    u16 *wins = &gTrainerCards[id].linkBattleWins;
+    (*wins)++;
+    if (*wins > 9999)
+        *wins = 9999;
+}
+
+static void IncLosses(int id)
+{
+    u16 *losses = &gTrainerCards[id].linkBattleLosses;
+    (*losses)++;
+    if (*losses > 9999)
+        *losses = 9999;
+}
+
+static void sub_8110254(int id)
+{
+    switch (gBattleOutcome)
+    {
+    case 1:
+        IncWins(id ^ 1);
+        IncLosses(id);
+        break;
+    case 2:
+        IncLosses(id ^ 1);
+        IncWins(id);
+        break;
+    }
+}
+
+void UpdateLinkBattleRecords(int id)
+{
+    sub_8110254(id);
+    sub_8110158(
+        gSaveBlock1.linkBattleRecords,
+        gTrainerCards[id].playerName,
+        gTrainerCards[id].trainerId,
+        gBattleOutcome,
+        gLinkPlayers[gLinkPlayerMapObjects[id].linkPlayerId].language);
+}
+
+static void PrintLinkBattleWinsLossesDraws(struct LinkBattleRecord *records)
+{
+    ConvertIntToDecimalStringN_DigitWidth6(gStringVar1, GetGameStat(GAME_STAT_LINK_BATTLE_WINS), STR_CONV_MODE_RIGHT_ALIGN, 4);
+    ConvertIntToDecimalStringN_DigitWidth6(gStringVar2, GetGameStat(GAME_STAT_LINK_BATTLE_LOSSES), STR_CONV_MODE_RIGHT_ALIGN, 4);
+    ConvertIntToDecimalStringN_DigitWidth6(gStringVar3, GetGameStat(GAME_STAT_LINK_BATTLE_DRAWS), STR_CONV_MODE_RIGHT_ALIGN, 4);
+    MenuPrint(gOtherText_WinRecord, 3, 3);
+}
+
+static void PrintLinkBattleRecord(struct LinkBattleRecord *record, u8 y)
+{
+    if (!record->wins && !record->losses && !record->draws)
+    {
+        u8 buffer[16];
+        buffer[0] = EXT_CTRL_CODE_BEGIN;
+        buffer[1] = 0x14;
+        buffer[2] = 6;
+        buffer[3] = EXT_CTRL_CODE_BEGIN;
+        buffer[4] = 0x11;
+        buffer[5] = 1;
+        StringCopy(buffer + 6, gOtherText_SevenDashes);
+        MenuPrint(buffer, 3, y);
+        StringCopy(buffer + 6, gOtherText_FourDashes);
+        MenuPrint(buffer, 11, y);
+        MenuPrint(buffer, 17, y);
+        MenuPrint(buffer, 23, y);
+    }
+    else
+    {
+        StringFillWithTerminator(gStringVar1, 8);
+        StringCopyN(gStringVar1, record->name, 7);
+        MenuPrint(gStringVar1, 3, y);
+        gStringVar1[0] = EXT_CTRL_CODE_BEGIN;
+        gStringVar1[1] = 0x14;
+        gStringVar1[2] = 6;
+        ConvertIntToDecimalStringN(gStringVar1 + 3, record->wins, STR_CONV_MODE_RIGHT_ALIGN, 4);
+        MenuPrint(gStringVar1, 11, y);
+        ConvertIntToDecimalStringN(gStringVar1 + 3, record->losses, STR_CONV_MODE_RIGHT_ALIGN, 4);
+        MenuPrint(gStringVar1, 17, y);
+        ConvertIntToDecimalStringN(gStringVar1 + 3, record->draws, STR_CONV_MODE_RIGHT_ALIGN, 4);
+        MenuPrint(gStringVar1, 23, y);
+    }
+}
 
 void ShowLinkBattleRecords(void) {
     s32 i;
@@ -12,11 +249,86 @@ void ShowLinkBattleRecords(void) {
 #if ENGLISH
     MenuPrint(gOtherText_WinLoseDraw, 12, 6);
 #elif GERMAN
-    MenuPrint_PixelCoords((u8 *) gOtherText_WinLoseDraw, 88, 48, 1);
+    MenuPrint_PixelCoords(gOtherText_WinLoseDraw, 88, 48, 1);
 #endif
 
     for (i = 0; i < 5; i++)
     {
-        PrintLinkBattleRecord(gSaveBlock1.linkBattleRecords[i], 6 + (i + 1) * 2);
+        PrintLinkBattleRecord(&gSaveBlock1.linkBattleRecords[i], 6 + (i + 1) * 2);
+    }
+}
+
+static bool32 sub_8110494(u8 a1)
+{
+    struct SaveBlock2_Sub *sb2sub = &gSaveBlock2.filler_A8;
+
+    switch (sb2sub->var_4AE[a1])
+    {
+    case 0:
+        return FALSE;
+    case 1:
+        return FALSE;
+    case 2:
+        return TRUE;
+    case 4:
+        return FALSE;
+    case 3:
+        return TRUE;
+    case 5:
+        return FALSE;
+    case 6:
+        return TRUE;
+    default:
+        return FALSE;
+    }
+}
+
+static void sub_81104E8(const u8 *str, u16 streak, u8 left, u8 top)
+{
+    MenuPrint(str, left, top);
+    if (streak > 9999)
+        streak = 9999;
+    sub_8072C14(gStringVar1, streak, 24, 1);
+    MenuPrint(gOtherText_WinStreak, left + 7, top);
+}
+
+static void sub_8110538(u8 a1, u8 left, u8 top)
+{
+    struct SaveBlock2_Sub *sb2sub = &gSaveBlock2.filler_A8;
+    u16 winStreak = sb2sub->recordWinStreak[a1];
+    sub_81104E8(gOtherText_Record, winStreak, left, top);
+}
+
+static u16 sub_811056C(u8 a1)
+{
+    u16 result = gSaveBlock2.filler_A8.winStreak[a1];
+    if (result > 9999)
+        result = 9999;
+    return result;
+}
+
+static void sub_8110594(u8 a1, u8 left, u8 top)
+{
+    u16 winStreak = sub_811056C(a1);
+    if (sub_8110494(a1) == TRUE)
+        sub_81104E8(gOtherText_Current, winStreak, left, top);
+    else
+        sub_81104E8(gOtherText_Prev, winStreak, left, top);
+}
+
+void ShowBattleTowerRecords(void)
+{
+    u16 i;
+    MenuDrawTextWindow(3, 1, 27, 17);
+    sub_8072BD8(gOtherText_BattleTowerResults, 3, 2, 0xC8);
+    MenuPrint(gOtherText_Lv50, 5, 6);
+    MenuPrint(gOtherText_Lv100, 5, 12);
+    for (i = 5; i < 26; i++)
+    {
+        sub_8071F60(CHAR_HYPHEN, i, 10);
     }
+    sub_8110594(0, 10, 6);
+    sub_8110538(0, 10, 8);
+    sub_8110594(1, 10, 12);
+    sub_8110538(1, 10, 14);
 }
diff --git a/src/menu.c b/src/menu.c
index d532fc602..ad356ccfd 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -180,7 +180,7 @@ void sub_8071F40(const u8 *str)
     MenuPrint(str, 3, 15);
 }
 
-void sub_8071F60(u8 a1, u8 a2, u8 a3, u8 a4)
+void sub_8071F60(u8 a1, u8 a2, u8 a3)
 {
     sub_8003490(gMenuWindowPtr, a1, gMenuTextTileOffset, a2, a3);
 }
diff --git a/src/unknown_debug_menu.c b/src/unknown_debug_menu.c
index 6a8bad0d4..a81625f2a 100644
--- a/src/unknown_debug_menu.c
+++ b/src/unknown_debug_menu.c
@@ -41,8 +41,8 @@ static u8 sub_814A464(void)
 
 u8 sub_814A4B8(void)
 {
-    gSaveBlock2.filler_A8.var_4AE = 3;
-    gSaveBlock2.filler_A8.var_4AF = 3;
+    gSaveBlock2.filler_A8.var_4AE[0] = 3;
+    gSaveBlock2.filler_A8.var_4AE[1] = 3;
     gSaveBlock2.filler_A8.var_4B4 = gBattleCommunication[0] + 1;
     gSaveBlock2.filler_A8.var_4B6 = gBattleCommunication[0] + 1;
     gSaveBlock2.filler_A8.var_4B0 = 1;
-- 
cgit v1.2.3


From 22160bc59c9e508e58b34b63ba7afaee6313d679 Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Sat, 15 Jul 2017 01:24:33 -0700
Subject: name things in battle_records.c

---
 src/battle_records.c | 84 ++++++++++++++++++++++++++--------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

(limited to 'src')

diff --git a/src/battle_records.c b/src/battle_records.c
index 368debec1..61dc09792 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -11,7 +11,7 @@
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
 extern u8 gBattleOutcome;
 
-static void sub_810FF78(struct LinkBattleRecord *record)
+static void InitLinkBattleRecord(struct LinkBattleRecord *record)
 {
     CpuFill16(0, record, sizeof(struct LinkBattleRecord));
     record->name[0] = 0xFF;
@@ -26,19 +26,19 @@ static void InitLinkBattleRecords_(struct LinkBattleRecord *records)
     int i;
     for (i = 0; i < 5; i++)
     {
-        sub_810FF78(records + i);
+        InitLinkBattleRecord(records + i);
     }
     SetGameStat(GAME_STAT_LINK_BATTLE_WINS, 0);
     SetGameStat(GAME_STAT_LINK_BATTLE_LOSSES, 0);
     SetGameStat(GAME_STAT_LINK_BATTLE_DRAWS, 0);
 }
 
-static int sub_810FFDC(struct LinkBattleRecord *record)
+static int GetLinkBattleRecordTotalBattles(struct LinkBattleRecord *record)
 {
     return record->wins + record->losses + record->draws;
 }
 
-static int sub_810FFEC(struct LinkBattleRecord *records, u8 *name, u16 trainerId)
+static int FindLinkBattleRecord(struct LinkBattleRecord *records, u8 *name, u16 trainerId)
 {
     int i;
 
@@ -53,7 +53,7 @@ static int sub_810FFEC(struct LinkBattleRecord *records, u8 *name, u16 trainerId
     return 5;
 }
 
-static void sub_811003C(struct LinkBattleRecord *records)
+static void SortLinkBattleRecords(struct LinkBattleRecord *records)
 {
     int i, j;
 
@@ -61,8 +61,8 @@ static void sub_811003C(struct LinkBattleRecord *records)
     {
         for (j = i - 1; j >= 0; j--)
         {
-            int totalBattlesI = sub_810FFDC(records + i);
-            int totalBattlesJ = sub_810FFDC(records + j);
+            int totalBattlesI = GetLinkBattleRecordTotalBattles(records + i);
+            int totalBattlesJ = GetLinkBattleRecordTotalBattles(records + j);
 
             if (totalBattlesI > totalBattlesJ)
             {
@@ -74,7 +74,7 @@ static void sub_811003C(struct LinkBattleRecord *records)
     }
 }
 
-static void sub_81100B8(struct LinkBattleRecord *record, int battleOutcome)
+static void UpdateLinkBattleRecord(struct LinkBattleRecord *record, int battleOutcome)
 {
     switch (battleOutcome)
     {
@@ -96,7 +96,7 @@ static void sub_81100B8(struct LinkBattleRecord *record, int battleOutcome)
     }
 }
 
-static void sub_811011C(int battleOutcome)
+static void UpdateLinkBattleGameStats(int battleOutcome)
 {
     u8 stat;
 
@@ -119,16 +119,16 @@ static void sub_811011C(int battleOutcome)
         IncrementGameStat(stat);
 }
 
-static void sub_8110158(struct LinkBattleRecord *records, u8 *name, u16 trainerId, int battleOutcome, u8 language)
+static void UpdateLinkBattleRecords_(struct LinkBattleRecord *records, u8 *name, u16 trainerId, int battleOutcome, u8 language)
 {
     int index;
-    sub_811011C(battleOutcome);
-    sub_811003C(records);
-    index = sub_810FFEC(records, name, trainerId);
+    UpdateLinkBattleGameStats(battleOutcome);
+    SortLinkBattleRecords(records);
+    index = FindLinkBattleRecord(records, name, trainerId);
     if (index == 5)
     {
         index = 4;
-        sub_810FF78(records + index);
+        InitLinkBattleRecord(records + index);
         if (language == LANGUAGE_JAPANESE)
         {
             records[index].name[0] = EXT_CTRL_CODE_BEGIN;
@@ -146,8 +146,8 @@ static void sub_8110158(struct LinkBattleRecord *records, u8 *name, u16 trainerI
             record->trainerId = trainerId;
         }
     }
-    sub_81100B8(records + index, battleOutcome);
-    sub_811003C(records);
+    UpdateLinkBattleRecord(records + index, battleOutcome);
+    SortLinkBattleRecords(records);
 }
 
 void InitLinkBattleRecords(void)
@@ -155,7 +155,7 @@ void InitLinkBattleRecords(void)
     InitLinkBattleRecords_(gSaveBlock1.linkBattleRecords);
 }
 
-static void IncWins(int id)
+static void IncTrainerCardWins(int id)
 {
     u16 *wins = &gTrainerCards[id].linkBattleWins;
     (*wins)++;
@@ -163,7 +163,7 @@ static void IncWins(int id)
         *wins = 9999;
 }
 
-static void IncLosses(int id)
+static void IncTrainerCardLosses(int id)
 {
     u16 *losses = &gTrainerCards[id].linkBattleLosses;
     (*losses)++;
@@ -171,25 +171,25 @@ static void IncLosses(int id)
         *losses = 9999;
 }
 
-static void sub_8110254(int id)
+static void UpdateTrainerCardWinsLosses(int id)
 {
     switch (gBattleOutcome)
     {
     case 1:
-        IncWins(id ^ 1);
-        IncLosses(id);
+        IncTrainerCardWins(id ^ 1);
+        IncTrainerCardLosses(id);
         break;
     case 2:
-        IncLosses(id ^ 1);
-        IncWins(id);
+        IncTrainerCardLosses(id ^ 1);
+        IncTrainerCardWins(id);
         break;
     }
 }
 
 void UpdateLinkBattleRecords(int id)
 {
-    sub_8110254(id);
-    sub_8110158(
+    UpdateTrainerCardWinsLosses(id);
+    UpdateLinkBattleRecords_(
         gSaveBlock1.linkBattleRecords,
         gTrainerCards[id].playerName,
         gTrainerCards[id].trainerId,
@@ -258,11 +258,11 @@ void ShowLinkBattleRecords(void) {
     }
 }
 
-static bool32 sub_8110494(u8 a1)
+static bool32 sub_8110494(u8 level)
 {
     struct SaveBlock2_Sub *sb2sub = &gSaveBlock2.filler_A8;
 
-    switch (sb2sub->var_4AE[a1])
+    switch (sb2sub->var_4AE[level])
     {
     case 0:
         return FALSE;
@@ -283,7 +283,7 @@ static bool32 sub_8110494(u8 a1)
     }
 }
 
-static void sub_81104E8(const u8 *str, u16 streak, u8 left, u8 top)
+static void PrintWinStreak(const u8 *str, u16 streak, u8 left, u8 top)
 {
     MenuPrint(str, left, top);
     if (streak > 9999)
@@ -292,28 +292,28 @@ static void sub_81104E8(const u8 *str, u16 streak, u8 left, u8 top)
     MenuPrint(gOtherText_WinStreak, left + 7, top);
 }
 
-static void sub_8110538(u8 a1, u8 left, u8 top)
+static void PrintRecordWinStreak(u8 level, u8 left, u8 top)
 {
     struct SaveBlock2_Sub *sb2sub = &gSaveBlock2.filler_A8;
-    u16 winStreak = sb2sub->recordWinStreak[a1];
-    sub_81104E8(gOtherText_Record, winStreak, left, top);
+    u16 winStreak = sb2sub->recordWinStreak[level];
+    PrintWinStreak(gOtherText_Record, winStreak, left, top);
 }
 
-static u16 sub_811056C(u8 a1)
+static u16 GetLastWinStreak(u8 level)
 {
-    u16 result = gSaveBlock2.filler_A8.winStreak[a1];
+    u16 result = gSaveBlock2.filler_A8.winStreak[level];
     if (result > 9999)
         result = 9999;
     return result;
 }
 
-static void sub_8110594(u8 a1, u8 left, u8 top)
+static void PrintLastWinStreak(u8 level, u8 left, u8 top)
 {
-    u16 winStreak = sub_811056C(a1);
-    if (sub_8110494(a1) == TRUE)
-        sub_81104E8(gOtherText_Current, winStreak, left, top);
+    u16 winStreak = GetLastWinStreak(level);
+    if (sub_8110494(level) == TRUE)
+        PrintWinStreak(gOtherText_Current, winStreak, left, top);
     else
-        sub_81104E8(gOtherText_Prev, winStreak, left, top);
+        PrintWinStreak(gOtherText_Prev, winStreak, left, top);
 }
 
 void ShowBattleTowerRecords(void)
@@ -327,8 +327,8 @@ void ShowBattleTowerRecords(void)
     {
         sub_8071F60(CHAR_HYPHEN, i, 10);
     }
-    sub_8110594(0, 10, 6);
-    sub_8110538(0, 10, 8);
-    sub_8110594(1, 10, 12);
-    sub_8110538(1, 10, 14);
+    PrintLastWinStreak(0, 10, 6);
+    PrintRecordWinStreak(0, 10, 8);
+    PrintLastWinStreak(1, 10, 12);
+    PrintRecordWinStreak(1, 10, 14);
 }
-- 
cgit v1.2.3


From 4d28489c65aba913e4169b3467dce49b54f38c87 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sat, 15 Jul 2017 14:50:23 -0500
Subject: decompile sub_80FB600 - sub_80FBB3C

---
 src/region_map.c | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 343 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 07c88ccd3..9e95c40d0 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1,4 +1,6 @@
 #include "global.h"
+#include "event_data.h"
+#include "field_specials.h"
 #include "main.h"
 #include "palette.h"
 #include "rom4.h"
@@ -10,7 +12,7 @@ struct UnknownStruct1
     u8 filler0[0x14];
     u16 unk14;
     u8 unk16;
-    u8 filler17[1];
+    u8 unk17;
     u8 (*unk18)(void);
     struct Sprite *unk1C;
     struct Sprite *unk20;
@@ -54,7 +56,7 @@ struct UnknownStruct1
     u8 unk7F;
     u8 filler80[0x100];
     u8 unk180[0x100];
-    u8 unk280[0x100];
+    u8 unk280[0x100];  // possibly 0x600
 };
 
 extern struct UnknownStruct1 *gUnknown_020388CC;
@@ -194,6 +196,23 @@ const struct RegionMapLocation gRegionMapLocations[] =
     { 0,  0, 1, 1, gMapName_None},
 };
 
+const u16 gUnknown_083E7684[][2] =
+{
+    {50, 39},
+    {51, 41},
+    {52, 42},
+    {53, 43},
+    {54, 14},
+    {69, 43},
+    {66, 12},
+    {79, 49},
+    {59, 19},
+    {76, 27},
+    {65, 37},
+    {85, 46},
+    {88, 88},
+};
+
 void sub_80FA904(struct UnknownStruct1 *, u8);
 bool8 sub_80FA940(void);
 u8 sub_80FAB78(void);
@@ -206,10 +225,11 @@ void sub_80FB260(void);
 u16 GetRegionMapSectionAt(u16, u16);
 void sub_80FB32C(void);
 void sub_80FB600(void);
-u16 sub_80FB758();
+u16 sub_80FB758(u16);
 u16 sub_80FB9C0(u16);
-void sub_80FBA18();
-void sub_80FBB3C();
+void sub_80FBA18(void);
+u8 sub_80FBAA0(u16);
+void sub_80FBB3C(u16, u16);
 void sub_80FBCA0(void);
 void sub_80FBDF8(void);
 void sub_80FBE24(void);
@@ -549,20 +569,20 @@ void sub_80FB170(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 g)
     s32 var2;
     s32 var3;
     s32 var4;
-    
+
     gUnknown_020388CC->unk2C = e * gSineTable[g + 64] >> 8;
     gUnknown_020388CC->unk30 = e * -gSineTable[g] >> 8;
     gUnknown_020388CC->unk34 = f * gSineTable[g] >> 8;
     gUnknown_020388CC->unk38 = f * gSineTable[g + 64] >> 8;
-    
+
     var1 = (a << 8) + (c << 8);
     var2 = d * gUnknown_020388CC->unk34 + gUnknown_020388CC->unk2C * c;
     gUnknown_020388CC->unk24 = var1 - var2;
-    
+
     var3 = (b << 8) + (d << 8);
     var4 = gUnknown_020388CC->unk38 * d + gUnknown_020388CC->unk30 * c;
     gUnknown_020388CC->unk28 = var3 - var4;
-    
+
     gUnknown_020388CC->unk7D = 1;
 }
 
@@ -600,7 +620,7 @@ void sub_80FB2A4(s16 a, s16 b)
 
 u16 GetRegionMapSectionAt(u16 x, u16 y)
 {
-    
+
     if (y < 2 || y > 16 || x < 1 || x > 0x1C)
         return 0x58;
     y -= 2;
@@ -617,13 +637,13 @@ void sub_80FB32C(void)
     u16 y;
     u16 r1;
     u16 r9;
-    
+
     if (gSaveBlock1.location.mapGroup == 0x19 && (gSaveBlock1.location.mapNum == 0x29 || gSaveBlock1.location.mapNum == 0x2A || gSaveBlock1.location.mapNum == 0x2B))
     {
         sub_80FB600();
         return;
     }
-    
+
     switch (get_map_light_level_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) - 1)
     {
     default:
@@ -663,7 +683,7 @@ void sub_80FB32C(void)
     case 7:
         {
             struct WarpData *r4;
-            
+
             gUnknown_020388CC->unk14 = gMapHeader.name;
             if (gUnknown_020388CC->unk14 != 0x57)
             {
@@ -684,19 +704,23 @@ void sub_80FB32C(void)
         }
         break;
     }
+
     r9 = x;
+
     r1 = mapWidth / gRegionMapLocations[gUnknown_020388CC->unk14].width;
     if (r1 == 0)
         r1 = 1;
     x /= r1;
     if (x >= gRegionMapLocations[gUnknown_020388CC->unk14].width)
         x = gRegionMapLocations[gUnknown_020388CC->unk14].width - 1;
+
     r1 = mapHeight / gRegionMapLocations[gUnknown_020388CC->unk14].height;
     if (r1 == 0)
         r1 = 1;
     y /= r1;
     if (y >= gRegionMapLocations[gUnknown_020388CC->unk14].height)
         y = gRegionMapLocations[gUnknown_020388CC->unk14].height - 1;
+
     switch (gUnknown_020388CC->unk14)
     {
     case 0x1D:
@@ -729,3 +753,309 @@ void sub_80FB32C(void)
     gUnknown_020388CC->unk54 = gRegionMapLocations[gUnknown_020388CC->unk14].x + x + 1;
     gUnknown_020388CC->unk56 = gRegionMapLocations[gUnknown_020388CC->unk14].y + y + 2;
 }
+
+void sub_80FB600(void)
+{
+    u16 y = 0;
+    u16 x = 0;
+    u8 mapGroup;
+    u8 mapNum;
+    s16 sp2;
+    s16 sp4;
+
+    switch (GetSSTidalLocation(&mapGroup, &mapNum, &sp2, &sp4))
+    {
+    case 1:
+        gUnknown_020388CC->unk14 = 8;
+        break;
+    case 2:
+        gUnknown_020388CC->unk14 = 12;
+        break;
+    case 3:
+        gUnknown_020388CC->unk14 = 0x27;
+        break;
+    case 4:
+        gUnknown_020388CC->unk14 = 0x2E;
+        break;
+    default:
+    case 0:
+        {
+            struct MapHeader *mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum);
+            u16 r1;
+
+            gUnknown_020388CC->unk14 = mapHeader->name;
+            r1 = mapHeader->mapData->width / gRegionMapLocations[gUnknown_020388CC->unk14].width;
+            if (r1 == 0)
+                r1 = 1;
+            x = sp2 / r1;
+            if (x >= gRegionMapLocations[gUnknown_020388CC->unk14].width)
+                x = gRegionMapLocations[gUnknown_020388CC->unk14].width - 1;
+
+            r1 = mapHeader->mapData->height / gRegionMapLocations[gUnknown_020388CC->unk14].height;
+            if (r1 == 0)
+                r1 = 1;
+            y = sp4 / r1;
+            if (y >= gRegionMapLocations[gUnknown_020388CC->unk14].height)
+                y = gRegionMapLocations[gUnknown_020388CC->unk14].height - 1;
+        }
+        break;
+    }
+    gUnknown_020388CC->unk7F = 0;
+    gUnknown_020388CC->unk54 = gRegionMapLocations[gUnknown_020388CC->unk14].x + x + 1;
+    gUnknown_020388CC->unk56 = gRegionMapLocations[gUnknown_020388CC->unk14].y + y + 2;
+}
+
+u16 sub_80FB758(u16 a)
+{
+    switch (a)
+    {
+    case 88:
+        return 0;
+    case 0:
+        return FlagGet(0x80F) ? 2 : 3;
+    case 1:
+        return FlagGet(0x810) ? 2 : 3;
+    case 2:
+        return FlagGet(0x811) ? 2 : 3;
+    case 3:
+        return FlagGet(0x812) ? 2 : 3;
+    case 4:
+        return FlagGet(0x813) ? 2 : 3;
+    case 5:
+        return FlagGet(0x814) ? 2 : 3;
+    case 6:
+        return FlagGet(0x815) ? 2 : 3;
+    case 7:
+        return FlagGet(0x816) ? 2 : 3;
+    case 8:
+        return FlagGet(0x817) ? 2 : 3;
+    case 9:
+        return FlagGet(0x818) ? 2 : 3;
+    case 10:
+        return FlagGet(0x819) ? 2 : 3;
+    case 11:
+        return FlagGet(0x81A) ? 2 : 3;
+    case 12:
+        return FlagGet(0x81B) ? 2 : 3;
+    case 13:
+        return FlagGet(0x81C) ? 2 : 3;
+    case 14:
+        return FlagGet(0x81D) ? 2 : 3;
+    case 15:
+        return FlagGet(0x81E) ? 2 : 3;
+    case 58:
+        return FlagGet(0x848) ? 4 : 0;
+    case 73:
+        return FlagGet(0x849) ? 1 : 0;
+    default:
+        return 1;
+    }
+}
+
+u16 GetRegionMapSectionAt_(u16 x, u16 y)
+{
+    return GetRegionMapSectionAt(x, y);
+}
+
+u16 sub_80FB9C0(u16 a)
+{
+    u16 i = 0;
+
+    while (gUnknown_083E7684[i][0] != 88)
+    {
+        if (gUnknown_083E7684[i][0] == a)
+            return gUnknown_083E7684[i][1];
+        i++;
+    }
+    return a;
+}
+
+u16 sub_80FBA04(u16 a)
+{
+    return sub_80FB9C0(a);
+}
+
+void sub_80FBA18(void)
+{
+    u16 x;
+    u16 y;
+    u16 i;
+
+    if (gUnknown_020388CC->unk14 == 88)
+    {
+        gUnknown_020388CC->unk17 = 0;
+        return;
+    }
+
+    if (gUnknown_020388CC->unk78 == 0)
+    {
+        x = gUnknown_020388CC->unk54;
+        y = gUnknown_020388CC->unk56;
+    }
+    else
+    {
+        x = gUnknown_020388CC->unk64;
+        y = gUnknown_020388CC->unk66;
+    }
+
+    i = 0;
+    while (1)
+    {
+        if (x <= 1)
+        {
+            if (sub_80FBAA0(y) != 0)
+            {
+                y--;
+                x = 0x1D;
+            }
+            else
+            {
+                break;
+            }
+        }
+        else
+        {
+            x--;
+            if (GetRegionMapSectionAt(x, y) == gUnknown_020388CC->unk14)
+                i++;
+        }
+    }
+
+    gUnknown_020388CC->unk17 = i;
+}
+
+u8 sub_80FBAA0(u16 a)
+{
+    u16 x;
+    u16 y;
+
+    y = a - 1;
+    if (y == 0xFFFF)
+        return 0;
+
+    x = 1;
+    while (x < 0x1D)
+    {
+        if (GetRegionMapSectionAt(x, y) == gUnknown_020388CC->unk14)
+            return 1;
+        x++;
+    }
+    return 0;
+}
+
+
+
+const struct OamData gOamData_83E76B8 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+const union AnimCmd gSpriteAnim_83E76C0[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(4, 20),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd gSpriteAnim_83E76CC[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(16, 10),
+    ANIMCMD_FRAME(32, 10),
+    ANIMCMD_FRAME(16, 10),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gSpriteAnimTable_83E76E0[] =
+{
+    gSpriteAnim_83E76C0,
+    gSpriteAnim_83E76CC,
+};
+
+void sub_80FBAF0(struct Sprite *sprite)
+{
+    if (gUnknown_020388CC->unk7A != 0)
+    {
+        sprite->pos1.x += gUnknown_020388CC->unk7B * 2;
+        sprite->pos1.y += gUnknown_020388CC->unk7C * 2;
+        gUnknown_020388CC->unk7A--;
+    }
+}
+
+void nullsub_66(struct Sprite *sprite)
+{
+}
+
+void sub_80FBB3C(u16 tileTag, u16 paletteTag)
+{
+    u8 spriteId;
+    struct SpriteSheet spriteSheet;
+    struct SpritePalette spritePalette =
+    {
+        .data = gPokenavCursor_Pal,
+    };
+    struct SpriteTemplate spriteTemplate =
+    {
+        .oam = &gOamData_83E76B8,
+        .anims = gSpriteAnimTable_83E76E0,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = sub_80FBAF0,
+    };
+
+    spriteSheet.tag = tileTag;
+    spriteTemplate.tileTag = tileTag;
+    gUnknown_020388CC->unk58 = tileTag;
+    
+    spritePalette.tag = paletteTag;
+    spriteTemplate.paletteTag = paletteTag;
+    gUnknown_020388CC->unk5A = paletteTag;
+    
+    if (gUnknown_020388CC->unk78 == 0)
+    {
+        spriteSheet.data = gUnknown_020388CC->unk180;
+        spriteSheet.size = 0x100;
+        spriteTemplate.callback = sub_80FBAF0;
+    }
+    else
+    {
+        spriteSheet.data = gUnknown_020388CC->unk280;
+        spriteSheet.size = 0x600;
+        spriteTemplate.callback = nullsub_66;
+    }
+    LoadSpriteSheet(&spriteSheet);
+    LoadSpritePalette(&spritePalette);
+    spriteId = CreateSprite(&spriteTemplate, 0x38, 0x48, 0);
+    if (spriteId != 64)
+    {
+        gUnknown_020388CC->unk1C = &gSprites[spriteId];
+        if (gUnknown_020388CC->unk78 == 1)
+        {
+            gUnknown_020388CC->unk1C->oam.size = 2;
+            gUnknown_020388CC->unk1C->pos1.x -= 8;
+            gUnknown_020388CC->unk1C->pos1.y -= 8;
+            StartSpriteAnim(gUnknown_020388CC->unk1C, 1);
+        }
+        else
+        {
+            gUnknown_020388CC->unk1C->oam.size = 1;
+            gUnknown_020388CC->unk1C->pos1.x = gUnknown_020388CC->unk54 * 8 + 4;
+            gUnknown_020388CC->unk1C->pos1.y = gUnknown_020388CC->unk56 * 8 + 4;
+        }
+        gUnknown_020388CC->unk1C->data1 = 2;
+        gUnknown_020388CC->unk1C->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101;
+        gUnknown_020388CC->unk1C->data3 = 1;
+    }
+}
-- 
cgit v1.2.3


From 32a9e2ae445e6f5674357edc4e8b9ee90c927c43 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sat, 15 Jul 2017 20:52:54 -0500
Subject: finish decompiling region_map

---
 src/menu.c       |   2 +-
 src/region_map.c | 746 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 741 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/menu.c b/src/menu.c
index d532fc602..8d80c35aa 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -710,7 +710,7 @@ _08072B3E:\n\
 }
 #endif
 
-void MenuPrint_RightAligned(u8 *str, u8 left, u8 top)
+void MenuPrint_RightAligned(const u8 *str, u8 left, u8 top)
 {
     sub_8004D38(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
 }
diff --git a/src/region_map.c b/src/region_map.c
index 9e95c40d0..6318893ab 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1,10 +1,19 @@
 #include "global.h"
 #include "event_data.h"
+#include "field_effect.h"
 #include "field_specials.h"
+#include "m4a.h"
 #include "main.h"
+#include "menu.h"
 #include "palette.h"
+#include "pokemon_menu.h"
 #include "rom4.h"
+#include "secret_base.h"
+#include "songs.h"
 #include "sprite.h"
+#include "strings.h"
+#include "string_util.h"
+#include "text.h"
 #include "trig.h"
 
 struct UnknownStruct1
@@ -233,7 +242,21 @@ void sub_80FBB3C(u16, u16);
 void sub_80FBCA0(void);
 void sub_80FBDF8(void);
 void sub_80FBE24(void);
-void sub_80FBFB4();
+void sub_80FBF34(struct Sprite *);
+void sub_80FBF40(struct Sprite *);
+void sub_80FBEA4(struct Sprite *);
+const u8 *sub_80FBFB4(u8 *, u16, u16);
+void sub_80FC214(void);
+void sub_80FC228(void);
+void sub_80FC244(void (*func)(void));
+void sub_80FC254(void);
+void sub_80FC31C(void);
+void sub_80FC374(void);
+void sub_80FC484(void);
+void sub_80FC55C(struct Sprite *);
+void sub_80FC5B4(void);
+void sub_80FC600(void);
+void sub_80FC69C(void);
 
 void sub_80FA8EC(struct UnknownStruct1 *a, u8 b)
 {
@@ -275,7 +298,7 @@ bool8 sub_80FA940(void)
         gUnknown_020388CC->unk76 = gUnknown_020388CC->unk56;
         gUnknown_020388CC->unk16 = sub_80FB758(gUnknown_020388CC->unk14);
         gUnknown_020388CC->unk14 = sub_80FB9C0(gUnknown_020388CC->unk14);
-        sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16);
+        sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16);
         break;
     case 6:
         if (gUnknown_020388CC->unk78 == 0)
@@ -390,7 +413,7 @@ u8 _swiopen(void)
     if (r4 != gUnknown_020388CC->unk14)
     {
         gUnknown_020388CC->unk14 = r4;
-        sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16);
+        sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16);
     }
     sub_80FBA18();
     gUnknown_020388CC->unk18 = sub_80FAB78;
@@ -456,7 +479,7 @@ u8 sub_80FADE4(void)
             if (r4 != gUnknown_020388CC->unk14)
             {
                 gUnknown_020388CC->unk14 = r4;
-                sub_80FBFB4(gUnknown_020388CC, gUnknown_020388CC->unk14, 16);
+                sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16);
             }
             sub_80FBA18();
         }
@@ -1018,11 +1041,11 @@ void sub_80FBB3C(u16 tileTag, u16 paletteTag)
     spriteSheet.tag = tileTag;
     spriteTemplate.tileTag = tileTag;
     gUnknown_020388CC->unk58 = tileTag;
-    
+
     spritePalette.tag = paletteTag;
     spriteTemplate.paletteTag = paletteTag;
     gUnknown_020388CC->unk5A = paletteTag;
-    
+
     if (gUnknown_020388CC->unk78 == 0)
     {
         spriteSheet.data = gUnknown_020388CC->unk180;
@@ -1059,3 +1082,714 @@ void sub_80FBB3C(u16 tileTag, u16 paletteTag)
         gUnknown_020388CC->unk1C->data3 = 1;
     }
 }
+
+void sub_80FBCA0(void)
+{
+    if (gUnknown_020388CC->unk1C != NULL)
+    {
+        DestroySprite(gUnknown_020388CC->unk1C);
+        FreeSpriteTilesByTag(gUnknown_020388CC->unk58);
+        FreeSpritePaletteByTag(gUnknown_020388CC->unk5A);
+    }
+}
+
+void unref_sub_80FBCD0(void)
+{
+    gUnknown_020388CC->unk1C->data3 = 1;
+}
+
+void unref_sub_80FBCE0(void)
+{
+    gUnknown_020388CC->unk1C->data3 = 0;
+}
+
+const struct OamData gOamData_083E7708 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+const union AnimCmd gSpriteAnim_83E7710[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gSpriteAnimTable_083E7718[] =
+{
+    gSpriteAnim_83E7710,
+};
+
+void sub_80FBCF0(u16 tileTag, u16 paletteTag)
+{
+    u8 spriteId;
+    struct SpriteSheet spriteSheet =
+    {
+        .data = gRegionMapBrendanIconTiles,
+        .size = 128,
+        .tag = tileTag,
+    };
+    struct SpritePalette spritePalette =
+    {
+        .data = gRegionMapBrendanIconPalette,
+        .tag = paletteTag,
+    };
+    struct SpriteTemplate spriteTemplate =
+    {
+        .tileTag = tileTag,
+        .paletteTag = paletteTag,
+        .oam = &gOamData_083E7708,
+        .anims = gSpriteAnimTable_083E7718,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    };
+
+    if (gSaveBlock2.playerGender == FEMALE)
+    {
+        spriteSheet.data = gRegionMapMayIconTiles;
+        spritePalette.data = gRegionMapMayIconPalette;
+    }
+    LoadSpriteSheet(&spriteSheet);
+    LoadSpritePalette(&spritePalette);
+    spriteId = CreateSprite(&spriteTemplate, 0, 0, 1);
+    gUnknown_020388CC->unk20 = &gSprites[spriteId];
+    if (gUnknown_020388CC->unk78 == 0)
+    {
+        gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 8 + 4;
+        gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 8 + 4;
+        gUnknown_020388CC->unk20->callback = sub_80FBF34;
+    }
+    else
+    {
+        gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 16 - 48;
+        gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 16 - 66;
+        gUnknown_020388CC->unk20->callback = sub_80FBEA4;
+    }
+}
+
+void sub_80FBDF8(void)
+{
+    if (gUnknown_020388CC->unk20 != NULL)
+    {
+        gUnknown_020388CC->unk20->invisible = TRUE;
+        gUnknown_020388CC->unk20->callback = SpriteCallbackDummy;
+    }
+}
+
+void sub_80FBE24(void)
+{
+    if (gUnknown_020388CC->unk20 != NULL)
+    {
+        if (gUnknown_020388CC->unk78 == 1)
+        {
+            gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 16 - 48;
+            gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 16 - 66;
+            gUnknown_020388CC->unk20->callback = sub_80FBEA4;
+            gUnknown_020388CC->unk20->invisible = FALSE;
+        }
+        else
+        {
+            gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 8 + 4;
+            gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 8 + 4;
+            gUnknown_020388CC->unk20->pos2.x = 0;
+            gUnknown_020388CC->unk20->pos2.y = 0;
+            gUnknown_020388CC->unk20->callback = sub_80FBF34;
+            gUnknown_020388CC->unk20->invisible = FALSE;
+        }
+    }
+}
+
+void sub_80FBEA4(struct Sprite *sprite)
+{
+    sprite->pos2.x = -(gUnknown_020388CC->unk5C * 2);
+    sprite->pos2.y = -(gUnknown_020388CC->unk5E * 2);
+    sprite->data0 = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+    sprite->data1 = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
+
+    if (sprite->data0 < -8 || sprite->data0 > 0xA8 || sprite->data1 < -8 || sprite->data1 > 0xF8)
+        sprite->data2 = 0;
+    else
+        sprite->data2 = 1;
+
+    if (sprite->data2 == 1)
+        sub_80FBF40(sprite);
+    else
+        sprite->invisible = TRUE;
+}
+
+void sub_80FBF34(struct Sprite *sprite)
+{
+    sub_80FBF40(sprite);
+}
+
+void sub_80FBF40(struct Sprite *sprite)
+{
+    if (gUnknown_020388CC->unk7E != 0)
+    {
+        sprite->data7++;
+        if (sprite->data7 > 16)
+        {
+            sprite->data7 = 0;
+            sprite->invisible = !sprite->invisible;
+        }
+    }
+    else
+    {
+        sprite->invisible = FALSE;
+    }
+}
+
+void sub_80FBF94(void)
+{
+    if (gUnknown_020388CC->unk7F != 0)
+        gUnknown_020388CC->unk7E = 1;
+}
+
+const u8 *sub_80FBFB4(u8 *dest, u16 b, u16 length)
+{
+    if (b == 86)
+        return GetSecretBaseMapName(dest);
+    if (b < 88)
+        return StringCopy(dest, gRegionMapLocations[b].name);
+    if (length == 0)
+        length = 18;
+    return StringFill(dest, CHAR_SPACE, length);
+}
+
+const u8 *CopyMapName(u8 *dest, u16 b)
+{
+    switch (b)
+    {
+    case 87:
+        return StringCopy(dest, gOtherText_Ferry);
+    case 86:
+        return StringCopy(dest, gOtherText_SecretBase);
+    default:
+        return sub_80FBFB4(dest, b, 0);
+    }
+}
+
+const u8 *CopyLocationName(u8 *dest, u16 b)
+{
+    if (b == 66)
+        return StringCopy(dest, gOtherText_Hideout);
+    else
+        return CopyMapName(dest, b);
+}
+
+void sub_80FC04C(u16 a, u16 *x, u16 *y, u16 *width, u16 *height)
+{
+    *x = gRegionMapLocations[a].x;
+    *y = gRegionMapLocations[a].y;
+    *width = gRegionMapLocations[a].width;
+    *height = gRegionMapLocations[a].height;
+}
+
+struct UnknownStruct3
+{
+    void (*unk0)(void);
+    u16 unk4;
+    u16 unk6;
+    struct UnknownStruct1 unk8;
+};
+
+extern u8 ewram[];
+#define ewram0 (*(struct UnknownStruct3 *)(ewram + 0))
+#define ewram888 (ewram + 0x888)
+#define ewramA6E (ewram[0xA6E])
+#define ewramA48 (ewram + 0xA48)
+
+const u16 gUnknown_083E771C[] = INCBIN_U16("graphics/pokenav/map_frame.gbapal");
+const u8 gUnknown_083E773C[] = INCBIN_U8("graphics/pokenav/map_frame.4bpp.lz");
+const u8 gUnknown_083E7774[] = INCBIN_U8("graphics/pokenav/map_frame.bin.lz");
+const u16 gPokenavMapMisc_Pal[] = INCBIN_U16("graphics/pokenav/map_misc.gbapal");
+const u8 gUnknown_083E784C[] = INCBIN_U8("graphics/pokenav/map_misc.4bpp.lz");
+
+const u8 gUnknown_083E7920[][3] =
+{
+    {0,  9,  1},
+    {0, 10, 14},
+    {0, 11, 15},
+    {0, 12, 16},
+    {0, 13, 17},
+    {0, 14, 18},
+    {0, 15, 19},
+    {0,  0,  3},
+    {0,  1,  4},
+    {0,  2,  5},
+    {0,  3,  6},
+    {0,  4,  7},
+    {0,  5,  8},
+    {0,  6,  9},
+    {0,  7, 10},
+    {0,  8, 11},
+    {0, 16,  0},
+    {0, 17,  0},
+    {0, 18,  0},
+    {0, 19,  0},
+    {0, 20,  0},
+    {0, 21,  0},
+    {0, 22,  0},
+    {0, 23,  0},
+    {0, 24,  0},
+    {0, 25,  0},
+    {0, 26,  0},
+    {0, 27,  0},
+    {0, 28,  0},
+    {0, 29,  0},
+    {0, 30,  0},
+    {0, 31,  0},
+    {0, 32,  0},
+    {0, 33,  0},
+    {0, 34,  0},
+    {0, 35,  0},
+    {0, 36,  0},
+    {0, 37,  0},
+    {0, 38,  0},
+    {0, 39,  0},
+    {0, 40,  0},
+    {0, 41,  0},
+    {0, 42,  0},
+    {0, 43,  0},
+    {0, 44,  0},
+    {0, 45,  0},
+    {0, 46,  0},
+    {0, 47,  0},
+    {0, 48,  0},
+    {0, 49,  0},
+};
+
+struct UnknownStruct4
+{
+    const u8 *const *unk0;
+    u16 unk4;
+    u16 unk6;
+};
+
+const u8 *const Unknown_3E79B8[] = {OtherText_PokeLeague, OtherText_PokeCenter};
+
+const struct UnknownStruct4 gUnknown_083E79C0[1] =
+{
+    {Unknown_3E79B8, 15, 0x854},
+};
+
+// XXX: what is this?
+static u8 *const ewram_ = ewram;
+
+const struct SpritePalette gUnknown_083E79CC = {gPokenavMapMisc_Pal, 2};
+
+const u16 gUnknown_083E79D4[][2] =
+{
+    {0x848, 58},
+    {0xFFFF, 88},
+};
+
+const struct OamData gOamData_83E79DC =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+const union AnimCmd gSpriteAnim_83E79E4[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_83E79EC[] =
+{
+    ANIMCMD_FRAME(1, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_83E79F4[] =
+{
+    ANIMCMD_FRAME(3, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_83E79FC[] =
+{
+    ANIMCMD_FRAME(5, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_83E7A04[] =
+{
+    ANIMCMD_FRAME(6, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_83E7A0C[] =
+{
+    ANIMCMD_FRAME(8, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_83E7A14[] =
+{
+    ANIMCMD_FRAME(10, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gSpriteAnimTable_83E7A1C[] =
+{
+    gSpriteAnim_83E79E4,
+    gSpriteAnim_83E79EC,
+    gSpriteAnim_83E79F4,
+    gSpriteAnim_83E79FC,
+    gSpriteAnim_83E7A04,
+    gSpriteAnim_83E7A0C,
+    gSpriteAnim_83E7A14,
+};
+
+const struct SpriteTemplate gSpriteTemplate_83E7A38 =
+{
+    .tileTag = 2,
+    .paletteTag = 2,
+    .oam = &gOamData_83E79DC,
+    .anims = gSpriteAnimTable_83E7A1C,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+void sub_80FC074(void)
+{
+    switch (gMain.state)
+    {
+    case 0:
+        SetVBlankCallback(NULL);
+        REG_DISPCNT = 0;
+        REG_BG0HOFS = 0;
+        REG_BG0VOFS = 0;
+        REG_BG1HOFS = 0;
+        REG_BG1VOFS = 0;
+        REG_BG2VOFS = 0;
+        REG_BG2HOFS = 0;
+        REG_BG3HOFS = 0;
+        REG_BG3VOFS = 0;
+        ResetPaletteFade();
+        ResetSpriteData();
+        FreeSpriteTileRanges();
+        FreeAllSpritePalettes();
+        break;
+    case 1:
+        SetUpWindowConfig(&gWindowConfig_81E7224);
+        break;
+    case 2:
+        InitMenuWindow(&gWindowConfig_81E7224);
+        MenuZeroFillScreen();
+        break;
+    case 3:
+        sub_80FA8EC(&ewram0.unk8, 0);
+        sub_80FBB3C(0, 0);
+        sub_80FBCF0(1, 1);
+        ewram0.unk6 = ewram0.unk8.unk14;
+        StringFill(ewramA48, CHAR_SPACE, 12);
+        sub_80FC254();
+        break;
+    case 4:
+        LZ77UnCompVram(gUnknown_083E773C, (void *)(VRAM + 0xC000));
+        break;
+    case 5:
+        LZ77UnCompVram(gUnknown_083E7774, (void *)(VRAM + 0xF000));
+        break;
+    case 6:
+        LoadPalette(gUnknown_083E771C, 16, 32);
+        MenuPrint_PixelCoords(gOtherText_FlyToWhere, 1, 0x90, 1);
+        break;
+    case 7:
+        sub_80FC31C();
+        break;
+    case 8:
+        BlendPalettes(0xFFFFFFFF, 16, 0);
+        SetVBlankCallback(sub_80FC214);
+        break;
+    case 9:
+        REG_BLDCNT = 0;
+        REG_BG1CNT = 0x1E0D;
+        REG_DISPCNT = 0x1741;
+        sub_80FC244(sub_80FC5B4);
+        SetMainCallback2(sub_80FC228);
+        break;
+    default:
+        return;
+    }
+    gMain.state++;
+}
+
+void sub_80FC214(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_80FC228(void)
+{
+    ewram0.unk0();
+    AnimateSprites();
+    BuildOamBuffer();
+}
+
+void sub_80FC244(void (*func)(void))
+{
+    ewram0.unk0 = func;
+    ewram0.unk4 = 0;
+}
+
+void sub_80FC254(void)
+{
+    if (ewram0.unk8.unk16 == 2 || ewram0.unk8.unk16 == 4)
+    {
+        u16 i = 0;
+        int zero;
+
+        for (i = 0; i < 1; i++)
+        {
+            const struct UnknownStruct4 *r4 = &gUnknown_083E79C0[i];
+
+            if (ewram0.unk8.unk14 == r4->unk4)
+            {
+                if (FlagGet(r4->unk6))
+                {
+                    MenuDrawTextWindow(16, 14, 29, 19);
+                    MenuPrint(ewram0.unk8.filler0, 17, 15);
+                    MenuPrint_RightAligned(r4->unk0[ewram0.unk8.unk17], 29, 17);
+                    return;
+                }
+                break;
+            }
+        }
+        // This check is always true, but somehow the compiler still performed it.
+        asm("mov %0, #0\n":"=r"(zero));  // zero = 0
+        if (zero == 0)
+        {
+            MenuDrawTextWindow(16, 16, 29, 19);
+            MenuPrint(ewram0.unk8.filler0, 17, 17);
+            MenuZeroFillWindowRect(16, 14, 29, 15);
+        }
+    }
+    else
+    {
+        MenuDrawTextWindow(16, 16, 29, 19);
+        MenuPrint(ewramA48, 17, 17);
+        MenuZeroFillWindowRect(16, 14, 29, 15);
+    }
+}
+
+void sub_80FC31C(void)
+{
+    struct SpriteSheet spriteSheet;
+
+    LZ77UnCompWram(gUnknown_083E784C, ewram888);
+    spriteSheet.data = ewram888;
+    spriteSheet.size = 0x1C0;
+    spriteSheet.tag = 2;
+    LoadSpriteSheet(&spriteSheet);
+    LoadSpritePalette(&gUnknown_083E79CC);
+    sub_80FC374();
+    sub_80FC484();
+}
+
+void sub_80FC374(void)
+{
+    u16 flag = 0x80F;
+    u16 i;
+
+    for (i = 0; i < 16; i++)
+    {
+        u16 x;
+        u16 y;
+        u16 width;
+        u16 height;
+        u16 r7;
+        u8 spriteId;
+
+        sub_80FC04C(i, &x, &y, &width, &height);
+        x = (x + 1) * 8 + 4;
+        y = (y + 2) * 8 + 4;
+        if (width == 2)
+            r7 = 1;
+        else if (height == 2)
+            r7 = 2;
+        else
+            r7 = 0;
+        spriteId = CreateSprite(&gSpriteTemplate_83E7A38, x, y, 10);
+        if (spriteId != 64)
+        {
+            gSprites[spriteId].oam.shape = r7;
+            if (FlagGet(flag))
+                gSprites[spriteId].callback = sub_80FC55C;
+            else
+                r7 += 3;
+            StartSpriteAnim(&gSprites[spriteId], r7);
+            gSprites[spriteId].data0 = i;
+        }
+        flag++;
+    }
+}
+
+void sub_80FC484(void)
+{
+    u16 i;
+
+    for (i = 0; gUnknown_083E79D4[i][1] != 88; i++)
+    {
+        u16 x;
+        u16 y;
+        u16 width;
+        u16 height;
+
+        if (FlagGet(gUnknown_083E79D4[i][0]))
+        {
+            u16 r6 = gUnknown_083E79D4[i][1];
+            u8 spriteId;
+
+            sub_80FC04C(r6, &x, &y, &width, &height);
+            x = (x + 1) * 8;
+            y = (y + 2) * 8;
+            spriteId = CreateSprite(&gSpriteTemplate_83E7A38, x, y, 10);
+            if (spriteId != 64)
+            {
+                gSprites[spriteId].oam.size = 1;
+                gSprites[spriteId].callback = sub_80FC55C;
+                StartSpriteAnim(&gSprites[spriteId], 6);
+                gSprites[spriteId].data0 = r6;
+            }
+        }
+    }
+}
+
+void sub_80FC55C(struct Sprite *sprite)
+{
+    if (ewram0.unk8.unk14 == sprite->data0)
+    {
+        sprite->data1++;
+        if (sprite->data1 > 16)
+        {
+            sprite->data1 = 0;
+            sprite->invisible = !sprite->invisible;
+        }
+    }
+    else
+    {
+        sprite->data1 = 16;
+        sprite->invisible = FALSE;
+    }
+}
+
+void sub_80FC5B4(void)
+{
+    switch (ewram0.unk4)
+    {
+    case 0:
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+        ewram0.unk4++;
+        break;
+    case 1:
+        if (UpdatePaletteFade() != 0)
+            break;
+        sub_80FC244(sub_80FC600);
+        break;
+    }
+}
+
+void sub_80FC600(void)
+{
+    if (ewram0.unk4 == 0)
+    {
+        switch (sub_80FAB60())
+        {
+        case 0:
+        case 1:
+        case 2:
+            break;
+        case 3:
+            sub_80FC254();
+            break;
+        case 4:
+            if (ewram0.unk8.unk16 == 2 || ewram0.unk8.unk16 == 4)
+            {
+                m4aSongNumStart(SE_SELECT);
+                ewramA6E = 1;
+                sub_80FC244(sub_80FC69C);
+            }
+            break;
+        case 5:
+            m4aSongNumStart(SE_SELECT);
+            ewramA6E = 0;
+            sub_80FC244(sub_80FC69C);
+            break;
+        }
+    }
+}
+
+void sub_80FC69C(void)
+{
+    switch (ewram0.unk4)
+    {
+    case 0:
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+        ewram0.unk4++;
+        break;
+    case 1:
+        if (UpdatePaletteFade() != 0)
+            break;
+        sub_80FAB10();
+        if (ewramA6E != 0)
+        {
+            switch (ewram0.unk8.unk14)
+            {
+            case 0x49:
+                sub_8053538(22);
+                break;
+            case 0x3A:
+                sub_8053538(21);
+                break;
+            case 0:
+                sub_8053538((gSaveBlock2.playerGender == MALE) ? 12 : 13);
+                break;
+            case 15:
+                sub_8053538((FlagGet(0x854) && ewram0.unk8.unk17 == 0) ? 20 : 11);
+                break;
+            default:
+                if (gUnknown_083E7920[ewram0.unk8.unk14][2] != 0)
+                    sub_8053538(gUnknown_083E7920[ewram0.unk8.unk14][2]);
+                else
+                    warp1_set_2(gUnknown_083E7920[ewram0.unk8.unk14][0], gUnknown_083E7920[ewram0.unk8.unk14][1], -1);
+                break;
+            }
+            sub_80865BC();
+        }
+        else
+        {
+            SetMainCallback2(sub_808AD58);
+        }
+        break;
+    }
+}
-- 
cgit v1.2.3


From 198b4724d78ad2d40dedd67a5a79cba97cdc3c33 Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Sun, 16 Jul 2017 02:02:24 -0700
Subject: fix CreateMonWithEVSpread

---
 src/pokemon_1.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index c55105ef3..185caaed2 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -249,29 +249,30 @@ void CreateMonWithIVsOTID(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u
 void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread)
 {
     s32 i;
-    register u32 temp asm("r4");
     s32 statCount = 0;
     u16 evAmount;
-    register u32 mask1 asm("r1");
-    u8 mask2;
+    u8 temp;
 
     CreateMon(mon, species, level, fixedIV, 0, 0, 0, 0);
+
     temp = evSpread;
-    mask1 = 1;
-    for (i = 5; i >= 0; i--)
+
+    for (i = 0; i < 6; i++)
     {
-        if (temp & mask1)
+        if (temp & 1)
             statCount++;
         temp >>= 1;
     }
 
     evAmount = 510 / statCount;
-    mask2 = 1;
+
+    temp = 1;
+
     for (i = 0; i < 6; i++)
     {
-        if (evSpread & mask2)
+        if (evSpread & temp)
             SetMonData(mon, MON_DATA_HP_EV + i, (u8 *)&evAmount);
-        mask2 <<= 1;
+        temp <<= 1;
     }
 
     CalculateMonStats(mon);
-- 
cgit v1.2.3


From c46baaf6732d68f5908a1f3c826e9aa2f88c3ff3 Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Sun, 16 Jul 2017 02:50:55 -0700
Subject: remove goto in CalculateMonStats

---
 src/pokemon_1.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index 185caaed2..231fc33ed 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -444,23 +444,21 @@ void CalculateMonStats(struct Pokemon *mon)
     if (species == SPECIES_SHEDINJA)
     {
         if (currentHP != 0 || oldMaxHP == 0)
-        {
             currentHP = 1;
-            goto set_hp;
-        }
+        else
+            return;
     }
     else
     {
-        if (currentHP != 0 || oldMaxHP == 0)
-        {
-            if (currentHP != 0)
-                currentHP += newMaxHP - oldMaxHP;
-            else if (oldMaxHP == 0)
-                currentHP = newMaxHP;
-        set_hp:
-            SetMonData(mon, MON_DATA_HP, (u8 *)&currentHP);
-        }
+        if (currentHP == 0 && oldMaxHP == 0)
+            currentHP = newMaxHP;
+        else if (currentHP != 0)
+            currentHP += newMaxHP - oldMaxHP;
+        else
+            return;
     }
+
+    SetMonData(mon, MON_DATA_HP, (u8 *)&currentHP);
 }
 
 void sub_803B4B4(struct Pokemon *src, struct Pokemon *dest)
-- 
cgit v1.2.3


From b03a51e034df8513456043dabf23596c8daba2c1 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 16 Jul 2017 10:35:31 -0500
Subject: labeling

---
 src/field_region_map.c |   13 +-
 src/field_specials.c   |    2 +-
 src/map_name_popup.c   |    2 +-
 src/region_map.c       | 1207 +++++++++++++++++++++++++-----------------------
 src/rom4.c             |    4 +-
 src/save_menu_util.c   |    2 +-
 src/secret_base.c      |    2 +-
 src/tv.c               |   18 +-
 8 files changed, 663 insertions(+), 587 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 58b0e37bc..2b324ca1e 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -19,11 +19,13 @@ struct UnkStruct
 {
     MainCallback callback;
     u8 filler[4];
+    // This should be RegionMap, but I can't do that because it overlaps unk888.
     struct RegionMapStruct unk8;
     u16 unk888;
 };
 
-extern struct UnkStruct unk_2000000;
+extern u8 ewram[];
+#define unk_2000000 (*(struct UnkStruct *)(ewram))
 
 void FieldInitRegionMap(MainCallback callback)
 {
@@ -46,9 +48,10 @@ void CB2_FieldInitRegionMap(void)
     REG_BG3VOFS = 0;
     ResetSpriteData();
     FreeAllSpritePalettes();
-    sub_80FA8EC((u32)&unk_2000000.unk8, 0);
-    sub_80FBCF0(0, 0);
-    sub_80FBB3C(1, 1);
+    // TODO: remove this cast
+    InitRegionMap((void *)&unk_2000000.unk8, 0);
+    CreateRegionMapPlayerIcon(0, 0);
+    CreateRegionMapCursorIcon(1, 1);
     SetUpWindowConfig(&gWindowConfig_81E709C);
     InitMenuWindow(&gWindowConfig_81E709C);
     MenuZeroFillScreen();
@@ -107,7 +110,7 @@ void sub_813EFDC(void)
     case 4:
         if (!gPaletteFade.active)
         {
-            sub_80FAB10();
+            FreeRegionMapIconResources();
             SetMainCallback2(unk_2000000.callback);
         }
         break;
diff --git a/src/field_specials.c b/src/field_specials.c
index 2b505bbfe..71de04f55 100755
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1761,7 +1761,7 @@ u8 GetPokeblockNameByMonNature(void)
 
 void GetSecretBaseNearbyMapName(void)
 {
-    sub_80FBFB4(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0);
+    GetMapSectionName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0);
 }
 
 u16 sub_810F404(void)
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index 303cc3d07..01105d0db 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -101,7 +101,7 @@ void DrawMapNamePopup(void)
     u8 name[20];
 
     MenuLoadTextWindowGraphics_OverrideFrameType(0);
-    sub_80FBFB4(name, gMapHeader.name, 0);
+    GetMapSectionName(name, gMapHeader.regionMapSectionId, 0);
     MenuDrawTextWindow(0, 0, 13, 3);
     sub_8072BD8(name, 1, 1, 0x60);
 }
diff --git a/src/region_map.c b/src/region_map.c
index 6318893ab..a0739ecef 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -4,9 +4,11 @@
 #include "field_specials.h"
 #include "m4a.h"
 #include "main.h"
+#include "map_constants.h"
 #include "menu.h"
 #include "palette.h"
 #include "pokemon_menu.h"
+#include "region_map.h"
 #include "rom4.h"
 #include "secret_base.h"
 #include "songs.h"
@@ -16,59 +18,116 @@
 #include "text.h"
 #include "trig.h"
 
-struct UnknownStruct1
-{
-    u8 filler0[0x14];
-    u16 unk14;
-    u8 unk16;
-    u8 unk17;
-    u8 (*unk18)(void);
-    struct Sprite *unk1C;
-    struct Sprite *unk20;
-    s32 unk24;
-    s32 unk28;
-    u32 unk2C;
-    u32 unk30;
-    u32 unk34;
-    u32 unk38;
-    s32 unk3C;
-    s32 unk40;
-    s32 unk44;
-    s32 unk48;
-    s32 unk4C;
-    u32 unk50;
-    u16 unk54;  // cursor x
-    u16 unk56;  // cursor y
-    u16 unk58;
-    u16 unk5A;
-    s16 unk5C;
-    s16 unk5E;
-    s16 unk60;
-    s16 unk62;
-    u16 unk64;
-    u16 unk66;
-    u16 unk68;
-    u16 unk6A;
-    u16 unk6C;
-    u16 unk6E;
-    u16 unk70;
-    u16 unk72;
-    u16 unk74;
-    u16 unk76;
-    u8 unk78;
-    u8 unk79;
-    s8 unk7A;
-    s8 unk7B;  // movement delta horizontal
-    s8 unk7C;  // movement delta vertical
-    u8 unk7D;
-    u8 unk7E;
-    u8 unk7F;
-    u8 filler80[0x100];
-    u8 unk180[0x100];
-    u8 unk280[0x100];  // possibly 0x600
+#define MAPSEC_LITTLEROOT_TOWN 0
+#define MAPSEC_OLDALE_TOWN 1
+#define MAPSEC_DEWFORD_TOWN 2
+#define MAPSEC_LAVARIDGE_TOWN 3
+#define MAPSEC_FALLARBOR_TOWN 4
+#define MAPSEC_VERDANTURF_TOWN 5
+#define MAPSEC_PACIFIDLOG_TOWN 6
+#define MAPSEC_PETALBURG_CITY 7
+#define MAPSEC_SLATEPORT_CITY 8
+#define MAPSEC_MAUVILLE_CITY 9
+#define MAPSEC_RUSTBORO_CITY 10
+#define MAPSEC_FORTREE_CITY 11
+#define MAPSEC_LILYCOVE_CITY 12
+#define MAPSEC_MOSSDEEP_CITY 13
+#define MAPSEC_SOOTOPOLIS_CITY 14
+#define MAPSEC_EVER_GRANDE_CITY 15
+#define MAPSEC_ROUTE_101 0x10
+#define MAPSEC_ROUTE_102 0x11
+#define MAPSEC_ROUTE_103 0x12
+#define MAPSEC_ROUTE_104 0x13
+#define MAPSEC_ROUTE_105 0x14
+#define MAPSEC_ROUTE_106 0x15
+#define MAPSEC_ROUTE_107 0x16
+#define MAPSEC_ROUTE_108 0x17
+#define MAPSEC_ROUTE_109 0x18
+#define MAPSEC_ROUTE_110 0x19
+#define MAPSEC_ROUTE_111 0x1A
+#define MAPSEC_ROUTE_112 0x1B
+#define MAPSEC_ROUTE_113 0x1C
+#define MAPSEC_ROUTE_114 0x1D
+#define MAPSEC_ROUTE_115 0x1E
+#define MAPSEC_ROUTE_116 0x1F
+#define MAPSEC_ROUTE_117 0x20
+#define MAPSEC_ROUTE_118 0x21
+#define MAPSEC_ROUTE_119 0x22
+#define MAPSEC_ROUTE_120 0x23
+#define MAPSEC_ROUTE_121 0x24
+#define MAPSEC_ROUTE_122 0x25
+#define MAPSEC_ROUTE_123 0x26
+#define MAPSEC_ROUTE_124 0x27
+#define MAPSEC_ROUTE_125 0x28
+#define MAPSEC_ROUTE_126 0x29
+#define MAPSEC_ROUTE_127 0x2A
+#define MAPSEC_ROUTE_128 0x2B
+#define MAPSEC_ROUTE_129 0x2C
+#define MAPSEC_ROUTE_130 0x2D
+#define MAPSEC_ROUTE_131 0x2E
+#define MAPSEC_ROUTE_132 0x2F
+#define MAPSEC_ROUTE_133 0x30
+#define MAPSEC_ROUTE_134 0x31
+#define MAPSEC_UNDERWATER1 0x32
+#define MAPSEC_UNDERWATER2 0x33
+#define MAPSEC_UNDERWATER3 0x34
+#define MAPSEC_UNDERWATER4 0x35
+#define MAPSEC_UNDERWATER5 0x36
+#define MAPSEC_GRANITE_CAVE 0x37
+#define MAPSEC_MT_CHIMNEY 0x38
+#define MAPSEC_SAFARI_ZONE 0x39
+#define MAPSEC_BATTLE_TOWER 0x3A
+#define MAPSEC_PETALBURG_WOODS 0x3B
+#define MAPSEC_RUSTURF_TUNNEL 0x3C
+#define MAPSEC_ABANDONED_SHIP 0x3D
+#define MAPSEC_NEW_MAUVILLE 0x3E
+#define MAPSEC_METEOR_FALLS_1 0x3F
+#define MAPSEC_METEOR_FALLS_2 0x40
+#define MAPSEC_MT_PYRE 0x41
+#define MAPSEC_EVIL_TEAM_HIDEOUT 0x42
+#define MAPSEC_SHOAL_CAVE 0x43
+#define MAPSEC_SEAFLOOR_CAVERN 0x44
+#define MAPSEC_UNDERWATER6 0x45
+#define MAPSEC_VICTORY_ROAD 0x46
+#define MAPSEC_MIRAGE_ISLAND 0x47
+#define MAPSEC_CAVE_OF_ORIGIN 0x48
+#define MAPSEC_SOUTHERN_ISLAND 0x49
+#define MAPSEC_FIERY_PATH_1 0x4A
+#define MAPSEC_FIERY_PATH_2 0x4B
+#define MAPSEC_JAGGED_PASS_1 0x4C
+#define MAPSEC_JAGGED_PASS_2 0x4D
+#define MAPSEC_SEALED_CHAMBER 0x4E
+#define MAPSEC_UNDERWATER7 0x4F
+#define MAPSEC_SCORCHED_SLAB 0x50
+#define MAPSEC_ISLAND_CAVE 0x51
+#define MAPSEC_DESERT_RUINS 0x52
+#define MAPSEC_ANCIENT_TOMB 0x53
+#define MAPSEC_INSIDE_OF_TRUCK 0x54
+#define MAPSEC_SKY_PILLAR 0x55
+#define MAPSEC_SECRET_BASE 0x56
+#define MAPSEC_UNK_0x57 0x57
+#define MAPSEC_NONE 0x58
+
+#define MAP_WIDTH 28
+#define MAP_HEIGHT 15
+
+#define MAPCURSOR_X_MIN 1
+#define MAPCURSOR_Y_MIN 2
+#define MAPCURSOR_X_MAX 28
+#define MAPCURSOR_Y_MAX 16
+
+// Input events
+enum
+{
+    INPUT_EVENT_NONE,
+    INPUT_EVENT_DPAD,
+    INPUT_EVENT_2,
+    INPUT_EVENT_3,
+    INPUT_EVENT_A_BUTTON,
+    INPUT_EVENT_B_BUTTON,
 };
 
-extern struct UnknownStruct1 *gUnknown_020388CC;
+extern struct RegionMap *gRegionMap;
 
 const u16 gPokenavCursor_Pal[] = INCBIN_U16("graphics/pokenav/cursor.gbapal");
 const u8 gUnknown_083E5AF0[] = INCBIN_U8("graphics/pokenav/cursor_small.4bpp.lz");
@@ -110,7 +169,7 @@ struct RegionMapLocation
 {
     u8 x, y;
     u8 width, height;
-    const u8 *name;
+    const u8 *regionMapSectionId;
 };
 
 const struct RegionMapLocation gRegionMapLocations[] =
@@ -207,75 +266,75 @@ const struct RegionMapLocation gRegionMapLocations[] =
 
 const u16 gUnknown_083E7684[][2] =
 {
-    {50, 39},
-    {51, 41},
-    {52, 42},
-    {53, 43},
-    {54, 14},
-    {69, 43},
-    {66, 12},
-    {79, 49},
-    {59, 19},
-    {76, 27},
-    {65, 37},
-    {85, 46},
-    {88, 88},
+    {MAPSEC_UNDERWATER1,       MAPSEC_ROUTE_124},
+    {MAPSEC_UNDERWATER2,       MAPSEC_ROUTE_126},
+    {MAPSEC_UNDERWATER3,       MAPSEC_ROUTE_127},
+    {MAPSEC_UNDERWATER4,       MAPSEC_ROUTE_128},
+    {MAPSEC_UNDERWATER5,       MAPSEC_SOOTOPOLIS_CITY},
+    {MAPSEC_UNDERWATER6,       MAPSEC_ROUTE_128},
+    {MAPSEC_EVIL_TEAM_HIDEOUT, MAPSEC_LILYCOVE_CITY},
+    {MAPSEC_UNDERWATER7,       MAPSEC_ROUTE_134},
+    {MAPSEC_PETALBURG_WOODS,   MAPSEC_ROUTE_104},
+    {MAPSEC_JAGGED_PASS_1,     MAPSEC_ROUTE_112},
+    {MAPSEC_MT_PYRE,           MAPSEC_ROUTE_122},
+    {MAPSEC_SKY_PILLAR,        MAPSEC_ROUTE_131},
+    {MAPSEC_NONE,              MAPSEC_NONE},
 };
 
-void sub_80FA904(struct UnknownStruct1 *, u8);
+void sub_80FA904(struct RegionMap *, u8);
 bool8 sub_80FA940(void);
 u8 sub_80FAB78(void);
 u8 _swiopen(void);
 u8 sub_80FAD04(void);
 u8 sub_80FADE4(void);
-void sub_80FB170(s16, s16, s16, s16, u16, u16, u8);
+void CalcZoomScrollParams(s16, s16, s16, s16, u16, u16, u8);
 void sub_80FB238(s16, s16);
-void sub_80FB260(void);
+void UpdateRegionMapVideoRegs(void);
 u16 GetRegionMapSectionAt(u16, u16);
-void sub_80FB32C(void);
+void InitializeCursorPosition(void);
 void sub_80FB600(void);
 u16 sub_80FB758(u16);
 u16 sub_80FB9C0(u16);
 void sub_80FBA18(void);
-u8 sub_80FBAA0(u16);
-void sub_80FBB3C(u16, u16);
+bool8 sub_80FBAA0(u16);
+void CreateRegionMapCursorIcon(u16, u16);
 void sub_80FBCA0(void);
 void sub_80FBDF8(void);
 void sub_80FBE24(void);
-void sub_80FBF34(struct Sprite *);
-void sub_80FBF40(struct Sprite *);
-void sub_80FBEA4(struct Sprite *);
-const u8 *sub_80FBFB4(u8 *, u16, u16);
+void SpriteCB_PlayerIconZoomedOut(struct Sprite *);
+void UpdateIconBlink(struct Sprite *);
+void SpriteCB_PlayerIconZoomedIn(struct Sprite *);
+const u8 *GetMapSectionName(u8 *, u16, u16);
 void sub_80FC214(void);
 void sub_80FC228(void);
 void sub_80FC244(void (*func)(void));
-void sub_80FC254(void);
-void sub_80FC31C(void);
-void sub_80FC374(void);
-void sub_80FC484(void);
-void sub_80FC55C(struct Sprite *);
+void PrintFlyTargetName(void);
+void CreateFlyTargetGraphics(void);
+void CreateCityTownFlyTargetIcons(void);
+void CreateSpecialAreaFlyTargetIcons(void);
+void SpriteCB_FlyTargetIcons(struct Sprite *);
 void sub_80FC5B4(void);
 void sub_80FC600(void);
 void sub_80FC69C(void);
 
-void sub_80FA8EC(struct UnknownStruct1 *a, u8 b)
+void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed)
 {
-    sub_80FA904(a, b);
+    sub_80FA904(regionMap, zoomed);
     while (sub_80FA940())
         ;
 }
 
-void sub_80FA904(struct UnknownStruct1 *a, u8 b)
+void sub_80FA904(struct RegionMap *regionMap, bool8 zoomed)
 {
-    gUnknown_020388CC = a;
-    gUnknown_020388CC->unk79 = 0;
-    gUnknown_020388CC->unk78 = b;
-    gUnknown_020388CC->unk18 = (b == 0) ? sub_80FAB78 : sub_80FAD04;
+    gRegionMap = regionMap;
+    gRegionMap->initStep = 0;
+    gRegionMap->zoomed = zoomed;
+    gRegionMap->inputCallback = (zoomed == 0) ? sub_80FAB78 : sub_80FAD04;
 }
 
 bool8 sub_80FA940(void)
 {
-    switch (gUnknown_020388CC->unk79)
+    switch (gRegionMap->initStep)
     {
     case 0:
         LZ77UnCompVram(gUnknown_083E5DA0, (void *)(VRAM + 0x8000));
@@ -287,240 +346,245 @@ bool8 sub_80FA940(void)
         LoadPalette(gUnknown_083E5D60, 0x70, 0x60);  // Why isn't this the right size?
         break;
     case 3:
-        LZ77UnCompWram(gUnknown_083E5AF0, gUnknown_020388CC->unk180);
+        LZ77UnCompWram(gUnknown_083E5AF0, gRegionMap->unk180);
         break;
     case 4:
-        LZ77UnCompWram(gUnknown_083E5B34, gUnknown_020388CC->unk280);
+        LZ77UnCompWram(gUnknown_083E5B34, gRegionMap->unk280);
         break;
     case 5:
-        sub_80FB32C();
-        gUnknown_020388CC->unk74 = gUnknown_020388CC->unk54;
-        gUnknown_020388CC->unk76 = gUnknown_020388CC->unk56;
-        gUnknown_020388CC->unk16 = sub_80FB758(gUnknown_020388CC->unk14);
-        gUnknown_020388CC->unk14 = sub_80FB9C0(gUnknown_020388CC->unk14);
-        sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16);
+        InitializeCursorPosition();
+        gRegionMap->unk74 = gRegionMap->cursorPosX;
+        gRegionMap->unk76 = gRegionMap->cursorPosY;
+        gRegionMap->unk16 = sub_80FB758(gRegionMap->mapSecId);
+        gRegionMap->mapSecId = sub_80FB9C0(gRegionMap->mapSecId);
+        GetMapSectionName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
         break;
     case 6:
-        if (gUnknown_020388CC->unk78 == 0)
+        if (gRegionMap->zoomed == FALSE)
         {
-            sub_80FB170(0, 0, 0, 0, 0x100, 0x100, 0);
+            CalcZoomScrollParams(0, 0, 0, 0, 0x100, 0x100, 0);
         }
         else
         {
-            gUnknown_020388CC->unk5C = gUnknown_020388CC->unk54 * 8 - 0x34;
-            gUnknown_020388CC->unk5E = gUnknown_020388CC->unk56 * 8 - 0x44;
-            gUnknown_020388CC->unk64 = gUnknown_020388CC->unk54;
-            gUnknown_020388CC->unk66 = gUnknown_020388CC->unk56;
-            sub_80FB170(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E, 0x38, 0x48, 0x80, 0x80, 0);
+            gRegionMap->scrollX = gRegionMap->cursorPosX * 8 - 52;
+            gRegionMap->scrollY = gRegionMap->cursorPosY * 8 - 68;
+            gRegionMap->unk64 = gRegionMap->cursorPosX;
+            gRegionMap->unk66 = gRegionMap->cursorPosY;
+            CalcZoomScrollParams(gRegionMap->scrollX, gRegionMap->scrollY, 0x38, 0x48, 0x80, 0x80, 0);
         }
         break;
     case 7:
         sub_80FBA18();
-        sub_80FB260();
-        gUnknown_020388CC->unk1C = NULL;
-        gUnknown_020388CC->unk20 = NULL;
-        gUnknown_020388CC->unk7A = 0;
-        gUnknown_020388CC->unk7E = 0;
+        UpdateRegionMapVideoRegs();
+        gRegionMap->cursorIconSprite = NULL;
+        gRegionMap->playerIconSprite = NULL;
+        gRegionMap->unk7A = 0;
+        gRegionMap->blinkPlayerIcon = FALSE;
         REG_BG2CNT = 0xBC8A;
-        gUnknown_020388CC->unk79++;
+        gRegionMap->initStep++;
     default:
         return FALSE;
     }
-    gUnknown_020388CC->unk79++;
+    gRegionMap->initStep++;
     return TRUE;
 }
 
-void sub_80FAB10(void)
+void FreeRegionMapIconResources(void)
 {
-    if (gUnknown_020388CC->unk1C != NULL)
+    if (gRegionMap->cursorIconSprite != NULL)
     {
-        DestroySprite(gUnknown_020388CC->unk1C);
-        FreeSpriteTilesByTag(gUnknown_020388CC->unk58);
-        FreeSpritePaletteByTag(gUnknown_020388CC->unk5A);
+        DestroySprite(gRegionMap->cursorIconSprite);
+        FreeSpriteTilesByTag(gRegionMap->cursorIconTileTag);
+        FreeSpritePaletteByTag(gRegionMap->cursorIconPaletteTag);
     }
-    if (gUnknown_020388CC->unk20 != NULL)
+    if (gRegionMap->playerIconSprite != NULL)
     {
-        DestroySprite(gUnknown_020388CC->unk20);
-        FreeSpriteTilesByTag(gUnknown_020388CC->unk70);
-        FreeSpritePaletteByTag(gUnknown_020388CC->unk72);
+        DestroySprite(gRegionMap->playerIconSprite);
+        FreeSpriteTilesByTag(gRegionMap->playerIconTileTag);
+        FreeSpritePaletteByTag(gRegionMap->playerIconPaletteTag);
     }
 }
 
 u8 sub_80FAB60(void)
 {
-    return gUnknown_020388CC->unk18();
+    return gRegionMap->inputCallback();
 }
 
 u8 sub_80FAB78(void)
 {
-    u8 r4 = 0;
+    u8 event = INPUT_EVENT_NONE;
 
-    gUnknown_020388CC->unk7B = 0;
-    gUnknown_020388CC->unk7C = 0;
-    if ((gMain.heldKeys & DPAD_UP) && gUnknown_020388CC->unk56 > 2)
+    gRegionMap->cursorDeltaX = 0;
+    gRegionMap->cursorDeltaY = 0;
+    if ((gMain.heldKeys & DPAD_UP) && gRegionMap->cursorPosY > MAPCURSOR_Y_MIN)
     {
-        gUnknown_020388CC->unk7C = -1;
-        r4 = 1;
+        gRegionMap->cursorDeltaY = -1;
+        event = INPUT_EVENT_DPAD;
     }
-    if ((gMain.heldKeys & DPAD_DOWN) && gUnknown_020388CC->unk56 < 16)
+    if ((gMain.heldKeys & DPAD_DOWN) && gRegionMap->cursorPosY < MAPCURSOR_Y_MAX)
     {
-        gUnknown_020388CC->unk7C = 1;
-        r4 = 1;
+        gRegionMap->cursorDeltaY = 1;
+        event = INPUT_EVENT_DPAD;
     }
-    if ((gMain.heldKeys & DPAD_LEFT) && gUnknown_020388CC->unk54 > 1)
+    if ((gMain.heldKeys & DPAD_LEFT) && gRegionMap->cursorPosX > MAPCURSOR_X_MIN)
     {
-        gUnknown_020388CC->unk7B = -1;
-        r4 = 1;
+        gRegionMap->cursorDeltaX = -1;
+        event = INPUT_EVENT_DPAD;
     }
-    if ((gMain.heldKeys & DPAD_RIGHT) && gUnknown_020388CC->unk54 < 0x1C)
+    if ((gMain.heldKeys & DPAD_RIGHT) && gRegionMap->cursorPosX < MAPCURSOR_X_MAX)
     {
-        gUnknown_020388CC->unk7B = 1;
-        r4 = 1;
+        gRegionMap->cursorDeltaX = 1;
+        event = INPUT_EVENT_DPAD;
     }
+
     if (gMain.newKeys & A_BUTTON)
-        r4 = 4;
+        event = INPUT_EVENT_A_BUTTON;
     else if (gMain.newKeys & B_BUTTON)
-        r4 = 5;
-    if (r4 == 1)
+        event = INPUT_EVENT_B_BUTTON;
+
+    if (event == INPUT_EVENT_DPAD)
     {
-        gUnknown_020388CC->unk7A = 4;
-        gUnknown_020388CC->unk18 = _swiopen;
+        gRegionMap->unk7A = 4;
+        gRegionMap->inputCallback = _swiopen;
     }
-    return r4;
+    return event;
 }
 
 u8 _swiopen(void)
 {
-    u16 r4;
+    u16 mapSecId;
 
-    if (gUnknown_020388CC->unk7A != 0)
-        return 2;
+    if (gRegionMap->unk7A != 0)
+        return INPUT_EVENT_2;
 
-    if (gUnknown_020388CC->unk7B > 0)
-        gUnknown_020388CC->unk54++;
+    if (gRegionMap->cursorDeltaX > 0)
+        gRegionMap->cursorPosX++;
 
-    if (gUnknown_020388CC->unk7B < 0)
-        gUnknown_020388CC->unk54--;
+    if (gRegionMap->cursorDeltaX < 0)
+        gRegionMap->cursorPosX--;
 
-    if (gUnknown_020388CC->unk7C > 0)
-        gUnknown_020388CC->unk56++;
+    if (gRegionMap->cursorDeltaY > 0)
+        gRegionMap->cursorPosY++;
 
-    if (gUnknown_020388CC->unk7C < 0)
-        gUnknown_020388CC->unk56--;
+    if (gRegionMap->cursorDeltaY < 0)
+        gRegionMap->cursorPosY--;
 
-    r4 = GetRegionMapSectionAt(gUnknown_020388CC->unk54, gUnknown_020388CC->unk56);
-    gUnknown_020388CC->unk16 = sub_80FB758(r4);
-    if (r4 != gUnknown_020388CC->unk14)
+    mapSecId = GetRegionMapSectionAt(gRegionMap->cursorPosX, gRegionMap->cursorPosY);
+    gRegionMap->unk16 = sub_80FB758(mapSecId);
+    if (mapSecId != gRegionMap->mapSecId)
     {
-        gUnknown_020388CC->unk14 = r4;
-        sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16);
+        gRegionMap->mapSecId = mapSecId;
+        GetMapSectionName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
     }
     sub_80FBA18();
-    gUnknown_020388CC->unk18 = sub_80FAB78;
-    return 3;
+    gRegionMap->inputCallback = sub_80FAB78;
+    return INPUT_EVENT_3;
 }
 
 u8 sub_80FAD04(void)
 {
-    u8 r4 = 0;
-    gUnknown_020388CC->unk6A = 0;
-    gUnknown_020388CC->unk68 = 0;
-    if ((gMain.heldKeys & 0x40) && gUnknown_020388CC->unk5E > -0x34)
+    u8 event = INPUT_EVENT_NONE;
+
+    gRegionMap->unk6A = 0;
+    gRegionMap->unk68 = 0;
+    if ((gMain.heldKeys & DPAD_UP) && gRegionMap->scrollY > -52)
     {
-        gUnknown_020388CC->unk68 = -1;
-        r4 = 1;
+        gRegionMap->unk68 = -1;
+        event = INPUT_EVENT_DPAD;
     }
-    if ((gMain.heldKeys & 0x80) && gUnknown_020388CC->unk5E < 0x3C)
+    if ((gMain.heldKeys & DPAD_DOWN) && gRegionMap->scrollY < 60)
     {
-        gUnknown_020388CC->unk68 = 1;
-        r4 = 1;
+        gRegionMap->unk68 = 1;
+        event = INPUT_EVENT_DPAD;
     }
-    if ((gMain.heldKeys & 0x20) && gUnknown_020388CC->unk5C > -0x2C)
+    if ((gMain.heldKeys & DPAD_LEFT) && gRegionMap->scrollX > -44)
     {
-        gUnknown_020388CC->unk6A = -1;
-        r4 = 1;
+        gRegionMap->unk6A = -1;
+        event = INPUT_EVENT_DPAD;
     }
-    if ((gMain.heldKeys & 0x10) && gUnknown_020388CC->unk5C < 0xAC)
+    if ((gMain.heldKeys & DPAD_RIGHT) && gRegionMap->scrollX < 172)
     {
-        gUnknown_020388CC->unk6A = 1;
-        r4 = 1;
+        gRegionMap->unk6A = 1;
+        event = INPUT_EVENT_DPAD;
     }
+
     if (gMain.newKeys & A_BUTTON)
-        r4 = 4;
+        event = INPUT_EVENT_A_BUTTON;
     if (gMain.newKeys & B_BUTTON)
-        r4 = 5;
-    if (r4 == 1)
+        event = INPUT_EVENT_B_BUTTON;
+
+    if (event == INPUT_EVENT_DPAD)
     {
-        gUnknown_020388CC->unk18 = sub_80FADE4;
-        gUnknown_020388CC->unk6C = 0;
+        gRegionMap->inputCallback = sub_80FADE4;
+        gRegionMap->unk6C = 0;
     }
-    return r4;
+    return event;
 }
 
 u8 sub_80FADE4(void)
 {
-    gUnknown_020388CC->unk5E += gUnknown_020388CC->unk68;
-    gUnknown_020388CC->unk5C += gUnknown_020388CC->unk6A;
-    sub_80FB238(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E);
-    gUnknown_020388CC->unk6C++;
-    if (gUnknown_020388CC->unk6C == 8)
+    gRegionMap->scrollY += gRegionMap->unk68;
+    gRegionMap->scrollX += gRegionMap->unk6A;
+    sub_80FB238(gRegionMap->scrollX, gRegionMap->scrollY);
+    gRegionMap->unk6C++;
+    if (gRegionMap->unk6C == 8)
     {
-        u16 r3 = (gUnknown_020388CC->unk5C + 0x2C) / 8 + 1;
-        u16 r1 = (gUnknown_020388CC->unk5E + 0x34) / 8 + 2;
+        u16 r3 = (gRegionMap->scrollX + 44) / 8 + 1;
+        u16 r1 = (gRegionMap->scrollY + 52) / 8 + 2;
 
-        if (r3 != gUnknown_020388CC->unk64 || r1 != gUnknown_020388CC->unk66)
+        if (r3 != gRegionMap->unk64 || r1 != gRegionMap->unk66)
         {
-            u16 r4;
+            u16 mapSecId;
 
-            gUnknown_020388CC->unk64 = r3;
-            gUnknown_020388CC->unk66 = r1;
-            r4 = GetRegionMapSectionAt(r3, r1);
-            gUnknown_020388CC->unk16 = sub_80FB758(r4);
-            if (r4 != gUnknown_020388CC->unk14)
+            gRegionMap->unk64 = r3;
+            gRegionMap->unk66 = r1;
+            mapSecId = GetRegionMapSectionAt(r3, r1);
+            gRegionMap->unk16 = sub_80FB758(mapSecId);
+            if (mapSecId != gRegionMap->mapSecId)
             {
-                gUnknown_020388CC->unk14 = r4;
-                sub_80FBFB4(gUnknown_020388CC->filler0, gUnknown_020388CC->unk14, 16);
+                gRegionMap->mapSecId = mapSecId;
+                GetMapSectionName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
             }
             sub_80FBA18();
         }
-        gUnknown_020388CC->unk6C = 0;
-        gUnknown_020388CC->unk18 = sub_80FAD04;
-        return 3;
+        gRegionMap->unk6C = 0;
+        gRegionMap->inputCallback = sub_80FAD04;
+        return INPUT_EVENT_3;
     }
-    return 2;
+    return INPUT_EVENT_2;
 }
 
 void sub_80FAEC4(void)
 {
-    if (gUnknown_020388CC->unk78 == 0)
+    if (gRegionMap->zoomed == FALSE)
     {
-        gUnknown_020388CC->unk5E = 0;
-        gUnknown_020388CC->unk5C = 0;
-        gUnknown_020388CC->unk40 = 0;
-        gUnknown_020388CC->unk3C = 0;
-        gUnknown_020388CC->unk60 = gUnknown_020388CC->unk54 * 8 - 0x34;
-        gUnknown_020388CC->unk62 = gUnknown_020388CC->unk56 * 8 - 0x44;
-        gUnknown_020388CC->unk44 = (gUnknown_020388CC->unk60 << 8) / 16;
-        gUnknown_020388CC->unk48 = (gUnknown_020388CC->unk62 << 8) / 16;
-        gUnknown_020388CC->unk64 = gUnknown_020388CC->unk54;
-        gUnknown_020388CC->unk66 = gUnknown_020388CC->unk56;
-        gUnknown_020388CC->unk4C = 0x10000;
-        gUnknown_020388CC->unk50 = -0x800;
+        gRegionMap->scrollY = 0;
+        gRegionMap->scrollX = 0;
+        gRegionMap->unk40 = 0;
+        gRegionMap->unk3C = 0;
+        gRegionMap->unk60 = gRegionMap->cursorPosX * 8 - 52;
+        gRegionMap->unk62 = gRegionMap->cursorPosY * 8 - 68;
+        gRegionMap->unk44 = (gRegionMap->unk60 << 8) / 16;
+        gRegionMap->unk48 = (gRegionMap->unk62 << 8) / 16;
+        gRegionMap->unk64 = gRegionMap->cursorPosX;
+        gRegionMap->unk66 = gRegionMap->cursorPosY;
+        gRegionMap->unk4C = (256 << 8);
+        gRegionMap->unk50 = -0x800;
     }
     else
     {
-        gUnknown_020388CC->unk3C = gUnknown_020388CC->unk5C * 256;
-        gUnknown_020388CC->unk40 = gUnknown_020388CC->unk5E * 256;
-        gUnknown_020388CC->unk60 = 0;
-        gUnknown_020388CC->unk62 = 0;
-        gUnknown_020388CC->unk44 = -(gUnknown_020388CC->unk3C / 16);
-        gUnknown_020388CC->unk48 = -(gUnknown_020388CC->unk40 / 16);
-        gUnknown_020388CC->unk54 = gUnknown_020388CC->unk64;
-        gUnknown_020388CC->unk56 = gUnknown_020388CC->unk66;
-        gUnknown_020388CC->unk4C = 0x8000;
-        gUnknown_020388CC->unk50 = 0x800;
+        gRegionMap->unk3C = gRegionMap->scrollX * 256;
+        gRegionMap->unk40 = gRegionMap->scrollY * 256;
+        gRegionMap->unk60 = 0;
+        gRegionMap->unk62 = 0;
+        gRegionMap->unk44 = -(gRegionMap->unk3C / 16);
+        gRegionMap->unk48 = -(gRegionMap->unk40 / 16);
+        gRegionMap->cursorPosX = gRegionMap->unk64;
+        gRegionMap->cursorPosY = gRegionMap->unk66;
+        gRegionMap->unk4C = (128 << 8);
+        gRegionMap->unk50 = 0x800;
     }
-    gUnknown_020388CC->unk6E = 0;
+    gRegionMap->unk6E = 0;
     sub_80FBCA0();
     sub_80FBDF8();
 }
@@ -529,129 +593,128 @@ u8 sub_80FAFC0(void)
 {
     u8 r4;
 
-    if (gUnknown_020388CC->unk6E > 15)
+    if (gRegionMap->unk6E >= 16)
         return 0;
-    gUnknown_020388CC->unk6E++;
-    if (gUnknown_020388CC->unk6E == 16)
+    gRegionMap->unk6E++;
+    if (gRegionMap->unk6E == 16)
     {
-        gUnknown_020388CC->unk44 = 0;
-        gUnknown_020388CC->unk48 = 0;
-        gUnknown_020388CC->unk5C = gUnknown_020388CC->unk60;
-        gUnknown_020388CC->unk5E = gUnknown_020388CC->unk62;
-        gUnknown_020388CC->unk4C = (gUnknown_020388CC->unk78 == 0) ? 0x8000 : 0x10000;
-        gUnknown_020388CC->unk78 = (gUnknown_020388CC->unk78 == 0) ? 1 : 0;
-        gUnknown_020388CC->unk18 = (gUnknown_020388CC->unk78 == 0) ? sub_80FAB78 : sub_80FAD04;
-        sub_80FBB3C(gUnknown_020388CC->unk58, gUnknown_020388CC->unk5A);
+        gRegionMap->unk44 = 0;
+        gRegionMap->unk48 = 0;
+        gRegionMap->scrollX = gRegionMap->unk60;
+        gRegionMap->scrollY = gRegionMap->unk62;
+        gRegionMap->unk4C = (gRegionMap->zoomed == FALSE) ? (128 << 8) : (256 << 8);
+        gRegionMap->zoomed = !gRegionMap->zoomed;
+        gRegionMap->inputCallback = (gRegionMap->zoomed == FALSE) ? sub_80FAB78 : sub_80FAD04;
+        CreateRegionMapCursorIcon(gRegionMap->cursorIconTileTag, gRegionMap->cursorIconPaletteTag);
         sub_80FBE24();
         r4 = 0;
     }
     else
     {
-        gUnknown_020388CC->unk3C += gUnknown_020388CC->unk44;
-        gUnknown_020388CC->unk40 += gUnknown_020388CC->unk48;
-        gUnknown_020388CC->unk5C = gUnknown_020388CC->unk3C >> 8;
-        gUnknown_020388CC->unk5E = gUnknown_020388CC->unk40 >> 8;
-        gUnknown_020388CC->unk4C += gUnknown_020388CC->unk50;
-        if ((gUnknown_020388CC->unk44 < 0 && gUnknown_020388CC->unk5C < gUnknown_020388CC->unk60)
-         || (gUnknown_020388CC->unk44 > 0 && gUnknown_020388CC->unk5C > gUnknown_020388CC->unk60))
+        gRegionMap->unk3C += gRegionMap->unk44;
+        gRegionMap->unk40 += gRegionMap->unk48;
+        gRegionMap->scrollX = gRegionMap->unk3C >> 8;
+        gRegionMap->scrollY = gRegionMap->unk40 >> 8;
+        gRegionMap->unk4C += gRegionMap->unk50;
+        if ((gRegionMap->unk44 < 0 && gRegionMap->scrollX < gRegionMap->unk60)
+         || (gRegionMap->unk44 > 0 && gRegionMap->scrollX > gRegionMap->unk60))
         {
-            gUnknown_020388CC->unk5C = gUnknown_020388CC->unk60;
-            gUnknown_020388CC->unk44 = 0;
+            gRegionMap->scrollX = gRegionMap->unk60;
+            gRegionMap->unk44 = 0;
         }
-        if ((gUnknown_020388CC->unk48 < 0 && gUnknown_020388CC->unk5E < gUnknown_020388CC->unk62)
-         || (gUnknown_020388CC->unk48 > 0 && gUnknown_020388CC->unk5E > gUnknown_020388CC->unk62))
+        if ((gRegionMap->unk48 < 0 && gRegionMap->scrollY < gRegionMap->unk62)
+         || (gRegionMap->unk48 > 0 && gRegionMap->scrollY > gRegionMap->unk62))
         {
-            gUnknown_020388CC->unk5E = gUnknown_020388CC->unk62;
-            gUnknown_020388CC->unk48 = 0;
+            gRegionMap->scrollY = gRegionMap->unk62;
+            gRegionMap->unk48 = 0;
         }
-        if (gUnknown_020388CC->unk78 == 0)
+        if (gRegionMap->zoomed == FALSE)
         {
-            if (gUnknown_020388CC->unk4C < 0x8000)
+            if (gRegionMap->unk4C < (128 << 8))
             {
-                gUnknown_020388CC->unk4C = 0x8000;
-                gUnknown_020388CC->unk50 = 0;
+                gRegionMap->unk4C = (128 << 8);
+                gRegionMap->unk50 = 0;
             }
         }
         else
         {
-            if (gUnknown_020388CC->unk4C > 0x10000)
+            if (gRegionMap->unk4C > (256 << 8))
             {
-                gUnknown_020388CC->unk4C = 0x10000;
-                gUnknown_020388CC->unk50 = 0;
+                gRegionMap->unk4C = (256 << 8);
+                gRegionMap->unk50 = 0;
             }
         }
         r4 = 1;
     }
-    sub_80FB170(gUnknown_020388CC->unk5C, gUnknown_020388CC->unk5E, 0x38, 0x48, gUnknown_020388CC->unk4C >> 8, gUnknown_020388CC->unk4C >> 8, 0);
+    CalcZoomScrollParams(gRegionMap->scrollX, gRegionMap->scrollY, 0x38, 0x48, gRegionMap->unk4C >> 8, gRegionMap->unk4C >> 8, 0);
     return r4;
 }
 
-void sub_80FB170(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 g)
+void CalcZoomScrollParams(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 rotation)
 {
     s32 var1;
     s32 var2;
     s32 var3;
     s32 var4;
 
-    gUnknown_020388CC->unk2C = e * gSineTable[g + 64] >> 8;
-    gUnknown_020388CC->unk30 = e * -gSineTable[g] >> 8;
-    gUnknown_020388CC->unk34 = f * gSineTable[g] >> 8;
-    gUnknown_020388CC->unk38 = f * gSineTable[g + 64] >> 8;
+    gRegionMap->unk2C = e * gSineTable[rotation + 64] >> 8;
+    gRegionMap->unk30 = e * -gSineTable[rotation] >> 8;
+    gRegionMap->unk34 = f * gSineTable[rotation] >> 8;
+    gRegionMap->unk38 = f * gSineTable[rotation + 64] >> 8;
 
     var1 = (a << 8) + (c << 8);
-    var2 = d * gUnknown_020388CC->unk34 + gUnknown_020388CC->unk2C * c;
-    gUnknown_020388CC->unk24 = var1 - var2;
+    var2 = d * gRegionMap->unk34 + gRegionMap->unk2C * c;
+    gRegionMap->bg2x = var1 - var2;
 
     var3 = (b << 8) + (d << 8);
-    var4 = gUnknown_020388CC->unk38 * d + gUnknown_020388CC->unk30 * c;
-    gUnknown_020388CC->unk28 = var3 - var4;
+    var4 = gRegionMap->unk38 * d + gRegionMap->unk30 * c;
+    gRegionMap->bg2y = var3 - var4;
 
-    gUnknown_020388CC->unk7D = 1;
+    gRegionMap->needUpdateVideoRegs = TRUE;
 }
 
-void sub_80FB238(s16 a, s16 b)
+void sub_80FB238(s16 x, s16 y)
 {
-    gUnknown_020388CC->unk24 = 0x1C00 + (a << 8);
-    gUnknown_020388CC->unk28 = 0x2400 + (b << 8);
-    gUnknown_020388CC->unk7D = 1;
+    gRegionMap->bg2x = (0x1C << 8) + (x << 8);
+    gRegionMap->bg2y = (0x24 << 8) + (y << 8);
+    gRegionMap->needUpdateVideoRegs = TRUE;
 }
 
-void sub_80FB260(void)
+void UpdateRegionMapVideoRegs(void)
 {
-    if (gUnknown_020388CC->unk7D != 0)
+    if (gRegionMap->needUpdateVideoRegs)
     {
-        REG_BG2PA = gUnknown_020388CC->unk2C;
-        REG_BG2PB = gUnknown_020388CC->unk34;
-        REG_BG2PC = gUnknown_020388CC->unk30;
-        REG_BG2PD = gUnknown_020388CC->unk38;
-        REG_BG2X = gUnknown_020388CC->unk24;
-        REG_BG2Y = gUnknown_020388CC->unk28;
-        gUnknown_020388CC->unk7D = 0;
+        REG_BG2PA = gRegionMap->unk2C;
+        REG_BG2PB = gRegionMap->unk34;
+        REG_BG2PC = gRegionMap->unk30;
+        REG_BG2PD = gRegionMap->unk38;
+        REG_BG2X = gRegionMap->bg2x;
+        REG_BG2Y = gRegionMap->bg2y;
+        gRegionMap->needUpdateVideoRegs = FALSE;
     }
 }
 
 void sub_80FB2A4(s16 a, s16 b)
 {
-    sub_80FB170(a, b, 0x38, 0x48, 0x100, 0x100, 0);
-    sub_80FB260();
-    if (gUnknown_020388CC->unk20 != NULL)
+    CalcZoomScrollParams(a, b, 0x38, 0x48, 0x100, 0x100, 0);
+    UpdateRegionMapVideoRegs();
+    if (gRegionMap->playerIconSprite != NULL)
     {
-        gUnknown_020388CC->unk20->pos2.x = -a;
-        gUnknown_020388CC->unk20->pos2.y = -b;
+        gRegionMap->playerIconSprite->pos2.x = -a;
+        gRegionMap->playerIconSprite->pos2.y = -b;
     }
 }
 
 u16 GetRegionMapSectionAt(u16 x, u16 y)
 {
-
-    if (y < 2 || y > 16 || x < 1 || x > 0x1C)
-        return 0x58;
-    y -= 2;
-    x -= 1;
+    if (y < MAPCURSOR_Y_MIN || y > MAPCURSOR_Y_MAX || x < MAPCURSOR_X_MIN || x > MAPCURSOR_X_MAX)
+        return MAPSEC_NONE;
+    y -= MAPCURSOR_Y_MIN;
+    x -= MAPCURSOR_X_MIN;
     return gRegionMapSections[x + y * 28];
 }
 
-void sub_80FB32C(void)
+void InitializeCursorPosition(void)
 {
     struct MapHeader *mapHeader;
     u16 mapWidth;
@@ -661,7 +724,10 @@ void sub_80FB32C(void)
     u16 r1;
     u16 r9;
 
-    if (gSaveBlock1.location.mapGroup == 0x19 && (gSaveBlock1.location.mapNum == 0x29 || gSaveBlock1.location.mapNum == 0x2A || gSaveBlock1.location.mapNum == 0x2B))
+    if (gSaveBlock1.location.mapGroup == 25
+     && (gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_CORRIDOR
+      || gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_LOWER_DECK
+      || gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_ROOMS))
     {
         sub_80FB600();
         return;
@@ -675,20 +741,20 @@ void sub_80FB32C(void)
     case 2:
     case 4:
     case 5:
-        gUnknown_020388CC->unk14 = gMapHeader.name;
-        gUnknown_020388CC->unk7F = 0;
+        gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
+        gRegionMap->playerIsInCave = FALSE;
         mapWidth = gMapHeader.mapData->width;
         mapHeight = gMapHeader.mapData->height;
         x = gSaveBlock1.pos.x;
         y = gSaveBlock1.pos.y;
-        if (gUnknown_020388CC->unk14 == 0x45)
-            gUnknown_020388CC->unk7F = 1;
+        if (gRegionMap->mapSecId == MAPSEC_UNDERWATER6)
+            gRegionMap->playerIsInCave = TRUE;
         break;
     case 3:
     case 6:
         mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp4.mapGroup, gSaveBlock1.warp4.mapNum);
-        gUnknown_020388CC->unk14 = mapHeader->name;
-        gUnknown_020388CC->unk7F = 1;
+        gRegionMap->mapSecId = mapHeader->regionMapSectionId;
+        gRegionMap->playerIsInCave = TRUE;
         mapWidth = mapHeader->mapData->width;
         mapHeight = mapHeader->mapData->height;
         x = gSaveBlock1.warp4.x;
@@ -696,8 +762,8 @@ void sub_80FB32C(void)
         break;
     case 8:
         mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum);
-        gUnknown_020388CC->unk14 = mapHeader->name;
-        gUnknown_020388CC->unk7F = 1;
+        gRegionMap->mapSecId = mapHeader->regionMapSectionId;
+        gRegionMap->playerIsInCave = TRUE;
         mapWidth = mapHeader->mapData->width;
         mapHeight = mapHeader->mapData->height;
         x = gSaveBlock1.warp2.x;
@@ -707,8 +773,8 @@ void sub_80FB32C(void)
         {
             struct WarpData *r4;
 
-            gUnknown_020388CC->unk14 = gMapHeader.name;
-            if (gUnknown_020388CC->unk14 != 0x57)
+            gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
+            if (gRegionMap->mapSecId != MAPSEC_UNK_0x57)
             {
                 r4 = &gSaveBlock1.warp4;
                 mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
@@ -717,9 +783,9 @@ void sub_80FB32C(void)
             {
                 r4 = &gSaveBlock1.warp2;
                 mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
-                gUnknown_020388CC->unk14 = mapHeader->name;
+                gRegionMap->mapSecId = mapHeader->regionMapSectionId;
             }
-            gUnknown_020388CC->unk7F = 0;
+            gRegionMap->playerIsInCave = FALSE;
             mapWidth = mapHeader->mapData->width;
             mapHeight = mapHeader->mapData->height;
             x = r4->x;
@@ -730,28 +796,28 @@ void sub_80FB32C(void)
 
     r9 = x;
 
-    r1 = mapWidth / gRegionMapLocations[gUnknown_020388CC->unk14].width;
+    r1 = mapWidth / gRegionMapLocations[gRegionMap->mapSecId].width;
     if (r1 == 0)
         r1 = 1;
     x /= r1;
-    if (x >= gRegionMapLocations[gUnknown_020388CC->unk14].width)
-        x = gRegionMapLocations[gUnknown_020388CC->unk14].width - 1;
+    if (x >= gRegionMapLocations[gRegionMap->mapSecId].width)
+        x = gRegionMapLocations[gRegionMap->mapSecId].width - 1;
 
-    r1 = mapHeight / gRegionMapLocations[gUnknown_020388CC->unk14].height;
+    r1 = mapHeight / gRegionMapLocations[gRegionMap->mapSecId].height;
     if (r1 == 0)
         r1 = 1;
     y /= r1;
-    if (y >= gRegionMapLocations[gUnknown_020388CC->unk14].height)
-        y = gRegionMapLocations[gUnknown_020388CC->unk14].height - 1;
+    if (y >= gRegionMapLocations[gRegionMap->mapSecId].height)
+        y = gRegionMapLocations[gRegionMap->mapSecId].height - 1;
 
-    switch (gUnknown_020388CC->unk14)
+    switch (gRegionMap->mapSecId)
     {
-    case 0x1D:
+    case MAPSEC_ROUTE_114:
         if (y != 0)
             x = 0;
         break;
-    case 0x29:
-    case 0x33:
+    case MAPSEC_ROUTE_126:
+    case MAPSEC_UNDERWATER2:
         x = 0;
         if (gSaveBlock1.pos.x > 32)
             x = 1;
@@ -763,7 +829,7 @@ void sub_80FB32C(void)
         if (gSaveBlock1.pos.y > 0x38)
             y++;
         break;
-    case 0x24:
+    case MAPSEC_ROUTE_121:
         x = 0;
         if (r9 > 14)
             x = 1;
@@ -773,8 +839,8 @@ void sub_80FB32C(void)
             x++;
         break;
     }
-    gUnknown_020388CC->unk54 = gRegionMapLocations[gUnknown_020388CC->unk14].x + x + 1;
-    gUnknown_020388CC->unk56 = gRegionMapLocations[gUnknown_020388CC->unk14].y + y + 2;
+    gRegionMap->cursorPosX = gRegionMapLocations[gRegionMap->mapSecId].x + x + MAPCURSOR_X_MIN;
+    gRegionMap->cursorPosY = gRegionMapLocations[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN;
 }
 
 void sub_80FB600(void)
@@ -789,16 +855,16 @@ void sub_80FB600(void)
     switch (GetSSTidalLocation(&mapGroup, &mapNum, &sp2, &sp4))
     {
     case 1:
-        gUnknown_020388CC->unk14 = 8;
+        gRegionMap->mapSecId = MAPSEC_SLATEPORT_CITY;
         break;
     case 2:
-        gUnknown_020388CC->unk14 = 12;
+        gRegionMap->mapSecId = MAPSEC_LILYCOVE_CITY;
         break;
     case 3:
-        gUnknown_020388CC->unk14 = 0x27;
+        gRegionMap->mapSecId = MAPSEC_ROUTE_124;
         break;
     case 4:
-        gUnknown_020388CC->unk14 = 0x2E;
+        gRegionMap->mapSecId = MAPSEC_ROUTE_131;
         break;
     default:
     case 0:
@@ -806,70 +872,71 @@ void sub_80FB600(void)
             struct MapHeader *mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum);
             u16 r1;
 
-            gUnknown_020388CC->unk14 = mapHeader->name;
-            r1 = mapHeader->mapData->width / gRegionMapLocations[gUnknown_020388CC->unk14].width;
+            gRegionMap->mapSecId = mapHeader->regionMapSectionId;
+            r1 = mapHeader->mapData->width / gRegionMapLocations[gRegionMap->mapSecId].width;
             if (r1 == 0)
                 r1 = 1;
             x = sp2 / r1;
-            if (x >= gRegionMapLocations[gUnknown_020388CC->unk14].width)
-                x = gRegionMapLocations[gUnknown_020388CC->unk14].width - 1;
+            if (x >= gRegionMapLocations[gRegionMap->mapSecId].width)
+                x = gRegionMapLocations[gRegionMap->mapSecId].width - 1;
 
-            r1 = mapHeader->mapData->height / gRegionMapLocations[gUnknown_020388CC->unk14].height;
+            r1 = mapHeader->mapData->height / gRegionMapLocations[gRegionMap->mapSecId].height;
             if (r1 == 0)
                 r1 = 1;
             y = sp4 / r1;
-            if (y >= gRegionMapLocations[gUnknown_020388CC->unk14].height)
-                y = gRegionMapLocations[gUnknown_020388CC->unk14].height - 1;
+            if (y >= gRegionMapLocations[gRegionMap->mapSecId].height)
+                y = gRegionMapLocations[gRegionMap->mapSecId].height - 1;
         }
         break;
     }
-    gUnknown_020388CC->unk7F = 0;
-    gUnknown_020388CC->unk54 = gRegionMapLocations[gUnknown_020388CC->unk14].x + x + 1;
-    gUnknown_020388CC->unk56 = gRegionMapLocations[gUnknown_020388CC->unk14].y + y + 2;
+    gRegionMap->playerIsInCave = FALSE;
+    gRegionMap->cursorPosX = gRegionMapLocations[gRegionMap->mapSecId].x + x + MAPCURSOR_X_MIN;
+    gRegionMap->cursorPosY = gRegionMapLocations[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN;
 }
 
-u16 sub_80FB758(u16 a)
+u16 sub_80FB758(u16 mapSecId)
 {
-    switch (a)
+    switch (mapSecId)
     {
-    case 88:
+    case MAPSEC_NONE:
         return 0;
-    case 0:
-        return FlagGet(0x80F) ? 2 : 3;
-    case 1:
-        return FlagGet(0x810) ? 2 : 3;
-    case 2:
-        return FlagGet(0x811) ? 2 : 3;
-    case 3:
-        return FlagGet(0x812) ? 2 : 3;
-    case 4:
-        return FlagGet(0x813) ? 2 : 3;
-    case 5:
-        return FlagGet(0x814) ? 2 : 3;
-    case 6:
-        return FlagGet(0x815) ? 2 : 3;
-    case 7:
-        return FlagGet(0x816) ? 2 : 3;
-    case 8:
-        return FlagGet(0x817) ? 2 : 3;
-    case 9:
-        return FlagGet(0x818) ? 2 : 3;
-    case 10:
-        return FlagGet(0x819) ? 2 : 3;
-    case 11:
-        return FlagGet(0x81A) ? 2 : 3;
-    case 12:
-        return FlagGet(0x81B) ? 2 : 3;
-    case 13:
-        return FlagGet(0x81C) ? 2 : 3;
-    case 14:
-        return FlagGet(0x81D) ? 2 : 3;
-    case 15:
-        return FlagGet(0x81E) ? 2 : 3;
-    case 58:
-        return FlagGet(0x848) ? 4 : 0;
-    case 73:
-        return FlagGet(0x849) ? 1 : 0;
+    case MAPSEC_LITTLEROOT_TOWN:
+        return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? 2 : 3;
+    case MAPSEC_OLDALE_TOWN:
+        return FlagGet(FLAG_VISITED_OLDALE_TOWN) ? 2 : 3;
+    case MAPSEC_DEWFORD_TOWN:
+        return FlagGet(FLAG_VISITED_DEWFORD_TOWN) ? 2 : 3;
+    case MAPSEC_LAVARIDGE_TOWN:
+        return FlagGet(FLAG_VISITED_LAVARIDGE_TOWN) ? 2 : 3;
+    case MAPSEC_FALLARBOR_TOWN:
+        return FlagGet(FLAG_VISITED_FALLARBOR_TOWN) ? 2 : 3;
+    case MAPSEC_VERDANTURF_TOWN:
+        return FlagGet(FLAG_VISITED_VERDANTURF_TOWN) ? 2 : 3;
+    case MAPSEC_PACIFIDLOG_TOWN:
+        return FlagGet(FLAG_VISITED_PACIFIDLOG_TOWN) ? 2 : 3;
+    case MAPSEC_PETALBURG_CITY:
+        return FlagGet(FLAG_VISITED_PETALBURG_CITY) ? 2 : 3;
+    case MAPSEC_SLATEPORT_CITY:
+        return FlagGet(FLAG_VISITED_SLATEPORT_CITY) ? 2 : 3;
+    case MAPSEC_MAUVILLE_CITY:
+        return FlagGet(FLAG_VISITED_MAUVILLE_CITY) ? 2 : 3;
+    case MAPSEC_RUSTBORO_CITY:
+        return FlagGet(FLAG_VISITED_RUSTBORO_CITY) ? 2 : 3;
+    case MAPSEC_FORTREE_CITY:
+        return FlagGet(FLAG_VISITED_FORTREE_CITY) ? 2 : 3;
+    case MAPSEC_LILYCOVE_CITY:
+        return FlagGet(FLAG_VISITED_LILYCOVE_CITY) ? 2 : 3;
+    case MAPSEC_MOSSDEEP_CITY:
+        return FlagGet(FLAG_VISITED_MOSSDEEP_CITY) ? 2 : 3;
+    case MAPSEC_SOOTOPOLIS_CITY:
+        return FlagGet(FLAG_VISITED_SOOTOPOLIS_CITY) ? 2 : 3;
+    case MAPSEC_EVER_GRANDE_CITY:
+        return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? 2 : 3;
+
+    case MAPSEC_BATTLE_TOWER:
+        return FlagGet(FLAG_UNLOCK_BATTLE_TOWER) ? 4 : 0;
+    case MAPSEC_SOUTHERN_ISLAND:
+        return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? 1 : 0;
     default:
         return 1;
     }
@@ -880,22 +947,21 @@ u16 GetRegionMapSectionAt_(u16 x, u16 y)
     return GetRegionMapSectionAt(x, y);
 }
 
-u16 sub_80FB9C0(u16 a)
+u16 sub_80FB9C0(u16 mapSecId)
 {
-    u16 i = 0;
+    u16 i;
 
-    while (gUnknown_083E7684[i][0] != 88)
+    for (i = 0; gUnknown_083E7684[i][0] != MAPSEC_NONE; i++)
     {
-        if (gUnknown_083E7684[i][0] == a)
+        if (gUnknown_083E7684[i][0] == mapSecId)
             return gUnknown_083E7684[i][1];
-        i++;
     }
-    return a;
+    return mapSecId;
 }
 
-u16 sub_80FBA04(u16 a)
+u16 sub_80FBA04(u16 mapSecId)
 {
-    return sub_80FB9C0(a);
+    return sub_80FB9C0(mapSecId);
 }
 
 void sub_80FBA18(void)
@@ -904,21 +970,21 @@ void sub_80FBA18(void)
     u16 y;
     u16 i;
 
-    if (gUnknown_020388CC->unk14 == 88)
+    if (gRegionMap->mapSecId == MAPSEC_NONE)
     {
-        gUnknown_020388CC->unk17 = 0;
+        gRegionMap->everGrandeCityArea = 0;
         return;
     }
 
-    if (gUnknown_020388CC->unk78 == 0)
+    if (gRegionMap->zoomed == FALSE)
     {
-        x = gUnknown_020388CC->unk54;
-        y = gUnknown_020388CC->unk56;
+        x = gRegionMap->cursorPosX;
+        y = gRegionMap->cursorPosY;
     }
     else
     {
-        x = gUnknown_020388CC->unk64;
-        y = gUnknown_020388CC->unk66;
+        x = gRegionMap->unk64;
+        y = gRegionMap->unk66;
     }
 
     i = 0;
@@ -926,7 +992,7 @@ void sub_80FBA18(void)
     {
         if (x <= 1)
         {
-            if (sub_80FBAA0(y) != 0)
+            if (sub_80FBAA0(y))
             {
                 y--;
                 x = 0x1D;
@@ -939,36 +1005,34 @@ void sub_80FBA18(void)
         else
         {
             x--;
-            if (GetRegionMapSectionAt(x, y) == gUnknown_020388CC->unk14)
+            if (GetRegionMapSectionAt(x, y) == gRegionMap->mapSecId)
                 i++;
         }
     }
 
-    gUnknown_020388CC->unk17 = i;
+    gRegionMap->everGrandeCityArea = i;
 }
 
-u8 sub_80FBAA0(u16 a)
+bool8 sub_80FBAA0(u16 a)
 {
     u16 x;
     u16 y;
 
     y = a - 1;
     if (y == 0xFFFF)
-        return 0;
+        return FALSE;
 
-    x = 1;
-    while (x < 0x1D)
+    for (x = MAPCURSOR_X_MIN; x <= MAPCURSOR_X_MAX; x++)
     {
-        if (GetRegionMapSectionAt(x, y) == gUnknown_020388CC->unk14)
-            return 1;
-        x++;
+        if (GetRegionMapSectionAt(x, y) == gRegionMap->mapSecId)
+            return TRUE;
     }
-    return 0;
+    return FALSE;
 }
 
 
 
-const struct OamData gOamData_83E76B8 =
+const struct OamData gCursorIconOamData =
 {
     .y = 0,
     .affineMode = 0,
@@ -1001,19 +1065,19 @@ const union AnimCmd gSpriteAnim_83E76CC[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gSpriteAnimTable_83E76E0[] =
+const union AnimCmd *const gCursorIconAnimTable[] =
 {
     gSpriteAnim_83E76C0,
     gSpriteAnim_83E76CC,
 };
 
-void sub_80FBAF0(struct Sprite *sprite)
+void SpriteCB_CursorIcon(struct Sprite *sprite)
 {
-    if (gUnknown_020388CC->unk7A != 0)
+    if (gRegionMap->unk7A != 0)
     {
-        sprite->pos1.x += gUnknown_020388CC->unk7B * 2;
-        sprite->pos1.y += gUnknown_020388CC->unk7C * 2;
-        gUnknown_020388CC->unk7A--;
+        sprite->pos1.x += gRegionMap->cursorDeltaX * 2;
+        sprite->pos1.y += gRegionMap->cursorDeltaY * 2;
+        gRegionMap->unk7A--;
     }
 }
 
@@ -1021,7 +1085,7 @@ void nullsub_66(struct Sprite *sprite)
 {
 }
 
-void sub_80FBB3C(u16 tileTag, u16 paletteTag)
+void CreateRegionMapCursorIcon(u16 tileTag, u16 paletteTag)
 {
     u8 spriteId;
     struct SpriteSheet spriteSheet;
@@ -1031,30 +1095,30 @@ void sub_80FBB3C(u16 tileTag, u16 paletteTag)
     };
     struct SpriteTemplate spriteTemplate =
     {
-        .oam = &gOamData_83E76B8,
-        .anims = gSpriteAnimTable_83E76E0,
+        .oam = &gCursorIconOamData,
+        .anims = gCursorIconAnimTable,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = sub_80FBAF0,
+        .callback = SpriteCB_CursorIcon,
     };
 
     spriteSheet.tag = tileTag;
     spriteTemplate.tileTag = tileTag;
-    gUnknown_020388CC->unk58 = tileTag;
+    gRegionMap->cursorIconTileTag = tileTag;
 
     spritePalette.tag = paletteTag;
     spriteTemplate.paletteTag = paletteTag;
-    gUnknown_020388CC->unk5A = paletteTag;
+    gRegionMap->cursorIconPaletteTag = paletteTag;
 
-    if (gUnknown_020388CC->unk78 == 0)
+    if (gRegionMap->zoomed == FALSE)
     {
-        spriteSheet.data = gUnknown_020388CC->unk180;
+        spriteSheet.data = gRegionMap->unk180;
         spriteSheet.size = 0x100;
-        spriteTemplate.callback = sub_80FBAF0;
+        spriteTemplate.callback = SpriteCB_CursorIcon;
     }
     else
     {
-        spriteSheet.data = gUnknown_020388CC->unk280;
+        spriteSheet.data = gRegionMap->unk280;
         spriteSheet.size = 0x600;
         spriteTemplate.callback = nullsub_66;
     }
@@ -1063,44 +1127,44 @@ void sub_80FBB3C(u16 tileTag, u16 paletteTag)
     spriteId = CreateSprite(&spriteTemplate, 0x38, 0x48, 0);
     if (spriteId != 64)
     {
-        gUnknown_020388CC->unk1C = &gSprites[spriteId];
-        if (gUnknown_020388CC->unk78 == 1)
+        gRegionMap->cursorIconSprite = &gSprites[spriteId];
+        if (gRegionMap->zoomed == TRUE)
         {
-            gUnknown_020388CC->unk1C->oam.size = 2;
-            gUnknown_020388CC->unk1C->pos1.x -= 8;
-            gUnknown_020388CC->unk1C->pos1.y -= 8;
-            StartSpriteAnim(gUnknown_020388CC->unk1C, 1);
+            gRegionMap->cursorIconSprite->oam.size = 2;
+            gRegionMap->cursorIconSprite->pos1.x -= 8;
+            gRegionMap->cursorIconSprite->pos1.y -= 8;
+            StartSpriteAnim(gRegionMap->cursorIconSprite, 1);
         }
         else
         {
-            gUnknown_020388CC->unk1C->oam.size = 1;
-            gUnknown_020388CC->unk1C->pos1.x = gUnknown_020388CC->unk54 * 8 + 4;
-            gUnknown_020388CC->unk1C->pos1.y = gUnknown_020388CC->unk56 * 8 + 4;
+            gRegionMap->cursorIconSprite->oam.size = 1;
+            gRegionMap->cursorIconSprite->pos1.x = gRegionMap->cursorPosX * 8 + 4;
+            gRegionMap->cursorIconSprite->pos1.y = gRegionMap->cursorPosY * 8 + 4;
         }
-        gUnknown_020388CC->unk1C->data1 = 2;
-        gUnknown_020388CC->unk1C->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101;
-        gUnknown_020388CC->unk1C->data3 = 1;
+        gRegionMap->cursorIconSprite->data1 = 2;
+        gRegionMap->cursorIconSprite->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101;
+        gRegionMap->cursorIconSprite->data3 = 1;
     }
 }
 
 void sub_80FBCA0(void)
 {
-    if (gUnknown_020388CC->unk1C != NULL)
+    if (gRegionMap->cursorIconSprite != NULL)
     {
-        DestroySprite(gUnknown_020388CC->unk1C);
-        FreeSpriteTilesByTag(gUnknown_020388CC->unk58);
-        FreeSpritePaletteByTag(gUnknown_020388CC->unk5A);
+        DestroySprite(gRegionMap->cursorIconSprite);
+        FreeSpriteTilesByTag(gRegionMap->cursorIconTileTag);
+        FreeSpritePaletteByTag(gRegionMap->cursorIconPaletteTag);
     }
 }
 
 void unref_sub_80FBCD0(void)
 {
-    gUnknown_020388CC->unk1C->data3 = 1;
+    gRegionMap->cursorIconSprite->data3 = 1;
 }
 
 void unref_sub_80FBCE0(void)
 {
-    gUnknown_020388CC->unk1C->data3 = 0;
+    gRegionMap->cursorIconSprite->data3 = 0;
 }
 
 const struct OamData gOamData_083E7708 =
@@ -1131,7 +1195,7 @@ const union AnimCmd *const gSpriteAnimTable_083E7718[] =
     gSpriteAnim_83E7710,
 };
 
-void sub_80FBCF0(u16 tileTag, u16 paletteTag)
+void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
 {
     u8 spriteId;
     struct SpriteSheet spriteSheet =
@@ -1164,80 +1228,82 @@ void sub_80FBCF0(u16 tileTag, u16 paletteTag)
     LoadSpriteSheet(&spriteSheet);
     LoadSpritePalette(&spritePalette);
     spriteId = CreateSprite(&spriteTemplate, 0, 0, 1);
-    gUnknown_020388CC->unk20 = &gSprites[spriteId];
-    if (gUnknown_020388CC->unk78 == 0)
+    gRegionMap->playerIconSprite = &gSprites[spriteId];
+    if (gRegionMap->zoomed == FALSE)
     {
-        gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 8 + 4;
-        gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 8 + 4;
-        gUnknown_020388CC->unk20->callback = sub_80FBF34;
+        gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 8 + 4;
+        gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 8 + 4;
+        gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedOut;
     }
     else
     {
-        gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 16 - 48;
-        gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 16 - 66;
-        gUnknown_020388CC->unk20->callback = sub_80FBEA4;
+        gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 16 - 48;
+        gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 16 - 66;
+        gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedIn;
     }
 }
 
 void sub_80FBDF8(void)
 {
-    if (gUnknown_020388CC->unk20 != NULL)
+    if (gRegionMap->playerIconSprite != NULL)
     {
-        gUnknown_020388CC->unk20->invisible = TRUE;
-        gUnknown_020388CC->unk20->callback = SpriteCallbackDummy;
+        gRegionMap->playerIconSprite->invisible = TRUE;
+        gRegionMap->playerIconSprite->callback = SpriteCallbackDummy;
     }
 }
 
 void sub_80FBE24(void)
 {
-    if (gUnknown_020388CC->unk20 != NULL)
+    if (gRegionMap->playerIconSprite != NULL)
     {
-        if (gUnknown_020388CC->unk78 == 1)
+        if (gRegionMap->zoomed == TRUE)
         {
-            gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 16 - 48;
-            gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 16 - 66;
-            gUnknown_020388CC->unk20->callback = sub_80FBEA4;
-            gUnknown_020388CC->unk20->invisible = FALSE;
+            gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 16 - 48;
+            gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 16 - 66;
+            gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedIn;
+            gRegionMap->playerIconSprite->invisible = FALSE;
         }
         else
         {
-            gUnknown_020388CC->unk20->pos1.x = gUnknown_020388CC->unk74 * 8 + 4;
-            gUnknown_020388CC->unk20->pos1.y = gUnknown_020388CC->unk76 * 8 + 4;
-            gUnknown_020388CC->unk20->pos2.x = 0;
-            gUnknown_020388CC->unk20->pos2.y = 0;
-            gUnknown_020388CC->unk20->callback = sub_80FBF34;
-            gUnknown_020388CC->unk20->invisible = FALSE;
+            gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 8 + 4;
+            gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 8 + 4;
+            gRegionMap->playerIconSprite->pos2.x = 0;
+            gRegionMap->playerIconSprite->pos2.y = 0;
+            gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedOut;
+            gRegionMap->playerIconSprite->invisible = FALSE;
         }
     }
 }
 
-void sub_80FBEA4(struct Sprite *sprite)
+void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite)
 {
-    sprite->pos2.x = -(gUnknown_020388CC->unk5C * 2);
-    sprite->pos2.y = -(gUnknown_020388CC->unk5E * 2);
+    sprite->pos2.x = -(gRegionMap->scrollX * 2);
+    sprite->pos2.y = -(gRegionMap->scrollY * 2);
     sprite->data0 = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
     sprite->data1 = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
 
+    // Determine if sprite is on screen
     if (sprite->data0 < -8 || sprite->data0 > 0xA8 || sprite->data1 < -8 || sprite->data1 > 0xF8)
-        sprite->data2 = 0;
+        sprite->data2 = FALSE;
     else
-        sprite->data2 = 1;
+        sprite->data2 = TRUE;
 
-    if (sprite->data2 == 1)
-        sub_80FBF40(sprite);
+    if (sprite->data2 == TRUE)
+        UpdateIconBlink(sprite);
     else
         sprite->invisible = TRUE;
 }
 
-void sub_80FBF34(struct Sprite *sprite)
+void SpriteCB_PlayerIconZoomedOut(struct Sprite *sprite)
 {
-    sub_80FBF40(sprite);
+    UpdateIconBlink(sprite);
 }
 
-void sub_80FBF40(struct Sprite *sprite)
+void UpdateIconBlink(struct Sprite *sprite)
 {
-    if (gUnknown_020388CC->unk7E != 0)
+    if (gRegionMap->blinkPlayerIcon)
     {
+        // Toggle visibility every 16 frames
         sprite->data7++;
         if (sprite->data7 > 16)
         {
@@ -1253,48 +1319,48 @@ void sub_80FBF40(struct Sprite *sprite)
 
 void sub_80FBF94(void)
 {
-    if (gUnknown_020388CC->unk7F != 0)
-        gUnknown_020388CC->unk7E = 1;
+    if (gRegionMap->playerIsInCave)
+        gRegionMap->blinkPlayerIcon = TRUE;
 }
 
-const u8 *sub_80FBFB4(u8 *dest, u16 b, u16 length)
+const u8 *GetMapSectionName(u8 *dest, u16 mapSecId, u16 length)
 {
-    if (b == 86)
+    if (mapSecId == MAPSEC_SECRET_BASE)
         return GetSecretBaseMapName(dest);
-    if (b < 88)
-        return StringCopy(dest, gRegionMapLocations[b].name);
+    if (mapSecId < MAPSEC_NONE)
+        return StringCopy(dest, gRegionMapLocations[mapSecId].regionMapSectionId);
     if (length == 0)
         length = 18;
     return StringFill(dest, CHAR_SPACE, length);
 }
 
-const u8 *CopyMapName(u8 *dest, u16 b)
+const u8 *CopyMapName(u8 *dest, u16 mapSecId)
 {
-    switch (b)
+    switch (mapSecId)
     {
-    case 87:
+    case MAPSEC_UNK_0x57:
         return StringCopy(dest, gOtherText_Ferry);
-    case 86:
+    case MAPSEC_SECRET_BASE:
         return StringCopy(dest, gOtherText_SecretBase);
     default:
-        return sub_80FBFB4(dest, b, 0);
+        return GetMapSectionName(dest, mapSecId, 0);
     }
 }
 
-const u8 *CopyLocationName(u8 *dest, u16 b)
+const u8 *CopyLocationName(u8 *dest, u16 mapSecId)
 {
-    if (b == 66)
+    if (mapSecId == MAPSEC_EVIL_TEAM_HIDEOUT)
         return StringCopy(dest, gOtherText_Hideout);
     else
-        return CopyMapName(dest, b);
+        return CopyMapName(dest, mapSecId);
 }
 
-void sub_80FC04C(u16 a, u16 *x, u16 *y, u16 *width, u16 *height)
+void GetRegionMapLocationPosition(u16 mapSecId, u16 *x, u16 *y, u16 *width, u16 *height)
 {
-    *x = gRegionMapLocations[a].x;
-    *y = gRegionMapLocations[a].y;
-    *width = gRegionMapLocations[a].width;
-    *height = gRegionMapLocations[a].height;
+    *x = gRegionMapLocations[mapSecId].x;
+    *y = gRegionMapLocations[mapSecId].y;
+    *width = gRegionMapLocations[mapSecId].width;
+    *height = gRegionMapLocations[mapSecId].height;
 }
 
 struct UnknownStruct3
@@ -1302,14 +1368,14 @@ struct UnknownStruct3
     void (*unk0)(void);
     u16 unk4;
     u16 unk6;
-    struct UnknownStruct1 unk8;
+    struct RegionMap regionMap;
 };
 
 extern u8 ewram[];
 #define ewram0 (*(struct UnknownStruct3 *)(ewram + 0))
 #define ewram888 (ewram + 0x888)
 #define ewramA6E (ewram[0xA6E])
-#define ewramA48 (ewram + 0xA48)
+#define ewramBlankMapName (ewram + 0xA48)
 
 const u16 gUnknown_083E771C[] = INCBIN_U16("graphics/pokenav/map_frame.gbapal");
 const u8 gUnknown_083E773C[] = INCBIN_U8("graphics/pokenav/map_frame.4bpp.lz");
@@ -1374,15 +1440,15 @@ const u8 gUnknown_083E7920[][3] =
 struct UnknownStruct4
 {
     const u8 *const *unk0;
-    u16 unk4;
-    u16 unk6;
+    u16 mapSecId;
+    u16 flag;
 };
 
-const u8 *const Unknown_3E79B8[] = {OtherText_PokeLeague, OtherText_PokeCenter};
+const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, OtherText_PokeCenter};
 
 const struct UnknownStruct4 gUnknown_083E79C0[1] =
 {
-    {Unknown_3E79B8, 15, 0x854},
+    {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, 0x854},
 };
 
 // XXX: what is this?
@@ -1390,13 +1456,15 @@ static u8 *const ewram_ = ewram;
 
 const struct SpritePalette gUnknown_083E79CC = {gPokenavMapMisc_Pal, 2};
 
-const u16 gUnknown_083E79D4[][2] =
+// Fly targets that are not cities or towns
+const u16 gSpecialFlyAreas[][2] =
 {
-    {0x848, 58},
-    {0xFFFF, 88},
+    // flag, mapSecId
+    {0x848, MAPSEC_BATTLE_TOWER},
+    {0xFFFF, MAPSEC_NONE},
 };
 
-const struct OamData gOamData_83E79DC =
+const struct OamData gFlyTargetOamData =
 {
     .y = 0,
     .affineMode = 0,
@@ -1413,71 +1481,71 @@ const struct OamData gOamData_83E79DC =
     .affineParam = 0,
 };
 
-const union AnimCmd gSpriteAnim_83E79E4[] =
+const union AnimCmd gFlyTargetAnimSeq0[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSpriteAnim_83E79EC[] =
+const union AnimCmd gFlyTargetAnimSeq1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSpriteAnim_83E79F4[] =
+const union AnimCmd gFlyTargetAnimSeq2[] =
 {
     ANIMCMD_FRAME(3, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSpriteAnim_83E79FC[] =
+const union AnimCmd gFlyTargetAnimSeq3[] =
 {
     ANIMCMD_FRAME(5, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSpriteAnim_83E7A04[] =
+const union AnimCmd gFlyTargetAnimSeq4[] =
 {
     ANIMCMD_FRAME(6, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSpriteAnim_83E7A0C[] =
+const union AnimCmd gFlyTargetAnimSeq5[] =
 {
     ANIMCMD_FRAME(8, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gSpriteAnim_83E7A14[] =
+const union AnimCmd gFlyTargetAnimSeq6[] =
 {
     ANIMCMD_FRAME(10, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSpriteAnimTable_83E7A1C[] =
+const union AnimCmd *const gFlyTargetAnimTable[] =
 {
-    gSpriteAnim_83E79E4,
-    gSpriteAnim_83E79EC,
-    gSpriteAnim_83E79F4,
-    gSpriteAnim_83E79FC,
-    gSpriteAnim_83E7A04,
-    gSpriteAnim_83E7A0C,
-    gSpriteAnim_83E7A14,
+    gFlyTargetAnimSeq0,
+    gFlyTargetAnimSeq1,
+    gFlyTargetAnimSeq2,
+    gFlyTargetAnimSeq3,
+    gFlyTargetAnimSeq4,
+    gFlyTargetAnimSeq5,
+    gFlyTargetAnimSeq6,
 };
 
-const struct SpriteTemplate gSpriteTemplate_83E7A38 =
+const struct SpriteTemplate gFlyTargetSpriteTemplate =
 {
     .tileTag = 2,
     .paletteTag = 2,
-    .oam = &gOamData_83E79DC,
-    .anims = gSpriteAnimTable_83E7A1C,
+    .oam = &gFlyTargetOamData,
+    .anims = gFlyTargetAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy,
 };
 
-void sub_80FC074(void)
+void CB2_InitFlyRegionMap(void)
 {
     switch (gMain.state)
     {
@@ -1505,12 +1573,12 @@ void sub_80FC074(void)
         MenuZeroFillScreen();
         break;
     case 3:
-        sub_80FA8EC(&ewram0.unk8, 0);
-        sub_80FBB3C(0, 0);
-        sub_80FBCF0(1, 1);
-        ewram0.unk6 = ewram0.unk8.unk14;
-        StringFill(ewramA48, CHAR_SPACE, 12);
-        sub_80FC254();
+        InitRegionMap(&ewram0.regionMap, 0);
+        CreateRegionMapCursorIcon(0, 0);
+        CreateRegionMapPlayerIcon(1, 1);
+        ewram0.unk6 = ewram0.regionMap.mapSecId;
+        StringFill(ewramBlankMapName, CHAR_SPACE, 12);
+        PrintFlyTargetName();
         break;
     case 4:
         LZ77UnCompVram(gUnknown_083E773C, (void *)(VRAM + 0xC000));
@@ -1523,7 +1591,7 @@ void sub_80FC074(void)
         MenuPrint_PixelCoords(gOtherText_FlyToWhere, 1, 0x90, 1);
         break;
     case 7:
-        sub_80FC31C();
+        CreateFlyTargetGraphics();
         break;
     case 8:
         BlendPalettes(0xFFFFFFFF, 16, 0);
@@ -1562,24 +1630,24 @@ void sub_80FC244(void (*func)(void))
     ewram0.unk4 = 0;
 }
 
-void sub_80FC254(void)
+void PrintFlyTargetName(void)
 {
-    if (ewram0.unk8.unk16 == 2 || ewram0.unk8.unk16 == 4)
+    if (ewram0.regionMap.unk16 == 2 || ewram0.regionMap.unk16 == 4)
     {
         u16 i = 0;
         int zero;
 
-        for (i = 0; i < 1; i++)
+        for (i = 0; i < ARRAY_COUNT(gUnknown_083E79C0); i++)
         {
             const struct UnknownStruct4 *r4 = &gUnknown_083E79C0[i];
 
-            if (ewram0.unk8.unk14 == r4->unk4)
+            if (ewram0.regionMap.mapSecId == r4->mapSecId)
             {
-                if (FlagGet(r4->unk6))
+                if (FlagGet(r4->flag))
                 {
                     MenuDrawTextWindow(16, 14, 29, 19);
-                    MenuPrint(ewram0.unk8.filler0, 17, 15);
-                    MenuPrint_RightAligned(r4->unk0[ewram0.unk8.unk17], 29, 17);
+                    MenuPrint(ewram0.regionMap.mapSecName, 17, 15);
+                    MenuPrint_RightAligned(r4->unk0[ewram0.regionMap.everGrandeCityArea], 29, 17);
                     return;
                 }
                 break;
@@ -1590,19 +1658,19 @@ void sub_80FC254(void)
         if (zero == 0)
         {
             MenuDrawTextWindow(16, 16, 29, 19);
-            MenuPrint(ewram0.unk8.filler0, 17, 17);
+            MenuPrint(ewram0.regionMap.mapSecName, 17, 17);
             MenuZeroFillWindowRect(16, 14, 29, 15);
         }
     }
     else
     {
         MenuDrawTextWindow(16, 16, 29, 19);
-        MenuPrint(ewramA48, 17, 17);
+        MenuPrint(ewramBlankMapName, 17, 17);
         MenuZeroFillWindowRect(16, 14, 29, 15);
     }
 }
 
-void sub_80FC31C(void)
+void CreateFlyTargetGraphics(void)
 {
     struct SpriteSheet spriteSheet;
 
@@ -1612,13 +1680,14 @@ void sub_80FC31C(void)
     spriteSheet.tag = 2;
     LoadSpriteSheet(&spriteSheet);
     LoadSpritePalette(&gUnknown_083E79CC);
-    sub_80FC374();
-    sub_80FC484();
+    CreateCityTownFlyTargetIcons();
+    CreateSpecialAreaFlyTargetIcons();
 }
 
-void sub_80FC374(void)
+// Draws a light overlay on cities and towns that the player can fly to
+void CreateCityTownFlyTargetIcons(void)
 {
-    u16 flag = 0x80F;
+    u16 canFlyFlag = 0x80F;
     u16 i;
 
     for (i = 0; i < 16; i++)
@@ -1630,7 +1699,7 @@ void sub_80FC374(void)
         u16 r7;
         u8 spriteId;
 
-        sub_80FC04C(i, &x, &y, &width, &height);
+        GetRegionMapLocationPosition(i, &x, &y, &width, &height);
         x = (x + 1) * 8 + 4;
         y = (y + 2) * 8 + 4;
         if (width == 2)
@@ -1639,56 +1708,60 @@ void sub_80FC374(void)
             r7 = 2;
         else
             r7 = 0;
-        spriteId = CreateSprite(&gSpriteTemplate_83E7A38, x, y, 10);
+        spriteId = CreateSprite(&gFlyTargetSpriteTemplate, x, y, 10);
         if (spriteId != 64)
         {
             gSprites[spriteId].oam.shape = r7;
-            if (FlagGet(flag))
-                gSprites[spriteId].callback = sub_80FC55C;
+            if (FlagGet(canFlyFlag))
+                gSprites[spriteId].callback = SpriteCB_FlyTargetIcons;
             else
                 r7 += 3;
             StartSpriteAnim(&gSprites[spriteId], r7);
             gSprites[spriteId].data0 = i;
         }
-        flag++;
+        canFlyFlag++;
     }
 }
 
-void sub_80FC484(void)
+// Draws a red box on other fly targets
+// The Battle Tower is the only one of these
+void CreateSpecialAreaFlyTargetIcons(void)
 {
     u16 i;
 
-    for (i = 0; gUnknown_083E79D4[i][1] != 88; i++)
+    for (i = 0; gSpecialFlyAreas[i][1] != MAPSEC_NONE; i++)
     {
         u16 x;
         u16 y;
         u16 width;
         u16 height;
 
-        if (FlagGet(gUnknown_083E79D4[i][0]))
+        if (FlagGet(gSpecialFlyAreas[i][0]))
         {
-            u16 r6 = gUnknown_083E79D4[i][1];
+            u16 mapSecId = gSpecialFlyAreas[i][1];
             u8 spriteId;
 
-            sub_80FC04C(r6, &x, &y, &width, &height);
+            GetRegionMapLocationPosition(mapSecId, &x, &y, &width, &height);
             x = (x + 1) * 8;
             y = (y + 2) * 8;
-            spriteId = CreateSprite(&gSpriteTemplate_83E7A38, x, y, 10);
+            spriteId = CreateSprite(&gFlyTargetSpriteTemplate, x, y, 10);
             if (spriteId != 64)
             {
                 gSprites[spriteId].oam.size = 1;
-                gSprites[spriteId].callback = sub_80FC55C;
+                gSprites[spriteId].callback = SpriteCB_FlyTargetIcons;
                 StartSpriteAnim(&gSprites[spriteId], 6);
-                gSprites[spriteId].data0 = r6;
+                gSprites[spriteId].data0 = mapSecId;
             }
         }
     }
 }
 
-void sub_80FC55C(struct Sprite *sprite)
+void SpriteCB_FlyTargetIcons(struct Sprite *sprite)
 {
-    if (ewram0.unk8.unk14 == sprite->data0)
+    // Blink if our mapSecId is the one selected on the map
+    if (ewram0.regionMap.mapSecId == sprite->data0)
     {
+        // Toggle visibility every 16 frames
         sprite->data1++;
         if (sprite->data1 > 16)
         {
@@ -1725,22 +1798,22 @@ void sub_80FC600(void)
     {
         switch (sub_80FAB60())
         {
-        case 0:
-        case 1:
-        case 2:
+        case INPUT_EVENT_NONE:
+        case INPUT_EVENT_DPAD:
+        case INPUT_EVENT_2:
             break;
-        case 3:
-            sub_80FC254();
+        case INPUT_EVENT_3:
+            PrintFlyTargetName();
             break;
-        case 4:
-            if (ewram0.unk8.unk16 == 2 || ewram0.unk8.unk16 == 4)
+        case INPUT_EVENT_A_BUTTON:
+            if (ewram0.regionMap.unk16 == 2 || ewram0.regionMap.unk16 == 4)
             {
                 m4aSongNumStart(SE_SELECT);
                 ewramA6E = 1;
                 sub_80FC244(sub_80FC69C);
             }
             break;
-        case 5:
+        case INPUT_EVENT_B_BUTTON:
             m4aSongNumStart(SE_SELECT);
             ewramA6E = 0;
             sub_80FC244(sub_80FC69C);
@@ -1760,28 +1833,28 @@ void sub_80FC69C(void)
     case 1:
         if (UpdatePaletteFade() != 0)
             break;
-        sub_80FAB10();
+        FreeRegionMapIconResources();
         if (ewramA6E != 0)
         {
-            switch (ewram0.unk8.unk14)
+            switch (ewram0.regionMap.mapSecId)
             {
-            case 0x49:
+            case MAPSEC_SOUTHERN_ISLAND:
                 sub_8053538(22);
                 break;
-            case 0x3A:
+            case MAPSEC_BATTLE_TOWER:
                 sub_8053538(21);
                 break;
-            case 0:
+            case MAPSEC_LITTLEROOT_TOWN:
                 sub_8053538((gSaveBlock2.playerGender == MALE) ? 12 : 13);
                 break;
-            case 15:
-                sub_8053538((FlagGet(0x854) && ewram0.unk8.unk17 == 0) ? 20 : 11);
+            case MAPSEC_EVER_GRANDE_CITY:
+                sub_8053538((FlagGet(0x854) && ewram0.regionMap.everGrandeCityArea == 0) ? 20 : 11);
                 break;
             default:
-                if (gUnknown_083E7920[ewram0.unk8.unk14][2] != 0)
-                    sub_8053538(gUnknown_083E7920[ewram0.unk8.unk14][2]);
+                if (gUnknown_083E7920[ewram0.regionMap.mapSecId][2] != 0)
+                    sub_8053538(gUnknown_083E7920[ewram0.regionMap.mapSecId][2]);
                 else
-                    warp1_set_2(gUnknown_083E7920[ewram0.unk8.unk14][0], gUnknown_083E7920[ewram0.unk8.unk14][1], -1);
+                    warp1_set_2(gUnknown_083E7920[ewram0.regionMap.mapSecId][0], gUnknown_083E7920[ewram0.regionMap.mapSecId][1], -1);
                 break;
             }
             sub_80865BC();
diff --git a/src/rom4.c b/src/rom4.c
index bfc8e0e44..b2e30e292 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -993,12 +993,12 @@ bool8 is_light_level_8_or_9(u8 a1)
 
 u8 unref_sub_8054260(void)
 {
-    return get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum)->name;
+    return get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum)->regionMapSectionId;
 }
 
 u8 sav1_map_get_name(void)
 {
-    return get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->name;
+    return get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->regionMapSectionId;
 }
 
 u8 sav1_map_get_battletype(void)
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index b2dd662d6..a2d17bd36 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -70,7 +70,7 @@ void PrintSaveMapName(s16 x, s16 y)
 {
     char name[32];
 
-    CopyMapName(name, gMapHeader.name);
+    CopyMapName(name, gMapHeader.regionMapSectionId);
     MenuPrint(name, x, y);
 }
 
diff --git a/src/secret_base.c b/src/secret_base.c
index d88d2c66a..4e8331f5c 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -205,7 +205,7 @@ void sub_80BB8CC(void)
     memset(gSaveBlock1.secretBases[0].sbr_field_2, 0xFF, 7);
     StringCopyN(gSaveBlock1.secretBases[0].sbr_field_2, gSaveBlock2.playerName, nameLength);
     gSaveBlock1.secretBases[0].gender = gSaveBlock2.playerGender;
-    VarSet(VAR_SECRET_BASE_MAP, gMapHeader.name);
+    VarSet(VAR_SECRET_BASE_MAP, gMapHeader.regionMapSectionId);
 }
 
 void sub_80BB970(struct MapEvents *events)
diff --git a/src/tv.c b/src/tv.c
index 27fe9b84c..529537366 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -479,7 +479,7 @@ void sub_80BDC14(void)
     gSaveBlock1.gabbyAndTyData.valB_2 = gSaveBlock1.gabbyAndTyData.valA_2;
     gSaveBlock1.gabbyAndTyData.valB_3 = gSaveBlock1.gabbyAndTyData.valA_3;
     gSaveBlock1.gabbyAndTyData.valA_4 = 1;
-    gSaveBlock1.gabbyAndTyData.mapnum = gMapHeader.name;
+    gSaveBlock1.gabbyAndTyData.mapnum = gMapHeader.regionMapSectionId;
     IncrementGameStat(GAME_STAT_GOT_INTERVIEWED);
 }
 
@@ -664,7 +664,7 @@ void sub_80BE028(void) {
     buffer->worldOfMasters.var02++;
     buffer->worldOfMasters.var04 = gBattleResults.CaughtPoke;
     buffer->worldOfMasters.var08 = gBattleResults.Poke1Species;
-    buffer->worldOfMasters.var0a = gMapHeader.name;
+    buffer->worldOfMasters.var0a = gMapHeader.regionMapSectionId;
 }
 
 #ifdef NONMATCHING
@@ -692,7 +692,7 @@ void sub_80BE074(void) {
                 show->pokemonTodayFailed.species2 = gBattleResults.unk20;
                 show->pokemonTodayFailed.var10 = total;
                 show->pokemonTodayFailed.var11 = gBattleOutcome;
-                show->pokemonTodayFailed.var12 = gMapHeader.name;
+                show->pokemonTodayFailed.var12 = gMapHeader.regionMapSectionId;
                 StringCopy(show->pokemonTodayFailed.playerName, gSaveBlock2.playerName);
                 sub_80BE138(show);
                 show->pokemonTodayFailed.language = GAME_LANGUAGE;
@@ -905,7 +905,7 @@ void sub_80BE3BC(void) {
                 tvShow = &gSaveBlock1.tvShows[gUnknown_03005D38.var0];
                 tvShow->smartshopperShow.var00 = TVSHOW_SMART_SHOPPER;
                 tvShow->smartshopperShow.var01 = rval;
-                tvShow->smartshopperShow.shopLocation = gMapHeader.name;
+                tvShow->smartshopperShow.shopLocation = gMapHeader.regionMapSectionId;
                 for (i=0; i<3; i++) {
                     tvShow->smartshopperShow.itemIds[i] = gUnknown_02038724[i].item_id;
                     tvShow->smartshopperShow.itemAmounts[i] = gUnknown_02038724[i].item_amount;
@@ -3216,7 +3216,7 @@ void DoTVShowTodaysSmartShopper(void)
     {
         case 0:
             TVShowConvertInternationalString(gStringVar1, tvShow->smartshopperShow.playerName, tvShow->smartshopperShow.language);
-            sub_80FBFB4(gStringVar2, tvShow->smartshopperShow.shopLocation, 0);
+            GetMapSectionName(gStringVar2, tvShow->smartshopperShow.shopLocation, 0);
             if (tvShow->smartshopperShow.itemAmounts[0] >= 0xff)
             {
                 gUnknown_020387E8 = 11;
@@ -3498,7 +3498,7 @@ void DoTVShowPokemonTodayFailedCapture(void) {
         break;
     case 1:
         TVShowConvertInternationalString(gStringVar1, tvShow->pokemonTodayFailed.playerName, tvShow->pokemonTodayFailed.language);
-        sub_80FBFB4(gStringVar2, tvShow->pokemonTodayFailed.var12, 0);
+        GetMapSectionName(gStringVar2, tvShow->pokemonTodayFailed.var12, 0);
         StringCopy(gStringVar3, gSpeciesNames[tvShow->pokemonTodayFailed.species2]);
         if (tvShow->pokemonTodayFailed.var11 == 1) {
             gUnknown_020387E8 = 3;
@@ -3653,7 +3653,7 @@ void DoTVShowPokemonNewsMassOutbreak(void)
 
     tvShow = &gSaveBlock1.tvShows[gSpecialVar_0x8004];
 
-    sub_80FBFB4(gStringVar1, tvShow->massOutbreak.locationMapNum, 0);
+    GetMapSectionName(gStringVar1, tvShow->massOutbreak.locationMapNum, 0);
 
     StringCopy(gStringVar2, gSpeciesNames[tvShow->massOutbreak.species]);
 
@@ -3669,7 +3669,7 @@ void DoTVShowInSearchOfTrainers(void) {
     switchval = gUnknown_020387E8;
     switch (switchval) {
     case 0:
-        sub_80FBFB4(gStringVar1, gSaveBlock1.gabbyAndTyData.mapnum, 0);
+        GetMapSectionName(gStringVar1, gSaveBlock1.gabbyAndTyData.mapnum, 0);
         if (gSaveBlock1.gabbyAndTyData.battleNum > 1) {
             gUnknown_020387E8 = 1;
         } else {
@@ -3765,7 +3765,7 @@ void DoTVShowTheWorldOfMasters(void) {
     case 2:
         TVShowConvertInternationalString(gStringVar1, tvShow->worldOfMasters.playerName,
                                          tvShow->worldOfMasters.language);
-        sub_80FBFB4(gStringVar2, tvShow->worldOfMasters.var0a, 0);
+        GetMapSectionName(gStringVar2, tvShow->worldOfMasters.var0a, 0);
         StringCopy(gStringVar3, gSpeciesNames[tvShow->worldOfMasters.var04]);
         TVShowDone();
         break;
-- 
cgit v1.2.3


From 9000ea3277d7c030e5830f5ca5206665b1c5be25 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 16 Jul 2017 11:30:26 -0500
Subject: visual region map layout

---
 src/data/region_map_layout.h | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/region_map.c             | 21 ++-------------------
 2 files changed, 44 insertions(+), 19 deletions(-)
 create mode 100644 src/data/region_map_layout.h

(limited to 'src')

diff --git a/src/data/region_map_layout.h b/src/data/region_map_layout.h
new file mode 100644
index 000000000..7b7c1df2a
--- /dev/null
+++ b/src/data/region_map_layout.h
@@ -0,0 +1,42 @@
+// Abbreviated definitions to make the map layout more visual
+#define R(routeNum) MAPSEC_ROUTE_##routeNum
+#define LITT_T      MAPSEC_LITTLEROOT_TOWN
+#define OLDA_T      MAPSEC_OLDALE_TOWN
+#define DEWF_T      MAPSEC_DEWFORD_TOWN
+#define LAVA_T      MAPSEC_LAVARIDGE_TOWN
+#define FALL_T      MAPSEC_FALLARBOR_TOWN
+#define VERD_T      MAPSEC_VERDANTURF_TOWN
+#define PACI_T      MAPSEC_PACIFIDLOG_TOWN
+#define PETA_C      MAPSEC_PETALBURG_CITY
+#define SLAT_C      MAPSEC_SLATEPORT_CITY
+#define MAUV_C      MAPSEC_MAUVILLE_CITY
+#define RUST_T      MAPSEC_RUSTBORO_CITY
+#define FORT_C      MAPSEC_FORTREE_CITY
+#define LILY_C      MAPSEC_LILYCOVE_CITY
+#define MOSS_C      MAPSEC_MOSSDEEP_CITY
+#define SOOT_C      MAPSEC_SOOTOPOLIS_CITY
+#define EVER_C      MAPSEC_EVER_GRANDE_CITY
+#define MTCHIM      MAPSEC_MT_CHIMNEY
+#define SAFARI      MAPSEC_SAFARI_ZONE
+#define BTLTWR      MAPSEC_BATTLE_TOWER
+#define S_ISLD      MAPSEC_SOUTHERN_ISLAND
+#define ______      MAPSEC_NONE
+
+const u8 gRegionMapLayout[] =
+{
+    ______, R(114), R(114), FALL_T, R(113), R(113), R(113), R(113), R(111), ______, ______, R(119), FORT_C, R(120), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
+    ______, R(114), ______, ______, ______, ______, MTCHIM, MTCHIM, R(111), ______, ______, R(119), ______, R(120), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
+    R(115), R(114), ______, ______, ______, ______, MTCHIM, MTCHIM, R(111), ______, ______, R(119), ______, R(120), ______, ______, SAFARI, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
+    R(115), ______, ______, ______, ______, LAVA_T, R(112), R(112), R(111), ______, ______, R(119), ______, R(120), R(121), R(121), R(121), R(121), LILY_C, LILY_C, R(124), R(124), R(124), R(124), R(125), R(125), ______, ______,
+    R(115), ______, ______, ______, ______, ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), R(125), R(125), ______, ______,
+    RUST_T, R(116), R(116), R(116), R(116), ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), MOSS_C, MOSS_C, ______, ______,
+    RUST_T, ______, ______, ______, VERD_T, R(117), R(117), R(117), MAUV_C, MAUV_C, R(118), R(118), R(123), R(123), R(123), R(123), R(123), ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, ______,
+    R(104), ______, ______, ______, ______, ______, ______, ______, R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(126), SOOT_C, R(126), R(127), R(127), R(127), ______, ______,
+    R(104), ______, ______, ______, R(103), R(103), R(103), R(103), R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, EVER_C,
+    R(104), PETA_C, R(102), R(102), OLDA_T, ______, ______, ______, R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(128), R(128), R(128), R(128), EVER_C,
+    R(105), ______, ______, ______, R(101), ______, ______, ______, SLAT_C, R(134), R(134), R(134), R(133), R(133), R(133), R(132), R(132), PACI_T, R(131), R(131), R(131), R(130), R(130), R(130), R(129), R(129), ______, ______,
+    R(105), ______, ______, ______, LITT_T, ______, ______, ______, SLAT_C, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
+    R(105), ______, ______, ______, ______, ______, ______, ______, R(109), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, BTLTWR, ______, ______, ______, ______, ______,
+    R(106), R(106), R(106), ______, ______, ______, ______, ______, R(109), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
+    ______, ______, DEWF_T, R(107), R(107), R(107), R(108), R(108), R(109), ______, ______, ______, S_ISLD, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
+};
diff --git a/src/region_map.c b/src/region_map.c
index a0739ecef..418be8663 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -140,24 +140,7 @@ const u16 gUnknown_083E5D60[] = INCBIN_U16("graphics/pokenav/region_map.gbapal")
 const u8 gUnknown_083E5DA0[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz");
 const u8 gUnknown_083E6B04[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz");
 
-const u8 gRegionMapSections[] =
-{
-    0x58, 0x1D, 0x1D, 0x04, 0x1C, 0x1C, 0x1C, 0x1C, 0x1A, 0x58, 0x58, 0x22, 0x0B, 0x23, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
-    0x58, 0x1D, 0x58, 0x58, 0x58, 0x58, 0x38, 0x38, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
-    0x1E, 0x1D, 0x58, 0x58, 0x58, 0x58, 0x38, 0x38, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x58, 0x58, 0x39, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
-    0x1E, 0x58, 0x58, 0x58, 0x58, 0x03, 0x1B, 0x1B, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x23, 0x24, 0x24, 0x24, 0x24, 0x0C, 0x0C, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0x58, 0x58,
-    0x1E, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x58, 0x58, 0x58, 0x25, 0x58, 0x58, 0x58, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0x58, 0x58,
-    0x0A, 0x1F, 0x1F, 0x1F, 0x1F, 0x58, 0x58, 0x58, 0x1A, 0x58, 0x58, 0x22, 0x58, 0x58, 0x58, 0x58, 0x25, 0x58, 0x58, 0x58, 0x27, 0x27, 0x27, 0x27, 0x0D, 0x0D, 0x58, 0x58,
-    0x0A, 0x58, 0x58, 0x58, 0x05, 0x20, 0x20, 0x20, 0x09, 0x09, 0x21, 0x21, 0x26, 0x26, 0x26, 0x26, 0x26, 0x58, 0x58, 0x58, 0x29, 0x29, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x58,
-    0x13, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x29, 0x0E, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x58,
-    0x13, 0x58, 0x58, 0x58, 0x12, 0x12, 0x12, 0x12, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x29, 0x29, 0x29, 0x2A, 0x2A, 0x2A, 0x58, 0x0F,
-    0x13, 0x07, 0x11, 0x11, 0x01, 0x58, 0x58, 0x58, 0x19, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x2B, 0x2B, 0x2B, 0x2B, 0x0F,
-    0x14, 0x58, 0x58, 0x58, 0x10, 0x58, 0x58, 0x58, 0x08, 0x31, 0x31, 0x31, 0x30, 0x30, 0x30, 0x2F, 0x2F, 0x06, 0x2E, 0x2E, 0x2E, 0x2D, 0x2D, 0x2D, 0x2C, 0x2C, 0x58, 0x58,
-    0x14, 0x58, 0x58, 0x58, 0x00, 0x58, 0x58, 0x58, 0x08, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
-    0x14, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x18, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x3A, 0x58, 0x58, 0x58, 0x58, 0x58,
-    0x15, 0x15, 0x15, 0x58, 0x58, 0x58, 0x58, 0x58, 0x18, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
-    0x58, 0x58, 0x02, 0x16, 0x16, 0x16, 0x17, 0x17, 0x18, 0x58, 0x58, 0x58, 0x49, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
-};
+#include "data/region_map_layout.h"
 
 #if ENGLISH
 #include "data/region_map_names_en.h"
@@ -711,7 +694,7 @@ u16 GetRegionMapSectionAt(u16 x, u16 y)
         return MAPSEC_NONE;
     y -= MAPCURSOR_Y_MIN;
     x -= MAPCURSOR_X_MIN;
-    return gRegionMapSections[x + y * 28];
+    return gRegionMapLayout[x + y * 28];
 }
 
 void InitializeCursorPosition(void)
-- 
cgit v1.2.3


From d4bd4c393e59bb66a8d4f69f23dce694982723e1 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 16 Jul 2017 12:41:13 -0500
Subject: more labeling and use static

---
 src/data/region_map_layout.h |   8 +-
 src/field_region_map.c       |   2 +-
 src/region_map.c             | 374 +++++++++++++++++++++----------------------
 3 files changed, 190 insertions(+), 194 deletions(-)

(limited to 'src')

diff --git a/src/data/region_map_layout.h b/src/data/region_map_layout.h
index 7b7c1df2a..ca33ef37a 100644
--- a/src/data/region_map_layout.h
+++ b/src/data/region_map_layout.h
@@ -10,7 +10,7 @@
 #define PETA_C      MAPSEC_PETALBURG_CITY
 #define SLAT_C      MAPSEC_SLATEPORT_CITY
 #define MAUV_C      MAPSEC_MAUVILLE_CITY
-#define RUST_T      MAPSEC_RUSTBORO_CITY
+#define RUST_C      MAPSEC_RUSTBORO_CITY
 #define FORT_C      MAPSEC_FORTREE_CITY
 #define LILY_C      MAPSEC_LILYCOVE_CITY
 #define MOSS_C      MAPSEC_MOSSDEEP_CITY
@@ -22,15 +22,15 @@
 #define S_ISLD      MAPSEC_SOUTHERN_ISLAND
 #define ______      MAPSEC_NONE
 
-const u8 gRegionMapLayout[] =
+static const u8 sRegionMapLayout[] =
 {
     ______, R(114), R(114), FALL_T, R(113), R(113), R(113), R(113), R(111), ______, ______, R(119), FORT_C, R(120), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
     ______, R(114), ______, ______, ______, ______, MTCHIM, MTCHIM, R(111), ______, ______, R(119), ______, R(120), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
     R(115), R(114), ______, ______, ______, ______, MTCHIM, MTCHIM, R(111), ______, ______, R(119), ______, R(120), ______, ______, SAFARI, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
     R(115), ______, ______, ______, ______, LAVA_T, R(112), R(112), R(111), ______, ______, R(119), ______, R(120), R(121), R(121), R(121), R(121), LILY_C, LILY_C, R(124), R(124), R(124), R(124), R(125), R(125), ______, ______,
     R(115), ______, ______, ______, ______, ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), R(125), R(125), ______, ______,
-    RUST_T, R(116), R(116), R(116), R(116), ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), MOSS_C, MOSS_C, ______, ______,
-    RUST_T, ______, ______, ______, VERD_T, R(117), R(117), R(117), MAUV_C, MAUV_C, R(118), R(118), R(123), R(123), R(123), R(123), R(123), ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, ______,
+    RUST_C, R(116), R(116), R(116), R(116), ______, ______, ______, R(111), ______, ______, R(119), ______, ______, ______, ______, R(122), ______, ______, ______, R(124), R(124), R(124), R(124), MOSS_C, MOSS_C, ______, ______,
+    RUST_C, ______, ______, ______, VERD_T, R(117), R(117), R(117), MAUV_C, MAUV_C, R(118), R(118), R(123), R(123), R(123), R(123), R(123), ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, ______,
     R(104), ______, ______, ______, ______, ______, ______, ______, R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(126), SOOT_C, R(126), R(127), R(127), R(127), ______, ______,
     R(104), ______, ______, ______, R(103), R(103), R(103), R(103), R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(126), R(126), R(126), R(127), R(127), R(127), ______, EVER_C,
     R(104), PETA_C, R(102), R(102), OLDA_T, ______, ______, ______, R(110), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, R(128), R(128), R(128), R(128), EVER_C,
diff --git a/src/field_region_map.c b/src/field_region_map.c
index 2b324ca1e..7cb22e5df 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -51,7 +51,7 @@ void CB2_FieldInitRegionMap(void)
     // TODO: remove this cast
     InitRegionMap((void *)&unk_2000000.unk8, 0);
     CreateRegionMapPlayerIcon(0, 0);
-    CreateRegionMapCursorIcon(1, 1);
+    CreateRegionMapCursor(1, 1);
     SetUpWindowConfig(&gWindowConfig_81E709C);
     InitMenuWindow(&gWindowConfig_81E709C);
     MenuZeroFillScreen();
diff --git a/src/region_map.c b/src/region_map.c
index 418be8663..097417357 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -18,6 +18,7 @@
 #include "text.h"
 #include "trig.h"
 
+// Map Section IDs
 #define MAPSEC_LITTLEROOT_TOWN 0
 #define MAPSEC_OLDALE_TOWN 1
 #define MAPSEC_DEWFORD_TOWN 2
@@ -110,11 +111,10 @@
 
 #define MAP_WIDTH 28
 #define MAP_HEIGHT 15
-
 #define MAPCURSOR_X_MIN 1
 #define MAPCURSOR_Y_MIN 2
-#define MAPCURSOR_X_MAX 28
-#define MAPCURSOR_Y_MAX 16
+#define MAPCURSOR_X_MAX (MAPCURSOR_X_MIN + MAP_WIDTH - 1)
+#define MAPCURSOR_Y_MAX (MAPCURSOR_Y_MIN + MAP_HEIGHT - 1)
 
 // Input events
 enum
@@ -129,16 +129,16 @@ enum
 
 extern struct RegionMap *gRegionMap;
 
-const u16 gPokenavCursor_Pal[] = INCBIN_U16("graphics/pokenav/cursor.gbapal");
-const u8 gUnknown_083E5AF0[] = INCBIN_U8("graphics/pokenav/cursor_small.4bpp.lz");
-const u8 gUnknown_083E5B34[] = INCBIN_U8("graphics/pokenav/cursor_large.4bpp.lz");
-const u16 gRegionMapBrendanIconPalette[] = INCBIN_U16("graphics/pokenav/brendan_icon.gbapal");
-const u8 gRegionMapBrendanIconTiles[] = INCBIN_U8("graphics/pokenav/brendan_icon.4bpp");
-const u16 gRegionMapMayIconPalette[] = INCBIN_U16("graphics/pokenav/may_icon.gbapal");
-const u8 gRegionMapMayIconTiles[] = INCBIN_U8("graphics/pokenav/may_icon.4bpp");
-const u16 gUnknown_083E5D60[] = INCBIN_U16("graphics/pokenav/region_map.gbapal");
-const u8 gUnknown_083E5DA0[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz");
-const u8 gUnknown_083E6B04[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz");
+static const u16 sRegionMapCursor_Pal[] = INCBIN_U16("graphics/pokenav/cursor.gbapal");
+static const u8 sRegionMapCursorSmall_ImageLZ[] = INCBIN_U8("graphics/pokenav/cursor_small.4bpp.lz");
+static const u8 sRegionMapCursorLarge_ImageLZ[] = INCBIN_U8("graphics/pokenav/cursor_large.4bpp.lz");
+static const u16 sRegionMapBrendanIcon_Pal[] = INCBIN_U16("graphics/pokenav/brendan_icon.gbapal");
+static const u8 sRegionMapBrendanIcon_Image[] = INCBIN_U8("graphics/pokenav/brendan_icon.4bpp");
+static const u16 sRegionMapMayIcon_Pal[] = INCBIN_U16("graphics/pokenav/may_icon.gbapal");
+static const u8 sRegionMapMayIcon_Image[] = INCBIN_U8("graphics/pokenav/may_icon.4bpp");
+static const u16 sRegionMapBkgnd_Pal[] = INCBIN_U16("graphics/pokenav/region_map.gbapal");
+static const u8 sRegionMapBkgnd_ImageLZ[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz");
+static const u8 sRegionMapBkgnd_TilemapLZ[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz");
 
 #include "data/region_map_layout.h"
 
@@ -247,7 +247,7 @@ const struct RegionMapLocation gRegionMapLocations[] =
     { 0,  0, 1, 1, gMapName_None},
 };
 
-const u16 gUnknown_083E7684[][2] =
+static const u16 gUnknown_083E7684[][2] =
 {
     {MAPSEC_UNDERWATER1,       MAPSEC_ROUTE_124},
     {MAPSEC_UNDERWATER2,       MAPSEC_ROUTE_126},
@@ -264,41 +264,39 @@ const u16 gUnknown_083E7684[][2] =
     {MAPSEC_NONE,              MAPSEC_NONE},
 };
 
-void sub_80FA904(struct RegionMap *, u8);
-bool8 sub_80FA940(void);
-u8 sub_80FAB78(void);
-u8 _swiopen(void);
-u8 sub_80FAD04(void);
-u8 sub_80FADE4(void);
-void CalcZoomScrollParams(s16, s16, s16, s16, u16, u16, u8);
-void sub_80FB238(s16, s16);
+static u8 sub_80FAB78(void);
+static u8 _swiopen(void);
+static u8 sub_80FAD04(void);
+static u8 sub_80FADE4(void);
+static void CalcZoomScrollParams(s16, s16, s16, s16, u16, u16, u8);
+static void sub_80FB238(s16, s16);
 void UpdateRegionMapVideoRegs(void);
-u16 GetRegionMapSectionAt(u16, u16);
-void InitializeCursorPosition(void);
-void sub_80FB600(void);
-u16 sub_80FB758(u16);
-u16 sub_80FB9C0(u16);
-void sub_80FBA18(void);
-bool8 sub_80FBAA0(u16);
-void CreateRegionMapCursorIcon(u16, u16);
-void sub_80FBCA0(void);
-void sub_80FBDF8(void);
-void sub_80FBE24(void);
-void SpriteCB_PlayerIconZoomedOut(struct Sprite *);
-void UpdateIconBlink(struct Sprite *);
-void SpriteCB_PlayerIconZoomedIn(struct Sprite *);
+static u16 GetRegionMapSectionAt(u16, u16);
+static void InitializeCursorPosition(void);
+static void sub_80FB600(void);
+static u16 sub_80FB758(u16);
+static u16 sub_80FB9C0(u16);
+static void sub_80FBA18(void);
+static bool8 sub_80FBAA0(u16);
+void CreateRegionMapCursor(u16, u16);
+static void sub_80FBCA0(void);
+static void sub_80FBDF8(void);
+static void sub_80FBE24(void);
+static void SpriteCB_PlayerIconZoomedOut(struct Sprite *);
+static void UpdateIconBlink(struct Sprite *);
+static void SpriteCB_PlayerIconZoomedIn(struct Sprite *);
 const u8 *GetMapSectionName(u8 *, u16, u16);
-void sub_80FC214(void);
-void sub_80FC228(void);
-void sub_80FC244(void (*func)(void));
-void PrintFlyTargetName(void);
-void CreateFlyTargetGraphics(void);
-void CreateCityTownFlyTargetIcons(void);
-void CreateSpecialAreaFlyTargetIcons(void);
-void SpriteCB_FlyTargetIcons(struct Sprite *);
-void sub_80FC5B4(void);
-void sub_80FC600(void);
-void sub_80FC69C(void);
+static void VBlankCB_FlyRegionMap(void);
+static void CB2_FlyRegionMap(void);
+static void sub_80FC244(void (*func)(void));
+static void PrintFlyTargetName(void);
+static void CreateFlyTargetGraphics(void);
+static void CreateCityTownFlyTargetIcons(void);
+static void CreateSpecialAreaFlyTargetIcons(void);
+static void SpriteCB_FlyTargetIcons(struct Sprite *);
+static void sub_80FC5B4(void);
+static void sub_80FC600(void);
+static void sub_80FC69C(void);
 
 void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed)
 {
@@ -320,19 +318,19 @@ bool8 sub_80FA940(void)
     switch (gRegionMap->initStep)
     {
     case 0:
-        LZ77UnCompVram(gUnknown_083E5DA0, (void *)(VRAM + 0x8000));
+        LZ77UnCompVram(sRegionMapBkgnd_ImageLZ, (void *)(VRAM + 0x8000));
         break;
     case 1:
-        LZ77UnCompVram(gUnknown_083E6B04, (void *)(VRAM + 0xE000));
+        LZ77UnCompVram(sRegionMapBkgnd_TilemapLZ, (void *)(VRAM + 0xE000));
         break;
     case 2:
-        LoadPalette(gUnknown_083E5D60, 0x70, 0x60);  // Why isn't this the right size?
+        LoadPalette(sRegionMapBkgnd_Pal, 0x70, 0x60);  // Why isn't this the right size?
         break;
     case 3:
-        LZ77UnCompWram(gUnknown_083E5AF0, gRegionMap->unk180);
+        LZ77UnCompWram(sRegionMapCursorSmall_ImageLZ, gRegionMap->cursorSmallImage);
         break;
     case 4:
-        LZ77UnCompWram(gUnknown_083E5B34, gRegionMap->unk280);
+        LZ77UnCompWram(sRegionMapCursorLarge_ImageLZ, gRegionMap->cursorLargeImage);
         break;
     case 5:
         InitializeCursorPosition();
@@ -359,7 +357,7 @@ bool8 sub_80FA940(void)
     case 7:
         sub_80FBA18();
         UpdateRegionMapVideoRegs();
-        gRegionMap->cursorIconSprite = NULL;
+        gRegionMap->cursorSprite = NULL;
         gRegionMap->playerIconSprite = NULL;
         gRegionMap->unk7A = 0;
         gRegionMap->blinkPlayerIcon = FALSE;
@@ -374,11 +372,11 @@ bool8 sub_80FA940(void)
 
 void FreeRegionMapIconResources(void)
 {
-    if (gRegionMap->cursorIconSprite != NULL)
+    if (gRegionMap->cursorSprite != NULL)
     {
-        DestroySprite(gRegionMap->cursorIconSprite);
-        FreeSpriteTilesByTag(gRegionMap->cursorIconTileTag);
-        FreeSpritePaletteByTag(gRegionMap->cursorIconPaletteTag);
+        DestroySprite(gRegionMap->cursorSprite);
+        FreeSpriteTilesByTag(gRegionMap->cursorTileTag);
+        FreeSpritePaletteByTag(gRegionMap->cursorPaletteTag);
     }
     if (gRegionMap->playerIconSprite != NULL)
     {
@@ -393,7 +391,7 @@ u8 sub_80FAB60(void)
     return gRegionMap->inputCallback();
 }
 
-u8 sub_80FAB78(void)
+static u8 sub_80FAB78(void)
 {
     u8 event = INPUT_EVENT_NONE;
 
@@ -433,7 +431,7 @@ u8 sub_80FAB78(void)
     return event;
 }
 
-u8 _swiopen(void)
+static u8 _swiopen(void)
 {
     u16 mapSecId;
 
@@ -464,7 +462,7 @@ u8 _swiopen(void)
     return INPUT_EVENT_3;
 }
 
-u8 sub_80FAD04(void)
+static u8 sub_80FAD04(void)
 {
     u8 event = INPUT_EVENT_NONE;
 
@@ -504,7 +502,7 @@ u8 sub_80FAD04(void)
     return event;
 }
 
-u8 sub_80FADE4(void)
+static u8 sub_80FADE4(void)
 {
     gRegionMap->scrollY += gRegionMap->unk68;
     gRegionMap->scrollX += gRegionMap->unk6A;
@@ -588,7 +586,7 @@ u8 sub_80FAFC0(void)
         gRegionMap->unk4C = (gRegionMap->zoomed == FALSE) ? (128 << 8) : (256 << 8);
         gRegionMap->zoomed = !gRegionMap->zoomed;
         gRegionMap->inputCallback = (gRegionMap->zoomed == FALSE) ? sub_80FAB78 : sub_80FAD04;
-        CreateRegionMapCursorIcon(gRegionMap->cursorIconTileTag, gRegionMap->cursorIconPaletteTag);
+        CreateRegionMapCursor(gRegionMap->cursorTileTag, gRegionMap->cursorPaletteTag);
         sub_80FBE24();
         r4 = 0;
     }
@@ -633,7 +631,7 @@ u8 sub_80FAFC0(void)
     return r4;
 }
 
-void CalcZoomScrollParams(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 rotation)
+static void CalcZoomScrollParams(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 rotation)
 {
     s32 var1;
     s32 var2;
@@ -656,7 +654,7 @@ void CalcZoomScrollParams(s16 a, s16 b, s16 c, s16 d, u16 e, u16 f, u8 rotation)
     gRegionMap->needUpdateVideoRegs = TRUE;
 }
 
-void sub_80FB238(s16 x, s16 y)
+static void sub_80FB238(s16 x, s16 y)
 {
     gRegionMap->bg2x = (0x1C << 8) + (x << 8);
     gRegionMap->bg2y = (0x24 << 8) + (y << 8);
@@ -688,16 +686,16 @@ void sub_80FB2A4(s16 a, s16 b)
     }
 }
 
-u16 GetRegionMapSectionAt(u16 x, u16 y)
+static u16 GetRegionMapSectionAt(u16 x, u16 y)
 {
     if (y < MAPCURSOR_Y_MIN || y > MAPCURSOR_Y_MAX || x < MAPCURSOR_X_MIN || x > MAPCURSOR_X_MAX)
         return MAPSEC_NONE;
     y -= MAPCURSOR_Y_MIN;
     x -= MAPCURSOR_X_MIN;
-    return gRegionMapLayout[x + y * 28];
+    return sRegionMapLayout[x + y * 28];
 }
 
-void InitializeCursorPosition(void)
+static void InitializeCursorPosition(void)
 {
     struct MapHeader *mapHeader;
     u16 mapWidth;
@@ -826,7 +824,7 @@ void InitializeCursorPosition(void)
     gRegionMap->cursorPosY = gRegionMapLocations[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN;
 }
 
-void sub_80FB600(void)
+static void sub_80FB600(void)
 {
     u16 y = 0;
     u16 x = 0;
@@ -877,7 +875,7 @@ void sub_80FB600(void)
     gRegionMap->cursorPosY = gRegionMapLocations[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN;
 }
 
-u16 sub_80FB758(u16 mapSecId)
+static u16 sub_80FB758(u16 mapSecId)
 {
     switch (mapSecId)
     {
@@ -930,7 +928,7 @@ u16 GetRegionMapSectionAt_(u16 x, u16 y)
     return GetRegionMapSectionAt(x, y);
 }
 
-u16 sub_80FB9C0(u16 mapSecId)
+static u16 sub_80FB9C0(u16 mapSecId)
 {
     u16 i;
 
@@ -947,7 +945,7 @@ u16 sub_80FBA04(u16 mapSecId)
     return sub_80FB9C0(mapSecId);
 }
 
-void sub_80FBA18(void)
+static void sub_80FBA18(void)
 {
     u16 x;
     u16 y;
@@ -996,7 +994,7 @@ void sub_80FBA18(void)
     gRegionMap->everGrandeCityArea = i;
 }
 
-bool8 sub_80FBAA0(u16 a)
+static bool8 sub_80FBAA0(u16 a)
 {
     u16 x;
     u16 y;
@@ -1013,9 +1011,7 @@ bool8 sub_80FBAA0(u16 a)
     return FALSE;
 }
 
-
-
-const struct OamData gCursorIconOamData =
+static const struct OamData sCursorOamData =
 {
     .y = 0,
     .affineMode = 0,
@@ -1032,14 +1028,14 @@ const struct OamData gCursorIconOamData =
     .affineParam = 0,
 };
 
-const union AnimCmd gSpriteAnim_83E76C0[] =
+static const union AnimCmd sCursorAnimSeq0[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(4, 20),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gSpriteAnim_83E76CC[] =
+static const union AnimCmd sCursorAnimSeq1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(16, 10),
@@ -1048,13 +1044,13 @@ const union AnimCmd gSpriteAnim_83E76CC[] =
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gCursorIconAnimTable[] =
+static const union AnimCmd *const sCursorAnimTable[] =
 {
-    gSpriteAnim_83E76C0,
-    gSpriteAnim_83E76CC,
+    sCursorAnimSeq0,
+    sCursorAnimSeq1,
 };
 
-void SpriteCB_CursorIcon(struct Sprite *sprite)
+static void SpriteCB_Cursor(struct Sprite *sprite)
 {
     if (gRegionMap->unk7A != 0)
     {
@@ -1064,44 +1060,44 @@ void SpriteCB_CursorIcon(struct Sprite *sprite)
     }
 }
 
-void nullsub_66(struct Sprite *sprite)
+static void nullsub_66(struct Sprite *sprite)
 {
 }
 
-void CreateRegionMapCursorIcon(u16 tileTag, u16 paletteTag)
+void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
 {
     u8 spriteId;
     struct SpriteSheet spriteSheet;
     struct SpritePalette spritePalette =
     {
-        .data = gPokenavCursor_Pal,
+        .data = sRegionMapCursor_Pal,
     };
     struct SpriteTemplate spriteTemplate =
     {
-        .oam = &gCursorIconOamData,
-        .anims = gCursorIconAnimTable,
+        .oam = &sCursorOamData,
+        .anims = sCursorAnimTable,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = SpriteCB_CursorIcon,
+        .callback = SpriteCB_Cursor,
     };
 
     spriteSheet.tag = tileTag;
     spriteTemplate.tileTag = tileTag;
-    gRegionMap->cursorIconTileTag = tileTag;
+    gRegionMap->cursorTileTag = tileTag;
 
     spritePalette.tag = paletteTag;
     spriteTemplate.paletteTag = paletteTag;
-    gRegionMap->cursorIconPaletteTag = paletteTag;
+    gRegionMap->cursorPaletteTag = paletteTag;
 
     if (gRegionMap->zoomed == FALSE)
     {
-        spriteSheet.data = gRegionMap->unk180;
+        spriteSheet.data = gRegionMap->cursorSmallImage;
         spriteSheet.size = 0x100;
-        spriteTemplate.callback = SpriteCB_CursorIcon;
+        spriteTemplate.callback = SpriteCB_Cursor;
     }
     else
     {
-        spriteSheet.data = gRegionMap->unk280;
+        spriteSheet.data = gRegionMap->cursorLargeImage;
         spriteSheet.size = 0x600;
         spriteTemplate.callback = nullsub_66;
     }
@@ -1110,47 +1106,47 @@ void CreateRegionMapCursorIcon(u16 tileTag, u16 paletteTag)
     spriteId = CreateSprite(&spriteTemplate, 0x38, 0x48, 0);
     if (spriteId != 64)
     {
-        gRegionMap->cursorIconSprite = &gSprites[spriteId];
+        gRegionMap->cursorSprite = &gSprites[spriteId];
         if (gRegionMap->zoomed == TRUE)
         {
-            gRegionMap->cursorIconSprite->oam.size = 2;
-            gRegionMap->cursorIconSprite->pos1.x -= 8;
-            gRegionMap->cursorIconSprite->pos1.y -= 8;
-            StartSpriteAnim(gRegionMap->cursorIconSprite, 1);
+            gRegionMap->cursorSprite->oam.size = 2;
+            gRegionMap->cursorSprite->pos1.x -= 8;
+            gRegionMap->cursorSprite->pos1.y -= 8;
+            StartSpriteAnim(gRegionMap->cursorSprite, 1);
         }
         else
         {
-            gRegionMap->cursorIconSprite->oam.size = 1;
-            gRegionMap->cursorIconSprite->pos1.x = gRegionMap->cursorPosX * 8 + 4;
-            gRegionMap->cursorIconSprite->pos1.y = gRegionMap->cursorPosY * 8 + 4;
+            gRegionMap->cursorSprite->oam.size = 1;
+            gRegionMap->cursorSprite->pos1.x = gRegionMap->cursorPosX * 8 + 4;
+            gRegionMap->cursorSprite->pos1.y = gRegionMap->cursorPosY * 8 + 4;
         }
-        gRegionMap->cursorIconSprite->data1 = 2;
-        gRegionMap->cursorIconSprite->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101;
-        gRegionMap->cursorIconSprite->data3 = 1;
+        gRegionMap->cursorSprite->data1 = 2;
+        gRegionMap->cursorSprite->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101;
+        gRegionMap->cursorSprite->data3 = 1;
     }
 }
 
-void sub_80FBCA0(void)
+static void sub_80FBCA0(void)
 {
-    if (gRegionMap->cursorIconSprite != NULL)
+    if (gRegionMap->cursorSprite != NULL)
     {
-        DestroySprite(gRegionMap->cursorIconSprite);
-        FreeSpriteTilesByTag(gRegionMap->cursorIconTileTag);
-        FreeSpritePaletteByTag(gRegionMap->cursorIconPaletteTag);
+        DestroySprite(gRegionMap->cursorSprite);
+        FreeSpriteTilesByTag(gRegionMap->cursorTileTag);
+        FreeSpritePaletteByTag(gRegionMap->cursorPaletteTag);
     }
 }
 
 void unref_sub_80FBCD0(void)
 {
-    gRegionMap->cursorIconSprite->data3 = 1;
+    gRegionMap->cursorSprite->data3 = 1;
 }
 
 void unref_sub_80FBCE0(void)
 {
-    gRegionMap->cursorIconSprite->data3 = 0;
+    gRegionMap->cursorSprite->data3 = 0;
 }
 
-const struct OamData gOamData_083E7708 =
+static const struct OamData sPlayerIconOamData =
 {
     .y = 0,
     .affineMode = 0,
@@ -1167,37 +1163,37 @@ const struct OamData gOamData_083E7708 =
     .affineParam = 0,
 };
 
-const union AnimCmd gSpriteAnim_83E7710[] =
+static const union AnimCmd sPlayerIconAnimSeq0[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSpriteAnimTable_083E7718[] =
+static const union AnimCmd *const sPlayerIconAnimTable[] =
 {
-    gSpriteAnim_83E7710,
+    sPlayerIconAnimSeq0,
 };
 
 void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
 {
     u8 spriteId;
-    struct SpriteSheet spriteSheet =
+    struct SpriteSheet playerIconSpriteSheet =
     {
-        .data = gRegionMapBrendanIconTiles,
+        .data = sRegionMapBrendanIcon_Image,
         .size = 128,
         .tag = tileTag,
     };
-    struct SpritePalette spritePalette =
+    struct SpritePalette playerIconSpritePalette =
     {
-        .data = gRegionMapBrendanIconPalette,
+        .data = sRegionMapBrendanIcon_Pal,
         .tag = paletteTag,
     };
-    struct SpriteTemplate spriteTemplate =
+    struct SpriteTemplate playerIconSpriteTemplate =
     {
         .tileTag = tileTag,
         .paletteTag = paletteTag,
-        .oam = &gOamData_083E7708,
-        .anims = gSpriteAnimTable_083E7718,
+        .oam = &sPlayerIconOamData,
+        .anims = sPlayerIconAnimTable,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -1205,12 +1201,12 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
 
     if (gSaveBlock2.playerGender == FEMALE)
     {
-        spriteSheet.data = gRegionMapMayIconTiles;
-        spritePalette.data = gRegionMapMayIconPalette;
+        playerIconSpriteSheet.data = sRegionMapMayIcon_Image;
+        playerIconSpritePalette.data = sRegionMapMayIcon_Pal;
     }
-    LoadSpriteSheet(&spriteSheet);
-    LoadSpritePalette(&spritePalette);
-    spriteId = CreateSprite(&spriteTemplate, 0, 0, 1);
+    LoadSpriteSheet(&playerIconSpriteSheet);
+    LoadSpritePalette(&playerIconSpritePalette);
+    spriteId = CreateSprite(&playerIconSpriteTemplate, 0, 0, 1);
     gRegionMap->playerIconSprite = &gSprites[spriteId];
     if (gRegionMap->zoomed == FALSE)
     {
@@ -1226,7 +1222,7 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
     }
 }
 
-void sub_80FBDF8(void)
+static void sub_80FBDF8(void)
 {
     if (gRegionMap->playerIconSprite != NULL)
     {
@@ -1235,7 +1231,7 @@ void sub_80FBDF8(void)
     }
 }
 
-void sub_80FBE24(void)
+static void sub_80FBE24(void)
 {
     if (gRegionMap->playerIconSprite != NULL)
     {
@@ -1258,7 +1254,7 @@ void sub_80FBE24(void)
     }
 }
 
-void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite)
+static void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite)
 {
     sprite->pos2.x = -(gRegionMap->scrollX * 2);
     sprite->pos2.y = -(gRegionMap->scrollY * 2);
@@ -1277,12 +1273,12 @@ void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite)
         sprite->invisible = TRUE;
 }
 
-void SpriteCB_PlayerIconZoomedOut(struct Sprite *sprite)
+static void SpriteCB_PlayerIconZoomedOut(struct Sprite *sprite)
 {
     UpdateIconBlink(sprite);
 }
 
-void UpdateIconBlink(struct Sprite *sprite)
+static void UpdateIconBlink(struct Sprite *sprite)
 {
     if (gRegionMap->blinkPlayerIcon)
     {
@@ -1338,7 +1334,7 @@ const u8 *CopyLocationName(u8 *dest, u16 mapSecId)
         return CopyMapName(dest, mapSecId);
 }
 
-void GetRegionMapLocationPosition(u16 mapSecId, u16 *x, u16 *y, u16 *width, u16 *height)
+static void GetRegionMapLocationPosition(u16 mapSecId, u16 *x, u16 *y, u16 *width, u16 *height)
 {
     *x = gRegionMapLocations[mapSecId].x;
     *y = gRegionMapLocations[mapSecId].y;
@@ -1360,13 +1356,13 @@ extern u8 ewram[];
 #define ewramA6E (ewram[0xA6E])
 #define ewramBlankMapName (ewram + 0xA48)
 
-const u16 gUnknown_083E771C[] = INCBIN_U16("graphics/pokenav/map_frame.gbapal");
-const u8 gUnknown_083E773C[] = INCBIN_U8("graphics/pokenav/map_frame.4bpp.lz");
-const u8 gUnknown_083E7774[] = INCBIN_U8("graphics/pokenav/map_frame.bin.lz");
-const u16 gPokenavMapMisc_Pal[] = INCBIN_U16("graphics/pokenav/map_misc.gbapal");
-const u8 gUnknown_083E784C[] = INCBIN_U8("graphics/pokenav/map_misc.4bpp.lz");
+static const u16 sFlyRegionMapFrame_Pal[] = INCBIN_U16("graphics/pokenav/map_frame.gbapal");
+static const u8 sFlyRegionMapFrame_ImageLZ[] = INCBIN_U8("graphics/pokenav/map_frame.4bpp.lz");
+static const u8 sFlyRegionMapFrame_TilemapLZ[] = INCBIN_U8("graphics/pokenav/map_frame.bin.lz");
+static const u16 sFlyTargetIcons_Pal[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal");
+static const u8 sFlyTargetIcons_ImageLZ[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
 
-const u8 gUnknown_083E7920[][3] =
+static const u8 sUnknown_083E7920[][3] =
 {
     {0,  9,  1},
     {0, 10, 14},
@@ -1427,27 +1423,27 @@ struct UnknownStruct4
     u16 flag;
 };
 
-const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, OtherText_PokeCenter};
+static const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, OtherText_PokeCenter};
 
-const struct UnknownStruct4 gUnknown_083E79C0[1] =
+static const struct UnknownStruct4 sUnknown_083E79C0[1] =
 {
-    {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, 0x854},
+    {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, SYS_POKEMON_LEAGUE_FLY},
 };
 
 // XXX: what is this?
 static u8 *const ewram_ = ewram;
 
-const struct SpritePalette gUnknown_083E79CC = {gPokenavMapMisc_Pal, 2};
+static const struct SpritePalette sFlyTargetIconSpritePalette = {sFlyTargetIcons_Pal, 2};
 
 // Fly targets that are not cities or towns
-const u16 gSpecialFlyAreas[][2] =
+static const u16 sSpecialFlyAreas[][2] =
 {
     // flag, mapSecId
     {0x848, MAPSEC_BATTLE_TOWER},
     {0xFFFF, MAPSEC_NONE},
 };
 
-const struct OamData gFlyTargetOamData =
+static const struct OamData sFlyTargetOamData =
 {
     .y = 0,
     .affineMode = 0,
@@ -1464,65 +1460,65 @@ const struct OamData gFlyTargetOamData =
     .affineParam = 0,
 };
 
-const union AnimCmd gFlyTargetAnimSeq0[] =
+static const union AnimCmd sFlyTargetAnimSeq0[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFlyTargetAnimSeq1[] =
+static const union AnimCmd sFlyTargetAnimSeq1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFlyTargetAnimSeq2[] =
+static const union AnimCmd sFlyTargetAnimSeq2[] =
 {
     ANIMCMD_FRAME(3, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFlyTargetAnimSeq3[] =
+static const union AnimCmd sFlyTargetAnimSeq3[] =
 {
     ANIMCMD_FRAME(5, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFlyTargetAnimSeq4[] =
+static const union AnimCmd sFlyTargetAnimSeq4[] =
 {
     ANIMCMD_FRAME(6, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFlyTargetAnimSeq5[] =
+static const union AnimCmd sFlyTargetAnimSeq5[] =
 {
     ANIMCMD_FRAME(8, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd gFlyTargetAnimSeq6[] =
+static const union AnimCmd sFlyTargetAnimSeq6[] =
 {
     ANIMCMD_FRAME(10, 5),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFlyTargetAnimTable[] =
+static const union AnimCmd *const sFlyTargetAnimTable[] =
 {
-    gFlyTargetAnimSeq0,
-    gFlyTargetAnimSeq1,
-    gFlyTargetAnimSeq2,
-    gFlyTargetAnimSeq3,
-    gFlyTargetAnimSeq4,
-    gFlyTargetAnimSeq5,
-    gFlyTargetAnimSeq6,
+    sFlyTargetAnimSeq0,
+    sFlyTargetAnimSeq1,
+    sFlyTargetAnimSeq2,
+    sFlyTargetAnimSeq3,
+    sFlyTargetAnimSeq4,
+    sFlyTargetAnimSeq5,
+    sFlyTargetAnimSeq6,
 };
 
-const struct SpriteTemplate gFlyTargetSpriteTemplate =
+static const struct SpriteTemplate gFlyTargetSpriteTemplate =
 {
     .tileTag = 2,
     .paletteTag = 2,
-    .oam = &gFlyTargetOamData,
-    .anims = gFlyTargetAnimTable,
+    .oam = &sFlyTargetOamData,
+    .anims = sFlyTargetAnimTable,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy,
@@ -1557,20 +1553,20 @@ void CB2_InitFlyRegionMap(void)
         break;
     case 3:
         InitRegionMap(&ewram0.regionMap, 0);
-        CreateRegionMapCursorIcon(0, 0);
+        CreateRegionMapCursor(0, 0);
         CreateRegionMapPlayerIcon(1, 1);
         ewram0.unk6 = ewram0.regionMap.mapSecId;
         StringFill(ewramBlankMapName, CHAR_SPACE, 12);
         PrintFlyTargetName();
         break;
     case 4:
-        LZ77UnCompVram(gUnknown_083E773C, (void *)(VRAM + 0xC000));
+        LZ77UnCompVram(sFlyRegionMapFrame_ImageLZ, (void *)(VRAM + 0xC000));
         break;
     case 5:
-        LZ77UnCompVram(gUnknown_083E7774, (void *)(VRAM + 0xF000));
+        LZ77UnCompVram(sFlyRegionMapFrame_TilemapLZ, (void *)(VRAM + 0xF000));
         break;
     case 6:
-        LoadPalette(gUnknown_083E771C, 16, 32);
+        LoadPalette(sFlyRegionMapFrame_Pal, 16, 32);
         MenuPrint_PixelCoords(gOtherText_FlyToWhere, 1, 0x90, 1);
         break;
     case 7:
@@ -1578,14 +1574,14 @@ void CB2_InitFlyRegionMap(void)
         break;
     case 8:
         BlendPalettes(0xFFFFFFFF, 16, 0);
-        SetVBlankCallback(sub_80FC214);
+        SetVBlankCallback(VBlankCB_FlyRegionMap);
         break;
     case 9:
         REG_BLDCNT = 0;
         REG_BG1CNT = 0x1E0D;
         REG_DISPCNT = 0x1741;
         sub_80FC244(sub_80FC5B4);
-        SetMainCallback2(sub_80FC228);
+        SetMainCallback2(CB2_FlyRegionMap);
         break;
     default:
         return;
@@ -1593,36 +1589,36 @@ void CB2_InitFlyRegionMap(void)
     gMain.state++;
 }
 
-void sub_80FC214(void)
+static void VBlankCB_FlyRegionMap(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void sub_80FC228(void)
+static void CB2_FlyRegionMap(void)
 {
     ewram0.unk0();
     AnimateSprites();
     BuildOamBuffer();
 }
 
-void sub_80FC244(void (*func)(void))
+static void sub_80FC244(void (*func)(void))
 {
     ewram0.unk0 = func;
     ewram0.unk4 = 0;
 }
 
-void PrintFlyTargetName(void)
+static void PrintFlyTargetName(void)
 {
     if (ewram0.regionMap.unk16 == 2 || ewram0.regionMap.unk16 == 4)
     {
         u16 i = 0;
         int zero;
 
-        for (i = 0; i < ARRAY_COUNT(gUnknown_083E79C0); i++)
+        for (i = 0; i < ARRAY_COUNT(sUnknown_083E79C0); i++)
         {
-            const struct UnknownStruct4 *r4 = &gUnknown_083E79C0[i];
+            const struct UnknownStruct4 *r4 = &sUnknown_083E79C0[i];
 
             if (ewram0.regionMap.mapSecId == r4->mapSecId)
             {
@@ -1653,22 +1649,22 @@ void PrintFlyTargetName(void)
     }
 }
 
-void CreateFlyTargetGraphics(void)
+static void CreateFlyTargetGraphics(void)
 {
     struct SpriteSheet spriteSheet;
 
-    LZ77UnCompWram(gUnknown_083E784C, ewram888);
+    LZ77UnCompWram(sFlyTargetIcons_ImageLZ, ewram888);
     spriteSheet.data = ewram888;
     spriteSheet.size = 0x1C0;
     spriteSheet.tag = 2;
     LoadSpriteSheet(&spriteSheet);
-    LoadSpritePalette(&gUnknown_083E79CC);
+    LoadSpritePalette(&sFlyTargetIconSpritePalette);
     CreateCityTownFlyTargetIcons();
     CreateSpecialAreaFlyTargetIcons();
 }
 
 // Draws a light overlay on cities and towns that the player can fly to
-void CreateCityTownFlyTargetIcons(void)
+static void CreateCityTownFlyTargetIcons(void)
 {
     u16 canFlyFlag = 0x80F;
     u16 i;
@@ -1708,20 +1704,20 @@ void CreateCityTownFlyTargetIcons(void)
 
 // Draws a red box on other fly targets
 // The Battle Tower is the only one of these
-void CreateSpecialAreaFlyTargetIcons(void)
+static void CreateSpecialAreaFlyTargetIcons(void)
 {
     u16 i;
 
-    for (i = 0; gSpecialFlyAreas[i][1] != MAPSEC_NONE; i++)
+    for (i = 0; sSpecialFlyAreas[i][1] != MAPSEC_NONE; i++)
     {
         u16 x;
         u16 y;
         u16 width;
         u16 height;
 
-        if (FlagGet(gSpecialFlyAreas[i][0]))
+        if (FlagGet(sSpecialFlyAreas[i][0]))
         {
-            u16 mapSecId = gSpecialFlyAreas[i][1];
+            u16 mapSecId = sSpecialFlyAreas[i][1];
             u8 spriteId;
 
             GetRegionMapLocationPosition(mapSecId, &x, &y, &width, &height);
@@ -1739,7 +1735,7 @@ void CreateSpecialAreaFlyTargetIcons(void)
     }
 }
 
-void SpriteCB_FlyTargetIcons(struct Sprite *sprite)
+static void SpriteCB_FlyTargetIcons(struct Sprite *sprite)
 {
     // Blink if our mapSecId is the one selected on the map
     if (ewram0.regionMap.mapSecId == sprite->data0)
@@ -1759,7 +1755,7 @@ void SpriteCB_FlyTargetIcons(struct Sprite *sprite)
     }
 }
 
-void sub_80FC5B4(void)
+static void sub_80FC5B4(void)
 {
     switch (ewram0.unk4)
     {
@@ -1775,7 +1771,7 @@ void sub_80FC5B4(void)
     }
 }
 
-void sub_80FC600(void)
+static void sub_80FC600(void)
 {
     if (ewram0.unk4 == 0)
     {
@@ -1805,7 +1801,7 @@ void sub_80FC600(void)
     }
 }
 
-void sub_80FC69C(void)
+static void sub_80FC69C(void)
 {
     switch (ewram0.unk4)
     {
@@ -1834,10 +1830,10 @@ void sub_80FC69C(void)
                 sub_8053538((FlagGet(0x854) && ewram0.regionMap.everGrandeCityArea == 0) ? 20 : 11);
                 break;
             default:
-                if (gUnknown_083E7920[ewram0.regionMap.mapSecId][2] != 0)
-                    sub_8053538(gUnknown_083E7920[ewram0.regionMap.mapSecId][2]);
+                if (sUnknown_083E7920[ewram0.regionMap.mapSecId][2] != 0)
+                    sub_8053538(sUnknown_083E7920[ewram0.regionMap.mapSecId][2]);
                 else
-                    warp1_set_2(gUnknown_083E7920[ewram0.regionMap.mapSecId][0], gUnknown_083E7920[ewram0.regionMap.mapSecId][1], -1);
+                    warp1_set_2(sUnknown_083E7920[ewram0.regionMap.mapSecId][0], sUnknown_083E7920[ewram0.regionMap.mapSecId][1], -1);
                 break;
             }
             sub_80865BC();
-- 
cgit v1.2.3


From 089c1b076901bd9eafac6a7753546612076399fb Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Sun, 16 Jul 2017 21:08:42 -0700
Subject: decompile pokemon_icon

---
 src/pokemon_icon.c | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 285 insertions(+)
 create mode 100644 src/pokemon_icon.c

(limited to 'src')

diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
new file mode 100644
index 000000000..7559f0322
--- /dev/null
+++ b/src/pokemon_icon.c
@@ -0,0 +1,285 @@
+#include "global.h"
+#include "mail_data.h"
+#include "species.h"
+#include "sprite.h"
+
+#define POKE_ICON_BASE_PAL_TAG 56000
+
+struct MonIconSpriteTemplate
+{
+    const struct OamData *oam;
+    const u8 *image;
+    const union AnimCmd *const *anims;
+    const union AffineAnimCmd *const *affineAnims;
+    void (*callback)(struct Sprite *);
+    u16 paletteTag;
+};
+
+extern u8 *gMonIconTable[];
+extern u8 gMonIconPaletteIndices[];
+extern const struct SpritePalette gMonIconPaletteTable[];
+extern struct OamData gOamData_83BC5E8;
+extern const union AnimCmd *const gSpriteAnimTable_83BC62C[];
+extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83BC660[];
+extern u16 gSpriteImageSizes[3][4];
+
+u16 GetUnownLetterByPersonality(u32);
+u8 *GetMonIconPtr(u16, u32 personality);
+u8 UpdateMonIconFrame(struct Sprite *);
+u8 CreateMonIconSprite(struct MonIconSpriteTemplate *, s16, s16, u8);
+void sub_809D7E8(struct Sprite *);
+
+// duplicate of sub_809D3A4
+u8 unref_sub_809D26C(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority)
+{
+    u8 spriteId;
+    struct MonIconSpriteTemplate iconTemplate;
+    struct MonIconSpriteTemplate *iconTemplatePtr = &iconTemplate; // needed to match
+
+    iconTemplatePtr->oam = &gOamData_83BC5E8;
+    iconTemplatePtr->image = gMonIconTable[species];
+    iconTemplatePtr->anims = gSpriteAnimTable_83BC62C;
+    iconTemplatePtr->affineAnims = gSpriteAffineAnimTable_83BC660;
+    iconTemplatePtr->callback = callback;
+    iconTemplatePtr->paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndices[species];
+
+    spriteId = CreateMonIconSprite(iconTemplatePtr, x, y, subpriority);
+
+    UpdateMonIconFrame(&gSprites[spriteId]);
+
+    return spriteId;
+}
+
+u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality)
+{
+    u8 spriteId;
+    struct MonIconSpriteTemplate iconTemplate =
+    {
+        .oam = &gOamData_83BC5E8,
+        .image = GetMonIconPtr(species, personality),
+        .anims = gSpriteAnimTable_83BC62C,
+        .affineAnims = gSpriteAffineAnimTable_83BC660,
+        .callback = callback,
+        .paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndices[species],
+    };
+
+    if (species > SPECIES_EGG)
+        iconTemplate.paletteTag = POKE_ICON_BASE_PAL_TAG;
+
+    spriteId = CreateMonIconSprite(&iconTemplate, x, y, subpriority);
+
+    UpdateMonIconFrame(&gSprites[spriteId]);
+
+    return spriteId;
+}
+
+u8 sub_809D3A4(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority)
+{
+    u8 spriteId;
+    struct MonIconSpriteTemplate iconTemplate;
+    struct MonIconSpriteTemplate *iconTemplatePtr = &iconTemplate; // needed to match
+
+    iconTemplatePtr->oam = &gOamData_83BC5E8;
+    iconTemplatePtr->image = gMonIconTable[species];
+    iconTemplatePtr->anims = gSpriteAnimTable_83BC62C;
+    iconTemplatePtr->affineAnims = gSpriteAffineAnimTable_83BC660;
+    iconTemplatePtr->callback = callback;
+    iconTemplatePtr->paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndices[species];
+
+    spriteId = CreateMonIconSprite(iconTemplatePtr, x, y, subpriority);
+
+    UpdateMonIconFrame(&gSprites[spriteId]);
+
+    return spriteId;
+}
+
+u16 mon_icon_convert_unown_species_id(u16 species, u32 personality)
+{
+    u16 result;
+
+    if (species == SPECIES_UNOWN)
+    {
+        u16 letter = GetUnownLetterByPersonality(personality);
+        if (letter == 0)
+            letter = SPECIES_UNOWN;
+        else
+            letter += (SPECIES_UNOWN_B - 1);
+        result = letter;
+    }
+    else
+    {
+        if (species > SPECIES_EGG)
+            result = 260;
+        else
+            result = species;
+    }
+
+    return result;
+}
+
+u16 GetUnownLetterByPersonality(u32 personality)
+{
+    return (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 0x3)) % 0x1C;
+}
+
+u16 sub_809D4A8(u16 species)
+{
+    u16 value;
+
+    if (MailSpeciesToSpecies(species, &value) == SPECIES_UNOWN)
+    {
+        if (value == 0)
+            value += SPECIES_UNOWN;
+        else
+            value += (SPECIES_UNOWN_B - 1);
+        return value;
+    }
+    else
+    {
+        return mon_icon_convert_unown_species_id(species, 0);
+    }
+}
+
+u8 *GetMonIconPtr(u16 species, u32 personality)
+{
+    u16 convertedSpecies = mon_icon_convert_unown_species_id(species, personality);
+    return gMonIconTable[convertedSpecies];
+}
+
+void sub_809D510(struct Sprite *sprite)
+{
+    sub_809D7E8(sprite);
+}
+
+void sub_809D51C(void)
+{
+    u8 i;
+    for (i = 0; i < 6; i++)
+        LoadSpritePalette(&gMonIconPaletteTable[i]);
+}
+
+// unused
+void SafeLoadMonIconPalette(u16 species)
+{
+    u8 palIndex;
+    if (species > SPECIES_EGG)
+        species = 260;
+    palIndex = gMonIconPaletteIndices[species];
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
+        LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
+}
+
+void sub_809D580(u16 species)
+{
+    u8 palIndex = gMonIconPaletteIndices[species];
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
+        LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
+}
+
+// unused
+void FreeMonIconPalettes(void)
+{
+    u8 i;
+    for (i = 0; i < 6; i++)
+        FreeSpritePaletteByTag(gMonIconPaletteTable[i].tag);
+}
+
+// unused
+void SafeFreeMonIconPalette(u16 species)
+{
+    u8 palIndex;
+    if (species > SPECIES_EGG)
+        species = 260;
+    palIndex = gMonIconPaletteIndices[species];
+    FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
+}
+
+void sub_809D608(u16 species)
+{
+    u8 palIndex;
+    palIndex = gMonIconPaletteIndices[species];
+    FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
+}
+
+void sub_809D62C(struct Sprite *sprite)
+{
+    UpdateMonIconFrame(sprite);
+}
+
+// TODO: try to find a way to avoid using goto and asm statement
+u8 UpdateMonIconFrame(struct Sprite *sprite)
+{
+    u8 result = 0;
+
+    if (sprite->animDelayCounter == 0)
+    {
+        s16 frame = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue;
+
+        if (frame != -2)
+        {
+            if (frame != -1)
+                goto copy;
+            goto end;
+        }
+
+        sprite->animCmdIndex = 0;
+        goto end;
+
+    copy:
+        RequestSpriteCopy(
+            (u8 *)sprite->images + gSpriteImageSizes[sprite->oam.shape][sprite->oam.size] * frame,
+            (u8 *)OBJ_VRAM0 + sprite->oam.tileNum * TILE_SIZE_4BPP,
+            gSpriteImageSizes[sprite->oam.shape][sprite->oam.size]);
+        {
+            register u8 duration asm("r0") = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration;
+            sprite->animDelayCounter = duration;
+        }
+        sprite->animCmdIndex++;
+        result = sprite->animCmdIndex;
+    }
+    else
+    {
+        sprite->animDelayCounter--;
+    }
+
+end:
+    return result;
+}
+
+u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x, s16 y, u8 subpriority)
+{
+    u8 spriteId;
+
+    struct SpriteFrameImage image = { 0, gSpriteImageSizes[iconTemplate->oam->shape][iconTemplate->oam->size] };
+
+    struct SpriteTemplate spriteTemplate =
+    {
+        .tileTag = 0xFFFF,
+        .paletteTag = iconTemplate->paletteTag,
+        .oam = iconTemplate->oam,
+        .anims = iconTemplate->anims,
+        .images = &image,
+        .affineAnims = iconTemplate->affineAnims,
+        .callback = iconTemplate->callback,
+    };
+
+    spriteId = CreateSprite(&spriteTemplate, x, y, subpriority);
+    gSprites[spriteId].animPaused = TRUE;
+    gSprites[spriteId].animBeginning = FALSE;
+    gSprites[spriteId].images = (const struct SpriteFrameImage *)iconTemplate->image;
+    return spriteId;
+}
+
+void sub_809D7E8(struct Sprite *sprite)
+{
+    struct SpriteFrameImage image = { 0, gSpriteImageSizes[sprite->oam.shape][sprite->oam.size] };
+    sprite->images = &image;
+    DestroySprite(sprite);
+}
+
+void sub_809D824(struct Sprite *sprite, u8 animNum)
+{
+    sprite->animNum = animNum;
+    sprite->animDelayCounter = 0;
+    sprite->animCmdIndex = 0;
+}
-- 
cgit v1.2.3


From a1d0d153c025dab893930265e88b3e4d8c917a7a Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Sun, 16 Jul 2017 21:53:57 -0700
Subject: move ROM data into pokemon_icon.c

---
 src/pokemon_icon.c | 1051 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 1021 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 7559f0322..e7cfd60c6 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "graphics.h"
 #include "mail_data.h"
 #include "species.h"
 #include "sprite.h"
@@ -15,16 +16,1006 @@ struct MonIconSpriteTemplate
     u16 paletteTag;
 };
 
-extern u8 *gMonIconTable[];
-extern u8 gMonIconPaletteIndices[];
-extern const struct SpritePalette gMonIconPaletteTable[];
-extern struct OamData gOamData_83BC5E8;
-extern const union AnimCmd *const gSpriteAnimTable_83BC62C[];
-extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83BC660[];
-extern u16 gSpriteImageSizes[3][4];
+const u8 * const gMonIconTable[] =
+{
+    gMonIcon_Bulbasaur,
+    gMonIcon_Bulbasaur,
+    gMonIcon_Ivysaur,
+    gMonIcon_Venusaur,
+    gMonIcon_Charmander,
+    gMonIcon_Charmeleon,
+    gMonIcon_Charizard,
+    gMonIcon_Squirtle,
+    gMonIcon_Wartortle,
+    gMonIcon_Blastoise,
+    gMonIcon_Caterpie,
+    gMonIcon_Metapod,
+    gMonIcon_Butterfree,
+    gMonIcon_Weedle,
+    gMonIcon_Kakuna,
+    gMonIcon_Beedrill,
+    gMonIcon_Pidgey,
+    gMonIcon_Pidgeotto,
+    gMonIcon_Pidgeot,
+    gMonIcon_Rattata,
+    gMonIcon_Raticate,
+    gMonIcon_Spearow,
+    gMonIcon_Fearow,
+    gMonIcon_Ekans,
+    gMonIcon_Arbok,
+    gMonIcon_Pikachu,
+    gMonIcon_Raichu,
+    gMonIcon_Sandshrew,
+    gMonIcon_Sandslash,
+    gMonIcon_NidoranF,
+    gMonIcon_Nidorina,
+    gMonIcon_Nidoqueen,
+    gMonIcon_NidoranM,
+    gMonIcon_Nidorino,
+    gMonIcon_Nidoking,
+    gMonIcon_Clefairy,
+    gMonIcon_Clefable,
+    gMonIcon_Vulpix,
+    gMonIcon_Ninetales,
+    gMonIcon_Jigglypuff,
+    gMonIcon_Wigglytuff,
+    gMonIcon_Zubat,
+    gMonIcon_Golbat,
+    gMonIcon_Oddish,
+    gMonIcon_Gloom,
+    gMonIcon_Vileplume,
+    gMonIcon_Paras,
+    gMonIcon_Parasect,
+    gMonIcon_Venonat,
+    gMonIcon_Venomoth,
+    gMonIcon_Diglett,
+    gMonIcon_Dugtrio,
+    gMonIcon_Meowth,
+    gMonIcon_Persian,
+    gMonIcon_Psyduck,
+    gMonIcon_Golduck,
+    gMonIcon_Mankey,
+    gMonIcon_Primeape,
+    gMonIcon_Growlithe,
+    gMonIcon_Arcanine,
+    gMonIcon_Poliwag,
+    gMonIcon_Poliwhirl,
+    gMonIcon_Poliwrath,
+    gMonIcon_Abra,
+    gMonIcon_Kadabra,
+    gMonIcon_Alakazam,
+    gMonIcon_Machop,
+    gMonIcon_Machoke,
+    gMonIcon_Machamp,
+    gMonIcon_Bellsprout,
+    gMonIcon_Weepinbell,
+    gMonIcon_Victreebel,
+    gMonIcon_Tentacool,
+    gMonIcon_Tentacruel,
+    gMonIcon_Geodude,
+    gMonIcon_Graveler,
+    gMonIcon_Golem,
+    gMonIcon_Ponyta,
+    gMonIcon_Rapidash,
+    gMonIcon_Slowpoke,
+    gMonIcon_Slowbro,
+    gMonIcon_Magnemite,
+    gMonIcon_Magneton,
+    gMonIcon_Farfetchd,
+    gMonIcon_Doduo,
+    gMonIcon_Dodrio,
+    gMonIcon_Seel,
+    gMonIcon_Dewgong,
+    gMonIcon_Grimer,
+    gMonIcon_Muk,
+    gMonIcon_Shellder,
+    gMonIcon_Cloyster,
+    gMonIcon_Gastly,
+    gMonIcon_Haunter,
+    gMonIcon_Gengar,
+    gMonIcon_Onix,
+    gMonIcon_Drowzee,
+    gMonIcon_Hypno,
+    gMonIcon_Krabby,
+    gMonIcon_Kingler,
+    gMonIcon_Voltorb,
+    gMonIcon_Electrode,
+    gMonIcon_Exeggcute,
+    gMonIcon_Exeggutor,
+    gMonIcon_Cubone,
+    gMonIcon_Marowak,
+    gMonIcon_Hitmonlee,
+    gMonIcon_Hitmonchan,
+    gMonIcon_Lickitung,
+    gMonIcon_Koffing,
+    gMonIcon_Weezing,
+    gMonIcon_Rhyhorn,
+    gMonIcon_Rhydon,
+    gMonIcon_Chansey,
+    gMonIcon_Tangela,
+    gMonIcon_Kangaskhan,
+    gMonIcon_Horsea,
+    gMonIcon_Seadra,
+    gMonIcon_Goldeen,
+    gMonIcon_Seaking,
+    gMonIcon_Staryu,
+    gMonIcon_Starmie,
+    gMonIcon_Mrmime,
+    gMonIcon_Scyther,
+    gMonIcon_Jynx,
+    gMonIcon_Electabuzz,
+    gMonIcon_Magmar,
+    gMonIcon_Pinsir,
+    gMonIcon_Tauros,
+    gMonIcon_Magikarp,
+    gMonIcon_Gyarados,
+    gMonIcon_Lapras,
+    gMonIcon_Ditto,
+    gMonIcon_Eevee,
+    gMonIcon_Vaporeon,
+    gMonIcon_Jolteon,
+    gMonIcon_Flareon,
+    gMonIcon_Porygon,
+    gMonIcon_Omanyte,
+    gMonIcon_Omastar,
+    gMonIcon_Kabuto,
+    gMonIcon_Kabutops,
+    gMonIcon_Aerodactyl,
+    gMonIcon_Snorlax,
+    gMonIcon_Articuno,
+    gMonIcon_Zapdos,
+    gMonIcon_Moltres,
+    gMonIcon_Dratini,
+    gMonIcon_Dragonair,
+    gMonIcon_Dragonite,
+    gMonIcon_Mewtwo,
+    gMonIcon_Mew,
+    gMonIcon_Chikorita,
+    gMonIcon_Bayleef,
+    gMonIcon_Meganium,
+    gMonIcon_Cyndaquil,
+    gMonIcon_Quilava,
+    gMonIcon_Typhlosion,
+    gMonIcon_Totodile,
+    gMonIcon_Croconaw,
+    gMonIcon_Feraligatr,
+    gMonIcon_Sentret,
+    gMonIcon_Furret,
+    gMonIcon_Hoothoot,
+    gMonIcon_Noctowl,
+    gMonIcon_Ledyba,
+    gMonIcon_Ledian,
+    gMonIcon_Spinarak,
+    gMonIcon_Ariados,
+    gMonIcon_Crobat,
+    gMonIcon_Chinchou,
+    gMonIcon_Lanturn,
+    gMonIcon_Pichu,
+    gMonIcon_Cleffa,
+    gMonIcon_Igglybuff,
+    gMonIcon_Togepi,
+    gMonIcon_Togetic,
+    gMonIcon_Natu,
+    gMonIcon_Xatu,
+    gMonIcon_Mareep,
+    gMonIcon_Flaaffy,
+    gMonIcon_Ampharos,
+    gMonIcon_Bellossom,
+    gMonIcon_Marill,
+    gMonIcon_Azumarill,
+    gMonIcon_Sudowoodo,
+    gMonIcon_Politoed,
+    gMonIcon_Hoppip,
+    gMonIcon_Skiploom,
+    gMonIcon_Jumpluff,
+    gMonIcon_Aipom,
+    gMonIcon_Sunkern,
+    gMonIcon_Sunflora,
+    gMonIcon_Yanma,
+    gMonIcon_Wooper,
+    gMonIcon_Quagsire,
+    gMonIcon_Espeon,
+    gMonIcon_Umbreon,
+    gMonIcon_Murkrow,
+    gMonIcon_Slowking,
+    gMonIcon_Misdreavus,
+    gMonIcon_UnownA,
+    gMonIcon_Wobbuffet,
+    gMonIcon_Girafarig,
+    gMonIcon_Pineco,
+    gMonIcon_Forretress,
+    gMonIcon_Dunsparce,
+    gMonIcon_Gligar,
+    gMonIcon_Steelix,
+    gMonIcon_Snubbull,
+    gMonIcon_Granbull,
+    gMonIcon_Qwilfish,
+    gMonIcon_Scizor,
+    gMonIcon_Shuckle,
+    gMonIcon_Heracross,
+    gMonIcon_Sneasel,
+    gMonIcon_Teddiursa,
+    gMonIcon_Ursaring,
+    gMonIcon_Slugma,
+    gMonIcon_Magcargo,
+    gMonIcon_Swinub,
+    gMonIcon_Piloswine,
+    gMonIcon_Corsola,
+    gMonIcon_Remoraid,
+    gMonIcon_Octillery,
+    gMonIcon_Delibird,
+    gMonIcon_Mantine,
+    gMonIcon_Skarmory,
+    gMonIcon_Houndour,
+    gMonIcon_Houndoom,
+    gMonIcon_Kingdra,
+    gMonIcon_Phanpy,
+    gMonIcon_Donphan,
+    gMonIcon_Porygon2,
+    gMonIcon_Stantler,
+    gMonIcon_Smeargle,
+    gMonIcon_Tyrogue,
+    gMonIcon_Hitmontop,
+    gMonIcon_Smoochum,
+    gMonIcon_Elekid,
+    gMonIcon_Magby,
+    gMonIcon_Miltank,
+    gMonIcon_Blissey,
+    gMonIcon_Raikou,
+    gMonIcon_Entei,
+    gMonIcon_Suicune,
+    gMonIcon_Larvitar,
+    gMonIcon_Pupitar,
+    gMonIcon_Tyranitar,
+    gMonIcon_Lugia,
+    gMonIcon_HoOh,
+    gMonIcon_Celebi,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_Treecko,
+    gMonIcon_Grovyle,
+    gMonIcon_Sceptile,
+    gMonIcon_Torchic,
+    gMonIcon_Combusken,
+    gMonIcon_Blaziken,
+    gMonIcon_Mudkip,
+    gMonIcon_Marshtomp,
+    gMonIcon_Swampert,
+    gMonIcon_Poochyena,
+    gMonIcon_Mightyena,
+    gMonIcon_Zigzagoon,
+    gMonIcon_Linoone,
+    gMonIcon_Wurmple,
+    gMonIcon_Silcoon,
+    gMonIcon_Beautifly,
+    gMonIcon_Cascoon,
+    gMonIcon_Dustox,
+    gMonIcon_Lotad,
+    gMonIcon_Lombre,
+    gMonIcon_Ludicolo,
+    gMonIcon_Seedot,
+    gMonIcon_Nuzleaf,
+    gMonIcon_Shiftry,
+    gMonIcon_Nincada,
+    gMonIcon_Ninjask,
+    gMonIcon_Shedinja,
+    gMonIcon_Taillow,
+    gMonIcon_Swellow,
+    gMonIcon_Shroomish,
+    gMonIcon_Breloom,
+    gMonIcon_Spinda,
+    gMonIcon_Wingull,
+    gMonIcon_Pelipper,
+    gMonIcon_Surskit,
+    gMonIcon_Masquerain,
+    gMonIcon_Wailmer,
+    gMonIcon_Wailord,
+    gMonIcon_Skitty,
+    gMonIcon_Delcatty,
+    gMonIcon_Kecleon,
+    gMonIcon_Baltoy,
+    gMonIcon_Claydol,
+    gMonIcon_Nosepass,
+    gMonIcon_Torkoal,
+    gMonIcon_Sableye,
+    gMonIcon_Barboach,
+    gMonIcon_Whiscash,
+    gMonIcon_Luvdisc,
+    gMonIcon_Corphish,
+    gMonIcon_Crawdaunt,
+    gMonIcon_Feebas,
+    gMonIcon_Milotic,
+    gMonIcon_Carvanha,
+    gMonIcon_Sharpedo,
+    gMonIcon_Trapinch,
+    gMonIcon_Vibrava,
+    gMonIcon_Flygon,
+    gMonIcon_Makuhita,
+    gMonIcon_Hariyama,
+    gMonIcon_Electrike,
+    gMonIcon_Manectric,
+    gMonIcon_Numel,
+    gMonIcon_Camerupt,
+    gMonIcon_Spheal,
+    gMonIcon_Sealeo,
+    gMonIcon_Walrein,
+    gMonIcon_Cacnea,
+    gMonIcon_Cacturne,
+    gMonIcon_Snorunt,
+    gMonIcon_Glalie,
+    gMonIcon_Lunatone,
+    gMonIcon_Solrock,
+    gMonIcon_Azurill,
+    gMonIcon_Spoink,
+    gMonIcon_Grumpig,
+    gMonIcon_Plusle,
+    gMonIcon_Minun,
+    gMonIcon_Mawile,
+    gMonIcon_Meditite,
+    gMonIcon_Medicham,
+    gMonIcon_Swablu,
+    gMonIcon_Altaria,
+    gMonIcon_Wynaut,
+    gMonIcon_Duskull,
+    gMonIcon_Dusclops,
+    gMonIcon_Roselia,
+    gMonIcon_Slakoth,
+    gMonIcon_Vigoroth,
+    gMonIcon_Slaking,
+    gMonIcon_Gulpin,
+    gMonIcon_Swalot,
+    gMonIcon_Tropius,
+    gMonIcon_Whismur,
+    gMonIcon_Loudred,
+    gMonIcon_Exploud,
+    gMonIcon_Clamperl,
+    gMonIcon_Huntail,
+    gMonIcon_Gorebyss,
+    gMonIcon_Absol,
+    gMonIcon_Shuppet,
+    gMonIcon_Banette,
+    gMonIcon_Seviper,
+    gMonIcon_Zangoose,
+    gMonIcon_Relicanth,
+    gMonIcon_Aron,
+    gMonIcon_Lairon,
+    gMonIcon_Aggron,
+    gMonIcon_Castform,
+    gMonIcon_Volbeat,
+    gMonIcon_Illumise,
+    gMonIcon_Lileep,
+    gMonIcon_Cradily,
+    gMonIcon_Anorith,
+    gMonIcon_Armaldo,
+    gMonIcon_Ralts,
+    gMonIcon_Kirlia,
+    gMonIcon_Gardevoir,
+    gMonIcon_Bagon,
+    gMonIcon_Shelgon,
+    gMonIcon_Salamence,
+    gMonIcon_Beldum,
+    gMonIcon_Metang,
+    gMonIcon_Metagross,
+    gMonIcon_Regirock,
+    gMonIcon_Regice,
+    gMonIcon_Registeel,
+    gMonIcon_Kyogre,
+    gMonIcon_Groudon,
+    gMonIcon_Rayquaza,
+    gMonIcon_Latias,
+    gMonIcon_Latios,
+    gMonIcon_Jirachi,
+    gMonIcon_Deoxys,
+    gMonIcon_Chimecho,
+    gMonIcon_Egg,
+    gMonIcon_UnownB,
+    gMonIcon_UnownC,
+    gMonIcon_UnownD,
+    gMonIcon_UnownE,
+    gMonIcon_UnownF,
+    gMonIcon_UnownG,
+    gMonIcon_UnownH,
+    gMonIcon_UnownI,
+    gMonIcon_UnownJ,
+    gMonIcon_UnownK,
+    gMonIcon_UnownL,
+    gMonIcon_UnownM,
+    gMonIcon_UnownN,
+    gMonIcon_UnownO,
+    gMonIcon_UnownP,
+    gMonIcon_UnownQ,
+    gMonIcon_UnownR,
+    gMonIcon_UnownS,
+    gMonIcon_UnownT,
+    gMonIcon_UnownU,
+    gMonIcon_UnownV,
+    gMonIcon_UnownW,
+    gMonIcon_UnownX,
+    gMonIcon_UnownY,
+    gMonIcon_UnownZ,
+    gMonIcon_UnownExclamationMark,
+    gMonIcon_UnownQuestionMark,
+};
+
+const u8 gMonIconPaletteIndices[] =
+{
+    0, // ??????????
+    1, // Bulbasaur
+    1, // Ivysaur
+    1, // Venusaur
+    0, // Charmander
+    0, // Charmeleon
+    0, // Charizard
+    0, // Squirtle
+    2, // Wartortle
+    2, // Blastoise
+    1, // Caterpie
+    1, // Metapod
+    0, // Butterfree
+    1, // Weedle
+    2, // Kakuna
+    2, // Beedrill
+    0, // Pidgey
+    0, // Pidgeotto
+    0, // Pidgeot
+    2, // Rattata
+    1, // Raticate
+    0, // Spearow
+    0, // Fearow
+    2, // Ekans
+    2, // Arbok
+    2, // Pikachu
+    0, // Raichu
+    2, // Sandshrew
+    2, // Sandslash
+    2, // Nidoran♀
+    2, // Nidorina
+    2, // Nidoqueen
+    2, // Nidoran♂
+    2, // Nidorino
+    2, // Nidoking
+    0, // Clefairy
+    0, // Clefable
+    2, // Vulpix
+    1, // Ninetales
+    0, // Jigglypuff
+    0, // Wigglytuff
+    2, // Zubat
+    2, // Golbat
+    1, // Oddish
+    0, // Gloom
+    0, // Vileplume
+    0, // Paras
+    0, // Parasect
+    0, // Venonat
+    2, // Venomoth
+    2, // Diglett
+    2, // Dugtrio
+    1, // Meowth
+    1, // Persian
+    1, // Psyduck
+    2, // Golduck
+    1, // Mankey
+    2, // Primeape
+    0, // Growlithe
+    0, // Arcanine
+    0, // Poliwag
+    0, // Poliwhirl
+    0, // Poliwrath
+    2, // Abra
+    2, // Kadabra
+    2, // Alakazam
+    0, // Machop
+    2, // Machoke
+    0, // Machamp
+    1, // Bellsprout
+    1, // Weepinbell
+    1, // Victreebel
+    2, // Tentacool
+    2, // Tentacruel
+    1, // Geodude
+    1, // Graveler
+    1, // Golem
+    0, // Ponyta
+    0, // Rapidash
+    0, // Slowpoke
+    0, // Slowbro
+    0, // Magnemite
+    0, // Magneton
+    1, // Farfetch'd
+    2, // Doduo
+    2, // Dodrio
+    2, // Seel
+    2, // Dewgong
+    2, // Grimer
+    2, // Muk
+    2, // Shellder
+    2, // Cloyster
+    2, // Gastly
+    2, // Haunter
+    2, // Gengar
+    2, // Onix
+    2, // Drowzee
+    1, // Hypno
+    2, // Krabby
+    2, // Kingler
+    0, // Voltorb
+    0, // Electrode
+    0, // Exeggcute
+    1, // Exeggutor
+    1, // Cubone
+    1, // Marowak
+    2, // Hitmonlee
+    2, // Hitmonchan
+    1, // Lickitung
+    2, // Koffing
+    2, // Weezing
+    1, // Rhyhorn
+    1, // Rhydon
+    0, // Chansey
+    0, // Tangela
+    1, // Kangaskhan
+    0, // Horsea
+    0, // Seadra
+    0, // Goldeen
+    0, // Seaking
+    2, // Staryu
+    2, // Starmie
+    0, // Mr. mime
+    1, // Scyther
+    2, // Jynx
+    1, // Electabuzz
+    0, // Magmar
+    2, // Pinsir
+    2, // Tauros
+    0, // Magikarp
+    0, // Gyarados
+    2, // Lapras
+    2, // Ditto
+    2, // Eevee
+    0, // Vaporeon
+    0, // Jolteon
+    0, // Flareon
+    0, // Porygon
+    0, // Omanyte
+    0, // Omastar
+    2, // Kabuto
+    2, // Kabutops
+    0, // Aerodactyl
+    1, // Snorlax
+    0, // Articuno
+    0, // Zapdos
+    0, // Moltres
+    0, // Dratini
+    0, // Dragonair
+    2, // Dragonite
+    2, // Mewtwo
+    0, // Mew
+    1, // Chikorita
+    1, // Bayleef
+    1, // Meganium
+    1, // Cyndaquil
+    1, // Quilava
+    1, // Typhlosion
+    2, // Totodile
+    2, // Croconaw
+    2, // Feraligatr
+    2, // Sentret
+    2, // Furret
+    2, // Hoothoot
+    2, // Noctowl
+    0, // Ledyba
+    0, // Ledian
+    1, // Spinarak
+    0, // Ariados
+    2, // Crobat
+    2, // Chinchou
+    0, // Lanturn
+    0, // Pichu
+    0, // Cleffa
+    1, // Igglybuff
+    2, // Togepi
+    2, // Togetic
+    0, // Natu
+    0, // Xatu
+    2, // Mareep
+    0, // Flaaffy
+    0, // Ampharos
+    1, // Bellossom
+    2, // Marill
+    2, // Azumarill
+    1, // Sudowoodo
+    1, // Politoed
+    1, // Hoppip
+    1, // Skiploom
+    2, // Jumpluff
+    2, // Aipom
+    1, // Sunkern
+    1, // Sunflora
+    1, // Yanma
+    0, // Wooper
+    0, // Quagsire
+    2, // Espeon
+    2, // Umbreon
+    2, // Murkrow
+    0, // Slowking
+    0, // Misdreavus
+    0, // Unown A
+    0, // Wobbuffet
+    1, // Girafarig
+    0, // Pineco
+    2, // Forretress
+    2, // Dunsparce
+    2, // Gligar
+    0, // Steelix
+    0, // Snubbull
+    2, // Granbull
+    0, // Qwilfish
+    0, // Scizor
+    1, // Shuckle
+    2, // Heracross
+    0, // Sneasel
+    0, // Teddiursa
+    2, // Ursaring
+    0, // Slugma
+    0, // Magcargo
+    2, // Swinub
+    2, // Piloswine
+    0, // Corsola
+    0, // Remoraid
+    0, // Octillery
+    0, // Delibird
+    2, // Mantine
+    0, // Skarmory
+    0, // Houndour
+    0, // Houndoom
+    0, // Kingdra
+    0, // Phanpy
+    0, // Donphan
+    0, // Porygon2
+    2, // Stantler
+    1, // Smeargle
+    2, // Tyrogue
+    2, // Hitmontop
+    1, // Smoochum
+    1, // Elekid
+    1, // Magby
+    1, // Miltank
+    1, // Blissey
+    0, // Raikou
+    2, // Entei
+    0, // Suicune
+    1, // Larvitar
+    0, // Pupitar
+    1, // Tyranitar
+    0, // Lugia
+    1, // Ho-Oh
+    1, // Celebi
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    1, // Treecko
+    0, // Grovyle
+    1, // Sceptile
+    0, // Torchic
+    0, // Combusken
+    0, // Blaziken
+    0, // Mudkip
+    0, // Marshtomp
+    0, // Swampert
+    2, // Poochyena
+    2, // Mightyena
+    2, // Zigzagoon
+    2, // Linoone
+    0, // Wurmple
+    2, // Silcoon
+    0, // Beautifly
+    2, // Cascoon
+    1, // Dustox
+    1, // Lotad
+    1, // Lombre
+    1, // Ludicolo
+    1, // Seedot
+    1, // Nuzleaf
+    0, // Shiftry
+    1, // Nincada
+    1, // Ninjask
+    1, // Shedinja
+    2, // Taillow
+    2, // Swellow
+    1, // Shroomish
+    1, // Breloom
+    1, // Spinda
+    0, // Wingull
+    0, // Pelipper
+    2, // Surskit
+    0, // Masquerain
+    2, // Wailmer
+    0, // Wailord
+    0, // Skitty
+    2, // Delcatty
+    1, // Kecleon
+    1, // Baltoy
+    0, // Claydol
+    0, // Nosepass
+    1, // Torkoal
+    2, // Sableye
+    0, // Barboach
+    0, // Whiscash
+    0, // Luvdisc
+    0, // Corphish
+    0, // Crawdaunt
+    2, // Feebas
+    0, // Milotic
+    0, // Carvanha
+    0, // Sharpedo
+    1, // Trapinch
+    1, // Vibrava
+    1, // Flygon
+    2, // Makuhita
+    1, // Hariyama
+    1, // Electrike
+    0, // Manectric
+    1, // Numel
+    0, // Camerupt
+    2, // Spheal
+    2, // Sealeo
+    0, // Walrein
+    1, // Cacnea
+    1, // Cacturne
+    2, // Snorunt
+    0, // Glalie
+    1, // Lunatone
+    0, // Solrock
+    2, // Azurill
+    0, // Spoink
+    2, // Grumpig
+    0, // Plusle
+    0, // Minun
+    2, // Mawile
+    0, // Meditite
+    0, // Medicham
+    0, // Swablu
+    0, // Altaria
+    0, // Wynaut
+    0, // Duskull
+    0, // Dusclops
+    0, // Roselia
+    2, // Slakoth
+    2, // Vigoroth
+    1, // Slaking
+    1, // Gulpin
+    2, // Swalot
+    1, // Tropius
+    0, // Whismur
+    2, // Loudred
+    2, // Exploud
+    0, // Clamperl
+    0, // Huntail
+    0, // Gorebyss
+    0, // Absol
+    0, // Shuppet
+    0, // Banette
+    2, // Seviper
+    0, // Zangoose
+    1, // Relicanth
+    2, // Aron
+    2, // Lairon
+    2, // Aggron
+    0, // Castform
+    0, // Volbeat
+    2, // Illumise
+    2, // Lileep
+    0, // Cradily
+    0, // Anorith
+    0, // Armaldo
+    1, // Ralts
+    1, // Kirlia
+    1, // Gardevoir
+    2, // Bagon
+    2, // Shelgon
+    0, // Salamence
+    0, // Beldum
+    0, // Metang
+    0, // Metagross
+    2, // Regirock
+    2, // Regice
+    2, // Registeel
+    2, // Kyogre
+    0, // Groudon
+    1, // Rayquaza
+    0, // Latias
+    2, // Latios
+    0, // Jirachi
+    0, // Deoxys
+    0, // Chimecho
+    1, // Egg
+    0, // Unown B
+    0, // Unown C
+    0, // Unown D
+    0, // Unown E
+    0, // Unown F
+    0, // Unown G
+    0, // Unown H
+    0, // Unown I
+    0, // Unown J
+    0, // Unown K
+    0, // Unown L
+    0, // Unown M
+    0, // Unown N
+    0, // Unown O
+    0, // Unown P
+    0, // Unown Q
+    0, // Unown R
+    0, // Unown S
+    0, // Unown T
+    0, // Unown U
+    0, // Unown V
+    0, // Unown W
+    0, // Unown X
+    0, // Unown Y
+    0, // Unown Z
+    0, // Unown Exclamation Mark
+    0, // Unown Question Mark
+};
+
+static const struct SpritePalette sMonIconPaletteTable[] =
+{
+    { &gMonIconPalettes[0][0], POKE_ICON_BASE_PAL_TAG + 0 },
+    { &gMonIconPalettes[1][0], POKE_ICON_BASE_PAL_TAG + 1 },
+    { &gMonIconPalettes[2][0], POKE_ICON_BASE_PAL_TAG + 2 },
+
+// These palettes are actually part of the title screen BG palette and are not
+// used for Pokémon icons.
+    { &gMonIconPalettes[3][0], POKE_ICON_BASE_PAL_TAG + 3 },
+    { &gMonIconPalettes[4][0], POKE_ICON_BASE_PAL_TAG + 4 },
+    { &gMonIconPalettes[5][0], POKE_ICON_BASE_PAL_TAG + 5 },
+};
+
+static const struct OamData sMonIconOamData =
+{
+    .size = 2,
+    .priority = 1,
+};
+
+// fastest to slowest
+
+static const union AnimCmd sAnim_0[] =
+{
+    ANIMCMD_FRAME(0, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sAnim_1[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sAnim_2[] =
+{
+    ANIMCMD_FRAME(0, 14),
+    ANIMCMD_FRAME(1, 14),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sAnim_3[] =
+{
+    ANIMCMD_FRAME(0, 22),
+    ANIMCMD_FRAME(1, 22),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sAnim_4[] =
+{
+    ANIMCMD_FRAME(0, 29),
+    ANIMCMD_FRAME(0, 29), // frame 0 is repeated
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd *const sMonIconAnims[] =
+{
+    sAnim_0,
+    sAnim_1,
+    sAnim_2,
+    sAnim_3,
+    sAnim_4,
+};
+
+static const union AffineAnimCmd sAffineAnim_0[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, 0, 10),
+    AFFINEANIMCMD_END,
+};
+
+static const union AffineAnimCmd sAffineAnim_1[] =
+{
+    AFFINEANIMCMD_FRAME(0xFFFE, 0xFFFE, 0, 122),
+    AFFINEANIMCMD_END,
+};
+
+static const union AffineAnimCmd *const sMonIconAffineAnims[] =
+{
+    sAffineAnim_0,
+    sAffineAnim_1,
+};
+
+const u16 sSpriteImageSizes[3][4] =
+{
+    // square
+    {
+         0x20, // 1×1
+         0x80, // 2×2
+        0x200, // 4×4
+        0x800, // 8×8
+    },
+
+    // horizontal rectangle
+    {
+         0x40, // 2×1
+         0x80, // 4×1
+        0x100, // 4×2
+        0x400, // 8×4
+    },
+
+    // vertical rectangle
+    {
+         0x40, // 1×2
+         0x80, // 1×4
+        0x100, // 2×4
+        0x400, // 4×8
+    },
+};
 
 u16 GetUnownLetterByPersonality(u32);
-u8 *GetMonIconPtr(u16, u32 personality);
+const u8 *GetMonIconPtr(u16, u32 personality);
 u8 UpdateMonIconFrame(struct Sprite *);
 u8 CreateMonIconSprite(struct MonIconSpriteTemplate *, s16, s16, u8);
 void sub_809D7E8(struct Sprite *);
@@ -36,10 +1027,10 @@ u8 unref_sub_809D26C(u16 species, void (*callback)(struct Sprite *), s16 x, s16
     struct MonIconSpriteTemplate iconTemplate;
     struct MonIconSpriteTemplate *iconTemplatePtr = &iconTemplate; // needed to match
 
-    iconTemplatePtr->oam = &gOamData_83BC5E8;
+    iconTemplatePtr->oam = &sMonIconOamData;
     iconTemplatePtr->image = gMonIconTable[species];
-    iconTemplatePtr->anims = gSpriteAnimTable_83BC62C;
-    iconTemplatePtr->affineAnims = gSpriteAffineAnimTable_83BC660;
+    iconTemplatePtr->anims = sMonIconAnims;
+    iconTemplatePtr->affineAnims = sMonIconAffineAnims;
     iconTemplatePtr->callback = callback;
     iconTemplatePtr->paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndices[species];
 
@@ -55,10 +1046,10 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u
     u8 spriteId;
     struct MonIconSpriteTemplate iconTemplate =
     {
-        .oam = &gOamData_83BC5E8,
+        .oam = &sMonIconOamData,
         .image = GetMonIconPtr(species, personality),
-        .anims = gSpriteAnimTable_83BC62C,
-        .affineAnims = gSpriteAffineAnimTable_83BC660,
+        .anims = sMonIconAnims,
+        .affineAnims = sMonIconAffineAnims,
         .callback = callback,
         .paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndices[species],
     };
@@ -79,10 +1070,10 @@ u8 sub_809D3A4(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8
     struct MonIconSpriteTemplate iconTemplate;
     struct MonIconSpriteTemplate *iconTemplatePtr = &iconTemplate; // needed to match
 
-    iconTemplatePtr->oam = &gOamData_83BC5E8;
+    iconTemplatePtr->oam = &sMonIconOamData;
     iconTemplatePtr->image = gMonIconTable[species];
-    iconTemplatePtr->anims = gSpriteAnimTable_83BC62C;
-    iconTemplatePtr->affineAnims = gSpriteAffineAnimTable_83BC660;
+    iconTemplatePtr->anims = sMonIconAnims;
+    iconTemplatePtr->affineAnims = sMonIconAffineAnims;
     iconTemplatePtr->callback = callback;
     iconTemplatePtr->paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndices[species];
 
@@ -140,7 +1131,7 @@ u16 sub_809D4A8(u16 species)
     }
 }
 
-u8 *GetMonIconPtr(u16 species, u32 personality)
+const u8 *GetMonIconPtr(u16 species, u32 personality)
 {
     u16 convertedSpecies = mon_icon_convert_unown_species_id(species, personality);
     return gMonIconTable[convertedSpecies];
@@ -155,7 +1146,7 @@ void sub_809D51C(void)
 {
     u8 i;
     for (i = 0; i < 6; i++)
-        LoadSpritePalette(&gMonIconPaletteTable[i]);
+        LoadSpritePalette(&sMonIconPaletteTable[i]);
 }
 
 // unused
@@ -165,15 +1156,15 @@ void SafeLoadMonIconPalette(u16 species)
     if (species > SPECIES_EGG)
         species = 260;
     palIndex = gMonIconPaletteIndices[species];
-    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
-        LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
+    if (IndexOfSpritePaletteTag(sMonIconPaletteTable[palIndex].tag) == 0xFF)
+        LoadSpritePalette(&sMonIconPaletteTable[palIndex]);
 }
 
 void sub_809D580(u16 species)
 {
     u8 palIndex = gMonIconPaletteIndices[species];
-    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
-        LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
+    if (IndexOfSpritePaletteTag(sMonIconPaletteTable[palIndex].tag) == 0xFF)
+        LoadSpritePalette(&sMonIconPaletteTable[palIndex]);
 }
 
 // unused
@@ -181,7 +1172,7 @@ void FreeMonIconPalettes(void)
 {
     u8 i;
     for (i = 0; i < 6; i++)
-        FreeSpritePaletteByTag(gMonIconPaletteTable[i].tag);
+        FreeSpritePaletteByTag(sMonIconPaletteTable[i].tag);
 }
 
 // unused
@@ -191,14 +1182,14 @@ void SafeFreeMonIconPalette(u16 species)
     if (species > SPECIES_EGG)
         species = 260;
     palIndex = gMonIconPaletteIndices[species];
-    FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
+    FreeSpritePaletteByTag(sMonIconPaletteTable[palIndex].tag);
 }
 
 void sub_809D608(u16 species)
 {
     u8 palIndex;
     palIndex = gMonIconPaletteIndices[species];
-    FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
+    FreeSpritePaletteByTag(sMonIconPaletteTable[palIndex].tag);
 }
 
 void sub_809D62C(struct Sprite *sprite)
@@ -227,9 +1218,9 @@ u8 UpdateMonIconFrame(struct Sprite *sprite)
 
     copy:
         RequestSpriteCopy(
-            (u8 *)sprite->images + gSpriteImageSizes[sprite->oam.shape][sprite->oam.size] * frame,
+            (u8 *)sprite->images + sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] * frame,
             (u8 *)OBJ_VRAM0 + sprite->oam.tileNum * TILE_SIZE_4BPP,
-            gSpriteImageSizes[sprite->oam.shape][sprite->oam.size]);
+            sSpriteImageSizes[sprite->oam.shape][sprite->oam.size]);
         {
             register u8 duration asm("r0") = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration;
             sprite->animDelayCounter = duration;
@@ -250,7 +1241,7 @@ u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x, s16 y,
 {
     u8 spriteId;
 
-    struct SpriteFrameImage image = { 0, gSpriteImageSizes[iconTemplate->oam->shape][iconTemplate->oam->size] };
+    struct SpriteFrameImage image = { NULL, sSpriteImageSizes[iconTemplate->oam->shape][iconTemplate->oam->size] };
 
     struct SpriteTemplate spriteTemplate =
     {
@@ -272,7 +1263,7 @@ u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x, s16 y,
 
 void sub_809D7E8(struct Sprite *sprite)
 {
-    struct SpriteFrameImage image = { 0, gSpriteImageSizes[sprite->oam.shape][sprite->oam.size] };
+    struct SpriteFrameImage image = { NULL, sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] };
     sprite->images = &image;
     DestroySprite(sprite);
 }
-- 
cgit v1.2.3


From e14ab5c4c7dfe153d0dcb6adad5ddb226a5e2e5f Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Sun, 16 Jul 2017 22:10:00 -0700
Subject: fix German build

---
 src/pokemon_icon.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index e7cfd60c6..d0a1842dd 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -904,7 +904,7 @@ const u8 gMonIconPaletteIndices[] =
     0, // Unown Question Mark
 };
 
-static const struct SpritePalette sMonIconPaletteTable[] =
+const struct SpritePalette gMonIconPaletteTable[] =
 {
     { &gMonIconPalettes[0][0], POKE_ICON_BASE_PAL_TAG + 0 },
     { &gMonIconPalettes[1][0], POKE_ICON_BASE_PAL_TAG + 1 },
@@ -1146,7 +1146,7 @@ void sub_809D51C(void)
 {
     u8 i;
     for (i = 0; i < 6; i++)
-        LoadSpritePalette(&sMonIconPaletteTable[i]);
+        LoadSpritePalette(&gMonIconPaletteTable[i]);
 }
 
 // unused
@@ -1156,15 +1156,15 @@ void SafeLoadMonIconPalette(u16 species)
     if (species > SPECIES_EGG)
         species = 260;
     palIndex = gMonIconPaletteIndices[species];
-    if (IndexOfSpritePaletteTag(sMonIconPaletteTable[palIndex].tag) == 0xFF)
-        LoadSpritePalette(&sMonIconPaletteTable[palIndex]);
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
+        LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
 }
 
 void sub_809D580(u16 species)
 {
     u8 palIndex = gMonIconPaletteIndices[species];
-    if (IndexOfSpritePaletteTag(sMonIconPaletteTable[palIndex].tag) == 0xFF)
-        LoadSpritePalette(&sMonIconPaletteTable[palIndex]);
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
+        LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
 }
 
 // unused
@@ -1172,7 +1172,7 @@ void FreeMonIconPalettes(void)
 {
     u8 i;
     for (i = 0; i < 6; i++)
-        FreeSpritePaletteByTag(sMonIconPaletteTable[i].tag);
+        FreeSpritePaletteByTag(gMonIconPaletteTable[i].tag);
 }
 
 // unused
@@ -1182,14 +1182,14 @@ void SafeFreeMonIconPalette(u16 species)
     if (species > SPECIES_EGG)
         species = 260;
     palIndex = gMonIconPaletteIndices[species];
-    FreeSpritePaletteByTag(sMonIconPaletteTable[palIndex].tag);
+    FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
 }
 
 void sub_809D608(u16 species)
 {
     u8 palIndex;
     palIndex = gMonIconPaletteIndices[species];
-    FreeSpritePaletteByTag(sMonIconPaletteTable[palIndex].tag);
+    FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag);
 }
 
 void sub_809D62C(struct Sprite *sprite)
-- 
cgit v1.2.3


From 92c40a7028ad95ffa11432d1b9eb1ece08d5c4d8 Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Mon, 17 Jul 2017 00:58:32 -0700
Subject: decompile fldeff_flash

---
 src/fldeff_flash.c | 306 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 306 insertions(+)
 create mode 100644 src/fldeff_flash.c

(limited to 'src')

diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
new file mode 100644
index 000000000..6c2633567
--- /dev/null
+++ b/src/fldeff_flash.c
@@ -0,0 +1,306 @@
+#include "global.h"
+#include "event_data.h"
+#include "field_effect.h"
+#include "main.h"
+#include "palette.h"
+#include "pokemon_menu.h"
+#include "rom4.h"
+#include "rom6.h"
+#include "script.h"
+#include "songs.h"
+#include "sound.h"
+#include "sprite.h"
+#include "task.h"
+
+struct FlashStruct
+{
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    void (*func)(void);
+};
+
+extern struct FlashStruct gUnknown_083F7FC4[];
+extern u16 gCaveTransitionPalette_White[];
+extern u16 gCaveTransitionPalette_Black[];
+extern u16 gUnknown_083F808C[];
+extern u16 gUnknown_083F809C[];
+extern u16 gCaveTransitionTilemap[];
+extern u8 gCaveTransitionTiles[];
+
+extern u8 gLastFieldPokeMenuOpened;
+extern void (*gUnknown_03005CE4)(void);
+
+extern u8 gUnknown_081B694A[];
+
+void sub_810CBFC(void);
+void sub_810CC34(void);
+bool8 sub_810CD5C(void);
+void sub_810CE5C(u8);
+void sub_810CE78(u8);
+void sub_810CF18(u8);
+void sub_810CF5C(u8);
+void sub_810CFC4(u8);
+void sub_810D00C(u8);
+void sub_810D028(u8);
+void sub_810D0C4(u8);
+void sub_810D128(u8);
+
+bool8 SetUpFieldMove_Flash(void)
+{
+    if (gMapHeader.cave == TRUE && !FlagGet(SYS_USE_FLASH))
+    {
+        gFieldCallback = sub_808AB90;
+        gUnknown_03005CE4 = sub_810CBFC;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+void sub_810CBFC(void)
+{
+    u8 taskId = oei_task_add();
+    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    gTasks[taskId].data[8] = (uintptr_t)sub_810CC34 >> 16;
+    gTasks[taskId].data[9] = (uintptr_t)sub_810CC34;
+}
+
+void sub_810CC34(void)
+{
+    PlaySE(SE_W115);
+    FlagSet(SYS_USE_FLASH);
+    ScriptContext1_SetupScript(gUnknown_081B694A);
+}
+
+void sub_810CC54(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+static void VBlankCB(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_810CC80(void)
+{
+    u16 ime;
+
+    SetVBlankCallback(NULL);
+    REG_DISPCNT = 0;
+    REG_BG2CNT = 0;
+    REG_BG1CNT = 0;
+    REG_BG0CNT = 0;
+    REG_BG2HOFS = 0;
+    REG_BG2VOFS = 0;
+    REG_BG1HOFS = 0;
+    REG_BG1VOFS = 0;
+    REG_BG0HOFS = 0;
+    REG_BG0VOFS = 0;
+    DmaFill16(3, 0, (void *)VRAM, VRAM_SIZE);
+    DmaFill32(3, 0, (void *)OAM, OAM_SIZE);
+    DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2);
+    ResetPaletteFade();
+    ResetTasks();
+    ResetSpriteData();
+    ime = REG_IME;
+    REG_IME = 0;
+    REG_IE |= INTR_FLAG_VBLANK;
+    REG_IME = ime;
+    SetVBlankCallback(VBlankCB);
+    SetMainCallback2(sub_810CC54);
+    if (!sub_810CD5C())
+        SetMainCallback2(gMain.savedCallback);
+}
+
+bool8 sub_810CD5C(void)
+{
+    u8 i;
+    u8 v0 = get_map_light_from_warp0();
+    u8 v1 = sav1_map_get_light_level();
+
+    for (i = 0; gUnknown_083F7FC4[i].unk0; i++)
+    {
+        if (gUnknown_083F7FC4[i].unk0 == v0 && gUnknown_083F7FC4[i].unk1 == v1)
+        {
+            gUnknown_083F7FC4[i].func();
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+u8 sub_810CDB8(u8 a1, u8 a2)
+{
+    u8 i;
+    u8 v0 = a1;
+    u8 v1 = a2;
+
+    for (i = 0; gUnknown_083F7FC4[i].unk0; i++)
+    {
+        if (gUnknown_083F7FC4[i].unk0 == v0 && gUnknown_083F7FC4[i].unk1 == v1)
+        {
+            return gUnknown_083F7FC4[i].unk2;
+        }
+    }
+
+    return FALSE;
+}
+
+u8 fade_type_for_given_maplight_pair(u8 a1, u8 a2)
+{
+    u8 i;
+    u8 v0 = a1;
+    u8 v1 = a2;
+
+    for (i = 0; gUnknown_083F7FC4[i].unk0; i++)
+    {
+        if (gUnknown_083F7FC4[i].unk0 == v0 && gUnknown_083F7FC4[i].unk1 == v1)
+        {
+            return gUnknown_083F7FC4[i].unk3;
+        }
+    }
+
+    return FALSE;
+}
+
+void sub_810CE48(void)
+{
+    CreateTask(sub_810CE5C, 0);
+}
+
+void sub_810CE5C(u8 taskId)
+{
+    gTasks[taskId].func = sub_810CE78;
+}
+
+void sub_810CE78(u8 taskId)
+{
+    REG_DISPCNT = 0;
+    LZ77UnCompVram(gCaveTransitionTiles, (void *)0x600C000);
+    LZ77UnCompVram(gCaveTransitionTilemap, (void *)0x600F800);
+    LoadPalette(gCaveTransitionPalette_White, 0xE0, 0x20);
+    LoadPalette(gUnknown_083F809C, 0xE0, 0x10);
+    REG_BLDCNT = 15937;
+    REG_BLDALPHA = 0;
+    REG_BLDY = 0;
+    REG_BG0CNT = 7948;
+    REG_DISPCNT = 4416;
+    gTasks[taskId].func = sub_810CF18;
+    gTasks[taskId].data[0] = 16;
+    gTasks[taskId].data[1] = 0;
+}
+
+void sub_810CF18(u8 taskId)
+{
+    u16 count = gTasks[taskId].data[1];
+    u16 blend = count + 0x1000;
+    REG_BLDALPHA = blend;
+    if (count <= 0x10)
+    {
+        gTasks[taskId].data[1]++;
+    }
+    else
+    {
+        gTasks[taskId].data[2] = 0;
+        gTasks[taskId].func = sub_810CF5C;
+    }
+}
+
+void sub_810CF5C(u8 taskId)
+{
+    u16 count;
+
+    REG_BLDALPHA = 4112;
+
+    count = gTasks[taskId].data[2];
+
+    if (count < 8)
+    {
+        gTasks[taskId].data[2]++;
+        LoadPalette(&gUnknown_083F809C[count], 0xE0, 16 - 2 * count);
+    }
+    else
+    {
+        LoadPalette(gCaveTransitionPalette_White, 0, 0x20);
+        gTasks[taskId].func = sub_810CFC4;
+        gTasks[taskId].data[2] = 8;
+    }
+}
+
+void sub_810CFC4(u8 taskId)
+{
+    if (gTasks[taskId].data[2])
+        gTasks[taskId].data[2]--;
+    else
+        SetMainCallback2(gMain.savedCallback);
+}
+
+void sub_810CFF8(void)
+{
+    CreateTask(sub_810D00C, 0);
+}
+
+void sub_810D00C(u8 taskId)
+{
+    gTasks[taskId].func = sub_810D028;
+}
+
+void sub_810D028(u8 taskId)
+{
+    REG_DISPCNT = 0;
+    LZ77UnCompVram(gCaveTransitionTiles, (void *)0x600C000);
+    LZ77UnCompVram(gCaveTransitionTilemap, (void *)0x600F800);
+    REG_BLDCNT = 0;
+    REG_BLDALPHA = 0;
+    REG_BLDY = 0;
+    REG_BG0CNT = 7948;
+    REG_DISPCNT = 4416;
+    LoadPalette(gCaveTransitionPalette_White, 0xE0, 0x20);
+    LoadPalette(gCaveTransitionPalette_Black, 0, 0x20);
+    gTasks[taskId].func = sub_810D0C4;
+    gTasks[taskId].data[0] = 16;
+    gTasks[taskId].data[1] = 0;
+    gTasks[taskId].data[2] = 0;
+}
+
+void sub_810D0C4(u8 taskId)
+{
+    u16 count = gTasks[taskId].data[2];
+    if (count < 16)
+    {
+        gTasks[taskId].data[2]++;
+        gTasks[taskId].data[2]++;
+        LoadPalette(&gUnknown_083F808C[15 - count], 0xE0, 2 * (count + 1));
+    }
+    else
+    {
+        REG_BLDALPHA = 4112;
+        REG_BLDCNT = 15937;
+        gTasks[taskId].func = sub_810D128;
+    }
+}
+
+void sub_810D128(u8 taskId)
+{
+    u16 count = 16 - gTasks[taskId].data[1];
+    u16 blend = count + 0x1000;
+    REG_BLDALPHA = blend;
+    if (count)
+    {
+        gTasks[taskId].data[1]++;
+    }
+    else
+    {
+        LoadPalette(gCaveTransitionPalette_Black, 0, 0x20);
+        SetMainCallback2(gMain.savedCallback);
+    }
+}
-- 
cgit v1.2.3


From a8bcbe3fe4b6b01cdfc85f1003e50b31f34700f2 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 18 Jul 2017 01:08:34 -0500
Subject: make ROM variables non-const

---
 src/record_mixing.c | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index a92743fdb..a8daa9220 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -30,31 +30,19 @@ extern u8 ewram[];
 #define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000))
 
 extern struct RecordMixing_UnknownStruct gUnknown_02038738;
-
-extern void *const recordMixingSecretBases;
-extern void *const recordMixingTvShows;
-extern void *const gUnknown_083D0274;
-extern void *const gUnknown_083D0278;
-extern void *const recordMixingEasyChatPairs;
-extern struct RecordMixing_UnknownStruct *const gUnknown_083D0280;
-extern void *const gUnknown_083D0284;
-
 extern u16 gSpecialVar_0x8005;
 extern u32 gUnknown_03005D2C;
 extern u8 gUnknown_03000718;
 extern u8 gUnknown_0300071C[];
 extern bool8 gReceivedRemoteLinkPlayers;
 
-// I can't define these here or else RecordMixing_PrepareExchangePacket gets optimized.
-/*
-void *const recordMixingSecretBases = &gSaveBlock1.secretBases;
-void *const recordMixingTvShows = &gSaveBlock1.tvShows;
-void *const gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
-void *const gUnknown_083D0278 = &gSaveBlock1.oldMan;
-void *const recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
-struct RecordMixing_UnknownStruct *const gUnknown_083D0280 = &gUnknown_02038738;
-void *const gUnknown_083D0284 = &gSaveBlock2.filler_A8;
-*/
+void *recordMixingSecretBases = &gSaveBlock1.secretBases;
+void *recordMixingTvShows = &gSaveBlock1.tvShows;
+void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
+void *gUnknown_083D0278 = &gSaveBlock1.oldMan;
+void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
+struct RecordMixing_UnknownStruct *gUnknown_083D0280 = &gUnknown_02038738;
+void *gUnknown_083D0284 = &gSaveBlock2.filler_A8;
 
 #define BUFFER_CHUNK_SIZE 200
 
-- 
cgit v1.2.3


From 41becb8ddaa9d3e95119ac2573e4f4e2acac4554 Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Tue, 18 Jul 2017 16:56:17 -0700
Subject: fix comment regarding palettes

---
 src/pokemon_icon.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index d0a1842dd..0835c4dac 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -906,15 +906,15 @@ const u8 gMonIconPaletteIndices[] =
 
 const struct SpritePalette gMonIconPaletteTable[] =
 {
-    { &gMonIconPalettes[0][0], POKE_ICON_BASE_PAL_TAG + 0 },
-    { &gMonIconPalettes[1][0], POKE_ICON_BASE_PAL_TAG + 1 },
-    { &gMonIconPalettes[2][0], POKE_ICON_BASE_PAL_TAG + 2 },
+    { gMonIconPalettes[0], POKE_ICON_BASE_PAL_TAG + 0 },
+    { gMonIconPalettes[1], POKE_ICON_BASE_PAL_TAG + 1 },
+    { gMonIconPalettes[2], POKE_ICON_BASE_PAL_TAG + 2 },
 
-// These palettes are actually part of the title screen BG palette and are not
-// used for Pokémon icons.
-    { &gMonIconPalettes[3][0], POKE_ICON_BASE_PAL_TAG + 3 },
-    { &gMonIconPalettes[4][0], POKE_ICON_BASE_PAL_TAG + 4 },
-    { &gMonIconPalettes[5][0], POKE_ICON_BASE_PAL_TAG + 5 },
+// There are only 3 actual palettes. The following are unused
+// and don't point to valid data.
+    { gMonIconPalettes[3], POKE_ICON_BASE_PAL_TAG + 3 },
+    { gMonIconPalettes[4], POKE_ICON_BASE_PAL_TAG + 4 },
+    { gMonIconPalettes[5], POKE_ICON_BASE_PAL_TAG + 5 },
 };
 
 static const struct OamData sMonIconOamData =
-- 
cgit v1.2.3


From e4a72cbff306e805606c3d95e5192e535fcb0ca8 Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Sat, 15 Jul 2017 18:48:46 -0700
Subject: map out ram variables

---
 src/battle_ai.c              |  2 +-
 src/battle_anim.c            |  8 +++++---
 src/berry_tag_screen.c       | 28 ++++++++++++----------------
 src/bike.c                   |  6 ++----
 src/braille_puzzles.c        |  2 --
 src/cable_club.c             |  1 -
 src/choose_party.c           |  3 ++-
 src/contest_painting.c       | 32 +++++++++++++++++---------------
 src/credits.c                |  9 +++++----
 src/decoration.c             | 21 +++++++++++++++++++++
 src/event_data.c             | 18 +++++++++++++++++-
 src/field_camera.c           | 19 +++++++++----------
 src/field_control_avatar.c   |  7 +++++--
 src/field_effect.c           |  2 ++
 src/field_map_obj.c          |  9 +++++----
 src/field_map_obj_helpers.c  |  2 --
 src/field_message_box.c      |  2 +-
 src/field_player_avatar.c    |  2 +-
 src/field_screen_effect.c    |  1 +
 src/field_specials.c         | 18 ++++++++++++++++++
 src/fieldmap.c               |  2 ++
 src/fldeff_cut.c             |  1 -
 src/fldeff_strength.c        |  2 --
 src/fldeff_sweetscent.c      |  2 --
 src/fldeff_teleport.c        |  2 --
 src/intro.c                  | 10 ++++++----
 src/load_save.c              | 29 ++++++++++++++++-------------
 src/menu_cursor.c            | 13 ++++++-------
 src/money.c                  |  3 ++-
 src/mori_debug_menu.c        |  3 ++-
 src/mystery_event_menu.c     |  3 ++-
 src/mystery_event_script.c   |  4 ++--
 src/new_game.c               |  3 ++-
 src/player_pc.c              |  5 +++--
 src/pokeblock.c              |  9 +++++++++
 src/pokedex.c                | 14 ++++++++------
 src/pokemon_1.c              |  8 +++++++-
 src/pokemon_2.c              |  3 ++-
 src/pokemon_storage_system.c |  2 ++
 src/record_mixing.c          |  9 +++++----
 src/region_map.c             |  2 +-
 src/rom3.c                   | 10 ++++++----
 src/rom4.c                   | 34 +++++++++++++++++-----------------
 src/rom6.c                   |  4 ++--
 src/rotating_gate.c          |  6 +++---
 src/save.c                   | 22 ++++++++++++----------
 src/save_failed_screen.c     | 26 ++++++++++----------------
 src/scrcmd.c                 | 16 ++++++++--------
 src/script.c                 |  3 +--
 src/script_movement.c        |  2 +-
 src/sound.c                  |  8 +++++---
 src/sound_check_menu.c       | 19 ++++++++++---------
 src/start_menu.c             |  4 +++-
 src/title_screen.c           |  3 ++-
 src/trainer_card.c           |  3 ++-
 src/trainer_see.c            |  2 --
 src/tv.c                     | 27 ++++++++++-----------------
 src/use_pokeblock.c          |  9 +++++----
 58 files changed, 298 insertions(+), 221 deletions(-)

(limited to 'src')

diff --git a/src/battle_ai.c b/src/battle_ai.c
index d262e69c8..6f91a104d 100644
--- a/src/battle_ai.c
+++ b/src/battle_ai.c
@@ -38,7 +38,7 @@ the number of bytes that the current command had reserved for arguments
 in order to read the next command correctly. refer to battle_ai_scripts.s for the
 AI scripts.
 */
-extern u8 *gAIScriptPtr;
+EWRAM_DATA u8 *gAIScriptPtr = NULL;
 
 static void BattleAICmd_if_random_less_than(void);
 static void BattleAICmd_if_random_greater_than(void);
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 55ede1788..6bd98099a 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -49,9 +49,11 @@ extern u16 gUnknown_03004280;
 extern u16 gUnknown_03004288;
 extern u16 gUnknown_030042C0;
 extern u16 gUnknown_030042C4;
-extern u16 gSoundAnimFramesToWait;
-extern u16 gAnimSpriteIndexArray[8];
-extern s16 gBattleAnimArgs[8];
+
+u16 gSoundAnimFramesToWait;
+s16 gBattleAnimArgs[8];
+u16 gAnimSpriteIndexArray[8];
+
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern struct MusicPlayerInfo gMPlay_SE1;
 extern struct MusicPlayerInfo gMPlay_SE2;
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 6cbc38ecc..ff430e7b2 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -28,16 +28,12 @@ struct Struct2000000
     /*0x1FFFF*/ u8 var_1FFFF;
 };
 
-struct BerryTagStatus
-{
-    s16 circles[5];
-};
-
 extern struct Struct2000000 unk_2000000;
-extern u8 gUnknown_0203932C;
-extern struct BerryTagStatus gUnknown_0203932E;
 extern u16 gUnknown_030041B4;
 
+static EWRAM_DATA u8 gUnknown_0203932C = 0;
+static EWRAM_DATA s16 gUnknown_0203932E[5] = {0};
+
 extern const struct CompressedSpriteSheet gUnknown_083C1F74;
 extern const struct CompressedSpritePalette gUnknown_083C1F7C;
 
@@ -336,19 +332,19 @@ static void sub_8146600(u8 berry)
 
     berryInfo = GetBerryInfo(berry + 1);
     for (i = 0; i < 5; i++)
-        gUnknown_0203932E.circles[i] = (u16)gUnknown_0203932E.circles[i] | 0xFFFF;
+        gUnknown_0203932E[i] = (u16)gUnknown_0203932E[i] | 0xFFFF;
 
     // argument is the center of the circle
     if (berryInfo->spicy)
-        gUnknown_0203932E.circles[0] = sub_80A7E5C(48);
+        gUnknown_0203932E[0] = sub_80A7E5C(48);
     if (berryInfo->dry)
-        gUnknown_0203932E.circles[1] = sub_80A7E5C(88);
+        gUnknown_0203932E[1] = sub_80A7E5C(88);
     if (berryInfo->sweet)
-        gUnknown_0203932E.circles[2] = sub_80A7E5C(128);
+        gUnknown_0203932E[2] = sub_80A7E5C(128);
     if (berryInfo->bitter)
-        gUnknown_0203932E.circles[3] = sub_80A7E5C(168);
+        gUnknown_0203932E[3] = sub_80A7E5C(168);
     if (berryInfo->sour)
-        gUnknown_0203932E.circles[4] = sub_80A7E5C(208);
+        gUnknown_0203932E[4] = sub_80A7E5C(208);
 }
 
 void sub_81466A0(void)
@@ -357,10 +353,10 @@ void sub_81466A0(void)
 
     for (i = 0; i < 5; i++)
     {
-        if (gUnknown_0203932E.circles[i] != -1)
+        if (gUnknown_0203932E[i] != -1)
         {
-            DestroySprite(&gSprites[gUnknown_0203932E.circles[i]]);
-            gUnknown_0203932E.circles[i] = -1;
+            DestroySprite(&gSprites[gUnknown_0203932E[i]]);
+            gUnknown_0203932E[i] = -1;
         }
     }
 }
diff --git a/src/bike.c b/src/bike.c
index f37eb2144..58a4f38f4 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -15,8 +15,6 @@ extern u8 sub_80608A4(u8);
 extern u8 gUnknown_02039250;
 extern u8 gUnknown_02039251;
 extern u8 gUnknown_0202E854;
-extern u8 gUnknown_0202E86C[];
-extern u8 gUnknown_0202E874[];
 
 static void MovePlayerOnMachBike(u8, u16, u16);
 static u8 GetMachBikeTransition(u8 *);
@@ -758,12 +756,12 @@ static bool8 sub_80E5BC8(const u8 *a, const u8 *b)
 
     for (i = 0; a[i] != 0; i++)
     {
-        if (gUnknown_0202E86C[i] > a[i])
+        if (gPlayerAvatar.unk14[i] > a[i])
             return FALSE;
     }
     for (i = 0; b[i] != 0; i++)
     {
-        if (gUnknown_0202E874[i] > b[i])
+        if (gPlayerAvatar.unk1C[i] > b[i])
             return FALSE;
     }
     return TRUE;
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 4de945b9c..b8d7cd386 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -19,8 +19,6 @@
 extern u8 gPlayerPartyCount;
 extern u8 gLastFieldPokeMenuOpened;
 
-extern u32 gUnknown_0202FF84[];
-
 extern u8 gIslandCave_EventScript_OpenRegiiceChamber[]; // regiice event script
 
 bool8 ShouldDoBrailleDigEffect(void)
diff --git a/src/cable_club.c b/src/cable_club.c
index 70b372205..20b087f4e 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -13,7 +13,6 @@
 
 extern u16 gScriptResult;
 extern struct TrainerCard gTrainerCards[4];
-extern struct LinkPlayer gLinkPlayers[];
 
 extern u8 gUnknown_03004860;
 extern u8 gFieldLinkPlayerCount;
diff --git a/src/choose_party.c b/src/choose_party.c
index 63e9c8477..d8df44028 100644
--- a/src/choose_party.c
+++ b/src/choose_party.c
@@ -31,7 +31,6 @@ struct UnknownPokemonStruct2
     /*0x1D*/ u8 language;
 };
 
-extern u8 gSelectedOrderFromParty[];
 extern u8 gPlayerPartyCount;
 extern u8 gLastFieldPokeMenuOpened;
 extern u8 gUnknown_020384F0;
@@ -40,6 +39,8 @@ extern u8 gUnknown_0202E8F6;
 extern struct Pokemon gUnknown_030042FC[];
 extern const u16 gBattleTowerBanlist[];
 
+EWRAM_DATA u8 gSelectedOrderFromParty[3] = {0};
+
 extern void OpenPartyMenu();
 extern void TryCreatePartyMenuMonIcon(u8, u8, struct Pokemon *);
 extern void LoadHeldItemIconGraphics(void);
diff --git a/src/contest_painting.c b/src/contest_painting.c
index d75947e05..391cbdfaa 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -14,18 +14,20 @@
 #include "unknown_task.h"
 
 extern u8 unk_2000000[];
-extern u8 gUnknown_03000750;
-extern u16 gUnknown_03000752;
-extern u16 gUnknown_03000754;
-extern u16 (*gUnknown_03005E10)[][32];
-extern u8 gUnknown_03005E40[];
-extern u16 (*gUnknown_03005E90)[];
+
+static u8 gUnknown_03000750;
+static u16 gUnknown_03000752;
+static u16 gUnknown_03000754;
+static u8 gUnknown_03000756;
+
+u16 (*gUnknown_03005E10)[][32];
+struct Unk03005E20 gUnknown_03005E20;
+u8 gUnknown_03005E40[0x4C];
+struct ContestEntry *gUnknown_03005E8C;
+u16 (*gUnknown_03005E90)[];
 
 extern struct ContestEntry unk_2015de0;
 extern struct Unk2015E00 unk_2015e00;
-extern struct Unk3000756 gUnknown_03000756;
-extern struct Unk03005E20 gUnknown_03005E20;
-extern struct ContestEntry *gUnknown_03005E8C;
 
 static const u16 gPictureFramePalettes[][16] =
 {
@@ -220,7 +222,7 @@ static void HoldContestPainting(void)
     case 0:
         if (!gPaletteFade.active)
             gUnknown_03000750 = 1;
-        if (gUnknown_03000756.var_0 != 0 && gUnknown_03000754 != 0)
+        if (gUnknown_03000756 != 0 && gUnknown_03000754 != 0)
             gUnknown_03000754--;
         break;
     case 1:
@@ -231,13 +233,13 @@ static void HoldContestPainting(void)
             gUnknown_03000750 = two;
             BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
         }
-        if (gUnknown_03000756.var_0 != 0)
+        if (gUnknown_03000756 != 0)
             gUnknown_03000754 = 0;
         break;
     case 2:
         if (!gPaletteFade.active)
             SetMainCallback2(CB2_QuitContestPainting);
-        if (gUnknown_03000756.var_0 != 0 && gUnknown_03000754 <= 0x1D)
+        if (gUnknown_03000756 != 0 && gUnknown_03000754 <= 0x1D)
             gUnknown_03000754++;
         break;
     }
@@ -311,13 +313,13 @@ static void ContestPaintingInitVars(bool8 arg0)
 {
     if (arg0 == FALSE)
     {
-        gUnknown_03000756.var_0 = FALSE;
+        gUnknown_03000756 = FALSE;
         gUnknown_03000752 = 0;
         gUnknown_03000754 = 0;
     }
     else
     {
-        gUnknown_03000756.var_0 = TRUE;
+        gUnknown_03000756 = TRUE;
         gUnknown_03000752 = 15;
         gUnknown_03000754 = 30;
     }
@@ -325,7 +327,7 @@ static void ContestPaintingInitVars(bool8 arg0)
 
 static void ContestPaintingMosaic(void)
 {
-    if (gUnknown_03000756.var_0 == FALSE)
+    if (gUnknown_03000756 == FALSE)
     {
         REG_MOSAIC = 0;
         return;
diff --git a/src/credits.c b/src/credits.c
index 8c4cfb84d..df70674b6 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -177,14 +177,15 @@ extern u16 unk_201f800[];
 
 extern struct SpriteTemplate gUnknown_02024E8C;
 
-extern s16 gUnknown_02039320;
-extern u16 gUnknown_02039322; // TASK A
-extern u8 gUnknown_02039324;
-extern u8 gUnknown_02039325;
 extern u16 gUnknown_02039358;
 extern s16 gUnknown_0203935A;
 extern s16 gUnknown_0203935C;
 
+static EWRAM_DATA s16 gUnknown_02039320 = 0;
+static EWRAM_DATA u16 gUnknown_02039322 = 0; // TASK A
+EWRAM_DATA u8 gUnknown_02039324 = 0;
+static EWRAM_DATA u8 gUnknown_02039325 = 0;
+
 extern u8 gReservedSpritePaletteCount;
 
 // data/hall_of_fame
diff --git a/src/decoration.c b/src/decoration.c
index e829cb072..da33b3ab7 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -19,6 +19,27 @@
 #include "field_weather.h"
 #include "decoration.h"
 
+EWRAM_DATA u8 *gUnknown_020388D0 = NULL;
+EWRAM_DATA u8 gUnknown_020388D4 = 0;
+EWRAM_DATA u8 gUnknown_020388D5 = 0;
+EWRAM_DATA u8 gUnknown_020388D6[16] = {0};
+EWRAM_DATA u8 gUnknown_020388E6[12] = {0};
+EWRAM_DATA u8 gUnknown_020388F2 = 0;
+EWRAM_DATA u8 gUnknown_020388F3 = 0;
+EWRAM_DATA u8 gUnknown_020388F4 = 0;
+EWRAM_DATA u8 gUnknown_020388F5 = 0;
+EWRAM_DATA u8 gUnknown_020388F6 = 0;
+EWRAM_DATA u8 gUnknown_020388F7[8] = {0};
+EWRAM_DATA struct UnkStruct_02038900 gUnknown_02038900 = {0};
+EWRAM_DATA u16 gUnknown_020391A4 = 0;
+EWRAM_DATA u16 gUnknown_020391A6 = 0;
+EWRAM_DATA u8 gUnknown_020391A8 = 0;
+EWRAM_DATA u8 gUnknown_020391A9 = 0;
+EWRAM_DATA u8 gUnknown_020391AA = 0;
+EWRAM_DATA struct OamData gUnknown_020391AC = {0};
+EWRAM_DATA struct UnkStruct_020391B4 gUnknown_020391B4[16] = {0};
+EWRAM_DATA u8 gUnknown_02039234 = 0;
+
 #if ENGLISH
 const u8 DecorDesc_SMALL_DESK[] = _(
     "A small desk built\n"
diff --git a/src/event_data.c b/src/event_data.c
index c6aecf13c..0484bae02 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -6,7 +6,23 @@
 #define TEMP_UPPER_FLAGS_SIZE 0x8
 #define TEMP_VARS_SIZE 0x20
 
-extern u8 gUnknown_0202E8E2[16];
+EWRAM_DATA u16 gSpecialVar_0x8000 = 0;
+EWRAM_DATA u16 gSpecialVar_0x8001 = 0;
+EWRAM_DATA u16 gSpecialVar_0x8002 = 0;
+EWRAM_DATA u16 gSpecialVar_0x8003 = 0;
+EWRAM_DATA u16 gSpecialVar_0x8004 = 0;
+EWRAM_DATA u16 gSpecialVar_0x8005 = 0;
+EWRAM_DATA u16 gSpecialVar_0x8006 = 0;
+EWRAM_DATA u16 gSpecialVar_0x8007 = 0;
+EWRAM_DATA u16 gSpecialVar_0x8008 = 0;
+EWRAM_DATA u16 gSpecialVar_0x8009 = 0;
+EWRAM_DATA u16 gSpecialVar_0x800A = 0;
+EWRAM_DATA u16 gSpecialVar_0x800B = 0;
+EWRAM_DATA u16 gScriptResult = 0;
+EWRAM_DATA u16 gScriptLastTalked = 0;
+EWRAM_DATA u16 gScriptFacing = 0;
+EWRAM_DATA u8 gUnknown_0202E8E2[16] = {0};
+
 extern u16 *gSpecialVars[];
 
 void InitEventData(void)
diff --git a/src/field_camera.c b/src/field_camera.c
index 1aed1549b..db51cf054 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -7,8 +7,7 @@
 #include "sprite.h"
 #include "text.h"
 
-extern u8 gUnknown_0202E854;
-
+EWRAM_DATA u8 gUnknown_0202E854 = 0;
 
 struct UnknownStruct
 {
@@ -19,15 +18,15 @@ struct UnknownStruct
     bool8 unk4;
 };
 
-extern struct UnknownStruct gUnknown_03000590;
-extern u16 gUnknown_03000598;
-extern s16 gUnknown_0300059A;
-extern u8 gUnknown_0300059C;
-extern void (*gUnknown_030005A0)(void);
+static struct UnknownStruct gUnknown_03000590;
+static u16 gUnknown_03000598;
+static s16 gUnknown_0300059A;
+static u8 gUnknown_0300059C;
+static void (*gUnknown_030005A0)(void);
 
-extern struct CameraSomething gUnknown_03004880;
-extern u16 gUnknown_03004898;
-extern u16 gUnknown_0300489C;
+struct CameraSomething gUnknown_03004880;
+u16 gUnknown_03004898;
+u16 gUnknown_0300489C;
 
 static void RedrawMapSliceNorth(struct UnknownStruct *a, struct MapData *mapData);
 static void RedrawMapSliceSouth(struct UnknownStruct *a, struct MapData *mapData);
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index a4f52f4b9..4795c7396 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -35,8 +35,11 @@ extern u16 gScriptFacing;
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
-extern u8 gUnknown_0202E8C0;
-extern u16 gUnknown_0202E8C2;
+
+static EWRAM_DATA u8 gUnknown_0202E8C0 = 0;
+static EWRAM_DATA u16 gUnknown_0202E8C2 = 0;
+
+u8 gSelectedMapObject;
 
 //scripts
 extern u8 gUnknown_081A2C51[];
diff --git a/src/field_effect.c b/src/field_effect.c
index 889664dfa..3632d7053 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -28,6 +28,8 @@
 
 #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
 
+EWRAM_DATA u32 gUnknown_0202FF84[8] = {0};
+
 const u32 gSpriteImage_839DC14[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
 const u16 gBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
 const u32 gSpriteImage_839E434[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index d94c97ff3..f60b1b233 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1902,8 +1902,11 @@ extern void CameraObjectReset1(void);
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
 extern u8 gReservedSpritePaletteCount;
 extern struct Camera gUnknown_0202E844;
-extern u8 gUnknown_030005A4;
-extern u16 gUnknown_030005A6;
+
+static u8 gUnknown_030005A4;
+static u16 gUnknown_030005A6;
+
+struct MapObject gMapObjects[16];
 
 void npc_clear_ids_and_state(struct MapObject *mapObj)
 {
@@ -3881,8 +3884,6 @@ u8 sub_805D314(struct MapObject *mapObject, struct Sprite *sprite)
     return gUnknown_083752D0[sprite->data1](mapObject, sprite);
 }
 
-extern u32 gUnknown_0202FF84[];
-
 u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     u8 berryTreeStage;
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index 46784cff3..87be8e011 100644
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -7,8 +7,6 @@
 
 typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
 
-extern u32 gUnknown_0202FF84[];
-
 extern s16 gUnknown_08376194[];
 extern SpriteStepFunc *gUnknown_08376180[];
 extern s8 *gUnknown_083761D0[];
diff --git a/src/field_message_box.c b/src/field_message_box.c
index 2cd2e66ab..35aac7ac9 100644
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -6,7 +6,7 @@
 #include "text.h"
 #include "text_window.h"
 
-extern struct Window gFieldMessageBoxWindow;
+static EWRAM_DATA struct Window gFieldMessageBoxWindow = {0};
 
 static u8 sMessageBoxMode;
 
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 3cdb45584..2a7b2f3e0 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -24,7 +24,7 @@
 #include "tv.h"
 #include "wild_encounter.h"
 
-extern u32 gUnknown_0202FF84[];
+EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {0};
 
 //Functions
 static bool8 sub_8058854(struct MapObject *, u8);
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index c6bd8cb77..79913e1c5 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "event_data.h"
 #include "field_camera.h"
 #include "menu.h"
 #include "palette.h"
diff --git a/src/field_specials.c b/src/field_specials.c
index 71de04f55..454bd8d96 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -41,8 +41,26 @@
 #elif GERMAN
 #define CHAR_DECIMAL_SEPARATOR CHAR_COMMA
 #endif
+
+extern struct WarpData gUnknown_020297F0;
+extern u8 gBattleOutcome;
+extern u16 gSpecialVar_0x8004;
+extern u16 gSpecialVar_0x8005;
+extern u16 gScriptResult;
+
+EWRAM_DATA u8 gUnknown_02039250 = 0;
+EWRAM_DATA u8 gUnknown_02039251 = 0;
+EWRAM_DATA u32 gUnknown_02039254 = 0;
+EWRAM_DATA u8 gUnknown_02039258 = 0;
+EWRAM_DATA u8 gUnknown_02039259 = 0;
+EWRAM_DATA u8 gUnknown_0203925A = 0;
+EWRAM_DATA u8 gUnknown_0203925B = 0;
+EWRAM_DATA u8 gUnknown_0203925C = 0;
+
 static void RecordCyclingRoadResults(u32, u8);
 
+static struct ElevatorMenu gUnknown_03000760[20];
+
 void sub_810D6A4(void) {
     SetMainCallback2(sub_8145D88);
     ScriptContext2_Enable();
diff --git a/src/fieldmap.c b/src/fieldmap.c
index e573ec13a..0e0ec246c 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -25,6 +25,8 @@ EWRAM_DATA struct MapHeader gMapHeader = {0};
 EWRAM_DATA struct Camera gUnknown_0202E844 = {0};
 EWRAM_DATA static struct ConnectionFlags gUnknown_0202E850 = {0};
 
+struct BackupMapData gUnknown_03004870;
+
 static const struct ConnectionFlags sDummyConnectionFlags = {0};
 
 struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection)
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index e837dbd45..b394d1e4c 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -27,7 +27,6 @@ extern struct SpriteTemplate gSpriteTemplate_CutGrass;
 extern struct MapPosition gUnknown_0203923C;
 
 extern u8 gLastFieldPokeMenuOpened;
-extern u32 gUnknown_0202FF84[];
 
 extern u8 UseCutScript;
 
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 1edae09d4..81f4f63c6 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -13,8 +13,6 @@ static void sub_811AA18(void);
 static void sub_811AA38(void);
 static void sub_811AA9C(void);
 
-extern u32 gUnknown_0202FF84[];
-
 extern u8 gLastFieldPokeMenuOpened;
 extern u16 gScriptResult;
 extern void (*gFieldCallback)(void);
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 6e782f4ac..4c3e6bf4a 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -15,8 +15,6 @@ static void sub_812C01C(void);
 static void sub_812C084(u8);
 static void sub_812C118(u8);
 
-extern u32 gUnknown_0202FF84[];
-
 extern u8 gLastFieldPokeMenuOpened;
 extern void (*gFieldCallback)(void);
 extern void (*gUnknown_03005CE4)(void);
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index df12d3072..74e68df06 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -7,8 +7,6 @@
 #include "rom6.h"
 #include "task.h"
 
-extern u32 gUnknown_0202FF84[];
-
 extern void (*gFieldCallback)(void);
 extern u8 gLastFieldPokeMenuOpened;
 extern void (*gUnknown_03005CE4)(void);
diff --git a/src/intro.c b/src/intro.c
index 462a2134d..a43e0356c 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -22,12 +22,8 @@
 #include "unknown_task.h"
 
 extern struct SpriteTemplate gUnknown_02024E8C;
-extern u16 gUnknown_02039318;
-extern u16 gUnknown_0203931A;
 extern u16 gUnknown_02039358;
 extern u16 gUnknown_0203935A;
-extern u32 gIntroFrameCounter;
-extern struct GcmbStruct gMultibootProgramStruct;
 extern u16 gSaveFileStatus;
 extern u8 gReservedSpritePaletteCount;
 extern const u8 gInterfaceGfx_PokeBall[];
@@ -37,6 +33,12 @@ extern const u16 gIntroCopyright_Pal[];
 extern const u16 gIntroCopyright_Tilemap[];
 extern void *const gUnknown_0840B5A0[];
 
+static EWRAM_DATA u16 gUnknown_02039318 = 0;
+static EWRAM_DATA u16 gUnknown_0203931A = 0;
+
+u32 gIntroFrameCounter;
+struct GcmbStruct gMultibootProgramStruct;
+
 //--------------------------------------------------
 // Graphics Data
 //--------------------------------------------------
diff --git a/src/load_save.c b/src/load_save.c
index 0630f060c..730aea2b8 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -19,7 +19,10 @@ struct LoadedSaveData
     struct MailStruct mail[16];
 };
 
-extern struct LoadedSaveData gLoadedSaveData[];
+EWRAM_DATA struct SaveBlock2 gSaveBlock2 = {0};
+EWRAM_DATA struct SaveBlock1 gSaveBlock1 = {0};
+
+static EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0};
 
 void CheckForFlashMemory(void)
 {
@@ -112,27 +115,27 @@ void LoadPlayerBag(void)
 
     // load player items.
     for (i = 0; i < 20; i++)
-        gLoadedSaveData->items[i] = gSaveBlock1.bagPocket_Items[i];
+        gLoadedSaveData.items[i] = gSaveBlock1.bagPocket_Items[i];
 
     // load player key items.
     for (i = 0; i < 20; i++)
-        gLoadedSaveData->keyItems[i] = gSaveBlock1.bagPocket_KeyItems[i];
+        gLoadedSaveData.keyItems[i] = gSaveBlock1.bagPocket_KeyItems[i];
 
     // load player pokeballs.
     for (i = 0; i < 16; i++)
-        gLoadedSaveData->pokeBalls[i] = gSaveBlock1.bagPocket_PokeBalls[i];
+        gLoadedSaveData.pokeBalls[i] = gSaveBlock1.bagPocket_PokeBalls[i];
 
     // load player TMs and HMs.
     for (i = 0; i < 64; i++)
-        gLoadedSaveData->TMsHMs[i] = gSaveBlock1.bagPocket_TMHM[i];
+        gLoadedSaveData.TMsHMs[i] = gSaveBlock1.bagPocket_TMHM[i];
 
     // load player berries.
     for (i = 0; i < 46; i++)
-        gLoadedSaveData->berries[i] = gSaveBlock1.bagPocket_Berries[i];
+        gLoadedSaveData.berries[i] = gSaveBlock1.bagPocket_Berries[i];
 
     // load mail.
     for (i = 0; i < 16; i++)
-        gLoadedSaveData->mail[i] = gSaveBlock1.mail[i];
+        gLoadedSaveData.mail[i] = gSaveBlock1.mail[i];
 }
 
 void SavePlayerBag(void)
@@ -141,25 +144,25 @@ void SavePlayerBag(void)
 
     // save player items.
     for (i = 0; i < 20; i++)
-        gSaveBlock1.bagPocket_Items[i] = gLoadedSaveData->items[i];
+        gSaveBlock1.bagPocket_Items[i] = gLoadedSaveData.items[i];
 
     // save player key items.
     for (i = 0; i < 20; i++)
-        gSaveBlock1.bagPocket_KeyItems[i] = gLoadedSaveData->keyItems[i];
+        gSaveBlock1.bagPocket_KeyItems[i] = gLoadedSaveData.keyItems[i];
 
     // save player pokeballs.
     for (i = 0; i < 16; i++)
-        gSaveBlock1.bagPocket_PokeBalls[i] = gLoadedSaveData->pokeBalls[i];
+        gSaveBlock1.bagPocket_PokeBalls[i] = gLoadedSaveData.pokeBalls[i];
 
     // save player TMs and HMs.
     for (i = 0; i < 64; i++)
-        gSaveBlock1.bagPocket_TMHM[i] = gLoadedSaveData->TMsHMs[i];
+        gSaveBlock1.bagPocket_TMHM[i] = gLoadedSaveData.TMsHMs[i];
 
     // save player berries.
     for (i = 0; i < 46; i++)
-        gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData->berries[i];
+        gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData.berries[i];
 
     // save mail.
     for (i = 0; i < 16; i++)
-        gSaveBlock1.mail[i] = gLoadedSaveData->mail[i];
+        gSaveBlock1.mail[i] = gLoadedSaveData.mail[i];
 }
diff --git a/src/menu_cursor.c b/src/menu_cursor.c
index c007296dc..64ab36573 100644
--- a/src/menu_cursor.c
+++ b/src/menu_cursor.c
@@ -22,13 +22,12 @@ extern const struct Subsprite gUnknown_0842F790;
 
 extern u16 gUnknown_0203A360[];
 
-extern struct Subsprite gMenuCursorSubsprites[];
-
-extern u8 gUnknown_0203A3D0;
-extern u8 gUnknown_0203A3D1;
-extern u8 gUnknown_0203A3D2;
-extern u8 gUnknown_0203A3D3;
-extern u8 gUnknown_0203A3D4;
+EWRAM_DATA struct Subsprite gMenuCursorSubsprites[10] = {0};
+EWRAM_DATA u8 gUnknown_0203A3D0 = 0;
+EWRAM_DATA u8 gUnknown_0203A3D1 = 0;
+EWRAM_DATA u8 gUnknown_0203A3D2 = 0;
+EWRAM_DATA u8 gUnknown_0203A3D3 = 0;
+EWRAM_DATA u8 gUnknown_0203A3D4 = 0;
 
 void sub_814A590(void)
 {
diff --git a/src/money.c b/src/money.c
index ab4508a39..5d9d0b689 100644
--- a/src/money.c
+++ b/src/money.c
@@ -8,7 +8,8 @@
 #define SPRITE_TAG_MONEY (0x2722)
 
 extern u16 gSpecialVar_0x8005;
-extern u8 gUnknown_02038734;
+
+static EWRAM_DATA u8 gUnknown_02038734 = 0;
 
 extern const struct CompressedSpriteSheet gUnknown_083CF584;
 extern const struct CompressedSpritePalette gUnknown_083CF58C;
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index 2d9e3fa6f..273191192 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -12,9 +12,10 @@
 
 #define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT)
 
-extern u8 gUnknown_03004DA0[];
 extern u8 (*gCallback_03004AE8)(void);
 
+u8 gUnknown_03004DA0[0x20];
+
 extern u8 gUnknown_0839B22C[][3];
 extern u8 gUnknown_0839B24A[];
 extern u8 gUnknown_0839B24D[];
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 4be5dec1c..89978f635 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -15,7 +15,8 @@
 #include "text.h"
 
 extern u8 unk_2000000[];
-extern u8 gUnknown_02039338;
+
+static EWRAM_DATA u8 gUnknown_02039338 = 0;
 
 static void VBlankCB(void);
 static bool8 CheckLanguageMatch(void);
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
index 45ef719da..f7a1b633d 100644
--- a/src/mystery_event_script.c
+++ b/src/mystery_event_script.c
@@ -16,13 +16,13 @@
 #define UNK_MASK_2 0x80
 #endif
 
-extern struct ScriptContext gUnknown_02039288;
-
 extern ScrCmdFunc gScriptFuncs[];
 extern ScrCmdFunc gScriptFuncs_End[];
 
 extern u8 gOtherText_DataCannotUseVersion[];
 
+static EWRAM_DATA struct ScriptContext gUnknown_02039288 = {0};
+
 bool32 sub_8126098(u16 a1, u32 a2, u16 a3, u32 a4)
 {
     if (!(a1 & UNK_MASK_1))
diff --git a/src/new_game.c b/src/new_game.c
index 4b6ea1dd2..226ac9bb7 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -26,7 +26,8 @@
 #include "secret_base.h"
 #include "tv.h"
 
-extern u8 gDifferentSaveFile;
+EWRAM_DATA u8 gDifferentSaveFile = 0;
+EWRAM_DATA u8 gUnknown_020297ED = 0;
 
 extern u8 gPlayerPartyCount;
 extern u8 gUnknown_03005CE8;
diff --git a/src/player_pc.c b/src/player_pc.c
index adff9971a..6d52c560a 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -32,8 +32,9 @@ extern u8 sub_807D770(void);
 extern void sub_808B020(void);
 extern void sub_80F944C(void);
 
-extern u8 *gPcItemMenuOptionOrder;
-extern u8 gPcItemMenuOptionsNum;
+static EWRAM_DATA u8 *gPcItemMenuOptionOrder = NULL;
+
+static u8 gPcItemMenuOptionsNum;
 
 extern u8 gUnknown_02038561;
 
diff --git a/src/pokeblock.c b/src/pokeblock.c
index b7fa5daa8..bc46a119a 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -26,8 +26,15 @@
 #include "songs.h"
 #include "safari_zone.h"
 #include "use_pokeblock.h"
+#include "event_data.h"
 #include "pokeblock.h"
 
+extern u8 ewram[];
+
+static EWRAM_DATA u8 gUnknown_02039244 = 0;
+static EWRAM_DATA ALIGNED(4) u8 gUnknown_02039248[4] = {0}; // why aligned to 4 bytes?
+static EWRAM_DATA u8 gUnknown_0203924C = 0;
+
 // function declarations
 
 // gUnknown_083F7EF4
@@ -76,6 +83,8 @@ static void sub_810C5EC(u8);
 // sub_810C610
 static void sub_810C704(u8);
 
+static const u8 *gUnknown_03000758;
+
 // rodata
 
 #define GFX_TAG_POKEBLOCK_CASE 14800
diff --git a/src/pokedex.c b/src/pokedex.c
index 2ef91e472..c132635cb 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -143,13 +143,7 @@ struct UnknownStruct4
 
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern u8 gReservedSpritePaletteCount;
-extern struct PokedexView *gPokedexView;
 extern struct SpriteTemplate gUnknown_02024E8C;
-extern u16 gUnknown_0202FFB8;
-extern u8 gUnknown_0202FFBA;
-extern struct PokedexListItem *gUnknown_0202FFBC;
-extern u8 gUnknown_03005CE8;
-extern IntrCallback gUnknown_03005CEC;
 extern u8 gUnknown_03005E98;
 extern const u8 gPokedexMenu_Gfx[];
 extern const u8 gUnknown_08E96738[];
@@ -171,6 +165,14 @@ extern const u16 gPokedexMenuSearch_Pal[];
 extern const u8 gTypeNames[][7];
 extern const u8 gPokedexMenu2_Gfx[];
 
+static EWRAM_DATA struct PokedexView *gPokedexView = NULL;
+static EWRAM_DATA u16 gUnknown_0202FFB8 = 0;
+static EWRAM_DATA u8 gUnknown_0202FFBA = 0;
+static EWRAM_DATA struct PokedexListItem *gUnknown_0202FFBC = NULL;
+
+u8 gUnknown_03005CE8;
+IntrCallback gUnknown_03005CEC;
+
 static u8 sub_8091E3C(void);
 
 static const u16 sPokedexSearchPalette[] = INCBIN_U16("graphics/pokedex/search.gbapal");
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index 231fc33ed..c65bfa185 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -18,7 +18,13 @@
 
 extern u8 unk_2000000[];
 extern u16 word_2024E82;
-extern u8 byte_2024E88;
+
+static EWRAM_DATA u8 byte_2024E88 = 0;
+
+u8 gPlayerPartyCount;
+struct Pokemon gPlayerParty[6];
+u8 gEnemyPartyCount;
+struct Pokemon gEnemyParty[6];
 
 void ZeroBoxMonData(struct BoxPokemon *boxMon)
 {
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 543b032e2..a77edbdb2 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -31,10 +31,11 @@ extern u8 gXXX_CritRelated;
 extern u16 gBattleWeather;
 extern struct BattleEnigmaBerry gEnigmaBerries[];
 extern u16 gBattleMovePower;
-extern struct SpriteTemplate gUnknown_02024E8C;
 extern u16 gTrainerBattleOpponent;
 extern struct PokemonStorage gPokemonStorage;
 
+EWRAM_DATA struct SpriteTemplate gUnknown_02024E8C = {0};
+
 extern u8 gBadEggNickname[];
 extern const struct SpriteTemplate gSpriteTemplate_8208288[];
 //array of pointers to arrays of pointers to union AnimCmd (We probably need to typedef this.)
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 0cab07fc1..5e97523e2 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -12,6 +12,8 @@ extern const struct StorageAction gUnknown_083B6DF4[];
 
 extern const u8 unk_2000000[];
 
+EWRAM_DATA struct PokemonStorage gPokemonStorage = {0};
+
 #define gUnk2002694 (u8 *)(&unk_2000000[0x2694])
 #define gUnk20026A6 (u8 *)(&unk_2000000[0x26a6])
 #define gUnk20011fa (u8 *)(&unk_2000000[0x11fa])
diff --git a/src/record_mixing.c b/src/record_mixing.c
index a8daa9220..9cbcce49c 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -31,10 +31,11 @@ extern u8 ewram[];
 
 extern struct RecordMixing_UnknownStruct gUnknown_02038738;
 extern u16 gSpecialVar_0x8005;
-extern u32 gUnknown_03005D2C;
-extern u8 gUnknown_03000718;
-extern u8 gUnknown_0300071C[];
-extern bool8 gReceivedRemoteLinkPlayers;
+
+u32 gUnknown_03005D2C;
+
+static u8 gUnknown_03000718;
+static u8 gUnknown_0300071C[4];
 
 void *recordMixingSecretBases = &gSaveBlock1.secretBases;
 void *recordMixingTvShows = &gSaveBlock1.tvShows;
diff --git a/src/region_map.c b/src/region_map.c
index 097417357..076dfecec 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -127,7 +127,7 @@ enum
     INPUT_EVENT_B_BUTTON,
 };
 
-extern struct RegionMap *gRegionMap;
+static EWRAM_DATA struct RegionMap *gRegionMap = NULL;
 
 static const u16 sRegionMapCursor_Pal[] = INCBIN_U16("graphics/pokenav/cursor.gbapal");
 static const u8 sRegionMapCursorSmall_ImageLZ[] = INCBIN_U8("graphics/pokenav/cursor_small.4bpp.lz");
diff --git a/src/rom3.c b/src/rom3.c
index 9d8d39f91..02def5dfa 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -24,9 +24,10 @@ extern u16 gBattleTypeFlags;
 extern u16 gBattleWeather;
 extern struct BattlePokemon gBattleMons[];
 
-extern u8 gUnknown_020238C4;
-extern u8 gUnknown_020238C5;
-extern u8 gUnknown_020238C6;
+static EWRAM_DATA u8 gUnknown_020238C4 = 0;
+static EWRAM_DATA u8 gUnknown_020238C5 = 0;
+static EWRAM_DATA u8 gUnknown_020238C6 = 0;
+
 extern u32 gUnknown_020239FC;
 extern u8 gBattleBufferA[][0x200];
 extern u8 gBattleBufferB[][0x200];
@@ -49,13 +50,14 @@ extern u8 gUnknown_02024C78;
 extern u8 gBattleOutcome;
 extern u8 gActionSelectionCursor[];
 extern u8 gMoveSelectionCursor[];
-extern u8 gBattleBuffersTransferData[];
 extern u8 gBattleTextBuff1[];
 extern u8 gBattleTextBuff2[];
 extern u8 gBattleTextBuff3[];
 extern void (*gBattleMainFunc)(void);
 extern void (*gBattleBankFunc[])(void);
 
+u8 gBattleBuffersTransferData[0x170];
+
 void sub_800B858(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
diff --git a/src/rom4.c b/src/rom4.c
index b2e30e292..f9006efba 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -60,23 +60,23 @@ struct UnkTVStruct
     u32 tv_field_4;
 };
 
-extern struct WarpData gUnknown_020297F0;
-extern struct WarpData gUnknown_020297F8;
-extern struct WarpData gUnknown_02029800;
-extern struct WarpData gUnknown_02029808;
-extern struct UnkPlayerStruct gUnknown_02029810;
-extern u16 gUnknown_02029814;
-extern bool8 gUnknown_02029816;
-extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
-
-extern u8 gUnknown_03000580[];
-extern u16 (*gUnknown_03000584)(u32);
-extern u8 gUnknown_03000588;
-
-extern u16 word_3004858;
-extern void (*gFieldCallback)(void);
-extern u8 gUnknown_03004860;
-extern u8 gFieldLinkPlayerCount;
+EWRAM_DATA struct WarpData gUnknown_020297F0 = {0};
+EWRAM_DATA struct WarpData gUnknown_020297F8 = {0};
+EWRAM_DATA struct WarpData gUnknown_02029800 = {0};
+EWRAM_DATA struct WarpData gUnknown_02029808 = {0};
+EWRAM_DATA struct UnkPlayerStruct gUnknown_02029810 = {0};
+EWRAM_DATA u16 gUnknown_02029814 = 0;
+EWRAM_DATA bool8 gUnknown_02029816 = FALSE;
+EWRAM_DATA struct LinkPlayerMapObject gLinkPlayerMapObjects[4] = {0};
+
+static u8 gUnknown_03000580[4];
+static u16 (*gUnknown_03000584)(u32);
+static u8 gUnknown_03000588;
+
+u16 word_3004858;
+void (*gFieldCallback)(void);
+u8 gUnknown_03004860;
+u8 gFieldLinkPlayerCount;
 
 extern u16 gUnknown_03004898;
 extern u16 gUnknown_0300489C;
diff --git a/src/rom6.c b/src/rom6.c
index 759aed93f..ff032b6c2 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -14,13 +14,13 @@
 #include "task.h"
 
 extern u16 gScriptLastTalked;
-extern u32 gUnknown_0202FF84[];
-extern struct MapPosition gUnknown_0203923C;
 extern void (*gFieldCallback)(void);
 extern u8 gLastFieldPokeMenuOpened;
 extern void (*gUnknown_03005CE4)(void);
 extern u8 UseRockSmashScript[];
 
+EWRAM_DATA struct MapPosition gUnknown_0203923C = {0};
+
 static void task08_080C9820(u8);
 static void sub_810B3DC(u8);
 static void sub_810B428(u8);
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index d12a21240..bb3c31dfc 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -565,9 +565,9 @@ static const u8 sRotatingGate_ArmLayout[][GATE_ARM_WEST + 1][GATE_ARM_MAX_LENGTH
     },
 };
 
-extern u8 gRotatingGate_GateSpriteIds[ROTATING_GATE_PUZZLE_MAX];
-extern const struct RotatingGatePuzzle *gRotatingGate_PuzzleConfig;
-extern u8 gRotatingGate_PuzzleCount;
+static EWRAM_DATA u8 gRotatingGate_GateSpriteIds[ROTATING_GATE_PUZZLE_MAX] = {0};
+static EWRAM_DATA const struct RotatingGatePuzzle *gRotatingGate_PuzzleConfig = NULL;
+static EWRAM_DATA u8 gRotatingGate_PuzzleCount = 0;
 
 static int GetCurrentMapRotatingGatePuzzleType(void)
 {
diff --git a/src/save.c b/src/save.c
index 46094746a..adf39268e 100644
--- a/src/save.c
+++ b/src/save.c
@@ -11,21 +11,23 @@
 #define GETBLOCKOFFSET(n) (0xF80 * (n - 1))
 #define TOTALNUMSECTORS ((ARRAY_COUNT(gSaveSectionLocations) * 2) + (ARRAY_COUNT(gHallOfFameSaveSectionLocations) * 2)) // there are 2 slots, so double each array count and get the sum.
 
-extern u32 gLastSaveSectorStatus; // used but in an unferenced function, so unused
-extern u16 gLastWrittenSector;
-extern u32 gLastSaveCounter;
-extern u16 gLastKnownGoodSector;
-extern u32 gDamagedSaveSectors;
-extern u32 gSaveCounter;
 extern struct SaveSection unk_2000000; // slow save RAM
-extern struct SaveSection *gFastSaveSection; // the pointer is in fast IWRAM but may sometimes point to the slower EWRAM.
-extern u16 gUnknown_03005EB4;
-extern u16 gSaveFileStatus;
-extern u32 gGameContinueCallback;
+
+u16 gLastWrittenSector;
+u32 gLastSaveCounter;
+u16 gLastKnownGoodSector;
+u32 gDamagedSaveSectors;
+u32 gSaveCounter;
+struct SaveSection *gFastSaveSection; // the pointer is in fast IWRAM but may sometimes point to the slower EWRAM.
+u16 gUnknown_03005EB4;
+u16 gSaveFileStatus;
+u32 gGameContinueCallback;
 
 extern struct PokemonStorage gPokemonStorage;
 extern struct HallOfFame gHallOfFame;
 
+static EWRAM_DATA u32 gLastSaveSectorStatus = 0; // used but in an unferenced function, so unused
+
 const struct SaveSectionLocation gSaveSectionLocations[] =
 {
     {((u8 *) &gSaveBlock2) + GETBLOCKOFFSET(1), GETCHUNKSIZE(gSaveBlock2, 1)},
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index a64b3eb5f..b91e8b5bf 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -22,17 +22,11 @@
 
 #define CLOCK_WIN_TOP (MSG_WIN_TOP - 4)
 
-struct SaveFailedClockStruct
-{
-    bool16 clockRunning;
-    u16 timer; // appears to be unused, the only case its "used" cannot be reached normally
-    u8 unused[0xE]; // appears to be unused space. alternatively, there could have been multiple clock structs. however, neither of these cases are fulfilled, so the purpose of this space is unknown. one theory is that there is room for 3 more clock structs (2 16-bit values), so its possible GF intended there to be support for link-based save failed screens in case the synchronization failed, or it in fact was present in an earlier build but taken out for reasons.
-};
-
 extern u8 unk_2000000[];
 
-extern u16 gSaveFailedType;
-extern struct SaveFailedClockStruct gSaveFailedClockInfo;
+static EWRAM_DATA u16 gSaveFailedType = 0;
+static EWRAM_DATA u16 gSaveFailedClockInfo[9] = {0};
+
 extern u32 gDamagedSaveSectors;
 extern u32 gGameContinueCallback;
 
@@ -83,7 +77,7 @@ void DoSaveFailedScreen(u8 saveType)
 {
     SetMainCallback2(CB2_SaveFailedScreen);
     gSaveFailedType = saveType;
-    gSaveFailedClockInfo.clockRunning = FALSE;
+    gSaveFailedClockInfo[0] = FALSE;
 }
 
 static void VBlankCB(void)
@@ -159,7 +153,7 @@ static void CB2_WipeSave(void)
 {
     u8 wipeTries = 0;
 
-    gSaveFailedClockInfo.clockRunning = TRUE;
+    gSaveFailedClockInfo[0] = TRUE;
 
     while (gDamagedSaveSectors != 0 && wipeTries < 3) // while there are still attempts left, keep trying to fix the save sectors.
     {
@@ -208,7 +202,7 @@ static void CB2_WipeSave(void)
 
 static void CB2_GameplayCannotBeContinued(void)
 {
-    gSaveFailedClockInfo.clockRunning = FALSE;
+    gSaveFailedClockInfo[0] = FALSE;
 
     if (gMain.newKeys & A_BUTTON)
     {
@@ -221,7 +215,7 @@ static void CB2_GameplayCannotBeContinued(void)
 
 static void CB2_FadeAndReturnToTitleScreen(void)
 {
-    gSaveFailedClockInfo.clockRunning = FALSE;
+    gSaveFailedClockInfo[0] = FALSE;
 
     if (gMain.newKeys & A_BUTTON)
     {
@@ -255,7 +249,7 @@ static void VBlankCB_UpdateClockGraphics(void)
     gMain.oamBuffer[0].x = 112;
     gMain.oamBuffer[0].y = (CLOCK_WIN_TOP + 1) * 8;
 
-    if (gSaveFailedClockInfo.clockRunning != FALSE)
+    if (gSaveFailedClockInfo[0] != FALSE)
     {
         gMain.oamBuffer[0].tileNum = sClockFrames[n][0];
         gMain.oamBuffer[0].matrixNum = (sClockFrames[n][2] << 4) | (sClockFrames[n][1] << 3);
@@ -267,8 +261,8 @@ static void VBlankCB_UpdateClockGraphics(void)
 
     CpuFastCopy(gMain.oamBuffer, (void *)OAM, 4);
 
-    if (gSaveFailedClockInfo.timer) // maybe was used for debugging?
-        gSaveFailedClockInfo.timer--;
+    if (gSaveFailedClockInfo[1]) // maybe was used for debugging?
+        gSaveFailedClockInfo[1]--;
 }
 
 static bool8 VerifySectorWipe(u16 sector)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 45552f2fa..7d719371e 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -48,12 +48,14 @@ typedef u16 (*SpecialFunc)(void);
 typedef void (*NativeFunc)(void);
 
 extern u32 gUnknown_0202E8AC;
-extern u32 gUnknown_0202E8B0;
-extern u16 gUnknown_0202E8B4;
-extern u16 gUnknown_0202E8B6;
-extern u16 gUnknown_0202E8B8;
-extern u16 gUnknown_0202E8BA;
-extern u16 gUnknown_0202E8BC;
+
+static EWRAM_DATA u32 gUnknown_0202E8B0 = 0;
+static EWRAM_DATA u16 gUnknown_0202E8B4 = 0;
+static EWRAM_DATA u16 gUnknown_0202E8B6 = 0;
+static EWRAM_DATA u16 gUnknown_0202E8B8 = 0;
+static EWRAM_DATA u16 gUnknown_0202E8BA = 0;
+static EWRAM_DATA u16 gUnknown_0202E8BC = 0;
+
 extern u16 gSpecialVar_0x8000;
 extern u16 gSpecialVar_0x8001;
 extern u16 gSpecialVar_0x8002;
@@ -61,8 +63,6 @@ extern u16 gSpecialVar_0x8004;
 
 extern u16 gScriptResult;
 
-extern u32 gUnknown_0202FF84[];
-
 extern u16 gScriptContestCategory;
 
 extern SpecialFunc gSpecials[];
diff --git a/src/script.c b/src/script.c
index c27eb22fe..e5be913c6 100644
--- a/src/script.c
+++ b/src/script.c
@@ -4,8 +4,7 @@
 
 #define RAM_SCRIPT_MAGIC 51
 
-extern u8 *gUnknown_0202E8AC;
-extern u32 gUnknown_0202E8B0;
+EWRAM_DATA u8 *gUnknown_0202E8AC = NULL;
 
 static u8 sScriptContext1Status;
 static struct ScriptContext sScriptContext1;
diff --git a/src/script_movement.c b/src/script_movement.c
index 31143ed6f..e25b60a3c 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -5,7 +5,7 @@
 #include "task.h"
 #include "util.h"
 
-extern u8 *gUnknown_020384F8[];
+static EWRAM_DATA u8 *gUnknown_020384F8[16] = {0};
 
 static void sub_80A2198(u8);
 static u8 sub_80A21E0(void);
diff --git a/src/sound.c b/src/sound.c
index c9c4916b0..8d23b7d7a 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -17,8 +17,9 @@ struct Fanfare
 u32 SpeciesToCryId(u32);
 
 extern u16 gBattleTypeFlags;
-extern struct MusicPlayerInfo *gMPlay_PokemonCry;
-extern u8 gPokemonCryBGMDuckingCounter;
+
+static EWRAM_DATA struct MusicPlayerInfo *gMPlay_PokemonCry = NULL;
+static EWRAM_DATA u8 gPokemonCryBGMDuckingCounter = 0;
 
 static u16 sCurrentMapMusic;
 static u16 sNextMapMusic;
@@ -26,7 +27,8 @@ static u8 sMapMusicState;
 static u8 sMapMusicFadeInSpeed;
 static u16 sFanfareCounter;
 
-extern bool8 gDisableMusic;
+bool8 gDisableMusic;
+
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern struct MusicPlayerInfo gMPlay_SE1;
 extern struct MusicPlayerInfo gMPlay_SE2;
diff --git a/src/sound_check_menu.c b/src/sound_check_menu.c
index 13a6f6f3e..d97ae6d86 100644
--- a/src/sound_check_menu.c
+++ b/src/sound_check_menu.c
@@ -57,18 +57,19 @@ extern struct ToneData voicegroup_8453190[];
 extern struct ToneData voicegroup_84549C0[];
 extern struct ToneData voicegroup_8453790[];
 
-extern int gUnknown_020387B4[9];
-
-extern s8 gUnknown_020387B3;
-extern u8 gUnknown_020387B1;
-extern u8 gUnknown_020387B2;
-extern u8 gUnknown_020387D8;
-extern u8 gUnknown_020387D9;
-extern u8 gUnknown_020387B0;
+static EWRAM_DATA u8 gUnknown_020387B0 = 0;
+static EWRAM_DATA u8 gUnknown_020387B1 = 0;
+static EWRAM_DATA u8 gUnknown_020387B2 = 0;
+static EWRAM_DATA s8 gUnknown_020387B3 = 0;
+static EWRAM_DATA int gUnknown_020387B4[9] = {0};
+static EWRAM_DATA u8 gUnknown_020387D8 = 0;
+static EWRAM_DATA u8 gUnknown_020387D9 = 0;
+
 extern u16 gUnknown_03005D34;
 extern u8 gUnknown_03005E98;
 
-extern struct MusicPlayerInfo *gUnknown_03005D30;
+struct MusicPlayerInfo *gUnknown_03005D30;
+
 extern struct MusicPlayerInfo gMPlay_BGM;
 
 void sub_80BA258(u8);
diff --git a/src/start_menu.c b/src/start_menu.c
index e05f3a999..411690aff 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -51,9 +51,11 @@ static bool8 savingComplete;
 extern bool8 gDifferentSaveFile;
 extern u16 gSaveFileStatus;
 extern u16 gScriptResult;
-extern u8 (*gCallback_03004AE8)(void);
+
 extern u8 gUnknown_03004860;
 
+u8 (*gCallback_03004AE8)(void);
+
 EWRAM_DATA static u8 sStartMenuCursorPos = 0;
 EWRAM_DATA static u8 sNumStartMenuActions = 0;
 EWRAM_DATA static u8 sCurrentStartMenuActions[10] = {0};
diff --git a/src/title_screen.c b/src/title_screen.c
index 1ed87ff03..ab0f1d505 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -41,7 +41,6 @@
 
 extern u8 gReservedSpritePaletteCount;
 extern struct MusicPlayerInfo gMPlay_BGM;
-extern u8 gUnknown_0202F7E4;
 extern u16 gUnknown_030041B4;
 extern u16 gUnknown_030042C0;
 extern const u8 gUnknown_08E9D8CC[];
@@ -51,6 +50,8 @@ extern const u8 gVersionTiles[];
 extern const u8 gTitleScreenPressStart_Gfx[];
 extern const u16 gTitleScreenLogoShinePalette[];
 
+static EWRAM_DATA u8 gUnknown_0202F7E4 = 0;
+
 #ifdef SAPPHIRE
 static const u16 sLegendaryMonPalettes[][16] =
 {
diff --git a/src/trainer_card.c b/src/trainer_card.c
index f7afd9cec..626c5a7bf 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -51,7 +51,8 @@ extern u8 ewram[];
 #define ewram0 (*(struct Struct2000000 *)(ewram))
 
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
-extern struct TrainerCard gTrainerCards[4];
+
+EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0};
 
 struct UnknownStruct1
 {
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 9b7a47f6b..feb35c67c 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -13,8 +13,6 @@ extern bool8 (*gIsTrainerInRange[])(struct MapObject *, u16, s16, s16);
 extern bool8 (*gTrainerSeeFuncList[])(u8, struct Task *, struct MapObject *);
 extern bool8 (*gTrainerSeeFuncList2[])(u8, struct Task *, struct MapObject *);
 
-extern u32 gUnknown_0202FF84[];
-
 extern struct SpriteTemplate gSpriteTemplate_839B510;
 extern struct SpriteTemplate gSpriteTemplate_839B528;
 
diff --git a/src/tv.c b/src/tv.c
index 8b99fc2fa..c5b47cdae 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -63,14 +63,7 @@ extern u8 gUnknown_02038694;
 
 extern struct TVSaleItem gUnknown_02038724[3];
 
-extern u16 gSpecialVar_0x8004;
-extern u16 gSpecialVar_0x8005;
-extern u16 gSpecialVar_0x8006;
-extern u8 gSpecialVar_0x8007;
-extern u16 gScriptResult;
-extern u8 gUnknown_020387E8;
-
-extern struct UnkTvStruct gUnknown_03005D38;
+struct UnkTvStruct gUnknown_03005D38;
 
 extern u8 *gTVBravoTrainerTextGroup[];
 extern u8 *gTVBravoTrainerBattleTowerTextGroup[];
@@ -87,8 +80,7 @@ extern u8 *gTVFishingGuruAdviceTextGroup[];
 extern u8 *gTVWorldOfMastersTextGroup[];
 extern struct OutbreakPokemon gPokeOutbreakSpeciesList[5];
 
-extern u16 gUnknown_020387E0;
-extern u16 gUnknown_020387E2;
+
 
 extern const u8 *gTVNewsTextGroup1[];
 extern const u8 *gTVNewsTextGroup2[];
@@ -96,7 +88,6 @@ extern const u8 *gTVNewsTextGroup3[];
 
 extern u16 gScriptLastTalked;
 
-
 extern u8 gScriptContestCategory;
 extern u8 gScriptContestRank;
 extern u8 gUnknown_03004316[11];
@@ -106,10 +97,15 @@ extern u16 gLastUsedItem;
 
 extern u8 ewram[];
 #define gUnknown_02007000 (*(ewramStruct_02007000 *)(ewram + 0x7000))
-extern u8 gUnknown_020387E4;
 
-extern u8 gUnknown_03000720;
-extern s8 gUnknown_03000722;
+static EWRAM_DATA u16 gUnknown_020387E0 = 0;
+static EWRAM_DATA u16 gUnknown_020387E2 = 0;
+static EWRAM_DATA u8 gUnknown_020387E4 = 0;
+static EWRAM_DATA ALIGNED(4) u8 gUnknown_020387E8 = 0; // why is this aligned to a 4-byte boundary?
+
+static u8 gUnknown_03000720;
+static u8 gUnknown_03000721;
+static s8 gUnknown_03000722;
 
 void ClearTVShowData(void)
 {
@@ -1921,9 +1917,6 @@ void sub_80BFD44(u8 *arg0, u32 arg1, u8 arg2)
     sub_80C0408();
 }
 
-extern u8 gUnknown_03000720;
-extern u8 gUnknown_03000721;
-extern s8 gUnknown_03000722;
 s8 sub_80C019C(TVShow tvShows[]);
 bool8 sub_80BFF68(TVShow * tv1[25], TVShow * tv2[25], u8 idx);
 u8 sub_80C004C(TVShow *tv1, TVShow *tv2, u8 idx);
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index ce83bc1c2..3aa2f1fa5 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -102,10 +102,11 @@ const struct SpriteTemplate gSpriteTemplate_840618C = {
 asm(".text\n"
     ".include \"constants/gba_constants.inc\"");
 
-extern struct UnkPokenavStruct_Sub1 *gUnknown_02039304;
-extern MainCallback gUnknown_02039308;
-extern struct Pokeblock *gUnknown_0203930C;
-extern u8 gUnknown_02039310;
+static EWRAM_DATA struct UnkPokenavStruct_Sub1 *gUnknown_02039304 = NULL;
+static EWRAM_DATA MainCallback gUnknown_02039308 = NULL;
+static EWRAM_DATA struct Pokeblock *gUnknown_0203930C = NULL;
+EWRAM_DATA u8 gUnknown_02039310 = 0;
+EWRAM_DATA s16 gUnknown_02039312 = 0;
 
 extern u16 gKeyRepeatStartDelay;
 extern u16 gScriptItemId; // FIXME: remove after merge of #349 Pokeblock
-- 
cgit v1.2.3


From 9eca72fc7f34c4f1b860fca1b6b9d6b8cd96aefd Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Fri, 21 Jul 2017 09:14:35 -0700
Subject: use -2 instead of 0xFFFE

---
 src/pokemon_icon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 0835c4dac..8994ea49e 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -977,7 +977,7 @@ static const union AffineAnimCmd sAffineAnim_0[] =
 
 static const union AffineAnimCmd sAffineAnim_1[] =
 {
-    AFFINEANIMCMD_FRAME(0xFFFE, 0xFFFE, 0, 122),
+    AFFINEANIMCMD_FRAME(-2, -2, 0, 122),
     AFFINEANIMCMD_END,
 };
 
-- 
cgit v1.2.3


From 4b3cdd869264ed2705558a7c74d521e2a290a86e Mon Sep 17 00:00:00 2001
From: drifloony <drifloony@users.noreply.github.com>
Date: Fri, 21 Jul 2017 15:19:00 -0700
Subject: make gUnknown_02039248 into struct

---
 src/pokeblock.c | 111 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 60 insertions(+), 51 deletions(-)

(limited to 'src')

diff --git a/src/pokeblock.c b/src/pokeblock.c
index bc46a119a..775280f6e 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -29,10 +29,19 @@
 #include "event_data.h"
 #include "pokeblock.h"
 
+struct UnkPokeblockStruct
+{
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+};
+
 extern u8 ewram[];
 
+
 static EWRAM_DATA u8 gUnknown_02039244 = 0;
-static EWRAM_DATA ALIGNED(4) u8 gUnknown_02039248[4] = {0}; // why aligned to 4 bytes?
+static EWRAM_DATA struct UnkPokeblockStruct gUnknown_02039248 = {0};
 static EWRAM_DATA u8 gUnknown_0203924C = 0;
 
 // function declarations
@@ -322,7 +331,7 @@ static bool8 sub_810B6C0(void)
         case 15:
             sub_810BB0C();
             sub_810BB30();
-            sub_810BC84(gUnknown_02039248[1]);
+            sub_810BC84(gUnknown_02039248.unk1);
             gMain.state++;
             break;
         case 16:
@@ -462,7 +471,7 @@ static void sub_810BB88(u8 a0)
     for (i=a0; i<=a0+8; i++)
     {
         y = (i - a0) << 1;
-        if (i == gUnknown_02039248[2])
+        if (i == gUnknown_02039248.unk2)
         {
             buf = sub_8072C74(gStringVar1, gContestStatsText_StowCase, 0x78, 0);
             MenuPrint(gStringVar1, 15, y + 1);
@@ -509,23 +518,23 @@ static void sub_810BC98(void)
 static void sub_810BD08(void)
 {
     u8 i;
-    gUnknown_02039248[2] = 0;
+    gUnknown_02039248.unk2 = 0;
     for (i=0; i<40; i++)
     {
         if (gSaveBlock1.pokeblocks[i].color != 0)
-            gUnknown_02039248[2]++;
+            gUnknown_02039248.unk2++;
     }
-    if (gUnknown_02039248[2] < 8)
+    if (gUnknown_02039248.unk2 < 8)
     {
-        gUnknown_02039248[3] = gUnknown_02039248[2];
+        gUnknown_02039248.unk3 = gUnknown_02039248.unk2;
     }
     else
     {
-        gUnknown_02039248[3] = 8;
+        gUnknown_02039248.unk3 = 8;
     }
-    if (gUnknown_02039248[1] + 8 > gUnknown_02039248[2] && gUnknown_02039248[1] != 0)
+    if (gUnknown_02039248.unk1 + 8 > gUnknown_02039248.unk2 && gUnknown_02039248.unk1 != 0)
     {
-        gUnknown_02039248[1]--;
+        gUnknown_02039248.unk1--;
     }
 }
 
@@ -535,8 +544,8 @@ static void sub_810BD64(u16 a0, u16 a1)
     int y;
     for (i=0; i<14; i++)
     {
-        gBGTilemapBuffers[2][(2 * gUnknown_02039248[0] + 1) * 32 + (y = i + 15)] = a0;
-        gBGTilemapBuffers[2][(2 * gUnknown_02039248[0] + 2) * 32 + y] = a0;
+        gBGTilemapBuffers[2][(2 * gUnknown_02039248.unk0 + 1) * 32 + (y = i + 15)] = a0;
+        gBGTilemapBuffers[2][(2 * gUnknown_02039248.unk0 + 2) * 32 + y] = a0;
     }
 }
 
@@ -552,7 +561,7 @@ static void sub_810BDAC(bool8 flag)
     {
         sub_810BD64(0x2005, 0x2014);
     }
-    if (gUnknown_02039248[1])
+    if (gUnknown_02039248.unk1)
     {
         sub_80F979C(0, 0);
     }
@@ -560,7 +569,7 @@ static void sub_810BDAC(bool8 flag)
     {
         sub_80F979C(0, 1);
     }
-    if (gUnknown_02039248[2] > gUnknown_02039248[3] && gUnknown_02039248[1] + gUnknown_02039248[3] != gUnknown_02039248[2])
+    if (gUnknown_02039248.unk2 > gUnknown_02039248.unk3 && gUnknown_02039248.unk1 + gUnknown_02039248.unk3 != gUnknown_02039248.unk2)
     {
         sub_80F979C(1, 0);
     }
@@ -571,9 +580,9 @@ static void sub_810BDAC(bool8 flag)
     for (i=0; i<5; i++)
     {
         v0 = ((i % 3) << 6) + 0x1a1 + (i / 3) * 6;
-        if (gUnknown_02039248[0] + gUnknown_02039248[1] != gUnknown_02039248[2])
+        if (gUnknown_02039248.unk0 + gUnknown_02039248.unk1 != gUnknown_02039248.unk2)
         {
-            if (sub_810CA9C(&gSaveBlock1.pokeblocks[gUnknown_02039248[0] + gUnknown_02039248[1]], i + 1) > 0)
+            if (sub_810CA9C(&gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1], i + 1) > 0)
             {
                 gBGTilemapBuffers[2][v0] = (i << 12) + 23;
                 gBGTilemapBuffers[2][v0 + 32] = (i << 12) + 24;
@@ -591,9 +600,9 @@ static void sub_810BDAC(bool8 flag)
         }
     }
     BasicInitMenuWindow(&gWindowConfig_81E6E34);
-    if (gUnknown_02039248[0] + gUnknown_02039248[1] != gUnknown_02039248[2])
+    if (gUnknown_02039248.unk0 + gUnknown_02039248.unk1 != gUnknown_02039248.unk2)
     {
-        sub_8072C14(gStringVar1, sub_810C9E8(&gSaveBlock1.pokeblocks[gUnknown_02039248[0] + gUnknown_02039248[1]]), 16, 1);
+        sub_8072C14(gStringVar1, sub_810C9E8(&gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1]), 16, 1);
         MenuPrint(gStringVar1, 11, 17);
     }
     else
@@ -615,48 +624,48 @@ static void sub_810BF7C(u8 taskId)
     {
         if (gMain.newAndRepeatedKeys & DPAD_UP)
         {
-            if (gUnknown_02039248[0] != 0)
+            if (gUnknown_02039248.unk0 != 0)
             {
                 sub_810BD64(5, 20);
-                gUnknown_02039248[0]--;
+                gUnknown_02039248.unk0--;
                 sub_810BF38(FALSE);
             }
-            else if (gUnknown_02039248[1] != 0)
+            else if (gUnknown_02039248.unk1 != 0)
             {
-                gUnknown_02039248[1]--;
-                sub_810BB88(gUnknown_02039248[1]);
+                gUnknown_02039248.unk1--;
+                sub_810BB88(gUnknown_02039248.unk1);
                 sub_810BF38(FALSE);
             }
         }
         else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
         {
-            if (gUnknown_02039248[0] != gUnknown_02039248[3])
+            if (gUnknown_02039248.unk0 != gUnknown_02039248.unk3)
             {
                 sub_810BD64(5, 20);
-                gUnknown_02039248[0]++;
+                gUnknown_02039248.unk0++;
                 sub_810BF38(FALSE);
             }
-            else if (gUnknown_02039248[1] + gUnknown_02039248[0] != gUnknown_02039248[2])
+            else if (gUnknown_02039248.unk1 + gUnknown_02039248.unk0 != gUnknown_02039248.unk2)
             {
-                gUnknown_02039248[1]++;
-                sub_810BB88(gUnknown_02039248[1]);
+                gUnknown_02039248.unk1++;
+                sub_810BB88(gUnknown_02039248.unk1);
                 sub_810BF38(FALSE);
             }
         }
         else if (gMain.newKeys & SELECT_BUTTON)
         {
-            if (gUnknown_02039248[1] + gUnknown_02039248[0] != gUnknown_02039248[2])
+            if (gUnknown_02039248.unk1 + gUnknown_02039248.unk0 != gUnknown_02039248.unk2)
             {
                 PlaySE(SE_SELECT);
                 sub_810BDAC(TRUE);
-                gTasks[taskId].data[0] = gUnknown_02039248[1] + gUnknown_02039248[0];
+                gTasks[taskId].data[0] = gUnknown_02039248.unk1 + gUnknown_02039248.unk0;
                 gTasks[taskId].func = sub_810C0C8;
             }
         }
         else if (gMain.newKeys & A_BUTTON)
         {
             PlaySE(SE_SELECT);
-            if (gUnknown_02039248[1] + gUnknown_02039248[0] == gUnknown_02039248[2])
+            if (gUnknown_02039248.unk1 + gUnknown_02039248.unk0 == gUnknown_02039248.unk2)
             {
                 gScriptResult = 0xffff;
                 sub_810C31C(taskId);
@@ -679,36 +688,36 @@ static void sub_810C0C8(u8 taskId)
 {
     if (gMain.newAndRepeatedKeys & DPAD_UP)
     {
-        if (gUnknown_02039248[0] != 0)
+        if (gUnknown_02039248.unk0 != 0)
         {
             sub_810BD64(5, 20);
-            gUnknown_02039248[0]--;
+            gUnknown_02039248.unk0--;
             sub_810BF38(TRUE);
             sub_810C1C8(taskId, 1);
         }
-        else if (gUnknown_02039248[1] != 0)
+        else if (gUnknown_02039248.unk1 != 0)
         {
             sub_810C1C8(taskId, 0);
-            gUnknown_02039248[1]--;
-            sub_810BB88(gUnknown_02039248[1]);
+            gUnknown_02039248.unk1--;
+            sub_810BB88(gUnknown_02039248.unk1);
             sub_810BF38(TRUE);
             sub_810C1C8(taskId, 1);
         }
     }
     else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
     {
-        if (gUnknown_02039248[0] != gUnknown_02039248[3])
+        if (gUnknown_02039248.unk0 != gUnknown_02039248.unk3)
         {
             sub_810BD64(5, 20);
-            gUnknown_02039248[0]++;
+            gUnknown_02039248.unk0++;
             sub_810BF38(TRUE);
             sub_810C1C8(taskId, 1);
         }
-        else if (gUnknown_02039248[1] + gUnknown_02039248[0] != gUnknown_02039248[2])
+        else if (gUnknown_02039248.unk1 + gUnknown_02039248.unk0 != gUnknown_02039248.unk2)
         {
             sub_810C1C8(taskId, 0);
-            gUnknown_02039248[1]++;
-            sub_810BB88(gUnknown_02039248[1]);
+            gUnknown_02039248.unk1++;
+            sub_810BB88(gUnknown_02039248.unk1);
             sub_810BF38(TRUE);
             sub_810C1C8(taskId, 1);
         }
@@ -739,8 +748,8 @@ static void sub_810C1C8(u8 taskId, u8 flag)
     {
         v0 = 0x0005;
     }
-    y = gTasks[taskId].data[0] - gUnknown_02039248[1];
-    if ((u16)y <= 8 && y != gUnknown_02039248[0])
+    y = gTasks[taskId].data[0] - gUnknown_02039248.unk1;
+    if ((u16)y <= 8 && y != gUnknown_02039248.unk0)
     {
         for (i=0; i<14; i++)
         {
@@ -753,8 +762,8 @@ static void sub_810C1C8(u8 taskId, u8 flag)
 static void sub_810C23C(u8 taskId)
 {
     struct Pokeblock buf;
-    u8 selidx = gUnknown_02039248[1] + gUnknown_02039248[0];
-    if (selidx == gUnknown_02039248[2])
+    u8 selidx = gUnknown_02039248.unk1 + gUnknown_02039248.unk0;
+    if (selidx == gUnknown_02039248.unk2)
     {
         sub_810BDAC(FALSE);
     }
@@ -763,7 +772,7 @@ static void sub_810C23C(u8 taskId)
         buf = gSaveBlock1.pokeblocks[selidx];
         gSaveBlock1.pokeblocks[selidx] = gSaveBlock1.pokeblocks[gTasks[taskId].data[0]];
         gSaveBlock1.pokeblocks[gTasks[taskId].data[0]] = buf;
-        sub_810BB88(gUnknown_02039248[1]);
+        sub_810BB88(gUnknown_02039248.unk1);
         sub_810BDAC(FALSE);
     }
 }
@@ -810,7 +819,7 @@ static void sub_810C368(u8 taskId)
     MenuDrawTextWindow(7, v0 + 4, 13, 11);
     PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, (const struct MenuAction *)gUnknown_083F7EF4, gUnknown_03000758);
     InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5);
-    gScriptItemId = gUnknown_02039248[0] + gUnknown_02039248[1];
+    gScriptItemId = gUnknown_02039248.unk0 + gUnknown_02039248.unk1;
     gTasks[taskId].func = sub_810C40C;
 }
 
@@ -865,7 +874,7 @@ static void sub_810C540(u8 taskId)
     BasicInitMenuWindow(&gWindowConfig_81E6E50);
     HandleDestroyMenuCursors();
     MenuZeroFillWindowRect(7, 4, 13, 11);
-    StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gUnknown_02039248[0] + gUnknown_02039248[1]].color]);
+    StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1].color]);
     StringExpandPlaceholders(gStringVar4, gContestStatsText_ThrowAwayPrompt);
     DisplayItemMessageOnField(taskId, gStringVar4, sub_810C5EC, 0);
 }
@@ -885,7 +894,7 @@ static void sub_810C5EC(u8 taskId)
 static void sub_810C610(u8 taskId)
 {
     MenuZeroFillWindowRect(7, 6, 13, 11);
-    sub_810CA6C((gUnknown_02039248[0] + gUnknown_02039248[1]));
+    sub_810CA6C((gUnknown_02039248.unk0 + gUnknown_02039248.unk1));
     StringExpandPlaceholders(gStringVar4, gContestStatsText_WasThrownAway);
     DisplayItemMessageOnField(taskId, gStringVar4, sub_810C704, 0);
     sub_810BC98();
@@ -896,7 +905,7 @@ static void sub_810C668(u8 taskId)
 {
     StartVerticalScrollIndicators(0);
     StartVerticalScrollIndicators(1);
-    if (gUnknown_02039248[2] > gUnknown_02039248[3] && gUnknown_02039248[1] + gUnknown_02039248[3] != gUnknown_02039248[2])
+    if (gUnknown_02039248.unk2 > gUnknown_02039248.unk3 && gUnknown_02039248.unk1 + gUnknown_02039248.unk3 != gUnknown_02039248.unk2)
     {
         sub_80F979C(1, 0);
     }
@@ -917,7 +926,7 @@ static void sub_810C6DC(u8 taskId)
 static void sub_810C704(u8 taskId)
 {
     BasicInitMenuWindow(&gWindowConfig_81E6E34);
-    sub_810BC84(gUnknown_02039248[1]);
+    sub_810BC84(gUnknown_02039248.unk1);
     sub_80F979C(1, 1);
     gTasks[taskId].func = sub_810C6DC;
 }
-- 
cgit v1.2.3