summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalax1@gmail.com>2017-09-12 16:17:52 -0400
committerPikalaxALT <pikalax1@gmail.com>2017-09-12 16:17:52 -0400
commitc6ef3442621227562f15017441aa6fb7709e7187 (patch)
tree8714288fb3d6e10b7c13836c15c751d6090ad584
parent9306122359968579b27b9a41e3cfd082860a4231 (diff)
sub_808F254
-rwxr-xr-x[-rw-r--r--]asm/field_map_obj.s31
-rwxr-xr-x[-rw-r--r--]include/field_map_obj.h1
-rwxr-xr-x[-rw-r--r--]src/field_map_obj.c10
3 files changed, 11 insertions, 31 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 243e96c75..ef9e6a2e8 100644..100755
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,37 +5,6 @@
.text
- thumb_func_start sub_808F254
-@ void sub_808F254(u8 localId, u8 mapId, u8 mapGroupId)
-sub_808F254: @ 808F254
- push {lr}
- sub sp, 0x4
- lsls r0, 24
- lsrs r0, 24
- lsls r1, 24
- lsrs r1, 24
- lsls r2, 24
- lsrs r2, 24
- mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
- lsls r0, 24
- cmp r0, 0
- bne _0808F282
- mov r0, sp
- ldrb r1, [r0]
- lsls r0, r1, 3
- adds r0, r1
- lsls r0, 2
- ldr r1, =gMapObjects
- adds r0, r1
- bl sub_808F208
-_0808F282:
- add sp, 0x4
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_808F254
-
thumb_func_start sub_808F28C
sub_808F28C: @ 808F28C
push {r4,lr}
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index b292d200d..ec28df643 100644..100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -46,6 +46,7 @@ void sub_808E75C(s16, s16);
void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
void npc_coords_shift(struct MapObject *, s16, s16);
void sub_808EB08(struct MapObject *, s16, s16);
+void sub_808F254(u8, u8, u8);
// Exported data declarations
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 59f8d35a1..af36d95f7 100644..100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1629,3 +1629,13 @@ void sub_808F23C(const struct MapObject *mapObject, u8 movementType)
mapObjectTemplate->movementType = movementType;
}
}
+
+void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup)
+{
+ u8 mapObjectId;
+
+ if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+ {
+ sub_808F208(&gMapObjects[mapObjectId]);
+ }
+}