diff options
| author | huderlem <huderlem@gmail.com> | 2019-03-08 13:37:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 13:37:12 -0600 |
| commit | 32f71b29766effb1d7cd137cc27f31631fef36e7 (patch) | |
| tree | 3cd963b2f04d2296dafed4d77500d06e22f9640c /include | |
| parent | f235d07db5c577b5ca9c8ab127eb70651113a247 (diff) | |
| parent | 146c194b0c638693270d6e4eac490e33a9dbb8fd (diff) | |
Merge pull request #600 from Phlosioneer/summary-screen-macros
Summary screen macros
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_tent.h | 2 | ||||
| -rw-r--r-- | include/party_menu.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_tent.h b/include/battle_tent.h index a894d4cfb..ca3faa4a6 100644 --- a/include/battle_tent.h +++ b/include/battle_tent.h @@ -1,6 +1,6 @@ #ifndef GUARD_BATTLE_TENT_H #define GUARD_BATTLE_TENT_H -bool8 sub_81B9E94(void); +bool8 InSlateportBattleTent(void); #endif //GUARD_BATTLE_TENT_H diff --git a/include/party_menu.h b/include/party_menu.h index e67dd56f2..413a89689 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -62,7 +62,7 @@ u8 sub_81B1B5C(const u8* str, u8 b); bool8 sub_81B1BD4(void); void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func); u8 pokemon_ailments_get_primary(u32 status); -u8 sub_81B205C(struct Pokemon *mon); +u8 GetMonAilment(struct Pokemon *mon); void display_pokemon_menu_message(u32 stringID); void sub_81B47E0(u8 taskId); bool8 FieldCallback_PrepareFadeInFromMenu(void); |