lots more renaming

22 files changed, 184 insertions, 167 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 5e2763653..80f3cd40a 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1040,7 +1040,7 @@ EventScript_19F8F2:
 	waittext
 	waitbutton
 	reptrainerbattle
-	specialval RESULT, sub_8082558
+	specialval RESULT, ScrSpecial_GetTrainerBattleMode
 	compare RESULT, 0
 	jumpeq EventScript_19F934
 	compare RESULT, 2
diff --git a/data/specials.inc b/data/specials.inc
index 891d2cfd7..ae2a4d8ef 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -58,7 +58,7 @@ gSpecials::
 	def_special FieldObjectInteractionWaterBerryTree
 	def_special PlayerHasBerries
 	def_special IsEnigmaBerryValid
-	def_special sub_8082558
+	def_special ScrSpecial_GetTrainerBattleMode
 	def_special sub_80826D8
 	def_special sub_8082718
 	def_special sub_8082564
diff --git a/include/battle_setup.h b/include/battle_setup.h
index e3fa3bb88..9857092c7 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -85,7 +85,7 @@ u8 *TrainerBattleConfigure(const u8 *data);
 void TrainerWantsBattle(u8, u8 *);
 bool32 GetTrainerFlagFromScriptPointer(u8 *data);
 //void sub_8082524(void);
-//u8 sub_8082558(void);
+//u8 ScrSpecial_GetTrainerBattleMode(void);
 //u8 sub_8082564(void);
 //void sub_808257C(void);
 //void unref_sub_8082590(void); // unused
diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h
index f7352be22..9fb57743e 100644
--- a/include/map_obj_lock.h
+++ b/include/map_obj_lock.h
@@ -7,7 +7,7 @@ bool8 sub_8064CFC(void);
 void ScriptFreezeMapObjects(void);
 void sub_8064D38(u8 taskId);
 bool8 sub_8064DB4(void);
-void sub_8064DD8(void);
+void LockSelectedMapObject(void);
 void sub_8064E2C(void);
 void unref_sub_8064E5C(void);
 void sub_8064EAC(void);
diff --git a/include/menu.h b/include/menu.h
index 24ac39762..bdf59b8f0 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -59,7 +59,7 @@ void sub_807274C(u8, u8, u8, u8, const struct MenuAction[], u8, u32);
 s8 sub_80727CC(void);
 u8 sub_807288C(u8);
 void PrintMenuItems(u8, u8, u8, const struct MenuAction[]);
-void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], const u8 *order);
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order);
 void InitYesNoMenu(u8, u8, u8);
 void DisplayYesNoMenu(u8, u8, u32);
 s8 ProcessMenuInputNoWrap_(void);
diff --git a/include/rom4.h b/include/rom4.h
index 74b83fa65..a319c6219 100644
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -97,14 +97,14 @@ void sav1_set_battle_music_maybe(u16);
 void sav1_reset_battle_music_maybe(void);
 void sub_8053F0C(void);
 void sub_8053F84(void);
-void sub_8053FB0(u16);
+void ChangeMapMusic(u16);
 // is_warp1_light_level_8_or_9
 void sub_8053FF8(void);
 bool8 sub_8054034(void);
 void sub_8054044(void);
-// sub_8054050
-void sub_80540D0(s16 *, u16 *);
-void sub_8054164(void);
+// PlayAmbientCry
+void UpdateAmbientCry(s16 *, u16 *);
+void ChooseAmbientCrySpecies(void);
 u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum);
 // get_map_light_level_from_warp
 u8 sav1_map_get_light_level(void);
diff --git a/include/script_movement.h b/include/script_movement.h
index e3cdc25b3..dc6d7e51b 100644
--- a/include/script_movement.h
+++ b/include/script_movement.h
@@ -1,8 +1,8 @@
 #ifndef GUARD_SCRIPT_MOVEMENT_H
 #define GUARD_SCRIPT_MOVEMENT_H
 
