From b2a6189f6b06270e522c72879d3225b594f8d78e Mon Sep 17 00:00:00 2001 From: RavePossum Date: Fri, 22 Nov 2024 20:48:11 -0500 Subject: [PATCH] Mass rename pss -> summary --- .../pokemon_summary_screen/main.h | 472 +++++------ .../pokemon_summary_screen/window.h | 18 +- .../message_bank_pokemon_summary_screen.gmm | 158 ++-- .../pokemon_summary_screen/3d_anim.c | 6 +- .../pokemon_summary_screen/main.c | 540 ++++++------ .../pokemon_summary_screen/sprite.c | 470 +++++------ .../pokemon_summary_screen/subscreen.c | 98 +-- .../pokemon_summary_screen/window.c | 780 +++++++++--------- src/unk_020989DC.c | 2 +- 9 files changed, 1272 insertions(+), 1272 deletions(-) diff --git a/include/applications/pokemon_summary_screen/main.h b/include/applications/pokemon_summary_screen/main.h index 24d23705f0..706038c982 100644 --- a/include/applications/pokemon_summary_screen/main.h +++ b/include/applications/pokemon_summary_screen/main.h @@ -28,269 +28,269 @@ #include "text.h" #include "trainer_info.h" -enum PSSMode { - PSS_MODE_NORMAL = 0, - PSS_MODE_LOCK_MOVES, - PSS_MODE_SELECT_MOVE, - PSS_MODE_POFFIN, - PSS_MODE_CONDITION, +enum SummaryMode { + SUMMARY_MODE_NORMAL = 0, + SUMMARY_MODE_LOCK_MOVES, + SUMMARY_MODE_SELECT_MOVE, + SUMMARY_MODE_POFFIN, + SUMMARY_MODE_CONDITION, }; -enum PSSPage { - PSS_PAGE_INFO = 0, - PSS_PAGE_MEMO, - PSS_PAGE_SKILLS, - PSS_PAGE_BATTLE_MOVES, - PSS_PAGE_CONDITION, - PSS_PAGE_CONTEST_MOVES, - PSS_PAGE_RIBBONS, - PSS_PAGE_EXIT, +enum SummaryPage { + SUMMARY_PAGE_INFO = 0, + SUMMARY_PAGE_MEMO, + SUMMARY_PAGE_SKILLS, + SUMMARY_PAGE_BATTLE_MOVES, + SUMMARY_PAGE_CONDITION, + SUMMARY_PAGE_CONTEST_MOVES, + SUMMARY_PAGE_RIBBONS, + SUMMARY_PAGE_EXIT, - PSS_PAGE_MAX, + SUMMARY_PAGE_MAX, - PSS_PAGE_NONE = 0xFF + SUMMARY_PAGE_NONE = 0xFF }; -enum PSSDataType { - PSS_DATA_MON = 0, - PSS_DATA_PARTY_MON, - PSS_DATA_BOX_MON, +enum SummaryDataType { + SUMMARY_DATA_MON = 0, + SUMMARY_DATA_PARTY_MON, + SUMMARY_DATA_BOX_MON, }; -enum PSSReturnMode { - PSS_RETURN_SELECT = 0, - PSS_RETURN_CANCEL, +enum SummaryReturnMode { + SUMMARY_RETURN_SELECT = 0, + SUMMARY_RETURN_CANCEL, }; -enum PSSSubscreenType { - PSS_SUBSCREEN_TYPE_NORMAL = 0, - PSS_SUBSCREEN_TYPE_NO_CONTEST_INFO, - PSS_SUBSCREEN_TYPE_UNUSED_MOVES_ONLY, // only shows battle and contest move pages, never used +enum SummarySubscreenType { + SUMMARY_SUBSCREEN_TYPE_NORMAL = 0, + SUMMARY_SUBSCREEN_TYPE_NO_CONTEST_INFO, + SUMMARY_SUBSCREEN_TYPE_UNUSED_MOVES_ONLY, // only shows battle and contest move pages, never used - PSS_SUBSCREEN_TYPE_NO_BUTTONS = 0xF, + SUMMARY_SUBSCREEN_TYPE_NO_BUTTONS = 0xF, }; -enum PSSStaticWindow { - PSS_WINDOW_LABEL_INFO = 0, - PSS_WINDOW_LABEL_MEMO, - PSS_WINDOW_LABEL_SKILLS, - PSS_WINDOW_LABEL_CONDITION, - PSS_WINDOW_LABEL_BATTLE_MOVES, - PSS_WINDOW_LABEL_CONTEST_MOVES, - PSS_WINDOW_LABEL_ITEM, - PSS_WINDOW_LABEL_DEX_NUM, - PSS_WINDOW_LABEL_SPECIES_NAME, - PSS_WINDOW_LABEL_TYPE, - PSS_WINDOW_LABEL_OT_NAME, - PSS_WINDOW_LABEL_OT_ID, - PSS_WINDOW_LABEL_EXP, - PSS_WINDOW_LABEL_EXP_NEXT_LV, - PSS_WINDOW_DUMMY_14, - PSS_WINDOW_LABEL_HP, - PSS_WINDOW_LABEL_ATTACK, - PSS_WINDOW_LABEL_DEFENSE, - PSS_WINDOW_LABEL_SP_ATTACK, - PSS_WINDOW_LABEL_SP_DEFENSE, - PSS_WINDOW_LABEL_SPEED, - PSS_WINDOW_LABEL_ABILITY, - PSS_WINDOW_LABEL_SHEEN, - PSS_WINDOW_DUMMY_23, - PSS_WINDOW_LABEL_MOVE_CANCEL, - PSS_WINDOW_LABEL_MOVE_CATEGORY, - PSS_WINDOW_LABEL_MOVE_POWER, - PSS_WINDOW_LABEL_MOVE_ACCURACY, - PSS_WINDOW_LABEL_CLOSE_WINDOW, - PSS_WINDOW_LABEL_APPEAL_POINTS, - PSS_WINDOW_LABEL_RIBBON_COUNT, - PSS_WINDOW_LABEL_RIBBONS, - PSS_WINDOW_ITEM_NAME, - PSS_WINDOW_MON_LEVEL, - PSS_WINDOW_MON_NICKNAME_GENDER, - PSS_WINDOW_BUTTON_PROMPT, - - PSS_STATIC_WINDOW_MAX +enum SummaryStaticWindow { + SUMMARY_WINDOW_LABEL_INFO = 0, + SUMMARY_WINDOW_LABEL_MEMO, + SUMMARY_WINDOW_LABEL_SKILLS, + SUMMARY_WINDOW_LABEL_CONDITION, + SUMMARY_WINDOW_LABEL_BATTLE_MOVES, + SUMMARY_WINDOW_LABEL_CONTEST_MOVES, + SUMMARY_WINDOW_LABEL_ITEM, + SUMMARY_WINDOW_LABEL_DEX_NUM, + SUMMARY_WINDOW_LABEL_SPECIES_NAME, + SUMMARY_WINDOW_LABEL_TYPE, + SUMMARY_WINDOW_LABEL_OT_NAME, + SUMMARY_WINDOW_LABEL_OT_ID, + SUMMARY_WINDOW_LABEL_EXP, + SUMMARY_WINDOW_LABEL_EXP_NEXT_LV, + SUMMARY_WINDOW_DUMMY_14, + SUMMARY_WINDOW_LABEL_HP, + SUMMARY_WINDOW_LABEL_ATTACK, + SUMMARY_WINDOW_LABEL_DEFENSE, + SUMMARY_WINDOW_LABEL_SP_ATTACK, + SUMMARY_WINDOW_LABEL_SP_DEFENSE, + SUMMARY_WINDOW_LABEL_SPEED, + SUMMARY_WINDOW_LABEL_ABILITY, + SUMMARY_WINDOW_LABEL_SHEEN, + SUMMARY_WINDOW_DUMMY_23, + SUMMARY_WINDOW_LABEL_MOVE_CANCEL, + SUMMARY_WINDOW_LABEL_MOVE_CATEGORY, + SUMMARY_WINDOW_LABEL_MOVE_POWER, + SUMMARY_WINDOW_LABEL_MOVE_ACCURACY, + SUMMARY_WINDOW_LABEL_CLOSE_WINDOW, + SUMMARY_WINDOW_LABEL_APPEAL_POINTS, + SUMMARY_WINDOW_LABEL_RIBBON_COUNT, + SUMMARY_WINDOW_LABEL_RIBBONS, + SUMMARY_WINDOW_ITEM_NAME, + SUMMARY_WINDOW_MON_LEVEL, + SUMMARY_WINDOW_MON_NICKNAME_GENDER, + SUMMARY_WINDOW_BUTTON_PROMPT, + + SUMMARY_STATIC_WINDOW_MAX }; -enum PSSExtraWindowInfo { - PSS_WINDOW_DEX_NUM = 0, - PSS_WINDOW_SPECIES_NAME, - PSS_WINDOW_OT_NAME, - PSS_WINDOW_OT_ID, - PSS_WINDOW_EXP, - PSS_WINDOW_EXP_NEXT_LV, +enum SummaryExtraWindowInfo { + SUMMARY_WINDOW_DEX_NUM = 0, + SUMMARY_WINDOW_SPECIES_NAME, + SUMMARY_WINDOW_OT_NAME, + SUMMARY_WINDOW_OT_ID, + SUMMARY_WINDOW_EXP, + SUMMARY_WINDOW_EXP_NEXT_LV, - PSS_INFO_WINDOW_MAX, + SUMMARY_INFO_WINDOW_MAX, }; -enum PSSExtraWindowMemo { - PSS_WINDOW_MEMO = 0, +enum SummaryExtraWindowMemo { + SUMMARY_WINDOW_MEMO = 0, - PSS_MEMO_WINDOW_MAX, + SUMMARY_MEMO_WINDOW_MAX, }; -enum PSSExtraWindowSkills { - PSS_WINDOW_HP = 0, - PSS_WINDOW_ATTACK, - PSS_WINDOW_DEFENSE, - PSS_WINDOW_SP_ATTACK, - PSS_WINDOW_SP_DEFENSE, - PSS_WINDOW_SPEED, - PSS_WINDOW_ABILITY, - PSS_WINDOW_ABILITY_DESCRIPTION, - - PSS_SKILLS_WINDOW_MAX, +enum SummaryExtraWindowSkills { + SUMMARY_WINDOW_HP = 0, + SUMMARY_WINDOW_ATTACK, + SUMMARY_WINDOW_DEFENSE, + SUMMARY_WINDOW_SP_ATTACK, + SUMMARY_WINDOW_SP_DEFENSE, + SUMMARY_WINDOW_SPEED, + SUMMARY_WINDOW_ABILITY, + SUMMARY_WINDOW_ABILITY_DESCRIPTION, + + SUMMARY_SKILLS_WINDOW_MAX, }; -enum PSSExtraWindowBattleMoves { - PSS_WINDOW_BATTLE_MOVE_1 = 0, - PSS_WINDOW_BATTLE_MOVE_2, - PSS_WINDOW_BATTLE_MOVE_3, - PSS_WINDOW_BATTLE_MOVE_4, - PSS_WINDOW_BATTLE_MOVE_5, - PSS_WINDOW_BATTLE_MOVE_POWER, - PSS_WINDOW_BATTLE_MOVE_ACCURACY, - PSS_WINDOW_BATTLE_MOVE_DESCRIPTION, - - PSS_BATTLE_MOVES_WINDOW_MAX, +enum SummaryExtraWindowBattleMoves { + SUMMARY_WINDOW_BATTLE_MOVE_1 = 0, + SUMMARY_WINDOW_BATTLE_MOVE_2, + SUMMARY_WINDOW_BATTLE_MOVE_3, + SUMMARY_WINDOW_BATTLE_MOVE_4, + SUMMARY_WINDOW_BATTLE_MOVE_5, + SUMMARY_WINDOW_BATTLE_MOVE_POWER, + SUMMARY_WINDOW_BATTLE_MOVE_ACCURACY, + SUMMARY_WINDOW_BATTLE_MOVE_DESCRIPTION, + + SUMMARY_BATTLE_MOVES_WINDOW_MAX, }; -enum PSSExtraWindowContestMoves { - PSS_WINDOW_CONTEST_MOVE_1 = 0, - PSS_WINDOW_CONTEST_MOVE_2, - PSS_WINDOW_CONTEST_MOVE_3, - PSS_WINDOW_CONTEST_MOVE_4, - PSS_WINDOW_CONTEST_MOVE_5, - PSS_WINDOW_CONTEST_MOVE_DESCRIPTION, +enum SummaryExtraWindowContestMoves { + SUMMARY_WINDOW_CONTEST_MOVE_1 = 0, + SUMMARY_WINDOW_CONTEST_MOVE_2, + SUMMARY_WINDOW_CONTEST_MOVE_3, + SUMMARY_WINDOW_CONTEST_MOVE_4, + SUMMARY_WINDOW_CONTEST_MOVE_5, + SUMMARY_WINDOW_CONTEST_MOVE_DESCRIPTION, - PSS_CONTEST_MOVES_WINDOW_MAX, + SUMMARY_CONTEST_MOVES_WINDOW_MAX, }; -enum PSSExtraWindowRibbons { - PSS_WINDOW_RIBBON_COUNT = 0, - PSS_WINDOW_RIBBON_INDEX, - PSS_WINDOW_RIBBON_NAME, - PSS_WINDOW_RIBBON_DESCRIPTION, +enum SummaryExtraWindowRibbons { + SUMMARY_WINDOW_RIBBON_COUNT = 0, + SUMMARY_WINDOW_RIBBON_INDEX, + SUMMARY_WINDOW_RIBBON_NAME, + SUMMARY_WINDOW_RIBBON_DESCRIPTION, - PSS_RIBBONS_WINDOW_MAX, + SUMMARY_RIBBONS_WINDOW_MAX, }; -enum PSSExtraWindowCondition { - PSS_WINDOW_POFFIN_BUTTON_PROMPT = 0, - PSS_WINDOW_FAVORITE_FOOD, - PSS_WINDOW_POFFIN_FEED_MSG, +enum SummaryExtraWindowCondition { + SUMMARY_WINDOW_POFFIN_BUTTON_PROMPT = 0, + SUMMARY_WINDOW_FAVORITE_FOOD, + SUMMARY_WINDOW_POFFIN_FEED_MSG, - PSS_CONDITION_WINDOW_MAX, + SUMMARY_CONDITION_WINDOW_MAX, }; -enum PSSSprite { - PSS_SPRITE_TAB_INFO = 0, - PSS_SPRITE_TAB_MEMO, - PSS_SPRITE_TAB_SKILLS, - PSS_SPRITE_TAB_BATTLE_MOVES, - PSS_SPRITE_TAB_CONDITION, - PSS_SPRITE_TAB_CONTEST_MOVES, - PSS_SPRITE_TAB_RIBBONS, - PSS_SPRITE_TAB_EXIT, - PSS_SPRITE_CAUGHT_BALL, - PSS_SPRITE_MOVE_SELECTOR_1, - PSS_SPRITE_MOVE_SELECTOR_2, - PSS_SPRITE_MON_TYPE_ICON_1, - PSS_SPRITE_MON_TYPE_ICON_2, - - PSS_MOVE_TYPE_ICON_SPRITE_START, - PSS_SPRITE_MOVE_TYPE_ICON_1 = PSS_MOVE_TYPE_ICON_SPRITE_START, - PSS_SPRITE_MOVE_TYPE_ICON_2, - PSS_SPRITE_MOVE_TYPE_ICON_3, - PSS_SPRITE_MOVE_TYPE_ICON_4, - PSS_SPRITE_MOVE_TYPE_ICON_5, - PSS_MOVE_TYPE_ICON_SPRITE_END = PSS_SPRITE_MOVE_TYPE_ICON_5, - - PSS_SPRITE_MOVE_CATEGORY_ICON, - PSS_SPRITE_MON_ICON, - PSS_SPRITE_STATUS_ICON, - PSS_SPRITE_PAGE_ARROW_LEFT, - PSS_SPRITE_PAGE_ARROW_RIGHT, - - PSS_MARKING_SPRITES_START, - PSS_SPRITE_MARKING_CIRCLE = PSS_MARKING_SPRITES_START, - PSS_SPRITE_MARKING_TRIANGLE, - PSS_SPRITE_MARKING_SQUARE, - PSS_SPRITE_MARKING_HEART, - PSS_SPRITE_MARKING_STAR, - PSS_SPRITE_MARKING_DIAMOND, - PSS_MARKING_SPRITES_END = PSS_SPRITE_MARKING_DIAMOND, - - PSS_SHEEN_SPRITES_START, - PSS_SPRITE_SHEEN_1 = PSS_SHEEN_SPRITES_START, - PSS_SPRITE_SHEEN_2, - PSS_SPRITE_SHEEN_3, - PSS_SPRITE_SHEEN_4, - PSS_SPRITE_SHEEN_5, - PSS_SPRITE_SHEEN_6, - PSS_SPRITE_SHEEN_7, - PSS_SPRITE_SHEEN_8, - PSS_SPRITE_SHEEN_9, - PSS_SPRITE_SHEEN_10, - PSS_SPRITE_SHEEN_11, - PSS_SPRITE_SHEEN_12, - PSS_SHEEN_SPRITES_END = PSS_SPRITE_SHEEN_12, - - PSS_SPRITE_BUTTON_TAP_CIRCLE, - - PSS_CONDITION_ARROW_SPRITES_START, - PSS_SPRITE_CONDITION_ARROW_COOL = PSS_CONDITION_ARROW_SPRITES_START, - PSS_SPRITE_CONDITION_ARROW_BEAUTY, - PSS_SPRITE_CONDITION_ARROW_CUTE, - PSS_SPRITE_CONDITION_ARROW_SMART, - PSS_SPRITE_CONDITION_ARROW_TOUGH, - PSS_CONDITION_ARROW_SPRITES_END = PSS_SPRITE_CONDITION_ARROW_TOUGH, - - PSS_SPRITE_A_BUTTON, - PSS_SPRITE_CONTEST_STAT_DOT_COOL, - PSS_SPRITE_CONTEST_STAT_DOT_BEAUTY, - PSS_SPRITE_CONTEST_STAT_DOT_CUTE, - PSS_SPRITE_CONTEST_STAT_DOT_SMART, - PSS_SPRITE_CONTEST_STAT_DOT_TOUGH, - PSS_SPRITE_SHINY_ICON, - PSS_SPRITE_POKERUS_CURED_ICON, - - PSS_RIBBON_SPRITES_START, - PSS_SPRITE_RIBBON_1 = PSS_RIBBON_SPRITES_START, - PSS_SPRITE_RIBBON_2, - PSS_SPRITE_RIBBON_3, - PSS_SPRITE_RIBBON_4, - PSS_SPRITE_RIBBON_5, - PSS_SPRITE_RIBBON_6, - PSS_SPRITE_RIBBON_7, - PSS_SPRITE_RIBBON_8, - PSS_SPRITE_RIBBON_9, - PSS_SPRITE_RIBBON_10, - PSS_SPRITE_RIBBON_11, - PSS_SPRITE_RIBBON_12, - PSS_RIBBON_SPRITES_END = PSS_SPRITE_RIBBON_12, - - PSS_SPRITE_RIBBON_CURSOR, - PSS_SPRITE_RIBBON_ARROW_UP, - PSS_SPRITE_RIBBON_ARROW_DOWN, - PSS_SPRITE_RIBBON_FLASH, - - PSS_CONDITION_FLASH_SPRITES_START, - PSS_SPRITE_CONDITION_FLASH_COOL = PSS_CONDITION_FLASH_SPRITES_START, - PSS_SPRITE_CONDITION_FLASH_BEAUTY, - PSS_SPRITE_CONDITION_FLASH_CUTE, - PSS_SPRITE_CONDITION_FLASH_SMART, - PSS_SPRITE_CONDITION_FLASH_TOUGH, - PSS_CONDITION_FLASH_SPRITES_END = PSS_SPRITE_CONDITION_FLASH_TOUGH, - - PSS_SPRITE_POKERUS_ICON, - - PSS_SPRITE_MAX = 77, +enum SummarySprite { + SUMMARY_SPRITE_TAB_INFO = 0, + SUMMARY_SPRITE_TAB_MEMO, + SUMMARY_SPRITE_TAB_SKILLS, + SUMMARY_SPRITE_TAB_BATTLE_MOVES, + SUMMARY_SPRITE_TAB_CONDITION, + SUMMARY_SPRITE_TAB_CONTEST_MOVES, + SUMMARY_SPRITE_TAB_RIBBONS, + SUMMARY_SPRITE_TAB_EXIT, + SUMMARY_SPRITE_CAUGHT_BALL, + SUMMARY_SPRITE_MOVE_SELECTOR_1, + SUMMARY_SPRITE_MOVE_SELECTOR_2, + SUMMARY_SPRITE_MON_TYPE_ICON_1, + SUMMARY_SPRITE_MON_TYPE_ICON_2, + + SUMMARY_MOVE_TYPE_ICON_SPRITE_START, + SUMMARY_SPRITE_MOVE_TYPE_ICON_1 = SUMMARY_MOVE_TYPE_ICON_SPRITE_START, + SUMMARY_SPRITE_MOVE_TYPE_ICON_2, + SUMMARY_SPRITE_MOVE_TYPE_ICON_3, + SUMMARY_SPRITE_MOVE_TYPE_ICON_4, + SUMMARY_SPRITE_MOVE_TYPE_ICON_5, + SUMMARY_MOVE_TYPE_ICON_SPRITE_END = SUMMARY_SPRITE_MOVE_TYPE_ICON_5, + + SUMMARY_SPRITE_MOVE_CATEGORY_ICON, + SUMMARY_SPRITE_MON_ICON, + SUMMARY_SPRITE_STATUS_ICON, + SUMMARY_SPRITE_PAGE_ARROW_LEFT, + SUMMARY_SPRITE_PAGE_ARROW_RIGHT, + + SUMMARY_MARKING_SPRITES_START, + SUMMARY_SPRITE_MARKING_CIRCLE = SUMMARY_MARKING_SPRITES_START, + SUMMARY_SPRITE_MARKING_TRIANGLE, + SUMMARY_SPRITE_MARKING_SQUARE, + SUMMARY_SPRITE_MARKING_HEART, + SUMMARY_SPRITE_MARKING_STAR, + SUMMARY_SPRITE_MARKING_DIAMOND, + SUMMARY_MARKING_SPRITES_END = SUMMARY_SPRITE_MARKING_DIAMOND, + + SUMMARY_SHEEN_SPRITES_START, + SUMMARY_SPRITE_SHEEN_1 = SUMMARY_SHEEN_SPRITES_START, + SUMMARY_SPRITE_SHEEN_2, + SUMMARY_SPRITE_SHEEN_3, + SUMMARY_SPRITE_SHEEN_4, + SUMMARY_SPRITE_SHEEN_5, + SUMMARY_SPRITE_SHEEN_6, + SUMMARY_SPRITE_SHEEN_7, + SUMMARY_SPRITE_SHEEN_8, + SUMMARY_SPRITE_SHEEN_9, + SUMMARY_SPRITE_SHEEN_10, + SUMMARY_SPRITE_SHEEN_11, + SUMMARY_SPRITE_SHEEN_12, + SUMMARY_SHEEN_SPRITES_END = SUMMARY_SPRITE_SHEEN_12, + + SUMMARY_SPRITE_BUTTON_TAP_CIRCLE, + + SUMMARY_CONDITION_ARROW_SPRITES_START, + SUMMARY_SPRITE_CONDITION_ARROW_COOL = SUMMARY_CONDITION_ARROW_SPRITES_START, + SUMMARY_SPRITE_CONDITION_ARROW_BEAUTY, + SUMMARY_SPRITE_CONDITION_ARROW_CUTE, + SUMMARY_SPRITE_CONDITION_ARROW_SMART, + SUMMARY_SPRITE_CONDITION_ARROW_TOUGH, + SUMMARY_CONDITION_ARROW_SPRITES_END = SUMMARY_SPRITE_CONDITION_ARROW_TOUGH, + + SUMMARY_SPRITE_A_BUTTON, + SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL, + SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY, + SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE, + SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART, + SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH, + SUMMARY_SPRITE_SHINY_ICON, + SUMMARY_SPRITE_POKERUS_CURED_ICON, + + SUMMARY_RIBBON_SPRITES_START, + SUMMARY_SPRITE_RIBBON_1 = SUMMARY_RIBBON_SPRITES_START, + SUMMARY_SPRITE_RIBBON_2, + SUMMARY_SPRITE_RIBBON_3, + SUMMARY_SPRITE_RIBBON_4, + SUMMARY_SPRITE_RIBBON_5, + SUMMARY_SPRITE_RIBBON_6, + SUMMARY_SPRITE_RIBBON_7, + SUMMARY_SPRITE_RIBBON_8, + SUMMARY_SPRITE_RIBBON_9, + SUMMARY_SPRITE_RIBBON_10, + SUMMARY_SPRITE_RIBBON_11, + SUMMARY_SPRITE_RIBBON_12, + SUMMARY_RIBBON_SPRITES_END = SUMMARY_SPRITE_RIBBON_12, + + SUMMARY_SPRITE_RIBBON_CURSOR, + SUMMARY_SPRITE_RIBBON_ARROW_UP, + SUMMARY_SPRITE_RIBBON_ARROW_DOWN, + SUMMARY_SPRITE_RIBBON_FLASH, + + SUMMARY_CONDITION_FLASH_SPRITES_START, + SUMMARY_SPRITE_CONDITION_FLASH_COOL = SUMMARY_CONDITION_FLASH_SPRITES_START, + SUMMARY_SPRITE_CONDITION_FLASH_BEAUTY, + SUMMARY_SPRITE_CONDITION_FLASH_CUTE, + SUMMARY_SPRITE_CONDITION_FLASH_SMART, + SUMMARY_SPRITE_CONDITION_FLASH_TOUGH, + SUMMARY_CONDITION_FLASH_SPRITES_END = SUMMARY_SPRITE_CONDITION_FLASH_TOUGH, + + SUMMARY_SPRITE_POKERUS_ICON, + + SUMMARY_SPRITE_MAX = 77, }; -enum PSSPokerusState { - PSS_POKERUS_NONE = 0, - PSS_POKERUS_INFECTED, - PSS_POKERUS_CURED, +enum SummaryPokerusState { + SUMMARY_POKERUS_NONE = 0, + SUMMARY_POKERUS_INFECTED, + SUMMARY_POKERUS_CURED, }; enum ConditionRect { @@ -302,16 +302,16 @@ enum ConditionRect { MAX_CONDITION_RECT }; -#define PSS_SUBSCREEN_BUTTON_NONE 0xFF +#define SUMMARY_SUBSCREEN_BUTTON_NONE 0xFF #define RIBBONS_PER_ROW 4 #define RIBBONS_PER_PAGE 12 -#define PSS_TEXT_BLACK TEXT_COLOR(1, 2, 0) -#define PSS_TEXT_WHITE TEXT_COLOR(15, 14, 0) -#define PSS_TEXT_BLUE TEXT_COLOR(3, 4, 0) -#define PSS_TEXT_RED TEXT_COLOR(5, 6, 0) -#define PSS_TEXT_BLACK_DARK_SHADOW TEXT_COLOR(1, 2, 15) +#define SUMMARY_TEXT_BLACK TEXT_COLOR(1, 2, 0) +#define SUMMARY_TEXT_WHITE TEXT_COLOR(15, 14, 0) +#define SUMMARY_TEXT_BLUE TEXT_COLOR(3, 4, 0) +#define SUMMARY_TEXT_RED TEXT_COLOR(5, 6, 0) +#define SUMMARY_TEXT_BLACK_DARK_SHADOW TEXT_COLOR(1, 2, 15) typedef struct ConditionRectangle { VecFx16 topLeft; @@ -409,7 +409,7 @@ typedef struct PokemonSummaryMonSpriteData { typedef struct PokemonSummaryScreen { BgConfig *bgConfig; - Window staticWindows[PSS_STATIC_WINDOW_MAX]; + Window staticWindows[SUMMARY_STATIC_WINDOW_MAX]; Window *extraWindows; u32 numExtraWindows; @@ -424,8 +424,8 @@ typedef struct PokemonSummaryScreen { SpriteRenderer *renderer; SpriteGfxHandler *gfxHandler; - CellActor *sprites[PSS_SPRITE_MAX]; - CellActorData *actor[PSS_SPRITE_MAX]; + CellActor *sprites[SUMMARY_SPRITE_MAX]; + CellActorData *actor[SUMMARY_SPRITE_MAX]; UnkStruct_0200C440 *unk_684; MessageLoader *msgLoader; diff --git a/include/applications/pokemon_summary_screen/window.h b/include/applications/pokemon_summary_screen/window.h index b2f4fa8cc9..5267cb8a38 100644 --- a/include/applications/pokemon_summary_screen/window.h +++ b/include/applications/pokemon_summary_screen/window.h @@ -3,15 +3,15 @@ #include "applications/pokemon_summary_screen/main.h" -enum PSSPoffinFeedMsg { - PSS_MSG_COOLNESS_ENHANCED = 0, - PSS_MSG_BEAUTY_ENHANCED, - PSS_MSG_CUTENESS_ENHANCED, - PSS_MSG_SMARTNESS_ENHANCED, - PSS_MSG_TOUGHNESS_ENHANCED, +enum SummaryPoffinFeedMsg { + SUMMARY_MSG_COOLNESS_ENHANCED = 0, + SUMMARY_MSG_BEAUTY_ENHANCED, + SUMMARY_MSG_CUTENESS_ENHANCED, + SUMMARY_MSG_SMARTNESS_ENHANCED, + SUMMARY_MSG_TOUGHNESS_ENHANCED, - PSS_MSG_NOTHING_CHANGED = 0xFE, - PSS_MSG_MON_WONT_EAT_MORE = 0xFF, + SUMMARY_MSG_NOTHING_CHANGED = 0xFE, + SUMMARY_MSG_MON_WONT_EAT_MORE = 0xFF, }; void PokemonSummaryScreen_DrawStaticWindows(PokemonSummaryScreen *summaryScreen); @@ -33,6 +33,6 @@ void PokemonSummaryScreen_SwapMoveNameAndPP(PokemonSummaryScreen *summaryScreen) void PokemonSummaryScreen_PrintHMMovesCantBeForgotten(PokemonSummaryScreen *summaryScreen); void PokemonSummaryScreen_PrintContestMoveAttributes(PokemonSummaryScreen *summaryScreen, u32 move); void PokemonSummaryScreen_ClearContestAttributeWindows(PokemonSummaryScreen *summaryScreen); -void PokemonSummaryScreen_PrintPoffinFeedMsg(PokemonSummaryScreen *summaryScreen, enum PSSPoffinFeedMsg msg); +void PokemonSummaryScreen_PrintPoffinFeedMsg(PokemonSummaryScreen *summaryScreen, enum SummaryPoffinFeedMsg msg); #endif // POKEPLATINUM_POKEMON_SUMMARY_SCREEN_WINDOW_H diff --git a/res/text/message_bank_pokemon_summary_screen.gmm b/res/text/message_bank_pokemon_summary_screen.gmm index b0d2e955b1..437fb6a2aa 100644 --- a/res/text/message_bank_pokemon_summary_screen.gmm +++ b/res/text/message_bank_pokemon_summary_screen.gmm @@ -1,83 +1,83 @@ - + used {STRVAR_1 1, 0, 0} - + used ♂ - + used ♀ - + used {STRVAR_1 52, 0, 0} - + used Item - + used {STRVAR_1 8, 0, 0} - + used None - + used POKéMON INFO - + used Pokédex No. - + used {STRVAR_1 52, 0, 0} - + used Name - + used {STRVAR_1 0, 0, 0} - + used Type - + used OT - + used {STRVAR_1 3, 0, 0} - + used ID No. - + used {STRVAR_1 54, 0, 0} - + used Exp. Points - + used {STRVAR_1 56, 0, 0} - + used To Next Lv. @@ -86,15 +86,15 @@ XX - + used {STRVAR_1 55, 0, 0} - + used ??? - + used TRAINER MEMO @@ -438,87 +438,87 @@ used “The Egg Watch”\nIt looks like this Egg\nwill take a long time to\nhatch. - + used POKéMON SKILLS - + used HP - + used Attack - + used Defense - + used Sp. Atk - + used Sp. Def - + used Speed - + used Ability - + used / - + used {STRVAR_1 52, 0, 0} - + used {STRVAR_1 52, 0, 0} - + used {STRVAR_1 52, 0, 0} - + used {STRVAR_1 52, 0, 0} - + used {STRVAR_1 52, 0, 0} - + used {STRVAR_1 52, 0, 0} - + used {STRVAR_1 52, 0, 0} - + used {STRVAR_1 5, 0, 0} - + used CONDITION - + used SHEEN - + used BATTLE MOVES - + used INFO @@ -586,27 +586,27 @@ used {STRVAR_1 51, 0, 0} - + used CANCEL - + used POWER - + used ACCURACY - + used CATEGORY - + used {STRVAR_1 52, 0, 0} - + used {STRVAR_1 52, 0, 0} @@ -618,11 +618,11 @@ used -- - + used --- - + used OK @@ -630,31 +630,31 @@ used HM moves can’t be\nforgotten now. - + used CONTEST MOVES - + used INFO - + used OK - + used APPEAL POINTS - + used EXIT - + used Close window. - + used OK @@ -663,27 +663,27 @@ XXX - + used FAVORITE FOOD - + used Likes it {COLOR 2}spicy{COLOR 0}. - + used Likes it {COLOR 2}dry{COLOR 0}. - + used Likes it {COLOR 2}sweet{COLOR 0}. - + used Likes it {COLOR 2}bitter{COLOR 0}. - + used Likes it {COLOR 2}sour{COLOR 0}. @@ -691,39 +691,39 @@ used Eats anything. - + used Coolness was enhanced! - + used Toughness was enhanced! - + used Beauty was enhanced! - + used Cuteness was enhanced! - + used Smartness was enhanced! - + used Nothing changed! - + used It won’t eat any more... - + used RIBBONS - + used INFO @@ -731,23 +731,23 @@ used CANCEL - + used No. of Ribbons: - + used {STRVAR_1 52, 0, 0} - + used {STRVAR_1 52, 0, 0} - + used / - + used {STRVAR_1 52, 0, 0} diff --git a/src/applications/pokemon_summary_screen/3d_anim.c b/src/applications/pokemon_summary_screen/3d_anim.c index 08a28179f1..424ba9513f 100644 --- a/src/applications/pokemon_summary_screen/3d_anim.c +++ b/src/applications/pokemon_summary_screen/3d_anim.c @@ -160,7 +160,7 @@ void PokemonSummaryScreen_Setup3DGfx(PokemonSummaryScreen *summaryScreen) void PokemonSummaryScreen_Update3DGfx(PokemonSummaryScreen *summaryScreen) { - if (summaryScreen->page == PSS_PAGE_CONDITION) { + if (summaryScreen->page == SUMMARY_PAGE_CONDITION) { sub_020241B4(); Camera_ComputeViewMatrix(); @@ -263,7 +263,7 @@ static void UpdateConditionRectsOrFlash(PokemonSummaryScreen *summaryScreen) void PokemonSummaryScreen_InitConditionRects(PokemonSummaryScreen *summaryScreen) { - if (summaryScreen->page != PSS_PAGE_CONDITION) { + if (summaryScreen->page != SUMMARY_PAGE_CONDITION) { return; } @@ -350,7 +350,7 @@ void PokemonSummaryScreen_LoadMonSprite(PokemonSummaryScreen *summaryScreen) ArchivedSprite sprite; - if (summaryScreen->data->dataType == PSS_DATA_BOX_MON) { + if (summaryScreen->data->dataType == SUMMARY_DATA_BOX_MON) { BoxPokemon_BuildArchivedSprite(&sprite, monData, 2, 0); } else { Pokemon_BuildArchivedSprite(&sprite, monData, 2); diff --git a/src/applications/pokemon_summary_screen/main.c b/src/applications/pokemon_summary_screen/main.c index a444ba728d..22ff76475b 100644 --- a/src/applications/pokemon_summary_screen/main.c +++ b/src/applications/pokemon_summary_screen/main.c @@ -64,30 +64,30 @@ #include "constdata/const_020F410C.h" -enum PSSState { - PSS_STATE_TRANSITION_IN = 0, - PSS_STATE_WAIT_TRANSITION, - PSS_STATE_HANDLE_INPUT, - PSS_STATE_SETUP_BATTLE_MOVE_INFO, - PSS_STATE_HIDE_BATTLE_MOVE_INFO, - PSS_STATE_SETUP_CONTEST_MOVE_INFO, - PSS_STATE_HIDE_CONTEST_MOVE_INFO, - PSS_STATE_MOVE_SELECT, - PSS_STATE_MOVE_SWAP, - PSS_STATE_LEARN_MOVE, - PSS_STATE_WAIT_HM_MSG_INPUT, - PSS_STATE_SETUP_RIBBON_INFO, - PSS_STATE_HIDE_RIBBON_INFO, - PSS_STATE_RIBBON_SELECT, - PSS_STATE_SUBSCREEN_INPUT, - PSS_STATE_SETUP_POFFIN_FEED, - PSS_STATE_PRINT_CONTEST_STAT_MSGS, - PSS_STATE_WAIT_FINISH_POFFIN_FEED, - PSS_STATE_TRANSITION_OUT, - PSS_STATE_WAIT_EXIT, +enum SummaryState { + SUMMARY_STATE_TRANSITION_IN = 0, + SUMMARY_STATE_WAIT_TRANSITION, + SUMMARY_STATE_HANDLE_INPUT, + SUMMARY_STATE_SETUP_BATTLE_MOVE_INFO, + SUMMARY_STATE_HIDE_BATTLE_MOVE_INFO, + SUMMARY_STATE_SETUP_CONTEST_MOVE_INFO, + SUMMARY_STATE_HIDE_CONTEST_MOVE_INFO, + SUMMARY_STATE_MOVE_SELECT, + SUMMARY_STATE_MOVE_SWAP, + SUMMARY_STATE_LEARN_MOVE, + SUMMARY_STATE_WAIT_HM_MSG_INPUT, + SUMMARY_STATE_SETUP_RIBBON_INFO, + SUMMARY_STATE_HIDE_RIBBON_INFO, + SUMMARY_STATE_RIBBON_SELECT, + SUMMARY_STATE_SUBSCREEN_INPUT, + SUMMARY_STATE_SETUP_POFFIN_FEED, + SUMMARY_STATE_PRINT_CONTEST_STAT_MSGS, + SUMMARY_STATE_WAIT_FINISH_POFFIN_FEED, + SUMMARY_STATE_TRANSITION_OUT, + SUMMARY_STATE_WAIT_EXIT, }; -enum PSSPageState { +enum SummaryPageState { PAGE_STATE_INITIAL = 0, PAGE_STATE_SCROLLING, PAGE_STATE_SCROLL_FINISHED, @@ -103,7 +103,7 @@ enum PSSPageState { #define HEAP_ALLOCATION_SIZE 0x40000 -#define PSS_MOVE_NONE -1 +#define SUMMARY_MOVE_NONE -1 #define POINTS_PER_APPEAL_HEART 10 #define MAX_APPEAL_HEARTS 6 @@ -262,65 +262,65 @@ static int PokemonSummaryScreen_Main(OverlayManager *ovyManager, int *state) PokemonSummaryScreen *summaryScreen = OverlayManager_Data(ovyManager); switch (*state) { - case PSS_STATE_TRANSITION_IN: + case SUMMARY_STATE_TRANSITION_IN: sub_0208C120(0, 19); - *state = PSS_STATE_WAIT_TRANSITION; + *state = SUMMARY_STATE_WAIT_TRANSITION; break; - case PSS_STATE_WAIT_TRANSITION: + case SUMMARY_STATE_WAIT_TRANSITION: *state = WaitSummaryScreenTransition(summaryScreen); break; - case PSS_STATE_HANDLE_INPUT: + case SUMMARY_STATE_HANDLE_INPUT: *state = HandleInput_Main(summaryScreen); break; - case PSS_STATE_SETUP_BATTLE_MOVE_INFO: + case SUMMARY_STATE_SETUP_BATTLE_MOVE_INFO: *state = WaitSetupBattleMoveInfo(summaryScreen); break; - case PSS_STATE_HIDE_BATTLE_MOVE_INFO: + case SUMMARY_STATE_HIDE_BATTLE_MOVE_INFO: *state = WaitHideBattleMoveInfo(summaryScreen); break; - case PSS_STATE_SETUP_CONTEST_MOVE_INFO: + case SUMMARY_STATE_SETUP_CONTEST_MOVE_INFO: *state = WaitSetupContestMoveInfo(summaryScreen); break; - case PSS_STATE_HIDE_CONTEST_MOVE_INFO: + case SUMMARY_STATE_HIDE_CONTEST_MOVE_INFO: *state = WaitHideContestMoveInfo(summaryScreen); break; - case PSS_STATE_MOVE_SELECT: + case SUMMARY_STATE_MOVE_SELECT: *state = HandleInput_MoveSelect(summaryScreen); break; - case PSS_STATE_MOVE_SWAP: + case SUMMARY_STATE_MOVE_SWAP: *state = HandleInput_MoveSwap(summaryScreen); break; - case PSS_STATE_LEARN_MOVE: + case SUMMARY_STATE_LEARN_MOVE: *state = HandleInput_LearnMove(summaryScreen); break; - case PSS_STATE_WAIT_HM_MSG_INPUT: + case SUMMARY_STATE_WAIT_HM_MSG_INPUT: *state = WaitForHMMsgInput(summaryScreen); break; - case PSS_STATE_SETUP_RIBBON_INFO: + case SUMMARY_STATE_SETUP_RIBBON_INFO: *state = WaitSetupRibbonInfo(summaryScreen); break; - case PSS_STATE_HIDE_RIBBON_INFO: + case SUMMARY_STATE_HIDE_RIBBON_INFO: *state = WaitHideRibbonInfo(summaryScreen); break; - case PSS_STATE_RIBBON_SELECT: + case SUMMARY_STATE_RIBBON_SELECT: *state = HandleInput_RibbonSelect(summaryScreen); break; - case PSS_STATE_SUBSCREEN_INPUT: + case SUMMARY_STATE_SUBSCREEN_INPUT: *state = HandleInput_Subscreen(summaryScreen); break; - case PSS_STATE_SETUP_POFFIN_FEED: + case SUMMARY_STATE_SETUP_POFFIN_FEED: *state = SetupPoffinFeedConditionPage(summaryScreen); break; - case PSS_STATE_PRINT_CONTEST_STAT_MSGS: + case SUMMARY_STATE_PRINT_CONTEST_STAT_MSGS: *state = PrintContestStatChangeMsgs(summaryScreen); break; - case PSS_STATE_WAIT_FINISH_POFFIN_FEED: + case SUMMARY_STATE_WAIT_FINISH_POFFIN_FEED: *state = WaitForPoffinFeedMsgInput(summaryScreen); break; - case PSS_STATE_TRANSITION_OUT: + case SUMMARY_STATE_TRANSITION_OUT: *state = SummaryScreenTransitionOut(summaryScreen); break; - case PSS_STATE_WAIT_EXIT: + case SUMMARY_STATE_WAIT_EXIT: if (ScreenTransitionIsDone(summaryScreen) == TRUE) { return TRUE; } @@ -569,120 +569,120 @@ static int WaitSummaryScreenTransition(PokemonSummaryScreen *summaryScreen) PokemonSummaryScreen_LoadMonAnimation(summaryScreen); PlayMonCry(summaryScreen); - if (summaryScreen->data->mode == PSS_MODE_SELECT_MOVE) { - return PSS_STATE_LEARN_MOVE; - } else if (summaryScreen->data->mode == PSS_MODE_CONDITION) { - return PSS_STATE_SETUP_POFFIN_FEED; + if (summaryScreen->data->mode == SUMMARY_MODE_SELECT_MOVE) { + return SUMMARY_STATE_LEARN_MOVE; + } else if (summaryScreen->data->mode == SUMMARY_MODE_CONDITION) { + return SUMMARY_STATE_SETUP_POFFIN_FEED; } else { - return PSS_STATE_HANDLE_INPUT; + return SUMMARY_STATE_HANDLE_INPUT; } } - return PSS_STATE_WAIT_TRANSITION; + return SUMMARY_STATE_WAIT_TRANSITION; } static int HandleInput_Main(PokemonSummaryScreen *summaryScreen) { if (summaryScreen->subscreenExit == TRUE) { - summaryScreen->data->returnMode = PSS_RETURN_CANCEL; - return PSS_STATE_TRANSITION_OUT; + summaryScreen->data->returnMode = SUMMARY_RETURN_CANCEL; + return SUMMARY_STATE_TRANSITION_OUT; } if (JOY_REPEAT(PAD_KEY_LEFT)) { ChangePage(summaryScreen, -1); - return PSS_STATE_HANDLE_INPUT; + return SUMMARY_STATE_HANDLE_INPUT; } if (JOY_REPEAT(PAD_KEY_RIGHT)) { ChangePage(summaryScreen, 1); - return PSS_STATE_HANDLE_INPUT; + return SUMMARY_STATE_HANDLE_INPUT; } if (JOY_REPEAT(PAD_KEY_UP)) { ChangeSummaryMon(summaryScreen, -1); - return PSS_STATE_HANDLE_INPUT; + return SUMMARY_STATE_HANDLE_INPUT; } if (JOY_REPEAT(PAD_KEY_DOWN)) { ChangeSummaryMon(summaryScreen, 1); - return PSS_STATE_HANDLE_INPUT; + return SUMMARY_STATE_HANDLE_INPUT; } if (JOY_NEW(PAD_BUTTON_B)) { Sound_PlayEffect(SEQ_SE_DP_DECIDE); - summaryScreen->data->returnMode = PSS_RETURN_CANCEL; - return PSS_STATE_TRANSITION_OUT; + summaryScreen->data->returnMode = SUMMARY_RETURN_CANCEL; + return SUMMARY_STATE_TRANSITION_OUT; } if (JOY_NEW(PAD_BUTTON_A)) { - if (summaryScreen->data->mode == PSS_MODE_POFFIN && summaryScreen->page == PSS_MODE_CONDITION) { + if (summaryScreen->data->mode == SUMMARY_MODE_POFFIN && summaryScreen->page == SUMMARY_MODE_CONDITION) { Sound_PlayEffect(SEQ_SE_DP_DECIDE); return TryFeedPoffin(summaryScreen); } - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { Sound_PlayEffect(SEQ_SE_DP_SYU01); summaryScreen->pageState = PAGE_STATE_INITIAL; - return PSS_STATE_SETUP_BATTLE_MOVE_INFO; - } else if (summaryScreen->page == PSS_PAGE_CONTEST_MOVES) { + return SUMMARY_STATE_SETUP_BATTLE_MOVE_INFO; + } else if (summaryScreen->page == SUMMARY_PAGE_CONTEST_MOVES) { Sound_PlayEffect(SEQ_SE_DP_SYU01); summaryScreen->pageState = PAGE_STATE_INITIAL; - return PSS_STATE_SETUP_CONTEST_MOVE_INFO; - } else if (summaryScreen->page == PSS_PAGE_RIBBONS) { + return SUMMARY_STATE_SETUP_CONTEST_MOVE_INFO; + } else if (summaryScreen->page == SUMMARY_PAGE_RIBBONS) { if (summaryScreen->ribbonMax != 0) { Sound_PlayEffect(SEQ_SE_DP_DECIDE); summaryScreen->pageState = PAGE_STATE_INITIAL; - return PSS_STATE_SETUP_RIBBON_INFO; + return SUMMARY_STATE_SETUP_RIBBON_INFO; } - } else if (summaryScreen->page == PSS_PAGE_EXIT) { + } else if (summaryScreen->page == SUMMARY_PAGE_EXIT) { Sound_PlayEffect(SEQ_SE_DP_DECIDE); - summaryScreen->data->returnMode = PSS_RETURN_CANCEL; - return PSS_STATE_TRANSITION_OUT; + summaryScreen->data->returnMode = SUMMARY_RETURN_CANCEL; + return SUMMARY_STATE_TRANSITION_OUT; } } if (CheckSubscreenPressAndSetButton(summaryScreen) == TRUE) { summaryScreen->pageState = PAGE_STATE_SCROLL_FINISHED; - return PSS_STATE_SUBSCREEN_INPUT; + return SUMMARY_STATE_SUBSCREEN_INPUT; } - return PSS_STATE_HANDLE_INPUT; + return SUMMARY_STATE_HANDLE_INPUT; } static int WaitSetupBattleMoveInfo(PokemonSummaryScreen *summaryScreen) { if (SetupBattleMoveInfo(summaryScreen) == TRUE) { - return PSS_STATE_MOVE_SELECT; + return SUMMARY_STATE_MOVE_SELECT; } - return PSS_STATE_SETUP_BATTLE_MOVE_INFO; + return SUMMARY_STATE_SETUP_BATTLE_MOVE_INFO; } static int WaitHideBattleMoveInfo(PokemonSummaryScreen *summaryScreen) { if (HideBattleMoveInfo(summaryScreen) == TRUE) { - return PSS_STATE_HANDLE_INPUT; + return SUMMARY_STATE_HANDLE_INPUT; } - return PSS_STATE_HIDE_BATTLE_MOVE_INFO; + return SUMMARY_STATE_HIDE_BATTLE_MOVE_INFO; } static int WaitSetupContestMoveInfo(PokemonSummaryScreen *summaryScreen) { if (SetupContestMoveInfo(summaryScreen) == TRUE) { - return PSS_STATE_MOVE_SELECT; + return SUMMARY_STATE_MOVE_SELECT; } - return PSS_STATE_SETUP_CONTEST_MOVE_INFO; + return SUMMARY_STATE_SETUP_CONTEST_MOVE_INFO; } static int WaitHideContestMoveInfo(PokemonSummaryScreen *summaryScreen) { if (HideContestMoveInfo(summaryScreen) == TRUE) { - return PSS_STATE_HANDLE_INPUT; + return SUMMARY_STATE_HANDLE_INPUT; } - return PSS_STATE_HIDE_CONTEST_MOVE_INFO; + return SUMMARY_STATE_HIDE_CONTEST_MOVE_INFO; } static int HandleInput_MoveSelect(PokemonSummaryScreen *summaryScreen) @@ -693,7 +693,7 @@ static int HandleInput_MoveSelect(PokemonSummaryScreen *summaryScreen) UpdateMoveAttributes(summaryScreen); } - return PSS_STATE_MOVE_SELECT; + return SUMMARY_STATE_MOVE_SELECT; } if (JOY_NEW(PAD_KEY_DOWN)) { @@ -702,7 +702,7 @@ static int HandleInput_MoveSelect(PokemonSummaryScreen *summaryScreen) UpdateMoveAttributes(summaryScreen); } - return PSS_STATE_MOVE_SELECT; + return SUMMARY_STATE_MOVE_SELECT; } if (JOY_NEW(PAD_BUTTON_A)) { @@ -710,16 +710,16 @@ static int HandleInput_MoveSelect(PokemonSummaryScreen *summaryScreen) Sound_PlayEffect(SEQ_SE_DP_SYU01); summaryScreen->pageState = PAGE_STATE_INITIAL; - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { - return PSS_STATE_HIDE_BATTLE_MOVE_INFO; + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { + return SUMMARY_STATE_HIDE_BATTLE_MOVE_INFO; } else { - return PSS_STATE_HIDE_CONTEST_MOVE_INFO; + return SUMMARY_STATE_HIDE_CONTEST_MOVE_INFO; } - } else if (summaryScreen->data->mode != PSS_MODE_LOCK_MOVES) { + } else if (summaryScreen->data->mode != SUMMARY_MODE_LOCK_MOVES) { Sound_PlayEffect(SEQ_SE_DP_DECIDE); PokemonSummaryScreen_SetMoveSelector2Pos(summaryScreen); summaryScreen->cursorTmp = summaryScreen->cursor; - return PSS_STATE_MOVE_SWAP; + return SUMMARY_STATE_MOVE_SWAP; } } @@ -727,14 +727,14 @@ static int HandleInput_MoveSelect(PokemonSummaryScreen *summaryScreen) Sound_PlayEffect(SEQ_SE_DP_SYU01); summaryScreen->pageState = PAGE_STATE_INITIAL; - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { - return PSS_STATE_HIDE_BATTLE_MOVE_INFO; + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { + return SUMMARY_STATE_HIDE_BATTLE_MOVE_INFO; } else { - return PSS_STATE_HIDE_CONTEST_MOVE_INFO; + return SUMMARY_STATE_HIDE_CONTEST_MOVE_INFO; } } - return PSS_STATE_MOVE_SELECT; + return SUMMARY_STATE_MOVE_SELECT; } static int HandleInput_MoveSwap(PokemonSummaryScreen *summaryScreen) @@ -745,7 +745,7 @@ static int HandleInput_MoveSwap(PokemonSummaryScreen *summaryScreen) UpdateMoveAttributes(summaryScreen); } - return PSS_STATE_MOVE_SWAP; + return SUMMARY_STATE_MOVE_SWAP; } if (JOY_NEW(PAD_KEY_DOWN)) { @@ -754,11 +754,11 @@ static int HandleInput_MoveSwap(PokemonSummaryScreen *summaryScreen) UpdateMoveAttributes(summaryScreen); } - return PSS_STATE_MOVE_SWAP; + return SUMMARY_STATE_MOVE_SWAP; } if (JOY_NEW(PAD_BUTTON_A)) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_2], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], FALSE); if (summaryScreen->cursor != LEARNED_MOVES_MAX && summaryScreen->cursor != summaryScreen->cursorTmp) { Sound_PlayEffect(SEQ_SE_DP_DECIDE); @@ -770,28 +770,28 @@ static int HandleInput_MoveSwap(PokemonSummaryScreen *summaryScreen) Sound_PlayEffect(SEQ_SE_DP_DECIDE); } - return PSS_STATE_MOVE_SELECT; + return SUMMARY_STATE_MOVE_SELECT; } if (JOY_NEW(PAD_BUTTON_B)) { Sound_PlayEffect(SEQ_SE_DP_DECIDE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_2], FALSE); - return PSS_STATE_MOVE_SELECT; + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], FALSE); + return SUMMARY_STATE_MOVE_SELECT; } - return PSS_STATE_MOVE_SWAP; + return SUMMARY_STATE_MOVE_SWAP; } static int HandleInput_LearnMove(PokemonSummaryScreen *summaryScreen) { if (JOY_NEW(PAD_KEY_LEFT)) { ChangePage(summaryScreen, -1); - return PSS_STATE_LEARN_MOVE; + return SUMMARY_STATE_LEARN_MOVE; } if (JOY_NEW(PAD_KEY_RIGHT)) { ChangePage(summaryScreen, 1); - return PSS_STATE_LEARN_MOVE; + return SUMMARY_STATE_LEARN_MOVE; } if (JOY_NEW(PAD_KEY_UP)) { @@ -800,7 +800,7 @@ static int HandleInput_LearnMove(PokemonSummaryScreen *summaryScreen) UpdateMoveAttributes(summaryScreen); } - return PSS_STATE_LEARN_MOVE; + return SUMMARY_STATE_LEARN_MOVE; } if (JOY_NEW(PAD_KEY_DOWN)) { @@ -809,7 +809,7 @@ static int HandleInput_LearnMove(PokemonSummaryScreen *summaryScreen) UpdateMoveAttributes(summaryScreen); } - return PSS_STATE_LEARN_MOVE; + return SUMMARY_STATE_LEARN_MOVE; } if (JOY_NEW(PAD_BUTTON_A)) { @@ -817,85 +817,85 @@ static int HandleInput_LearnMove(PokemonSummaryScreen *summaryScreen) if (summaryScreen->cursor != LEARNED_MOVES_MAX) { if (Item_IsHMMove(summaryScreen->monData.moves[summaryScreen->cursor]) == TRUE && summaryScreen->data->move != MOVE_NONE) { - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MOVE_CATEGORY_ICON], FALSE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], FALSE); DrawEmptyHearts(summaryScreen); PokemonSummaryScreen_PrintHMMovesCantBeForgotten(summaryScreen); - return PSS_STATE_WAIT_HM_MSG_INPUT; + return SUMMARY_STATE_WAIT_HM_MSG_INPUT; } } summaryScreen->data->selectedSlot = summaryScreen->cursor; - summaryScreen->data->returnMode = PSS_RETURN_SELECT; - return PSS_STATE_TRANSITION_OUT; + summaryScreen->data->returnMode = SUMMARY_RETURN_SELECT; + return SUMMARY_STATE_TRANSITION_OUT; } if (JOY_NEW(PAD_BUTTON_B)) { Sound_PlayEffect(SEQ_SE_DP_DECIDE); summaryScreen->data->selectedSlot = 4; - summaryScreen->data->returnMode = PSS_RETURN_CANCEL; - return PSS_STATE_TRANSITION_OUT; + summaryScreen->data->returnMode = SUMMARY_RETURN_CANCEL; + return SUMMARY_STATE_TRANSITION_OUT; } - return PSS_STATE_LEARN_MOVE; + return SUMMARY_STATE_LEARN_MOVE; } static int WaitForHMMsgInput(PokemonSummaryScreen *summaryScreen) { if (JOY_NEW(PAD_BUTTON_A | PAD_BUTTON_B)) { UpdateMoveAttributes(summaryScreen); - return PSS_STATE_LEARN_MOVE; + return SUMMARY_STATE_LEARN_MOVE; } - return PSS_STATE_WAIT_HM_MSG_INPUT; + return SUMMARY_STATE_WAIT_HM_MSG_INPUT; } static int WaitSetupRibbonInfo(PokemonSummaryScreen *summaryScreen) { if (SetupRibbonInfo(summaryScreen) == TRUE) { - return PSS_STATE_RIBBON_SELECT; + return SUMMARY_STATE_RIBBON_SELECT; } - return PSS_STATE_SETUP_RIBBON_INFO; + return SUMMARY_STATE_SETUP_RIBBON_INFO; } static int WaitHideRibbonInfo(PokemonSummaryScreen *summaryScreen) { if (HideRibbonInfo(summaryScreen) == TRUE) { - return PSS_STATE_HANDLE_INPUT; + return SUMMARY_STATE_HANDLE_INPUT; } - return PSS_STATE_HIDE_RIBBON_INFO; + return SUMMARY_STATE_HIDE_RIBBON_INFO; } static int HandleInput_RibbonSelect(PokemonSummaryScreen *summaryScreen) { if (JOY_REPEAT(PAD_KEY_LEFT)) { ChangeSelectedRibbon(summaryScreen, -1); - return PSS_STATE_RIBBON_SELECT; + return SUMMARY_STATE_RIBBON_SELECT; } if (JOY_REPEAT(PAD_KEY_RIGHT)) { ChangeSelectedRibbon(summaryScreen, 1); - return PSS_STATE_RIBBON_SELECT; + return SUMMARY_STATE_RIBBON_SELECT; } if (JOY_REPEAT(PAD_KEY_UP)) { ChangeSelectedRibbon(summaryScreen, -1 * RIBBONS_PER_ROW); - return PSS_STATE_RIBBON_SELECT; + return SUMMARY_STATE_RIBBON_SELECT; } if (JOY_REPEAT(PAD_KEY_DOWN)) { ChangeSelectedRibbon(summaryScreen, RIBBONS_PER_ROW); - return PSS_STATE_RIBBON_SELECT; + return SUMMARY_STATE_RIBBON_SELECT; } if (JOY_NEW(PAD_BUTTON_B | PAD_BUTTON_A)) { Sound_PlayEffect(SEQ_SE_DP_DECIDE); summaryScreen->pageState = PAGE_STATE_INITIAL; - return PSS_STATE_HIDE_RIBBON_INFO; + return SUMMARY_STATE_HIDE_RIBBON_INFO; } - return PSS_STATE_RIBBON_SELECT; + return SUMMARY_STATE_RIBBON_SELECT; } static int HandleInput_Subscreen(PokemonSummaryScreen *summaryScreen) @@ -907,12 +907,12 @@ static int HandleInput_Subscreen(PokemonSummaryScreen *summaryScreen) if (summaryScreen->buttonState == 1) { u8 page = PokemonSummaryScreen_GetSubscreenButtonPage(summaryScreen, summaryScreen->buttonCurrent); - if (page == PSS_PAGE_EXIT) { + if (page == SUMMARY_PAGE_EXIT) { summaryScreen->subscreenExit = TRUE; } if (summaryScreen->monData.isEgg == TRUE) { - if (page == PSS_PAGE_MEMO || page == PSS_PAGE_EXIT) { + if (page == SUMMARY_PAGE_MEMO || page == SUMMARY_PAGE_EXIT) { SetupPageFromSubscreenButton(summaryScreen, page); } } else { @@ -920,7 +920,7 @@ static int HandleInput_Subscreen(PokemonSummaryScreen *summaryScreen) } } - return PSS_STATE_SUBSCREEN_INPUT; + return SUMMARY_STATE_SUBSCREEN_INPUT; } static int SetupPoffinFeedConditionPage(PokemonSummaryScreen *summaryScreen) @@ -929,7 +929,7 @@ static int SetupPoffinFeedConditionPage(PokemonSummaryScreen *summaryScreen) BoxPokemon *boxMon; Pokemon *mon; - if (summaryScreen->data->dataType == PSS_DATA_BOX_MON) { + if (summaryScreen->data->dataType == SUMMARY_DATA_BOX_MON) { boxMon = PokemonSummaryScreen_MonData(summaryScreen); mon = Pokemon_New(HEAP_ID_POKEMON_SUMMARY_SCREEN); Pokemon_FromBoxPokemon(boxMon, mon); @@ -978,7 +978,7 @@ static int SetupPoffinFeedConditionPage(PokemonSummaryScreen *summaryScreen) summaryScreen->monData.sheen = Pokemon_GetValue(mon, MON_DATA_SHEEN, NULL); - if (summaryScreen->data->dataType == PSS_DATA_BOX_MON) { + if (summaryScreen->data->dataType == SUMMARY_DATA_BOX_MON) { Heap_FreeToHeap(mon); } @@ -986,17 +986,17 @@ static int SetupPoffinFeedConditionPage(PokemonSummaryScreen *summaryScreen) LoadMessageBoxGraphics(summaryScreen->bgConfig, BG_LAYER_MAIN_1, (1024 - (18 + 12)), 13, Options_Frame(summaryScreen->data->options), HEAP_ID_POKEMON_SUMMARY_SCREEN); if (summaryScreen->pageState == STAT_INCREASE_NONE) { - PokemonSummaryScreen_PrintPoffinFeedMsg(summaryScreen, PSS_MSG_NOTHING_CHANGED); - return PSS_STATE_WAIT_FINISH_POFFIN_FEED; + PokemonSummaryScreen_PrintPoffinFeedMsg(summaryScreen, SUMMARY_MSG_NOTHING_CHANGED); + return SUMMARY_STATE_WAIT_FINISH_POFFIN_FEED; } else { PokemonSummaryScreen_InitMaxAndDeltaConditionRects(summaryScreen); PokemonSummaryScreen_InitSheenSprites(summaryScreen); PokemonSummaryScreen_UpdateConditionArrowSprites(summaryScreen); - return PSS_STATE_PRINT_CONTEST_STAT_MSGS; + return SUMMARY_STATE_PRINT_CONTEST_STAT_MSGS; } } - return PSS_STATE_SETUP_POFFIN_FEED; + return SUMMARY_STATE_SETUP_POFFIN_FEED; } static int PrintContestStatChangeMsgs(PokemonSummaryScreen *summaryScreen) @@ -1008,29 +1008,29 @@ static int PrintContestStatChangeMsgs(PokemonSummaryScreen *summaryScreen) summaryScreen->pageState ^= (1 << i); if (summaryScreen->pageState == STAT_INCREASE_NONE) { - return PSS_STATE_WAIT_FINISH_POFFIN_FEED; + return SUMMARY_STATE_WAIT_FINISH_POFFIN_FEED; } break; } } } - return PSS_STATE_PRINT_CONTEST_STAT_MSGS; + return SUMMARY_STATE_PRINT_CONTEST_STAT_MSGS; } static int WaitForPoffinFeedMsgInput(PokemonSummaryScreen *dummy) { if (JOY_NEW(PAD_BUTTON_A | PAD_BUTTON_B)) { - return PSS_STATE_TRANSITION_OUT; + return SUMMARY_STATE_TRANSITION_OUT; } - return PSS_STATE_WAIT_FINISH_POFFIN_FEED; + return SUMMARY_STATE_WAIT_FINISH_POFFIN_FEED; } static u8 SummaryScreenTransitionOut(PokemonSummaryScreen *dummy) { sub_0208C120(1, 19); - return PSS_STATE_WAIT_EXIT; + return SUMMARY_STATE_WAIT_EXIT; } static u8 ScreenTransitionIsDone(PokemonSummaryScreen *dummy) @@ -1042,7 +1042,7 @@ static void SetMonData(PokemonSummaryScreen *summaryScreen) { void *monData = PokemonSummaryScreen_MonData(summaryScreen); - if (summaryScreen->data->dataType == PSS_DATA_BOX_MON) { + if (summaryScreen->data->dataType == SUMMARY_DATA_BOX_MON) { SetMonDataFromBoxMon(summaryScreen, monData, &summaryScreen->monData); } else { SetMonDataFromMon(summaryScreen, monData, &summaryScreen->monData); @@ -1064,15 +1064,15 @@ static void SetMonDataFromMon(PokemonSummaryScreen *summaryScreen, Pokemon *mon, monData->species = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); BoxPokemon *boxMon = Pokemon_GetBoxPokemon(mon); - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_species_name_template, summaryScreen->strbuf); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_species_name_template, summaryScreen->strbuf); StringTemplate_SetSpeciesName(summaryScreen->strFormatter, 0, boxMon); StringTemplate_Format(summaryScreen->strFormatter, summaryScreen->monData.speciesName, summaryScreen->strbuf); - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_nickname_template, summaryScreen->strbuf); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_nickname_template, summaryScreen->strbuf); StringTemplate_SetNickname(summaryScreen->strFormatter, 0, boxMon); StringTemplate_Format(summaryScreen->strFormatter, summaryScreen->monData.nickname, summaryScreen->strbuf); - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_otname_template, summaryScreen->strbuf); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_otname_template, summaryScreen->strbuf); StringTemplate_SetOTName(summaryScreen->strFormatter, 0, boxMon); StringTemplate_Format(summaryScreen->strFormatter, summaryScreen->monData.OTName, summaryScreen->strbuf); @@ -1140,15 +1140,15 @@ static void SetMonDataFromMon(PokemonSummaryScreen *summaryScreen, Pokemon *mon, monData->status = PokemonSummaryScreen_StatusIconAnimIdx(mon); if (Pokemon_HasCuredPokerus(mon) == TRUE) { - monData->pokerus = PSS_POKERUS_CURED; + monData->pokerus = SUMMARY_POKERUS_CURED; } else if (Pokemon_InfectedWithPokerus(mon) == TRUE) { - monData->pokerus = PSS_POKERUS_INFECTED; + monData->pokerus = SUMMARY_POKERUS_INFECTED; if (monData->status == 7) { monData->status = 0; } } else { - monData->pokerus = PSS_POKERUS_NONE; + monData->pokerus = SUMMARY_POKERUS_NONE; } if (Pokemon_IsShiny(mon) == TRUE) { @@ -1192,20 +1192,20 @@ static void PlayMonCry(PokemonSummaryScreen *summaryScreen) static void SetupInitialPageGfx(PokemonSummaryScreen *summaryScreen) { switch (summaryScreen->data->mode) { - case PSS_MODE_NORMAL: - case PSS_MODE_LOCK_MOVES: + case SUMMARY_MODE_NORMAL: + case SUMMARY_MODE_LOCK_MOVES: if (summaryScreen->monData.isEgg == FALSE) { - summaryScreen->page = PSS_PAGE_INFO; + summaryScreen->page = SUMMARY_PAGE_INFO; } else { - summaryScreen->page = PSS_PAGE_MEMO; + summaryScreen->page = SUMMARY_PAGE_MEMO; } break; - case PSS_MODE_SELECT_MOVE: - summaryScreen->page = PSS_PAGE_BATTLE_MOVES; + case SUMMARY_MODE_SELECT_MOVE: + summaryScreen->page = SUMMARY_PAGE_BATTLE_MOVES; break; - case PSS_MODE_POFFIN: - case PSS_MODE_CONDITION: - summaryScreen->page = PSS_PAGE_CONDITION; + case SUMMARY_MODE_POFFIN: + case SUMMARY_MODE_CONDITION: + summaryScreen->page = SUMMARY_PAGE_CONDITION; break; } @@ -1221,7 +1221,7 @@ static void SetupInitialPageGfx(PokemonSummaryScreen *summaryScreen) LoadCurrentPageTilemap(summaryScreen); PokemonSummaryScreen_InitConditionRects(summaryScreen); - if (summaryScreen->data->mode == PSS_MODE_SELECT_MOVE) { + if (summaryScreen->data->mode == SUMMARY_MODE_SELECT_MOVE) { SetupMoveInfoNoTransition(summaryScreen); } } @@ -1230,8 +1230,8 @@ void PokemonSummaryScreen_FlagVisiblePages(PokemonSummary *summary, const u8 *pa { summary->pageFlags = 0; - for (u8 i = 0; i < PSS_PAGE_MAX; i++) { - if (pages[i] == PSS_PAGE_MAX) { + for (u8 i = 0; i < SUMMARY_PAGE_MAX; i++) { + if (pages[i] == SUMMARY_PAGE_MAX) { break; } @@ -1245,22 +1245,22 @@ static void TryHideContestPages(PokemonSummaryScreen *summaryScreen) return; } - if (summaryScreen->data->pageFlags & (1 << PSS_PAGE_CONDITION)) { - summaryScreen->data->pageFlags ^= (1 << PSS_PAGE_CONDITION); + if (summaryScreen->data->pageFlags & (1 << SUMMARY_PAGE_CONDITION)) { + summaryScreen->data->pageFlags ^= (1 << SUMMARY_PAGE_CONDITION); } - if (summaryScreen->data->pageFlags & (1 << PSS_PAGE_CONTEST_MOVES)) { - summaryScreen->data->pageFlags ^= (1 << PSS_PAGE_CONTEST_MOVES); + if (summaryScreen->data->pageFlags & (1 << SUMMARY_PAGE_CONTEST_MOVES)) { + summaryScreen->data->pageFlags ^= (1 << SUMMARY_PAGE_CONTEST_MOVES); } - if (summaryScreen->data->pageFlags & (1 << PSS_PAGE_RIBBONS)) { - summaryScreen->data->pageFlags ^= (1 << PSS_PAGE_RIBBONS); + if (summaryScreen->data->pageFlags & (1 << SUMMARY_PAGE_RIBBONS)) { + summaryScreen->data->pageFlags ^= (1 << SUMMARY_PAGE_RIBBONS); } } u8 PokemonSummaryScreen_PageIsVisble(PokemonSummaryScreen *summaryScreen, u32 page) { - if (summaryScreen->monData.isEgg != FALSE && page != PSS_PAGE_MEMO && page != PSS_PAGE_EXIT) { + if (summaryScreen->monData.isEgg != FALSE && page != SUMMARY_PAGE_MEMO && page != SUMMARY_PAGE_EXIT) { return FALSE; } @@ -1272,7 +1272,7 @@ u8 PokemonSummaryScreen_CountVisiblePages(PokemonSummaryScreen *summaryScreen) u8 page; u8 countVisible = 0; - for (page = 0; page < PSS_PAGE_MAX; page++) { + for (page = 0; page < SUMMARY_PAGE_MAX; page++) { if (summaryScreen->data->pageFlags & (1 << page)) { countVisible++; } @@ -1289,7 +1289,7 @@ static void SetupPageFromSubscreenButton(PokemonSummaryScreen *summaryScreen, u8 // this code path is never reached because the select move mode // doesn't handle subscreen input - if (summaryScreen->data->mode == PSS_MODE_SELECT_MOVE) { + if (summaryScreen->data->mode == SUMMARY_MODE_SELECT_MOVE) { ClearMoveInfoWindows(summaryScreen); } @@ -1312,7 +1312,7 @@ static void SetupPageFromSubscreenButton(PokemonSummaryScreen *summaryScreen, u8 PokemonSummaryScreen_InitConditionRects(summaryScreen); // this code path is also never reached - if (summaryScreen->data->mode == PSS_MODE_SELECT_MOVE) { + if (summaryScreen->data->mode == SUMMARY_MODE_SELECT_MOVE) { SetupMoveInfoFromSubscreenButton(summaryScreen); } } @@ -1324,10 +1324,10 @@ static void ChangePage(PokemonSummaryScreen *summaryScreen, s8 delta) while (TRUE) { page += delta; - if (page < PSS_PAGE_INFO) { - page = PSS_PAGE_EXIT; - } else if (page > PSS_PAGE_EXIT) { - page = PSS_PAGE_INFO; + if (page < SUMMARY_PAGE_INFO) { + page = SUMMARY_PAGE_EXIT; + } else if (page > SUMMARY_PAGE_EXIT) { + page = SUMMARY_PAGE_INFO; } if (summaryScreen->monData.isEgg == FALSE) { @@ -1336,7 +1336,7 @@ static void ChangePage(PokemonSummaryScreen *summaryScreen, s8 delta) } } else { if ((summaryScreen->data->pageFlags & (1 << page)) != 0 - && (page == PSS_PAGE_MEMO || page == PSS_PAGE_EXIT)) { + && (page == SUMMARY_PAGE_MEMO || page == SUMMARY_PAGE_EXIT)) { break; } } @@ -1356,7 +1356,7 @@ static u8 CheckSubscreenPressAndSetButton(PokemonSummaryScreen *summaryScreen) { u8 button = PokemonSummaryScreen_CheckSubscreenButtonPress(summaryScreen); - if (button == PSS_SUBSCREEN_BUTTON_NONE) { + if (button == SUMMARY_SUBSCREEN_BUTTON_NONE) { return FALSE; } @@ -1370,8 +1370,8 @@ static u8 CheckSubscreenPressAndSetButton(PokemonSummaryScreen *summaryScreen) static void LoadCurrentPageTilemap(PokemonSummaryScreen *summaryScreen) { u32 memberIndex; - if (summaryScreen->data->mode == PSS_MODE_SELECT_MOVE && summaryScreen->data->move != MOVE_NONE) { - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { + if (summaryScreen->data->mode == SUMMARY_MODE_SELECT_MOVE && summaryScreen->data->move != MOVE_NONE) { + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { memberIndex = page_battle_moves_select_mode_NSCR; } else { memberIndex = page_contest_moves_select_mode_NSCR; @@ -1388,9 +1388,9 @@ static void LoadCurrentPageTilemap(PokemonSummaryScreen *summaryScreen) Bg_ScheduleTilemapTransfer(summaryScreen->bgConfig, BG_LAYER_MAIN_3); Heap_FreeToHeap(memberBuffer); - if (summaryScreen->page == PSS_PAGE_INFO) { + if (summaryScreen->page == SUMMARY_PAGE_INFO) { DrawExperienceProgressBar(summaryScreen); - } else if (summaryScreen->page == PSS_PAGE_SKILLS) { + } else if (summaryScreen->page == SUMMARY_PAGE_SKILLS) { DrawHealthBar(summaryScreen); } } @@ -1486,11 +1486,11 @@ static void ChangeSummaryMon(PokemonSummaryScreen *summaryScreen, s8 delta) PokemonSummaryScreen_PrintLevel(summaryScreen); PokemonSummaryScreen_PrintItemName(summaryScreen); - if (summaryScreen->page == PSS_PAGE_INFO) { + if (summaryScreen->page == SUMMARY_PAGE_INFO) { DrawExperienceProgressBar(summaryScreen); - } else if (summaryScreen->page == PSS_PAGE_SKILLS) { + } else if (summaryScreen->page == SUMMARY_PAGE_SKILLS) { DrawHealthBar(summaryScreen); - } else if (summaryScreen->page == PSS_PAGE_CONDITION) { + } else if (summaryScreen->page == SUMMARY_PAGE_CONDITION) { PokemonSummaryScreen_InitMaxAndDeltaConditionRects(summaryScreen); } @@ -1512,11 +1512,11 @@ static void ChangeSummaryMon(PokemonSummaryScreen *summaryScreen, s8 delta) static s8 TryAdvanceSummaryMonIndex(PokemonSummaryScreen *summaryScreen, s8 delta) { switch (summaryScreen->data->dataType) { - case PSS_DATA_MON: + case SUMMARY_DATA_MON: return TryAdvanceMonIndex(summaryScreen, delta); - case PSS_DATA_PARTY_MON: + case SUMMARY_DATA_PARTY_MON: return TryAdvancePartyMonIndex(summaryScreen, delta); - case PSS_DATA_BOX_MON: + case SUMMARY_DATA_BOX_MON: return TryAdvanceBoxMonIndex(summaryScreen, delta); } @@ -1525,11 +1525,11 @@ static s8 TryAdvanceSummaryMonIndex(PokemonSummaryScreen *summaryScreen, s8 delt static BOOL CanAdvanceToEgg(PokemonSummaryScreen *summaryScreen) { - if (summaryScreen->data->mode == PSS_MODE_POFFIN) { + if (summaryScreen->data->mode == SUMMARY_MODE_POFFIN) { return FALSE; } - if (summaryScreen->page != PSS_PAGE_MEMO && summaryScreen->page != PSS_PAGE_EXIT) { + if (summaryScreen->page != SUMMARY_PAGE_MEMO && summaryScreen->page != SUMMARY_PAGE_EXIT) { return FALSE; } @@ -1622,11 +1622,11 @@ static s8 TryAdvanceBoxMonIndex(PokemonSummaryScreen *summaryScreen, s8 delta) void *PokemonSummaryScreen_MonData(PokemonSummaryScreen *summaryScreen) { switch (summaryScreen->data->dataType) { - case PSS_DATA_MON: + case SUMMARY_DATA_MON: return summaryScreen->data->monData + (Pokemon_GetStructSize() * summaryScreen->data->pos); - case PSS_DATA_PARTY_MON: + case SUMMARY_DATA_PARTY_MON: return Party_GetPokemonBySlotIndex(summaryScreen->data->monData, summaryScreen->data->pos); - case PSS_DATA_BOX_MON: + case SUMMARY_DATA_BOX_MON: return summaryScreen->data->monData + (BoxPokemon_GetStructSize() * summaryScreen->data->pos); } @@ -1640,10 +1640,10 @@ static u8 SetupBattleMoveInfo(PokemonSummaryScreen *summaryScreen) Bg_ScheduleScroll(summaryScreen->bgConfig, BG_LAYER_MAIN_2, BG_OFFSET_UPDATE_SET_X, 136); Bg_ScheduleScroll(summaryScreen->bgConfig, BG_LAYER_MAIN_2, BG_OFFSET_UPDATE_SET_Y, 0); PokemonSummaryScreen_UpdatePageArrows(summaryScreen, FALSE); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_MON_LEVEL]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_ITEM]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_ITEM_NAME]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_MON_LEVEL]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_ITEM]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_ITEM_NAME]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, NULL); summaryScreen->cursor = 0; @@ -1662,20 +1662,20 @@ static u8 SetupBattleMoveInfo(PokemonSummaryScreen *summaryScreen) case PAGE_STATE_SCROLL_FINISHED: PokemonSummaryScreen_ShowMove5OrCancel(summaryScreen); - if (summaryScreen->data->mode != PSS_MODE_LOCK_MOVES) { + if (summaryScreen->data->mode != SUMMARY_MODE_LOCK_MOVES) { PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, 152); - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); } UpdateMoveAttributes(summaryScreen); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_1], TRUE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE); PokemonSummaryScreen_ShowMonIcon(summaryScreen); if (summaryScreen->monData.type1 != summaryScreen->monData.type2) { - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_2], TRUE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE); } - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_1], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], TRUE); return TRUE; } @@ -1686,12 +1686,12 @@ static u8 HideBattleMoveInfo(PokemonSummaryScreen *summaryScreen) { switch (summaryScreen->pageState) { case PAGE_STATE_INITIAL: - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_1], FALSE); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_2], FALSE); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MOVE_CATEGORY_ICON], FALSE); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_ICON], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_1], FALSE); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], FALSE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], FALSE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], FALSE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], FALSE); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, NULL); PokemonSummaryScreen_HideMoveCancelText(summaryScreen); PokemonSummaryScreen_ClearBattleAttributeWindows(summaryScreen); @@ -1708,12 +1708,12 @@ static u8 HideBattleMoveInfo(PokemonSummaryScreen *summaryScreen) } } break; case PAGE_STATE_SCROLL_FINISHED: - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_MON_LEVEL]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_ITEM]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_ITEM_NAME]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_MON_LEVEL]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_ITEM]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_ITEM_NAME]); PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, 129); PokemonSummaryScreen_UpdatePageArrows(summaryScreen, TRUE); - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); return TRUE; } @@ -1752,20 +1752,20 @@ static void UpdateMoveAttributes(PokemonSummaryScreen *summaryScreen) if (summaryScreen->cursor == LEARNED_MOVES_MAX) { if (summaryScreen->data->move != MOVE_NONE) { - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { UpdateBattleMoveAttributes(summaryScreen, summaryScreen->data->move); } else { UpdateContestMoveAttributes(summaryScreen, summaryScreen->data->move); } } else { - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { - UpdateBattleMoveAttributes(summaryScreen, PSS_MOVE_NONE); + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { + UpdateBattleMoveAttributes(summaryScreen, SUMMARY_MOVE_NONE); } else { - UpdateContestMoveAttributes(summaryScreen, PSS_MOVE_NONE); + UpdateContestMoveAttributes(summaryScreen, SUMMARY_MOVE_NONE); } } } else { - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { UpdateBattleMoveAttributes(summaryScreen, summaryScreen->monData.moves[summaryScreen->cursor]); } else { UpdateContestMoveAttributes(summaryScreen, summaryScreen->monData.moves[summaryScreen->cursor]); @@ -1775,13 +1775,13 @@ static void UpdateMoveAttributes(PokemonSummaryScreen *summaryScreen) static void UpdateBattleMoveAttributes(PokemonSummaryScreen *summaryScreen, u32 move) { - if (move == PSS_MOVE_NONE) { + if (move == SUMMARY_MOVE_NONE) { PokemonSummaryScreen_ClearBattleAttributeWindows(summaryScreen); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MOVE_CATEGORY_ICON], FALSE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], FALSE); } else { PokemonSummaryScreen_PrintBattleMoveAttributes(summaryScreen, move); PokemonSummaryScreen_UpdateMoveCategoryIcon(summaryScreen, move); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MOVE_CATEGORY_ICON], TRUE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], TRUE); } } @@ -1789,7 +1789,7 @@ static void UpdateContestMoveAttributes(PokemonSummaryScreen *summaryScreen, u32 { UpdateAppealHearts(summaryScreen, move); - if (move == PSS_MOVE_NONE) { + if (move == SUMMARY_MOVE_NONE) { PokemonSummaryScreen_ClearContestAttributeWindows(summaryScreen); } else { PokemonSummaryScreen_PrintContestMoveAttributes(summaryScreen, move); @@ -1800,7 +1800,7 @@ static void SwapSelectedMoves(PokemonSummaryScreen *summaryScreen) { void *monData = PokemonSummaryScreen_MonData(summaryScreen); - if (summaryScreen->data->dataType == PSS_DATA_BOX_MON) { + if (summaryScreen->data->dataType == SUMMARY_DATA_BOX_MON) { BoxPokemon_SwapMoveSlots(monData, summaryScreen->cursor, summaryScreen->cursorTmp); } else { Pokemon_SwapMoveSlots(monData, summaryScreen->cursor, summaryScreen->cursorTmp); @@ -1821,23 +1821,23 @@ static void SwapSelectedMoves(PokemonSummaryScreen *summaryScreen) static void SetupMoveInfoNoTransition(PokemonSummaryScreen *summaryScreen) { - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_MON_LEVEL]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_ITEM]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_ITEM_NAME]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_MON_LEVEL]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_ITEM]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_ITEM_NAME]); Bg_ScheduleScroll(summaryScreen->bgConfig, BG_LAYER_MAIN_2, BG_OFFSET_UPDATE_SET_X, 0); PokemonSummaryScreen_ShowMove5OrCancel(summaryScreen); UpdateMoveAttributes(summaryScreen); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_1], TRUE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE); PokemonSummaryScreen_ShowMonIcon(summaryScreen); if (summaryScreen->monData.type1 != summaryScreen->monData.type2) { - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_2], TRUE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE); } - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_1], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], TRUE); } static u8 SetupContestMoveInfo(PokemonSummaryScreen *summaryScreen) @@ -1846,12 +1846,12 @@ static u8 SetupContestMoveInfo(PokemonSummaryScreen *summaryScreen) case PAGE_STATE_INITIAL: Bg_ScheduleScroll(summaryScreen->bgConfig, BG_LAYER_MAIN_2, BG_OFFSET_UPDATE_SET_X, 136); Bg_ScheduleScroll(summaryScreen->bgConfig, BG_LAYER_MAIN_2, BG_OFFSET_UPDATE_SET_Y, 256); - UpdateAppealHearts(summaryScreen, PSS_MOVE_NONE); + UpdateAppealHearts(summaryScreen, SUMMARY_MOVE_NONE); PokemonSummaryScreen_UpdatePageArrows(summaryScreen, FALSE); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_MON_LEVEL]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_ITEM]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_ITEM_NAME]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_MON_LEVEL]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_ITEM]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_ITEM_NAME]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, NULL); summaryScreen->cursor = 0; summaryScreen->pageState = PAGE_STATE_SCROLLING; @@ -1869,15 +1869,15 @@ static u8 SetupContestMoveInfo(PokemonSummaryScreen *summaryScreen) case PAGE_STATE_SCROLL_FINISHED: PokemonSummaryScreen_ShowMove5OrCancel(summaryScreen); - if (summaryScreen->data->mode != PSS_MODE_LOCK_MOVES) { + if (summaryScreen->data->mode != SUMMARY_MODE_LOCK_MOVES) { PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, 152); - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); } UpdateMoveAttributes(summaryScreen); PokemonSummaryScreen_ShowMonIcon(summaryScreen); PokemonSummaryScreen_DrawContestStatDots(summaryScreen); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_1], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], TRUE); return TRUE; } @@ -1890,10 +1890,10 @@ static u8 HideContestMoveInfo(PokemonSummaryScreen *summaryScreen) switch (summaryScreen->pageState) { case PAGE_STATE_INITIAL: PokemonSummaryScreen_HideContestStatDots(summaryScreen); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_ICON], FALSE); - UpdateAppealHearts(summaryScreen, PSS_MOVE_NONE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_1], FALSE); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], FALSE); + UpdateAppealHearts(summaryScreen, SUMMARY_MOVE_NONE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], FALSE); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, NULL); PokemonSummaryScreen_HideMoveCancelText(summaryScreen); PokemonSummaryScreen_ClearContestAttributeWindows(summaryScreen); @@ -1910,12 +1910,12 @@ static u8 HideContestMoveInfo(PokemonSummaryScreen *summaryScreen) } } break; case PAGE_STATE_SCROLL_FINISHED: - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_MON_LEVEL]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_ITEM]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_ITEM_NAME]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_MON_LEVEL]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_ITEM]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_ITEM_NAME]); PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, 158); PokemonSummaryScreen_UpdatePageArrows(summaryScreen, TRUE); - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); return TRUE; } @@ -1947,7 +1947,7 @@ static void UpdateAppealHearts(PokemonSummaryScreen *summaryScreen, u32 move) DrawEmptyHearts(summaryScreen); - if (move != PSS_MOVE_NONE) { + if (move != SUMMARY_MOVE_NONE) { effect = MoveTable_LoadParam(move, MOVEATTRIBUTE_CONTEST_EFFECT); numHearts = sub_02095734(effect) / POINTS_PER_APPEAL_HEART; @@ -1961,7 +1961,7 @@ static void UpdateAppealHearts(PokemonSummaryScreen *summaryScreen, u32 move) static void ClearMoveInfoWindows(PokemonSummaryScreen *summaryScreen) { - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { PokemonSummaryScreen_ClearBattleAttributeWindows(summaryScreen); } else { PokemonSummaryScreen_ClearContestAttributeWindows(summaryScreen); @@ -1976,12 +1976,12 @@ static void SetupMoveInfoFromSubscreenButton(PokemonSummaryScreen *summaryScreen UpdateMoveAttributes(summaryScreen); PokemonSummaryScreen_ShowMonIcon(summaryScreen); - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { PokemonSummaryScreen_HideContestStatDots(summaryScreen); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_1], TRUE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE); if (summaryScreen->monData.type1 != summaryScreen->monData.type2) { - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_2], TRUE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE); } Bg_ScheduleScroll(summaryScreen->bgConfig, BG_LAYER_MAIN_2, 3, 0); @@ -1999,11 +1999,11 @@ static u8 SetupRibbonInfo(PokemonSummaryScreen *summaryScreen) Bg_ScheduleScroll(summaryScreen->bgConfig, BG_LAYER_MAIN_2, BG_OFFSET_UPDATE_SET_Y, 0); PokemonSummaryScreen_UpdatePageArrows(summaryScreen, FALSE); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_ITEM]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_ITEM_NAME]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_RIBBON_COUNT]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_COUNT]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_ITEM]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_ITEM_NAME]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_RIBBON_COUNT]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_COUNT]); PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, NULL); summaryScreen->ribbonCol = 0; @@ -2022,13 +2022,13 @@ static u8 SetupRibbonInfo(PokemonSummaryScreen *summaryScreen) } break; case PAGE_STATE_SCROLL_FINISHED: PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, 181); - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_CURSOR], TRUE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_FLASH], TRUE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_9], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_10], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_11], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_12], FALSE); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_CURSOR], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_9], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_10], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_11], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_12], FALSE); ChangeSelectedRibbon(summaryScreen, 0); return TRUE; @@ -2043,10 +2043,10 @@ static u8 HideRibbonInfo(PokemonSummaryScreen *summaryScreen) case PAGE_STATE_INITIAL: summaryScreen->ribbonCol = 0; summaryScreen->ribbonRow = 0; - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_INDEX]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_NAME]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_DESCRIPTION]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_INDEX]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_NAME]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_DESCRIPTION]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, NULL); PokemonSummaryScreen_UpdateRibbonSprites(summaryScreen); summaryScreen->pageState = PAGE_STATE_SCROLLING; @@ -2062,14 +2062,14 @@ static u8 HideRibbonInfo(PokemonSummaryScreen *summaryScreen) } } break; case PAGE_STATE_SCROLL_FINISHED: - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_ITEM]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_ITEM_NAME]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_RIBBON_COUNT]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_COUNT]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_ITEM]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_ITEM_NAME]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_RIBBON_COUNT]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_COUNT]); PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, 180); PokemonSummaryScreen_UpdatePageArrows(summaryScreen, TRUE); - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); return TRUE; } @@ -2138,15 +2138,15 @@ static void ChangeSelectedRibbon(PokemonSummaryScreen *summaryScreen, s8 delta) PokemonSummaryScreen_PrintRibbonIndexAndMax(summaryScreen); if (summaryScreen->ribbonRow != 0) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_ARROW_UP], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_UP], TRUE); } else { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_ARROW_UP], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_UP], FALSE); } if ((summaryScreen->ribbonRow * RIBBONS_PER_ROW + RIBBONS_PER_ROW * 2) < summaryScreen->ribbonMax) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_ARROW_DOWN], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_DOWN], TRUE); } else { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_ARROW_DOWN], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_DOWN], FALSE); } } @@ -2174,14 +2174,14 @@ static int TryFeedPoffin(PokemonSummaryScreen *summaryScreen) if (summaryScreen->monData.sheen == MAX_POKEMON_SHEEN) { Font_LoadScreenIndicatorsPalette(0, PLTT_OFFSET(14), HEAP_ID_POKEMON_SUMMARY_SCREEN); LoadMessageBoxGraphics(summaryScreen->bgConfig, BG_LAYER_MAIN_1, (1024 - (18 + 12)), 13, Options_Frame(summaryScreen->data->options), HEAP_ID_POKEMON_SUMMARY_SCREEN); - PokemonSummaryScreen_PrintPoffinFeedMsg(summaryScreen, PSS_MSG_MON_WONT_EAT_MORE); - summaryScreen->data->returnMode = PSS_RETURN_CANCEL; + PokemonSummaryScreen_PrintPoffinFeedMsg(summaryScreen, SUMMARY_MSG_MON_WONT_EAT_MORE); + summaryScreen->data->returnMode = SUMMARY_RETURN_CANCEL; - return PSS_STATE_WAIT_FINISH_POFFIN_FEED; + return SUMMARY_STATE_WAIT_FINISH_POFFIN_FEED; } - summaryScreen->data->returnMode = PSS_RETURN_SELECT; - return PSS_STATE_TRANSITION_OUT; + summaryScreen->data->returnMode = SUMMARY_RETURN_SELECT; + return SUMMARY_STATE_TRANSITION_OUT; } void PokemonSummaryScreen_SetPlayerProfile(PokemonSummary *summary, const TrainerInfo *trainerInfo) diff --git a/src/applications/pokemon_summary_screen/sprite.c b/src/applications/pokemon_summary_screen/sprite.c index e269fc1217..d120b5314c 100644 --- a/src/applications/pokemon_summary_screen/sprite.c +++ b/src/applications/pokemon_summary_screen/sprite.c @@ -32,12 +32,12 @@ static void DrawConditionFlash(CellActor *sprite, u32 statValue, u32 highestValu // the summary screen refers to the contest stats in the order they appear in the condition // screen clock-wise, not the order used elsewhere -enum PSSContestType { - PSS_CONTEST_TYPE_COOL = 0, - PSS_CONTEST_TYPE_BEAUTY, - PSS_CONTEST_TYPE_CUTE, - PSS_CONTEST_TYPE_SMART, - PSS_CONTEST_TYPE_TOUGH, +enum SummaryContestType { + SUMMARY_CONTEST_TYPE_COOL = 0, + SUMMARY_CONTEST_TYPE_BEAUTY, + SUMMARY_CONTEST_TYPE_CUTE, + SUMMARY_CONTEST_TYPE_SMART, + SUMMARY_CONTEST_TYPE_TOUGH, }; enum ConditionFlashBounds { @@ -49,9 +49,9 @@ enum ConditionFlashBounds { FLASH_BOUNDS_MAX, }; -#define MAX_SHEEN_SPRITES PSS_SHEEN_SPRITES_END - PSS_SHEEN_SPRITES_START + 1 -#define MAX_CONDITION_ARROW_SPRITES PSS_CONDITION_ARROW_SPRITES_END - PSS_CONDITION_ARROW_SPRITES_START + 1 -#define MAX_CONDITION_FLASH_SPRITES PSS_CONDITION_FLASH_SPRITES_END - PSS_CONDITION_FLASH_SPRITES_START + 1 +#define MAX_SHEEN_SPRITES SUMMARY_SHEEN_SPRITES_END - SUMMARY_SHEEN_SPRITES_START + 1 +#define MAX_CONDITION_ARROW_SPRITES SUMMARY_CONDITION_ARROW_SPRITES_END - SUMMARY_CONDITION_ARROW_SPRITES_START + 1 +#define MAX_CONDITION_FLASH_SPRITES SUMMARY_CONDITION_FLASH_SPRITES_END - SUMMARY_CONDITION_FLASH_SPRITES_START + 1 #define RIBBON_CURSOR_BASE_X 132 #define RIBBON_CURSOR_BASE_Y 56 @@ -117,83 +117,83 @@ enum ConditionFlashBounds { #define DOT_MIN_POS 44 static const UnkStruct_ov7_0224F358 Unk_020F41A8[] = { - [PSS_SPRITE_TAB_INFO] = { 0x1, 0x80, 0x18, 0x0, 0x0, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_TAB_MEMO] = { 0x1, 0x90, 0x18, 0x0, 0x1, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_TAB_SKILLS] = { 0x1, 0xA0, 0x18, 0x0, 0x2, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_TAB_BATTLE_MOVES] = { 0x1, 0xB0, 0x18, 0x0, 0x3, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_TAB_CONDITION] = { 0x1, 0xC0, 0x18, 0x0, 0x4, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_TAB_CONTEST_MOVES] = { 0x1, 0xD0, 0x18, 0x0, 0x5, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_TAB_RIBBONS] = { 0x1, 0xE0, 0x18, 0x0, 0x6, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_TAB_EXIT] = { 0x1, 0xF0, 0x18, 0x0, 0x7, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CAUGHT_BALL] = { 0x0, 0x10, 0x20, 0x0, 0x0, 0x0, 0xC, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MOVE_SELECTOR_1] = { 0x2, 0xC2, 0x30, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MOVE_SELECTOR_2] = { 0x2, 0xC2, 0x30, 0x0, 0x1, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MON_TYPE_ICON_1] = { 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MON_TYPE_ICON_2] = { 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MOVE_TYPE_ICON_1] = { 0x5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MOVE_TYPE_ICON_2] = { 0x6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MOVE_TYPE_ICON_3] = { 0x7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MOVE_TYPE_ICON_4] = { 0x8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MOVE_TYPE_ICON_5] = { 0x9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MOVE_CATEGORY_ICON] = { 0xA, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MON_ICON] = { 0xB, 0x18, 0x30, 0x0, 0x0, 0x0, 0x4, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_STATUS_ICON] = { 0xC, 0x50, 0x34, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_PAGE_ARROW_LEFT] = { 0xE, 0x0, 0x18, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_PAGE_ARROW_RIGHT] = { 0xE, 0x0, 0x18, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MARKING_CIRCLE] = { 0x12, 0x30, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MARKING_TRIANGLE] = { 0x13, 0x38, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MARKING_SQUARE] = { 0x14, 0x40, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MARKING_HEART] = { 0x15, 0x48, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MARKING_STAR] = { 0x16, 0x50, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_MARKING_DIAMOND] = { 0x17, 0x58, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_1] = { 0xD, 0x98, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_2] = { 0xD, 0xA0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_3] = { 0xD, 0xA8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_4] = { 0xD, 0xB0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_5] = { 0xD, 0xB8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_6] = { 0xD, 0xC0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_7] = { 0xD, 0xC8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_8] = { 0xD, 0xD0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_9] = { 0xD, 0xD8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_10] = { 0xD, 0xE0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_11] = { 0xD, 0xE8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHEEN_12] = { 0xD, 0xF0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_BUTTON_TAP_CIRCLE] = { 0xF, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONDITION_ARROW_COOL] = { 0x10, 0xD0, 0x30, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONDITION_ARROW_BEAUTY] = { 0x10, 0xE0, 0x58, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONDITION_ARROW_CUTE] = { 0x10, 0xD8, 0x78, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONDITION_ARROW_SMART] = { 0x10, 0x90, 0x78, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONDITION_ARROW_TOUGH] = { 0x10, 0x88, 0x58, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_A_BUTTON] = { 0x11, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONTEST_STAT_DOT_COOL] = { 0x19, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONTEST_STAT_DOT_BEAUTY] = { 0x19, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONTEST_STAT_DOT_CUTE] = { 0x19, 0x0, 0x0, 0x0, 0x3, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONTEST_STAT_DOT_SMART] = { 0x19, 0x0, 0x0, 0x0, 0x2, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONTEST_STAT_DOT_TOUGH] = { 0x19, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_SHINY_ICON] = { 0x18, 0x62, 0x48, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_POKERUS_CURED_ICON] = { 0x18, 0x62, 0x84, 0x0, 0x1, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_1] = { 0x1A, 0x84, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_2] = { 0x1B, 0xA4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_3] = { 0x1C, 0xC4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_4] = { 0x1D, 0xE4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_5] = { 0x1E, 0x84, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_6] = { 0x1F, 0xA4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_7] = { 0x20, 0xC4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_8] = { 0x21, 0xE4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_9] = { 0x22, 0x84, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_10] = { 0x23, 0xA4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_11] = { 0x24, 0xC4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_12] = { 0x25, 0xE4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_CURSOR] = { 0x26, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_ARROW_UP] = { 0x27, 0xB4, 0x20, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_ARROW_DOWN] = { 0x27, 0xB4, 0x78, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_RIBBON_FLASH] = { 0x28, 0x8, 0x84, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONDITION_FLASH_COOL] = { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONDITION_FLASH_BEAUTY] = { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONDITION_FLASH_CUTE] = { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONDITION_FLASH_SMART] = { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_CONDITION_FLASH_TOUGH] = { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, - [PSS_SPRITE_POKERUS_ICON] = { 0x2A, 0x4C, 0x30, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 } + [SUMMARY_SPRITE_TAB_INFO] = { 0x1, 0x80, 0x18, 0x0, 0x0, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_TAB_MEMO] = { 0x1, 0x90, 0x18, 0x0, 0x1, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_TAB_SKILLS] = { 0x1, 0xA0, 0x18, 0x0, 0x2, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_TAB_BATTLE_MOVES] = { 0x1, 0xB0, 0x18, 0x0, 0x3, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_TAB_CONDITION] = { 0x1, 0xC0, 0x18, 0x0, 0x4, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_TAB_CONTEST_MOVES] = { 0x1, 0xD0, 0x18, 0x0, 0x5, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_TAB_RIBBONS] = { 0x1, 0xE0, 0x18, 0x0, 0x6, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_TAB_EXIT] = { 0x1, 0xF0, 0x18, 0x0, 0x7, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CAUGHT_BALL] = { 0x0, 0x10, 0x20, 0x0, 0x0, 0x0, 0xC, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MOVE_SELECTOR_1] = { 0x2, 0xC2, 0x30, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MOVE_SELECTOR_2] = { 0x2, 0xC2, 0x30, 0x0, 0x1, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MON_TYPE_ICON_1] = { 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MON_TYPE_ICON_2] = { 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MOVE_TYPE_ICON_1] = { 0x5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MOVE_TYPE_ICON_2] = { 0x6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MOVE_TYPE_ICON_3] = { 0x7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MOVE_TYPE_ICON_4] = { 0x8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MOVE_TYPE_ICON_5] = { 0x9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MOVE_CATEGORY_ICON] = { 0xA, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MON_ICON] = { 0xB, 0x18, 0x30, 0x0, 0x0, 0x0, 0x4, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_STATUS_ICON] = { 0xC, 0x50, 0x34, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_PAGE_ARROW_LEFT] = { 0xE, 0x0, 0x18, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_PAGE_ARROW_RIGHT] = { 0xE, 0x0, 0x18, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MARKING_CIRCLE] = { 0x12, 0x30, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MARKING_TRIANGLE] = { 0x13, 0x38, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MARKING_SQUARE] = { 0x14, 0x40, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MARKING_HEART] = { 0x15, 0x48, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MARKING_STAR] = { 0x16, 0x50, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_MARKING_DIAMOND] = { 0x17, 0x58, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_1] = { 0xD, 0x98, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_2] = { 0xD, 0xA0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_3] = { 0xD, 0xA8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_4] = { 0xD, 0xB0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_5] = { 0xD, 0xB8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_6] = { 0xD, 0xC0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_7] = { 0xD, 0xC8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_8] = { 0xD, 0xD0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_9] = { 0xD, 0xD8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_10] = { 0xD, 0xE0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_11] = { 0xD, 0xE8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHEEN_12] = { 0xD, 0xF0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_BUTTON_TAP_CIRCLE] = { 0xF, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONDITION_ARROW_COOL] = { 0x10, 0xD0, 0x30, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONDITION_ARROW_BEAUTY] = { 0x10, 0xE0, 0x58, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONDITION_ARROW_CUTE] = { 0x10, 0xD8, 0x78, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONDITION_ARROW_SMART] = { 0x10, 0x90, 0x78, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONDITION_ARROW_TOUGH] = { 0x10, 0x88, 0x58, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_A_BUTTON] = { 0x11, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL] = { 0x19, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY] = { 0x19, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE] = { 0x19, 0x0, 0x0, 0x0, 0x3, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART] = { 0x19, 0x0, 0x0, 0x0, 0x2, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH] = { 0x19, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_SHINY_ICON] = { 0x18, 0x62, 0x48, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_POKERUS_CURED_ICON] = { 0x18, 0x62, 0x84, 0x0, 0x1, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_1] = { 0x1A, 0x84, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_2] = { 0x1B, 0xA4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_3] = { 0x1C, 0xC4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_4] = { 0x1D, 0xE4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_5] = { 0x1E, 0x84, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_6] = { 0x1F, 0xA4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_7] = { 0x20, 0xC4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_8] = { 0x21, 0xE4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_9] = { 0x22, 0x84, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_10] = { 0x23, 0xA4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_11] = { 0x24, 0xC4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_12] = { 0x25, 0xE4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_CURSOR] = { 0x26, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_ARROW_UP] = { 0x27, 0xB4, 0x20, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_ARROW_DOWN] = { 0x27, 0xB4, 0x78, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_RIBBON_FLASH] = { 0x28, 0x8, 0x84, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONDITION_FLASH_COOL] = { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONDITION_FLASH_BEAUTY] = { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONDITION_FLASH_CUTE] = { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONDITION_FLASH_SMART] = { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_CONDITION_FLASH_TOUGH] = { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + [SUMMARY_SPRITE_POKERUS_ICON] = { 0x2A, 0x4C, 0x30, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 } }; static const u8 sBallIDToPaletteNum[] = { @@ -245,7 +245,7 @@ void PokemonSummaryScreen_InitSpriteResources(PokemonSummaryScreen *summaryScree }; sub_0200C73C(summaryScreen->renderer, &v0, &v1, 32); - sub_0200C7C0(summaryScreen->renderer, summaryScreen->gfxHandler, PSS_SPRITE_MAX); + sub_0200C7C0(summaryScreen->renderer, summaryScreen->gfxHandler, SUMMARY_SPRITE_MAX); UnkStruct_ov7_0224F2EC v2 = { "data/pst_chr.resdat", @@ -268,48 +268,48 @@ void PokemonSummaryScreen_FreeSpriteResources(PokemonSummaryScreen *summaryScree void PokemonSummaryScreen_UpdateArrowAndTapAnims(PokemonSummaryScreen *summaryScreen) { - CellActor_UpdateAnim(summaryScreen->sprites[PSS_SPRITE_PAGE_ARROW_LEFT], FX32_ONE); - CellActor_UpdateAnim(summaryScreen->sprites[PSS_SPRITE_PAGE_ARROW_RIGHT], FX32_ONE); - CellActor_UpdateAnim(summaryScreen->sprites[PSS_SPRITE_BUTTON_TAP_CIRCLE], FX32_ONE); - CellActor_UpdateAnim(summaryScreen->sprites[PSS_SPRITE_RIBBON_ARROW_UP], FX32_ONE); - CellActor_UpdateAnim(summaryScreen->sprites[PSS_SPRITE_RIBBON_ARROW_DOWN], FX32_ONE); + CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_LEFT], FX32_ONE); + CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_RIGHT], FX32_ONE); + CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], FX32_ONE); + CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_UP], FX32_ONE); + CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_DOWN], FX32_ONE); } void PokemonSummaryScreen_SetDefaultSpriteStates(PokemonSummaryScreen *summaryScreen) { - for (u16 i = 0; i < PSS_SPRITE_MAX; i++) { + for (u16 i = 0; i < SUMMARY_SPRITE_MAX; i++) { summaryScreen->sprites[i] = sub_0200CA08(summaryScreen->renderer, summaryScreen->gfxHandler, &Unk_020F41A8[i]); } SetMonAndTypeIcons(summaryScreen); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_1], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_2], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_BUTTON_TAP_CIRCLE], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONDITION_ARROW_COOL], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONDITION_ARROW_BEAUTY], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONDITION_ARROW_CUTE], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONDITION_ARROW_SMART], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONDITION_ARROW_TOUGH], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_A_BUTTON], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_COOL], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_BEAUTY], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_CUTE], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_SMART], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_TOUGH], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONDITION_FLASH_COOL], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONDITION_FLASH_BEAUTY], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONDITION_FLASH_CUTE], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONDITION_FLASH_SMART], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONDITION_FLASH_TOUGH], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_POKERUS_ICON], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_COOL], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_BEAUTY], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_CUTE], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_SMART], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_TOUGH], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_COOL], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_BEAUTY], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_CUTE], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_SMART], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_TOUGH], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], FALSE); } static u8 CalcPageTabsBaseXPos(PokemonSummaryScreen *summaryScreen) { u8 page, visiblePageCount = 0; - for (page = 0; page < PSS_PAGE_MAX; page++) { + for (page = 0; page < SUMMARY_PAGE_MAX; page++) { if (PokemonSummaryScreen_PageIsVisble(summaryScreen, page) != FALSE) { visiblePageCount++; } @@ -328,7 +328,7 @@ void PokemonSummaryScreen_UpdatePageTabSprites(PokemonSummaryScreen *summaryScre CellActor **sprites = &summaryScreen->sprites[0]; u8 visiblePageCount = 0; - for (page = 0; page < PSS_PAGE_MAX; page++) { + for (page = 0; page < SUMMARY_PAGE_MAX; page++) { if (PokemonSummaryScreen_PageIsVisble(summaryScreen, page) == FALSE) { CellActor_SetDrawFlag(sprites[page], FALSE); continue; @@ -369,8 +369,8 @@ void PokemonSummaryScreen_SetPageArrowsPos(PokemonSummaryScreen *summaryScreen) u8 baseXPos = CalcPageTabsBaseXPos(summaryScreen); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_PAGE_ARROW_LEFT], baseXPos + PAGE_ARROW_LEFT_X, PAGE_ARROW_Y); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_PAGE_ARROW_RIGHT], CENTERED_TAB_POS_X + (CENTERED_TAB_POS_X - baseXPos) + PAGE_ARROW_RIGHT_X, PAGE_ARROW_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_LEFT], baseXPos + PAGE_ARROW_LEFT_X, PAGE_ARROW_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_RIGHT], CENTERED_TAB_POS_X + (CENTERED_TAB_POS_X - baseXPos) + PAGE_ARROW_RIGHT_X, PAGE_ARROW_Y); } void PokemonSummaryScreen_UpdatePageArrows(PokemonSummaryScreen *summaryScreen, BOOL showArrows) @@ -379,8 +379,8 @@ void PokemonSummaryScreen_UpdatePageArrows(PokemonSummaryScreen *summaryScreen, showArrows = FALSE; } - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_PAGE_ARROW_LEFT], showArrows); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_PAGE_ARROW_RIGHT], showArrows); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_LEFT], showArrows); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_RIGHT], showArrows); } void PokemonSummaryScreen_SetCaughtBallGfx(PokemonSummaryScreen *summaryScreen) @@ -400,15 +400,15 @@ void PokemonSummaryScreen_SetCaughtBallGfx(PokemonSummaryScreen *summaryScreen) void PokemonSummaryScreen_UpdateStatusIcon(PokemonSummaryScreen *summaryScreen) { if (summaryScreen->monData.status == 7) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_STATUS_ICON], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_POKERUS_ICON], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], FALSE); } else if (summaryScreen->monData.status != 0) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_POKERUS_ICON], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_STATUS_ICON], TRUE); - CellActor_SetAnim(summaryScreen->sprites[PSS_SPRITE_STATUS_ICON], summaryScreen->monData.status); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], TRUE); + CellActor_SetAnim(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], summaryScreen->monData.status); } else { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_POKERUS_ICON], TRUE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_STATUS_ICON], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], FALSE); } } @@ -421,7 +421,7 @@ static void SetMonAndTypeIcons(PokemonSummaryScreen *summaryScreen) continue; } - SetTypeIcon(summaryScreen, PSS_MOVE_TYPE_ICON_SPRITE_START + i, 5 + i, MoveTable_LoadParam(summaryScreen->monData.moves[i], MOVEATTRIBUTE_TYPE)); + SetTypeIcon(summaryScreen, SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i, 5 + i, MoveTable_LoadParam(summaryScreen->monData.moves[i], MOVEATTRIBUTE_TYPE)); } PokemonSummaryScreen_SetMonIcon(summaryScreen); @@ -430,71 +430,71 @@ static void SetMonAndTypeIcons(PokemonSummaryScreen *summaryScreen) void PokemonSummaryScreen_UpdateTypeIcons(PokemonSummaryScreen *summaryScreen) { u16 i; - for (i = PSS_SPRITE_MON_TYPE_ICON_1; i <= PSS_SPRITE_MON_ICON; i++) { + for (i = SUMMARY_SPRITE_MON_TYPE_ICON_1; i <= SUMMARY_SPRITE_MON_ICON; i++) { SpriteActor_DrawSprite(summaryScreen->sprites[i], FALSE); } switch (summaryScreen->page) { - case PSS_PAGE_INFO: - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_1], TRUE); + case SUMMARY_PAGE_INFO: + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE); if (summaryScreen->monData.type1 == summaryScreen->monData.type2) { - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_1], INFO_SOLO_MON_TYPE_ICON_X, INFO_MON_TYPE_ICON_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], INFO_SOLO_MON_TYPE_ICON_X, INFO_MON_TYPE_ICON_Y); } else { - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_1], INFO_MON_TYPE_ICON_1_X, INFO_MON_TYPE_ICON_Y); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_2], TRUE); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_2], INFO_MON_TYPE_ICON_2_X, INFO_MON_TYPE_ICON_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], INFO_MON_TYPE_ICON_1_X, INFO_MON_TYPE_ICON_Y); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], INFO_MON_TYPE_ICON_2_X, INFO_MON_TYPE_ICON_Y); } break; - case PSS_PAGE_BATTLE_MOVES: + case SUMMARY_PAGE_BATTLE_MOVES: for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (summaryScreen->monData.moves[i] == MOVE_NONE) { continue; } - SetTypeIcon(summaryScreen, PSS_MOVE_TYPE_ICON_SPRITE_START + i, 5 + i, MoveTable_LoadParam(summaryScreen->monData.moves[i], MOVEATTRIBUTE_TYPE)); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_MOVE_TYPE_ICON_SPRITE_START + i], TRUE); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_MOVE_TYPE_ICON_SPRITE_START + i], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + i * PIXELS_BETWEEN_MOVES); + SetTypeIcon(summaryScreen, SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i, 5 + i, MoveTable_LoadParam(summaryScreen->monData.moves[i], MOVEATTRIBUTE_TYPE)); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], TRUE); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + i * PIXELS_BETWEEN_MOVES); } if (summaryScreen->data->move != MOVE_NONE) { - SetTypeIcon(summaryScreen, PSS_SPRITE_MOVE_TYPE_ICON_5, 5 + 4, MoveTable_LoadParam(summaryScreen->data->move, MOVEATTRIBUTE_TYPE)); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MOVE_TYPE_ICON_5], TRUE); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MOVE_TYPE_ICON_5], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + LEARNED_MOVES_MAX * PIXELS_BETWEEN_MOVES); + SetTypeIcon(summaryScreen, SUMMARY_SPRITE_MOVE_TYPE_ICON_5, 5 + 4, MoveTable_LoadParam(summaryScreen->data->move, MOVEATTRIBUTE_TYPE)); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_TYPE_ICON_5], TRUE); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_TYPE_ICON_5], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + LEARNED_MOVES_MAX * PIXELS_BETWEEN_MOVES); } - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_1], MOVES_MON_TYPE_ICON_1_X, MOVES_MON_TYPE_ICON_Y); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_2], MOVES_MON_TYPE_ICON_2_X, MOVES_MON_TYPE_ICON_Y); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MOVE_CATEGORY_ICON], MOVE_CATEGORY_ICON_X, MOVE_CATEGORY_ICON_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], MOVES_MON_TYPE_ICON_1_X, MOVES_MON_TYPE_ICON_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], MOVES_MON_TYPE_ICON_2_X, MOVES_MON_TYPE_ICON_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], MOVE_CATEGORY_ICON_X, MOVE_CATEGORY_ICON_Y); break; - case PSS_PAGE_CONTEST_MOVES: + case SUMMARY_PAGE_CONTEST_MOVES: for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (summaryScreen->monData.moves[i] == MOVE_NONE) { continue; } - SetTypeIcon(summaryScreen, PSS_MOVE_TYPE_ICON_SPRITE_START + i, 5 + i, MoveTable_LoadParam(summaryScreen->monData.moves[i], MOVEATTRIBUTE_CONTEST_TYPE) + 18); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_MOVE_TYPE_ICON_SPRITE_START + i], 1); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_MOVE_TYPE_ICON_SPRITE_START + i], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + i * PIXELS_BETWEEN_MOVES); + SetTypeIcon(summaryScreen, SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i, 5 + i, MoveTable_LoadParam(summaryScreen->monData.moves[i], MOVEATTRIBUTE_CONTEST_TYPE) + 18); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], 1); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + i * PIXELS_BETWEEN_MOVES); } if (summaryScreen->data->move != MOVE_NONE) { - SetTypeIcon(summaryScreen, PSS_SPRITE_MOVE_TYPE_ICON_5, 5 + 4, MoveTable_LoadParam(summaryScreen->data->move, MOVEATTRIBUTE_CONTEST_TYPE) + 18); - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MOVE_TYPE_ICON_5], 1); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MOVE_TYPE_ICON_5], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + LEARNED_MOVES_MAX * PIXELS_BETWEEN_MOVES); + SetTypeIcon(summaryScreen, SUMMARY_SPRITE_MOVE_TYPE_ICON_5, 5 + 4, MoveTable_LoadParam(summaryScreen->data->move, MOVEATTRIBUTE_CONTEST_TYPE) + 18); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_TYPE_ICON_5], 1); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_TYPE_ICON_5], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + LEARNED_MOVES_MAX * PIXELS_BETWEEN_MOVES); } - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_1], MOVES_MON_TYPE_ICON_1_X, MOVES_MON_TYPE_ICON_Y); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MON_TYPE_ICON_2], MOVES_MON_TYPE_ICON_2_X, MOVES_MON_TYPE_ICON_Y); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MOVE_CATEGORY_ICON], MOVE_CATEGORY_ICON_X, MOVE_CATEGORY_ICON_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], MOVES_MON_TYPE_ICON_1_X, MOVES_MON_TYPE_ICON_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], MOVES_MON_TYPE_ICON_2_X, MOVES_MON_TYPE_ICON_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], MOVE_CATEGORY_ICON_X, MOVE_CATEGORY_ICON_Y); break; } } void PokemonSummaryScreen_SetMonTypeIcons(PokemonSummaryScreen *summaryScreen) { - SetTypeIcon(summaryScreen, PSS_SPRITE_MON_TYPE_ICON_1, 3, summaryScreen->monData.type1); - SetTypeIcon(summaryScreen, PSS_SPRITE_MON_TYPE_ICON_2, 4, summaryScreen->monData.type2); + SetTypeIcon(summaryScreen, SUMMARY_SPRITE_MON_TYPE_ICON_1, 3, summaryScreen->monData.type1); + SetTypeIcon(summaryScreen, SUMMARY_SPRITE_MON_TYPE_ICON_2, 4, summaryScreen->monData.type2); } static void SetTypeIcon(PokemonSummaryScreen *summaryScreen, u8 spriteIndex, u8 param2, u8 type) @@ -508,7 +508,7 @@ static void GetMoveTypeIconPos(PokemonSummaryScreen *summaryScreen, u8 *moveInde s16 newYPos = MOVE_TYPE_ICON_BASE_Y + *moveIndex * PIXELS_BETWEEN_MOVES; for (s16 i = 0; i < LEARNED_MOVES_MAX; i++) { - sub_0200D50C(summaryScreen->sprites[PSS_MOVE_TYPE_ICON_SPRITE_START + i], outX, outY); + sub_0200D50C(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], outX, outY); if (newYPos == *outY) { *moveIndex = i; @@ -524,8 +524,8 @@ void PokemonSummaryScreen_SwapMoveTypeIcons(PokemonSummaryScreen *summaryScreen, GetMoveTypeIconPos(summaryScreen, &moveIndex1, &xPos1, &yPos1); GetMoveTypeIconPos(summaryScreen, &moveIndex2, &xPos2, &yPos2); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_MOVE_TYPE_ICON_SPRITE_START + moveIndex1], xPos2, yPos2); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_MOVE_TYPE_ICON_SPRITE_START + moveIndex2], xPos1, yPos1); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + moveIndex1], xPos2, yPos2); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + moveIndex2], xPos1, yPos1); } void PokemonSummaryScreen_UpdateMoveCategoryIcon(PokemonSummaryScreen *summaryScreen, u32 move) @@ -533,20 +533,20 @@ void PokemonSummaryScreen_UpdateMoveCategoryIcon(PokemonSummaryScreen *summarySc u32 category = MoveTable_LoadParam(move, MOVEATTRIBUTE_CLASS); sub_0200D948(summaryScreen->renderer, summaryScreen->gfxHandler, sub_0207CAC0(), sub_0207CA90(category), 1, 10); - sub_0200D414(summaryScreen->sprites[PSS_SPRITE_MOVE_CATEGORY_ICON], sub_0207CAA8(category) + 3); + sub_0200D414(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], sub_0207CAA8(category) + 3); } void PokemonSummaryScreen_UpdateMoveSelectorPos(PokemonSummaryScreen *summaryScreen) { - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_1], MOVE_SELECTOR_X, MOVE_SELECTOR_BASE_Y + summaryScreen->cursor * PIXELS_BETWEEN_MOVES); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], MOVE_SELECTOR_X, MOVE_SELECTOR_BASE_Y + summaryScreen->cursor * PIXELS_BETWEEN_MOVES); } void PokemonSummaryScreen_SetMoveSelector2Pos(PokemonSummaryScreen *summaryScreen) { s16 x, y; - sub_0200D50C(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_1], &x, &y); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_2], x, y); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_MOVE_SELECTOR_2], TRUE); + sub_0200D50C(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], &x, &y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], x, y); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], TRUE); } void PokemonSummaryScreen_InitSheenSprites(PokemonSummaryScreen *summaryScreen) @@ -563,7 +563,7 @@ void PokemonSummaryScreen_InitSheenSprites(PokemonSummaryScreen *summaryScreen) summaryScreen->sheenMax = (((MAX_SHEEN_SPRITES << 8) / MAX_POKEMON_SHEEN) * summaryScreen->monData.sheen) >> 8; } - for (u32 spriteIndex = PSS_SHEEN_SPRITES_START; spriteIndex <= PSS_SHEEN_SPRITES_END; spriteIndex++) { + for (u32 spriteIndex = SUMMARY_SHEEN_SPRITES_START; spriteIndex <= SUMMARY_SHEEN_SPRITES_END; spriteIndex++) { CellActor_SetDrawFlag(summaryScreen->sprites[spriteIndex], FALSE); SpriteActor_SetAnimFrame(summaryScreen->sprites[spriteIndex], 0); } @@ -571,7 +571,7 @@ void PokemonSummaryScreen_InitSheenSprites(PokemonSummaryScreen *summaryScreen) void PokemonSummaryScreen_DrawSheenSprites(PokemonSummaryScreen *summaryScreen) { - if (summaryScreen->page != PSS_PAGE_CONDITION) { + if (summaryScreen->page != SUMMARY_PAGE_CONDITION) { return; } @@ -593,9 +593,9 @@ void PokemonSummaryScreen_DrawSheenSprites(PokemonSummaryScreen *summaryScreen) break; case 1: if (summaryScreen->sheenCount == 0) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SHEEN_SPRITES_START + summaryScreen->sheenPos], TRUE); - SpriteActor_SetAnimFrame(summaryScreen->sprites[PSS_SHEEN_SPRITES_START + summaryScreen->sheenPos], FALSE); - CellActor_SetAnim(summaryScreen->sprites[PSS_SHEEN_SPRITES_START + summaryScreen->sheenPos], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenPos], TRUE); + SpriteActor_SetAnimFrame(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenPos], FALSE); + CellActor_SetAnim(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenPos], FALSE); summaryScreen->sheenPos++; @@ -608,7 +608,7 @@ void PokemonSummaryScreen_DrawSheenSprites(PokemonSummaryScreen *summaryScreen) summaryScreen->sheenCount = (summaryScreen->sheenCount + 1) % 10; break; case 2: - if (CellActor_GetDrawFlag(summaryScreen->sprites[PSS_SHEEN_SPRITES_START + summaryScreen->sheenMax - 1]) == FALSE) { + if (CellActor_GetDrawFlag(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenMax - 1]) == FALSE) { summaryScreen->sheenCount = 0; summaryScreen->sheenState = 3; break; @@ -618,7 +618,7 @@ void PokemonSummaryScreen_DrawSheenSprites(PokemonSummaryScreen *summaryScreen) summaryScreen->sheenCount++; if (summaryScreen->sheenCount == 32) { - for (i = PSS_SHEEN_SPRITES_START; i < PSS_SHEEN_SPRITES_START + summaryScreen->sheenMax; i++) { + for (i = SUMMARY_SHEEN_SPRITES_START; i < SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenMax; i++) { CellActor_SetDrawFlag(summaryScreen->sprites[i], TRUE); SpriteActor_SetAnimFrame(summaryScreen->sprites[i], FALSE); CellActor_SetAnim(summaryScreen->sprites[i], FALSE); @@ -639,7 +639,7 @@ void PokemonSummaryScreen_DrawSheenSprites(PokemonSummaryScreen *summaryScreen) break; } - for (i = PSS_SHEEN_SPRITES_START; i < PSS_SHEEN_SPRITES_START + summaryScreen->sheenMax; i++) { + for (i = SUMMARY_SHEEN_SPRITES_START; i < SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenMax; i++) { if (CellActor_GetDrawFlag(summaryScreen->sprites[i]) == FALSE) { continue; } @@ -656,45 +656,45 @@ void PokemonSummaryScreen_UpdateMiscMonDataSprites(PokemonSummaryScreen *summary { for (u32 marking = 0; marking < MAX_POKEMON_MARKINGS; marking++) { if (summaryScreen->monData.markings & (1 << marking)) { - CellActor_SetAnim(summaryScreen->sprites[PSS_MARKING_SPRITES_START + marking], TRUE); + CellActor_SetAnim(summaryScreen->sprites[SUMMARY_MARKING_SPRITES_START + marking], TRUE); } else { - CellActor_SetAnim(summaryScreen->sprites[PSS_MARKING_SPRITES_START + marking], FALSE); + CellActor_SetAnim(summaryScreen->sprites[SUMMARY_MARKING_SPRITES_START + marking], FALSE); } } if (summaryScreen->monData.isShiny == TRUE && summaryScreen->monData.isEgg == FALSE) { - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_SHINY_ICON], TRUE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_SHINY_ICON], TRUE); } else { - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_SHINY_ICON], FALSE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_SHINY_ICON], FALSE); } - if (summaryScreen->monData.pokerus == PSS_POKERUS_CURED) { - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_POKERUS_CURED_ICON], TRUE); + if (summaryScreen->monData.pokerus == SUMMARY_POKERUS_CURED) { + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_CURED_ICON], TRUE); } else { - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_POKERUS_CURED_ICON], FALSE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_CURED_ICON], FALSE); } } void PokemonSummaryScreen_ButtonTapAnim(PokemonSummaryScreen *summaryScreen) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_BUTTON_TAP_CIRCLE], TRUE); - SpriteActor_SetAnimFrame(summaryScreen->sprites[PSS_SPRITE_BUTTON_TAP_CIRCLE], 0); - CellActor_SetAnim(summaryScreen->sprites[PSS_SPRITE_BUTTON_TAP_CIRCLE], 0); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], TRUE); + SpriteActor_SetAnimFrame(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], 0); + CellActor_SetAnim(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], 0); s16 x, y; PokemonSummaryScreen_CalcSubscreenButtonTapAnimPos(summaryScreen, &x, &y); - if (summaryScreen->subscreenType == PSS_SUBSCREEN_TYPE_NORMAL) { - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_BUTTON_TAP_CIRCLE], x, y + 192); + if (summaryScreen->subscreenType == SUMMARY_SUBSCREEN_TYPE_NORMAL) { + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], x, y + 192); } else { - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_BUTTON_TAP_CIRCLE], x - 4, y + 192); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], x - 4, y + 192); } } void PokemonSummaryScreen_HideButtonTapCircle(PokemonSummaryScreen *summaryScreen) { - if (CellActor_GetAnimFrame(summaryScreen->sprites[PSS_SPRITE_BUTTON_TAP_CIRCLE]) == 2) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_BUTTON_TAP_CIRCLE], FALSE); + if (CellActor_GetAnimFrame(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE]) == 2) { + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], FALSE); } } @@ -702,7 +702,7 @@ void PokemonSummaryScreen_UpdateConditionArrowSprites(PokemonSummaryScreen *summ { for (u8 i = 0; i < MAX_CONDITION_ARROW_SPRITES; i++) { if (summaryScreen->pageState & (1 << i)) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_CONDITION_ARROW_SPRITES_START + i], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_CONDITION_ARROW_SPRITES_START + i], TRUE); } } } @@ -710,12 +710,12 @@ void PokemonSummaryScreen_UpdateConditionArrowSprites(PokemonSummaryScreen *summ void PokemonSummaryScreen_UpdateAButtonSprite(PokemonSummaryScreen *summaryScreen, Window *window) { if (window == NULL) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_A_BUTTON], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], FALSE); return; } - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_A_BUTTON], Window_GetXPos(window) * 8 - 10, 8); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_A_BUTTON], TRUE); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], Window_GetXPos(window) * 8 - 10, 8); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], TRUE); } void PokemonSummaryScreen_SetMonIcon(PokemonSummaryScreen *summaryScreen) @@ -723,28 +723,28 @@ void PokemonSummaryScreen_SetMonIcon(PokemonSummaryScreen *summaryScreen) void *monData = PokemonSummaryScreen_MonData(summaryScreen); u32 iconIndex; - if (summaryScreen->data->dataType == PSS_DATA_BOX_MON) { + if (summaryScreen->data->dataType == SUMMARY_DATA_BOX_MON) { iconIndex = BoxPokemon_IconSpriteIndex(monData); } else { iconIndex = Pokemon_IconSpriteIndex(monData); } sub_0200D948(summaryScreen->renderer, summaryScreen->gfxHandler, NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, iconIndex, 0, 11); - sub_0200D414(summaryScreen->sprites[PSS_SPRITE_MON_ICON], PokeIconPaletteIndex(summaryScreen->monData.species, summaryScreen->monData.form, summaryScreen->monData.isEgg) + 7); - CellActor_SetFlipMode(summaryScreen->sprites[PSS_SPRITE_MON_ICON], (PokemonPersonalData_GetFormValue(summaryScreen->monData.species, summaryScreen->monData.form, 28) ^ 1)); + sub_0200D414(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], PokeIconPaletteIndex(summaryScreen->monData.species, summaryScreen->monData.form, summaryScreen->monData.isEgg) + 7); + CellActor_SetFlipMode(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], (PokemonPersonalData_GetFormValue(summaryScreen->monData.species, summaryScreen->monData.form, 28) ^ 1)); } void PokemonSummaryScreen_ShowMonIcon(PokemonSummaryScreen *summaryScreen) { sub_0200D97C(summaryScreen->renderer, summaryScreen->gfxHandler, NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, PokeIconPalettesFileIndex(), FALSE, 5); - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MON_ICON], 24, 48); + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], 24, 48); } else { - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_MON_ICON], 32, 68); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], 32, 68); } - SpriteActor_DrawSprite(summaryScreen->sprites[PSS_SPRITE_MON_ICON], TRUE); + SpriteActor_DrawSprite(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], TRUE); } static s16 CalcContestStatDotPos(u32 statValue, s16 max, s16 min) @@ -768,42 +768,42 @@ static s16 CalcContestStatDotPos(u32 statValue, s16 max, s16 min) void PokemonSummaryScreen_DrawContestStatDots(PokemonSummaryScreen *summaryScreen) { - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_COOL], CalcContestStatDotPos(summaryScreen->monData.cool, COOL_MAX_X, COOL_MIN_X), CalcContestStatDotPos(summaryScreen->monData.cool, COOL_MAX_Y, COOL_MIN_Y)); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_BEAUTY], CalcContestStatDotPos(summaryScreen->monData.beauty, BEAUTY_MAX_X, BEAUTY_MIN_X), CalcContestStatDotPos(summaryScreen->monData.beauty, BEAUTY_MAX_Y, BEAUTY_MIN_Y)); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_CUTE], CalcContestStatDotPos(summaryScreen->monData.cute, CUTE_MAX_X, CUTE_MIN_X), CalcContestStatDotPos(summaryScreen->monData.cute, CUTE_MAX_Y, CUTE_MIN_Y)); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_SMART], CalcContestStatDotPos(summaryScreen->monData.smart, SMART_MAX_X, SMART_MIN_X), CalcContestStatDotPos(summaryScreen->monData.smart, SMART_MAX_Y, SMART_MIN_Y)); - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_TOUGH], CalcContestStatDotPos(summaryScreen->monData.tough, TOUGH_MAX_X, TOUGH_MIN_X), CalcContestStatDotPos(summaryScreen->monData.tough, TOUGH_MAX_Y, TOUGH_MIN_Y)); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL], CalcContestStatDotPos(summaryScreen->monData.cool, COOL_MAX_X, COOL_MIN_X), CalcContestStatDotPos(summaryScreen->monData.cool, COOL_MAX_Y, COOL_MIN_Y)); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY], CalcContestStatDotPos(summaryScreen->monData.beauty, BEAUTY_MAX_X, BEAUTY_MIN_X), CalcContestStatDotPos(summaryScreen->monData.beauty, BEAUTY_MAX_Y, BEAUTY_MIN_Y)); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE], CalcContestStatDotPos(summaryScreen->monData.cute, CUTE_MAX_X, CUTE_MIN_X), CalcContestStatDotPos(summaryScreen->monData.cute, CUTE_MAX_Y, CUTE_MIN_Y)); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], CalcContestStatDotPos(summaryScreen->monData.smart, SMART_MAX_X, SMART_MIN_X), CalcContestStatDotPos(summaryScreen->monData.smart, SMART_MAX_Y, SMART_MIN_Y)); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], CalcContestStatDotPos(summaryScreen->monData.tough, TOUGH_MAX_X, TOUGH_MIN_X), CalcContestStatDotPos(summaryScreen->monData.tough, TOUGH_MAX_Y, TOUGH_MIN_Y)); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_COOL], TRUE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_BEAUTY], TRUE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_CUTE], TRUE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_SMART], TRUE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_TOUGH], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], TRUE); } void PokemonSummaryScreen_HideContestStatDots(PokemonSummaryScreen *summaryScreen) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_COOL], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_BEAUTY], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_CUTE], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_SMART], FALSE); - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_SPRITE_CONTEST_STAT_DOT_TOUGH], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], FALSE); } static void SetRibbonSpriteGfx(PokemonSummaryScreen *summaryScreen, u8 ribbonNum, u8 ribbonIndex) { sub_0200D948(summaryScreen->renderer, summaryScreen->gfxHandler, NARC_INDEX_GRAPHIC__PL_PST_GRA, Ribbon_GetData(ribbonNum, RIBBON_DATA_SPRITE_ID), 0, 26 + ribbonIndex); - sub_0200D414(summaryScreen->sprites[PSS_SPRITE_RIBBON_1 + ribbonIndex], Ribbon_GetData(ribbonNum, RIBBON_DATA_PALETTE_NUM) + 7); + sub_0200D414(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_1 + ribbonIndex], Ribbon_GetData(ribbonNum, RIBBON_DATA_PALETTE_NUM) + 7); } void PokemonSummaryScreen_UpdateRibbonSprites(PokemonSummaryScreen *summaryScreen) { u16 i; - for (i = PSS_RIBBON_SPRITES_START; i <= PSS_SPRITE_RIBBON_FLASH; i++) { + for (i = SUMMARY_RIBBON_SPRITES_START; i <= SUMMARY_SPRITE_RIBBON_FLASH; i++) { CellActor_SetDrawFlag(summaryScreen->sprites[i], FALSE); } - if (summaryScreen->page != PSS_PAGE_RIBBONS) { + if (summaryScreen->page != SUMMARY_PAGE_RIBBONS) { return; } @@ -811,51 +811,51 @@ void PokemonSummaryScreen_UpdateRibbonSprites(PokemonSummaryScreen *summaryScree for (i = 0; i < RIBBONS_PER_PAGE; i++) { if (i < summaryScreen->ribbonMax) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_RIBBON_SPRITES_START + i], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_RIBBON_SPRITES_START + i], TRUE); SetRibbonSpriteGfx(summaryScreen, PokemonSummaryScreen_RibbonNumAt(summaryScreen, i), i); } } - CellActor_SetAnim(summaryScreen->sprites[PSS_SPRITE_RIBBON_FLASH], 0); + CellActor_SetAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH], 0); } void PokemonSummaryScreen_UpdateShownRibbonRows(PokemonSummaryScreen *summaryScreen) { for (u16 i = 0; i < RIBBONS_PER_ROW * 2; i++) { if ((summaryScreen->ribbonRow * RIBBONS_PER_ROW + i) < summaryScreen->ribbonMax) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_RIBBON_SPRITES_START + i], TRUE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_RIBBON_SPRITES_START + i], TRUE); SetRibbonSpriteGfx(summaryScreen, PokemonSummaryScreen_RibbonNumAt(summaryScreen, i), i); } else { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_RIBBON_SPRITES_START + i], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_RIBBON_SPRITES_START + i], FALSE); } } } void PokemonSummaryScreen_UpdateRibbonCursorPos(PokemonSummaryScreen *summaryScreen) { - SpriteActor_SetPositionXY(summaryScreen->sprites[PSS_SPRITE_RIBBON_CURSOR], RIBBON_CURSOR_BASE_X + (summaryScreen->ribbonCol & (RIBBONS_PER_ROW - 1)) * RIBBON_SPACING_X, RIBBON_CURSOR_BASE_Y + (summaryScreen->ribbonCol / RIBBONS_PER_ROW) * RIBBON_SPACING_Y); + SpriteActor_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_CURSOR], RIBBON_CURSOR_BASE_X + (summaryScreen->ribbonCol & (RIBBONS_PER_ROW - 1)) * RIBBON_SPACING_X, RIBBON_CURSOR_BASE_Y + (summaryScreen->ribbonCol / RIBBONS_PER_ROW) * RIBBON_SPACING_Y); } void PokemonSummaryScreen_UpdateRibbonFlashAnim(PokemonSummaryScreen *summaryScreen) { - if (CellActor_GetDrawFlag(summaryScreen->sprites[PSS_SPRITE_RIBBON_FLASH]) == TRUE) { - CellActor_UpdateAnim(summaryScreen->sprites[PSS_SPRITE_RIBBON_FLASH], FX32_ONE); + if (CellActor_GetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH]) == TRUE) { + CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH], FX32_ONE); } } static const s16 sConditionFlashCoordBounds[][FLASH_BOUNDS_MAX] = { - [PSS_CONTEST_TYPE_COOL] = { 180, 57, 180, 90 }, - [PSS_CONTEST_TYPE_BEAUTY] = { 213, 85, 184, 93 }, - [PSS_CONTEST_TYPE_CUTE] = { 200, 125, 182, 97 }, - [PSS_CONTEST_TYPE_SMART] = { 159, 125, 178, 97 }, - [PSS_CONTEST_TYPE_TOUGH] = { 146, 85, 176, 93 } + [SUMMARY_CONTEST_TYPE_COOL] = { 180, 57, 180, 90 }, + [SUMMARY_CONTEST_TYPE_BEAUTY] = { 213, 85, 184, 93 }, + [SUMMARY_CONTEST_TYPE_CUTE] = { 200, 125, 182, 97 }, + [SUMMARY_CONTEST_TYPE_SMART] = { 159, 125, 178, 97 }, + [SUMMARY_CONTEST_TYPE_TOUGH] = { 146, 85, 176, 93 } }; void PokemonSummaryScreen_UpdateConditionFlashSprites(PokemonSummaryScreen *summaryScreen, BOOL showFlashes) { if (showFlashes == FALSE) { for (u16 i = 0; i < MAX_CONDITION_FLASH_SPRITES; i++) { - CellActor_SetDrawFlag(summaryScreen->sprites[PSS_CONDITION_FLASH_SPRITES_START + i], FALSE); + CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_CONDITION_FLASH_SPRITES_START + i], FALSE); } } else { u16 highestValue = summaryScreen->monData.cool; @@ -876,11 +876,11 @@ void PokemonSummaryScreen_UpdateConditionFlashSprites(PokemonSummaryScreen *summ highestValue = summaryScreen->monData.tough; } - DrawConditionFlash(summaryScreen->sprites[PSS_SPRITE_CONDITION_FLASH_COOL], summaryScreen->monData.cool, highestValue, sConditionFlashCoordBounds[PSS_CONTEST_TYPE_COOL]); - DrawConditionFlash(summaryScreen->sprites[PSS_SPRITE_CONDITION_FLASH_BEAUTY], summaryScreen->monData.beauty, highestValue, sConditionFlashCoordBounds[PSS_CONTEST_TYPE_BEAUTY]); - DrawConditionFlash(summaryScreen->sprites[PSS_SPRITE_CONDITION_FLASH_CUTE], summaryScreen->monData.cute, highestValue, sConditionFlashCoordBounds[PSS_CONTEST_TYPE_CUTE]); - DrawConditionFlash(summaryScreen->sprites[PSS_SPRITE_CONDITION_FLASH_SMART], summaryScreen->monData.smart, highestValue, sConditionFlashCoordBounds[PSS_CONTEST_TYPE_SMART]); - DrawConditionFlash(summaryScreen->sprites[PSS_SPRITE_CONDITION_FLASH_TOUGH], summaryScreen->monData.tough, highestValue, sConditionFlashCoordBounds[PSS_CONTEST_TYPE_TOUGH]); + DrawConditionFlash(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_COOL], summaryScreen->monData.cool, highestValue, sConditionFlashCoordBounds[SUMMARY_CONTEST_TYPE_COOL]); + DrawConditionFlash(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_BEAUTY], summaryScreen->monData.beauty, highestValue, sConditionFlashCoordBounds[SUMMARY_CONTEST_TYPE_BEAUTY]); + DrawConditionFlash(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_CUTE], summaryScreen->monData.cute, highestValue, sConditionFlashCoordBounds[SUMMARY_CONTEST_TYPE_CUTE]); + DrawConditionFlash(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_SMART], summaryScreen->monData.smart, highestValue, sConditionFlashCoordBounds[SUMMARY_CONTEST_TYPE_SMART]); + DrawConditionFlash(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_TOUGH], summaryScreen->monData.tough, highestValue, sConditionFlashCoordBounds[SUMMARY_CONTEST_TYPE_TOUGH]); } } @@ -915,6 +915,6 @@ static void DrawConditionFlash(CellActor *sprite, u32 statValue, u32 highestValu void PokemonSummaryScreen_UpdateConditionFlashAnim(PokemonSummaryScreen *summaryScreen) { for (u32 i = 0; i < MAX_CONDITION_FLASH_SPRITES; i++) { - CellActor_UpdateAnim(summaryScreen->sprites[PSS_CONDITION_FLASH_SPRITES_START + i], FX32_ONE); + CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_CONDITION_FLASH_SPRITES_START + i], FX32_ONE); } } diff --git a/src/applications/pokemon_summary_screen/subscreen.c b/src/applications/pokemon_summary_screen/subscreen.c index d889b1642a..e9315a5b9e 100644 --- a/src/applications/pokemon_summary_screen/subscreen.c +++ b/src/applications/pokemon_summary_screen/subscreen.c @@ -13,47 +13,47 @@ #include "touch_screen.h" #include "unk_02005474.h" -typedef struct PSSSubscreenButton { +typedef struct SummarySubscreenButton { u8 page; u8 paletteNum; u8 x; u8 y; -} PSSSubscreenButton; +} SummarySubscreenButton; static void sub_0223D0BC(PokemonSummaryScreen *summaryScreen); static int CheckSubscreenRectanglePress(PokemonSummaryScreen *summaryScreen); -static const PSSSubscreenButton sSubscreenButtons_Normal[] = { - { PSS_PAGE_INFO, 1, 1, 4 }, - { PSS_PAGE_MEMO, 1, 2, 10 }, - { PSS_PAGE_SKILLS, 2, 5, 15 }, - { PSS_PAGE_BATTLE_MOVES, 3, 10, 18 }, - { PSS_PAGE_CONDITION, 2, 17, 18 }, - { PSS_PAGE_CONTEST_MOVES, 3, 22, 15 }, - { PSS_PAGE_RIBBONS, 4, 25, 10 }, - { PSS_PAGE_EXIT, 4, 26, 4 }, - { PSS_PAGE_NONE, -1, -1, -1 } +static const SummarySubscreenButton sSubscreenButtons_Normal[] = { + { SUMMARY_PAGE_INFO, 1, 1, 4 }, + { SUMMARY_PAGE_MEMO, 1, 2, 10 }, + { SUMMARY_PAGE_SKILLS, 2, 5, 15 }, + { SUMMARY_PAGE_BATTLE_MOVES, 3, 10, 18 }, + { SUMMARY_PAGE_CONDITION, 2, 17, 18 }, + { SUMMARY_PAGE_CONTEST_MOVES, 3, 22, 15 }, + { SUMMARY_PAGE_RIBBONS, 4, 25, 10 }, + { SUMMARY_PAGE_EXIT, 4, 26, 4 }, + { SUMMARY_PAGE_NONE, -1, -1, -1 } }; -static const PSSSubscreenButton sSubscreenButtons_NoContestInfo[] = { - { PSS_PAGE_INFO, 1, 2, 9 }, - { PSS_PAGE_MEMO, 1, 6, 15 }, - { PSS_PAGE_SKILLS, 2, 14, 18 }, - { PSS_PAGE_BATTLE_MOVES, 3, 22, 15 }, - { PSS_PAGE_EXIT, 4, 26, 9 }, - { PSS_PAGE_NONE, -1, -1, -1 } +static const SummarySubscreenButton sSubscreenButtons_NoContestInfo[] = { + { SUMMARY_PAGE_INFO, 1, 2, 9 }, + { SUMMARY_PAGE_MEMO, 1, 6, 15 }, + { SUMMARY_PAGE_SKILLS, 2, 14, 18 }, + { SUMMARY_PAGE_BATTLE_MOVES, 3, 22, 15 }, + { SUMMARY_PAGE_EXIT, 4, 26, 9 }, + { SUMMARY_PAGE_NONE, -1, -1, -1 } }; -static const PSSSubscreenButton sSubscreenButtons_UnusedMovesOnly[] = { - { PSS_PAGE_BATTLE_MOVES, 3, 10, 18 }, - { PSS_PAGE_CONTEST_MOVES, 3, 17, 18 }, - { PSS_PAGE_NONE, -1, -1, -1 } +static const SummarySubscreenButton sSubscreenButtons_UnusedMovesOnly[] = { + { SUMMARY_PAGE_BATTLE_MOVES, 3, 10, 18 }, + { SUMMARY_PAGE_CONTEST_MOVES, 3, 17, 18 }, + { SUMMARY_PAGE_NONE, -1, -1, -1 } }; -static const PSSSubscreenButton *sSubscreenButtonTypes[] = { - [PSS_SUBSCREEN_TYPE_NORMAL] = sSubscreenButtons_Normal, - [PSS_SUBSCREEN_TYPE_NO_CONTEST_INFO] = sSubscreenButtons_NoContestInfo, - [PSS_SUBSCREEN_TYPE_UNUSED_MOVES_ONLY] = sSubscreenButtons_UnusedMovesOnly +static const SummarySubscreenButton *sSubscreenButtonTypes[] = { + [SUMMARY_SUBSCREEN_TYPE_NORMAL] = sSubscreenButtons_Normal, + [SUMMARY_SUBSCREEN_TYPE_NO_CONTEST_INFO] = sSubscreenButtons_NoContestInfo, + [SUMMARY_SUBSCREEN_TYPE_UNUSED_MOVES_ONLY] = sSubscreenButtons_UnusedMovesOnly }; static const TouchScreenRect sSubscreenRectangles_Normal[] = { @@ -84,33 +84,33 @@ static const TouchScreenRect sSubscreenRectangles_UnusedMovesOnly[] = { }; static const TouchScreenRect *sSubscreenRectangles[] = { - [PSS_SUBSCREEN_TYPE_NORMAL] = sSubscreenRectangles_Normal, - [PSS_SUBSCREEN_TYPE_NO_CONTEST_INFO] = sSubscreenRectangles_NoContestInfo, - [PSS_SUBSCREEN_TYPE_UNUSED_MOVES_ONLY] = sSubscreenRectangles_UnusedMovesOnly + [SUMMARY_SUBSCREEN_TYPE_NORMAL] = sSubscreenRectangles_Normal, + [SUMMARY_SUBSCREEN_TYPE_NO_CONTEST_INFO] = sSubscreenRectangles_NoContestInfo, + [SUMMARY_SUBSCREEN_TYPE_UNUSED_MOVES_ONLY] = sSubscreenRectangles_UnusedMovesOnly }; void PokemonSummaryScreen_SetSubscreenType(PokemonSummaryScreen *summaryScreen) { switch (summaryScreen->data->mode) { - case PSS_MODE_NORMAL: - case PSS_MODE_LOCK_MOVES: + case SUMMARY_MODE_NORMAL: + case SUMMARY_MODE_LOCK_MOVES: if (summaryScreen->data->showContest != FALSE) { - summaryScreen->subscreenType = PSS_SUBSCREEN_TYPE_NORMAL; + summaryScreen->subscreenType = SUMMARY_SUBSCREEN_TYPE_NORMAL; } else { - summaryScreen->subscreenType = PSS_SUBSCREEN_TYPE_NO_CONTEST_INFO; + summaryScreen->subscreenType = SUMMARY_SUBSCREEN_TYPE_NO_CONTEST_INFO; Bg_ScheduleScroll(summaryScreen->bgConfig, BG_LAYER_SUB_0, BG_OFFSET_UPDATE_SET_X, 4); } break; - case PSS_MODE_SELECT_MOVE: - case PSS_MODE_POFFIN: + case SUMMARY_MODE_SELECT_MOVE: + case SUMMARY_MODE_POFFIN: default: - summaryScreen->subscreenType = PSS_SUBSCREEN_TYPE_NO_BUTTONS; + summaryScreen->subscreenType = SUMMARY_SUBSCREEN_TYPE_NO_BUTTONS; } PokemonSummaryScreen_UpdateSubscreenButtonGfx(summaryScreen); } -static void UpdateSubscreenButtonTilemap(PokemonSummaryScreen *summaryScreen, const PSSSubscreenButton *button, u8 animID) +static void UpdateSubscreenButtonTilemap(PokemonSummaryScreen *summaryScreen, const SummarySubscreenButton *button, u8 animID) { u16 *bgSub0Tilemap = (u16 *)Bg_GetTilemapBuffer(summaryScreen->bgConfig, BG_LAYER_SUB_0); u16 baseTile = (button->page & 1) * 15 + (button->page / 2) * (30 * 5) + animID * 5 + 30; @@ -125,15 +125,15 @@ static void UpdateSubscreenButtonTilemap(PokemonSummaryScreen *summaryScreen, co void PokemonSummaryScreen_UpdateSubscreenButtonGfx(PokemonSummaryScreen *summaryScreen) { - if (summaryScreen->subscreenType == PSS_SUBSCREEN_TYPE_NO_BUTTONS) { + if (summaryScreen->subscreenType == SUMMARY_SUBSCREEN_TYPE_NO_BUTTONS) { return; } - const PSSSubscreenButton *buttonList = sSubscreenButtonTypes[summaryScreen->subscreenType]; + const SummarySubscreenButton *buttonList = sSubscreenButtonTypes[summaryScreen->subscreenType]; u8 button = 0; while (TRUE) { - if (buttonList[button].page == PSS_PAGE_NONE) { + if (buttonList[button].page == SUMMARY_PAGE_NONE) { break; } @@ -152,12 +152,12 @@ u8 PokemonSummaryScreen_CheckSubscreenButtonPress(PokemonSummaryScreen *summaryS return button; } - return PSS_SUBSCREEN_BUTTON_NONE; + return SUMMARY_SUBSCREEN_BUTTON_NONE; } static int CheckSubscreenRectanglePress(PokemonSummaryScreen *summaryScreen) { - if (summaryScreen->subscreenType == PSS_SUBSCREEN_TYPE_NO_BUTTONS) { + if (summaryScreen->subscreenType == SUMMARY_SUBSCREEN_TYPE_NO_BUTTONS) { return TOUCHSCREEN_INPUT_NONE; } @@ -168,7 +168,7 @@ static int sub_02092224(PokemonSummaryScreen *summaryScreen) { int v0; - if (summaryScreen->subscreenType == PSS_SUBSCREEN_TYPE_NO_BUTTONS) { + if (summaryScreen->subscreenType == SUMMARY_SUBSCREEN_TYPE_NO_BUTTONS) { return TOUCHSCREEN_INPUT_NONE; } @@ -187,7 +187,7 @@ static int sub_02092224(PokemonSummaryScreen *summaryScreen) u8 PokemonSummaryScreen_DrawSubscreenButtonAnim(PokemonSummaryScreen *summaryScreen) { - const PSSSubscreenButton *buttonList = sSubscreenButtonTypes[summaryScreen->subscreenType]; + const SummarySubscreenButton *buttonList = sSubscreenButtonTypes[summaryScreen->subscreenType]; switch (summaryScreen->buttonState) { case 0: @@ -214,8 +214,8 @@ u8 PokemonSummaryScreen_DrawSubscreenButtonAnim(PokemonSummaryScreen *summaryScr if (sub_02092224(summaryScreen) != summaryScreen->buttonCurrent) { if (summaryScreen->monData.isEgg != FALSE - && buttonList[summaryScreen->buttonCurrent].page != PSS_PAGE_MEMO - && buttonList[summaryScreen->buttonCurrent].page != PSS_PAGE_EXIT) { + && buttonList[summaryScreen->buttonCurrent].page != SUMMARY_PAGE_MEMO + && buttonList[summaryScreen->buttonCurrent].page != SUMMARY_PAGE_EXIT) { UpdateSubscreenButtonTilemap(summaryScreen, &buttonList[summaryScreen->buttonCurrent], 0); } else { UpdateSubscreenButtonTilemap(summaryScreen, &buttonList[summaryScreen->buttonCurrent], 1); @@ -231,7 +231,7 @@ u8 PokemonSummaryScreen_DrawSubscreenButtonAnim(PokemonSummaryScreen *summaryScr void PokemonSummaryScreen_CalcSubscreenButtonTapAnimPos(PokemonSummaryScreen *summaryScreen, s16 *outX, s16 *outY) { - const PSSSubscreenButton *buttonList = sSubscreenButtonTypes[summaryScreen->subscreenType]; + const SummarySubscreenButton *buttonList = sSubscreenButtonTypes[summaryScreen->subscreenType]; *outX = buttonList[summaryScreen->buttonCurrent].x * 8 + (5 * 8) / 2; *outY = buttonList[summaryScreen->buttonCurrent].y * 8 + (5 * 8) / 2; @@ -239,6 +239,6 @@ void PokemonSummaryScreen_CalcSubscreenButtonTapAnimPos(PokemonSummaryScreen *su u8 PokemonSummaryScreen_GetSubscreenButtonPage(PokemonSummaryScreen *summaryScreen, u8 button) { - const PSSSubscreenButton *buttonList = sSubscreenButtonTypes[summaryScreen->subscreenType]; + const SummarySubscreenButton *buttonList = sSubscreenButtonTypes[summaryScreen->subscreenType]; return buttonList[button].page; } diff --git a/src/applications/pokemon_summary_screen/window.c b/src/applications/pokemon_summary_screen/window.c index b1dcf4bfb9..ce62e2202d 100644 --- a/src/applications/pokemon_summary_screen/window.c +++ b/src/applications/pokemon_summary_screen/window.c @@ -30,14 +30,14 @@ #include "unk_02094EDC.h" // todo: consolidate this with more generic ones if this scheme is used elsewhere -enum PSSTextAlignment { +enum SummaryTextAlignment { ALIGN_LEFT = 0, ALIGN_RIGHT, ALIGN_CENTER, }; -static void PrintStrbufToWindow(PokemonSummaryScreen *summaryScreen, Window *window, TextColor color, enum PSSTextAlignment alignment); -static void PrintTextToStaticWindow(PokemonSummaryScreen *summaryScreen, enum PSSStaticWindow windowIndex, u32 entryID, TextColor color, enum PSSTextAlignment alignment); +static void PrintStrbufToWindow(PokemonSummaryScreen *summaryScreen, Window *window, TextColor color, enum SummaryTextAlignment alignment); +static void PrintTextToStaticWindow(PokemonSummaryScreen *summaryScreen, enum SummaryStaticWindow windowIndex, u32 entryID, TextColor color, enum SummaryTextAlignment alignment); static void PrintStaticWindows(PokemonSummaryScreen *summaryScreen); static void PrintMoveNameAndPP(PokemonSummaryScreen *summaryScreen, u32 moveIndex); static void DrawInfoPageWindows(PokemonSummaryScreen *summaryScreen); @@ -50,7 +50,7 @@ static void DrawRibbonsPageWindows(PokemonSummaryScreen *summaryScreen); static void DrawExitPageWindows(PokemonSummaryScreen *summaryScreen); static const WindowTemplate sStaticWindowTemplates[] = { - [PSS_WINDOW_LABEL_INFO] = { + [SUMMARY_WINDOW_LABEL_INFO] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 0, @@ -59,7 +59,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x1, }, - [PSS_WINDOW_LABEL_MEMO] = { + [SUMMARY_WINDOW_LABEL_MEMO] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 0, @@ -68,7 +68,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x1B, }, - [PSS_WINDOW_LABEL_SKILLS] = { + [SUMMARY_WINDOW_LABEL_SKILLS] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 0, @@ -77,7 +77,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x31, }, - [PSS_WINDOW_LABEL_CONDITION] = { + [SUMMARY_WINDOW_LABEL_CONDITION] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 0, @@ -86,7 +86,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x4D, }, - [PSS_WINDOW_LABEL_BATTLE_MOVES] = { + [SUMMARY_WINDOW_LABEL_BATTLE_MOVES] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 0, @@ -95,7 +95,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x63, }, - [PSS_WINDOW_LABEL_CONTEST_MOVES] = { + [SUMMARY_WINDOW_LABEL_CONTEST_MOVES] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 0, @@ -104,7 +104,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x75, }, - [PSS_WINDOW_LABEL_ITEM] = { + [SUMMARY_WINDOW_LABEL_ITEM] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 20, @@ -113,7 +113,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x8B, }, - [PSS_WINDOW_LABEL_DEX_NUM] = { + [SUMMARY_WINDOW_LABEL_DEX_NUM] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 5, @@ -122,7 +122,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x97, }, - [PSS_WINDOW_LABEL_SPECIES_NAME] = { + [SUMMARY_WINDOW_LABEL_SPECIES_NAME] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 7, @@ -131,7 +131,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0xA9, }, - [PSS_WINDOW_LABEL_TYPE] = { + [SUMMARY_WINDOW_LABEL_TYPE] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 9, @@ -140,7 +140,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0xB3, }, - [PSS_WINDOW_LABEL_OT_NAME] = { + [SUMMARY_WINDOW_LABEL_OT_NAME] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 11, @@ -149,7 +149,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0xBD, }, - [PSS_WINDOW_LABEL_OT_ID] = { + [SUMMARY_WINDOW_LABEL_OT_ID] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 13, @@ -158,7 +158,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0xC7, }, - [PSS_WINDOW_LABEL_EXP] = { + [SUMMARY_WINDOW_LABEL_EXP] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 15, @@ -167,7 +167,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0xD1, }, - [PSS_WINDOW_LABEL_EXP_NEXT_LV] = { + [SUMMARY_WINDOW_LABEL_EXP_NEXT_LV] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 19, @@ -176,7 +176,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0xEF, }, - [PSS_WINDOW_DUMMY_14] = { + [SUMMARY_WINDOW_DUMMY_14] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 19, .tilemapTop = 21, @@ -185,7 +185,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x107, }, - [PSS_WINDOW_LABEL_HP] = { + [SUMMARY_WINDOW_LABEL_HP] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 18, .tilemapTop = 4, @@ -194,7 +194,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x10D, }, - [PSS_WINDOW_LABEL_ATTACK] = { + [SUMMARY_WINDOW_LABEL_ATTACK] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 16, .tilemapTop = 7, @@ -203,7 +203,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x111, }, - [PSS_WINDOW_LABEL_DEFENSE] = { + [SUMMARY_WINDOW_LABEL_DEFENSE] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 16, .tilemapTop = 9, @@ -212,7 +212,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x11D, }, - [PSS_WINDOW_LABEL_SP_ATTACK] = { + [SUMMARY_WINDOW_LABEL_SP_ATTACK] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 16, .tilemapTop = 11, @@ -221,7 +221,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x129, }, - [PSS_WINDOW_LABEL_SP_DEFENSE] = { + [SUMMARY_WINDOW_LABEL_SP_DEFENSE] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 16, .tilemapTop = 13, @@ -230,7 +230,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x135, }, - [PSS_WINDOW_LABEL_SPEED] = { + [SUMMARY_WINDOW_LABEL_SPEED] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 16, .tilemapTop = 15, @@ -239,7 +239,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x141, }, - [PSS_WINDOW_LABEL_ABILITY] = { + [SUMMARY_WINDOW_LABEL_ABILITY] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 18, @@ -248,7 +248,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x14D, }, - [PSS_WINDOW_LABEL_SHEEN] = { + [SUMMARY_WINDOW_LABEL_SHEEN] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 20, @@ -257,7 +257,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x159, }, - [PSS_WINDOW_DUMMY_23] = { + [SUMMARY_WINDOW_DUMMY_23] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 22, @@ -266,7 +266,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x163, }, - [PSS_WINDOW_LABEL_MOVE_CANCEL] = { + [SUMMARY_WINDOW_LABEL_MOVE_CANCEL] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 20, @@ -275,7 +275,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x16F, }, - [PSS_WINDOW_LABEL_MOVE_CATEGORY] = { + [SUMMARY_WINDOW_LABEL_MOVE_CATEGORY] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 8, @@ -284,7 +284,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x179, }, - [PSS_WINDOW_LABEL_MOVE_POWER] = { + [SUMMARY_WINDOW_LABEL_MOVE_POWER] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 10, @@ -293,7 +293,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x185, }, - [PSS_WINDOW_LABEL_MOVE_ACCURACY] = { + [SUMMARY_WINDOW_LABEL_MOVE_ACCURACY] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 12, @@ -302,7 +302,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x191, }, - [PSS_WINDOW_LABEL_CLOSE_WINDOW] = { + [SUMMARY_WINDOW_LABEL_CLOSE_WINDOW] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 18, .tilemapTop = 11, @@ -311,7 +311,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x1A1, }, - [PSS_WINDOW_LABEL_APPEAL_POINTS] = { + [SUMMARY_WINDOW_LABEL_APPEAL_POINTS] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 2, .tilemapTop = 13, @@ -320,7 +320,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x1B3, }, - [PSS_WINDOW_LABEL_RIBBON_COUNT] = { + [SUMMARY_WINDOW_LABEL_RIBBON_COUNT] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 21, @@ -329,7 +329,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x1CB, }, - [PSS_WINDOW_LABEL_RIBBONS] = { + [SUMMARY_WINDOW_LABEL_RIBBONS] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 0, @@ -338,7 +338,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x1E3, }, - [PSS_WINDOW_ITEM_NAME] = { + [SUMMARY_WINDOW_ITEM_NAME] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 22, @@ -347,7 +347,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x1F9, }, - [PSS_WINDOW_MON_LEVEL] = { + [SUMMARY_WINDOW_MON_LEVEL] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 5, @@ -356,7 +356,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x211, }, - [PSS_WINDOW_MON_NICKNAME_GENDER] = { + [SUMMARY_WINDOW_MON_NICKNAME_GENDER] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 3, .tilemapTop = 3, @@ -365,7 +365,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { .palette = 15, .baseTile = 0x21D, }, - [PSS_WINDOW_BUTTON_PROMPT] = { + [SUMMARY_WINDOW_BUTTON_PROMPT] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 26, .tilemapTop = 0, @@ -377,7 +377,7 @@ static const WindowTemplate sStaticWindowTemplates[] = { }; static const WindowTemplate sExtraWindowTemplates_Info[] = { - [PSS_WINDOW_DEX_NUM] = { + [SUMMARY_WINDOW_DEX_NUM] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 24, .tilemapTop = 5, @@ -386,7 +386,7 @@ static const WindowTemplate sExtraWindowTemplates_Info[] = { .palette = 15, .baseTile = 0x23B, }, - [PSS_WINDOW_SPECIES_NAME] = { + [SUMMARY_WINDOW_SPECIES_NAME] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 23, .tilemapTop = 7, @@ -395,7 +395,7 @@ static const WindowTemplate sExtraWindowTemplates_Info[] = { .palette = 15, .baseTile = 0x247, }, - [PSS_WINDOW_OT_NAME] = { + [SUMMARY_WINDOW_OT_NAME] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 23, .tilemapTop = 11, @@ -404,7 +404,7 @@ static const WindowTemplate sExtraWindowTemplates_Info[] = { .palette = 15, .baseTile = 0x257, }, - [PSS_WINDOW_OT_ID] = { + [SUMMARY_WINDOW_OT_ID] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 25, .tilemapTop = 13, @@ -413,7 +413,7 @@ static const WindowTemplate sExtraWindowTemplates_Info[] = { .palette = 15, .baseTile = 0x267, }, - [PSS_WINDOW_EXP] = { + [SUMMARY_WINDOW_EXP] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 24, .tilemapTop = 17, @@ -422,7 +422,7 @@ static const WindowTemplate sExtraWindowTemplates_Info[] = { .palette = 15, .baseTile = 0x271, }, - [PSS_WINDOW_EXP_NEXT_LV] = { + [SUMMARY_WINDOW_EXP_NEXT_LV] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 24, .tilemapTop = 21, @@ -434,7 +434,7 @@ static const WindowTemplate sExtraWindowTemplates_Info[] = { }; static const WindowTemplate sExtraWindowTemplates_Memo[] = { - [PSS_WINDOW_MEMO] = { + [SUMMARY_WINDOW_MEMO] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 5, @@ -446,7 +446,7 @@ static const WindowTemplate sExtraWindowTemplates_Memo[] = { }; static const WindowTemplate sExtraWindowTemplates_Skills[] = { - [PSS_WINDOW_HP] = { + [SUMMARY_WINDOW_HP] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 23, .tilemapTop = 4, @@ -455,7 +455,7 @@ static const WindowTemplate sExtraWindowTemplates_Skills[] = { .palette = 15, .baseTile = 0x23B, }, - [PSS_WINDOW_ATTACK] = { + [SUMMARY_WINDOW_ATTACK] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 25, .tilemapTop = 7, @@ -464,7 +464,7 @@ static const WindowTemplate sExtraWindowTemplates_Skills[] = { .palette = 15, .baseTile = 0x249, }, - [PSS_WINDOW_DEFENSE] = { + [SUMMARY_WINDOW_DEFENSE] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 25, .tilemapTop = 9, @@ -473,7 +473,7 @@ static const WindowTemplate sExtraWindowTemplates_Skills[] = { .palette = 15, .baseTile = 0x24F, }, - [PSS_WINDOW_SP_ATTACK] = { + [SUMMARY_WINDOW_SP_ATTACK] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 25, .tilemapTop = 11, @@ -482,7 +482,7 @@ static const WindowTemplate sExtraWindowTemplates_Skills[] = { .palette = 15, .baseTile = 0x255, }, - [PSS_WINDOW_SP_DEFENSE] = { + [SUMMARY_WINDOW_SP_DEFENSE] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 25, .tilemapTop = 13, @@ -491,7 +491,7 @@ static const WindowTemplate sExtraWindowTemplates_Skills[] = { .palette = 15, .baseTile = 0x25B, }, - [PSS_WINDOW_SPEED] = { + [SUMMARY_WINDOW_SPEED] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 25, .tilemapTop = 15, @@ -500,7 +500,7 @@ static const WindowTemplate sExtraWindowTemplates_Skills[] = { .palette = 15, .baseTile = 0x261, }, - [PSS_WINDOW_ABILITY] = { + [SUMMARY_WINDOW_ABILITY] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 18, @@ -509,7 +509,7 @@ static const WindowTemplate sExtraWindowTemplates_Skills[] = { .palette = 15, .baseTile = 0x267, }, - [PSS_WINDOW_ABILITY_DESCRIPTION] = { + [SUMMARY_WINDOW_ABILITY_DESCRIPTION] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 14, .tilemapTop = 20, @@ -521,7 +521,7 @@ static const WindowTemplate sExtraWindowTemplates_Skills[] = { }; static const WindowTemplate sExtraWindowTemplates_BattleMoves[] = { - [PSS_WINDOW_BATTLE_MOVE_1] = { + [SUMMARY_WINDOW_BATTLE_MOVE_1] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 4, @@ -530,7 +530,7 @@ static const WindowTemplate sExtraWindowTemplates_BattleMoves[] = { .palette = 15, .baseTile = 0x23B, }, - [PSS_WINDOW_BATTLE_MOVE_2] = { + [SUMMARY_WINDOW_BATTLE_MOVE_2] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 8, @@ -539,7 +539,7 @@ static const WindowTemplate sExtraWindowTemplates_BattleMoves[] = { .palette = 15, .baseTile = 0x267, }, - [PSS_WINDOW_BATTLE_MOVE_3] = { + [SUMMARY_WINDOW_BATTLE_MOVE_3] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 12, @@ -548,7 +548,7 @@ static const WindowTemplate sExtraWindowTemplates_BattleMoves[] = { .palette = 15, .baseTile = 0x293, }, - [PSS_WINDOW_BATTLE_MOVE_4] = { + [SUMMARY_WINDOW_BATTLE_MOVE_4] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 16, @@ -557,7 +557,7 @@ static const WindowTemplate sExtraWindowTemplates_BattleMoves[] = { .palette = 15, .baseTile = 0x2BF, }, - [PSS_WINDOW_BATTLE_MOVE_5] = { + [SUMMARY_WINDOW_BATTLE_MOVE_5] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 20, @@ -566,7 +566,7 @@ static const WindowTemplate sExtraWindowTemplates_BattleMoves[] = { .palette = 15, .baseTile = 0x2EB, }, - [PSS_WINDOW_BATTLE_MOVE_POWER] = { + [SUMMARY_WINDOW_BATTLE_MOVE_POWER] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 12, .tilemapTop = 10, @@ -575,7 +575,7 @@ static const WindowTemplate sExtraWindowTemplates_BattleMoves[] = { .palette = 15, .baseTile = 0x317, }, - [PSS_WINDOW_BATTLE_MOVE_ACCURACY] = { + [SUMMARY_WINDOW_BATTLE_MOVE_ACCURACY] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 12, .tilemapTop = 12, @@ -584,7 +584,7 @@ static const WindowTemplate sExtraWindowTemplates_BattleMoves[] = { .palette = 15, .baseTile = 0x31D, }, - [PSS_WINDOW_BATTLE_MOVE_DESCRIPTION] = { + [SUMMARY_WINDOW_BATTLE_MOVE_DESCRIPTION] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 14, @@ -596,7 +596,7 @@ static const WindowTemplate sExtraWindowTemplates_BattleMoves[] = { }; static const WindowTemplate sExtraWindowTemplates_ContestMoves[] = { - [PSS_WINDOW_CONTEST_MOVE_1] = { + [SUMMARY_WINDOW_CONTEST_MOVE_1] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 4, @@ -605,7 +605,7 @@ static const WindowTemplate sExtraWindowTemplates_ContestMoves[] = { .palette = 15, .baseTile = 0x23B, }, - [PSS_WINDOW_CONTEST_MOVE_2] = { + [SUMMARY_WINDOW_CONTEST_MOVE_2] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 8, @@ -614,7 +614,7 @@ static const WindowTemplate sExtraWindowTemplates_ContestMoves[] = { .palette = 15, .baseTile = 0x267, }, - [PSS_WINDOW_CONTEST_MOVE_3] = { + [SUMMARY_WINDOW_CONTEST_MOVE_3] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 12, @@ -623,7 +623,7 @@ static const WindowTemplate sExtraWindowTemplates_ContestMoves[] = { .palette = 15, .baseTile = 0x293, }, - [PSS_WINDOW_CONTEST_MOVE_4] = { + [SUMMARY_WINDOW_CONTEST_MOVE_4] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 16, @@ -632,7 +632,7 @@ static const WindowTemplate sExtraWindowTemplates_ContestMoves[] = { .palette = 15, .baseTile = 0x2BF, }, - [PSS_WINDOW_CONTEST_MOVE_5] = { + [SUMMARY_WINDOW_CONTEST_MOVE_5] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 21, .tilemapTop = 20, @@ -641,7 +641,7 @@ static const WindowTemplate sExtraWindowTemplates_ContestMoves[] = { .palette = 15, .baseTile = 0x2EB, }, - [PSS_WINDOW_CONTEST_MOVE_DESCRIPTION] = { + [SUMMARY_WINDOW_CONTEST_MOVE_DESCRIPTION] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 18, @@ -653,7 +653,7 @@ static const WindowTemplate sExtraWindowTemplates_ContestMoves[] = { }; static const WindowTemplate sExtraWindowTemplates_Ribbons[] = { - [PSS_WINDOW_RIBBON_COUNT] = { + [SUMMARY_WINDOW_RIBBON_COUNT] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 26, .tilemapTop = 21, @@ -662,7 +662,7 @@ static const WindowTemplate sExtraWindowTemplates_Ribbons[] = { .palette = 15, .baseTile = 0x23B, }, - [PSS_WINDOW_RIBBON_INDEX] = { + [SUMMARY_WINDOW_RIBBON_INDEX] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 24, .tilemapTop = 15, @@ -671,7 +671,7 @@ static const WindowTemplate sExtraWindowTemplates_Ribbons[] = { .palette = 15, .baseTile = 0x245, }, - [PSS_WINDOW_RIBBON_NAME] = { + [SUMMARY_WINDOW_RIBBON_NAME] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 18, @@ -680,7 +680,7 @@ static const WindowTemplate sExtraWindowTemplates_Ribbons[] = { .palette = 15, .baseTile = 0x253, }, - [PSS_WINDOW_RIBBON_DESCRIPTION] = { + [SUMMARY_WINDOW_RIBBON_DESCRIPTION] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 20, @@ -692,7 +692,7 @@ static const WindowTemplate sExtraWindowTemplates_Ribbons[] = { }; static const WindowTemplate sExtraWindowTemplates_Condition[] = { - [PSS_WINDOW_POFFIN_BUTTON_PROMPT] = { + [SUMMARY_WINDOW_POFFIN_BUTTON_PROMPT] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 26, .tilemapTop = 0, @@ -701,7 +701,7 @@ static const WindowTemplate sExtraWindowTemplates_Condition[] = { .palette = 15, .baseTile = 0x23B, }, - [PSS_WINDOW_FAVORITE_FOOD] = { + [SUMMARY_WINDOW_FAVORITE_FOOD] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 1, .tilemapTop = 20, @@ -710,7 +710,7 @@ static const WindowTemplate sExtraWindowTemplates_Condition[] = { .palette = 15, .baseTile = 0x24D, }, - [PSS_WINDOW_POFFIN_FEED_MSG] = { + [SUMMARY_WINDOW_POFFIN_FEED_MSG] = { .bgLayer = BG_LAYER_MAIN_1, .tilemapLeft = 2, .tilemapTop = 21, @@ -723,7 +723,7 @@ static const WindowTemplate sExtraWindowTemplates_Condition[] = { void PokemonSummaryScreen_DrawStaticWindows(PokemonSummaryScreen *summaryScreen) { - for (u16 window = 0; window < PSS_STATIC_WINDOW_MAX; window++) { + for (u16 window = 0; window < SUMMARY_STATIC_WINDOW_MAX; window++) { Window_AddFromTemplate(summaryScreen->bgConfig, &summaryScreen->staticWindows[window], &sStaticWindowTemplates[window]); Window_FillTilemap(&summaryScreen->staticWindows[window], 0); } @@ -739,39 +739,39 @@ void PokemonSummaryScreen_AddExtraWindows(PokemonSummaryScreen *summaryScreen) const WindowTemplate *extraWindows; switch (summaryScreen->page) { - case PSS_PAGE_INFO: + case SUMMARY_PAGE_INFO: extraWindows = sExtraWindowTemplates_Info; - summaryScreen->numExtraWindows = PSS_INFO_WINDOW_MAX; + summaryScreen->numExtraWindows = SUMMARY_INFO_WINDOW_MAX; break; - case PSS_PAGE_MEMO: + case SUMMARY_PAGE_MEMO: extraWindows = sExtraWindowTemplates_Memo; - summaryScreen->numExtraWindows = PSS_MEMO_WINDOW_MAX; + summaryScreen->numExtraWindows = SUMMARY_MEMO_WINDOW_MAX; break; - case PSS_PAGE_SKILLS: + case SUMMARY_PAGE_SKILLS: extraWindows = sExtraWindowTemplates_Skills; - summaryScreen->numExtraWindows = PSS_SKILLS_WINDOW_MAX; + summaryScreen->numExtraWindows = SUMMARY_SKILLS_WINDOW_MAX; break; - case PSS_PAGE_BATTLE_MOVES: + case SUMMARY_PAGE_BATTLE_MOVES: extraWindows = sExtraWindowTemplates_BattleMoves; - summaryScreen->numExtraWindows = PSS_BATTLE_MOVES_WINDOW_MAX; + summaryScreen->numExtraWindows = SUMMARY_BATTLE_MOVES_WINDOW_MAX; break; - case PSS_PAGE_CONTEST_MOVES: + case SUMMARY_PAGE_CONTEST_MOVES: extraWindows = sExtraWindowTemplates_ContestMoves; - summaryScreen->numExtraWindows = PSS_CONTEST_MOVES_WINDOW_MAX; + summaryScreen->numExtraWindows = SUMMARY_CONTEST_MOVES_WINDOW_MAX; break; - case PSS_PAGE_RIBBONS: + case SUMMARY_PAGE_RIBBONS: extraWindows = sExtraWindowTemplates_Ribbons; - summaryScreen->numExtraWindows = PSS_RIBBONS_WINDOW_MAX; + summaryScreen->numExtraWindows = SUMMARY_RIBBONS_WINDOW_MAX; break; - case PSS_PAGE_CONDITION: - case PSS_PAGE_EXIT: + case SUMMARY_PAGE_CONDITION: + case SUMMARY_PAGE_EXIT: // the exit page shows the "favorite food" condition extra window when feeding poffins - if (summaryScreen->data->mode != PSS_MODE_POFFIN && summaryScreen->data->mode != PSS_MODE_CONDITION) { + if (summaryScreen->data->mode != SUMMARY_MODE_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_CONDITION) { return; } extraWindows = sExtraWindowTemplates_Condition; - summaryScreen->numExtraWindows = PSS_CONDITION_WINDOW_MAX; + summaryScreen->numExtraWindows = SUMMARY_CONDITION_WINDOW_MAX; break; default: return; @@ -787,17 +787,17 @@ void PokemonSummaryScreen_AddExtraWindows(PokemonSummaryScreen *summaryScreen) void PokemonSummaryScreen_RemoveExtraWindows(PokemonSummaryScreen *summaryScreen) { switch (summaryScreen->page) { - case PSS_PAGE_INFO: - case PSS_PAGE_MEMO: - case PSS_PAGE_SKILLS: - case PSS_PAGE_BATTLE_MOVES: - case PSS_PAGE_CONTEST_MOVES: - case PSS_PAGE_RIBBONS: + case SUMMARY_PAGE_INFO: + case SUMMARY_PAGE_MEMO: + case SUMMARY_PAGE_SKILLS: + case SUMMARY_PAGE_BATTLE_MOVES: + case SUMMARY_PAGE_CONTEST_MOVES: + case SUMMARY_PAGE_RIBBONS: break; - case PSS_PAGE_CONDITION: - case PSS_PAGE_EXIT: + case SUMMARY_PAGE_CONDITION: + case SUMMARY_PAGE_EXIT: // the exit page shows the "favorite food" condition extra window when feeding poffins - if (summaryScreen->data->mode != PSS_MODE_POFFIN && summaryScreen->data->mode != PSS_MODE_CONDITION) { + if (summaryScreen->data->mode != SUMMARY_MODE_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_CONDITION) { return; } break; @@ -812,25 +812,25 @@ void PokemonSummaryScreen_RemoveWindows(PokemonSummaryScreen *summaryScreen) { PokemonSummaryScreen_RemoveExtraWindows(summaryScreen); - for (u32 i = 0; i < PSS_STATIC_WINDOW_MAX; i++) { + for (u32 i = 0; i < SUMMARY_STATIC_WINDOW_MAX; i++) { Window_Remove(&summaryScreen->staticWindows[i]); } } void PokemonSummaryScreen_PrintNicknameAndGender(PokemonSummaryScreen *summaryScreen) { - Window *window = &summaryScreen->staticWindows[PSS_WINDOW_MON_NICKNAME_GENDER]; + Window *window = &summaryScreen->staticWindows[SUMMARY_WINDOW_MON_NICKNAME_GENDER]; Window_FillTilemap(window, 0); - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->monData.nickname, 0, 0, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_WHITE, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->monData.nickname, 0, 0, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_WHITE, NULL); if (summaryScreen->monData.hideGender == FALSE) { if (summaryScreen->monData.gender == GENDER_MALE) { - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_male_symbol, summaryScreen->strbuf); - PrintStrbufToWindow(summaryScreen, window, PSS_TEXT_BLUE, ALIGN_RIGHT); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_male_symbol, summaryScreen->strbuf); + PrintStrbufToWindow(summaryScreen, window, SUMMARY_TEXT_BLUE, ALIGN_RIGHT); } else if (summaryScreen->monData.gender == GENDER_FEMALE) { - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_female_symbol, summaryScreen->strbuf); - PrintStrbufToWindow(summaryScreen, window, PSS_TEXT_RED, ALIGN_RIGHT); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_female_symbol, summaryScreen->strbuf); + PrintStrbufToWindow(summaryScreen, window, SUMMARY_TEXT_RED, ALIGN_RIGHT); } } @@ -839,19 +839,19 @@ void PokemonSummaryScreen_PrintNicknameAndGender(PokemonSummaryScreen *summarySc void PokemonSummaryScreen_PrintLevel(PokemonSummaryScreen *summaryScreen) { - Window *window = &summaryScreen->staticWindows[PSS_WINDOW_MON_LEVEL]; + Window *window = &summaryScreen->staticWindows[SUMMARY_WINDOW_MON_LEVEL]; Window_FillTilemap(window, 0); Strbuf *buf; if (summaryScreen->monData.isEgg == FALSE) { sub_0200C578(summaryScreen->unk_684, 1, window, 0, 5); - buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, pss_template_mon_level); + buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, summary_template_mon_level); StringTemplate_SetNumber(summaryScreen->strFormatter, 0, summaryScreen->monData.level, 3, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(summaryScreen->strFormatter, summaryScreen->strbuf, buf); Strbuf_Free(buf); - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, 16, 0, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, 16, 0, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); } Window_ScheduleCopyToVRAM(window); @@ -861,27 +861,27 @@ void PokemonSummaryScreen_PrintItemName(PokemonSummaryScreen *summaryScreen) { Strbuf *buf; - Window_FillTilemap(&summaryScreen->staticWindows[PSS_WINDOW_ITEM_NAME], 0); + Window_FillTilemap(&summaryScreen->staticWindows[SUMMARY_WINDOW_ITEM_NAME], 0); if (summaryScreen->monData.heldItem != ITEM_NONE) { StringTemplate_SetItemName(summaryScreen->strFormatter, 0, summaryScreen->monData.heldItem); - buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, pss_template_item_name); + buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, summary_template_item_name); StringTemplate_Format(summaryScreen->strFormatter, summaryScreen->strbuf, buf); Strbuf_Free(buf); } else { - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_none, summaryScreen->strbuf); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_none, summaryScreen->strbuf); } - PrintStrbufToWindow(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_ITEM_NAME], PSS_TEXT_BLACK, ALIGN_LEFT); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_ITEM]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_ITEM_NAME]); + PrintStrbufToWindow(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_ITEM_NAME], SUMMARY_TEXT_BLACK, ALIGN_LEFT); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_ITEM]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_ITEM_NAME]); } void PokemonSummaryScreen_ClearAndPrintButtonPrompt(PokemonSummaryScreen *summaryScreen, u32 entryID) { - Window_FillTilemap(&summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT], 0); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_BUTTON_PROMPT, entryID, PSS_TEXT_WHITE, ALIGN_LEFT); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + Window_FillTilemap(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT], 0); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_BUTTON_PROMPT, entryID, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); } static BOOL DoesMonOTMatchPlayer(PokemonSummaryScreen *summaryScreen) @@ -895,7 +895,7 @@ static BOOL DoesMonOTMatchPlayer(PokemonSummaryScreen *summaryScreen) return FALSE; } -static void PrintStrbufToWindow(PokemonSummaryScreen *summaryScreen, Window *window, TextColor color, enum PSSTextAlignment alignment) +static void PrintStrbufToWindow(PokemonSummaryScreen *summaryScreen, Window *window, TextColor color, enum SummaryTextAlignment alignment) { u8 strWidth, windowWidth, xOffset; @@ -918,7 +918,7 @@ static void PrintStrbufToWindow(PokemonSummaryScreen *summaryScreen, Window *win Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, xOffset, 0, TEXT_SPEED_NO_TRANSFER, color, NULL); } -static void PrintTextToStaticWindow(PokemonSummaryScreen *summaryScreen, enum PSSStaticWindow windowIndex, u32 entryID, TextColor color, enum PSSTextAlignment alignment) +static void PrintTextToStaticWindow(PokemonSummaryScreen *summaryScreen, enum SummaryStaticWindow windowIndex, u32 entryID, TextColor color, enum SummaryTextAlignment alignment) { MessageLoader_GetStrbuf(summaryScreen->msgLoader, entryID, summaryScreen->strbuf); PrintStrbufToWindow(summaryScreen, &summaryScreen->staticWindows[windowIndex], color, alignment); @@ -941,51 +941,51 @@ static void PrintCurrentAndMaxInfo(PokemonSummaryScreen *summaryScreen, u32 move u16 curXOffset = xOffset - strWidth / 2; u16 maxXOffset = curXOffset + strWidth; - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, curXOffset, yOffset, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, curXOffset, yOffset, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); SetAndFormatNumberBuf(summaryScreen, curEntryID, curValue, digits, PADDING_MODE_NONE); strWidth = Font_CalcStrbufWidth(FONT_SYSTEM, summaryScreen->strbuf, 0); - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, curXOffset - strWidth, yOffset, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, curXOffset - strWidth, yOffset, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); SetAndFormatNumberBuf(summaryScreen, maxEntryID, maxValue, digits, PADDING_MODE_NONE); - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, maxXOffset, yOffset, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, maxXOffset, yOffset, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); } static void PrintStaticWindows(PokemonSummaryScreen *summaryScreen) { - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_INFO, pss_page_title_info, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_MEMO, pss_page_title_memo, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_SKILLS, pss_page_title_skills, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_CONDITION, pss_page_title_condition, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_BATTLE_MOVES, pss_page_title_battle_moves, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_CONTEST_MOVES, pss_page_title_contest_moves, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_ITEM, pss_label_item, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_DEX_NUM, pss_label_dex_num, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_SPECIES_NAME, pss_label_species_name, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_TYPE, pss_label_type, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_OT_NAME, pss_label_ot_name, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_OT_ID, pss_label_ot_id, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_EXP, pss_label_exp, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_EXP_NEXT_LV, pss_label_exp_next_lv, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_HP, pss_label_hp, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_ATTACK, pss_label_attack, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_DEFENSE, pss_label_defense, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_SP_ATTACK, pss_label_sp_attack, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_SP_DEFENSE, pss_label_sp_defense, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_SPEED, pss_label_speed, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_ABILITY, pss_label_ability, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_SHEEN, pss_label_sheen, PSS_TEXT_WHITE, ALIGN_LEFT); - - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_move_cancel, summaryScreen->strbuf); - Text_AddPrinterWithParamsAndColor(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_MOVE_CANCEL], FONT_SYSTEM, summaryScreen->strbuf, 0, 2, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_WHITE, NULL); - - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_MOVE_CATEGORY, pss_label_move_category, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_MOVE_POWER, pss_label_move_power, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_MOVE_ACCURACY, pss_label_move_accuracy, PSS_TEXT_WHITE, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_CLOSE_WINDOW, pss_close_window, PSS_TEXT_WHITE, ALIGN_CENTER); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_APPEAL_POINTS, pss_label_appeal_points, PSS_TEXT_BLACK, ALIGN_CENTER); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_RIBBON_COUNT, pss_label_ribbon_count, PSS_TEXT_BLACK, ALIGN_LEFT); - PrintTextToStaticWindow(summaryScreen, PSS_WINDOW_LABEL_RIBBONS, pss_page_title_ribbons, PSS_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_INFO, summary_page_title_info, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_MEMO, summary_page_title_memo, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_SKILLS, summary_page_title_skills, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_CONDITION, summary_page_title_condition, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_BATTLE_MOVES, summary_page_title_battle_moves, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_CONTEST_MOVES, summary_page_title_contest_moves, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_ITEM, summary_label_item, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_DEX_NUM, summary_label_dex_num, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_SPECIES_NAME, summary_label_species_name, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_TYPE, summary_label_type, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_OT_NAME, summary_label_ot_name, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_OT_ID, summary_label_ot_id, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_EXP, summary_label_exp, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_EXP_NEXT_LV, summary_label_exp_next_lv, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_HP, summary_label_hp, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_ATTACK, summary_label_attack, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_DEFENSE, summary_label_defense, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_SP_ATTACK, summary_label_sp_attack, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_SP_DEFENSE, summary_label_sp_defense, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_SPEED, summary_label_speed, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_ABILITY, summary_label_ability, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_SHEEN, summary_label_sheen, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_move_cancel, summaryScreen->strbuf); + Text_AddPrinterWithParamsAndColor(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_MOVE_CANCEL], FONT_SYSTEM, summaryScreen->strbuf, 0, 2, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_WHITE, NULL); + + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_MOVE_CATEGORY, summary_label_move_category, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_MOVE_POWER, summary_label_move_power, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_MOVE_ACCURACY, summary_label_move_accuracy, SUMMARY_TEXT_WHITE, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_CLOSE_WINDOW, summary_close_window, SUMMARY_TEXT_WHITE, ALIGN_CENTER); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_APPEAL_POINTS, summary_label_appeal_points, SUMMARY_TEXT_BLACK, ALIGN_CENTER); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_RIBBON_COUNT, summary_label_ribbon_count, SUMMARY_TEXT_BLACK, ALIGN_LEFT); + PrintTextToStaticWindow(summaryScreen, SUMMARY_WINDOW_LABEL_RIBBONS, summary_page_title_ribbons, SUMMARY_TEXT_WHITE, ALIGN_LEFT); } void PokemonSummaryScreen_DrawExtraWindows(PokemonSummaryScreen *summaryScreen) @@ -994,28 +994,28 @@ void PokemonSummaryScreen_DrawExtraWindows(PokemonSummaryScreen *summaryScreen) Bg_FillTilemapRect(summaryScreen->bgConfig, BG_LAYER_MAIN_1, 0, 14, 2, 18, 22, 16); switch (summaryScreen->page) { - case PSS_PAGE_INFO: + case SUMMARY_PAGE_INFO: DrawInfoPageWindows(summaryScreen); break; - case PSS_PAGE_MEMO: + case SUMMARY_PAGE_MEMO: DrawMemoPageWindows(summaryScreen); break; - case PSS_PAGE_SKILLS: + case SUMMARY_PAGE_SKILLS: DrawSkillsPageWindows(summaryScreen); break; - case PSS_PAGE_CONDITION: + case SUMMARY_PAGE_CONDITION: DrawConditionPageWindows(summaryScreen); break; - case PSS_PAGE_BATTLE_MOVES: + case SUMMARY_PAGE_BATTLE_MOVES: DrawBattleMovesPageWindows(summaryScreen); break; - case PSS_PAGE_CONTEST_MOVES: + case SUMMARY_PAGE_CONTEST_MOVES: DrawContestMovesPageWindows(summaryScreen); break; - case PSS_PAGE_RIBBONS: + case SUMMARY_PAGE_RIBBONS: DrawRibbonsPageWindows(summaryScreen); break; - case PSS_PAGE_EXIT: + case SUMMARY_PAGE_EXIT: DrawExitPageWindows(summaryScreen); break; } @@ -1023,70 +1023,70 @@ void PokemonSummaryScreen_DrawExtraWindows(PokemonSummaryScreen *summaryScreen) static void DrawInfoPageWindows(PokemonSummaryScreen *summaryScreen) { - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_INFO]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_DEX_NUM]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_SPECIES_NAME]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_TYPE]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_OT_NAME]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_OT_ID]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_EXP]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_EXP_NEXT_LV]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_DUMMY_14]); - - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_DEX_NUM], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_SPECIES_NAME], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_OT_NAME], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_OT_ID], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_EXP], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_EXP_NEXT_LV], 0); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_INFO]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_DEX_NUM]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_SPECIES_NAME]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_TYPE]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_OT_NAME]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_OT_ID]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_EXP]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_EXP_NEXT_LV]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_DUMMY_14]); + + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_DEX_NUM], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_SPECIES_NAME], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_OT_NAME], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_OT_ID], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_EXP], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_EXP_NEXT_LV], 0); u32 dexNum = sub_0207A294(summaryScreen->data->dexMode, summaryScreen->monData.species); if (dexNum != 0) { - SetAndFormatNumberBuf(summaryScreen, pss_dex_number_template, dexNum, 3, PADDING_MODE_ZEROES); + SetAndFormatNumberBuf(summaryScreen, summary_dex_number_template, dexNum, 3, PADDING_MODE_ZEROES); } else { - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_three_question_marks, summaryScreen->strbuf); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_three_question_marks, summaryScreen->strbuf); } if (summaryScreen->monData.isShiny == FALSE) { - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_DEX_NUM], PSS_TEXT_BLACK, ALIGN_CENTER); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_DEX_NUM], SUMMARY_TEXT_BLACK, ALIGN_CENTER); } else { - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_DEX_NUM], PSS_TEXT_RED, ALIGN_CENTER); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_DEX_NUM], SUMMARY_TEXT_RED, ALIGN_CENTER); } u32 speciesWidth = Font_CalcStrbufWidth(FONT_SYSTEM, summaryScreen->monData.speciesName, 0); - u32 speciesX = (summaryScreen->extraWindows[PSS_WINDOW_SPECIES_NAME].width * 8 - speciesWidth) / 2; + u32 speciesX = (summaryScreen->extraWindows[SUMMARY_WINDOW_SPECIES_NAME].width * 8 - speciesWidth) / 2; - Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[PSS_WINDOW_SPECIES_NAME], FONT_SYSTEM, summaryScreen->monData.speciesName, speciesX, 0, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[SUMMARY_WINDOW_SPECIES_NAME], FONT_SYSTEM, summaryScreen->monData.speciesName, speciesX, 0, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); u32 OTNameWidth = Font_CalcStrbufWidth(FONT_SYSTEM, summaryScreen->monData.OTName, 0); - u32 OTNameX = (summaryScreen->extraWindows[PSS_WINDOW_OT_NAME].width * 8 - OTNameWidth) / 2; + u32 OTNameX = (summaryScreen->extraWindows[SUMMARY_WINDOW_OT_NAME].width * 8 - OTNameWidth) / 2; if (summaryScreen->monData.OTGender == GENDER_MALE) { - Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[PSS_WINDOW_OT_NAME], FONT_SYSTEM, summaryScreen->monData.OTName, OTNameX, 0, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLUE, NULL); + Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[SUMMARY_WINDOW_OT_NAME], FONT_SYSTEM, summaryScreen->monData.OTName, OTNameX, 0, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLUE, NULL); } else { - Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[PSS_WINDOW_OT_NAME], FONT_SYSTEM, summaryScreen->monData.OTName, OTNameX, 0, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_RED, NULL); + Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[SUMMARY_WINDOW_OT_NAME], FONT_SYSTEM, summaryScreen->monData.OTName, OTNameX, 0, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_RED, NULL); } - SetAndFormatNumberBuf(summaryScreen, pss_template_ot_id, (summaryScreen->monData.OTID & 0xFFFF), 5, PADDING_MODE_ZEROES); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_OT_ID], PSS_TEXT_BLACK, ALIGN_CENTER); + SetAndFormatNumberBuf(summaryScreen, summary_template_ot_id, (summaryScreen->monData.OTID & 0xFFFF), 5, PADDING_MODE_ZEROES); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_OT_ID], SUMMARY_TEXT_BLACK, ALIGN_CENTER); - SetAndFormatNumberBuf(summaryScreen, pss_template_exp, summaryScreen->monData.curExp, 7, PADDING_MODE_SPACES); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_EXP], PSS_TEXT_BLACK, ALIGN_CENTER); + SetAndFormatNumberBuf(summaryScreen, summary_template_exp, summaryScreen->monData.curExp, 7, PADDING_MODE_SPACES); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_EXP], SUMMARY_TEXT_BLACK, ALIGN_CENTER); if (summaryScreen->monData.level < MAX_POKEMON_LEVEL) { - SetAndFormatNumberBuf(summaryScreen, pss_template_exp_next_lv, summaryScreen->monData.nextLevelExp - summaryScreen->monData.curExp, 7, PADDING_MODE_SPACES); + SetAndFormatNumberBuf(summaryScreen, summary_template_exp_next_lv, summaryScreen->monData.nextLevelExp - summaryScreen->monData.curExp, 7, PADDING_MODE_SPACES); } else { - SetAndFormatNumberBuf(summaryScreen, pss_template_exp_next_lv, 0, 7, PADDING_MODE_SPACES); + SetAndFormatNumberBuf(summaryScreen, summary_template_exp_next_lv, 0, 7, PADDING_MODE_SPACES); } - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_EXP_NEXT_LV], PSS_TEXT_BLACK, ALIGN_CENTER); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_DEX_NUM]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_SPECIES_NAME]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_OT_NAME]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_OT_ID]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_EXP]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_EXP_NEXT_LV]); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_EXP_NEXT_LV], SUMMARY_TEXT_BLACK, ALIGN_CENTER); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_DEX_NUM]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_SPECIES_NAME]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_OT_NAME]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_OT_ID]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_EXP]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_EXP_NEXT_LV]); } static void PrintTrainerMemo(Window *window, Pokemon *mon, BOOL monOTMatches) @@ -1094,23 +1094,23 @@ static void PrintTrainerMemo(Window *window, Pokemon *mon, BOOL monOTMatches) PokemonInfoDisplayStruct *infoDisplay = sub_02092494(mon, monOTMatches, HEAP_ID_POKEMON_SUMMARY_SCREEN); if (infoDisplay->unk_14.unk_04 != NULL) { - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_14.unk_04, 0, (infoDisplay->unk_14.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_14.unk_04, 0, (infoDisplay->unk_14.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); } if (infoDisplay->unk_1C.unk_04 != NULL) { - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_1C.unk_04, 0, (infoDisplay->unk_1C.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_1C.unk_04, 0, (infoDisplay->unk_1C.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); } if (infoDisplay->unk_24.unk_04 != NULL) { - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_24.unk_04, 0, (infoDisplay->unk_24.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_24.unk_04, 0, (infoDisplay->unk_24.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); } if (infoDisplay->unk_2C.unk_04 != NULL) { - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_2C.unk_04, 0, (infoDisplay->unk_2C.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_2C.unk_04, 0, (infoDisplay->unk_2C.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); } if (infoDisplay->unk_34.unk_04 != NULL) { - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_34.unk_04, 0, (infoDisplay->unk_34.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, infoDisplay->unk_34.unk_04, 0, (infoDisplay->unk_34.unk_00 - 1) * 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); } sub_0209282C(infoDisplay); @@ -1118,204 +1118,204 @@ static void PrintTrainerMemo(Window *window, Pokemon *mon, BOOL monOTMatches) static void DrawMemoPageWindows(PokemonSummaryScreen *summaryScreen) { - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_MEMO]); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_MEMO], 0); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_MEMO]); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_MEMO], 0); void *monData = PokemonSummaryScreen_MonData(summaryScreen); BOOL monOTMatches = DoesMonOTMatchPlayer(summaryScreen); - if (summaryScreen->data->dataType == PSS_DATA_BOX_MON) { + if (summaryScreen->data->dataType == SUMMARY_DATA_BOX_MON) { Pokemon *mon = Pokemon_New(HEAP_ID_POKEMON_SUMMARY_SCREEN); Pokemon_FromBoxPokemon(monData, mon); - PrintTrainerMemo(&summaryScreen->extraWindows[PSS_WINDOW_MEMO], mon, monOTMatches); + PrintTrainerMemo(&summaryScreen->extraWindows[SUMMARY_WINDOW_MEMO], mon, monOTMatches); Heap_FreeToHeap(mon); } else { - PrintTrainerMemo(&summaryScreen->extraWindows[PSS_WINDOW_MEMO], monData, monOTMatches); + PrintTrainerMemo(&summaryScreen->extraWindows[SUMMARY_WINDOW_MEMO], monData, monOTMatches); } - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_MEMO]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_MEMO]); } static void DrawSkillsPageWindows(PokemonSummaryScreen *summaryScreen) { - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_SKILLS]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_HP]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_ATTACK]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_DEFENSE]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_SP_ATTACK]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_SP_DEFENSE]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_SPEED]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_ABILITY]); - - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_HP], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_ATTACK], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_DEFENSE], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_SP_ATTACK], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_SP_DEFENSE], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_SPEED], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_ABILITY], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_ABILITY_DESCRIPTION], 0); - - u32 hpWindowWidth = Window_GetWidth(&summaryScreen->extraWindows[PSS_WINDOW_HP]) * 8; - - PrintCurrentAndMaxInfo(summaryScreen, 0, pss_slash, pss_template_current_hp, pss_template_max_hp, summaryScreen->monData.curHP, summaryScreen->monData.maxHP, 3, hpWindowWidth / 2, 0); - SetAndFormatNumberBuf(summaryScreen, pss_template_attack, summaryScreen->monData.attack, 3, PADDING_MODE_NONE); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_ATTACK], PSS_TEXT_BLACK, ALIGN_RIGHT); - SetAndFormatNumberBuf(summaryScreen, pss_template_defense, summaryScreen->monData.defense, 3, PADDING_MODE_NONE); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_DEFENSE], PSS_TEXT_BLACK, ALIGN_RIGHT); - SetAndFormatNumberBuf(summaryScreen, pss_template_sp_attack, summaryScreen->monData.spAttack, 3, PADDING_MODE_NONE); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_SP_ATTACK], PSS_TEXT_BLACK, ALIGN_RIGHT); - SetAndFormatNumberBuf(summaryScreen, pss_template_sp_defense, summaryScreen->monData.spDefense, 3, PADDING_MODE_NONE); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_SP_DEFENSE], PSS_TEXT_BLACK, ALIGN_RIGHT); - SetAndFormatNumberBuf(summaryScreen, pss_template_speed, summaryScreen->monData.speed, 3, PADDING_MODE_NONE); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_SPEED], PSS_TEXT_BLACK, ALIGN_RIGHT); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_SKILLS]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_HP]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_ATTACK]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_DEFENSE]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_SP_ATTACK]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_SP_DEFENSE]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_SPEED]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_ABILITY]); + + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_HP], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_ATTACK], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_DEFENSE], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_SP_ATTACK], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_SP_DEFENSE], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_SPEED], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_ABILITY], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_ABILITY_DESCRIPTION], 0); + + u32 hpWindowWidth = Window_GetWidth(&summaryScreen->extraWindows[SUMMARY_WINDOW_HP]) * 8; + + PrintCurrentAndMaxInfo(summaryScreen, 0, summary_slash, summary_template_current_hp, summary_template_max_hp, summaryScreen->monData.curHP, summaryScreen->monData.maxHP, 3, hpWindowWidth / 2, 0); + SetAndFormatNumberBuf(summaryScreen, summary_template_attack, summaryScreen->monData.attack, 3, PADDING_MODE_NONE); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_ATTACK], SUMMARY_TEXT_BLACK, ALIGN_RIGHT); + SetAndFormatNumberBuf(summaryScreen, summary_template_defense, summaryScreen->monData.defense, 3, PADDING_MODE_NONE); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_DEFENSE], SUMMARY_TEXT_BLACK, ALIGN_RIGHT); + SetAndFormatNumberBuf(summaryScreen, summary_template_sp_attack, summaryScreen->monData.spAttack, 3, PADDING_MODE_NONE); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_SP_ATTACK], SUMMARY_TEXT_BLACK, ALIGN_RIGHT); + SetAndFormatNumberBuf(summaryScreen, summary_template_sp_defense, summaryScreen->monData.spDefense, 3, PADDING_MODE_NONE); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_SP_DEFENSE], SUMMARY_TEXT_BLACK, ALIGN_RIGHT); + SetAndFormatNumberBuf(summaryScreen, summary_template_speed, summaryScreen->monData.speed, 3, PADDING_MODE_NONE); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_SPEED], SUMMARY_TEXT_BLACK, ALIGN_RIGHT); StringTemplate_SetAbilityName(summaryScreen->strFormatter, 0, summaryScreen->monData.ability); - Strbuf *buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, pss_template_ability); + Strbuf *buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, summary_template_ability); StringTemplate_Format(summaryScreen->strFormatter, summaryScreen->strbuf, buf); Strbuf_Free(buf); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_ABILITY], PSS_TEXT_BLACK, ALIGN_LEFT); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_ABILITY], SUMMARY_TEXT_BLACK, ALIGN_LEFT); MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_ability_descriptions, HEAP_ID_POKEMON_SUMMARY_SCREEN); MessageLoader_GetStrbuf(msgLoader, summaryScreen->monData.ability, summaryScreen->strbuf); MessageLoader_Free(msgLoader); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_ABILITY_DESCRIPTION], PSS_TEXT_BLACK, ALIGN_LEFT); - - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_HP]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_ATTACK]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_DEFENSE]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_SP_ATTACK]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_SP_DEFENSE]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_SPEED]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_ABILITY]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_ABILITY_DESCRIPTION]); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_ABILITY_DESCRIPTION], SUMMARY_TEXT_BLACK, ALIGN_LEFT); + + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_HP]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_ATTACK]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_DEFENSE]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_SP_ATTACK]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_SP_DEFENSE]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_SPEED]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_ABILITY]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_ABILITY_DESCRIPTION]); } static void DrawConditionPageWindows(PokemonSummaryScreen *summaryScreen) { - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_CONDITION]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_SHEEN]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_CONDITION]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_SHEEN]); - if (summaryScreen->data->mode != PSS_MODE_POFFIN && summaryScreen->data->mode != PSS_MODE_CONDITION) { + if (summaryScreen->data->mode != SUMMARY_MODE_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_CONDITION) { return; } - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_FAVORITE_FOOD], 0); - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_favorite_food, summaryScreen->strbuf); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_FAVORITE_FOOD], PSS_TEXT_WHITE, ALIGN_LEFT); - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_template_likes_spicy + summaryScreen->monData.preferredFlavor, summaryScreen->strbuf); - Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[PSS_WINDOW_FAVORITE_FOOD], FONT_SYSTEM, summaryScreen->strbuf, 0, 16, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_FAVORITE_FOOD]); - - if (summaryScreen->data->mode == PSS_MODE_POFFIN) { - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_POFFIN_BUTTON_PROMPT], 0); - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_poffin_feed_ok, summaryScreen->strbuf); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_POFFIN_BUTTON_PROMPT], PSS_TEXT_WHITE, ALIGN_LEFT); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_POFFIN_BUTTON_PROMPT]); - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_POFFIN_BUTTON_PROMPT]); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_FAVORITE_FOOD], 0); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_favorite_food, summaryScreen->strbuf); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_FAVORITE_FOOD], SUMMARY_TEXT_WHITE, ALIGN_LEFT); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_template_likes_spicy + summaryScreen->monData.preferredFlavor, summaryScreen->strbuf); + Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[SUMMARY_WINDOW_FAVORITE_FOOD], FONT_SYSTEM, summaryScreen->strbuf, 0, 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_FAVORITE_FOOD]); + + if (summaryScreen->data->mode == SUMMARY_MODE_POFFIN) { + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_POFFIN_BUTTON_PROMPT], 0); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_poffin_feed_ok, summaryScreen->strbuf); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_POFFIN_BUTTON_PROMPT], SUMMARY_TEXT_WHITE, ALIGN_LEFT); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_POFFIN_BUTTON_PROMPT]); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_POFFIN_BUTTON_PROMPT]); } } static void DrawBattleMovesPageWindows(PokemonSummaryScreen *summaryScreen) { - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_BATTLE_MOVES]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_BATTLE_MOVES]); - if (summaryScreen->data->mode == PSS_MODE_SELECT_MOVE) { - PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, pss_select_battle_move_ok); + if (summaryScreen->data->mode == SUMMARY_MODE_SELECT_MOVE) { + PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, summary_select_battle_move_ok); } else { - PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, pss_select_battle_move_info); + PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, summary_select_battle_move_info); } - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_1], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_2], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_3], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_4], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_1], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_2], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_3], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_4], 0); PrintMoveNameAndPP(summaryScreen, 0); PrintMoveNameAndPP(summaryScreen, 1); PrintMoveNameAndPP(summaryScreen, 2); PrintMoveNameAndPP(summaryScreen, 3); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_1]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_2]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_3]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_4]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_1]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_2]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_3]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_4]); } static void DrawContestMovesPageWindows(PokemonSummaryScreen *summaryScreen) { - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_CONTEST_MOVES]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_CONTEST_MOVES]); - if (summaryScreen->data->mode == PSS_MODE_SELECT_MOVE) { - PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, pss_select_contest_move_ok); + if (summaryScreen->data->mode == SUMMARY_MODE_SELECT_MOVE) { + PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, summary_select_contest_move_ok); } else { - PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, pss_select_contest_move_info); + PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, summary_select_contest_move_info); } - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_1], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_2], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_3], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_4], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_1], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_2], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_3], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_4], 0); PrintMoveNameAndPP(summaryScreen, 0); PrintMoveNameAndPP(summaryScreen, 1); PrintMoveNameAndPP(summaryScreen, 2); PrintMoveNameAndPP(summaryScreen, 3); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_1]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_2]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_3]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_4]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_1]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_2]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_3]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_4]); } static void DrawRibbonsPageWindows(PokemonSummaryScreen *summaryScreen) { - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_RIBBONS]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_RIBBON_COUNT]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_RIBBONS]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_RIBBON_COUNT]); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_COUNT], 0); - SetAndFormatNumberBuf(summaryScreen, pss_template_ribbon_count, summaryScreen->ribbonMax, 3, PADDING_MODE_NONE); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_RIBBON_COUNT], PSS_TEXT_BLACK, ALIGN_LEFT); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_COUNT]); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_COUNT], 0); + SetAndFormatNumberBuf(summaryScreen, summary_template_ribbon_count, summaryScreen->ribbonMax, 3, PADDING_MODE_NONE); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_COUNT], SUMMARY_TEXT_BLACK, ALIGN_LEFT); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_COUNT]); if (summaryScreen->ribbonMax != 0) { - PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, pss_ribbon_select_info); - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, summary_ribbon_select_info); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); } } static void DrawExitPageWindows(PokemonSummaryScreen *summaryScreen) { - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_CLOSE_WINDOW]); - PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, pss_prompt_exit); - PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[PSS_WINDOW_BUTTON_PROMPT]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_CLOSE_WINDOW]); + PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, summary_prompt_exit); + PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]); // the exit page shows the "favorite food" condition extra window when feeding poffins - if (summaryScreen->data->mode != PSS_MODE_POFFIN && summaryScreen->data->mode != PSS_MODE_CONDITION) { + if (summaryScreen->data->mode != SUMMARY_MODE_POFFIN && summaryScreen->data->mode != SUMMARY_MODE_CONDITION) { return; } - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_FAVORITE_FOOD], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_FAVORITE_FOOD], 0); - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_favorite_food, summaryScreen->strbuf); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_FAVORITE_FOOD], PSS_TEXT_WHITE, ALIGN_LEFT); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_favorite_food, summaryScreen->strbuf); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_FAVORITE_FOOD], SUMMARY_TEXT_WHITE, ALIGN_LEFT); - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_template_likes_spicy + summaryScreen->monData.preferredFlavor, summaryScreen->strbuf); - Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[PSS_WINDOW_FAVORITE_FOOD], FONT_SYSTEM, summaryScreen->strbuf, 0, 16, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_template_likes_spicy + summaryScreen->monData.preferredFlavor, summaryScreen->strbuf); + Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[SUMMARY_WINDOW_FAVORITE_FOOD], FONT_SYSTEM, summaryScreen->strbuf, 0, 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_FAVORITE_FOOD]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_FAVORITE_FOOD]); } void PokemonSummaryScreen_PrintRibbonIndexAndMax(PokemonSummaryScreen *summaryScreen) { - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_INDEX], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_INDEX], 0); - Strbuf *buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, pss_ribbon_max_number); + Strbuf *buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, summary_ribbon_max_number); StringTemplate_SetNumber(summaryScreen->strFormatter, 0, summaryScreen->ribbonMax, 3, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(summaryScreen->strFormatter, summaryScreen->strbuf, buf); @@ -1324,16 +1324,16 @@ void PokemonSummaryScreen_PrintRibbonIndexAndMax(PokemonSummaryScreen *summarySc u8 strWidth = Font_CalcStrbufWidth(FONT_SYSTEM, summaryScreen->strbuf, 0); u8 xOffset = 7 * 8 - strWidth; - Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_INDEX], FONT_SYSTEM, summaryScreen->strbuf, xOffset, 0, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_INDEX], FONT_SYSTEM, summaryScreen->strbuf, xOffset, 0, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); - buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, pss_ribbon_number_slash); + buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, summary_ribbon_number_slash); strWidth = Font_CalcStrbufWidth(FONT_SYSTEM, buf, 0); xOffset -= strWidth; - Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_INDEX], FONT_SYSTEM, buf, xOffset, 0, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_INDEX], FONT_SYSTEM, buf, xOffset, 0, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); Strbuf_Free(buf); - buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, pss_ribbon_index_number); + buf = MessageLoader_GetNewStrbuf(summaryScreen->msgLoader, summary_ribbon_index_number); StringTemplate_SetNumber(summaryScreen->strFormatter, 0, summaryScreen->ribbonCol + summaryScreen->ribbonRow * RIBBONS_PER_ROW + 1, 3, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(summaryScreen->strFormatter, summaryScreen->strbuf, buf); @@ -1342,23 +1342,23 @@ void PokemonSummaryScreen_PrintRibbonIndexAndMax(PokemonSummaryScreen *summarySc strWidth = Font_CalcStrbufWidth(FONT_SYSTEM, summaryScreen->strbuf, 0); xOffset -= strWidth; - Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_INDEX], FONT_SYSTEM, summaryScreen->strbuf, xOffset, 0, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_INDEX]); + Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_INDEX], FONT_SYSTEM, summaryScreen->strbuf, xOffset, 0, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_INDEX]); } void PokemonSummaryScreen_PrintRibbonNameAndDesc(PokemonSummaryScreen *summaryScreen) { - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_NAME], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_DESCRIPTION], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_NAME], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_DESCRIPTION], 0); MessageLoader_GetStrbuf(summaryScreen->ribbonLoader, Ribbon_GetData(summaryScreen->ribbonNum, RIBBON_DATA_NAME_ID), summaryScreen->strbuf); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_RIBBON_NAME], PSS_TEXT_WHITE, ALIGN_LEFT); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_NAME], SUMMARY_TEXT_WHITE, ALIGN_LEFT); MessageLoader_GetStrbuf(summaryScreen->ribbonLoader, PokemonSummaryScreen_GetRibbonDescriptionID(summaryScreen->data->specialRibbons, summaryScreen->ribbonNum), summaryScreen->strbuf); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_RIBBON_DESCRIPTION], PSS_TEXT_BLACK, ALIGN_LEFT); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_DESCRIPTION], SUMMARY_TEXT_BLACK, ALIGN_LEFT); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_NAME]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_RIBBON_DESCRIPTION]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_NAME]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_RIBBON_DESCRIPTION]); } static void PrintMoveNameAndPP(PokemonSummaryScreen *summaryScreen, u32 moveIndex) @@ -1379,84 +1379,84 @@ static void PrintMoveNameAndPP(PokemonSummaryScreen *summaryScreen, u32 moveInde } MessageLoader_GetStrbuf(summaryScreen->moveNameLoader, moveName, summaryScreen->strbuf); - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, 1, 2, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_WHITE, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, 1, 2, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_WHITE, NULL); if (moveName != MOVE_NONE) { MessageLoader_GetStrbuf(summaryScreen->msgLoader, 135, summaryScreen->strbuf); - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, 16, 16, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, 16, 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); PrintCurrentAndMaxInfo(summaryScreen, moveIndex, 117, 136 + moveIndex, 141 + moveIndex, curPP, maxPP, 2, (40 + 20), 16); } else { MessageLoader_GetStrbuf(summaryScreen->msgLoader, 153, summaryScreen->strbuf); u32 strWidth = Font_CalcStrbufWidth(FONT_SYSTEM, summaryScreen->strbuf, 0); - Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, (40 + 20) - strWidth / 2, 16, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, summaryScreen->strbuf, (40 + 20) - strWidth / 2, 16, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); } } void PokemonSummaryScreen_PrintBattleMoveAttributes(PokemonSummaryScreen *summaryScreen, u32 move) { - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_MOVE_CATEGORY]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_MOVE_POWER]); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_MOVE_ACCURACY]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_MOVE_CATEGORY]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_MOVE_POWER]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_MOVE_ACCURACY]); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_POWER], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_ACCURACY], 0); - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_DESCRIPTION], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_POWER], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_ACCURACY], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_DESCRIPTION], 0); u32 moveAttribute = MoveTable_LoadParam(move, MOVEATTRIBUTE_POWER); if (moveAttribute <= 1) { - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_three_dashes, summaryScreen->strbuf); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_three_dashes, summaryScreen->strbuf); } else { - SetAndFormatNumberBuf(summaryScreen, pss_move_power_template, moveAttribute, 3, PADDING_MODE_SPACES); + SetAndFormatNumberBuf(summaryScreen, summary_move_power_template, moveAttribute, 3, PADDING_MODE_SPACES); } - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_POWER], PSS_TEXT_BLACK, ALIGN_CENTER); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_POWER], SUMMARY_TEXT_BLACK, ALIGN_CENTER); moveAttribute = MoveTable_LoadParam(move, MOVEATTRIBUTE_ACCURACY); if (moveAttribute == 0) { - MessageLoader_GetStrbuf(summaryScreen->msgLoader, pss_three_dashes, summaryScreen->strbuf); + MessageLoader_GetStrbuf(summaryScreen->msgLoader, summary_three_dashes, summaryScreen->strbuf); } else { - SetAndFormatNumberBuf(summaryScreen, pss_move_accuracy_template, moveAttribute, 3, PADDING_MODE_SPACES); + SetAndFormatNumberBuf(summaryScreen, summary_move_accuracy_template, moveAttribute, 3, PADDING_MODE_SPACES); } - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_ACCURACY], PSS_TEXT_BLACK, ALIGN_CENTER); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_ACCURACY], SUMMARY_TEXT_BLACK, ALIGN_CENTER); MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_move_descriptions, HEAP_ID_POKEMON_SUMMARY_SCREEN); MessageLoader_GetStrbuf(msgLoader, move, summaryScreen->strbuf); - PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_DESCRIPTION], PSS_TEXT_BLACK, ALIGN_LEFT); + PrintStrbufToWindow(summaryScreen, &summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_DESCRIPTION], SUMMARY_TEXT_BLACK, ALIGN_LEFT); MessageLoader_Free(msgLoader); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_POWER]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_ACCURACY]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_DESCRIPTION]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_POWER]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_ACCURACY]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_DESCRIPTION]); } void PokemonSummaryScreen_ClearBattleAttributeWindows(PokemonSummaryScreen *summaryScreen) { - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_MOVE_CATEGORY]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_MOVE_POWER]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_MOVE_ACCURACY]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_POWER]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_ACCURACY]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_DESCRIPTION]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_MOVE_CATEGORY]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_MOVE_POWER]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_MOVE_ACCURACY]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_POWER]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_ACCURACY]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_DESCRIPTION]); } void PokemonSummaryScreen_ShowMove5OrCancel(PokemonSummaryScreen *summaryScreen) { if (summaryScreen->data->move != MOVE_NONE) { - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_5], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_5], 0); PrintMoveNameAndPP(summaryScreen, LEARNED_MOVES_MAX); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_5]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_5]); } else { - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_MOVE_CANCEL]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_MOVE_CANCEL]); } } void PokemonSummaryScreen_HideMoveCancelText(PokemonSummaryScreen *summaryScreen) { - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_MOVE_CANCEL]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_MOVE_CANCEL]); Bg_ScheduleTilemapTransfer(summaryScreen->bgConfig, BG_LAYER_MAIN_1); } @@ -1476,76 +1476,76 @@ void PokemonSummaryScreen_PrintHMMovesCantBeForgotten(PokemonSummaryScreen *summ { Window *window; - if (summaryScreen->page == PSS_PAGE_BATTLE_MOVES) { - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_POWER]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_ACCURACY]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_DESCRIPTION]); - window = &summaryScreen->extraWindows[PSS_WINDOW_BATTLE_MOVE_DESCRIPTION]; + if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) { + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_POWER]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_ACCURACY]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_DESCRIPTION]); + window = &summaryScreen->extraWindows[SUMMARY_WINDOW_BATTLE_MOVE_DESCRIPTION]; } else { - window = &summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_DESCRIPTION]; + window = &summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_DESCRIPTION]; } Window_FillTilemap(window, 0); MessageLoader_GetStrbuf(summaryScreen->msgLoader, 156, summaryScreen->strbuf); - PrintStrbufToWindow(summaryScreen, window, PSS_TEXT_BLACK, ALIGN_LEFT); + PrintStrbufToWindow(summaryScreen, window, SUMMARY_TEXT_BLACK, ALIGN_LEFT); Window_ScheduleCopyToVRAM(window); } void PokemonSummaryScreen_PrintContestMoveAttributes(PokemonSummaryScreen *summaryScreen, u32 move) { - Window_FillTilemap(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_DESCRIPTION], 0); + Window_FillTilemap(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_DESCRIPTION], 0); u32 contestEffect = MoveTable_LoadParam(move, MOVEATTRIBUTE_CONTEST_EFFECT); u32 descEntryID = sub_0209577C(contestEffect); MessageLoader *msgLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_contest_effects, HEAP_ID_POKEMON_SUMMARY_SCREEN); MessageLoader_GetStrbuf(msgLoader, descEntryID, summaryScreen->strbuf); - Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_DESCRIPTION], FONT_SYSTEM, summaryScreen->strbuf, 0, 0, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK, NULL); + Text_AddPrinterWithParamsAndColor(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_DESCRIPTION], FONT_SYSTEM, summaryScreen->strbuf, 0, 0, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK, NULL); MessageLoader_Free(msgLoader); - Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_APPEAL_POINTS]); - Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_DESCRIPTION]); + Window_ScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_APPEAL_POINTS]); + Window_ScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_DESCRIPTION]); } void PokemonSummaryScreen_ClearContestAttributeWindows(PokemonSummaryScreen *summaryScreen) { - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[PSS_WINDOW_LABEL_APPEAL_POINTS]); - Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[PSS_WINDOW_CONTEST_MOVE_DESCRIPTION]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_LABEL_APPEAL_POINTS]); + Window_ClearAndScheduleCopyToVRAM(&summaryScreen->extraWindows[SUMMARY_WINDOW_CONTEST_MOVE_DESCRIPTION]); } -void PokemonSummaryScreen_PrintPoffinFeedMsg(PokemonSummaryScreen *summaryScreen, enum PSSPoffinFeedMsg msg) +void PokemonSummaryScreen_PrintPoffinFeedMsg(PokemonSummaryScreen *summaryScreen, enum SummaryPoffinFeedMsg msg) { u32 entryID; switch (msg) { - case PSS_MSG_COOLNESS_ENHANCED: - entryID = pss_coolness_enhanced; + case SUMMARY_MSG_COOLNESS_ENHANCED: + entryID = summary_coolness_enhanced; break; - case PSS_MSG_BEAUTY_ENHANCED: - entryID = pss_beauty_enhanced; + case SUMMARY_MSG_BEAUTY_ENHANCED: + entryID = summary_beauty_enhanced; break; - case PSS_MSG_CUTENESS_ENHANCED: - entryID = pss_cuteness_enhanced; + case SUMMARY_MSG_CUTENESS_ENHANCED: + entryID = summary_cuteness_enhanced; break; - case PSS_MSG_SMARTNESS_ENHANCED: - entryID = pss_smartness_enhanced; + case SUMMARY_MSG_SMARTNESS_ENHANCED: + entryID = summary_smartness_enhanced; break; - case PSS_MSG_TOUGHNESS_ENHANCED: - entryID = pss_toughness_enhanced; + case SUMMARY_MSG_TOUGHNESS_ENHANCED: + entryID = summary_toughness_enhanced; break; - case PSS_MSG_NOTHING_CHANGED: - entryID = pss_nothing_changed; + case SUMMARY_MSG_NOTHING_CHANGED: + entryID = summary_nothing_changed; break; default: - entryID = pss_pokemon_wont_eat_more; + entryID = summary_pokemon_wont_eat_more; } - Window *window = &summaryScreen->extraWindows[PSS_WINDOW_POFFIN_FEED_MSG]; + Window *window = &summaryScreen->extraWindows[SUMMARY_WINDOW_POFFIN_FEED_MSG]; Window_DrawMessageBoxWithScrollCursor(window, TRUE, (1024 - (18 + 12)), 13); Window_FillTilemap(window, 15); MessageLoader_GetStrbuf(summaryScreen->msgLoader, entryID, summaryScreen->strbuf); - Text_AddPrinterWithParamsAndColor(window, FONT_MESSAGE, summaryScreen->strbuf, 0, 0, TEXT_SPEED_NO_TRANSFER, PSS_TEXT_BLACK_DARK_SHADOW, NULL); + Text_AddPrinterWithParamsAndColor(window, FONT_MESSAGE, summaryScreen->strbuf, 0, 0, TEXT_SPEED_NO_TRANSFER, SUMMARY_TEXT_BLACK_DARK_SHADOW, NULL); Window_ScheduleCopyToVRAM(window); } diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c index 8020611571..79307245de 100644 --- a/src/unk_020989DC.c +++ b/src/unk_020989DC.c @@ -356,7 +356,7 @@ static int sub_02098D38(UnkStruct_02098BE4 *param0) Heap_FreeToHeap(param0->unk_10); - if (returnMode == PSS_RETURN_CANCEL) { + if (returnMode == SUMMARY_RETURN_CANCEL) { return 0; }