diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-10-01 11:17:34 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-10-01 11:17:34 -0500 |
| commit | f91da8a21072836d18b77380f45030bc8bd87743 (patch) | |
| tree | d5a0e2e90f11420115c2dd7a998976cc87e80ce9 /include/data/field_map_obj/callback_subroutine_pointers.h | |
| parent | e926119b726839bc687c503db3680899906aad0d (diff) | |
| parent | 83efcc9c3d1e81b78c2cd9ceab3ac6420a5f4070 (diff) | |
Merge remote-tracking branch 'upstream/master' into script_cmd_renaming
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, |