diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-06-23 22:06:21 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-06-23 22:06:21 -0400 |
| commit | a04106a011429db1a474fedd1fd30d892309e4dd (patch) | |
| tree | e0d2291199adb85bd092a75d84c581fc94fed4bb /include | |
| parent | d096f37d75138eba940f55bd7e1ec8bacc092935 (diff) | |
pokemon_summary_screen.c, part 4.
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/global.h | 1 | ||||
| -rw-r--r-- | include/pokemon_summary_screen.h | 9 | ||||
| -rw-r--r-- | include/strings.h | 2 | ||||
| -rw-r--r-- | include/trade.h | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/include/constants/global.h b/include/constants/global.h index f8cfaa4b0..6a05d169e 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -6,6 +6,7 @@ #define ITEM_NAME_LENGTH 14 #define POKEMON_NAME_LENGTH 10 #define OT_NAME_LENGTH 7 +#define MOVE_NAME_LENGTH 12 #define VERSION_SAPPHIRE 1 #define VERSION_RUBY 2 diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index 9c9c1e351..0c1a2f221 100644 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -45,6 +45,15 @@ enum PokemonSummaryScreenState3270 PSS_STATE3270_6 }; +enum PokemonSummaryScreenStat +{ + PSS_STAT_ATK, + PSS_STAT_DEF, + PSS_STAT_SPA, + PSS_STAT_SPD, + PSS_STAT_SPE +}; + s32 GetLastViewedMonIndex(void); void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4); void sub_8138B38(u8); diff --git a/include/strings.h b/include/strings.h index 6c12d38f5..9f86bf6ef 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1476,5 +1476,7 @@ extern const u8 gUnknown_8419C45[]; extern const u8 gUnknown_8419C82[]; extern const u8 gUnknown_8416202[]; extern const u8 gUnknown_84161EF[]; +extern const u8 gUnknown_841620E[]; +extern const u8 gUnknown_8416210[]; #endif //GUARD_STRINGS_H diff --git a/include/trade.h b/include/trade.h index 196a46587..44d883f66 100644 --- a/include/trade.h +++ b/include/trade.h @@ -17,5 +17,6 @@ void CB2_ReturnFromLinkTrade(void); s32 Trade_CalcLinkPlayerCompatibilityParam(void); s32 CanRegisterMonForTradingBoard(struct GFtgtGnameSub rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet); s32 GetUnionRoomTradeMessageId(struct GFtgtGnameSub rfuPlayer, struct GFtgtGnameSub rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet); +void CB2_ReturnToTradeMenuFromSummary(void); #endif //GUARD_TRADE_H |