diff --git a/include/dungeon_action.h b/include/dungeon_action.h
index d8acfa2f8..b9f02a3c8 100644
--- a/include/dungeon_action.h
+++ b/include/dungeon_action.h
@@ -3,7 +3,7 @@
 
 #include "structs/dungeon_entity.h"
 
-void sub_8044C50(u16 action);
+void SetLeaderActionFields(u16 action);
 void ClearMonsterActionFields(ActionContainer *actionPointer);
 void SetMonsterActionFields(ActionContainer *actionPointer, u16 action);
 void SetActionPassTurnOrWalk(ActionContainer *actionPointer, s16 species);
diff --git a/include/dungeon_map.h b/include/dungeon_map.h
index da3160581..4042b4c71 100644
--- a/include/dungeon_map.h
+++ b/include/dungeon_map.h
@@ -14,9 +14,9 @@ void CloseDungeonMapFile(void);
 void LoadDungeonMapPalette(void);
 void DrawMinimapTile(s32 x, s32 y);
 void CopyDungeonMapToVram(void);
-void ShowPlayerDotOnMap(void);
+void FlashLeaderIcon(void);
 void ResetMapPlayerDotFrames(void);
-void ShowWholeRevealedDungeonMap(void);
+void UpdateMinimap(void);
 void UpdateBgTilemapForDungeonMap(bool8 a0);
 void TryResetDungeonMapTilesScheduledForCopy(void);
 
diff --git a/include/dungeon_map_access.h b/include/dungeon_map_access.h
index 03f66b722..fffa44244 100644
--- a/include/dungeon_map_access.h
+++ b/include/dungeon_map_access.h
@@ -7,7 +7,7 @@ const Tile *GetTile(s32 x, s32 y);
 Tile *GetTileMut(s32 x, s32 y);
 
 void UpdateTrapsVisibility(void);
-void sub_804AC20(DungeonPos *pos);
+void DiscoverMinimap(DungeonPos *pos);
 
 void sub_80495E4(void);
 void LoadDungeonTilesetAssets(void);
diff --git a/include/dungeon_misc.h b/include/dungeon_misc.h
index ba0146058..4b5b018d8 100644
--- a/include/dungeon_misc.h
+++ b/include/dungeon_misc.h
@@ -47,14 +47,14 @@ bool8 sub_8069D18(DungeonPos *pos,Entity *entity);
 void sub_8069D4C(struct unkStruct_8069D4C *r0, Entity *target);
 void TargetTileInFront(Entity *pokemon);
 void sub_8069E0C(Entity *pokemon);
-void TriggerWeatherAbilities(void);
+void TryActivateArtificialWeatherAbilities(void);
 s32 GetMonsterApparentID(Entity *pokemon, s32 _id);
 void sub_8069F9C(Entity *pokemon, Entity *target, Move *move);
 void sub_806A120(Entity * pokemon, Entity * target, Move* move);
 void sub_806A1B0(Entity *pokemon);
 void sub_806A1E8(Entity *pokemon);
 void sub_806A240(Entity *pokemon, Entity *target);
-void sub_806A2BC(Entity *pokemon, u8 param_2);
+void TryPointCameraToMonster(Entity *pokemon, u8 param_2);
 void sub_806A338(void);
 void sub_806A390(Entity *pokemon);
 void sub_806A3D4(u8 *dst, s32 _a1, s32 id, bool32 _a3);
diff --git a/src/blow_away.c b/src/blow_away.c
index ee292d3db..fcdb75a34 100644
--- a/src/blow_away.c
+++ b/src/blow_away.c
@@ -34,7 +34,7 @@ u8 IsFloorOver(void);
 extern void sub_806F370(Entity *pokemon, Entity *target, u32, u32, u8 *, u8 moveType, s32, u32, u32, u32);
 void sub_80421AC(Entity * pokemon, Entity * target);
 void sub_807BB78(Entity *pokemon);
-extern void sub_803F580(u32);
+extern void UpdateCamera(u32);
 bool8 sub_808384C(DungeonPos *, DungeonPos *);
 u8 sub_8083660(DungeonPos *);
 
@@ -144,7 +144,7 @@ void BlowAwayTarget(Entity *pokemon, Entity *target, u32 direction)
             if (GetEntInfo(target)->isTeamLeader) {
                 gDungeon->unk1 = 0;
                 gDungeon->unk5C0 = -1;
-                sub_804AC20(&target->pos);
+                DiscoverMinimap(&target->pos);
                 sub_807EC28(FALSE);
             }
             sub_806A5B8(target);
diff --git a/src/code_8069E0C.c b/src/code_8069E0C.c
index 7eae990c1..c752030bd 100644
--- a/src/code_8069E0C.c
+++ b/src/code_8069E0C.c
@@ -39,9 +39,9 @@ extern void sub_8042900(Entity *r0);
 extern void sub_8042968(Entity *r0);
 extern void EndAbilityImmuneStatus(Entity *, Entity *);
 void sub_8041BBC(Entity *r0);
-extern void sub_806A2BC(Entity *, u8);
+extern void TryPointCameraToMonster(Entity *, u8);
 extern void sub_804178C(u32);
-extern void sub_803F508(Entity *);
+extern void PointCameraToMonster(Entity *);
 extern void sub_8042B20(Entity *entity);
 extern void sub_8042B0C(Entity *entity);
 extern void sub_8072AC8(u16 *param_1, s32 species, s32 param_3);
@@ -55,8 +55,8 @@ extern u8 GetRandomFloorItem(s32 a0);
 extern void sub_80429E8(Entity *r0);
 extern Entity *sub_804550C(s16 a);
 extern Entity *sub_80453AC(s16 id);
-extern void sub_803F580(s32);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateCamera(s32);
+extern void UpdateMinimap(void);
 extern void sub_806B678(void);
 extern void EntityUpdateStatusSprites(Entity *);
 extern Entity *sub_80696A8(Entity *a0);
diff --git a/src/code_80718D8.c b/src/code_80718D8.c
index 21d979a55..9b8ac87f5 100644
--- a/src/code_80718D8.c
+++ b/src/code_80718D8.c
@@ -256,7 +256,7 @@ void sub_807218C(Entity *pokemon)
     r6 = 0;
     info = GetEntInfo(pokemon);
 
-    sub_806A2BC(pokemon, 0);
+    TryPointCameraToMonster(pokemon, 0);
     SetMessageArgument_2(gFormatBuffer_Monsters[0], info, 0);
     if(sub_8070BC0(pokemon))
     {
@@ -322,7 +322,7 @@ void sub_807218C(Entity *pokemon)
     if(buffer[0])
         DisplayDungeonMessage(0, buffer, 1);
 
-    sub_806A2BC(GetLeader(), 0);
+    TryPointCameraToMonster(GetLeader(), 0);
 }
 
 void LevelDownTarget(Entity *pokemon, Entity *target, u32 level)
