diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-09 10:23:23 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-10-09 10:40:04 -0700 |
| commit | 72beb410f423cafd35989c0b8dd4c52860cf80f8 (patch) | |
| tree | 155aa1e2c39ebd504e095bc8c1dc218aad3acdc4 /include/data/field_map_obj/callback_subroutine_pointers.h | |
| parent | a871ce87a74421df64a9ad381d37dc32ff9bdc6d (diff) | |
| parent | 3e03d362fae398fa56c4a6e45d7b999772d0803f (diff) | |
Merge remote-tracking branch 'upstream/master' into party_menu
Diffstat (limited to 'include/data/field_map_obj/callback_subroutine_pointers.h')
| -rw-r--r-- | include/data/field_map_obj/callback_subroutine_pointers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/data/field_map_obj/callback_subroutine_pointers.h b/include/data/field_map_obj/callback_subroutine_pointers.h index d24a47184..a324066b7 100644 --- a/include/data/field_map_obj/callback_subroutine_pointers.h +++ b/include/data/field_map_obj/callback_subroutine_pointers.h @@ -1,5 +1,5 @@ // -// Created by scott on 6/18/2017. + // #ifndef POKERUBY_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, |