dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Slight touching up of data3.s; denote boundaries of data/field_map_obj.s for future split

Browse Source
This commit is contained in:
PikalaxALT
2017-09-06 22:46:44 -04:00
parent 1f83a2885e
commit 112177b57f
3 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
asm/field_map_obj.s
View File

@@ -5,24 +5,6 @@
.text
thumb_func_start MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
@ void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct objtemplate *objectTemplate, SpriteOamTable **spriteOamTables)
MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: @ 808DD30
push {r4,lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
ldr r4, =gUnknown_08505438
lsrs r1, 14
adds r1, r4
ldr r1, [r1]
bl MakeObjectTemplateFromFieldObjectGraphicsInfo
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
thumb_func_start MakeObjectTemplateFromFieldObjectTemplate
@ void MakeObjectTemplateFromFieldObjectTemplate(struct FieldObjectTemplate *fieldObjectTemplate, struct objtemplate *objectTemplate, SpriteOamTable **spriteOamTables)
MakeObjectTemplateFromFieldObjectTemplate: @ 808DD50