diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-24 21:52:28 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-24 21:52:28 -0400 |
| commit | 33fe400bcff27f9f9636addac5faa17ac97f4014 (patch) | |
| tree | 4e2949b8944d0fec97e7a0ddd30b9aaedaaebf4b /include/field_map_obj.h | |
| parent | 4fb48ddb53d9782538c447a795099d368d1b361d (diff) | |
| parent | fd69fc936729c288720a7e5251314efa121e9ac3 (diff) | |
Merge branch 'master' into secret_base_data_fix
Diffstat (limited to 'include/field_map_obj.h')
| -rw-r--r-- | include/field_map_obj.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 641a28ed3..19482e71f 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -381,7 +381,7 @@ void npc_set_running_behaviour_etc(struct MapObject *, u8); u8 npc_running_behaviour_by_direction(u8); u8 npc_block_way(struct MapObject *, s16, s16, u32); u8 sub_8060024(struct MapObject *, s16, s16, u8); -u8 sub_8060234(u8, u8, u8); +bool8 IsBerryTreeSparkling(u8, u8, u8); void sub_8060288(u8, u8, u8); void sub_8060388(s16, s16, s16 *, s16 *); void sub_80603CC(s16 x, s16 y, s16 *pInt, s16 *pInt1); |