From b6a56a75f3dff85cdd1b6fc38b1c841e2d0591b3 Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Mon, 22 Jul 2024 07:00:53 +0100
Subject: [PATCH] MapObjectManager_Get

---
 arm9/asm/map_object_s.s | 8 ++++----
 arm9/src/map_object.c   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arm9/asm/map_object_s.s b/arm9/asm/map_object_s.s
index 327c52a98..d24b50ca6 100644
--- a/arm9/asm/map_object_s.s
+++ b/arm9/asm/map_object_s.s
@@ -221,8 +221,8 @@ sub_02058348: ; 0x02058348
 _0205835E:
 	pop {r4, pc}
 
-	thumb_func_start MapObjectManager_GetMapObjectManager
-MapObjectManager_GetMapObjectManager: ; 0x02058360
+	thumb_func_start MapObjectManager_Get
+MapObjectManager_Get: ; 0x02058360
 	bx lr
 	.balign 4
 
@@ -697,12 +697,12 @@ MapObject_GetManager: ; 0x02058578
 
 	thumb_func_start sub_02058580
 sub_02058580: ; 0x02058580
-	ldr r3, _02058588 ; =MapObjectManager_GetMapObjectManager
+	ldr r3, _02058588 ; =MapObjectManager_Get
 	add r0, #0xb4
 	ldr r0, [r0, #0x0]
 	bx r3
 	.balign 4
-_02058588: .word MapObjectManager_GetMapObjectManager
+_02058588: .word MapObjectManager_Get
 
 	thumb_func_start sub_0205858C
 sub_0205858C: ; 0x0205858C
diff --git a/arm9/src/map_object.c b/arm9/src/map_object.c
index 37c2f2fc9..6098a00df 100644
--- a/arm9/src/map_object.c
+++ b/arm9/src/map_object.c
@@ -52,7 +52,7 @@ extern void sub_02057E90(LocalMapObject *object, MapObjectManager *manager);
 extern void sub_0205844C(LocalMapObject *object, u32 mapNo);
 extern void sub_020581B4(LocalMapObject *object);
 extern void MapObject_SetFlagsBits(LocalMapObject *object, MapObjectFlagBits bits);
-extern MapObjectManager *MapObjectManager_GetMapObjectManager(MapObjectManager *manager);
+extern MapObjectManager *MapObjectManager_Get(MapObjectManager *manager);
 extern void sub_0205836C(MapObjectManager *manager);
 extern void ObjectEvent_SetId(ObjectEvent *objectEvent, u32 id);
 extern void ObjectEvent_SetSprite(ObjectEvent *objectEvent, u32 sprite);
@@ -275,7 +275,7 @@ static LocalMapObject *MapObject_CreateFromObjectEvent(MapObjectManager *manager
     sub_020581B4(ret);
     MapObject_SetFlagsBits(ret, MAPOBJECTFLAG_UNK2);
     sub_02057CF0(manager, ret);
-    sub_0205836C(MapObjectManager_GetMapObjectManager(manager));
+    sub_0205836C(MapObjectManager_Get(manager));
     return ret;
 }
 
@@ -529,7 +529,7 @@ static void sub_02057AEC(MapObjectManager *manager, LocalMapObject *object) {
     sub_020581B4(object);
     sub_02057CF0(manager, object);
     sub_0205866C(object);
-    sub_0205836C(MapObjectManager_GetMapObjectManager(manager));
+    sub_0205836C(MapObjectManager_Get(manager));
 }
 
 static void sub_02057B34(LocalMapObject *object) {