Merge branch 'master' into daycare

98 files changed, 11206 insertions, 2732 deletions

diff --git a/src/bard_music.c b/src/bard_music.c
index a31568475..daf003233 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -1,71 +1,43 @@
 #include "global.h"
+#include "bard_music.h"
 #include "easy_chat.h"
 
 struct BardSound
 {
-    u8 pad_00[48];
-};
-
-struct UnkBard
-{
     /*0x00*/ u8 var00;
     /*0x01*/ s8 var01;
     /*0x02*/ u16 var02;
-    /*0x04*/ u16 var04;
+    /*0x04*/ u16 volume;
     /*0x06*/ u16 var06;
 };
 
-struct UnkBard3
-{
-    /*0x00*/ u16 var00;
-    /*0x02*/ u16 var02;
-    /*0x04*/ s16 var04;
-    /*0x06*/ u16 var06;
-};
-
-struct UnkBard2
-{
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
-    /*0x02*/ u8 var02;
-    /*0x03*/ u8 var03;
-    /*0x04*/ u16 var04;
-             u8 pad06[4];
-    /*0x0A*/ u16 var0A;
-             u8 pad0C[12];
-    /*0x18*/ struct UnkBard3 var18[6];
-};
-
-extern struct BardSound *gBardMusicTable[];
+extern const struct BardSound (*const gBardMusicTable[])[][6];
 extern s16 *gUnknown_08417068[];
 extern u32 gUnknown_084170F4[];
 
-static s16 sub_814A2B8(u32 arg0, u32 arg1)
+static s16 CalcWordPitch(u32 arg0, u32 songPos)
 {
-    return gUnknown_08417068[arg0][arg1];
+    return gUnknown_08417068[arg0][songPos];
 }
 
 #if ENGLISH
-struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
+const struct BardSound *GetWordSounds(u16 group, u16 word)
 {
-    struct BardSound *sounds = gBardMusicTable[arg0];
+    const struct BardSound (*sounds)[][6] = gBardMusicTable[group];
 
-    return &sounds[arg1];
+    return (*sounds)[word];
 }
 #elif GERMAN
-struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
+const struct BardSound *GetWordSounds(u16 group, u16 word)
 {
-    u32 index;
-    struct BardSound *sounds;
-
-    sounds = gBardMusicTable[arg0];
-    index = de_sub_80EB748(arg0, arg1);
+    const struct BardSound (*sounds)[][6] = gBardMusicTable[group];
+    u32 index = de_sub_80EB748(group, word);
 
-    return &sounds[index];
+    return (*sounds)[index];
 }
 #endif
 
-s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2)
+s32 GetWordPhonemes(struct BardSong *song, const struct BardSound *src, u16 arg2)
 {
     s32 i;
     s32 j;
@@ -73,25 +45,25 @@ s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2)
 
     for (i = 0; i < 6; i++)
     {
-        dest->var18[i].var00 = src[i].var00;
+        song->phonemes[i].sound = src[i].var00;
         if (src[i].var00 != 0xFF)
         {
-            s32 r1 = src[i].var01 +gUnknown_084170F4[src[i].var00];
+            s32 length = src[i].var01 + gUnknown_084170F4[src[i].var00];
 
-            dest->var18[i].var02 = r1;
-            dest->var18[i].var06 = src[i].var04;
-            dest->var04 += r1;
+            song->phonemes[i].length = length;
+            song->phonemes[i].volume = src[i].volume;
+            song->var04 += length;
         }
     }
 
     for (j = 0, thirty = 30; j < i; j++)
-        dest->var18[j].var04 = sub_814A2B8(thirty + arg2, j);
+        song->phonemes[j].pitch = CalcWordPitch(thirty + arg2, j);
 
-    dest->var00++;
-    dest->var01 = 0;
-    dest->var02 = 0;
-    dest->var03 = 0;
-    dest->var0A = 0;
+    song->currWord++;
+    song->currPhoneme = 0;
+    song->phonemeTimer = 0;
+    song->state = 0;
+    song->voiceInflection = 0;
 
     //warning: no return statement in function returning non-void
 }
diff --git a/src/battle_2.c b/src/battle_2.c
index 106d3333b..3cdea07be 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -181,7 +181,7 @@ extern u8 gHealthboxIDs[];
 extern struct UnknownStruct6 gUnknown_03004DE0;
 //extern u16 gUnknown_03004DE0[][0xA0];  // possibly?
 extern u16 gBattleTypeFlags;
-extern s8 gBattleTerrain;  // I'm not sure if this is supposed to be s8 or u8. Regardless, it must have the same type as the return value of GetBattleTerrain.
+extern s8 gBattleTerrain;  // I'm not sure if this is supposed to be s8 or u8. Regardless, it must have the same type as the return value of BattleSetup_GetTerrain.
 extern u8 gReservedSpritePaletteCount;
 extern u16 gTrainerBattleOpponent;
 extern struct BattleEnigmaBerry gEnigmaBerries[];
@@ -239,7 +239,8 @@ void InitBattle(void)
         gUnknown_03004DE0.unk0[i] = 0xFF10;
         gUnknown_03004DE0.unk780[i] = 0xFF10;
     }
-    sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8);
+    //sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8);
+    sub_80895F8(gUnknown_081F9674);
     SetUpWindowConfig(&gWindowConfig_81E6C58);
     ResetPaletteFade();
     gUnknown_030042A4 = 0;
@@ -250,7 +251,7 @@ void InitBattle(void)
     gUnknown_03004280 = 0;
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
-    gBattleTerrain = GetBattleTerrain();
+    gBattleTerrain = BattleSetup_GetTerrain();
     InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
     InitWindowFromConfig(&gUnknown_030041D0, &gWindowConfig_81E71D0);
     InitWindowFromConfig(&gUnknown_03004250, &gWindowConfig_81E71EC);
diff --git a/src/battle_4.c b/src/battle_4.c
index a796ace94..65ea765cf 100644
--- a/src/battle_4.c
+++ b/src/battle_4.c
@@ -82,7 +82,7 @@ extern void (*gBattleMainFunc)(void);
 extern struct Window gUnknown_03004210;
 extern const u8 gUnknown_08400D7A[];
 extern u8 gPlayerPartyCount;
-extern u16 word_2024E82; //move to learn
+extern u16 gMoveToLearn; //move to learn
 extern const u8 gTrainerMoney[];
 extern u16 gRandomMove;
 extern u8* gBattleScriptsEffectsTable[];
@@ -129,7 +129,7 @@ u16 sub_803FBFC(u8 a);
 u8 GetBankByPlayerAI(u8 ID);
 void sub_8012258(u8);
 void sub_80157C4(u8 bank); //update sent pokes in battle
-//sub_803B7C8 teach poke a move
+//MonTryLearningNewMove teach poke a move
 u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move);
 void IncrementGameStat(u8 index);
 u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale);
@@ -144,7 +144,7 @@ void sub_802BBD4(u8 r0, u8 r1, u8 r2, u8 r3, u8 sp0);
 void nullsub_6(void);
 void ReshowBattleScreenAfterMenu(void);
 void sub_800F808(void);
-void sub_80B79B8(u32* moneySaveblock, u32 to_give);
+void AddMoney(u32* moneySaveblock, u32 to_give);
 void sub_80156DC(void); //set sentpokes value
 bool8 sub_8014AB8(u8 bank); //can run from battle
 u8 CountAliveMons(u8 caseID);
@@ -154,7 +154,7 @@ u8 GetMoveTarget(u16 move, u8 targetbyte); //get target of move
 void sub_80153D0(u8 atk); //pressure perish song pp decrement
 u8 CastformDataTypeChange(u8 bank);
 void b_push_move_exec(u8* bs_ptr);
-u8 sav1_map_get_light_level(void);
+u8 Overworld_GetMapTypeOfSaveblockLocation(void);
 u8 CalculatePlayerPartyCount(void);
 u16 Sqrt(u32 num);
 u8 sub_809070C(u16 nationalNum, u32 TiD, u32 PiD); //task prepare poke dex display
@@ -11460,9 +11460,9 @@ void atk59_learnmove_inbattle(void)
     u8* loc1 = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     u8* loc2 = BSScriptReadPtr(gBattlescriptCurrInstr + 5);
 
-    u16 ret = sub_803B7C8(&gPlayerParty[BATTLE_STRUCT->expGetterID], BSScriptRead8(gBattlescriptCurrInstr + 9));
+    u16 ret = MonTryLearningNewMove(&gPlayerParty[BATTLE_STRUCT->expGetterID], BSScriptRead8(gBattlescriptCurrInstr + 9));
     while (ret == 0xFFFE)
-        ret = sub_803B7C8(&gPlayerParty[BATTLE_STRUCT->expGetterID], 0);
+        ret = MonTryLearningNewMove(&gPlayerParty[BATTLE_STRUCT->expGetterID], 0);
 
     if (ret == 0)
     {
@@ -11549,7 +11549,7 @@ static void atk5A(void)
     case 2:
         if (!gPaletteFade.active)
         {
-            sub_809D9F0(gPlayerParty, BATTLE_STRUCT->expGetterID, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, word_2024E82);
+            sub_809D9F0(gPlayerParty, BATTLE_STRUCT->expGetterID, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, gMoveToLearn);
             BATTLE_STRUCT->atk5A_StateTracker++;
         }
         break;
@@ -11584,18 +11584,18 @@ static void atk5A(void)
                     }
                     ptr[0] = 0xFF;
                     RemoveMonPPBonus(&gPlayerParty[BATTLE_STRUCT->expGetterID], move_pos);
-                    SetMonMoveSlot(&gPlayerParty[BATTLE_STRUCT->expGetterID], word_2024E82, move_pos);
+                    SetMonMoveSlot(&gPlayerParty[BATTLE_STRUCT->expGetterID], gMoveToLearn, move_pos);
                     if (gBattlePartyID[0] == BATTLE_STRUCT->expGetterID && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED)
                         && !(gDisableStructs[0].unk18_b & gBitTable[move_pos]))
                     {
                         RemoveBattleMonPPBonus(&gBattleMons[0], move_pos);
-                        SetBattleMonMoveSlot(&gBattleMons[0], word_2024E82, move_pos);
+                        SetBattleMonMoveSlot(&gBattleMons[0], gMoveToLearn, move_pos);
                     }
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlePartyID[2] == BATTLE_STRUCT->expGetterID && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED)
                         && !(gDisableStructs[2].unk18_b & gBitTable[move_pos]))
                     {
                         RemoveBattleMonPPBonus(&gBattleMons[2], move_pos);
-                        SetBattleMonMoveSlot(&gBattleMons[2], word_2024E82, move_pos);
+                        SetBattleMonMoveSlot(&gBattleMons[2], gMoveToLearn, move_pos);
                     }
                 }
             }
@@ -11717,7 +11717,7 @@ static void atk5D_getmoneyreward(void)
             money_to_give = 1 * gTrainerMoney[i * 4 + 1] * money_to_give;
     }
 
-    sub_80B79B8(&gSaveBlock1.money, money_to_give);
+    AddMoney(&gSaveBlock1.money, money_to_give);
     gBattleTextBuff1[0] = 0xFD;
     gBattleTextBuff1[1] = 1;
     gBattleTextBuff1[2] = 4;
@@ -11889,7 +11889,7 @@ _0802413C:\n\
 _08024140:\n\
     mov r0, r8\n\
     adds r1, r4, 0\n\
-    bl sub_80B79B8\n\
+    bl AddMoney\n\
     ldr r1, _0802418C @ =gBattleTextBuff1\n\
     movs r0, 0xFD\n\
     strb r0, [r1]\n\
@@ -12653,8 +12653,8 @@ void sub_8024CEC(void)
 {
     gBattleTextBuff2[0] = 0xFD;
     gBattleTextBuff2[1] = 2;
-    gBattleTextBuff2[2] = (word_2024E82);
-    gBattleTextBuff2[3] = uBYTE1_16(word_2024E82);
+    gBattleTextBuff2[2] = (gMoveToLearn);
+    gBattleTextBuff2[3] = uBYTE1_16(gMoveToLearn);
     gBattleTextBuff2[4] = 0xFF;
 }
 
@@ -14186,7 +14186,7 @@ static void atk91_givepaydaymoney(void)
 {
     if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gPaydayMoney)
     {
-        sub_80B79B8(&gSaveBlock1.money, gPaydayMoney * BATTLE_STRUCT->moneyMultiplier);
+        AddMoney(&gSaveBlock1.money, gPaydayMoney * BATTLE_STRUCT->moneyMultiplier);
         gBattleTextBuff1[0] = 0xFD;
         gBattleTextBuff1[1] = 1;
         gBattleTextBuff1[2] = 2;
@@ -17570,28 +17570,28 @@ static void atkE4_getsecretpowereffect(void)
 {
     switch (gBattleTerrain)
     {
-    case 0:
+    case BATTLE_TERRAIN_GRASS:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 2;
         break;
-    case 1:
+    case BATTLE_TERRAIN_LONG_GRASS:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 1;
         break;
-    case 2:
+    case BATTLE_TERRAIN_SAND:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 27;
         break;
-    case 3:
+    case BATTLE_TERRAIN_UNDERWATER:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 23;
         break;
-    case 4:
+    case BATTLE_TERRAIN_WATER:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 22;
         break;
-    case 5:
+    case BATTLE_TERRAIN_POND:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 24;
         break;
-    case 6:
+    case BATTLE_TERRAIN_MOUNTAIN:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 7;
         break;
-    case 7:
+    case BATTLE_TERRAIN_CAVE:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 8;
         break;
     default:
@@ -17818,7 +17818,7 @@ void atkEF_pokeball_catch_calculation(void)
                     ball_multiplier = 10;
                 break;
             case ITEM_DIVE_BALL:
-                if (sav1_map_get_light_level() == 5)
+                if (Overworld_GetMapTypeOfSaveblockLocation() == 5)
                     ball_multiplier = 35;
                 else
                     ball_multiplier = 10;
diff --git a/src/battle_controller_linkopponent2.c b/src/battle_controller_linkopponent.c
index 59030cd6e..93c6671e5 100644
--- a/src/battle_controller_linkopponent2.c
+++ b/src/battle_controller_linkopponent.c
@@ -3,6 +3,8 @@
 #include "battle_interface.h"
 #include "data2.h"
 #include "link.h"
+#include "m4a.h"
+#include "main.h"
 #include "palette.h"
 #include "rom_8077ABC.h"
 #include "rom3.h"
@@ -48,6 +50,9 @@ extern struct Window gUnknown_03004210;
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
 extern u8 gUnknown_0300434C[];
+extern u32 gBattleExecBuffer;
+extern MainCallback gPreBattleCallback1;
+extern struct MusicPlayerInfo gMPlay_BGM;
 
 extern u8 sub_8077F68();
 extern u8 sub_8079E90();
@@ -99,10 +104,14 @@ extern u8 move_anim_start_t3();
 extern void sub_8037FD8(void);
 extern void sub_8037F34(void);
 extern void LinkOpponentBufferExecCompleted(void);
+extern void sub_8141828();
+extern void sub_804777C();
 
 // this file's functions
 
 u32 dp01_getattr_by_ch1_for_player_pokemon__(u8, u8 *);
+void sub_803752C(void);
+void sub_8037D2C(void);
 void sub_8038900(u8);
 void sub_8039430(u8, u8);
 void sub_8039648(void);
@@ -234,6 +243,330 @@ const BattleBufferCmd gLinkOpponentBufferCommands[] =
 
 // code
 
+void nullsub_47(void)
+{
+}
+
+void SetBankFuncToLinkOpponentBufferRunCommand(void)
+{
+    gBattleBankFunc[gActiveBank] = sub_803752C;
+}
+
+void sub_803752C(void)
+{
+    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    {
+        if (gBattleBufferA[gActiveBank][0] <= 0x38)
+            gLinkOpponentBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        else
+            LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_803757C(void)
+{
+    if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+        LinkOpponentBufferExecCompleted();
+}
+
+void sub_80375B4(void)
+{
+    if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+    {
+        sub_8031B74(gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam);
+        gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = gSprites[gObjectBankIDs[gActiveBank]].data5;
+        FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
+        DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+        LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_8037644(void)
+{
+    if ((--ewram17810[gActiveBank].unk9) == 0xFF)
+    {
+        ewram17810[gActiveBank].unk9 = 0;
+        LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_8037680(void)
+{
+    bool8 r6 = FALSE;
+
+    if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
+    {
+        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+            r6 = TRUE;
+    }
+    else
+    {
+        if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy
+         && gSprites[gHealthboxIDs[gActiveBank ^ 2]].callback == SpriteCallbackDummy)
+            r6 = TRUE;
+    }
+    if (IsCryPlayingOrClearCrySongs())
+        r6 = FALSE;
+
+    if (r6)
+    {
+        if (GetBankIdentity(gActiveBank) == 1)
+        {
+            if (!ewram17810[gActiveBank].unk1_0 || !ewram17810[gActiveBank ^ 2].unk1_0)
+                return;
+            ewram17810[gActiveBank].unk0_7 = 0;
+            ewram17810[gActiveBank].unk1_0 = 0;
+            ewram17810[gActiveBank ^ 2].unk0_7 = 0;
+            ewram17810[gActiveBank ^ 2].unk1_0 = 0;
+            FreeSpriteTilesByTag(0x27F9);
+            FreeSpritePaletteByTag(0x27F9);
+        }
+        if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+        {
+            if (GetBankIdentity(gActiveBank) == 1)
+                m4aMPlayContinue(&gMPlay_BGM);
+        }
+        else
+        {
+            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
+        }
+        ewram17810[gActiveBank].unk9 = 3;
+        gBattleBankFunc[gActiveBank] = sub_8037644;
+    }
+}
+
+void sub_8037840(void)
+{
+    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
+        sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+    if (!ewram17810[gActiveBank ^ 2].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_7)
+        sub_8141828(gActiveBank ^ 2, &gEnemyParty[gBattlePartyID[gActiveBank ^ 2]]);
+    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_3)
+    {
+        if ((gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBankIdentity(gActiveBank) == 3)
+        {
+            if (++ewram17810[gActiveBank].unk9 == 1)
+                return;
+            ewram17810[gActiveBank].unk9 = 0;
+        }
+        if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
+        {
+            DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank ^ 2]]);
+            sub_8045A5C(
+              gHealthboxIDs[gActiveBank ^ 2],
+              &gEnemyParty[gBattlePartyID[gActiveBank ^ 2]],
+              0);
+            sub_804777C(gActiveBank ^ 2);
+            sub_8043DFC(gHealthboxIDs[gActiveBank ^ 2]);
+            sub_8032984(
+              gActiveBank ^ 2,
+              GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank ^ 2]], MON_DATA_SPECIES));
+        }
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
+        sub_8045A5C(
+          gHealthboxIDs[gActiveBank],
+          &gEnemyParty[gBattlePartyID[gActiveBank]],
+          0);
+        sub_804777C(gActiveBank);
+        sub_8043DFC(gHealthboxIDs[gActiveBank]);
+        sub_8032984(
+          gActiveBank,
+          GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+
+        ewram17840.unk9_0 = 0;
+        gBattleBankFunc[gActiveBank] = sub_8037680;
+    }
+}
+
+void sub_8037A74(void)
+{
+    if (gSprites[gObjectBankIDs[gActiveBank]].animEnded == TRUE
+     && gSprites[gObjectBankIDs[gActiveBank]].pos2.x == 0)
+    {
+        if (!ewram17810[gActiveBank].unk0_7)
+        {
+            sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+            return;
+        }
+        if (ewram17810[gActiveBank].unk1_0)
+        {
+            ewram17810[gActiveBank].unk0_7 = 0;
+            ewram17810[gActiveBank].unk1_0 = 0;
+            FreeSpriteTilesByTag(0x27F9);
+            FreeSpritePaletteByTag(0x27F9);
+            LinkOpponentBufferExecCompleted();
+            return;
+        }
+    }
+}
+
+void sub_8037B24(void)
+{
+    s16 r4 = sub_8045C78(gActiveBank, gHealthboxIDs[gActiveBank], 0, 0);
+
+    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    if (r4 != -1)
+        sub_80440EC(gHealthboxIDs[gActiveBank], r4, 0);
+    else
+        LinkOpponentBufferExecCompleted();
+}
+
+void sub_8037B78(void)
+{
+    if (!gSprites[gObjectBankIDs[gActiveBank]].inUse)
+    {
+        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_8037BBC(void)
+{
+    if (!ewram17810[gActiveBank].unk0_6)
+    {
+        FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]);
+        DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]);
+        sub_8032A08(gActiveBank);
+        sub_8043DB0(gHealthboxIDs[gActiveBank]);
+        LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_8037C2C(void)
+{
+    if (gUnknown_03004210.state == 0)
+        LinkOpponentBufferExecCompleted();
+}
+
+void dp01t_0F_4_move_anim(void)
+{
+    u8 spriteId = gObjectBankIDs[gActiveBank];
+
+    if (gSprites[spriteId].data1 == 32)
+    {
+        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].invisible = FALSE;
+        gDoingBattleAnim = 0;
+        LinkOpponentBufferExecCompleted();
+    }
+    else
+    {
+        if (((u16)gSprites[spriteId].data1 % 4) == 0)
+            gSprites[spriteId].invisible ^= 1;
+        gSprites[spriteId].data1++;
+    }
+}
+
+void sub_8037CC0(void)
+{
+    if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
+    {
+        if (ewram17800[gActiveBank].substituteSprite)
+            move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
+        gBattleBankFunc[gActiveBank] = sub_8037D2C;
+    }
+}
+
+void sub_8037D2C(void)
+{
+    if (!ewram17810[gActiveBank].unk0_6)
+    {
+        CreateTask(c3_0802FDF4, 10);
+        LinkOpponentBufferExecCompleted();
+    }
+}
+
+void sub_8037D64(void)
+{
+    if (ewram17810[gActiveBank].unk1_0)
+    {
+        ewram17810[gActiveBank].unk0_7 = 0;
+        ewram17810[gActiveBank].unk1_0 = 0;
+        FreeSpriteTilesByTag(0x27F9);
+        FreeSpritePaletteByTag(0x27F9);
+        StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 0);
+        sub_8045A5C(
+          gHealthboxIDs[gActiveBank],
+          &gEnemyParty[gBattlePartyID[gActiveBank]],
+          0);
+        sub_804777C(gActiveBank);
+        sub_8043DFC(gHealthboxIDs[gActiveBank]);
+        sub_8031F88(gActiveBank);
+        gBattleBankFunc[gActiveBank] = sub_8037CC0;
+    }
+}
+
+void sub_8037E30(void)
+{
+    if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7)
+        sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+    if (gSprites[gUnknown_0300434C[gActiveBank]].callback == SpriteCallbackDummy
+     && !ewram17810[gActiveBank].unk0_3)
+    {
+        DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]);
+        sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+        gBattleBankFunc[gActiveBank] = sub_8037D64;
+    }
+}
+
+void sub_8037EF0(void)
+{
+    if (gReceivedRemoteLinkPlayers == 0)
+    {
+        m4aSongNumStop(SE_HINSI);
+        gMain.inBattle = FALSE;
+        gMain.callback1 = gPreBattleCallback1;
+        SetMainCallback2(c2_8011A1C);
+    }
+}
+
+void sub_8037F34(void)
+{
+    if (!gPaletteFade.active)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            sub_800832C();
+            gBattleBankFunc[gActiveBank] = sub_8037EF0;
+        }
+        else
+        {
+            m4aSongNumStop(SE_HINSI);
+            gMain.inBattle = FALSE;
+            gMain.callback1 = gPreBattleCallback1;
+            SetMainCallback2(gMain.savedCallback);
+        }
+    }
+}
+
+void sub_8037FAC(void)
+{
+    if (!ewram17810[gActiveBank].unk0_4)
+        LinkOpponentBufferExecCompleted();
+}
+
+void sub_8037FD8(void)
+{
+    if (!ewram17810[gActiveBank].unk0_5)
+        LinkOpponentBufferExecCompleted();
+}
+
+void LinkOpponentBufferExecCompleted(void)
+{
+    gBattleBankFunc[gActiveBank] = sub_803752C;
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        u8 playerId = GetMultiplayerId();
+
+        PrepareBufferDataTransferLink(2, 4, &playerId);
+        gBattleBufferA[gActiveBank][0] = 0x38;
+    }
+    else
+    {
+        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+    }
+}
+
 void LinkOpponentHandleGetAttributes(void)
 {
     u8 buffer[0x100];
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index e84969b4f..e05578c31 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -2,8 +2,16 @@
 #include "battle_anim_81258BC.h"
 #include "battle.h"
 #include "battle_message.h"
+#include "data2.h"
+#include "link.h"
+#include "main.h"
 #include "menu_cursor.h"
+#include "palette.h"
+#include "rom3.h"
+#include "songs.h"
+#include "sound.h"
 #include "text.h"
+#include "util.h"
 
 extern struct Window gUnknown_03004210;
 extern u8 gDisplayedStringBattle[];
@@ -16,6 +24,32 @@ extern const u8 gUnknown_08400D15[];
 extern void *gBattleBankFunc[];
 extern u16 gUnknown_030042A0;
 extern u16 gUnknown_030042A4;
+extern u8 gBattleBufferA[][0x200];
+extern bool8 gDoingBattleAnim;
+extern u8 gObjectBankIDs[];
+extern struct SpriteTemplate gUnknown_02024E8C;
+extern u16 gBattleTypeFlags;
+extern u32 gBattleExecBuffer;
+extern u16 gScriptItemId;
+extern MainCallback gPreBattleCallback1;
+extern u8 gBankInMenu;
+extern u8 gHealthboxIDs[];
+extern u16 gBattlePartyID[];
+extern u16 gUnknown_02024DE8;
+extern u8 gBattleOutcome;
+
+extern u8 GetBankSide(u8);
+extern u8 GetBankByPlayerAI(u8);
+extern u8 GetBankIdentity(u8);
+extern void LoadPlayerTrainerBankSprite();
+extern u8 sub_8079E90();
+extern void sub_80313A0(struct Sprite *);
+extern void sub_810BADC(void);
+extern void sub_8045A5C();
+extern void sub_80E43C0();
+extern void sub_804777C();
+extern void sub_8043DFC();
+extern bool8 move_anim_start_t3();
 
 #if ENGLISH
 #define SUB_812BB10_TILE_DATA_OFFSET 440
@@ -146,7 +180,292 @@ const BattleBufferCmd gSafariBufferCommands[] =
 };
 // code
 
-void SafariHandlecmd18(void) {
+void SafariBufferExecCompleted(void);
+void bx_wait_t6(void);
+void sub_812B65C(void);
+void SafariBufferRunCommand(void);
+void sub_812B758(void);
+
+void unref_sub_812B464(void)
+{
+}
+
+void SetBankFuncToSafariBufferRunCommand(void)
+{
+    gBattleBankFunc[gActiveBank] = SafariBufferRunCommand;
+}
+
+void SafariBufferRunCommand(void)
+{
+    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    {
+        if (gBattleBufferA[gActiveBank][0] < 0x39)
+            gSafariBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        else
+            SafariBufferExecCompleted();
+    }
+}
+
+void bx_battle_menu_t6_2(void)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        DestroyMenuCursor();
+
+        // Useless switch statement.
+        switch (gActionSelectionCursor[gActiveBank])
+        {
+        case 0:
+            Emitcmd33(1, 5, 0);
+            break;
+        case 1:
+            Emitcmd33(1, 6, 0);
+            break;
+        case 2:
+            Emitcmd33(1, 7, 0);
+            break;
+        case 3:
+            Emitcmd33(1, 8, 0);
+            break;
+        }
+        SafariBufferExecCompleted();
+    }
+    else if (gMain.newKeys & DPAD_LEFT)
+    {
+        if (gActionSelectionCursor[gActiveBank] & 1)
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 1;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+    else if (gMain.newKeys & DPAD_RIGHT)
+    {
+        if (!(gActionSelectionCursor[gActiveBank] & 1))
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 1;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+    else if (gMain.newKeys & DPAD_UP)
+    {
+        if (gActionSelectionCursor[gActiveBank] & 2)
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 2;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        if (!(gActionSelectionCursor[gActiveBank] & 2))
+        {
+            PlaySE(SE_SELECT);
+            nullsub_8(gActionSelectionCursor[gActiveBank]);
+            gActionSelectionCursor[gActiveBank] ^= 2;
+            sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+        }
+    }
+}
+
+void sub_812B65C(void)
+{
+    if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy)
+        SafariBufferExecCompleted();
+}
+
+void sub_812B694(void)
+{
+    if (gUnknown_03004210.state == 0)
+        SafariBufferExecCompleted();
+}
+
+void sub_812B6AC(void)
+{
+    if (!gPaletteFade.active)
+    {
+        gMain.inBattle = FALSE;
+        gMain.callback1 = gPreBattleCallback1;
+        SetMainCallback2(gMain.savedCallback);
+    }
+}
+
+void bx_wait_t6(void)
+{
+    if (!gDoingBattleAnim || !ewram17810[gActiveBank].unk0_6)
+        SafariBufferExecCompleted();
+}
+
+void sub_812B724(void)
+{
+    if (!gPaletteFade.active)
+    {
+        gBattleBankFunc[gActiveBank] = sub_812B758;
+        sub_810BADC();
+    }
+}
+
+void sub_812B758(void)
+{
+    if (gMain.callback2 == sub_800F808 && !gPaletteFade.active)
+    {
+        Emitcmd35(1, gScriptItemId);
+        SafariBufferExecCompleted();
+    }
+}
+
+void sub_812B794(void)
+{
+    if (!ewram17810[gActiveBank].unk0_5)
+        SafariBufferExecCompleted();
+}
+
+void SafariBufferExecCompleted(void)
+{
+    gBattleBankFunc[gActiveBank] = SafariBufferRunCommand;
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        u8 playerId = GetMultiplayerId();
+
+        PrepareBufferDataTransferLink(2, 4, &playerId);
+        gBattleBufferA[gActiveBank][0] = 0x38;
+    }
+    else
+    {
+        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+    }
+}
+
+void unref_sub_812B838(void)
+{
+    if (!ewram17810[gActiveBank].unk0_4)
+        SafariBufferExecCompleted();
+}
+
+void SafariHandleGetAttributes(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd1(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleSetAttributes(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd3(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleLoadPokeSprite(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleSendOutPoke(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleReturnPokeToBall(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleTrainerThrow(void)
+{
+    LoadPlayerTrainerBankSprite(gSaveBlock2.playerGender, gActiveBank);
+    GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(gActiveBank));
+    gObjectBankIDs[gActiveBank] = CreateSprite(
+      &gUnknown_02024E8C,
+      80,
+      (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
+      30);
+    gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank;
+    gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240;
+    gSprites[gObjectBankIDs[gActiveBank]].data0 = -2;
+    gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0;
+    gBattleBankFunc[gActiveBank] = sub_812B65C;
+}
+
+void SafariHandleTrainerSlide(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleTrainerSlideBack(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd10(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd11(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd12(void)
+{
+    ewram17840.unk8 = 4;
+    gDoingBattleAnim = 1;
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4);
+    gBattleBankFunc[gActiveBank] = bx_wait_t6;
+}
+
+void SafariHandleBallThrow(void)
+{
+    u8 var = gBattleBufferA[gActiveBank][1];
+
+    ewram17840.unk8 = var;
+    gDoingBattleAnim = 1;
+    move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4);
+    gBattleBankFunc[gActiveBank] = bx_wait_t6;
+}
+
+// TODO: spell Pause correctly
+void SafariHandlePuase(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleMoveAnimation(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlePrintString(void)
+{
+    gUnknown_030042A4 = 0;
+    gUnknown_030042A0 = 0;
+    BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]);
+    sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+    gBattleBankFunc[gActiveBank] = sub_812B694;
+}
+
+void SafariHandlePrintStringPlayerOnly(void)
+{
+    if (GetBankSide(gActiveBank) == 0)
+        SafariHandlePrintString();
+    else
+        SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd18(void)
+{
     int i;
 
     gUnknown_030042A4 = 0;
@@ -161,9 +480,7 @@ void SafariHandlecmd18(void) {
     sub_814A5C0(0, 0xFFFF, 12, 11679, 0);
 
     for (i = 0; i < 4; i++)
-    {
         nullsub_8(i);
-    }
 
     sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
     StrCpyDecodeToDisplayedStringBattle((u8 *) gUnknown_08400CBB);
@@ -171,3 +488,222 @@ void SafariHandlecmd18(void) {
     InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35);
     sub_8002F44(&gUnknown_03004210);
 }
+
+void SafariHandlecmd19(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd20(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleOpenBag(void)
+{
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    gBattleBankFunc[gActiveBank] = sub_812B724;
+    gBankInMenu = gActiveBank;
+}
+
+void SafariHandlecmd22(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd23(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleHealthBarUpdate(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleExpBarUpdate(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleStatusIconUpdate(void)
+{
+    sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 11);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleStatusAnimation(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleStatusXor(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd29(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleDMATransfer(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd31(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd32(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd33(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd34(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd35(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd36(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd37(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd38(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd39(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd40(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleHitAnimation(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd42(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleEffectivenessSound(void)
+{
+    s8 pan;
+
+    if (GetBankSide(gActiveBank) == 0)
+        pan = -64;
+    else
+        pan = 63;
+    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd44(void)
+{
+    PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleFaintingCry(void)
+{
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+
+    PlayCry1(species, 25);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleIntroSlide(void)
+{
+    sub_80E43C0(gBattleBufferA[gActiveBank][1]);
+    gUnknown_02024DE8 |= 1;
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleTrainerBallThrow(void)
+{
+    sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 10);
+    sub_804777C(gActiveBank);
+    sub_8043DFC(gHealthboxIDs[gActiveBank]);
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd48(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd49(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd50(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleSpriteInvisibility(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleBattleAnimation(void)
+{
+    u8 r3 = gBattleBufferA[gActiveBank][1];
+    u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+
+    if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, r3, r4) != 0)
+        SafariBufferExecCompleted();
+    else
+        gBattleBankFunc[gActiveBank] = sub_812B794;
+}
+
+void SafariHandleLinkStandbyMsg(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandleResetActionMoveSelection(void)
+{
+    SafariBufferExecCompleted();
+}
+
+void SafariHandlecmd55(void)
+{
+    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    FadeOutMapMusic(5);
+    BeginFastPaletteFade(3);
+    SafariBufferExecCompleted();
+    if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_WILD))
+        gBattleBankFunc[gActiveBank] = sub_812B6AC;
+}
+
+void SafariHandlecmd56(void)
+{
+}
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index 73b847713..49e0b8432 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -35,23 +35,16 @@ extern void PartyMenuDrawHPBars(void);
 extern u8 sub_806B58C(u8);
 extern u8 GetItemEffectType();
 extern void sub_806E750(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, int);
-extern u16 sub_806BD80();
-extern u8 sub_806CA38();
 extern void sub_806D5A4(void);
 extern void sub_802E414(void);
 extern void sub_80A6DCC(void);
 extern void sub_806AF4C();
-extern u8 sub_80F9344(void);
-extern u8 sub_806B124(void);
-extern void sub_806C994();
-extern void sub_806BF74();
 extern void sub_806AEDC(void);
 extern TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, u8);
 extern void sub_806E7D0(u8, const struct PartyPopupMenu *);
 extern u8 *sub_8040D08();
 extern void sub_8040B8C(void);
 extern void sub_806E6F0();
-extern void sub_806D538();
 extern void nullsub_14();
 extern void OpenPartyMenu();
 extern u8 sub_803FBBC(void);
@@ -586,7 +579,7 @@ static void Task_809538C(void)
 {
     do
     {
-        if (sub_806B124() == 1)
+        if (sub_806B124() == TRUE)
         {
             sub_806C994(EWRAM_1B000.unk260, gUnknown_020384F0);
             sub_806BF74(EWRAM_1B000.unk260, 0);
diff --git a/src/battle_records.c b/src/battle_records.c
index 61dc09792..d848a10b8 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -3,7 +3,7 @@
 #include "game_stat.h"
 #include "link.h"
 #include "menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "string_util.h"
 #include "strings2.h"
 #include "trainer_card.h"
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 31c127416..59e17e9eb 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -18,7 +18,7 @@
 #include "opponent_constants.h"
 #include "palette.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "safari_zone.h"
 #include "script.h"
 #include "script_pokemon_80C4.h"
@@ -37,15 +37,15 @@ extern u16 gScriptResult;
 
 extern void (*gFieldCallback)(void);
 
-EWRAM_DATA u16 gTrainerBattleMode = 0;
+EWRAM_DATA static u16 sTrainerBattleMode = 0;
 EWRAM_DATA u16 gTrainerBattleOpponent = 0;
-EWRAM_DATA u16 gTrainerMapObjectLocalId = 0;
-EWRAM_DATA u8 *gTrainerIntroSpeech = NULL;
-EWRAM_DATA u8 *gTrainerDefeatSpeech = NULL;
-EWRAM_DATA u8 *gTrainerVictorySpeech = NULL;
-EWRAM_DATA u8 *gTrainerCannotBattleSpeech = NULL;
-EWRAM_DATA u8 *gTrainerBattleScriptReturnAddress = NULL;
-EWRAM_DATA u8 *gTrainerBattleEndScript = NULL;
+EWRAM_DATA static u16 sTrainerMapObjectLocalId = 0;
+EWRAM_DATA static u8 *sTrainerIntroSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerDefeatSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerVictorySpeech = NULL;
+EWRAM_DATA static u8 *sTrainerCannotBattleSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerBattleScriptRetAddr = NULL;
+EWRAM_DATA static u8 *sTrainerBattleEndScript = NULL;
 
 extern u16 gBattleTypeFlags;
 extern u16 gScriptLastTalked;
@@ -62,80 +62,99 @@ extern u8 gUnknown_0819F8AE[];
 extern u8 gUnknown_0819F80B[];
 extern u8 gUnknown_081C6C02[];
 
-
+// The first transition is used if the enemy pokemon are lower level than our pokemon.
+// Otherwise, the second transition is used.
 static const u8 gBattleTransitionTable_Wild[][2] =
 {
-    {8, 9},
-    {5, 10},
-    {0, 10},
-    {7, 6},
+    {B_TRANSITION_SLICE,               B_TRANSITION_WHITEFADE},     // Normal
+    {B_TRANSITION_CLOCKWISE_BLACKFADE, B_TRANSITION_GRID_SQUARES},  // Cave
+    {B_TRANSITION_BLUR,                B_TRANSITION_GRID_SQUARES},  // Cave with flash used
+    {B_TRANSITION_WAVE,                B_TRANSITION_RIPPLE},        // Water
 };
 static const u8 gBattleTransitionTable_Trainer[][2] =
 {
-    {4, 11},
-    {2, 3},
-    {0, 10},
-    {1, 6},
+    {B_TRANSITION_POKEBALLS_TRAIL, B_TRANSITION_SHARDS},        // Normal
+    {B_TRANSITION_SHUFFLE,         B_TRANSITION_BIG_POKEBALL},  // Cave
+    {B_TRANSITION_BLUR,            B_TRANSITION_GRID_SQUARES},  // Cave with flash used
+    {B_TRANSITION_SWIRL,           B_TRANSITION_RIPPLE},        // Water
+};
+
+enum
+{
+    TRAINER_PARAM_LOAD_VAL_8BIT,
+    TRAINER_PARAM_LOAD_VAL_16BIT,
+    TRAINER_PARAM_LOAD_VAL_32BIT,
+    TRAINER_PARAM_CLEAR_VAL_8BIT,
+    TRAINER_PARAM_CLEAR_VAL_16BIT,
+    TRAINER_PARAM_CLEAR_VAL_32BIT,
+    TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR,
+};
+
+struct TrainerBattleParameter
+{
+    void *varPtr;
+    u8 ptrType;
 };
-static const struct TrainerBattleSpec gTrainerBattleSpecs_0[] =
-{
-    {&gTrainerBattleMode, 0},
-    {&gTrainerBattleOpponent, 1},
-    {&gTrainerMapObjectLocalId, 1},
-    {&gTrainerIntroSpeech, 2},
-    {&gTrainerDefeatSpeech, 2},
-    {&gTrainerVictorySpeech, 5},
-    {&gTrainerCannotBattleSpeech, 5},
-    {&gTrainerBattleEndScript, 5},
-    {&gTrainerBattleScriptReturnAddress, 6},
+
+static const struct TrainerBattleParameter gTrainerBattleSpecs_0[] =
+{
+    {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,  TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleEndScript,     TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleScriptRetAddr, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
 };
-static const struct TrainerBattleSpec gTrainerBattleSpecs_1[] =
-{
-    {&gTrainerBattleMode, 0},
-    {&gTrainerBattleOpponent, 1},
-    {&gTrainerMapObjectLocalId, 1},
-    {&gTrainerIntroSpeech, 2},
-    {&gTrainerDefeatSpeech, 2},
-    {&gTrainerVictorySpeech, 5},
-    {&gTrainerCannotBattleSpeech, 5},
-    {&gTrainerBattleEndScript, 2},
-    {&gTrainerBattleScriptReturnAddress, 6},
+static const struct TrainerBattleParameter gTrainerBattleSpecs_1[] =
+{
+    {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,  TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleEndScript,     TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleScriptRetAddr, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
 };
-static const struct TrainerBattleSpec gTrainerBattleSpecs_2[] =
-{
-    {&gTrainerBattleMode, 0},
-    {&gTrainerBattleOpponent, 1},
-    {&gTrainerMapObjectLocalId, 1},
-    {&gTrainerIntroSpeech, 2},
-    {&gTrainerDefeatSpeech, 2},
-    {&gTrainerVictorySpeech, 5},
-    {&gTrainerCannotBattleSpeech, 2},
-    {&gTrainerBattleEndScript, 5},
-    {&gTrainerBattleScriptReturnAddress, 6},
+static const struct TrainerBattleParameter gTrainerBattleSpecs_2[] =
+{
+    {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,  TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleEndScript,     TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleScriptRetAddr, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
 };
-static const struct TrainerBattleSpec gTrainerBattleSpecs_3[] =
-{
-    {&gTrainerBattleMode, 0},
-    {&gTrainerBattleOpponent, 1},
-    {&gTrainerMapObjectLocalId, 1},
-    {&gTrainerIntroSpeech, 5},
-    {&gTrainerDefeatSpeech, 2},
-    {&gTrainerVictorySpeech, 5},
-    {&gTrainerCannotBattleSpeech, 5},
-    {&gTrainerBattleEndScript, 5},
-    {&gTrainerBattleScriptReturnAddress, 6},
+static const struct TrainerBattleParameter gTrainerBattleSpecs_3[] =
+{
+    {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerIntroSpeech,         TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,  TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleEndScript,     TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleScriptRetAddr, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
 };
-static const struct TrainerBattleSpec gTrainerBattleSpecs_4[] =
-{
-    {&gTrainerBattleMode, 0},
-    {&gTrainerBattleOpponent, 1},
-    {&gTrainerMapObjectLocalId, 1},
-    {&gTrainerIntroSpeech, 2},
-    {&gTrainerDefeatSpeech, 2},
-    {&gTrainerVictorySpeech, 5},
-    {&gTrainerCannotBattleSpeech, 2},
-    {&gTrainerBattleEndScript, 2},
-    {&gTrainerBattleScriptReturnAddress, 6},
+static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] =
+{
+    {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,  TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleEndScript,     TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleScriptRetAddr, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
 };
 
 const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
@@ -424,17 +443,32 @@ const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
 
 static const u16 sBadgeFlags[] = {BADGE01_GET, BADGE02_GET, BADGE03_GET, BADGE04_GET, BADGE05_GET, BADGE06_GET, BADGE07_GET, BADGE08_GET};
 
-void task01_battle_start(u8 taskId)
+static void DoStandardWildBattle(void);
+static void DoSafariBattle(void);
+static void SetTrainerFlagsAfterTrainerEyeRematch(void);
+static void CB2_EndWildBattle(void);
+static void CB2_EndScriptedWildBattle(void);
+static u8 GetWildBattleTransition(void);
+static u8 GetTrainerBattleTransition(void);
+static void CB2_GiveStarter(void);
+static void CB2_StartFirstBattle(void);
+static void CB2_EndFirstBattle(void);
+static bool32 IsPlayerDefeated(u32 a1);
+
+#define tState data[0]
+#define tTransition data[1]
+
+static void Task_BattleStart(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    switch (data[0])
+    switch (tState)
     {
     case 0:
         if (!FieldPoisonEffectIsRunning()) // is poison not active?
         {
-            sub_811AABC(data[1]);
-            data[0]++; // go to case 1.
+            BattleTransition_StartOnField(tTransition);
+            tState++; // go to case 1.
         }
         break;
     case 1:
@@ -449,132 +483,135 @@ void task01_battle_start(u8 taskId)
     }
 }
 
-void task_add_01_battle_start(u8 transition, u16 song)
+static void CreateBattleStartTask(u8 transition, u16 song)
 {
-    u8 taskId = CreateTask(task01_battle_start, 1);
+    u8 taskId = CreateTask(Task_BattleStart, 1);
 
-    gTasks[taskId].data[1] = transition;
+    gTasks[taskId].tTransition = transition;
     current_map_music_set__default_for_battle(song);
 }
 
-void CheckForSafariZoneAndProceed(void)
+#undef tState
+#undef tTransition
+
+void BattleSetup_StartWildBattle(void)
 {
     if (GetSafariZoneFlag())
-        StartBattle_Safari();
+        DoSafariBattle();
     else
-        StartBattle_StandardWild();
+        DoStandardWildBattle();
 }
 
-void StartBattle_StandardWild(void)
+static void DoStandardWildBattle(void)
 {
     ScriptContext2_Enable();
     FreezeMapObjects();
     sub_80597F4();
-    gMain.savedCallback = HandleWildBattleEnd;
+    gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = 0;
-    task_add_01_battle_start(GetWildBattleTransition(), 0);
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_Roamer(void)
+void BattleSetup_StartRoamerBattle(void)
 {
     ScriptContext2_Enable();
     FreezeMapObjects();
     sub_80597F4();
-    gMain.savedCallback = HandleWildBattleEnd;
+    gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_ROAMER;
-    task_add_01_battle_start(GetWildBattleTransition(), 0);
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_Safari(void)
+static void DoSafariBattle(void)
 {
     ScriptContext2_Enable();
     FreezeMapObjects();
     sub_80597F4();
     gMain.savedCallback = sub_80C824C;
     gBattleTypeFlags = BATTLE_TYPE_SAFARI;
-    task_add_01_battle_start(GetWildBattleTransition(), 0);
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
 }
 
-void task_add_01_battle_start_with_music_and_stats(void)
+static void StartTheBattle(void)
 {
-    task_add_01_battle_start(GetTrainerBattleTransition(), 0);
+    CreateBattleStartTask(GetTrainerBattleTransition(), 0);
     IncrementGameStat(7);
     IncrementGameStat(9);
 }
 
 //Initiates battle where Wally catches Ralts
-void StartBattle_WallyTutorial(void)
+void ScrSpecial_StartWallyTutorialBattle(void)
 {
     CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5);
     ScriptContext2_Enable();
     gMain.savedCallback = c2_exit_to_overworld_1_continue_scripts_restart_music;
     gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL;
-    task_add_01_battle_start(8, 0);
+    CreateBattleStartTask(B_TRANSITION_SLICE, 0);
 }
 
-void StartBattle_ScriptedWild(void)
+void BattleSetup_StartScriptedWildBattle(void)
 {
     ScriptContext2_Enable();
-    gMain.savedCallback = HandleScriptedWildBattleEnd;
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = 0;
-    task_add_01_battle_start(GetWildBattleTransition(), 0);
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_SouthernIsland(void)
+void ScrSpecial_StartSouthernIslandBattle(void)
 {
     ScriptContext2_Enable();
-    gMain.savedCallback = HandleScriptedWildBattleEnd;
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
-    task_add_01_battle_start(GetWildBattleTransition(), 0);
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_Rayquaza(void)
+void ScrSpecial_StartRayquazaBattle(void)
 {
     ScriptContext2_Enable();
-    gMain.savedCallback = HandleScriptedWildBattleEnd;
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
-    task_add_01_battle_start(0, BGM_BATTLE34);
+    CreateBattleStartTask(B_TRANSITION_BLUR, BGM_BATTLE34);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_GroudonKyogre(void)
+void ScrSpecial_StartGroudonKyogreBattle(void)
 {
     ScriptContext2_Enable();
-    gMain.savedCallback = HandleScriptedWildBattleEnd;
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
-    if (gGameVersion == 2)
-        task_add_01_battle_start(0xB, BGM_BATTLE34); // KYOGRE
+    if (gGameVersion == VERSION_RUBY)
+        CreateBattleStartTask(B_TRANSITION_SHARDS, BGM_BATTLE34); // GROUDON
     else
-        task_add_01_battle_start(0x6, BGM_BATTLE34); // GROUDON
+        CreateBattleStartTask(B_TRANSITION_RIPPLE, BGM_BATTLE34); // KYOGRE
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void StartBattle_Regi(void)
+void ScrSpecial_StartRegiBattle(void)
 {
     ScriptContext2_Enable();
-    gMain.savedCallback = HandleScriptedWildBattleEnd;
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
-    task_add_01_battle_start(0xA, BGM_BATTLE36);
+    CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, BGM_BATTLE36);
     IncrementGameStat(7);
     IncrementGameStat(8);
 }
 
-void HandleWildBattleEnd(void)
+static void CB2_EndWildBattle(void)
 {
     CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE);
     ResetOamRange(0, 128);
 
-    if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE)
+    if (IsPlayerDefeated(gBattleOutcome) == TRUE)
     {
         SetMainCallback2(CB2_WhiteOut);
     }
@@ -585,18 +622,18 @@ void HandleWildBattleEnd(void)
     }
 }
 
-void HandleScriptedWildBattleEnd(void)
+void CB2_EndScriptedWildBattle(void)
 {
     CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE);
     ResetOamRange(0, 128);
 
-    if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE)
+    if (IsPlayerDefeated(gBattleOutcome) == TRUE)
         SetMainCallback2(CB2_WhiteOut);
     else
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
 }
 
-s8 GetBattleTerrain(void)
+s8 BattleSetup_GetTerrain(void)
 {
     u16 tileBehavior;
     s16 x, y;
@@ -605,11 +642,11 @@ s8 GetBattleTerrain(void)
     tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
 
     if (MetatileBehavior_IsTallGrass(tileBehavior))
-        return 0;
+        return BATTLE_TERRAIN_GRASS;
     if (MetatileBehavior_IsLongGrass(tileBehavior))
-        return 1;
+        return BATTLE_TERRAIN_LONG_GRASS;
     if (MetatileBehavior_IsSandOrDeepSand(tileBehavior))
-        return 2;
+        return BATTLE_TERRAIN_SAND;
     switch (gMapHeader.mapType)
     {
     case MAP_TYPE_TOWN:
@@ -618,54 +655,49 @@ s8 GetBattleTerrain(void)
         break;
     case MAP_TYPE_UNDERGROUND:
         if (sub_80574C4(tileBehavior))
-            return 8;
+            return BATTLE_TERRAIN_BUILDING;
         if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
-            return 5;
-        return 7;
+            return BATTLE_TERRAIN_POND;
+        return BATTLE_TERRAIN_CAVE;
     case MAP_TYPE_INDOOR:
     case MAP_TYPE_SECRET_BASE:
-        return 8;
+        return BATTLE_TERRAIN_BUILDING;
     case MAP_TYPE_UNDERWATER:
-        return 3;
+        return BATTLE_TERRAIN_UNDERWATER;
     case MAP_TYPE_6:
         if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
-            return 4;
-        return 9;
+            return BATTLE_TERRAIN_WATER;
+        return BATTLE_TERRAIN_PLAIN;
     }
     if (sub_8057568(tileBehavior))
-        return 4;
+        return BATTLE_TERRAIN_WATER;
     if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
-        return 5;
+        return BATTLE_TERRAIN_POND;
     if (sub_80574D8(tileBehavior))
-        return 6;
+        return BATTLE_TERRAIN_MOUNTAIN;
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
     {
         if (sub_8057450(tileBehavior))
-            return 5;
+            return BATTLE_TERRAIN_POND;
         if (MetatileBehavior_IsBridge(tileBehavior) == TRUE)
-            return 4;
+            return BATTLE_TERRAIN_WATER;
     }
-    if (gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 28)
-        return 2;
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE113 && gSaveBlock1.location.mapNum == MAP_ID_ROUTE113)
+        return BATTLE_TERRAIN_SAND;
     if (GetSav1Weather() == 8)
-        return 2;
-    return 9;
+        return BATTLE_TERRAIN_SAND;
+    return BATTLE_TERRAIN_PLAIN;
 }
 
-s8 GetBattleTransitionTypeByMap(void)
+static s8 GetBattleTransitionTypeByMap(void)
 {
-    u8 flashUsed;
     u16 tileBehavior;
     s16 x, y;
 
     PlayerGetDestCoords(&x, &y);
     tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
-
-    flashUsed = sav1_get_flash_used_on_map();
-
-    if (flashUsed)
+    if (Overworld_GetFlashLevel())
         return 2;
-
     if (!MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
     {
         switch (gMapHeader.mapType)
@@ -681,7 +713,7 @@ s8 GetBattleTransitionTypeByMap(void)
     return 3;
 }
 
-u16 GetSumOfPartyMonLevel(u8 numMons)
+static u16 GetSumOfPlayerPartyLevel(u8 numMons)
 {
     u8 sum = 0;
     int i;
@@ -701,37 +733,37 @@ u16 GetSumOfPartyMonLevel(u8 numMons)
     return sum;
 }
 
-u8 GetSumOfEnemyPartyLevel(u16 trainerNum, u8 numMons)
+static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
 {
     u8 i;
     u8 sum;
     u32 count = numMons;
     void *party;
 
-    if (gTrainers[trainerNum].partySize < count)
-        count = gTrainers[trainerNum].partySize;
+    if (gTrainers[opponentId].partySize < count)
+        count = gTrainers[opponentId].partySize;
 
     sum = 0;
 
-    switch (gTrainers[trainerNum].partyFlags)
+    switch (gTrainers[opponentId].partyFlags)
     {
     case 0:
-        party = gTrainers[trainerNum].party;
+        party = gTrainers[opponentId].party;
         for (i = 0; i < count; i++)
             sum += ((struct TrainerPartyMember0 *)party)[i].level;
         break;
     case 1:
-        party = gTrainers[trainerNum].party;
+        party = gTrainers[opponentId].party;
         for (i = 0; i < count; i++)
             sum += ((struct TrainerPartyMember1 *)party)[i].level;
         break;
     case 2:
-        party = gTrainers[trainerNum].party;
+        party = gTrainers[opponentId].party;
         for (i = 0; i < count; i++)
             sum += ((struct TrainerPartyMember2 *)party)[i].level;
         break;
     case 3:
-        party = gTrainers[trainerNum].party;
+        party = gTrainers[opponentId].party;
         for (i = 0; i < count; i++)
             sum += ((struct TrainerPartyMember3 *)party)[i].level;
         break;
@@ -740,76 +772,79 @@ u8 GetSumOfEnemyPartyLevel(u16 trainerNum, u8 numMons)
     return sum;
 }
 
-u8 GetWildBattleTransition(void)
+static u8 GetWildBattleTransition(void)
 {
-    u8 flashVar = GetBattleTransitionTypeByMap();
-    u8 level = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
+    u8 transitionType = GetBattleTransitionTypeByMap();
+    u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
+    u8 playerLevel = GetSumOfPlayerPartyLevel(1);
 
-    if (level < (u8)GetSumOfPartyMonLevel(1)) // is wild mon level than the player's mon level?
-        return gBattleTransitionTable_Wild[flashVar][0];
+    if (enemyLevel < playerLevel)
+        return gBattleTransitionTable_Wild[transitionType][0];
     else
-        return gBattleTransitionTable_Wild[flashVar][1]; // use a white fade in instead of normal transition.
+        return gBattleTransitionTable_Wild[transitionType][1];
 }
 
-u8 GetTrainerBattleTransition(void)
+static u8 GetTrainerBattleTransition(void)
 {
     const struct Trainer *trainer;
     u8 minPartyCount;
-    u8 flashVar;
-    u8 level;
+    u8 transitionType;
+    u8 enemyLevel;
+    u8 playerLevel;
 
     if (gTrainerBattleOpponent == 1024) // link battle?
-        return 16;
+        return B_TRANSITION_STEVEN;
 
     trainer = gTrainers;
 
     if (trainer[gTrainerBattleOpponent].trainerClass == 24) // league?
     {
         if (gTrainerBattleOpponent == 261)
-            return 12;
+            return B_TRANSITION_SYDNEY;
         if (gTrainerBattleOpponent == 262)
-            return 13;
+            return B_TRANSITION_PHOEBE;
         if (gTrainerBattleOpponent == 263)
-            return 14;
+            return B_TRANSITION_GLACIA;
         if (gTrainerBattleOpponent == 264)
-            return 15;
-        return 16;
+            return B_TRANSITION_DRAKE;
+        return B_TRANSITION_STEVEN;
     }
 
     if (trainer[gTrainerBattleOpponent].trainerClass == 32) // team leader?
-        return 16;
+        return B_TRANSITION_STEVEN;
 
     if (trainer[gTrainerBattleOpponent].doubleBattle == TRUE)
         minPartyCount = 2; // double battles always at least have 2 pokemon.
     else
         minPartyCount = 1;
 
-    flashVar = GetBattleTransitionTypeByMap();
-    level = GetSumOfEnemyPartyLevel(gTrainerBattleOpponent, minPartyCount);
-
-    if (level < (u8)GetSumOfPartyMonLevel(minPartyCount)) // is wild mon level than the player's mon level?
-        return gBattleTransitionTable_Trainer[flashVar][0];
+    transitionType = GetBattleTransitionTypeByMap();
+    enemyLevel = GetSumOfEnemyPartyLevel(gTrainerBattleOpponent, minPartyCount);
+    playerLevel = GetSumOfPlayerPartyLevel(minPartyCount);
+    if (enemyLevel < playerLevel) // is wild mon level than the player's mon level?
+        return gBattleTransitionTable_Trainer[transitionType][0];
     else
-        return gBattleTransitionTable_Trainer[flashVar][1];
+        return gBattleTransitionTable_Trainer[transitionType][1];
 }
 
-u8 GetBattleTowerBattleTransition(void)
+u8 BattleSetup_GetBattleTowerBattleTransition(void)
 {
-    u8 monData = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
+    u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
+    u8 playerLevel = GetSumOfPlayerPartyLevel(1);
 
-    if (monData < (u8)GetSumOfPartyMonLevel(1))
-        return 4;
+    if (enemyLevel < playerLevel)
+        return B_TRANSITION_POKEBALLS_TRAIL;
     else
-        return 3;
+        return B_TRANSITION_BIG_POKEBALL;
 }
 
-void ChooseStarter(void)
+void ScrSpecial_ChooseStarter(void)
 {
     SetMainCallback2(CB2_ChooseStarter);
     gMain.savedCallback = CB2_GiveStarter;
 }
 
-void CB2_GiveStarter(void)
+static void CB2_GiveStarter(void)
 {
     u16 starterPoke;
 
@@ -819,10 +854,10 @@ void CB2_GiveStarter(void)
     ResetTasks();
     sub_80408BC();
     SetMainCallback2(CB2_StartFirstBattle);
-    sub_811AAD8(0);
+    BattleTransition_Start(0);
 }
 
-void CB2_StartFirstBattle(void)
+static void CB2_StartFirstBattle(void)
 {
     UpdatePaletteFade();
     RunTasks();
@@ -830,7 +865,7 @@ void CB2_StartFirstBattle(void)
     if (IsBattleTransitionDone() == TRUE)
     {
         gBattleTypeFlags = BATTLE_TYPE_FIRST_BATTLE;
-        gMain.savedCallback = HandleFirstBattleEnd;
+        gMain.savedCallback = CB2_EndFirstBattle;
         SetMainCallback2(sub_800E7C4);
         prev_quest_postbuffer_cursor_backup_reset();
         overworld_poison_timer_set();
@@ -839,35 +874,35 @@ void CB2_StartFirstBattle(void)
     }
 }
 
-void HandleFirstBattleEnd(void)
+static void CB2_EndFirstBattle(void)
 {
     sav1_reset_battle_music_maybe();
     SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
 }
 
-u32 TrainerBattleLoadArg32(const u8 *ptr)
+static u32 TrainerBattleLoadArg32(const u8 *ptr)
 {
     return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
 }
 
-u16 TrainerBattleLoadArg16(const u8 *ptr)
+static u16 TrainerBattleLoadArg16(const u8 *ptr)
 {
     return ptr[0] | (ptr[1] << 8);
 }
 
-u8 TrainerBattleLoadArg8(const u8 *ptr)
+static u8 TrainerBattleLoadArg8(const u8 *ptr)
 {
     return ptr[0];
 }
 
-u16 trainerflag_opponent(void)
+static u16 CurrentOpponentTrainerFlag(void)
 {
     return TRAINER_FLAG_START + gTrainerBattleOpponent;
 }
 
-bool32 battle_exit_is_player_defeat(u32 a1)
+static bool32 IsPlayerDefeated(u32 battleOutcome)
 {
-    switch (a1)
+    switch (battleOutcome)
     {
     case 2:
     case 3:
@@ -882,69 +917,69 @@ bool32 battle_exit_is_player_defeat(u32 a1)
     return FALSE;
 }
 
-void sub_80822BC(void)
+static void sub_80822BC(void)
 {
-    gTrainerBattleMode = 0;
+    sTrainerBattleMode = 0;
     gTrainerBattleOpponent = 0;
-    gTrainerMapObjectLocalId = 0;
-    gTrainerIntroSpeech = 0;
-    gTrainerDefeatSpeech = 0;
-    gTrainerVictorySpeech = 0;
-    gTrainerCannotBattleSpeech = 0;
-    gTrainerBattleScriptReturnAddress = 0;
-    gTrainerBattleEndScript = 0;
+    sTrainerMapObjectLocalId = 0;
+    sTrainerIntroSpeech = 0;
+    sTrainerDefeatSpeech = 0;
+    sTrainerVictorySpeech = 0;
+    sTrainerCannotBattleSpeech = 0;
+    sTrainerBattleScriptRetAddr = 0;
+    sTrainerBattleEndScript = 0;
 }
 
-void TrainerBattleLoadArgs(const struct TrainerBattleSpec *specs, const u8 *data)
+static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, const u8 *data)
 {
     while (1)
     {
         switch (specs->ptrType)
         {
-        case 0:
-            *(u8 *)specs->ptr = TrainerBattleLoadArg8(data);
-            data++;
+        case TRAINER_PARAM_LOAD_VAL_8BIT:
+            *(u8 *)specs->varPtr = TrainerBattleLoadArg8(data);
+            data += 1;
             break;
-        case 1:
-            *(u16 *)specs->ptr = TrainerBattleLoadArg16(data);
+        case TRAINER_PARAM_LOAD_VAL_16BIT:
+            *(u16 *)specs->varPtr = TrainerBattleLoadArg16(data);
             data += 2;
             break;
-        case 2:
-            *(u32 *)specs->ptr = TrainerBattleLoadArg32(data);
+        case TRAINER_PARAM_LOAD_VAL_32BIT:
+            *(u32 *)specs->varPtr = TrainerBattleLoadArg32(data);
             data += 4;
             break;
-        case 3:
-            *(u8 *)specs->ptr = 0;
+        case TRAINER_PARAM_CLEAR_VAL_8BIT:
+            *(u8 *)specs->varPtr = 0;
             break;
-        case 4:
-            *(u16 *)specs->ptr = 0;
+        case TRAINER_PARAM_CLEAR_VAL_16BIT:
+            *(u16 *)specs->varPtr = 0;
             break;
-        case 5:
-            *(u32 *)specs->ptr = 0;
+        case TRAINER_PARAM_CLEAR_VAL_32BIT:
+            *(u32 *)specs->varPtr = 0;
             break;
-        case 6:
-            *(const u8 **)specs->ptr = data;
+        case TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR:
+            *(const u8 **)specs->varPtr = data;
             return;
         }
         specs++;
     }
 }
 
-void battle_80801F0(void)
+static void battle_80801F0(void)
 {
-    if (gTrainerMapObjectLocalId)
+    if (sTrainerMapObjectLocalId)
     {
-        gScriptLastTalked = gTrainerMapObjectLocalId;
-        gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(gTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+        gScriptLastTalked = sTrainerMapObjectLocalId;
+        gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(sTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
     }
 }
 
-u8 *TrainerBattleConfigure(const u8 *data)
+u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
 {
     sub_80822BC();
-    gTrainerBattleMode = TrainerBattleLoadArg8(data);
+    sTrainerBattleMode = TrainerBattleLoadArg8(data);
 
-    switch (gTrainerBattleMode)
+    switch (sTrainerBattleMode)
     {
     case 3:
         TrainerBattleLoadArgs(gTrainerBattleSpecs_3, data);
@@ -984,7 +1019,7 @@ void TrainerWantsBattle(u8 trainerMapObjId, u8 *trainerScript)
 {
     gSelectedMapObject = trainerMapObjId;
     gScriptLastTalked = gMapObjects[trainerMapObjId].localId;
-    TrainerBattleConfigure(trainerScript + 1);
+    BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
     ScriptContext1_SetupScript(gUnknown_0819F80B);
     ScriptContext2_Enable();
 }
@@ -1002,27 +1037,27 @@ void sub_8082524(void)
     npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->mapobj_unk_18));
 }
 
-u8 sub_8082558(void)
+u8 ScrSpecial_GetTrainerBattleMode(void)
 {
-    return gTrainerBattleMode;
+    return sTrainerBattleMode;
 }
 
-u8 sub_8082564(void)
+u8 ScrSpecial_HasTrainerBeenFought(void)
 {
-    return FlagGet(trainerflag_opponent());
+    return FlagGet(CurrentOpponentTrainerFlag());
 }
 
-void sub_808257C(void)
+void SetCurrentTrainerBattledFlag(void)
 {
-    FlagSet(trainerflag_opponent());
+    FlagSet(CurrentOpponentTrainerFlag());
 }
 
 void unref_sub_8082590(void)
 {
-    FlagSet(trainerflag_opponent()); // duplicate function
+    FlagSet(CurrentOpponentTrainerFlag()); // duplicate function
 }
 
-u8 trainer_flag_check(u16 flag)
+u8 HasTrainerAlreadyBeenFought(u16 flag)
 {
     return FlagGet(TRAINER_FLAG_START + flag);
 }
@@ -1034,14 +1069,14 @@ void trainer_flag_set(u16 flag)
 
 void trainer_flag_clear(u16 flag)
 {
-    FlagReset(TRAINER_FLAG_START + flag);
+    FlagClear(TRAINER_FLAG_START + flag);
 }
 
-void sub_80825E4(void)
+void BattleSetup_StartTrainerBattle(void)
 {
     gBattleTypeFlags = BATTLE_TYPE_TRAINER;
     gMain.savedCallback = sub_808260C;
-    task_add_01_battle_start_with_music_and_stats();
+    StartTheBattle();
     ScriptContext1_Stop();
 }
 
@@ -1051,74 +1086,77 @@ void sub_808260C(void)
     {
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); // link battle?
     }
-    else if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE)
+    else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
     {
         SetMainCallback2(CB2_WhiteOut);
     }
     else
     {
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
-        sub_808257C();
+        SetCurrentTrainerBattledFlag();
     }
 }
 
-void do_choose_name_or_words_screen(void)
+void CB2_EndTrainerEyeRematchBattle(void)
 {
     if (gTrainerBattleOpponent == 1024)
     {
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); // link battle?
     }
-    else if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE)
+    else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
     {
         SetMainCallback2(CB2_WhiteOut);
     }
     else
     {
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
-        sub_808257C();
-        sub_8082CB8();
+        SetCurrentTrainerBattledFlag();
+        SetTrainerFlagsAfterTrainerEyeRematch();
     }
 }
 
-void sub_80826B0(void)
+void ScrSpecial_StartTrainerEyeRematch(void)
 {
     gBattleTypeFlags = BATTLE_TYPE_TRAINER;
-    gMain.savedCallback = do_choose_name_or_words_screen;
-    task_add_01_battle_start_with_music_and_stats();
+    gMain.savedCallback = CB2_EndTrainerEyeRematchBattle;
+    StartTheBattle();
     ScriptContext1_Stop();
 }
 
-void sub_80826D8(void)
+static u8 *GetTrainerIntroSpeech(void);
+static u8 *GetTrainerNonBattlingSpeech(void);
+
+void ScrSpecial_ShowTrainerIntroSpeech(void)
 {
-    ShowFieldMessage(sub_808281C());
+    ShowFieldMessage(GetTrainerIntroSpeech());
 }
 
-u8 *sub_80826E8(void)
+u8 *BattleSetup_GetScriptAddrAfterBattle(void)
 {
-    if (gTrainerBattleScriptReturnAddress)
-        return gTrainerBattleScriptReturnAddress;
+    if (sTrainerBattleScriptRetAddr)
+        return sTrainerBattleScriptRetAddr;
     else
         return gUnknown_081C6C02;
 }
 
-u8 *sub_8082700(void)
+u8 *BattleSetup_GetTrainerPostBattleScript(void)
 {
-    if (gTrainerBattleEndScript)
-        return gTrainerBattleEndScript;
+    if (sTrainerBattleEndScript)
+        return sTrainerBattleEndScript;
     else
         return gUnknown_081C6C02;
 }
 
-void sub_8082718(void)
+void ScrSpecial_ShowTrainerNonBattlingSpeech(void)
 {
-    ShowFieldMessage(sub_8082880());
+    ShowFieldMessage(GetTrainerNonBattlingSpeech());
 }
 
 void PlayTrainerEncounterMusic(void)
 {
     u16 music;
 
-    if (gTrainerBattleMode != 1 && gTrainerBattleMode != 8)
+    if (sTrainerBattleMode != 1 && sTrainerBattleMode != 8)
     {
         switch (sub_803FC58(gTrainerBattleOpponent))
         {
@@ -1169,7 +1207,7 @@ void PlayTrainerEncounterMusic(void)
 }
 
 //Returns an empty string if a null pointer was passed, otherwise returns str
-u8 *SanitizeString(const u8 *str)
+static u8 *SanitizeString(const u8 *str)
 {
     if (str)
         return (u8 *) str;
@@ -1177,9 +1215,9 @@ u8 *SanitizeString(const u8 *str)
         return (u8 *) gOtherText_CancelWithTerminator;
 }
 
-u8 *sub_808281C(void)
+static u8 *GetTrainerIntroSpeech(void)
 {
-    return SanitizeString(gTrainerIntroSpeech);
+    return SanitizeString(sTrainerIntroSpeech);
 }
 
 u8 *sub_8082830(void)
@@ -1189,7 +1227,7 @@ u8 *sub_8082830(void)
     if (gTrainerBattleOpponent == 1024)
         str = sub_80BCCE8();
     else
-        str = gTrainerDefeatSpeech;
+        str = sTrainerDefeatSpeech;
 
     StringExpandPlaceholders(gStringVar4, SanitizeString(str));
     return gStringVar4;
@@ -1197,43 +1235,43 @@ u8 *sub_8082830(void)
 
 u8 *unref_sub_808286C(void)
 {
-    return SanitizeString(gTrainerVictorySpeech);
+    return SanitizeString(sTrainerVictorySpeech);
 }
 
-u8 *sub_8082880(void)
+static u8 *GetTrainerNonBattlingSpeech(void)
 {
-    return SanitizeString(gTrainerCannotBattleSpeech);
+    return SanitizeString(sTrainerCannotBattleSpeech);
 }
 
-s32 sub_8082894(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+s32 sub_8082894(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
     s32 i;
 
     for (i = 0; i < NUM_TRAINER_EYE_TRAINERS; i++)
     {
-        if (trainers[i].trainerNums[0] == trainerNum)
+        if (trainers[i].opponentIDs[0] == opponentId)
             return i;
     }
     return -1;
 }
 
-s32 sub_80828B8(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+s32 sub_80828B8(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
     s32 i;
     s32 j;
 
     for (i = 0; i < NUM_TRAINER_EYE_TRAINERS; i++)
     {
-        for (j = 0; j < 5 && trainers[i].trainerNums[j] != 0; j++)
+        for (j = 0; j < 5 && trainers[i].opponentIDs[j] != 0; j++)
         {
-            if (trainers[i].trainerNums[j] == trainerNum)
+            if (trainers[i].opponentIDs[j] == opponentId)
                 return i;
         }
     }
     return -1;
 }
 
-bool32 sub_80828FC(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum)
+bool32 UpdateRandomTrainerEyeRematches(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapNum)
 {
     int i;
     bool32 ret = FALSE;
@@ -1243,14 +1281,19 @@ bool32 sub_80828FC(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 m
         if (trainers[i].mapGroup == mapGroup && trainers[i].mapNum == mapNum)
         {
             if (gSaveBlock1.trainerRematches[i] != 0)
+            {
+                // Trainer already wants rematch. Don't bother updating it
                 ret = TRUE;
-            else if (trainer_flag_check(trainers[i].trainerNums[0]) == TRUE && (Random() % 100) <= 30)
+            }
+            else if (HasTrainerAlreadyBeenFought(trainers[i].opponentIDs[0]) == TRUE
+             && (Random() % 100) <= 30)  // 31% chance of getting a rematch
             {
-                int j = 1;
+                int rematches = 1;
 
-                while (j < 5 && trainers[i].trainerNums[j] != 0 && trainer_flag_check(trainers[i].trainerNums[j]))
-                    j++;
-                gSaveBlock1.trainerRematches[i] = j;
+                while (rematches < 5 && trainers[i].opponentIDs[rematches] != 0
+                 && HasTrainerAlreadyBeenFought(trainers[i].opponentIDs[rematches]))
+                    rematches++;
+                gSaveBlock1.trainerRematches[i] = rematches;
                 ret = TRUE;
             }
         }
@@ -1282,9 +1325,9 @@ s32 sub_80829E8(const struct TrainerEyeTrainer *trainers, u16 mapGroup, u16 mapN
     return 0;
 }
 
-bool8 sub_8082A18(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+bool8 sub_8082A18(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
-    s32 trainerEyeIndex = sub_8082894(trainers, trainerNum);
+    s32 trainerEyeIndex = sub_8082894(trainers, opponentId);
 
     if (trainerEyeIndex != -1 && trainerEyeIndex < 100 && gSaveBlock1.trainerRematches[trainerEyeIndex])
         return TRUE;
@@ -1292,9 +1335,9 @@ bool8 sub_8082A18(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
         return FALSE;
 }
 
-bool8 sub_8082A54(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+bool8 GetTrainerEyeRematchFlag(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
-    s32 trainerEyeIndex = sub_80828B8(trainers, trainerNum);
+    s32 trainerEyeIndex = sub_80828B8(trainers, opponentId);
 
     if (trainerEyeIndex != -1 && trainerEyeIndex < 100 && gSaveBlock1.trainerRematches[trainerEyeIndex])
         return TRUE;
@@ -1302,38 +1345,38 @@ bool8 sub_8082A54(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
         return FALSE;
 }
 
-u16 sub_8082A90(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+u16 sub_8082A90(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
     int i;
     const struct TrainerEyeTrainer *trainer;
-    s32 trainerEyeIndex = sub_8082894(trainers, trainerNum);
+    s32 trainerEyeIndex = sub_8082894(trainers, opponentId);
 
     if (trainerEyeIndex == -1)
         return 0;
     trainer = &trainers[trainerEyeIndex];
     for (i = 1; i < 5; i++)
     {
-        if (!trainer->trainerNums[i])
-            return trainer->trainerNums[i - 1];
-        if (!trainer_flag_check(trainer->trainerNums[i]))
-            return trainer->trainerNums[i];
+        if (!trainer->opponentIDs[i])
+            return trainer->opponentIDs[i - 1];
+        if (!HasTrainerAlreadyBeenFought(trainer->opponentIDs[i]))
+            return trainer->opponentIDs[i];
     }
-    return trainer->trainerNums[4];
+    return trainer->opponentIDs[4];
 }
 
-void sub_8082AE4(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+void ClearTrainerEyeRematchFlag(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
-    s32 trainerEyeIndex = sub_80828B8(trainers, trainerNum);
+    s32 trainerEyeIndex = sub_80828B8(trainers, opponentId);
 
     if (trainerEyeIndex != -1)
         gSaveBlock1.trainerRematches[trainerEyeIndex] = 0;
 }
 
-bool8 sub_8082B10(const struct TrainerEyeTrainer *trainers, u16 trainerNum)
+bool8 sub_8082B10(const struct TrainerEyeTrainer *trainers, u16 opponentId)
 {
-    s32 trainerEyeIndex = sub_8082894(trainers, trainerNum);
+    s32 trainerEyeIndex = sub_8082894(trainers, opponentId);
 
-    if (trainerEyeIndex != -1 && trainer_flag_check(trainers[trainerEyeIndex].trainerNums[1]))
+    if (trainerEyeIndex != -1 && HasTrainerAlreadyBeenFought(trainers[trainerEyeIndex].opponentIDs[1]))
         return TRUE;
     else
         return FALSE;
@@ -1377,7 +1420,7 @@ bool32 sub_8082BA4(void)
 
 void sub_8082BD0(u16 mapGroup, u16 mapNum)
 {
-    if (sub_8082BA4() && sub_80828FC(gTrainerEyeTrainers, mapGroup, mapNum) == TRUE)
+    if (sub_8082BA4() && UpdateRandomTrainerEyeRematches(gTrainerEyeTrainers, mapGroup, mapNum) == TRUE)
         gSaveBlock1.trainerRematchStepCounter = 0;
 }
 
@@ -1391,9 +1434,9 @@ s32 unref_sub_8082C2C(u16 mapGroup, u16 mapNum)
     return sub_80829E8(gTrainerEyeTrainers, mapGroup, mapNum);
 }
 
-u16 sub_8082C4C(u16 trainerNum)
+u16 sub_8082C4C(u16 opponentId)
 {
-    return sub_8082A90(gTrainerEyeTrainers, trainerNum);
+    return sub_8082A90(gTrainerEyeTrainers, opponentId);
 }
 
 s32 sub_8082C68(void)
@@ -1404,13 +1447,13 @@ s32 sub_8082C68(void)
         return sub_8082B10(gTrainerEyeTrainers, gTrainerBattleOpponent);
 }
 
-u8 sub_8082C9C(void)
+u8 ScrSpecial_GetTrainerEyeRematchFlag(void)
 {
-    return sub_8082A54(gTrainerEyeTrainers, gTrainerBattleOpponent);
+    return GetTrainerEyeRematchFlag(gTrainerEyeTrainers, gTrainerBattleOpponent);
 }
 
-void sub_8082CB8(void)
+void SetTrainerFlagsAfterTrainerEyeRematch(void)
 {
-    sub_8082AE4(gTrainerEyeTrainers, gTrainerBattleOpponent);
-    sub_808257C();
+    ClearTrainerEyeRematchFlag(gTrainerEyeTrainers, gTrainerBattleOpponent);
+    SetCurrentTrainerBattledFlag();
 }
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 1cacb8857..53d32d03a 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle_transition.h"
 #include "main.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "task.h"
 #include "palette.h"
 #include "trig.h"
@@ -530,13 +530,13 @@ static const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/el
 
 // actual code starts here
 
-void sub_811AABC(u8 transitionID)
+void BattleTransition_StartOnField(u8 transitionID)
 {
-    gMain.callback2 = sub_8054398;
+    gMain.callback2 = CB2_OverworldBasic;
     LaunchBattleTransitionTask(transitionID);
 }
 
-void sub_811AAD8(u8 transitionID)
+void BattleTransition_Start(u8 transitionID)
 {
     LaunchBattleTransitionTask(transitionID);
 }
@@ -994,10 +994,10 @@ static bool8 Phase2_Transition_PokeballsTrail_Func2(struct Task* task)
     rand = Random() & 1;
     for (i = 0; i <= 4; i++, rand ^= 1)
     {
-        gUnknown_0202FF84[0] = arr0[rand];      // x
-        gUnknown_0202FF84[1] = (i * 32) + 16;   // y
-        gUnknown_0202FF84[2] = rand;
-        gUnknown_0202FF84[3] = arr1[i];
+        gFieldEffectArguments[0] = arr0[rand];      // x
+        gFieldEffectArguments[1] = (i * 32) + 16;   // y
+        gFieldEffectArguments[2] = rand;
+        gFieldEffectArguments[3] = arr1[i];
         FieldEffectStart(FLDEFF_POKEBALL);
     }
 
@@ -1017,14 +1017,14 @@ static bool8 Phase2_Transition_PokeballsTrail_Func3(struct Task* task)
 
 bool8 FldEff_Pokeball(void)
 {
-    u8 spriteID = CreateSpriteAtEnd(&sSpriteTemplate_83FD98C, gUnknown_0202FF84[0], gUnknown_0202FF84[1], 0);
+    u8 spriteID = CreateSpriteAtEnd(&sSpriteTemplate_83FD98C, gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
     gSprites[spriteID].oam.priority = 0;
     gSprites[spriteID].oam.affineMode = 1;
-    gSprites[spriteID].data0 = gUnknown_0202FF84[2];
-    gSprites[spriteID].data1 = gUnknown_0202FF84[3];
+    gSprites[spriteID].data0 = gFieldEffectArguments[2];
+    gSprites[spriteID].data1 = gFieldEffectArguments[3];
     gSprites[spriteID].data2 = -1;
     InitSpriteAffineAnim(&gSprites[spriteID]);
-    StartSpriteAffineAnim(&gSprites[spriteID], gUnknown_0202FF84[2]);
+    StartSpriteAffineAnim(&gSprites[spriteID], gFieldEffectArguments[2]);
     return FALSE;
 }
 
diff --git a/src/berry.c b/src/berry.c
index fa15672e7..d82eab2a6 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -974,7 +974,7 @@ const struct Berry gBerries[] =
 
 const struct BerryTree gBlankBerryTree = {0};
 
-extern u8 BerryTreeScript;
+extern u8 S_BerryTree[];
 extern u16 gScriptLastTalked;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
@@ -1078,7 +1078,7 @@ bool32 FieldObjectInteractionWaterBerryTree(void)
 
 bool8 IsPlayerFacingPlantedBerryTree(void)
 {
-    if (GetFieldObjectScriptPointerForComparison() == &BerryTreeScript
+    if (GetFieldObjectScriptPointerForComparison() == S_BerryTree
      && GetStageByBerryTreeId(FieldObjectGetBerryTreeId(gSelectedMapObject)) == 0)
         return TRUE;
     else
@@ -1087,7 +1087,7 @@ bool8 IsPlayerFacingPlantedBerryTree(void)
 
 bool8 TryToWaterBerryTree(void)
 {
-    if (GetFieldObjectScriptPointerForComparison() != &BerryTreeScript)
+    if (GetFieldObjectScriptPointerForComparison() != S_BerryTree)
         return FALSE;
     else
         return FieldObjectInteractionWaterBerryTree();
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 029d352df..455aabc45 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -12,7 +12,7 @@
 #include "string_util.h"
 #include "link.h"
 #include "task.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "item.h"
 #include "items.h"
 #include "rng.h"
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index a965f386c..1413a02ca 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -10,7 +10,7 @@
 #include "menu.h"
 #include "menu_helpers.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
diff --git a/src/bike.c b/src/bike.c
index 58a4f38f4..80cab0850 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -6,7 +6,7 @@
 #include "flags.h"
 #include "global.fieldmap.h"
 #include "metatile_behavior.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "songs.h"
 #include "sound.h"
 
@@ -944,7 +944,7 @@ void GetOnOffBike(u8 var)
     {
         SetPlayerAvatarTransitionFlags(var);
         sav1_set_battle_music_maybe(BGM_CYCLING);
-        sub_8053FB0(BGM_CYCLING);
+        Overworld_ChangeMusicTo(BGM_CYCLING);
     }
 }
 
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index b8d7cd386..b11b1ff3a 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -6,6 +6,7 @@
 #include "fieldmap.h"
 #include "flags.h"
 #include "main.h"
+#include "map_constants.h"
 #include "map_obj_lock.h"
 #include "menu.h"
 #include "rom6.h"
@@ -19,11 +20,13 @@
 extern u8 gPlayerPartyCount;
 extern u8 gLastFieldPokeMenuOpened;
 
-extern u8 gIslandCave_EventScript_OpenRegiiceChamber[]; // regiice event script
+extern u8 S_OpenRegiceChamber[]; // regiice event script
 
 bool8 ShouldDoBrailleDigEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_DIG) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x47))
+    if (!FlagGet(SYS_BRAILLE_DIG)
+     && (gSaveBlock1.location.mapGroup == MAP_GROUP_SEALED_CHAMBER_OUTER_ROOM
+     && gSaveBlock1.location.mapNum == MAP_ID_SEALED_CHAMBER_OUTER_ROOM))
     {
         if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 3)
             return TRUE;
@@ -52,10 +55,11 @@ void DoBrailleDigEffect(void)
 
 bool8 CheckRelicanthWailord(void)
 {
+    // First comes Relicanth.
     if (GetMonData(&gPlayerParty, MON_DATA_SPECIES2, 0) == SPECIES_RELICANTH)
     {
         CalculatePlayerPartyCount();
-
+        // Last comes Wailord
         if (GetMonData(&gPlayerParty[gPlayerPartyCount - 1], MON_DATA_SPECIES2, 0) == SPECIES_WAILORD)
             return TRUE;
     }
@@ -64,7 +68,7 @@ bool8 CheckRelicanthWailord(void)
 
 bool8 ShouldDoBrailleStrengthEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x6))
+    if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS))
     {
         if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23)
             return TRUE;
@@ -94,7 +98,7 @@ void DoBrailleStrengthEffect(void)
 
 bool8 ShouldDoBrailleFlyEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == 0x18 && gSaveBlock1.location.mapNum == 0x44))
+    if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB))
     {
         if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25)
             return TRUE;
@@ -105,8 +109,8 @@ bool8 ShouldDoBrailleFlyEffect(void)
 
 void DoBrailleFlyEffect(void)
 {
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-    FieldEffectStart(0x3C);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB);
 }
 
 bool8 FldEff_UseFlyAncientTomb(void)
@@ -120,7 +124,7 @@ bool8 FldEff_UseFlyAncientTomb(void)
 
 void UseFlyAncientTomb_Callback(void)
 {
-    FieldEffectActiveListRemove(0x3C);
+    FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB);
     UseFlyAncientTomb_Finish();
 }
 
@@ -158,7 +162,7 @@ void Task_BrailleWait(u8 taskId)
         if (BrailleWait_CheckButtonPress() != FALSE)
         {
             MenuZeroFillScreen();
-            PlaySE(5);
+            PlaySE(SE_SELECT);
             data[0] = 2;
         }
         else
@@ -191,7 +195,7 @@ void Task_BrailleWait(u8 taskId)
         break;
     case 4:
         sub_8064E2C();
-        ScriptContext1_SetupScript(gIslandCave_EventScript_OpenRegiiceChamber);
+        ScriptContext1_SetupScript(S_OpenRegiceChamber);
         DestroyTask(taskId);
         break;
     }
@@ -199,14 +203,14 @@ void Task_BrailleWait(u8 taskId)
 
 bool32 BrailleWait_CheckButtonPress(void)
 {
-    u16 var = 0xFF;
+    u16 keyMask = A_BUTTON | B_BUTTON | START_BUTTON | SELECT_BUTTON | DPAD_ANY;
 
-    if (gSaveBlock2.optionsButtonMode == 1)
-        var |= 0x300;
-    if (gSaveBlock2.optionsButtonMode == 2)
-        var |= 0x200;
+    if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)
+        keyMask |= L_BUTTON | R_BUTTON;
+    if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A)
+        keyMask |= L_BUTTON;
 
-    if ((var & gMain.newKeys) != FALSE)
+    if (gMain.newKeys & keyMask)
         return TRUE;
     else
         return FALSE;
diff --git a/src/cable_club.c b/src/cable_club.c
index 20b087f4e..7a85f2b6c 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -1,229 +1,350 @@
 #include "global.h"
+#include "battle.h"
+#include "battle_records.h"
 #include "cable_club.h"
 #include "field_message_box.h"
+#include "field_weather.h"
 #include "link.h"
+#include "load_save.h"
+#include "m4a.h"
 #include "main.h"
+#include "menu.h"
+#include "palette.h"
+#include "record_mixing.h"
+#include "overworld.h"
 #include "script.h"
+#include "script_pokemon_80C4.h"
 #include "songs.h"
 #include "sound.h"
+#include "start_menu.h"
 #include "string_util.h"
+#include "strings2.h"
 #include "task.h"
 #include "text.h"
 #include "trainer_card.h"
 
 extern u16 gScriptResult;
 extern struct TrainerCard gTrainerCards[4];
-
 extern u8 gUnknown_03004860;
 extern u8 gFieldLinkPlayerCount;
-
-extern u8 gUnknown_081A4932[];
+extern u16 gSpecialVar_0x8004;
+extern u16 gSpecialVar_0x8005;
+extern u16 gSpecialVar_0x8006;
+extern u16 gBattleTypeFlags;
+extern const u8 gUnknown_081A4932[];
 extern const u8 gUnknown_081A4975[];
-
+extern const u8 gUnknown_081A49B6[];
+extern const u8 gUnknown_081A490C[];
+extern const u8* const gTrainerCardColorNames[];
+extern struct
+{
+    u8 field0;
+    u8 field1;
+} gUnknown_020297D8;
+
+static void sub_8082F20(u8 taskId);
+static void sub_8082F68(u8 taskId);
+static void sub_8082FEC(u8 taskId);
+static void sub_808303C(u8 taskId);
 static void sub_80830E4(u8 taskId);
+static void sub_8083188(u8 taskId);
 static void sub_8083288(u8 taskId);
 static void sub_8083314(u8 taskId);
+static void sub_80833C4(u8 taskId);
+static void sub_80833EC(u8 taskId);
+static void sub_8083418(u8 taskId);
+static bool8 sub_8083444(u8 taskId);
+static void sub_808353C(u8 taskId);
+static void sub_8083710(u8 taskId);
+static void sub_8083760(u8 taskId);
+static void sub_80837B4(u8 taskId);
+static void sub_80837EC(u8 taskId);
+static void sub_808382C(u8 taskId);
+static void sub_8083958(void);
+static void sub_80839DC(u8 taskId);
+static void sub_8083AAC(u8 taskId);
+static void sub_8083B44(u8 taskId);
+static void sub_8083B6C(void);
+static void sub_8083CA4(u8 taskId);
+
+extern void sub_80831F8(u8 taskId);
+extern void call_map_music_set_to_zero(void);
+extern void sub_810FEFC(void);
+extern void sub_8047CD8(void);
+extern void sub_805559C(void);
+extern void sub_8055574(void);
+extern s32 sub_80554F8(void);
+extern void sub_805465C(void);
+
+static void sub_8082CD4(u8 arg0, u8 arg1)
+{
+    if (FindTaskIdByFunc(sub_8082F20) == 0xFF)
+    {
+        u8 taskId = CreateTask(sub_8082F20, 80);
+
+        gTasks[taskId].data[1] = arg0;
+        gTasks[taskId].data[2] = arg1;
+    }
+}
+
+static void sub_8082D18(u32 value)
+{
+    ConvertIntToDecimalStringN(gStringVar1, value, STR_CONV_MODE_LEFT_ALIGN, 1);
+    MenuDrawTextWindow(18, 10, 28, 13);
+    sub_8072BD8(gOtherText_PLink, 19, 11, 72);
+}
+
+static void sub_8082D4C()
+{
+    MenuZeroFillWindowRect(18, 10, 28, 13);
+}
+
+static void sub_8082D60(u8 taskId, u8 arg1)
+{
+    s16 *data = &gTasks[taskId].data[3];
+
+    if (arg1 != *data)
+    {
+        if (arg1 <= 1)
+            sub_8082D4C();
+        else
+            sub_8082D18(arg1);
+        *data = arg1;
+    }
+}
+
+static u32 sub_8082D9C(u8 minPlayers, u8 maxPlayers)
+{
+    int playerCount;
+
+    switch (GetLinkPlayerDataExchangeStatusTimed())
+    {
+    case EXCHANGE_COMPLETE:
+        playerCount = GetLinkPlayerCount_2();
+        if (minPlayers <= playerCount && playerCount <= maxPlayers)
+            return 1;
+        ConvertIntToDecimalStringN(gStringVar1, playerCount, STR_CONV_MODE_LEFT_ALIGN, 1);
+        return 4;
+    case EXCHANGE_TIMED_OUT:
+        return 0;
+    case EXCHANGE_IN_PROGRESS:
+        return 3;
+    default:
+        return 0;
+    }
+}
+
+static bool32 sub_8082DF4(u8 taskId)
+{
+    if (HasLinkErrorOccurred() == TRUE)
+    {
+        gTasks[taskId].func = sub_8083418;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static bool32 sub_8082E28(u8 taskId)
+{
+    if ((gMain.newKeys & B_BUTTON)
+     && IsLinkConnectionEstablished() == FALSE)
+    {
+        gTasks[taskId].func = sub_80833EC;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static bool32 sub_8082E6C(u8 taskId)
+{
+    if (IsLinkConnectionEstablished())
+        SetSuppressLinkErrorMessage(TRUE);
+
+    if (gMain.newKeys & B_BUTTON)
+    {
+        gTasks[taskId].func = sub_80833EC;
+        return TRUE;
+    }
+    return FALSE;
+}
 
-void sub_808303C(u8 taskId) {
-    s32 linkPlayerCount;
-    s16 *taskData;
+static bool32 sub_8082EB8(u8 taskId)
+{
+    if (GetSioMultiSI() == 1)
+    {
+        gTasks[taskId].func = sub_8083418;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void unref_sub_8082EEC(u8 taskId)
+{
+    gTasks[taskId].data[0]++;
+    if (gTasks[taskId].data[0] == 10)
+    {
+        sub_8007E9C(2);
+        DestroyTask(taskId);
+    }
+}
+
+static void sub_8082F20(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (data[0] == 0)
+    {
+        OpenLinkTimed();
+        sub_80082EC();
+        ResetLinkPlayers();
+    }
+    else if (data[0] > 9)
+    {
+        gTasks[taskId].func = sub_8082F68;
+    }
+    data[0]++;
+}
 
-    taskData = gTasks[taskId].data;
+static void sub_8082F68(u8 taskId)
+{
+    u32 playerCount = GetLinkPlayerCount_2();
 
-    linkPlayerCount = GetLinkPlayerCount_2();
+    if (sub_8082E28(taskId) == TRUE
+     || sub_8082E6C(taskId) == TRUE
+     || playerCount < 2)
+        return;
 
-    if (sub_8082E28(taskId) == 1 ||
-        sub_8082EB8(taskId) == 1 ||
-        sub_8082DF4(taskId) == 1)
+    SetSuppressLinkErrorMessage(TRUE);
+    gTasks[taskId].data[3] = 0;
+    if (IsLinkMaster() == TRUE)
     {
+        PlaySE(SE_PIN);
+        ShowFieldAutoScrollMessage(gUnknown_081A4932);
+        gTasks[taskId].func = sub_8082FEC;
+    }
+    else
+    {
+        PlaySE(SE_BOO);
+        ShowFieldAutoScrollMessage(gUnknown_081A49B6);
+        gTasks[taskId].func = sub_80831F8;
+    }
+}
+
+static void sub_8082FEC(u8 taskId)
+{
+    if (sub_8082E28(taskId) == TRUE
+     || sub_8082EB8(taskId) == TRUE
+     || sub_8082DF4(taskId) == TRUE)
         return;
+
+    if (GetFieldMessageBoxMode() == FIELD_MESSAGE_BOX_HIDDEN)
+    {
+        gTasks[taskId].data[3] = 0;
+        gTasks[taskId].func = sub_808303C;
     }
+}
+
+static void sub_808303C(u8 taskId)
+{
+    s16 *taskData = gTasks[taskId].data;
+    s32 linkPlayerCount = GetLinkPlayerCount_2();
+
+    if (sub_8082E28(taskId) == TRUE
+     || sub_8082EB8(taskId) == TRUE
+     || sub_8082DF4(taskId) == TRUE)
+        return;
 
     sub_8082D60(taskId, linkPlayerCount);
 
     if (!(gMain.newKeys & A_BUTTON))
-    {
         return;
-    }
 
 #if ENGLISH
     if (linkPlayerCount < taskData[1])
-    {
         return;
-    }
 
     sub_80081C8(linkPlayerCount);
     sub_8082D4C();
-    ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1); // r5
-    ShowFieldAutoScrollMessage((u8 *) gUnknown_081A4975);
+    ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1);
+    ShowFieldAutoScrollMessage((u8 *)gUnknown_081A4975);
     gTasks[taskId].func = sub_80830E4;
 #elif GERMAN
-    if ((gLinkType == 0x2255 && (u32) linkPlayerCount > 1) ||
-        (gLinkType != 0x2255 && taskData[1] <= linkPlayerCount))
+    if ((gLinkType == 0x2255 && (u32)linkPlayerCount > 1)
+     || (gLinkType != 0x2255 && taskData[1] <= linkPlayerCount))
     {
         sub_80081C8(linkPlayerCount);
         sub_8082D4C();
-        ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1); // r5
-        ShowFieldAutoScrollMessage((u8 *) gUnknown_081A4975);
+        ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1);
+        ShowFieldAutoScrollMessage((u8 *)gUnknown_081A4975);
         gTasks[taskId].func = sub_80830E4;
     }
 #endif
 }
 
-#ifdef NONMATCHING
-static void sub_80830E4(u8 taskId) {
-    if (sub_8082E28(taskId) == 1 ||
-        sub_8082EB8(taskId) == 1 ||
-        sub_8082DF4(taskId) == 1 ||
-        GetFieldMessageBoxMode())
-    {
+static void sub_80830E4(u8 taskId)
+{
+    if (sub_8082E28(taskId) == TRUE
+     || sub_8082EB8(taskId) == TRUE
+     || sub_8082DF4(taskId) == TRUE)
         return;
-    }
 
-    if (sub_800820C() == GetLinkPlayerCount_2() &&
-        !(gMain.heldKeys & B_BUTTON))
+    if (GetFieldMessageBoxMode() == FIELD_MESSAGE_BOX_HIDDEN)
     {
-        ShowFieldAutoScrollMessage(gUnknown_081A4932);
-        gTasks[taskId].func = sub_8082FEC;
-        return;
+        if (sub_800820C() != GetLinkPlayerCount_2())
+        {
+            ShowFieldAutoScrollMessage(gUnknown_081A4932);
+            gTasks[taskId].func = sub_8082FEC;
+        }
+        else if (gMain.heldKeys & B_BUTTON)
+        {
+            ShowFieldAutoScrollMessage(gUnknown_081A4932);
+            gTasks[taskId].func = sub_8082FEC;
+        }
+        else if (gMain.heldKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sub_8007F4C();
+            gTasks[taskId].func = sub_8083188;
+        }
     }
-
-    if (gMain.heldKeys & A_BUTTON)
-    {
-        PlaySE(SE_SELECT);
-        sub_8007F4C();
-        gTasks[(u32) taskId].func = sub_8083188;
-    }
-}
-#else
-__attribute__((naked))
-static void sub_80830E4(u8 taskId) {
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    adds r6, r5, 0\n\
-    adds r0, r5, 0\n\
-    bl sub_8082E28\n\
-    cmp r0, 0x1\n\
-    beq _08083178\n\
-    adds r0, r5, 0\n\
-    bl sub_8082EB8\n\
-    cmp r0, 0x1\n\
-    beq _08083178\n\
-    adds r0, r5, 0\n\
-    bl sub_8082DF4\n\
-    cmp r0, 0x1\n\
-    beq _08083178\n\
-    bl GetFieldMessageBoxMode\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    bne _08083178\n\
-    bl sub_800820C\n\
-    adds r4, r0, 0\n\
-    bl GetLinkPlayerCount_2\n\
-    lsls r4, 24\n\
-    lsls r0, 24\n\
-    cmp r4, r0\n\
-    bne _08083132\n\
-    ldr r0, _08083148 @ =gMain\n\
-    ldrh r1, [r0, 0x2C]\n\
-    movs r0, 0x2\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    beq _08083158\n\
-_08083132:\n\
-    ldr r0, _0808314C @ =gUnknown_081A4932\n\
-    bl ShowFieldAutoScrollMessage\n\
-    ldr r1, _08083150 @ =gTasks\n\
-    lsls r0, r5, 2\n\
-    adds r0, r5\n\
-    lsls r0, 3\n\
-    adds r0, r1\n\
-    ldr r1, _08083154 @ =sub_8082FEC\n\
-    str r1, [r0]\n\
-    b _08083178\n\
-    .align 2, 0\n\
-_08083148: .4byte gMain\n\
-_0808314C: .4byte gUnknown_081A4932\n\
-_08083150: .4byte gTasks\n\
-_08083154: .4byte sub_8082FEC\n\
-_08083158:\n\
-    movs r0, 0x1\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    beq _08083178\n\
-    movs r0, 0x5\n\
-    bl PlaySE\n\
-    bl sub_8007F4C\n\
-    ldr r0, _08083180 @ =gTasks\n\
-    lsls r1, r6, 2\n\
-    adds r1, r6\n\
-    lsls r1, 3\n\
-    adds r1, r0\n\
-    ldr r0, _08083184 @ =sub_8083188\n\
-    str r0, [r1]\n\
-_08083178:\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08083180: .4byte gTasks\n\
-_08083184: .4byte sub_8083188\n\
-    .syntax divided\n");
 }
-#endif
-
-void sub_8083188(u8 taskId) {
-    u8 local1, local2;
-    u16 *result;
 
-    local1 = gTasks[taskId].data[1];
-    local2 = gTasks[taskId].data[2];
+static void sub_8083188(u8 taskId)
+{
+    u8 local1 = gTasks[taskId].data[1];
+    u8 local2 = gTasks[taskId].data[2];
 
-
-    if (sub_8082DF4(taskId) == 1 ||
-        sub_8083444(taskId) == 1)
-    {
+    if (sub_8082DF4(taskId) == TRUE
+     || sub_8083444(taskId) == TRUE)
         return;
-    }
 
     if (GetLinkPlayerCount_2() != sub_800820C())
     {
         gTasks[taskId].func = sub_8083418;
-        return;
     }
-
-    result = &gScriptResult;
-    *result = sub_8082D9C(local1, local2);
-    if (*result)
+    else
     {
-        gTasks[taskId].func = sub_8083288;
+        gScriptResult = sub_8082D9C(local1, local2);
+        if (gScriptResult != 0)
+            gTasks[taskId].func = sub_8083288;
     }
 }
 
-void sub_80831F8(u8 taskId) {
+void sub_80831F8(u8 taskId)
+{
     u8 local1, local2;
-    u16 *result;
 
     local1 = gTasks[taskId].data[1];
     local2 = gTasks[taskId].data[2];
 
-    if (sub_8082E28(taskId) == 1 ||
-        sub_8082DF4(taskId) == 1)
-    {
+    if (sub_8082E28(taskId) == TRUE
+     || sub_8082DF4(taskId) == TRUE)
         return;
-    }
 
-    result = &gScriptResult;
-    *result = sub_8082D9C(local1, local2);
-    if (*result == 0)
-    {
+    gScriptResult = sub_8082D9C(local1, local2);
+    if (gScriptResult == 0)
         return;
-    }
-
-
-    if (*result == 3)
+    if (gScriptResult == 3)
     {
         sub_800832C();
         HideFieldMessageBox();
@@ -234,16 +355,15 @@ void sub_80831F8(u8 taskId) {
         gFieldLinkPlayerCount = GetLinkPlayerCount_2();
         gUnknown_03004860 = GetMultiplayerId();
         sub_80081C8(gFieldLinkPlayerCount);
-        sub_8093390((struct TrainerCard *) gBlockSendBuffer);
+        sub_8093390((struct TrainerCard *)gBlockSendBuffer);
         gTasks[taskId].func = sub_8083314;
     }
 }
 
-static void sub_8083288(u8 taskId) {
-    if (sub_8082DF4(taskId) == 1)
-    {
+static void sub_8083288(u8 taskId)
+{
+    if (sub_8082DF4(taskId) == TRUE)
         return;
-    }
 
     if (gScriptResult == 3)
     {
@@ -256,26 +376,22 @@ static void sub_8083288(u8 taskId) {
         gFieldLinkPlayerCount = GetLinkPlayerCount_2();
         gUnknown_03004860 = GetMultiplayerId();
         sub_80081C8(gFieldLinkPlayerCount);
-        sub_8093390((struct TrainerCard *) gBlockSendBuffer);
+        sub_8093390((struct TrainerCard *)gBlockSendBuffer);
         gTasks[taskId].func = sub_8083314;
         sub_8007E9C(2);
     }
 }
 
-static void sub_8083314(u8 taskId) {
+static void sub_8083314(u8 taskId)
+{
     u8 index;
-
     struct TrainerCard *trainerCards;
 
-    if (sub_8082DF4(taskId) == 1)
-    {
+    if (sub_8082DF4(taskId) == TRUE)
         return;
-    }
 
     if (GetBlockReceivedStatus() != sub_8008198())
-    {
         return;
-    }
 
     index = 0;
     trainerCards = gTrainerCards;
@@ -296,14 +412,12 @@ static void sub_8083314(u8 taskId) {
         u16 linkType;
         linkType = gLinkType;
         // FIXME: sub_8082D4C doesn't take any arguments
-        sub_8082D4C(0x00004411, linkType);
+        sub_8082D4C(0x4411, linkType);
 #elif GERMAN
         if (gLinkType != 0x4411)
         {
             if (gLinkType == 0x6601)
-            {
                 deUnkValue2 = 1;
-            }
         }
         sub_8082D4C();
 #endif
@@ -315,3 +429,477 @@ static void sub_8083314(u8 taskId) {
     sub_800832C();
     gTasks[taskId].func = sub_80833C4;
 }
+
+static void sub_80833C4(u8 taskId)
+{
+    if (gReceivedRemoteLinkPlayers == FALSE)
+    {
+        sub_8082D4C();
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+    }
+}
+
+static void sub_80833EC(u8 taskId)
+{
+    gScriptResult = 5;
+    sub_8082D4C();
+    HideFieldMessageBox();
+    EnableBothScriptContexts();
+    DestroyTask(taskId);
+}
+
+static void sub_8083418(u8 taskId)
+{
+    gScriptResult = 6;
+    sub_8082D4C();
+    HideFieldMessageBox();
+    EnableBothScriptContexts();
+    DestroyTask(taskId);
+}
+
+static bool8 sub_8083444(u8 taskId)
+{
+    gTasks[taskId].data[4]++;
+    if (gTasks[taskId].data[4] > 600)
+    {
+        gTasks[taskId].func = sub_8083418;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+void sub_808347C(u8 arg0)
+{
+    u32 r3 = 2;
+    u32 r2 = 2;
+
+    switch (gSpecialVar_0x8004)
+    {
+    case 1:
+        r3 = 2;
+        gLinkType = 0x2233;
+        break;
+    case 2:
+        r3 = 2;
+        gLinkType = 0x2244;
+        break;
+    case 5:
+        r3 = 4;
+        r2 = 4;
+        gLinkType = 0x2255;
+        break;
+    }
+
+    sub_8082CD4(r3, r2);
+}
+
+void sub_80834E4(void)
+{
+    gLinkType = 0x1133;
+    gBattleTypeFlags = 0;
+    sub_8082CD4(2, 2);
+}
+
+void sub_808350C(void)
+{
+    gScriptResult = 0;
+    gLinkType = 0x3311;
+    gBattleTypeFlags = 0;
+    sub_8082CD4(2, 4);
+}
+
+static void sub_808353C(u8 taskId)
+{
+    int playerCount;
+    int i;
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        if (gScriptResult == 1)
+        {
+            playerCount = GetLinkPlayerCount();
+            for (i = 0; i < playerCount; i++)
+            {
+                if (gLinkPlayers[i].language == LANGUAGE_JAPANESE)
+                {
+                    gScriptResult = 7;
+                    sub_8008480();
+                    gTasks[taskId].data[0] = 1;
+                    return;
+                }
+            }
+        }
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+        break;
+    case 1:
+        if (gReceivedRemoteLinkPlayers == FALSE)
+        {
+            EnableBothScriptContexts();
+            DestroyTask(taskId);
+        }
+        break;
+    }
+}
+
+void sub_80835D8(void)
+{
+    int taskId = FindTaskIdByFunc(sub_808353C);
+
+    if (taskId == 0xFF)
+    {
+        taskId = CreateTask(sub_808353C, 80);
+        gTasks[taskId].data[0] = 0;
+    }
+}
+
+void sub_8083614(void)
+{
+    gLinkType = 0x4411;
+    gBattleTypeFlags = 0;
+    sub_8082CD4(2, 4);
+}
+
+void sub_808363C(void)
+{
+    gLinkType = 0x6601;
+    gBattleTypeFlags = 0;
+    sub_8082CD4(4, 4);
+}
+
+u8 sub_8083664(void)
+{
+    if (FuncIsActiveTask(sub_8083710) != FALSE)
+        return 0xFF;
+
+    switch (gSpecialVar_0x8004)
+    {
+    case 1:
+        gLinkType = 0x2233;
+        break;
+    case 2:
+        gLinkType = 0x2244;
+        break;
+    case 5:
+        gLinkType = 0x2255;
+        break;
+    case 3:
+        gLinkType = 0x1111;
+        break;
+    case 4:
+        gLinkType = 0x3322;
+        break;
+    }
+
+    return CreateTask(sub_8083710, 80);
+}
+
+static void sub_8083710(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (data[0] == 0)
+    {
+        OpenLink();
+        ResetLinkPlayers();
+        CreateTask(sub_8083C50, 80);
+    }
+    else if (data[0] >= 10)
+    {
+        gTasks[taskId].func = sub_8083760;
+    }
+    data[0]++;
+}
+
+static void sub_8083760(u8 taskId)
+{
+    if (GetLinkPlayerCount_2() >= 2)
+    {
+        if (IsLinkMaster() == TRUE)
+            gTasks[taskId].func = sub_80837B4;
+        else
+            gTasks[taskId].func = sub_80837EC;
+    }
+}
+
+static void sub_80837B4(u8 taskId)
+{
+    if (sub_800820C() == GetLinkPlayerCount_2())
+    {
+        sub_8007F4C();
+        gTasks[taskId].func = sub_80837EC;
+    }
+}
+
+static void sub_80837EC(u8 taskId)
+{
+    if (gReceivedRemoteLinkPlayers == TRUE
+     && IsLinkPlayerDataExchangeComplete() == TRUE)
+    {
+        sub_800826C();
+        sub_8007B14();
+        DestroyTask(taskId);
+    }
+}
+
+void sub_8083820(void)
+{
+    ScrSpecial_DoSaveDialog();
+}
+
+static void sub_808382C(u8 taskId)
+{
+    struct Task* task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        fade_screen(1, 0);
+        gLinkType = 0x2211;
+        ClearLinkCallback_2();
+        task->data[0]++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+            task->data[0]++;
+        break;
+    case 2:
+        task->data[1]++;
+        if (task->data[1] > 20)
+            task->data[0]++;
+        break;
+    case 3:
+        sub_800832C();
+        task->data[0]++;
+        break;
+    case 4:
+        if (!gReceivedRemoteLinkPlayers)
+            task->data[0]++;
+        break;
+    case 5:
+        if (gLinkPlayers[0].trainerId & 1)
+            current_map_music_set__default_for_battle(BGM_BATTLE32);
+        else
+            current_map_music_set__default_for_battle(BGM_BATTLE20);
+
+        switch (gSpecialVar_0x8004)
+        {
+        case 1:
+            gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_LINK;
+            break;
+        case 2:
+            gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE;
+            break;
+        case 5:
+            ReducePlayerPartyToThree();
+            gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE | BATTLE_TYPE_MULTI;
+            break;
+        }
+
+        SetMainCallback2(sub_800E7C4);
+        gMain.savedCallback = sub_8083958;
+        DestroyTask(taskId);
+        break;
+    }
+}
+
+static void sub_8083958(void)
+{
+    call_map_music_set_to_zero();
+    LoadPlayerParty();
+    SavePlayerBag();
+    sub_810FEFC();
+
+    if (gSpecialVar_0x8004 != 5)
+        UpdateLinkBattleRecords(gUnknown_03004860 ^ 1);
+
+    gMain.savedCallback = sub_805465C;
+    SetMainCallback2(sub_8071B28);
+}
+
+void sub_80839A4(void)
+{
+    if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2 || gSpecialVar_0x8004 == 5)
+    {
+        LoadPlayerParty();
+        SavePlayerBag();
+    }
+    copy_saved_warp2_bank_and_enter_x_to_warp1(0x7F);
+}
+
+void sub_80839D0(void)
+{
+    sub_805559C();
+}
+
+static void sub_80839DC(u8 taskId)
+{
+    struct Task* task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        ShowFieldMessage(gUnknown_081A490C);
+        task->data[0] = 1;
+        break;
+    case 1:
+        if (IsFieldMessageBoxHidden())
+        {
+            sub_8055574();
+            sub_8007270(gSpecialVar_0x8005);
+            task->data[0] = 2;
+        }
+        break;
+    case 2:
+        switch (sub_80554F8())
+        {
+        case 0:
+            break;
+        case 1:
+            HideFieldMessageBox();
+            task->data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        case 2:
+            task->data[0] = 3;
+            break;
+        }
+        break;
+    case 3:
+        sub_8055588();
+        HideFieldMessageBox();
+        MenuZeroFillScreen();
+        DestroyTask(taskId);
+        EnableBothScriptContexts();
+        break;
+    }
+}
+
+void sub_8083A84(TaskFunc followupFunc)
+{
+    u8 taskId = CreateTask(sub_80839DC, 80);
+    SetTaskFuncWithFollowupFunc(taskId, sub_80839DC, followupFunc);
+    ScriptContext1_Stop();
+}
+
+static void sub_8083AAC(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        ScriptContext2_Enable();
+        fade_screen(1, 0);
+        ClearLinkCallback_2();
+        task->data[0]++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+            task->data[0]++;
+        break;
+    case 2:
+        gUnknown_020297D8.field0 = 0;
+        gUnknown_020297D8.field1 = 0;
+        m4aMPlayAllStop();
+        sub_800832C();
+        task->data[0]++;
+        break;
+    case 3:
+        if (!gReceivedRemoteLinkPlayers)
+        {
+            SetMainCallback2(sub_8047CD8);
+            DestroyTask(taskId);
+        }
+        break;
+    }
+}
+
+static void sub_8083B44(u8 taskId)
+{
+    sub_8083B6C();
+    DestroyTask(taskId);
+}
+
+void sub_8083B5C(void)
+{
+    sub_8083A84(sub_8083B44);
+}
+
+static void sub_8083B6C(void)
+{
+    CreateTask(sub_8083AAC, 80);
+}
+
+void sub_8083B80(void)
+{
+    sub_8083B6C();
+    ScriptContext1_Stop();
+}
+
+void sub_8083B90(void)
+{
+    gLinkType = 0x2211;
+    sub_8083A84(sub_808382C);
+}
+
+void unref_sub_8083BB0(void)
+{
+    u8 taskId = CreateTask(sub_80839DC, 80);
+    SetTaskFuncWithFollowupFunc(taskId, sub_80839DC, Task_RecordMixing_Main);
+    ScriptContext1_Stop();
+}
+
+void sub_8083BDC(void)
+{
+    sub_8093130(gSpecialVar_0x8006, c2_exit_to_overworld_1_continue_scripts_restart_music);
+}
+
+bool32 sub_8083BF4(u8 linkPlayerIndex)
+{
+    u32 trainerCardColorIndex;
+
+    gSpecialVar_0x8006 = linkPlayerIndex;
+    StringCopy(gStringVar1, gLinkPlayers[linkPlayerIndex].name);
+
+    trainerCardColorIndex = sub_80934C4(linkPlayerIndex);
+    if (trainerCardColorIndex == 0)
+        return FALSE;
+
+    StringCopy(gStringVar2, gTrainerCardColorNames[trainerCardColorIndex - 1]);
+    return TRUE;
+}
+
+void sub_8083C50(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    task->data[0]++;
+    if (task->data[0] > 300)
+    {
+        CloseLink();
+        SetMainCallback2(CB2_LinkError);
+        DestroyTask(taskId);
+    }
+
+    if (gReceivedRemoteLinkPlayers)
+        DestroyTask(taskId);
+}
+
+static void sub_8083CA4(u8 taskId)
+{
+    if (!gReceivedRemoteLinkPlayers)
+    {
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+    }
+}
+
+void unref_sub_8083CC8(u8 taskId)
+{
+    sub_800832C();
+    gTasks[taskId].func = sub_8083CA4;
+}
\ No newline at end of file
diff --git a/src/choose_party.c b/src/choose_party.c
index 7b2c833e1..9cdf63fc8 100644
--- a/src/choose_party.c
+++ b/src/choose_party.c
@@ -6,9 +6,10 @@
 #include "name_string_util.h"
 #include "palette.h"
 #include "party_menu.h"
+#include "pokemon_menu.h"
 #include "pokemon.h"
 #include "pokemon_summary_screen.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
@@ -50,10 +51,8 @@ extern void PartyMenuPrintMonsLevelOrStatus(void);
 extern void PrintPartyMenuMonNicknames(void);
 extern void sub_806BC3C(u8, u8);
 extern u8 sub_806B58C(u8);
-extern void sub_806D538();
 extern u16 sub_806BE38();
 extern u8 sub_806CA38();
-extern void sub_808B5B4();
 extern TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, u8);
 extern u8 sub_806B124();
 extern void sub_806C994();
@@ -84,8 +83,6 @@ extern void PartyMenuDoPutNicknameTilemap(u16, u8, u8, u8, const u8 *);
 extern void box_print(u8, int, const u8 *);
 extern void sub_806BCE8(void);
 extern void sub_806E750(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, int);
-extern u16 sub_806BD80();
-extern void sub_806BF74();
 
 static void ClearPartySelection(void);
 static bool8 IsMonAllowedInBattleTower(struct Pokemon *);
diff --git a/src/clock.c b/src/clock.c
index 1f2aac9fd..9635514d2 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -7,7 +7,7 @@
 #include "field_weather.h"
 #include "lottery_corner.h"
 #include "main.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "time_events.h"
 #include "tv.h"
diff --git a/src/daycare.c b/src/daycare.c
index 717e37330..b383667a7 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -21,9 +21,7 @@
 #include "sound.h"
 #include "songs.h"
 #include "script.h"
-#include "rom4.h"
-
-extern u16 word_2024E82;
+#include "overworld.h"
 
 IWRAM_DATA u16 gUnknown_03000470[52];
 IWRAM_DATA u16 gUnknown_030004D8[4];
@@ -150,6 +148,9 @@ static void sub_80414C0(struct DayCareData * daycare_data)
     }
 }
 
+u8 TryIncrementMonLevel(struct Pokemon *);
+extern u16 gMoveToLearn;
+
 static void DayCare_LevelUpMoves(struct Pokemon * mon)
 {
     s32 i;
@@ -161,11 +162,11 @@ static void DayCare_LevelUpMoves(struct Pokemon * mon)
         if (TryIncrementMonLevel(mon))
         {
             r6 = 1;
-            while ((temp = sub_803B7C8(mon, r6)) != 0)
+            while ((temp = MonTryLearningNewMove(mon, r6)) != 0)
             {
                 r6 = 0;
                 if (temp == 0xffff)
-                    DeleteFirstMoveAndGiveMoveToMon(mon, word_2024E82);
+                    DeleteFirstMoveAndGiveMoveToMon(mon, gMoveToLearn);
             }
         }
         else
diff --git a/src/decoration.c b/src/decoration.c
index da33b3ab7..1d48692c1 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "main.h"
 #include "map_object_constants.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sound.h"
 #include "songs.h"
 #include "string_util.h"
@@ -2322,7 +2322,7 @@ void sub_80FF474(void)
     {
         if (FlagGet(i + 0xae) == 1)
         {
-            FlagReset(i + 0xae);
+            FlagClear(i + 0xae);
             for (j=0; j<gMapHeader.events->mapObjectCount; j++)
             {
                 if (gMapHeader.events->mapObjects[j].flagId == i + 0xae)
diff --git a/src/diploma.c b/src/diploma.c
index ba7de58aa..27601404c 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -4,7 +4,7 @@
 #include "menu.h"
 #include "palette.h"
 #include "pokedex.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "strings2.h"
@@ -35,7 +35,7 @@ static void VBlankCB(void)
     TransferPlttBuffer();
 }
 
-void sub_8145D88(void)
+void CB2_ShowDiploma(void)
 {
     u32 savedIme;
 
diff --git a/src/easy_chat.c b/src/easy_chat.c
index f3673c8fa..e71067454 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -21,8 +21,8 @@ extern u16 gSpecialVar_0x8004;
 
 IWRAM_DATA u8 gUnknown_03000740;
 
-
-u8 *sub_80EB3FC(u8 *dst, u16 word)
+// returns the end of the destination buffer text
+u8 *EasyChat_GetWordText(u8 *dst, u16 word)
 {
     u16 group;
     u16 wordIndex;
@@ -34,13 +34,13 @@ u8 *sub_80EB3FC(u8 *dst, u16 word)
 
     if (word == 0xFFFF)
     {
-        dst[0] = EOS;
+        *dst = EOS;
         return dst;
     }
     else
     {
-        group = word >> 9;
-        wordIndex = word & 0x1FF;
+        group = EC_GROUP(word);
+        wordIndex = EC_INDEX(word);
         switch (group)
         {
         case EC_GROUP_POKEMON: // 0
@@ -61,7 +61,7 @@ u8 *sub_80EB3FC(u8 *dst, u16 word)
             dst = StringCopy(dst, src);
             break;
         }
-        dst[0] = EOS;
+        *dst = EOS;
         return dst;
     }
 }
@@ -79,7 +79,7 @@ u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         for (n = 0; n < i1; n++)
         {
-            dst = sub_80EB3FC(dst, words[0]);
+            dst = EasyChat_GetWordText(dst, words[0]);
 
             if (words[0] != 0xFFFF)
             {
@@ -92,7 +92,7 @@ u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         word = words[0];
         words++;
-        dst = sub_80EB3FC(dst, word);
+        dst = EasyChat_GetWordText(dst, word);
 
         dst[0] = CHAR_NEWLINE;
         dst++;
@@ -117,7 +117,7 @@ u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         for (n = 0; n < i1; n++)
         {
-            dst = sub_80EB3FC(dst, words[0]);
+            dst = EasyChat_GetWordText(dst, words[0]);
 
             if (words[0] != 0xFFFF)
             {
@@ -130,7 +130,7 @@ u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         word = words[0];
         words++;
-        dst = sub_80EB3FC(dst, word);
+        dst = EasyChat_GetWordText(dst, word);
 
         // Only difference with ConvertEasyChatWordsToString
         dst[0] = (i == 0) ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL;
@@ -146,7 +146,7 @@ u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
 u16 unref_sub_80EB5E0(u16 arg0)
 {
-    u8 *chars;
+    const u8 *chars;
     u16 i;
     u16 length;
     int group, word;
@@ -155,8 +155,8 @@ u16 unref_sub_80EB5E0(u16 arg0)
     if (arg0 == 0xFFFF)
         return 0;
 
-    group = arg0 >> 9;
-    word = arg0 & 0x1FF;
+    group = EC_GROUP(arg0);
+    word = EC_INDEX(arg0);
     switch (group)
     {
     case EC_GROUP_POKEMON: // 0
@@ -323,7 +323,7 @@ void sub_80EB83C(void)
         group = EC_GROUP_LIFESTYLE;
 
     local2 = sub_80EB784(group);
-    sub_80EB3FC(gStringVar2, local2);
+    EasyChat_GetWordText(gStringVar2, local2);
 }
 
 u8 sub_80EB868(u8 arg0)
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index aa3d45250..90d1ee039 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -6,7 +6,7 @@
 #include "task.h"
 #include "script.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "main.h"
 #include "event_data.h"
 #include "sound.h"
diff --git a/src/event_data.c b/src/event_data.c
index 0484bae02..ee475343f 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -36,10 +36,10 @@ void ClearTempFieldEventData(void)
 {
     memset(gSaveBlock1.flags, 0, TEMP_FLAGS_SIZE);
     memset(gSaveBlock1.vars, 0, TEMP_VARS_SIZE);
-    FlagReset(SYS_ENC_UP_ITEM);
-    FlagReset(SYS_ENC_DOWN_ITEM);
-    FlagReset(SYS_USE_STRENGTH);
-    FlagReset(SYS_CTRL_OBJ_DELETE);
+    FlagClear(SYS_ENC_UP_ITEM);
+    FlagClear(SYS_ENC_DOWN_ITEM);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_CTRL_OBJ_DELETE);
 }
 
 // probably had different flag splits at one point.
@@ -53,7 +53,7 @@ void DisableNationalPokedex(void)
     u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
     gSaveBlock2.pokedex.nationalMagic = 0;
     *nationalDexVar = 0;
-    FlagReset(SYS_NATIONAL_DEX);
+    FlagClear(SYS_NATIONAL_DEX);
 }
 
 void EnableNationalPokedex(void)
@@ -77,7 +77,7 @@ bool32 IsNationalPokedexEnabled(void)
 
 void DisableMysteryGift(void)
 {
-    FlagReset(SYS_EXDATA_ENABLE);
+    FlagClear(SYS_EXDATA_ENABLE);
 }
 
 void EnableMysteryGift(void)
@@ -93,7 +93,7 @@ bool32 IsMysteryGiftEnabled(void)
 void DisableResetRTC(void)
 {
     VarSet(VAR_RESET_RTC_ENABLE, 0);
-    FlagReset(SYS_RESET_RTC_ENABLE);
+    FlagClear(SYS_RESET_RTC_ENABLE);
 }
 
 void EnableResetRTC(void)
@@ -162,7 +162,7 @@ u8 FlagSet(u16 id)
     return 0;
 }
 
-u8 FlagReset(u16 id)
+u8 FlagClear(u16 id)
 {
     u8 *ptr = GetFlagPointer(id);
     if (ptr)
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index a47e63a59..1fd5bf8fa 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "evolution_graphics.h"
 #include "sprite.h"
 #include "trig.h"
 #include "rng.h"
@@ -376,10 +377,10 @@ static void EvoTask_DestroyPostSet1Task(u8 taskID)
     DestroyTask(taskID);
 }
 
-u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 arg0)
+u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species)
 {
     u8 taskID = CreateTask(EvoTask_BeginPostSparklesSet2_AndFlash, 0);
-    gTasks[taskID].data[2] = arg0;
+    gTasks[taskID].data[2] = species;
     return taskID;
 }
 
@@ -424,10 +425,10 @@ static void EvoTask_DestroyPostSet2AndFlashTask(u8 taskID)
         DestroyTask(taskID);
 }
 
-u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 arg0)
+u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species)
 {
     u8 taskID = CreateTask(EvoTask_BeginPostSparklesSet2_AndFlash_Trade, 0);
-    gTasks[taskID].data[2] = arg0;
+    gTasks[taskID].data[2] = species;
     return taskID;
 }
 
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
new file mode 100644
index 000000000..e312b081f
--- /dev/null
+++ b/src/evolution_scene.c
@@ -0,0 +1,3966 @@
+#include "global.h"
+#include "task.h"
+#include "evolution_scene.h"
+#include "evolution_graphics.h"
+#include "palette.h"
+#include "main.h"
+#include "text.h"
+#include "text_window.h"
+#include "pokemon.h"
+#include "string_util.h"
+#include "battle.h"
+#include "unknown_task.h"
+#include "data2.h"
+#include "decompress.h"
+#include "m4a.h"
+#include "trade.h"
+#include "menu.h"
+#include "pokedex.h"
+#include "species.h"
+#include "sound.h"
+#include "songs.h"
+#include "overworld.h"
+#include "battle_message.h"
+#include "pokemon_summary_screen.h"
+#include "menu_cursor.h"
+#include "strings2.h"
+
+struct EvoInfo
+{
+    u8 preEvoSpriteID;
+    u8 postEvoSpriteID;
+    u8 evoTaskID;
+    u8 field_3;
+
+    u8 unk4[0x40];
+    u8 unk44[0x40];
+    u8 unk84[0x40];
+
+    u8 unkC4[0x40][0x20];    // 0x20148C4
+    u8 unk8C4[0x40][0x20];   // 0x20150C4
+    u8 unk10C4[0x40][0x20];  // 0x20158C4
+    u8 unk18C4[0x40][0x20];  // 0x20160C4
+    u8 unk20C4[0x40][0x20];  // 0x20168C4
+    u8 unk28C4[0x40][0x20];  // 0x20170C4
+    u8 unk30C4[0x40][0x20];  // 0x20178C4
+    u8 unk38C4[0x40][0x20];  // 0x20180C4
+
+    u8 *unk40C4[0x40][0x20];  // 0x20188C4
+
+    u16 unk60C4[0x40][0x20];  // 0x201A8C4
+    u16 unk70C4[0x40][0x20];  // 0x201B8C4
+    u16 unk80C4[0x40][0x20];  // 0x201C8C4
+    u16 unk90C4[0x40][0x20];  // 0x201D8C4
+
+    u8 unkA0C4; // 0x201E8C4
+};
+
+#define sEvoInfo ((*(struct EvoInfo*)(ewram + 0x14800)))
+
+void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
+void sub_8024CEC(void);
+void sub_8023A80(void);
+void sub_802BC6C(void);
+void sub_8023AD8(void);
+void nullsub_6(void);
+bool32 IsHMMove2(u16 move);
+
+extern struct Window gUnknown_03004210;
+extern u16 gUnknown_030042A4;
+extern u16 gUnknown_030042A0;
+extern u16 gUnknown_030042C0;
+extern u16 gUnknown_030041B4;
+extern u16 gUnknown_03004288;
+extern u16 gUnknown_03004280;
+extern u16 gUnknown_030041B0;
+extern u16 gUnknown_030041B8;
+extern u8 gBattleTerrain;
+extern u8 gReservedSpritePaletteCount;
+extern u16 gMoveToLearn;
+extern struct SpriteTemplate gUnknown_02024E8C;
+extern u8 gUnk_2009000[]; // won't match if I 'ewram' it
+extern bool8 gAffineAnimsDisabled;
+extern u8 gDisplayedStringBattle[];
+extern u8 gBattleTextBuff2[];
+
+extern u8 gBattleCommunication[];
+#define sEvoCursorPos        gBattleCommunication[1] // when learning a new move
+#define sEvoGraphicsTaskID   gBattleCommunication[2]
+
+extern const u8 gUnknown_08400C4A[];
+extern const u8 gUnknown_08400C60[];
+extern const u8 gUnknown_08400C8D[];
+extern void * const gUnknown_081FAF4C[];
+extern const u8* const gBattleStringsTable[];
+
+// this file's functions
+static void Task_EvolutionScene(u8 taskID);
+static void Task_TradeEvolutionScene(u8 taskID);
+static void CB2_EvolutionSceneUpdate(void);
+static void CB2_TradeEvolutionSceneUpdate(void);
+static void EvoDummyFunc(void);
+static void EvoDummyFunc2(void);
+static void VBlankCB_EvolutionScene(void);
+static void VBlankCB_TradeEvolutionScene(void);
+static void sub_81150D8(void);
+
+// iwram common
+MainCallback gCB2_AfterEvolution;
+
+// const data
+static const u8 sUnknownShedinjaJpnString[] = _("ヌケニン");
+static const u8 sUnusedString0[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}");
+static const u8 sUnusedString1[] = _("▶\n ");
+static const u8 sUnusedString2[] = _("       \n▶");
+static const u8 sUnusedString3[] = _("       \n ");
+static const u8 sPadding[9] = {0};
+
+// code
+
+static void CB2_BeginEvolutionScene(void)
+{
+    UpdatePaletteFade();
+    RunTasks();
+}
+
+#define tState              data[0]
+#define tMonPtrHI           data[1]
+#define tMonPtrLO           data[2]
+#define tPreEvoSpecies      data[3]
+#define tPostEvoSpecies     data[4]
+#define tCanStop            data[5] // in first fast data[5] only checks that
+#define tBits               data[5] // in the second task, it works as a bitfield
+#define tLearnsFirstMove    data[6]
+#define tLearnMoveState     data[8]
+#define tData9              data[9]
+#define tData10             data[10]
+#define tEvoWasStopped      data[11]
+#define tPartyID            data[12]
+
+#define TASK_BIT_CAN_STOP       0x1
+#define TASK_BIT_LEARN_MOVE     0x80
+
+static void Task_BeginEvolutionScene(u8 taskID)
+{
+    struct Pokemon* mon = NULL;
+    switch (gTasks[taskID].tState)
+    {
+    case 0:
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        gTasks[taskID].tState++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+            u16 speciesToEvolve;
+            bool8 canStopEvo;
+            u8 partyID;
+
+            mon = (struct Pokemon*)(gTasks[taskID].tMonPtrHI | (gTasks[taskID].tMonPtrLO << 0x10));
+            speciesToEvolve = gTasks[taskID].tPostEvoSpecies;
+            canStopEvo = gTasks[taskID].tCanStop;
+            partyID = gTasks[taskID].tPartyID;
+
+            DestroyTask(taskID);
+            EvolutionScene(mon, speciesToEvolve, canStopEvo, partyID);
+        }
+        break;
+    }
+}
+
+void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID)
+{
+    u8 taskID = CreateTask(Task_BeginEvolutionScene, 0);
+    gTasks[taskID].tState = 0;
+    gTasks[taskID].tMonPtrHI = (u32)(mon);
+    gTasks[taskID].tMonPtrLO = (u32)(mon) >> 0x10;
+    gTasks[taskID].tPostEvoSpecies = speciesToEvolve;
+    gTasks[taskID].tCanStop = canStopEvo;
+    gTasks[taskID].tPartyID = partyID;
+    SetMainCallback2(CB2_BeginEvolutionScene);
+}
+
+void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID)
+{
+    u8 name[20];
+    u16 currSpecies;
+    u32 TiD, PiD;
+    const struct CompressedSpritePalette** pokePal;
+    u8 ID;
+    SetHBlankCallback(NULL);
+    SetVBlankCallback(NULL);
+    CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+
+    REG_MOSAIC = 0;
+    REG_WIN0H = 0;
+    REG_WIN0V = 0;
+    REG_WIN1H = 0;
+    REG_WIN1V = 0;
+    REG_WININ = 0;
+    REG_WINOUT = 0;
+
+    SetUpWindowConfig(&gWindowConfig_81E6C58);
+    ResetPaletteFade();
+
+    gUnknown_030042A4 = 0;
+    gUnknown_030042A0 = 0;
+    gUnknown_030042C0 = 0;
+    gUnknown_030041B4 = 0;
+    gUnknown_03004288 = 0;
+    gUnknown_03004280 = 0;
+    gUnknown_030041B0 = 256;
+    gUnknown_030041B8 = 0;
+
+    InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
+    gBattleTerrain = BATTLE_TERRAIN_PLAIN;
+
+    sub_800D6D4();
+    sub_800DAB8();
+    ResetSpriteData();
+    remove_some_task();
+    ResetTasks();
+    FreeAllSpritePalettes();
+
+    gReservedSpritePaletteCount = 4;
+
+    GetMonData(mon, MON_DATA_NICKNAME, name);
+    StringCopy10(gStringVar1, name);
+    StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]);
+
+    // preEvo sprite
+    currSpecies = GetMonData(mon, MON_DATA_SPECIES);
+    TiD = GetMonData(mon, MON_DATA_OT_ID);
+    PiD = GetMonData(mon, MON_DATA_PERSONALITY);
+    DecompressPicFromTable_2(&gMonFrontPicTable[currSpecies],
+                             gMonFrontPicCoords[currSpecies].coords,
+                             gMonFrontPicCoords[currSpecies].y_offset,
+                             (void*)(0x2000000),
+                             gUnknown_081FAF4C[1], currSpecies);
+    pokePal = (void*) sub_80409C8(currSpecies, TiD, PiD);
+    LoadCompressedPalette(*pokePal, 0x110, 0x20);
+
+    GetMonSpriteTemplate_803C56C(currSpecies, 1);
+    gUnknown_02024E8C.affineAnims = gDummySpriteAffineAnimTable;
+    sEvoInfo.preEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30);
+
+    gSprites[ID].callback = nullsub_37;
+    gSprites[ID].oam.paletteNum = 1;
+    gSprites[ID].invisible = 1;
+
+    // postEvo sprite
+    DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve],
+                             gMonFrontPicCoords[speciesToEvolve].coords,
+                             gMonFrontPicCoords[speciesToEvolve].y_offset,
+                             (void*)(0x2000000),
+                             gUnknown_081FAF4C[3], speciesToEvolve);
+    pokePal = (void*) sub_80409C8(speciesToEvolve, TiD, PiD);
+    LoadCompressedPalette(*pokePal, 0x120, 0x20);
+
+    GetMonSpriteTemplate_803C56C(speciesToEvolve, 3);
+    gUnknown_02024E8C.affineAnims = gDummySpriteAffineAnimTable;
+    sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30);
+    gSprites[ID].callback = nullsub_37;
+    gSprites[ID].oam.paletteNum = 2;
+    gSprites[ID].invisible = 1;
+
+    LoadEvoSparkleSpriteAndPal();
+
+    sEvoInfo.evoTaskID = ID = CreateTask(Task_EvolutionScene, 0);
+    gTasks[ID].tState = 0;
+    gTasks[ID].tPreEvoSpecies = currSpecies;
+    gTasks[ID].tPostEvoSpecies = speciesToEvolve;
+    gTasks[ID].tMonPtrHI = (u32)(mon);
+    gTasks[ID].tMonPtrLO = (u32)(mon) >> 0x10;
+    gTasks[ID].tCanStop = canStopEvo;
+    gTasks[ID].tLearnsFirstMove = TRUE;
+    gTasks[ID].tEvoWasStopped = FALSE;
+    gTasks[ID].tPartyID = partyID;
+
+    memcpy(gUnk_2009000, &gPlttBufferUnfaded[0x20], 0x60);
+
+    REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP;
+    SetHBlankCallback(EvoDummyFunc);
+    SetVBlankCallback(VBlankCB_EvolutionScene);
+    m4aMPlayAllStop();
+    SetMainCallback2(CB2_EvolutionSceneUpdate);
+}
+
+static void CB2_EvolutionSceneLoadGraphics(void)
+{
+    u8 ID;
+    const struct CompressedSpritePalette** pokePal;
+    u16 postEvoSpecies;
+    u32 TiD, PiD;
+    struct Pokemon* Mon = &gPlayerParty[gTasks[sEvoInfo.evoTaskID].tPartyID];
+
+    postEvoSpecies = gTasks[sEvoInfo.evoTaskID].tPostEvoSpecies;
+    TiD = GetMonData(Mon, MON_DATA_OT_ID);
+    PiD = GetMonData(Mon, MON_DATA_PERSONALITY);
+
+    SetHBlankCallback(NULL);
+    SetVBlankCallback(NULL);
+    CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+
+    REG_MOSAIC = 0;
+    REG_WIN0H = 0;
+    REG_WIN0V = 0;
+    REG_WIN1H = 0;
+    REG_WIN1V = 0;
+    REG_WININ = 0;
+    REG_WINOUT = 0;
+    SetUpWindowConfig(&gWindowConfig_81E6C58);
+    ResetPaletteFade();
+    gUnknown_030042A4 = 0;
+    gUnknown_030042A0 = 0;
+    gUnknown_030042C0 = 0;
+    gUnknown_030041B4 = 0;
+    gUnknown_03004288 = 0;
+    gUnknown_03004280 = 0;
+    gUnknown_030041B0 = 256;
+    gUnknown_030041B8 = 0;
+
+    InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
+    gBattleTerrain = BATTLE_TERRAIN_PLAIN;
+
+    sub_800D6D4();
+    sub_800DAB8();
+    ResetSpriteData();
+    FreeAllSpritePalettes();
+    gReservedSpritePaletteCount = 4;
+
+    DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies],
+                             gMonFrontPicCoords[postEvoSpecies].coords,
+                             gMonFrontPicCoords[postEvoSpecies].y_offset,
+                             (void*)(0x2000000),
+                             gUnknown_081FAF4C[3], postEvoSpecies);
+    pokePal = (void*) sub_80409C8(postEvoSpecies, TiD, PiD);
+    LoadCompressedPalette(*pokePal, 0x120, 0x20);
+
+    GetMonSpriteTemplate_803C56C(postEvoSpecies, 3);
+    gUnknown_02024E8C.affineAnims = gDummySpriteAffineAnimTable;
+    sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30);
+
+    gSprites[ID].callback = nullsub_37;
+    gSprites[ID].oam.paletteNum = 2;
+
+    REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP;
+    SetHBlankCallback(EvoDummyFunc);
+    SetVBlankCallback(VBlankCB_EvolutionScene);
+    SetMainCallback2(CB2_EvolutionSceneUpdate);
+    BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+}
+
+static void CB2_TradeEvolutionSceneLoadGraphics(void)
+{
+    struct Pokemon* Mon = &gPlayerParty[gTasks[sEvoInfo.evoTaskID].tPartyID];
+    u16 postEvoSpecies = gTasks[sEvoInfo.evoTaskID].tPostEvoSpecies;
+
+    switch (gMain.state)
+    {
+    case 0:
+        REG_DISPCNT = 0;
+        SetHBlankCallback(NULL);
+        SetVBlankCallback(NULL);
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        gReservedSpritePaletteCount = 4;
+        gUnknown_030042A4 = 0;
+        gUnknown_030042A0 = 0;
+        gUnknown_030042C0 = 0;
+        gUnknown_030041B4 = 0;
+        gUnknown_03004288 = 0;
+        gUnknown_03004280 = 0;
+        gUnknown_030041B0 = 256;
+        gUnknown_030041B8 = 0;
+        gMain.state++;
+        break;
+    case 1:
+        SetUpWindowConfig(&gWindowConfig_81E6F84);
+        InitWindowFromConfig(&gUnknown_03004828->field_4, &gWindowConfig_81E6F84);
+        gMain.state++;
+        break;
+    case 2:
+        LoadTextWindowGraphics(&gUnknown_03004828->field_4);
+        gUnknown_03004828->field_34 = SetTextWindowBaseTileNum(2);
+        LoadTextWindowGraphics(&gUnknown_03004828->field_4);
+        MenuZeroFillScreen();
+        ResetPaletteFade();
+        gMain.state++;
+        SetHBlankCallback(EvoDummyFunc);
+        SetVBlankCallback(VBlankCB_TradeEvolutionScene);
+        break;
+    case 3:
+        sub_804E22C();
+        gMain.state++;
+        break;
+    case 4:
+        {
+            const struct CompressedSpritePalette** pokePal;
+            u32 TiD = GetMonData(Mon, MON_DATA_OT_ID);
+            u32 PiD = GetMonData(Mon, MON_DATA_PERSONALITY);
+            DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies],
+                                     gMonFrontPicCoords[postEvoSpecies].coords,
+                                     gMonFrontPicCoords[postEvoSpecies].y_offset,
+                                     (void*)(0x2000000),
+                                     gUnknown_081FAF4C[3], postEvoSpecies);
+            pokePal = (void*) sub_80409C8(postEvoSpecies, TiD, PiD);
+            LoadCompressedPalette(*pokePal, 0x120, 0x20);
+            gMain.state++;
+        }
+        break;
+    case 5:
+        {
+            u8 ID;
+
+            GetMonSpriteTemplate_803C56C(postEvoSpecies, 3);
+            gUnknown_02024E8C.affineAnims = gDummySpriteAffineAnimTable;
+            sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30);
+
+            gSprites[ID].callback = nullsub_37;
+            gSprites[ID].oam.paletteNum = 2;
+            gMain.state++;
+        }
+        break;
+    case 6:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        SetMainCallback2(CB2_TradeEvolutionSceneUpdate);
+        REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP;
+        break;
+    }
+}
+
+void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID)
+{
+    u8 name[20];
+    u16 currSpecies;
+    u32 TiD, PiD;
+    const struct CompressedSpritePalette** pokePal;
+    u8 ID;
+
+    GetMonData(mon, MON_DATA_NICKNAME, name);
+    StringCopy10(gStringVar1, name);
+    StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]);
+
+    gAffineAnimsDisabled = TRUE;
+
+    // preEvo sprite
+    currSpecies = GetMonData(mon, MON_DATA_SPECIES);
+    PiD = GetMonData(mon, MON_DATA_PERSONALITY);
+    TiD = GetMonData(mon, MON_DATA_OT_ID);
+    sEvoInfo.preEvoSpriteID = preEvoSpriteID;
+    DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve],
+                             gMonFrontPicCoords[speciesToEvolve].coords,
+                             gMonFrontPicCoords[speciesToEvolve].y_offset,
+                             (void*)(0x2000000),
+                             gUnknown_081FAF4C[1], speciesToEvolve);
+    pokePal = (void*) sub_80409C8(speciesToEvolve, TiD, PiD);
+    LoadCompressedPalette(*pokePal, 0x120, 0x20);
+
+    GetMonSpriteTemplate_803C56C(speciesToEvolve, 1);
+    gUnknown_02024E8C.affineAnims = gDummySpriteAffineAnimTable;
+    sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30);
+
+    gSprites[ID].callback = nullsub_37;
+    gSprites[ID].oam.paletteNum = 2;
+    gSprites[ID].invisible = 1;
+
+    LoadEvoSparkleSpriteAndPal();
+
+    sEvoInfo.evoTaskID = ID = CreateTask(Task_TradeEvolutionScene, 0);
+    gTasks[ID].tState = 0;
+    gTasks[ID].tPreEvoSpecies = currSpecies;
+    gTasks[ID].tPostEvoSpecies = speciesToEvolve;
+    gTasks[ID].tMonPtrHI = (u32)(mon);
+    gTasks[ID].tMonPtrLO = (u32)(mon) >> 0x10;
+    gTasks[ID].tLearnsFirstMove = TRUE;
+    gTasks[ID].tEvoWasStopped = FALSE;
+    gTasks[ID].tPartyID = partyID;
+
+    SetMainCallback2(CB2_TradeEvolutionSceneUpdate);
+}
+
+static void CB2_EvolutionSceneUpdate(void)
+{
+    AnimateSprites();
+    BuildOamBuffer();
+    sub_800374C(&gUnknown_03004210);
+    UpdatePaletteFade();
+    RunTasks();
+}
+
+static void CB2_TradeEvolutionSceneUpdate(void)
+{
+    AnimateSprites();
+    BuildOamBuffer();
+    sub_80035AC(&gUnknown_03004828->field_4);
+    UpdatePaletteFade();
+    RunTasks();
+}
+
+static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
+{
+    u32 data = 0;
+    if (gEvolutionTable[preEvoSpecies].evolutions[0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < 6)
+    {
+        s32 i;
+        struct Pokemon* Shedinja = &gPlayerParty[gPlayerPartyCount];
+        const struct EvolutionData* EvoTable;
+        const struct EvolutionData* Evos;
+
+        CopyMon(Shedinja, mon, sizeof(struct Pokemon));
+        SetMonData(Shedinja, MON_DATA_SPECIES, (void*)(&gEvolutionTable[preEvoSpecies].evolutions[1].targetSpecies));
+        SetMonData(Shedinja, MON_DATA_NICKNAME, (void*)(gSpeciesNames[gEvolutionTable[preEvoSpecies].evolutions[1].targetSpecies]));
+        SetMonData(Shedinja, MON_DATA_HELD_ITEM, (void*)(&data));
+        SetMonData(Shedinja, MON_DATA_MARKINGS, (void*)(&data));
+        SetMonData(Shedinja, MON_DATA_10, (void*)(&data));
+        for (i = MON_DATA_COOL_RIBBON; i < MON_DATA_COOL_RIBBON + 5; i++)
+            SetMonData(Shedinja, i, (void*)(&data));
+        for (i = MON_DATA_CHAMPION_RIBBON; i <= MON_DATA_FATEFUL_ENCOUNTER; i++)
+            SetMonData(Shedinja, i, (void*)(&data));
+        SetMonData(Shedinja, MON_DATA_STATUS, (void*)(&data));
+        data = 0xFF;
+        SetMonData(Shedinja, MON_DATA_MAIL, (void*)(&data));
+
+        CalculateMonStats(Shedinja);
+        CalculatePlayerPartyCount();
+
+        // can't match it otherwise, ehh
+        EvoTable = gEvolutionTable;
+        Evos = EvoTable + preEvoSpecies;
+        GetNationalPokedexFlag(SpeciesToNationalPokedexNum(Evos->evolutions[1].targetSpecies), 2);
+        GetNationalPokedexFlag(SpeciesToNationalPokedexNum(Evos->evolutions[1].targetSpecies), 3);
+
+        if (GetMonData(Shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA
+            && GetMonData(Shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE
+            && GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NINJASK)
+                SetMonData(Shedinja, MON_DATA_NICKNAME, sUnknownShedinjaJpnString);
+    }
+}
+
+static void Task_EvolutionScene(u8 taskID)
+{
+    u32 var;
+    struct Pokemon* mon = (struct Pokemon*)(gTasks[taskID].tMonPtrHI | (gTasks[taskID].tMonPtrLO << 0x10));
+
+    // check if B Button was held, so the evolution gets stopped
+    if (gMain.heldKeys == B_BUTTON && gTasks[taskID].tState == 8 && gTasks[taskID].tBits & TASK_BIT_CAN_STOP)
+    {
+        gTasks[taskID].tState = 16;
+        if (gTasks[sEvoGraphicsTaskID].isActive)
+            gTasks[sEvoGraphicsTaskID].EvoGraphicsTaskEvoStop = TRUE;
+    }
+    switch (gTasks[taskID].tState)
+    {
+    case 0:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        gSprites[sEvoInfo.preEvoSpriteID].invisible = 0;
+        gTasks[taskID].tState++;
+        break;
+    case 1: // print 'whoa, poke is evolving!!!' msg
+        if (!gPaletteFade.active)
+        {
+            StringExpandPlaceholders(gStringVar4, gUnknown_08400C4A);
+            sub_8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 2: // wait for string, play cry
+        if (gUnknown_03004210.state == 0)
+        {
+            PlayCry1(gTasks[taskID].tPreEvoSpecies, 0);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 3: // wait for cry, play tu du SE
+        if (IsCryFinished())
+        {
+            PlaySE(BGM_ME_SHINKA);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 4: // play evolution music and fade screen black
+        if (!IsSEPlaying())
+        {
+            PlayNewMapMusic(BGM_SHINKA);
+            gTasks[taskID].tState++;
+            BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0);
+        }
+        break;
+    case 5: // after screen fade, preapre evo sparkles
+        if (!gPaletteFade.active)
+        {
+            sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet1(17);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 6: // another set of evo sparkles
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            gTasks[taskID].tState++;
+            sEvoInfo.field_3 = 1;
+            sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet2();
+        }
+        break;
+    case 7: // launch task that flashes pre evo with post evo sprites
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            sEvoGraphicsTaskID = sub_8149E7C(sEvoInfo.preEvoSpriteID, sEvoInfo.postEvoSpriteID);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 8: // wait for the above task to finish
+        if (--sEvoInfo.field_3 == 0)
+        {
+            sEvoInfo.field_3 = 3;
+            if (!gTasks[sEvoGraphicsTaskID].isActive)
+                gTasks[taskID].tState++;
+        }
+        break;
+    case 9: // post evo sparkles
+        sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet1();
+        gTasks[taskID].tState++;
+        break;
+    case 10:
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet2AndFlash(gTasks[taskID].tPostEvoSpecies);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 11: // play tu du sound after evolution
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            PlaySE(SE_EXP);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 12: // play poke cry after evolution and return screed to pre-fade state
+        if (IsSEPlaying())
+        {
+            m4aMPlayAllStop();
+            PlayCry1(gTasks[taskID].tPostEvoSpecies, 0);
+            memcpy(&gPlttBufferUnfaded[0x20], gUnk_2009000, 0x60);
+            BeginNormalPaletteFade(0x1C, 0, 0x10, 0, 0);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 13: // congratulations string and rename prompt
+        if (IsCryFinished() && !gPaletteFade.active)
+        {
+            StringExpandPlaceholders(gStringVar4, gUnknown_08400C60);
+            sub_8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15);
+            PlayBGM(BGM_FANFA5);
+            gTasks[taskID].tState++;
+            SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
+            CalculateMonStats(mon);
+            EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies);
+            GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 2);
+            GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 3);
+            IncrementGameStat(14);
+        }
+        break;
+    case 14: // check if it wants to learn a new move
+        if (gUnknown_03004210.state == 0)
+        {
+            var = MonTryLearningNewMove(mon, gTasks[taskID].tLearnsFirstMove);
+            if (var != 0 && !gTasks[taskID].tEvoWasStopped)
+            {
+                u8 text[20];
+
+                sub_8053E90();
+                gTasks[taskID].tBits |= TASK_BIT_LEARN_MOVE;
+                gTasks[taskID].tLearnsFirstMove = FALSE;
+                gTasks[taskID].tLearnMoveState = 0;
+                GetMonData(mon, MON_DATA_NICKNAME, text);
+                StringCopy10(gBattleTextBuff1, text);
+                if (var == 0xFFFF) // no place to learn it
+                    gTasks[taskID].tState = 21;
+                else if (var == 0xFFFE) // it already knows that move
+                    break;
+                else
+                    gTasks[taskID].tState = 19; // has less than 4 moves, so it's been learned
+            }
+            else // no move to learn
+            {
+                BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                gTasks[taskID].tState++;
+            }
+        }
+        break;
+    case 15: // task has finished, return
+        if (!gPaletteFade.active)
+        {
+            if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE))
+                sub_8053E90();
+            if (!gTasks[taskID].tEvoWasStopped)
+                CreateShedinja(gTasks[taskID].tPreEvoSpecies, mon);
+            DestroyTask(taskID);
+            SetMainCallback2(gCB2_AfterEvolution);
+        }
+        break;
+    case 16: // evolution has been canceled, stop music and re-fade palette
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            m4aMPlayAllStop();
+            BeginNormalPaletteFade(0x6001C, 0, 0x10, 0, 0x7FFF);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 17: // play cry of the pokemon trying to evolve again, evolution has been stopped
+        if (!gPaletteFade.active)
+        {
+            PlayCry1(gTasks[taskID].tPreEvoSpecies, 0);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 18: // after the cry, print the string 'WHOA IT DID NOT EVOLVE!!!'
+        if (IsCryFinished())
+        {
+            StringExpandPlaceholders(gStringVar4, gUnknown_08400C8D);
+            sub_8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15);
+            gTasks[taskID].tEvoWasStopped = TRUE;
+            gTasks[taskID].tState = 14;
+        }
+        break;
+    case 19: // pokemon learned a new move, print string and play a fanfare
+        if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+        {
+            sub_8024CEC();
+            PlayFanfare(BGM_FANFA1);
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]);
+            sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+            gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 20: // wait a bit and check if can learn another move
+        if (gUnknown_03004210.state == 0 && !IsSEPlaying() && --gTasks[taskID].tLearnsFirstMove == 0)
+            gTasks[taskID].tState = 14;
+        break;
+    case 21: // try to learn a new move
+        switch (gTasks[taskID].tLearnMoveState)
+        {
+        case 0:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+            {
+                sub_8024CEC();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[4]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 1:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[5]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 2:
+            if (gUnknown_03004210.state != 0)
+                break;
+            if (!IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                gTasks[taskID].tData9 = 5;
+                gTasks[taskID].tData10 = 9;
+                gTasks[taskID].tLearnMoveState++;
+            }
+        case 3:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+            {
+                sub_8023A80();
+                gTasks[taskID].tLearnMoveState++;
+                sEvoCursorPos = 0;
+                sub_802BC6C();
+            }
+            break;
+        case 4:
+            if (gMain.newKeys & DPAD_UP && sEvoCursorPos != 0)
+            {
+                PlaySE(SE_SELECT);
+                nullsub_6();
+                sEvoCursorPos = 0;
+                sub_802BC6C();
+            }
+            if (gMain.newKeys & DPAD_DOWN && sEvoCursorPos == 0)
+            {
+                PlaySE(SE_SELECT);
+                nullsub_6();
+                sEvoCursorPos = 1;
+                sub_802BC6C();
+            }
+            if (gMain.newKeys & A_BUTTON)
+            {
+                sub_8023AD8();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                PlaySE(SE_SELECT);
+                if (sEvoCursorPos != 0)
+                    gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10;
+                else
+                {
+                    gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9;
+                    if (gTasks[taskID].tLearnMoveState == 5)
+                        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                }
+            }
+            if (gMain.newKeys & B_BUTTON)
+            {
+                sub_8023AD8();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                PlaySE(SE_SELECT);
+                gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10;
+            }
+            break;
+        case 5:
+            if (!gPaletteFade.active)
+            {
+                sub_809D9F0(gPlayerParty, gTasks[taskID].tPartyID,
+                            gPlayerPartyCount - 1, CB2_EvolutionSceneLoadGraphics,
+                            gMoveToLearn);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 6:
+            if (!gPaletteFade.active && gMain.callback2 == CB2_EvolutionSceneUpdate)
+            {
+                var = sub_809FA30(); // moveID
+                if (var == 4)
+                    gTasks[taskID].tLearnMoveState = 9;
+                else
+                {
+                    u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
+                    if (IsHMMove2(move))
+                    {
+                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[307]);
+                        sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                        gTasks[taskID].tLearnMoveState = 11;
+                    }
+                    else
+                    {
+                        gBattleTextBuff2[0] = 0xFD;
+                        gBattleTextBuff2[1] = 2;
+                        gBattleTextBuff2[2] = move;
+                        gBattleTextBuff2[3] = (move & 0xFF00) >> 8;
+                        gBattleTextBuff2[4] = EOS;
+                        RemoveMonPPBonus(mon, var);
+                        SetMonMoveSlot(mon, gMoveToLearn, var);
+                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[207]);
+                        sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                        gTasks[taskID].tLearnMoveState++;
+                    }
+                }
+            }
+            break;
+        case 7:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[7]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 8:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[208]);
+                sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+                gTasks[taskID].tState = 19;
+            }
+            break;
+        case 9:
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]);
+            sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+            gTasks[taskID].tData9 = 10;
+            gTasks[taskID].tData10 = 0;
+            gTasks[taskID].tLearnMoveState = 3;
+            break;
+        case 10:
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[9]);
+            sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
+            gTasks[taskID].tState = 14;
+            break;
+        case 11:
+            if (gUnknown_03004210.state == 0 && !IsSEPlaying())
+                gTasks[taskID].tLearnMoveState = 5;
+            break;
+        }
+        break;
+    }
+}
+
+static void Task_TradeEvolutionScene(u8 taskID)
+{
+    u32 var;
+    struct Pokemon* mon = (struct Pokemon*)(gTasks[taskID].tMonPtrHI | (gTasks[taskID].tMonPtrLO << 0x10));
+
+    switch (gTasks[taskID].tState)
+    {
+    case 0:
+        StringExpandPlaceholders(gStringVar4, gUnknown_08400C4A);
+        sub_8002EB0(&gUnknown_03004828->field_4, gStringVar4, gUnknown_03004828->field_34, 2, 15);
+        gTasks[taskID].tState++;
+        break;
+    case 1:
+        if (gUnknown_03004828->field_4.state == 0)
+        {
+            PlayCry1(gTasks[taskID].tPreEvoSpecies, 0);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 2:
+        if (IsCryFinished())
+        {
+            m4aSongNumStop(BGM_SHINKA);
+            PlaySE(BGM_ME_SHINKA);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 3:
+        if (!IsSEPlaying())
+        {
+            PlayBGM(BGM_SHINKA);
+            gTasks[taskID].tState++;
+            BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0);
+        }
+        break;
+    case 4:
+        if (!gPaletteFade.active)
+        {
+            REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP;
+            sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet1(17);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 5:
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            gTasks[taskID].tState++;
+            sEvoInfo.field_3 = 1;
+            sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet2();
+        }
+        break;
+    case 6:
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            sEvoGraphicsTaskID = sub_8149E7C(sEvoInfo.preEvoSpriteID, sEvoInfo.postEvoSpriteID);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 7:
+        if (--sEvoInfo.field_3 == 0)
+        {
+            sEvoInfo.field_3 = 3;
+            if (!gTasks[sEvoGraphicsTaskID].isActive)
+                gTasks[taskID].tState++;
+        }
+        break;
+    case 8:
+        sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet1();
+        gTasks[taskID].tState++;
+        break;
+    case 9:
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet2AndFlash_Trade(gTasks[taskID].tPostEvoSpecies);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 10:
+        if (!gTasks[sEvoGraphicsTaskID].isActive)
+        {
+            PlaySE(SE_EXP);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 11:
+        if (IsSEPlaying())
+        {
+            PlayCry1(gTasks[taskID].tPostEvoSpecies, 0);
+            memcpy(&gPlttBufferUnfaded[0x20], gUnk_2009000, 0x60);
+            BeginNormalPaletteFade(1, 0, 0x10, 0, 0);
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 12:
+        if (IsCryFinished() && !gPaletteFade.active)
+        {
+            StringExpandPlaceholders(gStringVar4, gUnknown_08400C60);
+            sub_8002EB0(&gUnknown_03004828->field_4, gStringVar4, gUnknown_03004828->field_34, 2, 15);
+            PlayFanfare(BGM_FANFA5);
+            gTasks[taskID].tState++;
+            SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
+            CalculateMonStats(mon);
+            EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies);
+            GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 2);
+            GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 3);
+            IncrementGameStat(14);
+        }
+        break;
+    case 13:
+        if (gUnknown_03004828->field_4.state == 0 && IsFanfareTaskInactive() == TRUE)
+        {
+            var = MonTryLearningNewMove(mon, gTasks[taskID].tLearnsFirstMove);
+            if (var != 0 && !gTasks[taskID].tEvoWasStopped)
+            {
+                u8 text[20];
+
+                gTasks[taskID].tBits |= TASK_BIT_LEARN_MOVE;
+                gTasks[taskID].tLearnsFirstMove = FALSE;
+                gTasks[taskID].tLearnMoveState = 0;
+                GetMonData(mon, MON_DATA_NICKNAME, text);
+                StringCopy10(gBattleTextBuff1, text);
+                if (var == 0xFFFF)
+                    gTasks[taskID].tState = 17;
+                else if (var == 0xFFFE)
+                    break;
+                else
+                    gTasks[taskID].tState = 15;
+            }
+            else
+            {
+                PlayBGM(BGM_SHINKA);
+                sub_8002EB0(&gUnknown_03004828->field_4, gOtherText_LinkStandby2, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tState++;
+            }
+        }
+        break;
+    case 14:
+        if (gUnknown_03004828->field_4.state == 0)
+        {
+            DestroyTask(taskID);
+            SetMainCallback2(gCB2_AfterEvolution);
+        }
+        break;
+    case 15:
+        if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+        {
+            sub_8024CEC();
+            PlayFanfare(BGM_FANFA1);
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]);
+            sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+            gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
+            gTasks[taskID].tState++;
+        }
+        break;
+    case 16:
+        if (gUnknown_03004828->field_4.state == 0 && IsFanfareTaskInactive() == TRUE && --gTasks[taskID].tLearnsFirstMove == 0)
+            gTasks[taskID].tState = 13;
+        break;
+    case 17:
+        switch (gTasks[taskID].tLearnMoveState)
+        {
+        case 0:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+            {
+                sub_8024CEC();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[4]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 1:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[5]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 2:
+            if (gUnknown_03004828->field_4.state != 0)
+                break;
+            if (!IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tData9 = 5;
+                gTasks[taskID].tData10 = 9;
+                gTasks[taskID].tLearnMoveState++;
+            }
+        case 3:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+            {
+                DrawTextWindow(&gUnknown_03004828->field_4, 24, 8, 29, 13);
+                sEvoCursorPos = 0;
+                InitWindow(&gUnknown_03004828->field_4, gOtherText_YesNoAndPlayer, gUnknown_03004828->field_34 + 128, 25, 9);
+                sub_8002F44(&gUnknown_03004828->field_4);
+                sub_814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20);
+                sub_81150D8();
+                gTasks[taskID].tLearnMoveState++;
+                sEvoCursorPos = 0;
+            }
+            break;
+        case 4:
+            if (gMain.newKeys & DPAD_UP && sEvoCursorPos != 0)
+            {
+                PlaySE(SE_SELECT);
+                EvoDummyFunc2();
+                sEvoCursorPos = 0;
+                sub_81150D8();
+            }
+            if (gMain.newKeys & DPAD_DOWN && sEvoCursorPos == 0)
+            {
+                PlaySE(SE_SELECT);
+                EvoDummyFunc2();
+                sEvoCursorPos = 1;
+                sub_81150D8();
+            }
+            if (gMain.newKeys & A_BUTTON)
+            {
+                ZeroFillWindowRect(&gUnknown_03004828->field_4, 0x18, 8, 0x1D, 0xD);
+                DestroyMenuCursor();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                PlaySE(SE_SELECT);
+                if (sEvoCursorPos != 0)
+                    gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10;
+                else
+                {
+                    gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9;
+                    if (gTasks[taskID].tLearnMoveState == 5)
+                        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                }
+            }
+            if (gMain.newKeys & B_BUTTON)
+            {
+                ZeroFillWindowRect(&gUnknown_03004828->field_4, 0x18, 8, 0x1D, 0xD);
+                DestroyMenuCursor();
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                PlaySE(SE_SELECT);
+                gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10;
+            }
+            break;
+        case 5:
+            if (!gPaletteFade.active)
+            {
+                sub_809D9F0(gPlayerParty, gTasks[taskID].tPartyID,
+                            gPlayerPartyCount - 1, CB2_TradeEvolutionSceneLoadGraphics,
+                            gMoveToLearn);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 6:
+            if (!gPaletteFade.active && gMain.callback2 == CB2_TradeEvolutionSceneUpdate)
+            {
+                var = sub_809FA30(); // moveID
+                if (var == 4)
+                    gTasks[taskID].tLearnMoveState = 9;
+                else
+                {
+                    u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
+                    if (IsHMMove2(move))
+                    {
+                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[307]);
+                        sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                        gTasks[taskID].tLearnMoveState = 11;
+                    }
+                    else
+                    {
+                        gBattleTextBuff2[0] = 0xFD;
+                        gBattleTextBuff2[1] = 2;
+                        gBattleTextBuff2[2] = move;
+                        gBattleTextBuff2[3] = (move & 0xFF00) >> 8;
+                        gBattleTextBuff2[4] = EOS;
+                        RemoveMonPPBonus(mon, var);
+                        SetMonMoveSlot(mon, gMoveToLearn, var);
+                        StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[207]);
+                        sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                        gTasks[taskID].tLearnMoveState++;
+                    }
+                }
+            }
+            break;
+        case 7:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[7]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tLearnMoveState++;
+            }
+            break;
+        case 8:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+            {
+                StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[208]);
+                sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+                gTasks[taskID].tState = 15;
+            }
+            break;
+        case 9:
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]);
+            sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+            gTasks[taskID].tData9 = 10;
+            gTasks[taskID].tData10 = 0;
+            gTasks[taskID].tLearnMoveState = 3;
+            break;
+        case 10:
+            StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[9]);
+            sub_8002EB0(&gUnknown_03004828->field_4, gDisplayedStringBattle, gUnknown_03004828->field_34, 2, 15);
+            gTasks[taskID].tState = 13;
+            break;
+        case 11:
+            if (gUnknown_03004828->field_4.state == 0 && !IsSEPlaying())
+                gTasks[taskID].tLearnMoveState = 5;
+            break;
+        }
+        break;
+    }
+}
+
+/*
+DizzyEgg, 27.08.2017
+NOTE:
+    Functions below are all unused.
+    What's more, they do NOT exist in Emerald.
+    That's why I think there is no reason to decompile those,
+    as they probably were prototypes for the evolution
+    functions.
+*/
+
+/*
+void unref_sub_8113B50(u8 *a, u8 *b)
+{
+    //u8 *sp0 = a;
+    //u8 *sp4 = b;
+#define sp0 a
+#define sp4 b
+    s32 sp8;
+    s32 spC = 0;
+    u32 sp10 = 0;
+    s32 sp14;
+    s32 r6;
+    u32 r8;
+
+    for (sp8 = 0; sp8 < 64; sp8++)
+    {
+        sEvoInfo.unk84[sp8] = 0;
+        sEvoInfo.unk4[sp8] = 0;
+        sEvoInfo.unk44[sp8] = 0;
+        for (r6 = 0; r6 < 32; r6++)
+        {
+            sEvoInfo.unk10C4[sp8][r6] = 0;
+            sEvoInfo.unk18C4[sp8][r6] = 0;
+            sEvoInfo.unk20C4[sp8][r6] = 0;
+            sEvoInfo.unk28C4[sp8][r6] = 0;
+            sEvoInfo.unkC4[sp8][r6] = 0;
+            sEvoInfo.unk8C4[sp8][r6] = 0;
+            sEvoInfo.unk30C4[sp8][r6] = 0;
+            sEvoInfo.unk38C4[sp8][r6] = 0;
+
+            sEvoInfo.unk60C4[sp8][r6] = 0;
+            sEvoInfo.unk70C4[sp8][r6] = 0;
+            sEvoInfo.unk80C4[sp8][r6] = 0;
+            sEvoInfo.unk90C4[sp8][r6] = 0;
+        }
+    }
+
+    sEvoInfo.unkA0C4 = 64;
+    r8 = 0;
+    for (sp8 = 0; sp8 < 64; sp8++)
+    {
+        //_08113C32
+        u32 r3 = 0;
+        u8 *r2 = sp0 + r8;
+
+        for (r6 = 0; r6 < 64; r6++)
+        {
+            sEvoInfo.unk40C4[sp8][r6 >> 1] = r2;
+            switch (r3)
+            {
+            case 0:
+                switch (r6 & 1)
+                {
+                case 0:
+                    if (*r2 & 0xF)
+                    {
+                        sEvoInfo.unk10C4[sp8][sEvoInfo.unk4[sp8]] = r6;
+                        r3 = 1;
+                    }
+                    break;
+                case 1:
+                    if (*r2 & 0xF0)
+                    {
+                        sEvoInfo.unk10C4[sp8][sEvoInfo.unk4[sp8]] = r6;
+                        r3 = 1;
+                    }
+                    break;
+                }
+                break;
+            case 1:
+                switch (r6 & r3)
+                {
+                 case 0:
+                    if (*r2 & 0xF)
+                    {
+                        sEvoInfo.unk18C4[sp8][sEvoInfo.unk4[sp8]] = r6 - 1;
+                        sEvoInfo.unk4[sp8]++;
+                        r3 = 0;
+                    }
+                    break;
+                case 1:
+                    if (*r2 & 0xF0)
+                    {
+                        sEvoInfo.unk18C4[sp8][sEvoInfo.unk4[sp8]] = r6 - 1;
+                        sEvoInfo.unk4[sp8]++;
+                        r3 = 0;
+                    }
+                    break;
+                }
+            }
+            //if (!((r6 + 1) & 7))
+            if ((r6 + 1) % 8 == 0)
+                r2 += 0x1D;
+            else if (r6 & 1)
+                r2 += 1;
+        }
+        if (r3)
+        {
+            sEvoInfo.unk18C4[sp8][sEvoInfo.unk4[sp8]] = r6;
+            sEvoInfo.unk4[sp8]++;
+        }
+        //_08113D26
+        if (!((sp8 + 1) & 7))
+            r8 += 0xE4;
+        else
+            r8 += 4;
+    }
+    //_08113D4A
+    r8 = 0;
+    for (sp8 = 0; sp8 < 64; sp8++)
+    {
+        //_08113D6A
+        u32 r3 = 0;
+        u8 *r2 = sp4 + r8;
+
+        for (r6 = 0; r6 < 64; r6++)
+        {
+            switch (r3)
+            {
+            case 0:
+                switch (r6 & 1)
+                {
+                case 0:
+                    if (*r2 & 0xF)
+                    {
+                        sEvoInfo.unk20C4[sp8][sEvoInfo.unk44[sp8]] = r6;
+                        r3 = 1;
+                    }
+                    break;
+                case 1:
+                    if (*r2 & 0xF0)
+                    {
+                        sEvoInfo.unk20C4[sp8][sEvoInfo.unk44[sp8]] = r6;
+                        r3 = 1;
+                    }
+                    break;
+                }
+                break;
+            case 1:
+                switch (r6 & r3)
+                {
+                 case 0:
+                    if (*r2 & 0xF)
+                    {
+                        sEvoInfo.unk28C4[sp8][sEvoInfo.unk44[sp8]] = r6 - 1;
+                        sEvoInfo.unk44[sp8]++;
+                        r3 = 0;
+                    }
+                    break;
+                case 1:
+                    if (*r2 & 0xF0)
+                    {
+                        sEvoInfo.unk28C4[sp8][sEvoInfo.unk44[sp8]] = r6 - 1;
+                        sEvoInfo.unk44[sp8]++;
+                        r3 = 0;
+                    }
+                    break;
+                }
+            }
+            //_08113DE4
+            if (!((r6 + 1) & 7))
+                r2 += 0x1D;
+            else if (r6 & 1)
+                r2 += 1;
+
+        }
+        if (r3)
+        {
+            sEvoInfo.unk28C4[sp8][sEvoInfo.unk44[sp8]] = r6;
+            sEvoInfo.unk44[sp8]++;
+        }
+        //if (!((sp8 + 1) & 7))
+        if ((sp8 + 1) % 8 == 0)
+            r8 += 0xE4;
+        else
+            r8 += 4;
+    }
+
+    for (sp8 = 0; sp8 < 0x40; sp8++)  //_08113E3A
+    {
+        if (sEvoInfo.unk4[sp8] < sEvoInfo.unk44[sp8])
+        {
+            for (spC = 0; spC < sEvoInfo.unk4[sp8]; spC++)
+            {
+                sp14 = 0x100;
+
+                for (r6 = 0; r6 < sEvoInfo.unk44[sp8]; r6++)
+                {
+                    s32 r3;
+
+                    //_08113EA4
+                    if (sEvoInfo.unk10C4[sp8][spC] > sEvoInfo.unk20C4[sp8][r6])
+                        r3 = sEvoInfo.unk10C4[sp8][spC] - sEvoInfo.unk20C4[sp8][r6];
+                    else
+                        r3 = sEvoInfo.unk20C4[sp8][r6] - sEvoInfo.unk10C4[sp8][spC];
+
+                    if (sEvoInfo.unk18C4[sp8][spC] > sEvoInfo.unk28C4[sp8][spC])
+                        r3 += sEvoInfo.unk18C4[sp8][spC] - sEvoInfo.unk28C4[sp8][spC];
+                    else
+                        r3 += sEvoInfo.unk28C4[sp8][spC] - sEvoInfo.unk18C4[sp8][spC];
+
+                    if (sp14 >= r3 && sEvoInfo.unkC4[sp8][r6] == 0 && sEvoInfo.unk8C4[sp8][r6] == 0)
+                    {
+                        sp10 = r6;
+                        sp14 = r3;
+                    }
+                }
+                //_08113F3E
+                sub_81141F0(spC, sp10, sp8);
+            }
+            //_08113F54
+
+            for (r6 = 0; r6 < sEvoInfo.unk44[sp8]; r6++)
+            {
+                if (sEvoInfo.unkC4[sp8][r6] == 0 && sEvoInfo.unk8C4[sp8][r6] == 0)
+                    sub_811430C(r6, sp8);
+            }
+        }
+        //_08113F9E
+        if (sEvoInfo.unk4[sp8] == sEvoInfo.unk44[sp8])
+        {
+            for (r6 = 0; r6 < sEvoInfo.unk4[sp8]; r6++)
+                sub_81141F0(r6, r6, sp8);
+        }
+        //_08113FCC
+        if (sEvoInfo.unk4[sp8] > sEvoInfo.unk44[sp8])
+        {
+            for (sp10 = 0; sp10 < sEvoInfo.unk44[sp8]; sp10++)
+            {
+                sp14 = 0x100;
+
+                for (r6 = 0; r6 < sEvoInfo.unk4[sp8]; r6++)
+                {
+                    s32 r3;
+
+                    if (sEvoInfo.unk10C4[sp8][r6] > sEvoInfo.unk20C4[sp8][sp10])
+                        r3 = sEvoInfo.unk10C4[sp8][r6] - sEvoInfo.unk20C4[sp8][sp10];
+                    else
+                        r3 = sEvoInfo.unk20C4[sp8][sp10] - sEvoInfo.unk10C4[sp8][r6];
+
+                    if (sEvoInfo.unk18C4[sp8][r6] > sEvoInfo.unk28C4[sp8][sp10])
+                        r3 += sEvoInfo.unk18C4[sp8][r6] - sEvoInfo.unk28C4[sp8][sp10];
+                    else
+                        r3 += sEvoInfo.unk28C4[sp8][sp10] - sEvoInfo.unk18C4[sp8][r6];
+
+                    //r3 = abs(sEvoInfo.unk10C4[sp8][r6] - sEvoInfo.unk20C4[sp8][sp10]);
+                    //r3 += abs(sEvoInfo.unk18C4[sp8][r6] - sEvoInfo.unk28C4[sp8][sp10]);
+
+                    if (sp14 > r3 && sEvoInfo.unkC4[sp8][r6] == 0)
+                    {
+                        spC = r6;
+                        sp14 = r3;
+                    }
+                }
+                //_081140C4
+                sEvoInfo.unk30C4[sp8][spC] = sEvoInfo.unk20C4[sp8][sp10];
+                sEvoInfo.unk38C4[sp8][spC] = sEvoInfo.unk28C4[sp8][sp10];
+                sEvoInfo.unkC4[sp8][spC] = 1;
+            }
+            //_08114104
+            for (r6 = 0; r6 < sEvoInfo.unk4[sp8]; r6++)
+            {
+                sEvoInfo.unk20C4[sp8][r6] = sEvoInfo.unk30C4[sp8][r6];
+                sEvoInfo.unk28C4[sp8][r6] = sEvoInfo.unk38C4[sp8][r6];
+                if (sEvoInfo.unkC4[sp8][r6] != 0)
+                {
+                    sEvoInfo.unkC4[sp8][r6] = 0;
+                    sub_81141F0(r6, r6, sp8);
+                }
+                else
+                {
+                    // Ugh, can't get this part right
+                    //u8 *ptr1 = &sEvoInfo.unk10C4[sp8][r6];
+                    //u8 *ptr2 = &sEvoInfo.unk18C4[sp8][r6];
+                    //s32 r2 = *ptr1 + (*ptr2 - *ptr1) / 2;
+
+                    //u8 r0_ = sEvoInfo.unk10C4[sp8][r6];
+                    //u8 r2_ = sEvoInfo.unk18C4[sp8][r6];
+                    //s32 r2 = (r0_ - r2_) / 2;
+
+                    s32 r2 = (sEvoInfo.unk18C4[sp8][r6] - sEvoInfo.unk10C4[sp8][r6]);
+                    s32 r2_ = sEvoInfo.unk10C4[sp8][r6];
+
+                    sEvoInfo.unk20C4[sp8][r6] = sEvoInfo.unk28C4[sp8][r6] = r2_ + r2 / 2;
+                    sEvoInfo.unk28C4[sp8][r6]++;
+                    sub_81141F0(r6, r6, sp8);
+                }
+            }
+        }
+        //_081141C4
+    }
+#undef sp0
+#undef sp4
+}
+*/
+__attribute__((naked))
+void unref_sub_8113B50()
+{
+    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, 0x3C\n\
+    str r0, [sp]\n\
+    str r1, [sp, 0x4]\n\
+    movs r0, 0\n\
+    str r0, [sp, 0xC]\n\
+    movs r1, 0\n\
+    str r1, [sp, 0x10]\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x8]\n\
+    ldr r3, _08113C60 @ =0x02014800\n\
+    mov r12, r3\n\
+    ldr r4, _08113C64 @ =0x000018c4\n\
+    add r4, r12\n\
+    mov r10, r4\n\
+    ldr r5, _08113C68 @ =0x000020c4\n\
+    add r5, r12\n\
+    mov r8, r5\n\
+_08113B7C:\n\
+    adds r0, r3, 0\n\
+    adds r0, 0x84\n\
+    ldr r1, [sp, 0x8]\n\
+    adds r0, r1, r0\n\
+    strb r2, [r0]\n\
+    adds r0, r3, 0x4\n\
+    adds r0, r1, r0\n\
+    strb r2, [r0]\n\
+    ldr r4, _08113C6C @ =0x02014844\n\
+    adds r0, r1, r4\n\
+    strb r2, [r0]\n\
+    movs r6, 0\n\
+    lsls r1, 5\n\
+    mov r9, r1\n\
+    ldr r5, [sp, 0x8]\n\
+    lsls r4, r5, 6\n\
+_08113B9C:\n\
+    mov r0, r9\n\
+    adds r1, r6, r0\n\
+    ldr r5, _08113C70 @ =0x020158c4\n\
+    adds r0, r1, r5\n\
+    strb r2, [r0]\n\
+    mov r5, r10\n\
+    adds r0, r1, r5\n\
+    strb r2, [r0]\n\
+    mov r5, r8\n\
+    adds r0, r1, r5\n\
+    strb r2, [r0]\n\
+    ldr r5, _08113C74 @ =0x020170c4\n\
+    adds r0, r1, r5\n\
+    strb r2, [r0]\n\
+    adds r7, r3, 0\n\
+    adds r7, 0xC4\n\
+    adds r0, r1, r7\n\
+    strb r2, [r0]\n\
+    ldr r5, _08113C78 @ =0x000008c4\n\
+    adds r0, r3, r5\n\
+    adds r0, r1, r0\n\
+    strb r2, [r0]\n\
+    ldr r5, _08113C7C @ =0x000030c4\n\
+    adds r0, r3, r5\n\
+    adds r0, r1, r0\n\
+    strb r2, [r0]\n\
+    ldr r5, _08113C80 @ =0x000038c4\n\
+    adds r0, r3, r5\n\
+    adds r1, r0\n\
+    strb r2, [r1]\n\
+    lsls r1, r6, 1\n\
+    adds r1, r4\n\
+    ldr r5, _08113C84 @ =0x000060c4\n\
+    adds r0, r3, r5\n\
+    adds r0, r1, r0\n\
+    strh r2, [r0]\n\
+    ldr r5, _08113C88 @ =0x000070c4\n\
+    adds r0, r3, r5\n\
+    adds r0, r1, r0\n\
+    strh r2, [r0]\n\
+    ldr r5, _08113C8C @ =0x000080c4\n\
+    adds r0, r3, r5\n\
+    adds r0, r1, r0\n\
+    strh r2, [r0]\n\
+    ldr r5, _08113C90 @ =0x000090c4\n\
+    adds r0, r3, r5\n\
+    adds r1, r0\n\
+    strh r2, [r1]\n\
+    adds r6, 0x1\n\
+    cmp r6, 0x1F\n\
+    ble _08113B9C\n\
+    ldr r0, [sp, 0x8]\n\
+    adds r0, 0x1\n\
+    str r0, [sp, 0x8]\n\
+    cmp r0, 0x3F\n\
+    ble _08113B7C\n\
+    ldr r1, _08113C94 @ =0x0000a0c4\n\
+    add r1, r12\n\
+    movs r0, 0x40\n\
+    strb r0, [r1]\n\
+    movs r1, 0\n\
+    mov r8, r1\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x8]\n\
+    movs r3, 0x80\n\
+    lsls r3, 5\n\
+    adds r3, r7\n\
+    mov r12, r3\n\
+    movs r4, 0xC0\n\
+    lsls r4, 5\n\
+    adds r4, r7\n\
+    mov r9, r4\n\
+    movs r5, 0\n\
+    adds r4, r7, 0\n\
+    subs r4, 0xC0\n\
+_08113C32:\n\
+    movs r3, 0\n\
+    ldr r2, [sp]\n\
+    add r2, r8\n\
+    movs r6, 0\n\
+    ldr r0, [sp, 0x8]\n\
+    adds r0, 0x1\n\
+    str r0, [sp, 0x30]\n\
+    ldr r1, [sp, 0x8]\n\
+    lsls r1, 7\n\
+    mov r10, r1\n\
+    movs r7, 0x1\n\
+    negs r7, r7\n\
+_08113C4A:\n\
+    asrs r0, r6, 1\n\
+    lsls r0, 2\n\
+    add r0, r10\n\
+    ldr r1, _08113C98 @ =0x020188c4\n\
+    adds r0, r1\n\
+    str r2, [r0]\n\
+    cmp r3, 0\n\
+    beq _08113C9C\n\
+    cmp r3, 0x1\n\
+    beq _08113CC6\n\
+    b _08113CF4\n\
+    .align 2, 0\n\
+_08113C60: .4byte 0x02014800\n\
+_08113C64: .4byte 0x000018c4\n\
+_08113C68: .4byte 0x000020c4\n\
+_08113C6C: .4byte 0x02014844\n\
+_08113C70: .4byte 0x020158c4\n\
+_08113C74: .4byte 0x020170c4\n\
+_08113C78: .4byte 0x000008c4\n\
+_08113C7C: .4byte 0x000030c4\n\
+_08113C80: .4byte 0x000038c4\n\
+_08113C84: .4byte 0x000060c4\n\
+_08113C88: .4byte 0x000070c4\n\
+_08113C8C: .4byte 0x000080c4\n\
+_08113C90: .4byte 0x000090c4\n\
+_08113C94: .4byte 0x0000a0c4\n\
+_08113C98: .4byte 0x020188c4\n\
+_08113C9C:\n\
+    movs r0, 0x1\n\
+    ands r0, r6\n\
+    cmp r0, 0\n\
+    beq _08113CAA\n\
+    cmp r0, 0x1\n\
+    beq _08113CB0\n\
+    b _08113CF4\n\
+_08113CAA:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF\n\
+    b _08113CB4\n\
+_08113CB0:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF0\n\
+_08113CB4:\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08113CF4\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    add r0, r12\n\
+    strb r6, [r0]\n\
+    movs r3, 0x1\n\
+    b _08113CF4\n\
+_08113CC6:\n\
+    adds r0, r6, 0\n\
+    ands r0, r3\n\
+    cmp r0, 0\n\
+    beq _08113CD4\n\
+    cmp r0, 0x1\n\
+    beq _08113CDA\n\
+    b _08113CF4\n\
+_08113CD4:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF\n\
+    b _08113CDE\n\
+_08113CDA:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF0\n\
+_08113CDE:\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08113CF4\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    add r0, r9\n\
+    strb r7, [r0]\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    movs r3, 0\n\
+_08113CF4:\n\
+    adds r0, r6, 0x1\n\
+    movs r1, 0x7\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08113D02\n\
+    adds r2, 0x1D\n\
+    b _08113D0C\n\
+_08113D02:\n\
+    movs r0, 0x1\n\
+    ands r0, r6\n\
+    cmp r0, 0\n\
+    beq _08113D0C\n\
+    adds r2, 0x1\n\
+_08113D0C:\n\
+    adds r7, 0x1\n\
+    adds r6, 0x1\n\
+    cmp r6, 0x3F\n\
+    ble _08113C4A\n\
+    cmp r3, 0\n\
+    beq _08113D26\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    add r0, r9\n\
+    strb r6, [r0]\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+_08113D26:\n\
+    movs r0, 0x7\n\
+    ldr r2, [sp, 0x30]\n\
+    ands r2, r0\n\
+    cmp r2, 0\n\
+    bne _08113D36\n\
+    movs r3, 0xE4\n\
+    add r8, r3\n\
+    b _08113D3A\n\
+_08113D36:\n\
+    movs r0, 0x4\n\
+    add r8, r0\n\
+_08113D3A:\n\
+    adds r5, 0x20\n\
+    adds r4, 0x1\n\
+    ldr r1, [sp, 0x8]\n\
+    adds r1, 0x1\n\
+    str r1, [sp, 0x8]\n\
+    cmp r1, 0x3F\n\
+    bgt _08113D4A\n\
+    b _08113C32\n\
+_08113D4A:\n\
+    movs r2, 0\n\
+    mov r8, r2\n\
+    movs r3, 0\n\
+    str r3, [sp, 0x8]\n\
+    ldr r0, _08113D84 @ =0x02014844\n\
+    movs r4, 0x82\n\
+    lsls r4, 6\n\
+    adds r4, r0\n\
+    mov r10, r4\n\
+    movs r5, 0xA2\n\
+    lsls r5, 6\n\
+    adds r7, r0, r5\n\
+    movs r5, 0\n\
+    adds r4, r0, 0\n\
+    movs r0, 0x1\n\
+    mov r9, r0\n\
+_08113D6A:\n\
+    movs r3, 0\n\
+    ldr r2, [sp, 0x4]\n\
+    add r2, r8\n\
+    movs r6, 0\n\
+    ldr r1, [sp, 0x8]\n\
+    adds r1, 0x1\n\
+    str r1, [sp, 0x30]\n\
+_08113D78:\n\
+    cmp r3, 0\n\
+    beq _08113D88\n\
+    cmp r3, 0x1\n\
+    beq _08113DB4\n\
+    b _08113DE4\n\
+    .align 2, 0\n\
+_08113D84: .4byte 0x02014844\n\
+_08113D88:\n\
+    adds r0, r6, 0\n\
+    mov r1, r9\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08113D98\n\
+    cmp r0, 0x1\n\
+    beq _08113D9E\n\
+    b _08113DE4\n\
+_08113D98:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF\n\
+    b _08113DA2\n\
+_08113D9E:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF0\n\
+_08113DA2:\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08113DE4\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    add r0, r10\n\
+    strb r6, [r0]\n\
+    movs r3, 0x1\n\
+    b _08113DE4\n\
+_08113DB4:\n\
+    adds r0, r6, 0\n\
+    ands r0, r3\n\
+    cmp r0, 0\n\
+    beq _08113DC2\n\
+    cmp r0, 0x1\n\
+    beq _08113DC8\n\
+    b _08113DE4\n\
+_08113DC2:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF\n\
+    b _08113DCC\n\
+_08113DC8:\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0xF0\n\
+_08113DCC:\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08113DE4\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    adds r0, r7\n\
+    subs r1, r6, 0x1\n\
+    strb r1, [r0]\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    movs r3, 0\n\
+_08113DE4:\n\
+    adds r1, r6, 0x1\n\
+    movs r0, 0x7\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08113DF2\n\
+    adds r2, 0x1D\n\
+    b _08113DFC\n\
+_08113DF2:\n\
+    mov r0, r9\n\
+    ands r6, r0\n\
+    cmp r6, 0\n\
+    beq _08113DFC\n\
+    adds r2, 0x1\n\
+_08113DFC:\n\
+    adds r6, r1, 0\n\
+    cmp r6, 0x3F\n\
+    ble _08113D78\n\
+    cmp r3, 0\n\
+    beq _08113E14\n\
+    ldrb r0, [r4]\n\
+    adds r0, r5\n\
+    adds r0, r7\n\
+    strb r6, [r0]\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+_08113E14:\n\
+    movs r0, 0x7\n\
+    ldr r1, [sp, 0x30]\n\
+    ands r1, r0\n\
+    cmp r1, 0\n\
+    bne _08113E24\n\
+    movs r2, 0xE4\n\
+    add r8, r2\n\
+    b _08113E28\n\
+_08113E24:\n\
+    movs r3, 0x4\n\
+    add r8, r3\n\
+_08113E28:\n\
+    adds r5, 0x20\n\
+    adds r4, 0x1\n\
+    ldr r0, [sp, 0x8]\n\
+    adds r0, 0x1\n\
+    str r0, [sp, 0x8]\n\
+    cmp r0, 0x3F\n\
+    ble _08113D6A\n\
+    movs r1, 0\n\
+    str r1, [sp, 0x8]\n\
+_08113E3A:\n\
+    ldr r3, [sp, 0x8]\n\
+    ldr r4, _08113EBC @ =0x02014804\n\
+    adds r2, r3, r4\n\
+    ldr r5, _08113EC0 @ =0x02014844\n\
+    adds r1, r3, r5\n\
+    ldrb r0, [r2]\n\
+    adds r3, 0x1\n\
+    str r3, [sp, 0x30]\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    bcc _08113E52\n\
+    b _08113F9E\n\
+_08113E52:\n\
+    movs r0, 0\n\
+    str r0, [sp, 0xC]\n\
+    ldrb r2, [r2]\n\
+    cmp r0, r2\n\
+    bge _08113F54\n\
+    ldr r0, _08113EC4 @ =0x02014800\n\
+    adds r0, 0x4\n\
+    ldr r1, [sp, 0x8]\n\
+    adds r0, r1, r0\n\
+    str r0, [sp, 0x18]\n\
+_08113E66:\n\
+    movs r2, 0x80\n\
+    lsls r2, 1\n\
+    str r2, [sp, 0x14]\n\
+    movs r6, 0\n\
+    ldr r3, [sp, 0x8]\n\
+    ldr r4, _08113EC0 @ =0x02014844\n\
+    adds r0, r3, r4\n\
+    ldr r5, [sp, 0xC]\n\
+    adds r5, 0x1\n\
+    str r5, [sp, 0x34]\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    bge _08113F3E\n\
+    ldr r0, _08113EC4 @ =0x02014800\n\
+    mov r10, r0\n\
+    lsls r0, r3, 5\n\
+    ldr r2, [sp, 0xC]\n\
+    adds r1, r2, r0\n\
+    mov r9, r0\n\
+    ldr r0, _08113EC4 @ =0x02014800\n\
+    adds r0, 0xC4\n\
+    mov r3, r9\n\
+    adds r7, r3, r0\n\
+    mov r5, r9\n\
+    ldr r4, _08113EC4 @ =0x02014800\n\
+    ldr r2, _08113EC8 @ =0x000010c4\n\
+    adds r0, r4, r2\n\
+    adds r1, r0\n\
+    mov r8, r1\n\
+    ldrb r3, [r1]\n\
+    str r3, [sp, 0x1C]\n\
+_08113EA4:\n\
+    ldr r0, _08113ECC @ =0x000020c4\n\
+    add r0, r10\n\
+    adds r0, r5, r0\n\
+    ldr r4, [sp, 0x1C]\n\
+    ldrb r1, [r0]\n\
+    cmp r4, r1\n\
+    bls _08113ED0\n\
+    mov r2, r8\n\
+    ldrb r1, [r2]\n\
+    ldrb r0, [r0]\n\
+    b _08113ED6\n\
+    .align 2, 0\n\
+_08113EBC: .4byte 0x02014804\n\
+_08113EC0: .4byte 0x02014844\n\
+_08113EC4: .4byte 0x02014800\n\
+_08113EC8: .4byte 0x000010c4\n\
+_08113ECC: .4byte 0x000020c4\n\
+_08113ED0:\n\
+    ldrb r1, [r0]\n\
+    mov r3, r8\n\
+    ldrb r0, [r3]\n\
+_08113ED6:\n\
+    subs r3, r1, r0\n\
+    ldr r1, [sp, 0xC]\n\
+    add r1, r9\n\
+    ldr r0, _08113EFC @ =0x000018c4\n\
+    add r0, r10\n\
+    adds r4, r1, r0\n\
+    ldr r0, _08113F00 @ =0x000028c4\n\
+    add r0, r10\n\
+    adds r2, r5, r0\n\
+    ldrb r0, [r4]\n\
+    ldr r1, _08113F04 @ =0x02014800\n\
+    mov r12, r1\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bls _08113F08\n\
+    adds r1, r0, 0\n\
+    ldrb r0, [r2]\n\
+    b _08113F0C\n\
+    .align 2, 0\n\
+_08113EFC: .4byte 0x000018c4\n\
+_08113F00: .4byte 0x000028c4\n\
+_08113F04: .4byte 0x02014800\n\
+_08113F08:\n\
+    ldrb r1, [r2]\n\
+    ldrb r0, [r4]\n\
+_08113F0C:\n\
+    subs r1, r0\n\
+    adds r3, r1\n\
+    ldr r2, [sp, 0x14]\n\
+    cmp r2, r3\n\
+    ble _08113F2C\n\
+    ldrb r0, [r7]\n\
+    cmp r0, 0\n\
+    bne _08113F2C\n\
+    ldr r0, _08114050 @ =0x000008c4\n\
+    add r0, r12\n\
+    adds r0, r5, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08113F2C\n\
+    str r6, [sp, 0x10]\n\
+    str r3, [sp, 0x14]\n\
+_08113F2C:\n\
+    adds r7, 0x1\n\
+    adds r5, 0x1\n\
+    adds r6, 0x1\n\
+    ldr r3, [sp, 0x8]\n\
+    ldr r4, _08114054 @ =0x02014844\n\
+    adds r0, r3, r4\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    blt _08113EA4\n\
+_08113F3E:\n\
+    ldr r0, [sp, 0xC]\n\
+    ldr r1, [sp, 0x10]\n\
+    ldr r2, [sp, 0x8]\n\
+    bl sub_81141F0\n\
+    ldr r5, [sp, 0x34]\n\
+    str r5, [sp, 0xC]\n\
+    ldr r0, [sp, 0x18]\n\
+    ldrb r0, [r0]\n\
+    cmp r5, r0\n\
+    blt _08113E66\n\
+_08113F54:\n\
+    movs r6, 0\n\
+    ldr r2, _08114058 @ =0x02014800\n\
+    ldr r1, [sp, 0x8]\n\
+    ldr r3, _08114054 @ =0x02014844\n\
+    adds r0, r1, r3\n\
+    adds r4, r2, 0\n\
+    mov r12, r4\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    bge _08113F9E\n\
+    mov r0, r12\n\
+    adds r0, 0x44\n\
+    adds r4, r1, r0\n\
+_08113F6E:\n\
+    ldr r5, [sp, 0x8]\n\
+    lsls r0, r5, 5\n\
+    adds r1, r6, r0\n\
+    adds r0, r2, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r1, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08113F94\n\
+    ldr r3, _08114050 @ =0x000008c4\n\
+    adds r0, r2, r3\n\
+    adds r0, r1, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08113F94\n\
+    adds r0, r6, 0\n\
+    adds r1, r5, 0\n\
+    bl sub_811430C\n\
+_08113F94:\n\
+    adds r6, 0x1\n\
+    ldr r2, _08114058 @ =0x02014800\n\
+    ldrb r5, [r4]\n\
+    cmp r6, r5\n\
+    blt _08113F6E\n\
+_08113F9E:\n\
+    ldr r0, [sp, 0x8]\n\
+    ldr r1, _0811405C @ =0x02014804\n\
+    adds r2, r0, r1\n\
+    ldr r3, _08114054 @ =0x02014844\n\
+    adds r1, r0, r3\n\
+    ldrb r0, [r2]\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    bne _08113FCC\n\
+    movs r6, 0\n\
+    ldrb r4, [r2]\n\
+    cmp r6, r4\n\
+    bge _08113FCC\n\
+    adds r4, r2, 0\n\
+_08113FBA:\n\
+    adds r0, r6, 0\n\
+    adds r1, r6, 0\n\
+    ldr r2, [sp, 0x8]\n\
+    bl sub_81141F0\n\
+    adds r6, 0x1\n\
+    ldrb r5, [r4]\n\
+    cmp r6, r5\n\
+    blt _08113FBA\n\
+_08113FCC:\n\
+    ldr r0, [sp, 0x8]\n\
+    ldr r1, _0811405C @ =0x02014804\n\
+    adds r2, r0, r1\n\
+    ldr r3, _08114054 @ =0x02014844\n\
+    adds r1, r0, r3\n\
+    ldrb r0, [r2]\n\
+    ldr r4, _08114058 @ =0x02014800\n\
+    ldrb r5, [r1]\n\
+    cmp r0, r5\n\
+    bhi _08113FE2\n\
+    b _081141C4\n\
+_08113FE2:\n\
+    movs r0, 0\n\
+    str r0, [sp, 0x10]\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    blt _08113FEE\n\
+    b _08114104\n\
+_08113FEE:\n\
+    str r2, [sp, 0x2C]\n\
+    ldr r1, [sp, 0x8]\n\
+    lsls r1, 5\n\
+    mov r9, r1\n\
+    adds r0, r4, 0\n\
+    adds r0, 0x44\n\
+    ldr r2, [sp, 0x8]\n\
+    adds r0, r2, r0\n\
+    str r0, [sp, 0x20]\n\
+    mov r3, r9\n\
+    str r3, [sp, 0x24]\n\
+_08114004:\n\
+    movs r4, 0x80\n\
+    lsls r4, 1\n\
+    str r4, [sp, 0x14]\n\
+    movs r6, 0\n\
+    ldr r5, [sp, 0x10]\n\
+    adds r5, 0x1\n\
+    str r5, [sp, 0x38]\n\
+    ldr r0, [sp, 0x2C]\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    bge _081140C4\n\
+    ldr r1, [sp, 0x10]\n\
+    ldr r2, [sp, 0x24]\n\
+    adds r1, r2\n\
+    mov r10, r1\n\
+    ldr r0, _08114058 @ =0x02014800\n\
+    adds r0, 0xC4\n\
+    adds r2, r0\n\
+    mov r8, r2\n\
+    ldr r7, [sp, 0x24]\n\
+    ldr r3, _08114058 @ =0x02014800\n\
+    ldr r4, _08114060 @ =0x000010c4\n\
+    adds r0, r3, r4\n\
+    adds r5, r7, r0\n\
+    ldr r0, _08114064 @ =0x020168c4\n\
+    add r0, r10\n\
+    mov r12, r0\n\
+    ldrb r1, [r0]\n\
+    str r1, [sp, 0x28]\n\
+_0811403E:\n\
+    ldrb r0, [r5]\n\
+    ldr r2, [sp, 0x28]\n\
+    cmp r0, r2\n\
+    bls _08114068\n\
+    adds r1, r0, 0\n\
+    mov r3, r12\n\
+    ldrb r0, [r3]\n\
+    b _0811406E\n\
+    .align 2, 0\n\
+_08114050: .4byte 0x000008c4\n\
+_08114054: .4byte 0x02014844\n\
+_08114058: .4byte 0x02014800\n\
+_0811405C: .4byte 0x02014804\n\
+_08114060: .4byte 0x000010c4\n\
+_08114064: .4byte 0x020168c4\n\
+_08114068:\n\
+    mov r4, r12\n\
+    ldrb r1, [r4]\n\
+    ldrb r0, [r5]\n\
+_0811406E:\n\
+    subs r3, r1, r0\n\
+    ldr r1, _0811408C @ =0x02014800\n\
+    ldr r2, _08114090 @ =0x000018c4\n\
+    adds r0, r1, r2\n\
+    adds r4, r7, r0\n\
+    ldr r2, _08114094 @ =0x020170c4\n\
+    add r2, r10\n\
+    ldrb r0, [r4]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bls _08114098\n\
+    adds r1, r0, 0\n\
+    ldrb r0, [r2]\n\
+    b _0811409C\n\
+    .align 2, 0\n\
+_0811408C: .4byte 0x02014800\n\
+_08114090: .4byte 0x000018c4\n\
+_08114094: .4byte 0x020170c4\n\
+_08114098:\n\
+    ldrb r1, [r2]\n\
+    ldrb r0, [r4]\n\
+_0811409C:\n\
+    subs r1, r0\n\
+    adds r3, r1\n\
+    ldr r2, [sp, 0x14]\n\
+    cmp r2, r3\n\
+    ble _081140B2\n\
+    mov r4, r8\n\
+    ldrb r0, [r4]\n\
+    cmp r0, 0\n\
+    bne _081140B2\n\
+    str r6, [sp, 0xC]\n\
+    str r3, [sp, 0x14]\n\
+_081140B2:\n\
+    movs r0, 0x1\n\
+    add r8, r0\n\
+    adds r7, 0x1\n\
+    adds r5, 0x1\n\
+    adds r6, 0x1\n\
+    ldr r1, [sp, 0x2C]\n\
+    ldrb r1, [r1]\n\
+    cmp r6, r1\n\
+    blt _0811403E\n\
+_081140C4:\n\
+    ldr r3, [sp, 0xC]\n\
+    add r3, r9\n\
+    ldr r2, _08114164 @ =0x02014800\n\
+    ldr r4, _08114168 @ =0x000030c4\n\
+    adds r1, r2, r4\n\
+    adds r1, r3, r1\n\
+    ldr r2, [sp, 0x10]\n\
+    add r2, r9\n\
+    ldr r5, _0811416C @ =0x020168c4\n\
+    adds r0, r2, r5\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r1]\n\
+    ldr r0, _08114164 @ =0x02014800\n\
+    ldr r4, _08114170 @ =0x000038c4\n\
+    adds r1, r0, r4\n\
+    adds r1, r3, r1\n\
+    ldr r5, _08114174 @ =0x020170c4\n\
+    adds r2, r5\n\
+    ldrb r0, [r2]\n\
+    strb r0, [r1]\n\
+    ldr r0, _08114164 @ =0x02014800\n\
+    adds r0, 0xC4\n\
+    adds r3, r0\n\
+    movs r0, 0x1\n\
+    strb r0, [r3]\n\
+    ldr r0, [sp, 0x38]\n\
+    str r0, [sp, 0x10]\n\
+    ldr r1, [sp, 0x20]\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    bge _08114104\n\
+    b _08114004\n\
+_08114104:\n\
+    movs r6, 0\n\
+    ldr r4, _08114164 @ =0x02014800\n\
+    ldr r2, [sp, 0x8]\n\
+    ldr r3, _08114178 @ =0x02014804\n\
+    adds r0, r2, r3\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    bge _081141C4\n\
+    adds r7, r4, 0\n\
+    mov r9, r6\n\
+    movs r5, 0xC4\n\
+    adds r5, r7\n\
+    mov r8, r5\n\
+_0811411E:\n\
+    ldr r1, [sp, 0x8]\n\
+    lsls r0, r1, 5\n\
+    adds r2, r6, r0\n\
+    ldr r3, _0811417C @ =0x000020c4\n\
+    adds r0, r7, r3\n\
+    adds r0, r2\n\
+    mov r10, r0\n\
+    ldr r5, _08114168 @ =0x000030c4\n\
+    adds r0, r7, r5\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    mov r1, r10\n\
+    strb r0, [r1]\n\
+    ldr r3, _08114180 @ =0x000028c4\n\
+    adds r0, r7, r3\n\
+    adds r3, r2, r0\n\
+    ldr r5, _08114170 @ =0x000038c4\n\
+    adds r0, r7, r5\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r3]\n\
+    mov r0, r8\n\
+    adds r1, r2, r0\n\
+    ldrb r0, [r1]\n\
+    cmp r0, 0\n\
+    beq _08114184\n\
+    mov r2, r9\n\
+    strb r2, [r1]\n\
+    adds r0, r6, 0\n\
+    adds r1, r6, 0\n\
+    ldr r2, [sp, 0x8]\n\
+    bl sub_81141F0\n\
+    b _081141B4\n\
+    .align 2, 0\n\
+_08114164: .4byte 0x02014800\n\
+_08114168: .4byte 0x000030c4\n\
+_0811416C: .4byte 0x020168c4\n\
+_08114170: .4byte 0x000038c4\n\
+_08114174: .4byte 0x020170c4\n\
+_08114178: .4byte 0x02014804\n\
+_0811417C: .4byte 0x000020c4\n\
+_08114180: .4byte 0x000028c4\n\
+_08114184:\n\
+    ldr r5, _081141E0 @ =0x000010c4\n\
+    adds r1, r4, r5\n\
+    adds r1, r2, r1\n\
+    ldr r5, _081141E4 @ =0x000018c4\n\
+    adds r0, r4, r5\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    ldrb r2, [r1]\n\
+    subs r0, r2\n\
+    lsrs r1, r0, 31\n\
+    adds r0, r1\n\
+    asrs r0, 1\n\
+    adds r2, r0\n\
+    strb r2, [r3]\n\
+    mov r0, r10\n\
+    strb r2, [r0]\n\
+    ldrb r0, [r3]\n\
+    subs r0, 0x1\n\
+    strb r0, [r3]\n\
+    adds r0, r6, 0\n\
+    adds r1, r6, 0\n\
+    ldr r2, [sp, 0x8]\n\
+    bl sub_81141F0\n\
+_081141B4:\n\
+    adds r6, 0x1\n\
+    ldr r4, _081141E8 @ =0x02014800\n\
+    ldr r1, [sp, 0x8]\n\
+    ldr r2, _081141EC @ =0x02014804\n\
+    adds r0, r1, r2\n\
+    ldrb r0, [r0]\n\
+    cmp r6, r0\n\
+    blt _0811411E\n\
+_081141C4:\n\
+    ldr r3, [sp, 0x30]\n\
+    str r3, [sp, 0x8]\n\
+    cmp r3, 0x3F\n\
+    bgt _081141CE\n\
+    b _08113E3A\n\
+_081141CE:\n\
+    add sp, 0x3C\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\
+_081141E0: .4byte 0x000010c4\n\
+_081141E4: .4byte 0x000018c4\n\
+_081141E8: .4byte 0x02014800\n\
+_081141EC: .4byte 0x02014804\n\
+        .syntax divided");
+}
+
+void sub_81141F0(s32 a, s32 b, s32 c)
+{
+    u32 r7;
+
+    sEvoInfo.unk30C4[c][b] = sEvoInfo.unk10C4[c][a];
+    sEvoInfo.unk38C4[c][b] = sEvoInfo.unk18C4[c][a];
+
+    r7 = 0;
+    if (sEvoInfo.unk10C4[c][a] < sEvoInfo.unk20C4[c][b])
+    {
+        sEvoInfo.unkC4[c][b] = 4;
+        r7 = sEvoInfo.unk20C4[c][b] - sEvoInfo.unk10C4[c][a];
+    }
+    else if (sEvoInfo.unk10C4[c][a] > sEvoInfo.unk20C4[c][b])
+    {
+        sEvoInfo.unkC4[c][b] = 1;
+        r7 = sEvoInfo.unk10C4[c][a] - sEvoInfo.unk20C4[c][b];
+    }
+    sEvoInfo.unk80C4[c][b] = r7 * 16;
+
+    r7 = 0;
+    if (sEvoInfo.unk18C4[c][a] < sEvoInfo.unk28C4[c][b])
+    {
+        sEvoInfo.unk8C4[c][b] = 3;
+        r7 = sEvoInfo.unk28C4[c][b] - sEvoInfo.unk18C4[c][a];
+    }
+    else if (sEvoInfo.unk18C4[c][a] > sEvoInfo.unk28C4[c][b])
+    {
+        sEvoInfo.unk8C4[c][b] = 2;
+        r7 = sEvoInfo.unk18C4[c][a] - sEvoInfo.unk28C4[c][b];
+    }
+    sEvoInfo.unk90C4[c][b] = r7 * 16;
+
+    sEvoInfo.unk84[c]++;
+}
+
+void sub_811430C(u32 a, u32 b)
+{
+    u8 r2 = sEvoInfo.unk28C4[b][a];
+    u8 r3 = sEvoInfo.unk20C4[b][a];
+    s32 r7 = r2 - r3;
+
+    sEvoInfo.unk30C4[b][a] = sEvoInfo.unk38C4[b][a] = r3 + r7 / 2;
+    sEvoInfo.unkC4[b][a] = 5;
+    sEvoInfo.unk8C4[b][a] = 7;
+    sEvoInfo.unk84[b]++;
+    r7 = sEvoInfo.unk30C4[b][a] - sEvoInfo.unk20C4[b][a];
+    sEvoInfo.unk80C4[b][a] = r7 * 16;
+    r7 = sEvoInfo.unk28C4[b][a] - sEvoInfo.unk38C4[b][a];
+    sEvoInfo.unk90C4[b][a] = r7 * 16;
+}
+
+__attribute__((naked))
+void unref_sub_81143CC()
+{
+    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, 0x14\n\
+    movs r0, 0x1\n\
+    str r0, [sp, 0x4]\n\
+    ldr r0, _08114408 @ =0x02014800\n\
+    ldr r2, _0811440C @ =0x0000a0c4\n\
+    adds r1, r0, r2\n\
+    ldrb r3, [r1]\n\
+    adds r4, r0, 0\n\
+    cmp r3, 0\n\
+    beq _081143EE\n\
+    subs r0, r3, 0x1\n\
+    strb r0, [r1]\n\
+_081143EE:\n\
+    movs r5, 0\n\
+    str r5, [sp]\n\
+_081143F2:\n\
+    movs r3, 0\n\
+    adds r2, r4, 0\n\
+    adds r0, r4, 0\n\
+    adds r0, 0x84\n\
+    ldr r1, [sp]\n\
+    adds r0, r1, r0\n\
+    adds r1, 0x1\n\
+    str r1, [sp, 0x8]\n\
+    bl _08114D84\n\
+    .align 2, 0\n\
+_08114408: .4byte 0x02014800\n\
+_0811440C: .4byte 0x0000a0c4\n\
+_08114410:\n\
+    ldr r5, [sp]\n\
+    lsls r0, r5, 5\n\
+    adds r1, r3, r0\n\
+    adds r2, 0xC4\n\
+    adds r1, r2\n\
+    ldrb r2, [r1]\n\
+    mov r8, r0\n\
+    adds r0, r3, 0x1\n\
+    mov r10, r0\n\
+    cmp r2, 0xC\n\
+    bls _08114428\n\
+    b _081148D2\n\
+_08114428:\n\
+    lsls r0, r2, 2\n\
+    ldr r1, _08114434 @ =_08114438\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
+_08114434: .4byte _08114438\n\
+    .align 2, 0\n\
+_08114438:\n\
+    .4byte _081148D2\n\
+    .4byte _0811446C\n\
+    .4byte _081144F0\n\
+    .4byte _0811457C\n\
+    .4byte _08114600\n\
+    .4byte _0811468C\n\
+    .4byte _081146C8\n\
+    .4byte _08114704\n\
+    .4byte _08114740\n\
+    .4byte _0811477C\n\
+    .4byte _081147D0\n\
+    .4byte _08114810\n\
+    .4byte _08114858\n\
+_0811446C:\n\
+    movs r1, 0\n\
+    str r1, [sp, 0x4]\n\
+    lsls r0, r3, 1\n\
+    ldr r2, [sp]\n\
+    lsls r1, r2, 6\n\
+    adds r0, r1\n\
+    ldr r5, _081144E0 @ =0x000060c4\n\
+    adds r2, r4, r5\n\
+    adds r2, r0, r2\n\
+    ldr r5, _081144E4 @ =0x000080c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    adds r1, r3, 0x1\n\
+    mov r10, r1\n\
+    ldr r2, [sp, 0x4]\n\
+    cmp r2, r5\n\
+    blt _081144A6\n\
+    b _081148D2\n\
+_081144A6:\n\
+    mov r9, r4\n\
+    mov r4, r8\n\
+    adds r7, r3, r4\n\
+    ldr r0, _081144E8 @ =0x000030c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _081144EC @ =0x000020c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_081144B8:\n\
+    ldrb r0, [r4]\n\
+    subs r0, 0x1\n\
+    strb r0, [r4]\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldrb r0, [r4]\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _081144D8\n\
+    b _081148A0\n\
+_081144D8:\n\
+    adds r6, 0x1\n\
+    cmp r6, r5\n\
+    blt _081144B8\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_081144E0: .4byte 0x000060c4\n\
+_081144E4: .4byte 0x000080c4\n\
+_081144E8: .4byte 0x000030c4\n\
+_081144EC: .4byte 0x000020c4\n\
+_081144F0:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r4, _08114568 @ =0x02014800\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _0811456C @ =0x000060c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _08114570 @ =0x000080c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    adds r1, r3, 0x1\n\
+    mov r10, r1\n\
+    ldr r2, [sp, 0x4]\n\
+    cmp r2, r5\n\
+    blt _0811452C\n\
+    b _081148D2\n\
+_0811452C:\n\
+    mov r9, r4\n\
+    mov r4, r8\n\
+    adds r7, r3, r4\n\
+    ldr r0, _08114574 @ =0x000030c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _08114578 @ =0x000020c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_0811453E:\n\
+    ldrb r0, [r4]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _08114548\n\
+    b _081148B8\n\
+_08114548:\n\
+    adds r1, r0, 0\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DF0\n\
+    ldrb r0, [r4]\n\
+    subs r0, 0x1\n\
+    strb r0, [r4]\n\
+    adds r6, 0x1\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    cmp r6, r5\n\
+    blt _0811453E\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_08114568: .4byte 0x02014800\n\
+_0811456C: .4byte 0x000060c4\n\
+_08114570: .4byte 0x000080c4\n\
+_08114574: .4byte 0x000030c4\n\
+_08114578: .4byte 0x000020c4\n\
+_0811457C:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _081145F0 @ =0x000060c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _081145F4 @ =0x000080c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    adds r1, r3, 0x1\n\
+    mov r10, r1\n\
+    ldr r2, [sp, 0x4]\n\
+    cmp r2, r5\n\
+    blt _081145B6\n\
+    b _081148D2\n\
+_081145B6:\n\
+    mov r9, r4\n\
+    mov r4, r8\n\
+    adds r7, r3, r4\n\
+    ldr r0, _081145F8 @ =0x000030c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _081145FC @ =0x000020c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_081145C8:\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldrb r0, [r4]\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _081145E8\n\
+    b _081148AC\n\
+_081145E8:\n\
+    adds r6, 0x1\n\
+    cmp r6, r5\n\
+    blt _081145C8\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_081145F0: .4byte 0x000060c4\n\
+_081145F4: .4byte 0x000080c4\n\
+_081145F8: .4byte 0x000030c4\n\
+_081145FC: .4byte 0x000020c4\n\
+_08114600:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r4, _08114678 @ =0x02014800\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _0811467C @ =0x000060c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _08114680 @ =0x000080c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    adds r1, r3, 0x1\n\
+    mov r10, r1\n\
+    ldr r2, [sp, 0x4]\n\
+    cmp r2, r5\n\
+    blt _0811463C\n\
+    b _081148D2\n\
+_0811463C:\n\
+    mov r9, r4\n\
+    mov r4, r8\n\
+    adds r7, r3, r4\n\
+    ldr r0, _08114684 @ =0x000030c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _08114688 @ =0x000020c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_0811464E:\n\
+    ldrb r0, [r4]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _08114658\n\
+    b _081148B8\n\
+_08114658:\n\
+    adds r1, r0, 0\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DF0\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    adds r6, 0x1\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    cmp r6, r5\n\
+    blt _0811464E\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_08114678: .4byte 0x02014800\n\
+_0811467C: .4byte 0x000060c4\n\
+_08114680: .4byte 0x000080c4\n\
+_08114684: .4byte 0x000030c4\n\
+_08114688: .4byte 0x000020c4\n\
+_0811468C:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r5, _081146C0 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _081146C4 @ =0x000030c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    ldr r3, [sp, 0x10]\n\
+    adds r2, r3, 0x1\n\
+    mov r10, r2\n\
+    cmp r0, 0\n\
+    bne _081146B4\n\
+    b _081148D2\n\
+_081146B4:\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r4, r0\n\
+    movs r1, 0x9\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_081146C0: .4byte 0x02014800\n\
+_081146C4: .4byte 0x000030c4\n\
+_081146C8:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _081146FC @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114700 @ =0x000030c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    ldr r3, [sp, 0x10]\n\
+    adds r2, r3, 0x1\n\
+    mov r10, r2\n\
+    cmp r0, 0\n\
+    bne _081146F0\n\
+    b _081148D2\n\
+_081146F0:\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xA\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_081146FC: .4byte 0x02014800\n\
+_08114700: .4byte 0x000030c4\n\
+_08114704:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _08114738 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _0811473C @ =0x000030c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    ldr r3, [sp, 0x10]\n\
+    adds r2, r3, 0x1\n\
+    mov r10, r2\n\
+    cmp r0, 0\n\
+    bne _0811472C\n\
+    b _081148D2\n\
+_0811472C:\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xB\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_08114738: .4byte 0x02014800\n\
+_0811473C: .4byte 0x000030c4\n\
+_08114740:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _08114774 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114778 @ =0x000030c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    ldr r3, [sp, 0x10]\n\
+    adds r2, r3, 0x1\n\
+    mov r10, r2\n\
+    cmp r0, 0\n\
+    bne _08114768\n\
+    b _081148D2\n\
+_08114768:\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xC\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_08114774: .4byte 0x02014800\n\
+_08114778: .4byte 0x000030c4\n\
+_0811477C:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r6, _081147B4 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r5, r3, r0\n\
+    ldr r1, _081147B8 @ =0x000030c4\n\
+    adds r4, r6, r1\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldr r2, _081147BC @ =0x000020c4\n\
+    adds r0, r6, r2\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    bne _081147C0\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    mov r4, sp\n\
+    ldrb r4, [r4, 0x4]\n\
+    strb r4, [r0]\n\
+    b _08114844\n\
+    .align 2, 0\n\
+_081147B4: .4byte 0x02014800\n\
+_081147B8: .4byte 0x000030c4\n\
+_081147BC: .4byte 0x000020c4\n\
+_081147C0:\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x1\n\
+    strb r1, [r0]\n\
+    adds r0, r3, 0x1\n\
+    mov r10, r0\n\
+    b _081148D2\n\
+_081147D0:\n\
+    movs r1, 0\n\
+    str r1, [sp, 0x4]\n\
+    ldr r6, _08114804 @ =0x02014800\n\
+    mov r2, r8\n\
+    adds r5, r3, r2\n\
+    ldr r0, _08114808 @ =0x000030c4\n\
+    adds r4, r6, r0\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DF0\n\
+    ldr r1, _0811480C @ =0x000020c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    beq _08114882\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x2\n\
+    b _08114842\n\
+    .align 2, 0\n\
+_08114804: .4byte 0x02014800\n\
+_08114808: .4byte 0x000030c4\n\
+_0811480C: .4byte 0x000020c4\n\
+_08114810:\n\
+    movs r0, 0\n\
+    str r0, [sp, 0x4]\n\
+    ldr r6, _0811484C @ =0x02014800\n\
+    mov r1, r8\n\
+    adds r5, r3, r1\n\
+    ldr r2, _08114850 @ =0x000030c4\n\
+    adds r4, r6, r2\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldr r1, _08114854 @ =0x000020c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    beq _08114882\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x3\n\
+_08114842:\n\
+    strb r1, [r0]\n\
+_08114844:\n\
+    adds r5, r3, 0x1\n\
+    mov r10, r5\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_0811484C: .4byte 0x02014800\n\
+_08114850: .4byte 0x000030c4\n\
+_08114854: .4byte 0x000020c4\n\
+_08114858:\n\
+    movs r0, 0\n\
+    str r0, [sp, 0x4]\n\
+    ldr r6, _08114894 @ =0x02014800\n\
+    mov r1, r8\n\
+    adds r5, r3, r1\n\
+    ldr r2, _08114898 @ =0x000030c4\n\
+    adds r4, r6, r2\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DF0\n\
+    ldr r1, _0811489C @ =0x000020c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    bne _081148C4\n\
+_08114882:\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    mov r2, sp\n\
+    ldrb r2, [r2, 0x4]\n\
+    strb r2, [r0]\n\
+    adds r4, r3, 0x1\n\
+    mov r10, r4\n\
+    b _081148D2\n\
+    .align 2, 0\n\
+_08114894: .4byte 0x02014800\n\
+_08114898: .4byte 0x000030c4\n\
+_0811489C: .4byte 0x000020c4\n\
+_081148A0:\n\
+    mov r0, r9\n\
+    adds r0, 0xC4\n\
+    adds r0, r7, r0\n\
+    movs r5, 0\n\
+    strb r5, [r0]\n\
+    b _081148D2\n\
+_081148AC:\n\
+    mov r0, r9\n\
+    adds r0, 0xC4\n\
+    adds r0, r7, r0\n\
+    movs r1, 0\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+_081148B8:\n\
+    mov r0, r9\n\
+    adds r0, 0xC4\n\
+    adds r0, r7, r0\n\
+    movs r1, 0\n\
+    strb r1, [r0]\n\
+    b _081148D2\n\
+_081148C4:\n\
+    adds r0, r6, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x4\n\
+    strb r1, [r0]\n\
+    adds r2, r3, 0x1\n\
+    mov r10, r2\n\
+_081148D2:\n\
+    ldr r0, _081148F4 @ =0x02014800\n\
+    mov r4, r8\n\
+    adds r1, r3, r4\n\
+    ldr r5, _081148F8 @ =0x000008c4\n\
+    adds r2, r0, r5\n\
+    adds r1, r2\n\
+    ldrb r1, [r1]\n\
+    adds r4, r0, 0\n\
+    cmp r1, 0xC\n\
+    bls _081148E8\n\
+    b _08114D76\n\
+_081148E8:\n\
+    lsls r0, r1, 2\n\
+    ldr r1, _081148FC @ =_08114900\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
+_081148F4: .4byte 0x02014800\n\
+_081148F8: .4byte 0x000008c4\n\
+_081148FC: .4byte _08114900\n\
+    .align 2, 0\n\
+_08114900:\n\
+    .4byte _08114D76\n\
+    .4byte _08114934\n\
+    .4byte _081149B8\n\
+    .4byte _08114A3C\n\
+    .4byte _08114AC0\n\
+    .4byte _08114B44\n\
+    .4byte _08114B7C\n\
+    .4byte _08114BB4\n\
+    .4byte _08114BEC\n\
+    .4byte _08114C24\n\
+    .4byte _08114C78\n\
+    .4byte _08114CB8\n\
+    .4byte _08114CF8\n\
+_08114934:\n\
+    movs r0, 0\n\
+    str r0, [sp, 0x4]\n\
+    lsls r0, r3, 1\n\
+    ldr r2, [sp]\n\
+    lsls r1, r2, 6\n\
+    adds r0, r1\n\
+    ldr r5, _081149A8 @ =0x000070c4\n\
+    adds r2, r4, r5\n\
+    adds r2, r0, r2\n\
+    ldr r5, _081149AC @ =0x000090c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    ldr r1, [sp, 0x4]\n\
+    cmp r1, r5\n\
+    blt _0811496A\n\
+    b _08114D76\n\
+_0811496A:\n\
+    mov r9, r4\n\
+    mov r2, r8\n\
+    adds r7, r3, r2\n\
+    ldr r0, _081149B0 @ =0x000038c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    movs r3, 0\n\
+    ldr r0, _081149B4 @ =0x000028c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_0811497E:\n\
+    ldrb r0, [r4]\n\
+    subs r0, 0x1\n\
+    strb r0, [r4]\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldrb r0, [r4]\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _0811499E\n\
+    b _08114D4C\n\
+_0811499E:\n\
+    adds r6, 0x1\n\
+    cmp r6, r5\n\
+    blt _0811497E\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_081149A8: .4byte 0x000070c4\n\
+_081149AC: .4byte 0x000090c4\n\
+_081149B0: .4byte 0x000038c4\n\
+_081149B4: .4byte 0x000028c4\n\
+_081149B8:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r4, _08114A28 @ =0x02014800\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _08114A2C @ =0x000070c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _08114A30 @ =0x000090c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    ldr r1, [sp, 0x4]\n\
+    cmp r1, r5\n\
+    blt _081149F0\n\
+    b _08114D76\n\
+_081149F0:\n\
+    mov r9, r4\n\
+    mov r2, r8\n\
+    adds r7, r3, r2\n\
+    ldr r0, _08114A34 @ =0x000038c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _08114A38 @ =0x000028c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_08114A02:\n\
+    ldrb r0, [r4]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _08114A0C\n\
+    b _08114D3C\n\
+_08114A0C:\n\
+    adds r1, r0, 0\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    bl sub_8114DF0\n\
+    ldrb r0, [r4]\n\
+    subs r0, 0x1\n\
+    strb r0, [r4]\n\
+    adds r6, 0x1\n\
+    ldr r2, [sp, 0xC]\n\
+    cmp r6, r5\n\
+    blt _08114A02\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114A28: .4byte 0x02014800\n\
+_08114A2C: .4byte 0x000070c4\n\
+_08114A30: .4byte 0x000090c4\n\
+_08114A34: .4byte 0x000038c4\n\
+_08114A38: .4byte 0x000028c4\n\
+_08114A3C:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _08114AB0 @ =0x000070c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _08114AB4 @ =0x000090c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    ldr r1, [sp, 0x4]\n\
+    cmp r1, r5\n\
+    blt _08114A72\n\
+    b _08114D76\n\
+_08114A72:\n\
+    mov r9, r4\n\
+    mov r2, r8\n\
+    adds r7, r3, r2\n\
+    ldr r0, _08114AB8 @ =0x000038c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    movs r3, 0\n\
+    ldr r0, _08114ABC @ =0x000028c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_08114A86:\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    str r3, [sp, 0x10]\n\
+    bl sub_8114DB4\n\
+    ldrb r0, [r4]\n\
+    ldr r2, [sp, 0xC]\n\
+    ldr r3, [sp, 0x10]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _08114AA6\n\
+    b _08114D4C\n\
+_08114AA6:\n\
+    adds r6, 0x1\n\
+    cmp r6, r5\n\
+    blt _08114A86\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114AB0: .4byte 0x000070c4\n\
+_08114AB4: .4byte 0x000090c4\n\
+_08114AB8: .4byte 0x000038c4\n\
+_08114ABC: .4byte 0x000028c4\n\
+_08114AC0:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r4, _08114B30 @ =0x02014800\n\
+    lsls r0, r3, 1\n\
+    ldr r5, [sp]\n\
+    lsls r1, r5, 6\n\
+    adds r0, r1\n\
+    ldr r1, _08114B34 @ =0x000070c4\n\
+    adds r2, r4, r1\n\
+    adds r2, r0, r2\n\
+    ldr r5, _08114B38 @ =0x000090c4\n\
+    adds r1, r4, r5\n\
+    adds r0, r1\n\
+    ldrh r1, [r0]\n\
+    ldrh r0, [r2]\n\
+    adds r1, r0\n\
+    movs r0, 0xFF\n\
+    lsls r0, 8\n\
+    ands r0, r1\n\
+    lsrs r5, r0, 8\n\
+    movs r0, 0xFF\n\
+    ands r1, r0\n\
+    strh r1, [r2]\n\
+    movs r6, 0\n\
+    ldr r1, [sp, 0x4]\n\
+    cmp r1, r5\n\
+    blt _08114AF8\n\
+    b _08114D76\n\
+_08114AF8:\n\
+    mov r9, r4\n\
+    mov r2, r8\n\
+    adds r7, r3, r2\n\
+    ldr r0, _08114B3C @ =0x000038c4\n\
+    add r0, r9\n\
+    adds r4, r7, r0\n\
+    ldr r0, _08114B40 @ =0x000028c4\n\
+    add r0, r9\n\
+    adds r2, r7, r0\n\
+_08114B0A:\n\
+    ldrb r0, [r4]\n\
+    ldrb r1, [r2]\n\
+    cmp r0, r1\n\
+    bne _08114B14\n\
+    b _08114D5C\n\
+_08114B14:\n\
+    adds r1, r0, 0\n\
+    ldr r0, [sp]\n\
+    str r2, [sp, 0xC]\n\
+    bl sub_8114DF0\n\
+    ldrb r0, [r4]\n\
+    adds r0, 0x1\n\
+    strb r0, [r4]\n\
+    adds r6, 0x1\n\
+    ldr r2, [sp, 0xC]\n\
+    cmp r6, r5\n\
+    blt _08114B0A\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114B30: .4byte 0x02014800\n\
+_08114B34: .4byte 0x000070c4\n\
+_08114B38: .4byte 0x000090c4\n\
+_08114B3C: .4byte 0x000038c4\n\
+_08114B40: .4byte 0x000028c4\n\
+_08114B44:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r5, _08114B70 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114B74 @ =0x000038c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _08114B64\n\
+    b _08114D76\n\
+_08114B64:\n\
+    ldr r2, _08114B78 @ =0x000008c4\n\
+    adds r0, r5, r2\n\
+    adds r0, r4, r0\n\
+    movs r1, 0x9\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114B70: .4byte 0x02014800\n\
+_08114B74: .4byte 0x000038c4\n\
+_08114B78: .4byte 0x000008c4\n\
+_08114B7C:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _08114BA8 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114BAC @ =0x000038c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _08114B9C\n\
+    b _08114D76\n\
+_08114B9C:\n\
+    ldr r2, _08114BB0 @ =0x000008c4\n\
+    adds r0, r5, r2\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xA\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114BA8: .4byte 0x02014800\n\
+_08114BAC: .4byte 0x000038c4\n\
+_08114BB0: .4byte 0x000008c4\n\
+_08114BB4:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _08114BE0 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114BE4 @ =0x000038c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _08114BD4\n\
+    b _08114D76\n\
+_08114BD4:\n\
+    ldr r2, _08114BE8 @ =0x000008c4\n\
+    adds r0, r5, r2\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xB\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114BE0: .4byte 0x02014800\n\
+_08114BE4: .4byte 0x000038c4\n\
+_08114BE8: .4byte 0x000008c4\n\
+_08114BEC:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r5, _08114C18 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r4, r3, r0\n\
+    ldr r1, _08114C1C @ =0x000038c4\n\
+    adds r0, r5, r1\n\
+    adds r0, r4, r0\n\
+    ldrb r1, [r0]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114E48\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _08114C0C\n\
+    b _08114D76\n\
+_08114C0C:\n\
+    ldr r2, _08114C20 @ =0x000008c4\n\
+    adds r0, r5, r2\n\
+    adds r0, r4, r0\n\
+    movs r1, 0xC\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114C18: .4byte 0x02014800\n\
+_08114C1C: .4byte 0x000038c4\n\
+_08114C20: .4byte 0x000008c4\n\
+_08114C24:\n\
+    movs r4, 0\n\
+    str r4, [sp, 0x4]\n\
+    ldr r6, _08114C58 @ =0x02014800\n\
+    mov r0, r8\n\
+    adds r5, r3, r0\n\
+    ldr r1, _08114C5C @ =0x000038c4\n\
+    adds r4, r6, r1\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114DB4\n\
+    ldr r2, _08114C60 @ =0x000028c4\n\
+    adds r0, r6, r2\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    bne _08114C68\n\
+    ldr r4, _08114C64 @ =0x000008c4\n\
+    adds r0, r6, r4\n\
+    adds r0, r5, r0\n\
+    mov r5, sp\n\
+    ldrb r5, [r5, 0x4]\n\
+    strb r5, [r0]\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114C58: .4byte 0x02014800\n\
+_08114C5C: .4byte 0x000038c4\n\
+_08114C60: .4byte 0x000028c4\n\
+_08114C64: .4byte 0x000008c4\n\
+_08114C68:\n\
+    ldr r1, _08114C74 @ =0x000008c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x1\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114C74: .4byte 0x000008c4\n\
+_08114C78:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r6, _08114CA8 @ =0x02014800\n\
+    mov r4, r8\n\
+    adds r5, r3, r4\n\
+    ldr r0, _08114CAC @ =0x000038c4\n\
+    adds r4, r6, r0\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114DF0\n\
+    ldr r1, _08114CB0 @ =0x000028c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    beq _08114D1E\n\
+    ldr r1, _08114CB4 @ =0x000008c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x2\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114CA8: .4byte 0x02014800\n\
+_08114CAC: .4byte 0x000038c4\n\
+_08114CB0: .4byte 0x000028c4\n\
+_08114CB4: .4byte 0x000008c4\n\
+_08114CB8:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r6, _08114CE8 @ =0x02014800\n\
+    mov r4, r8\n\
+    adds r5, r3, r4\n\
+    ldr r0, _08114CEC @ =0x000038c4\n\
+    adds r4, r6, r0\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114DB4\n\
+    ldr r1, _08114CF0 @ =0x000028c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    beq _08114D1E\n\
+    ldr r1, _08114CF4 @ =0x000008c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x3\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114CE8: .4byte 0x02014800\n\
+_08114CEC: .4byte 0x000038c4\n\
+_08114CF0: .4byte 0x000028c4\n\
+_08114CF4: .4byte 0x000008c4\n\
+_08114CF8:\n\
+    movs r2, 0\n\
+    str r2, [sp, 0x4]\n\
+    ldr r6, _08114D2C @ =0x02014800\n\
+    mov r4, r8\n\
+    adds r5, r3, r4\n\
+    ldr r0, _08114D30 @ =0x000038c4\n\
+    adds r4, r6, r0\n\
+    adds r4, r5, r4\n\
+    ldrb r1, [r4]\n\
+    ldr r0, [sp]\n\
+    bl sub_8114DF0\n\
+    ldr r1, _08114D34 @ =0x000028c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    ldrb r1, [r4]\n\
+    ldrb r0, [r0]\n\
+    cmp r1, r0\n\
+    bne _08114D6C\n\
+_08114D1E:\n\
+    ldr r2, _08114D38 @ =0x000008c4\n\
+    adds r0, r6, r2\n\
+    adds r0, r5, r0\n\
+    mov r4, sp\n\
+    ldrb r4, [r4, 0x4]\n\
+    strb r4, [r0]\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114D2C: .4byte 0x02014800\n\
+_08114D30: .4byte 0x000038c4\n\
+_08114D34: .4byte 0x000028c4\n\
+_08114D38: .4byte 0x000008c4\n\
+_08114D3C:\n\
+    ldr r0, _08114D48 @ =0x000008c4\n\
+    add r0, r9\n\
+    adds r0, r7, r0\n\
+    movs r1, 0\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114D48: .4byte 0x000008c4\n\
+_08114D4C:\n\
+    ldr r0, _08114D58 @ =0x000008c4\n\
+    add r0, r9\n\
+    adds r0, r7, r0\n\
+    strb r3, [r0]\n\
+    b _08114D76\n\
+    .align 2, 0\n\
+_08114D58: .4byte 0x000008c4\n\
+_08114D5C:\n\
+    ldr r0, _08114D68 @ =0x000008c4\n\
+    add r0, r9\n\
+    adds r0, r7, r0\n\
+    movs r1, 0\n\
+    b _08114D74\n\
+    .align 2, 0\n\
+_08114D68: .4byte 0x000008c4\n\
+_08114D6C:\n\
+    ldr r1, _08114DAC @ =0x000008c4\n\
+    adds r0, r6, r1\n\
+    adds r0, r5, r0\n\
+    movs r1, 0x4\n\
+_08114D74:\n\
+    strb r1, [r0]\n\
+_08114D76:\n\
+    mov r3, r10\n\
+    ldr r2, _08114DB0 @ =0x02014800\n\
+    adds r0, r2, 0\n\
+    adds r0, 0x84\n\
+    ldr r4, [sp]\n\
+    adds r0, r4, r0\n\
+    adds r4, r2, 0\n\
+_08114D84:\n\
+    ldrb r0, [r0]\n\
+    cmp r3, r0\n\
+    bge _08114D8E\n\
+    bl _08114410\n\
+_08114D8E:\n\
+    ldr r5, [sp, 0x8]\n\
+    str r5, [sp]\n\
+    cmp r5, 0x3F\n\
+    bgt _08114D9A\n\
+    bl _081143F2\n\
+_08114D9A:\n\
+    ldr r0, [sp, 0x4]\n\
+    add sp, 0x14\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .align 2, 0\n\
+_08114DAC: .4byte 0x000008c4\n\
+_08114DB0: .4byte 0x02014800\n\
+        .syntax divided");
+}
+
+void sub_8114DB4(u32 a, u8 b)
+{
+    u8 *r2 = sEvoInfo.unk40C4[a][b / 2];
+
+    if (b % 2 != 0)
+        *r2 |= 0xF0;
+    else
+        *r2 |= 0x0F;
+}
+
+void sub_8114DF0(u32 a, u8 b)
+{
+    u8 *r2 = sEvoInfo.unk40C4[a][b / 2];
+    u8 *r1 = r2 + 0x6000;
+
+    if (b % 2 != 0)
+    {
+        if (!(*r1 & 0xF0))
+            *r2 &= 0x0F;
+    }
+    else
+    {
+        if (!(*r1 & 0x0F))
+            *r2 &= 0xF0;
+    }
+}
+
+__attribute__((naked))
+void sub_8114E48()
+{
+    asm(".syntax unified\n\
+        push {r4-r7,lr}\n\
+    adds r4, r0, 0\n\
+    lsls r1, 24\n\
+    lsrs r6, r1, 24\n\
+    ldr r1, _08114E6C @ =0x02014800\n\
+    ldr r2, _08114E70 @ =0x0000a0c4\n\
+    adds r0, r1, r2\n\
+    ldrb r0, [r0]\n\
+    adds r5, r1, 0\n\
+    cmp r0, 0\n\
+    bne _08114E60\n\
+    b _08114F5E\n\
+_08114E60:\n\
+    movs r1, 0\n\
+    movs r3, 0\n\
+    cmp r4, 0\n\
+    bne _08114E74\n\
+    movs r1, 0x1\n\
+    b _08114EA6\n\
+    .align 2, 0\n\
+_08114E6C: .4byte 0x02014800\n\
+_08114E70: .4byte 0x0000a0c4\n\
+_08114E74:\n\
+    subs r0, r4, 0x1\n\
+    lsls r0, 5\n\
+    adds r2, r3, r0\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08114EA6\n\
+    ldr r7, _08114EC4 @ =0x000008c4\n\
+    adds r0, r5, r7\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08114EA6\n\
+    adds r3, 0x1\n\
+    cmp r3, 0x1F\n\
+    bgt _08114EA6\n\
+    cmp r4, 0\n\
+    bne _08114E74\n\
+    lsls r0, r1, 24\n\
+    movs r1, 0x80\n\
+    lsls r1, 17\n\
+    adds r0, r1\n\
+    lsrs r1, r0, 24\n\
+_08114EA6:\n\
+    cmp r3, 0x20\n\
+    bne _08114EB4\n\
+    lsls r0, r1, 24\n\
+    movs r2, 0x80\n\
+    lsls r2, 17\n\
+    adds r0, r2\n\
+    lsrs r1, r0, 24\n\
+_08114EB4:\n\
+    movs r3, 0\n\
+    cmp r4, 0x3F\n\
+    bne _08114EC8\n\
+    lsls r0, r1, 24\n\
+    movs r7, 0x80\n\
+    lsls r7, 17\n\
+    adds r0, r7\n\
+    b _08114EF8\n\
+    .align 2, 0\n\
+_08114EC4: .4byte 0x000008c4\n\
+_08114EC8:\n\
+    adds r0, r4, 0x1\n\
+    lsls r0, 5\n\
+    adds r2, r3, r0\n\
+    adds r0, r5, 0\n\
+    adds r0, 0xC4\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08114EFA\n\
+    ldr r7, _08114F64 @ =0x000008c4\n\
+    adds r0, r5, r7\n\
+    adds r0, r2, r0\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08114EFA\n\
+    adds r3, 0x1\n\
+    cmp r3, 0x1F\n\
+    bgt _08114EFA\n\
+    cmp r4, 0x3F\n\
+    bne _08114EC8\n\
+    lsls r0, r1, 24\n\
+    movs r1, 0x80\n\
+    lsls r1, 17\n\
+    adds r0, r1\n\
+_08114EF8:\n\
+    lsrs r1, r0, 24\n\
+_08114EFA:\n\
+    cmp r3, 0x20\n\
+    bne _08114F08\n\
+    lsls r0, r1, 24\n\
+    movs r2, 0x80\n\
+    lsls r2, 17\n\
+    adds r0, r2\n\
+    lsrs r1, r0, 24\n\
+_08114F08:\n\
+    cmp r1, 0x2\n\
+    beq _08114F5E\n\
+    subs r0, r6, 0x2\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+    cmp r0, 0\n\
+    bge _08114F18\n\
+    movs r1, 0\n\
+_08114F18:\n\
+    adds r0, r6, 0x2\n\
+    lsls r0, 24\n\
+    lsrs r2, r0, 24\n\
+    asrs r0, 24\n\
+    cmp r0, 0x3F\n\
+    ble _08114F26\n\
+    movs r2, 0x3F\n\
+_08114F26:\n\
+    lsls r1, 24\n\
+    asrs r3, r1, 24\n\
+    lsls r0, r2, 24\n\
+    asrs r2, r0, 24\n\
+    adds r6, r1, 0\n\
+    adds r7, r0, 0\n\
+    cmp r3, r2\n\
+    bge _08114F7C\n\
+    cmp r4, 0\n\
+    beq _08114F7C\n\
+    subs r0, r4, 0x1\n\
+    lsls r5, r0, 7\n\
+    ldr r0, _08114F68 @ =0x020188c4\n\
+    mov r12, r0\n\
+_08114F42:\n\
+    asrs r0, r3, 1\n\
+    lsls r0, 2\n\
+    adds r0, r5\n\
+    add r0, r12\n\
+    ldr r1, [r0]\n\
+    movs r0, 0x1\n\
+    ands r0, r3\n\
+    cmp r0, 0\n\
+    beq _08114F6C\n\
+    ldrb r1, [r1]\n\
+    movs r0, 0xF0\n\
+_08114F58:\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08114F72\n\
+_08114F5E:\n\
+    movs r0, 0x1\n\
+    b _08114FCA\n\
+    .align 2, 0\n\
+_08114F64: .4byte 0x000008c4\n\
+_08114F68: .4byte 0x020188c4\n\
+_08114F6C:\n\
+    ldrb r1, [r1]\n\
+    movs r0, 0xF\n\
+    b _08114F58\n\
+_08114F72:\n\
+    adds r3, 0x1\n\
+    cmp r3, r2\n\
+    bge _08114F7C\n\
+    cmp r4, 0\n\
+    bne _08114F42\n\
+_08114F7C:\n\
+    asrs r3, r6, 24\n\
+    asrs r1, r7, 24\n\
+    cmp r3, r1\n\
+    bge _08114FC8\n\
+    cmp r4, 0x3F\n\
+    beq _08114FC8\n\
+    adds r0, r4, 0x1\n\
+    lsls r5, r0, 7\n\
+    ldr r6, _08114FB0 @ =0x020188c4\n\
+    adds r2, r1, 0\n\
+_08114F90:\n\
+    asrs r0, r3, 1\n\
+    lsls r0, 2\n\
+    adds r0, r5\n\
+    adds r0, r6\n\
+    ldr r1, [r0]\n\
+    movs r0, 0x1\n\
+    ands r0, r3\n\
+    cmp r0, 0\n\
+    beq _08114FB4\n\
+    ldrb r1, [r1]\n\
+    movs r0, 0xF0\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _08114FBE\n\
+    b _08114F5E\n\
+    .align 2, 0\n\
+_08114FB0: .4byte 0x020188c4\n\
+_08114FB4:\n\
+    ldrb r1, [r1]\n\
+    movs r0, 0xF\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _08114F5E\n\
+_08114FBE:\n\
+    adds r3, 0x1\n\
+    cmp r3, r2\n\
+    bge _08114FC8\n\
+    cmp r4, 0x3F\n\
+    bne _08114F90\n\
+_08114FC8:\n\
+    movs r0, 0\n\
+_08114FCA:\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+        .syntax divided");
+}
+
+// Functions below are vblank callbacks and are used
+
+static void EvoDummyFunc(void)
+{
+
+}
+
+static void VBlankCB_EvolutionScene(void)
+{
+    REG_BG0CNT = BGCNT_SCREENBASE(24) | BGCNT_16COLOR | BGCNT_TXT256x256 | BGCNT_AFF512x512 | BGCNT_PRIORITY(3); // 0x9803
+    REG_BG0HOFS = gUnknown_030042A4;
+    REG_BG0VOFS = gUnknown_030042A0;
+    REG_BG1HOFS = gUnknown_030042C0;
+    REG_BG1VOFS = gUnknown_030041B4;
+    REG_BG2HOFS = gUnknown_03004288;
+    REG_BG2VOFS = gUnknown_03004280;
+    REG_BG3HOFS = gUnknown_030041B0;
+    REG_BG3VOFS = gUnknown_030041B8;
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_8089668();
+}
+
+static void VBlankCB_TradeEvolutionScene(void)
+{
+    REG_BG0HOFS = gUnknown_030042A4;
+    REG_BG0VOFS = gUnknown_030042A0;
+    REG_BG1HOFS = gUnknown_030042C0;
+    REG_BG1VOFS = gUnknown_030041B4;
+    REG_BG2HOFS = gUnknown_03004288;
+    REG_BG2VOFS = gUnknown_03004280;
+    REG_BG3HOFS = gUnknown_030041B0;
+    REG_BG3VOFS = gUnknown_030041B8;
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_8089668();
+}
+
+static void sub_81150D8(void)
+{
+    sub_814A880(200, 72 + (sEvoCursorPos * 16));
+}
+
+static void EvoDummyFunc2(void)
+{
+
+}
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index a8f6b6b9b..ff8e8504c 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -13,7 +13,7 @@
 #include "flags.h"
 #include "item_menu.h"
 #include "metatile_behavior.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "safari_zone.h"
 #include "script.h"
 #include "secret_base.h"
@@ -57,7 +57,7 @@ extern u8 gUnknown_081A4363[];
 extern u8 gUnknown_081C346A[];
 extern u8 gUnknown_081616E1[];
 extern u8 Event_WorldMap[];
-extern u8 Event_RunningShoesManual[];
+extern u8 S_RunningShoesManual[];
 extern u8 PictureBookShelfScript[];
 extern u8 BookshelfScript[];
 extern u8 PokemonCenterBookshelfScript[];
@@ -70,13 +70,13 @@ extern u8 gUnknown_0815F43A[];
 extern u8 gUnknown_0815F523[];
 extern u8 gUnknown_0815F528[];
 extern u8 UseSurfScript[];
-extern u8 UseWaterfallScript[];
-extern u8 CannotUseWaterfallScript[];
+extern u8 S_UseWaterfall[];
+extern u8 S_CannotUseWaterfall[];
 extern u8 UseDiveScript[];
-extern u8 UnderwaterUseDiveScript[];
-extern u8 GraniteCave_B1F_EventScript_1C6BC5[];
+extern u8 S_UseDiveUnderwater[];
+extern u8 S_FallDownHole[];
 extern u8 gUnknown_081A14B8[];
-extern u8 Event_EggHatch[];
+extern u8 S_EggHatch[];
 extern u8 gUnknown_0815FD0D[];
 extern u8 gUnknown_081C6BDE[];
 
@@ -391,7 +391,7 @@ static u8 *sub_8068500(struct MapPosition *position, u8 b, u8 c)
     if (MetatileBehavior_IsRegionMap(b) == TRUE)
         return Event_WorldMap;
     if (sub_805791C(b) == TRUE)
-        return Event_RunningShoesManual;
+        return S_RunningShoesManual;
     if (MetatileBehavior_IsPictureBookShelf(b) == TRUE)
         return PictureBookShelfScript;
     if (MetatileBehavior_IsBookShelf(b) == TRUE)
@@ -428,9 +428,9 @@ static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2)
     if (MetatileBehavior_IsWaterfall(b) == TRUE)
     {
         if (FlagGet(BADGE08_GET) == TRUE && IsPlayerSurfingNorth() == TRUE)
-            return UseWaterfallScript;
+            return S_UseWaterfall;
         else
-            return CannotUseWaterfallScript;
+            return S_CannotUseWaterfall;
     }
     return NULL;
 }
@@ -447,9 +447,9 @@ static bool32 sub_8068770(void)
 
 static bool32 sub_80687A4(void)
 {
-    if (FlagGet(BADGE07_GET) && gMapHeader.mapType == 5 && sub_8068F18() == 1)
+    if (FlagGet(BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_8068F18() == 1)
     {
-        ScriptContext1_SetupScript(UnderwaterUseDiveScript);
+        ScriptContext1_SetupScript(S_UseDiveUnderwater);
         return TRUE;
     }
     return FALSE;
@@ -485,7 +485,7 @@ bool8 sub_8068870(u16 a)
 {
     if (MetatileBehavior_IsCrackedFloorHole(a))
     {
-        ScriptContext1_SetupScript(GraniteCave_B1F_EventScript_1C6BC5);
+        ScriptContext1_SetupScript(S_FallDownHole);
         return TRUE;
     }
     return FALSE;
@@ -503,7 +503,7 @@ bool8 sub_8068894(void)
     if (sub_80422A0())
     {
         IncrementGameStat(13);
-        ScriptContext1_SetupScript(Event_EggHatch);
+        ScriptContext1_SetupScript(S_EggHatch);
         return TRUE;
     }
     if (SafariZoneTakeStep() == TRUE)
@@ -549,14 +549,14 @@ static bool8 overworld_poison_step(void)
 {
     u16 *ptr;
 
-    if (gMapHeader.mapType != 9)
+    if (gMapHeader.mapType != MAP_TYPE_SECRET_BASE)
     {
         ptr = GetVarPointer(VAR_POISON_STEP_COUNTER);
         (*ptr)++;
         (*ptr) %= 4;
         if (*ptr == 0)
         {
-            switch (overworld_poison())
+            switch (DoPoisonFieldEffect())
             {
             case 0:
                 return FALSE;
@@ -698,7 +698,7 @@ static void sub_8068C30(struct MapHeader *unused, s8 b, struct MapPosition *posi
 
         warp1_set_2(warpEvent->unk7, warpEvent->mapNum, warpEvent->mapGroup);
         sub_80535C4(position->x, position->y);
-        mapHeader = get_mapheader_by_bank_and_number(warpEvent->unk7, warpEvent->mapNum);
+        mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->unk7, warpEvent->mapNum);
         if (mapHeader->events->warps[warpEvent->mapGroup].mapNum == 0x7F)
             saved_warp2_set(mapHeader->events->warps[b].mapGroup, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, b);
     }
@@ -730,7 +730,7 @@ static bool8 map_warp_consider_2_to_inside(struct MapPosition *position, u16 b,
     return FALSE;
 }
 
-static s8 map_warp_check(struct MapHeader *mapHeader, u16 b, u16 c, u8 d)
+static s8 map_warp_check(struct MapHeader *mapHeader, u16 x, u16 y, u8 warpId)
 {
     s32 i;
     struct WarpEvent *warpEvent = mapHeader->events->warps;
@@ -738,9 +738,9 @@ static s8 map_warp_check(struct MapHeader *mapHeader, u16 b, u16 c, u8 d)
 
     for (i = 0; i < warpCount; i++, warpEvent++)
     {
-        if ((u16)warpEvent->x == b && (u16)warpEvent->y == c)
+        if ((u16)warpEvent->x == x && (u16)warpEvent->y == y)
         {
-            if ((u8)warpEvent->warpId == d || (u8)warpEvent->warpId == 0)
+            if ((u8)warpEvent->warpId == warpId || (u8)warpEvent->warpId == 0)
                 return i;
         }
     }
@@ -767,7 +767,7 @@ static u8 *trigger_activate(struct CoordEvent *coordEvent)
     return NULL;
 }
 
-static u8 *mapheader_trigger_activate_at(struct MapHeader *mapHeader, u16 b, u16 c, u8 d)
+static u8 *mapheader_trigger_activate_at(struct MapHeader *mapHeader, u16 x, u16 y, u8 d)
 {
     s32 i;
     struct CoordEvent *coordEvents = mapHeader->events->coordEvents;
@@ -776,7 +776,7 @@ static u8 *mapheader_trigger_activate_at(struct MapHeader *mapHeader, u16 b, u16
 
     for (i = 0; i < coordEventCount; i++)
     {
-        if ((u16)coordEvents[i].x == b && (u16)coordEvents[i].y == c)
+        if ((u16)coordEvents[i].x == x && (u16)coordEvents[i].y == y)
         {
             if (coordEvents[i].unk4 == d || coordEvents[i].unk4 == 0)
             {
@@ -813,7 +813,7 @@ static struct BgEvent *FindInvisibleMapObjectByPosition(struct MapHeader *mapHea
 
 int dive_warp(struct MapPosition *position, u16 b)
 {
-    if (gMapHeader.mapType == 5 && sub_805750C(b) == 0)
+    if (gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_805750C(b) == 0)
     {
         if (sub_80538B0(position->x - 7, position->y - 7))
         {
@@ -843,7 +843,7 @@ u8 sub_8068F18(void)
 
     PlayerGetDestCoords(&x, &y);
     r5 = MapGridGetMetatileBehaviorAt(x, y);
-    if (gMapHeader.mapType == 5 && sub_805750C(r5) == 0)
+    if (gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_805750C(r5) == 0)
     {
         if (sub_80538B0(x - 7, y - 7) == TRUE)
             return 1;
diff --git a/src/field_door.c b/src/field_door.c
index 791ed4c94..ab46f0696 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -3,6 +3,7 @@
 #include "field_camera.h"
 #include "fieldmap.h"
 #include "metatile_behavior.h"
+#include "songs.h"
 #include "task.h"
 
 extern struct DoorAnimFrame gDoorOpenAnimFrames[];
@@ -212,10 +213,10 @@ bool8 FieldIsDoorAnimationRunning(void)
     return FuncIsActiveTask(Task_AnimateDoor);
 }
 
-u32 sub_8058790(u32 x, u32 y)
+u32 GetDoorSoundEffect(u32 x, u32 y)
 {
     if (cur_mapdata_get_door_x2_at(gDoorAnimGraphicsTable, x, y) == 0)
-        return 8;
+        return SE_DOOR;
     else
-        return 18;
+        return SE_JIDO_DOA;
 }
diff --git a/src/field_effect.c b/src/field_effect.c
index cffed2614..0625e9d18 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -9,7 +9,7 @@
 #include "menu.h"
 #include "palette.h"
 #include "text.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "task.h"
 #include "sound.h"
 #include "songs.h"
@@ -28,7 +28,7 @@
 
 #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
 
-EWRAM_DATA u32 gUnknown_0202FF84[8] = {0};
+EWRAM_DATA u32 gFieldEffectArguments[8] = {0};
 
 const u32 gSpriteImage_839DC14[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
 const u16 gBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
@@ -1203,10 +1203,10 @@ void task00_8084310(u8 taskId)
         {
             return;
         }
-        gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-        if ((int)gUnknown_0202FF84[0] > 5)
+        gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+        if ((int)gFieldEffectArguments[0] > 5)
         {
-            gUnknown_0202FF84[0] = 0;
+            gFieldEffectArguments[0] = 0;
         }
         FieldEffectStart(FLDEFF_USE_FLY);
         task->data[0]++;
@@ -1665,7 +1665,7 @@ bool8 FldEff_UseWaterfall(void)
 {
     u8 taskId;
     taskId = CreateTask(sub_8086F64, 0xff);
-    gTasks[taskId].data[1] = gUnknown_0202FF84[0];
+    gTasks[taskId].data[1] = gFieldEffectArguments[0];
     sub_8086F64(taskId);
     return FALSE;
 }
@@ -1689,7 +1689,7 @@ bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObjec
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject))
     {
         FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
-        gUnknown_0202FF84[0] = task->data[1];
+        gFieldEffectArguments[0] = task->data[1];
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         task->data[0]++;
     }
@@ -1738,8 +1738,8 @@ bool8 FldEff_UseDive(void)
 {
     u8 taskId;
     taskId = CreateTask(Task_Dive, 0xff);
-    gTasks[taskId].data[15] = gUnknown_0202FF84[0];
-    gTasks[taskId].data[14] = gUnknown_0202FF84[1];
+    gTasks[taskId].data[15] = gFieldEffectArguments[0];
+    gTasks[taskId].data[14] = gFieldEffectArguments[1];
     Task_Dive(taskId);
     return FALSE;
 }
@@ -1759,7 +1759,7 @@ bool8 sub_8087124(struct Task *task)
 bool8 dive_2_unknown(struct Task *task)
 {
     ScriptContext2_Enable();
-    gUnknown_0202FF84[0] = task->data[15];
+    gFieldEffectArguments[0] = task->data[15];
     FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
     task->data[0]++;
     return FALSE;
@@ -1820,10 +1820,10 @@ bool8 sub_8087298(struct Task *task, struct MapObject *mapObject, struct Sprite
 {
     sprite->pos2.y = 0;
     task->data[3] = 1;
-    gUnknown_0202FF84[0] = mapObject->coords2.x;
-    gUnknown_0202FF84[1] = mapObject->coords2.y;
-    gUnknown_0202FF84[2] = sprite->subpriority - 1;
-    gUnknown_0202FF84[3] = sprite->oam.priority;
+    gFieldEffectArguments[0] = mapObject->coords2.x;
+    gFieldEffectArguments[1] = mapObject->coords2.y;
+    gFieldEffectArguments[2] = sprite->subpriority - 1;
+    gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
     PlaySE(SE_W153);
     task->data[0]++;
@@ -1924,10 +1924,10 @@ bool8 sub_80874FC(struct Task *task, struct MapObject *mapObject, struct Sprite
 {
     if (sub_807D770())
     {
-        gUnknown_0202FF84[0] = mapObject->coords2.x;
-        gUnknown_0202FF84[1] = mapObject->coords2.y;
-        gUnknown_0202FF84[2] = sprite->subpriority - 1;
-        gUnknown_0202FF84[3] = sprite->oam.priority;
+        gFieldEffectArguments[0] = mapObject->coords2.x;
+        gFieldEffectArguments[1] = mapObject->coords2.y;
+        gFieldEffectArguments[2] = sprite->subpriority - 1;
+        gFieldEffectArguments[3] = sprite->oam.priority;
         task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
         task->data[0]++;
     }
@@ -1966,9 +1966,9 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36]
 u8 FldEff_LavaridgeGymWarp(void)
 {
     u8 spriteId;
-    sub_8060470((s16 *)&gUnknown_0202FF84[0], (s16 *)&gUnknown_0202FF84[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
-    gSprites[spriteId].oam.priority = gUnknown_0202FF84[3];
+    sub_8060470((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    gSprites[spriteId].oam.priority = gFieldEffectArguments[3];
     gSprites[spriteId].coordOffsetEnabled = 1;
     return spriteId;
 }
@@ -2009,10 +2009,10 @@ bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite
     {
         if (task->data[1] > 3)
         {
-            gUnknown_0202FF84[0] = mapObject->coords2.x;
-            gUnknown_0202FF84[1] = mapObject->coords2.y;
-            gUnknown_0202FF84[2] = sprite->subpriority - 1;
-            gUnknown_0202FF84[3] = sprite->oam.priority;
+            gFieldEffectArguments[0] = mapObject->coords2.x;
+            gFieldEffectArguments[1] = mapObject->coords2.y;
+            gFieldEffectArguments[2] = sprite->subpriority - 1;
+            gFieldEffectArguments[3] = sprite->oam.priority;
             task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
             task->data[0]++;
         } else
@@ -2064,9 +2064,9 @@ bool8 sub_80877D4(struct Task *task, struct MapObject *mapObject, struct Sprite
 u8 FldEff_PopOutOfAsh(void)
 {
     u8 spriteId;
-    sub_8060470((s16 *)&gUnknown_0202FF84[0], (s16 *)&gUnknown_0202FF84[1], 8, 8);
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
-    gSprites[spriteId].oam.priority = gUnknown_0202FF84[3];
+    sub_8060470((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    gSprites[spriteId].oam.priority = gFieldEffectArguments[3];
     gSprites[spriteId].coordOffsetEnabled = 1;
     return spriteId;
 }
@@ -2385,26 +2385,26 @@ void sub_8088890(struct Sprite *);
 bool8 FldEff_FieldMoveShowMon(void)
 {
     u8 taskId;
-    if (is_light_level_1_2_3_5_or_6(sav1_map_get_light_level()) == TRUE)
+    if (is_map_type_1_2_3_5_or_6(Overworld_GetMapTypeOfSaveblockLocation()) == TRUE)
     {
         taskId = CreateTask(sub_8088120, 0xff);
     } else
     {
         taskId = CreateTask(sub_808847C, 0xff);
     }
-    gTasks[taskId].data[15] = sub_8088830(gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
+    gTasks[taskId].data[15] = sub_8088830(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
     return FALSE;
 }
 
 bool8 FldEff_FieldMoveShowMonInit(void)
 {
     struct Pokemon *pokemon;
-    u32 flag = gUnknown_0202FF84[0] & 0x80000000;
-    pokemon = &gPlayerParty[(u8)gUnknown_0202FF84[0]];
-    gUnknown_0202FF84[0] = GetMonData(pokemon, MON_DATA_SPECIES);
-    gUnknown_0202FF84[1] = GetMonData(pokemon, MON_DATA_OT_ID);
-    gUnknown_0202FF84[2] = GetMonData(pokemon, MON_DATA_PERSONALITY);
-    gUnknown_0202FF84[0] |= flag;
+    u32 flag = gFieldEffectArguments[0] & 0x80000000;
+    pokemon = &gPlayerParty[(u8)gFieldEffectArguments[0]];
+    gFieldEffectArguments[0] = GetMonData(pokemon, MON_DATA_SPECIES);
+    gFieldEffectArguments[1] = GetMonData(pokemon, MON_DATA_OT_ID);
+    gFieldEffectArguments[2] = GetMonData(pokemon, MON_DATA_PERSONALITY);
+    gFieldEffectArguments[0] |= flag;
     FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON);
     FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
     return FALSE;
@@ -2879,9 +2879,9 @@ u8 FldEff_UseSurf(void)
 {
     u8 taskId;
     taskId = CreateTask(sub_8088954, 0xff);
-    gTasks[taskId].data[15] = gUnknown_0202FF84[0];
+    gTasks[taskId].data[15] = gFieldEffectArguments[0];
     sav1_reset_battle_music_maybe();
-    sub_8053FB0(0x016d);
+    Overworld_ChangeMusicTo(0x016d);
     return FALSE;
 }
 
@@ -2919,7 +2919,7 @@ void sub_8088A30(struct Task *task)
     mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
     if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject))
     {
-        gUnknown_0202FF84[0] = task->data[15] | 0x80000000;
+        gFieldEffectArguments[0] = task->data[15] | 0x80000000;
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         task->data[0]++;
     }
@@ -2934,9 +2934,9 @@ void sub_8088A78(struct Task *task)
         sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(3));
         FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
         FieldObjectSetSpecialAnim(mapObject, sub_80608D0(mapObject->placeholder18));
-        gUnknown_0202FF84[0] = task->data[1];
-        gUnknown_0202FF84[1] = task->data[2];
-        gUnknown_0202FF84[2] = gPlayerAvatar.mapObjectId;
+        gFieldEffectArguments[0] = task->data[1];
+        gFieldEffectArguments[1] = task->data[2];
+        gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_SURF_BLOB);
         task->data[0]++;
     }
@@ -2970,7 +2970,7 @@ u8 FldEff_NPCFlyOut(void)
     sprite->oam.paletteNum = 0;
     sprite->oam.priority = 1;
     sprite->callback = sub_8088BC4;
-    sprite->data1 = gUnknown_0202FF84[0];
+    sprite->data1 = gFieldEffectArguments[0];
     PlaySE(SE_W019);
     return spriteId;
 }
@@ -3009,7 +3009,7 @@ u8 FldEff_UseFly(void)
 {
     u8 taskId;
     taskId = CreateTask(sub_8088C70, 0xfe);
-    gTasks[taskId].data[1] = gUnknown_0202FF84[0];
+    gTasks[taskId].data[1] = gFieldEffectArguments[0];
     return 0;
 }
 
@@ -3040,7 +3040,7 @@ void sub_8088CF8(struct Task *task)
     if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
     {
         task->data[0]++;
-        gUnknown_0202FF84[0] = task->data[1];
+        gFieldEffectArguments[0] = task->data[1];
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
     }
 }
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index e614d899a..d95177821 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -15,7 +15,7 @@
 #include "map_obj_lock.h"
 #include "metatile_behavior.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
@@ -40,8 +40,8 @@ void palette_bg_fill_black(void)
 
 void pal_fill_for_map_transition(void)
 {
-    u8 map_light = get_map_light_from_warp0();
-    switch (fade_type_for_given_maplight_pair(map_light, sav1_map_get_light_level()))
+    u8 map_light = get_map_type_from_warp0();
+    switch (fade_type_for_given_maplight_pair(map_light, Overworld_GetMapTypeOfSaveblockLocation()))
     {
     case 0:
         fade_screen(0, 0);
@@ -61,7 +61,7 @@ void pal_fill_black(void)
 
 void fade_8080918(void)
 {
-    u8 light_level = sav1_map_get_light_level();
+    u8 light_level = Overworld_GetMapTypeOfSaveblockLocation();
     switch (sub_810CDB8(light_level, warp1_get_mapheader()->mapType))
     {
     case 0:
@@ -547,7 +547,7 @@ void sub_808115C(u8 taskId)
     case 0:
         FreezeMapObjects();
         PlayerGetDestCoords(x, y);
-        PlaySE(sub_8058790(*x, *y - 1));
+        PlaySE(GetDoorSoundEffect(*x, *y - 1));
         task->data[1] = FieldAnimateDoorOpen(*x, *y - 1);
         task->data[0] = 1;
         break;
diff --git a/src/field_ground_effect.c b/src/field_ground_effect.c
index 42862d0ff..2a398ba22 100644
--- a/src/field_ground_effect.c
+++ b/src/field_ground_effect.c
@@ -1,11 +1,38 @@
 #include "global.h"
 #include "field_ground_effect.h"
+#include "field_effect.h"
+#include "field_effect_helpers.h"
+#include "field_map_obj_helpers.h"
 #include "fieldmap.h"
 #include "metatile_behavior.h"
 
-extern u32 gUnknown_08376008[];
+static void nullsub(struct MapObject *mapObj, struct Sprite *sprite, u8);
+static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Sprite *sprite, u8);
+static void DoTracksGroundEffect_BikeTireTracks(
+    struct MapObject *mapObj, struct Sprite *sprite, u8);
+void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite);
+void sub_8063E94(struct MapObject *mapObj, struct Sprite *sprite);
+void sub_8063EE0(struct MapObject *mapObj, struct Sprite *sprite);
+void sub_8063F2C(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_WaterReflection(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_IceReflection(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_FlowingWater(struct MapObject *mapObj, struct Sprite *sprite);
+void sub_8063FA0(struct MapObject *mapObj, struct Sprite *sprite);
+void sub_8063FCC(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_Ripple(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_StepOnPuddle(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_SandPile(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_JumpOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_JumpOnShallowWater(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_JumpOnWater(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_JumpLandingDust(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_ShortGrass(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_HotSprings(struct MapObject *mapObj, struct Sprite *sprite);
+void GroundEffect_Seaweed(struct MapObject *mapObj, struct Sprite *sprite);
+u8 GetReflectionTypeByMetatileBehavior(u32 behavior);
 
-void GetAllGroundEffectFlags_OnSpawn(struct MapObject *mapObj, u32 *flags)
+static void GetAllGroundEffectFlags_OnSpawn(struct MapObject *mapObj, u32 *flags)
 {
     FieldObjectUpdateMetatileBehaviors(mapObj);
     GetGroundEffectFlags_Reflection(mapObj, flags);
@@ -17,7 +44,7 @@ void GetAllGroundEffectFlags_OnSpawn(struct MapObject *mapObj, u32 *flags)
     GetGroundEffectFlags_HotSprings(mapObj, flags);
 }
 
-void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *mapObj, u32 *flags)
+static void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *mapObj, u32 *flags)
 {
     FieldObjectUpdateMetatileBehaviors(mapObj);
     GetGroundEffectFlags_Reflection(mapObj, flags);
@@ -31,7 +58,7 @@ void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *mapObj, u32 *flags)
     GetGroundEffectFlags_HotSprings(mapObj, flags);
 }
 
-void GetAllGroundEffectFlags_OnFinishStep(struct MapObject *mapObj, u32 *flags)
+static void GetAllGroundEffectFlags_OnFinishStep(struct MapObject *mapObj, u32 *flags)
 {
     FieldObjectUpdateMetatileBehaviors(mapObj);
     GetGroundEffectFlags_ShallowFlowingWater(mapObj, flags);
@@ -101,7 +128,7 @@ void GetGroundEffectFlags_Tracks(struct MapObject *mapObj, u32 *flags)
         *flags |= 0x100;
     }
     else if (MetatileBehavior_IsSandOrDeepSand(mapObj->mapobj_unk_1F)
-     || MetatileBehavior_IsUnusedFootprintMetatile(mapObj->mapobj_unk_1F))
+             || MetatileBehavior_IsUnusedFootprintMetatile(mapObj->mapobj_unk_1F))
     {
         *flags |= 0x80;
     }
@@ -110,7 +137,7 @@ void GetGroundEffectFlags_Tracks(struct MapObject *mapObj, u32 *flags)
 void GetGroundEffectFlags_SandPile(struct MapObject *mapObj, u32 *flags)
 {
     if (MetatileBehavior_IsDeepSand(mapObj->mapobj_unk_1E)
-     && MetatileBehavior_IsDeepSand(mapObj->mapobj_unk_1F))
+        && MetatileBehavior_IsDeepSand(mapObj->mapobj_unk_1F))
     {
         if (!mapObj->mapobj_bit_20)
         {
@@ -127,8 +154,10 @@ void GetGroundEffectFlags_SandPile(struct MapObject *mapObj, u32 *flags)
 
 void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *mapObj, u32 *flags)
 {
-    if ((MetatileBehavior_IsShallowFlowingWater(mapObj->mapobj_unk_1E) && MetatileBehavior_IsShallowFlowingWater(mapObj->mapobj_unk_1F))
-     || (MetatileBehavior_IsPacifidlogLog(mapObj->mapobj_unk_1E) && MetatileBehavior_IsPacifidlogLog(mapObj->mapobj_unk_1F)))
+    if ((MetatileBehavior_IsShallowFlowingWater(mapObj->mapobj_unk_1E)
+         && MetatileBehavior_IsShallowFlowingWater(mapObj->mapobj_unk_1F))
+        || (MetatileBehavior_IsPacifidlogLog(mapObj->mapobj_unk_1E)
+            && MetatileBehavior_IsPacifidlogLog(mapObj->mapobj_unk_1F)))
     {
         if (!mapObj->mapobj_bit_19)
         {
@@ -146,7 +175,7 @@ void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *mapObj, u32 *fla
 void GetGroundEffectFlags_Puddle(struct MapObject *mapObj, u32 *flags)
 {
     if (MetatileBehavior_IsPuddle(mapObj->mapobj_unk_1E)
-     && MetatileBehavior_IsPuddle(mapObj->mapobj_unk_1F))
+        && MetatileBehavior_IsPuddle(mapObj->mapobj_unk_1F))
     {
         *flags |= 0x400;
     }
@@ -161,7 +190,7 @@ void GetGroundEffectFlags_Ripple(struct MapObject *mapObj, u32 *flags)
 void GetGroundEffectFlags_ShortGrass(struct MapObject *mapObj, u32 *flags)
 {
     if (MetatileBehavior_IsShortGrass(mapObj->mapobj_unk_1E)
-     && MetatileBehavior_IsShortGrass(mapObj->mapobj_unk_1F))
+        && MetatileBehavior_IsShortGrass(mapObj->mapobj_unk_1F))
     {
         if (!mapObj->mapobj_bit_18)
         {
@@ -179,7 +208,7 @@ void GetGroundEffectFlags_ShortGrass(struct MapObject *mapObj, u32 *flags)
 void GetGroundEffectFlags_HotSprings(struct MapObject *mapObj, u32 *flags)
 {
     if (MetatileBehavior_IsHotSprings(mapObj->mapobj_unk_1E)
-     && MetatileBehavior_IsHotSprings(mapObj->mapobj_unk_1F))
+        && MetatileBehavior_IsHotSprings(mapObj->mapobj_unk_1F))
     {
         if (!mapObj->mapobj_bit_21)
         {
@@ -204,8 +233,7 @@ void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags)
 {
     typedef bool8 (*MetatileFunc)(u8);
 
-    static const MetatileFunc metatileFuncs[] =
-    {
+    static const MetatileFunc metatileFuncs[] = {
         MetatileBehavior_IsTallGrass,
         MetatileBehavior_IsLongGrass,
         MetatileBehavior_IsPuddle,
@@ -214,14 +242,13 @@ void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags)
         MetatileBehavior_IsATile,
     };
 
-    static const u32 jumpLandingFlags[] =
-    {
-        0x00001000,  // Landing in tall grass
-        0x00002000,  // Landing in long grass
-        0x00004000,  // Landing on puddle
-        0x00008000,  // Landing on surfable water or underwater
-        0x00004000,  // Landing on shallow flowing water
-        0x00010000,  // Landing on any other type of ground
+    static const u32 jumpLandingFlags[] = {
+        0x00001000, // Landing in tall grass
+        0x00002000, // Landing in long grass
+        0x00004000, // Landing on puddle
+        0x00008000, // Landing on surfable water or underwater
+        0x00004000, // Landing on shallow flowing water
+        0x00010000, // Landing on any other type of ground
     };
 
     if (mapObj->mapobj_bit_5 && !mapObj->mapobj_bit_25)
@@ -238,3 +265,529 @@ void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags)
         }
     }
 }
+
+u8 FieldObjectCheckForReflectiveSurface(struct MapObject *mapObj)
+{
+    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId);
+
+    // ceil div by tile width?
+    s16 width = (info->width + 8) >> 4;
+    s16 height = (info->height + 8) >> 4;
+    s16 i;
+    s16 j;
+    u8 result;
+    u8 b;
+    s16 one;
+
+#define RETURN_REFLECTION_TYPE_AT(x, y)              \
+    b = MapGridGetMetatileBehaviorAt(x, y);          \
+    result = GetReflectionTypeByMetatileBehavior(b); \
+    if (result != 0)                                 \
+        return result;
+
+    for (i = 0, one = 1; i < height; i++)
+    {
+        RETURN_REFLECTION_TYPE_AT(mapObj->coords2.x, mapObj->coords2.y + one + i)
+        RETURN_REFLECTION_TYPE_AT(mapObj->coords3.x, mapObj->coords3.y + one + i)
+        for (j = 1; j < width; j++)
+        {
+            RETURN_REFLECTION_TYPE_AT(mapObj->coords2.x + j, mapObj->coords2.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(mapObj->coords2.x - j, mapObj->coords2.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(mapObj->coords3.x + j, mapObj->coords3.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(mapObj->coords3.x - j, mapObj->coords3.y + one + i)
+        }
+    }
+    return 0;
+
+#undef RETURN_REFLECTION_TYPE_AT
+}
+
+u8 GetReflectionTypeByMetatileBehavior(u32 behavior)
+{
+    if (MetatileBehavior_IsIce(behavior))
+        return 1;
+    else if (MetatileBehavior_IsReflective(behavior))
+        return 2;
+    else
+        return 0;
+}
+
+u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z)
+{
+    static bool8 (*const unknown_08376040[])(u8) = {
+        MetatileBehavior_IsJumpSouth,
+        MetatileBehavior_IsJumpNorth,
+        MetatileBehavior_IsJumpWest,
+        MetatileBehavior_IsJumpEast,
+    };
+
+    u8 b;
+    u8 index = z;
+
+    if (index == 0)
+        return 0;
+    else if (index > 4)
+        index -= 4;
+
+    index--;
+    b = MapGridGetMetatileBehaviorAt(x, y);
+
+    if (unknown_08376040[index](b) == 1)
+        return index + 1;
+
+    return 0;
+}
+
+void FieldObjectSetSpriteOamTableForLongGrass(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    if (mapObj->mapobj_bit_4)
+        return;
+
+    if (!MetatileBehavior_IsLongGrass(mapObj->mapobj_unk_1E))
+        return;
+
+    if (!MetatileBehavior_IsLongGrass(mapObj->mapobj_unk_1F))
+        return;
+
+    sprite->subspriteTableNum = 4;
+
+    if (ZCoordToPriority(mapObj->elevation) == 1)
+        sprite->subspriteTableNum = 5;
+}
+
+bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y)
+{
+    u8 mapZ;
+
+    if (z == 0)
+        return FALSE;
+
+    mapZ = MapGridGetZCoordAt(x, y);
+
+    if (mapZ == 0 || mapZ == 0xF)
+        return FALSE;
+
+    if (mapZ != z)
+        return TRUE;
+
+    return FALSE;
+}
+
+static const u8 sUnknown_08376050[] = {
+    0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
+};
+
+// Each byte corresponds to a sprite priority for a field object.
+// This is directly the inverse of gFieldObjectPriorities_08376070.
+static const u8 sFieldObjectPriorities_08376060[] = {
+    2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2
+};
+
+// Each byte corresponds to a sprite priority for a field object.
+// This is the inverse of gFieldObjectPriorities_08376060.
+// 1 = Above player sprite
+// 2 = Below player sprite
+static const u8 sFieldObjectPriorities_08376070[] = {
+    1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1,
+};
+
+void FieldObjectUpdateZCoordAndPriority(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    if (mapObj->mapobj_bit_26)
+        return;
+
+    FieldObjectUpdateZCoord(mapObj);
+
+    sprite->subspriteTableNum = sFieldObjectPriorities_08376070[mapObj->elevation];
+    sprite->oam.priority = sFieldObjectPriorities_08376060[mapObj->elevation];
+}
+
+void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z)
+{
+    sprite->subspriteTableNum = sFieldObjectPriorities_08376070[z];
+    sprite->oam.priority = sFieldObjectPriorities_08376060[z];
+}
+
+u8 ZCoordToPriority(u8 z)
+{
+    return sFieldObjectPriorities_08376060[z];
+}
+
+void FieldObjectUpdateZCoord(struct MapObject *mapObj)
+{
+    u8 z = MapGridGetZCoordAt(mapObj->coords2.x, mapObj->coords2.y);
+    u8 z2 = MapGridGetZCoordAt(mapObj->coords3.x, mapObj->coords3.y);
+
+    if (z == 0xF || z2 == 0xF)
+        return;
+
+    mapObj->mapobj_unk_0B_0 = z;
+
+    if (z != 0 && z != 0xF)
+        mapObj->elevation = z;
+}
+
+void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b)
+{
+    s32 tmp = sprite->centerToCornerVecY;
+    u32 tmpa = *(u16 *)&sprite->pos1.y;
+    u32 tmpb = *(u16 *)&gSpriteCoordOffsetY;
+    s32 tmp2 = (tmpa - tmp) + tmpb;
+    u16 tmp3 = (0x10 - ((((u32)tmp2 + 8) & 0xFF) >> 4)) * 2;
+    sprite->subpriority = tmp3 + sUnknown_08376050[a] + b;
+}
+
+void FieldObjectUpdateSubpriority(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    if (mapObj->mapobj_bit_26)
+        return;
+
+    SetObjectSubpriorityByZCoord(mapObj->elevation, sprite, 1);
+}
+
+bool8 AreZCoordsCompatible(u8 a, u8 b)
+{
+    if (a == 0 || b == 0)
+        return TRUE;
+
+    if (a != b)
+        return FALSE;
+
+    return TRUE;
+}
+
+void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u8 *ptr;
+
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = (mapObj->localId << 8) | mapObj->mapNum;
+    gFieldEffectArguments[5] = mapObj->mapGroup;
+
+    ptr = (u8 *)&gSaveBlock1;
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+                         | (u8)gSaveBlock1.location.mapGroup;
+
+    gFieldEffectArguments[7] = 1;
+    FieldEffectStart(4);
+}
+
+void sub_8063E94(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u8 *ptr;
+
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = (mapObj->localId << 8) | mapObj->mapNum;
+    gFieldEffectArguments[5] = mapObj->mapGroup;
+
+    ptr = (u8 *)&gSaveBlock1;
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+                         | (u8)gSaveBlock1.location.mapGroup;
+
+    gFieldEffectArguments[7] = 0;
+    FieldEffectStart(4);
+}
+
+void sub_8063EE0(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u8 *ptr;
+
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = (mapObj->localId << 8) | mapObj->mapNum;
+    gFieldEffectArguments[5] = mapObj->mapGroup;
+
+    ptr = (u8 *)&gSaveBlock1;
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+                         | (u8)gSaveBlock1.location.mapGroup;
+
+    gFieldEffectArguments[7] = 1;
+    FieldEffectStart(17);
+}
+
+void sub_8063F2C(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u8 *ptr;
+
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = (mapObj->localId << 8) | mapObj->mapNum;
+    gFieldEffectArguments[5] = mapObj->mapGroup;
+
+    ptr = (u8 *)&gSaveBlock1;
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+                         | (u8)gSaveBlock1.location.mapGroup;
+
+    gFieldEffectArguments[7] = 0;
+    FieldEffectStart(17);
+}
+
+void GroundEffect_WaterReflection(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    SetUpReflection(mapObj, sprite, 0);
+}
+
+void GroundEffect_IceReflection(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    SetUpReflection(mapObj, sprite, 1);
+}
+
+void GroundEffect_FlowingWater(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    oe_exec_and_other_stuff(FLDEFF_FEET_IN_FLOWING_WATER, mapObj);
+}
+
+static void (*const gUnknown_08376080[])(struct MapObject *mapObj, struct Sprite *sprite, u8 a) = {
+    nullsub, DoTracksGroundEffect_Footprints, DoTracksGroundEffect_BikeTireTracks,
+};
+
+void sub_8063FA0(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId);
+    gUnknown_08376080[info->tracks](mapObj, sprite, 0);
+}
+
+void sub_8063FCC(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId);
+    gUnknown_08376080[info->tracks](mapObj, sprite, 1);
+}
+
+static void nullsub(struct MapObject *mapObj, struct Sprite *sprite, u8 a)
+{
+}
+
+static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Sprite *sprite, u8 a)
+{
+    // First half-word is a Field Effect script id. (gFieldEffectScriptPointers)
+    u16 sandFootprints_FieldEffectData[2] = { 0xD, 0x18 };
+
+    gFieldEffectArguments[0] = mapObj->coords3.x;
+    gFieldEffectArguments[1] = mapObj->coords3.y;
+    gFieldEffectArguments[2] = 149;
+    gFieldEffectArguments[3] = 2;
+    gFieldEffectArguments[4] = mapObj->mapobj_unk_18;
+    FieldEffectStart(sandFootprints_FieldEffectData[a]);
+}
+
+static void DoTracksGroundEffect_BikeTireTracks(
+    struct MapObject *mapObj, struct Sprite *sprite, u8 a)
+{
+    //  Specifies which bike track shape to show next.
+    //  For example, when the bike turns from up to right, it will show
+    //  a track that curves to the right.
+    //  Each 4-byte row corresponds to the initial direction of the bike, and
+    //  each byte in that row is for the next direction of the bike in the order
+    //  of down, up, left, right.
+    static const u8 bikeTireTracks_Transitions[4][4] = {
+        1, 2, 7, 8,
+        1, 2, 6, 5,
+        5, 8, 3, 4,
+        6, 7, 3, 4,
+    };
+
+    if (mapObj->coords2.x != mapObj->coords3.x || mapObj->coords2.y != mapObj->coords3.y)
+    {
+        gFieldEffectArguments[0] = mapObj->coords3.x;
+        gFieldEffectArguments[1] = mapObj->coords3.y;
+        gFieldEffectArguments[2] = 149;
+        gFieldEffectArguments[3] = 2;
+        gFieldEffectArguments[4] =
+            bikeTireTracks_Transitions[mapObj->mapobj_unk_20][mapObj->mapobj_unk_18 - 5];
+        FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS);
+    }
+}
+
+void GroundEffect_Ripple(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    DoRippleFieldEffect(mapObj, sprite);
+}
+
+void GroundEffect_StepOnPuddle(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    oe_exec_and_other_stuff(FLDEFF_SPLASH, mapObj);
+}
+
+void GroundEffect_SandPile(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    oe_exec_and_other_stuff(FLDEFF_SAND_PILE, mapObj);
+}
+
+void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u8 spriteId;
+
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    FieldEffectStart(FLDEFF_JUMP_TALL_GRASS);
+
+    spriteId = sub_8126FF0(
+        mapObj->localId, mapObj->mapNum, mapObj->mapGroup, mapObj->coords2.x, mapObj->coords2.y);
+
+    if (spriteId == MAX_SPRITES)
+        GroundEffect_SpawnOnTallGrass(mapObj, sprite);
+}
+
+void GroundEffect_JumpOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = 2;
+    FieldEffectStart(FLDEFF_JUMP_LONG_GRASS);
+}
+
+void GroundEffect_JumpOnShallowWater(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH);
+}
+
+void GroundEffect_JumpOnWater(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH);
+}
+
+void GroundEffect_JumpLandingDust(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_DUST);
+}
+
+void GroundEffect_ShortGrass(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    oe_exec_and_other_stuff(FLDEFF_SHORT_GRASS, mapObj);
+}
+
+void GroundEffect_HotSprings(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    oe_exec_and_other_stuff(FLDEFF_HOT_SPRINGS_WATER, mapObj);
+}
+
+void GroundEffect_Seaweed(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    FieldEffectStart(FLDEFF_BUBBLES);
+}
+
+static void (*const gUnknown_083760A0[])(struct MapObject *mapObj, struct Sprite *sprite) = {
+    GroundEffect_SpawnOnTallGrass,
+    sub_8063E94,
+    sub_8063EE0,
+    sub_8063F2C,
+    GroundEffect_WaterReflection,
+    GroundEffect_IceReflection,
+    GroundEffect_FlowingWater,
+    sub_8063FA0,
+    sub_8063FCC,
+    GroundEffect_Ripple,
+    GroundEffect_StepOnPuddle,
+    GroundEffect_SandPile,
+    GroundEffect_JumpOnTallGrass,
+    GroundEffect_JumpOnLongGrass,
+    GroundEffect_JumpOnShallowWater,
+    GroundEffect_JumpOnWater,
+    GroundEffect_JumpLandingDust,
+    GroundEffect_ShortGrass,
+    GroundEffect_HotSprings,
+    GroundEffect_Seaweed
+};
+
+void sub_8064218(struct MapObject *mapObj, struct Sprite *sprite, u32 flags)
+{
+    u8 i;
+    for (i = 0; i < ARRAY_COUNT(gUnknown_083760A0); i++, flags >>= 1)
+        if (flags & 1)
+            gUnknown_083760A0[i](mapObj, sprite);
+}
+
+void filters_out_some_ground_effects(struct MapObject *mapObj, u32 *flags)
+{
+    if (mapObj->mapobj_bit_4)
+    {
+        mapObj->mapobj_bit_18 = 0;
+        mapObj->mapobj_bit_20 = 0;
+        mapObj->mapobj_bit_19 = 0;
+        mapObj->mapobj_bit_21 = 0;
+        *flags &= 0xFFF9F7BD;
+    }
+}
+
+void FilterOutStepOnPuddleGroundEffectIfJumping(struct MapObject *mapObj, u32 *flags)
+{
+    if (mapObj->mapobj_bit_5)
+        *flags &= 0xFFFFFBFF;
+}
+
+void DoGroundEffects_OnSpawn(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u32 flags;
+
+    if (mapObj->mapobj_bit_2)
+    {
+        flags = 0;
+        FieldObjectUpdateZCoordAndPriority(mapObj, sprite);
+        GetAllGroundEffectFlags_OnSpawn(mapObj, &flags);
+        FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite);
+        sub_8064218(mapObj, sprite, flags);
+        mapObj->mapobj_bit_2 = 0;
+        mapObj->mapobj_bit_4 = 0;
+    }
+}
+
+void DoGroundEffects_OnBeginStep(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u32 flags;
+
+    if (mapObj->mapobj_bit_2)
+    {
+        flags = 0;
+        FieldObjectUpdateZCoordAndPriority(mapObj, sprite);
+        GetAllGroundEffectFlags_OnBeginStep(mapObj, &flags);
+        FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite);
+        filters_out_some_ground_effects(mapObj, &flags);
+        sub_8064218(mapObj, sprite, flags);
+        mapObj->mapobj_bit_2 = 0;
+        mapObj->mapobj_bit_4 = 0;
+    }
+}
+
+void DoGroundEffects_OnFinishStep(struct MapObject *mapObj, struct Sprite *sprite)
+{
+    u32 flags;
+
+    if (mapObj->mapobj_bit_3)
+    {
+        flags = 0;
+        FieldObjectUpdateZCoordAndPriority(mapObj, sprite);
+        GetAllGroundEffectFlags_OnFinishStep(mapObj, &flags);
+        FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite);
+        FilterOutStepOnPuddleGroundEffectIfJumping(mapObj, &flags);
+        sub_8064218(mapObj, sprite, flags);
+        mapObj->mapobj_bit_3 = 0;
+        mapObj->mapobj_bit_5 = 0;
+    }
+}
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index f60b1b233..0e7cd7896 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -11,7 +11,7 @@
 #include "fieldmap.h"
 #include "palette.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sprite.h"
 #include "metatile_behavior.h"
 #include "map_constants.h"
@@ -3244,7 +3244,7 @@ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 m
         return FindFieldObjectTemplateInArrayByLocalId(localId, gSaveBlock1.mapObjectTemplates, gMapHeader.events->mapObjectCount);
     else
     {
-        struct MapHeader *mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum);
+        struct MapHeader *mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
 
         return FindFieldObjectTemplateInArrayByLocalId(localId, mapHeader->events->mapObjects, mapHeader->events->mapObjectCount);
     }
@@ -3895,11 +3895,11 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp
     {
         if (!(sprite->data7 & 4) && sprite->animNum == 4)
         {
-            gUnknown_0202FF84[0] = mapObject->coords2.x;
-            gUnknown_0202FF84[1] = mapObject->coords2.y;
-            gUnknown_0202FF84[2] = sprite->subpriority - 1;
-            gUnknown_0202FF84[3] = sprite->oam.priority;
-            FieldEffectStart(0x17);
+            gFieldEffectArguments[0] = mapObject->coords2.x;
+            gFieldEffectArguments[1] = mapObject->coords2.y;
+            gFieldEffectArguments[2] = sprite->subpriority - 1;
+            gFieldEffectArguments[3] = sprite->oam.priority;
+            FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE);
             sprite->animNum = 0;
         }
         return 0;
@@ -3934,11 +3934,11 @@ u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sp
     sprite->data1 = 3;
     sprite->data2 = 0;
     sprite->data7 |= 2;
-    gUnknown_0202FF84[0] = mapObject->coords2.x;
-    gUnknown_0202FF84[1] = mapObject->coords2.y;
-    gUnknown_0202FF84[2] = sprite->subpriority - 1;
-    gUnknown_0202FF84[3] = sprite->oam.priority;
-    FieldEffectStart(0x17);
+    gFieldEffectArguments[0] = mapObject->coords2.x;
+    gFieldEffectArguments[1] = mapObject->coords2.y;
+    gFieldEffectArguments[2] = sprite->subpriority - 1;
+    gFieldEffectArguments[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE);
     return 1;
 }
 
@@ -5086,8 +5086,8 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
     mapObject = &gMapObjects[sprite->data0];
     if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-        mapObject->mapobj_unk_1A = FieldEffectStart(0x1c);
+        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+        mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
         sprite->data7 ++;
     }
@@ -5106,8 +5106,8 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
     mapObject = &gMapObjects[sprite->data0];
     if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-        mapObject->mapobj_unk_1A = FieldEffectStart(0x1d);
+        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+        mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
         sprite->data7 ++;
     }
@@ -5364,53 +5364,36 @@ u8 sub_805FF20(struct MapObject *mapObject, u8 direction)
 }
 
 bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject2 *mapObject, s16 x, s16 y);
-bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s16 x, s16 y);
+static bool8 DoesObjectCollideWithObjectAt(struct MapObject *mapObject, s16 x, s16 y);
 bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction);
 
 u8 npc_block_way(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
 {
     if (IsCoordOutsideFieldObjectMovementRect((struct MapObject2 *)mapObject, x, y))
-    {
         return 1;
-    }
-    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction))
-    {
+    else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction))
         return 2;
-    } else if (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction))
-    {
+    else if (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction))
         return 2;
-    }
-    if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y))
-    {
+    else if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y))
         return 3;
-    }
-    if (CheckForCollisionBetweenFieldObjects(mapObject, x, y))
-    {
+    else if (DoesObjectCollideWithObjectAt(mapObject, x, y))
         return 4;
-    }
     return 0;
 }
 
 u8 sub_8060024(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
 {
-    u8 flags;
-    flags = 0;
+    u8 flags = 0;
+
     if (IsCoordOutsideFieldObjectMovementRect((struct MapObject2 *)mapObject, x, y))
-    {
         flags |= 1;
-    }
     if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction)))
-    {
         flags |= 2;
-    }
     if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y))
-    {
         flags |= 4;
-    }
-    if (CheckForCollisionBetweenFieldObjects(mapObject, x, y))
-    {
+    if (DoesObjectCollideWithObjectAt(mapObject, x, y))
         flags |= 8;
-    }
     return flags;
 }
 
@@ -5418,25 +5401,22 @@ bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject2 *mapObject, s16 x,
 {
     s16 minv;
     s16 maxv;
+
     if (mapObject->mapobj_unk_19 != 0)
     {
         minv = mapObject->coords1.x - (mapObject->mapobj_unk_19);
         maxv = mapObject->coords1.x + (mapObject->mapobj_unk_19);
         if (minv > x || maxv < x)
-        {
-            return 1;
-        }
+            return TRUE;
     }
     if (mapObject->mapobj_unk_19b != 0)
     {
         minv = mapObject->coords1.y - (mapObject->mapobj_unk_19b);
         maxv = mapObject->coords1.y + (mapObject->mapobj_unk_19b);
         if (minv > y || maxv < y)
-        {
-            return 1;
-        }
+            return TRUE;
     }
-    return 0;
+    return FALSE;
 }
 
 bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
@@ -5448,23 +5428,19 @@ bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16
     return 0;
 }
 
-bool8 CheckForCollisionBetweenFieldObjects(struct MapObject *mapObject, s16 x, s16 y)
+static bool8 DoesObjectCollideWithObjectAt(struct MapObject *mapObject, s16 x, s16 y)
 {
-    struct MapObject *mapObject2;
     u8 i;
-    for (i=0; i<16; i++)
+
+    for (i = 0; i < 16; i++)
     {
-        mapObject2 = &gMapObjects[i];
+        struct MapObject *mapObject2 = &gMapObjects[i];
+
         if (mapObject2->active && mapObject2 != mapObject)
         {
-            if ((mapObject2->coords2.x != x || mapObject2->coords2.y != y) && (mapObject2->coords3.x != x || mapObject2->coords3.y != y))
-            {
-                continue;
-            }
-            if (AreZCoordsCompatible(mapObject->mapobj_unk_0B_0, mapObject2->mapobj_unk_0B_0))
-            {
-                return 1;
-            }
+            if (((mapObject2->coords2.x == x && mapObject2->coords2.y == y) || (mapObject2->coords3.x == x && mapObject2->coords3.y == y))
+             && AreZCoordsCompatible(mapObject->mapobj_unk_0B_0, mapObject2->mapobj_unk_0B_0))
+                return TRUE;
         }
     }
     return 0;
@@ -7490,24 +7466,24 @@ bool8 sub_8062644(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-    FieldEffectStart(0x0);
+    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
     sprite->data2 = 1;
     return TRUE;
 }
 
 bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-    FieldEffectStart(0x21);
+    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2);
     sprite->data2 = 1;
     return TRUE;
 }
 
 bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-    FieldEffectStart(0x2e);
+    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_HEART_ICON);
     sprite->data2 = 1;
     return TRUE;
 }
@@ -8303,12 +8279,12 @@ void sub_80634A0(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 void sub_80634E8(struct MapObject *, struct Sprite *);
-void npc_update_obj_anim_flag(struct MapObject *, struct Sprite *);
+static void UpdateMapObjSpriteVisibility(struct MapObject *, struct Sprite *);
 
 void sub_80634D0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80634E8(mapObject, sprite);
-    npc_update_obj_anim_flag(mapObject, sprite);
+    UpdateMapObjSpriteVisibility(mapObject, sprite);
 }
 
 #ifdef NONMATCHING
@@ -8464,7 +8440,7 @@ _080635C0:\n\
 }
 #endif
 
-void npc_update_obj_anim_flag(struct MapObject *mapObject, struct Sprite *sprite)
+void UpdateMapObjSpriteVisibility(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sprite->invisible = 0;
     if (mapObject->mapobj_bit_13 || mapObject->mapobj_bit_14)
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index 87be8e011..93cd57557 100644
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -294,7 +294,7 @@ void sub_8064990(u8 a1, u8 dir)
 
 u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
     return FieldEffectStart(fieldEffectId);
 }
 
@@ -310,9 +310,9 @@ void DoShadowFieldEffect(struct MapObject *mapObject)
 void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite)
 {
     const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
-    gUnknown_0202FF84[0] = sprite->pos1.x;
-    gUnknown_0202FF84[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
-    gUnknown_0202FF84[2] = 151;
-    gUnknown_0202FF84[3] = 3;
-    FieldEffectStart(5);
+    gFieldEffectArguments[0] = sprite->pos1.x;
+    gFieldEffectArguments[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
+    gFieldEffectArguments[2] = 151;
+    gFieldEffectArguments[3] = 3;
+    FieldEffectStart(FLDEFF_RIPPLE);
 }
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 2a7b2f3e0..c8099a73d 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -14,7 +14,7 @@
 #include "metatile_behavior.h"
 #include "party_menu.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rotating_gate.h"
 #include "script.h"
 #include "songs.h"
@@ -666,10 +666,10 @@ void PlayerAvatarTransition_Surfing(struct MapObject *a)
     sub_805B980(a, GetPlayerAvatarGraphicsIdByStateId(3));
     FieldObjectTurn(a, a->placeholder18);
     SetPlayerAvatarStateMask(8);
-    gUnknown_0202FF84[0] = a->coords2.x;
-    gUnknown_0202FF84[1] = a->coords2.y;
-    gUnknown_0202FF84[2] = gPlayerAvatar.mapObjectId;
-    unk = FieldEffectStart(8);
+    gFieldEffectArguments[0] = a->coords2.x;
+    gFieldEffectArguments[1] = a->coords2.y;
+    gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
+    unk = FieldEffectStart(FLDEFF_SURF_BLOB);
     a->mapobj_unk_1A = unk;
     sub_8127ED0(unk, 1);
 }
@@ -1226,11 +1226,11 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c)
         FieldObjectClearAnimIfSpecialAnimFinished(c);
         FieldObjectSetSpecialAnim(b, GetStepInPlaceDelay16AnimId(task->data[2]));
         FieldObjectSetSpecialAnim(c, GetSimpleGoAnimId(task->data[2]));
-        gUnknown_0202FF84[0] = c->coords2.x;
-        gUnknown_0202FF84[1] = c->coords2.y;
-        gUnknown_0202FF84[2] = c->elevation;
-        gUnknown_0202FF84[3] = gSprites[c->spriteId].oam.priority;
-        FieldEffectStart(10);
+        gFieldEffectArguments[0] = c->coords2.x;
+        gFieldEffectArguments[1] = c->coords2.y;
+        gFieldEffectArguments[2] = c->elevation;
+        gFieldEffectArguments[3] = gSprites[c->spriteId].oam.priority;
+        FieldEffectStart(FLDEFF_DUST);
         PlaySE(SE_W070);
         task->data[0]++;
     }
@@ -1406,7 +1406,7 @@ static void sub_805A2D0(u8 taskId)
 
 /* Fishing */
 
-static u8 (*const gUnknown_0830FCB4[])(struct Task *) =
+static u8 (*const sFishingStateFuncs[])(struct Task *) =
 {
     Fishing1,
     Fishing2,
@@ -1429,17 +1429,33 @@ static u8 (*const gUnknown_0830FCB4[])(struct Task *) =
 static void Task_Fishing(u8 taskId);
 static void sub_805A954(void);
 
-void StartFishing(u8 a)
+#define tStep              data[0]
+#define tFrameCounter      data[1]
+#define tNumDots           data[2]
+#define tDotsRequired      data[3]
+#define tRoundsPlayed      data[12]
+#define tMinRoundsRequired data[13]
+#define tPlayerGfxId       data[14]
+#define tFishingRod        data[15]
+
+#define FISHING_START_ROUND 3
+#define FISHING_GOT_BITE 6
+#define FISHING_ON_HOOK 9
+#define FISHING_NO_BITE 11
+#define FISHING_GOT_AWAY 12
+#define FISHING_SHOW_RESULT 13
+
+void StartFishing(u8 rod)
 {
     u8 taskId = CreateTask(Task_Fishing, 0xFF);
 
-    gTasks[taskId].data[15] = a;
+    gTasks[taskId].tFishingRod = rod;
     Task_Fishing(taskId);
 }
 
 static void Task_Fishing(u8 taskId)
 {
-    while (gUnknown_0830FCB4[gTasks[taskId].data[0]](&gTasks[taskId]))
+    while (sFishingStateFuncs[gTasks[taskId].tStep](&gTasks[taskId]))
         ;
 }
 
@@ -1447,7 +1463,7 @@ u8 Fishing1(struct Task *task)
 {
     ScriptContext2_Enable();
     gPlayerAvatar.unk6 = 1;
-    task->data[0]++;
+    task->tStep++;
     return 0;
 }
 
@@ -1457,23 +1473,25 @@ u8 Fishing2(struct Task *task)
     const s16 arr1[] = {1, 1, 1};
     const s16 arr2[] = {1, 3, 6};
 
-    task->data[12] = 0;
-    task->data[13] = arr1[task->data[15]] + (Random() % arr2[task->data[15]]);
-    task->data[14] = gMapObjects[gPlayerAvatar.mapObjectId].graphicsId;
+    task->tRoundsPlayed = 0;
+    task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]);
+    task->tPlayerGfxId = gMapObjects[gPlayerAvatar.mapObjectId].graphicsId;
     playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
     FieldObjectClearAnimIfSpecialAnimActive(playerMapObj);
     playerMapObj->mapobj_bit_11 = 1;
     sub_8059C3C(playerMapObj->mapobj_unk_18);
-    task->data[0]++;
+    task->tStep++;
     return 0;
 }
 
 u8 Fishing3(struct Task *task)
 {
     sub_805A954();
-    task->data[1]++;
-    if (task->data[1] > 0x3B)
-        task->data[0]++;
+    
+    // Wait one second before starting dot game
+    task->tFrameCounter++;
+    if (task->tFrameCounter >= 60)
+        task->tStep++;
     return 0;
 }
 
@@ -1482,87 +1500,92 @@ u8 Fishing4(struct Task *task)
     u32 randVal;
 
     MenuDisplayMessageBox();
-    task->data[0]++;
-    task->data[1] = 0;
-    task->data[2] = 0;
+    task->tStep++;
+    task->tFrameCounter = 0;
+    task->tNumDots = 0;
     randVal = Random();
     randVal %= 10;
-    task->data[3] = randVal + 1;
-    if (task->data[12] == 0)
-        task->data[3] = randVal + 4;
-    if (task->data[3] > 9)
-        task->data[3] = 10;
+    task->tDotsRequired = randVal + 1;
+    if (task->tRoundsPlayed == 0)
+        task->tDotsRequired = randVal + 4;
+    if (task->tDotsRequired >= 10)
+        task->tDotsRequired = 10;
     return 1;
 }
 
+// Play a round of the dot game
 u8 Fishing5(struct Task *task)
 {
     const u8 dot[] = _("·");
 
     sub_805A954();
-    task->data[1]++;
+    task->tFrameCounter++;
     if (gMain.newKeys & A_BUTTON)
     {
-        task->data[0] = 11;
-        if (task->data[12] != 0)
-            task->data[0] = 12;
+        task->tStep = FISHING_NO_BITE;
+        if (task->tRoundsPlayed != 0)
+            task->tStep = FISHING_GOT_AWAY;
         return 1;
     }
     else
     {
-        if (task->data[1] > 0x13)
+        if (task->tFrameCounter >= 20)
         {
-            task->data[1] = 0;
-            if (task->data[2] >= task->data[3])
+            task->tFrameCounter = 0;
+            if (task->tNumDots >= task->tDotsRequired)
             {
-                task->data[0]++;
-                if (task->data[12] != 0)
-                    task->data[0]++;
-                task->data[12]++;
+                task->tStep++;
+                if (task->tRoundsPlayed != 0)
+                    task->tStep++;
+                task->tRoundsPlayed++;
             }
             else
             {
-                MenuPrint(dot, task->data[2] + 4, 15);
-                task->data[2]++;
+                MenuPrint(dot, task->tNumDots + 4, 15);
+                task->tNumDots++;
             }
         }
         return 0;
     }
 }
 
+// Determine if fish bites
 u8 Fishing6(struct Task *task)
 {
     sub_805A954();
-    task->data[0]++;
-    if (!GetFishingWildMonListHeader() || (Random() & 1))
-        task->data[0] = 11;
+    task->tStep++;
+    if (!DoesCurrentMapHaveFishingMons() || (Random() & 1))
+        task->tStep = FISHING_NO_BITE;
     else
         StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FE08(player_get_direction_lower_nybble()));
     return 1;
 }
 
+// Oh! A Bite!
 u8 Fishing7(struct Task *task)
 {
     sub_805A954();
     MenuPrint(gOtherText_OhABite, 4, 17);
-    task->data[0]++;
-    task->data[1] = 0;
+    task->tStep++;
+    task->tFrameCounter = 0;
     return 0;
 }
 
+// We have a bite. Now, wait for the player to press A, or the timer to expire.
 u8 Fishing8(struct Task *task)
 {
-    const s16 arr[3] = {36, 33, 30};
+    const s16 reelTimeouts[3] = {36, 33, 30};
 
     sub_805A954();
-    task->data[1]++;
-    if (task->data[1] >= arr[task->data[15]])
-        task->data[0] = 12;
+    task->tFrameCounter++;
+    if (task->tFrameCounter >= reelTimeouts[task->tFishingRod])
+        task->tStep = FISHING_GOT_AWAY;
     else if (gMain.newKeys & A_BUTTON)
-        task->data[0]++;
+        task->tStep++;
     return 0;
 }
 
+// Determine if we're going to play the dot game again
 u8 Fishing9(struct Task *task)
 {
     const s16 arr[][2] =
@@ -1573,17 +1596,18 @@ u8 Fishing9(struct Task *task)
     };
 
     sub_805A954();
-    task->data[0]++;
-    if (task->data[12] < task->data[13])
+    task->tStep++;
+    if (task->tRoundsPlayed < task->tMinRoundsRequired)
     {
-        task->data[0] = 3;
+        task->tStep = FISHING_START_ROUND;
     }
-    else if (task->data[12] < 2)
+    else if (task->tRoundsPlayed < 2)
     {
-        s16 randVal = Random() % 100;
+        // probability of having to play another round
+        s16 probability = Random() % 100;
 
-        if (arr[task->data[15]][task->data[12]] > randVal)
-            task->data[0] = 3;
+        if (arr[task->tFishingRod][task->tRoundsPlayed] > probability)
+            task->tStep = FISHING_START_ROUND;
     }
     return 0;
 }
@@ -1591,72 +1615,73 @@ u8 Fishing9(struct Task *task)
 u8 Fishing10(struct Task *task)
 {
     sub_805A954();
-    sub_8072044(gOtherText_PokeOnHook);
+    MenuPrintMessageDefaultCoords(gOtherText_PokeOnHook);
     MenuDisplayMessageBox();
-    task->data[0]++;
-    task->data[1] = 0;
+    task->tStep++;
+    task->tFrameCounter = 0;
     return 0;
 }
 
 u8 Fishing11(struct Task *task)
 {
-    if (task->data[1] == 0)
-    {
+    if (task->tFrameCounter == 0)
         sub_805A954();
-        if (task->data[1] == 0)
+
+    if (task->tFrameCounter == 0)
+    {
+        if (MenuUpdateWindowText())
         {
-            if (MenuUpdateWindowText())
-            {
-                struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-
-                sub_805B980(playerMapObj, task->data[14]);
-                FieldObjectTurn(playerMapObj, playerMapObj->placeholder18);
-                if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-                    sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 0, 0);
-                gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
-                gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
-                MenuZeroFillScreen();
-                task->data[1]++;
-                return 0;
-            }
-            else
-            {
-                if (task->data[1] == 0)
-                    return 0;
-            }
+            struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+            sub_805B980(playerMapObj, task->tPlayerGfxId);
+            FieldObjectTurn(playerMapObj, playerMapObj->placeholder18);
+            if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+                sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 0, 0);
+            gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
+            gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
+            MenuZeroFillScreen();
+            task->tFrameCounter++;
+            return 0;
         }
     }
-    gPlayerAvatar.unk6 = 0;
-    ScriptContext2_Disable();
-    FishingWildEncounter(task->data[15]);
-    sub_80BE97C(1);
-    DestroyTask(FindTaskIdByFunc(Task_Fishing));
+
+    if (task->tFrameCounter != 0)
+    {
+        gPlayerAvatar.unk6 = 0;
+        ScriptContext2_Disable();
+        FishingWildEncounter(task->tFishingRod);
+        sub_80BE97C(1);
+        DestroyTask(FindTaskIdByFunc(Task_Fishing));
+    }
     return 0;
 }
 
+// Not even a nibble
 u8 Fishing12(struct Task *task)
 {
     sub_805A954();
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FDF8(player_get_direction_lower_nybble()));
-    sub_8072044(gOtherText_NotEvenANibble);
-    task->data[0] = 13;
+    MenuPrintMessageDefaultCoords(gOtherText_NotEvenANibble);
+    task->tStep = FISHING_SHOW_RESULT;
     return 1;
 }
 
+// It got away
 u8 Fishing13(struct Task *task)
 {
     sub_805A954();
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FDF8(player_get_direction_lower_nybble()));
-    sub_8072044(gOtherText_ItGotAway);
-    task->data[0]++;
+    MenuPrintMessageDefaultCoords(gOtherText_ItGotAway);
+    task->tStep++;
     return 1;
 }
 
+// Display the message
 u8 Fishing14(struct Task *task)
 {
     sub_805A954();
     MenuDisplayMessageBox();
-    task->data[0]++;
+    task->tStep++;
     return 0;
 }
 
@@ -1667,13 +1692,13 @@ u8 Fishing15(struct Task *task)
     {
         struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
 
-        sub_805B980(playerMapObj, task->data[14]);
+        sub_805B980(playerMapObj, task->tPlayerGfxId);
         FieldObjectTurn(playerMapObj, playerMapObj->placeholder18);
         if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
             sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 0, 0);
         gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
         gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
-        task->data[0]++;
+        task->tStep++;
     }
     return 0;
 }
@@ -1692,6 +1717,10 @@ u8 Fishing16(struct Task *task)
     return 0;
 }
 
+#undef tStep
+#undef tFrameCounter
+#undef tFishingRod
+
 static void sub_805A954(void)
 {
     struct Sprite *playerSprite = &gSprites[gPlayerAvatar.spriteId];
diff --git a/src/field_poison.c b/src/field_poison.c
index 8c9e029e1..1244b9c62 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -108,7 +108,7 @@ void ExecuteWhiteOut(void)
     ScriptContext1_Stop();
 }
 
-s32 overworld_poison(void)
+s32 DoPoisonFieldEffect(void)
 {
     struct Pokemon *pkmn = &gPlayerParty[0];
     u32 numPoisoned = 0;
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 79913e1c5..1464a99b1 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -3,7 +3,7 @@
 #include "field_camera.h"
 #include "menu.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "task.h"
 #include "text.h"
@@ -21,11 +21,11 @@ extern u16 gUnknown_03004DE0[][0x3C0];
 
 const static u16 gUnknown_0839ACDC[] = { 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0 };
 
-const s32 gUnknown_0839ACE8 = 4;
+const s32 gMaxFlashLevel = 4;
 
-const static u32 gUnknown_0839ACEC[3] =
+const static struct UnknownTaskStruct gUnknown_0839ACEC =
 {
-    REG_ADDR_WIN0H,
+    (void *)REG_ADDR_WIN0H,
     ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
     1
 };
@@ -137,11 +137,11 @@ static u8 sub_8081534(s32 a1, s32 a2, s32 a3, s32 a4, s32 a5, u8 a6)
 
 void sub_8081594(u8 a1)
 {
-    u8 index = sav1_get_flash_used_on_map();
+    u8 flashLevel = Overworld_GetFlashLevel();
     u8 value = 0;
     if (!a1)
         value = 1;
-    sub_8081534(120, 80, gUnknown_0839ACDC[index], gUnknown_0839ACDC[a1], value, 1);
+    sub_8081534(120, 80, gUnknown_0839ACDC[flashLevel], gUnknown_0839ACDC[a1], value, 1);
     sub_8081510();
     ScriptContext2_Enable();
 }
@@ -220,7 +220,8 @@ static void sub_80816A8(u8 taskId)
         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]);
+        //sub_80895F8(gUnknown_0839ACEC[0], gUnknown_0839ACEC[1], gUnknown_0839ACEC[2]);
+        sub_80895F8(gUnknown_0839ACEC);
         data[0] = 1;
         break;
     case 1:
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 82a7a13e3..38c076c51 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -8,7 +8,7 @@
 #include "fieldmap.h"
 #include "main.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "script_movement.h"
 #include "songs.h"
@@ -273,7 +273,7 @@ void Task_HandlePorthole(u8 taskId)
     case IDLE_CHECK: // idle and move.
         if (gMain.newKeys & A_BUTTON)
             data[1] = 1;
-        if (!sub_80A212C(0xFF, location->mapNum, location->mapGroup))
+        if (!ScriptMovement_IsObjectMovementFinished(0xFF, location->mapNum, location->mapGroup))
             return;
         if (CountSSTidalStep(1) == TRUE)
         {
@@ -294,18 +294,18 @@ void Task_HandlePorthole(u8 taskId)
         // run this once.
         if (*var == 2) // which direction?
         {
-            exec_movement(0xFF, location->mapNum, location->mapGroup, gUnknown_083D295F);
+            ScriptMovement_StartObjectMovementScript(0xFF, location->mapNum, location->mapGroup, gUnknown_083D295F);
             data[0] = IDLE_CHECK; // run case 1.
         }
         else
         {
-            exec_movement(0xFF, location->mapNum, location->mapGroup, gUnknown_083D2961);
+            ScriptMovement_StartObjectMovementScript(0xFF, location->mapNum, location->mapGroup, gUnknown_083D2961);
             data[0] = IDLE_CHECK; // run case 1.
         }
         break;
     case EXIT_PORTHOLE: // exit porthole.
-        FlagReset(0x4001);
-        FlagReset(0x4000);
+        FlagClear(0x4001);
+        FlagClear(0x4000);
         copy_saved_warp2_bank_and_enter_x_to_warp1(0);
         sp13E_warp_to_last_warp();
         DestroyTask(taskId);
diff --git a/src/field_specials.c b/src/field_specials.c
index 454bd8d96..c23ea2ddc 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -12,7 +12,7 @@
 #include "field_player_avatar.h"
 #include "main.h"
 #include "map_constants.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "string_util.h"
@@ -61,44 +61,44 @@ static void RecordCyclingRoadResults(u32, u8);
 
 static struct ElevatorMenu gUnknown_03000760[20];
 
-void sub_810D6A4(void) {
-    SetMainCallback2(sub_8145D88);
+void ScrSpecial_ShowDiploma(void)
+{
+    SetMainCallback2(CB2_ShowDiploma);
     ScriptContext2_Enable();
 }
 
-void sub_810D6B8(void) {
+void ScrSpecial_ViewWallClock(void)
+{
     gMain.savedCallback = c2_exit_to_overworld_2_switch;
     SetMainCallback2(CB2_ViewWallClock);
     ScriptContext2_Enable();
 }
 
-void ResetCyclingRoadChallengeData(void) {
+void ResetCyclingRoadChallengeData(void)
+{
     gUnknown_02039250 = 0;
     gUnknown_02039251 = 0;
     gUnknown_02039254 = 0;
 }
 
-void BeginCyclingRoadChallenge(void) {
+void ScrSpecial_BeginCyclingRoadChallenge(void)
+{
     gUnknown_02039250 = 1;
     gUnknown_02039251 = 0;
     gUnknown_02039254 = gMain.vblankCounter1;
 }
 
-u16 GetPlayerAvatarBike(void) {
+u16 GetPlayerAvatarBike(void)
+{
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE))
-    {
         return 1;
-    }
-
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE))
-    {
         return 2;
-    }
-
     return 0;
 }
 
-void DetermineCyclingRoadResults(u32 arg0, u8 arg1) {
+static void DetermineCyclingRoadResults(u32 arg0, u8 arg1)
+{
     u8 result;
 
     if (arg1 <= 99)
@@ -225,7 +225,7 @@ void SetSSTidalFlag(void)
 
 void ResetSSTidalFlag(void)
 {
-    FlagReset(SYS_CRUISE_MODE);
+    FlagClear(SYS_CRUISE_MODE);
 }
 
 bool32 CountSSTidalStep(u16 delta)
@@ -1453,7 +1453,7 @@ void ResetTrickHouseEndRoomFlag(void)
     u16 *specVar = &gSpecialVar_0x8004;
     u16 flag = 0x259;
     *specVar = flag;
-    FlagReset(flag);
+    FlagClear(flag);
 }
 
 bool8 CheckLeadMonCool(void)
@@ -1868,7 +1868,7 @@ void GivLeadMonEffortRibbon(void)
     SetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_EFFORT_RIBBON, &ribbonSet);
 }
 
-bool8 GetLeadMonEVCount(void)
+bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
 {
     if (GetMonEVCount(&gPlayerParty[GetLeadMonIndex()]) >= 510)
     {
@@ -1919,7 +1919,7 @@ bool8 IsStarterInParty(void)
     u8 i;
     u16 starter = GetStarterPokemon(VarGet(VAR_FIRST_POKE));
     u8 partyCount = CalculatePlayerPartyCount();
-    for (i=0; i<partyCount; i++)
+    for (i = 0; i < partyCount; i++)
     {
         if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) == starter)
         {
@@ -2005,7 +2005,7 @@ bool8 sub_810F828(void)
 
 void SetRoute119Weather(void)
 {
-    if (is_light_level_1_2_3_5_or_6(get_map_light_from_warp0()) != TRUE)
+    if (is_map_type_1_2_3_5_or_6(get_map_type_from_warp0()) != TRUE)
     {
         SetSav1Weather(0x14);
     }
@@ -2013,7 +2013,7 @@ void SetRoute119Weather(void)
 
 void SetRoute123Weather(void)
 {
-    if (is_light_level_1_2_3_5_or_6(get_map_light_from_warp0()) != TRUE)
+    if (is_map_type_1_2_3_5_or_6(get_map_type_from_warp0()) != TRUE)
     {
         SetSav1Weather(0x15);
     }
@@ -2140,10 +2140,10 @@ void sub_810FAA0(void)
         sub_810FF48();
         sub_810FD80();
         gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours;
-        FlagReset(0x315);
-        FlagReset(0x316);
-        FlagReset(0x317);
-        FlagReset(0x318);
+        FlagClear(0x315);
+        FlagClear(0x316);
+        FlagClear(0x317);
+        FlagClear(0x318);
         VarSet(VAR_0x4095, 1);
     }
 }
diff --git a/src/field_tasks.c b/src/field_tasks.c
index caf2ce6b9..2be54f923 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -10,7 +10,7 @@
 #include "item.h"
 #include "items.h"
 #include "event_data.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "clock.h"
 #include "script.h"
 #include "field_special_scene.h"
@@ -48,21 +48,25 @@ void Task_RunPerStepCallback(u8 taskId)
     gUnknown_08376364[idx](taskId);
 }
 
-static void RunTimeBasedEvents(s16 *taskData)
+#define tState           data[0]
+#define tAmbientCryState data[1]
+#define tAmbientCryDelay data[2]
+
+static void RunTimeBasedEvents(s16 *data)
 {
-    switch (*taskData)
+    switch (tState)
     {
         case 0:
             if (gMain.vblankCounter1 & 0x1000)
             {
                 DoTimeBasedEvents();
-                (*taskData)++;
+                tState++;
             }
             break;
         case 1:
             if (!(gMain.vblankCounter1 & 0x1000))
             {
-                (*taskData)--;
+                tState--;
             }
             break;
     }
@@ -70,14 +74,19 @@ static void RunTimeBasedEvents(s16 *taskData)
 
 void Task_RunTimeBasedEvents(u8 taskId)
 {
-    s16 *taskData = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
+
     if (!ScriptContext2_IsEnabled())
     {
-        RunTimeBasedEvents(taskData);
-        sub_80540D0(taskData + 1, taskData + 2);
+        RunTimeBasedEvents(data);
+        UpdateAmbientCry(&tAmbientCryState, &tAmbientCryDelay);
     }
 }
 
+#undef tState
+#undef tAmbientCryState
+#undef tAmbientCryDelay
+
 void Task_MuddySlope(u8);
 
 void SetUpFieldTasks(void)
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 0e0ec246c..3ad190a4b 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "fieldmap.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "secret_base.h"
 #include "tv.h"
@@ -31,7 +31,7 @@ static const struct ConnectionFlags sDummyConnectionFlags = {0};
 
 struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection)
 {
-    return get_mapheader_by_bank_and_number(connection->mapGroup, connection->mapNum);
+    return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum);
 }
 
 void not_trainer_hill_battle_pyramid(void)
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index b394d1e4c..00643a979 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -8,7 +8,7 @@
 #include "metatile_behavior.h"
 #include "metatile_behaviors.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rom6.h"
 #include "script.h"
 #include "songs.h"
@@ -28,7 +28,7 @@ extern struct MapPosition gUnknown_0203923C;
 
 extern u8 gLastFieldPokeMenuOpened;
 
-extern u8 UseCutScript;
+extern u8 S_UseCut[];
 
 bool8 SetUpFieldMove_Cut(void)
 {
@@ -38,7 +38,7 @@ bool8 SetUpFieldMove_Cut(void)
 
     if(npc_before_player_of_type(0x52) == TRUE) // is in front of tree?
     {
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_80A2634;
         return TRUE;
     }
@@ -57,7 +57,7 @@ bool8 SetUpFieldMove_Cut(void)
                     if(MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE
                     || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE)
                     {
-                        gFieldCallback = sub_808AB90;
+                        gFieldCallback = FieldCallback_Teleport;
                         gUnknown_03005CE4 = sub_80A25E8;
                         return TRUE;
                     }
@@ -70,8 +70,8 @@ bool8 SetUpFieldMove_Cut(void)
 
 void sub_80A25E8(void)
 {
-    FieldEffectStart(1);
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_CUT_ON_GRASS);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
 }
 
 bool8 FldEff_UseCutOnGrass(void)
@@ -86,8 +86,8 @@ bool8 FldEff_UseCutOnGrass(void)
 
 void sub_80A2634(void)
 {
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-    ScriptContext1_SetupScript(&UseCutScript);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    ScriptContext1_SetupScript(S_UseCut);
 }
 
 bool8 FldEff_UseCutOnTree(void)
@@ -102,8 +102,8 @@ bool8 FldEff_UseCutOnTree(void)
 
 void sub_80A2684(void)
 {
-    FieldEffectActiveListRemove(1);
-    FieldEffectStart(0x3A);
+    FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_GRASS);
+    FieldEffectStart(FLDEFF_CUT_GRASS);
 }
 
 bool8 FldEff_CutGrass(void)
@@ -272,19 +272,16 @@ void sub_80A2AB8(void)
 {
     u8 i;
 
-    for(i = 1; i < 8; i++)
-    {
+    for (i = 1; i < 8; i++)
         DestroySprite(&gSprites[gCutGrassSpriteArray[i]]);
-    }
-
-    FieldEffectStop(&gSprites[gCutGrassSpriteArray[0]], 0x3A);
+    FieldEffectStop(&gSprites[gCutGrassSpriteArray[0]], FLDEFF_CUT_GRASS);
     sub_8064E2C();
     ScriptContext2_Disable();
 }
 
 void sub_80A2B00(void)
 {
-    PlaySE(0x80);
-    FieldEffectActiveListRemove(2);
+    PlaySE(SE_W015);
+    FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE);
     EnableBothScriptContexts();
 }
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index 6c2633567..1ee8a8f05 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -4,7 +4,7 @@
 #include "main.h"
 #include "palette.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rom6.h"
 #include "script.h"
 #include "songs.h"
@@ -51,7 +51,7 @@ bool8 SetUpFieldMove_Flash(void)
 {
     if (gMapHeader.cave == TRUE && !FlagGet(SYS_USE_FLASH))
     {
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_810CBFC;
         return TRUE;
     }
@@ -62,7 +62,7 @@ bool8 SetUpFieldMove_Flash(void)
 void sub_810CBFC(void)
 {
     u8 taskId = oei_task_add();
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
     gTasks[taskId].data[8] = (uintptr_t)sub_810CC34 >> 16;
     gTasks[taskId].data[9] = (uintptr_t)sub_810CC34;
 }
@@ -123,8 +123,8 @@ void sub_810CC80(void)
 bool8 sub_810CD5C(void)
 {
     u8 i;
-    u8 v0 = get_map_light_from_warp0();
-    u8 v1 = sav1_map_get_light_level();
+    u8 v0 = get_map_type_from_warp0();
+    u8 v1 = Overworld_GetMapTypeOfSaveblockLocation();
 
     for (i = 0; gUnknown_083F7FC4[i].unk0; i++)
     {
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 81f4f63c6..d9603d094 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -18,14 +18,14 @@ extern u16 gScriptResult;
 extern void (*gFieldCallback)(void);
 extern void (*gUnknown_03005CE4)(void);
 
-extern u8 UseStrengthScript[];
+extern u8 S_UseStrength[];
 
 bool8 SetUpFieldMove_Strength(void)
 {
     if (ShouldDoBrailleStrengthEffect())
     {
         gScriptResult = gLastFieldPokeMenuOpened;
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_811AA38;
     }
     else
@@ -33,7 +33,7 @@ bool8 SetUpFieldMove_Strength(void)
         if (npc_before_player_of_type(87) != TRUE)
             return 0;
         gScriptResult = gLastFieldPokeMenuOpened;
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_811AA18;
     }
 
@@ -42,14 +42,14 @@ bool8 SetUpFieldMove_Strength(void)
 
 static void sub_811AA18(void)
 {
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-    ScriptContext1_SetupScript(UseStrengthScript);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    ScriptContext1_SetupScript(S_UseStrength);
 }
 
 static void sub_811AA38(void)
 {
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-    FieldEffectStart(40);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_STRENGTH);
 }
 
 bool8 FldEff_UseStrength(void)
@@ -58,7 +58,7 @@ bool8 FldEff_UseStrength(void)
 
     gTasks[taskId].data[8] = (u32)sub_811AA9C >> 16;
     gTasks[taskId].data[9] = (u32)sub_811AA9C;
-    GetMonNickname(&gPlayerParty[gUnknown_0202FF84[0]], gStringVar1);
+    GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1);
     return FALSE;
 }
 
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 4c3e6bf4a..b9dbf619d 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -23,15 +23,15 @@ extern u8 SweetScentNothingHereScript[];
 
 bool8 SetUpFieldMove_SweetScent(void)
 {
-    gFieldCallback = sub_808AB90;
+    gFieldCallback = FieldCallback_Teleport;
     gUnknown_03005CE4 = sub_812BFD4;
     return TRUE;
 }
 
 static void sub_812BFD4(void)
 {
-    FieldEffectStart(51);
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_SWEET_SCENT);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
 }
 
 bool8 FldEff_SweetScent()
@@ -51,7 +51,7 @@ static void sub_812C01C(void)
     BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, 0x1F);
     taskId = CreateTask(sub_812C084, 0);
     gTasks[taskId].data[0] = 0;
-    FieldEffectActiveListRemove(51);
+    FieldEffectActiveListRemove(FLDEFF_SWEET_SCENT);
 }
 
 static void sub_812C084(u8 taskId)
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 74e68df06..af48fb414 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -3,7 +3,7 @@
 #include "field_effect.h"
 #include "field_player_avatar.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rom6.h"
 #include "task.h"
 
@@ -13,9 +13,9 @@ extern void (*gUnknown_03005CE4)(void);
 
 bool8 SetUpFieldMove_Teleport(void)
 {
-    if (is_light_level_1_2_3_or_6(gMapHeader.mapType) == TRUE)
+    if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE)
     {
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = hm_teleport_run_dp02scr;
         return TRUE;
     }
@@ -25,9 +25,9 @@ bool8 SetUpFieldMove_Teleport(void)
 
 void hm_teleport_run_dp02scr(void)
 {
-    new_game();
-    FieldEffectStart(63);
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    Overworld_ResetStateAfterTeleport();
+    FieldEffectStart(FLDEFF_USE_TELEPORT);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
 }
 
 bool8 FldEff_UseTeleport(void)
@@ -41,6 +41,6 @@ bool8 FldEff_UseTeleport(void)
 
 void sub_814A404(void)
 {
-    FieldEffectActiveListRemove(63);
+    FieldEffectActiveListRemove(FLDEFF_USE_TELEPORT);
     sub_8087BA8();
 }
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 78909e289..10c999ef3 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "save.h"
 #include "species.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "m4a.h"
 #include "data2.h"
 #include "decompress.h"
diff --git a/src/hof_pc.c b/src/hof_pc.c
index 4646d171c..aeeb7fe17 100644
--- a/src/hof_pc.c
+++ b/src/hof_pc.c
@@ -2,7 +2,7 @@
 #include "hall_of_fame.h"
 #include "main.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "script_menu.h"
 #include "task.h"
@@ -30,8 +30,8 @@ static void ReshowPCMenuAfterHallOfFamePC(void)
     ScriptContext2_Enable();
     sub_8053E90();
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
-    TryCreatePCMenu();
-    sub_80B5838();
+    ScrSpecial_CreatePCMenu();
+    ScriptMenu_DisplayPCStartupPrompt();
     CreateTask(Task_WaitForPaletteFade, 10);
 }
 
diff --git a/src/item_menu.c b/src/item_menu.c
index 4436bdfbe..891eb135f 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -23,7 +23,7 @@
 #include "party_menu.h"
 #include "player_pc.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
@@ -3115,7 +3115,7 @@ static void sub_80A6760(u8 taskId)
 static void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
 {
     sub_80A36B8(gBGTilemapBuffers[1], 0, 0, 31, 31);
-    RemoveMoneyLabelObject(0, 0);
+    CloseMoneyWindow(0, 0);
     MenuZeroFillWindowRect(0, 4, 13, 13);
     MenuZeroFillWindowRect(0, 14, 29, 19);
     gTasks[taskId].func = sub_80A6760;
@@ -3123,20 +3123,20 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
 
 static void BuyMenuDisplayMessage(u16 itemId, u16 quantity)
 {
-    sub_80B7A94(ItemId_GetPrice(itemId) / 2 * quantity, 6, 6, 11);
+    PrintMoneyAmount(ItemId_GetPrice(itemId) / 2 * quantity, 6, 6, 11);
     ConvertIntToDecimalStringN(gStringVar1, ItemId_GetPrice(itemId) / 2 * quantity, STR_CONV_MODE_LEFT_ALIGN, 6);
 }
 
 static void sub_80A683C(void)
 {
-    sub_80B7C14(gSaveBlock1.money, 0, 0);
+    OpenMoneyWindow(gSaveBlock1.money, 0, 0);
     sub_80A4008(gBGTilemapBuffers[1], 1, 1, 12, 2);
 }
 
 static void sub_80A6870(u16 itemId, u8 quantity)
 {
-    sub_80B79B8(&gSaveBlock1.money, ItemId_GetPrice(itemId) / 2 * quantity);
-    sub_80B7BEC(gSaveBlock1.money, 0, 0);
+    AddMoney(&gSaveBlock1.money, ItemId_GetPrice(itemId) / 2 * quantity);
+    UpdateMoneyWindow(gSaveBlock1.money, 0, 0);
 }
 
 static void sub_80A68A4(void)
diff --git a/src/item_use.c b/src/item_use.c
index 1750c1584..8bc83bdc6 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -26,7 +26,7 @@
 #include "pokeblock.h"
 #include "pokemon_item_effect.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rom_8094928.h"
 #include "script.h"
 #include "songs.h"
@@ -36,10 +36,10 @@
 #include "task.h"
 #include "vars.h"
 
-extern void (* gUnknown_03005D00)(u8);
-extern void (* gFieldCallback)(void);
-extern void (* gUnknown_0300485C)(void);
-extern void (* gUnknown_03004AE4)(u8, u16, TaskFunc);
+extern void (*gUnknown_03005D00)(u8);
+extern void (*gFieldCallback)(void);
+extern void (*gUnknown_0300485C)(void);
+extern void (*gUnknown_03004AE4)(u8, u16, TaskFunc);
 
 extern u8 gUnknown_02038561;
 extern u8 gLastFieldPokeMenuOpened;
@@ -185,7 +185,7 @@ void ItemUseOutOfBattle_Bike(u8 taskId)
     }
     else
     {
-        if (IsBikingAllowedByMap() == TRUE && IsBikingDisallowedByPlayer() == FALSE)
+        if (Overworld_IsBikeAllowedOnCurrentMap() == TRUE && IsBikingDisallowedByPlayer() == FALSE)
         {
             gUnknown_03005D00 = (void *)ItemUseOnFieldCB_Bike;
             SetUpItemUseOnFieldCallback(taskId);
@@ -342,7 +342,7 @@ bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId)
     sub_80C9720(taskId);
 
     // hidden item detected?
-    if(gTasks[taskId].data[2] == TRUE)
+    if (gTasks[taskId].data[2] == TRUE)
         return TRUE;
     else
         return FALSE;
@@ -354,11 +354,11 @@ bool8 HiddenItemAtPos(struct MapEvents *events, s16 x, s16 y)
     struct BgEvent *bgEvent = events->bgEvents;
     int i;
 
-    for(i = 0; i < bgEventCount; i++)
+    for (i = 0; i < bgEventCount; i++)
     {
-        if(bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed?
+        if (bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed?
         {
-            if(!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + 600))
+            if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + 600))
                 return TRUE;
             else
                 return FALSE;
@@ -376,7 +376,7 @@ bool8 sub_80C9688(struct MapConnection *connection, int x, int y)
 
     mapHeader = mapconnection_get_mapheader(connection);
 
-    switch(connection->direction)
+    switch (connection->direction)
     {
     // same weird temp variable behavior seen in HiddenItemAtPos
     case 2:
@@ -592,7 +592,7 @@ void sub_80C9838(u8 taskId, s16 x, s16 y)
     s16 *data = gTasks[taskId].data;
     s16 var1, var2, var3, var4;
 
-    if(data[2] == FALSE)
+    if (data[2] == FALSE)
     {
         data[0] = x;
         data[1] = y;
@@ -602,34 +602,34 @@ void sub_80C9838(u8 taskId, s16 x, s16 y)
     {
         // data[0] and data[1] contain the player's coordinates.
         // x and y contain the item's coordinates.
-        if(data[0] < 0)
+        if (data[0] < 0)
             var1 = data[0] * -1; // item is to the left
         else
             var1 = data[0]; // item is to the right
 
-        if(data[1] < 0)
+        if (data[1] < 0)
             var2 = data[1] * -1; // item is to the north
         else
             var2 = data[1]; // item is to the south
 
-        if(x < 0)
+        if (x < 0)
             var3 = x * -1;
         else
             var3 = x;
 
-        if(y < 0)
+        if (y < 0)
             var4 = y * -1;
         else
             var4 = y;
 
-        if(var1 + var2 > var3 + var4)
+        if (var1 + var2 > var3 + var4)
         {
             data[0] = x;
             data[1] = y;
         }
         else
         {
-            if(var1 + var2 == var3 + var4 && (var2 > var4 || (var2 == var4 && data[1] < y)))
+            if (var1 + var2 == var3 + var4 && (var2 > var4 || (var2 == var4 && data[1] < y)))
             {
                 data[0] = x;
                 data[1] = y;
@@ -642,40 +642,40 @@ u8 GetPlayerDirectionTowardsHiddenItem(s16 itemX, s16 itemY)
 {
     s16 abX, abY;
 
-    if(itemX == 0 && itemY == 0)
+    if (itemX == 0 && itemY == 0)
         return DIR_NONE; // player is standing on the item.
 
     // get absolute X distance.
-    if(itemX < 0)
+    if (itemX < 0)
         abX = itemX * -1;
     else
         abX = itemX;
 
     // get absolute Y distance.
-    if(itemY < 0)
+    if (itemY < 0)
         abY = itemY * -1;
     else
         abY = itemY;
 
-    if(abX > abY)
+    if (abX > abY)
     {
-        if(itemX < 0)
+        if (itemX < 0)
             return DIR_EAST;
         else
             return DIR_NORTH;
     }
     else
     {
-        if(abX < abY)
+        if (abX < abY)
         {
-            if(itemY < 0)
+            if (itemY < 0)
                 return DIR_SOUTH;
             else
                 return DIR_WEST;
         }
-        if(abX == abY)
+        if (abX == abY)
         {
-            if(itemY < 0)
+            if (itemY < 0)
                 return DIR_SOUTH;
             else
                 return DIR_WEST;
@@ -694,7 +694,7 @@ void SetPlayerDirectionTowardsItem(u8 direction)
 
 void DisplayItemRespondingMessageAndExitItemfinder(u8 taskId)
 {
-    if(FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
+    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
         DisplayItemMessageOnField(taskId, gOtherText_ItemfinderResponding, ExitItemfinder, 0);
 }
 
@@ -702,7 +702,7 @@ void RotatePlayerAndExitItemfinder(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    if(FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
+    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
     || data[2] == FALSE)
     {
         SetPlayerDirectionTowardsItem(gItemFinderDirections[data[5]]);
@@ -710,18 +710,18 @@ void RotatePlayerAndExitItemfinder(u8 taskId)
         data[5] = (data[5] + 1) & 3;
         data[3]++;
 
-        if(data[3] == 4)
+        if (data[3] == 4)
             DisplayItemMessageOnField(taskId, gOtherText_ItemfinderItemUnderfoot, ExitItemfinder, 0);
     }
 }
 
 void ItemUseOutOfBattle_PokeblockCase(u8 taskId)
 {
-    if(sub_80F9344() == TRUE)
+    if (sub_80F9344() == TRUE)
     {
         DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[2]);
     }
-    else if(gTasks[taskId].data[2] != TRUE)
+    else if (gTasks[taskId].data[2] != TRUE)
     {
         sub_810BA7C(0);
         ItemMenu_ConfirmNormalFade(taskId);
@@ -739,7 +739,7 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId)
     ConvertIntToDecimalStringN(gStringVar1, GetCoins(), 0, 4);
     StringExpandPlaceholders(gStringVar4, gOtherText_Coins3);
 
-    if(!gTasks[taskId].data[2])
+    if (!gTasks[taskId].data[2])
     {
         MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
         DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1);
@@ -752,20 +752,20 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId)
 
 void sub_80C9BB8(u8 var)
 {
-    if(gMain.newKeys & A_BUTTON)
+    if (gMain.newKeys & A_BUTTON)
         CleanUpItemMenuMessage(var);
 }
 
 void sub_80C9BD8(u8 var)
 {
-    if(gMain.newKeys & A_BUTTON)
+    if (gMain.newKeys & A_BUTTON)
         CleanUpOverworldMessage(var);
 }
 
 // unused
 void ItemUseOutOfBattle_SSTicket(u8 taskId)
 {
-    if(gTasks[taskId].data[2] == 0)
+    if (gTasks[taskId].data[2] == 0)
     {
         MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
         DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)], sub_80C9BB8, 1);
@@ -778,7 +778,7 @@ void ItemUseOutOfBattle_SSTicket(u8 taskId)
 
 void sub_80C9C7C(u8 taskId)
 {
-    if(IsPlayerFacingPlantedBerryTree() == TRUE)
+    if (IsPlayerFacingPlantedBerryTree() == TRUE)
     {
         gUnknown_03005D00 = sub_80C9D00;
         gFieldCallback = ExecuteItemUseFromBlackPalette;
@@ -803,7 +803,7 @@ void sub_80C9D00(u8 taskId)
 
 void ItemUseOutOfBattle_WailmerPail(u8 taskId)
 {
-    if(TryToWaterBerryTree() == TRUE)
+    if (TryToWaterBerryTree() == TRUE)
     {
         gUnknown_03005D00 = sub_80C9D74;
         SetUpItemUseOnFieldCallback(taskId);
@@ -839,9 +839,9 @@ void ItemUseOutOfBattle_SacredAsh(u8 taskId)
 
     gLastFieldPokeMenuOpened = 0;
 
-    for(i = 0; i < 6; i++)
+    for (i = 0; i < 6; i++)
     {
-        if(GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != 0 && GetMonData(&gPlayerParty[i], MON_DATA_HP) == 0)
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != 0 && GetMonData(&gPlayerParty[i], MON_DATA_HP) == 0)
         {
             gLastFieldPokeMenuOpened = i;
             break;
@@ -874,7 +874,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId)
 {
     MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
 
-    if(gScriptItemId >= ITEM_HM01)
+    if (gScriptItemId >= ITEM_HM01)
         DisplayItemMessageOnField(taskId, gOtherText_BootedHM, sub_80C9EE4, 1); // HM
     else
         DisplayItemMessageOnField(taskId, gOtherText_BootedTM, sub_80C9EE4, 1); // TM
@@ -882,13 +882,13 @@ void ItemUseOutOfBattle_TMHM(u8 taskId)
 
 void sub_80C9EE4(u8 taskId)
 {
-    PlaySE(2);
+    PlaySE(SE_PC_LOGON);
     gTasks[taskId].func = sub_80C9F10;
 }
 
 void sub_80C9F10(u8 taskId)
 {
-    if(gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
     {
         StringCopy(gStringVar1, gMoveNames[ItemIdToBattleMoveId(gScriptItemId)]);
         StringExpandPlaceholders(gStringVar4, gOtherText_ContainsMove);
@@ -919,7 +919,7 @@ void sub_80C9FDC(void)
 
 void ItemUseOutOfBattle_Repel(u8 var)
 {
-    if(VarGet(VAR_REPEL_STEP_COUNT) == FALSE)
+    if (VarGet(VAR_REPEL_STEP_COUNT) == FALSE)
     {
         VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gScriptItemId));
         sub_80C9FDC();
@@ -941,26 +941,26 @@ void sub_80CA098(u8 taskId)
 {
     if(++gTasks[taskId].data[15] > 7)
     {
-        PlaySE(0x75);
+        PlaySE(SE_BIDORO);
         DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1);
     }
 }
 
 void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId)
 {
-    if(gScriptItemId == 43)
+    if (gScriptItemId == ITEM_WHITE_FLUTE)
     {
         FlagSet(SYS_ENC_UP_ITEM);
-        FlagReset(SYS_ENC_DOWN_ITEM);
+        FlagClear(SYS_ENC_DOWN_ITEM);
         sub_80CA07C();
         StringExpandPlaceholders(gStringVar4, gOtherText_UsedFlute);
         gTasks[taskId].func = sub_80CA098;
         gTasks[taskId].data[15] = 0;
     }
-    else if(gScriptItemId == 42)
+    else if (gScriptItemId == ITEM_BLACK_FLUTE)
     {
         FlagSet(SYS_ENC_DOWN_ITEM);
-        FlagReset(SYS_ENC_UP_ITEM);
+        FlagClear(SYS_ENC_UP_ITEM);
         sub_80CA07C();
         StringExpandPlaceholders(gStringVar4, gOtherText_UsedRepel);
         gTasks[taskId].func = sub_80CA098;
@@ -983,9 +983,9 @@ void sub_80CA18C(u8 taskId)
     DisplayItemMessageOnField(taskId, gStringVar4, task08_080A1C44, 0);
 }
 
-bool8 sub_80CA1C8(void)
+bool8 CanUseEscapeRopeOnCurrMap(void)
 {
-    if(gMapHeader.mapType == MAP_TYPE_UNDERGROUND)
+    if (gMapHeader.mapType == MAP_TYPE_UNDERGROUND)
         return TRUE;
     else
         return FALSE;
@@ -993,7 +993,7 @@ bool8 sub_80CA1C8(void)
 
 void ItemUseOutOfBattle_EscapeRope(u8 taskId)
 {
-    if(sub_80CA1C8() == TRUE) // is map type an area you can use escape rope?
+    if (CanUseEscapeRopeOnCurrMap() == TRUE)
     {
         gUnknown_03005D00 = sub_80CA18C;
         SetUpItemUseOnFieldCallback(taskId);
@@ -1012,7 +1012,7 @@ void ItemUseOutOfBattle_EvolutionStone(u8 var)
 
 void ItemUseInBattle_PokeBall(u8 var)
 {
-    if(PlayerPartyAndPokemonStorageFull() == FALSE) // have room for mon?
+    if (PlayerPartyAndPokemonStorageFull() == FALSE) // have room for mon?
     {
         RemoveBagItem(gScriptItemId, 1);
         sub_80A7094(var);
@@ -1026,7 +1026,7 @@ void ItemUseInBattle_PokeBall(u8 var)
 
 void sub_80CA294(u8 var)
 {
-    if(gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
         sub_80A7094(var);
 }
 
@@ -1034,7 +1034,7 @@ void sub_80CA2BC(u8 taskId)
 {
     if(++gTasks[taskId].data[15] > 7)
     {
-        PlaySE(1);
+        PlaySE(SE_KAIFUKU);
         RemoveBagItem(gScriptItemId, 1);
         DisplayItemMessageOnField(taskId, sub_803F378(gScriptItemId), sub_80CA294, 1);
     }
@@ -1046,7 +1046,7 @@ void ItemUseInBattle_StatIncrease(u8 taskId)
 
     MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
 
-    if(ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gScriptItemId, partyId, 0) != FALSE)
+    if (ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gScriptItemId, partyId, 0) != FALSE)
     {
         DisplayItemMessageOnField(taskId, gOtherText_WontHaveAnyEffect, CleanUpItemMenuMessage, 1);
     }
@@ -1059,7 +1059,7 @@ void ItemUseInBattle_StatIncrease(u8 taskId)
 
 void sub_80CA394(u8 taskId)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
         sub_8094E4C();
         gpu_pal_allocator_reset__manage_upper_four();
@@ -1095,7 +1095,7 @@ void unref_sub_80CA448(u8 var)
 {
     MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
 
-    if(ExecuteTableBasedItemEffect__(0, gScriptItemId, 0) == FALSE)
+    if (ExecuteTableBasedItemEffect__(0, gScriptItemId, 0) == FALSE)
     {
         RemoveBagItem(gScriptItemId, 1);
         GetMonNickname(&gPlayerParty[0], gStringVar1);
@@ -1125,7 +1125,7 @@ void ItemUseInBattle_Escape(u8 taskId)
 
 void ItemUseOutOfBattle_EnigmaBerry(u8 taskId)
 {
-    switch(GetItemEffectType(gScriptItemId) - 1)
+    switch (GetItemEffectType(gScriptItemId) - 1)
     {
     case 1:
     case 2:
@@ -1168,7 +1168,7 @@ void ItemUseOutOfBattle_EnigmaBerry(u8 taskId)
 
 void ItemUseInBattle_EnigmaBerry(u8 taskId)
 {
-    switch(GetItemEffectType(gScriptItemId))
+    switch (GetItemEffectType(gScriptItemId))
     {
     case 0:
         ItemUseInBattle_StatIncrease(taskId);
diff --git a/src/learn_move.c b/src/learn_move.c
index 51de68171..33252c66b 100644
--- a/src/learn_move.c
+++ b/src/learn_move.c
@@ -6,7 +6,7 @@
 #include "menu_cursor.h"
 #include "palette.h"
 #include "pokemon.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
diff --git a/src/load_save.c b/src/load_save.c
index 730aea2b8..8424b1121 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -3,7 +3,7 @@
 #include "load_save.h"
 #include "main.h"
 #include "pokemon.h"
-#include "rom4.h"
+#include "overworld.h"
 
 extern u8 gPlayerPartyCount;
 
diff --git a/src/m4a_4.c b/src/m4a_4.c
index 99195ec00..2e1d140b4 100644
--- a/src/m4a_4.c
+++ b/src/m4a_4.c
@@ -45,7 +45,7 @@ void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16
     mplayInfo->ident = ID_NUMBER;
 }
 
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 pitch)
+void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch)
 {
     s32 i;
     u32 bit;
diff --git a/src/mail.c b/src/mail.c
index 658d37976..c5dd119e3 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -8,7 +8,7 @@
 #include "name_string_util.h"
 #include "palette.h"
 #include "pokemon_icon.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "strings2.h"
@@ -92,7 +92,7 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2)
 
     ewram0.varFF = GAME_LANGUAGE;
     ewram0.var100 = 1;
-    ewram0.var104 = (MainCallback)sub_80EB3FC;
+    ewram0.var104 = (MainCallback)EasyChat_GetWordText;
     ewram0.var108 = (MainCallback)ConvertEasyChatWordsToString;
 
     mailDesign = arg0->itemId - ITEM_ORANGE_MAIL;
diff --git a/src/main.c b/src/main.c
index afaa0e77a..d7c11b6c8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,7 +9,7 @@
 #include "play_time.h"
 #include "rng.h"
 #include "rom3.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "siirtc.h"
 #include "sound.h"
diff --git a/src/main_menu.c b/src/main_menu.c
index 3b616065b..e0af86f3d 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -10,7 +10,7 @@
 #include "option_menu.h"
 #include "palette.h"
 #include "pokeball.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "save_menu_util.h"
 #include "songs.h"
@@ -56,32 +56,14 @@ extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E79AC[];
 
 extern u8 unk_2000000[];
 
-//Task data
-enum {
-    TD_MENULAYOUT,
-    TD_SELECTEDMENUITEM,
-};
-
 //Menu layouts
-enum {
+enum
+{
     HAS_NO_SAVED_GAME,  //NEW GAME, OPTION
     HAS_SAVED_GAME,     //CONTINUE, NEW GAME, OPTION
     HAS_MYSTERY_GIFT,   //CONTINUE, NEW GAME, MYSTERY EVENTS, OPTION
 };
 
-//Task data
-enum {
-    TD_TRAINER_SPRITE_ID = 2,       //Trainer sprite being displayed during gender menu
-    TD_BGHOFS = 4,                  //Used to set REG_BG1HOFS and slide the platform around
-    TD_SUBTASK_DONE,                //Set to true if the spawned task has finished
-    TD_GENDER_SELECTION,
-    TD_COUNTER,
-    TD_BIRCH_SPRITE_ID,
-    TD_AZURILL_SPRITE_ID,
-    TD_BRENDAN_SPRITE_ID,
-    TD_MAY_SPRITE_ID
-};
-
 static void CB2_MainMenu(void);
 static void VBlankCB_MainMenu(void);
 static void CB2_InitMainMenuFromOptions(void);
@@ -180,6 +162,9 @@ static void CB2_InitMainMenuFromOptions(void)
     InitMainMenu(TRUE);
 }
 
+#define tMenuLayout    data[0]
+#define tMenuSelection data[1]
+
 u32 InitMainMenu(u8 a1)
 {
     u16 savedIme;
@@ -239,7 +224,7 @@ u32 InitMainMenu(u8 a1)
                 | DISPCNT_WIN0_ON;
 
     taskId = CreateTask(Task_MainMenuCheckSave, 0);
-    gTasks[taskId].data[TD_SELECTEDMENUITEM] = 0;
+    gTasks[taskId].tMenuSelection = 0;
 
     return 0;
 }
@@ -261,9 +246,9 @@ void Task_MainMenuCheckSave(u8 taskId)
     {
     case 1:
         if (IsMysteryGiftEnabled() == TRUE)
-            gTasks[taskId].data[TD_MENULAYOUT] = HAS_MYSTERY_GIFT;
+            gTasks[taskId].tMenuLayout = HAS_MYSTERY_GIFT;
         else
-            gTasks[taskId].data[TD_MENULAYOUT] = HAS_SAVED_GAME;
+            gTasks[taskId].tMenuLayout = HAS_SAVED_GAME;
 
         gTasks[taskId].func = Task_MainMenuCheckRtc;
         break;
@@ -272,7 +257,7 @@ void Task_MainMenuCheckSave(u8 taskId)
         MenuPrintMessage(gSaveFileDeletedMessage, 3, 15);
         REG_WIN0H = WIN_RANGE(17, 223);
         REG_WIN0V = WIN_RANGE(113, 159);
-        gTasks[taskId].data[TD_MENULAYOUT] = HAS_NO_SAVED_GAME;
+        gTasks[taskId].tMenuLayout = HAS_NO_SAVED_GAME;
         gTasks[taskId].func = Task_MainMenuWaitForSaveErrorAck;
         break;
     case 255:
@@ -280,17 +265,17 @@ void Task_MainMenuCheckSave(u8 taskId)
         MenuPrintMessage(gSaveFileCorruptMessage, 3, 15);
         REG_WIN0H = WIN_RANGE(17, 223);
         REG_WIN0V = WIN_RANGE(113, 159);
-        gTasks[taskId].data[TD_MENULAYOUT] = HAS_SAVED_GAME;
+        gTasks[taskId].tMenuLayout = HAS_SAVED_GAME;
         gTasks[taskId].func = Task_MainMenuWaitForSaveErrorAck;
 
         if (IsMysteryGiftEnabled() == TRUE)
-            gTasks[taskId].data[TD_MENULAYOUT] = HAS_MYSTERY_GIFT;
+            gTasks[taskId].tMenuLayout = HAS_MYSTERY_GIFT;
         else
-            gTasks[taskId].data[TD_MENULAYOUT] = HAS_SAVED_GAME;
+            gTasks[taskId].tMenuLayout = HAS_SAVED_GAME;
         break;
     case 0:
     default:
-        gTasks[taskId].data[TD_MENULAYOUT] = HAS_NO_SAVED_GAME;
+        gTasks[taskId].tMenuLayout = HAS_NO_SAVED_GAME;
         gTasks[taskId].func = Task_MainMenuCheckRtc;
         break;
     case 4:
@@ -298,7 +283,7 @@ void Task_MainMenuCheckSave(u8 taskId)
         MenuPrintMessage(gBoardNotInstalledMessage, 3, 15);
         REG_WIN0H = WIN_RANGE(17, 223);
         REG_WIN0V = WIN_RANGE(113, 159);
-        gTasks[taskId].data[TD_MENULAYOUT] = HAS_NO_SAVED_GAME;
+        gTasks[taskId].tMenuLayout = HAS_NO_SAVED_GAME;
         gTasks[taskId].func = Task_MainMenuWaitForSaveErrorAck;
         return;
     }
@@ -383,7 +368,7 @@ void Task_MainMenuDraw(u8 taskId)
             LoadPalette(&palette, 241, 2);
         }
 
-        switch (gTasks[taskId].data[TD_MENULAYOUT])
+        switch (gTasks[taskId].tMenuLayout)
         {
         case HAS_NO_SAVED_GAME:
         default:
@@ -420,7 +405,7 @@ void Task_MainMenuDraw(u8 taskId)
 
 void Task_MainMenuHighlight(u8 taskId)
 {
-    HighlightCurrentMenuItem(gTasks[taskId].data[TD_MENULAYOUT], gTasks[taskId].data[TD_SELECTEDMENUITEM]);
+    HighlightCurrentMenuItem(gTasks[taskId].tMenuLayout, gTasks[taskId].tMenuSelection);
     gTasks[taskId].func = Task_MainMenuProcessKeyInput;
 }
 
@@ -444,7 +429,7 @@ bool8 MainMenuProcessKeyInput(u8 taskId)
     {
         s32 menuItemCount;
 
-        switch (gTasks[taskId].data[TD_MENULAYOUT])
+        switch (gTasks[taskId].tMenuLayout)
         {
         case HAS_NO_SAVED_GAME:
         default:
@@ -460,17 +445,17 @@ bool8 MainMenuProcessKeyInput(u8 taskId)
 
         if (gMain.newKeys & DPAD_UP)
         {
-            if (gTasks[taskId].data[TD_SELECTEDMENUITEM] > 0)
+            if (gTasks[taskId].tMenuSelection > 0)
             {
-                gTasks[taskId].data[TD_SELECTEDMENUITEM]--;
+                gTasks[taskId].tMenuSelection--;
                 return TRUE;
             }
         }
         if (gMain.newKeys & DPAD_DOWN)
         {
-            if (gTasks[taskId].data[TD_SELECTEDMENUITEM] < menuItemCount - 1)
+            if (gTasks[taskId].tMenuSelection < menuItemCount - 1)
             {
-                gTasks[taskId].data[TD_SELECTEDMENUITEM]++;
+                gTasks[taskId].tMenuSelection++;
                 return TRUE;
             }
         }
@@ -499,11 +484,11 @@ void Task_MainMenuPressedA(u8 taskId)
     if (gPaletteFade.active)
         return;
 
-    switch (gTasks[taskId].data[TD_MENULAYOUT])
+    switch (gTasks[taskId].tMenuLayout)
     {
     case HAS_NO_SAVED_GAME:
     default:
-        switch (gTasks[taskId].data[TD_SELECTEDMENUITEM])
+        switch (gTasks[taskId].tMenuSelection)
         {
         case 0:
         default:
@@ -515,7 +500,7 @@ void Task_MainMenuPressedA(u8 taskId)
         }
         break;
     case HAS_SAVED_GAME:
-        switch (gTasks[taskId].data[TD_SELECTEDMENUITEM])
+        switch (gTasks[taskId].tMenuSelection)
         {
         case 0:
         default:
@@ -530,7 +515,7 @@ void Task_MainMenuPressedA(u8 taskId)
         }
         break;
     case HAS_MYSTERY_GIFT:
-        switch (gTasks[taskId].data[TD_SELECTEDMENUITEM])
+        switch (gTasks[taskId].tMenuSelection)
         {
         case 0:
         default:
@@ -584,6 +569,9 @@ void Task_MainMenuPressedB(u8 taskId)
     }
 }
 
+#undef tMenuLayout
+#undef tMenuSelection
+
 void HighlightCurrentMenuItem(u8 layout, u8 menuItem)
 {
     REG_WIN0H = WIN_RANGE(9, 231);
@@ -710,6 +698,16 @@ void PrintBadgeCount(void)
     MenuPrint_PixelCoords(buffer, 205, 40, 1);
 }
 
+#define tTrainerSpriteId data[2]
+#define tBGhofs          data[4]
+#define tSubtaskIsDone   data[5]
+#define tGenderSelection data[6]
+#define tFrameCounter    data[7]
+#define tBirchSpriteId   data[8]
+#define tAzurillSpriteId data[9]
+#define tBrendanSpriteId data[10]
+#define tMaySpriteId     data[11]
+
 static void Task_NewGameSpeech1(u8 taskId)
 {
     SetUpWindowConfig(&gWindowConfig_81E6C3C);
@@ -732,25 +730,25 @@ static void Task_NewGameSpeech1(u8 taskId)
     BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
     REG_BG1CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP;
-    gTasks[taskId].data[TD_BGHOFS] = 0;
+    gTasks[taskId].tBGhofs = 0;
     gTasks[taskId].func = Task_NewGameSpeech2;
-    gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = 0xFF;
+    gTasks[taskId].tTrainerSpriteId = 0xFF;
     gTasks[taskId].data[3] = 0xFF;
-    gTasks[taskId].data[TD_COUNTER] = 216;  //Wait 3.6 seconds (216 frames) before starting speech
+    gTasks[taskId].tFrameCounter = 216;  //Wait 3.6 seconds (216 frames) before starting speech
 
     PlayBGM(BGM_DOORO_X4);
 }
 
 static void Task_NewGameSpeech2(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_COUNTER] != 0)
+    if (gTasks[taskId].tFrameCounter != 0)
     {
-        gTasks[taskId].data[TD_COUNTER]--;
+        gTasks[taskId].tFrameCounter--;
     }
     else
     {
         //Initialize Birch sprite
-        u8 spriteId = gTasks[taskId].data[TD_BIRCH_SPRITE_ID];
+        u8 spriteId = gTasks[taskId].tBirchSpriteId;
 
         gSprites[spriteId].pos1.x = 136;
         gSprites[spriteId].pos1.y = 60;
@@ -758,19 +756,19 @@ static void Task_NewGameSpeech2(u8 taskId)
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeIn(taskId, 10);
         StartBackgroundFadeIn(taskId, 20);
-        gTasks[taskId].data[TD_COUNTER] = 80;
+        gTasks[taskId].tFrameCounter = 80;
         gTasks[taskId].func = Task_NewGameSpeech3;
     }
 }
 
 static void Task_NewGameSpeech3(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE] != FALSE)
+    if (gTasks[taskId].tSubtaskIsDone)
     {
-        gSprites[gTasks[taskId].data[TD_BIRCH_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_NORMAL;
-        if (gTasks[taskId].data[TD_COUNTER])
+        gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
+        if (gTasks[taskId].tFrameCounter)
         {
-            gTasks[taskId].data[TD_COUNTER]--;
+            gTasks[taskId].tFrameCounter--;
         }
         else
         {
@@ -801,7 +799,7 @@ static void Task_NewGameSpeech5(u8 taskId)
 
 static void Task_NewGameSpeech6(u8 taskId)
 {
-    u8 spriteId = gTasks[taskId].data[TD_AZURILL_SPRITE_ID];
+    u8 spriteId = gTasks[taskId].tAzurillSpriteId;
 
     gSprites[spriteId].pos1.x = 104;
     gSprites[spriteId].pos1.y = 72;
@@ -809,7 +807,7 @@ static void Task_NewGameSpeech6(u8 taskId)
     gSprites[spriteId].data0 = 0;
     CreatePokeballSprite(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF);
     gTasks[taskId].func = Task_NewGameSpeech7;
-    gTasks[taskId].data[TD_COUNTER] = 0;
+    gTasks[taskId].tFrameCounter = 0;
 }
 
 static void Task_NewGameSpeech7(u8 taskId)
@@ -817,18 +815,18 @@ static void Task_NewGameSpeech7(u8 taskId)
     if (IsCryFinished())
     {
         //Go on to next sentence after frame 95
-        if (gTasks[taskId].data[TD_COUNTER] > 95)
+        if (gTasks[taskId].tFrameCounter > 95)
         {
             MenuSetText(gSystemText_NewPara);
             gTasks[taskId].func = Task_NewGameSpeech8;
         }
     }
 
-    if (gTasks[taskId].data[TD_COUNTER] < 16384)
+    if (gTasks[taskId].tFrameCounter < 16384)
     {
-        gTasks[taskId].data[TD_COUNTER]++;
+        gTasks[taskId].tFrameCounter++;
         //Play Azurill cry at frame 32
-        if (gTasks[taskId].data[TD_COUNTER] == 32)
+        if (gTasks[taskId].tFrameCounter == 32)
             PlayCry1(SPECIES_AZURILL, 0);
     }
 }
@@ -859,11 +857,11 @@ static void Task_NewGameSpeech10(u8 taskId)
 {
     if (BirchSpeechUpdateWindowText())
     {
-        gSprites[gTasks[taskId].data[TD_BIRCH_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND;
-        gSprites[gTasks[taskId].data[TD_AZURILL_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND;
+        gSprites[gTasks[taskId].tBirchSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
+        gSprites[gTasks[taskId].tAzurillSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeOut(taskId, 2);
         StartBackgroundFadeOut(taskId, 1);
-        gTasks[taskId].data[TD_COUNTER] = 64;
+        gTasks[taskId].tFrameCounter = 64;
         gTasks[taskId].func = Task_NewGameSpeech11;
     }
 }
@@ -871,41 +869,41 @@ static void Task_NewGameSpeech10(u8 taskId)
 //Slide platform away to the right
 static void Task_NewGameSpeech11(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_BGHOFS] != -60)
+    if (gTasks[taskId].tBGhofs != -60)
     {
-        gTasks[taskId].data[TD_BGHOFS] -= 2;
-        REG_BG1HOFS = gTasks[taskId].data[TD_BGHOFS];
+        gTasks[taskId].tBGhofs -= 2;
+        REG_BG1HOFS = gTasks[taskId].tBGhofs;
     }
     else
     {
-        gTasks[taskId].data[TD_BGHOFS] = -60;
+        gTasks[taskId].tBGhofs = -60;
         gTasks[taskId].func = Task_NewGameSpeech12;
     }
 }
 
 static void Task_NewGameSpeech12(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
         //Hide Birch and Azurill
-        gSprites[gTasks[taskId].data[TD_BIRCH_SPRITE_ID]].invisible = TRUE;
-        gSprites[gTasks[taskId].data[TD_AZURILL_SPRITE_ID]].invisible = TRUE;
+        gSprites[gTasks[taskId].tBirchSpriteId].invisible = TRUE;
+        gSprites[gTasks[taskId].tAzurillSpriteId].invisible = TRUE;
 
-        if (gTasks[taskId].data[TD_COUNTER])
+        if (gTasks[taskId].tFrameCounter)
         {
-            gTasks[taskId].data[TD_COUNTER]--;
+            gTasks[taskId].tFrameCounter--;
         }
         else
         {
             //Initialize Brendan sprite
-            u8 spriteId = gTasks[taskId].data[TD_BRENDAN_SPRITE_ID];
+            u8 spriteId = gTasks[taskId].tBrendanSpriteId;
 
             gSprites[spriteId].pos1.x = 180;
             gSprites[spriteId].pos1.y = 60;
             gSprites[spriteId].invisible = FALSE;
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
-            gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = spriteId;
-            gTasks[taskId].data[TD_GENDER_SELECTION] = 0;
+            gTasks[taskId].tTrainerSpriteId = spriteId;
+            gTasks[taskId].tGenderSelection = 0;
             StartSpriteFadeIn(taskId, 2);
             StartBackgroundFadeIn(taskId, 1);
             gTasks[taskId].func = Task_NewGameSpeech13;
@@ -915,9 +913,9 @@ static void Task_NewGameSpeech12(u8 taskId)
 
 static void Task_NewGameSpeech13(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
-        gSprites[gTasks[taskId].data[TD_TRAINER_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_NORMAL;
+        gSprites[gTasks[taskId].tTrainerSpriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
         gTasks[taskId].func = Task_NewGameSpeech14;
     }
 }
@@ -964,11 +962,11 @@ static void Task_NewGameSpeech16(u8 taskId)
 
     cursorPos = GetMenuCursorPos();
 
-    if (cursorPos != gTasks[taskId].data[TD_GENDER_SELECTION])
+    if (cursorPos != gTasks[taskId].tGenderSelection)
     {
         //Menu selection changed. Slide Brendan or May out and slide the other in
-        gTasks[taskId].data[TD_GENDER_SELECTION] = cursorPos;
-        gSprites[gTasks[taskId].data[TD_TRAINER_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND;
+        gTasks[taskId].tGenderSelection = cursorPos;
+        gSprites[gTasks[taskId].tTrainerSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeOut(taskId, 0);
         gTasks[taskId].func = Task_NewGameSpeech17;
     }
@@ -977,9 +975,9 @@ static void Task_NewGameSpeech16(u8 taskId)
 //Slide old trainer sprite off right of screen
 static void Task_NewGameSpeech17(u8 taskId)
 {
-    u8 spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+    u8 spriteId = gTasks[taskId].tTrainerSpriteId;
 
-    if (gTasks[taskId].data[TD_SUBTASK_DONE] == FALSE)
+    if (gTasks[taskId].tSubtaskIsDone == FALSE)
     {
         gSprites[spriteId].pos1.x += 4;     //Move sprite right
     }
@@ -988,14 +986,14 @@ static void Task_NewGameSpeech17(u8 taskId)
         gSprites[spriteId].invisible = TRUE;
 
         //Set up new trainer sprite
-        if (gTasks[taskId].data[TD_GENDER_SELECTION])
-            spriteId = gTasks[taskId].data[TD_MAY_SPRITE_ID];
+        if (gTasks[taskId].tGenderSelection)
+            spriteId = gTasks[taskId].tMaySpriteId;
         else
-            spriteId = gTasks[taskId].data[TD_BRENDAN_SPRITE_ID];
+            spriteId = gTasks[taskId].tBrendanSpriteId;
         gSprites[spriteId].pos1.x = 240;
         gSprites[spriteId].pos1.y = 60;
         gSprites[spriteId].invisible = FALSE;
-        gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = spriteId;
+        gTasks[taskId].tTrainerSpriteId = spriteId;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeIn(taskId, 0);
         gTasks[taskId].func = Task_NewGameSpeech18;
@@ -1005,7 +1003,7 @@ static void Task_NewGameSpeech17(u8 taskId)
 //Slide new trainer sprite from right of screen
 static void Task_NewGameSpeech18(u8 taskId)
 {
-    u8 spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+    u8 spriteId = gTasks[taskId].tTrainerSpriteId;
 
     if (gSprites[spriteId].pos1.x > 180)
     {
@@ -1014,7 +1012,7 @@ static void Task_NewGameSpeech18(u8 taskId)
     else
     {
         gSprites[spriteId].pos1.x = 180;
-        if (gTasks[taskId].data[TD_SUBTASK_DONE])
+        if (gTasks[taskId].tSubtaskIsDone)
         {
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
             gTasks[taskId].func = Task_NewGameSpeech16; //Go back to gender menu
@@ -1106,7 +1104,7 @@ static void Task_NewGameSpeech25(u8 taskId)
     case 0:     //YES
         PlaySE(SE_SELECT);
         MenuZeroFillWindowRect(2, 1, 8, 7);
-        gSprites[gTasks[taskId].data[TD_TRAINER_SPRITE_ID]].oam.objMode = ST_OAM_OBJ_BLEND;
+        gSprites[gTasks[taskId].tTrainerSpriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         StartSpriteFadeOut(taskId, 2);
         StartBackgroundFadeOut(taskId, 1);
         gTasks[taskId].func = Task_NewGameSpeech26;     //Continue
@@ -1122,10 +1120,10 @@ static void Task_NewGameSpeech25(u8 taskId)
 
 static void Task_NewGameSpeech26(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_BGHOFS])
+    if (gTasks[taskId].tBGhofs)
     {
-        gTasks[taskId].data[TD_BGHOFS] += 2;
-        REG_BG1HOFS = gTasks[taskId].data[TD_BGHOFS];
+        gTasks[taskId].tBGhofs += 2;
+        REG_BG1HOFS = gTasks[taskId].tBGhofs;
     }
     else
     {
@@ -1135,23 +1133,23 @@ static void Task_NewGameSpeech26(u8 taskId)
 
 static void Task_NewGameSpeech27(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
         s16 spriteId;
 
         //Hide Brendan and May sprites
-        spriteId = gTasks[taskId].data[TD_BRENDAN_SPRITE_ID];
+        spriteId = gTasks[taskId].tBrendanSpriteId;
         gSprites[spriteId].invisible = TRUE;
-        spriteId = gTasks[taskId].data[TD_MAY_SPRITE_ID];
+        spriteId = gTasks[taskId].tMaySpriteId;
         gSprites[spriteId].invisible = TRUE;
 
         //Fade in Birch and Azurill
-        spriteId = (u8)gTasks[taskId].data[TD_BIRCH_SPRITE_ID];
+        spriteId = (u8)gTasks[taskId].tBirchSpriteId;
         gSprites[spriteId].pos1.x = 136;
         gSprites[spriteId].pos1.y = 64;
         gSprites[spriteId].invisible = FALSE;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
-        spriteId = (u8)gTasks[taskId].data[TD_AZURILL_SPRITE_ID];
+        spriteId = (u8)gTasks[taskId].tAzurillSpriteId;
         gSprites[spriteId].pos1.x = 104;
         gSprites[spriteId].pos1.y = 72;
         gSprites[spriteId].invisible = FALSE;
@@ -1170,27 +1168,27 @@ static void Task_NewGameSpeech27(u8 taskId)
 
 static void Task_NewGameSpeech28(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
         s16 spriteId;
 
-        spriteId = gTasks[taskId].data[TD_BIRCH_SPRITE_ID];
+        spriteId = gTasks[taskId].tBirchSpriteId;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
 
-        spriteId = gTasks[taskId].data[TD_AZURILL_SPRITE_ID];
+        spriteId = gTasks[taskId].tAzurillSpriteId;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
 
         if (BirchSpeechUpdateWindowText())
         {
             //Fade out Birch and Azurill
-            spriteId = gTasks[taskId].data[TD_BIRCH_SPRITE_ID];
+            spriteId = gTasks[taskId].tBirchSpriteId;
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
-            spriteId = gTasks[taskId].data[TD_AZURILL_SPRITE_ID];
+            spriteId = gTasks[taskId].tAzurillSpriteId;
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
 
             StartSpriteFadeOut(taskId, 2);
             StartBackgroundFadeOut(taskId, 1);
-            gTasks[taskId].data[TD_COUNTER] = 64;
+            gTasks[taskId].tFrameCounter = 64;
             gTasks[taskId].func = Task_NewGameSpeech29;
         }
     }
@@ -1198,19 +1196,19 @@ static void Task_NewGameSpeech28(u8 taskId)
 
 static void Task_NewGameSpeech29(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
         s16 spriteId;
 
         //Hide Birch and Azurill
-        spriteId = gTasks[taskId].data[TD_BIRCH_SPRITE_ID];
+        spriteId = gTasks[taskId].tBirchSpriteId;
         gSprites[spriteId].invisible = TRUE;
-        spriteId = gTasks[taskId].data[TD_AZURILL_SPRITE_ID];
+        spriteId = gTasks[taskId].tAzurillSpriteId;
         gSprites[spriteId].invisible = TRUE;
 
-        if (gTasks[taskId].data[TD_COUNTER])
+        if (gTasks[taskId].tFrameCounter)
         {
-            gTasks[taskId].data[TD_COUNTER]--;
+            gTasks[taskId].tFrameCounter--;
         }
         else
         {
@@ -1218,14 +1216,14 @@ static void Task_NewGameSpeech29(u8 taskId)
 
             //Fade in trainer and background
             if (gSaveBlock2.playerGender)
-                spriteId = (u8)gTasks[taskId].data[TD_MAY_SPRITE_ID];
+                spriteId = (u8)gTasks[taskId].tMaySpriteId;
             else
-                spriteId = (u8)gTasks[taskId].data[TD_BRENDAN_SPRITE_ID];
+                spriteId = (u8)gTasks[taskId].tBrendanSpriteId;
             gSprites[spriteId].pos1.x = 120;
             gSprites[spriteId].pos1.y = 60;
             gSprites[spriteId].invisible = FALSE;
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
-            gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = spriteId;
+            gTasks[taskId].tTrainerSpriteId = spriteId;
 
             StartSpriteFadeIn(taskId, 2);
             StartBackgroundFadeIn(taskId, 1);
@@ -1238,18 +1236,18 @@ static void Task_NewGameSpeech29(u8 taskId)
 
 static void Task_NewGameSpeech30(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_SUBTASK_DONE])
+    if (gTasks[taskId].tSubtaskIsDone)
     {
         s16 spriteId;
 
-        spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+        spriteId = gTasks[taskId].tTrainerSpriteId;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
 
         if (BirchSpeechUpdateWindowText())
         {
             u8 spriteId;
 
-            spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+            spriteId = gTasks[taskId].tTrainerSpriteId;
             gSprites[spriteId].oam.affineMode = 1;
             gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_81E79AC;
             InitSpriteAffineAnim(&gSprites[spriteId]);
@@ -1264,7 +1262,7 @@ static void Task_NewGameSpeech30(u8 taskId)
 
 static void Task_NewGameSpeech31(u8 taskId)
 {
-    u8 spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+    u8 spriteId = gTasks[taskId].tTrainerSpriteId;
 
     if (gSprites[spriteId].affineAnimEnded)
         gTasks[taskId].func = Task_NewGameSpeech32;
@@ -1274,7 +1272,7 @@ static void Task_NewGameSpeech32(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        u8 spriteId = gTasks[taskId].data[TD_TRAINER_SPRITE_ID];
+        u8 spriteId = gTasks[taskId].tTrainerSpriteId;
         gSprites[spriteId].callback = nullsub_34;
         REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON;
         BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0x10, 0xFFFF);
@@ -1328,7 +1326,7 @@ void CB_ContinueNewGameSpeechPart2()
 
     taskId = CreateTask(Task_NewGameSpeech23, 0);
 
-    gTasks[taskId].data[TD_BGHOFS] = -60;
+    gTasks[taskId].tBGhofs = -60;
 
     remove_some_task();
     ResetSpriteData();
@@ -1340,20 +1338,20 @@ void CB_ContinueNewGameSpeechPart2()
 
     if (gSaveBlock2.playerGender != MALE)
     {
-        gTasks[taskId].data[TD_GENDER_SELECTION] = FEMALE;
-        spriteId = gTasks[taskId].data[TD_MAY_SPRITE_ID];
+        gTasks[taskId].tGenderSelection = FEMALE;
+        spriteId = gTasks[taskId].tMaySpriteId;
     }
     else
     {
-        gTasks[taskId].data[TD_GENDER_SELECTION] = MALE;
-        spriteId = gTasks[taskId].data[TD_BRENDAN_SPRITE_ID];
+        gTasks[taskId].tGenderSelection = MALE;
+        spriteId = gTasks[taskId].tBrendanSpriteId;
     }
 
     gSprites[spriteId].pos1.x = 180;
     gSprites[spriteId].pos1.y = 60;
     gSprites[spriteId].invisible = FALSE;
 
-    gTasks[taskId].data[TD_TRAINER_SPRITE_ID] = spriteId;
+    gTasks[taskId].tTrainerSpriteId = spriteId;
 
     REG_BG1HOFS = -60;
 
@@ -1412,56 +1410,67 @@ void AddBirchSpeechObjects(u8 taskId)
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].oam.priority = 0;
     gSprites[spriteId].invisible = 1;
-    gTasks[taskId].data[TD_BIRCH_SPRITE_ID] = spriteId;
+    gTasks[taskId].tBirchSpriteId = spriteId;
 
     spriteId = CreateAzurillSprite(0x68, 0x48);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].oam.priority = 0;
     gSprites[spriteId].invisible = 1;
-    gTasks[taskId].data[TD_AZURILL_SPRITE_ID] = spriteId;
+    gTasks[taskId].tAzurillSpriteId = spriteId;
 
     //Create Brendan sprite
     spriteId = CreateTrainerSprite(0, 120, 60, 0, unk_2000000);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].invisible = 1;
     gSprites[spriteId].oam.priority = 0;
-    gTasks[taskId].data[TD_BRENDAN_SPRITE_ID] = spriteId;
+    gTasks[taskId].tBrendanSpriteId = spriteId;
 
     //Create May sprite
     spriteId = CreateTrainerSprite(1, 120, 60, 0, unk_2000000 + 0x800);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].invisible = 1;
     gSprites[spriteId].oam.priority = 0;
-    gTasks[taskId].data[TD_MAY_SPRITE_ID] = spriteId;
+    gTasks[taskId].tMaySpriteId = spriteId;
 }
 
-enum {
-    TD_PARENT_TASK_ID,
-    TD_EVA,             //EVA coefficient of REG_BLDALPHA
-    TD_EVB,             //EVB coefficient of REG_BLDALPHA
-    TD_INTERVAL,
-    TD_FRAMECOUNTER
-};
+#undef tTrainerSpriteId
+#undef tBGhofs
+//#undef tSubtaskIsDone
+#undef tGenderSelection
+#undef tFrameCounter
+#undef tBirchSpriteId
+#undef tAzurillSpriteId
+#undef tBrendanSpriteId
+#undef tMaySpriteId
+
+
+// Sprite Fade task
+
+#define tMainTaskId     data[0]
+#define tBlendEVA       data[1]
+#define tBlendEVB       data[2]
+#define tUpdateInterval data[3]
+#define tFrameCounter   data[4]
 
 static void Task_SpriteFadeOut(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_EVA] == 0)
+    if (gTasks[taskId].tBlendEVA == 0)
     {
-        gTasks[gTasks[taskId].data[TD_PARENT_TASK_ID]].data[TD_SUBTASK_DONE] = TRUE;
+        gTasks[gTasks[taskId].tMainTaskId].tSubtaskIsDone = TRUE;
         DestroyTask(taskId);
     }
     else
     {
-        if (gTasks[taskId].data[TD_FRAMECOUNTER])
+        if (gTasks[taskId].tFrameCounter)
         {
-            gTasks[taskId].data[TD_FRAMECOUNTER]--;
+            gTasks[taskId].tFrameCounter--;
         }
         else
         {
-            gTasks[taskId].data[TD_FRAMECOUNTER] = gTasks[taskId].data[TD_INTERVAL];
-            gTasks[taskId].data[TD_EVA]--;
-            gTasks[taskId].data[TD_EVB]++;
-            REG_BLDALPHA = gTasks[taskId].data[TD_EVA] + (gTasks[taskId].data[TD_EVB] * 256);
+            gTasks[taskId].tFrameCounter = gTasks[taskId].tUpdateInterval;
+            gTasks[taskId].tBlendEVA--;
+            gTasks[taskId].tBlendEVB++;
+            REG_BLDALPHA = gTasks[taskId].tBlendEVA + (gTasks[taskId].tBlendEVB * 256);
         }
     }
 }
@@ -1474,33 +1483,33 @@ static void StartSpriteFadeOut(u8 taskId, u8 interval)
     REG_BLDCNT = 592;
     REG_BLDALPHA = 16;
     REG_BLDY = 0;
-    gTasks[taskId].data[TD_SUBTASK_DONE] = FALSE;
+    gTasks[taskId].tSubtaskIsDone = FALSE;
     newTaskId = CreateTask(Task_SpriteFadeOut, 0);
 
-    gTasks[newTaskId].data[TD_PARENT_TASK_ID] = taskId;
-    gTasks[newTaskId].data[TD_EVA] = 16;
-    gTasks[newTaskId].data[TD_EVB] = 0;
-    gTasks[newTaskId].data[TD_INTERVAL] = interval;
-    gTasks[newTaskId].data[TD_FRAMECOUNTER] = interval;
+    gTasks[newTaskId].tMainTaskId = taskId;
+    gTasks[newTaskId].tBlendEVA = 16;
+    gTasks[newTaskId].tBlendEVB = 0;
+    gTasks[newTaskId].tUpdateInterval = interval;
+    gTasks[newTaskId].tFrameCounter = interval;
 }
 
 static void Task_SpriteFadeIn(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_EVA] == 16)
+    if (gTasks[taskId].tBlendEVA == 16)
     {
-        gTasks[gTasks[taskId].data[TD_PARENT_TASK_ID]].data[TD_SUBTASK_DONE] = TRUE;
+        gTasks[gTasks[taskId].tMainTaskId].tSubtaskIsDone = TRUE;
         DestroyTask(taskId);
     }
-    else if (gTasks[taskId].data[TD_FRAMECOUNTER])
+    else if (gTasks[taskId].tFrameCounter)
     {
-        gTasks[taskId].data[TD_FRAMECOUNTER]--;
+        gTasks[taskId].tFrameCounter--;
     }
     else
     {
-        gTasks[taskId].data[TD_FRAMECOUNTER] = gTasks[taskId].data[TD_INTERVAL];
-        gTasks[taskId].data[TD_EVA]++;
-        gTasks[taskId].data[TD_EVB]--;
-        REG_BLDALPHA = gTasks[taskId].data[TD_EVA] + (gTasks[taskId].data[TD_EVB] * 256);
+        gTasks[taskId].tFrameCounter = gTasks[taskId].tUpdateInterval;
+        gTasks[taskId].tBlendEVA++;
+        gTasks[taskId].tBlendEVB--;
+        REG_BLDALPHA = gTasks[taskId].tBlendEVA + (gTasks[taskId].tBlendEVB * 256);
     }
 }
 
@@ -1512,36 +1521,49 @@ static void StartSpriteFadeIn(u8 taskId, u8 interval)
     REG_BLDCNT = 592;
     REG_BLDALPHA = 4096;
     REG_BLDY = 0;
-    gTasks[taskId].data[TD_SUBTASK_DONE] = FALSE;
+    gTasks[taskId].tSubtaskIsDone = FALSE;
     newTaskId = CreateTask(Task_SpriteFadeIn, 0);
 
-    gTasks[newTaskId].data[TD_PARENT_TASK_ID] = taskId;
-    gTasks[newTaskId].data[TD_EVA] = 0;
-    gTasks[newTaskId].data[TD_EVB] = 16;
-    gTasks[newTaskId].data[TD_INTERVAL] = interval;
-    gTasks[newTaskId].data[TD_FRAMECOUNTER] = interval;
+    gTasks[newTaskId].tMainTaskId = taskId;
+    gTasks[newTaskId].tBlendEVA = 0;
+    gTasks[newTaskId].tBlendEVB = 16;
+    gTasks[newTaskId].tUpdateInterval = interval;
+    gTasks[newTaskId].tFrameCounter = interval;
 }
 
-enum {
-    TD_FADELEVEL = 1,
-    TD_DELAY,
-};
+#undef tMainTaskId
+#undef tBlendEVA
+#undef tBlendEVB
+#undef tUpdateInterval
+#undef tFrameCounter
+
+
+// Background fade task
+
+#define tMainTaskId     data[0]
+#define tFadeLevel      data[1]
+#define tDelay          data[2]
+#define tUpdateInterval data[3]
+#define tFrameCounter   data[4]
 
 static void HandleFloorShadowFadeOut(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_DELAY])
-        gTasks[taskId].data[TD_DELAY]--;
+    if (gTasks[taskId].tDelay)
+        gTasks[taskId].tDelay--;
     else
     {
-        if (gTasks[taskId].data[TD_FADELEVEL] == 8)
+        if (gTasks[taskId].tFadeLevel == 8)
             DestroyTask(taskId);
-        else if (gTasks[taskId].data[TD_FRAMECOUNTER])
-            gTasks[taskId].data[TD_FRAMECOUNTER]--;
         else
         {
-            gTasks[taskId].data[TD_FRAMECOUNTER] = gTasks[taskId].data[TD_INTERVAL];
-            gTasks[taskId].data[TD_FADELEVEL]++;
-            LoadPalette(&gUnknown_081E795C[gTasks[taskId].data[TD_FADELEVEL]], 1, 0x10);
+            if (gTasks[taskId].tFrameCounter)
+                gTasks[taskId].tFrameCounter--;
+            else
+            {
+                gTasks[taskId].tFrameCounter = gTasks[taskId].tUpdateInterval;
+                gTasks[taskId].tFadeLevel++;
+                LoadPalette(&gUnknown_081E795C[gTasks[taskId].tFadeLevel], 1, 0x10);
+            }
         }
     }
 }
@@ -1550,30 +1572,30 @@ static void HandleFloorShadowFadeOut(u8 taskId)
 static void StartBackgroundFadeOut(u8 taskId, u8 interval)
 {
     u8 newTaskId = CreateTask(HandleFloorShadowFadeOut, 0);
-    gTasks[newTaskId].data[TD_PARENT_TASK_ID] = taskId;
-    gTasks[newTaskId].data[TD_FADELEVEL] = 0;
-    gTasks[newTaskId].data[TD_DELAY] = 8;
-    gTasks[newTaskId].data[TD_INTERVAL] = interval;
-    gTasks[newTaskId].data[TD_FRAMECOUNTER] = interval;
+    gTasks[newTaskId].tMainTaskId = taskId;
+    gTasks[newTaskId].tFadeLevel = 0;
+    gTasks[newTaskId].tDelay = 8;
+    gTasks[newTaskId].tUpdateInterval = interval;
+    gTasks[newTaskId].tFrameCounter = interval;
 }
 
 static void HandleFloorShadowFadeIn(u8 taskId)
 {
-    if (gTasks[taskId].data[TD_DELAY])
-        gTasks[taskId].data[TD_DELAY]--;
+    if (gTasks[taskId].tDelay)
+        gTasks[taskId].tDelay--;
     else
     {
-        if (gTasks[taskId].data[TD_FADELEVEL] == 0)
+        if (gTasks[taskId].tFadeLevel == 0)
             DestroyTask(taskId);
         else
         {
-            if (gTasks[taskId].data[TD_FRAMECOUNTER])
-                gTasks[taskId].data[TD_FRAMECOUNTER]--;
+            if (gTasks[taskId].tFrameCounter)
+                gTasks[taskId].tFrameCounter--;
             else
             {
-                gTasks[taskId].data[TD_FRAMECOUNTER] = gTasks[taskId].data[TD_INTERVAL];
-                gTasks[taskId].data[TD_FADELEVEL]--;
-                LoadPalette(&gUnknown_081E795C[gTasks[taskId].data[TD_FADELEVEL]], 1, 0x10);
+                gTasks[taskId].tFrameCounter = gTasks[taskId].tUpdateInterval;
+                gTasks[taskId].tFadeLevel--;
+                LoadPalette(&gUnknown_081E795C[gTasks[taskId].tFadeLevel], 1, 0x10);
             }
         }
     }
@@ -1583,12 +1605,18 @@ static void HandleFloorShadowFadeIn(u8 taskId)
 static void StartBackgroundFadeIn(u8 taskId, u8 interval)
 {
     u8 newTaskId = CreateTask(HandleFloorShadowFadeIn, 0);
-    gTasks[newTaskId].data[TD_PARENT_TASK_ID] = taskId;
-    gTasks[newTaskId].data[TD_FADELEVEL] = 8;
-    gTasks[newTaskId].data[TD_DELAY] = 8;
-    gTasks[newTaskId].data[TD_INTERVAL] = interval;
-    gTasks[newTaskId].data[TD_FRAMECOUNTER] = interval;
-}
+    gTasks[newTaskId].tMainTaskId = taskId;
+    gTasks[newTaskId].tFadeLevel = 8;
+    gTasks[newTaskId].tDelay = 8;
+    gTasks[newTaskId].tUpdateInterval = interval;
+    gTasks[newTaskId].tFrameCounter = interval;
+}
+
+#undef tMainTaskId
+#undef tFadeLevel
+#undef tDelay
+#undef tUpdateInterval
+#undef tFrameCounter
 
 static void CreateGenderMenu(u8 left, u8 top)
 {
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c
index bd40bcacc..2856320b8 100644
--- a/src/map_obj_lock.c
+++ b/src/map_obj_lock.c
@@ -75,7 +75,7 @@ bool8 sub_8064DB4(void)
     }
 }
 
-void sub_8064DD8(void)
+void LockSelectedMapObject(void)
 {
     u8 taskId;
     FreezeMapObjectsExceptOne(gSelectedMapObject);
diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c
index 3665cabd8..c7d81f502 100644
--- a/src/matsuda_debug_menu.c
+++ b/src/matsuda_debug_menu.c
@@ -8,7 +8,7 @@
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sprite.h"
 #include "start_menu.h"
 #include "string_util.h"
diff --git a/src/mauville_man.c b/src/mauville_man.c
new file mode 100644
index 000000000..33bc39648
--- /dev/null
+++ b/src/mauville_man.c
@@ -0,0 +1,1311 @@
+#include "global.h"
+#include "bard_music.h"
+#include "mauville_man.h"
+#include "easy_chat.h"
+#include "event_data.h"
+#include "field_message_box.h"
+#include "m4a.h"
+#include "menu.h"
+#include "overworld.h"
+#include "rng.h"
+#include "script.h"
+#include "songs.h"
+#include "sound.h"
+#include "string_util.h"
+#include "strings.h"
+#include "task.h"
+#include "trader.h"
+
+#define MACRO1(a) (((a) % 4) + (((a) / 8) & 1))
+
+extern struct MusicPlayerInfo gMPlay_SE2;
+
+extern u16 gScriptResult;
+extern u16 gSpecialVar_0x8004;
+
+extern const u8 gTextStoryteller_Story1Title[];
+extern const u8 gTextStoryteller_Story1Action[];
+extern const u8 gTextStoryteller_Story1Text[];
+extern const u8 gTextStoryteller_Story2Title[];
+extern const u8 gTextStoryteller_Story2Action[];
+extern const u8 gTextStoryteller_Story2Text[];
+extern const u8 gTextStoryteller_Story3Title[];
+extern const u8 gTextStoryteller_Story3Action[];
+extern const u8 gTextStoryteller_Story3Text[];
+extern const u8 gTextStoryteller_Story4Title[];
+extern const u8 gTextStoryteller_Story4Action[];
+extern const u8 gTextStoryteller_Story4Text[];
+extern const u8 gTextStoryteller_Story5Title[];
+extern const u8 gTextStoryteller_Story5Action[];
+extern const u8 gTextStoryteller_Story5Text[];
+extern const u8 gTextStoryteller_Story6Title[];
+extern const u8 gTextStoryteller_Story6Action[];
+extern const u8 gTextStoryteller_Story6Text[];
+extern const u8 gTextStoryteller_Story7Title[];
+extern const u8 gTextStoryteller_Story7Action[];
+extern const u8 gTextStoryteller_Story7Text[];
+extern const u8 gTextStoryteller_Story8Title[];
+extern const u8 gTextStoryteller_Story8Action[];
+extern const u8 gTextStoryteller_Story8Text[];
+extern const u8 gTextStoryteller_Story9Title[];
+extern const u8 gTextStoryteller_Story9Action[];
+extern const u8 gTextStoryteller_Story9Text[];
+extern const u8 gTextStoryteller_Story10Title[];
+extern const u8 gTextStoryteller_Story10Action[];
+extern const u8 gTextStoryteller_Story10Text[];
+extern const u8 gTextStoryteller_Story11Title[];
+extern const u8 gTextStoryteller_Story11Action[];
+extern const u8 gTextStoryteller_Story11Text[];
+extern const u8 gTextStoryteller_Story12Title[];
+extern const u8 gTextStoryteller_Story12Action[];
+extern const u8 gTextStoryteller_Story12Text[];
+extern const u8 gTextStoryteller_Story13Title[];
+extern const u8 gTextStoryteller_Story13Action[];
+extern const u8 gTextStoryteller_Story13Text[];
+extern const u8 gTextStoryteller_Story14Title[];
+extern const u8 gTextStoryteller_Story14Action[];
+extern const u8 gTextStoryteller_Story14Text[];
+extern const u8 gTextStoryteller_Story15Title[];
+extern const u8 gTextStoryteller_Story15Action[];
+extern const u8 gTextStoryteller_Story15Text[];
+extern const u8 gTextStoryteller_Story16Title[];
+extern const u8 gTextStoryteller_Story16Action[];
+extern const u8 gTextStoryteller_Story16Text[];
+extern const u8 gTextStoryteller_Story17Title[];
+extern const u8 gTextStoryteller_Story17Action[];
+extern const u8 gTextStoryteller_Story17Text[];
+extern const u8 gTextStoryteller_Story18Title[];
+extern const u8 gTextStoryteller_Story18Action[];
+extern const u8 gTextStoryteller_Story18Text[];
+extern const u8 gTextStoryteller_Story19Title[];
+extern const u8 gTextStoryteller_Story19Action[];
+extern const u8 gTextStoryteller_Story19Text[];
+extern const u8 gTextStoryteller_Story20Title[];
+extern const u8 gTextStoryteller_Story20Action[];
+extern const u8 gTextStoryteller_Story20Text[];
+extern const u8 gTextStoryteller_Story21Title[];
+extern const u8 gTextStoryteller_Story21Action[];
+extern const u8 gTextStoryteller_Story21Text[];
+extern const u8 gTextStoryteller_Story22Title[];
+extern const u8 gTextStoryteller_Story22Action[];
+extern const u8 gTextStoryteller_Story22Text[];
+extern const u8 gTextStoryteller_Story23Title[];
+extern const u8 gTextStoryteller_Story23Action[];
+extern const u8 gTextStoryteller_Story23Text[];
+extern const u8 gTextStoryteller_Story24Title[];
+extern const u8 gTextStoryteller_Story24Action[];
+extern const u8 gTextStoryteller_Story24Text[];
+extern const u8 gTextStoryteller_Story25Title[];
+extern const u8 gTextStoryteller_Story25Action[];
+extern const u8 gTextStoryteller_Story25Text[];
+extern const u8 gTextStoryteller_Story26Title[];
+extern const u8 gTextStoryteller_Story26Action[];
+extern const u8 gTextStoryteller_Story26Text[];
+extern const u8 gTextStoryteller_Story27Title[];
+extern const u8 gTextStoryteller_Story27Action[];
+extern const u8 gTextStoryteller_Story27Text[];
+extern const u8 gTextStoryteller_Story28Title[];
+extern const u8 gTextStoryteller_Story28Action[];
+extern const u8 gTextStoryteller_Story28Text[];
+extern const u8 gTextStoryteller_Story29Title[];
+extern const u8 gTextStoryteller_Story29Action[];
+extern const u8 gTextStoryteller_Story29Text[];
+extern const u8 gTextStoryteller_Story30Title[];
+extern const u8 gTextStoryteller_Story30Action[];
+extern const u8 gTextStoryteller_Story30Text[];
+extern const u8 gTextStoryteller_Story31Title[];
+extern const u8 gTextStoryteller_Story31Action[];
+extern const u8 gTextStoryteller_Story31Text[];
+extern const u8 gTextStoryteller_Story32Title[];
+extern const u8 gTextStoryteller_Story32Action[];
+extern const u8 gTextStoryteller_Story32Text[];
+extern const u8 gTextStoryteller_Story33Title[];
+extern const u8 gTextStoryteller_Story33Action[];
+extern const u8 gTextStoryteller_Story33Text[];
+extern const u8 gTextStoryteller_Story34Title[];
+extern const u8 gTextStoryteller_Story34Action[];
+extern const u8 gTextStoryteller_Story34Text[];
+extern const u8 gTextStoryteller_Story35Title[];
+extern const u8 gTextStoryteller_Story35Action[];
+extern const u8 gTextStoryteller_Story35Text[];
+extern const u8 gTextStoryteller_Story36Title[];
+extern const u8 gTextStoryteller_Story36Action[];
+extern const u8 gTextStoryteller_Story36Text[];
+
+extern struct BardSong gUnknown_03005DA0;
+
+EWRAM_DATA static u16 gUnknown_020388BC = 0;  // set but not used?
+
+static const u16 sDefaultBardSongLyrics[] =
+{
+#ifdef ENGLISH
+    EC_WORD_SISTER,
+    EC_WORD_EATS,
+    EC_WORD_SWEETS,
+    EC_WORD_VORACIOUS,
+    EC_WORD_AND,
+    EC_WORD_DROOLING,
+#else
+    EC_WORD_SISTER,
+    EC_WORD_MUST_BE,
+    EC_WORD_SWEETS,
+    EC_WORD_VORACIOUS,
+    EC_WORD_DROOLING,
+    EC_WORD_THICK,
+#endif
+};
+
+static const u8 *const sGiddyAdjectives[] =
+{
+    OtherText_SoPretty,
+    OtherText_SoDarling,
+    OtherText_SoRelaxed,
+    OtherText_SoSunny,
+    OtherText_SoDesirable,
+    OtherText_SoExciting,
+    OtherText_SoAmusing,
+    OtherText_SoMagical,
+};
+
+static const u8 *const sGiddyQuestions[] =
+{
+    OtherText_WantVacationNicePlace,
+    OtherText_BoughtCrayonsIsNice,
+    OtherText_IfWeCouldFloat,
+    OtherText_SandWashesAwayMakeSad,
+    OtherText_WhatsBottomSeaLike,
+    OtherText_SeeSettingSun,
+    OtherText_LyingInGreenGrass,
+    OtherText_SecretBasesWonderful,
+};
+
+static void sub_80F7DC0(void);
+static void Task_BardSong(u8);
+static void StartBardSong(u8);
+static void StorytellerSetup(void);
+static void sub_80F8428(void);
+
+static void SetupBard(void)
+{
+    u16 i;
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    bard->id = MAUVILLE_MAN_BARD;
+    bard->hasChangedSong = FALSE;
+    for (i = 0; i < 6; i++)
+        bard->songLyrics[i] = sDefaultBardSongLyrics[i];
+}
+
+static void SetupHipster(void)
+{
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    hipster->id = MAUVILLE_MAN_HIPSTER;
+    hipster->alreadySpoken = FALSE;
+}
+
+static void SetupStoryteller(void)
+{
+    StorytellerSetup();
+}
+
+static void SetupGiddy(void)
+{
+    struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+    giddy->id = MAUVILLE_MAN_GIDDY;
+    giddy->taleCounter = 0;
+}
+
+static void SetupTrader(void)
+{
+    TraderSetup();
+}
+
+void SetupMauvilleOldMan(void)
+{
+    u16 trainerId = (gSaveBlock2.playerTrainerId[1] << 8) | gSaveBlock2.playerTrainerId[0];
+
+    // Determine man based on the last digit of the player's trainer ID.
+    switch ((trainerId % 10) / 2)
+    {
+    case MAUVILLE_MAN_BARD:
+        SetupBard();
+        break;
+    case MAUVILLE_MAN_HIPSTER:
+        SetupHipster();
+        break;
+    case MAUVILLE_MAN_TRADER:
+        SetupTrader();
+        break;
+    case MAUVILLE_MAN_STORYTELLER:
+        SetupStoryteller();
+        break;
+    case MAUVILLE_MAN_GIDDY:
+        SetupGiddy();
+        break;
+    }
+    sub_80F83D0();
+}
+
+static u8 GetCurrentMauvilleOldMan(void)
+{
+    struct MauvilleManCommon *common = &gSaveBlock1.mauvilleMan.common;
+
+    return common->id;
+}
+
+void ScrSpecial_GetCurrentMauvilleMan(void)
+{
+    gScriptResult = GetCurrentMauvilleOldMan();
+}
+
+void ScrSpecial_HasBardSongBeenChanged(void)
+{
+    u16 *scriptResult = &gScriptResult; // why??
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    *scriptResult = bard->hasChangedSong;
+}
+
+void ScrSpecial_SaveBardSongLyrics(void)
+{
+    u16 i;
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    StringCopy(bard->playerName, gSaveBlock2.playerName);
+
+    for (i = 0; i < 4; i++)
+        bard->playerTrainerId[i] = gSaveBlock2.playerTrainerId[i];
+
+    for (i = 0; i < 6; i++)
+        bard->songLyrics[i] = bard->temporaryLyrics[i];
+
+    bard->hasChangedSong = TRUE;
+}
+
+// Copies lyrics into gStringVar4
+void PrepareSongText(void)
+{
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+    u16 specialVar = gSpecialVar_0x8004;  // It's a bit odd to use this temp variable, but it seems needed to match.
+    u16 *lyrics;
+    u16 lineNum;
+    u8 *wordEnd;
+    u8 *str;
+
+    lyrics = bard->temporaryLyrics;
+    if (specialVar == 0)
+        lyrics = bard->songLyrics;
+    wordEnd = gStringVar4;
+    str = wordEnd;
+    // Put three words on each line
+    for (lineNum = 0; lineNum < 2; lineNum++)
+    {
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
+        {
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
+        }
+
+        str++;
+        *(wordEnd++) = CHAR_SPACE;
+
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
+        {
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
+        }
+
+        str++;
+        *(wordEnd++) = CHAR_NEWLINE;
+
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
+        {
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
+        }
+
+        if (lineNum == 0)
+        {
+            *(wordEnd++) = EXT_CTRL_CODE_BEGIN;
+            *(wordEnd++) = 15;
+        }
+    }
+}
+
+void ScrSpecial_PlayBardSong(void)
+{
+    StartBardSong(gSpecialVar_0x8004);
+    MenuDisplayMessageBox();
+    ScriptContext1_Stop();
+}
+
+void ScrSpecial_GetHipsterSpokenFlag(void)
+{
+    u16 *scriptResult = &gScriptResult; // again??
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    *scriptResult = hipster->alreadySpoken;
+}
+
+void ScrSpecial_SetHipsterSpokenFlag(void)
+{
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    hipster->alreadySpoken = TRUE;
+}
+
+void ScrSpecial_HipsterTeachWord(void)
+{
+    u16 var = sub_80EB8EC();
+
+    if (var == 0xFFFF)
+    {
+        gScriptResult = FALSE;
+    }
+    else
+    {
+        EasyChat_GetWordText(gStringVar1, var);
+        gScriptResult = TRUE;
+    }
+}
+
+void ScrSpecial_GiddyShouldTellAnotherTale(void)
+{
+    struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+    if (giddy->taleCounter == 10)
+    {
+        gScriptResult = FALSE;
+        giddy->taleCounter = 0;
+    }
+    else
+    {
+        gScriptResult = TRUE;
+    }
+}
+
+void ScrSpecial_GenerateGiddyLine(void)
+{
+    struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+    if (giddy->taleCounter == 0)
+        sub_80F7DC0();
+
+    if (giddy->randomWords[giddy->taleCounter] != 0xFFFF) // is not the last element of the array?
+    {
+        u8 *stringPtr;
+        u32 adjective = Random();
+
+        adjective %= 8;
+        stringPtr = EasyChat_GetWordText(gStringVar4, giddy->randomWords[giddy->taleCounter]);
+        stringPtr = StringCopy(stringPtr, gOtherText_Is);
+        stringPtr = StringCopy(stringPtr, sGiddyAdjectives[adjective]);
+        StringCopy(stringPtr, gOtherText_DontYouAgree);
+    }
+    else
+    {
+        StringCopy(gStringVar4, sGiddyQuestions[giddy->questionList[giddy->questionNum++]]);
+    }
+
+    if (!(Random() % 10))
+        giddy->taleCounter = 10;
+    else
+        giddy->taleCounter++;
+
+    gScriptResult = TRUE;
+}
+
+#ifdef NONMATCHING
+static void sub_80F7DC0(void)
+{
+    u16 arr[][2] =
+    {
+        { 0x0, 0},
+        { 0xC, 0},
+        { 0xD, 0},
+        {0x12, 0},
+        {0x13, 0},
+        {0x15, 0},
+    };
+    u16 i;
+    u16 r10;
+    u16 r7;
+
+    for (i = 0; i < 8; i++)
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+        //gSaveBlock1.mauvilleMan.giddy.questionList[i] = i;
+        giddy->questionList[i] = i;
+    }
+
+    // Scramble questions
+    for (i = 0; i < 8; i++)
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+        /*
+        u16 r1 = Random() % (i + 1);
+        u8 r7 = gSaveBlock1.mauvilleMan.giddy.questionList[i];
+        gSaveBlock1.mauvilleMan.giddy.questionList[i] = gSaveBlock1.mauvilleMan.giddy.questionList[r1];
+        gSaveBlock1.mauvilleMan.giddy.questionList[r1] = r7;
+        */
+        u16 r1 = Random() % (i + 1);
+        u8 r7 = giddy->questionList[i];
+        giddy->questionList[i] = giddy->questionList[r1];
+        giddy->questionList[r1] = r7;
+    }
+
+    r10 = 0;
+    for (i = 0; i < 6; i++)
+    {
+        arr[i][1] = sub_80EAE88(arr[i][0]);
+        r10 += arr[i][1];
+    }
+
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+        giddy->questionNum = 0;
+    }
+    //gSaveBlock1.mauvilleMan.giddy.questionNum = 0;
+
+    r7 = 0;
+    for (i = 0; i < 10; i++)
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+        u16 var = Random() % 10;
+        if (var < 3 && r7 < 8)
+        {
+            //gSaveBlock1.mauvilleMan.giddy.randomWords[i] = 0xFFFF;
+            giddy->randomWords[i] = 0xFFFF;
+            r7++;
+        }
+        //_080F7E90
+        else
+        {
+            s16 r2 = Random() % r10;
+
+            u16 r1 = 0;
+
+            while (i < 6)  // comparing the wrong variable
+            {
+                r2 = arr[r1][1] - r2;
+                if (r2 <= 0)
+                    break;
+                r1++;
+            }
+
+            if (r1 == 6)
+                r1 = 0;
+            //gSaveBlock1.mauvilleMan.giddy.randomWords[i] = sub_80EB784(arr[r1][0]);
+            giddy->randomWords[i] = sub_80EB784(arr[r1][0]);
+        }
+    }
+}
+#else
+
+static const u16 gUnknown_083E53C8[][2] =
+{
+    { 0x0, 0},
+    { 0xC, 0},
+    { 0xD, 0},
+    {0x12, 0},
+    {0x13, 0},
+    {0x15, 0},
+};
+
+__attribute__((naked))
+static void sub_80F7DC0(void)
+{
+    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, 0x18\n\
+    ldr r1, _080F7E84 @ =gUnknown_083E53C8\n\
+    mov r0, sp\n\
+    movs r2, 0x18\n\
+    bl memcpy\n\
+    movs r5, 0\n\
+    movs r0, 0x2\n\
+    add r0, sp\n\
+    mov r8, r0\n\
+    ldr r1, _080F7E88 @ =gSaveBlock1 + 0x2D94\n\
+    adds r1, 0x18\n\
+    adds r3, r1, 0\n\
+_080F7DE4:\n\
+    adds r0, r3, r5\n\
+    strb r5, [r0]\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x7\n\
+    bls _080F7DE4\n\
+    movs r5, 0\n\
+    ldr r2, _080F7E88 @ =gSaveBlock1 + 0x2D94\n\
+    adds r2, 0x4\n\
+    mov r9, r2\n\
+    adds r6, r1, 0\n\
+_080F7DFC:\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    adds r4, r5, 0x1\n\
+    adds r1, r4, 0\n\
+    bl __modsi3\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    adds r2, r6, r5\n\
+    ldrb r7, [r2]\n\
+    adds r1, r6, r1\n\
+    ldrb r0, [r1]\n\
+    strb r0, [r2]\n\
+    strb r7, [r1]\n\
+    lsls r4, 16\n\
+    lsrs r5, r4, 16\n\
+    cmp r5, 0x7\n\
+    bls _080F7DFC\n\
+    movs r3, 0\n\
+    mov r10, r3\n\
+    movs r5, 0\n\
+_080F7E2A:\n\
+    lsls r4, r5, 2\n\
+    mov r1, sp\n\
+    adds r0, r1, r4\n\
+    ldrb r0, [r0]\n\
+    bl sub_80EAE88\n\
+    add r4, r8\n\
+    strh r0, [r4]\n\
+    add r0, r10\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r10, r0\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x5\n\
+    bls _080F7E2A\n\
+    movs r0, 0\n\
+    ldr r2, _080F7E88 @ =gSaveBlock1 + 0x2D94\n\
+    strb r0, [r2, 0x2]\n\
+    movs r7, 0\n\
+    movs r5, 0\n\
+_080F7E56:\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    movs r1, 0xA\n\
+    bl __umodsi3\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    cmp r1, 0x2\n\
+    bhi _080F7E90\n\
+    cmp r7, 0x7\n\
+    bhi _080F7E90\n\
+    lsls r0, r5, 1\n\
+    add r0, r9\n\
+    ldr r1, _080F7E8C @ =0x0000ffff\n\
+    strh r1, [r0]\n\
+    adds r0, r7, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r7, r0, 16\n\
+    adds r4, r5, 0x1\n\
+    b _080F7EE2\n\
+    .align 2, 0\n\
+_080F7E84: .4byte gUnknown_083E53C8\n\
+_080F7E88: .4byte gSaveBlock1 + 0x2D94\n\
+_080F7E8C: .4byte 0x0000ffff\n\
+_080F7E90:\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r1, r10\n\
+    bl __umodsi3\n\
+    lsls r0, 16\n\
+    lsrs r2, r0, 16\n\
+    movs r1, 0\n\
+    adds r4, r5, 0x1\n\
+    lsls r6, r5, 1\n\
+    cmp r5, 0x5\n\
+    bhi _080F7ECC\n\
+    mov r3, r8\n\
+    ldrh r0, [r3]\n\
+    b _080F7EC2\n\
+_080F7EB2:\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    cmp r5, 0x5\n\
+    bhi _080F7ECC\n\
+    lsls r0, r1, 2\n\
+    adds r0, r3, r0\n\
+    ldrh r0, [r0]\n\
+_080F7EC2:\n\
+    subs r0, r2, r0\n\
+    lsls r0, 16\n\
+    lsrs r2, r0, 16\n\
+    cmp r0, 0\n\
+    bgt _080F7EB2\n\
+_080F7ECC:\n\
+    cmp r1, 0x6\n\
+    bne _080F7ED2\n\
+    movs r1, 0\n\
+_080F7ED2:\n\
+    lsls r0, r1, 2\n\
+    add r0, sp\n\
+    ldrh r0, [r0]\n\
+    bl sub_80EB784\n\
+    mov r2, r9\n\
+    adds r1, r2, r6\n\
+    strh r0, [r1]\n\
+_080F7EE2:\n\
+    lsls r0, r4, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x9\n\
+    bls _080F7E56\n\
+    add sp, 0x18\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\
+    .syntax divided\n");
+}
+#endif
+
+static void sub_80F7EFC(void)
+{
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    bard->hasChangedSong = FALSE;
+}
+
+static void sub_80F7F0C(void)
+{
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    hipster->alreadySpoken = FALSE;
+}
+
+static void sub_80F7F18(void)
+{
+    sub_8109A20();
+}
+
+static void sub_80F7F24(void)
+{
+    sub_80F8428();
+}
+
+void sub_80F7F30(void)
+{
+    switch (GetCurrentMauvilleOldMan())
+    {
+    case MAUVILLE_MAN_BARD:
+        sub_80F7EFC();
+        break;
+    case MAUVILLE_MAN_HIPSTER:
+        sub_80F7F0C();
+        break;
+    case MAUVILLE_MAN_STORYTELLER:
+        sub_80F7F24();
+        break;
+    case MAUVILLE_MAN_TRADER:
+        sub_80F7F18();
+        break;
+    case MAUVILLE_MAN_GIDDY:
+        break;
+    }
+    sub_80F83D0();
+}
+
+#define tState data[0]
+#define tCharIndex data[3]
+#define tCurrWord data[4]
+#define tUseTemporaryLyrics data[5]
+
+static void StartBardSong(bool8 useTemporaryLyrics)
+{
+    u8 taskId = CreateTask(Task_BardSong, 0x50);
+
+    gTasks[taskId].tUseTemporaryLyrics = useTemporaryLyrics;
+}
+
+static void BardSing(struct Task *task, struct BardSong *song)
+{
+    switch (task->tState)
+    {
+    case 0:  // Initialize song
+        {
+            struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+            u16 *lyrics;
+            s32 i;
+
+            // Copy lyrics
+            if (gSpecialVar_0x8004 == 0)
+                lyrics = bard->songLyrics;
+            else
+                lyrics = bard->temporaryLyrics;
+            for (i = 0; i < 6; i++)
+                song->lyrics[i] = lyrics[i];
+
+            // Clear phonemes
+            for (i = 0; i < 6; i++)
+            {
+                song->phonemes[i].sound = 0xFFFF;
+                song->phonemes[i].length = 0;
+                song->phonemes[i].pitch = 0;
+                song->phonemes[i].volume = 0;
+            }
+            song->currWord = 0;
+            song->currPhoneme = 0;
+            song->var04 = 0;
+        }
+        break;
+    case 1:  // Wait for BGM to end
+        break;
+    case 2:  // Initialize word
+        {
+            u16 word = song->lyrics[song->currWord];
+            const struct BardSound *sounds = GetWordSounds(EC_GROUP(word), EC_INDEX(word));
+
+            song->var04 = 0;
+            GetWordPhonemes(song, sounds, MACRO1(word));
+        }
+        break;
+    case 3:
+    case 4:
+        {
+            struct BardPhoneme *phoneme = &song->phonemes[song->currPhoneme];
+
+            switch (song->state)
+            {
+            case 0:
+                if (song->phonemeTimer == 0)  // Timer has expired. Move to next phoneme
+                {
+                    if (song->currPhoneme == 6 || phoneme->sound == 0xFF)
+                    {
+                        song->state = 0xFE;
+                        break;
+                    }
+                    song->phonemeTimer = phoneme->length;
+                    if (phoneme->sound <= 50)
+                    {
+                        u16 num = phoneme->sound / 3;
+
+                        m4aSongNumStart(249 + num * 3);
+                    }
+                    song->state = 1;
+                }
+                else
+                {
+                    if (song->voiceInflection > 10)
+                        song->volume -= 2;
+                    if (song->voiceInflection & 1)
+                        song->pitch += 64;
+                    else
+                        song->pitch -= 64;
+                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume);
+                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch);
+                    song->voiceInflection++;
+                }
+                song->phonemeTimer--;
+                break;
+            case 1:
+                song->currPhoneme++;
+                song->state = 0;
+                if (phoneme->sound <= 50)
+                {
+                    song->volume = 0x100 + phoneme->volume * 16;
+                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume);
+                    song->pitch = 0x200 + phoneme->pitch;
+                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch);
+                }
+                break;
+            case 0xFE:
+                m4aMPlayStop(&gMPlay_SE2);
+                song->state = 0xFF;
+                break;
+            }
+        }
+        break;
+    case 5:
+        break;
+    }
+}
+
+static void Task_BardSong(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];  // r5
+
+    BardSing(task, &gUnknown_03005DA0);
+    switch (task->tState)
+    {
+    case 0:  // Initialize song
+        PrepareSongText();
+        InitWindowFromConfig(gMenuWindowPtr, &gWindowConfig_81E6CE4);
+        sub_8002EB0(gMenuWindowPtr, gStringVar4, 2, 4, 15);
+        task->data[1] = 0;
+        task->data[2] = 0;
+        task->tCharIndex = 0;
+        task->tCurrWord = 0;
+        FadeOutBGMTemporarily(4);
+        task->tState = 1;
+        break;
+    case 1:  // Wait for BGM to end
+        if (IsBGMPausedOrStopped())
+            task->tState = 2;
+        break;
+    case 2:  // Initialize word
+        {
+            struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+            u8 *str = gStringVar4 + task->tCharIndex;
+            u16 wordLen = 0;
+            // Can't get it to match without hacking
+            u32 temp;
+            register s16 zero asm("r1");
+
+            while (*str != CHAR_SPACE
+                && *str != CHAR_NEWLINE
+                && *str != EXT_CTRL_CODE_BEGIN
+                && *str != EOS)
+            {
+                str++;
+                wordLen++;
+            }
+            if (!task->tUseTemporaryLyrics)
+                gUnknown_020388BC = MACRO1(bard->songLyrics[task->tCurrWord]);
+            else
+                gUnknown_020388BC = MACRO1(bard->temporaryLyrics[task->tCurrWord]);
+            temp = gUnknown_03005DA0.var04 / wordLen;
+            zero = 0;
+            gUnknown_03005DA0.var04 = temp;
+            if (gUnknown_03005DA0.var04 <= 0)
+                gUnknown_03005DA0.var04 = 1;
+            task->tCurrWord++;
+            if (task->data[2] == 0)
+                task->tState = 3;
+            else
+                task->tState = 5;
+            task->data[1] = zero;
+        }
+        break;
+    case 5:
+        if (task->data[2] == 0)
+            task->tState = 3;
+        else
+            task->data[2]--;
+        break;
+    case 3:
+        if (gStringVar4[task->tCharIndex] == EOS)
+        {
+            FadeInNewBGM(BGM_POKECEN, 6);
+            m4aMPlayFadeOutTemporarily(&gMPlay_SE2, 2);
+            EnableBothScriptContexts();
+            DestroyTask(taskId);
+        }
+        else if (gStringVar4[task->tCharIndex] == CHAR_SPACE)
+        {
+            sub_8003418(gMenuWindowPtr);
+            task->tCharIndex++;
+            task->tState = 2;
+            task->data[2] = 0;
+        }
+        else if (gStringVar4[task->tCharIndex] == CHAR_NEWLINE)
+        {
+            task->tCharIndex++;
+            task->tState = 2;
+            task->data[2] = 0;
+        }
+        else if (gStringVar4[task->tCharIndex] == EXT_CTRL_CODE_BEGIN)
+        {
+            task->tCharIndex += 2;  // skip over control codes
+            task->tState = 2;
+            task->data[2] = 8;
+        }
+        else if (gStringVar4[task->tCharIndex] == CHAR_SONG_WORD_SEPARATOR)
+        {
+            gStringVar4[task->tCharIndex] = CHAR_SPACE;  // restore it back to a space
+            sub_8003418(gMenuWindowPtr);
+            task->tCharIndex++;
+            task->data[2] = 0;
+        }
+        else
+        {
+            switch (task->data[1])
+            {
+            case 0:
+                sub_8003418(gMenuWindowPtr);
+                task->data[1]++;
+                break;
+            case 1:
+                task->data[1]++;
+                break;
+            case 2:
+                task->tCharIndex++;
+                task->data[1] = 0;
+                task->data[2] = gUnknown_03005DA0.var04;
+                task->tState = 4;
+                break;
+            }
+        }
+        break;
+    case 4:
+        task->data[2]--;
+        if (task->data[2] == 0)
+            task->tState = 3;
+        break;
+    }
+}
+
+void sub_80F83D0(void)
+{
+    VarSet(0x4010, 0x45 + GetCurrentMauvilleOldMan());
+}
+
+struct Story
+{
+    u8 stat;
+    u8 minVal;
+    const u8 *title;
+    const u8 *action;
+    const u8 *fullText;
+};
+
+static const struct Story sStorytellerStories[] =
+{
+    {0x32, 1, gTextStoryteller_Story1Title,  gTextStoryteller_Story1Action,  gTextStoryteller_Story1Text},
+    {0x02, 1, gTextStoryteller_Story2Title,  gTextStoryteller_Story2Action,  gTextStoryteller_Story2Text},
+    {0x03, 1, gTextStoryteller_Story3Title,  gTextStoryteller_Story3Action,  gTextStoryteller_Story3Text},
+    {0x04, 1, gTextStoryteller_Story4Title,  gTextStoryteller_Story4Action,  gTextStoryteller_Story4Text},
+    {0x06, 1, gTextStoryteller_Story5Title,  gTextStoryteller_Story5Action,  gTextStoryteller_Story5Text},
+    {0x09, 1, gTextStoryteller_Story6Title,  gTextStoryteller_Story6Action,  gTextStoryteller_Story6Text},
+    {0x0B, 1, gTextStoryteller_Story7Title,  gTextStoryteller_Story7Action,  gTextStoryteller_Story7Text},
+    {0x0C, 1, gTextStoryteller_Story8Title,  gTextStoryteller_Story8Action,  gTextStoryteller_Story8Text},
+    {0x0D, 1, gTextStoryteller_Story9Title,  gTextStoryteller_Story9Action,  gTextStoryteller_Story9Text},
+    {0x0E, 1, gTextStoryteller_Story10Title, gTextStoryteller_Story10Action, gTextStoryteller_Story10Text},
+    {0x0F, 1, gTextStoryteller_Story11Title, gTextStoryteller_Story11Action, gTextStoryteller_Story11Text},
+    {0x10, 1, gTextStoryteller_Story12Title, gTextStoryteller_Story12Action, gTextStoryteller_Story12Text},
+    {0x11, 1, gTextStoryteller_Story13Title, gTextStoryteller_Story13Action, gTextStoryteller_Story13Text},
+    {0x12, 1, gTextStoryteller_Story14Title, gTextStoryteller_Story14Action, gTextStoryteller_Story14Text},
+    {0x13, 1, gTextStoryteller_Story15Title, gTextStoryteller_Story15Action, gTextStoryteller_Story15Text},
+    {0x14, 1, gTextStoryteller_Story16Title, gTextStoryteller_Story16Action, gTextStoryteller_Story16Text},
+    {0x1A, 1, gTextStoryteller_Story17Title, gTextStoryteller_Story17Action, gTextStoryteller_Story17Text},
+    {0x1B, 1, gTextStoryteller_Story18Title, gTextStoryteller_Story18Action, gTextStoryteller_Story18Text},
+    {0x1C, 1, gTextStoryteller_Story19Title, gTextStoryteller_Story19Action, gTextStoryteller_Story19Text},
+    {0x1D, 2, gTextStoryteller_Story20Title, gTextStoryteller_Story20Action, gTextStoryteller_Story20Text},
+    {0x1E, 1, gTextStoryteller_Story21Title, gTextStoryteller_Story21Action, gTextStoryteller_Story21Text},
+    {0x21, 1, gTextStoryteller_Story22Title, gTextStoryteller_Story22Action, gTextStoryteller_Story22Text},
+    {0x24, 1, gTextStoryteller_Story23Title, gTextStoryteller_Story23Action, gTextStoryteller_Story23Text},
+    {0x25, 1, gTextStoryteller_Story24Title, gTextStoryteller_Story24Action, gTextStoryteller_Story24Text},
+    {0x26, 1, gTextStoryteller_Story25Title, gTextStoryteller_Story25Action, gTextStoryteller_Story25Text},
+    {0x27, 1, gTextStoryteller_Story26Title, gTextStoryteller_Story26Action, gTextStoryteller_Story26Text},
+    {0x28, 1, gTextStoryteller_Story27Title, gTextStoryteller_Story27Action, gTextStoryteller_Story27Text},
+    {0x29, 1, gTextStoryteller_Story28Title, gTextStoryteller_Story28Action, gTextStoryteller_Story28Text},
+    {0x2A, 1, gTextStoryteller_Story29Title, gTextStoryteller_Story29Action, gTextStoryteller_Story29Text},
+    {0x2B, 1, gTextStoryteller_Story30Title, gTextStoryteller_Story30Action, gTextStoryteller_Story30Text},
+    {0x2C, 1, gTextStoryteller_Story31Title, gTextStoryteller_Story31Action, gTextStoryteller_Story31Text},
+    {0x2D, 1, gTextStoryteller_Story32Title, gTextStoryteller_Story32Action, gTextStoryteller_Story32Text},
+    {0x2E, 1, gTextStoryteller_Story33Title, gTextStoryteller_Story33Action, gTextStoryteller_Story33Text},
+    {0x2F, 1, gTextStoryteller_Story34Title, gTextStoryteller_Story34Action, gTextStoryteller_Story34Text},
+    {0x30, 1, gTextStoryteller_Story35Title, gTextStoryteller_Story35Action, gTextStoryteller_Story35Text},
+    {0x31, 1, gTextStoryteller_Story36Title, gTextStoryteller_Story36Action, gTextStoryteller_Story36Text},
+};
+
+static void StorytellerSetup(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+    s32 i;
+
+    storyteller->id = MAUVILLE_MAN_STORYTELLER;
+    storyteller->alreadyRecorded = FALSE;
+    for (i = 0; i < 4; i++)
+    {
+        storyteller->gameStatIDs[i] = 0;
+        storyteller->trainerNames[0][i] = EOS;  // Maybe they meant storyteller->trainerNames[i][0] instead?
+    }
+}
+
+static void sub_80F8428(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    storyteller->id = MAUVILLE_MAN_STORYTELLER;
+    storyteller->alreadyRecorded = FALSE;
+}
+
+static u32 StorytellerGetGameStat(u8 stat)
+{
+    if (stat == NUM_GAME_STATS)
+        stat = 0;
+    return GetGameStat(stat);
+}
+
+static const struct Story *GetStoryByStat(u32 stat)
+{
+    s32 i;
+
+    for (i = 0; i < 36; i++)
+    {
+        if (sStorytellerStories[i].stat == stat)
+            return &sStorytellerStories[i];
+    }
+    return &sStorytellerStories[35];
+}
+
+static const u8 *GetStoryTitleByStat(u32 stat)
+{
+    return GetStoryByStat(stat)->title;
+}
+
+static const u8 *GetStoryTextByStat(u32 stat)
+{
+    return GetStoryByStat(stat)->fullText;
+}
+
+static const u8 *GetStoryActionByStat(u32 stat)
+{
+    return GetStoryByStat(stat)->action;
+}
+
+static u8 GetFreeStorySlot(void)
+{
+    u8 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+        if (storyteller->gameStatIDs[i] == 0)
+            break;
+    }
+    return i;
+}
+
+static u32 StorytellerGetRecordedTrainerStat(u32 trainer)
+{
+    u8 *ptr = gSaveBlock1.mauvilleMan.storyteller.statValues[trainer];
+
+    return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
+}
+
+static void StorytellerSetRecordedTrainerStat(u32 trainer, u32 val)
+{
+    u8 *ptr = gSaveBlock1.mauvilleMan.storyteller.statValues[trainer];
+
+    ptr[0] = val;
+    ptr[1] = val >> 8;
+    ptr[2] = val >> 16;
+    ptr[3] = val >> 24;
+}
+
+static bool32 HasTrainerStatIncreased(u32 trainer)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    if (StorytellerGetGameStat(storyteller->gameStatIDs[trainer]) > StorytellerGetRecordedTrainerStat(trainer))
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static void GetStoryByStattellerPlayerName(u32 player, void *dst)
+{
+    u8 *name = gSaveBlock1.mauvilleMan.storyteller.trainerNames[player];
+
+    memset(dst, EOS, 8);
+    memcpy(dst, name, 7);
+}
+
+static void StorytellerSetPlayerName(u32 player, const u8 *src)
+{
+    u8 *name = gSaveBlock1.mauvilleMan.storyteller.trainerNames[player];
+    u8 len = StringLength(src);
+
+    memset(name, EOS, 7);
+    StringCopyN(name, src, len);
+}
+
+static void StorytellerRecordNewStat(u32 player, u32 stat)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    storyteller->gameStatIDs[player] = stat;
+    StorytellerSetPlayerName(player, gSaveBlock2.playerName);
+    StorytellerSetRecordedTrainerStat(player, StorytellerGetGameStat(stat));
+    ConvertIntToDecimalStringN(gStringVar1, StorytellerGetGameStat(stat), 0, 10);
+    StringCopy(gStringVar2, GetStoryActionByStat(stat));
+}
+
+static void ScrambleStatList(u8 *arr, s32 count)
+{
+    s32 i;
+
+    for (i = 0; i < count; i++)
+        arr[i] = i;
+    for (i = 0; i < count; i++)
+    {
+        u32 a = Random() % count;
+        u32 b = Random() % count;
+        u8 temp = arr[a];
+        arr[a] = arr[b];
+        arr[b] = temp;
+    }
+}
+
+// What purpose does this struct even serve? Only the length field is used.
+static const struct {u32 length; struct MauvilleManStoryteller *unused1; u32 unused2;} sStorytellerStuff =
+{
+    36,
+    &gSaveBlock1.mauvilleMan.storyteller,  // unused
+    12,                                    // unused
+};
+
+static bool8 StorytellerInitializeRandomStat(void)
+{
+    u8 arr[sStorytellerStuff.length];
+    s32 i;
+    s32 j;
+
+    ScrambleStatList(arr, 36);
+    for (i = 0; i < 36; i++)
+    {
+        u8 stat = sStorytellerStories[arr[i]].stat;
+        u8 minVal = sStorytellerStories[arr[i]].minVal;
+        struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+        for (j = 0; j < 4; j++)
+        {
+            if (gSaveBlock1.mauvilleMan.storyteller.gameStatIDs[j] == stat)
+                break;
+        }
+        if (j == 4 && StorytellerGetGameStat(stat) >= minVal)
+        {
+            storyteller->alreadyRecorded = TRUE;
+            StorytellerRecordNewStat(GetFreeStorySlot(), stat);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static void StorytellerDisplayStory(u32 player)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+    u8 stat = storyteller->gameStatIDs[player];
+
+    ConvertIntToDecimalStringN(gStringVar1, StorytellerGetRecordedTrainerStat(player), 0, 10);
+    StringCopy(gStringVar2, GetStoryActionByStat(stat));
+    GetStoryByStattellerPlayerName(player, gStringVar3);
+    ShowFieldMessage(GetStoryTextByStat(stat));
+}
+
+static void PrintStoryList(void)
+{
+    s32 i;
+
+    MenuDrawTextWindow(0, 0, 25, 4 + GetFreeStorySlot() * 2);
+    for (i = 0; i < 4; i++)
+    {
+        struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+        u8 stat = storyteller->gameStatIDs[i];
+
+        if (stat == 0)
+            break;
+        MenuPrint(GetStoryTitleByStat(stat), 1, 2 + i * 2);
+    }
+    MenuPrint(gPCText_Cancel, 1, 2 + i * 2);
+}
+
+static u8 gUnknown_03000748;
+
+static void Task_StoryListMenu(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    s32 selection;
+
+    switch (task->data[0])
+    {
+    case 0:
+        PrintStoryList();
+        InitMenu(0, 1, 2, GetFreeStorySlot() + 1, 0, 24);
+        task->data[0]++;
+        break;
+    case 1:
+        selection = ProcessMenuInput();
+        if (selection == -2)
+            break;
+        if (selection == -1 || selection == GetFreeStorySlot())
+        {
+            gScriptResult = 0;
+        }
+        else
+        {
+            gScriptResult = 1;
+            gUnknown_03000748 = selection;
+        }
+        HandleDestroyMenuCursors();
+        MenuZeroFillWindowRect(0, 0, 25, 12);
+        DestroyTask(taskId);
+        EnableBothScriptContexts();
+        break;
+    }
+}
+
+// Sets gScriptResult to TRUE if player selected a story
+void ScrSpecial_StorytellerStoryListMenu(void)
+{
+    CreateTask(Task_StoryListMenu, 0x50);
+}
+
+void ScrSpecial_StorytellerDisplayStory(void)
+{
+    StorytellerDisplayStory(gUnknown_03000748);
+}
+
+u8 ScrSpecial_StorytellerGetFreeStorySlot(void)
+{
+    return GetFreeStorySlot();
+}
+
+// Returns TRUE if stat has increased
+bool8 ScrSpecial_StorytellerUpdateStat(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+    u8 r4 = storyteller->gameStatIDs[gUnknown_03000748];
+
+    if (HasTrainerStatIncreased(gUnknown_03000748) == TRUE)
+    {
+        StorytellerRecordNewStat(gUnknown_03000748, r4);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 ScrSpecial_HasStorytellerAlreadyRecorded(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    if (storyteller->alreadyRecorded == FALSE)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+bool8 ScrSpecial_StorytellerInitializeRandomStat(void)
+{
+    return StorytellerInitializeRandomStat();
+}
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
deleted file mode 100644
index 789a251e6..000000000
--- a/src/mauville_old_man.c
+++ /dev/null
@@ -1,249 +0,0 @@
-#include "global.h"
-#include "mauville_old_man.h"
-#include "easy_chat.h"
-#include "menu.h"
-#include "rng.h"
-#include "script.h"
-#include "string_util.h"
-#include "strings.h"
-#include "trader.h"
-
-extern u16 gScriptResult;
-extern u16 gSpecialVar_0x8004;
-
-extern u32 gUnknown_083E5388[];
-extern u32 gUnknown_083E53A8[];
-
-extern u16 gUnknown_083E537C[];
-
-IWRAM_DATA u8 gUnknown_03000748;
-
-void sub_80F7A34(void)
-{
-    u16 i;
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    oldMan->oldMan1.unk_2D94 = 0;
-    oldMan->oldMan1.unk_2DBD = 0;
-
-    for(i = 0; i < 6; i++)
-        oldMan->oldMan1.mauvilleOldMan_ecArray[i] = gUnknown_083E537C[i];
-}
-
-void sub_80F7A6C(void)
-{
-    struct UnkMauvilleOldManStruct *bard = &gSaveBlock1.oldMan.oldMan1;
-
-    bard->unk_2D94 = 1;
-    bard->unk_2D95 = 0;
-}
-
-void sub_80F7A7C(void)
-{
-    sub_80F83F8();
-}
-
-void sub_80F7A88(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    oldMan->oldMan1.unk_2D94 = 4;
-    oldMan->oldMan1.unk_2D95 = 0;
-}
-
-void sub_80F7A98(void)
-{
-    sub_81099CC();
-}
-
-void SetMauvilleOldMan(void)
-{
-    u32 var = ((u16)((gSaveBlock2.playerTrainerId[1] << 8 | gSaveBlock2.playerTrainerId[0])) % 10) / 2;
-
-    switch(var)
-    {
-    case 0:
-        sub_80F7A34();
-        break;
-    case 1:
-        sub_80F7A6C();
-        break;
-    case 2:
-        sub_80F7A98();
-        break;
-    case 3:
-        sub_80F7A7C();
-        break;
-    case 4:
-        sub_80F7A88();
-        break;
-    }
-    sub_80F83D0();
-}
-
-u8 GetCurrentMauvilleOldMan(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    return oldMan->oldMan1.unk_2D94;
-}
-
-void sub_80F7B14(void)
-{
-    gScriptResult = GetCurrentMauvilleOldMan();
-}
-
-void sub_80F7B2C(void)
-{
-    u16 *scriptPtr = &gScriptResult; // why??
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    *scriptPtr = oldMan->oldMan1.unk_2DBD;
-}
-
-void sub_80F7B40(void)
-{
-    u16 i;
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-    //struct UnkMauvilleOldManStruct *oldManStruct = &gSaveBlock1.oldManStruct;
-
-    StringCopy(oldMan->oldMan1.playerName, gSaveBlock2.playerName);
-
-    for(i = 0; i < 4; i++)
-        oldMan->oldMan1.playerTrainerId[i] = gSaveBlock2.playerTrainerId[i];
-
-    for(i = 0; i < 6; i++)
-        oldMan->oldMan1.mauvilleOldMan_ecArray[i] = oldMan->oldMan1.mauvilleOldMan_ecArray2[i];
-
-    oldMan->oldMan1.unk_2DBD = 1;
-}
-
-void sub_80F7BA0(void)
-{
-    struct UnkMauvilleOldManStruct *oldMan = &gSaveBlock1.oldMan.oldMan1;
-    u16 specialVar = gSpecialVar_0x8004;  // It's a bit odd to use this temp variable, but it seems needed to match.
-    u16 *r5;
-    u16 i;
-    u8 *ptr;
-    u8 *r4;
-
-    r5 = oldMan->mauvilleOldMan_ecArray2;
-    if (specialVar == 0)
-        r5 = oldMan->mauvilleOldMan_ecArray;
-    ptr = gStringVar4;
-    r4 = ptr;
-    for (i = 0; i < 2; i++)
-    {
-        ptr = sub_80EB3FC(ptr, *(r5++));
-        while (ptr != r4)
-        {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
-        }
-        r4++;
-        *(ptr++) = 0;
-        ptr = sub_80EB3FC(ptr, *(r5++));
-        while (ptr != r4)
-        {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
-        }
-        r4++;
-        *(ptr++) = 0xFE;
-        ptr = sub_80EB3FC(ptr, *(r5++));
-        while (ptr != r4)
-        {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
-        }
-        //_080F7C2A
-        if (i == 0)
-        {
-            *(ptr++) = EXT_CTRL_CODE_BEGIN;
-            *(ptr++) = 0xF;
-        }
-    }
-}
-
-void sub_80F7C54(void)
-{
-    sub_80F7F80(gSpecialVar_0x8004);
-    MenuDisplayMessageBox();
-    ScriptContext1_Stop();
-}
-
-void sub_80F7C70(void)
-{
-    u16 *scriptPtr = &gScriptResult; // again??
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    *scriptPtr = oldMan->oldMan1.unk_2D95;
-}
-
-void sub_80F7C84(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    oldMan->oldMan1.unk_2D95 = 1;
-}
-
-void sub_80F7C90(void)
-{
-    u16 var = sub_80EB8EC();
-
-    if(var == 0xFFFF)
-    {
-        gScriptResult = FALSE;
-    }
-    else
-    {
-        sub_80EB3FC(gStringVar1, var);
-        gScriptResult = TRUE;
-    }
-}
-
-void sub_80F7CC8(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    if(oldMan->oldMan1.unk_2D95 == 10)
-    {
-        gScriptResult = FALSE;
-        oldMan->oldMan1.unk_2D95 = 0;
-    }
-    else
-        gScriptResult = TRUE;
-}
-
-void sub_80F7CF4(void)
-{
-    struct UnkMauvilleOldManStruct2 *oldMan = &gSaveBlock1.oldMan.oldMan2;
-
-    if(oldMan->unk1 == 0)
-        sub_80F7DC0();
-
-    if(oldMan->mauvilleOldMan_ecArray[oldMan->unk1] != 0xFFFF) // is not the last element of the array?
-    {
-        u8 *stringPtr;
-        u32 random = Random();
-
-        random %= 8;
-        stringPtr = sub_80EB3FC(gStringVar4, oldMan->mauvilleOldMan_ecArray[oldMan->unk1]);
-        stringPtr = StringCopy(stringPtr, gOtherText_Is);
-        stringPtr = StringCopy(stringPtr, (u8 *)gUnknown_083E5388[random]);
-        StringCopy(stringPtr, gOtherText_DontYouAgree);
-    }
-    else
-    {
-        StringCopy(gStringVar4, (u8 *)gUnknown_083E53A8[oldMan->mauvilleOldMan_ecArray2[oldMan->unk2++]]);
-    }
-    if(!(Random() % 10))
-        oldMan->unk1 = 10;
-    else
-        oldMan->unk1++;
-
-    gScriptResult = TRUE;
-}
diff --git a/src/menu.c b/src/menu.c
index 1096fa0bd..a9c4aaa43 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -154,9 +154,9 @@ void MenuPrint(const u8 *str, u8 left, u8 top)
     sub_8003460(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
 }
 
-void MenuZeroFillWindowRect(u8 a1, u8 a2, u8 a3, u8 a4)
+void MenuZeroFillWindowRect(u8 left, u8 top, u8 right, u8 bottom)
 {
-    ZeroFillWindowRect(gMenuWindowPtr, a1, a2, a3, a4);
+    ZeroFillWindowRect(gMenuWindowPtr, left, top, right, bottom);
 }
 
 void MenuFillWindowRectWithBlankTile(u8 left, u8 top, u8 right, u8 bottom)
@@ -205,7 +205,7 @@ void MenuPrintMessage(const u8 *str, u8 left, u8 top)
     sub_8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
 }
 
-void sub_8072044(const u8 *str)
+void MenuPrintMessageDefaultCoords(const u8 *str)
 {
     sub_8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, 2, 15);
 }
@@ -571,7 +571,7 @@ void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction m
         MenuPrint(menuItems[i].text, left, top + 2 * i);
 }
 
-void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], const u8 *order)
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order)
 {
     u8 i;
 
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index 9915d67ac..14e823355 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -7,7 +7,7 @@
 #include "map_constants.h"
 #include "menu.h"
 #include "menu_helpers.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
@@ -140,7 +140,7 @@ static void PrintMessage(const u8 *str, u16 tile)
     {
         sub_80A3FA0(&gBGTilemapBuffers[1][0], 2, 15, 26, 4, tile);
     }
-    sub_8072044(str);
+    MenuPrintMessageDefaultCoords(str);
 }
 
 static void sub_80F9090(u8 taskId)
diff --git a/src/money.c b/src/money.c
index 67b7eb03f..5d0f0ae8d 100644
--- a/src/money.c
+++ b/src/money.c
@@ -25,7 +25,7 @@ bool8 IsEnoughMoney(u32 budget, u32 cost)
     return FALSE;
 }
 
-void sub_80B79B8(u32 *arg0, u32 arg1)
+void AddMoney(u32 *arg0, u32 arg1)
 {
     if (*arg0 > *arg0 + arg1)
     {
@@ -40,7 +40,7 @@ void sub_80B79B8(u32 *arg0, u32 arg1)
     }
 }
 
-void sub_80B79E0(u32 *arg0, u32 arg1)
+void RemoveMoney(u32 *arg0, u32 arg1)
 {
     if (*arg0 < arg1)
     {
@@ -52,39 +52,25 @@ void sub_80B79E0(u32 *arg0, u32 arg1)
     }
 }
 
-void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2)
+void GetMoneyAmountText(u8 *buffer, u32 amount, u8 arg2)
 {
     u8 width;
     u8 i;
 
-    if (arg1 > 999999)
-    {
+    if (amount > 999999)
         width = 7;
-    }
-    else if (arg1 > 99999)
-    {
+    else if (amount > 99999)
         width = 6;
-    }
-    else if (arg1 > 10000)
-    {
+    else if (amount > 10000)
         width = 5;
-    }
-    else if (arg1 > 999)
-    {
+    else if (amount > 999)
         width = 4;
-    }
-    else if (arg1 > 99)
-    {
+    else if (amount > 99)
         width = 3;
-    }
-    else if (arg1 > 9)
-    {
+    else if (amount > 9)
         width = 2;
-    }
     else
-    {
         width = 1;
-    }
 
     buffer[0] = EXT_CTRL_CODE_BEGIN;
     buffer[1] = 0x14;
@@ -100,7 +86,7 @@ void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2)
     buffer[0] = CHAR_CURRENCY;
     buffer += 1;
 
-    buffer = ConvertIntToDecimalString(buffer, arg1);
+    buffer = ConvertIntToDecimalString(buffer, amount);
 
     buffer[0] = EXT_CTRL_CODE_BEGIN;
     buffer[1] = 0x14;
@@ -108,16 +94,18 @@ void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2)
     buffer[3] = EOS;
 }
 
-void sub_80B7A94(u32 arg0, u8 size, u8 x, u8 y)
+void PrintMoneyAmount(u32 amount, u8 size, u8 x, u8 y)
 {
     u8 buffer[16];
     u8 stringWidth;
 
-    sub_80B79F8(buffer, arg0, size);
+    GetMoneyAmountText(buffer, amount, size);
     stringWidth = sub_8072CA4(buffer);
 
     if (stringWidth >= (size + 1) * 8)
+    {
         MenuPrint(buffer, x, y);
+    }
     else
     {
         int xPlusOne = x + 1;
@@ -241,15 +229,15 @@ _080B7BE8: .4byte 0x0600f840\n\
     .syntax divided\n");
 }
 
-void sub_80B7BEC(u32 arg0, u8 x, u8 y)
+void UpdateMoneyWindow(u32 amount, u8 x, u8 y)
 {
-    sub_80B7A94(arg0, 6, x + 6, y + 1);
+    PrintMoneyAmount(amount, 6, x + 6, y + 1);
 }
 
-void sub_80B7C14(u32 arg0, u8 x, u8 y)
+void OpenMoneyWindow(u32 amount, u8 x, u8 y)
 {
     MenuDrawTextWindow(x, y, x + 13, y + 3);
-    sub_80B7BEC(arg0, x, y);
+    UpdateMoneyWindow(amount, x, y);
 
     LoadCompressedObjectPic(&gUnknown_083CF584);
     LoadCompressedObjectPalette(&gUnknown_083CF58C);
@@ -257,7 +245,7 @@ void sub_80B7C14(u32 arg0, u8 x, u8 y)
     gUnknown_02038734 = CreateSprite(&gSpriteTemplate_83CF56C, x * 8 + 19, y * 8 + 11, 0);
 }
 
-void RemoveMoneyLabelObject(u8 x, u8 y)
+void CloseMoneyWindow(u8 x, u8 y)
 {
     DestroySpriteAndFreeResources(&gSprites[gUnknown_02038734]);
     FreeSpritePaletteByTag(SPRITE_TAG_MONEY);
@@ -271,5 +259,5 @@ bool8 sub_80B7CE8(void)
 
 void sub_80B7D0C(void)
 {
-    sub_80B79E0(&gSaveBlock1.money, gSpecialVar_0x8005);
+    RemoveMoney(&gSaveBlock1.money, gSpecialVar_0x8005);
 }
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 46b76fd88..0e48dc177 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -94,7 +94,7 @@ static void CB2_MysteryEventMenu(void)
     case 1:
         if (gPaletteFade.active)
             break;
-        sub_8072044(gSystemText_LinkStandby);
+        MenuPrintMessageDefaultCoords(gSystemText_LinkStandby);
         gMain.state++;
         break;
     case 2:
@@ -109,7 +109,7 @@ static void CB2_MysteryEventMenu(void)
         if ((gLinkStatus & 0x20) && (gLinkStatus & 0x1C) > 4)
         {
             PlaySE(SE_PIN);
-            sub_8072044(gSystemText_LoadEventPressA);
+            MenuPrintMessageDefaultCoords(gSystemText_LoadEventPressA);
             gMain.state++;
         }
         if (gMain.newKeys & B_BUTTON)
@@ -128,7 +128,7 @@ static void CB2_MysteryEventMenu(void)
         if (GetLinkPlayerCount_2() != 2)
         {
             GetEventLoadMessage(gStringVar4, 1);
-            sub_8072044(gStringVar4);
+            MenuPrintMessageDefaultCoords(gStringVar4);
             gMain.state = 13;
             break;
         }
@@ -158,13 +158,13 @@ static void CB2_MysteryEventMenu(void)
                 sub_800832C();
                 MenuZeroFillWindowRect(6, 5, 23, 8);
                 GetEventLoadMessage(gStringVar4, 1);
-                sub_8072044(gStringVar4);
+                MenuPrintMessageDefaultCoords(gStringVar4);
                 gMain.state = 13;
                 break;
             }
             else if (CheckLanguageMatch())
             {
-                sub_8072044(gSystemText_DontCutLink);
+                MenuPrintMessageDefaultCoords(gSystemText_DontCutLink);
                 gMain.state++;
                 break;
             }
@@ -173,7 +173,7 @@ static void CB2_MysteryEventMenu(void)
                 CloseLink();
                 MenuZeroFillWindowRect(6, 5, 23, 8);
                 GetEventLoadMessage(gStringVar4, 1);
-                sub_8072044(gStringVar4);
+                MenuPrintMessageDefaultCoords(gStringVar4);
                 gMain.state = 13;
                 break;
             }
@@ -222,7 +222,7 @@ static void CB2_MysteryEventMenu(void)
                 sub_800832C();
                 MenuZeroFillWindowRect(6, 5, 23, 8);
                 GetEventLoadMessage(gStringVar4, 1);
-                sub_8072044(gStringVar4);
+                MenuPrintMessageDefaultCoords(gStringVar4);
                 ptr = (u8 *)&gMain;
                 offset1 = offsetof(struct Main, state);
                 asm("" ::: "r1");
@@ -234,7 +234,7 @@ static void CB2_MysteryEventMenu(void)
                 register u8 *ptr2 asm("r1");
                 register int offset3 asm("r0");
                 register int dummy asm("r2");
-                sub_8072044(gSystemText_DontCutLink);
+                MenuPrintMessageDefaultCoords(gSystemText_DontCutLink);
                 ptr2 = (u8 *)&gMain;
                 offset3 = offsetof(struct Main, state);
                 if (dummy)
@@ -249,7 +249,7 @@ static void CB2_MysteryEventMenu(void)
                 MenuZeroFillWindowRect(6, 5, 23, 8);
             label:
                 GetEventLoadMessage(gStringVar4, 1);
-                sub_8072044(gStringVar4);
+                MenuPrintMessageDefaultCoords(gStringVar4);
                 ptr = (u8 *)&gMain;
                 offset2 = offsetof(struct Main, state);
                 ptr += offset2;
@@ -294,7 +294,7 @@ static void CB2_MysteryEventMenu(void)
         gMain.state++;
         break;
     case 12:
-        sub_8072044(gStringVar4);
+        MenuPrintMessageDefaultCoords(gStringVar4);
         gMain.state++;
         break;
     case 13:
@@ -329,7 +329,7 @@ static void CB2_MysteryEventMenu(void)
             CloseLink();
             MenuZeroFillWindowRect(6, 5, 23, 8);
             GetEventLoadMessage(gStringVar4, 1);
-            sub_8072044(gStringVar4);
+            MenuPrintMessageDefaultCoords(gStringVar4);
             gMain.state = 13;
         }
     }
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 6c107f022..3f8417e6d 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1618,7 +1618,7 @@ static void DisplaySentToPCMessage(void)
     StringExpandPlaceholders(gStringVar4, gOtherText_SentToPC);
     BasicInitMenuWindow(&gWindowConfig_81E6E88);
     MenuDisplayMessageBox();
-    sub_8072044(gStringVar4);
+    MenuPrintMessageDefaultCoords(gStringVar4);
 }
 
 static void sub_80B753C(void)
diff --git a/src/new_game.c b/src/new_game.c
index 226ac9bb7..3f9e9f5a1 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -11,7 +11,7 @@
 #include "item_menu.h"
 #include "lottery_corner.h"
 #include "mail_data.h"
-#include "mauville_old_man.h"
+#include "mauville_man.h"
 #include "play_time.h"
 #include "player_pc.h"
 #include "pokeblock.h"
@@ -20,7 +20,7 @@
 #include "pokemon_storage_system.h"
 #include "rng.h"
 #include "roamer.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "script.h"
 #include "secret_base.h"
@@ -157,7 +157,7 @@ void NewGameInitData(void)
     ClearPokeblocks();
     ClearDecorationInventories();
     InitEasyChatPhrases();
-    SetMauvilleOldMan();
+    SetupMauvilleOldMan();
     InitDewfordTrend();
     ResetFanClub();
     ResetLotteryCorner();
diff --git a/src/rom4.c b/src/overworld.c
index f9006efba..9b41a262d 100644
--- a/src/rom4.c
+++ b/src/overworld.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "battle_setup.h"
 #include "berry.h"
 #include "cable_club.h"
@@ -25,6 +25,7 @@
 #include "link.h"
 #include "load_save.h"
 #include "main.h"
+#include "map_constants.h"
 #include "map_name_popup.h"
 #include "menu.h"
 #include "metatile_behavior.h"
@@ -40,6 +41,7 @@
 #include "secret_base.h"
 #include "songs.h"
 #include "sound.h"
+#include "species.h"
 #include "start_menu.h"
 #include "task.h"
 #include "tileset_anim.h"
@@ -60,28 +62,10 @@ struct UnkTVStruct
     u32 tv_field_4;
 };
 
-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;
 
-extern u8 EventScript_LeagueWhiteOut[];
+extern u8 S_WhiteOut[];
 extern u8 gUnknown_0819FC9F[];
 extern u8 SingleBattleColosseum_EventScript_1A436F[];
 extern u8 SingleBattleColosseum_EventScript_1A4379[];
@@ -102,21 +86,115 @@ extern u8 TradeRoom_PromptToCancelLink[];
 extern u8 TradeRoom_TerminateLink[];
 extern u8 gUnknown_081A4508[];
 
-extern u8 (*gUnknown_082166A0[])(struct LinkPlayerMapObject *, struct MapObject *, u8);
-extern u8 (*gUnknown_082166AC[])(struct LinkPlayerMapObject *, struct MapObject *, u8);
-extern void (*gUnknown_082166D8[])(struct LinkPlayerMapObject *, struct MapObject *);
-
 extern struct MapData * const gMapAttributes[];
 extern struct MapHeader * const * const gMapGroups[];
-extern const struct WarpData gDummyWarpData;
-extern s32 gUnknown_0839ACE8;
-extern u32 gUnknown_08216694[];
+extern s32 gMaxFlashLevel;
+
+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 static u16 sAmbientCrySpecies = 0;
+EWRAM_DATA static bool8 sIsAmbientCryWaterMon = 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;
+
+static const struct WarpData sDummyWarpData =
+{
+    .mapGroup = -1,
+    .mapNum = -1,
+    .warpId = -1,
+    .x = -1,
+    .y = -1,
+};
+
+static const u8 sUnusedData[] =
+{
+    0xB0, 0x04, 0x00, 0x00,
+    0x10, 0x0E, 0x00, 0x00,
+    0xB0, 0x04, 0x00, 0x00,
+    0x60, 0x09, 0x00, 0x00,
+    0x32, 0x00, 0x00, 0x00,
+    0x50, 0x00, 0x00, 0x00,
+    0xD4, 0xFF, 0xFF, 0xFF,
+    0x2C, 0x00, 0x00, 0x00,
+};
+
+const struct UCoords32 gUnknown_0821664C[] =
+{
+    { 0,  0},
+    { 0,  1},
+    { 0, -1},
+    {-1,  0},
+    { 1,  0},
+    {-1,  1},
+    { 1,  1},
+    {-1, -1},
+    { 1, -1},
+};
+
+const struct UnknownTaskStruct gUnknown_08216694 =
+{
+    (void *)REG_ADDR_WIN0H,
+    ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
+    1,
+    0,
+};
+
+static u8 sub_8055C68(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055C88(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055C8C(struct LinkPlayerMapObject *, struct MapObject *, u8);
+
+static u8 (*const gUnknown_082166A0[])(struct LinkPlayerMapObject *, struct MapObject *, u8) =
+{
+    sub_8055C68,
+    sub_8055C88,
+    sub_8055C8C,
+};
+
+static u8 sub_8055CAC(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055CB0(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055D18(struct LinkPlayerMapObject *, struct MapObject *, u8);
+
+static u8 (*const gUnknown_082166AC[])(struct LinkPlayerMapObject *, struct MapObject *, u8) =
+{
+    sub_8055CAC,
+    sub_8055CB0,
+    sub_8055CB0,
+    sub_8055CB0,
+    sub_8055CB0,
+    sub_8055CAC,
+    sub_8055CAC,
+    sub_8055D18,
+    sub_8055D18,
+    sub_8055D18,
+    sub_8055D18,
+};
 
-void DoWhiteOut(void)
+static void sub_8055D30(struct LinkPlayerMapObject *, struct MapObject *);
+static void sub_8055D38(struct LinkPlayerMapObject *, struct MapObject *);
+
+static void (*const gUnknown_082166D8[])(struct LinkPlayerMapObject *, struct MapObject *) =
+{
+    sub_8055D30,
+    sub_8055D38,
+};
+
+
+static void DoWhiteOut(void)
 {
-    ScriptContext2_RunNewScript(EventScript_LeagueWhiteOut);
+    ScriptContext2_RunNewScript(S_WhiteOut);
     gSaveBlock1.money /= 2;
-    HealPlayerParty();
+    ScrSpecial_HealPlayerParty();
     sub_8053050();
     sub_8053570();
     warp_in();
@@ -125,48 +203,48 @@ void DoWhiteOut(void)
 void flag_var_implications_of_teleport_(void)
 {
     player_avatar_init_params_reset();
-    FlagReset(SYS_CYCLING_ROAD);
-    FlagReset(SYS_CRUISE_MODE);
-    FlagReset(SYS_SAFARI_MODE);
-    FlagReset(SYS_USE_STRENGTH);
-    FlagReset(SYS_USE_FLASH);
+    FlagClear(SYS_CYCLING_ROAD);
+    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_USE_FLASH);
 }
 
-void new_game(void)
+void Overworld_ResetStateAfterTeleport(void)
 {
     player_avatar_init_params_reset();
-    FlagReset(SYS_CYCLING_ROAD);
-    FlagReset(SYS_CRUISE_MODE);
-    FlagReset(SYS_SAFARI_MODE);
-    FlagReset(SYS_USE_STRENGTH);
-    FlagReset(SYS_USE_FLASH);
+    FlagClear(SYS_CYCLING_ROAD);
+    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_USE_FLASH);
     ScriptContext2_RunNewScript(gUnknown_0819FC9F);
 }
 
 void sub_8053014(void)
 {
     player_avatar_init_params_reset();
-    FlagReset(SYS_CYCLING_ROAD);
-    FlagReset(SYS_CRUISE_MODE);
-    FlagReset(SYS_SAFARI_MODE);
-    FlagReset(SYS_USE_STRENGTH);
-    FlagReset(SYS_USE_FLASH);
+    FlagClear(SYS_CYCLING_ROAD);
+    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_USE_FLASH);
 }
 
 void sub_8053050(void)
 {
     player_avatar_init_params_reset();
-    FlagReset(SYS_CYCLING_ROAD);
-    FlagReset(SYS_CRUISE_MODE);
-    FlagReset(SYS_SAFARI_MODE);
-    FlagReset(SYS_USE_STRENGTH);
-    FlagReset(SYS_USE_FLASH);
+    FlagClear(SYS_CYCLING_ROAD);
+    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_USE_FLASH);
 }
 
 void sub_805308C(void)
 {
-    FlagReset(SYS_SAFARI_MODE);
-    sub_8054164();
+    FlagClear(SYS_SAFARI_MODE);
+    ChooseAmbientCrySpecies();
     ResetCyclingRoadChallengeData();
     UpdateLocationHistoryForRoamer();
     RoamerMoveToOtherLocationSet();
@@ -213,15 +291,16 @@ void sub_8053154(void)
               gMapHeader.events->mapObjectCount * sizeof(struct MapObjectTemplate));
 }
 
-void sub_8053198(void)
+static void LoadSaveblockMapObjScripts(void)
 {
     struct MapObjectTemplate *mapObjectTemplates = gSaveBlock1.mapObjectTemplates;
     s32 i;
+
     for (i = 0; i < 64; i++)
         mapObjectTemplates[i].script = gMapHeader.events->mapObjects[i].script;
 }
 
-void update_saveblock1_field_object_coords(u8 localId, s16 x, s16 y)
+void Overworld_SaveMapObjCoords(u8 localId, s16 x, s16 y)
 {
     s32 i;
     for (i = 0; i < 64; i++)
@@ -231,28 +310,26 @@ void update_saveblock1_field_object_coords(u8 localId, s16 x, s16 y)
         {
             mapObjectTemplate->x = x;
             mapObjectTemplate->y = y;
-            break;
+            return;
         }
     }
 }
 
-void update_saveblock1_field_object_movement_behavior(u8 localId, u8 movementType)
+void Overworld_SaveMapObjMovementType(u8 localId, u8 movementType)
 {
-    s32 i = 0;
-    struct MapObjectTemplate *mapObjectTemplate = gSaveBlock1.mapObjectTemplates;
-    do
+    s32 i;
+    for (i = 0; i < 64; i++)
     {
+        struct MapObjectTemplate *mapObjectTemplate = &gSaveBlock1.mapObjectTemplates[i];
         if (mapObjectTemplate->localId == localId)
         {
             mapObjectTemplate->movementType = movementType;
-            break;
+            return;
         }
-        mapObjectTemplate++;
-        i++;
-    } while (i < 64);
+    }
 }
 
-void mapdata_load_assets_to_gpu_and_full_redraw(void)
+static void mapdata_load_assets_to_gpu_and_full_redraw(void)
 {
     move_tilemap_camera_to_upper_left_corner();
     copy_map_tileset1_tileset2_to_vram(gMapHeader.mapData);
@@ -261,7 +338,7 @@ void mapdata_load_assets_to_gpu_and_full_redraw(void)
     cur_mapheader_run_tileset_funcs_after_some_cpuset();
 }
 
-struct MapData *get_mapdata_header(void)
+static struct MapData *get_mapdata_header(void)
 {
     u16 mapDataId = gSaveBlock1.mapDataId;
     if (mapDataId)
@@ -269,15 +346,15 @@ struct MapData *get_mapdata_header(void)
     return NULL;
 }
 
-void warp_shift(void)
+static void warp_shift(void)
 {
     gUnknown_020297F0 = gSaveBlock1.location;
     gSaveBlock1.location = gUnknown_020297F8;
-    gUnknown_02029800 = gDummyWarpData;
-    gUnknown_02029808 = gDummyWarpData;
+    gUnknown_02029800 = sDummyWarpData;
+    gUnknown_02029808 = sDummyWarpData;
 }
 
-void warp_set(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
+static void warp_set(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
 {
     warp->mapGroup = mapGroup;
     warp->mapNum = mapNum;
@@ -286,7 +363,7 @@ void warp_set(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8
     warp->y = y;
 }
 
-bool32 warp_data_is_not_neg_1(struct WarpData *warp)
+static bool32 warp_data_is_not_neg_1(struct WarpData *warp)
 {
     if (warp->mapGroup != -1)
         return FALSE;
@@ -301,31 +378,27 @@ bool32 warp_data_is_not_neg_1(struct WarpData *warp)
     return TRUE;
 }
 
-struct MapHeader * const get_mapheader_by_bank_and_number(u16 mapGroup, u16 mapNum)
+struct MapHeader *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum)
 {
     return gMapGroups[mapGroup][mapNum];
 }
 
-struct MapHeader * const warp1_get_mapheader(void)
+struct MapHeader *const warp1_get_mapheader(void)
 {
-    return get_mapheader_by_bank_and_number(gUnknown_020297F8.mapGroup, gUnknown_020297F8.mapNum);
+    return Overworld_GetMapHeaderByGroupAndId(gUnknown_020297F8.mapGroup, gUnknown_020297F8.mapNum);
 }
 
-void set_current_map_header_from_sav1_save_old_name(void)
+static void set_current_map_header_from_sav1_save_old_name(void)
 {
-    struct MapHeader *dest = &gMapHeader;
-    struct MapHeader *src = get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
-    *dest = *src;
-    gSaveBlock1.mapDataId = dest->mapDataId;
-    dest->mapData = get_mapdata_header();
+    gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
+    gSaveBlock1.mapDataId = gMapHeader.mapDataId;
+    gMapHeader.mapData = get_mapdata_header();
 }
 
-void sub_805338C(void)
+static void LoadSaveblockMapHeader(void)
 {
-    struct MapHeader *dest = &gMapHeader;
-    struct MapHeader *src = get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
-    *dest = *src;
-    dest->mapData = get_mapdata_header();
+    gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
+    gMapHeader.mapData = get_mapdata_header();
 }
 
 void sub_80533CC(void)
@@ -382,6 +455,7 @@ void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused)
 void sub_8053538(u8 a1)
 {
     const struct HealLocation *warp = GetHealLocation(a1);
+
     if (warp)
         warp1_set(warp->group, warp->map, -1, warp->x, warp->y);
 }
@@ -400,9 +474,9 @@ void sub_8053588(u8 a1)
 
 void sub_80535C4(s16 a1, s16 a2)
 {
-    u8 v4 = sav1_map_get_light_level();
-    u8 v5 = get_map_light_level_by_bank_and_number(gUnknown_020297F8.mapGroup, gUnknown_020297F8.mapNum);
-    if (is_light_level_1_2_3_5_or_6(v4) && is_light_level_1_2_3_5_or_6(v5) != TRUE)
+    u8 v4 = Overworld_GetMapTypeOfSaveblockLocation();
+    u8 v5 = GetMapTypeByGroupAndId(gUnknown_020297F8.mapGroup, gUnknown_020297F8.mapNum);
+    if (is_map_type_1_2_3_5_or_6(v4) && is_map_type_1_2_3_5_or_6(v5) != TRUE)
         sub_805363C(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1, a1 - 7, a2 - 6);
 }
 
@@ -484,7 +558,7 @@ struct MapConnection *sub_8053818(u8 dir)
 bool8 sub_8053850(u8 dir, u16 x, u16 y)
 {
     struct MapConnection *connection = sub_8053818(dir);
-    if (connection)
+    if (connection != NULL)
     {
         warp1_set(connection->mapGroup, connection->mapNum, -1, x, y);
     }
@@ -523,8 +597,8 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     sub_8082BD0(mapGroup, mapNum);
     DoTimeBasedEvents();
     sub_80806E4();
-    sub_8054164();
-    sub_8053C98();
+    ChooseAmbientCrySpecies();
+    SetDefaultFlashLevel();
     sav1_reset_battle_music_maybe();
     mapheader_run_script_with_tag_x3();
     not_trainer_hill_battle_pyramid();
@@ -550,8 +624,8 @@ void sub_8053994(u32 a1)
 
     set_current_map_header_from_sav1_save_old_name();
     sub_8053154();
-    v2 = is_light_level_1_2_3_5_or_6(gMapHeader.mapType);
-    v3 = is_light_level_8_or_9(gMapHeader.mapType);
+    v2 = is_map_type_1_2_3_5_or_6(gMapHeader.mapType);
+    v3 = Overworld_MapTypeIsIndoors(gMapHeader.mapType);
     ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
@@ -559,10 +633,10 @@ void sub_8053994(u32 a1)
     if (a1 != 1)
         DoTimeBasedEvents();
     sub_80806E4();
-    sub_8054164();
+    ChooseAmbientCrySpecies();
     if (v2)
-        FlagReset(SYS_USE_FLASH);
-    sub_8053C98();
+        FlagClear(SYS_USE_FLASH);
+    SetDefaultFlashLevel();
     sav1_reset_battle_music_maybe();
     mapheader_run_script_with_tag_x3();
     UpdateLocationHistoryForRoamer();
@@ -600,11 +674,11 @@ void walkrun_find_lowest_active_bit_in_bitfield(void)
 struct UnkPlayerStruct *sub_8053AA8(void)
 {
     struct UnkPlayerStruct playerStruct;
-    u8 light = sav1_map_get_light_level();
+    u8 mapType = Overworld_GetMapTypeOfSaveblockLocation();
     u16 v2 = cur_mapdata_block_role_at_screen_center_acc_to_sav1();
-    u8 v4 = sub_8053B00(&gUnknown_02029810, v2, light);
+    u8 v4 = sub_8053B00(&gUnknown_02029810, v2, mapType);
     playerStruct.player_field_0 = v4;
-    playerStruct.player_field_1 = sub_8053B60(&gUnknown_02029810, v4, v2, light);
+    playerStruct.player_field_1 = sub_8053B60(&gUnknown_02029810, v4, v2, mapType);
     gUnknown_02029810 = playerStruct;
     return &gUnknown_02029810;
 }
@@ -617,7 +691,7 @@ u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3)
         return 16;
     if (MetatileBehavior_IsSurfableWaterOrUnderwater(a2) == 1)
         return 8;
-    if (IsBikingAllowedByMap() != TRUE)
+    if (Overworld_IsBikeAllowedOnCurrentMap() != TRUE)
         return 1;
     if (playerStruct->player_field_0 == 2)
         return 2;
@@ -655,10 +729,12 @@ u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void)
     return MapGridGetMetatileBehaviorAt(gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7);
 }
 
-bool32 IsBikingAllowedByMap(void)
+bool32 Overworld_IsBikeAllowedOnCurrentMap(void)
 {
     // is player in cycling road entrance?
-    if (gSaveBlock1.location.mapGroup == 29 && (gSaveBlock1.location.mapNum == 11 || gSaveBlock1.location.mapNum == 12))
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
+     && (gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
+      || gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE))
         return TRUE;
 
     // is player indoor, in a secret base, or underwater?
@@ -669,37 +745,37 @@ bool32 IsBikingAllowedByMap(void)
     if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
         return FALSE;
 
-    // is player in SeafloorCavern_Room9?
-    if (gSaveBlock1.location.mapGroup == 24 && gSaveBlock1.location.mapNum == 36)
+    // Thou shalt not bike on the sacred resting grounds of Kyogre/Groudon.
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_SEAFLOOR_CAVERN_ROOM9
+     && gSaveBlock1.location.mapNum == MAP_ID_SEAFLOOR_CAVERN_ROOM9)
         return FALSE;
-
-    // is player in CaveOfOrigin_B4F?
-    if (gSaveBlock1.location.mapGroup == 24 && gSaveBlock1.location.mapNum == 42)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_CAVE_OF_ORIGIN_B4F
+     && gSaveBlock1.location.mapNum == MAP_ID_CAVE_OF_ORIGIN_B4F)
         return FALSE;
 
     return TRUE;
 }
 
-void sub_8053C98(void)
+void SetDefaultFlashLevel(void)
 {
     if (!gMapHeader.cave)
-        gSaveBlock1.flashUsed = 0;
+        gSaveBlock1.flashLevel = 0;
     else if (FlagGet(SYS_USE_FLASH))
-        gSaveBlock1.flashUsed = 1;
+        gSaveBlock1.flashLevel = 1;
     else
-        gSaveBlock1.flashUsed = gUnknown_0839ACE8;
+        gSaveBlock1.flashLevel = gMaxFlashLevel;
 }
 
-void sub_8053CE4(s32 a1)
+void Overworld_SetFlashLevel(s32 flashLevel)
 {
-    if (a1 < 0 || a1 > gUnknown_0839ACE8)
-        a1 = 0;
-    gSaveBlock1.flashUsed = a1;
+    if (flashLevel < 0 || flashLevel > gMaxFlashLevel)
+        flashLevel = 0;
+    gSaveBlock1.flashLevel = flashLevel;
 }
 
-u8 sav1_get_flash_used_on_map(void)
+u8 Overworld_GetFlashLevel(void)
 {
-    return gSaveBlock1.flashUsed;
+    return gSaveBlock1.flashLevel;
 }
 
 void sub_8053D14(u16 mapDataId)
@@ -708,60 +784,62 @@ void sub_8053D14(u16 mapDataId)
     gMapHeader.mapData = get_mapdata_header();
 }
 
-bool16 sub_8053D30(struct WarpData *warp)
+static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
 {
     if (!FlagGet(SYS_WEATHER_CTRL))
         return FALSE;
-    if (warp->mapGroup != 0)
-        return FALSE;
-    switch (warp->mapNum)
+    if (warp->mapGroup == 0)
     {
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-        return TRUE;
-    case 39:
-    case 40:
-    case 41:
-    case 42:
-    case 43:
-        return TRUE;
+        switch (warp->mapNum)
+        {
+        case MAP_ID_LILYCOVE_CITY:
+        case MAP_ID_MOSSDEEP_CITY:
+        case MAP_ID_SOOTOPOLIS_CITY:
+        case MAP_ID_EVER_GRANDE_CITY:
+            return TRUE;
+        case MAP_ID_ROUTE124:
+        case MAP_ID_ROUTE125:
+        case MAP_ID_ROUTE126:
+        case MAP_ID_ROUTE127:
+        case MAP_ID_ROUTE128:
+            return TRUE;
+        }
     }
     return FALSE;
 }
 
-bool16 sub_8053D6C(struct WarpData *warp)
+static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp)
 {
-    if (VarGet(0x40B3))
+    if (VarGet(VAR_WEATHER_INSTITUTE_CLEARED))
         return FALSE;
-    if (warp->mapGroup != 32)
+    if (warp->mapGroup != MAP_GROUP_ROUTE119_WEATHER_INSTITUTE_1F)
         return FALSE;
-    if (warp->mapNum == 0 || warp->mapNum == 1)
+    if (warp->mapNum == MAP_ID_ROUTE119_WEATHER_INSTITUTE_1F
+     || warp->mapNum == MAP_ID_ROUTE119_WEATHER_INSTITUTE_2F)
         return TRUE;
     return FALSE;
 }
 
-u16 sub_8053D9C(struct WarpData *warp)
+static u16 GetLocationMusic(struct WarpData *warp)
 {
-    if (sub_8053D30(warp) == TRUE)
+    if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
         return LEGENDARY_MUSIC;
-    else if (sub_8053D6C(warp) == TRUE)
+    else if (IsInfiltratedWeatherInstitute(warp) == TRUE)
         return BGM_TOZAN;
     else
-        return get_mapheader_by_bank_and_number(warp->mapGroup, warp->mapNum)->music;
+        return Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum)->music;
 }
 
 u16 sav1_map_get_music(void)
 {
     u16 music;
 
-    if (gSaveBlock1.location.mapGroup == 0
-     && gSaveBlock1.location.mapNum == 26
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE111
+     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE111
      && GetSav1Weather() == 8)
         return BGM_ASHROAD;
 
-    music = sub_8053D9C(&gSaveBlock1.location);
+    music = GetLocationMusic(&gSaveBlock1.location);
     if (music != 0x7FFF)
     {
         return music;
@@ -777,14 +855,15 @@ u16 sav1_map_get_music(void)
 
 u16 warp1_target_get_music(void)
 {
-    u16 music = sub_8053D9C(&gUnknown_020297F8);
+    u16 music = GetLocationMusic(&gUnknown_020297F8);
     if (music != 0x7FFF)
     {
         return music;
     }
     else
     {
-        if (gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 2)
+        if (gSaveBlock1.location.mapGroup == MAP_GROUP_MAUVILLE_CITY
+         && gSaveBlock1.location.mapNum == MAP_ID_MAUVILLE_CITY)
             return BGM_DOORO_X1;
         else
             return BGM_GRANROAD;
@@ -804,7 +883,7 @@ void sub_8053E90(void)
     {
         if (gSaveBlock1.battleMusic)
             music = gSaveBlock1.battleMusic;
-        else if (sav1_map_get_light_level() == 5)
+        else if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER)
             music = BGM_DEEPDEEP;
         else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
             music = BGM_NAMINORI;
@@ -854,17 +933,17 @@ void sub_8053F84(void)
         FadeOutAndPlayNewMapMusic(sav1_map_get_music(), 8);
 }
 
-void sub_8053FB0(u16 music)
+void Overworld_ChangeMusicTo(u16 newMusic)
 {
     u16 currentMusic = GetCurrentMapMusic();
-    if (currentMusic != music && currentMusic != LEGENDARY_MUSIC)
-        FadeOutAndPlayNewMapMusic(music, 8);
+    if (currentMusic != newMusic && currentMusic != LEGENDARY_MUSIC)
+        FadeOutAndPlayNewMapMusic(newMusic, 8);
 }
 
-u8 is_warp1_light_level_8_or_9(void)
+u8 GetMapMusicFadeoutSpeed(void)
 {
     struct MapHeader *mapHeader = warp1_get_mapheader();
-    if (is_light_level_8_or_9(mapHeader->mapType) == TRUE)
+    if (Overworld_MapTypeIsIndoors(mapHeader->mapType) == TRUE)
         return 2;
     else
         return 4;
@@ -875,7 +954,7 @@ void sub_8053FF8(void)
     u16 music = warp1_target_get_music();
     if (FlagGet(SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic())
     {
-        u8 speed = is_warp1_light_level_8_or_9();
+        u8 speed = GetMapMusicFadeoutSpeed();
         FadeOutMapMusic(speed);
     }
 }
@@ -890,43 +969,43 @@ void sub_8054044(void)
     FadeOutMapMusic(4);
 }
 
-void sub_8054050(void)
+static void PlayAmbientCry(void)
 {
     s16 x, y;
-    PlayerGetDestCoords((u16 *)&x, (u16 *)&y);
-    if (gUnknown_02029816 != TRUE
+    PlayerGetDestCoords(&x, &y);
+    if (sIsAmbientCryWaterMon != TRUE
      || MetatileBehavior_IsSurfableWaterOrUnderwater(MapGridGetMetatileBehaviorAt(x, y)))
     {
         s8 pan = (Random() % 88) + 212;
         s8 volume = (Random() % 30) + 50;
-        PlayCry2(gUnknown_02029814, pan, volume, 1);
+        PlayCry2(sAmbientCrySpecies, pan, volume, 1);
     }
 }
 
-void sub_80540D0(s16 *a1, u16 *a2)
+void UpdateAmbientCry(s16 *state, u16 *delayCounter)
 {
-    switch (*a1)
+    switch (*state)
     {
     case 0:
-        if (!gUnknown_02029814)
-            *a1 = 4;
+        if (sAmbientCrySpecies == SPECIES_NONE)
+            *state = 4;
         else
-            *a1 = 1;
+            *state = 1;
         break;
     case 1:
-        *a2 = (Random() % 2400) + 1200;
-        *a1 = 3;
+        *delayCounter = (Random() % 2400) + 1200;
+        *state = 3;
         break;
     case 2:
-        *a2 = (Random() % 1200) + 1200;
-        *a1 = 3;
+        *delayCounter = (Random() % 1200) + 1200;
+        *state = 3;
         break;
     case 3:
-        (*a2)--;
-        if (*a2 == 0)
+        (*delayCounter)--;
+        if (*delayCounter == 0)
         {
-            sub_8054050();
-            *a1 = 2;
+            PlayAmbientCry();
+            *state = 2;
         }
         break;
     case 4:
@@ -934,58 +1013,70 @@ void sub_80540D0(s16 *a1, u16 *a2)
     }
 }
 
-void sub_8054164(void)
+void ChooseAmbientCrySpecies(void)
 {
-    if ((gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 45) && !IsMirageIslandPresent())
+    if ((gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE130
+     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE130)
+     && !IsMirageIslandPresent())
     {
-        gUnknown_02029816 = TRUE;
-        gUnknown_02029814 = GetMirageIslandMon();
+        // Only play water pokemon cries on this route
+        // when Mirage Island is not present
+        sIsAmbientCryWaterMon = TRUE;
+        sAmbientCrySpecies = GetLocalWaterMon();
     }
     else
     {
-        gUnknown_02029814 = GetLocalWildMon(&gUnknown_02029816);
+        sAmbientCrySpecies = GetLocalWildMon(&sIsAmbientCryWaterMon);
     }
 }
 
-u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum)
+u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum)
 {
-    return get_mapheader_by_bank_and_number(mapGroup, mapNum)->mapType;
+    return Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum)->mapType;
 }
 
-u8 get_map_light_level_from_warp(struct WarpData *warp)
+u8 GetMapTypeByWarpData(struct WarpData *warp)
 {
-    return get_map_light_level_by_bank_and_number(warp->mapGroup, warp->mapNum);
+    return GetMapTypeByGroupAndId(warp->mapGroup, warp->mapNum);
 }
 
-u8 sav1_map_get_light_level(void)
+u8 Overworld_GetMapTypeOfSaveblockLocation(void)
 {
-    return get_map_light_level_from_warp(&gSaveBlock1.location);
+    return GetMapTypeByWarpData(&gSaveBlock1.location);
 }
 
-u8 get_map_light_from_warp0(void)
+u8 get_map_type_from_warp0(void)
 {
-    return get_map_light_level_from_warp(&gUnknown_020297F0);
+    return GetMapTypeByWarpData(&gUnknown_020297F0);
 }
 
-bool8 is_light_level_1_2_3_5_or_6(u8 a1)
+bool8 is_map_type_1_2_3_5_or_6(u8 mapType)
 {
-    if (a1 == 3 || a1 == 1 || a1 == 5 || a1 == 2 || a1 == 6)
+    if (mapType == MAP_TYPE_ROUTE
+     || mapType == MAP_TYPE_TOWN
+     || mapType == MAP_TYPE_UNDERWATER
+     || mapType == MAP_TYPE_CITY
+     || mapType == MAP_TYPE_6)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 is_light_level_1_2_3_or_6(u8 a1)
+bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType)
 {
-    if (a1 == 3 || a1 == 1 || a1 == 6 || a1 == 2)
+    if (mapType == MAP_TYPE_ROUTE
+     || mapType == MAP_TYPE_TOWN
+     || mapType == MAP_TYPE_6
+     || mapType == MAP_TYPE_CITY)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 is_light_level_8_or_9(u8 a1)
+bool8 Overworld_MapTypeIsIndoors(u8 mapType)
 {
-    if (a1 == 8 || a1 == 9)
+    if (mapType == MAP_TYPE_INDOOR
+     || mapType == MAP_TYPE_SECRET_BASE)
         return TRUE;
     else
         return FALSE;
@@ -993,17 +1084,17 @@ 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)->regionMapSectionId;
+    return Overworld_GetMapHeaderByGroupAndId(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)->regionMapSectionId;
+    return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->regionMapSectionId;
 }
 
 u8 sav1_map_get_battletype(void)
 {
-    return get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->battleType;
+    return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->battleType;
 }
 
 void ResetSafariZoneFlag_(void)
@@ -1046,7 +1137,7 @@ void c1_overworld(void)
         c1_overworld_normal(gMain.newKeys, gMain.heldKeys);
 }
 
-void c2_overworld_basic(void)
+void OverworldBasic(void)
 {
     ScriptContext2_RunScript();
     RunTasks();
@@ -1058,9 +1149,9 @@ void c2_overworld_basic(void)
     sub_8072EDC();
 }
 
-void sub_8054398(void)
+void CB2_OverworldBasic(void)
 {
-    c2_overworld_basic();
+    OverworldBasic();
 }
 
 void c2_overworld(void)
@@ -1068,7 +1159,7 @@ void c2_overworld(void)
     int fading = (gPaletteFade.active != 0);
     if (fading)
         SetVBlankCallback(NULL);
-    c2_overworld_basic();
+    OverworldBasic();
     if (fading)
         SetFieldVBlankCallback();
 }
@@ -1265,8 +1356,8 @@ void CB2_ContinueSavedGame(void)
     FieldClearVBlankHBlankCallbacks();
     StopMapMusic();
     ResetSafariZoneFlag_();
-    sub_805338C();
-    sub_8053198();
+    LoadSaveblockMapHeader();
+    LoadSaveblockMapObjScripts();
     UnfreezeMapObjects();
     DoTimeBasedEvents();
     sub_805308C();
@@ -1317,11 +1408,11 @@ void VBlankCB_Field(void)
 
 void sub_8054814(void)
 {
-    u8 val = sav1_get_flash_used_on_map();
+    u8 val = Overworld_GetFlashLevel();
     if (val)
     {
         sub_80815E0(val);
-        sub_80895F8(gUnknown_08216694[0], gUnknown_08216694[1], gUnknown_08216694[2]);
+        sub_80895F8(gUnknown_08216694);
     }
 }
 
@@ -2434,27 +2525,27 @@ void sub_8055BFC(u8 linkPlayerId, u8 a2)
     }
 }
 
-u8 sub_8055C68(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C68(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return gUnknown_082166AC[a3](linkPlayerMapObj, mapObj, a3);
 }
 
-u8 sub_8055C88(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C88(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return 1;
 }
 
-u8 sub_8055C8C(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C8C(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return gUnknown_082166AC[a3](linkPlayerMapObj, mapObj, a3);
 }
 
-u8 sub_8055CAC(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055CAC(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     return 0;
 }
 
-u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     s16 x, y;
 
@@ -2474,18 +2565,18 @@ u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *m
     }
 }
 
-u8 sub_8055D18(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055D18(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
 {
     mapObj->mapobj_unk_19 = npc_something3(a3, mapObj->mapobj_unk_19);
     return 0;
 }
 
-void sub_8055D30(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+static void sub_8055D30(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
 {
     linkPlayerMapObj->mode = 0;
 }
 
-void sub_8055D38(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+static void sub_8055D38(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
 {
     mapObj->mapobj_unk_21--;
     linkPlayerMapObj->mode = 1;
diff --git a/src/party_menu.c b/src/party_menu.c
index 1fcd2cdda..39477e293 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -33,15 +33,6 @@
 #include "species.h"
 #include "party_menu.h"
 
-#define DATA_COUNT (6)
-
-struct Unk2001000
-{
-    u8 unk0;
-    u8 unk1;
-    u8 unk2;
-};
-
 struct Unk201C000
 {
     /*0x00*/ struct Pokemon *pokemon;
@@ -68,8 +59,6 @@ struct UnknownStruct5
     u16 *unk4;
 };
 
-extern u8 ewram[];
-#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x01000))
 #define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000))
 #define ewram1F000 (*(struct Unk201F000 *)(ewram + 0x1F000))
 
diff --git a/src/player_pc.c b/src/player_pc.c
index 6d52c560a..83e6dd221 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -18,7 +18,7 @@
 #include "songs.h"
 #include "name_string_util.h"
 #include "mail.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "player_pc.h"
 
 extern void DisplayItemMessageOnField(u8, const u8*, TaskFunc, u16);
@@ -106,7 +106,7 @@ static const u8 *const gPCText_OptionDescList[] =
     gMenuText_GoBackToPrev
 };
 
-static const struct MenuAction2 gPCText_PlayerPCOptionsText[] =
+static const struct MenuAction2 sPlayerPCMenuActions[] =
 {
     { SecretBaseText_ItemStorage, PlayerPC_ItemStorage },
     { gPCText_Mailbox, PlayerPC_Mailbox },
@@ -226,7 +226,7 @@ void PlayerPC(void)
 static void InitPlayerPCMenu(u8 taskId)
 {
     MenuDrawTextWindow(0, 0, 10, gPcItemMenuOptionsNum * 2 + 1);
-    PrintMenuItemsReordered(1, 1, gPcItemMenuOptionsNum, (struct MenuAction *)gPCText_PlayerPCOptionsText, gPcItemMenuOptionOrder);
+    PrintMenuItemsReordered(1, 1, gPcItemMenuOptionsNum, sPlayerPCMenuActions, gPcItemMenuOptionOrder);
     InitMenu(0, 1, 1, gPcItemMenuOptionsNum, 0, 9);
     TASK.FUNC = PlayerPCProcessMenuInput;
 }
@@ -247,13 +247,13 @@ static void PlayerPCProcessMenuInput(u8 taskId)
     {
         HandleDestroyMenuCursors();
         PlaySE(SE_SELECT);
-        gPCText_PlayerPCOptionsText[gPcItemMenuOptionOrder[GetMenuCursorPos()]].func(taskId);
+        sPlayerPCMenuActions[gPcItemMenuOptionOrder[GetMenuCursorPos()]].func(taskId);
     }
     else if (gMain.newKeys & B_BUTTON)
     {
         HandleDestroyMenuCursors();
         PlaySE(SE_SELECT);
-        gPCText_PlayerPCOptionsText[gPcItemMenuOptionsNum[gPcItemMenuOptionOrder - 1]].func(taskId); // run EXIT.
+        sPlayerPCMenuActions[gPcItemMenuOptionsNum[gPcItemMenuOptionOrder - 1]].func(taskId); // run EXIT.
     }
 }
 
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 029bb066f..d69c41639 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -3,7 +3,7 @@
 //
 
 #include "global.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "sprite.h"
 #include "script.h"
 #include "strings.h"
@@ -816,7 +816,7 @@ static void sub_810C368(u8 taskId)
     sub_80F98A4(1);
     BasicInitMenuWindow(&gWindowConfig_81E6E50);
     MenuDrawTextWindow(7, v0 + 4, 13, 11);
-    PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, (const struct MenuAction *)gUnknown_083F7EF4, gUnknown_03000758);
+    PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758);
     InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5);
     gScriptItemId = gUnknown_02039248.unk0 + gUnknown_02039248.unk1;
     gTasks[taskId].func = sub_810C40C;
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index db4db55a7..ccbb391af 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -6,7 +6,7 @@
 #include "text.h"
 #include "text_window.h"
 #include "menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "decompress.h"
 #include "data2.h"
 #include "sprite.h"
diff --git a/src/pokedex.c b/src/pokedex.c
index c132635cb..603b5ae48 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -16,7 +16,7 @@
 #include "pokedex_cry_screen.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "songs.h"
 #include "sound.h"
 #include "species.h"
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index 5cfd2c794..1d597cb17 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -4,7 +4,7 @@
 #include "main.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "species.h"
 #include "sprite.h"
 #include "string_util.h"
@@ -17,9 +17,9 @@
 #define LOHALF(n) ((n) & 0xFFFF)
 
 extern u8 unk_2000000[];
-extern u16 word_2024E82;
+extern u16 gMoveToLearn;
 
-static EWRAM_DATA u8 byte_2024E88 = 0;
+static EWRAM_DATA u8 sLearningMoveTableID = 0;
 
 u8 gPlayerPartyCount;
 struct Pokemon gPlayerParty[6];
@@ -69,6 +69,7 @@ void ZeroEnemyPartyMons(void)
 void CreateMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
 {
     u32 arg;
+
     ZeroMonData(mon);
     CreateBoxMon(&mon->box, species, level, fixedIV, hasFixedPersonality, fixedPersonality, otIdType, fixedOtId);
     SetMonData(mon, MON_DATA_LEVEL, &level);
@@ -583,29 +584,33 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon)
     }
 }
 
-u16 sub_803B7C8(struct Pokemon *mon, u8 a2)
+u16 MonTryLearningNewMove(struct Pokemon *mon, bool8 firstMove)
 {
     u32 retVal = 0;
     u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
     u8 level = GetMonData(mon, MON_DATA_LEVEL, NULL);
 
-    if (a2)
+    // since you can learn more than one move per level
+    // the game needs to know whether you decided to
+    // learn it or keep the old set to avoid asking
+    // you to learn the same move over and over again
+    if (firstMove)
     {
-        byte_2024E88 = retVal;
+        sLearningMoveTableID = 0;
 
-        while ((gLevelUpLearnsets[species][byte_2024E88] & 0xFE00) != (level << 9))
+        while ((gLevelUpLearnsets[species][sLearningMoveTableID] & 0xFE00) != (level << 9))
         {
-            byte_2024E88++;
-            if (gLevelUpLearnsets[species][byte_2024E88] == (u16)-1)
+            sLearningMoveTableID++;
+            if (gLevelUpLearnsets[species][sLearningMoveTableID] == 0xFFFF)
                 return 0;
         }
     }
 
-    if ((gLevelUpLearnsets[species][byte_2024E88] & 0xFE00) == (level << 9))
+    if ((gLevelUpLearnsets[species][sLearningMoveTableID] & 0xFE00) == (level << 9))
     {
-        word_2024E82 = (gLevelUpLearnsets[species][byte_2024E88] & 0x1FF);
-        byte_2024E88++;
-        retVal = GiveMoveToMon(mon, word_2024E82);
+        gMoveToLearn = (gLevelUpLearnsets[species][sLearningMoveTableID] & 0x1FF);
+        sLearningMoveTableID++;
+        retVal = GiveMoveToMon(mon, gMoveToLearn);
     }
 
     return retVal;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index d7cc39546..e51d3187b 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -11,7 +11,7 @@
 #include "main.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rom_8077ABC.h"
 #include "rom_8094928.h"
 #include "rtc.h"
@@ -1197,7 +1197,7 @@ const struct CompressedSpritePalette *sub_80409C8(u16 species, u32 otId , u32 pe
         return &gMonPaletteTable[species];
 }
 
-bool8 IsHMMove2(u16 move)
+bool32 IsHMMove2(u16 move)
 {
     int i = 0;
     while (gHMMoves[i] != 0xFFFF)
diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c
new file mode 100644
index 000000000..bc5150a16
--- /dev/null
+++ b/src/pokemon_menu.c
@@ -0,0 +1,1200 @@
+#include "global.h"
+#include "pokemon.h"
+#include "pokemon_menu.h"
+#include "party_menu.h"
+#include "palette.h"
+#include "menu.h"
+#include "mail_data.h"
+#include "songs.h"
+#include "sound.h"
+#include "main.h"
+#include "overworld.h"
+#include "menu_helpers.h"
+#include "pokemon_summary_screen.h"
+#include "moves.h"
+#include "data2.h"
+#include "strings.h"
+#include "item_use.h"
+#include "item.h"
+#include "event_data.h"
+#include "mail.h"
+#include "field_player_avatar.h"
+#include "fldeff_softboiled.h"
+#include "braille_puzzles.h"
+#include "field_fadetransition.h"
+#include "field_weather.h"
+#include "field_effect.h"
+#include "field_control_avatar.h"
+#include "metatile_behavior.h"
+#include "fieldmap.h"
+#include "item_menu.h"
+#include "player_pc.h"
+
+/*
+Pokemon menu:
+    The menu that appears when you
+    click on a pokemon in
+    overworld 'pokemon' menu
+*/
+
+struct PokeMenuFieldMoveFunc
+{
+    bool8 (*func)(void);
+    u8 field_1;
+};
+
+extern u8 gUnknown_020384F0;
+extern u8 gUnknown_0202E8F4;
+extern u8 gUnknown_0202E8F5;
+extern u8 gUnknown_0202E8F6;
+extern u8 gUnknown_02038561;
+extern u16 gUnknown_0202E8F8;
+extern u8 ewram[];
+extern void (*gUnknown_03004AE4)(u8 taskID, u16 itemID, TaskFunc func);
+extern TaskFunc gUnknown_03005CF0;
+
+void sub_80E62A0(u8 arg0, struct MailStruct* arg1, void* arg2, u8 arg3);
+void sub_808A520(void);
+void sub_80A61D0(void);
+void CB2_InitFlyRegionMap(void);
+u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem);
+bool8 SetUpFieldMove_Cut(void);
+bool8 SetUpFieldMove_Flash(void);
+bool8 SetUpFieldMove_RockSmash(void);
+bool8 SetUpFieldMove_Strength(void);
+bool8 SetUpFieldMove_Teleport(void);
+bool8 SetUpFieldMove_Dig(void);
+bool8 SetUpFieldMove_SecretPower(void);
+bool8 SetUpFieldMove_SoftBoiled(void);
+bool8 SetUpFieldMove_SoftBoiled(void);
+bool8 SetUpFieldMove_SweetScent(void);
+
+#define sFieldMovesTerminator 0xFF // note: should be changed to 0xFFFF, because currently it makes it impossible to add a field move with 0xFF index
+
+// this file's functions
+static void sub_808A8A8(void);
+static void sub_808B3EC(void);
+static void sub_8089D94(u8 taskID);
+static void sub_8089E4C(u8 taskID);
+static void sub_808A5BC(u8 taskID);
+static void sub_808A8D4(u8 taskID);
+static void sub_808A73C(u8 taskID);
+static void sub_808A848(u8 taskID);
+static void sub_808AAF0(u8 taskID);
+static void sub_808ABF4(u8 taskID);
+static void sub_808AB34(u8 taskID);
+static void sub_808ABA8(u8 taskID);
+static void sub_808B224(u8 taskID);
+static void sub_808B2EC(u8 taskID);
+static void sub_808B2B4(u8 taskID);
+static void sub_808B25C(u8 taskID);
+static void sub_808B1EC(u8 taskID);
+static void sub_808B338(u8 taskID);
+static void sub_808B4A4(u8 taskID);
+static void sub_808B4EC(u8 taskID);
+static void sub_808B5E4(u8 taskID);
+static void PokemonMenu_Summary(u8 taskID);
+static void PokemonMenu_Switch(u8 taskID);
+static void PokemonMenu_Item(u8 taskID);
+static void PokemonMenu_Cancel(u8 taskID);
+static void PokemonMenu_GiveItem(u8 taskID);
+static void PokemonMenu_TakeItem(u8 taskID);
+static void PokemonMenu_TakeMail(u8 taskID);
+static void PokemonMenu_Mail(u8 taskID);
+static void PokemonMenu_ReadMail(u8 taskID);
+static void PokemonMenu_CancelSubmenu(u8 taskID);
+static void PokemonMenu_FieldMove(u8 taskID);
+static bool8 SetUpFieldMove_Waterfall(void);
+static bool8 SetUpFieldMove_Surf(void);
+static bool8 SetUpFieldMove_Fly(void);
+static bool8 SetUpFieldMove_Dive(void);
+
+// ewram data
+
+EWRAM_DATA static u8 sPokeMenuCursorPos = 0;
+EWRAM_DATA static u8 sPokeMenuOptionsNo = 0;
+EWRAM_DATA static u8 sPokeMenuOptionsOrder[8] = {0}; // 4 possible field moves and 4 default options
+
+// iwram common
+u8 gLastFieldPokeMenuOpened;
+void (*gUnknown_03005CE4)(void);
+
+// const data
+
+static const struct MenuAction2 sPokemonMenuActions[] =
+{
+    {OtherText_Summary,             PokemonMenu_Summary},
+    {OtherText_Switch2,             PokemonMenu_Switch},
+    {OtherText_Item,                PokemonMenu_Item},
+    {gOtherText_CancelNoTerminator, PokemonMenu_Cancel},
+    {OtherText_Give2,               PokemonMenu_GiveItem},
+    {OtherText_Take2,               PokemonMenu_TakeItem},
+    {OtherText_Take,                PokemonMenu_TakeMail},
+    {OtherText_Mail,                PokemonMenu_Mail},
+    {OtherText_Read2,               PokemonMenu_ReadMail},
+    {gOtherText_CancelNoTerminator, PokemonMenu_CancelSubmenu},
+    {gMoveNames[MOVE_CUT],          PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_FLASH],        PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_ROCK_SMASH],   PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_STRENGTH],     PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SURF],         PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_FLY],          PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_DIVE],         PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_WATERFALL],    PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_TELEPORT],     PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_DIG],          PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SECRET_POWER], PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_MILK_DRINK],   PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SOFT_BOILED],  PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SWEET_SCENT],  PokemonMenu_FieldMove},
+};
+
+static const u16 sPokeMenuFieldMoves[] =
+{
+    MOVE_CUT, MOVE_FLASH, MOVE_ROCK_SMASH, MOVE_STRENGTH,
+    MOVE_SURF, MOVE_FLY, MOVE_DIVE, MOVE_WATERFALL,
+    MOVE_TELEPORT, MOVE_DIG, MOVE_SECRET_POWER, MOVE_MILK_DRINK,
+    MOVE_SOFT_BOILED, MOVE_SWEET_SCENT, sFieldMovesTerminator,
+};
+
+static const u8 sUnknown_39F572[] = {4, 5, 9, 0};
+static const struct PartyPopupMenu sUnknown_0839F578 = {3, 6, sUnknown_39F572};
+
+static const u8 sUnknown_39F580[] = {8, 6, 9, 0};
+static const struct PartyPopupMenu sUnknown_0839F584 = {3, 9, sUnknown_39F580};
+
+static const struct PokeMenuFieldMoveFunc sFieldMoveFuncs[] =
+{
+    {SetUpFieldMove_Cut,            0x6},
+    {SetUpFieldMove_Flash,          0x9},
+    {SetUpFieldMove_RockSmash,      0x9},
+    {SetUpFieldMove_Strength,       0x9},
+    {SetUpFieldMove_Surf,           0x7},
+    {SetUpFieldMove_Fly,            0x9},
+    {SetUpFieldMove_Dive,           0x9},
+    {SetUpFieldMove_Waterfall,      0x9},
+    {SetUpFieldMove_Teleport,       0x9},
+    {SetUpFieldMove_Dig,            0x9},
+    {SetUpFieldMove_SecretPower,    0x9},
+    {SetUpFieldMove_SoftBoiled,     0x10},
+    {SetUpFieldMove_SoftBoiled,     0x10},
+    {SetUpFieldMove_SweetScent,     0x9},
+};
+
+void sub_8089A70(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    OpenPartyMenu(0, 0);
+}
+
+static void sub_8089A8C(void)
+{
+    sPokeMenuOptionsNo = 0;
+    // if checking pokemon is an egg, we can't give it an item and it doesn't know any move
+    if (GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_IS_EGG))
+    {
+        AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_SUMMARY);
+        AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_SWITCH);
+        AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_CANCEL);
+    }
+    else
+    {
+        u16 moveID, tableID;
+        for (moveID = 0; moveID < 4; moveID++) // 4, max number of possible field moves
+        {
+            for (tableID = 0; sPokeMenuFieldMoves[tableID] != sFieldMovesTerminator; tableID++)
+            {
+                if (GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_MOVE1 + moveID) == sPokeMenuFieldMoves[tableID])
+                {
+                    u8 fieldID = tableID + POKEMENU_FIRST_FIELD_MOVE_ID;
+                    AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, fieldID);
+                    break;
+                }
+            }
+        }
+        AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_SUMMARY);
+
+        // can't switch a pokemon if it's the only one in the party
+        if (GetMonData(&gPlayerParty[1], MON_DATA_SPECIES) != 0)
+            AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_SWITCH);
+
+        if (ItemIsMail(GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_HELD_ITEM)))
+            AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_MAIL);
+        else
+            AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_ITEM);
+
+        AppendToList(sPokeMenuOptionsOrder, &sPokeMenuOptionsNo, POKEMENU_CANCEL);
+    }
+}
+
+static void sub_8089BDC(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order, u8 arg6)
+{
+    sub_806D538(5, arg6);
+    MenuDrawTextWindow(arg0, arg1, arg0 + arg2, (noOfOptions * 2) + arg1 + 1);
+    PrintMenuItemsReordered(arg0 + 1, arg1 + 1, noOfOptions, menuActions, order);
+}
+
+void sub_8089C50(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order)
+{
+    sub_8089BDC(arg0, arg1, arg2, noOfOptions, menuActions, order, 1);
+}
+
+static void sub_8089C7C(u8 arg0)
+{
+    u32 r4 = (u8)(18 - (sPokeMenuOptionsNo << 1));
+
+    sub_8089BDC(19, r4, 10, sPokeMenuOptionsNo, sPokemonMenuActions, sPokeMenuOptionsOrder, 3);
+    r4 |= 1;
+    InitMenu(0, 20, r4, sPokeMenuOptionsNo, arg0, 9);
+}
+
+void sub_8089CD4(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        switch (sub_806BD80(taskID))
+        {
+        case 1:
+            PlaySE(SE_SELECT);
+            gLastFieldPokeMenuOpened = sub_806CA38(taskID);
+            GetMonNickname(&gPlayerParty[gLastFieldPokeMenuOpened], gStringVar1);
+            sub_8089A8C();
+            sPokeMenuCursorPos = 0;
+            sub_8089C7C(0);
+            gTasks[taskID].func = sub_8089D94;
+            sub_808B5B4(taskID);
+            break;
+        case 2:
+            PlaySE(SE_SELECT);
+            BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+            gTasks[taskID].func = sub_8089E4C;
+            break;
+        }
+    }
+}
+
+static void sub_8089D94(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
+        {
+            PlaySE(SE_SELECT);
+            sPokeMenuCursorPos = MoveMenuCursor(-1);
+            sub_808B5B4(taskID);
+        }
+        else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
+        {
+            PlaySE(SE_SELECT);
+            sPokeMenuCursorPos = MoveMenuCursor(1);
+            sub_808B5B4(taskID);
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sPokemonMenuActions[sPokeMenuOptionsOrder[sPokeMenuCursorPos]].func(taskID);
+            sub_808B5B4(taskID);
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PokemonMenu_Cancel(taskID);
+            sub_808B5B4(taskID);
+        }
+    }
+}
+
+static void sub_8089E4C(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        gLastFieldPokeMenuOpened = 0;
+        SetMainCallback2(sub_805469C);
+        DestroyTask(taskID);
+    }
+}
+
+static void sub_8089E84(void)
+{
+    GetMonNickname(&gPlayerParty[gLastFieldPokeMenuOpened], gStringVar1);
+    sub_8089A8C();
+    sPokeMenuCursorPos = 0;
+    sub_8089C7C(0);
+}
+
+static void sub_8089EBC(void)
+{
+    do
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gUnknown_020384F0);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            gLastFieldPokeMenuOpened = gUnknown_020384F0;
+            sub_8089E84();
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+    } while (sub_80F9344() != TRUE);
+}
+
+static void sub_8089F14(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    sub_806AF4C(0, 0xFF, sub_8089D94, 5);
+    SetMainCallback2(sub_8089EBC);
+}
+
+static void sub_8089F44(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 spriteID = gSprites[gTasks[taskID].data[3] >> 8].data0;
+        DestroyTask(taskID);
+        ewram1B000_alt.unk262 = 1;
+        ShowPokemonSummaryScreen(gPlayerParty, spriteID, gPlayerPartyCount - 1, sub_8089F14, 0);
+    }
+}
+
+static void PokemonMenu_Summary(u8 taskID)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskID].func = sub_8089F44;
+}
+
+void sub_808A004(u8 taskID)
+{
+    SetTaskFuncWithFollowupFunc(taskID, sub_806CA60, sub_8089CD4);
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+}
+
+static void PokemonMenu_Switch(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    ewram01000.unkC = sub_806CD5C;
+    ewram01000.array[53553] = 1;
+    sub_808A004(taskID);
+}
+
+static void sub_808A060(u8 taskID)
+{
+    if (gMain.newKeys == DPAD_UP && sPokeMenuCursorPos != 0)
+    {
+        sPokeMenuCursorPos = MoveMenuCursor(-1);
+        PlaySE(SE_SELECT);
+    }
+    if (gMain.newKeys == DPAD_DOWN && sPokeMenuCursorPos != 2)
+    {
+        sPokeMenuCursorPos = MoveMenuCursor(1);
+        PlaySE(SE_SELECT);
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        PartyMenuGetPopupMenuFunc(0, &sUnknown_0839F578, (void *)sPokemonMenuActions, sPokeMenuCursorPos)(taskID);
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        sub_806E7D0(0, &sUnknown_0839F578);
+        PokemonMenu_CancelSubmenu(taskID);
+    }
+}
+
+static void sub_808A100(u8 taskID)
+{
+    sub_806E750(0, &sUnknown_0839F578, (void*)(sPokemonMenuActions), 0);
+    sub_806D538(0xD, 2);
+    gTasks[taskID].func = sub_808A060;
+}
+
+static void PokemonMenu_Item(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    sPokeMenuCursorPos = 0;
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    gTasks[taskID].func = sub_808A100;
+}
+
+static void sub_808A180(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 mailID = GetMonData(&gPlayerParty[sub_806CA38(taskID)], MON_DATA_MAIL);
+        DestroyTask(taskID);
+        sub_80E62A0(4, &gSaveBlock1.mail[mailID], sub_808A520, 3);
+    }
+}
+
+static void sub_808A1E0(u8 taskID)
+{
+    if (gUnknown_0202E8F6 != 1)
+    {
+        SetHeldItemIconVisibility(taskID, sub_806CA38(taskID));
+        sub_806D538(0, 0);
+        gTasks[taskID].func = sub_8089CD4;
+    }
+}
+
+static void sub_808A228(u8 taskID)
+{
+    if (ItemIsMail(gScriptItemId) && gUnknown_0202E8F4 != 0)
+    {
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        gTasks[taskID].func = sub_808A180;
+    }
+    else
+    {
+        MenuZeroFillWindowRect(0, 0, 29, 19);
+        sub_806D538(0, 0);
+        gTasks[taskID].func = sub_8089CD4;
+    }
+}
+
+static void sub_808A2AC(u8 taskID)
+{
+    if (!gPaletteFade.active)
+        PartyMenuTryGiveMonHeldItem(taskID, gScriptItemId, sub_808A228);
+}
+
+static void sub_808A2DC(u8 taskID)
+{
+    u8 mailID = GetMonData(&gPlayerParty[sub_806CA38(taskID)], MON_DATA_MAIL);
+    DestroyTask(taskID);
+    sub_80E62A0(4, &gSaveBlock1.mail[mailID], sub_808A520, 3);
+}
+
+static void sub_808A330(u8 taskID)
+{
+    PartyMenuTryGiveMonHeldItem(taskID, gScriptItemId, sub_808A2DC);
+}
+
+static void sub_808A34C(void)
+{
+    RunTasks();
+}
+
+static void sub_808A358(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+static void sub_808A3A4(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            EWRAM_1B000.unk262 = 3;
+            sub_8089E84();
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+void sub_808A3F8(void)
+{
+    if (ItemIsMail(gScriptItemId))
+    {
+        u8 taskID = CreateTask(sub_808A330, 0);
+        gPaletteFade.bufferTransferDisabled = 1;
+        sub_806BD58(taskID, 0);
+        sub_806C994(taskID, gLastFieldPokeMenuOpened);
+        sub_806BF74(taskID, 0);
+        if (!(bool8)(GetMonData(&gPlayerParty[sub_806CA38(taskID)], MON_DATA_HELD_ITEM)))
+        {
+            SetMainCallback2(sub_808A34C);
+            return;
+        }
+        else
+            DestroyTask(taskID);
+    }
+    gPaletteFade.bufferTransferDisabled = 1;
+    if (gScriptItemId)
+    {
+        sub_806AF4C(0, 0xFF, sub_808A2AC, 0xFF);
+        SetMainCallback2(sub_808A358);
+    }
+    else
+    {
+        sub_806AF4C(0, 0xFF, sub_8089D94, 5);
+        SetMainCallback2(sub_808A3A4);
+    }
+}
+
+static void sub_808A4D4(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+void sub_808A520(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    if (gScriptResult == 0)
+    {
+        if (gUnknown_0202E8F8)
+            RemoveBagItem(gUnknown_0202E8F8, 1);
+        AddBagItem(GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_HELD_ITEM), 1);
+        TakeMailFromMon(&gPlayerParty[gLastFieldPokeMenuOpened]);
+        SetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_HELD_ITEM, (void*) &gUnknown_0202E8F8);
+        sub_806AF4C(0, 0xFF, sub_8089CD4, 0);
+    }
+    else
+        sub_806AF4C(0, 0xFF, sub_808A5BC, 0xFF);
+    SetMainCallback2(sub_808A4D4);
+}
+
+static void sub_808A5BC(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        DisplayGiveHeldItemMessage(gLastFieldPokeMenuOpened, gScriptItemId, 0);
+        gTasks[taskID].func = sub_808A1E0;
+    }
+}
+
+static void sub_808A604(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(sub_80A61D0);
+        DestroyTask(taskID);
+    }
+}
+
+static void PokemonMenu_GiveItem(u8 taskID)
+{
+    gUnknown_0202E8F5 = sub_806CA38(taskID);
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskID].func = sub_808A604;
+}
+
+static void sub_808A678(u8 taskID)
+{
+    sub_808A8D4(taskID);
+}
+
+static void PokemonMenu_TakeItem(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    sub_806D5A4();
+    PartyMenuTryGiveMonHeldItem_806ECE8(taskID, sub_808A678);
+}
+
+static void PokemonMenu_TakeMail(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    sub_806D5A4();
+    DoTakeMail(taskID, sub_808A678);
+}
+
+static void PokemonMenu_Mail(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    sPokeMenuCursorPos = 0;
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    sub_806E750(0, &sUnknown_0839F584, (void*) sPokemonMenuActions, 0);
+    gTasks[taskID].func = sub_808A73C;
+}
+
+static void sub_808A73C(u8 taskID)
+{
+    if (gMain.newAndRepeatedKeys == DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        if (sPokeMenuCursorPos == 0)
+            sPokeMenuCursorPos = MoveMenuCursor(sUnknown_0839F584.unk0 - 1);
+        else
+            sPokeMenuCursorPos = MoveMenuCursor(-1);
+    }
+    if (gMain.newAndRepeatedKeys == DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        if (sPokeMenuCursorPos == sUnknown_0839F584.unk0 - 1)
+            sPokeMenuCursorPos = MoveMenuCursor(1 - sUnknown_0839F584.unk0);
+        else
+            sPokeMenuCursorPos = MoveMenuCursor(1);
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        PartyMenuGetPopupMenuFunc(0, &sUnknown_0839F584, (void*) sPokemonMenuActions, sPokeMenuCursorPos)(taskID);
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        sub_806E7D0(0, &sUnknown_0839F584);
+        PokemonMenu_Cancel(taskID);
+    }
+}
+
+static void PokemonMenu_ReadMail(u8 taskID)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskID].func = sub_808A848;
+}
+
+static void sub_808A848(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 mailID = GetMonData(&gPlayerParty[sub_806CA38(taskID)], MON_DATA_MAIL);
+        DestroyTask(taskID);
+        HandleReadMail(&gSaveBlock1.mail[mailID], sub_808A8A8, 1);
+    }
+}
+
+static void sub_808A8A8(void)
+{
+    gUnknown_020384F0 = gLastFieldPokeMenuOpened;
+    ewram1B000.unk262 = 4;
+    sub_8089F14();
+}
+
+static void sub_808A8D4(u8 taskID)
+{
+    sPokeMenuCursorPos = 0;
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    sub_806D538(0, 0);
+    gTasks[taskID].func = sub_8089CD4;
+}
+
+static void PokemonMenu_Cancel(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    PlaySE(SE_SELECT);
+    sub_808A8D4(taskID);
+}
+
+static void PokemonMenu_CancelSubmenu(u8 taskID)
+{
+    HandleDestroyMenuCursors();
+    PlaySE(SE_SELECT);
+    MenuZeroFillWindowRect(19, 0, 29, 19);
+    sub_806D5A4();
+    sub_8089C7C(sPokeMenuCursorPos);
+    gTasks[taskID].func = sub_8089D94;
+}
+
+#define IS_SOFTBOILED_MILKDRINK(ID)((ID == (POKEMENU_MILK_DRINK - POKEMENU_FIRST_FIELD_MOVE_ID) || ID == (POKEMENU_SOFT_BOILED - POKEMENU_FIRST_FIELD_MOVE_ID)))
+#define IS_SURF(ID)((ID == (POKEMENU_SURF - POKEMENU_FIRST_FIELD_MOVE_ID)))
+#define IS_FLY(ID)((ID == (POKEMENU_FLY - POKEMENU_FIRST_FIELD_MOVE_ID)))
+
+#define tFieldMoveId data[11]
+
+static void PokemonMenu_FieldMove(u8 taskID)
+{
+    s16* data = gTasks[taskID].data;
+
+    HandleDestroyMenuCursors();
+    tFieldMoveId = sPokeMenuOptionsOrder[sPokeMenuCursorPos] - POKEMENU_FIRST_FIELD_MOVE_ID;
+    if (sub_80F9344() == TRUE)
+    {
+        MenuZeroFillWindowRect(19, 0, 29, 19);
+        if (IS_SOFTBOILED_MILKDRINK(tFieldMoveId))
+            sub_806D538(9, 0);
+        else
+            sub_806D538(sFieldMoveFuncs[tFieldMoveId].field_1, 0);
+        gTasks[taskID].func = sub_808ABF4;
+    }
+    else if (tFieldMoveId <= 7 && FlagGet(BADGE01_GET + tFieldMoveId) != TRUE)
+    {
+        // can't use a field HM move without a proper badge
+        MenuZeroFillWindowRect(19, 0, 29, 19);
+        sub_806D5A4();
+        sub_806E834(gOtherText_CantBeUsedBadge, 1);
+        gTasks[taskID].func = sub_808AAF0;
+    }
+    else
+    {
+        if (sFieldMoveFuncs[tFieldMoveId].func() == TRUE)
+        {
+            sPokeMenuCursorPos = 0;
+            if (!IS_SOFTBOILED_MILKDRINK(tFieldMoveId))
+            {
+                gTasks[taskID].func = sub_808AB34;
+                BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+            }
+            else
+                sub_8133D28(taskID);
+        }
+        else
+        {
+            MenuZeroFillWindowRect(19, 0, 29, 19);
+            if (IS_SURF(tFieldMoveId) && TestPlayerAvatarFlags(8))
+                sub_806D538(8, 0);
+            else
+                sub_806D538(sFieldMoveFuncs[tFieldMoveId].field_1, 0);
+            gTasks[taskID].func = sub_808ABF4;
+        }
+    }
+}
+
+static void sub_808AAF0(u8 taskID)
+{
+    if (gUnknown_0202E8F6 != 1 && (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON))
+    {
+        MenuZeroFillWindowRect(0, 14, 29, 19);
+        PokemonMenu_Cancel(taskID);
+    }
+}
+
+static void sub_808AB34(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        if (!IS_FLY(gTasks[taskID].tFieldMoveId) || ShouldDoBrailleFlyEffect())
+            SetMainCallback2(c2_exit_to_overworld_2_switch);
+        else
+            SetMainCallback2(CB2_InitFlyRegionMap);
+        DestroyTask(taskID);
+    }
+}
+
+#undef tFieldMoveId
+
+void FieldCallback_Teleport(void)
+{
+    pal_fill_black();
+    CreateTask(sub_808ABA8, 8);
+}
+
+static void sub_808ABA8(u8 taskID)
+{
+    if (sub_807D770() == TRUE)
+    {
+        gFieldEffectArguments[0] = GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_SPECIES);
+        gUnknown_03005CE4();
+        DestroyTask(taskID);
+    }
+}
+
+static void sub_808ABF4(u8 taskID)
+{
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    {
+        MenuZeroFillWindowRect(1, 17, 28, 18);
+        PokemonMenu_Cancel(taskID);
+    }
+}
+
+static void sub_808AC2C(void)
+{
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_SURF);
+}
+
+static bool8 SetUpFieldMove_Surf(void)
+{
+    if (PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE)
+    {
+        gFieldCallback = FieldCallback_Teleport;
+        gUnknown_03005CE4 = sub_808AC2C;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+static void sub_808AC8C(void)
+{
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_FLY);
+}
+
+static bool8 SetUpFieldMove_Fly(void)
+{
+    if (ShouldDoBrailleFlyEffect())
+    {
+        gFieldCallback = FieldCallback_Teleport;
+        gUnknown_03005CE4 = DoBrailleFlyEffect;
+        return TRUE;
+    }
+    if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE)
+    {
+        gFieldCallback = FieldCallback_Teleport;
+        gUnknown_03005CE4 = sub_808AC8C;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static void sub_808AD0C(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+void sub_808AD58(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    sub_806AF4C(0, 0xFF, sub_8089CD4, 0);
+    SetMainCallback2(sub_808AD0C);
+}
+
+u16 unref_sub_808AD88(void)
+{
+    return GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_SPECIES);
+}
+
+static void sub_808ADAC(void)
+{
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_DIVE);
+}
+
+static bool8 SetUpFieldMove_Dive(void)
+{
+    gFieldEffectArguments[1] = sub_8068F18();
+    if (gFieldEffectArguments[1])
+    {
+        gFieldCallback = FieldCallback_Teleport;
+        gUnknown_03005CE4 = sub_808ADAC;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+static void sub_808AE08(void)
+{
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_WATERFALL);
+}
+
+static bool8 SetUpFieldMove_Waterfall(void)
+{
+    s16 x, y;
+    GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
+    if (MetatileBehavior_IsWaterfall(MapGridGetMetatileBehaviorAt(x, y)) == TRUE
+        && IsPlayerSurfingNorth() == TRUE)
+    {
+        gFieldCallback = FieldCallback_Teleport;
+        gUnknown_03005CE4 = sub_808AE08;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+static void sub_808AE8C(void)
+{
+    u8 i;
+    u8 arg = gScriptItemId - 33;
+    for (i = 0; i < 6; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES))
+        {
+            sub_806D668(i);
+            if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !CanMonLearnTMHM(&gPlayerParty[i], arg))
+                sub_806BC3C(i, 0x9A);
+            else if (pokemon_has_move(&gPlayerParty[i], ItemIdToBattleMoveId(gScriptItemId)))
+                sub_806BC3C(i, 0xA8);
+            else
+                sub_806BC3C(i, 0x8C);
+        }
+    }
+}
+
+static void sub_808AF20(void)
+{
+    u8 i;
+    for (i = 0; i < 6; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES))
+        {
+            if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !GetEvolutionTargetSpecies(&gPlayerParty[i], 3, gScriptItemId))
+            {
+                sub_806D668(i);
+                sub_806BC3C(i, 0);
+            }
+        }
+    }
+}
+
+static void sub_808AF80(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            if (gUnknown_02038561 == 0)
+            {
+                switch (CheckIfItemIsTMHMOrEvolutionStone(gScriptItemId))
+                {
+                case 1:
+                    sub_808AE8C();
+                    break;
+                case 2:
+                    sub_808AF20();
+                    break;
+                }
+            }
+            if (gLastFieldPokeMenuOpened > 5 || !GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_SPECIES))
+                gLastFieldPokeMenuOpened = 0;
+            sub_806C994(ewram1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(ewram1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+void sub_808B020(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    switch (gUnknown_02038561)
+    {
+    case 0:
+        if (CheckIfItemIsTMHMOrEvolutionStone(gScriptItemId) == 1)
+            sub_806AF4C(0, 0, sub_808B0C0, 20);
+        else
+            sub_806AF4C(0, 0, sub_808B0C0, 3);
+        break;
+    case 4:
+        sub_806AF4C(0, 0, sub_808B1EC, 0xFF);
+        break;
+    case 1:
+    case 3:
+        sub_806AF4C(0, 0, sub_808B0C0, 4);
+        break;
+    }
+    SetMainCallback2(sub_808AF80);
+}
+
+void sub_808B0C0(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        switch (sub_806BD80(taskID))
+        {
+        case 1:
+            gLastFieldPokeMenuOpened = sub_806CA38(taskID);
+            if (GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_IS_EGG))
+                PlaySE(SE_HAZURE);
+            else
+            {
+                sub_806D5A4();
+                if (gUnknown_02038561 == 0)
+                    gUnknown_03004AE4(taskID, gScriptItemId, sub_808B224);
+                if (gUnknown_02038561 == 1)
+                {
+                    PlaySE(SE_SELECT);
+                    PartyMenuTryGiveMonHeldItem(taskID, gScriptItemId, sub_808B2EC);
+                }
+                if (gUnknown_02038561 == 3)
+                {
+                    PlaySE(SE_SELECT);
+                    PartyMenuTryGiveMonMail(taskID, sub_808B2B4);
+                }
+            }
+            break;
+        case 2:
+            gLastFieldPokeMenuOpened = sub_806CA38(taskID);
+            PlaySE(SE_SELECT);
+            BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+            if (gUnknown_02038561 == 0 || gUnknown_02038561 == 1)
+                gTasks[taskID].func = sub_808B25C;
+            if (gUnknown_02038561 == 3)
+                gTasks[taskID].func = sub_808B2B4;
+            break;
+        }
+    }
+}
+
+static void sub_808B1EC(u8 taskID)
+{
+    if (!gPaletteFade.active)
+        gUnknown_03004AE4(taskID, gScriptItemId, sub_808B224);
+}
+
+static void sub_808B224(u8 taskID)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskID].func = sub_808B25C;
+}
+
+static void sub_808B25C(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(sub_80A5B40);
+        DestroyTask(taskID);
+    }
+}
+
+static void sub_808B288(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(Mailbox_ReturnToMailListAfterDeposit);
+        DestroyTask(taskID);
+    }
+}
+
+static void sub_808B2B4(u8 taskID)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskID].func = sub_808B288;
+}
+
+static void sub_808B2EC(u8 taskID)
+{
+    if (gUnknown_0202E8F4 == 2)
+    {
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        gTasks[taskID].func = sub_808B338;
+    }
+    else
+        sub_808B224(taskID);
+}
+
+static void sub_808B338(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 mailID;
+
+        gLastFieldPokeMenuOpened = sub_806CA38(taskID);
+        mailID = GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_MAIL);
+        DestroyTask(taskID);
+        sub_80E62A0(4, &gSaveBlock1.mail[mailID], sub_808B3EC, 3);
+    }
+}
+
+static void sub_808B3A0(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gLastFieldPokeMenuOpened);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+static void sub_808B3EC(void)
+{
+    IntrCallback callback;
+
+    gPaletteFade.bufferTransferDisabled = 1;
+    if (gScriptResult == 0)
+    {
+        if (gUnknown_0202E8F8)
+            RemoveBagItem(gUnknown_0202E8F8, 1);
+        AddBagItem(GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_HELD_ITEM), 1);
+        TakeMailFromMon(&gPlayerParty[gLastFieldPokeMenuOpened]);
+        SetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_HELD_ITEM, (void*) &gUnknown_0202E8F8);
+        CreateTask(sub_808B25C, 5);
+        gPaletteFade.bufferTransferDisabled = 0;
+        callback = sub_806AEDC;
+    }
+    else
+    {
+        sub_806AF4C(0, 0, sub_808B4A4, 0xFF);
+        callback = sub_808B3A0;
+    }
+    SetMainCallback2(callback);
+}
+
+static void sub_808B4A4(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        DisplayGiveHeldItemMessage(gLastFieldPokeMenuOpened, gScriptItemId, 1);
+        gTasks[taskID].func = sub_808B4EC;
+    }
+}
+
+static void sub_808B4EC(u8 taskID)
+{
+    if (gUnknown_0202E8F6 != 1)
+        sub_808B224(taskID);
+}
+
+void sub_808B508(u8 taskID)
+{
+    sub_808B224(taskID);
+}
+
+static void sub_808B518(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == TRUE)
+        {
+            sub_806C994(EWRAM_1B000.unk260, gUnknown_020384F0);
+            sub_806BF74(EWRAM_1B000.unk260, 0);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == TRUE)
+            break;
+    }
+}
+
+void sub_808B564(void)
+{
+    gPaletteFade.bufferTransferDisabled = 1;
+    if (sub_809FA30() != 4)
+        sub_806AF4C(0, 0, TaughtMove, 0xFF);
+    else
+        sub_806AF4C(0, 0, StopTryingToTeachMove_806F588, 0xFF);
+    SetMainCallback2(sub_808B518);
+}
+
+void sub_808B5B4(u32 taskID)
+{
+    gUnknown_03005CF0 = gTasks[taskID].func;
+    gTasks[taskID].func = sub_808B5E4;
+    sub_808B5E4(taskID);
+}
+
+static void sub_808B5E4(u8 taskID)
+{
+    if (sub_8055870() != TRUE)
+        gTasks[taskID].func = gUnknown_03005CF0;
+}
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index 8d85705c8..27d7022fe 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -4,7 +4,7 @@
 #include "load_save.h"
 #include "main.h"
 #include "pokemon.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script_pokemon_80C4.h"
 
 extern u8 gUnknown_02039324;
@@ -14,7 +14,7 @@ int GameClear(void)
     int i;
     bool32 ribbonGet;
 
-    HealPlayerParty();
+    ScrSpecial_HealPlayerParty();
 
     if (FlagGet(SYS_GAME_CLEAR) == TRUE)
     {
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 7c46d4d0a..57c7cff1d 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -10,11 +10,11 @@
 #include "items.h"
 #include "load_save.h"
 #include "link.h"
-#include "mauville_old_man.h"
+#include "mauville_man.h"
 #include "menu.h"
 #include "mystery_event_script.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "save.h"
 #include "script.h"
 #include "secret_base.h"
@@ -40,7 +40,7 @@ static u8 gUnknown_0300071C[4];
 void *recordMixingSecretBases = &gSaveBlock1.secretBases;
 void *recordMixingTvShows = &gSaveBlock1.tvShows;
 void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
-void *gUnknown_083D0278 = &gSaveBlock1.oldMan;
+void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan;
 void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
 struct RecordMixingDayCareMail *gUnknown_083D0280 = &gUnknown_02038738;
 void *gUnknown_083D0284 = &gSaveBlock2.filler_A8;
diff --git a/src/region_map.c b/src/region_map.c
index 076dfecec..900c9ad71 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -9,7 +9,7 @@
 #include "palette.h"
 #include "pokemon_menu.h"
 #include "region_map.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "secret_base.h"
 #include "songs.h"
 #include "sprite.h"
@@ -714,7 +714,7 @@ static void InitializeCursorPosition(void)
         return;
     }
 
-    switch (get_map_light_level_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) - 1)
+    switch (GetMapTypeByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) - 1)
     {
     default:
     case 0:
@@ -733,7 +733,7 @@ static void InitializeCursorPosition(void)
         break;
     case 3:
     case 6:
-        mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp4.mapGroup, gSaveBlock1.warp4.mapNum);
+        mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.warp4.mapGroup, gSaveBlock1.warp4.mapNum);
         gRegionMap->mapSecId = mapHeader->regionMapSectionId;
         gRegionMap->playerIsInCave = TRUE;
         mapWidth = mapHeader->mapData->width;
@@ -742,7 +742,7 @@ static void InitializeCursorPosition(void)
         y = gSaveBlock1.warp4.y;
         break;
     case 8:
-        mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum);
+        mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum);
         gRegionMap->mapSecId = mapHeader->regionMapSectionId;
         gRegionMap->playerIsInCave = TRUE;
         mapWidth = mapHeader->mapData->width;
@@ -758,12 +758,12 @@ static void InitializeCursorPosition(void)
             if (gRegionMap->mapSecId != MAPSEC_UNK_0x57)
             {
                 r4 = &gSaveBlock1.warp4;
-                mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
+                mapHeader = Overworld_GetMapHeaderByGroupAndId(r4->mapGroup, r4->mapNum);
             }
             else
             {
                 r4 = &gSaveBlock1.warp2;
-                mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
+                mapHeader = Overworld_GetMapHeaderByGroupAndId(r4->mapGroup, r4->mapNum);
                 gRegionMap->mapSecId = mapHeader->regionMapSectionId;
             }
             gRegionMap->playerIsInCave = FALSE;
@@ -850,7 +850,7 @@ static void sub_80FB600(void)
     default:
     case 0:
         {
-            struct MapHeader *mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum);
+            struct MapHeader *mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
             u16 r1;
 
             gRegionMap->mapSecId = mapHeader->regionMapSectionId;
diff --git a/src/rom3.c b/src/rom3.c
index 3b4b6a941..3f4860ecc 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -1081,10 +1081,10 @@ void EmitFaintingCry(u8 a)
     PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4);
 }
 
-void EmitIntroSlide(u8 a, u8 b)
+void EmitIntroSlide(u8 a, u8 battleTerrain)
 {
     gBattleBuffersTransferData[0] = 46;
-    gBattleBuffersTransferData[1] = b;
+    gBattleBuffersTransferData[1] = battleTerrain;
     PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 2);
 }
 
diff --git a/src/rom6.c b/src/rom6.c
index ff032b6c2..3a5071034 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -6,7 +6,7 @@
 #include "field_player_avatar.h"
 #include "item_use.h"
 #include "pokemon_menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "songs.h"
 #include "sound.h"
@@ -17,7 +17,7 @@ extern u16 gScriptLastTalked;
 extern void (*gFieldCallback)(void);
 extern u8 gLastFieldPokeMenuOpened;
 extern void (*gUnknown_03005CE4)(void);
-extern u8 UseRockSmashScript[];
+extern u8 S_UseRockSmash[];
 
 EWRAM_DATA struct MapPosition gUnknown_0203923C = {0};
 
@@ -64,9 +64,9 @@ static void task08_080C9820(u8 taskId)
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gMapObjects[mapObjId])
      || FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]))
     {
-        if (gMapHeader.mapType == 5)
+        if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
         {
-            FieldEffectStart(0x3B);
+            FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
             gTasks[taskId].func = sub_810B428;
         }
         else
@@ -82,7 +82,7 @@ static void sub_810B3DC(u8 taskId)
 {
     if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE)
     {
-        FieldEffectStart(0x3B);
+        FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         gTasks[taskId].func = sub_810B428;
     }
 }
@@ -91,17 +91,17 @@ static void sub_810B428(u8 taskId)
 {
     if (!FieldEffectActiveListContains(6))
     {
-        gUnknown_0202FF84[1] = player_get_direction_lower_nybble();
-        if (gUnknown_0202FF84[1] == 1)
-            gUnknown_0202FF84[2] = 0;
-        if (gUnknown_0202FF84[1] == 2)
-            gUnknown_0202FF84[2] = 1;
-        if (gUnknown_0202FF84[1] == 3)
-            gUnknown_0202FF84[2] = 2;
-        if (gUnknown_0202FF84[1] == 4)
-            gUnknown_0202FF84[2] = 3;
+        gFieldEffectArguments[1] = player_get_direction_lower_nybble();
+        if (gFieldEffectArguments[1] == 1)
+            gFieldEffectArguments[2] = 0;
+        if (gFieldEffectArguments[1] == 2)
+            gFieldEffectArguments[2] = 1;
+        if (gFieldEffectArguments[1] == 3)
+            gFieldEffectArguments[2] = 2;
+        if (gFieldEffectArguments[1] == 4)
+            gFieldEffectArguments[2] = 3;
         sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
-        StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gUnknown_0202FF84[2]);
+        StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
         FieldEffectActiveListRemove(6);
         gTasks[taskId].func = sub_810B4CC;
     }
@@ -120,7 +120,7 @@ bool8 SetUpFieldMove_RockSmash(void)
 {
     if (npc_before_player_of_type(0x56) == TRUE)
     {
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_810B53C;
         return TRUE;
     }
@@ -132,8 +132,8 @@ bool8 SetUpFieldMove_RockSmash(void)
 
 static void sub_810B53C(void)
 {
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
-    ScriptContext1_SetupScript(UseRockSmashScript);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
+    ScriptContext1_SetupScript(S_UseRockSmash);
 }
 
 int FldEff_RockSmash(void)
@@ -149,15 +149,15 @@ int FldEff_RockSmash(void)
 static void sub_810B58C(void)
 {
     PlaySE(SE_W088);
-    FieldEffectActiveListRemove(0x25);
+    FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
     EnableBothScriptContexts();
 }
 
 int SetUpFieldMove_Dig(void)
 {
-    if (sub_80CA1C8() == TRUE)
+    if (CanUseEscapeRopeOnCurrMap() == TRUE)
     {
-        gFieldCallback = sub_808AB90;
+        gFieldCallback = FieldCallback_Teleport;
         gUnknown_03005CE4 = sub_810B5D8;
         return TRUE;
     }
@@ -170,8 +170,8 @@ int SetUpFieldMove_Dig(void)
 static void sub_810B5D8(void)
 {
     sub_8053014();
-    FieldEffectStart(0x26);
-    gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+    FieldEffectStart(FLDEFF_USE_DIG);
+    gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
 }
 
 int FldEff_UseDig(void)
@@ -189,7 +189,7 @@ static void sub_810B634(void)
 {
     u8 taskId;
 
-    FieldEffectActiveListRemove(0x26);
+    FieldEffectActiveListRemove(FLDEFF_USE_DIG);
     if (ShouldDoBrailleDigEffect())
     {
         DoBrailleDigEffect();
diff --git a/src/safari_zone.c b/src/safari_zone.c
index a47c8e951..14fd1ddc4 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -4,7 +4,7 @@
 #include "field_fadetransition.h"
 #include "field_player_avatar.h"
 #include "main.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "string_util.h"
 #include "text.h"
@@ -51,7 +51,7 @@ void SetSafariZoneFlag(void)
 
 void ResetSafariZoneFlag(void)
 {
-    FlagReset(SYS_SAFARI_MODE);
+    FlagClear(SYS_SAFARI_MODE);
 }
 
 void EnterSafariMode(void)
diff --git a/src/save.c b/src/save.c
index adf39268e..eae3f4470 100644
--- a/src/save.c
+++ b/src/save.c
@@ -3,7 +3,7 @@
 #include "gba/flash_internal.h"
 #include "save.h"
 #include "load_save.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "save_failed_screen.h"
 
 #define GETVALIDSTATUSBITFIELD ((1 << ARRAY_COUNT(gSaveSectionLocations)) - 1)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 66578f350..31a90158a 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -31,7 +31,7 @@
 #include "party_menu.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "script.h"
 #include "script_menu.h"
@@ -50,11 +50,11 @@ typedef void (*NativeFunc)(void);
 extern u32 gUnknown_0202E8AC;
 
 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;
+static EWRAM_DATA u16 sPauseCounter = 0;
+static EWRAM_DATA u16 sMovingNpcId = 0;
+static EWRAM_DATA u16 sMovingNpcMapBank = 0;
+static EWRAM_DATA u16 sMovingNpcMapId = 0;
+static EWRAM_DATA u16 sFieldEffectScriptId = 0;
 
 extern u16 gSpecialVar_0x8000;
 extern u16 gSpecialVar_0x8001;
@@ -109,8 +109,8 @@ bool8 ScrCmd_end(struct ScriptContext *ctx)
 
 bool8 ScrCmd_jumpasm(struct ScriptContext *ctx)
 {
-    u32 addr = ScriptReadWord(ctx);
-    SetupNativeScript(ctx, (void *)addr);
+    bool8 (*addr)(void) = (bool8 (*)(void))ScriptReadWord(ctx);
+    SetupNativeScript(ctx, addr);
     return TRUE;
 }
 
@@ -542,7 +542,7 @@ bool8 ScrCmd_setflag(struct ScriptContext *ctx)
 
 bool8 ScrCmd_clearflag(struct ScriptContext *ctx)
 {
-    FlagReset(ScriptReadHalfword(ctx));
+    FlagClear(ScriptReadHalfword(ctx));
     return FALSE;
 }
 
@@ -567,8 +567,8 @@ bool8 ScrCmd_lighten(struct ScriptContext *ctx)
 
 bool8 ScrCmd_darken(struct ScriptContext *ctx)
 {
-    u16 value = VarGet(ScriptReadHalfword(ctx));
-    sub_8053CE4(value);
+    u16 flashLevel = VarGet(ScriptReadHalfword(ctx));
+    Overworld_SetFlashLevel(flashLevel);
     return FALSE;
 }
 
@@ -598,9 +598,9 @@ bool8 ScrCmd_fadescreendelay(struct ScriptContext *ctx)
 
 bool8 s28_pause_asm()
 {
-    gUnknown_0202E8B4--;
+    sPauseCounter--;
 
-    if (gUnknown_0202E8B4 == 0)
+    if (sPauseCounter == 0)
         return TRUE;
     else
         return FALSE;
@@ -608,7 +608,7 @@ bool8 s28_pause_asm()
 
 bool8 ScrCmd_pause(struct ScriptContext *ctx)
 {
-    gUnknown_0202E8B4 = ScriptReadHalfword(ctx);
+    sPauseCounter = ScriptReadHalfword(ctx);
     SetupNativeScript(ctx, s28_pause_asm);
     return TRUE;
 }
@@ -815,7 +815,7 @@ bool8 ScrCmd_playsfx(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 s30_music_check_asm()
+static bool8 WaitForSoundEffectFinish()
 {
     if (!IsSEPlaying())
         return TRUE;
@@ -825,7 +825,7 @@ bool8 s30_music_check_asm()
 
 bool8 ScrCmd_checksound(struct ScriptContext *ctx)
 {
-    SetupNativeScript(ctx, s30_music_check_asm);
+    SetupNativeScript(ctx, WaitForSoundEffectFinish);
     return TRUE;
 }
 
@@ -835,14 +835,14 @@ bool8 ScrCmd_fanfare(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 s32_fanfare_wait_asm()
+static bool8 WaitForFanfareFinish()
 {
     return IsFanfareTaskInactive();
 }
 
 bool8 ScrCmd_waitfanfare(struct ScriptContext *ctx)
 {
-    SetupNativeScript(ctx, s32_fanfare_wait_asm);
+    SetupNativeScript(ctx, WaitForFanfareFinish);
     return TRUE;
 }
 
@@ -870,15 +870,15 @@ bool8 ScrCmd_fadedefault(struct ScriptContext *ctx)
 
 bool8 ScrCmd_fademusic(struct ScriptContext *ctx)
 {
-    sub_8053FB0(ScriptReadHalfword(ctx));
+    Overworld_ChangeMusicTo(ScriptReadHalfword(ctx));
     return FALSE;
 }
 
 bool8 ScrCmd_fadeout(struct ScriptContext *ctx)
 {
-    u8 val = ScriptReadByte(ctx);
-    if (val)
-        FadeOutBGMTemporarily(4 * val);
+    u8 speed = ScriptReadByte(ctx);
+    if (speed != 0)
+        FadeOutBGMTemporarily(4 * speed);
     else
         FadeOutBGMTemporarily(4);
     SetupNativeScript(ctx, IsBGMPausedOrStopped);
@@ -887,9 +887,9 @@ bool8 ScrCmd_fadeout(struct ScriptContext *ctx)
 
 bool8 ScrCmd_fadein(struct ScriptContext *ctx)
 {
-    u8 val = ScriptReadByte(ctx);
-    if (val)
-        FadeInBGM(4 * val);
+    u8 speed = ScriptReadByte(ctx);
+    if (speed != 0)
+        FadeInBGM(4 * speed);
     else
         FadeInBGM(4);
     return FALSE;
@@ -897,54 +897,56 @@ bool8 ScrCmd_fadein(struct ScriptContext *ctx)
 
 bool8 ScrCmd_move(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    void *v2 = (void *)ScriptReadWord(ctx);
-    exec_movement(v1, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, v2);
-    gUnknown_0202E8B6 = v1;
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+    void *movementScript = (void *)ScriptReadWord(ctx);
+
+    ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, movementScript);
+    sMovingNpcId = localId;
     return FALSE;
 }
 
 bool8 ScrCmd_movecoords(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    void *v2 = (void *)ScriptReadWord(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    exec_movement(v1, v4, v3, v2);
-    gUnknown_0202E8B6 = v1;
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+    void *movementScript = (void *)ScriptReadWord(ctx);
+    u8 mapGroup = ScriptReadByte(ctx);
+    u8 mapNum = ScriptReadByte(ctx);
+
+    ScriptMovement_StartObjectMovementScript(localId, mapNum, mapGroup, movementScript);
+    sMovingNpcId = localId;
     return FALSE;
 }
 
-bool8 s51a_0806B288(void)
+static bool8 WaitForMovementFinish(void)
 {
-    return sub_80A212C(gUnknown_0202E8B6, gUnknown_0202E8BA, gUnknown_0202E8B8);
+    return ScriptMovement_IsObjectMovementFinished(sMovingNpcId, sMovingNpcMapId, sMovingNpcMapBank);
 }
 
 bool8 ScrCmd_waitmove(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    if (v1)
-        gUnknown_0202E8B6 = v1;
-    gUnknown_0202E8B8 = gSaveBlock1.location.mapGroup;
-    gUnknown_0202E8BA = gSaveBlock1.location.mapNum;
-    SetupNativeScript(ctx, s51a_0806B288);
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+
+    if (localId != 0)
+        sMovingNpcId = localId;
+    sMovingNpcMapBank = gSaveBlock1.location.mapGroup;
+    sMovingNpcMapId = gSaveBlock1.location.mapNum;
+    SetupNativeScript(ctx, WaitForMovementFinish);
     return TRUE;
 }
 
 bool8 ScrCmd_waitmovexy(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    u8 v2;
-    u8 v3;
-
-    if (v1)
-        gUnknown_0202E8B6 = v1;
-
-    v2 = ScriptReadByte(ctx);
-    v3 = ScriptReadByte(ctx);
-    gUnknown_0202E8B8 = v2;
-    gUnknown_0202E8BA = v3;
-    SetupNativeScript(ctx, s51a_0806B288);
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+    u8 mapBank;
+    u8 mapId;
+
+    if (localId != 0)
+        sMovingNpcId = localId;
+    mapBank = ScriptReadByte(ctx);
+    mapId = ScriptReadByte(ctx);
+    sMovingNpcMapBank = mapBank;
+    sMovingNpcMapId = mapId;
+    SetupNativeScript(ctx, WaitForMovementFinish);
     return TRUE;
 }
 
@@ -994,7 +996,7 @@ bool8 ScrCmd_movespriteperm(struct ScriptContext *ctx)
     u16 v1 = VarGet(ScriptReadHalfword(ctx));
     u16 v2 = VarGet(ScriptReadHalfword(ctx));
     u32 v3 = VarGet(ScriptReadHalfword(ctx));
-    update_saveblock1_field_object_coords(v1, v2, v3);
+    Overworld_SaveMapObjCoords(v1, v2, v3);
     return FALSE;
 }
 
@@ -1054,9 +1056,9 @@ bool8 ScrCmd_faceplayer(struct ScriptContext *ctx)
 
 bool8 ScrCmd_spriteface(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    u8 v2 = ScriptReadByte(ctx);
-    FieldObjectTurnByLocalIdAndMap(v1, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, v2);
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+    u8 direction = ScriptReadByte(ctx);
+    FieldObjectTurnByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, direction);
     return FALSE;
 }
 
@@ -1064,7 +1066,7 @@ bool8 ScrCmd_spritebehave(struct ScriptContext *ctx)
 {
     u16 v1 = VarGet(ScriptReadHalfword(ctx));
     u8 v2 = ScriptReadByte(ctx);
-    update_saveblock1_field_object_movement_behavior(v1, v2);
+    Overworld_SaveMapObjMovementType(v1, v2);
     return FALSE;
 }
 
@@ -1112,7 +1114,7 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
     {
         if (gMapObjects[gSelectedMapObject].active)
         {
-            sub_8064DD8();
+            LockSelectedMapObject();
             SetupNativeScript(ctx, sub_8064DB4);
         }
         else
@@ -1198,9 +1200,9 @@ bool8 ScrCmd_waitbutton(struct ScriptContext *ctx)
 
 bool8 ScrCmd_yesnobox(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    if (yes_no_box(v1, v2) == 1)
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    if (ScriptMenu_YesNo(left, top) == TRUE)
     {
         ScriptContext1_Stop();
         return TRUE;
@@ -1213,11 +1215,11 @@ bool8 ScrCmd_yesnobox(struct ScriptContext *ctx)
 
 bool8 ScrCmd_multichoice(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    if (sub_80B5054(v1, v2, v3, v4) == 1)
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 multichoiceId = ScriptReadByte(ctx);
+    u8 ignoreBPress = ScriptReadByte(ctx);
+    if (ScriptMenu_Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE)
     {
         ScriptContext1_Stop();
         return TRUE;
@@ -1230,12 +1232,12 @@ bool8 ScrCmd_multichoice(struct ScriptContext *ctx)
 
 bool8 ScrCmd_multichoicedef(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    u8 v5 = ScriptReadByte(ctx);
-    if (sub_80B50B0(v1, v2, v3, v5, v4) == 1)
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 multichoiceId = ScriptReadByte(ctx);
+    u8 defaultChoice = ScriptReadByte(ctx);
+    u8 ignoreBPress = ScriptReadByte(ctx);
+    if (ScriptMenu_MultichoiceWithDefault(left, top, multichoiceId, ignoreBPress, defaultChoice) == TRUE)
     {
         ScriptContext1_Stop();
         return TRUE;
@@ -1248,22 +1250,22 @@ bool8 ScrCmd_multichoicedef(struct ScriptContext *ctx)
 
 bool8 ScrCmd_showbox(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    MenuDrawTextWindow(v1, v2, v3, v4);
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 right = ScriptReadByte(ctx);
+    u8 bottom = ScriptReadByte(ctx);
+    MenuDrawTextWindow(left, top, right, bottom);
     return FALSE;
 }
 
 bool8 ScrCmd_multichoicerow(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    u8 v5 = ScriptReadByte(ctx);
-    if (sub_80B5578(v1, v2, v3, v5, v4) == 1)
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 multichoiceId = ScriptReadByte(ctx);
+    u8 numColumns = ScriptReadByte(ctx);
+    u8 ignoreBPress = ScriptReadByte(ctx);
+    if (ScriptMenu_MultichoiceGrid(left, top, multichoiceId, ignoreBPress, numColumns) == TRUE)
     {
         ScriptContext1_Stop();
         return TRUE;
@@ -1276,21 +1278,22 @@ bool8 ScrCmd_multichoicerow(struct ScriptContext *ctx)
 
 bool8 ScrCmd_hidebox(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    MenuZeroFillWindowRect(v1, v2, v3, v4);
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 right = ScriptReadByte(ctx);
+    u8 bottom = ScriptReadByte(ctx);
+    MenuZeroFillWindowRect(left, top, right, bottom);
     return FALSE;
 }
 
+// unused
 bool8 ScrCmd_clearbox(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    if (Multichoice(v1, v2, v3, v4) == 1)
+    u8 left = ScriptReadByte(ctx);
+    u8 top = ScriptReadByte(ctx);
+    u8 multichoiceId = ScriptReadByte(ctx);
+    u8 ignoreBPress = ScriptReadByte(ctx);
+    if (Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE)
     {
         ScriptContext1_Stop();
         return TRUE;
@@ -1303,19 +1306,19 @@ bool8 ScrCmd_clearbox(struct ScriptContext *ctx)
 
 bool8 ScrCmd_showpokepic(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    sub_80B58C4(v1, v2, v3);
+    u16 species = VarGet(ScriptReadHalfword(ctx));
+    u8 x = ScriptReadByte(ctx);
+    u8 y = ScriptReadByte(ctx);
+    ScriptMenu_ShowPokemonPic(species, x, y);
     return FALSE;
 }
 
 bool8 ScrCmd_hidepokepic(struct ScriptContext *ctx)
 {
-    void *func = picbox_close();
-    if (!func)
-        return FALSE;
+    bool8 (*func)(void) = ScriptMenu_GetPicboxWaitFunc();
 
+    if (func == NULL)
+        return FALSE;
     SetupNativeScript(ctx, func);
     return TRUE;
 }
@@ -1447,29 +1450,29 @@ bool8 ScrCmd_vbuffer(struct ScriptContext *ctx)
 
 bool8 ScrCmd_givepokemon(struct ScriptContext *ctx)
 {
-    u16 v3 = VarGet(ScriptReadHalfword(ctx));
-    u8 v5 = ScriptReadByte(ctx);
-    u16 v7 = VarGet(ScriptReadHalfword(ctx));
-    u32 v8 = ScriptReadWord(ctx);
-    u32 v9 = ScriptReadWord(ctx);
-    u8 v10 = ScriptReadByte(ctx);
-    gScriptResult = ScriptGiveMon(v3, v5, v7, v8, v9, v10);
+    u16 species = VarGet(ScriptReadHalfword(ctx));
+    u8 level = ScriptReadByte(ctx);
+    u16 item = VarGet(ScriptReadHalfword(ctx));
+    u32 unkParam1 = ScriptReadWord(ctx);
+    u32 unkParam2 = ScriptReadWord(ctx);
+    u8 unkParam3 = ScriptReadByte(ctx);
+    gScriptResult = ScriptGiveMon(species, level, item, unkParam1, unkParam2, unkParam3);
     return FALSE;
 }
 
 bool8 ScrCmd_giveegg(struct ScriptContext *ctx)
 {
-    u16 value = VarGet(ScriptReadHalfword(ctx));
-    gScriptResult = ScriptGiveEgg(value);
+    u16 species = VarGet(ScriptReadHalfword(ctx));
+    gScriptResult = ScriptGiveEgg(species);
     return FALSE;
 }
 
 bool8 ScrCmd_setpokemove(struct ScriptContext *ctx)
 {
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u16 v4 = ScriptReadHalfword(ctx);
-    ScriptSetMonMoveSlot(v2, v4, v3);
+    u8 partyIndex = ScriptReadByte(ctx);
+    u8 slot = ScriptReadByte(ctx);
+    u16 move = ScriptReadHalfword(ctx);
+    ScriptSetMonMoveSlot(partyIndex, move, slot);
     return FALSE;
 }
 
@@ -1499,7 +1502,7 @@ bool8 ScrCmd_givemoney(struct ScriptContext *ctx)
     u32 amount = ScriptReadWord(ctx);
     u8 ignore = ScriptReadByte(ctx);
     if (!ignore)
-        sub_80B79B8(&gSaveBlock1.money, amount);
+        AddMoney(&gSaveBlock1.money, amount);
     return FALSE;
 }
 
@@ -1508,7 +1511,7 @@ bool8 ScrCmd_paymoney(struct ScriptContext *ctx)
     u32 amount = ScriptReadWord(ctx);
     u8 ignore = ScriptReadByte(ctx);
     if (!ignore)
-        sub_80B79E0(&gSaveBlock1.money, amount);
+        RemoveMoney(&gSaveBlock1.money, amount);
     return FALSE;
 }
 
@@ -1523,19 +1526,19 @@ bool8 ScrCmd_checkmoney(struct ScriptContext *ctx)
 
 bool8 ScrCmd_showmoney(struct ScriptContext *ctx)
 {
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
+    u8 x = ScriptReadByte(ctx);
+    u8 y = ScriptReadByte(ctx);
     u8 ignore = ScriptReadByte(ctx);
     if (!ignore)
-        sub_80B7C14(gSaveBlock1.money, v2, v3);
+        OpenMoneyWindow(gSaveBlock1.money, x, y);
     return FALSE;
 }
 
 bool8 ScrCmd_hidemoney(struct ScriptContext *ctx)
 {
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    RemoveMoneyLabelObject(v2, v3);
+    u8 x = ScriptReadByte(ctx);
+    u8 y = ScriptReadByte(ctx);
+    CloseMoneyWindow(x, y);
     return FALSE;
 }
 
@@ -1545,7 +1548,7 @@ bool8 ScrCmd_updatemoney(struct ScriptContext *ctx)
     u8 v3 = ScriptReadByte(ctx);
     u8 ignore = ScriptReadByte(ctx);
     if (!ignore)
-        sub_80B7BEC(gSaveBlock1.money, v2, v3);
+        UpdateMoneyWindow(gSaveBlock1.money, v2, v3);
     return FALSE;
 }
 
@@ -1575,32 +1578,32 @@ bool8 ScrCmd_updatecoins(struct ScriptContext *ctx)
 
 bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx)
 {
-    ctx->scriptPtr = TrainerBattleConfigure(ctx->scriptPtr);
+    ctx->scriptPtr = BattleSetup_ConfigureTrainerBattle(ctx->scriptPtr);
     return FALSE;
 }
 
 bool8 ScrCmd_reptrainerbattle(struct ScriptContext *ctx)
 {
-    sub_80825E4();
+    BattleSetup_StartTrainerBattle();
     return TRUE;
 }
 
 bool8 ScrCmd_endtrainerbattle(struct ScriptContext *ctx)
 {
-    ctx->scriptPtr = sub_80826E8();
+    ctx->scriptPtr = BattleSetup_GetScriptAddrAfterBattle();
     return FALSE;
 }
 
 bool8 ScrCmd_endtrainerbattle2(struct ScriptContext *ctx)
 {
-    ctx->scriptPtr = sub_8082700();
+    ctx->scriptPtr = BattleSetup_GetTrainerPostBattleScript();
     return FALSE;
 }
 
 bool8 ScrCmd_checktrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
-    ctx->comparisonResult = trainer_flag_check(index);
+    ctx->comparisonResult = HasTrainerAlreadyBeenFought(index);
     return FALSE;
 }
 
@@ -1620,16 +1623,16 @@ bool8 ScrCmd_settrainerflag(struct ScriptContext *ctx)
 
 bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
 {
-    u16 v2 = ScriptReadHalfword(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    u16 v5 = ScriptReadHalfword(ctx);
-    ScriptWildBattle(v2, v4, v5);
+    u16 species = ScriptReadHalfword(ctx);
+    u8 level = ScriptReadByte(ctx);
+    u16 item = ScriptReadHalfword(ctx);
+    CreateScriptedWildMon(species, level, item);
     return FALSE;
 }
 
 bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
 {
-    StartBattle_ScriptedWild();
+    BattleSetup_StartScriptedWildBattle();
     ScriptContext1_Stop();
     return TRUE;
 }
@@ -1668,13 +1671,13 @@ bool8 ScrCmd_pokecasino(struct ScriptContext *ctx)
 
 bool8 ScrCmd_event_8a(struct ScriptContext *ctx)
 {
-    u8 v2 = ScriptReadByte(ctx);
-    u8 v3 = ScriptReadByte(ctx);
-    u8 v4 = ScriptReadByte(ctx);
-    if (!v3)
-        PlantBerryTree(v2, 0, v4, FALSE);
+    u8 treeId = ScriptReadByte(ctx);
+    u8 berry = ScriptReadByte(ctx);
+    u8 growthStage = ScriptReadByte(ctx);
+    if (berry == 0)
+        PlantBerryTree(treeId, 0, growthStage, FALSE);
     else
-        PlantBerryTree(v2, v3, v4, FALSE);
+        PlantBerryTree(treeId, berry, growthStage, FALSE);
     return FALSE;
 }
 
@@ -1716,21 +1719,21 @@ bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx)
 bool8 ScrCmd_doanimation(struct ScriptContext *ctx)
 {
     u16 effectId = VarGet(ScriptReadHalfword(ctx));
-    gUnknown_0202E8BC = effectId;
-    FieldEffectStart(gUnknown_0202E8BC);
+    sFieldEffectScriptId = effectId;
+    FieldEffectStart(sFieldEffectScriptId);
     return FALSE;
 }
 
 bool8 ScrCmd_setanimation(struct ScriptContext *ctx)
 {
-    u8 v2 = ScriptReadByte(ctx);
-    gUnknown_0202FF84[v2] = (s16)VarGet(ScriptReadHalfword(ctx));
+    u8 argNum = ScriptReadByte(ctx);
+    gFieldEffectArguments[argNum] = (s16)VarGet(ScriptReadHalfword(ctx));
     return FALSE;
 }
 
 static bool8 sub_8067B48()
 {
-    if (!FieldEffectActiveListContains(gUnknown_0202E8BC))
+    if (!FieldEffectActiveListContains(sFieldEffectScriptId))
         return TRUE;
     else
         return FALSE;
@@ -1738,7 +1741,7 @@ static bool8 sub_8067B48()
 
 bool8 ScrCmd_checkanimation(struct ScriptContext *ctx)
 {
-    gUnknown_0202E8BC = VarGet(ScriptReadHalfword(ctx));
+    sFieldEffectScriptId = VarGet(ScriptReadHalfword(ctx));
     SetupNativeScript(ctx, sub_8067B48);
     return TRUE;
 }
@@ -1758,9 +1761,9 @@ bool8 ScrCmd_checkgender(struct ScriptContext *ctx)
 
 bool8 ScrCmd_pokecry(struct ScriptContext *ctx)
 {
-    u16 v3 = VarGet(ScriptReadHalfword(ctx));
-    u16 v5 = VarGet(ScriptReadHalfword(ctx));
-    PlayCry5(v3, v5);
+    u16 species = VarGet(ScriptReadHalfword(ctx));
+    u16 mode = VarGet(ScriptReadHalfword(ctx));
+    PlayCry5(species, mode);
     return FALSE;
 }
 
@@ -1772,16 +1775,16 @@ bool8 ScrCmd_waitpokecry(struct ScriptContext *ctx)
 
 bool8 ScrCmd_setmaptile(struct ScriptContext *ctx)
 {
-    u16 v3 = VarGet(ScriptReadHalfword(ctx));
-    u16 v5 = VarGet(ScriptReadHalfword(ctx));
-    u16 v7 = VarGet(ScriptReadHalfword(ctx));
+    u16 x = VarGet(ScriptReadHalfword(ctx));
+    u16 y = VarGet(ScriptReadHalfword(ctx));
+    u16 tileId = VarGet(ScriptReadHalfword(ctx));
     u16 v8 = VarGet(ScriptReadHalfword(ctx));
-    v3 += 7;
-    v5 += 7;
+    x += 7;
+    y += 7;
     if (!v8)
-        MapGridSetMetatileIdAt(v3, v5, v7);
+        MapGridSetMetatileIdAt(x, y, tileId);
     else
-        MapGridSetMetatileIdAt(v3, v5, v7 | 0xC00);
+        MapGridSetMetatileIdAt(x, y, tileId | 0xC00);
     return FALSE;
 }
 
@@ -1791,7 +1794,7 @@ bool8 ScrCmd_setdooropened(struct ScriptContext *ctx)
     u16 y = VarGet(ScriptReadHalfword(ctx));
     x += 7;
     y += 7;
-    PlaySE(sub_8058790(x, y));
+    PlaySE(GetDoorSoundEffect(x, y));
     FieldAnimateDoorOpen(x, y);
     return FALSE;
 }
diff --git a/src/script.c b/src/script.c
index 8f12da437..f049b96fc 100644
--- a/src/script.c
+++ b/src/script.c
@@ -40,7 +40,7 @@ u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr)
     return 1;
 }
 
-void SetupNativeScript(struct ScriptContext *ctx, void *ptr)
+void SetupNativeScript(struct ScriptContext *ctx, bool8 (*ptr)(void))
 {
     ctx->mode = 2;
     ctx->nativePtr = ptr;
@@ -64,7 +64,7 @@ u8 RunScriptCommand(struct ScriptContext *ctx)
     case 2:
         if (ctx->nativePtr)
         {
-            if (ctx->nativePtr() == 1)
+            if (ctx->nativePtr() == TRUE)
                 ctx->mode = 1;
             return 1;
         }
@@ -228,16 +228,16 @@ void ScriptContext2_RunNewScript(const u8 *ptr)
         ;
 }
 
-u8 *mapheader_get_tagged_pointer(u8 tag)
+static u8 *mapheader_get_tagged_pointer(u8 tag)
 {
     u8 *mapScripts = gMapHeader.mapScripts;
 
-    if (!mapScripts)
+    if (mapScripts == NULL)
         return NULL;
 
     while (1)
     {
-        if (!*mapScripts)
+        if (*mapScripts == 0)
             return NULL;
         if (*mapScripts == tag)
         {
@@ -248,14 +248,14 @@ u8 *mapheader_get_tagged_pointer(u8 tag)
     }
 }
 
-void mapheader_run_script_by_tag(u8 tag)
+static void mapheader_run_script_by_tag(u8 tag)
 {
     u8 *ptr = mapheader_get_tagged_pointer(tag);
     if (ptr)
         ScriptContext2_RunNewScript(ptr);
 }
 
-u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag)
+static u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag)
 {
     u8 *ptr = mapheader_get_tagged_pointer(tag);
 
@@ -316,7 +316,7 @@ void mapheader_run_first_tag4_script_list_match(void)
         ScriptContext2_RunNewScript(ptr);
 }
 
-u32 CalculateRamScriptChecksum(void)
+static u32 CalculateRamScriptChecksum(void)
 {
     u32 i;
     u32 sum = 0;
diff --git a/src/script_menu.c b/src/script_menu.c
index 6e1a12a60..e25e74d8c 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1,10 +1,12 @@
 #include "global.h"
+#include "script.h"
 #include "script_menu.h"
 #include "event_data.h"
 #include "field_effect.h"
 #include "menu.h"
 #include "palette.h"
 #include "script.h"
+#include "songs.h"
 #include "sound.h"
 #include "sprite.h"
 #include "strings.h"
@@ -13,538 +15,544 @@
 // multichoice lists
 const struct MenuAction MultichoiceList_00[] =
 {
-    {(u8 *)OtherText_Petalburg, 0},
-    {(u8 *)OtherText_Slateport, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Petalburg, NULL},
+    {OtherText_Slateport, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_02[] =
 {
-    {(u8 *)OtherText_Enter, 0},
-    {(u8 *)OtherText_Info3, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Enter, NULL},
+    {OtherText_Info3, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_03[] =
 {
-    {(u8 *)OtherText_WhatsAContest, 0},
-    {(u8 *)OtherText_TypesOfContest, 0},
-    {(u8 *)OtherText_Ranks, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_WhatsAContest, NULL},
+    {OtherText_TypesOfContest, NULL},
+    {OtherText_Ranks, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_04[] =
 {
-    {(u8 *)OtherText_CoolContest, 0},
-    {(u8 *)OtherText_BeautyContest, 0},
-    {(u8 *)OtherText_CuteContest, 0},
-    {(u8 *)OtherText_SmartContest, 0},
-    {(u8 *)OtherText_ToughContest, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_CoolContest, NULL},
+    {OtherText_BeautyContest, NULL},
+    {OtherText_CuteContest, NULL},
+    {OtherText_SmartContest, NULL},
+    {OtherText_ToughContest, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_06[] =
 {
-    {(u8 *)OtherText_Decoration, 0},
-    {(u8 *)OtherText_PackUp, 0},
-    {(u8 *)OtherText_Registry, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Decoration, NULL},
+    {OtherText_PackUp, NULL},
+    {OtherText_Registry, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_05[] =
 {
-    {(u8 *)OtherText_Decoration, 0},
-    {(u8 *)OtherText_PackUp, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Decoration, NULL},
+    {OtherText_PackUp, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_07[] =
 {
-    {(u8 *)OtherText_Register, 0},
-    {(u8 *)OtherText_Registry, 0},
-    {(u8 *)OtherText_Information, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Register, NULL},
+    {OtherText_Registry, NULL},
+    {OtherText_Information, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_12[] =
 {
-    {(u8 *)OtherText_Mach, 0},
-    {(u8 *)OtherText_Acro, 0},
+    {OtherText_Mach, NULL},
+    {OtherText_Acro, NULL},
 };
 
 const struct MenuAction MultichoiceList_13[] =
 {
-    {(u8 *)OtherText_Poison, 0},
-    {(u8 *)OtherText_Paralysis, 0},
-    {(u8 *)OtherText_Sleep, 0},
-    {(u8 *)OtherText_Burn, 0},
-    {(u8 *)OtherText_Frozen, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Poison, NULL},
+    {OtherText_Paralysis, NULL},
+    {OtherText_Sleep, NULL},
+    {OtherText_Burn, NULL},
+    {OtherText_Frozen, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_14[] =
 {
-    {(u8 *)OtherText_Dewford, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Dewford, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_16[] =
 {
-    {(u8 *)OtherText_SawIt, 0},
-    {(u8 *)OtherText_NotYet, 0},
+    {OtherText_SawIt, NULL},
+    {OtherText_NotYet, NULL},
 };
 
 const struct MenuAction MultichoiceList_17[] =
 {
-    {(u8 *)OtherText_Yes, 0},
-    {(u8 *)OtherText_No, 0},
-    {(u8 *)OtherText_Info3, 0},
+    {OtherText_Yes, NULL},
+    {OtherText_No, NULL},
+    {OtherText_Info3, NULL},
 };
 
 const struct MenuAction MultichoiceList_18[] =
 {
-    {(u8 *)OtherText_SingleBattle, 0},
-    {(u8 *)OtherText_DoubleBattle, 0},
-    {(u8 *)OtherText_MultiBattle, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_SingleBattle, NULL},
+    {OtherText_DoubleBattle, NULL},
+    {OtherText_MultiBattle, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_19[] =
 {
-    {(u8 *)OtherText_Littleroot, 0},
-    {(u8 *)OtherText_Slateport, 0},
-    {(u8 *)OtherText_Lilycove, 0},
+    {OtherText_Littleroot, NULL},
+    {OtherText_Slateport, NULL},
+    {OtherText_Lilycove, NULL},
 };
 
 const struct MenuAction MultichoiceList_20[] =
 {
-    {(u8 *)OtherText_Yes, 0},
-    {(u8 *)OtherText_No, 0},
-    {(u8 *)OtherText_Info3, 0},
+    {OtherText_Yes, NULL},
+    {OtherText_No, NULL},
+    {OtherText_Info3, NULL},
 };
 
 const struct MenuAction MultichoiceList_23[] =
 {
-    {(u8 *)OtherText_MakeAChallenge, 0},
-    {(u8 *)OtherText_ObtainInformation, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_MakeAChallenge, NULL},
+    {OtherText_ObtainInformation, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_24[] =
 {
-    {(u8 *)OtherText_Lv50_2, 0},
-    {(u8 *)OtherText_Lv100_2, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Lv50_2, NULL},
+    {OtherText_Lv100_2, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_25[] =
 {
-    {(u8 *)OtherText_Zigzagoon, 0},
-    {(u8 *)OtherText_Nincada, 0},
-    {(u8 *)OtherText_Poochyena, 0},
+    {OtherText_Zigzagoon, NULL},
+    {OtherText_Nincada, NULL},
+    {OtherText_Poochyena, NULL},
 };
 
 const struct MenuAction MultichoiceList_26[] =
 {
-    {(u8 *)OtherText_Nincada2, 0},
-    {(u8 *)OtherText_Lotad, 0},
-    {(u8 *)OtherText_Roselia, 0},
+    {OtherText_Nincada2, NULL},
+    {OtherText_Lotad, NULL},
+    {OtherText_Roselia, NULL},
 };
 
 const struct MenuAction MultichoiceList_27[] =
 {
-    {(u8 *)OtherText_Shroomish, 0},
-    {(u8 *)OtherText_Nincada3, 0},
-    {(u8 *)OtherText_Surskit, 0},
+    {OtherText_Shroomish, NULL},
+    {OtherText_Nincada3, NULL},
+    {OtherText_Surskit, NULL},
 };
 
 const struct MenuAction MultichoiceList_28[] =
 {
-    {(u8 *)OtherText_Treecko, 0},
-    {(u8 *)OtherText_Torchic, 0},
-    {(u8 *)OtherText_Mudkip, 0},
+    {OtherText_Treecko, NULL},
+    {OtherText_Torchic, NULL},
+    {OtherText_Mudkip, NULL},
 };
 
 const struct MenuAction MultichoiceList_29[] =
 {
-    {(u8 *)OtherText_Seedot, 0},
-    {(u8 *)OtherText_Shroomish2, 0},
-    {(u8 *)OtherText_Spinda, 0},
+    {OtherText_Seedot, NULL},
+    {OtherText_Shroomish2, NULL},
+    {OtherText_Spinda, NULL},
 };
 
 const struct MenuAction MultichoiceList_30[] =
 {
-    {(u8 *)OtherText_Shroomish3, 0},
-    {(u8 *)OtherText_Zigzagoon2, 0},
-    {(u8 *)OtherText_Wurmple, 0},
+    {OtherText_Shroomish3, NULL},
+    {OtherText_Zigzagoon2, NULL},
+    {OtherText_Wurmple, NULL},
 };
 
 const struct MenuAction MultichoiceList_31[] =
 {
-    {(u8 *)OtherText_PokeBall, 0},
-    {(u8 *)OtherText_SuperPotion, 0},
-    {(u8 *)OtherText_SamePrice, 0},
+    {OtherText_PokeBall, NULL},
+    {OtherText_SuperPotion, NULL},
+    {OtherText_SamePrice, NULL},
 };
 
 const struct MenuAction MultichoiceList_32[] =
 {
-    {(u8 *)OtherText_Yen135, 0},
-    {(u8 *)OtherText_Yen155, 0},
-    {(u8 *)OtherText_Yen175, 0},
+    {OtherText_Yen135, NULL},
+    {OtherText_Yen155, NULL},
+    {OtherText_Yen175, NULL},
 };
 
 const struct MenuAction MultichoiceList_33[] =
 {
-    {(u8 *)OtherText_CostMore, 0},
-    {(u8 *)OtherText_CostLess, 0},
-    {(u8 *)OtherText_SamePrice2, 0},
+    {OtherText_CostMore, NULL},
+    {OtherText_CostLess, NULL},
+    {OtherText_SamePrice2, NULL},
 };
 
 const struct MenuAction MultichoiceList_34[] =
 {
-    {(u8 *)OtherText_MaleSymbol, 0},
-    {(u8 *)OtherText_FemaleSymbol, 0},
-    {(u8 *)OtherText_Neither, 0},
+    {OtherText_MaleSymbol, NULL},
+    {OtherText_FemaleSymbol, NULL},
+    {OtherText_Neither, NULL},
 };
 
 const struct MenuAction MultichoiceList_35[] =
 {
-    {(u8 *)OtherText_Males, 0},
-    {(u8 *)OtherText_Females, 0},
-    {(u8 *)OtherText_SameNumber, 0},
+    {OtherText_Males, NULL},
+    {OtherText_Females, NULL},
+    {OtherText_SameNumber, NULL},
 };
 
 const struct MenuAction MultichoiceList_36[] =
 {
-    {(u8 *)OtherText_Male, 0},
-    {(u8 *)OtherText_Female, 0},
-    {(u8 *)OtherText_ItDepends, 0},
+    {OtherText_Male, NULL},
+    {OtherText_Female, NULL},
+    {OtherText_ItDepends, NULL},
 };
 
 const struct MenuAction MultichoiceList_37[] =
 {
-    {(u8 *)OtherText_Six2, 0},
-    {(u8 *)OtherText_Eight2, 0},
-    {(u8 *)OtherText_Ten, 0},
+    {OtherText_Six2, NULL},
+    {OtherText_Eight2, NULL},
+    {OtherText_Ten, NULL},
 };
 
 const struct MenuAction MultichoiceList_38[] =
 {
-    {(u8 *)OtherText_One, 0},
-    {(u8 *)OtherText_Two, 0},
-    {(u8 *)OtherText_Three, 0},
+    {OtherText_One, NULL},
+    {OtherText_Two, NULL},
+    {OtherText_Three, NULL},
 };
 
 const struct MenuAction MultichoiceList_39[] =
 {
-    {(u8 *)OtherText_Six, 0},
-    {(u8 *)OtherText_Seven, 0},
-    {(u8 *)OtherText_Eight, 0},
+    {OtherText_Six, NULL},
+    {OtherText_Seven, NULL},
+    {OtherText_Eight, NULL},
 };
 
 const struct MenuAction MultichoiceList_42[] =
 {
-    {(u8 *)OtherText_FreshWater, 0},
-    {(u8 *)OtherText_SodaPop, 0},
-    {(u8 *)OtherText_Lemonade, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_FreshWater, NULL},
+    {OtherText_SodaPop, NULL},
+    {OtherText_Lemonade, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_43[] =
 {
-    {(u8 *)OtherText_HowToRide, 0},
-    {(u8 *)OtherText_HowToTurn, 0},
-    {(u8 *)OtherText_SandySlopes, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_HowToRide, NULL},
+    {OtherText_HowToTurn, NULL},
+    {OtherText_SandySlopes, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_44[] =
 {
-    {(u8 *)OtherText_Wheelies, 0},
-    {(u8 *)OtherText_BunnyHops, 0},
-    {(u8 *)OtherText_Jumping, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Wheelies, NULL},
+    {OtherText_BunnyHops, NULL},
+    {OtherText_Jumping, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_45[] =
 {
-    {(u8 *)OtherText_Satisfied, 0},
-    {(u8 *)OtherText_Dissatisfied, 0},
+    {OtherText_Satisfied, NULL},
+    {OtherText_Dissatisfied, NULL},
 };
 
 const struct MenuAction MultichoiceList_46[] =
 {
-    {(u8 *)OtherText_Deepseatooth, 0},
-    {(u8 *)OtherText_Deepseascale, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Deepseatooth, NULL},
+    {OtherText_Deepseascale, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_47[] =
 {
-    {(u8 *)OtherText_BlueFlute2, 0},
-    {(u8 *)OtherText_YellowFlute2, 0},
-    {(u8 *)OtherText_RedFlute2, 0},
-    {(u8 *)OtherText_WhiteFlute2, 0},
-    {(u8 *)OtherText_BlackFlute2, 0},
-    {(u8 *)OtherText_GlassChair, 0},
-    {(u8 *)OtherText_GlassDesk, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_BlueFlute2, NULL},
+    {OtherText_YellowFlute2, NULL},
+    {OtherText_RedFlute2, NULL},
+    {OtherText_WhiteFlute2, NULL},
+    {OtherText_BlackFlute2, NULL},
+    {OtherText_GlassChair, NULL},
+    {OtherText_GlassDesk, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_48[] =
 {
-    {(u8 *)OtherText_TreeckoDoll, 0},
-    {(u8 *)OtherText_TorchicDoll, 0},
-    {(u8 *)OtherText_MudkipDoll, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_TreeckoDoll, NULL},
+    {OtherText_TorchicDoll, NULL},
+    {OtherText_MudkipDoll, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_55[] =
 {
-    {(u8 *)OtherText_TM32, 0},
-    {(u8 *)OtherText_TM29, 0},
-    {(u8 *)OtherText_TM35, 0},
-    {(u8 *)OtherText_TM24, 0},
-    {(u8 *)OtherText_TM13, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_TM32, NULL},
+    {OtherText_TM29, NULL},
+    {OtherText_TM35, NULL},
+    {OtherText_TM24, NULL},
+    {OtherText_TM13, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_49[] =
 {
-    {(u8 *)OtherText_50Coins, 0},
-    {(u8 *)OtherText_500Coins, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_50Coins, NULL},
+    {OtherText_500Coins, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_50[] =
 {
-    {(u8 *)OtherText_Excellent, 0},
-    {(u8 *)OtherText_NotSoHot, 0},
+    {OtherText_Excellent, NULL},
+    {OtherText_NotSoHot, NULL},
 };
 
 const struct MenuAction MultichoiceList_52[] =
 {
-    {(u8 *)OtherText_Lilycove, 0},
-    {(u8 *)OtherText_BattleTower, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Lilycove, NULL},
+    {OtherText_BattleTower, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_53[] =
 {
-    {(u8 *)OtherText_Slateport, 0},
-    {(u8 *)OtherText_Lilycove, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Slateport, NULL},
+    {OtherText_Lilycove, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_54[] =
 {
-    {(u8 *)OtherText_Right, 0},
-    {(u8 *)OtherText_Left, 0},
+    {OtherText_Right, NULL},
+    {OtherText_Left, NULL},
 };
 
 const struct MenuAction MultichoiceList_56[] =
 {
-    {(u8 *)OtherText_Slateport, 0},
-    {(u8 *)OtherText_BattleTower, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_Slateport, NULL},
+    {OtherText_BattleTower, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_57[] =
 {
-    {(u8 *)OtherText_1F_2, 0},
-    {(u8 *)OtherText_2F_2, 0},
-    {(u8 *)OtherText_3F_2, 0},
-    {(u8 *)OtherText_4F_2, 0},
-    {(u8 *)OtherText_5F_2, 0},
+    {OtherText_1F_2, NULL},
+    {OtherText_2F_2, NULL},
+    {OtherText_3F_2, NULL},
+    {OtherText_4F_2, NULL},
+    {OtherText_5F_2, NULL},
 };
 
 const struct MenuAction MultichoiceList_58[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_59[] =
 {
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_YellowShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_60[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_YellowShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_61[] =
 {
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_BlueShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_62[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_63[] =
 {
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_YellowShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_64[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_YellowShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_65[] =
 {
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_66[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_67[] =
 {
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_YellowShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_68[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_YellowShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_69[] =
 {
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_BlueShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_70[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_71[] =
 {
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_YellowShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_72[] =
 {
-    {(u8 *)OtherText_RedShard, 0},
-    {(u8 *)OtherText_YellowShard, 0},
-    {(u8 *)OtherText_BlueShard, 0},
-    {(u8 *)OtherText_GreenShard, 0},
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {OtherText_RedShard, NULL},
+    {OtherText_YellowShard, NULL},
+    {OtherText_BlueShard, NULL},
+    {OtherText_GreenShard, NULL},
+    {gOtherText_CancelNoTerminator, NULL},
 };
 
 const struct MenuAction MultichoiceList_01[] =
 {
-    {(u8 *)gOtherText_CancelNoTerminator, 0},
+    {gOtherText_CancelNoTerminator, NULL},
+};
+
+struct MultichoiceListStruct
+{
+    const struct MenuAction *list;
+    u8 count;
 };
 
 const struct MultichoiceListStruct gMultichoiceLists[] =
 {
-    {(struct MenuAction *)MultichoiceList_00, 3},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_02, 3},
-    {(struct MenuAction *)MultichoiceList_03, 4},
-    {(struct MenuAction *)MultichoiceList_04, 6},
-    {(struct MenuAction *)MultichoiceList_05, 3},
-    {(struct MenuAction *)MultichoiceList_06, 4},
-    {(struct MenuAction *)MultichoiceList_07, 4},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_12, 2},
-    {(struct MenuAction *)MultichoiceList_13, 6},
-    {(struct MenuAction *)MultichoiceList_14, 2},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_16, 2},
-    {(struct MenuAction *)MultichoiceList_17, 3},
-    {(struct MenuAction *)MultichoiceList_18, 4},
-    {(struct MenuAction *)MultichoiceList_19, 3},
-    {(struct MenuAction *)MultichoiceList_20, 3},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_23, 3},
-    {(struct MenuAction *)MultichoiceList_24, 3},
-    {(struct MenuAction *)MultichoiceList_25, 3},
-    {(struct MenuAction *)MultichoiceList_26, 3},
-    {(struct MenuAction *)MultichoiceList_27, 3},
-    {(struct MenuAction *)MultichoiceList_28, 3},
-    {(struct MenuAction *)MultichoiceList_29, 3},
-    {(struct MenuAction *)MultichoiceList_30, 3},
-    {(struct MenuAction *)MultichoiceList_31, 3},
-    {(struct MenuAction *)MultichoiceList_32, 3},
-    {(struct MenuAction *)MultichoiceList_33, 3},
-    {(struct MenuAction *)MultichoiceList_34, 3},
-    {(struct MenuAction *)MultichoiceList_35, 3},
-    {(struct MenuAction *)MultichoiceList_36, 3},
-    {(struct MenuAction *)MultichoiceList_37, 3},
-    {(struct MenuAction *)MultichoiceList_38, 3},
-    {(struct MenuAction *)MultichoiceList_39, 3},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_42, 4},
-    {(struct MenuAction *)MultichoiceList_43, 4},
-    {(struct MenuAction *)MultichoiceList_44, 4},
-    {(struct MenuAction *)MultichoiceList_45, 2},
-    {(struct MenuAction *)MultichoiceList_46, 3},
-    {(struct MenuAction *)MultichoiceList_47, 8},
-    {(struct MenuAction *)MultichoiceList_48, 4},
-    {(struct MenuAction *)MultichoiceList_49, 3},
-    {(struct MenuAction *)MultichoiceList_50, 2},
-    {(struct MenuAction *)MultichoiceList_01, 1},
-    {(struct MenuAction *)MultichoiceList_52, 3},
-    {(struct MenuAction *)MultichoiceList_53, 3},
-    {(struct MenuAction *)MultichoiceList_54, 2},
-    {(struct MenuAction *)MultichoiceList_55, 6},
-    {(struct MenuAction *)MultichoiceList_56, 3},
-    {(struct MenuAction *)MultichoiceList_57, 5},
-    {(struct MenuAction *)MultichoiceList_58, 2},
-    {(struct MenuAction *)MultichoiceList_59, 2},
-    {(struct MenuAction *)MultichoiceList_60, 3},
-    {(struct MenuAction *)MultichoiceList_61, 2},
-    {(struct MenuAction *)MultichoiceList_62, 3},
-    {(struct MenuAction *)MultichoiceList_63, 3},
-    {(struct MenuAction *)MultichoiceList_64, 4},
-    {(struct MenuAction *)MultichoiceList_65, 2},
-    {(struct MenuAction *)MultichoiceList_66, 3},
-    {(struct MenuAction *)MultichoiceList_67, 3},
-    {(struct MenuAction *)MultichoiceList_68, 4},
-    {(struct MenuAction *)MultichoiceList_69, 3},
-    {(struct MenuAction *)MultichoiceList_70, 4},
-    {(struct MenuAction *)MultichoiceList_71, 4},
-    {(struct MenuAction *)MultichoiceList_72, 5}
+    {MultichoiceList_00, ARRAY_COUNT(MultichoiceList_00)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_02, ARRAY_COUNT(MultichoiceList_02)},
+    {MultichoiceList_03, ARRAY_COUNT(MultichoiceList_03)},
+    {MultichoiceList_04, ARRAY_COUNT(MultichoiceList_04)},
+    {MultichoiceList_05, ARRAY_COUNT(MultichoiceList_05)},
+    {MultichoiceList_06, ARRAY_COUNT(MultichoiceList_06)},
+    {MultichoiceList_07, ARRAY_COUNT(MultichoiceList_07)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_12, ARRAY_COUNT(MultichoiceList_12)},
+    {MultichoiceList_13, ARRAY_COUNT(MultichoiceList_13)},
+    {MultichoiceList_14, ARRAY_COUNT(MultichoiceList_14)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_16, ARRAY_COUNT(MultichoiceList_16)},
+    {MultichoiceList_17, ARRAY_COUNT(MultichoiceList_17)},
+    {MultichoiceList_18, ARRAY_COUNT(MultichoiceList_18)},
+    {MultichoiceList_19, ARRAY_COUNT(MultichoiceList_19)},
+    {MultichoiceList_20, ARRAY_COUNT(MultichoiceList_20)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_23, ARRAY_COUNT(MultichoiceList_23)},
+    {MultichoiceList_24, ARRAY_COUNT(MultichoiceList_24)},
+    {MultichoiceList_25, ARRAY_COUNT(MultichoiceList_25)},
+    {MultichoiceList_26, ARRAY_COUNT(MultichoiceList_26)},
+    {MultichoiceList_27, ARRAY_COUNT(MultichoiceList_27)},
+    {MultichoiceList_28, ARRAY_COUNT(MultichoiceList_28)},
+    {MultichoiceList_29, ARRAY_COUNT(MultichoiceList_29)},
+    {MultichoiceList_30, ARRAY_COUNT(MultichoiceList_30)},
+    {MultichoiceList_31, ARRAY_COUNT(MultichoiceList_31)},
+    {MultichoiceList_32, ARRAY_COUNT(MultichoiceList_32)},
+    {MultichoiceList_33, ARRAY_COUNT(MultichoiceList_33)},
+    {MultichoiceList_34, ARRAY_COUNT(MultichoiceList_34)},
+    {MultichoiceList_35, ARRAY_COUNT(MultichoiceList_35)},
+    {MultichoiceList_36, ARRAY_COUNT(MultichoiceList_36)},
+    {MultichoiceList_37, ARRAY_COUNT(MultichoiceList_37)},
+    {MultichoiceList_38, ARRAY_COUNT(MultichoiceList_38)},
+    {MultichoiceList_39, ARRAY_COUNT(MultichoiceList_39)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_42, ARRAY_COUNT(MultichoiceList_42)},
+    {MultichoiceList_43, ARRAY_COUNT(MultichoiceList_43)},
+    {MultichoiceList_44, ARRAY_COUNT(MultichoiceList_44)},
+    {MultichoiceList_45, ARRAY_COUNT(MultichoiceList_45)},
+    {MultichoiceList_46, ARRAY_COUNT(MultichoiceList_46)},
+    {MultichoiceList_47, ARRAY_COUNT(MultichoiceList_47)},
+    {MultichoiceList_48, ARRAY_COUNT(MultichoiceList_48)},
+    {MultichoiceList_49, ARRAY_COUNT(MultichoiceList_49)},
+    {MultichoiceList_50, ARRAY_COUNT(MultichoiceList_50)},
+    {MultichoiceList_01, ARRAY_COUNT(MultichoiceList_01)},
+    {MultichoiceList_52, ARRAY_COUNT(MultichoiceList_52)},
+    {MultichoiceList_53, ARRAY_COUNT(MultichoiceList_53)},
+    {MultichoiceList_54, ARRAY_COUNT(MultichoiceList_54)},
+    {MultichoiceList_55, ARRAY_COUNT(MultichoiceList_55)},
+    {MultichoiceList_56, ARRAY_COUNT(MultichoiceList_56)},
+    {MultichoiceList_57, ARRAY_COUNT(MultichoiceList_57)},
+    {MultichoiceList_58, ARRAY_COUNT(MultichoiceList_58)},
+    {MultichoiceList_59, ARRAY_COUNT(MultichoiceList_59)},
+    {MultichoiceList_60, ARRAY_COUNT(MultichoiceList_60)},
+    {MultichoiceList_61, ARRAY_COUNT(MultichoiceList_61)},
+    {MultichoiceList_62, ARRAY_COUNT(MultichoiceList_62)},
+    {MultichoiceList_63, ARRAY_COUNT(MultichoiceList_63)},
+    {MultichoiceList_64, ARRAY_COUNT(MultichoiceList_64)},
+    {MultichoiceList_65, ARRAY_COUNT(MultichoiceList_65)},
+    {MultichoiceList_66, ARRAY_COUNT(MultichoiceList_66)},
+    {MultichoiceList_67, ARRAY_COUNT(MultichoiceList_67)},
+    {MultichoiceList_68, ARRAY_COUNT(MultichoiceList_68)},
+    {MultichoiceList_69, ARRAY_COUNT(MultichoiceList_69)},
+    {MultichoiceList_70, ARRAY_COUNT(MultichoiceList_70)},
+    {MultichoiceList_71, ARRAY_COUNT(MultichoiceList_71)},
+    {MultichoiceList_72, ARRAY_COUNT(MultichoiceList_72)},
 };
 
 const u8 *const gUnknown_083CE048[] =
@@ -574,37 +582,50 @@ extern u8 gPCText_WhichPCShouldBeAccessed[];
 
 extern u16 gScriptResult;
 
-bool8 sub_80B5054(u8 left, u8 top, u8 var3, u8 var4)
+static void Task_HandleMultichoiceInput(u8);
+static void Task_HandleYesNoInput(u8);
+static void Task_HandleMultichoiceGridInput(u8);
+static u16 GetStringWidthInTilesForScriptMenu(const u8 *str);
+static void DrawMultichoiceMenu(u8, u8, u8, const struct MenuAction *list, u8, u8);
+static void StartScriptMenuTask(u8, u8, u8, u8, u8, u8);
+static void sub_80B53B4(u8, u8, u8, const struct MenuAction *list, u8);
+static bool8 IsPicboxClosed(void);
+
+bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress)
 {
-    if (FuncIsActiveTask(sub_80B52B4) == 1)
+    if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
+    {
         return FALSE;
+    }
     else
     {
         gScriptResult = 0xFF;
-        DrawMultichoiceMenu(left, top, gMultichoiceLists[var3].count, gMultichoiceLists[var3].list, var4, 0);
+        DrawMultichoiceMenu(left, top, gMultichoiceLists[multichoiceId].count, gMultichoiceLists[multichoiceId].list, ignoreBPress, 0);
         return TRUE;
     }
 }
 
-bool8 sub_80B50B0(u8 left, u8 top, u8 var3, u8 var4, u8 var5)
+bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 defaultChoice)
 {
-    if (FuncIsActiveTask(sub_80B52B4) == 1)
+    if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
+    {
         return FALSE;
+    }
     else
     {
         gScriptResult = 0xFF;
-        DrawMultichoiceMenu(left, top, gMultichoiceLists[var3].count, gMultichoiceLists[var3].list, var4, var5);
+        DrawMultichoiceMenu(left, top, gMultichoiceLists[multichoiceId].count, gMultichoiceLists[multichoiceId].list, ignoreBPress, defaultChoice);
         return TRUE;
     }
 }
 
-u16 GetStringWidthInTilesForScriptMenu(const u8 *str)
+static u16 GetStringWidthInTilesForScriptMenu(const u8 *str)
 {
     // each tile on screen is 8x8, so it needs the number of tiles and not pixels, hence the division by 8.
     return (GetStringWidthGivenWindowConfig((struct WindowConfig *)&gWindowConfig_81E6CE4, str) + 7) / 8;
 }
 
-void DrawMultichoiceMenu(u8 left, u8 top, u8 count, struct MenuAction *list, u8 var4, u8 cursorPos)
+static void DrawMultichoiceMenu(u8 left, u8 top, u8 count, const struct MenuAction *list, u8 ignoreBPress, u8 cursorPos)
 {
     u16 width = GetStringWidthInTilesForScriptMenu(list[0].text);
     u16 newWidth;
@@ -633,75 +654,79 @@ void DrawMultichoiceMenu(u8 left, u8 top, u8 count, struct MenuAction *list, u8
     MenuDrawTextWindow(left, top, right, bottom);
     PrintMenuItems(left + 1, top + 1, count, list);
     InitMenu(0, left + 1, top + 1, count, cursorPos, right - left - 1);
-    sub_80B5230(left, top, right, bottom, var4, count);
+    StartScriptMenuTask(left, top, right, bottom, ignoreBPress, count);
 }
 
-void sub_80B5230(u8 left, u8 top, u8 right, u8 bottom, u8 unkVar, u8 count)
+#define tLeft         data[0]
+#define tTop          data[1]
+#define tRight        data[2]
+#define tBottom       data[3]
+#define tIgnoreBPress data[4]
+#define tDoWrap       data[5]
+
+static void StartScriptMenuTask(u8 left, u8 top, u8 right, u8 bottom, u8 ignoreBPress, u8 count)
 {
-    u8 taskId = CreateTask(sub_80B52B4, 80);
+    u8 taskId = CreateTask(Task_HandleMultichoiceInput, 80);
 
-    gTasks[taskId].data[0] = left;
-    gTasks[taskId].data[1] = top;
-    gTasks[taskId].data[2] = right;
-    gTasks[taskId].data[3] = bottom;
-    gTasks[taskId].data[4] = unkVar;
+    gTasks[taskId].tLeft = left;
+    gTasks[taskId].tTop = top;
+    gTasks[taskId].tRight = right;
+    gTasks[taskId].tBottom = bottom;
+    gTasks[taskId].tIgnoreBPress = ignoreBPress;
 
     if (count > 3)
-        gTasks[taskId].data[5] = TRUE;
+        gTasks[taskId].tDoWrap = TRUE;
     else
-        gTasks[taskId].data[5] = FALSE;
+        gTasks[taskId].tDoWrap = FALSE;
 }
 
-void sub_80B52B4(u8 taskId)
+static void Task_HandleMultichoiceInput(u8 taskId)
 {
-    s8 var;
+    s8 selection;
 
     if (!gPaletteFade.active)
     {
-        if (!gTasks[taskId].data[5])
-            var = ProcessMenuInputNoWrap();
+        if (!gTasks[taskId].tDoWrap)
+            selection = ProcessMenuInputNoWrap();
         else
-            var = ProcessMenuInput();
+            selection = ProcessMenuInput();
 
-        if (var != -2)
+        if (selection != -2)
         {
-            if (var == -1)
+            if (selection == -1)
             {
-                if (!gTasks[taskId].data[4])
-                {
-                    PlaySE(5);
-                    gScriptResult = 127;
-                }
-                else
-                {
+                if (gTasks[taskId].tIgnoreBPress)
                     return;
-                }
+                PlaySE(SE_SELECT);
+                gScriptResult = 127;
             }
             else
             {
-                gScriptResult = var;
+                gScriptResult = selection;
             }
             HandleDestroyMenuCursors();
-            MenuZeroFillWindowRect(gTasks[taskId].data[0], gTasks[taskId].data[1], gTasks[taskId].data[2], gTasks[taskId].data[3]);
+            MenuZeroFillWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom);
             DestroyTask(taskId);
             EnableBothScriptContexts();
         }
     }
 }
 
-bool8 Multichoice(u8 var1, u8 var2, u8 var3, u8 var4)
+bool8 Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress)
 {
-    if (FuncIsActiveTask(sub_80B52B4) == 1)
+    if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
+    {
         return FALSE;
+    }
     else
     {
         gScriptResult = 0xFF;
-        sub_80B53B4(var1, var2, gMultichoiceLists[var3].count, gMultichoiceLists[var3].list, var4);
+        sub_80B53B4(left, top, gMultichoiceLists[multichoiceId].count, gMultichoiceLists[multichoiceId].list, ignoreBPress);
         return TRUE;
     }
 }
 
-void sub_80B53B4(u8 left, u8 top, u8 count, struct MenuAction *list, u8 var4)
+static void sub_80B53B4(u8 left, u8 top, u8 count, const struct MenuAction *list, u8 ignoreBPress)
 {
     u16 width = GetStringWidthInTilesForScriptMenu(list[0].text);
     u16 newWidth;
@@ -722,22 +747,24 @@ void sub_80B53B4(u8 left, u8 top, u8 count, struct MenuAction *list, u8 var4)
 
     PrintMenuItems(left, top, count, list);
     InitMenu(0, left, top, count, 0, right - left - 1);
-    sub_80B5230(left, top, right, bottom, var4, count);
+    StartScriptMenuTask(left, top, right, bottom, ignoreBPress, count);
 }
 
-bool8 yes_no_box(u8 var1, u8 var2)
+bool8 ScriptMenu_YesNo(u8 left, u8 top)
 {
     u8 taskId;
 
-    if (FuncIsActiveTask(task_yes_no_maybe) == 1)
+    if (FuncIsActiveTask(Task_HandleYesNoInput) == TRUE)
+    {
         return FALSE;
+    }
     else
     {
         gScriptResult = 0xFF;
-        DisplayYesNoMenu(var1, var2, 1);
-        taskId = CreateTask(task_yes_no_maybe, 0x50);
-        gTasks[taskId].data[0] = var1;
-        gTasks[taskId].data[1] = var2;
+        DisplayYesNoMenu(left, top, 1);
+        taskId = CreateTask(Task_HandleYesNoInput, 0x50);
+        gTasks[taskId].tLeft = left;
+        gTasks[taskId].tTop = top;
         return TRUE;
     }
 }
@@ -751,13 +778,13 @@ bool8 IsScriptActive(void)
         return TRUE;
 }
 
-void task_yes_no_maybe(u8 taskId)
+static void Task_HandleYesNoInput(u8 taskId)
 {
     u8 left, top;
 
-    if (gTasks[taskId].data[2] < 5)
+    if (gTasks[taskId].tRight < 5)
     {
-        gTasks[taskId].data[2]++;
+        gTasks[taskId].tRight++;
         return;
     }
 
@@ -767,7 +794,7 @@ void task_yes_no_maybe(u8 taskId)
         return;
     case -1:
     case 1:
-        PlaySE(5);
+        PlaySE(SE_SELECT);
         gScriptResult = 0;
         break;
     case 0:
@@ -775,19 +802,19 @@ void task_yes_no_maybe(u8 taskId)
         break;
     }
 
-    left = gTasks[taskId].data[0];
-    top = gTasks[taskId].data[1];
+    left = gTasks[taskId].tLeft;
+    top = gTasks[taskId].tTop;
 
     MenuZeroFillWindowRect(left, top, left + 6, top + 5);
     DestroyTask(taskId);
     EnableBothScriptContexts();
 }
 
-bool8 sub_80B5578(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount)
+bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 columnCount)
 {
     u8 bottom = 0;
 
-    if (FuncIsActiveTask(sub_80B5684) == TRUE)
+    if (FuncIsActiveTask(Task_HandleMultichoiceGridInput) == TRUE)
     {
         return FALSE;
     }
@@ -800,7 +827,7 @@ bool8 sub_80B5578(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount)
 
         sub_807274C(left, top, gMultichoiceLists[multichoiceId].count, 0, gMultichoiceLists[multichoiceId].list, columnCount, 0);
 
-        taskId = CreateTask(sub_80B5684, 80);
+        taskId = CreateTask(Task_HandleMultichoiceGridInput, 80);
 
         if (!((gMultichoiceLists[multichoiceId].count >> 1) < columnCount || (gMultichoiceLists[multichoiceId].count & 1))
          || columnCount == 1 || gMultichoiceLists[multichoiceId].count == columnCount)
@@ -813,58 +840,62 @@ bool8 sub_80B5578(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount)
         }
 
         width = sub_807288C(columnCount);
-        gTasks[taskId].data[0] = left;
-        gTasks[taskId].data[1] = top;
-        gTasks[taskId].data[2] = width + left + 2;
-        gTasks[taskId].data[3] = bottom;
-        gTasks[taskId].data[4] = a4;
+        gTasks[taskId].tLeft = left;
+        gTasks[taskId].tTop = top;
+        gTasks[taskId].tRight = width + left + 2;
+        gTasks[taskId].tBottom = bottom;
+        gTasks[taskId].tIgnoreBPress = ignoreBPress;
         return TRUE;
     }
 }
 
-void sub_80B5684(u8 taskId)
+static void Task_HandleMultichoiceGridInput(u8 taskId)
 {
-    s8 var = sub_80727CC();
+    s8 selection = sub_80727CC();
 
-    if (var != -2)
+    if (selection != -2)
     {
-        if (var == -1)
+        if (selection == -1)
         {
-            if (!gTasks[taskId].data[4])
-            {
-                PlaySE(5);
-                gScriptResult = 127;
-            }
-            else
-            {
+            if (gTasks[taskId].tIgnoreBPress)
                 return;
-            }
+            PlaySE(SE_SELECT);
+            gScriptResult = 127;
         }
         else
         {
-            gScriptResult = var;
+            gScriptResult = selection;
         }
         HandleDestroyMenuCursors();
-        MenuZeroFillWindowRect(gTasks[taskId].data[0], gTasks[taskId].data[1], gTasks[taskId].data[2], gTasks[taskId].data[3]);
+        MenuZeroFillWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom);
         DestroyTask(taskId);
         EnableBothScriptContexts();
     }
 }
 
-bool8 TryCreatePCMenu(void)
+#undef tLeft
+#undef tTop
+#undef tRight
+#undef tBottom
+#undef tIgnoreBPress
+#undef tDoWrap
+
+bool8 ScrSpecial_CreatePCMenu(void)
 {
-    if (FuncIsActiveTask(sub_80B52B4) == 1)
+    if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
+    {
         return FALSE;
+    }
     else
     {
         gScriptResult = 0xFF;
-        CreatePCMenu();
+        ScriptMenu_CreatePCMenu();
         return TRUE;
     }
 }
 
 #if ENGLISH
-void CreatePCMenu(void)
+void ScriptMenu_CreatePCMenu(void)
 {
     u16 playersPCWidth = GetStringWidthInTilesForScriptMenu(gPCText_PlayersPC);
     u8 width;
@@ -896,11 +927,11 @@ void CreatePCMenu(void)
 
     MenuPrint(gPCText_PlayersPC, 1, 3);
     InitMenu(0, 1, 1, numChoices, 0, width + 1);
-    sub_80B5230(0, 0, width + 2, 2 * numChoices + 1, 0, numChoices);
+    StartScriptMenuTask(0, 0, width + 2, 2 * numChoices + 1, 0, numChoices);
 }
 #elif GERMAN
 __attribute__((naked))
-void CreatePCMenu(void) {
+void ScriptMenu_CreatePCMenu(void) {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
     sub sp, 0x18\n\
@@ -1051,7 +1082,7 @@ _080B584A:\n\
     str r7, [sp, 0x4]\n\
     movs r0, 0\n\
     movs r1, 0\n\
-    bl sub_80B5230\n\
+    bl StartScriptMenuTask\n\
     add sp, 0x18\n\
     pop {r4-r7}\n\
     pop {r0}\n\
@@ -1063,72 +1094,85 @@ _080B588C: .4byte gPCText_PlayersPC\n\
 }
 #endif
 
-void sub_80B5838(void)
+void ScriptMenu_DisplayPCStartupPrompt(void)
 {
     MenuDisplayMessageBox();
     MenuPrint(gPCText_WhichPCShouldBeAccessed, 2, 15);
 }
 
-void task_picbox(u8 taskId)
+#define tState       data[0]
+#define tMonSpecies  data[1]
+#define tMonSpriteId data[2]
+#define tWindowX     data[3]
+#define tWindowY     data[4]
+
+static void Task_PokemonPicWindow(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
-    switch (task->data[0])
+    switch (task->tState)
     {
     case 0:
-        task->data[0]++;
+        task->tState++;
         break;
     case 1:
         break;
     case 2:
-        FreeResourcesAndDestroySprite(&gSprites[task->data[2]]);
-        task->data[0]++;
+        FreeResourcesAndDestroySprite(&gSprites[task->tMonSpriteId]);
+        task->tState++;
         break;
     case 3:
-        MenuZeroFillWindowRect(task->data[3], task->data[4], task->data[3] + 9, task->data[4] + 10);
+        MenuZeroFillWindowRect(task->tWindowX, task->tWindowY, task->tWindowX + 9, task->tWindowY + 10);
         DestroyTask(taskId);
         break;
     }
 }
 
-bool8 sub_80B58C4(u16 var1, u8 var2, u8 var3)
+bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y)
 {
     u8 taskId;
-    u8 var;
+    u8 spriteId;
 
-    if (FindTaskIdByFunc(task_picbox) != 0xFF)
+    if (FindTaskIdByFunc(Task_PokemonPicWindow) != 0xFF)
+    {
         return FALSE;
+    }
     else
     {
-        MenuDrawTextWindow(var2, var3, var2 + 9, var3 + 10);
-        taskId = CreateTask(task_picbox, 0x50);
-        gTasks[taskId].data[0] = 0;
-        gTasks[taskId].data[1] = var1;
-        var = CreateMonSprite_PicBox(var1, var2 * 8 + 40, var3 * 8 + 40, 0);
-        gTasks[taskId].data[2] = var;
-        gTasks[taskId].data[3] = var2;
-        gTasks[taskId].data[4] = var3;
-        gSprites[var].callback = SpriteCallbackDummy;
-        gSprites[var].oam.priority = 0;
+        MenuDrawTextWindow(x, y, x + 9, y + 10);
+        taskId = CreateTask(Task_PokemonPicWindow, 0x50);
+        gTasks[taskId].tState = 0;
+        gTasks[taskId].tMonSpecies = species;
+        spriteId = CreateMonSprite_PicBox(species, x * 8 + 40, y * 8 + 40, 0);
+        gTasks[taskId].tMonSpriteId = spriteId;
+        gTasks[taskId].tWindowX = x;
+        gTasks[taskId].tWindowY = y;
+        gSprites[spriteId].callback = SpriteCallbackDummy;
+        gSprites[spriteId].oam.priority = 0;
         return TRUE;
     }
-}
+}  
 
-void *picbox_close(void)
+bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void)
 {
-    u8 taskId = FindTaskIdByFunc(task_picbox);
+    u8 taskId = FindTaskIdByFunc(Task_PokemonPicWindow);
 
     if (taskId == 0xFF)
         return NULL;
-
-    gTasks[taskId].data[0]++;
-    return (void *)sub_80B59AC;
+    gTasks[taskId].tState++;
+    return IsPicboxClosed;
 }
 
-bool8 sub_80B59AC(void)
+static bool8 IsPicboxClosed(void)
 {
-    if (FindTaskIdByFunc(task_picbox) == 0xFF)
+    if (FindTaskIdByFunc(Task_PokemonPicWindow) == 0xFF)
         return TRUE;
     else
         return FALSE;
 }
+
+#undef tState      
+#undef tMonSpecies 
+#undef tMonSpriteId
+#undef tWindowX    
+#undef tWindowY  
diff --git a/src/script_movement.c b/src/script_movement.c
index e25b60a3c..30e10b451 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -13,33 +13,33 @@ static bool8 sub_80A21F4(u8, u8, u8 *);
 static u8 sub_80A2260(u8, u8);
 static bool8 sub_80A2370(u8, u8);
 static void sub_80A23C8(u8, u8, u8, u8 *);
-static void sub_80A2408(u8);
+static void UnfreezeObjects(u8);
 static void Task_80A244C(u8);
 static void sub_80A2490(u8, u8, u8, u8 *);
 
-bool8 exec_movement(u8 a, u8 b, u8 c, u8 *d)
+bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, u8 *movementScript)
 {
     u8 mapObjId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(a, b, c, &mapObjId))
+    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjId))
         return TRUE;
     if (!FuncIsActiveTask(Task_80A244C))
         sub_80A2198(50);
-    return sub_80A21F4(sub_80A21E0(), mapObjId, d);
+    return sub_80A21F4(sub_80A21E0(), mapObjId, movementScript);
 }
 
-bool8 sub_80A212C(u8 a, u8 b, u8 c)
+bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapBank)
 {
     u8 mapObjId;
     u8 r4;
     u8 r1;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(a, b, c, &mapObjId))
-        return 1;
+    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapBank, &mapObjId))
+        return TRUE;
     r4 = sub_80A21E0();
     r1 = sub_80A2260(r4, mapObjId);
     if (r1 == 16)
-        return 1;
+        return TRUE;
     return sub_80A2370(r4, r1);
 }
 
@@ -50,7 +50,7 @@ void sub_80A2178(void)
     taskId = sub_80A21E0();
     if (taskId != 0xFF)
     {
-        sub_80A2408(taskId);
+        UnfreezeObjects(taskId);
         DestroyTask(taskId);
     }
 }
@@ -70,27 +70,31 @@ static u8 sub_80A21E0(void)
     return FindTaskIdByFunc(Task_80A244C);
 }
 
-static bool8 sub_80A21F4(u8 taskId, u8 b, u8 *c)
+static bool8 sub_80A21F4(u8 taskId, u8 mapObjId, u8 *movementScript)
 {
     u8 r4;
 
-    r4 = sub_80A2260(taskId, b);
+    r4 = sub_80A2260(taskId, mapObjId);
     if (r4 != 16)
     {
         if (sub_80A2370(taskId, r4) == 0)
+        {
             return TRUE;
+        }
         else
         {
-            sub_80A23C8(taskId, r4, b, c);
+            sub_80A23C8(taskId, r4, mapObjId, movementScript);
             return FALSE;
         }
     }
     r4 = sub_80A2260(taskId, 0xFF);
     if (r4 == 16)
+    {
         return TRUE;
+    }
     else
     {
-        sub_80A23C8(taskId, r4, b, c);
+        sub_80A23C8(taskId, r4, mapObjId, movementScript);
         return FALSE;
     }
 }
@@ -156,9 +160,9 @@ static bool8 sub_80A2370(u8 taskId, u8 b)
         return FALSE;
 }
 
-static void npc_obj_offscreen_culling_and_flag_update(u8 a, u8 *b)
+static void npc_obj_offscreen_culling_and_flag_update(u8 a, u8 *movementScript)
 {
-    gUnknown_020384F8[a] = b;
+    gUnknown_020384F8[a] = movementScript;
 }
 
 static u8 *sub_80A23B8(u8 a)
@@ -166,23 +170,23 @@ static u8 *sub_80A23B8(u8 a)
     return gUnknown_020384F8[a];
 }
 
-static void sub_80A23C8(u8 taskId, u8 b, u8 c, u8 *d)
+static void sub_80A23C8(u8 taskId, u8 b, u8 mapObjId, u8 *movementScript)
 {
     sub_80A2318(taskId, b);
-    npc_obj_offscreen_culling_and_flag_update(b, d);
-    sub_80A22D0(taskId, b, c);
+    npc_obj_offscreen_culling_and_flag_update(b, movementScript);
+    sub_80A22D0(taskId, b, mapObjId);
 }
 
-static void sub_80A2408(u8 a)
+static void UnfreezeObjects(u8 taskId)
 {
-    u8 *ptr;
+    u8 *pMapObjId;
     u8 i;
 
-    ptr = (u8 *)&gTasks[a].data[1];
-    for (i = 0; i < 16; i++, ptr++)
+    pMapObjId = (u8 *)&gTasks[taskId].data[1];
+    for (i = 0; i < 16; i++, pMapObjId++)
     {
-        if (*ptr != 0xFF)
-            UnfreezeMapObject(&gMapObjects[*ptr]);
+        if (*pMapObjId != 0xFF)
+            UnfreezeMapObject(&gMapObjects[*pMapObjId]);
     }
 }
 
@@ -199,23 +203,23 @@ static void Task_80A244C(u8 taskId)
     }
 }
 
-static void sub_80A2490(u8 taskId, u8 b, u8 c, u8 *d)
+static void sub_80A2490(u8 taskId, u8 b, u8 mapObjId, u8 *d)
 {
     u8 var;
 
-    if (FieldObjectIsSpecialAnimActive(&gMapObjects[c])
-     && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[c]))
+    if (FieldObjectIsSpecialAnimActive(&gMapObjects[mapObjId])
+     && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]))
         return;
 
     var = *d;
     if (var == 0xFE)
     {
         sub_80A2348(taskId, b);
-        FreezeMapObject(&gMapObjects[c]);
+        FreezeMapObject(&gMapObjects[mapObjId]);
     }
     else
     {
-        if (!FieldObjectSetSpecialAnim(&gMapObjects[c], var))
+        if (!FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], var))
         {
             d++;
             npc_obj_offscreen_culling_and_flag_update(b, d);
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index cbca07011..323df991a 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -18,7 +18,7 @@
 #include "pokedex.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script_pokemon_80C4.h"
 #include "species.h"
 #include "task.h"
@@ -511,7 +511,7 @@ void ScriptRandom(void)
     *scriptPtr = random % *scriptPtr;
 }
 
-void HealPlayerParty(void)
+void ScrSpecial_HealPlayerParty(void)
 {
     u8 i, j;
     u8 ppBonuses;
@@ -542,41 +542,39 @@ void HealPlayerParty(void)
     }
 }
 
-u8 ScriptGiveMon(u16 species, u8 var, u16 item, u32 var3, u32 var4, u8 var5)
+u8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unused1, u32 unused2, u8 unused3)
 {
-    u16 nationalSpecies;
+    u16 nationalDexNum;
     int sentToPc;
-    u8 array[2];
+    u8 heldItem[2];
     struct Pokemon mon;
 
-    CreateMon(&mon, species, var, 32, 0, 0, 0, 0);
-    array[0] = item;
-    array[1] = item >> 8;
-    SetMonData(&mon, MON_DATA_HELD_ITEM, array);
+    CreateMon(&mon, species, level, 32, 0, 0, 0, 0);
+    heldItem[0] = item;
+    heldItem[1] = item >> 8;
+    SetMonData(&mon, MON_DATA_HELD_ITEM, heldItem);
     sentToPc = GiveMonToPlayer(&mon);
-    nationalSpecies = SpeciesToNationalPokedexNum(species);
+    nationalDexNum = SpeciesToNationalPokedexNum(species);
 
-    // nested if check to fool compiler
     switch(sentToPc)
     {
-        case 0:
-        case 1:
-            GetNationalPokedexFlag(nationalSpecies, 2);
-            GetNationalPokedexFlag(nationalSpecies, 3);
-            return sentToPc;
-        default:
-            return sentToPc;
+    case 0:
+    case 1:
+        GetNationalPokedexFlag(nationalDexNum, 2);
+        GetNationalPokedexFlag(nationalDexNum, 3);
+        break;
     }
+    return sentToPc;
 }
 
-u8 ScriptGiveEgg(u16 value)
+u8 ScriptGiveEgg(u16 species)
 {
     struct Pokemon mon;
-    u8 data;
+    u8 isEgg;
 
-    sub_8042044(&mon, value, 1);
-    data = 1;
-    SetMonData(&mon, MON_DATA_IS_EGG, &data);
+    sub_8042044(&mon, species, 1);
+    isEgg = TRUE;
+    SetMonData(&mon, MON_DATA_IS_EGG, &isEgg);
 
     return GiveMonToPlayer(&mon);
 }
@@ -622,18 +620,18 @@ bool8 GetNameOfEnigmaBerryInPlayerParty(void)
     return hasItem;
 }
 
-void ScriptWildBattle(u16 species, u8 level, u16 item)
+void CreateScriptedWildMon(u16 species, u8 level, u16 item)
 {
-    u8 data[2];
+    u8 heldItem[2];
 
     ZeroEnemyPartyMons();
     CreateMon(&gEnemyParty[0], species, level, 0x20, 0, 0, 0, 0);
 
     if(item)
     {
-        data[0] = item;
-        data[1] = item >> 8;
-        SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, data);
+        heldItem[0] = item;
+        heldItem[1] = item >> 8;
+        SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, heldItem);
     }
 }
 
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index 2b48cc0d8..f930df8e2 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -9,16 +9,15 @@
 #include "party_menu.h"
 #include "pokemon.h"
 #include "pokemon_summary_screen.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "script_pokemon_80F9.h"
+#include "songs.h"
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
 
-
-
 extern u8 gPlayerPartyCount;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
@@ -59,7 +58,7 @@ void sub_80F9A4C(void)
 
 void sub_80F9A8C(u8 taskId)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
         gPaletteFade.bufferTransferDisabled = 1;
         OpenPartyMenu((u8) gTasks[taskId].data[0], 0);
@@ -69,10 +68,10 @@ void sub_80F9A8C(u8 taskId)
 
 bool8 sub_80F9ACC(void)
 {
-    switch(EWRAM_1B000.unk264)
+    switch (EWRAM_1B000.unk264)
     {
     case 0:
-        if(EWRAM_1B000.unk266 < gPlayerPartyCount)
+        if (EWRAM_1B000.unk266 < gPlayerPartyCount)
         {
             TryCreatePartyMenuMonIcon(EWRAM_1B000.unk260, EWRAM_1B000.unk266, &gPlayerParty[EWRAM_1B000.unk266]);
             EWRAM_1B000.unk266++;
@@ -92,7 +91,7 @@ bool8 sub_80F9ACC(void)
         EWRAM_1B000.unk264++;
         break;
     case 3:
-        if(sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
+        if (sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
         {
             EWRAM_1B000.unk266++;
             break;
@@ -116,7 +115,7 @@ bool8 sub_80F9ACC(void)
         EWRAM_1B000.unk264++;
         break;
     case 7: // the only case that can return true.
-        if(sub_806B58C(EWRAM_1B000.unk266) != 1)
+        if (sub_806B58C(EWRAM_1B000.unk266) != 1)
         {
             EWRAM_1B000.unk266++;
             break;
@@ -135,9 +134,9 @@ void sub_80F9C00(void)
 {
     u8 i;
 
-    for(i = 0; i < gPlayerPartyCount; i++)
+    for (i = 0; i < gPlayerPartyCount; i++)
     {
-        switch(sub_80AE47C(&gPlayerParty[i]))
+        switch (sub_80AE47C(&gPlayerParty[i]))
         {
         case 0:
         case 3:
@@ -154,18 +153,18 @@ void sub_80F9C00(void)
 
 void sub_80F9C6C(u8 var)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
-        switch(sub_806BD80(var))
+        switch (sub_806BD80(var))
         {
         case 1:
-            PlaySE(5);
+            PlaySE(SE_SELECT);
             gUnknown_02038694 = sub_806CA38(var);
             gSpecialVar_0x8004 = gUnknown_02038694;
             sub_8123138(var);
             break;
         case 2:
-            PlaySE(5);
+            PlaySE(SE_SELECT);
             gUnknown_02038694 = 0xFF;
             gSpecialVar_0x8004 = 0xFF;
             sub_8123138(var);
@@ -176,10 +175,10 @@ void sub_80F9C6C(u8 var)
 
 bool8 sub_80F9CE8(void) // this is the same function as sub_80F9ACC except case 6 calls a different function. why
 {
-    switch(EWRAM_1B000.unk264)
+    switch (EWRAM_1B000.unk264)
     {
     case 0:
-        if(EWRAM_1B000.unk266 < gPlayerPartyCount)
+        if (EWRAM_1B000.unk266 < gPlayerPartyCount)
         {
             TryCreatePartyMenuMonIcon(EWRAM_1B000.unk260, EWRAM_1B000.unk266, &gPlayerParty[EWRAM_1B000.unk266]);
             EWRAM_1B000.unk266++;
@@ -199,7 +198,7 @@ bool8 sub_80F9CE8(void) // this is the same function as sub_80F9ACC except case
         EWRAM_1B000.unk264++;
         break;
     case 3:
-        if(sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
+        if (sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
         {
             EWRAM_1B000.unk266++;
             break;
@@ -223,7 +222,7 @@ bool8 sub_80F9CE8(void) // this is the same function as sub_80F9ACC except case
         EWRAM_1B000.unk264++;
         break;
     case 7: // the only case that can return true.
-        if(sub_806B58C(EWRAM_1B000.unk266) != 1)
+        if (sub_806B58C(EWRAM_1B000.unk266) != 1)
         {
             EWRAM_1B000.unk266++;
             break;
@@ -242,9 +241,9 @@ void sub_80F9E1C(void)
 {
     u8 i;
 
-    for(i = 0; i < gPlayerPartyCount; i++)
+    for (i = 0; i < gPlayerPartyCount; i++)
     {
-        if(!sub_8040574(&gPlayerParty[i]))
+        if (!sub_8040574(&gPlayerParty[i]))
             sub_806BC3C(i, 0x9A);
         else
             sub_806BC3C(i, 0x8C);
@@ -253,18 +252,18 @@ void sub_80F9E1C(void)
 
 void sub_80F9E64(u8 var)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
-        switch(sub_806BD80(var))
+        switch (sub_806BD80(var))
         {
         case 1:
-            PlaySE(5);
+            PlaySE(SE_SELECT);
             gSpecialVar_0x8004 = sub_806CA38(var);
             gSpecialVar_0x8005 = sub_8040574(&gPlayerParty[gSpecialVar_0x8004]);
             sub_8123138(var);
             break;
         case 2:
-            PlaySE(5);
+            PlaySE(SE_SELECT);
             gSpecialVar_0x8004 = 0xFF;
             sub_8123138(var);
         }
@@ -278,23 +277,23 @@ void sub_80F9EEC(void)
     gFieldCallback = sub_8080990;
 }
 
-void sub_80F9F3C(void) // count pokemon moves
+void ScrSpecial_CountPokemonMoves(void) // count pokemon moves
 {
     u8 i;
 
     gScriptResult = 0;
 
-    for(i = 0; i < 4; i++) // checks MOVE1-MOVE4
-        if(GetMonData(&gPlayerParty[gSpecialVar_0x8004], i + 13))
+    for (i = 0; i < 4; i++) // checks MOVE1-MOVE4
+        if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_MOVE1 + i))
             gScriptResult++;
 }
 
-void sub_80F9F84(void)
+void ScrSpecial_GetPokemonNicknameAndMoveName(void)
 {
-    struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004];
-    u16 data = GetMonData(party, gSpecialVar_0x8005 + 13);
+    struct Pokemon *pkmn = &gPlayerParty[gSpecialVar_0x8004];
+    u16 data = GetMonData(pkmn, MON_DATA_MOVE1 + gSpecialVar_0x8005);
 
-    GetMonNickname(party, gStringVar1);
+    GetMonNickname(pkmn, gStringVar1);
     StringCopy(gStringVar2, gMoveNames[data]);
 }
 
@@ -431,7 +430,7 @@ void sub_80FA0DC(void)
     SetMonMoveSlot(&gPlayerParty[gSpecialVar_0x8004], 0, gSpecialVar_0x8005);
     RemoveMonPPBonus(&gPlayerParty[gSpecialVar_0x8004], gSpecialVar_0x8005);
 
-    for(i = gSpecialVar_0x8005; i < 3; i++)
+    for (i = gSpecialVar_0x8005; i < 3; i++)
         sub_80F9FDC(&gPlayerParty[gSpecialVar_0x8004], i, i + 1);
 }
 
@@ -440,6 +439,6 @@ void sub_80FA148(void)
     struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004];
     gScriptResult = 0;
 
-    if(GetMonData(party, MON_DATA_IS_EGG))
+    if (GetMonData(party, MON_DATA_IS_EGG))
         gScriptResult = 1;
 }
diff --git a/src/secret_base.c b/src/secret_base.c
index 4e8331f5c..b2cd1f094 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -14,7 +14,7 @@
 #include "metatile_behavior.h"
 #include "palette.h"
 #include "pokemon.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script.h"
 #include "string_util.h"
 #include "strings.h"
@@ -270,7 +270,7 @@ void sub_80BBAF0(void)
 
 bool8 sub_80BBB24(void)
 {
-    if (gMapHeader.mapType == 9 && VarGet(VAR_0x4097) == 0)
+    if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_0x4097) == 0)
         return FALSE;
     return TRUE;
 }
@@ -380,7 +380,7 @@ void sub_80BBDD0(void)
                 gScriptResult = gMapHeader.events->mapObjects[objid].graphicsId + 0x3f20;
                 VarSet(gScriptResult, gDecorations[roomdecor[decidx]].tiles[0]);
                 gScriptResult = gMapHeader.events->mapObjects[objid].localId;
-                FlagReset(gSpecialVar_0x8004 + 0xAE);
+                FlagClear(gSpecialVar_0x8004 + 0xAE);
                 show_sprite(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
                 sub_805C0F8(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
                 sub_805C78C(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
@@ -690,7 +690,7 @@ _080BBEDA:\n\
     adds r0, 0xAE\n\
     lsls r0, 16\n\
     lsrs r0, 16\n\
-    bl FlagReset\n\
+    bl FlagClear\n\
     ldr r3, _080BBF9C @ =gScriptResult\n\
     ldrb r0, [r3]\n\
     mov r4, r10\n\
diff --git a/src/shop.c b/src/shop.c
index 6a88f1394..22250b1c4 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -23,7 +23,7 @@
 #include "decoration.h"
 #include "items.h"
 #include "songs.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "decoration_inventory.h"
 #include "field_camera.h"
 
@@ -60,7 +60,7 @@ EWRAM_DATA u8 gUnknown_02038730 = 0;
 EWRAM_DATA u8 gUnknown_02038731 = 0;
 
 // rodata
-static const struct MenuAction2 gUnknown_083CC6D0[] =
+static const struct MenuAction2 sBuySellQuitMenuActions[] =
 {
     { MartText_Buy, sub_80B2EFC },
     { MartText_Sell, sub_80B2F30 },
@@ -88,13 +88,13 @@ u8 CreateShopMenu(u8 martType)
     {
         gMartInfo.numChoices = 2;
         MenuDrawTextWindow(0, 0, 10, 7);
-        PrintMenuItemsReordered(1, 1, 3, (struct MenuAction *)gUnknown_083CC6D0, (u8 *)gUnknown_083CC6E8);
+        PrintMenuItemsReordered(1, 1, 3, sBuySellQuitMenuActions, gUnknown_083CC6E8);
     }
     else
     {
         gMartInfo.numChoices = 1;
         MenuDrawTextWindow(0, 0, 10, 5);
-        PrintMenuItemsReordered(1, 1, 2, (struct MenuAction *)gUnknown_083CC6D0, (u8 *)gUnknown_083CC6EB);
+        PrintMenuItemsReordered(1, 1, 2, sBuySellQuitMenuActions, gUnknown_083CC6EB);
     }
     InitMenu(0, 1, 1, gMartInfo.numChoices + 1, 0, 9); // add 1 for cancel
 
@@ -145,11 +145,11 @@ void sub_80B2E38(u8 var)
         PlaySE(SE_SELECT);
         if (gMartInfo.martType == MART_TYPE_0)
         {
-            gUnknown_083CC6D0[gUnknown_083CC6E8[gMartInfo.cursor]].func(local);
+            sBuySellQuitMenuActions[gUnknown_083CC6E8[gMartInfo.cursor]].func(local);
         }
         else
         {
-            gUnknown_083CC6D0[gUnknown_083CC6EB[gMartInfo.cursor]].func(local);
+            sBuySellQuitMenuActions[gUnknown_083CC6EB[gMartInfo.cursor]].func(local);
         }
     }
     else if (gMain.newKeys & B_BUTTON)
@@ -294,7 +294,7 @@ void BuyMenuDrawGraphics(void)
     gMartInfo.cursor = zero;
     gMartInfo.choicesAbove = zero2;
     MenuZeroFillWindowRect(0, 0, 0x20, 0x20);
-    sub_80B7C14(gSaveBlock1.money, 0, 0);
+    OpenMoneyWindow(gSaveBlock1.money, 0, 0);
     sub_80B3764(0, 7);
     sub_80B37EC();
     sub_80B3270();
@@ -530,7 +530,7 @@ void sub_80B37F8(u8 taskId)
     u16 itemId = gMartInfo.itemList[itemListIndex];
     u32 price = (ItemId_GetPrice(itemId) >> GetPriceReduction(1));
 
-    sub_80B7A94(gTasks[taskId].data[1] * price, 6, 6, 11);
+    PrintMoneyAmount(gTasks[taskId].data[1] * price, 6, 6, 11);
     gStringVar1[0] = EXT_CTRL_CODE_BEGIN;
     gStringVar1[1] = 0x14;
     gStringVar1[2] = 0x6;
@@ -559,7 +559,7 @@ void sub_80B389C(u16 itemId, u8 var2, bool32 hasControlCode)
     if (hasControlCode != FALSE)
         stringPtr = &gStringVar1[3];
 
-    sub_80B79F8(stringPtr, (ItemId_GetPrice(itemId) >> GetPriceReduction(1)), 0x4);
+    GetMoneyAmountText(stringPtr, (ItemId_GetPrice(itemId) >> GetPriceReduction(1)), 0x4);
     MenuPrint_PixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 1);
 }
 
@@ -588,7 +588,7 @@ void sub_80B3930(u16 itemId, u8 var2, bool32 hasControlCode)
     }
     else
     {
-        sub_80B79F8(stringPtr, gDecorations[itemId].price, 0x4);
+        GetMoneyAmountText(stringPtr, gDecorations[itemId].price, 0x4);
         MenuPrint_PixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 0x1);
     }
 }
@@ -648,9 +648,9 @@ void sub_80B3AEC(u8 taskId)
 void sub_80B3B80(u8 taskId)
 {
     IncrementGameStat(0x26);
-    sub_80B79E0(&gSaveBlock1.money, gMartTotalCost);
+    RemoveMoney(&gSaveBlock1.money, gMartTotalCost);
     PlaySE(SE_REGI);
-    sub_80B7BEC(gSaveBlock1.money, 0, 0);
+    UpdateMoneyWindow(gSaveBlock1.money, 0, 0);
     gTasks[taskId].func = sub_80B3AEC;
 }
 
@@ -1165,7 +1165,7 @@ void Task_ExitBuyMenu(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        RemoveMoneyLabelObject(0, 0);
+        CloseMoneyWindow(0, 0);
         BuyMenuFreeMemory();
         SetMainCallback2(c2_exit_to_overworld_2_switch);
         DestroyTask(taskId);
diff --git a/src/start_menu.c b/src/start_menu.c
index 411690aff..6e44090df 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -15,7 +15,7 @@
 #include "pokedex.h"
 #include "pokemon_menu.h"
 #include "pokenav.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "safari_zone.h"
 #include "save.h"
 #include "save_menu_util.h"
@@ -505,7 +505,7 @@ static u8 RunSaveDialogCallback(void)
     return saveDialogCallback();
 }
 
-void InitSaveDialog(void)
+void ScrSpecial_DoSaveDialog(void)
 {
     sub_807160C();
     CreateTask(Task_SaveDialog, 0x50);
@@ -515,7 +515,7 @@ static void DisplaySaveMessageWithCallback(const u8 *ptr, u8 (*func)(void))
 {
     StringExpandPlaceholders(gStringVar4, ptr);
     MenuDisplayMessageBox();
-    sub_8072044(gStringVar4);
+    MenuPrintMessageDefaultCoords(gStringVar4);
     savingComplete = TRUE;
     saveDialogCallback = func;
 }
diff --git a/src/strings.c b/src/strings.c
index 219c5bec1..6c8dce9d6 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -861,7 +861,7 @@ const u8 gOtherText_AtBattleStart[] = _("At the battle’s start.");
 const u8 gOtherText_UponWinningBattle[] = _("Upon winning a battle.");
 const u8 gOtherText_UponLosingBattle[] = _("Upon losing a battle.");
 
-// mauville_old_man?
+// mauville_man?
 const u8 gOtherText_TheBardsSong[] = _("The BARD’s Song");
 const u8 gOtherText_WhatsHipHappening[] = _("What’s hip and happening?");
 const u8 gOtherText_Interview[] = _("Interview");
@@ -1781,7 +1781,7 @@ const u8 gOtherText_AtBattleStart[] = _("Zum Kampfbeginn");
 const u8 gOtherText_UponWinningBattle[] = _("Über den Sieg");
 const u8 gOtherText_UponLosingBattle[] = _("Über die Niederlage");
 
-// mauville_old_man?
+// mauville_man?
 const u8 gOtherText_TheBardsSong[] = _("Das BARDEN-Lied");
 const u8 gOtherText_WhatsHipHappening[] = _("Was ist hip? Was ist top?");
 const u8 gOtherText_Interview[] = _("Interview");
diff --git a/src/time_events.c b/src/time_events.c
index e1b9a2e9e..accb03db8 100644
--- a/src/time_events.c
+++ b/src/time_events.c
@@ -4,7 +4,7 @@
 #include "field_weather.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "script.h"
 #include "task.h"
@@ -81,13 +81,13 @@ void UpdateShoalTideFlag(void)
         1,
     };
 
-    if (is_light_level_1_2_3_5_or_6(get_map_light_from_warp0()))
+    if (is_map_type_1_2_3_5_or_6(get_map_type_from_warp0()))
     {
         RtcCalcLocalTime();
         if (tide[gLocalTime.hours])
             FlagSet(SYS_SHOAL_TIDE);
         else
-            FlagReset(SYS_SHOAL_TIDE);
+            FlagClear(SYS_SHOAL_TIDE);
     }
 }
 
diff --git a/src/trader.c b/src/trader.c
index ea06058e9..61f48fad8 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -3,6 +3,7 @@
 #include "decoration_inventory.h"
 #include "event_data.h"
 #include "main.h"
+#include "mauville_man.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "script.h"
@@ -36,7 +37,7 @@ void sub_810993C(void)
 {
     u8 i, j;
     u8 buffer[12];
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     for (i = 0; i < 3; i++)
     {
@@ -55,13 +56,13 @@ void sub_810993C(void)
     }
 }
 
-void sub_81099CC(void)
+void TraderSetup(void)
 {
     u8 i;
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
-    trader->unk0 = 2;
-    trader->unk31 = 0;
+    trader->id = MAUVILLE_MAN_TRADER;
+    trader->alreadyTraded = FALSE;
 
     for (i = 0; i < 4; i++)
     {
@@ -74,8 +75,8 @@ void sub_81099CC(void)
 
 void sub_8109A20(void)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
-    trader->unk31 = 0;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
+    trader->alreadyTraded = FALSE;
 }
 
 void sub_8109A30(u8 value)
@@ -83,12 +84,12 @@ void sub_8109A30(u8 value)
     VarSet(VAR_RECYCLE_GOODS, value);
 }
 
-void sub_8109A48(u8 taskId)
+void CreateAvailableDecorationsMenu(u8 taskId)
 {
     u8 i;
     u8 numChoices = 1;
     u8 numDecorations = 0;
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     for (i = 0; i < 4; i++)
     {
@@ -139,9 +140,9 @@ void sub_8109B34(u8 taskId, u8 decorationId)
     EnableBothScriptContexts();
 }
 
-void sub_8109B7C(u8 taskId)
+void Task_HandleGetDecorationMenuInput(u8 taskId)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     if (gMain.newKeys & DPAD_UP)
     {
@@ -174,13 +175,13 @@ void sub_8109B7C(u8 taskId)
     }
 }
 
-void sub_8109C44(void)
+void ScrSpecial_GetTraderTradedFlag(void)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
-    gScriptResult = trader->unk31;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
+    gScriptResult = trader->alreadyTraded;
 }
 
-void sub_8109C58(void)
+void ScrSpecial_DoesPlayerHaveNoDecorations(void)
 {
     u8 i;
 
@@ -195,7 +196,7 @@ void sub_8109C58(void)
     gScriptResult = TRUE;
 }
 
-void sub_8109C90(void)
+void ScrSpecial_IsDecorationFull(void)
 {
     gScriptResult = FALSE;
     if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
@@ -206,7 +207,7 @@ void sub_8109C90(void)
     }
 }
 
-void sub_8109CF0(void)
+void ScrSpecial_TraderMenuGiveDecoration(void)
 {
     CreateTask(sub_80FE7A8, 0);
 }
@@ -242,20 +243,20 @@ void sub_8109DAC(u8 taskId)
     EnableBothScriptContexts();
 }
 
-void sub_8109DE0(void)
+void ScrSpecial_TraderDoDecorationTrade(void)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     sub_81340A8(gSpecialVar_0x8006);
     IsThereStorageSpaceForDecoration(gSpecialVar_0x8004);
     StringCopy(trader->unk5[gSpecialVar_0x8005], gSaveBlock2.playerName);
     trader->unk1[gSpecialVar_0x8005] = gSpecialVar_0x8006;
     sub_810993C();
-    trader->unk31 = 1;
+    trader->alreadyTraded = TRUE;
 }
 
-void sub_8109E34(void)
+void ScrSpecial_TraderMenuGetDecoration(void)
 {
-    u8 taskId = CreateTask(sub_8109B7C, 0);
-    sub_8109A48(taskId);
+    u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0);
+    CreateAvailableDecorationsMenu(taskId);
 }
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 626c5a7bf..bcb62ede6 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -10,7 +10,7 @@
 #include "money.h"
 #include "palette.h"
 #include "pokedex.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "script_pokemon_80C4.h"
 #include "songs.h"
 #include "sound.h"
@@ -509,7 +509,7 @@ static void sub_8093688(void)
     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]);
+        EasyChat_GetWordText(ewram0.var_20[i], ewram0.var_64.var_28[i]);
     sub_80936D4();
 }
 
diff --git a/src/trainer_see.c b/src/trainer_see.c
index feb35c67c..5a8ebbafc 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -9,113 +9,132 @@
 #include "task.h"
 #include "util.h"
 
-extern bool8 (*gIsTrainerInRange[])(struct MapObject *, u16, s16, s16);
-extern bool8 (*gTrainerSeeFuncList[])(u8, struct Task *, struct MapObject *);
-extern bool8 (*gTrainerSeeFuncList2[])(u8, struct Task *, struct MapObject *);
+const u8 gSpriteImage_839B308[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/0.4bpp");
+const u8 gSpriteImage_839B388[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/1.4bpp");
+const u8 gSpriteImage_839B408[] = INCBIN_U8("graphics/unknown_sprites/839B408.4bpp");
+
+u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+
+static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *, s16, s16, s16) =
+{
+    GetTrainerApproachDistanceSouth,
+    GetTrainerApproachDistanceNorth,
+    GetTrainerApproachDistanceWest,
+    GetTrainerApproachDistanceEast,
+};
 
 extern struct SpriteTemplate gSpriteTemplate_839B510;
 extern struct SpriteTemplate gSpriteTemplate_839B528;
 
 bool8 CheckTrainers(void)
 {
-    u8 i;
+    u8 mapObjId;
 
-    for (i = 0; i < 16; i++)
+    for (mapObjId = 0; mapObjId < 16; mapObjId++)
     {
-        if ( gMapObjects[i].active )
-            if ( gMapObjects[i].trainerType == 1 ||  gMapObjects[i].trainerType == 3 )
-                if ( CheckTrainer(i) )
-                    return TRUE;
+        if (gMapObjects[mapObjId].active
+         && (gMapObjects[mapObjId].trainerType == 1 ||  gMapObjects[mapObjId].trainerType == 3)
+         && CheckTrainer(mapObjId))
+            return TRUE;
     }
     return FALSE;
 }
 
-bool8 CheckTrainer(u8 trainer)
+bool8 CheckTrainer(u8 mapObjId)
 {
-   u8 *scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(trainer);
+    u8 *scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(mapObjId);
 
-   if (GetTrainerFlagFromScriptPointer(scriptPtr))
-       return FALSE;
-   else
-   {
-       struct MapObject *trainerObj = &gMapObjects[trainer];
-       u8 canApproach = TrainerCanApproachPlayer(trainerObj);
+    if (GetTrainerFlagFromScriptPointer(scriptPtr))
+    {
+        return FALSE;
+    }
+    else
+    {
+        struct MapObject *trainerObj = &gMapObjects[mapObjId];
+        bool8 canApproach = TrainerCanApproachPlayer(trainerObj);
 
-       if (canApproach != 0)
+        if (canApproach)
         {
-           TrainerWantsBattle(trainer, scriptPtr);
-           sub_80842C8(trainerObj, (canApproach - 1));
-           return TRUE;
+            TrainerWantsBattle(mapObjId, scriptPtr);
+            sub_80842C8(trainerObj, (canApproach - 1));
+            return TRUE;
         }
-       else
-       {
-           return FALSE;
-       }
-   }
+        else
+        {
+            return FALSE;
+        }
+    }
 }
 
 bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj)
 {
     s16 x, y;
     u8 i;
-    u8 playerCoord;
+    u8 approachDistance;
 
     PlayerGetDestCoords(&x, &y);
-    if ( trainerObj->trainerType == 1 ) // trainers that don't spin
+    if (trainerObj->trainerType == 1)  // can only see in one direction
     {
-        playerCoord = gIsTrainerInRange[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-        return CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, playerCoord, trainerObj->mapobj_unk_18);
+        approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
+        return CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, approachDistance, trainerObj->mapobj_unk_18);
     }
-    else // spinners
+    else  // can see in all directions
     {
         for (i = 0; i < 4; i++)
         {
-            playerCoord = gIsTrainerInRange[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-            if ( CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, playerCoord, i + 1) ) // directions are 1-4 instead of 0-3. south north west east
-                return playerCoord;
+            approachDistance = sDirectionalApproachDistanceFuncs[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
+            if (CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, approachDistance, i + 1)) // directions are 1-4 instead of 0-3. south north west east
+                return approachDistance;
         }
-        return FALSE;
     }
+    return FALSE;
 }
 
-bool8 IsTrainerInRangeSouth(struct MapObject *trainerObj, s16 vision, s16 x, s16 y)
+// Returns how far south the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if ( trainerObj->coords2.x == x
-        && y > trainerObj->coords2.y
-        && y <= trainerObj->coords2.y + vision )
+    if (trainerObj->coords2.x == x
+     && y > trainerObj->coords2.y
+     && y <= trainerObj->coords2.y + range)
         return (y - trainerObj->coords2.y);
     else
-        return FALSE;
+        return 0;
 }
 
-bool8 IsTrainerInRangeNorth(struct MapObject *trainerObj, s16 vision, s16 x, s16 y)
+// Returns how far north the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if ( trainerObj->coords2.x == x
-        && y < trainerObj->coords2.y
-        && y >= trainerObj->coords2.y - vision )
+    if (trainerObj->coords2.x == x
+     && y < trainerObj->coords2.y
+     && y >= trainerObj->coords2.y - range)
         return (trainerObj->coords2.y - y);
     else
-        return FALSE;
+        return 0;
 }
 
-bool8 IsTrainerInRangeWest(struct MapObject *trainerObj, s16 vision, s16 x, s16 y)
+// Returns how far west the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if ( trainerObj->coords2.y == y
-        && x < trainerObj->coords2.x
-        && x >= trainerObj->coords2.x - vision )
+    if (trainerObj->coords2.y == y
+     && x < trainerObj->coords2.x
+     && x >= trainerObj->coords2.x - range)
         return (trainerObj->coords2.x - x);
     else
-        return FALSE;
+        return 0;
 }
 
-bool8 IsTrainerInRangeEast(struct MapObject *trainerObj, s16 vision, s16 x, s16 y)
+// Returns how far east the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
-    if ( trainerObj->coords2.y == y
-        && x > trainerObj->coords2.x
-        && x <= trainerObj->coords2.x + vision )
+    if (trainerObj->coords2.y == y
+     && x > trainerObj->coords2.x
+     && x <= trainerObj->coords2.x + range)
         return (x - trainerObj->coords2.x);
     else
-        return FALSE;
+        return 0;
 }
 
 #ifdef BUGFIX_TRAINERAPPROACH
@@ -124,25 +143,24 @@ bool8 IsTrainerInRangeEast(struct MapObject *trainerObj, s16 vision, s16 x, s16
 #define COLLISION_MASK 1
 #endif
 
-bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 playerCoord, u8 direction)
+bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 approachDistance, u8 direction)
 {
     s16 x, y;
     u8 unk19_temp;
     u8 unk19b_temp;
     u8 i;
-    u8 var;
+    u8 collision;
 
-    if (!playerCoord)
+    if (approachDistance == 0)
         return FALSE;
 
     x = trainerObj->coords2.x;
     y = trainerObj->coords2.y;
 
-    for (i = 0; i <= playerCoord - 1; i++, MoveCoords(direction, &x, &y))
+    for (i = 0; i <= approachDistance - 1; i++, MoveCoords(direction, &x, &y))
     {
-        var = sub_8060024((struct MapObject *)trainerObj, x, y, direction);
-
-        if (var && (var & COLLISION_MASK))
+        collision = sub_8060024((struct MapObject *)trainerObj, x, y, direction);
+        if (collision != 0 && (collision & COLLISION_MASK))
             return FALSE;
     }
 
@@ -152,176 +170,212 @@ bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 playerC
     trainerObj->mapobj_unk_19 = 0;
     trainerObj->mapobj_unk_19b = 0;
 
-    var = npc_block_way((struct MapObject *)trainerObj, x, y, direction);
+    collision = npc_block_way((struct MapObject *)trainerObj, x, y, direction);
 
     trainerObj->mapobj_unk_19 = unk19_temp;
     trainerObj->mapobj_unk_19b = unk19b_temp;
-    if (var == 4)
-        return playerCoord;
+    if (collision == 4)
+        return approachDistance;
 
     return FALSE;
 }
 
-void sub_80842C8(struct MapObject *trainerObj, u8 taskId)
+#define tTrainerObjHi   data[1]
+#define tTrainerObjLo   data[2]
+
+void sub_80842C8(struct MapObject *trainerObj, u8 b)
 {
-    struct Task *task = &gTasks[CreateTask(RunTrainerSeeFuncList, 0x50)];
+    u8 taskId = CreateTask(RunTrainerSeeFuncList, 0x50);
+    struct Task *task = &gTasks[taskId];
 
-    task->data[1] = (u32)(trainerObj) >> 16;
-    task->data[2] = (u32)(trainerObj);
-    task->data[3] = taskId;
+    task->tTrainerObjHi = (u32)(trainerObj) >> 16;
+    task->tTrainerObjLo = (u32)(trainerObj);
+    task->data[3] = b;
 }
 
-void sub_80842FC(TaskFunc func)
+void sub_80842FC(TaskFunc followupFunc)
 {
-    TaskFunc func2 = RunTrainerSeeFuncList;
-    u8 taskId = FindTaskIdByFunc(func2);
+    TaskFunc taskFunc = RunTrainerSeeFuncList;
+    u8 taskId = FindTaskIdByFunc(taskFunc);
 
-    SetTaskFuncWithFollowupFunc(taskId, RunTrainerSeeFuncList, func);
+    SetTaskFuncWithFollowupFunc(taskId, taskFunc, followupFunc);
     gTasks[taskId].data[0] = 1;
-    func2(taskId);
-}
+    taskFunc(taskId);
+}
+
+static bool8 sub_8084394(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+
+static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+{
+    sub_8084394,
+    sub_8084398,
+    sub_80843DC,
+    sub_808441C,
+    sub_8084478,
+    sub_8084534,
+    sub_8084578,
+    sub_80845AC,
+    sub_80845C8,
+    sub_80845FC,
+    sub_8084654,
+    sub_80846C8,
+};
 
 void RunTrainerSeeFuncList(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    struct MapObject *trainerObj = (struct MapObject *)((task->data[1] << 16) | (task->data[2]));
+    struct MapObject *trainerObj = (struct MapObject *)((task->tTrainerObjHi << 16) | (task->tTrainerObjLo));
 
     if (!trainerObj->active)
+    {
         SwitchTaskToFollowupFunc(taskId);
+    }
     else
-        while (gTrainerSeeFuncList[task->data[0]](taskId, task, trainerObj));
+    {
+        while (gTrainerSeeFuncList[task->data[0]](taskId, task, trainerObj))
+            ;
+    }
 }
 
-u8 sub_8084394() // cant be void because it is called with RunTrainerSeeFuncList with arguments.
+static bool8 sub_8084394(u8 taskId, struct Task *task, struct MapObject *trainerObj) // cant be void because it is called with RunTrainerSeeFuncList with arguments.
 {
-    return 0;
+    return FALSE;
 }
 
-s8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     u8 direction;
 
-    FieldObjectGetLocalIdAndMap(trainerObj, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
-    FieldEffectStart(0);
-
+    FieldObjectGetLocalIdAndMap(trainerObj, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
     direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
-
     FieldObjectSetSpecialAnim(trainerObj, direction);
     task->data[0]++;
-    return 1;
+    return TRUE;
 }
 
-s8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (FieldEffectActiveListContains(0))
-        return 0;
+    {
+        return FALSE;
+    }
     else
     {
         task->data[0]++;
-        if ((u8)(trainerObj->animPattern - 57) <= 1)
+        if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58)
             task->data[0] = 6;
         if (trainerObj->animPattern == 63)
             task->data[0] = 8;
-        return 1;
+        return TRUE;
     }
 }
 
-s8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
-            if (task->data[3])
-            {
-                FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18));
-                task->data[3]--;
-            }
-            else
-            {
-                FieldObjectSetSpecialAnim(trainerObj, 0x3E);
-                task->data[0]++;
-            }
+        if (task->data[3])
+        {
+            FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18));
+            task->data[3]--;
+        }
+        else
+        {
+            FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+            task->data[0]++;
+        }
     }
-    return 0;
+    return FALSE;
 }
 
-s8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     struct MapObject *playerObj;
 
     if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
-        return 0;
+        return FALSE;
 
     npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
     sub_805C774(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
     sub_805C754(trainerObj);
 
     playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
-     && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
-        return 0;
+    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+        return FALSE;
 
     sub_80597E8();
     FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18)));
     task->data[0]++;
-    return 0;
+    return FALSE;
 }
 
-s8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainerObj) // technically only 1 parameter, but needs all 3 for TrainerSeeFuncList call.
+static bool8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainerObj) // technically only 1 parameter, but needs all 3 for TrainerSeeFuncList call.
 {
     struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
 
-    if ( !FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
-        || FieldObjectClearAnimIfSpecialAnimFinished(playerObj) )
-    SwitchTaskToFollowupFunc(taskId);
-
-    return 0;
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+        SwitchTaskToFollowupFunc(taskId);
+    return FALSE;
 }
 
-s8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
-        || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
         FieldObjectSetSpecialAnim(trainerObj, 0x59);
         task->data[0]++;
     }
-    return 0;
+    return FALSE;
 }
 
-s8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
-    if ( FieldObjectClearAnimIfSpecialAnimFinished(trainerObj) )
+    if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
         task->data[0] = 3;
 
-    return 0;
+    return FALSE;
 }
 
-s8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
-        || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
         FieldObjectSetSpecialAnim(trainerObj, 0x3E);
         task->data[0]++;
     }
-    return 0;
+    return FALSE;
 }
 
-s8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj))
     {
-        gUnknown_0202FF84[0] = trainerObj->coords2.x;
-        gUnknown_0202FF84[1] = trainerObj->coords2.y;
-        gUnknown_0202FF84[2] = gSprites[trainerObj->spriteId].subpriority - 1;
-        gUnknown_0202FF84[3] = 2;
-        task->data[4] = FieldEffectStart(49);
+        gFieldEffectArguments[0] = trainerObj->coords2.x;
+        gFieldEffectArguments[1] = trainerObj->coords2.y;
+        gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1;
+        gFieldEffectArguments[3] = 2;
+        task->data[4] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
         task->data[0]++;
     }
-    return 0;
+    return FALSE;
 }
 
-s8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     struct Sprite *sprite;
 
@@ -336,17 +390,25 @@ s8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj)
         FieldObjectSetSpecialAnim(trainerObj, sub_806084C(trainerObj->mapobj_unk_18));
         task->data[0]++;
     }
-    return 0;
+    return FALSE;
 }
 
-s8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!FieldEffectActiveListContains(49))
         task->data[0] = 3;
 
-    return 0;
+    return FALSE;
 }
 
+static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct MapObject *) =
+{
+    sub_80845C8,
+    sub_80845FC,
+    sub_8084654,
+    sub_80846C8,
+};
+
 void sub_80846E4(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
@@ -375,12 +437,14 @@ void sub_8084794(struct MapObject *var)
     StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80846E4, 0)].data[1], (u32)var);
 }
 
-void sub_80847C8(void)
+static void Task_DestroyTrainerApproachTask(u8);
+
+void ScrSpecial_EndTrainerApproach(void)
 {
-    sub_80842FC(sub_80847D8);
+    sub_80842FC(Task_DestroyTrainerApproachTask);
 }
 
-void sub_80847D8(u8 taskId)
+static void Task_DestroyTrainerApproachTask(u8 taskId)
 {
     DestroyTask(taskId);
     EnableBothScriptContexts();
@@ -421,9 +485,9 @@ void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3)
     sprite->oam.priority = 1;
     sprite->coordOffsetEnabled = 1;
 
-    sprite->data0 = gUnknown_0202FF84[0];
-    sprite->data1 = gUnknown_0202FF84[1];
-    sprite->data2 = gUnknown_0202FF84[2];
+    sprite->data0 = gFieldEffectArguments[0];
+    sprite->data1 = gFieldEffectArguments[1];
+    sprite->data2 = gFieldEffectArguments[2];
     sprite->data3 = -5;
     sprite->data7 = a2;
 
diff --git a/src/tv.c b/src/tv.c
index a254bcd5f..734cbad6f 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -15,7 +15,7 @@
 #include "species.h"
 #include "pokedex.h"
 #include "naming_screen.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "map_constants.h"
 #include "strings.h"
 #include "battle.h"
@@ -31,7 +31,7 @@
 #include "pokedex.h"
 #include "region_map.h"
 #include "rng.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rtc.h"
 #include "script_menu.h"
 #include "species.h"
@@ -235,7 +235,7 @@ void UpdateTVScreensOnMap(int width, int height)
         }
         else if (FlagGet(SYS_TV_START) && (sub_80BD8B8() != 0xff || sub_80BECA0() != 0xff || IsTVShowInSearchOfTrainersAiring()))
         {
-            FlagReset(SYS_TV_WATCH);
+            FlagClear(SYS_TV_WATCH);
             SetTVMetatilesOnMap(width, height, 0x3);
         }
         break;
@@ -388,7 +388,7 @@ bool8 GabbyAndTyGetLastQuote(void)
     if (gSaveBlock1.gabbyAndTyData.quote == 0xffff)
         return FALSE;
 
-    sub_80EB3FC(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
+    EasyChat_GetWordText(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
     gSaveBlock1.gabbyAndTyData.quote |= 0xffff;
     return TRUE;
 }
@@ -942,7 +942,6 @@ void sub_80BE97C(bool8 flag)
 
 void sub_80BE9D4(void)
 {
-    //TVShow *show;
     gUnknown_03005D38.var0 = sub_80BF74C(gSaveBlock1.tvShows);
     if (gUnknown_03005D38.var0 != -1 && sub_80BF1B4(TVSHOW_FISHING_ADVICE) != 1)
     {
@@ -1624,7 +1623,7 @@ void sub_80BF79C(TVShow *arg0)
             break;
         i++;
     }
-    sub_80EB3FC(gStringVar3, arg0->recentHappenings.var04[i]);
+    EasyChat_GetWordText(gStringVar3, arg0->recentHappenings.var04[i]);
 }
 
 u8 sub_80BF7E8(struct TVShowNameRaterShow *arg0)
@@ -2575,20 +2574,20 @@ void DoTVShowBravoTrainerPokemonProfile(void)
         break;
     case 3:
         TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language);
-        sub_80EB3FC(gStringVar2, bravoTrainer->var04[0]);
+        EasyChat_GetWordText(gStringVar2, bravoTrainer->var04[0]);
         sub_80BF088(2, bravoTrainer->contestResult + 1);
         gUnknown_020387E8 = 5;
         break;
     case 4:
         TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language);
-        sub_80EB3FC(gStringVar2, bravoTrainer->var04[0]);
+        EasyChat_GetWordText(gStringVar2, bravoTrainer->var04[0]);
         sub_80BF088(2, bravoTrainer->contestResult + 1);
         gUnknown_020387E8 = 5;
         break;
     case 5:
         TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language);
         CopyContestCategoryToStringVar(1, bravoTrainer->contestCategory);
-        sub_80EB3FC(gStringVar3, bravoTrainer->var04[1]);
+        EasyChat_GetWordText(gStringVar3, bravoTrainer->var04[1]);
         if (bravoTrainer->var14)
             gUnknown_020387E8 = 6;
         else
@@ -2597,7 +2596,7 @@ void DoTVShowBravoTrainerPokemonProfile(void)
     case 6:
         StringCopy(gStringVar1, gSpeciesNames[bravoTrainer->species]);
         StringCopy(gStringVar2, gMoveNames[bravoTrainer->var14]);
-        sub_80EB3FC(gStringVar3, bravoTrainer->var04[1]);
+        EasyChat_GetWordText(gStringVar3, bravoTrainer->var04[1]);
         gUnknown_020387E8 = 7;
         break;
     case 7:
@@ -2680,7 +2679,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
         gUnknown_020387E8 = 11;
         break;
     case 11:
-        sub_80EB3FC(gStringVar1, bravoTrainerTower->var18[0]);
+        EasyChat_GetWordText(gStringVar1, bravoTrainerTower->var18[0]);
         if (bravoTrainerTower->var1b == 0)
             gUnknown_020387E8 = 12;
         else
@@ -2688,7 +2687,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
         break;
     case 12:
     case 13:
-        sub_80EB3FC(gStringVar1, bravoTrainerTower->var18[0]);
+        EasyChat_GetWordText(gStringVar1, bravoTrainerTower->var18[0]);
         TVShowConvertInternationalString(gStringVar2, bravoTrainerTower->trainerName, bravoTrainerTower->language);
         TVShowConvertInternationalString(gStringVar3, bravoTrainerTower->pokemonName, bravoTrainerTower->language);
         gUnknown_020387E8 = 14;
@@ -3106,12 +3105,12 @@ void DoTVShowPokemonFanClubOpinions(void)
     case 3:
         TVShowConvertInternationalString(gStringVar1, fanclubOpinions->playerName, fanclubOpinions->language);
         StringCopy(gStringVar2, gSpeciesNames[fanclubOpinions->var02]);
-        sub_80EB3FC(gStringVar3, fanclubOpinions->var1C[0]);
+        EasyChat_GetWordText(gStringVar3, fanclubOpinions->var1C[0]);
         gUnknown_020387E8 = 4;
         break;
     case 4:
         TVShowConvertInternationalString(gStringVar1, fanclubOpinions->playerName, fanclubOpinions->language);
-        sub_80EB3FC(gStringVar3, fanclubOpinions->var1C[1]);
+        EasyChat_GetWordText(gStringVar3, fanclubOpinions->var1C[1]);
         TVShowDone();
         break;
     }
@@ -3176,7 +3175,7 @@ void DoTVShowInSearchOfTrainers(void)
         gUnknown_020387E8 = 8;
         break;
     case 8:
-        sub_80EB3FC(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
+        EasyChat_GetWordText(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
         StringCopy(gStringVar2, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon1]);
         StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon2]);
         gScriptResult = 1;
diff --git a/src/unknown_task.c b/src/unknown_task.c
index 81b89ef92..5ec7fa6bc 100644
--- a/src/unknown_task.c
+++ b/src/unknown_task.c
@@ -2,11 +2,12 @@
 #include "data2.h"
 #include "task.h"
 #include "trig.h"
+#include "unknown_task.h"
 
 struct UnknownStruct1
 {
     void *src[2];
-    void *dest;
+    volatile void *dest;
     u32 unkC;
     void (*unk10)(void);
     u8 srcBank;
@@ -17,14 +18,6 @@ struct UnknownStruct1
     u8 filler19[0x7];
 };
 
-struct UnknownStruct2
-{
-    void *dest;
-    u32 control;
-    u8 unk8;
-    u8 unk9;
-};
-
 static void sub_80896F4(void);
 static void sub_8089714(void);
 
@@ -68,7 +61,7 @@ void dp12_8087EA4(void)
     gUnknown_03004DC0.taskId = 0xFF;
 }
 
-void sub_80895F8(struct UnknownStruct2 unk)
+void sub_80895F8(struct UnknownTaskStruct unk)
 {
     if (unk.control == (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1))
     {
@@ -214,7 +207,7 @@ u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7)
 {
     int i;
     int offset;
-    struct UnknownStruct2 unk;
+    struct UnknownTaskStruct unk;
     u8 taskId;
 
     dp12_8087EA4();
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 0c8f59959..be3003680 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -5,7 +5,7 @@
 
 #include "global.h"
 #include "main.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "string_util.h"
 #include "strings.h"
 #include "sprite.h"
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 7001c2eaa..390898917 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -5,11 +5,12 @@
 #include "event_data.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
+#include "map_constants.h"
 #include "metatile_behavior.h"
 #include "pokeblock.h"
 #include "rng.h"
 #include "roamer.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "safari_zone.h"
 #include "script.h"
 #include "species.h"
@@ -2901,7 +2902,7 @@ const struct WildPokemonInfo Underwater2_WaterMonsInfo = {4, Underwater2_WaterMo
 extern u16 gRoute119WaterTileData[];
 extern u16 gScriptResult;
 extern struct WildPokemon gWildFeebasRoute119Data;
-extern u8 Event_RepelWoreOff[];
+extern u8 S_RepelWoreOff[];
 
 EWRAM_DATA static u8 sWildEncountersDisabled = 0;
 EWRAM_DATA static u32 sFeebasRngValue = 0;
@@ -2911,7 +2912,7 @@ EWRAM_DATA static u32 sFeebasRngValue = 0;
 static u16 FeebasRandom(void);
 static void FeebasSeedRng(u16 seed);
 
-static bool8 RepelCheck(u8 level);
+static bool8 IsWildLevelAllowedByRepel(u8 level);
 static void ApplyFluteEncounterRateMod(u32 *encRate);
 static void ApplyCleanseTagEncounterRateMod(u32 *encRate);
 
@@ -2952,7 +2953,8 @@ static bool8 CheckFeebas(void)
     u8 route119section = 0;
     u16 waterTileNum;
 
-    if (gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 0x22)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE119
+     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE119)
     {
         GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
         x -= 7;
@@ -3193,7 +3195,7 @@ static bool8 GenerateWildMon(struct WildPokemonInfo *wildMonInfo, u8 area, bool8
         break;
     }
     level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]);
-    if (checkRepel == TRUE && RepelCheck(level) == FALSE)
+    if (checkRepel == TRUE && IsWildLevelAllowedByRepel(level) == FALSE)
         return FALSE;
     else
     {
@@ -3215,7 +3217,7 @@ static bool8 SetUpMassOutbreakEncounter(bool8 checkRepel)
 {
     u16 i;
 
-    if (checkRepel == TRUE && RepelCheck(gSaveBlock1.outbreakPokemonLevel) == 0)
+    if (checkRepel == TRUE && IsWildLevelAllowedByRepel(gSaveBlock1.outbreakPokemonLevel) == FALSE)
         return FALSE;
     else
     {
@@ -3302,9 +3304,9 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                         if (TryStartRoamerEncounter() == TRUE)
                         {
                             roamer = &gSaveBlock1.roamer;
-                            if (RepelCheck(roamer->level))
+                            if (IsWildLevelAllowedByRepel(roamer->level))
                             {
-                                StartBattle_Roamer();
+                                BattleSetup_StartRoamerBattle();
                                 return 1;
                             }
                         }
@@ -3312,7 +3314,7 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                         {
                             if (DoMassOutbreakEncounterTest() == TRUE && SetUpMassOutbreakEncounter(1) == TRUE)
                             {
-                                CheckForSafariZoneAndProceed();
+                                BattleSetup_StartWildBattle();
                                 return 1;
                             }
                             if (GenerateWildMon(gWildMonHeaders[headerNum].landMonsInfo, 0, TRUE) == TRUE)
@@ -3336,9 +3338,9 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                         if (TryStartRoamerEncounter() == TRUE)
                         {
                             roamer = &gSaveBlock1.roamer;
-                            if (RepelCheck(roamer->level))
+                            if (IsWildLevelAllowedByRepel(roamer->level))
                             {
-                                StartBattle_Roamer();
+                                BattleSetup_StartRoamerBattle();
                                 return 1;
                             }
                         }
@@ -3349,7 +3351,7 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                             {
                             label:
                                 //_0808527A
-                                CheckForSafariZoneAndProceed();
+                                BattleSetup_StartWildBattle();
                                 return 1;
                             }
                         }
@@ -3361,7 +3363,7 @@ bool8 StandardWildEncounter(u16 a, u16 b)
     return 0;
 }
 
-void RockSmashWildEncounter(void)
+void ScrSpecial_RockSmashWildEncounter(void)
 {
     u16 headerNum = GetCurrentMapWildMonHeader();
 
@@ -3377,7 +3379,7 @@ void RockSmashWildEncounter(void)
         else if (DoWildEncounterTest(wildPokemonInfo->encounterRate, 1) == TRUE
          && GenerateWildMon(wildPokemonInfo, 2, TRUE) == TRUE)
         {
-            CheckForSafariZoneAndProceed();
+            BattleSetup_StartWildBattle();
             gScriptResult = 1;
             return;
         }
@@ -3403,14 +3405,14 @@ bool8 SweetScentWildEncounter(void)
                 return FALSE;
             if (TryStartRoamerEncounter() == TRUE)
             {
-                StartBattle_Roamer();
+                BattleSetup_StartRoamerBattle();
                 return TRUE;
             }
             if (DoMassOutbreakEncounterTest() == TRUE)
-                SetUpMassOutbreakEncounter(0);
+                SetUpMassOutbreakEncounter(FALSE);
             else
                 GenerateWildMon(wildPokemonInfo, 0, FALSE);
-            CheckForSafariZoneAndProceed();
+            BattleSetup_StartWildBattle();
             return TRUE;
         }
         else if (MetatileBehavior_IsWaterWildEncounter(MapGridGetMetatileBehaviorAt(x, y)) == 1)
@@ -3420,18 +3422,18 @@ bool8 SweetScentWildEncounter(void)
                 return FALSE;
             if (TryStartRoamerEncounter() == TRUE)
             {
-                StartBattle_Roamer();
+                BattleSetup_StartRoamerBattle();
                 return TRUE;
             }
             GenerateWildMon(wildPokemonInfo, 1, FALSE);
-            CheckForSafariZoneAndProceed();
+            BattleSetup_StartWildBattle();
             return TRUE;
         }
     }
     return FALSE;
 }
 
-bool8 GetFishingWildMonListHeader(void)
+bool8 DoesCurrentMapHaveFishingMons(void)
 {
     u16 headerNum = GetCurrentMapWildMonHeader();
 
@@ -3460,7 +3462,7 @@ void FishingWildEncounter(u8 rod)
     }
     IncrementGameStat(12);
     sub_80BEA50(species);
-    CheckForSafariZoneAndProceed();
+    BattleSetup_StartWildBattle();
 }
 
 u16 GetLocalWildMon(bool8 *isWaterMon)
@@ -3497,7 +3499,7 @@ u16 GetLocalWildMon(bool8 *isWaterMon)
     }
 }
 
-u16 GetMirageIslandMon(void)
+u16 GetLocalWaterMon(void)
 {
     u16 headerNum = GetCurrentMapWildMonHeader();
 
@@ -3521,20 +3523,21 @@ bool8 UpdateRepelCounter(void)
         VarSet(VAR_REPEL_STEP_COUNT, steps);
         if (steps == 0)
         {
-            ScriptContext1_SetupScript(Event_RepelWoreOff);
+            ScriptContext1_SetupScript(S_RepelWoreOff);
             return TRUE;
         }
     }
     return FALSE;
 }
 
-//Returns FALSE if Repel prevents wild Pokemon at the specified level from appearing
-static bool8 RepelCheck(u8 level)
+static bool8 IsWildLevelAllowedByRepel(u8 wildLevel)
 {
     u8 i;
 
     if (!VarGet(VAR_REPEL_STEP_COUNT))
+    {
         return TRUE;
+    }
     else
     {
         for (i = 0; i < 6; i++)
@@ -3542,7 +3545,9 @@ static bool8 RepelCheck(u8 level)
             // UB: Too few arguments for function 'GetMonData'
             if (GetMonData(&gPlayerParty[i], MON_DATA_HP) && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
             {
-                if (level < (u8)GetMonData(&gPlayerParty[i], MON_DATA_LEVEL))
+                u8 ourLevel = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
+
+                if (wildLevel < ourLevel)
                     return FALSE;
                 else
                     return TRUE;