diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 23:20:59 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 23:20:59 -0400 |
| commit | d0fbed6ad50c34593002c2b540c4e3e7f4c5cd16 (patch) | |
| tree | c424d9be35c931994b185855efb35cb221a3b9df /include/data | |
| parent | b014273d73996d98519f90b1349feb469cd5f765 (diff) | |
| parent | 445cdf69c9744fe6d6f5161f9119d605e0df76c8 (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'include/data')
| -rw-r--r-- | include/data/field_map_obj/callback_subroutine_pointers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/data/field_map_obj/callback_subroutine_pointers.h b/include/data/field_map_obj/callback_subroutine_pointers.h index 151d5a4f8..a324066b7 100644 --- a/include/data/field_map_obj/callback_subroutine_pointers.h +++ b/include/data/field_map_obj/callback_subroutine_pointers.h @@ -394,7 +394,7 @@ u8 (*const gUnknown_08375588[])(struct MapObject *, struct Sprite *) = { sub_805F3C4 }; -u8 (*const gUnknown_08375594[])(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)) = { +u8 (*const gUnknown_08375594[])(struct MapObject *, struct Sprite *, u8, bool8(u8)) = { sub_805F3EC, sub_805F3F0, sub_805F438, |