diff --git a/graphics/interface/pokesummary_unk_8463B00.pal b/graphics/interface/pokesummary_unk_8463B00.pal deleted file mode 100644 index 61af05b25..000000000 --- a/graphics/interface/pokesummary_unk_8463B00.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 164 164 -106 106 106 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/interface/pokesummary_unk_8463B44.pal b/graphics/interface/pokesummary_unk_8463B44.pal deleted file mode 100644 index 37aafef66..000000000 --- a/graphics/interface/pokesummary_unk_8463B44.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 213 82 -189 148 16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/interface/trainer_memo_pal.pal b/graphics/summary_screen/bg.pal similarity index 100% rename from graphics/interface/trainer_memo_pal.pal rename to graphics/summary_screen/bg.pal diff --git a/graphics/interface/trainer_memo.png b/graphics/summary_screen/bg.png similarity index 100% rename from graphics/interface/trainer_memo.png rename to graphics/summary_screen/bg.png diff --git a/graphics/interface/summary_exp_bar.png b/graphics/summary_screen/exp_bar.png similarity index 100% rename from graphics/interface/summary_exp_bar.png rename to graphics/summary_screen/exp_bar.png diff --git a/graphics/interface/summary_hp_bar.png b/graphics/summary_screen/hp_bar.png similarity index 100% rename from graphics/interface/summary_hp_bar.png rename to graphics/summary_screen/hp_bar.png diff --git a/graphics/interface/pokesummary_unk_8463ACC.pal b/graphics/summary_screen/hp_bar_red.pal similarity index 100% rename from graphics/interface/pokesummary_unk_8463ACC.pal rename to graphics/summary_screen/hp_bar_red.pal diff --git a/graphics/interface/pokesummary_unk_8463AAC.pal b/graphics/summary_screen/hp_bar_yellow.pal similarity index 100% rename from graphics/interface/pokesummary_unk_8463AAC.pal rename to graphics/summary_screen/hp_bar_yellow.pal diff --git a/graphics/interface/pokesummary_unk_84636E0.pal b/graphics/summary_screen/marking.pal similarity index 100% rename from graphics/interface/pokesummary_unk_84636E0.pal rename to graphics/summary_screen/marking.pal diff --git a/graphics/interface/pokesummary_unk_8463720.pal b/graphics/summary_screen/move_selection_cursor.pal similarity index 100% rename from graphics/interface/pokesummary_unk_8463720.pal rename to graphics/summary_screen/move_selection_cursor.pal diff --git a/graphics/interface/pokesummary_unk_8463740.png b/graphics/summary_screen/move_selection_cursor_left.png similarity index 100% rename from graphics/interface/pokesummary_unk_8463740.png rename to graphics/summary_screen/move_selection_cursor_left.png diff --git a/graphics/interface/pokesummary_unk_846386C.png b/graphics/summary_screen/move_selection_cursor_right.png similarity index 100% rename from graphics/interface/pokesummary_unk_846386C.png rename to graphics/summary_screen/move_selection_cursor_right.png diff --git a/graphics/interface/pokesummary_unk_8463B88.bin b/graphics/summary_screen/moves_info_page.bin similarity index 100% rename from graphics/interface/pokesummary_unk_8463B88.bin rename to graphics/summary_screen/moves_info_page.bin diff --git a/graphics/interface/pokesummary_unk_8463C80.bin b/graphics/summary_screen/moves_page.bin similarity index 100% rename from graphics/interface/pokesummary_unk_8463C80.bin rename to graphics/summary_screen/moves_page.bin diff --git a/graphics/interface/trainer_memo_5.bin b/graphics/summary_screen/page_egg.bin similarity index 100% rename from graphics/interface/trainer_memo_5.bin rename to graphics/summary_screen/page_egg.bin diff --git a/graphics/interface/trainer_memo.bin b/graphics/summary_screen/page_info.bin similarity index 100% rename from graphics/interface/trainer_memo.bin rename to graphics/summary_screen/page_info.bin diff --git a/graphics/interface/trainer_memo_3.bin b/graphics/summary_screen/page_moves.bin similarity index 100% rename from graphics/interface/trainer_memo_3.bin rename to graphics/summary_screen/page_moves.bin diff --git a/graphics/interface/trainer_memo_4.bin b/graphics/summary_screen/page_moves_info.bin similarity index 100% rename from graphics/interface/trainer_memo_4.bin rename to graphics/summary_screen/page_moves_info.bin diff --git a/graphics/interface/trainer_memo_2.bin b/graphics/summary_screen/page_skills.bin similarity index 100% rename from graphics/interface/trainer_memo_2.bin rename to graphics/summary_screen/page_skills.bin diff --git a/graphics/interface/pokesummary_unk_8463B20.png b/graphics/summary_screen/pokerus_cured.png similarity index 100% rename from graphics/interface/pokesummary_unk_8463B20.png rename to graphics/summary_screen/pokerus_cured.png diff --git a/graphics/interface/pokesummary_unk_8463B64.png b/graphics/summary_screen/shiny_star.png similarity index 100% rename from graphics/interface/pokesummary_unk_8463B64.png rename to graphics/summary_screen/shiny_star.png diff --git a/graphics/interface/status_ailment_icons.png b/graphics/summary_screen/status_ailment_icons.png similarity index 100% rename from graphics/interface/status_ailment_icons.png rename to graphics/summary_screen/status_ailment_icons.png diff --git a/graphics/interface/pokesummary_unk_84636C0.pal b/graphics/summary_screen/text_header.pal similarity index 100% rename from graphics/interface/pokesummary_unk_84636C0.pal rename to graphics/summary_screen/text_header.pal diff --git a/graphics/interface/pokesummary_unk_8463700.pal b/graphics/summary_screen/text_moves.pal similarity index 100% rename from graphics/interface/pokesummary_unk_8463700.pal rename to graphics/summary_screen/text_moves.pal diff --git a/src/graphics.c b/src/graphics.c index 31d3a8e2c..90dbb1849 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1191,24 +1191,22 @@ const u16 gEasyChatButtonWindow_Pal[] = INCBIN_U16("graphics/easy_chat/button_wi const u32 gEasyChatButtonWindow_Gfx[] = INCBIN_U32("graphics/easy_chat/button_window.4bpp.lz"); const u32 gEasyChatMode_Gfx[] = INCBIN_U32("graphics/easy_chat/mode.4bpp.lz"); -const u32 gPokeSumBgTiles[] = INCBIN_U32("graphics/interface/trainer_memo.4bpp.lz"); -const u32 gTrainerMemoPal[] = INCBIN_U32("graphics/interface/trainer_memo_pal.gbapal"); - -const u32 gPokeSummary_ExpBarTiles[] = INCBIN_U32("graphics/interface/summary_exp_bar.4bpp.lz"); -const u32 gPokeSummary_HpBarTiles[] = INCBIN_U32("graphics/interface/summary_hp_bar.4bpp.lz"); -const u16 gPokeSummary_ExpBarPals[] = INCBIN_U16("graphics/interface/summary_exp_bar.gbapal"); // hp bar uses this too - -const u32 gBgTilemap_TrainerMemo_Details[] = INCBIN_U32("graphics/interface/trainer_memo.bin.lz"); -const u32 gBgTilemap_TrainerMemo_Stats[] = INCBIN_U32("graphics/interface/trainer_memo_2.bin.lz"); -const u32 gBgTilemap_PokeSum_MovesListForDelete[] = INCBIN_U32("graphics/interface/trainer_memo_3.bin.lz"); -const u32 gBgTilemap_PokeSum_MoveDetailsForDelete[] = INCBIN_U32("graphics/interface/trainer_memo_4.bin.lz"); -const u32 gBgTilemap_TrainerMemo_Egg[] = INCBIN_U32("graphics/interface/trainer_memo_5.bin.lz"); +const u32 gSummaryScreen_Bg_Gfx[] = INCBIN_U32("graphics/summary_screen/bg.4bpp.lz"); +const u32 gSummaryScreen_Bg_Pal[] = INCBIN_U32("graphics/summary_screen/bg.gbapal"); +const u32 gSummaryScreen_ExpBar_Gfx[] = INCBIN_U32("graphics/summary_screen/exp_bar.4bpp.lz"); +const u32 gSummaryScreen_HpBar_Gfx[] = INCBIN_U32("graphics/summary_screen/hp_bar.4bpp.lz"); +const u16 gSummaryScreen_HpExpBar_Pal[] = INCBIN_U16("graphics/summary_screen/exp_bar.gbapal"); // hp bar uses this too +const u32 gSummaryScreen_PageInfo_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_info.bin.lz"); +const u32 gSummaryScreen_PageSkills_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_skills.bin.lz"); +const u32 gSummaryScreen_PageMoves_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_moves.bin.lz"); +const u32 gSummaryScreen_PageMovesInfo_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_moves_info.bin.lz"); +const u32 gSummaryScreen_PageEgg_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_egg.bin.lz"); const u16 gUnusedRedPalette[] = INCBIN_U16("graphics/unused/red_palette.gbapal"); const u32 gEasyChatRectangleCursor_Gfx[] = INCBIN_U32("graphics/easy_chat/rectangle_cursor.4bpp.lz"); -const u16 gPokeSummary_StatusAilmentIconPals[] = INCBIN_U16("graphics/interface/status_ailment_icons.gbapal"); -const u32 gPokeSummary_StatusAilmentIconTiles[] = INCBIN_U32("graphics/interface/status_ailment_icons.4bpp.lz"); +const u16 gSummaryScreen_StatusAilmentIcon_Pal[] = INCBIN_U16("graphics/summary_screen/status_ailment_icons.gbapal"); +const u32 gSummaryScreen_StatusAilmentIcon_Gfx[] = INCBIN_U32("graphics/summary_screen/status_ailment_icons.4bpp.lz"); const u16 gDexScreen_TopMenuIconPals_AtoZ[] = INCBIN_U16("graphics/pokedex/cat_icon_abc.gbapal"); const u32 gDexScreen_TopMenuIconTiles_AtoZ[] = INCBIN_U32("graphics/pokedex/cat_icon_abc.4bpp.lz"); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 01518a96f..bba8c7d5a 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -58,7 +58,7 @@ static void PokeSum_SetHelpContext(void); static void Task_HandleInput_SelectMove(u8 id); static void PokeSum_CopyNewBgTilemapBeforePageFlip_2(void); static void PokeSum_CopyNewBgTilemapBeforePageFlip(void); -static void PokeSum_DrawBg3Tilemap(void); +static void PokeSum_DrawPageProgressTiles(void); static void PokeSum_PrintRightPaneText(void); static void PokeSum_PrintBottomPaneText(void); static void PokeSum_PrintAbilityDataOrMoveTypes(void); @@ -327,26 +327,25 @@ static EWRAM_DATA u8 sMoveSelectionCursorPos = 0; static EWRAM_DATA u8 sMoveSwapCursorPos = 0; static EWRAM_DATA struct MonPicBounceState * sMonPicBounceState = NULL; -extern const u32 gBgTilemap_TrainerMemo_Stats[]; -extern const u32 gBgTilemap_PokeSum_MovesListForDelete[]; -extern const u32 gBgTilemap_TrainerMemo_Details[]; -extern const u32 gBgTilemap_PokeSum_MoveDetailsForDelete[]; -extern const u32 gBgTilemap_TrainerMemo_Egg[]; -extern const u16 gTrainerMemoPal[]; -extern const u32 gPokeSumBgTiles[]; -extern const u16 gPokeSummary_ExpBarPals[]; -extern const u32 gPokeSummary_StatusAilmentIconTiles[]; -extern const u16 gPokeSummary_StatusAilmentIconPals[]; -extern const u32 gPokeSummary_HpBarTiles[]; -extern const u32 gPokeSummary_ExpBarTiles[]; -extern const u16 gPokeSummary_ExpBarPals[]; +extern const u32 gSummaryScreen_PageSkills_Tilemap[]; +extern const u32 gSummaryScreen_PageMoves_Tilemap[]; +extern const u32 gSummaryScreen_PageInfo_Tilemap[]; +extern const u32 gSummaryScreen_PageMovesInfo_Tilemap[]; +extern const u32 gSummaryScreen_PageEgg_Tilemap[]; +extern const u16 gSummaryScreen_Bg_Pal[]; +extern const u32 gSummaryScreen_Bg_Gfx[]; +extern const u16 gSummaryScreen_HpExpBar_Pal[]; +extern const u32 gSummaryScreen_StatusAilmentIcon_Gfx[]; +extern const u16 gSummaryScreen_StatusAilmentIcon_Pal[]; +extern const u32 gSummaryScreen_HpBar_Gfx[]; +extern const u32 gSummaryScreen_ExpBar_Gfx[]; -static const u32 sBgPal7[] = INCBIN_U32("graphics/interface/pokesummary_unk_84636C0.gbapal"); -static const u16 sMonMarkingSpritePalette[] = INCBIN_U16("graphics/interface/pokesummary_unk_84636E0.gbapal"); -static const u32 sBgPal8[] = INCBIN_U32("graphics/interface/pokesummary_unk_8463700.gbapal"); -static const u16 sMoveSelectionCursorPals[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463720.gbapal"); -static const u32 sMoveSelectionCursorTiles_Left[] = INCBIN_U32("graphics/interface/pokesummary_unk_8463740.4bpp.lz"); -static const u32 sMoveSelectionCursorTiles_Right[] = INCBIN_U32("graphics/interface/pokesummary_unk_846386C.4bpp.lz"); +static const u32 sTextHeaderPalette[] = INCBIN_U32("graphics/summary_screen/text_header.gbapal"); +static const u16 sMonMarkingSpritePalette[] = INCBIN_U16("graphics/summary_screen/marking.gbapal"); +static const u32 sTextMovesPalette[] = INCBIN_U32("graphics/summary_screen/text_moves.gbapal"); +static const u16 sMoveSelectionCursorPals[] = INCBIN_U16("graphics/summary_screen/move_selection_cursor.gbapal"); +static const u32 sMoveSelectionCursorTiles_Left[] = INCBIN_U32("graphics/summary_screen/move_selection_cursor_left.4bpp.lz"); +static const u32 sMoveSelectionCursorTiles_Right[] = INCBIN_U32("graphics/summary_screen/move_selection_cursor_right.4bpp.lz"); static const struct OamData sMoveSelectionCursorOamData = { @@ -560,8 +559,8 @@ static const union AnimCmd * const sHpOrExpBarAnimTable[] = sHpOrExpAnim_11 }; -static const u16 sPokeSummary_HpBarPalYellow[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463AAC.gbapal"); -static const u16 sPokeSummary_HpBarPalRed[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463ACC.gbapal"); +static const u16 sPokeSummary_HpBarPalYellow[] = INCBIN_U16("graphics/summary_screen/hp_bar_yellow.gbapal"); +static const u16 sPokeSummary_HpBarPalRed[] = INCBIN_U16("graphics/summary_screen/hp_bar_red.gbapal"); static const struct OamData sPokerusIconObjOamData = { .y = 0, @@ -589,8 +588,8 @@ static const union AnimCmd * const sPokerusIconObjAnimTable[] = sPokerusIconObjAnim0 }; -static const u16 sPokerusIconObjPal[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463B00.gbapal"); -static const u32 sPokerusIconObjTiles[] = INCBIN_U32("graphics/interface/pokesummary_unk_8463B20.4bpp.lz"); +static const u16 sPokerusIconObjPal[] = INCBIN_U16("graphics/summary_screen/pokerus_cured.gbapal"); +static const u32 sPokerusIconObjTiles[] = INCBIN_U32("graphics/summary_screen/pokerus_cured.4bpp.lz"); static const struct OamData sStarObjOamData = { @@ -619,10 +618,10 @@ static const union AnimCmd * const sStarObjAnimTable[] = sStarObjAnim0 }; -static const u16 sStarObjPal[] = INCBIN_U16( "graphics/interface/pokesummary_unk_8463B44.gbapal"); -static const u32 sStarObjTiles[] = INCBIN_U32( "graphics/interface/pokesummary_unk_8463B64.4bpp.lz"); -static const u32 sBgTilemap_MovesInfoPage[] = INCBIN_U32( "graphics/interface/pokesummary_unk_8463B88.bin.lz"); -static const u32 sBgTilemap_MovesPage[] = INCBIN_U32( "graphics/interface/pokesummary_unk_8463C80.bin.lz"); +static const u16 sStarObjPal[] = INCBIN_U16( "graphics/summary_screen/shiny_star.gbapal"); +static const u32 sStarObjTiles[] = INCBIN_U32( "graphics/summary_screen/shiny_star.4bpp.lz"); +static const u32 sBgTilemap_MovesInfoPage[] = INCBIN_U32( "graphics/summary_screen/moves_info_page.bin.lz"); +static const u32 sBgTilemap_MovesPage[] = INCBIN_U32( "graphics/summary_screen/moves_page.bin.lz"); #include "data/text/nature_names.h" @@ -959,7 +958,7 @@ static const s8 sEggPicShakeXDelta_AlmostReadyToHatch[] = static const u16 * const sHpBarPals[] = { - gPokeSummary_ExpBarPals, + gSummaryScreen_HpExpBar_Pal, sPokeSummary_HpBarPalYellow, sPokeSummary_HpBarPalRed, }; @@ -1262,7 +1261,7 @@ static void Task_PokeSum_FlipPages(u8 taskId) case 2: PokeSum_CopyNewBgTilemapBeforePageFlip_2(); PokeSum_CopyNewBgTilemapBeforePageFlip(); - PokeSum_DrawBg3Tilemap(); + PokeSum_DrawPageProgressTiles(); PokeSum_PrintPageHeaderText(sMonSummaryScreen->curPageIndex); break; case 3: @@ -1358,7 +1357,7 @@ static void Task_FlipPages_FromInfo(u8 taskId) PokeSum_HideSpritesBeforePageFlip(); PokeSum_UpdateWin1ActiveFlag(sMonSummaryScreen->curPageIndex); PokeSum_CopyNewBgTilemapBeforePageFlip(); - PokeSum_DrawBg3Tilemap(); + PokeSum_DrawPageProgressTiles(); PokeSum_CopyNewBgTilemapBeforePageFlip_2(); break; case 3: @@ -1510,7 +1509,7 @@ static void Task_BackOutOfSelectMove(u8 taskId) break; case 10: PokeSum_CopyNewBgTilemapBeforePageFlip(); - PokeSum_DrawBg3Tilemap(); + PokeSum_DrawPageProgressTiles(); CopyBgTilemapBufferToVram(3); PokeSum_ShowSpritesBeforePageFlip(); break; @@ -1838,24 +1837,24 @@ static void PokeSum_CopyNewBgTilemapBeforePageFlip_2(void) switch (newPage) { case PSS_PAGE_INFO: - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); break; case PSS_PAGE_SKILLS: if (sMonSummaryScreen->pageFlipDirection == 1) - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_PokeSum_MovesListForDelete, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageMoves_Tilemap, 0, 0); else - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_TrainerMemo_Details, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageInfo_Tilemap, 0, 0); break; case PSS_PAGE_MOVES: if (sMonSummaryScreen->pageFlipDirection == 1) - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_PokeSum_MoveDetailsForDelete, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageMovesInfo_Tilemap, 0, 0); else - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); break; case PSS_PAGE_MOVES_INFO: - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_PokeSum_MovesListForDelete, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageMoves_Tilemap, 0, 0); break; } } @@ -1872,7 +1871,7 @@ static void PokeSum_CopyNewBgTilemapBeforePageFlip(void) switch (newPage) { case PSS_PAGE_INFO: - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); break; case PSS_PAGE_SKILLS: break; @@ -1933,22 +1932,22 @@ static void CB2_SetUpPSS(void) else CopyToBgTilemapBuffer(3, sBgTilemap_MovesInfoPage, 0, 0); - PokeSum_DrawBg3Tilemap(); + PokeSum_DrawPageProgressTiles(); break; case 11: if (sMonSummaryScreen->isEgg) - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_TrainerMemo_Egg, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageEgg_Tilemap, 0, 0); else { if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE || sMonSummaryScreen->mode == PSS_MODE_FORGET_MOVE) { - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_PokeSum_MovesListForDelete, 0, 0); - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_PokeSum_MoveDetailsForDelete, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageMoves_Tilemap, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageMovesInfo_Tilemap, 0, 0); } else { - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_TrainerMemo_Details, 0, 0); - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageInfo_Tilemap, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); } } @@ -2007,28 +2006,28 @@ static u8 PokeSum_HandleLoadBgGfx(void) switch (sMonSummaryScreen->loadBgGfxStep) { case 0: - LoadPalette(gTrainerMemoPal, 0, 0x20 * 5); + LoadPalette(gSummaryScreen_Bg_Pal, 0, 0x20 * 5); if (IsMonShiny(&sMonSummaryScreen->currentMon) == TRUE && !sMonSummaryScreen->isEgg) { - LoadPalette(&gTrainerMemoPal[16 * 6], 0, 0x20); - LoadPalette(&gTrainerMemoPal[16 * 5], 0x10, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 6], 0, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 5], 0x10, 0x20); } else { - LoadPalette(&gTrainerMemoPal[16 * 0], 0, 0x20); - LoadPalette(&gTrainerMemoPal[16 * 1], 0x10, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 0], 0, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 1], 0x10, 0x20); } break; case 1: ListMenuLoadStdPalAt(0x60, 1); - LoadPalette(sBgPal7, 0x70, 0x20); + LoadPalette(sTextHeaderPalette, 0x70, 0x20); break; case 2: ResetTempTileDataBuffers(); break; case 3: - DecompressAndCopyTileDataToVram(2, gPokeSumBgTiles, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, gSummaryScreen_Bg_Gfx, 0, 0, 0); break; case 4: if (FreeTempTileDataBuffersIfPossible() == TRUE) @@ -2040,7 +2039,7 @@ static u8 PokeSum_HandleLoadBgGfx(void) break; default: - LoadPalette(sBgPal8, 0x80, 0x20); + LoadPalette(sTextMovesPalette, 0x80, 0x20); return TRUE; } @@ -3272,86 +3271,86 @@ static u8 PokeSum_BufferOtName_IsEqualToCurrentOwner(struct Pokemon * mon) return TRUE; } -#define SUB_8138538_BASE_TILE_NUM (345) +#define PAGE_PROGRESS_BASE_TILE_NUM (345) -static void PokeSum_DrawBg3Tilemap(void) +static void PokeSum_DrawPageProgressTiles(void) { switch (sMonSummaryScreen->curPageIndex) { case PSS_PAGE_INFO: if (!sMonSummaryScreen->isEgg) { - FillBgTilemapBufferRect(3, 17 + SUB_8138538_BASE_TILE_NUM, 13, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 33 + SUB_8138538_BASE_TILE_NUM, 13, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 16 + SUB_8138538_BASE_TILE_NUM, 14, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 32 + SUB_8138538_BASE_TILE_NUM, 14, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 18 + SUB_8138538_BASE_TILE_NUM, 15, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 34 + SUB_8138538_BASE_TILE_NUM, 15, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 20 + SUB_8138538_BASE_TILE_NUM, 16, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 36 + SUB_8138538_BASE_TILE_NUM, 16, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 18 + SUB_8138538_BASE_TILE_NUM, 17, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 34 + SUB_8138538_BASE_TILE_NUM, 17, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 21 + SUB_8138538_BASE_TILE_NUM, 18, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 37 + SUB_8138538_BASE_TILE_NUM, 18, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 17 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 33 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 16 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 32 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 18 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 34 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 20 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 36 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 18 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 34 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 21 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 37 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 1, 1, 1, 0); } else { - FillBgTilemapBufferRect(3, 17 + SUB_8138538_BASE_TILE_NUM, 13, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 33 + SUB_8138538_BASE_TILE_NUM, 13, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 48 + SUB_8138538_BASE_TILE_NUM, 14, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 64 + SUB_8138538_BASE_TILE_NUM, 14, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 2 + SUB_8138538_BASE_TILE_NUM, 15, 0, 4, 2, 0); + FillBgTilemapBufferRect(3, 17 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 33 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 48 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 64 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 2 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 0, 4, 2, 0); } break; case PSS_PAGE_SKILLS: - FillBgTilemapBufferRect(3, 49 + SUB_8138538_BASE_TILE_NUM, 13, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 65 + SUB_8138538_BASE_TILE_NUM, 13, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 14, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 14, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 17 + SUB_8138538_BASE_TILE_NUM, 15, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 33 + SUB_8138538_BASE_TILE_NUM, 15, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 16 + SUB_8138538_BASE_TILE_NUM, 16, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 32 + SUB_8138538_BASE_TILE_NUM, 16, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 18 + SUB_8138538_BASE_TILE_NUM, 17, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 34 + SUB_8138538_BASE_TILE_NUM, 17, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 21 + SUB_8138538_BASE_TILE_NUM, 18, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 37 + SUB_8138538_BASE_TILE_NUM, 18, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 49 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 65 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 17 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 33 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 16 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 32 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 18 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 34 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 21 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 37 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 1, 1, 1, 0); break; case PSS_PAGE_MOVES: - FillBgTilemapBufferRect(3, 49 + SUB_8138538_BASE_TILE_NUM, 13, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 65 + SUB_8138538_BASE_TILE_NUM, 13, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 14, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 14, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 49 + SUB_8138538_BASE_TILE_NUM, 15, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 65 + SUB_8138538_BASE_TILE_NUM, 15, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 16, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 16, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 17 + SUB_8138538_BASE_TILE_NUM, 17, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 33 + SUB_8138538_BASE_TILE_NUM, 17, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 48 + SUB_8138538_BASE_TILE_NUM, 18, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 64 + SUB_8138538_BASE_TILE_NUM, 18, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 49 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 65 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 49 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 65 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 17 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 33 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 48 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 64 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 1, 1, 1, 0); break; case PSS_PAGE_MOVES_INFO: if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) { - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 13, 0, 4, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 13, 1, 4, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 4, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 4, 1, 0); } else { - FillBgTilemapBufferRect(3, 49 + SUB_8138538_BASE_TILE_NUM, 13, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 65 + SUB_8138538_BASE_TILE_NUM, 13, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 14, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 14, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 49 + SUB_8138538_BASE_TILE_NUM, 15, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 65 + SUB_8138538_BASE_TILE_NUM, 15, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 1 + SUB_8138538_BASE_TILE_NUM, 16, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 19 + SUB_8138538_BASE_TILE_NUM, 16, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 49 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 65 + PAGE_PROGRESS_BASE_TILE_NUM, 13, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 14, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 49 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 65 + PAGE_PROGRESS_BASE_TILE_NUM, 15, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 1 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 19 + PAGE_PROGRESS_BASE_TILE_NUM, 16, 1, 1, 1, 0); } - FillBgTilemapBufferRect(3, 50 + SUB_8138538_BASE_TILE_NUM, 17, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 66 + SUB_8138538_BASE_TILE_NUM, 17, 1, 1, 1, 0); - FillBgTilemapBufferRect(3, 48 + SUB_8138538_BASE_TILE_NUM, 18, 0, 1, 1, 0); - FillBgTilemapBufferRect(3, 64 + SUB_8138538_BASE_TILE_NUM, 18, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 50 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 66 + PAGE_PROGRESS_BASE_TILE_NUM, 17, 1, 1, 1, 0); + FillBgTilemapBufferRect(3, 48 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 0, 1, 1, 0); + FillBgTilemapBufferRect(3, 64 + PAGE_PROGRESS_BASE_TILE_NUM, 18, 1, 1, 1, 0); break; } } @@ -4309,7 +4308,7 @@ static void CreateMonStatusIconObj(u16 tileTag, u16 palTag) sStatusIcon = AllocZeroed(sizeof(struct MonStatusIconObj)); gfxBufferPtr = AllocZeroed(0x20 * 32); - LZ77UnCompWram(gPokeSummary_StatusAilmentIconTiles, gfxBufferPtr); + LZ77UnCompWram(gSummaryScreen_StatusAilmentIcon_Gfx, gfxBufferPtr); if (sStatusIcon != NULL) { @@ -4319,7 +4318,7 @@ static void CreateMonStatusIconObj(u16 tileTag, u16 palTag) .tag = tileTag }; - struct SpritePalette palette = {.data = gPokeSummary_StatusAilmentIconPals, .tag = palTag}; + struct SpritePalette palette = {.data = gSummaryScreen_StatusAilmentIcon_Pal, .tag = palTag}; struct SpriteTemplate template = { .tileTag = tileTag, .paletteTag = palTag, @@ -4401,7 +4400,7 @@ static void CreateHpBarObjs(u16 tileTag, u16 palTag) sHpBarObjs = AllocZeroed(sizeof(struct HpBarObjs)); gfxBufferPtr = AllocZeroed(0x20 * 12); - LZ77UnCompWram(gPokeSummary_HpBarTiles, gfxBufferPtr); + LZ77UnCompWram(gSummaryScreen_HpBar_Gfx, gfxBufferPtr); curHp = GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_HP); maxHp = GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_MAX_HP); @@ -4559,7 +4558,7 @@ static void CreateExpBarObjs(u16 tileTag, u16 palTag) sExpBarObjs = AllocZeroed(sizeof(struct ExpBarObjs)); gfxBufferPtr = AllocZeroed(0x20 * 12); - LZ77UnCompWram(gPokeSummary_ExpBarTiles, gfxBufferPtr); + LZ77UnCompWram(gSummaryScreen_ExpBar_Gfx, gfxBufferPtr); if (gfxBufferPtr != NULL) { struct SpriteSheet sheet = { @@ -4568,7 +4567,7 @@ static void CreateExpBarObjs(u16 tileTag, u16 palTag) .tag = tileTag }; - struct SpritePalette palette = {.data = gPokeSummary_ExpBarPals, .tag = palTag}; + struct SpritePalette palette = {.data = gSummaryScreen_HpExpBar_Pal, .tag = palTag}; LoadSpriteSheet(&sheet); LoadSpritePalette(&palette); } @@ -5079,13 +5078,13 @@ static void Task_PokeSum_SwitchDisplayedPokemon(u8 taskId) if (IsMonShiny(&sMonSummaryScreen->currentMon) == TRUE && !sMonSummaryScreen->isEgg) { - LoadPalette(&gTrainerMemoPal[16 * 6], 0, 0x20); - LoadPalette(&gTrainerMemoPal[16 * 5], 0x10, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 6], 0, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 5], 0x10, 0x20); } else { - LoadPalette(&gTrainerMemoPal[16 * 0], 0, 0x20); - LoadPalette(&gTrainerMemoPal[16 * 1], 0x10, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 0], 0, 0x20); + LoadPalette(&gSummaryScreen_Bg_Pal[16 * 1], 0x10, 0x20); } sMonSummaryScreen->switchMonTaskState++; @@ -5095,13 +5094,13 @@ static void Task_PokeSum_SwitchDisplayedPokemon(u8 taskId) { if (sMonSummaryScreen->isEgg) { - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_TrainerMemo_Egg, 0, 0); - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageEgg_Tilemap, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); } else { - CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gBgTilemap_TrainerMemo_Details, 0, 0); - CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gBgTilemap_TrainerMemo_Stats, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->skillsPageBgNum, gSummaryScreen_PageInfo_Tilemap, 0, 0); + CopyToBgTilemapBuffer(sMonSummaryScreen->infoAndMovesPageBgNum, gSummaryScreen_PageSkills_Tilemap, 0, 0); } } sMonSummaryScreen->switchMonTaskState++; @@ -5130,7 +5129,7 @@ static void Task_PokeSum_SwitchDisplayedPokemon(u8 taskId) break; case 9: PokeSum_PrintMonTypeIcons(); - PokeSum_DrawBg3Tilemap(); + PokeSum_DrawPageProgressTiles(); PokeSum_PrintPageHeaderText(sMonSummaryScreen->curPageIndex); sMonSummaryScreen->switchMonTaskState++; break;