@@ -390,7 +390,7 @@ static bool8 LevelUp(Entity *pokemon, Entity *target, u8 param_3, u8 param_4)
         {
             if(!info->isNotTeamMember)
             {
-                sub_806A2BC(target, 0);
+                TryPointCameraToMonster(target, 0);
                 if(!flag)
                     sub_8083D58();
                 gFormatArgs[0] = level;
diff --git a/src/code_8073CF0.c b/src/code_8073CF0.c
index 13e86489a..ef23d906d 100644
--- a/src/code_8073CF0.c
+++ b/src/code_8073CF0.c
@@ -398,7 +398,7 @@ void sub_8074094(Entity *entity)
         return;
 }
 
-void TickStatusHeal(Entity *entity)
+void TickStatusAndHealthRegen(Entity *entity)
 {
     s32 i;
     bool32 spdChange;
diff --git a/src/code_8075708.c b/src/code_8075708.c
index 006fa7421..b93a80336 100644
--- a/src/code_8075708.c
+++ b/src/code_8075708.c
@@ -275,7 +275,7 @@ bool8 DisplayActions(Entity *a0)
             if (monInfo->flags & 0x2000) {
                 monInfo->flags &= ~(0x2000);
                 if (monInfo->isTeamLeader) {
-                    sub_804AC20(&mon->pos);
+                    DiscoverMinimap(&mon->pos);
                     sub_807EC28(FALSE);
                     CheckLeaderTile();
                 }
diff --git a/src/code_80848F0.c b/src/code_80848F0.c
index 1cd304cfc..a13817e81 100644
--- a/src/code_80848F0.c
+++ b/src/code_80848F0.c
@@ -52,7 +52,7 @@ extern const u8 gUnknown_8107358[25];
 extern const DungeonPos gUnknown_80F4598[];
 
 extern bool8 sub_8004C00(unkStruct_202EE8C *a0, s32 a1, s32 a2, s32 brightness, const RGB *ramp, struct RgbS16 *a5);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern s32 GetCameraXPos(void);
 extern s32 GetCameraYPos(void);
 extern void sub_803F4A0(u32);
@@ -136,7 +136,7 @@ void sub_80847D4(void)
 
     gDungeon->unk3A0D = 0;
     gDungeon->unk1356C = 0;
-    ShowWholeRevealedDungeonMap();
+    UpdateMinimap();
     for(index = 0; index < 0x3e7 && gUnknown_8107234[index].unk0 != 0;  index++) {
         fixedRoomNumber = gDungeon->fixedRoomNumber;
         if (fixedRoomNumber - 0x1c < 0x16) {
diff --git a/src/drought_orb.c b/src/drought_orb.c
index c9ec3c164..7b0c817ad 100644
--- a/src/drought_orb.c
+++ b/src/drought_orb.c
@@ -72,6 +72,6 @@ void HandleDroughtOrbAction(Entity *pokemon, Entity *target)
 	}
 	gDungeon->unk644.unk2C = 1;
 	DetermineAllMonsterShadow();
-	ShowWholeRevealedDungeonMap();
+	UpdateMinimap();
 	UpdateTrapsVisibility();
 }
diff --git a/src/dungeon_action.c b/src/dungeon_action.c
index 9b085f08f..71ec6bb16 100644
--- a/src/dungeon_action.c
+++ b/src/dungeon_action.c
@@ -22,9 +22,9 @@
 
 extern void sub_8086AC0(void);
 extern void DisplayActions(u32);
-extern void TriggerWeatherAbilities(void);
+extern void TryActivateArtificialWeatherAbilities(void);
 extern void EnemyEvolution(Entity *);
-extern void TickStatusHeal(Entity *);
+extern void TickStatusAndHealthRegen(Entity *);
 
 EWRAM_DATA SubMenuAction gDungeonSubMenu[10] = {0};
 EWRAM_DATA s32 gDungeonSubMenuItemsCount = 0;
@@ -73,7 +73,7 @@ void SetLeaderActionToNothing(bool8 clearActionFields)
     }
 }
 
-void sub_8044C50(u16 action)
+void SetLeaderActionFields(u16 action)
 {
     EntityInfo * entityInfo = GetLeaderInfo();
 
diff --git a/src/dungeon_ai_attack.c b/src/dungeon_ai_attack.c
index f019dec2f..576e20559 100644
--- a/src/dungeon_ai_attack.c
+++ b/src/dungeon_ai_attack.c
@@ -52,7 +52,7 @@ extern bool8 sub_8044D40(ActionContainer *, u32);
 extern void sub_8045BF8(u8 *, struct Item *);
 extern void sub_8044DF0(struct Entity *, u32, u32);
 extern void EnemyEvolution(struct Entity *);
-extern void sub_804AC20(DungeonPos *);
+extern void DiscoverMinimap(DungeonPos *);
 extern void sub_807EC28(bool8);
 extern void sub_806A5B8(struct Entity *entity);
 
@@ -1039,7 +1039,7 @@ void HandleUseOrbAction(Entity *pokemon)
         sub_806CE68(pokemon, 8);
 
         if (entityInfo->isTeamLeader) {
-            sub_804AC20(&pokemon->pos);
+            DiscoverMinimap(&pokemon->pos);
             sub_807EC28(FALSE);
         }
 
diff --git a/src/dungeon_cutscene_articuno.c b/src/dungeon_cutscene_articuno.c
index 9af5a717f..150d3d555 100644
--- a/src/dungeon_cutscene_articuno.c
+++ b/src/dungeon_cutscene_articuno.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_celebi.c b/src/dungeon_cutscene_celebi.c
index f60ec9dc8..3a3085aa2 100644
--- a/src/dungeon_cutscene_celebi.c
+++ b/src/dungeon_cutscene_celebi.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_deoxys.c b/src/dungeon_cutscene_deoxys.c
index 87c3cba89..5354575f1 100644
--- a/src/dungeon_cutscene_deoxys.c
+++ b/src/dungeon_cutscene_deoxys.c
@@ -44,7 +44,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_entei.c b/src/dungeon_cutscene_entei.c
index a35127f31..e7a5b43c6 100644
--- a/src/dungeon_cutscene_entei.c
+++ b/src/dungeon_cutscene_entei.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_groudon.c b/src/dungeon_cutscene_groudon.c
index ce3e93811..98e5e15ca 100644
--- a/src/dungeon_cutscene_groudon.c
+++ b/src/dungeon_cutscene_groudon.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_hooh.c b/src/dungeon_cutscene_hooh.c
index cc38e22df..f608e1456 100644
--- a/src/dungeon_cutscene_hooh.c
+++ b/src/dungeon_cutscene_hooh.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_jirachi.c b/src/dungeon_cutscene_jirachi.c
index 8484348dd..567ba5871 100644
--- a/src/dungeon_cutscene_jirachi.c
+++ b/src/dungeon_cutscene_jirachi.c
@@ -44,7 +44,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
@@ -139,7 +139,7 @@ void sub_808B3E4(u8 param_1, u8 param_2, u8 param_3)
             sub_808B50C();
         }
         gDungeon->unk1356C = uVar1;
-        ShowWholeRevealedDungeonMap();
+        UpdateMinimap();
     }
   }
 }
@@ -510,7 +510,7 @@ static void CreateJirachiWishWarpTile(void)
   sub_8049884();
   sub_8049B8C();
   UpdateTrapsVisibility();
-  ShowWholeRevealedDungeonMap();
+  UpdateMinimap();
 }
 
 static void EnableJirachiWishWarpTile(void)
@@ -526,7 +526,7 @@ static void EnableJirachiWishWarpTile(void)
   sub_8049884();
   sub_8049B8C();
   UpdateTrapsVisibility();
-  ShowWholeRevealedDungeonMap();
+  UpdateMinimap();
 }
 
 static u8 JirachiFriendAreaSearch(void)
diff --git a/src/dungeon_cutscene_kyogre.c b/src/dungeon_cutscene_kyogre.c
index a372e005c..28e7afd4f 100644
--- a/src/dungeon_cutscene_kyogre.c
+++ b/src/dungeon_cutscene_kyogre.c
@@ -44,7 +44,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_latios.c b/src/dungeon_cutscene_latios.c
index e98666fe0..4e881956e 100644
--- a/src/dungeon_cutscene_latios.c
+++ b/src/dungeon_cutscene_latios.c
@@ -44,7 +44,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_lugia.c b/src/dungeon_cutscene_lugia.c
index b103bd3c6..6cc21597a 100644
--- a/src/dungeon_cutscene_lugia.c
+++ b/src/dungeon_cutscene_lugia.c
@@ -44,7 +44,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_magma_cavern.c b/src/dungeon_cutscene_magma_cavern.c
index 746364ebd..922c59256 100644
--- a/src/dungeon_cutscene_magma_cavern.c
+++ b/src/dungeon_cutscene_magma_cavern.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_mankey.c b/src/dungeon_cutscene_mankey.c
index 256aabe98..c13a95465 100644
--- a/src/dungeon_cutscene_mankey.c
+++ b/src/dungeon_cutscene_mankey.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_meanies.c b/src/dungeon_cutscene_meanies.c
index ee4afb0f2..e2a898348 100644
--- a/src/dungeon_cutscene_meanies.c
+++ b/src/dungeon_cutscene_meanies.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_medicham.c b/src/dungeon_cutscene_medicham.c
index 4ff6a9849..d3e490535 100644
--- a/src/dungeon_cutscene_medicham.c
+++ b/src/dungeon_cutscene_medicham.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_mewtwo.c b/src/dungeon_cutscene_mewtwo.c
index b105a0a8e..8a7c5f8c6 100644
--- a/src/dungeon_cutscene_mewtwo.c
+++ b/src/dungeon_cutscene_mewtwo.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_moltres.c b/src/dungeon_cutscene_moltres.c
index f650c04e1..099060fec 100644
--- a/src/dungeon_cutscene_moltres.c
+++ b/src/dungeon_cutscene_moltres.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_raikou.c b/src/dungeon_cutscene_raikou.c
index 10a0d43a4..98767430f 100644
--- a/src/dungeon_cutscene_raikou.c
+++ b/src/dungeon_cutscene_raikou.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_rayquaza.c b/src/dungeon_cutscene_rayquaza.c
index 087e9e357..b7515b02e 100644
--- a/src/dungeon_cutscene_rayquaza.c
+++ b/src/dungeon_cutscene_rayquaza.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_regis.c b/src/dungeon_cutscene_regis.c
index 458009fe5..1aec6f1ec 100644
--- a/src/dungeon_cutscene_regis.c
+++ b/src/dungeon_cutscene_regis.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
@@ -333,7 +333,7 @@ static void sub_808B1CC(u8 itemID)
         SpawnItem(&pos,&item,1);
     }
     UpdateTrapsVisibility();
-    ShowWholeRevealedDungeonMap();
+    UpdateMinimap();
 }
 
 static void SetupRegiFacingDirection(Entity *regiEntity)
