diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-23 09:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 09:05:26 -0400 |
| commit | 6e36c229200e083ca005cbc448e99210d111f3b2 (patch) | |
| tree | aec86bd0f081a7ff207f68cba33315991b629be1 /asm/field_map_obj.s | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
| parent | 3efd2e1210b4149628197446d063df0fc11281ab (diff) | |
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
Diffstat (limited to 'asm/field_map_obj.s')
| -rw-r--r-- | asm/field_map_obj.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 2b16f5e1f..57f7fbe1c 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -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 |