-bool8 exec_movement(u8, u8, u8, u8 *);
-bool8 sub_80A212C(u8, u8, u8);
+bool8 ScriptMovement_StartObjectMovementScript(u8, u8, u8, u8 *);
+bool8 ScriptMovement_IsObjectMovementFinished(u8, u8, u8);
 void sub_80A2178(void);
 
 #endif // GUARD_SCRIPT_MOVEMENT_H
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 4618095d3..388a08e03 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1025,7 +1025,7 @@ void sub_8082524(void)
     npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->mapobj_unk_18));
 }
 
-u8 sub_8082558(void)
+u8 ScrSpecial_GetTrainerBattleMode(void)
 {
     return sTrainerBattleMode;
 }
diff --git a/src/bike.c b/src/bike.c
index 58a4f38f4..eaaf17a71 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -944,7 +944,7 @@ void GetOnOffBike(u8 var)
     {
         SetPlayerAvatarTransitionFlags(var);
         sav1_set_battle_music_maybe(BGM_CYCLING);
-        sub_8053FB0(BGM_CYCLING);
+        ChangeMapMusic(BGM_CYCLING);
     }
 }
 
diff --git a/src/field_effect.c b/src/field_effect.c
index 2f8200708..168962ca1 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2881,7 +2881,7 @@ u8 FldEff_UseSurf(void)
     taskId = CreateTask(sub_8088954, 0xff);
     gTasks[taskId].data[15] = gFieldEffectArguments[0];
     sav1_reset_battle_music_maybe();
-    sub_8053FB0(0x016d);
+    ChangeMapMusic(0x016d);
     return FALSE;
 }
 
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index e29e17ae7..782734abe 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -8303,12 +8303,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 +8464,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_special_scene.c b/src/field_special_scene.c
index 82a7a13e3..c9b7ee363 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -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,12 +294,12 @@ 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;
diff --git a/src/field_tasks.c b/src/field_tasks.c
index caf2ce6b9..d8c07b67d 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -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/map_obj_lock.c b/src/map_obj_lock.c
index bd40bcacc..2856320b8 100644
--- a/src/map_obj_lock.c
+++ b/src/map_obj_lock.c
@@ -75,7 +75,7 @@ bool8 sub_8064DB4(void)
     }
 }
 
-void sub_8064DD8(void)
+void LockSelectedMapObject(void)
 {
     u8 taskId;
     FreezeMapObjectsExceptOne(gSelectedMapObject);
diff --git a/src/menu.c b/src/menu.c
index c2909f82f..31bafa509 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -571,7 +571,7 @@ void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction m
         MenuPrint(menuItems[i].text, left, top + 2 * i);
 }
 
-void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], const u8 *order)
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order)
 {
     u8 i;
 
diff --git a/src/player_pc.c b/src/player_pc.c
index 6d52c560a..64e2734db 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -106,7 +106,7 @@ static const u8 *const gPCText_OptionDescList[] =
     gMenuText_GoBackToPrev
 };
 