diff --git a/src/dungeon_cutscene_skarmory.c b/src/dungeon_cutscene_skarmory.c
index 4dfc7b529..097a482da 100644
--- a/src/dungeon_cutscene_skarmory.c
+++ b/src/dungeon_cutscene_skarmory.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_smeargle.c b/src/dungeon_cutscene_smeargle.c
index d581c4609..87e852662 100644
--- a/src/dungeon_cutscene_smeargle.c
+++ b/src/dungeon_cutscene_smeargle.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_suicune.c b/src/dungeon_cutscene_suicune.c
index 318309b66..66dde9db7 100644
--- a/src/dungeon_cutscene_suicune.c
+++ b/src/dungeon_cutscene_suicune.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_cutscene_zapdos.c b/src/dungeon_cutscene_zapdos.c
index ebe343115..f16b22c74 100644
--- a/src/dungeon_cutscene_zapdos.c
+++ b/src/dungeon_cutscene_zapdos.c
@@ -42,7 +42,7 @@ extern void BgColorCallNullsub4(void);
 extern void sub_8085EB0(void);
 extern void sub_8049884(void);
 extern void sub_8049B8C(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_8086A54(Entity *);
 extern void ResetMonEntityData(EntityInfo *, u32);
 extern void sub_8041888(u32);
diff --git a/src/dungeon_damage.c b/src/dungeon_damage.c
index 67356c859..e8a61c33a 100644
--- a/src/dungeon_damage.c
+++ b/src/dungeon_damage.c
@@ -60,7 +60,7 @@ extern bool8 DoEnemiesEvolveWhenKOed(u8 dungeon);
 extern bool8 sub_806FA5C(Entity *, Entity *, struct unkStruct_8069D4C *);
 extern void EntityUpdateStatusSprites(Entity *);
 extern void sub_806F500(void);
-extern void sub_803F508(Entity *);
+extern void PointCameraToMonster(Entity *);
 extern bool8 sub_806E100(s48_16 *param_1, Entity *pokemon, Entity *target, u8 type, struct DamageStruct *dmgStruct);
 extern void sub_8041B74(Entity *pokemon);
 extern void sub_8041B5C(Entity *pokemon);
@@ -1668,6 +1668,6 @@ void sub_806F63C(Entity *param_1)
     temp = &gDungeon->unk181e8;
 
     if (temp->cameraTarget == param_1) {
-        sub_803F508(temp->cameraTarget);
+        PointCameraToMonster(temp->cameraTarget);
     }
 }
diff --git a/src/dungeon_engine.c b/src/dungeon_engine.c
index 7f145686c..dac39cfcb 100644
--- a/src/dungeon_engine.c
+++ b/src/dungeon_engine.c
@@ -20,10 +20,10 @@ extern void sub_8044574(void);
 extern void sub_8044820(void);
 extern void sub_8044AB4(void);
 extern u8 DisplayActions(u32);
-extern void TickStatusHeal(Entity *);
+extern void TickStatusAndHealthRegen(Entity *);
 extern void sub_8086AC0(void);
 extern void EnemyEvolution(Entity *);
-extern void TriggerWeatherAbilities(void);
+extern void TryActivateArtificialWeatherAbilities(void);
 extern void DungeonHandlePlayerInput(void);
 extern void sub_805F02C(void);
 extern void sub_8074094(Entity *);
@@ -76,7 +76,7 @@ static bool8 RunLeaderTurn(bool8 param_1)
     if (entity == NULL)
         return FALSE;
 
-    TriggerWeatherAbilities();
+    TryActivateArtificialWeatherAbilities();
     movSpeed = CalcSpeedStage(entity);
     if (gSpeedTurns[movSpeed][gDungeon->unk644.fractionalTurn] == 0)
         return FALSE;
@@ -99,7 +99,7 @@ static bool8 RunLeaderTurn(bool8 param_1)
             param_1 = FALSE;
         }
         else {
-            TickStatusHeal(entity);
+            TickStatusAndHealthRegen(entity);
         }
 
         if (IsFloorOver())
