merge

49 files changed, 4113 insertions, 1325 deletions

diff --git a/src/field/berry.c b/src/field/berry.c
index fa15672e7..d82eab2a6 100644
--- a/src/field/berry.c
+++ b/src/field/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/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index a965f386c..1413a02ca 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/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/field/bike.c b/src/field/bike.c
index 58a4f38f4..80cab0850 100644
--- a/src/field/bike.c
+++ b/src/field/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/field/braille_puzzles.c b/src/field/braille_puzzles.c
index b8d7cd386..b11b1ff3a 100644
--- a/src/field/braille_puzzles.c
+++ b/src/field/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/field/choose_party.c b/src/field/choose_party.c
index 27181cf74..9cdf63fc8 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -9,7 +9,7 @@
 #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"
diff --git a/src/field/decoration.c b/src/field/decoration.c
index dde364069..065afbfb6 100644
--- a/src/field/decoration.c
+++ b/src/field/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/field/diploma.c b/src/field/diploma.c
index ba7de58aa..27601404c 100644
--- a/src/field/diploma.c
+++ b/src/field/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/field/event_data.c b/src/field/event_data.c
index 0484bae02..ee475343f 100644
--- a/src/field/event_data.c
+++ b/src/field/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/field/field_control_avatar.c b/src/field/field_control_avatar.c
index a8f6b6b9b..ff8e8504c 100644
--- a/src/field/field_control_avatar.c
+++ b/src/field/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/field_door.c b/src/field/field_door.c
index 791ed4c94..ab46f0696 100644
--- a/src/field/field_door.c
+++ b/src/field/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/field_effect.c b/src/field/field_effect.c
index cffed2614..0625e9d18 100644
--- a/src/field/field_effect.c
+++ b/src/field/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/field_fadetransition.c b/src/field/field_fadetransition.c
index e614d899a..d95177821 100644
--- a/src/field/field_fadetransition.c
+++ b/src/field/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/field_ground_effect.c b/src/field/field_ground_effect.c
index b9935463b..2a398ba22 100644
--- a/src/field/field_ground_effect.c
+++ b/src/field/field_ground_effect.c
@@ -460,18 +460,18 @@ void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *spri
 {
     u8 *ptr;
 
-    gUnknown_0202FF84[0] = mapObj->coords2.x;
-    gUnknown_0202FF84[1] = mapObj->coords2.y;
-    gUnknown_0202FF84[2] = mapObj->elevation;
-    gUnknown_0202FF84[3] = 2;
-    gUnknown_0202FF84[4] = (mapObj->localId << 8) | mapObj->mapNum;
-    gUnknown_0202FF84[5] = mapObj->mapGroup;
+    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;
-    gUnknown_0202FF84[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
                          | (u8)gSaveBlock1.location.mapGroup;
 
-    gUnknown_0202FF84[7] = 1;
+    gFieldEffectArguments[7] = 1;
     FieldEffectStart(4);
 }
 
@@ -479,18 +479,18 @@ void sub_8063E94(struct MapObject *mapObj, struct Sprite *sprite)
 {
     u8 *ptr;
 
-    gUnknown_0202FF84[0] = mapObj->coords2.x;
-    gUnknown_0202FF84[1] = mapObj->coords2.y;
-    gUnknown_0202FF84[2] = mapObj->elevation;
-    gUnknown_0202FF84[3] = 2;
-    gUnknown_0202FF84[4] = (mapObj->localId << 8) | mapObj->mapNum;
-    gUnknown_0202FF84[5] = mapObj->mapGroup;
+    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;
-    gUnknown_0202FF84[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
                          | (u8)gSaveBlock1.location.mapGroup;
 
-    gUnknown_0202FF84[7] = 0;
+    gFieldEffectArguments[7] = 0;
     FieldEffectStart(4);
 }
 
@@ -498,18 +498,18 @@ void sub_8063EE0(struct MapObject *mapObj, struct Sprite *sprite)
 {
     u8 *ptr;
 
-    gUnknown_0202FF84[0] = mapObj->coords2.x;
-    gUnknown_0202FF84[1] = mapObj->coords2.y;
-    gUnknown_0202FF84[2] = mapObj->elevation;
-    gUnknown_0202FF84[3] = 2;
-    gUnknown_0202FF84[4] = (mapObj->localId << 8) | mapObj->mapNum;
-    gUnknown_0202FF84[5] = mapObj->mapGroup;
+    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;
-    gUnknown_0202FF84[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
                          | (u8)gSaveBlock1.location.mapGroup;
 
-    gUnknown_0202FF84[7] = 1;
+    gFieldEffectArguments[7] = 1;
     FieldEffectStart(17);
 }
 
@@ -517,18 +517,18 @@ void sub_8063F2C(struct MapObject *mapObj, struct Sprite *sprite)
 {
     u8 *ptr;
 
-    gUnknown_0202FF84[0] = mapObj->coords2.x;
-    gUnknown_0202FF84[1] = mapObj->coords2.y;
-    gUnknown_0202FF84[2] = mapObj->elevation;
-    gUnknown_0202FF84[3] = 2;
-    gUnknown_0202FF84[4] = (mapObj->localId << 8) | mapObj->mapNum;
-    gUnknown_0202FF84[5] = mapObj->mapGroup;
+    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;
-    gUnknown_0202FF84[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+    gFieldEffectArguments[6] = ((u8)gSaveBlock1.location.mapNum << 8)
                          | (u8)gSaveBlock1.location.mapGroup;
 
-    gUnknown_0202FF84[7] = 0;
+    gFieldEffectArguments[7] = 0;
     FieldEffectStart(17);
 }
 
@@ -572,11 +572,11 @@ static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Spr
     // First half-word is a Field Effect script id. (gFieldEffectScriptPointers)
     u16 sandFootprints_FieldEffectData[2] = { 0xD, 0x18 };
 
-    gUnknown_0202FF84[0] = mapObj->coords3.x;
-    gUnknown_0202FF84[1] = mapObj->coords3.y;
-    gUnknown_0202FF84[2] = 149;
-    gUnknown_0202FF84[3] = 2;
-    gUnknown_0202FF84[4] = mapObj->mapobj_unk_18;
+    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]);
 }
 
@@ -598,11 +598,11 @@ static void DoTracksGroundEffect_BikeTireTracks(
 
     if (mapObj->coords2.x != mapObj->coords3.x || mapObj->coords2.y != mapObj->coords3.y)
     {
-        gUnknown_0202FF84[0] = mapObj->coords3.x;
-        gUnknown_0202FF84[1] = mapObj->coords3.y;
-        gUnknown_0202FF84[2] = 149;
-        gUnknown_0202FF84[3] = 2;
-        gUnknown_0202FF84[4] =
+        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);
     }
@@ -627,10 +627,10 @@ void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprit
 {
     u8 spriteId;
 
-    gUnknown_0202FF84[0] = mapObj->coords2.x;
-    gUnknown_0202FF84[1] = mapObj->coords2.y;
-    gUnknown_0202FF84[2] = mapObj->elevation;
-    gUnknown_0202FF84[3] = 2;
+    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(
@@ -642,37 +642,37 @@ void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprit
 
 void GroundEffect_JumpOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite)
 {
-    gUnknown_0202FF84[0] = mapObj->coords2.x;
-    gUnknown_0202FF84[1] = mapObj->coords2.y;
-    gUnknown_0202FF84[2] = mapObj->elevation;
-    gUnknown_0202FF84[3] = 2;
+    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)
 {
-    gUnknown_0202FF84[0] = mapObj->coords2.x;
-    gUnknown_0202FF84[1] = mapObj->coords2.y;
-    gUnknown_0202FF84[2] = mapObj->elevation;
-    gUnknown_0202FF84[3] = sprite->oam.priority;
+    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)
 {
-    gUnknown_0202FF84[0] = mapObj->coords2.x;
-    gUnknown_0202FF84[1] = mapObj->coords2.y;
-    gUnknown_0202FF84[2] = mapObj->elevation;
-    gUnknown_0202FF84[3] = sprite->oam.priority;
+    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)
 {
-    gUnknown_0202FF84[0] = mapObj->coords2.x;
-    gUnknown_0202FF84[1] = mapObj->coords2.y;
-    gUnknown_0202FF84[2] = mapObj->elevation;
-    gUnknown_0202FF84[3] = sprite->oam.priority;
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
+    gFieldEffectArguments[2] = mapObj->elevation;
+    gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_DUST);
 }
 
@@ -688,8 +688,8 @@ void GroundEffect_HotSprings(struct MapObject *mapObj, struct Sprite *sprite)
 
 void GroundEffect_Seaweed(struct MapObject *mapObj, struct Sprite *sprite)
 {
-    gUnknown_0202FF84[0] = mapObj->coords2.x;
-    gUnknown_0202FF84[1] = mapObj->coords2.y;
+    gFieldEffectArguments[0] = mapObj->coords2.x;
+    gFieldEffectArguments[1] = mapObj->coords2.y;
     FieldEffectStart(FLDEFF_BUBBLES);
 }
 
diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c
index f60b1b233..0e7cd7896 100644
--- a/src/field/field_map_obj.c
+++ b/src/field/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/field_map_obj_helpers.c b/src/field/field_map_obj_helpers.c
index 87be8e011..93cd57557 100644
--- a/src/field/field_map_obj_helpers.c
+++ b/src/field/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/field_player_avatar.c b/src/field/field_player_avatar.c
index 2a7b2f3e0..c8099a73d 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/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/field_poison.c b/src/field/field_poison.c
index 8c9e029e1..1244b9c62 100644
--- a/src/field/field_poison.c
+++ b/src/field/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/field_screen_effect.c b/src/field/field_screen_effect.c
index 79913e1c5..1464a99b1 100644
--- a/src/field/field_screen_effect.c
+++ b/src/field/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/field_special_scene.c b/src/field/field_special_scene.c
index 82a7a13e3..38c076c51 100644
--- a/src/field/field_special_scene.c
+++ b/src/field/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/field_specials.c b/src/field/field_specials.c
index 454bd8d96..c23ea2ddc 100644
--- a/src/field/field_specials.c
+++ b/src/field/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/field_tasks.c b/src/field/field_tasks.c
index caf2ce6b9..2be54f923 100644
--- a/src/field/field_tasks.c
+++ b/src/field/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/field/fieldmap.c b/src/field/fieldmap.c
index 0e0ec246c..3ad190a4b 100644
--- a/src/field/fieldmap.c
+++ b/src/field/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/field/fldeff_cut.c b/src/field/fldeff_cut.c
index b394d1e4c..00643a979 100644
--- a/src/field/fldeff_cut.c
+++ b/src/field/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/field/fldeff_flash.c b/src/field/fldeff_flash.c
index 6c2633567..1ee8a8f05 100644
--- a/src/field/fldeff_flash.c
+++ b/src/field/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/field/fldeff_strength.c b/src/field/fldeff_strength.c
index 81f4f63c6..d9603d094 100644
--- a/src/field/fldeff_strength.c
+++ b/src/field/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/field/fldeff_sweetscent.c b/src/field/fldeff_sweetscent.c
index 4c3e6bf4a..b9dbf619d 100644
--- a/src/field/fldeff_sweetscent.c
+++ b/src/field/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/field/fldeff_teleport.c b/src/field/fldeff_teleport.c
index 74e68df06..af48fb414 100644
--- a/src/field/fldeff_teleport.c
+++ b/src/field/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/field/hof_pc.c b/src/field/hof_pc.c
index 4646d171c..aeeb7fe17 100644
--- a/src/field/hof_pc.c
+++ b/src/field/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/field/item_menu.c b/src/field/item_menu.c
index 4436bdfbe..891eb135f 100644
--- a/src/field/item_menu.c
+++ b/src/field/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/field/item_use.c b/src/field/item_use.c
index 1750c1584..8bc83bdc6 100644
--- a/src/field/item_use.c
+++ b/src/field/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/field/map_obj_lock.c b/src/field/map_obj_lock.c
index bd40bcacc..2856320b8 100644
--- a/src/field/map_obj_lock.c
+++ b/src/field/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/field/mauville_man.c b/src/field/mauville_man.c
index 4a77717f1..33bc39648 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -6,7 +6,7 @@
 #include "field_message_box.h"
 #include "m4a.h"
 #include "menu.h"
-#include "rom4.h"
+#include "overworld.h"
 #include "rng.h"
 #include "script.h"
 #include "songs.h"
diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c
index 9915d67ac..14e823355 100644
--- a/src/field/menu_helpers.c
+++ b/src/field/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/field/money.c b/src/field/money.c
index 67b7eb03f..5d0f0ae8d 100644
--- a/src/field/money.c
+++ b/src/field/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/field/overworld.c b/src/field/overworld.c
new file mode 100644
index 000000000..9b41a262d
--- /dev/null
+++ b/src/field/overworld.c
@@ -0,0 +1,2664 @@
+#include "global.h"
+#include "overworld.h"
+#include "battle_setup.h"
+#include "berry.h"
+#include "cable_club.h"
+#include "clock.h"
+#include "event_data.h"
+#include "field_camera.h"
+#include "field_control_avatar.h"
+#include "field_effect.h"
+#include "field_fadetransition.h"
+#include "field_ground_effect.h"
+#include "field_map_obj.h"
+#include "field_map_obj_helpers.h"
+#include "field_message_box.h"
+#include "field_player_avatar.h"
+#include "field_screen_effect.h"
+#include "field_special_scene.h"
+#include "field_specials.h"
+#include "field_tasks.h"
+#include "field_weather.h"
+#include "fieldmap.h"
+#include "fldeff_flash.h"
+#include "heal_location.h"
+#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"
+#include "new_game.h"
+#include "palette.h"
+#include "play_time.h"
+#include "rng.h"
+#include "roamer.h"
+#include "rotating_gate.h"
+#include "safari_zone.h"
+#include "script.h"
+#include "script_pokemon_80C4.h"
+#include "secret_base.h"
+#include "songs.h"
+#include "sound.h"
+#include "species.h"
+#include "start_menu.h"
+#include "task.h"
+#include "tileset_anim.h"
+#include "time_events.h"
+#include "tv.h"
+#include "unknown_task.h"
+#include "wild_encounter.h"
+
+#ifdef SAPPHIRE
+#define LEGENDARY_MUSIC BGM_OOAME  // Heavy Rain
+#else
+#define LEGENDARY_MUSIC BGM_HIDERI // Drought
+#endif
+
+struct UnkTVStruct
+{
+    u32 tv_field_0;
+    u32 tv_field_4;
+};
+
+extern u16 gUnknown_03004898;
+extern u16 gUnknown_0300489C;
+
+extern u8 S_WhiteOut[];
+extern u8 gUnknown_0819FC9F[];
+extern u8 SingleBattleColosseum_EventScript_1A436F[];
+extern u8 SingleBattleColosseum_EventScript_1A4379[];
+extern u8 DoubleBattleColosseum_EventScript_1A4383[];
+extern u8 DoubleBattleColosseum_EventScript_1A439E[];
+extern u8 DoubleBattleColosseum_EventScript_1A43B9[];
+extern u8 DoubleBattleColosseum_EventScript_1A43D4[];
+extern u8 TradeCenter_EventScript_1A43F0[];
+extern u8 TradeCenter_EventScript_1A43FA[];
+extern u8 RecordCorner_EventScript_1A4418[];
+extern u8 RecordCorner_EventScript_1A442D[];
+extern u8 RecordCorner_EventScript_1A4442[];
+extern u8 RecordCorner_EventScript_1A4457[];
+extern u8 TradeRoom_ReadTrainerCard1[];
+extern u8 TradeRoom_ReadTrainerCard2[];
+extern u8 TradeRoom_TooBusyToNotice[];
+extern u8 TradeRoom_PromptToCancelLink[];
+extern u8 TradeRoom_TerminateLink[];
+extern u8 gUnknown_081A4508[];
+
+extern struct MapData * const gMapAttributes[];
+extern struct MapHeader * const * const gMapGroups[];
+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,
+};
+
+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(S_WhiteOut);
+    gSaveBlock1.money /= 2;
+    ScrSpecial_HealPlayerParty();
+    sub_8053050();
+    sub_8053570();
+    warp_in();
+}
+
+void flag_var_implications_of_teleport_(void)
+{
+    player_avatar_init_params_reset();
+    FlagClear(SYS_CYCLING_ROAD);
+    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_USE_FLASH);
+}
+
+void Overworld_ResetStateAfterTeleport(void)
+{
+    player_avatar_init_params_reset();
+    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();
+    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();
+    FlagClear(SYS_CYCLING_ROAD);
+    FlagClear(SYS_CRUISE_MODE);
+    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(SYS_USE_STRENGTH);
+    FlagClear(SYS_USE_FLASH);
+}
+
+void sub_805308C(void)
+{
+    FlagClear(SYS_SAFARI_MODE);
+    ChooseAmbientCrySpecies();
+    ResetCyclingRoadChallengeData();
+    UpdateLocationHistoryForRoamer();
+    RoamerMoveToOtherLocationSet();
+}
+
+void ResetGameStats(void)
+{
+    s32 i;
+
+    for (i = 0; i < NUM_GAME_STATS; i++)
+        gSaveBlock1.gameStats[i] = 0;
+}
+
+void IncrementGameStat(u8 index)
+{
+    if (index < NUM_GAME_STATS)
+    {
+        if (gSaveBlock1.gameStats[index] < 0xFFFFFF)
+            gSaveBlock1.gameStats[index]++;
+        else
+            gSaveBlock1.gameStats[index] = 0xFFFFFF;
+    }
+}
+
+u32 GetGameStat(u8 index)
+{
+    if (index >= NUM_GAME_STATS)
+        return 0;
+
+    return gSaveBlock1.gameStats[index];
+}
+
+void SetGameStat(u8 index, u32 value)
+{
+    if (index < NUM_GAME_STATS)
+        gSaveBlock1.gameStats[index] = value;
+}
+
+void sub_8053154(void)
+{
+    CpuFill32(0, gSaveBlock1.mapObjectTemplates, sizeof(gSaveBlock1.mapObjectTemplates));
+    CpuCopy32(gMapHeader.events->mapObjects,
+              gSaveBlock1.mapObjectTemplates,
+              gMapHeader.events->mapObjectCount * sizeof(struct MapObjectTemplate));
+}
+
+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 Overworld_SaveMapObjCoords(u8 localId, s16 x, s16 y)
+{
+    s32 i;
+    for (i = 0; i < 64; i++)
+    {
+        struct MapObjectTemplate *mapObjectTemplate = &gSaveBlock1.mapObjectTemplates[i];
+        if (mapObjectTemplate->localId == localId)
+        {
+            mapObjectTemplate->x = x;
+            mapObjectTemplate->y = y;
+            return;
+        }
+    }
+}
+
+void Overworld_SaveMapObjMovementType(u8 localId, u8 movementType)
+{
+    s32 i;
+    for (i = 0; i < 64; i++)
+    {
+        struct MapObjectTemplate *mapObjectTemplate = &gSaveBlock1.mapObjectTemplates[i];
+        if (mapObjectTemplate->localId == localId)
+        {
+            mapObjectTemplate->movementType = movementType;
+            return;
+        }
+    }
+}
+
+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);
+    apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+    DrawWholeMapView();
+    cur_mapheader_run_tileset_funcs_after_some_cpuset();
+}
+
+static struct MapData *get_mapdata_header(void)
+{
+    u16 mapDataId = gSaveBlock1.mapDataId;
+    if (mapDataId)
+        return gMapAttributes[mapDataId - 1];
+    return NULL;
+}
+
+static void warp_shift(void)
+{
+    gUnknown_020297F0 = gSaveBlock1.location;
+    gSaveBlock1.location = gUnknown_020297F8;
+    gUnknown_02029800 = sDummyWarpData;
+    gUnknown_02029808 = sDummyWarpData;
+}
+
+static void warp_set(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
+{
+    warp->mapGroup = mapGroup;
+    warp->mapNum = mapNum;
+    warp->warpId = warpId;
+    warp->x = x;
+    warp->y = y;
+}
+
+static bool32 warp_data_is_not_neg_1(struct WarpData *warp)
+{
+    if (warp->mapGroup != -1)
+        return FALSE;
+    if (warp->mapNum != -1)
+        return FALSE;
+    if (warp->warpId != -1)
+        return FALSE;
+    if (warp->x != -1)
+        return FALSE;
+    if (warp->y != -1)
+        return FALSE;
+    return TRUE;
+}
+
+struct MapHeader *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum)
+{
+    return gMapGroups[mapGroup][mapNum];
+}
+
+struct MapHeader *const warp1_get_mapheader(void)
+{
+    return Overworld_GetMapHeaderByGroupAndId(gUnknown_020297F8.mapGroup, gUnknown_020297F8.mapNum);
+}
+
+static void set_current_map_header_from_sav1_save_old_name(void)
+{
+    gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
+    gSaveBlock1.mapDataId = gMapHeader.mapDataId;
+    gMapHeader.mapData = get_mapdata_header();
+}
+
+static void LoadSaveblockMapHeader(void)
+{
+    gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
+    gMapHeader.mapData = get_mapdata_header();
+}
+
+void sub_80533CC(void)
+{
+    if (gSaveBlock1.location.warpId >= 0 && gSaveBlock1.location.warpId < gMapHeader.events->warpCount)
+    {
+        gSaveBlock1.pos.x = gMapHeader.events->warps[gSaveBlock1.location.warpId].x;
+        gSaveBlock1.pos.y = gMapHeader.events->warps[gSaveBlock1.location.warpId].y;
+    }
+    else if (gSaveBlock1.location.x >= 0 && gSaveBlock1.location.y >= 0)
+    {
+        gSaveBlock1.pos.x = gSaveBlock1.location.x;
+        gSaveBlock1.pos.y = gSaveBlock1.location.y;
+    }
+    else
+    {
+        gSaveBlock1.pos.x = gMapHeader.mapData->width / 2;
+        gSaveBlock1.pos.y = gMapHeader.mapData->height / 2;
+    }
+}
+
+void warp_in(void)
+{
+    warp_shift();
+    set_current_map_header_from_sav1_save_old_name();
+    sub_80533CC();
+}
+
+void warp1_set(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
+{
+    warp_set(&gUnknown_020297F8, mapGroup, mapNum, warpId, x, y);
+}
+
+void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId)
+{
+    warp1_set(mapGroup, mapNum, warpId, -1, -1);
+}
+
+void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId)
+{
+    warp_set(&gSaveBlock1.warp2, mapGroup, mapNum, warpId, gSaveBlock1.pos.x, gSaveBlock1.pos.y);
+}
+
+void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
+{
+    warp_set(&gSaveBlock1.warp2, mapGroup, mapNum, warpId, x, y);
+}
+
+void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused)
+{
+    gUnknown_020297F8 = gSaveBlock1.warp2;
+}
+
+void sub_8053538(u8 a1)
+{
+    const struct HealLocation *warp = GetHealLocation(a1);
+
+    if (warp)
+        warp1_set(warp->group, warp->map, -1, warp->x, warp->y);
+}
+
+void sub_8053570(void)
+{
+    gUnknown_020297F8 = gSaveBlock1.warp3;
+}
+
+void sub_8053588(u8 a1)
+{
+    const struct HealLocation *warp = GetHealLocation(a1);
+    if (warp)
+        warp_set(&gSaveBlock1.warp3, warp->group, warp->map, -1, warp->x, warp->y);
+}
+
+void sub_80535C4(s16 a1, s16 a2)
+{
+    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);
+}
+
+void sub_805363C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
+{
+    warp_set(&gSaveBlock1.warp4, mapGroup, mapNum, warpId, x, y);
+}
+
+void sub_8053678(void)
+{
+    gUnknown_020297F8 = gSaveBlock1.warp4;
+}
+
+void sub_8053690(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
+{
+    warp_set(&gUnknown_02029800, mapGroup, mapNum, warpId, x, y);
+}
+
+void warp1_set_to_warp2(void)
+{
+    gUnknown_020297F8 = gUnknown_02029800;
+}
+
+void sub_80536E4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
+{
+    warp_set(&gUnknown_02029808, mapGroup, mapNum, warpId, x, y);
+}
+
+void sub_8053720(s16 x, s16 y)
+{
+    if (warp_data_is_not_neg_1(&gUnknown_02029808) == TRUE)
+    {
+        gUnknown_020297F8 = gUnknown_020297F0;
+    }
+    else
+    {
+        warp1_set(gUnknown_02029808.mapGroup, gUnknown_02029808.mapNum, -1, x, y);
+    }
+}
+
+void sub_8053778(void)
+{
+    gUnknown_020297F8 = gSaveBlock1.warp1;
+}
+
+void unref_sub_8053790(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y)
+{
+    warp_set(&gSaveBlock1.warp1, mapGroup, mapNum, warpId, x, y);
+}
+
+void sub_80537CC(u8 a1)
+{
+    const struct HealLocation *warp = GetHealLocation(a1);
+    if (warp)
+        warp_set(&gSaveBlock1.warp1, warp->group, warp->map, -1, warp->x, warp->y);
+}
+
+void gpu_sync_bg_hide()
+{
+    gSaveBlock1.warp1 = gSaveBlock1.warp2;
+}
+
+struct MapConnection *sub_8053818(u8 dir)
+{
+    s32 i;
+    s32 count = gMapHeader.connections->count;
+    struct MapConnection *connection = gMapHeader.connections->connections;
+
+    if (connection == NULL)
+        return NULL;
+
+    for(i = 0; i < count; i++, connection++)
+        if (connection->direction == dir)
+            return connection;
+
+    return NULL;
+}
+
+bool8 sub_8053850(u8 dir, u16 x, u16 y)
+{
+    struct MapConnection *connection = sub_8053818(dir);
+    if (connection != NULL)
+    {
+        warp1_set(connection->mapGroup, connection->mapNum, -1, x, y);
+    }
+    else
+    {
+        mapheader_run_script_with_tag_x6();
+        if (warp_data_is_not_neg_1(&gUnknown_02029800))
+            return FALSE;
+        warp1_set_to_warp2();
+    }
+    return TRUE;
+}
+
+bool8 sub_80538B0(u16 x, u16 y)
+{
+    return sub_8053850(CONNECTION_EMERGE, x, y);
+}
+
+bool8 sub_80538D0(u16 x, u16 y)
+{
+    return sub_8053850(CONNECTION_DIVE, x, y);
+}
+
+void sub_80538F0(u8 mapGroup, u8 mapNum)
+{
+    s32 i;
+
+    warp1_set(mapGroup, mapNum, -1, -1, -1);
+    sub_8053F0C();
+    warp_shift();
+    set_current_map_header_from_sav1_save_old_name();
+    sub_8053154();
+    ClearTempFieldEventData();
+    ResetCyclingRoadChallengeData();
+    prev_quest_postbuffer_cursor_backup_reset();
+    sub_8082BD0(mapGroup, mapNum);
+    DoTimeBasedEvents();
+    sub_80806E4();
+    ChooseAmbientCrySpecies();
+    SetDefaultFlashLevel();
+    sav1_reset_battle_music_maybe();
+    mapheader_run_script_with_tag_x3();
+    not_trainer_hill_battle_pyramid();
+    sub_8056D38(gMapHeader.mapData);
+    apply_map_tileset2_palette(gMapHeader.mapData);
+
+    for (i = 6; i < 12; i++)
+        sub_807D874(i);
+
+    sub_8072ED0();
+    UpdateLocationHistoryForRoamer();
+    RoamerMove();
+    DoCurrentWeather();
+    ResetFieldTasksArgs();
+    mapheader_run_script_with_tag_x5();
+    ShowMapNamePopup();
+}
+
+void sub_8053994(u32 a1)
+{
+    bool8 v2;
+    bool8 v3;
+
+    set_current_map_header_from_sav1_save_old_name();
+    sub_8053154();
+    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();
+    sub_8082BD0(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
+    if (a1 != 1)
+        DoTimeBasedEvents();
+    sub_80806E4();
+    ChooseAmbientCrySpecies();
+    if (v2)
+        FlagClear(SYS_USE_FLASH);
+    SetDefaultFlashLevel();
+    sav1_reset_battle_music_maybe();
+    mapheader_run_script_with_tag_x3();
+    UpdateLocationHistoryForRoamer();
+    RoamerMoveToOtherLocationSet();
+    not_trainer_hill_battle_pyramid();
+    if (a1 != 1 && v3)
+    {
+        UpdateTVScreensOnMap(gUnknown_03004870.width, gUnknown_03004870.height);
+        sub_80BBCCC(1);
+    }
+}
+
+void player_avatar_init_params_reset(void)
+{
+    gUnknown_02029810.player_field_1 = 1;
+    gUnknown_02029810.player_field_0 = 1;
+}
+
+void walkrun_find_lowest_active_bit_in_bitfield(void)
+{
+    gUnknown_02029810.player_field_1 = player_get_direction_lower_nybble();
+
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE))
+        gUnknown_02029810.player_field_0 = 2;
+    else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE))
+        gUnknown_02029810.player_field_0 = 4;
+    else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+        gUnknown_02029810.player_field_0 = 8;
+    else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_4))
+        gUnknown_02029810.player_field_0 = 16;
+    else
+        gUnknown_02029810.player_field_0 = 1;
+}
+
+struct UnkPlayerStruct *sub_8053AA8(void)
+{
+    struct UnkPlayerStruct playerStruct;
+    u8 mapType = Overworld_GetMapTypeOfSaveblockLocation();
+    u16 v2 = cur_mapdata_block_role_at_screen_center_acc_to_sav1();
+    u8 v4 = sub_8053B00(&gUnknown_02029810, v2, mapType);
+    playerStruct.player_field_0 = v4;
+    playerStruct.player_field_1 = sub_8053B60(&gUnknown_02029810, v4, v2, mapType);
+    gUnknown_02029810 = playerStruct;
+    return &gUnknown_02029810;
+}
+
+u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3)
+{
+    if (a3 != 8 && FlagGet(SYS_CRUISE_MODE))
+        return 1;
+    if (a3 == 5)
+        return 16;
+    if (MetatileBehavior_IsSurfableWaterOrUnderwater(a2) == 1)
+        return 8;
+    if (Overworld_IsBikeAllowedOnCurrentMap() != TRUE)
+        return 1;
+    if (playerStruct->player_field_0 == 2)
+        return 2;
+    if (playerStruct->player_field_0 != 4)
+        return 1;
+    return 4;
+}
+
+u8 sub_8053B60(struct UnkPlayerStruct *playerStruct, u8 a2, u16 a3, u8 a4)
+{
+    if (FlagGet(SYS_CRUISE_MODE) && a4 == 6)
+        return 4;
+    if (MetatileBehavior_IsDeepSouthWarp(a3) == TRUE)
+        return 2;
+    if (MetatileBehavior_IsNonAnimDoor(a3) == TRUE || MetatileBehavior_IsDoor(a3) == TRUE)
+        return 1;
+    if (MetatileBehavior_IsSouthArrowWarp(a3) == TRUE)
+        return 2;
+    if (MetatileBehavior_IsNorthArrowWarp(a3) == TRUE)
+        return 1;
+    if (MetatileBehavior_IsWestArrowWarp(a3) == TRUE)
+        return 4;
+    if (MetatileBehavior_IsEastArrowWarp(a3) == TRUE)
+        return 3;
+    if ((playerStruct->player_field_0 == 16 && a2 == 8)
+     || (playerStruct->player_field_0 == 8 && a2 == 16))
+        return playerStruct->player_field_1;
+    if (MetatileBehavior_IsLadder(a3) == TRUE)
+        return playerStruct->player_field_1;
+    return 1;
+}
+
+u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void)
+{
+    return MapGridGetMetatileBehaviorAt(gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7);
+}
+
+bool32 Overworld_IsBikeAllowedOnCurrentMap(void)
+{
+    // is player in cycling road entrance?
+    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?
+    if (gMapHeader.mapType == MAP_TYPE_INDOOR)
+        return FALSE;
+    if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE)
+        return FALSE;
+    if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
+        return FALSE;
+
+    // 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;
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_CAVE_OF_ORIGIN_B4F
+     && gSaveBlock1.location.mapNum == MAP_ID_CAVE_OF_ORIGIN_B4F)
+        return FALSE;
+
+    return TRUE;
+}
+
+void SetDefaultFlashLevel(void)
+{
+    if (!gMapHeader.cave)
+        gSaveBlock1.flashLevel = 0;
+    else if (FlagGet(SYS_USE_FLASH))
+        gSaveBlock1.flashLevel = 1;
+    else
+        gSaveBlock1.flashLevel = gMaxFlashLevel;
+}
+
+void Overworld_SetFlashLevel(s32 flashLevel)
+{
+    if (flashLevel < 0 || flashLevel > gMaxFlashLevel)
+        flashLevel = 0;
+    gSaveBlock1.flashLevel = flashLevel;
+}
+
+u8 Overworld_GetFlashLevel(void)
+{
+    return gSaveBlock1.flashLevel;
+}
+
+void sub_8053D14(u16 mapDataId)
+{
+    gSaveBlock1.mapDataId = mapDataId;
+    gMapHeader.mapData = get_mapdata_header();
+}
+
+static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
+{
+    if (!FlagGet(SYS_WEATHER_CTRL))
+        return FALSE;
+    if (warp->mapGroup == 0)
+    {
+        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;
+}
+
+static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp)
+{
+    if (VarGet(VAR_WEATHER_INSTITUTE_CLEARED))
+        return FALSE;
+    if (warp->mapGroup != MAP_GROUP_ROUTE119_WEATHER_INSTITUTE_1F)
+        return FALSE;
+    if (warp->mapNum == MAP_ID_ROUTE119_WEATHER_INSTITUTE_1F
+     || warp->mapNum == MAP_ID_ROUTE119_WEATHER_INSTITUTE_2F)
+        return TRUE;
+    return FALSE;
+}
+
+static u16 GetLocationMusic(struct WarpData *warp)
+{
+    if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
+        return LEGENDARY_MUSIC;
+    else if (IsInfiltratedWeatherInstitute(warp) == TRUE)
+        return BGM_TOZAN;
+    else
+        return Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum)->music;
+}
+
+u16 sav1_map_get_music(void)
+{
+    u16 music;
+
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE111
+     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE111
+     && GetSav1Weather() == 8)
+        return BGM_ASHROAD;
+
+    music = GetLocationMusic(&gSaveBlock1.location);
+    if (music != 0x7FFF)
+    {
+        return music;
+    }
+    else
+    {
+        if (gSaveBlock1.pos.x < 24)
+            return BGM_DOORO_X1;
+        else
+            return BGM_GRANROAD;
+    }
+}
+
+u16 warp1_target_get_music(void)
+{
+    u16 music = GetLocationMusic(&gUnknown_020297F8);
+    if (music != 0x7FFF)
+    {
+        return music;
+    }
+    else
+    {
+        if (gSaveBlock1.location.mapGroup == MAP_GROUP_MAUVILLE_CITY
+         && gSaveBlock1.location.mapNum == MAP_ID_MAUVILLE_CITY)
+            return BGM_DOORO_X1;
+        else
+            return BGM_GRANROAD;
+    }
+}
+
+void call_map_music_set_to_zero(void)
+{
+    ResetMapMusic();
+}
+
+void sub_8053E90(void)
+{
+    u16 music = sav1_map_get_music();
+
+    if (music != LEGENDARY_MUSIC)
+    {
+        if (gSaveBlock1.battleMusic)
+            music = gSaveBlock1.battleMusic;
+        else if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER)
+            music = BGM_DEEPDEEP;
+        else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+            music = BGM_NAMINORI;
+    }
+
+    if (music != GetCurrentMapMusic())
+        PlayNewMapMusic(music);
+}
+
+void sav1_set_battle_music_maybe(u16 songNum)
+{
+    gSaveBlock1.battleMusic = songNum;
+}
+
+void sav1_reset_battle_music_maybe(void)
+{
+    gSaveBlock1.battleMusic = 0;
+}
+
+void sub_8053F0C(void)
+{
+    if (FlagGet(SPECIAL_FLAG_1) != TRUE)
+    {
+        u16 newMusic = warp1_target_get_music();
+        u16 currentMusic = GetCurrentMapMusic();
+        if (newMusic != LEGENDARY_MUSIC)
+        {
+            if (currentMusic == BGM_DEEPDEEP || currentMusic == BGM_NAMINORI)
+                return;
+            if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+                newMusic = BGM_NAMINORI;
+        }
+        if (newMusic != currentMusic)
+        {
+            if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
+                FadeOutAndFadeInNewMapMusic(newMusic, 4, 4);
+            else
+                FadeOutAndPlayNewMapMusic(newMusic, 8);
+        }
+    }
+}
+
+void sub_8053F84(void)
+{
+    u16 currentMusic = GetCurrentMapMusic();
+    if (currentMusic != sav1_map_get_music())
+        FadeOutAndPlayNewMapMusic(sav1_map_get_music(), 8);
+}
+
+void Overworld_ChangeMusicTo(u16 newMusic)
+{
+    u16 currentMusic = GetCurrentMapMusic();
+    if (currentMusic != newMusic && currentMusic != LEGENDARY_MUSIC)
+        FadeOutAndPlayNewMapMusic(newMusic, 8);
+}
+
+u8 GetMapMusicFadeoutSpeed(void)
+{
+    struct MapHeader *mapHeader = warp1_get_mapheader();
+    if (Overworld_MapTypeIsIndoors(mapHeader->mapType) == TRUE)
+        return 2;
+    else
+        return 4;
+}
+
+void sub_8053FF8(void)
+{
+    u16 music = warp1_target_get_music();
+    if (FlagGet(SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic())
+    {
+        u8 speed = GetMapMusicFadeoutSpeed();
+        FadeOutMapMusic(speed);
+    }
+}
+
+bool8 sub_8054034(void)
+{
+    return IsNotWaitingForBGMStop();
+}
+
+void sub_8054044(void)
+{
+    FadeOutMapMusic(4);
+}
+
+static void PlayAmbientCry(void)
+{
+    s16 x, y;
+    PlayerGetDestCoords(&x, &y);
+    if (sIsAmbientCryWaterMon != TRUE
+     || MetatileBehavior_IsSurfableWaterOrUnderwater(MapGridGetMetatileBehaviorAt(x, y)))
+    {
+        s8 pan = (Random() % 88) + 212;
+        s8 volume = (Random() % 30) + 50;
+        PlayCry2(sAmbientCrySpecies, pan, volume, 1);
+    }
+}
+
+void UpdateAmbientCry(s16 *state, u16 *delayCounter)
+{
+    switch (*state)
+    {
+    case 0:
+        if (sAmbientCrySpecies == SPECIES_NONE)
+            *state = 4;
+        else
+            *state = 1;
+        break;
+    case 1:
+        *delayCounter = (Random() % 2400) + 1200;
+        *state = 3;
+        break;
+    case 2:
+        *delayCounter = (Random() % 1200) + 1200;
+        *state = 3;
+        break;
+    case 3:
+        (*delayCounter)--;
+        if (*delayCounter == 0)
+        {
+            PlayAmbientCry();
+            *state = 2;
+        }
+        break;
+    case 4:
+        break;
+    }
+}
+
+void ChooseAmbientCrySpecies(void)
+{
+    if ((gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE130
+     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE130)
+     && !IsMirageIslandPresent())
+    {
+        // Only play water pokemon cries on this route
+        // when Mirage Island is not present
+        sIsAmbientCryWaterMon = TRUE;
+        sAmbientCrySpecies = GetLocalWaterMon();
+    }
+    else
+    {
+        sAmbientCrySpecies = GetLocalWildMon(&sIsAmbientCryWaterMon);
+    }
+}
+
+u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum)
+{
+    return Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum)->mapType;
+}
+
+u8 GetMapTypeByWarpData(struct WarpData *warp)
+{
+    return GetMapTypeByGroupAndId(warp->mapGroup, warp->mapNum);
+}
+
+u8 Overworld_GetMapTypeOfSaveblockLocation(void)
+{
+    return GetMapTypeByWarpData(&gSaveBlock1.location);
+}
+
+u8 get_map_type_from_warp0(void)
+{
+    return GetMapTypeByWarpData(&gUnknown_020297F0);
+}
+
+bool8 is_map_type_1_2_3_5_or_6(u8 mapType)
+{
+    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 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType)
+{
+    if (mapType == MAP_TYPE_ROUTE
+     || mapType == MAP_TYPE_TOWN
+     || mapType == MAP_TYPE_6
+     || mapType == MAP_TYPE_CITY)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+bool8 Overworld_MapTypeIsIndoors(u8 mapType)
+{
+    if (mapType == MAP_TYPE_INDOOR
+     || mapType == MAP_TYPE_SECRET_BASE)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+u8 unref_sub_8054260(void)
+{
+    return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum)->regionMapSectionId;
+}
+
+u8 sav1_map_get_name(void)
+{
+    return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->regionMapSectionId;
+}
+
+u8 sav1_map_get_battletype(void)
+{
+    return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->battleType;
+}
+
+void ResetSafariZoneFlag_(void)
+{
+    ResetSafariZoneFlag();
+}
+
+bool32 is_c1_link_related_active(void)
+{
+    if (gMain.callback1 == sub_8055354)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void c1_overworld_normal(u16 newKeys, u16 heldKeys)
+{
+    struct FieldInput inputStruct;
+
+    sub_8059204();
+    FieldClearPlayerInput(&inputStruct);
+    FieldGetPlayerInput(&inputStruct, newKeys, heldKeys);
+    if (!ScriptContext2_IsEnabled())
+    {
+        if (sub_8068024(&inputStruct) == 1)
+        {
+            ScriptContext2_Enable();
+            HideMapNamePopup();
+        }
+        else
+        {
+            player_step(inputStruct.dpadDirection, newKeys, heldKeys);
+        }
+    }
+}
+
+void c1_overworld(void)
+{
+    if (gMain.callback2 == c2_overworld)
+        c1_overworld_normal(gMain.newKeys, gMain.heldKeys);
+}
+
+void OverworldBasic(void)
+{
+    ScriptContext2_RunScript();
+    RunTasks();
+    AnimateSprites();
+    CameraUpdate();
+    UpdateCameraPanning();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+    sub_8072EDC();
+}
+
+void CB2_OverworldBasic(void)
+{
+    OverworldBasic();
+}
+
+void c2_overworld(void)
+{
+    int fading = (gPaletteFade.active != 0);
+    if (fading)
+        SetVBlankCallback(NULL);
+    OverworldBasic();
+    if (fading)
+        SetFieldVBlankCallback();
+}
+
+void set_callback1(MainCallback cb)
+{
+    gMain.callback1 = cb;
+}
+
+void sub_80543DC(u16 (*a1)(u32))
+{
+    gUnknown_03000584 = a1;
+}
+
+void sub_80543E8(void)
+{
+    if (gFieldCallback)
+        gFieldCallback();
+    else
+        mapldr_default();
+    gFieldCallback = NULL;
+}
+
+void CB2_NewGame(void)
+{
+    FieldClearVBlankHBlankCallbacks();
+    StopMapMusic();
+    ResetSafariZoneFlag_();
+    NewGameInitData();
+    player_avatar_init_params_reset();
+    PlayTimeCounter_Start();
+    ScriptContext1_Init();
+    ScriptContext2_Disable();
+    gFieldCallback = ExecuteTruckSequence;
+    do_load_map_stuff_loop(&gMain.state);
+    SetFieldVBlankCallback();
+    set_callback1(c1_overworld);
+    SetMainCallback2(c2_overworld);
+}
+
+void CB2_WhiteOut(void)
+{
+    u8 val;
+    gMain.state++;
+    if (gMain.state >= 120)
+    {
+        FieldClearVBlankHBlankCallbacks();
+        StopMapMusic();
+        ResetSafariZoneFlag_();
+        DoWhiteOut();
+        player_avatar_init_params_reset();
+        ScriptContext1_Init();
+        ScriptContext2_Disable();
+        gFieldCallback = sub_8080B60;
+        val = 0;
+        do_load_map_stuff_loop(&val);
+        SetFieldVBlankCallback();
+        set_callback1(c1_overworld);
+        SetMainCallback2(c2_overworld);
+    }
+}
+
+void CB2_LoadMap(void)
+{
+    FieldClearVBlankHBlankCallbacks();
+    ScriptContext1_Init();
+    ScriptContext2_Disable();
+    set_callback1(NULL);
+    SetMainCallback2(sub_810CC80);
+    gMain.savedCallback = CB2_LoadMap2;
+}
+
+void CB2_LoadMap2(void)
+{
+    do_load_map_stuff_loop(&gMain.state);
+    SetFieldVBlankCallback();
+    set_callback1(c1_overworld);
+    SetMainCallback2(c2_overworld);
+}
+
+void sub_8054534(void)
+{
+    if (!gMain.state)
+    {
+        FieldClearVBlankHBlankCallbacks();
+        ScriptContext1_Init();
+        ScriptContext2_Disable();
+        set_callback1(NULL);
+    }
+    if (sub_805493C(&gMain.state, 1))
+    {
+        SetFieldVBlankCallback();
+        set_callback1(c1_overworld);
+        SetMainCallback2(c2_overworld);
+    }
+}
+
+void sub_8054588(void)
+{
+    FieldClearVBlankHBlankCallbacks();
+    gFieldCallback = sub_8080AC4;
+    SetMainCallback2(c2_80567AC);
+}
+
+void c2_80567AC(void)
+{
+    if (sub_805483C(&gMain.state))
+    {
+        SetFieldVBlankCallback();
+        set_callback1(sub_8055354);
+        sub_80543DC(sub_8055390);
+        SetMainCallback2(c2_overworld);
+    }
+}
+
+void c2_exit_to_overworld_2_switch(void)
+{
+    if (is_c1_link_related_active() == TRUE)
+    {
+        SetMainCallback2(c2_exit_to_overworld_2_link);
+    }
+    else
+    {
+        FieldClearVBlankHBlankCallbacks();
+        SetMainCallback2(c2_exit_to_overworld_2_local);
+    }
+}
+
+void c2_exit_to_overworld_2_local(void)
+{
+    if (sub_8054A4C(&gMain.state))
+    {
+        SetFieldVBlankCallback();
+        SetMainCallback2(c2_overworld);
+    }
+}
+
+void c2_exit_to_overworld_2_link(void)
+{
+    if (!sub_8055870() && sub_8054A9C(&gMain.state))
+        SetMainCallback2(c2_overworld);
+}
+
+void sub_805465C(void)
+{
+    FieldClearVBlankHBlankCallbacks();
+    StopMapMusic();
+    sub_8054F70();
+    set_callback1(sub_8055354);
+    sub_80543DC(sub_8055390);
+    gFieldCallback = sub_8080A3C;
+    ScriptContext1_Init();
+    ScriptContext2_Disable();
+    c2_exit_to_overworld_2_switch();
+}
+
+void sub_805469C(void)
+{
+    FieldClearVBlankHBlankCallbacks();
+    gFieldCallback = atk17_seteffectuser;
+    c2_exit_to_overworld_2_switch();
+}
+
+void sub_80546B8(void)
+{
+    FieldClearVBlankHBlankCallbacks();
+    gFieldCallback = sub_80809B0;
+    c2_exit_to_overworld_2_switch();
+}
+
+void c2_exit_to_overworld_1_continue_scripts_restart_music(void)
+{
+    FieldClearVBlankHBlankCallbacks();
+    gFieldCallback = sub_8080990;
+    c2_exit_to_overworld_2_switch();
+}
+
+void sub_80546F0(void)
+{
+    FieldClearVBlankHBlankCallbacks();
+    gFieldCallback = sub_8080B60;
+    c2_exit_to_overworld_2_switch();
+}
+
+void sub_805470C(void)
+{
+    if (gMapHeader.flags == 1 && sub_80BBB24() == 1)
+        ShowMapNamePopup();
+    sub_8080B60();
+}
+
+void CB2_ContinueSavedGame(void)
+{
+    FieldClearVBlankHBlankCallbacks();
+    StopMapMusic();
+    ResetSafariZoneFlag_();
+    LoadSaveblockMapHeader();
+    LoadSaveblockMapObjScripts();
+    UnfreezeMapObjects();
+    DoTimeBasedEvents();
+    sub_805308C();
+    sub_8055FC0();
+    PlayTimeCounter_Start();
+    ScriptContext1_Init();
+    ScriptContext2_Disable();
+    if (GetSecretBase2Field_9() == 1)
+    {
+        ClearSecretBase2Field_9();
+        sub_8053778();
+        warp_in();
+        SetMainCallback2(CB2_LoadMap);
+    }
+    else
+    {
+        gFieldCallback = sub_805470C;
+        set_callback1(c1_overworld);
+        c2_exit_to_overworld_2_switch();
+    }
+}
+
+void FieldClearVBlankHBlankCallbacks(void)
+{
+    u16 savedIme = REG_IME;
+    REG_IME = 0;
+    REG_IE &= ~INTR_FLAG_HBLANK;
+    REG_IE |= INTR_FLAG_VBLANK;
+    REG_IME = savedIme;
+    SetVBlankCallback(NULL);
+    SetHBlankCallback(NULL);
+}
+
+void SetFieldVBlankCallback(void)
+{
+    SetVBlankCallback(VBlankCB_Field);
+}
+
+void VBlankCB_Field(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    sub_8089668();
+    sub_8057A58();
+    TransferPlttBuffer();
+    sub_8072E74();
+}
+
+void sub_8054814(void)
+{
+    u8 val = Overworld_GetFlashLevel();
+    if (val)
+    {
+        sub_80815E0(val);
+        sub_80895F8(gUnknown_08216694);
+    }
+}
+
+bool32 sub_805483C(u8 *a1)
+{
+    switch (*a1)
+    {
+    case 0:
+        FieldClearVBlankHBlankCallbacks();
+        ScriptContext1_Init();
+        ScriptContext2_Disable();
+        sub_8054F70();
+        sub_8054BA8();
+        (*a1)++;
+        break;
+    case 1:
+        sub_8053994(1);
+        (*a1)++;
+        break;
+    case 2:
+        sub_8054D4C(1);
+        (*a1)++;
+        break;
+    case 3:
+        sub_8054E98();
+        sub_8054D90();
+        sub_8054EC8();
+        sub_8054E60();
+        (*a1)++;
+        break;
+    case 4:
+        sub_8054814();
+        sub_8054C54();
+        SetUpWindowConfig(&gWindowConfig_81E6C3C);
+        InitMenuWindow(&gWindowConfig_81E6CE4);
+        (*a1)++;
+        break;
+    case 5:
+        move_tilemap_camera_to_upper_left_corner();
+        (*a1)++;
+        break;
+    case 6:
+        sub_8056D28(gMapHeader.mapData);
+        (*a1)++;
+        break;
+    case 7:
+        sub_8056D38(gMapHeader.mapData);
+        (*a1)++;
+        break;
+    case 8:
+        apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+        (*a1)++;
+        break;
+    case 9:
+        DrawWholeMapView();
+        (*a1)++;
+        break;
+    case 10:
+        cur_mapheader_run_tileset_funcs_after_some_cpuset();
+        (*a1)++;
+        break;
+    case 12:
+        sub_80543E8();
+        (*a1)++;
+        break;
+    case 11:
+        (*a1)++;
+        break;
+    case 13:
+        return 1;
+    }
+    return 0;
+}
+
+bool32 sub_805493C(u8 *a1, u32 a2)
+{
+    switch (*a1)
+    {
+    case 0:
+        FieldClearVBlankHBlankCallbacks();
+        sub_8053994(a2);
+        (*a1)++;
+        break;
+    case 1:
+        sub_8054BA8();
+        (*a1)++;
+        break;
+    case 2:
+        sub_8054D4C(a2);
+        (*a1)++;
+        break;
+    case 3:
+        mli4_mapscripts_and_other();
+        sub_8054E34();
+        (*a1)++;
+        break;
+    case 4:
+        sub_8054814();
+        sub_8054C54();
+        SetUpWindowConfig(&gWindowConfig_81E6C3C);
+        InitMenuWindow(&gWindowConfig_81E6CE4);
+        (*a1)++;
+        break;
+    case 5:
+        move_tilemap_camera_to_upper_left_corner();
+        (*a1)++;
+        break;
+    case 6:
+        sub_8056D28(gMapHeader.mapData);
+        (*a1)++;
+        break;
+    case 7:
+        sub_8056D38(gMapHeader.mapData);
+        (*a1)++;
+        break;
+    case 8:
+        apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+        (*a1)++;
+        break;
+    case 9:
+        DrawWholeMapView();
+        (*a1)++;
+        break;
+    case 10:
+        cur_mapheader_run_tileset_funcs_after_some_cpuset();
+        (*a1)++;
+        break;
+    case 11:
+        if (gMapHeader.flags == 1 && sub_80BBB24() == 1)
+            ShowMapNamePopup();
+        (*a1)++;
+        break;
+    case 12:
+        sub_80543E8();
+        (*a1)++;
+        break;
+    case 13:
+        return 1;
+    }
+    return 0;
+}
+
+bool32 sub_8054A4C(u8 *a1)
+{
+    switch (*a1)
+    {
+    case 0:
+        sub_8054BA8();
+        sub_8054D4C(0);
+        sub_8054E20();
+        sub_8054E34();
+        (*a1)++;
+        break;
+    case 1:
+        sub_8054C2C();
+        (*a1)++;
+        break;
+    case 2:
+        sub_80543E8();
+        (*a1)++;
+        break;
+    case 3:
+        return 1;
+    }
+    return 0;
+}
+
+bool32 sub_8054A9C(u8 *a1)
+{
+    switch (*a1)
+    {
+    case 0:
+        FieldClearVBlankHBlankCallbacks();
+        sub_8054BA8();
+        (*a1)++;
+        break;
+    case 1:
+        sub_8054D4C(1);
+        (*a1)++;
+        break;
+    case 2:
+        sub_8054F48();
+        sub_8054E20();
+        sub_8054E7C();
+        (*a1)++;
+        break;
+    case 3:
+        sub_8054814();
+        sub_8054C54();
+        SetUpWindowConfig(&gWindowConfig_81E6C3C);
+        InitMenuWindow(&gWindowConfig_81E6CE4);
+        (*a1)++;
+        break;
+    case 4:
+        move_tilemap_camera_to_upper_left_corner();
+        (*a1)++;
+        break;
+    case 5:
+        sub_8056D28(gMapHeader.mapData);
+        (*a1)++;
+        break;
+    case 6:
+        sub_8056D38(gMapHeader.mapData);
+        (*a1)++;
+        break;
+    case 7:
+        apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+        (*a1)++;
+        break;
+    case 8:
+        DrawWholeMapView();
+        (*a1)++;
+        break;
+    case 9:
+        cur_mapheader_run_tileset_funcs_after_some_cpuset();
+        (*a1)++;
+        break;
+    case 12:
+        sub_80543E8();
+        (*a1)++;
+        break;
+    case 10:
+    case 11:
+        (*a1)++;
+        break;
+    case 13:
+        SetFieldVBlankCallback();
+        (*a1)++;
+        return 1;
+    }
+    return 0;
+}
+
+void do_load_map_stuff_loop(u8 *a1)
+{
+    while (!sub_805493C(a1, 0))
+        ;
+}
+
+void sub_8054BA8(void)
+{
+    u8 *addr;
+    u32 size;
+
+    REG_DISPCNT = 0;
+
+    remove_some_task();
+
+    DmaClear16(3, PLTT + 2, PLTT_SIZE - 2);
+
+    addr = (void *)VRAM;
+    size = 0x18000;
+    while (1)
+    {
+        DmaFill16(3, 0, addr, 0x1000);
+        addr += 0x1000;
+        size -= 0x1000;
+        if (size <= 0x1000)
+        {
+            DmaFill16(3, 0, addr, size);
+            break;
+        }
+    }
+
+    ResetOamRange(0, 128);
+    LoadOam();
+}
+
+void sub_8054C2C(void)
+{
+    sub_8054814();
+    sub_8054C54();
+    SetUpWindowConfig(&gWindowConfig_81E6C3C);
+    InitMenuWindow(&gWindowConfig_81E6CE4);
+    mapdata_load_assets_to_gpu_and_full_redraw();
+}
+
+void sub_8054C54(void)
+{
+    REG_MOSAIC = 0;
+    REG_WININ = 7967;
+    REG_WINOUT = 257;
+    REG_WIN0H = 255;
+    REG_WIN0V = 255;
+    REG_WIN1H = -1;
+    REG_WIN1V = -1;
+    REG_BLDCNT = gUnknown_081E29E0[1] | gUnknown_081E29E0[2] | gUnknown_081E29E0[3] | 0x1040;
+    REG_BLDALPHA = 1805;
+    *gBGHOffsetRegs[0] = 0;
+    *gBGVOffsetRegs[0] = 0;
+    *gBGControlRegs[0] = 0;
+    *gBGHOffsetRegs[1] = 0;
+    *gBGVOffsetRegs[1] = 0;
+    *gBGControlRegs[1] = 7489;
+    *gBGHOffsetRegs[2] = 0;
+    *gBGVOffsetRegs[2] = 0;
+    *gBGControlRegs[2] = 7234;
+    *gBGHOffsetRegs[3] = 0;
+    *gBGVOffsetRegs[3] = 0;
+    *gBGControlRegs[3] = 7747;
+    REG_DISPCNT = gUnknown_081E29D8[1] | 0x7060 | gUnknown_081E29D8[2] | gUnknown_081E29D8[0] | gUnknown_081E29D8[3];
+}
+
+void sub_8054D4C(u32 a1)
+{
+    ResetTasks();
+    ResetSpriteData();
+    ResetPaletteFade();
+    dp12_8087EA4();
+    ResetCameraUpdateInfo();
+    InstallCameraPanAheadCallback();
+    sub_805C7C4(0);
+    FieldEffectActiveListClear();
+    InitFieldMessageBox();
+    sub_807C828();
+    sub_8080750();
+    if (!a1)
+        SetUpFieldTasks();
+    mapheader_run_script_with_tag_x5();
+}
+
+void sub_8054D90(void)
+{
+    gUnknown_0300489C = 0;
+    gUnknown_03004898 = 0;
+    sub_805AA98();
+    sub_805B55C(0, 0);
+    mapheader_run_first_tag4_script_list_match();
+}
+
+void mli4_mapscripts_and_other(void)
+{
+    s16 x, y;
+    struct UnkPlayerStruct *player;
+    gUnknown_0300489C = 0;
+    gUnknown_03004898 = 0;
+    sub_805AA98();
+    sav1_camera_get_focus_coords(&x, &y);
+    player = sub_8053AA8();
+    InitPlayerAvatar(x, y, player->player_field_1, gSaveBlock2.playerGender);
+    SetPlayerAvatarTransitionFlags(player->player_field_0);
+    player_avatar_init_params_reset();
+    sub_805B55C(0, 0);
+    ResetBerryTreeSparkleFlags();
+    mapheader_run_first_tag4_script_list_match();
+}
+
+void sub_8054E20(void)
+{
+    sub_805B710(0, 0);
+    RotatingGate_InitPuzzleAndGraphics();
+}
+
+void sub_8054E34(void)
+{
+    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_15 = 1;
+    InitCameraUpdateCallback(gPlayerAvatar.spriteId);
+}
+
+void sub_8054E60(void)
+{
+    InitCameraUpdateCallback(sub_8055AE8(gUnknown_03004860));
+}
+
+void sub_8054E7C(void)
+{
+    InitCameraUpdateCallback(sub_8055AE8(gUnknown_03004860));
+}
+
+void sub_8054E98(void)
+{
+    u16 x, y;
+    sav1_camera_get_focus_coords(&x, &y);
+    sub_8056C50(x + gUnknown_03004860, y);
+}
+
+void sub_8054EC8(void)
+{
+    u16 i;
+    u16 x, y;
+
+    sav1_camera_get_focus_coords(&x, &y);
+    x -= gUnknown_03004860;
+
+    for (i = 0; i < gFieldLinkPlayerCount; i++)
+    {
+        SpawnLinkPlayerMapObject(i, i + x, y, gLinkPlayers[i].gender);
+        CreateLinkPlayerSprite(i);
+    }
+
+    sub_8055340(word_3002910);
+}
+
+void sub_8054F48(void)
+{
+    u16 i;
+    for (i = 0; i < gFieldLinkPlayerCount; i++)
+        CreateLinkPlayerSprite(i);
+}
+
+void sub_8054F70(void)
+{
+    int i;
+    for (i = 0; i < 4; i++)
+        gUnknown_03000580[i] = 0x80;
+}
+
+bool32 sub_8054F88(u16 a1)
+{
+    int i;
+    int count = gFieldLinkPlayerCount;
+
+    for (i = 0; i < count; i++)
+        if (gUnknown_03000580[i] != a1)
+            return FALSE;
+    return TRUE;
+}
+
+bool32 sub_8054FC0(u16 a1)
+{
+    int i;
+    int count = gFieldLinkPlayerCount;
+
+    for (i = 0; i < count; i++)
+        if (gUnknown_03000580[i] == a1)
+            return TRUE;
+    return FALSE;
+}
+
+void sub_8054FF8(u32 a1, u16 a2, struct UnkStruct_8054FF8 *a3, u16 *a4)
+{
+    u8 *script;
+
+    if (gUnknown_03000580[a1] == 0x80)
+    {
+        script = sub_8055648(a3);
+        if (script)
+        {
+            *a4 = sub_8055758(script);
+            gUnknown_03000580[a1] = 0x81;
+            if (a3->b)
+            {
+                sub_80543DC(sub_80553E4);
+                sub_8055808(script);
+            }
+            return;
+        }
+        if (sub_8054FC0(0x83) == 1)
+        {
+            gUnknown_03000580[a1] = 0x81;
+            if (a3->b)
+            {
+                sub_80543DC(sub_80553E4);
+                sub_805585C();
+            }
+            return;
+        }
+        switch (a2)
+        {
+        case 24:
+            if (sub_8055630(a3))
+            {
+                gUnknown_03000580[a1] = 0x81;
+                if (a3->b)
+                {
+                    sub_80543DC(sub_80553E4);
+                    sub_80557F4();
+                }
+            }
+            break;
+        case 18:
+            if (sub_8055660(a3) == 1)
+            {
+                gUnknown_03000580[a1] = 0x81;
+                if (a3->b)
+                {
+                    sub_80543DC(sub_80553E4);
+                    sub_8055824();
+                }
+            }
+            break;
+        case 25:
+            script = sub_805568C(a3);
+            if (script)
+            {
+                gUnknown_03000580[a1] = 0x81;
+                if (a3->b)
+                {
+                    sub_80543DC(sub_80553E4);
+                    sub_8055840(script);
+                }
+            }
+            break;
+        case 27:
+            if (sub_8055618(a3))
+            {
+                gUnknown_03000580[a1] = 0x81;
+                if (a3->b)
+                {
+                    sub_80543DC(sub_8055408);
+                    sub_80557E8();
+                }
+            }
+            break;
+        case 28:
+            if (sub_8055618(a3))
+            {
+                gUnknown_03000580[a1] = 0x81;
+                if (a3->b)
+                {
+                    sub_80543DC(sub_8055438);
+                    sub_80557E8();
+                }
+            }
+            break;
+        }
+    }
+
+    switch (a2)
+    {
+    case 23:
+        gUnknown_03000580[a1] = 0x83;
+        break;
+    case 22:
+        gUnknown_03000580[a1] = 0x82;
+        break;
+    case 26:
+        gUnknown_03000580[a1] = 0x80;
+        if (a3->b)
+            sub_80543DC(sub_8055390);
+        break;
+    case 29:
+        if (gUnknown_03000580[a1] == 0x82)
+            gUnknown_03000580[a1] = 0x81;
+        break;
+    }
+}
+
+void sub_8055218(u16 *a1, int a2)
+{
+    struct UnkStruct_8054FF8 st;
+    int i;
+    for (i = 0; i < 4; i++)
+    {
+        u16 v5 = a1[i];
+        u16 v8 = 0;
+        sub_80555B0(i, a2, &st);
+        sub_8054FF8(i, v5, &st, &v8);
+        if (gUnknown_03000580[i] == 0x80)
+            v8 = sub_805530C(v5);
+        sub_8055BFC(i, v8);
+    }
+}
+
+void sub_8055280(u16 a1)
+{
+    if (a1 >= 17 && a1 < 30)
+        word_3004858 = a1;
+    else
+        word_3004858 = 17;
+}
+
+u16 sub_80552B0(u32 a1)
+{
+    if (gMain.heldKeys & 0x40)
+    {
+        return 19;
+    }
+    else if (gMain.heldKeys & 0x80)
+    {
+        return 18;
+    }
+    else if (gMain.heldKeys & 0x20)
+    {
+        return 20;
+    }
+    else if (gMain.heldKeys & 0x10)
+    {
+        return 21;
+    }
+    else if (gMain.newKeys & 8)
+    {
+        return 24;
+    }
+    else if (gMain.newKeys & 1)
+    {
+        return 25;
+    }
+    else
+    {
+        return 17;
+    }
+}
+
+u16 sub_805530C(u16 a1)
+{
+    switch (a1)
+    {
+    case 21:
+        return 4;
+    case 20:
+        return 3;
+    case 19:
+        return 1;
+    case 18:
+        return 2;
+    default:
+        return 0;
+    }
+}
+
+void sub_8055340(u16 *a1)
+{
+    int i;
+    for (i = 0; i < 4; i++)
+        a1[i] = 17;
+}
+
+void sub_8055354(void)
+{
+    u8 val = gUnknown_03004860;
+    sub_8055218(word_3002910, val);
+    sub_8055280(gUnknown_03000584(val));
+    sub_8055340(word_3002910);
+}
+
+u16 sub_8055390(u32 a1)
+{
+    if (ScriptContext2_IsEnabled() == 1)
+        return 17;
+    if (gLink.recvQueue.count > 4)
+        return 27;
+    if (gLink.sendQueue.count <= 4)
+        return sub_80552B0(a1);
+    return 28;
+}
+
+u16 sub_80553E0(u32 a1)
+{
+    return 17;
+}
+
+u16 sub_80553E4(u32 a1)
+{
+    u16 retVal;
+    if (ScriptContext2_IsEnabled() == 1)
+    {
+        retVal = 17;
+    }
+    else
+    {
+        retVal = 26;
+        sub_80543DC(sub_80553E0);
+    }
+    return retVal;
+}
+
+u16 sub_8055408(u32 a1)
+{
+    u16 retVal;
+    if (gLink.recvQueue.count > 2)
+    {
+        retVal = 17;
+    }
+    else
+    {
+        retVal = 26;
+        ScriptContext2_Disable();
+        sub_80543DC(sub_80553E0);
+    }
+    return retVal;
+}
+
+u16 sub_8055438(u32 a1)
+{
+    u16 retVal;
+    if (gLink.sendQueue.count > 2)
+    {
+        retVal = 17;
+    }
+    else
+    {
+        retVal = 26;
+        ScriptContext2_Disable();
+        sub_80543DC(sub_80553E0);
+    }
+    return retVal;
+}
+
+u16 sub_8055468(u32 a1)
+{
+    return 17;
+}
+
+u16 sub_805546C(u32 linkPlayerId)
+{
+    if (gUnknown_03000580[linkPlayerId] == 0x82 && (gMain.newKeys & B_BUTTON))
+    {
+        sub_80543DC(sub_8055468);
+        return 29;
+    }
+    else
+    {
+        return 17;
+    }
+}
+
+u16 sub_80554A4(u32 a1)
+{
+    sub_80543DC(sub_805546C);
+    return 22;
+}
+
+u16 sub_80554B8(u32 a1)
+{
+    return 17;
+}
+
+u16 sub_80554BC(u32 a1)
+{
+    if (sub_8054F88(0x83) == TRUE)
+    {
+        ScriptContext1_SetupScript(gUnknown_081A4508);
+        sub_80543DC(sub_80554B8);
+    }
+    return 17;
+}
+
+u16 sub_80554E4(u32 a1)
+{
+    sub_80543DC(sub_80554BC);
+    return 23;
+}
+
+u32 sub_80554F8(void)
+{
+    if (sub_8054FC0(0x83) == TRUE)
+        return 2;
+    if (gUnknown_03000584 == sub_805546C && gUnknown_03000580[gUnknown_03004860] != 0x82)
+        return 0;
+    if (gUnknown_03000584 == sub_8055468 && gUnknown_03000580[gUnknown_03004860] == 0x81)
+        return 2;
+    return sub_8054F88(0x82);
+}
+
+bool32 unref_sub_8055568(void)
+{
+    return sub_8054FC0(0x83);
+}
+
+u16 sub_8055574(void)
+{
+    sub_80543DC(sub_80554A4);
+    return 0;
+}
+
+u16 sub_8055588(void)
+{
+    sub_80543DC(sub_80553E4);
+    return 0;
+}
+
+u16 sub_805559C(void)
+{
+    sub_80543DC(sub_80554E4);
+    return 0;
+}
+
+void sub_80555B0(int linkPlayerId, int a2, struct UnkStruct_8054FF8 *a3)
+{
+    s16 x, y;
+
+    a3->a = linkPlayerId;
+    a3->b = (linkPlayerId == a2) ? 1 : 0;
+    a3->c = gLinkPlayerMapObjects[linkPlayerId].mode;
+    a3->d = sub_8055B30(linkPlayerId);
+    sub_8055B08(linkPlayerId, &x, &y);
+    a3->sub.x = x;
+    a3->sub.y = y;
+    a3->sub.height = sub_8055B50(linkPlayerId);
+    a3->field_C = MapGridGetMetatileBehaviorAt(x, y);
+}
+
+bool32 sub_8055618(struct UnkStruct_8054FF8 *a1)
+{
+    u8 v1 = a1->c;
+    if (v1 == 2 || v1 == 0)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+bool32 sub_8055630(struct UnkStruct_8054FF8 *a1)
+{
+    u8 v1 = a1->c;
+    if (v1 == 2 || v1 == 0)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+u8 *sub_8055648(struct UnkStruct_8054FF8 *a1)
+{
+    if (a1->c != 2)
+        return 0;
+    return sub_8068E24(&a1->sub);
+}
+
+bool32 sub_8055660(struct UnkStruct_8054FF8 *a1)
+{
+    if (a1->c != 2 && a1->c != 0)
+        return FALSE;
+    if (!MetatileBehavior_IsSouthArrowWarp(a1->field_C))
+        return FALSE;
+    if (a1->d != 1)
+        return FALSE;
+    return TRUE;
+}
+
+u8 *sub_805568C(struct UnkStruct_8054FF8 *a1)
+{
+    struct MapPosition unkStruct;
+    u8 linkPlayerId;
+
+    if (a1->c && a1->c != 2)
+        return 0;
+
+    unkStruct = a1->sub;
+    unkStruct.x += gUnknown_0821664C[a1->d].x;
+    unkStruct.y += gUnknown_0821664C[a1->d].y;
+    unkStruct.height = 0;
+    linkPlayerId = GetLinkPlayerIdAt(unkStruct.x, unkStruct.y);
+
+    if (linkPlayerId != 4)
+    {
+        if (!a1->b)
+            return TradeRoom_TooBusyToNotice;
+        if (gUnknown_03000580[linkPlayerId] != 0x80)
+            return TradeRoom_TooBusyToNotice;
+        if (!sub_8083BF4(linkPlayerId))
+            return TradeRoom_ReadTrainerCard1;
+        else
+            return TradeRoom_ReadTrainerCard2;
+    }
+
+    return sub_80682A8(&unkStruct, a1->field_C, a1->d);
+}
+
+u16 sub_8055758(u8 *script)
+{
+    if (script == DoubleBattleColosseum_EventScript_1A4383)
+        return 10;
+    if (script == DoubleBattleColosseum_EventScript_1A439E)
+        return 9;
+    if (script == DoubleBattleColosseum_EventScript_1A43B9)
+        return 10;
+    if (script == DoubleBattleColosseum_EventScript_1A43D4)
+        return 9;
+    if (script == RecordCorner_EventScript_1A4418)
+        return 10;
+    if (script == RecordCorner_EventScript_1A442D)
+        return 9;
+    if (script == RecordCorner_EventScript_1A4442)
+        return 10;
+    if (script == RecordCorner_EventScript_1A4457)
+        return 9;
+    if (script == SingleBattleColosseum_EventScript_1A436F)
+        return 10;
+    if (script == SingleBattleColosseum_EventScript_1A4379)
+        return 9;
+    if (script == TradeCenter_EventScript_1A43F0)
+        return 10;
+    if (script == TradeCenter_EventScript_1A43FA)
+        return 9;
+    return 0;
+}
+
+void sub_80557E8(void)
+{
+    ScriptContext2_Enable();
+}
+
+void sub_80557F4(void)
+{
+    PlaySE(SE_WIN_OPEN);
+    sub_8071310();
+    ScriptContext2_Enable();
+}
+
+void sub_8055808(u8 *script)
+{
+    PlaySE(SE_SELECT);
+    ScriptContext1_SetupScript(script);
+    ScriptContext2_Enable();
+}
+
+void sub_8055824(void)
+{
+    PlaySE(SE_WIN_OPEN);
+    ScriptContext1_SetupScript(TradeRoom_PromptToCancelLink);
+    ScriptContext2_Enable();
+}
+
+void sub_8055840(u8 *script)
+{
+    PlaySE(SE_SELECT);
+    ScriptContext1_SetupScript(script);
+    ScriptContext2_Enable();
+}
+
+void sub_805585C(void)
+{
+    ScriptContext1_SetupScript(TradeRoom_TerminateLink);
+    ScriptContext2_Enable();
+}
+
+bool32 sub_8055870(void)
+{
+    if (!is_c1_link_related_active())
+        return 0;
+    if (gLink.recvQueue.count >= 3)
+        gUnknown_03000588 = 1;
+    else
+        gUnknown_03000588 = 0;
+    return gUnknown_03000588;
+}
+
+bool32 sub_80558AC(void)
+{
+    u8 temp;
+
+    if (is_c1_link_related_active() != TRUE)
+        return FALSE;
+
+    if (sub_8007B24() != TRUE)
+        return FALSE;
+
+    if (gUnknown_03000584 == sub_8055408)
+        return TRUE;
+
+    if (gUnknown_03000584 != sub_80553E4)
+        return FALSE;
+
+    temp = gUnknown_03000588;
+    gUnknown_03000588 = 0;
+
+    if (temp == TRUE)
+        return TRUE;
+
+    if (gPaletteFade.active && gPaletteFade.softwareFadeFinishing)
+        return TRUE;
+
+    return FALSE;
+}
+
+bool32 sub_8055910(void)
+{
+    if (is_c1_link_related_active() != TRUE)
+        return FALSE;
+
+    if (sub_8007B24() != TRUE)
+        return FALSE;
+
+    if (gUnknown_03000584 == sub_8055438)
+        return TRUE;
+
+    return FALSE;
+}
+
+bool32 sub_8055940(void)
+{
+    if (!sub_8007B24())
+        return FALSE;
+    return TRUE;
+}
+
+void ZeroLinkPlayerMapObject(struct LinkPlayerMapObject *linkPlayerMapObj)
+{
+    memset(linkPlayerMapObj, 0, sizeof(struct LinkPlayerMapObject));
+}
+
+void strange_npc_table_clear(void)
+{
+    memset(gLinkPlayerMapObjects, 0, sizeof(gLinkPlayerMapObjects));
+}
+
+void ZeroMapObject(struct MapObject *mapObj)
+{
+    memset(mapObj, 0, sizeof(struct MapObject));
+}
+
+void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4)
+{
+    u8 mapObjId = sub_805AB54();
+    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
+    struct MapObject *mapObj = &gMapObjects[mapObjId];
+
+    ZeroLinkPlayerMapObject(linkPlayerMapObj);
+    ZeroMapObject(mapObj);
+
+    linkPlayerMapObj->active = 1;
+    linkPlayerMapObj->linkPlayerId = linkPlayerId;
+    linkPlayerMapObj->mapObjId = mapObjId;
+    linkPlayerMapObj->mode = 0;
+
+    mapObj->active = 1;
+    mapObj->mapobj_bit_1 = a4;
+    mapObj->mapobj_unk_19 = 2;
+    mapObj->spriteId = 64;
+
+    InitLinkPlayerMapObjectPos(mapObj, x, y);
+}
+
+void InitLinkPlayerMapObjectPos(struct MapObject *mapObj, s16 x, s16 y)
+{
+    mapObj->coords2.x = x;
+    mapObj->coords2.y = y;
+    mapObj->coords3.x = x;
+    mapObj->coords3.y = y;
+    sub_80603CC(x, y, &mapObj->coords1.x, &mapObj->coords1.y);
+    mapObj->coords1.x += 8;
+    FieldObjectUpdateZCoord(mapObj);
+}
+
+void unref_sub_8055A6C(u8 linkPlayerId, u8 a2)
+{
+    if (gLinkPlayerMapObjects[linkPlayerId].active)
+    {
+        u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
+        struct MapObject *mapObj = &gMapObjects[mapObjId];
+        mapObj->mapobj_unk_19 = a2;
+    }
+}
+
+void unref_sub_8055A9C(u8 linkPlayerId)
+{
+    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
+    u8 mapObjId = linkPlayerMapObj->mapObjId;
+    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    if (mapObj->spriteId != 64 )
+        DestroySprite(&gSprites[mapObj->spriteId]);
+    linkPlayerMapObj->active = 0;
+    mapObj->active = 0;
+}
+
+u8 sub_8055AE8(u8 linkPlayerId)
+{
+    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
+    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    return mapObj->spriteId;
+}
+
+void sub_8055B08(u8 linkPlayerId, u16 *x, u16 *y)
+{
+    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
+    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    *x = mapObj->coords2.x;
+    *y = mapObj->coords2.y;
+}
+
+u8 sub_8055B30(u8 linkPlayerId)
+{
+    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
+    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    return mapObj->mapobj_unk_19;
+}
+
+u8 sub_8055B50(u8 linkPlayerId)
+{
+    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
+    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    return mapObj->mapobj_unk_0B_0;
+}
+
+s32 unref_sub_8055B74(u8 linkPlayerId)
+{
+    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
+    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    return 16 - (s8)mapObj->mapobj_unk_21;
+}
+
+u8 GetLinkPlayerIdAt(s16 x, s16 y)
+{
+    u8 i;
+    for (i = 0; i < 4; i++)
+    {
+        if (gLinkPlayerMapObjects[i].active
+         && (gLinkPlayerMapObjects[i].mode == 0 || gLinkPlayerMapObjects[i].mode == 2))
+        {
+            struct MapObject *mapObj = &gMapObjects[gLinkPlayerMapObjects[i].mapObjId];
+            if (mapObj->coords2.x == x && mapObj->coords2.y == y)
+                return i;
+        }
+    }
+    return 4;
+}
+
+void sub_8055BFC(u8 linkPlayerId, u8 a2)
+{
+    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
+    u8 mapObjId = linkPlayerMapObj->mapObjId;
+    struct MapObject *mapObj = &gMapObjects[mapObjId];
+
+    if (linkPlayerMapObj->active)
+    {
+        if (a2 > 10)
+            mapObj->mapobj_bit_2 = 1;
+        else
+            gUnknown_082166D8[gUnknown_082166A0[linkPlayerMapObj->mode](linkPlayerMapObj, mapObj, a2)](linkPlayerMapObj, mapObj);
+    }
+}
+
+static u8 sub_8055C68(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+{
+    return gUnknown_082166AC[a3](linkPlayerMapObj, mapObj, a3);
+}
+
+static u8 sub_8055C88(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+{
+    return 1;
+}
+
+static u8 sub_8055C8C(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+{
+    return gUnknown_082166AC[a3](linkPlayerMapObj, mapObj, a3);
+}
+
+static u8 sub_8055CAC(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+{
+    return 0;
+}
+
+static u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+{
+    s16 x, y;
+
+    mapObj->mapobj_unk_19 = npc_something3(a3, mapObj->mapobj_unk_19);
+    FieldObjectMoveDestCoords(mapObj, mapObj->mapobj_unk_19, &x, &y);
+
+    if (LinkPlayerDetectCollision(linkPlayerMapObj->mapObjId, mapObj->mapobj_unk_19, x, y))
+    {
+        return 0;
+    }
+    else
+    {
+        mapObj->mapobj_unk_21 = 16;
+        npc_coords_shift(mapObj, x, y);
+        FieldObjectUpdateZCoord(mapObj);
+        return 1;
+    }
+}
+
+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;
+}
+
+static void sub_8055D30(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+{
+    linkPlayerMapObj->mode = 0;
+}
+
+static void sub_8055D38(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+{
+    mapObj->mapobj_unk_21--;
+    linkPlayerMapObj->mode = 1;
+    MoveCoords(mapObj->mapobj_unk_19, &mapObj->coords1.x, &mapObj->coords1.y);
+    if (!mapObj->mapobj_unk_21)
+    {
+        npc_coords_shift_still(mapObj);
+        linkPlayerMapObj->mode = 2;
+    }
+}
+
+u8 npc_something3(u8 a1, u8 a2)
+{
+    switch (a1 - 1)
+    {
+    case 0:
+    case 6:
+        return 2;
+    case 1:
+    case 7:
+        return 1;
+    case 2:
+    case 8:
+        return 3;
+    case 3:
+    case 9:
+        return 4;
+    }
+    return a2;
+}
+
+u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y)
+{
+    u8 i;
+    for (i = 0; i < 16; i++)
+    {
+        if (i != selfMapObjId)
+        {
+            if ((gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y)
+             || (gMapObjects[i].coords3.x == x && gMapObjects[i].coords3.y == y))
+            {
+                return 1;
+            }
+        }
+    }
+    return MapGridIsImpassableAt(x, y);
+}
+
+void CreateLinkPlayerSprite(u8 linkPlayerId)
+{
+    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
+    u8 mapObjId = linkPlayerMapObj->mapObjId;
+    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    struct Sprite *sprite;
+
+    if (linkPlayerMapObj->active)
+    {
+        u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(0, mapObj->mapobj_bit_1);
+        mapObj->spriteId = AddPseudoFieldObject(val, SpriteCB_LinkPlayer, 0, 0, 0);
+        sprite = &gSprites[mapObj->spriteId];
+        sprite->coordOffsetEnabled = TRUE;
+        sprite->data0 = linkPlayerId;
+        mapObj->mapobj_bit_2 = 0;
+    }
+}
+
+void SpriteCB_LinkPlayer(struct Sprite *sprite)
+{
+    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[sprite->data0];
+    struct MapObject *mapObj = &gMapObjects[linkPlayerMapObj->mapObjId];
+    sprite->pos1.x = mapObj->coords1.x;
+    sprite->pos1.y = mapObj->coords1.y;
+    SetObjectSubpriorityByZCoord(mapObj->elevation, sprite, 1);
+    sprite->oam.priority = ZCoordToPriority(mapObj->elevation);
+    if (!linkPlayerMapObj->mode)
+        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObj->mapobj_unk_19));
+    else
+        StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(mapObj->mapobj_unk_19));
+    sub_806487C(sprite, 0);
+    if (mapObj->mapobj_bit_2)
+    {
+        sprite->invisible = ((sprite->data7 & 4) >> 2);
+        sprite->data7++;
+    }
+}
diff --git a/src/field/player_pc.c b/src/field/player_pc.c
index 6d52c560a..83e6dd221 100644
--- a/src/field/player_pc.c
+++ b/src/field/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/field/pokeblock.c b/src/field/pokeblock.c
index 029bb066f..d69c41639 100644
--- a/src/field/pokeblock.c
+++ b/src/field/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/field/region_map.c b/src/field/region_map.c
index 7ca7e809f..bfd2729c2 100644
--- a/src/field/region_map.c
+++ b/src/field/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/field/safari_zone.c b/src/field/safari_zone.c
index a47c8e951..14fd1ddc4 100644
--- a/src/field/safari_zone.c
+++ b/src/field/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/field/scrcmd.c b/src/field/scrcmd.c
index 66578f350..31a90158a 100644
--- a/src/field/scrcmd.c
+++ b/src/field/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/field/script_menu.c b/src/field/script_menu.c
index 6e1a12a60..e25e74d8c 100644
--- a/src/field/script_menu.c
+++ b/src/field/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/field/script_movement.c b/src/field/script_movement.c
index e25b60a3c..30e10b451 100644
--- a/src/field/script_movement.c
+++ b/src/field/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/field/secret_base.c b/src/field/secret_base.c
index 4e8331f5c..b2cd1f094 100644
--- a/src/field/secret_base.c
+++ b/src/field/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/field/shop.c b/src/field/shop.c
index 6a88f1394..22250b1c4 100644
--- a/src/field/shop.c
+++ b/src/field/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/field/start_menu.c b/src/field/start_menu.c
index 411690aff..6e44090df 100644
--- a/src/field/start_menu.c
+++ b/src/field/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/field/trainer_see.c b/src/field/trainer_see.c
index feb35c67c..5a8ebbafc 100644
--- a/src/field/trainer_see.c
+++ b/src/field/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/field/tv.c b/src/field/tv.c
index 996709209..734cbad6f 100644
--- a/src/field/tv.c
+++ b/src/field/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;
@@ -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)
     {
diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c
index 0c8f59959..be3003680 100644
--- a/src/field/use_pokeblock.c
+++ b/src/field/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/field/wild_encounter.c b/src/field/wild_encounter.c
index 7001c2eaa..390898917 100644
--- a/src/field/wild_encounter.c
+++ b/src/field/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;