Merge remote-tracking branch 'origin/master' into sync_bery_crush

1 files changed, 4 insertions, 4 deletions

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 69acf7b7b..224da3ef4 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1106,7 +1106,7 @@ bool8 ScrCmd_showobject_at(struct ScriptContext * ctx)
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
 
-    npc_by_local_id_and_map_set_field_1_bit_x20(localId, mapNum, mapGroup, 0);
+    ShowOrHideObjectByLocalIdAndMap(localId, mapNum, mapGroup, 0);
     return FALSE;
 }
 
@@ -1116,7 +1116,7 @@ bool8 ScrCmd_hideobject_at(struct ScriptContext * ctx)
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
 
-    npc_by_local_id_and_map_set_field_1_bit_x20(localId, mapNum, mapGroup, 1);
+    ShowOrHideObjectByLocalIdAndMap(localId, mapNum, mapGroup, 1);
     return FALSE;
 }
 
@@ -1127,7 +1127,7 @@ bool8 ScrCmd_setobjectpriority(struct ScriptContext * ctx)
     u8 mapNum = ScriptReadByte(ctx);
     u8 priority = ScriptReadByte(ctx);
 
-    sub_805F3A8(localId, mapNum, mapGroup, priority + 83);
+    SetObjectPriorityByLocalIdAndMap(localId, mapNum, mapGroup, priority + 83);
     return FALSE;
 }
 
@@ -1137,7 +1137,7 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext * ctx)
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
 
-    sub_805F400(localId, mapNum, mapGroup);
+    UnfixObjectPriorityByLocalIdAndMap(localId, mapNum, mapGroup);
     return FALSE;
 }