@@ -154,7 +154,7 @@ static void sub_8044454(void)
       entity = gDungeon->activePokemon[index];
       if ((EntityIsValid(entity)) && (entityInfo = GetEntInfo(entity), (entityInfo->flags & MOVEMENT_FLAG_SWAPPING_PLACES_PETRIFIED_ALLY))) {
         if (IsFloorOver()) break;
-        TickStatusHeal(entity);
+        TickStatusAndHealthRegen(entity);
         if (EntityIsValid(entity)) {
           EnemyEvolution(entity);
           RunMonsterAI(entity, 0);
@@ -214,7 +214,7 @@ void sub_8044574(void)
                 if (IsFloorOver())
                     break;
                 gDungeon->unkB8 = teamMon;
-                TriggerWeatherAbilities();
+                TryActivateArtificialWeatherAbilities();
                 teamMonInfo->aiAllySkip = FALSE;
 
                 spdStage = CalcSpeedStage(teamMon);
@@ -227,7 +227,7 @@ void sub_8044574(void)
                     }
                     else {
                         teamMonInfo->recalculateFollow = FALSE;
-                        TickStatusHeal(teamMon);
+                        TickStatusAndHealthRegen(teamMon);
                         if (EntityIsValid(teamMon)) {
                             s32 j;
 
@@ -332,7 +332,7 @@ void sub_8044820(void)
       if (IsFloorOver()) break;
       entityInfo = GetEntInfo(entity);
       gDungeon->unkB8 = entity;
-      TriggerWeatherAbilities();
+      TryActivateArtificialWeatherAbilities();
       if ((entityInfo->flags & MOVEMENT_FLAG_SWAPPING_PLACES_PETRIFIED_ALLY) == 0) {
         if ((u16)(entityInfo->flags & MOVEMENT_FLAG_UNK_14) != 0) {
             entityInfo->flags &= ~(MOVEMENT_FLAG_UNK_14);
@@ -345,7 +345,7 @@ void sub_8044820(void)
             if (!entityInfo->attacking) {
               entityInfo->flags &= ~(MOVEMENT_FLAG_UNK_14 | MOVEMENT_FLAG_SWAPPING_PLACES_PETRIFIED_ALLY);
               entityInfo->recalculateFollow = FALSE;
-              TickStatusHeal(entity);
+              TickStatusAndHealthRegen(entity);
               if (EntityIsValid(entity)) {
                 EnemyEvolution(entity);
                 RunMonsterAI(entity, 0);
diff --git a/src/dungeon_items.c b/src/dungeon_items.c
index 17badb5fc..dbbe85752 100644
--- a/src/dungeon_items.c
+++ b/src/dungeon_items.c
@@ -821,7 +821,7 @@ static void MusicBoxCreation(void)
         sub_803E708(10,0x41);
         sub_804178C(1);
         gDungeon->unk1356C = 0;
-        ShowWholeRevealedDungeonMap();
+        UpdateMinimap();
     }
 }
 
diff --git a/src/dungeon_main.c b/src/dungeon_main.c
index 0ba7d1e03..78943ccf5 100644
--- a/src/dungeon_main.c
+++ b/src/dungeon_main.c
@@ -66,7 +66,7 @@ extern void PlayDungeonConfirmationSE(void);
 extern void sub_806A6E8(Entity *);
 extern void TryTriggerTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4);
 bool8 sub_807EF48(void);
-void sub_806A2BC(Entity *a0, u8 a1);
+void TryPointCameraToMonster(Entity *a0, u8 a1);
 bool8 sub_80701A4(Entity *a0);
 void sub_8075680(u32);
 void sub_8094C88(void);
@@ -90,7 +90,7 @@ extern bool8 sub_8071A8C(Entity *pokemon);
 extern void GetWeatherName(u8 *dst, u8 weatherId);
 extern bool8 sub_8070F14(Entity * pokemon, s32 direction);
 extern Entity *sub_80696A8(Entity *a0);
-extern void sub_803F508(Entity *);
+extern void PointCameraToMonster(Entity *);
 extern void sub_8041AD0(Entity *pokemon);
 extern void sub_8041AE0(Entity *pokemon);
 extern void sub_807EC28(bool8);
@@ -160,7 +160,7 @@ void DungeonHandlePlayerInput(void)
     unkPtr = &gDungeon->unk181e8;
     var_38 = 3;
     gDungeon->unk12 = 0;
-    sub_806A2BC(GetLeader(), 1);
+    TryPointCameraToMonster(GetLeader(), 1);
     if (sub_80701A4(GetLeader())) {
         sub_803E708(60, 16);
         return;
@@ -210,7 +210,7 @@ void DungeonHandlePlayerInput(void)
         }
 
         frames = 0;
-        sub_8044C50(ACTION_NOTHING);
+        SetLeaderActionFields(ACTION_NOTHING);
         sShowThreeArrows1 = FALSE;
         sShowThreeArrows2 = FALSE;
 
@@ -242,7 +242,7 @@ void DungeonHandlePlayerInput(void)
             }
 
             if (gRealInputs.held & A_BUTTON && gRealInputs.held & B_BUTTON && FixedPointToInt(leaderInfo->belly) != 0) {
-                sub_8044C50(ACTION_PASS_TURN);
+                SetLeaderActionFields(ACTION_PASS_TURN);
                 gDungeon->unk644.unk2F = 1;
                 break;
             }
@@ -253,14 +253,14 @@ void DungeonHandlePlayerInput(void)
             if (gRealInputs.pressed & A_BUTTON) {
                 if (gRealInputs.held & B_BUTTON) {
                     if (FixedPointToInt(leaderInfo->belly) != 0) {
-                        sub_8044C50(ACTION_PASS_TURN);
+                        SetLeaderActionFields(ACTION_PASS_TURN);
                         gDungeon->unk644.unk2F = 1;
                         break;
                     }
                 }
                 else if (ShouldMonsterRunAwayAndShowEffect(leader, TRUE)) {
                     LogMessageByIdWithPopupCheckUser(leader, gUnknown_80FD4B0);
-                    sub_8044C50(ACTION_PASS_TURN);
+                    SetLeaderActionFields(ACTION_PASS_TURN);
                     gDungeon->unk644.unk2F = 1;
                     break;
                 }
@@ -410,7 +410,7 @@ void DungeonHandlePlayerInput(void)
                 s32 i;
                 for (i = 0; i < INVENTORY_SIZE; i++) {
                     if (ItemExists(&gTeamInventoryRef->teamItems[i]) && ItemSet(&gTeamInventoryRef->teamItems[i])) {
-                        sub_8044C50(ACTION_THROW_ITEM_PLAYER);
+                        SetLeaderActionFields(ACTION_THROW_ITEM_PLAYER);
                         leaderInfo->action.actionParameters[0].actionUseIndex = i +1;
                         leaderInfo->action.actionParameters[0].itemPos.x = 0;
                         leaderInfo->action.actionParameters[0].itemPos.y = 0;
@@ -431,7 +431,7 @@ void DungeonHandlePlayerInput(void)
                     sub_8094C88();
                 }
                 sub_8052210(1);
-                ShowWholeRevealedDungeonMap();
+                UpdateMinimap();
                 SetBGOBJEnableFlags(0x1E);
                 sub_803E708(0xA, 0x2F);
                 while (1) {
@@ -443,13 +443,13 @@ void DungeonHandlePlayerInput(void)
 
                     if (gRealInputs.pressed & A_BUTTON) {
                         gShowMonsterDotsInDungeonMap = (gShowMonsterDotsInDungeonMap == FALSE) ? TRUE : FALSE; // Flip
-                        ShowWholeRevealedDungeonMap();
+                        UpdateMinimap();
                     }
                 }
                 gDungeon->unk181e8.inFloorMapMode = FALSE;
                 gGameOptionsRef->mapOption = prevMapOption;
                 gShowMonsterDotsInDungeonMap = TRUE;
-                ShowWholeRevealedDungeonMap();
+                UpdateMinimap();
                 SetBGOBJEnableFlags(0);
                 DungeonRunFrameActions(0x2F);
                 DungeonRunFrameActions(0x2F);
@@ -526,11 +526,11 @@ void DungeonHandlePlayerInput(void)
                             if (immobilizedMsg != NULL) {
                                 LogMessageByIdWithPopupCheckUser(leader, immobilizedMsg);
                             }
-                            sub_8044C50(ACTION_PASS_TURN);
+                            SetLeaderActionFields(ACTION_PASS_TURN);
                             gDungeon->unk644.unk2F = 1;
                         }
                         else {
-                            sub_8044C50(ACTION_WALK);
+                            SetLeaderActionFields(ACTION_WALK);
                             if ((gRealInputs.held & B_BUTTON || bPress) && FixedPointToInt(leaderInfo->belly) != 0) {
                                 if (GetEntInfo(leader)->cringeClassStatus.status != STATUS_CONFUSED) {
                                     gDungeon->unk644.unk28 = 1;
@@ -560,7 +560,7 @@ void DungeonHandlePlayerInput(void)
             HandleTalkFieldAction(leader);
             if (IsFloorOver())
                 break;
-            sub_8044C50(ACTION_NOTHING);
+            SetLeaderActionFields(ACTION_NOTHING);
         }
         else if ((r6.a0_8) == 0) {
             gDungeon->unk644.unk29 = 0;
@@ -1137,7 +1137,7 @@ void sub_805F02C(void)
         }
         gLeaderPointer = NULL;
         r8->action = leaderInfo->action;
-        sub_803F508(r7);
+        PointCameraToMonster(r7);
         sub_8041AD0(leader);
         sub_8041AE0(GetLeader());
         SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], r7, 0);
@@ -1199,7 +1199,7 @@ static void ShowMainMenu(bool8 fromBPress, bool8 a1)
             SetLeaderActionToNothing(TRUE);
             gTeamMenuChosenId = -1;
             PrintOnMainMenu(printAll);
-            sub_806A2BC(GetLeader(), 0);
+            TryPointCameraToMonster(GetLeader(), 0);
             while (1) {
                 AddMenuCursorSprite(&gDungeonMenu);
                 DungeonRunFrameActions(0x1D);
@@ -1324,7 +1324,7 @@ static void ShowMainMenu(bool8 fromBPress, bool8 a1)
                         if (i == GetLeaderActionContainer()->actionParameters[0].actionUseIndex) {
                             gTeamMenuChosenId = count;
                             if (GetLeaderActionId() != ACTION_NOTHING) {
-                                sub_806A2BC(teamMon, 0);
+                                TryPointCameraToMonster(teamMon, 0);
                             }
                             break;
                         }
@@ -1372,7 +1372,7 @@ static void ShowMainMenu(bool8 fromBPress, bool8 a1)
                     currEntity = GetLeader();
                 }
 
-                sub_806A2BC(currEntity, 0);
+                TryPointCameraToMonster(currEntity, 0);
                 ChangeDungeonCameraPos(&currEntity->pos, 0, 1, 1);
                 GetLeaderInfo()->action.actionParameters[0].actionUseIndex = currMonId;
                 SetLeaderActionToNothing(FALSE);
@@ -1431,7 +1431,7 @@ static void ShowMainMenu(bool8 fromBPress, bool8 a1)
                     break;
                 }
             }
-            sub_806A2BC(GetLeader(), 0);
+            TryPointCameraToMonster(GetLeader(), 0);
             ChangeDungeonCameraPos(&GetLeader()->pos, 0, 1, 1);
             if (GetLeaderActionId() != ACTION_NOTHING)
                 break;
@@ -1522,7 +1522,7 @@ static void ShowMainMenu(bool8 fromBPress, bool8 a1)
             ResetUnusedInputStruct();
         }
         else {
-            sub_806A2BC(GetLeader(), 0);
+            TryPointCameraToMonster(GetLeader(), 0);
             break;
         }
     }
diff --git a/src/dungeon_map.c b/src/dungeon_map.c
index d10ed49d0..05e67279a 100644
--- a/src/dungeon_map.c
+++ b/src/dungeon_map.c
@@ -25,7 +25,7 @@ extern s32 gUnknown_202EDD0;
 
 extern u8 GetFloorType(void);
 extern bool8 sub_8094C48(void);
-extern bool8 sub_8045804(Entity *ent);
+extern bool8 ShouldMinimapDisplayEntity(Entity *ent);
 extern bool8 DoesNotHaveShadedMap(void);
 
 struct UnkStruct1