-static const struct MenuAction2 gPCText_PlayerPCOptionsText[] =
+static const struct MenuAction2 sPlayerPCMenuActions[] =
 {
     { SecretBaseText_ItemStorage, PlayerPC_ItemStorage },
     { gPCText_Mailbox, PlayerPC_Mailbox },
@@ -226,7 +226,7 @@ void PlayerPC(void)
 static void InitPlayerPCMenu(u8 taskId)
 {
     MenuDrawTextWindow(0, 0, 10, gPcItemMenuOptionsNum * 2 + 1);
-    PrintMenuItemsReordered(1, 1, gPcItemMenuOptionsNum, (struct MenuAction *)gPCText_PlayerPCOptionsText, gPcItemMenuOptionOrder);
+    PrintMenuItemsReordered(1, 1, gPcItemMenuOptionsNum, sPlayerPCMenuActions, gPcItemMenuOptionOrder);
     InitMenu(0, 1, 1, gPcItemMenuOptionsNum, 0, 9);
     TASK.FUNC = PlayerPCProcessMenuInput;
 }
@@ -247,13 +247,13 @@ static void PlayerPCProcessMenuInput(u8 taskId)
     {
         HandleDestroyMenuCursors();
         PlaySE(SE_SELECT);
-        gPCText_PlayerPCOptionsText[gPcItemMenuOptionOrder[GetMenuCursorPos()]].func(taskId);
+        sPlayerPCMenuActions[gPcItemMenuOptionOrder[GetMenuCursorPos()]].func(taskId);
     }
     else if (gMain.newKeys & B_BUTTON)
     {
         HandleDestroyMenuCursors();
         PlaySE(SE_SELECT);
-        gPCText_PlayerPCOptionsText[gPcItemMenuOptionsNum[gPcItemMenuOptionOrder - 1]].func(taskId); // run EXIT.
+        sPlayerPCMenuActions[gPcItemMenuOptionsNum[gPcItemMenuOptionOrder - 1]].func(taskId); // run EXIT.
     }
 }
 
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 029bb066f..9f74a0cf4 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -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/pokemon_menu.c b/src/pokemon_menu.c
index 0fc79f711..36144ae7c 100644
--- a/src/pokemon_menu.c
+++ b/src/pokemon_menu.c
@@ -121,32 +121,32 @@ void (*gUnknown_03005CE4)(void);
 
 // const data
 
-static const struct MenuAction sPokemonMenuActions[] =
-{
-    {OtherText_Summary, (void*) PokemonMenu_Summary},
-    {OtherText_Switch2, (void*) PokemonMenu_Switch},
-    {OtherText_Item, (void*) PokemonMenu_Item},
-    {gOtherText_CancelNoTerminator, (void*) PokemonMenu_Cancel},
-    {OtherText_Give2, (void*) PokemonMenu_GiveItem},
-    {OtherText_Take2, (void*) PokemonMenu_TakeItem},
-    {OtherText_Take, (void*) PokemonMenu_TakeMail},
-    {OtherText_Mail, (void*) PokemonMenu_Mail},
-    {OtherText_Read2, (void*) PokemonMenu_ReadMail},
-    {gOtherText_CancelNoTerminator, (void*) PokemonMenu_CancelSubmenu},
-    {gMoveNames[MOVE_CUT], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_FLASH], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_ROCK_SMASH], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_STRENGTH], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_SURF], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_FLY], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_DIVE], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_WATERFALL], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_TELEPORT], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_DIG], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_SECRET_POWER], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_MILK_DRINK], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_SOFT_BOILED], (void*) PokemonMenu_FieldMove},
-    {gMoveNames[MOVE_SWEET_SCENT], (void*) PokemonMenu_FieldMove},
+static const struct MenuAction2 sPokemonMenuActions[] =
+{
+    {OtherText_Summary,             PokemonMenu_Summary},
+    {OtherText_Switch2,             PokemonMenu_Switch},
+    {OtherText_Item,                PokemonMenu_Item},
+    {gOtherText_CancelNoTerminator, PokemonMenu_Cancel},
+    {OtherText_Give2,               PokemonMenu_GiveItem},
+    {OtherText_Take2,               PokemonMenu_TakeItem},
+    {OtherText_Take,                PokemonMenu_TakeMail},
+    {OtherText_Mail,                PokemonMenu_Mail},
+    {OtherText_Read2,               PokemonMenu_ReadMail},
+    {gOtherText_CancelNoTerminator, PokemonMenu_CancelSubmenu},
+    {gMoveNames[MOVE_CUT],          PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_FLASH],        PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_ROCK_SMASH],   PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_STRENGTH],     PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SURF],         PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_FLY],          PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_DIVE],         PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_WATERFALL],    PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_TELEPORT],     PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_DIG],          PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SECRET_POWER], PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_MILK_DRINK],   PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SOFT_BOILED],  PokemonMenu_FieldMove},
+    {gMoveNames[MOVE_SWEET_SCENT],  PokemonMenu_FieldMove},
 };
 
 static const u16 sPokeMenuFieldMoves[] =
