ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

sub_808D4F4

Browse Source
This commit is contained in:
scnorton 2017-09-06 09:42:10 -04:00
parent 368b0f9ee8
commit f3f8c5ec2c
2 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
asm/field_map_obj.s
View File

@ -5,35 +5,6 @@
.text .text
thumb_func_start sub_808D4F4
sub_808D4F4: @ 808D4F4
push {lr}
movs r1, 0
ldr r2, =gUnknown_02037350
ldrb r0, [r2]
b _0808D518
.pool
_0808D504:
adds r0, r1, 0x1
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xF
bhi _0808D51E
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
adds r0, r2
ldrb r0, [r0]
_0808D518:
lsls r0, 31
cmp r0, 0
bne _0808D504
_0808D51E:
adds r0, r1, 0
pop {r1}
bx r1
thumb_func_end sub_808D4F4
thumb_func_start GetFieldObjectIdByLocalIdAndMap thumb_func_start GetFieldObjectIdByLocalIdAndMap
@ u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId) @ u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
GetFieldObjectIdByLocalIdAndMap: @ 808D524 GetFieldObjectIdByLocalIdAndMap: @ 808D524

15
src/field_map_obj.c
View File

@ -30,6 +30,7 @@
static void npcs_clear_ids_and_state(void) static void npcs_clear_ids_and_state(void)
{ {
u8 i; u8 i;
for (i = 0; i < ARRAY_COUNT(gUnknown_02037350); i ++) for (i = 0; i < ARRAY_COUNT(gUnknown_02037350); i ++)
{ {
npc_clear_ids_and_state(&gUnknown_02037350[i]); npc_clear_ids_and_state(&gUnknown_02037350[i]);
@ -60,3 +61,17 @@ void sub_808D438(void)
StartSpriteAffineAnim(&gSprites[spriteIdx], 1); StartSpriteAffineAnim(&gSprites[spriteIdx], 1);
gSprites[spriteIdx].invisible = TRUE; gSprites[spriteIdx].invisible = TRUE;
} }
u8 sub_808D4F4(void)
{
u8 i;
for (i = 0; i < ARRAY_COUNT(gUnknown_02037350); i ++)
{
if (!gUnknown_02037350[i].active)
{
break;
}
}
return i;
}