@@ -242,7 +242,7 @@ void DrawMinimapTile(s32 x, s32 y)
             Entity *entity = tile->monster;
             if (entity != NULL) {
                 s32 entType = GetEntityType(entity);
-                if (gShowMonsterDotsInDungeonMap && entType == ENTITY_MONSTER && sub_8045804(entity)) {
+                if (gShowMonsterDotsInDungeonMap && entType == ENTITY_MONSTER && ShouldMinimapDisplayEntity(entity)) {
                     EntityInfo *entInfo = GetEntInfo(entity);
                     if (IsExperienceLocked(entInfo->joinedAt.id) || entInfo->monsterBehavior == 1 || entInfo->monsterBehavior == 4) {
                         mapGfxType = MAP_GFX_ALLY;
@@ -479,7 +479,7 @@ void CopyDungeonMapToVram(void)
     dungeon->dungeonMap.scheduledVramCopiesCount = 0;
 }
 
-void ShowPlayerDotOnMap(void)
+void FlashLeaderIcon(void)
 {
     if (gDungeon->unk181e8.inFloorMapMode)
         return;
@@ -522,7 +522,7 @@ void ResetMapPlayerDotFrames(void)
     sPlayerDotFrames = 0;
 }
 
-void ShowWholeRevealedDungeonMap(void)
+void UpdateMinimap(void)
 {
     s32 x, y;
 
diff --git a/src/dungeon_map_access.c b/src/dungeon_map_access.c
index a5a860da0..eb57ab659 100644
--- a/src/dungeon_map_access.c
+++ b/src/dungeon_map_access.c
@@ -1016,7 +1016,7 @@ void sub_804AAD4(void)
     gDungeon->unk104C0 = maxRooms + 1;
 }
 
-void sub_804AC20(DungeonPos *pos)
+void DiscoverMinimap(DungeonPos *pos)
 {
     s32 y;
     const Tile *tile2;
diff --git a/src/dungeon_menu_items.c b/src/dungeon_menu_items.c
index 1dc184bb3..caceb923c 100644
--- a/src/dungeon_menu_items.c
+++ b/src/dungeon_menu_items.c
@@ -29,13 +29,13 @@
 
 extern void PlayDungeonCancelSE(void);
 extern void PlayDungeonConfirmationSE(void);
-extern void sub_806A2BC(Entity *a0, u8 a1);
+extern void TryPointCameraToMonster(Entity *a0, u8 a1);
 extern void SetLeaderActionToNothing(u8 a0);
 extern Item *sub_8044D90(Entity *, s32, u32);
 extern bool8 sub_8070F14(Entity * pokemon, s32 direction);
 bool8 sub_805EC2C(Entity *a0, s32 x, s32 y);
 extern Entity *sub_80696A8(Entity *a0);
-extern void sub_803F508(Entity *);
+extern void PointCameraToMonster(Entity *);
 extern void sub_8041AD0(Entity *pokemon);
 extern void sub_8041AE0(Entity *pokemon);
 extern void sub_807EC28(bool8);
@@ -184,7 +184,7 @@ bool8 ShowDungeonItemsMenu(Entity * a0, struct UnkMenuBitsStruct *a1)
         else {
             r4 = a0;
         }
-        sub_806A2BC(r4, 0);
+        TryPointCameraToMonster(r4, 0);
         ChangeDungeonCameraPos(&r4->pos, 0, 1, 1);
 
         while (1) {
diff --git a/src/dungeon_menu_moves.c b/src/dungeon_menu_moves.c
index d807acde0..ff8635426 100644
--- a/src/dungeon_menu_moves.c
+++ b/src/dungeon_menu_moves.c
@@ -39,7 +39,7 @@ extern void SetLeaderActionToNothing(u8 a0);
 extern void sub_806752C(ActionContainer *a0);
 extern void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 a1);
 extern void sub_8067768(ActionContainer *a0);
-extern void sub_806A2BC(Entity *a0, u8 a1);
+extern void TryPointCameraToMonster(Entity *a0, u8 a1);
 extern bool8 sub_8071A8C(Entity *pokemon);
 extern void sub_8083D1C(void);
 extern s32 ActionToDungeonSubMenuId(u16 param_1);
@@ -96,7 +96,7 @@ void ShowMovesFromTeamMenu(ActionContainer *a0)
             }
         }
 
-        sub_806A2BC(entityNew, 0);
+        TryPointCameraToMonster(entityNew, 0);
         ChangeDungeonCameraPos(&entityNew->pos, 0, 1, 1);
         SetLeaderActionToNothing(1);
         if (ShowDungeonMovesMenu(entityNew, 0, 1, countUntilId, count)) {
@@ -169,7 +169,7 @@ void ShowMovesFromTeamMenu(ActionContainer *a0)
             break;
     }
 
-    sub_806A2BC(entityOrg, 0);
+    TryPointCameraToMonster(entityOrg, 0);
     ChangeDungeonCameraPos(&entityOrg->pos, 0, 1, 1);
 }
 
diff --git a/src/dungeon_menu_others.c b/src/dungeon_menu_others.c
index 1b9953b0a..d1f406d35 100644
--- a/src/dungeon_menu_others.c
+++ b/src/dungeon_menu_others.c
@@ -146,7 +146,7 @@ void ShowDungeonOthersMenu(void)
             break;
     }
 
-    ShowWholeRevealedDungeonMap();
+    UpdateMinimap();
     sub_803EAF0(0, NULL);
 }
 
diff --git a/src/dungeon_menu_team.c b/src/dungeon_menu_team.c
index d562f6eda..5c660a277 100644
--- a/src/dungeon_menu_team.c
+++ b/src/dungeon_menu_team.c
@@ -52,7 +52,7 @@ extern void PlayDungeonConfirmationSE(void);
 extern void sub_806A6E8(Entity *);
 extern void TryTriggerTrap(Entity *pokemon, DungeonPos *pos, int param_3, char param_4);
 bool8 sub_807EF48(void);
-void sub_806A2BC(Entity *a0, u8 a1);
+void TryPointCameraToMonster(Entity *a0, u8 a1);
 bool8 sub_805E874(void);
 bool8 sub_80701A4(Entity *a0);
 void sub_805E738(Entity *a0);
@@ -92,7 +92,7 @@ extern bool8 ShowDungeonMovesMenu(Entity * entity, u8 a1, u8 a2, s32 a3, s32 a4)
 extern bool8 sub_8070F14(Entity * pokemon, s32 direction);
 bool8 sub_805EC2C(Entity *a0, s32 x, s32 y);
 extern Entity *sub_80696A8(Entity *a0);
-extern void sub_803F508(Entity *);
+extern void PointCameraToMonster(Entity *);
 extern void sub_8041AD0(Entity *pokemon);
 extern void sub_8041AE0(Entity *pokemon);
 extern void sub_807EC28(bool8);
@@ -200,7 +200,7 @@ bool8 ShowDungeonTeamMenu(Entity *a0)
             s32 id = sp.unk4[gDungeonMenu.menuIndex];
             if (id >= 0) {
                 Entity *teamMon = gDungeon->teamPokemon[id];
-                sub_806A2BC(teamMon, 0);
+                TryPointCameraToMonster(teamMon, 0);
                 ChangeDungeonCameraPos(&teamMon->pos, 0, 1, 1);
             }
 
@@ -240,7 +240,7 @@ bool8 ShowDungeonTeamMenu(Entity *a0)
         id = sp.unk4[gDungeonMenu.menuIndex];
         if (id >= 0) {
             Entity *teamMon = gDungeon->teamPokemon[id];
-            sub_806A2BC(teamMon, 0);
+            TryPointCameraToMonster(teamMon, 0);
             ChangeDungeonCameraPos(&teamMon->pos, 0, 1, 1);
         }
 
@@ -298,7 +298,7 @@ bool8 ShowDungeonTeamMenu(Entity *a0)
     }
 
     if (ret) {
-        sub_806A2BC(GetLeader(), 0);
+        TryPointCameraToMonster(GetLeader(), 0);
     }
     sub_803EAF0(0, NULL);
     return ret;
@@ -1500,7 +1500,7 @@ Entity *ShowDungeonToWhichMonMenu(s32 *teamId, s32 caseId)
                 }
             }
             prevId = currId;
-            sub_806A2BC(entity, 0);
+            TryPointCameraToMonster(entity, 0);
             ChangeDungeonCameraPos(&entity->pos, 0, 1, 1);
         }
 
@@ -1532,7 +1532,7 @@ Entity *ShowDungeonToWhichMonMenu(s32 *teamId, s32 caseId)
     AddMenuCursorSprite(&gDungeonMenu);
     DungeonRunFrameActions(0x1B);
     sub_804AA60();
-    sub_806A2BC(GetLeader(), 0);
+    TryPointCameraToMonster(GetLeader(), 0);
     sub_803EAF0(0, NULL);
     sub_803E708(4, 0x3E);
     if (bPress) {
diff --git a/src/dungeon_misc.c b/src/dungeon_misc.c
index f6591f0c9..c9cccc9cf 100644
--- a/src/dungeon_misc.c
+++ b/src/dungeon_misc.c
@@ -61,9 +61,9 @@ extern void sub_8042900(Entity *r0);
 extern void sub_8042968(Entity *r0);
 extern void EndAbilityImmuneStatus(Entity *, Entity *);
 extern void sub_8041BBC(Entity *r0);
-extern void sub_806A2BC(Entity *, u8);
+extern void TryPointCameraToMonster(Entity *, u8);
 extern void sub_804178C(u32);
-extern void sub_803F508(Entity *);
+extern void PointCameraToMonster(Entity *);
 extern void sub_8042B20(Entity *entity);
 extern void sub_8042B0C(Entity *entity);
 extern void sub_8072AC8(u16 *param_1, s32 species, s32 param_3);
@@ -79,8 +79,8 @@ extern s32 gDungeonFramesCounter;
 extern void sub_8042EC8(Entity *a0, s32 a1);
 extern Entity *sub_804550C(s16 a);
 extern Entity *sub_80453AC(s16 id);
-extern void sub_803F580(s32);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateCamera(s32);
+extern void UpdateMinimap(void);
 extern void sub_806B678(void);
 extern void EntityUpdateStatusSprites(Entity *);
 extern Entity *sub_80696A8(Entity *a0);
@@ -473,7 +473,7 @@ void sub_8068F80(void)
         bool8 isShop = (GetTileAtEntitySafe(leader)->terrainType & TERRAIN_TYPE_SHOP) != 0;
         dungeon->unk644.unk54 = isShop;
         dungeon->unk644.unk55 = isShop;
-        sub_804AC20(&leader->pos);
+        DiscoverMinimap(&leader->pos);
     }
 }
 
