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

through FieldObjectGetBerryTreeId

Browse source
This commit is contained in:
scnorton 2017-09-11 10:19:03 -04:00
parent bcf844f965
commit bd9b81546f
2 changed files with 22 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
asm/field_map_obj.s
View file

@ -5,68 +5,6 @@
.text .text
thumb_func_start sub_808F0BC
sub_808F0BC: @ 808F0BC
lsls r0, 24
lsrs r0, 24
ldr r2, =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r0, [r1, 0x7]
bx lr
.pool
thumb_func_end sub_808F0BC
thumb_func_start sub_808F0D4
sub_808F0D4: @ 808F0D4
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 _0808F108
ldr r2, =gMapObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
adds r0, r2
ldrb r0, [r0, 0x1D]
b _0808F10A
.pool
_0808F108:
movs r0, 0xFF
_0808F10A:
add sp, 0x4
pop {r1}
bx r1
thumb_func_end sub_808F0D4
thumb_func_start FieldObjectGetBerryTreeId
@ u8 FieldObjectGetBerryTreeId(u8 fieldObjectId)
FieldObjectGetBerryTreeId: @ 808F110
lsls r0, 24
lsrs r0, 24
ldr r2, =gMapObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r0, [r1, 0x1D]
bx lr
.pool
thumb_func_end FieldObjectGetBerryTreeId
thumb_func_start GetFieldObjectTemplateByLocalIdAndMap thumb_func_start GetFieldObjectTemplateByLocalIdAndMap
@ struct FieldObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId) @ struct FieldObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapId, u8 mapGroupId)
GetFieldObjectTemplateByLocalIdAndMap: @ 808F128 GetFieldObjectTemplateByLocalIdAndMap: @ 808F128

22
src/field_map_obj.c
View file

@ -1521,3 +1521,25 @@ u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup)
} }
return gMapObjects[mapObjectId].trainerType; return gMapObjects[mapObjectId].trainerType;
} }
u8 sub_808F0BC(u8 mapObjectId)
{
return gMapObjects[mapObjectId].trainerType;
}
u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup)
{
u8 mapObjectId;
if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
{
return 0xFF;
}
return gMapObjects[mapObjectId].trainerRange_berryTreeId;
}
u8 FieldObjectGetBerryTreeId(u8 mapObjectId)
{
return gMapObjects[mapObjectId].trainerRange_berryTreeId;
}