diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-14 22:01:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-14 22:01:31 -0400 |
| commit | 200bdcb5c2c34f18ca8ccb667642080441feb97f (patch) | |
| tree | ed504cfb57480f0a9c6d8af9aded8e5300f16a3d /include | |
| parent | 8219bb53d59c426de31c43ec3a045b61d7108798 (diff) | |
| parent | 817f20d2275d29a2d1976fa2e1281a15b0c45630 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby
Diffstat (limited to 'include')
| -rwxr-xr-x | include/menu.h | 2 | ||||
| -rw-r--r-- | include/menu_cursor.h | 2 | ||||
| -rw-r--r-- | include/pokedex.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/menu.h b/include/menu.h index 98d7afcc3..09aa6b750 100755 --- a/include/menu.h +++ b/include/menu.h @@ -81,6 +81,6 @@ void RedrawMenuCursor(u8, u8); void unref_sub_8072DC0(void); void sub_8072DCC(u8); void sub_8072DDC(u8); -void sub_8072DEC(void); +void HandleDestroyMenuCursors(void); #endif // GUARD_MENU_H diff --git a/include/menu_cursor.h b/include/menu_cursor.h index cc6cc16bc..ca82ef244 100644 --- a/include/menu_cursor.h +++ b/include/menu_cursor.h @@ -7,7 +7,7 @@ void sub_814A590(void); u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5); u8 sub_814A758(u8 a1, u8 a2, u8 a3, u8 a4); u8 unref_sub_814A7AC(u8 a1, u16 a2, u8 a3); -void sub_814A7FC(void); +void DestroyMenuCursor(void); void sub_814A880(u8 a1, u8 a2); void sub_814A904(void); void sub_814A958(u8 a1); diff --git a/include/pokedex.h b/include/pokedex.h index 61597981b..a243e6064 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -135,7 +135,7 @@ void sub_8090A3C(u8); void sub_8090C68(void); u8 *GetPokemonCategory(u16); -s8 sub_8090D90(u16, u8); +s8 GetNationalPokedexFlag(u16, u8); u16 GetNationalPokedexCount(u8); u16 GetHoennPokedexCount(u8); bool8 sub_8090FC0(void); |