@@ -1096,7 +1096,7 @@ void sub_8069E0C(Entity *pokemon)
   gDungeon->unkC = 1;
 }
 
-void TriggerWeatherAbilities(void)
+void TryActivateArtificialWeatherAbilities(void)
 {
   Entity *entity;
   s32 index;
@@ -1262,7 +1262,7 @@ void sub_806A1E8(Entity *pokemon)
       bVar3 = FALSE;
     }
     if (bVar3 && (!ShouldDisplayEntity(pokemon))) {
-      sub_806A2BC(pokemon,1);
+      TryPointCameraToMonster(pokemon,1);
     }
   }
 }
@@ -1279,7 +1279,7 @@ void sub_806A240(Entity *pokemon, Entity *target)
         isNotTeamMember = (!entityInfo->isNotTeamMember);
     }
     if (isNotTeamMember && (!ShouldDisplayEntity(pokemon))) {
-        sub_806A2BC(pokemon,1);
+        TryPointCameraToMonster(pokemon,1);
         return;
     }
     else if (GetEntityType(target) == ENTITY_MONSTER) {
@@ -1287,12 +1287,12 @@ void sub_806A240(Entity *pokemon, Entity *target)
         isNotTeamMember = (!entityInfo->isNotTeamMember);
     }
     if (isNotTeamMember && (!ShouldDisplayEntity(target))) {
-        sub_806A2BC(target,1);
+        TryPointCameraToMonster(target,1);
     }
   }
 }
 
-void sub_806A2BC(Entity *pokemon, u8 param_2)
+void TryPointCameraToMonster(Entity *pokemon, u8 param_2)
 {
   if ((EntityIsValid(pokemon)) && (GetEntityType(pokemon) == ENTITY_MONSTER) && (gDungeon->unk181e8.cameraTarget != pokemon)) {
     if (param_2 != '\0') {
@@ -1302,8 +1302,8 @@ void sub_806A2BC(Entity *pokemon, u8 param_2)
       }
     }
     sub_803E708(4,0x44);
-    sub_803F508(pokemon);
-    sub_804AC20(&pokemon->pos);
+    PointCameraToMonster(pokemon);
+    DiscoverMinimap(&pokemon->pos);
     gDungeon->unk12 = 0;
   }
 }
@@ -1523,8 +1523,8 @@ void sub_806A6E8(Entity *entity)
         }
         else {
             if (info->heldItem.id == ITEM_X_RAY_SPECS || info->unk64 == ITEM_X_RAY_SPECS) {
-                sub_803F580(1);
-                ShowWholeRevealedDungeonMap();
+                UpdateCamera(1);
+                UpdateMinimap();
             }
         }
         sub_807AA30();
diff --git a/src/dungeon_tilemap.c b/src/dungeon_tilemap.c
index 131c27dc7..b96906ae0 100644
--- a/src/dungeon_tilemap.c
+++ b/src/dungeon_tilemap.c
@@ -36,15 +36,15 @@
 
 extern s32 gDungeonFramesCounter;
 
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_80400D4(void);
 extern void sub_8041888(u8 param_1);
 extern void sub_803F7BC(void);
-extern void ShowWholeRevealedDungeonMap();
+extern void UpdateMinimap();
 
 void sub_803EC94(void);
 s32 sub_803EF90(s32 a0, u8 a1);
-void sub_803F580(u8 a0);
+void UpdateCamera(u8 a0);
 void sub_803F7BC(void);
 void sub_803F38C(void);
 void sub_803FB74(void);
@@ -157,7 +157,7 @@ void sub_803F4A0(Entity *a0)
         strPtr->unk18216 = 1;
     }
 
-    sub_803F580(0);
+    UpdateCamera(0);
     sub_803F38C();
     if (gDungeon->unk1356C == 0) {
         sub_806CD90();
@@ -165,7 +165,7 @@ void sub_803F4A0(Entity *a0)
 }
 
 // Very similar to the one above
-void sub_803F508(Entity *a0)
+void PointCameraToMonster(Entity *a0)
 {
     UnkDungeonGlobal_unk181E8_sub *strPtr = &gDungeon->unk181e8;
 
@@ -180,16 +180,16 @@ void sub_803F508(Entity *a0)
     }
     strPtr->cameraTarget = a0;
 
-    sub_803F580(0);
+    UpdateCamera(0);
     sub_803F38C();
     if (gDungeon->unk1356C == 0) {
         sub_806CD90();
     }
     UpdateTrapsVisibility();
-    ShowWholeRevealedDungeonMap();
+    UpdateMinimap();
 }
 
-void sub_803F580(u8 a0)
+void UpdateCamera(u8 a0)
 {
     UnkDungeonGlobal_unk181E8_sub *strPtr = &gDungeon->unk181e8;
     Entity *cameraTarget = strPtr->cameraTarget;
@@ -266,7 +266,7 @@ void sub_803F580(u8 a0)
 
         if (before != strPtr->showInvisibleTrapsMonsters) {
             UpdateTrapsVisibility();
-            ShowWholeRevealedDungeonMap();
+            UpdateMinimap();
             sub_8041888(0);
         }
 
@@ -716,9 +716,9 @@ void HandleLuminousOrbAction(Entity *pokemon)
       mapTile->spawnOrVisibilityFlags |= VISIBILITY_FLAG_REVEALED;
     }
   }
-  sub_803F580(0);
+  UpdateCamera(0);
   UpdateTrapsVisibility();
-  ShowWholeRevealedDungeonMap();
+  UpdateMinimap();
   LogMessageByIdWithPopupCheckUser(pokemon, gUnknown_80FD040);
 }
 
diff --git a/src/dungeon_util.c b/src/dungeon_util.c
index 21f845c64..c62eafb0a 100644
--- a/src/dungeon_util.c
+++ b/src/dungeon_util.c
@@ -398,7 +398,7 @@ void sub_80457DC(Entity* ent)
     ent->unk22 = 0;
 }
 
