diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 0cc7f1fe37..2bf3ce5728 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -5,18 +5,6 @@ .text - thumb_func_start sub_808EAB0 -sub_808EAB0: @ 808EAB0 - push {lr} - lsls r0, 16 - lsrs r0, 16 - lsls r1, 24 - lsrs r1, 24 - bl pal_patch_for_npc - pop {r0} - bx r0 - thumb_func_end sub_808EAB0 - thumb_func_start sub_808EAC4 sub_808EAC4: @ 808EAC4 push {r4,lr} diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 04bdb42d40..c5b23103f7 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -21,7 +21,6 @@ void npc_load_two_palettes__no_record(u16, u8); void npc_load_two_palettes__and_record(u16, u8); void pal_patch_for_npc(u16, u8); void sub_808E16C(s16, s16); -void sub_808EAB0(u16, u8); void sub_8092FF0(s16, s16, s16 *, s16 *); u8 FieldObjectDirectionToImageAnimId(u8); void sub_80930E0(s16 *, s16 *, u8, u8); diff --git a/src/field_map_obj.c b/src/field_map_obj.c index b5a0ce5e5b..8042348f25 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -46,6 +46,7 @@ static void SetPlayerAvatarFieldObjectIdAndObjectId(u8, u8); /*static*/ void sub_808E38C(struct MapObject *); static u8 sub_808E8F4(const struct SpritePalette *); static u8 FindFieldObjectPaletteIndexByTag(u16); +static void sub_808EAB0(u16, u8); // ROM data @@ -1211,3 +1212,8 @@ void npc_load_two_palettes__and_record(u16 tag, u8 slot) } } } + +static void sub_808EAB0(u16 tag, u8 slot) +{ + pal_patch_for_npc(tag, slot); +}