name some functions

6 files changed, 18 insertions, 18 deletions

diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index f5e8039ae..c1f0fab6d 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -5739,8 +5739,8 @@ _080A065C: .4byte 0x0000044c
 _080A0660: .4byte 0x0000103d
 	thumb_func_end sub_80A057C
 
-	thumb_func_start sub_80A0664
-sub_80A0664: @ 80A0664
+	thumb_func_start PokemonSummaryScreen_CheckOT
+PokemonSummaryScreen_CheckOT: @ 80A0664
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	ldr r0, _080A06A0 @ =0x02018000
@@ -5774,7 +5774,7 @@ _080A06A4: .4byte gEnemyParty
 _080A06A8: .4byte gLinkPlayers
 _080A06AC: .4byte gStringVar1
 _080A06B0:
-	bl sub_80BFB94
+	bl GetPlayerTrainerId
 	adds r5, r0, 0
 	ldr r0, _080A06F0 @ =0x0000ffff
 	ands r5, r0
@@ -5813,7 +5813,7 @@ _080A0702:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80A0664
+	thumb_func_end PokemonSummaryScreen_CheckOT
 
 	thumb_func_start sub_80A0708
 sub_80A0708: @ 80A0708
@@ -5855,7 +5855,7 @@ _080A073C:
 _080A0750: .4byte gOtherText_EggNicePlace
 _080A0754:
 	adds r0, r4, 0
-	bl sub_80A0664
+	bl PokemonSummaryScreen_CheckOT
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A0768
diff --git a/asm/tv.s b/asm/tv.s
index 018b5a65c..1d9fd7e5d 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -1259,7 +1259,7 @@ _080BE134: .4byte gSaveBlock2
 sub_80BE138: @ 80BE138
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80BFB94
+	bl GetPlayerTrainerId
 	strb r0, [r4, 0x1E]
 	lsrs r2, r0, 8
 	strb r2, [r4, 0x1F]
@@ -1282,7 +1282,7 @@ sub_80BE138: @ 80BE138
 sub_80BE160: @ 80BE160
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80BFB94
+	bl GetPlayerTrainerId
 	adds r1, r4, 0
 	adds r1, 0x20
 	strb r0, [r1]
@@ -2832,7 +2832,7 @@ sub_80BF1B4: @ 80BF1B4
 	lsls r0, 24
 	lsrs r6, r0, 24
 	ldr r7, _080BF1F4 @ =gSaveBlock1 + 0x2738
-	bl sub_80BFB94
+	bl GetPlayerTrainerId
 	adds r5, r0, 0
 	movs r4, 0x5
 _080BF1C4:
@@ -4054,7 +4054,7 @@ _080BFB0C: .4byte gStringVar1
 	thumb_func_start sub_80BFB10
 sub_80BFB10: @ 80BFB10
 	push {r4,lr}
-	bl sub_80BFB94
+	bl GetPlayerTrainerId
 	adds r4, r0, 0
 	ldr r0, _080BFB38 @ =gSpecialVar_0x8004
 	ldrh r1, [r0]
@@ -4127,8 +4127,8 @@ _080BFB90:
 	bx r1
 	thumb_func_end sub_80BFB54
 
-	thumb_func_start sub_80BFB94
-sub_80BFB94: @ 80BFB94
+	thumb_func_start GetPlayerTrainerId
+GetPlayerTrainerId: @ 80BFB94
 	ldr r2, _080BFBAC @ =gSaveBlock2
 	ldrb r0, [r2, 0xD]
 	lsls r0, 24
@@ -4143,7 +4143,7 @@ sub_80BFB94: @ 80BFB94
 	bx lr
 	.align 2, 0
 _080BFBAC: .4byte gSaveBlock2
-	thumb_func_end sub_80BFB94
+	thumb_func_end GetPlayerTrainerId
 
 	thumb_func_start CheckForBigMovieOrEmergencyNewsOnTV
 CheckForBigMovieOrEmergencyNewsOnTV: @ 80BFBB0
diff --git a/include/map_obj_lock.h b/include/map_obj_lock.h
index 6d677ad8c..f7352be22 100644
--- a/include/map_obj_lock.h
+++ b/include/map_obj_lock.h
@@ -4,7 +4,7 @@
 bool8 walkrun_is_standing_still(void);
 void sub_8064CDC(u8 taskId);
 bool8 sub_8064CFC(void);
-void sub_8064D20(void);
+void ScriptFreezeMapObjects(void);
 void sub_8064D38(u8 taskId);
 bool8 sub_8064DB4(void);
 void sub_8064DD8(void);
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c
index fc9882ce2..b1e7bb3df 100644
--- a/src/map_obj_lock.c
+++ b/src/map_obj_lock.c
@@ -36,7 +36,7 @@ bool8 sub_8064CFC(void)
     }
 }
 
-void sub_8064D20(void)
+void ScriptFreezeMapObjects(void)
 {
     FreezeMapObjects();
     CreateTask(sub_8064CDC, 80);
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 5095ec3d0..58573e97e 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -18,7 +18,7 @@ extern const u8 gOtherText_FatefulEncounter[];
 extern const u8 gOtherText_Met2[];
 
 u8 *sub_80A1E9C(u8 *dest, u8 *src, u8);
-u8 sub_80A0664(struct Pokemon *pokemon);
+u8 PokemonSummaryScreen_CheckOT(struct Pokemon *pokemon);
 u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level);
 
 void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *pokemon, u8 left, u8 top) {
@@ -35,7 +35,7 @@ void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *pokemon, u8 left, u8
 
     ptr = StringCopy(ptr, gOtherText_Nature);
 
-    if (sub_80A0664(pokemon) == TRUE) {
+    if (PokemonSummaryScreen_CheckOT(pokemon) == TRUE) {
         locationMet = GetMonData(pokemon, MON_DATA_MET_LOCATION);
 
         if (GetMonData(pokemon, MON_DATA_MET_LEVEL) == 0) {
diff --git a/src/scrcmd.c b/src/scrcmd.c
index e11f73bfc..4dc7a38dc 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1085,7 +1085,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
     }
     else
     {
-        sub_8064D20();
+        ScriptFreezeMapObjects();
         SetupNativeScript(ctx, sub_8064CFC);
         return TRUE;
     }
@@ -1106,7 +1106,7 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
         }
         else
         {
-            sub_8064D20();
+            ScriptFreezeMapObjects();
             SetupNativeScript(ctx, sub_8064CFC);
         }