-bool8 sub_8045804(Entity *ent)
+bool8 ShouldMinimapDisplayEntity(Entity *ent)
 {
     UnkDungeonGlobal_unk181E8_sub* saveTyping;
     Entity* camTarget;
diff --git a/src/dungeon_vram.c b/src/dungeon_vram.c
index d337c353c..1c8103571 100644
--- a/src/dungeon_vram.c
+++ b/src/dungeon_vram.c
@@ -48,7 +48,7 @@ extern OpenedFile *gUnknown_202EC9C;
 
 void xxx_draw_string_80524F0(void);
 void sub_8085F78(void);
-void sub_803F580(s32);
+void UpdateCamera(s32);
 void sub_806CC10();
 void sub_804522C();
 void sub_803F9CC();
@@ -176,7 +176,7 @@ static void sub_803E490(u32 unused)
     gUnknown_202EDD4++;
     xxx_draw_string_80524F0();
     sub_8085F78();
-    sub_803F580(1);
+    UpdateCamera(1);
 
     if(gDungeon->unk181e8.unk1821A)
     {
@@ -202,7 +202,7 @@ static void sub_803E490(u32 unused)
     sub_8042E5C();
 
     if(gUnknown_202EDD0 == 0 || gUnknown_202EDD0 == 3 || gGameOptionsRef->mapOption == TOP_MAP_AND_TEAM_NO_BOTTOM)
-        ShowPlayerDotOnMap();
+        FlashLeaderIcon();
     sub_803ECE0();
     sub_803EDF0();
 
@@ -571,7 +571,7 @@ void sub_803EAF0(u32 kind, u8 *name)
             sub_803EC94();
             ShowWindows(NULL, TRUE, TRUE);
             if (gUnknown_203B40C != 0) {
-                ShowWholeRevealedDungeonMap();
+                UpdateMinimap();
                 UpdateBgTilemapForDungeonMap(FALSE);
             }
             break;
diff --git a/src/dungeon_wind.c b/src/dungeon_wind.c
index 1d7f1b6ce..5537cfb90 100644
--- a/src/dungeon_wind.c
+++ b/src/dungeon_wind.c
@@ -19,7 +19,7 @@
 
 extern u8 DisplayActions(Entity *);
 extern void sub_805E804(void);
-void sub_806A2BC(Entity *pokemon, u8 param_2);
+void TryPointCameraToMonster(Entity *pokemon, u8 param_2);
 extern void nullsub_93(DungeonPos *);
 extern void sub_806F370(Entity *pokemon, Entity *target, u32, u32, u8 *, u8 moveType, s32, u32, u32, u32);
 extern void sub_807EC28(bool8);
@@ -42,7 +42,7 @@ void sub_807E378(void)
     if (gDungeon->unk644.unk36 == 0) {
       if (gDungeon->unk644.windTurns < 0xfa) {
         sub_805E804();
-        sub_806A2BC(leader,1);
+        TryPointCameraToMonster(leader,1);
         DisplayActions(leader);
         if (IsFloorOver() == 0) {
           LogMessageByIdWithPopupCheckUser(leader,gUnknown_80F9C4C);
@@ -54,7 +54,7 @@ void sub_807E378(void)
     else if (gDungeon->unk644.unk36 == 1) {
       if (gDungeon->unk644.windTurns < 0x96) {
         sub_805E804();
-        sub_806A2BC(leader,1);
+        TryPointCameraToMonster(leader,1);
         DisplayActions(leader);
         if (IsFloorOver() == 0) {
           LogMessageByIdWithPopupCheckUser(leader,gUnknown_80F9C70);
@@ -66,7 +66,7 @@ void sub_807E378(void)
     else if (gDungeon->unk644.unk36 == 2) {
       if (gDungeon->unk644.windTurns < 0x32) {
         sub_805E804();
-        sub_806A2BC(leader,1);
+        TryPointCameraToMonster(leader,1);
         DisplayActions(leader);
         if (IsFloorOver() == 0) {
           LogMessageByIdWithPopupCheckUser(leader,gUnknown_80F9C8C);
@@ -77,7 +77,7 @@ void sub_807E378(void)
     }
     else if (gDungeon->unk644.windTurns < 1) {
       sub_805E804();
-      sub_806A2BC(leader,1);
+      TryPointCameraToMonster(leader,1);
       DisplayActions(leader);
       if (IsFloorOver() == 0) {
         LogMessageByIdWithPopupCheckUser(leader,gUnknown_80F9CBC);
diff --git a/src/explosion.c b/src/explosion.c
index b5e88ef7a..df491faaf 100644
--- a/src/explosion.c
+++ b/src/explosion.c
@@ -166,7 +166,7 @@ void HandleExplosion(Entity *pokemon,Entity *target,DungeonPos *param_3,s32 para
                 sub_8049BB0(x,y);
             }
         }
-        ShowWholeRevealedDungeonMap();
+        UpdateMinimap();
         UpdateTrapsVisibility();
     }
 }
diff --git a/src/expose_trap.c b/src/expose_trap.c
index 31822716d..8987ab91c 100644
--- a/src/expose_trap.c
+++ b/src/expose_trap.c
@@ -62,7 +62,7 @@ void sub_807D3CC(Entity *param_1)
     }
     if (flag) {
         LogMessageByIdWithPopupCheckUser(param_1,gUnknown_80FD2F8); // All traps were exposed
-        ShowWholeRevealedDungeonMap();
+        UpdateMinimap();
         UpdateTrapsVisibility();
     }
     else {
diff --git a/src/hurl_orb.c b/src/hurl_orb.c
index 1be7d8347..8dd074309 100644
--- a/src/hurl_orb.c
+++ b/src/hurl_orb.c
@@ -240,7 +240,7 @@ void sub_807F9BC(Entity *entity)
         if (entInfo->isTeamLeader) {
             gDungeon->unk1 = 0;
             gDungeon->unk5C0 = -1;
-            sub_804AC20(&entity->pos);
+            DiscoverMinimap(&entity->pos);
             sub_807EC28(FALSE);
         }
         sub_806A5B8(entity);
diff --git a/src/move_orb_actions_3.c b/src/move_orb_actions_3.c
index ca47de058..b950a179c 100644
--- a/src/move_orb_actions_3.c
+++ b/src/move_orb_actions_3.c
@@ -657,7 +657,7 @@ _0805AA5E:
         WarpTarget(pokemon,target,0,0);
       }
       if (GetEntInfo(target)->isTeamLeader) {
-        sub_804AC20(r9);
+        DiscoverMinimap(r9);
         sub_807EC28(FALSE);
       }
       sub_806A5B8(target);
diff --git a/src/move_orb_actions_4.c b/src/move_orb_actions_4.c
index 789672c05..fe5792c9c 100644
--- a/src/move_orb_actions_4.c
+++ b/src/move_orb_actions_4.c
@@ -39,7 +39,7 @@
 extern void sub_807F43C(Entity *, Entity *);
 extern void HandleOneRoomOrb(Entity *, Entity *);
 extern void sub_806F370(Entity *r0, Entity *r1, u32, u32, u8 *, u8, s32, u32, u32, u32);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void HandleDroughtOrbAction(Entity *);
 extern void HandleLuminousOrbAction(Entity *pokemon);
 extern void HandleTrawlOrbAction(Entity *, Entity *);
@@ -700,7 +700,7 @@ bool8 TrapbustOrbAction(Entity * pokemon,Entity * target, Move *move, s32 param_
         }
         if (foundTrap) {
             TryDisplayDungeonLoggableMessage3(pokemon, target, gUnknown_80FD1B0);
-            ShowWholeRevealedDungeonMap();
+            UpdateMinimap();
             UpdateTrapsVisibility();
         }
         else {
diff --git a/src/move_orb_actions_5.c b/src/move_orb_actions_5.c
index 15e95f0f3..80b6682ae 100644
--- a/src/move_orb_actions_5.c
+++ b/src/move_orb_actions_5.c
@@ -65,7 +65,7 @@ bool8 FillInOrbAction(Entity *pokemon,Entity *target, Move *move, s32 param_4)
         else {
             TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FD0B8);
         }
-        ShowWholeRevealedDungeonMap();
+        UpdateMinimap();
         UpdateTrapsVisibility();
         return filledInTile;
     }
diff --git a/src/move_orb_effects_2.c b/src/move_orb_effects_2.c
index 237f02069..cbceea9bf 100644
--- a/src/move_orb_effects_2.c
+++ b/src/move_orb_effects_2.c
@@ -50,7 +50,7 @@ extern void nullsub_82(Entity *);
 extern void nullsub_83(Entity *);
 extern void nullsub_84(Entity *);
 extern void nullsub_85(Entity *);
-extern void ShowWholeRevealedDungeonMap();
+extern void UpdateMinimap();
 extern void EntityUpdateStatusSprites(Entity *);
 extern void sub_8042A74(Entity *r0);
 extern void sub_807EC28(bool8);
@@ -79,7 +79,7 @@ extern void sub_8041E74(Entity *);
 extern void sub_8041E60(Entity *);
 extern void sub_8041E4C(Entity *);
 extern void sub_8041E3C(Entity *);
-extern void sub_803F580(u32);
+extern void UpdateCamera(u32);
 extern void sub_8041E1C(Entity *);
 extern void nullsub_89(Entity *);
 extern void nullsub_88(Entity *);
@@ -88,8 +88,8 @@ extern void nullsub_86(Entity *);
 extern void sub_8041E0C(Entity *);
 extern void sub_8041DD8(Entity *r0, s32 r1); // NOTE: is s16 in another file
 extern bool8 sub_806AA0C(s32, u32);
-extern void sub_803F580(u32);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateCamera(u32);
+extern void UpdateMinimap(void);
 extern void sub_8041D9C(Entity *);
 extern void sub_8041DB0(Entity *pokemon);
 extern void sub_8041CA8(Entity *);
@@ -251,8 +251,8 @@ void HandleScannerOrb(Entity* pokemon, Entity* target)
         nullsub_75(target);
         SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], target, 0);
         TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FAEA0); // Item locations became evident
-        sub_803F580(0);
-        ShowWholeRevealedDungeonMap();
+        UpdateCamera(0);
+        UpdateMinimap();
         EntityUpdateStatusSprites(target);
     }
   }
@@ -276,8 +276,8 @@ void HandleStairsOrb(Entity* pokemon, Entity* target)
             nullsub_76(target);
             SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],target,0);
             TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FAEC8);
-            sub_803F580(0);
-            ShowWholeRevealedDungeonMap();
+            UpdateCamera(0);
+            UpdateMinimap();
             EntityUpdateStatusSprites(target);
         }
     }
@@ -296,8 +296,8 @@ void HandleRadarOrb(Entity* pokemon, Entity* target)
         nullsub_77(target);
         SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],target,0);
         TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FAFAC);
-        sub_803F580(0);
-        ShowWholeRevealedDungeonMap();
+        UpdateCamera(0);
+        UpdateMinimap();
         EntityUpdateStatusSprites(target);
     }
   }
@@ -1059,7 +1059,7 @@ void BlindTarget(Entity *pokemon, Entity *target)
         TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FB7F4);
         DungeonRunFrameActions(0x31);
         UpdateTrapsVisibility();
-        ShowWholeRevealedDungeonMap();
+        UpdateMinimap();
     }
     else
     {
@@ -1084,9 +1084,9 @@ void CrossEyeVisionTarget(Entity *pokemon, Entity *target)
             TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FB834);
             entityInfo->blinkerClassStatus.status = STATUS_CROSS_EYED;
             entityInfo->blinkerClassStatus.turns = CalculateStatusTurns(target,gCrossEyedTurnRange, TRUE) + 1;
-            sub_803F580(0x1);
+            UpdateCamera(0x1);
             UpdateTrapsVisibility();