@@ -227,14 +227,14 @@ static void sub_8089A8C(void)
     }
 }
 
-static void sub_8089BDC(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction* menuActions, const u8* order, u8 arg6)
+static void sub_8089BDC(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order, u8 arg6)
 {
     sub_806D538(5, arg6);
     MenuDrawTextWindow(arg0, arg1, arg0 + arg2, (noOfOptions * 2) + arg1 + 1);
     PrintMenuItemsReordered(arg0 + 1, arg1 + 1, noOfOptions, menuActions, order);
 }
 
-void sub_8089C50(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction* menuActions, const u8* order)
+void sub_8089C50(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order)
 {
     sub_8089BDC(arg0, arg1, arg2, noOfOptions, menuActions, order, 1);
 }
@@ -390,7 +390,7 @@ static void sub_808A060(u8 taskID)
     if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
-        PartyMenuGetPopupMenuFunc(0, &sUnknown_0839F578, (void*) sPokemonMenuActions, sPokeMenuCursorPos)(taskID);
+        PartyMenuGetPopupMenuFunc(0, &sUnknown_0839F578, (void *)sPokemonMenuActions, sPokeMenuCursorPos)(taskID);
     }
     else if (gMain.newKeys & B_BUTTON)
     {
@@ -706,23 +706,24 @@ static void PokemonMenu_CancelSubmenu(u8 taskID)
 #define IS_SURF(ID)((ID == (POKEMENU_SURF - POKEMENU_FIRST_FIELD_MOVE_ID)))
 #define IS_FLY(ID)((ID == (POKEMENU_FLY - POKEMENU_FIRST_FIELD_MOVE_ID)))
 
-#define TASK_FIELD_MOVE_ID  11
+#define tFieldMoveId data[11]
 
 static void PokemonMenu_FieldMove(u8 taskID)
 {
-    s16* taskData = gTasks[taskID].data;
+    s16* data = gTasks[taskID].data;
+
     HandleDestroyMenuCursors();
-    taskData[TASK_FIELD_MOVE_ID] = sPokeMenuOptionsOrder[sPokeMenuCursorPos] - POKEMENU_FIRST_FIELD_MOVE_ID;
+    tFieldMoveId = sPokeMenuOptionsOrder[sPokeMenuCursorPos] - POKEMENU_FIRST_FIELD_MOVE_ID;
     if (sub_80F9344() == TRUE)
     {
         MenuZeroFillWindowRect(19, 0, 29, 19);
-        if (IS_SOFTBOILED_MILKDRINK(taskData[TASK_FIELD_MOVE_ID]))
+        if (IS_SOFTBOILED_MILKDRINK(tFieldMoveId))
             sub_806D538(9, 0);
         else
-            sub_806D538(sFieldMoveFuncs[taskData[TASK_FIELD_MOVE_ID]].field_1, 0);
+            sub_806D538(sFieldMoveFuncs[tFieldMoveId].field_1, 0);
         gTasks[taskID].func = sub_808ABF4;
     }
-    else if (taskData[TASK_FIELD_MOVE_ID] <= 7 && FlagGet(BADGE01_GET + taskData[TASK_FIELD_MOVE_ID]) != TRUE)
+    else if (tFieldMoveId <= 7 && FlagGet(BADGE01_GET + tFieldMoveId) != TRUE)
     {
         // can't use a field HM move without a proper badge
         MenuZeroFillWindowRect(19, 0, 29, 19);
@@ -732,10 +733,10 @@ static void PokemonMenu_FieldMove(u8 taskID)
     }
     else
     {
-        if (sFieldMoveFuncs[taskData[TASK_FIELD_MOVE_ID]].func() == TRUE)
+        if (sFieldMoveFuncs[tFieldMoveId].func() == TRUE)
         {
             sPokeMenuCursorPos = 0;
-            if (!IS_SOFTBOILED_MILKDRINK(taskData[TASK_FIELD_MOVE_ID]))
+            if (!IS_SOFTBOILED_MILKDRINK(tFieldMoveId))
             {
                 gTasks[taskID].func = sub_808AB34;
                 BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
@@ -746,10 +747,10 @@ static void PokemonMenu_FieldMove(u8 taskID)
         else
         {
             MenuZeroFillWindowRect(19, 0, 29, 19);
-            if (IS_SURF(taskData[TASK_FIELD_MOVE_ID]) && TestPlayerAvatarFlags(8))
+            if (IS_SURF(tFieldMoveId) && TestPlayerAvatarFlags(8))
                 sub_806D538(8, 0);
             else
-                sub_806D538(sFieldMoveFuncs[taskData[TASK_FIELD_MOVE_ID]].field_1, 0);
+                sub_806D538(sFieldMoveFuncs[tFieldMoveId].field_1, 0);
             gTasks[taskID].func = sub_808ABF4;
         }
     }
@@ -768,7 +769,7 @@ static void sub_808AB34(u8 taskID)
 {
     if (!gPaletteFade.active)
     {
-        if (!IS_FLY(gTasks[taskID].data[TASK_FIELD_MOVE_ID]) || ShouldDoBrailleFlyEffect())
+        if (!IS_FLY(gTasks[taskID].tFieldMoveId) || ShouldDoBrailleFlyEffect())
             SetMainCallback2(c2_exit_to_overworld_2_switch);
         else
             SetMainCallback2(CB2_InitFlyRegionMap);
@@ -776,6 +777,8 @@ static void sub_808AB34(u8 taskID)
     }
 }
 
+#undef tFieldMoveId
+
 void sub_808AB90(void)
 {
     pal_fill_black();
diff --git a/src/rom4.c b/src/rom4.c
index fd0cdbcde..69faec2ca 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -40,6 +40,7 @@
 #include "secret_base.h"
 #include "songs.h"
 #include "sound.h"
+#include "species.h"
 #include "start_menu.h"
 #include "task.h"
 #include "tileset_anim.h"
@@ -65,8 +66,8 @@ EWRAM_DATA struct WarpData gUnknown_020297F8 = {0};
 EWRAM_DATA struct WarpData gUnknown_02029800 = {0};
 EWRAM_DATA struct WarpData gUnknown_02029808 = {0};
 EWRAM_DATA struct UnkPlayerStruct gUnknown_02029810 = {0};
-EWRAM_DATA u16 gUnknown_02029814 = 0;
-EWRAM_DATA bool8 gUnknown_02029816 = FALSE;
+EWRAM_DATA static u16 sAmbientCrySpecies = 0;
+EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE;
 EWRAM_DATA struct LinkPlayerMapObject gLinkPlayerMapObjects[4] = {0};
 
 static u8 gUnknown_03000580[4];
@@ -132,6 +133,7 @@ void flag_var_implications_of_teleport_(void)
     FlagReset(SYS_USE_FLASH);
 }
 
+// not new_game
 void new_game(void)
 {
     player_avatar_init_params_reset();
@@ -166,7 +168,7 @@ void sub_8053050(void)
 void sub_805308C(void)
 {
     FlagReset(SYS_SAFARI_MODE);
-    sub_8054164();
+    ChooseAmbientCrySpecies();
     ResetCyclingRoadChallengeData();
     UpdateLocationHistoryForRoamer();
     RoamerMoveToOtherLocationSet();
@@ -301,31 +303,27 @@ bool32 warp_data_is_not_neg_1(struct WarpData *warp)
     return TRUE;
 }
 
-struct MapHeader * const get_mapheader_by_bank_and_number(u16 mapGroup, u16 mapNum)
+struct MapHeader *const get_mapheader_by_bank_and_number(u16 mapGroup, u16 mapNum)
 {
     return gMapGroups[mapGroup][mapNum];
 }
 
-struct MapHeader * const warp1_get_mapheader(void)
+struct MapHeader *const warp1_get_mapheader(void)
 {
     return get_mapheader_by_bank_and_number(gUnknown_020297F8.mapGroup, gUnknown_020297F8.mapNum);
 }
 
 void set_current_map_header_from_sav1_save_old_name(void)
 {
-    struct MapHeader *dest = &gMapHeader;
-    struct MapHeader *src = get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
-    *dest = *src;
-    gSaveBlock1.mapDataId = dest->mapDataId;
-    dest->mapData = get_mapdata_header();
+    gMapHeader = *get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
+    gSaveBlock1.mapDataId = gMapHeader.mapDataId;
+    gMapHeader.mapData = get_mapdata_header();
 }
 
 void sub_805338C(void)
 {
-    struct MapHeader *dest = &gMapHeader;
-    struct MapHeader *src = get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
-    *dest = *src;
-    dest->mapData = get_mapdata_header();
+    gMapHeader = *get_mapheader_by_bank_and_number(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
+    gMapHeader.mapData = get_mapdata_header();
 }
 
 void sub_80533CC(void)
@@ -523,7 +521,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     sub_8082BD0(mapGroup, mapNum);
     DoTimeBasedEvents();
     sub_80806E4();
-    sub_8054164();
+    ChooseAmbientCrySpecies();
     sub_8053C98();
     sav1_reset_battle_music_maybe();
     mapheader_run_script_with_tag_x3();
@@ -559,7 +557,7 @@ void sub_8053994(u32 a1)
     if (a1 != 1)
         DoTimeBasedEvents();
     sub_80806E4();
-    sub_8054164();
+    ChooseAmbientCrySpecies();
     if (v2)
         FlagReset(SYS_USE_FLASH);
     sub_8053C98();
@@ -854,11 +852,11 @@ void sub_8053F84(void)
         FadeOutAndPlayNewMapMusic(sav1_map_get_music(), 8);
 }
 
-void sub_8053FB0(u16 music)
+void ChangeMapMusic(u16 newMusic)
 {
     u16 currentMusic = GetCurrentMapMusic();
-    if (currentMusic != music && currentMusic != LEGENDARY_MUSIC)
-        FadeOutAndPlayNewMapMusic(music, 8);
+    if (currentMusic != newMusic && currentMusic != LEGENDARY_MUSIC)
+        FadeOutAndPlayNewMapMusic(newMusic, 8);
 }
 
 u8 is_warp1_light_level_8_or_9(void)
@@ -890,43 +888,43 @@ void sub_8054044(void)
     FadeOutMapMusic(4);
 }
 
-void sub_8054050(void)
+static void PlayAmbientCry(void)
 {
     s16 x, y;
-    PlayerGetDestCoords((u16 *)&x, (u16 *)&y);
-    if (gUnknown_02029816 != TRUE
+    PlayerGetDestCoords(&x, &y);
+    if (sIsAmbientCryWaterMon != TRUE
      || MetatileBehavior_IsSurfableWaterOrUnderwater(MapGridGetMetatileBehaviorAt(x, y)))
     {
         s8 pan = (Random() % 88) + 212;
         s8 volume = (Random() % 30) + 50;
-        PlayCry2(gUnknown_02029814, pan, volume, 1);
+        PlayCry2(sAmbientCrySpecies, pan, volume, 1);
     }
 }
 
-void sub_80540D0(s16 *a1, u16 *a2)
+void UpdateAmbientCry(s16 *state, u16 *delayCounter)
 {
-    switch (*a1)
+    switch (*state)
     {
     case 0:
-        if (!gUnknown_02029814)
-            *a1 = 4;
+        if (sAmbientCrySpecies == SPECIES_NONE)
+            *state = 4;
         else
-            *a1 = 1;
+            *state = 1;
         break;
     case 1:
-        *a2 = (Random() % 2400) + 1200;
-        *a1 = 3;
+        *delayCounter = (Random() % 2400) + 1200;
+        *state = 3;
         break;
     case 2:
-        *a2 = (Random() % 1200) + 1200;
-        *a1 = 3;
+        *delayCounter = (Random() % 1200) + 1200;
+        *state = 3;
         break;
     case 3:
-        (*a2)--;
-        if (*a2 == 0)
+        (*delayCounter)--;
+        if (*delayCounter == 0)
         {
-            sub_8054050();
-            *a1 = 2;
+            PlayAmbientCry();
+            *state = 2;
         }
         break;
     case 4:
@@ -934,16 +932,16 @@ void sub_80540D0(s16 *a1, u16 *a2)
     }
 }
 
-void sub_8054164(void)
+void ChooseAmbientCrySpecies(void)
 {
     if ((gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 45) && !IsMirageIslandPresent())
     {
-        gUnknown_02029816 = TRUE;
-        gUnknown_02029814 = GetMirageIslandMon();
+        sIsAmbientCryWaterMon = TRUE;
+        sAmbientCrySpecies = GetMirageIslandMon();
     }
     else
     {
-        gUnknown_02029814 = GetLocalWildMon(&gUnknown_02029816);
+        sAmbientCrySpecies = GetLocalWildMon(&sIsAmbientCryWaterMon);
     }
 }
 
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 64ec485ce..1cacb7348 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -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));
+    ChangeMapMusic(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,53 +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);
-    sMovingNpcId = 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);
-    sMovingNpcId = 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(sMovingNpcId, sMovingNpcMapId, sMovingNpcMapBank);
+    return ScriptMovement_IsObjectMovementFinished(sMovingNpcId, sMovingNpcMapId, sMovingNpcMapBank);
 }
 
 bool8 ScrCmd_waitmove(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
-    if (v1)
-        sMovingNpcId = v1;
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
+
+    if (localId != 0)
+        sMovingNpcId = localId;
     sMovingNpcMapBank = gSaveBlock1.location.mapGroup;
     sMovingNpcMapId = gSaveBlock1.location.mapNum;
-    SetupNativeScript(ctx, s51a_0806B288);
+    SetupNativeScript(ctx, WaitForMovementFinish);
     return TRUE;
 }
 
 bool8 ScrCmd_waitmovexy(struct ScriptContext *ctx)
 {
-    u16 v1 = VarGet(ScriptReadHalfword(ctx));
+    u16 localId = VarGet(ScriptReadHalfword(ctx));
     u8 mapBank;
     u8 mapId;
 
-    if (v1 != 0)
-        sMovingNpcId = v1;
+    if (localId != 0)
+        sMovingNpcId = localId;
     mapBank = ScriptReadByte(ctx);
     mapId = ScriptReadByte(ctx);
     sMovingNpcMapBank = mapBank;
     sMovingNpcMapId = mapId;
-    SetupNativeScript(ctx, s51a_0806B288);
+    SetupNativeScript(ctx, WaitForMovementFinish);
     return TRUE;
 }
 
@@ -1053,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;
 }
 
@@ -1111,7 +1114,7 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
     {
         if (gMapObjects[gSelectedMapObject].active)
         {
-            sub_8064DD8();
+            LockSelectedMapObject();
             SetupNativeScript(ctx, sub_8064DB4);
         }
         else
diff --git a/src/script_movement.c b/src/script_movement.c
index c4380e73f..30e10b451 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -17,18 +17,18 @@ 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 localId, u8 mapNum, u8 mapBank)
+bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapBank)
 {
     u8 mapObjId;
     u8 r4;
@@ -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,11 +170,11 @@ 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 UnfreezeObjects(u8 taskId)
diff --git a/src/shop.c b/src/shop.c
index 9ec79aef6..10c530a45 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -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)