dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-24 01:42:52 +08:00
parent 9a53686a4e 6e36c22920
commit 1dc0b25c1e
1127 changed files with 79056 additions and 34785 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_map_obj.s
+2 -2
View File
@@ -2774,14 +2774,14 @@ _0805F2E0:
bls _0805F2E6
movs r1, 0x10
_0805F2E6:
ldr r0, _0805F2F4 @ =gUnknown_839FDB0
ldr r0, _0805F2F4 @ =gMapObjectGraphicsInfoPointers
lsls r1, 2
adds r1, r0
ldr r0, [r1]
pop {r1}
bx r1
.align 2, 0
_0805F2F4: .4byte gUnknown_839FDB0
_0805F2F4: .4byte gMapObjectGraphicsInfoPointers
thumb_func_end GetFieldObjectGraphicsInfo
thumb_func_start FieldObjectHandleDynamicGraphicsId