-            ShowWholeRevealedDungeonMap();
+            UpdateMinimap();
         }
         else
         {
@@ -1112,7 +1112,7 @@ void RestoreVisionTarget(Entity *pokemon, Entity *target)
         TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FB880);
         DungeonRunFrameActions(0x31);
         UpdateTrapsVisibility();
-        ShowWholeRevealedDungeonMap();
+        UpdateMinimap();
     }
     else
     {
diff --git a/src/move_orb_effects_4.c b/src/move_orb_effects_4.c
index dc1edee1c..b2e254902 100644
--- a/src/move_orb_effects_4.c
+++ b/src/move_orb_effects_4.c
@@ -27,7 +27,7 @@
 #include "dungeon_config.h"
 #include "dungeon_strings.h"
 
-extern void ShowWholeRevealedDungeonMap();
+extern void UpdateMinimap();
 extern void EntityUpdateStatusSprites(Entity *);
 extern void sub_8042A74(Entity *r0);
 extern void sub_807EC28(bool8);
@@ -59,7 +59,7 @@ extern void sub_8041E74(Entity *);
 extern void sub_8041E60(Entity *);
 extern void sub_8041E4C(Entity *);
 extern void sub_8041E3C(Entity *);
-extern void sub_803F580(u32);
+extern void UpdateCamera(u32);
 extern void sub_8041E1C(Entity *);
 extern void nullsub_89(Entity *);
 extern void nullsub_88(Entity *);
diff --git a/src/move_orb_effects_5.c b/src/move_orb_effects_5.c
index 057bc4110..1664a2b19 100644
--- a/src/move_orb_effects_5.c
+++ b/src/move_orb_effects_5.c
@@ -28,7 +28,7 @@
 #include "dungeon_strings.h"
 #include "dungeon_pos_data.h"
 
-extern void ShowWholeRevealedDungeonMap();
+extern void UpdateMinimap();
 extern void EntityUpdateStatusSprites(Entity *);
 extern void sub_8042A74(Entity *r0);
 extern void sub_807EC28(bool8);
@@ -60,7 +60,7 @@ extern void sub_8041E74(Entity *);
 extern void sub_8041E60(Entity *);
 extern void sub_8041E4C(Entity *);
 extern void sub_8041E3C(Entity *);
-extern void sub_803F580(u32);
+extern void UpdateCamera(u32);
 extern void sub_8041E1C(Entity *);
 extern void nullsub_89(Entity *);
 extern void nullsub_88(Entity *);
@@ -546,7 +546,7 @@ void SendEyesightEndMessage(Entity * pokemon,Entity * target)
   if (entityInfo->isTeamLeader) {
     DungeonRunFrameActions(0x31);
     UpdateTrapsVisibility();
-    ShowWholeRevealedDungeonMap();
+    UpdateMinimap();
   }
 }
 
diff --git a/src/one_room_orb.c b/src/one_room_orb.c
index 122d6b6c3..fbee76dd9 100644
--- a/src/one_room_orb.c
+++ b/src/one_room_orb.c
@@ -128,7 +128,7 @@ void HandleOneRoomOrb(Entity *pokemon, Entity *target)
 	sub_804AAD4();
 	sub_8049884();
 	DetermineAllMonsterShadow();
-	ShowWholeRevealedDungeonMap();
+	UpdateMinimap();
 	UpdateTrapsVisibility();
 	LogMessageByIdWithPopupCheckUser(pokemon,gUnknown_80FD3A0);
 	sub_803E708(0x28,0x2b);
diff --git a/src/pounce_orb.c b/src/pounce_orb.c
index fb7b5b9ae..5bcc1749c 100644
--- a/src/pounce_orb.c
+++ b/src/pounce_orb.c
@@ -79,7 +79,7 @@ void HandlePounceOrbAction(Entity *pokemon, Entity *target, u8 r2)
         sub_806CE68(target, 8);
         if(info->isTeamLeader)
         {
-            sub_804AC20(&target->pos);
+            DiscoverMinimap(&target->pos);
             sub_807EC28(0);
         }
         sub_806A5B8(target);
diff --git a/src/run_dungeon.c b/src/run_dungeon.c
index 0f1ee3de0..d7348549f 100644
--- a/src/run_dungeon.c
+++ b/src/run_dungeon.c
@@ -80,9 +80,9 @@ extern void EnemyEvolution(Entity *);
 extern void sub_803E748(void);
 extern void sub_8083D68(void);
 extern void sub_803E7C8(void);
-extern void ShowWholeRevealedDungeonMap(void);
+extern void UpdateMinimap(void);
 extern void sub_807E5AC(void);
-extern void TriggerWeatherAbilities(void);
+extern void TryActivateArtificialWeatherAbilities(void);
 extern void sub_807E88C(void);
 extern void nullsub_16(void);
 extern void sub_80521D0(void);
@@ -435,7 +435,7 @@ void RunDungeon_Async(DungeonSetupStruct *setupPtr)
         sub_8040094(0);
         sub_803EAF0(0, NULL);
         InitDungeonMap(r6);
-        ShowWholeRevealedDungeonMap();
+        UpdateMinimap();
         gDungeon->unkB8 = NULL;
         gDungeon->unk644.unk28 = 0;
         gDungeon->unk644.unk29 = 0;
@@ -459,7 +459,7 @@ void RunDungeon_Async(DungeonSetupStruct *setupPtr)
             }
             else {
                 sub_803F4A0(GetLeader());
-                ShowWholeRevealedDungeonMap();
+                UpdateMinimap();
             }
         }
 
@@ -472,7 +472,7 @@ void RunDungeon_Async(DungeonSetupStruct *setupPtr)
             }
         }
         else {
-            TriggerWeatherAbilities();
+            TryActivateArtificialWeatherAbilities();
         }
 
         if (r6) {
diff --git a/src/switcher_orb.c b/src/switcher_orb.c
index 60b2e8792..02a650642 100644
--- a/src/switcher_orb.c
+++ b/src/switcher_orb.c
@@ -59,7 +59,7 @@ void HandleSwitcherOrb(Entity *pokemon,Entity *target)
 
     if (EntityIsValid(pokemon)) {
       if (GetEntInfo(pokemon)->isTeamLeader) {
-        sub_804AC20(&pokemon->pos);
+        DiscoverMinimap(&pokemon->pos);
         sub_807EC28(FALSE);
       }
       sub_806A5B8(pokemon);
@@ -68,7 +68,7 @@ void HandleSwitcherOrb(Entity *pokemon,Entity *target)
 
     if (EntityIsValid(target)) {
       if (GetEntInfo(target)->isTeamLeader) {
-        sub_804AC20(&target->pos);
+        DiscoverMinimap(&target->pos);
         sub_807EC28(FALSE);
       }
       sub_806A5B8(target);
diff --git a/src/warp_target.c b/src/warp_target.c
index c80d0f3ea..485405d26 100644
--- a/src/warp_target.c
+++ b/src/warp_target.c
@@ -29,13 +29,13 @@
 extern u32 gDungeonFramesCounter;
 
 bool8 ExposeTrap(s32 x, s32 y);
-void ShowWholeRevealedDungeonMap();
+void UpdateMinimap();
 void sub_807EC28(u32);
 u8 IsFloorOver(void);
 extern void sub_806F370(Entity *pokemon, Entity *target, u32, u32, u8 *, u8 moveType, s32, u32, u32, u32);
 void sub_80421AC(Entity * pokemon, Entity * target);
 void sub_807BB78(Entity *pokemon);
-extern void sub_803F580(u32);
+extern void UpdateCamera(u32);
 bool8 sub_808384C(DungeonPos *, DungeonPos *);
 u8 sub_8083660(DungeonPos *);
 
@@ -116,7 +116,7 @@ void WarpTarget(Entity *pokemon, Entity *target, u32 param_3, DungeonPos *pos)
     sub_80694C0(target,local_2c.x,local_2c.y,1);
     UpdateEntityPixelPos(target,0);
     sub_807BB78(target);
-    sub_803F580(1);
+    UpdateCamera(1);
     if (ShouldDisplayEntity(target)) {
         direction = (info->action).direction;
         target->unk1C.raw = 0x9c00;
@@ -139,7 +139,7 @@ void WarpTarget(Entity *pokemon, Entity *target, u32 param_3, DungeonPos *pos)
         PetrifiedStatusTarget(pokemon,target);
     }
     if (info->isTeamLeader) {
-        sub_804AC20(&target->pos);
+        DiscoverMinimap(&target->pos);
         gDungeon->unk1 = 0;
         gDungeon->unk5C0 = -1;
         sub_807EC28(0);
diff --git a/src/weather.c b/src/weather.c
index 5809119b4..a671b20dd 100644
--- a/src/weather.c
+++ b/src/weather.c
@@ -64,7 +64,7 @@ void sub_807E5AC(void)
     if(weather == WEATHER_COUNT)
         weather = DungeonRandInt(WEATHER_COUNT);
     sub_807E5E4(weather);
-    TriggerWeatherAbilities();
+    TryActivateArtificialWeatherAbilities();
     sub_807EAA0(0, 1);
 }