diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 12:18:17 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 12:18:17 -0400 |
commit | 9377dc23e2dcb8a293d8c0d1193c4d708045e08d (patch) | |
tree | 45eca3d96fe89f574a4f187bd82c9aedf1f614e4 /include | |
parent | 714d387cbd8e3a9a9e5b522eed42c8132d41e0b0 (diff) |
through sub_8111F8C
Diffstat (limited to 'include')
-rw-r--r-- | include/field_player_avatar.h | 2 | ||||
-rw-r--r-- | include/map_obj_80688E4.h | 6 | ||||
-rw-r--r-- | include/palette.h | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 25b7f2d71..4bbc197aa 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -11,6 +11,8 @@ u8 player_get_direction_upper_nybble(void); u8 player_get_x22(void); void sub_808D074(u8); +void sub_805C270(); +void sub_805C780(); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/map_obj_80688E4.h b/include/map_obj_80688E4.h new file mode 100644 index 000000000..b131a1a54 --- /dev/null +++ b/include/map_obj_80688E4.h @@ -0,0 +1,6 @@ +#ifndef GUARD_MAP_OBJ_80688E4_H +#define GUARD_MAP_OBJ_80688E4_H + +void player_bitmagic(void); + +#endif //GUARD_MAP_OBJ_80688E4_H diff --git a/include/palette.h b/include/palette.h index ffdc0496d..bdd1d1b93 100644 --- a/include/palette.h +++ b/include/palette.h @@ -68,6 +68,6 @@ void BeginHardwarePaletteFade(u8, u8, u8, u8, u8); void BlendPalettes(u32, u8, u16); void BlendPalettesUnfaded(u32, u8, u16); -extern struct PaletteFadeControl gUnknown_2037AB8; +extern struct PaletteFadeControl gPaletteFade; #endif // GUARD_PALETTE_H |