atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sub_808EAB0

Browse source
This commit is contained in:
scnorton 2017-09-08 18:12:27 -04:00
parent a17a1bb27a
commit b639ca3b15
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
asm/field_map_obj.s
View file

@ -5,18 +5,6 @@
.text .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 thumb_func_start sub_808EAC4
sub_808EAC4: @ 808EAC4 sub_808EAC4: @ 808EAC4
push {r4,lr} push {r4,lr}

1
include/field_map_obj.h
View file

@ -21,7 +21,6 @@ void npc_load_two_palettes__no_record(u16, u8);
void npc_load_two_palettes__and_record(u16, u8); void npc_load_two_palettes__and_record(u16, u8);
void pal_patch_for_npc(u16, u8); void pal_patch_for_npc(u16, u8);
void sub_808E16C(s16, s16); void sub_808E16C(s16, s16);
void sub_808EAB0(u16, u8);
void sub_8092FF0(s16, s16, s16 *, s16 *); void sub_8092FF0(s16, s16, s16 *, s16 *);
u8 FieldObjectDirectionToImageAnimId(u8); u8 FieldObjectDirectionToImageAnimId(u8);
void sub_80930E0(s16 *, s16 *, u8, u8); void sub_80930E0(s16 *, s16 *, u8, u8);

6
src/field_map_obj.c
View file

@ -46,6 +46,7 @@ static void SetPlayerAvatarFieldObjectIdAndObjectId(u8, u8);
/*static*/ void sub_808E38C(struct MapObject *); /*static*/ void sub_808E38C(struct MapObject *);
static u8 sub_808E8F4(const struct SpritePalette *); static u8 sub_808E8F4(const struct SpritePalette *);
static u8 FindFieldObjectPaletteIndexByTag(u16); static u8 FindFieldObjectPaletteIndexByTag(u16);
static void sub_808EAB0(u16, u8);
// ROM data // 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);
}