From 7103839a615463eeadeb671ad75436dd2e4a52e3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 11:14:59 -0500 Subject: Move summary screen graphics out of interface, fix some names --- graphics/interface/appealjam_tilemap.bin | Bin 160 -> 0 bytes graphics/interface/powacc_tilemap.bin | Bin 160 -> 0 bytes graphics/interface/status_tilemap.bin | Bin 40 -> 0 bytes graphics/interface/summary.bin | Bin 128 -> 0 bytes graphics/interface/summary_a_button.png | Bin 225 -> 0 bytes graphics/interface/summary_b_button.png | Bin 225 -> 0 bytes graphics/interface/summary_frames.png | Bin 273 -> 0 bytes graphics/interface/summary_markings.pal | 19 ---- graphics/interface/summary_page_battle_moves.bin | Bin 2048 -> 0 bytes graphics/interface/summary_page_contest_moves.bin | Bin 2048 -> 0 bytes graphics/interface/summary_page_info.bin | Bin 2048 -> 0 bytes graphics/interface/summary_page_info_copy.bin | Bin 2048 -> 0 bytes graphics/interface/summary_page_skills.bin | Bin 2048 -> 0 bytes graphics/interface/summary_screen.pal | 131 ---------------------- graphics/interface/summary_screen.png | Bin 1633 -> 0 bytes graphics/summary_screen/a_button.png | Bin 0 -> 225 bytes graphics/summary_screen/b_button.png | Bin 0 -> 225 bytes graphics/summary_screen/effect_battle.bin | Bin 0 -> 160 bytes graphics/summary_screen/effect_cancel.bin | Bin 0 -> 128 bytes graphics/summary_screen/effect_contest.bin | Bin 0 -> 160 bytes graphics/summary_screen/markings.pal | 19 ++++ graphics/summary_screen/move_select.png | Bin 0 -> 273 bytes graphics/summary_screen/page_battle_moves.bin | Bin 0 -> 2048 bytes graphics/summary_screen/page_contest_moves.bin | Bin 0 -> 2048 bytes graphics/summary_screen/page_info.bin | Bin 0 -> 2048 bytes graphics/summary_screen/page_info_egg.bin | Bin 0 -> 2048 bytes graphics/summary_screen/page_skills.bin | Bin 0 -> 2048 bytes graphics/summary_screen/status_tilemap.bin | Bin 0 -> 40 bytes graphics/summary_screen/tiles.pal | 131 ++++++++++++++++++++++ graphics/summary_screen/tiles.png | Bin 0 -> 1633 bytes include/graphics.h | 8 +- src/graphics.c | 24 ++-- src/pokemon_summary_screen.c | 33 +++--- 33 files changed, 183 insertions(+), 182 deletions(-) delete mode 100644 graphics/interface/appealjam_tilemap.bin delete mode 100644 graphics/interface/powacc_tilemap.bin delete mode 100644 graphics/interface/status_tilemap.bin delete mode 100644 graphics/interface/summary.bin delete mode 100644 graphics/interface/summary_a_button.png delete mode 100644 graphics/interface/summary_b_button.png delete mode 100644 graphics/interface/summary_frames.png delete mode 100644 graphics/interface/summary_markings.pal delete mode 100644 graphics/interface/summary_page_battle_moves.bin delete mode 100644 graphics/interface/summary_page_contest_moves.bin delete mode 100644 graphics/interface/summary_page_info.bin delete mode 100644 graphics/interface/summary_page_info_copy.bin delete mode 100644 graphics/interface/summary_page_skills.bin delete mode 100644 graphics/interface/summary_screen.pal delete mode 100644 graphics/interface/summary_screen.png create mode 100644 graphics/summary_screen/a_button.png create mode 100644 graphics/summary_screen/b_button.png create mode 100644 graphics/summary_screen/effect_battle.bin create mode 100644 graphics/summary_screen/effect_cancel.bin create mode 100644 graphics/summary_screen/effect_contest.bin create mode 100644 graphics/summary_screen/markings.pal create mode 100644 graphics/summary_screen/move_select.png create mode 100644 graphics/summary_screen/page_battle_moves.bin create mode 100644 graphics/summary_screen/page_contest_moves.bin create mode 100644 graphics/summary_screen/page_info.bin create mode 100644 graphics/summary_screen/page_info_egg.bin create mode 100644 graphics/summary_screen/page_skills.bin create mode 100644 graphics/summary_screen/status_tilemap.bin create mode 100644 graphics/summary_screen/tiles.pal create mode 100644 graphics/summary_screen/tiles.png diff --git a/graphics/interface/appealjam_tilemap.bin b/graphics/interface/appealjam_tilemap.bin deleted file mode 100644 index 0b3837ae2..000000000 Binary files a/graphics/interface/appealjam_tilemap.bin and /dev/null differ diff --git a/graphics/interface/powacc_tilemap.bin b/graphics/interface/powacc_tilemap.bin deleted file mode 100644 index 5b492db68..000000000 Binary files a/graphics/interface/powacc_tilemap.bin and /dev/null differ diff --git a/graphics/interface/status_tilemap.bin b/graphics/interface/status_tilemap.bin deleted file mode 100644 index 961d7a329..000000000 Binary files a/graphics/interface/status_tilemap.bin and /dev/null differ diff --git a/graphics/interface/summary.bin b/graphics/interface/summary.bin deleted file mode 100644 index 0a19222a3..000000000 Binary files a/graphics/interface/summary.bin and /dev/null differ diff --git a/graphics/interface/summary_a_button.png b/graphics/interface/summary_a_button.png deleted file mode 100644 index 4607ca9da..000000000 Binary files a/graphics/interface/summary_a_button.png and /dev/null differ diff --git a/graphics/interface/summary_b_button.png b/graphics/interface/summary_b_button.png deleted file mode 100644 index 32ce28e04..000000000 Binary files a/graphics/interface/summary_b_button.png and /dev/null differ diff --git a/graphics/interface/summary_frames.png b/graphics/interface/summary_frames.png deleted file mode 100644 index 2a579b012..000000000 Binary files a/graphics/interface/summary_frames.png and /dev/null differ diff --git a/graphics/interface/summary_markings.pal b/graphics/interface/summary_markings.pal deleted file mode 100644 index 08124207d..000000000 --- a/graphics/interface/summary_markings.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -164 148 222 -172 156 238 -255 255 255 -205 205 205 -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/summary_page_battle_moves.bin b/graphics/interface/summary_page_battle_moves.bin deleted file mode 100644 index f835047d1..000000000 Binary files a/graphics/interface/summary_page_battle_moves.bin and /dev/null differ diff --git a/graphics/interface/summary_page_contest_moves.bin b/graphics/interface/summary_page_contest_moves.bin deleted file mode 100644 index 9c11ccc4f..000000000 Binary files a/graphics/interface/summary_page_contest_moves.bin and /dev/null differ diff --git a/graphics/interface/summary_page_info.bin b/graphics/interface/summary_page_info.bin deleted file mode 100644 index 771d4db93..000000000 Binary files a/graphics/interface/summary_page_info.bin and /dev/null differ diff --git a/graphics/interface/summary_page_info_copy.bin b/graphics/interface/summary_page_info_copy.bin deleted file mode 100644 index a869a9d03..000000000 Binary files a/graphics/interface/summary_page_info_copy.bin and /dev/null differ diff --git a/graphics/interface/summary_page_skills.bin b/graphics/interface/summary_page_skills.bin deleted file mode 100644 index 19cb94637..000000000 Binary files a/graphics/interface/summary_page_skills.bin and /dev/null differ diff --git a/graphics/interface/summary_screen.pal b/graphics/interface/summary_screen.pal deleted file mode 100644 index badbfe53b..000000000 --- a/graphics/interface/summary_screen.pal +++ /dev/null @@ -1,131 +0,0 @@ -JASC-PAL -0100 -128 -180 180 115 -74 65 57 -255 255 255 -222 230 246 -213 213 189 -246 255 255 -115 106 98 -98 156 222 -74 148 189 -57 148 164 -32 148 139 -16 148 115 -156 222 164 -98 180 139 -49 139 115 -0 106 98 -180 180 115 -74 65 57 -255 255 255 -90 106 0 -123 139 32 -255 246 205 -115 106 98 -90 222 123 -90 205 98 -90 189 74 -98 172 49 -98 156 24 -238 164 255 -189 156 164 -148 148 82 -106 148 0 -180 180 115 -74 65 57 -255 255 255 -172 180 172 -205 205 197 -246 255 238 -115 106 98 -238 222 24 -213 189 57 -189 164 98 -164 139 131 -139 115 172 -205 222 123 -172 172 148 -139 131 180 -115 90 213 -180 180 115 -74 65 57 -255 255 255 -0 0 0 -0 0 0 -246 255 246 -115 106 98 -222 24 238 -189 16 238 -164 8 238 -131 8 246 -106 0 246 -172 222 222 -139 148 230 -106 74 238 -82 0 255 -180 180 115 -74 65 57 -148 32 172 -189 106 213 -230 189 255 -255 255 255 -213 148 246 -189 139 205 -255 230 255 -230 180 213 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -115 98 90 -180 180 115 -74 65 57 -255 255 255 -222 230 246 -246 246 222 -246 255 255 -115 106 98 -255 205 74 -230 164 98 -205 123 123 -180 82 148 -156 41 172 -230 156 255 -197 98 238 -164 49 222 -131 0 205 -98 180 106 -0 0 0 -213 213 205 -255 255 255 -98 98 98 -230 8 8 -255 189 115 -65 205 255 -0 139 189 -255 156 148 -189 90 82 -139 246 255 -24 164 213 -255 189 180 -213 115 106 -0 0 0 -98 180 106 -0 0 0 -213 213 205 -255 255 255 -98 98 98 -230 8 8 -255 189 115 -238 238 172 -164 164 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 0 0 -164 0 0 -255 255 255 diff --git a/graphics/interface/summary_screen.png b/graphics/interface/summary_screen.png deleted file mode 100644 index 2f9f8db85..000000000 Binary files a/graphics/interface/summary_screen.png and /dev/null differ diff --git a/graphics/summary_screen/a_button.png b/graphics/summary_screen/a_button.png new file mode 100644 index 000000000..4607ca9da Binary files /dev/null and b/graphics/summary_screen/a_button.png differ diff --git a/graphics/summary_screen/b_button.png b/graphics/summary_screen/b_button.png new file mode 100644 index 000000000..32ce28e04 Binary files /dev/null and b/graphics/summary_screen/b_button.png differ diff --git a/graphics/summary_screen/effect_battle.bin b/graphics/summary_screen/effect_battle.bin new file mode 100644 index 000000000..5b492db68 Binary files /dev/null and b/graphics/summary_screen/effect_battle.bin differ diff --git a/graphics/summary_screen/effect_cancel.bin b/graphics/summary_screen/effect_cancel.bin new file mode 100644 index 000000000..0a19222a3 Binary files /dev/null and b/graphics/summary_screen/effect_cancel.bin differ diff --git a/graphics/summary_screen/effect_contest.bin b/graphics/summary_screen/effect_contest.bin new file mode 100644 index 000000000..0b3837ae2 Binary files /dev/null and b/graphics/summary_screen/effect_contest.bin differ diff --git a/graphics/summary_screen/markings.pal b/graphics/summary_screen/markings.pal new file mode 100644 index 000000000..08124207d --- /dev/null +++ b/graphics/summary_screen/markings.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +164 148 222 +172 156 238 +255 255 255 +205 205 205 +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/summary_screen/move_select.png b/graphics/summary_screen/move_select.png new file mode 100644 index 000000000..2a579b012 Binary files /dev/null and b/graphics/summary_screen/move_select.png differ diff --git a/graphics/summary_screen/page_battle_moves.bin b/graphics/summary_screen/page_battle_moves.bin new file mode 100644 index 000000000..f835047d1 Binary files /dev/null and b/graphics/summary_screen/page_battle_moves.bin differ diff --git a/graphics/summary_screen/page_contest_moves.bin b/graphics/summary_screen/page_contest_moves.bin new file mode 100644 index 000000000..9c11ccc4f Binary files /dev/null and b/graphics/summary_screen/page_contest_moves.bin differ diff --git a/graphics/summary_screen/page_info.bin b/graphics/summary_screen/page_info.bin new file mode 100644 index 000000000..771d4db93 Binary files /dev/null and b/graphics/summary_screen/page_info.bin differ diff --git a/graphics/summary_screen/page_info_egg.bin b/graphics/summary_screen/page_info_egg.bin new file mode 100644 index 000000000..a869a9d03 Binary files /dev/null and b/graphics/summary_screen/page_info_egg.bin differ diff --git a/graphics/summary_screen/page_skills.bin b/graphics/summary_screen/page_skills.bin new file mode 100644 index 000000000..19cb94637 Binary files /dev/null and b/graphics/summary_screen/page_skills.bin differ diff --git a/graphics/summary_screen/status_tilemap.bin b/graphics/summary_screen/status_tilemap.bin new file mode 100644 index 000000000..961d7a329 Binary files /dev/null and b/graphics/summary_screen/status_tilemap.bin differ diff --git a/graphics/summary_screen/tiles.pal b/graphics/summary_screen/tiles.pal new file mode 100644 index 000000000..badbfe53b --- /dev/null +++ b/graphics/summary_screen/tiles.pal @@ -0,0 +1,131 @@ +JASC-PAL +0100 +128 +180 180 115 +74 65 57 +255 255 255 +222 230 246 +213 213 189 +246 255 255 +115 106 98 +98 156 222 +74 148 189 +57 148 164 +32 148 139 +16 148 115 +156 222 164 +98 180 139 +49 139 115 +0 106 98 +180 180 115 +74 65 57 +255 255 255 +90 106 0 +123 139 32 +255 246 205 +115 106 98 +90 222 123 +90 205 98 +90 189 74 +98 172 49 +98 156 24 +238 164 255 +189 156 164 +148 148 82 +106 148 0 +180 180 115 +74 65 57 +255 255 255 +172 180 172 +205 205 197 +246 255 238 +115 106 98 +238 222 24 +213 189 57 +189 164 98 +164 139 131 +139 115 172 +205 222 123 +172 172 148 +139 131 180 +115 90 213 +180 180 115 +74 65 57 +255 255 255 +0 0 0 +0 0 0 +246 255 246 +115 106 98 +222 24 238 +189 16 238 +164 8 238 +131 8 246 +106 0 246 +172 222 222 +139 148 230 +106 74 238 +82 0 255 +180 180 115 +74 65 57 +148 32 172 +189 106 213 +230 189 255 +255 255 255 +213 148 246 +189 139 205 +255 230 255 +230 180 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +115 98 90 +180 180 115 +74 65 57 +255 255 255 +222 230 246 +246 246 222 +246 255 255 +115 106 98 +255 205 74 +230 164 98 +205 123 123 +180 82 148 +156 41 172 +230 156 255 +197 98 238 +164 49 222 +131 0 205 +98 180 106 +0 0 0 +213 213 205 +255 255 255 +98 98 98 +230 8 8 +255 189 115 +65 205 255 +0 139 189 +255 156 148 +189 90 82 +139 246 255 +24 164 213 +255 189 180 +213 115 106 +0 0 0 +98 180 106 +0 0 0 +213 213 205 +255 255 255 +98 98 98 +230 8 8 +255 189 115 +238 238 172 +164 164 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 0 0 +164 0 0 +255 255 255 diff --git a/graphics/summary_screen/tiles.png b/graphics/summary_screen/tiles.png new file mode 100644 index 000000000..2f9f8db85 Binary files /dev/null and b/graphics/summary_screen/tiles.png differ diff --git a/include/graphics.h b/include/graphics.h index 7b29a70b7..5c6a043cc 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4035,16 +4035,16 @@ extern const u32 gPokenavRibbonsSummaryBg_Tilemap[]; extern const u32 gSummaryScreen_Gfx[]; extern const u32 gSummaryScreen_Pal[]; extern const u32 gSummaryPage_Info_Tilemap[]; -extern const u32 gSummaryPage_InfoCopy_Tilemap[]; +extern const u32 gSummaryPage_InfoEgg_Tilemap[]; extern const u32 gSummaryPage_Skills_Tilemap[]; extern const u32 gSummaryPage_BattleMoves_Tilemap[]; extern const u32 gSummaryPage_ContestMoves_Tilemap[]; extern const u16 gPPTextPalette[]; -extern const u16 gSummaryScreenWindow_Tilemap[]; extern const u32 gMoveTypes_Pal[]; -extern const u16 gSummaryScreenPowAcc_Tilemap[]; -extern const u16 gSummaryScreenAppealJam_Tilemap[]; +extern const u16 gSummaryScreen_MoveEffect_Battle_Tilemap[]; +extern const u16 gSummaryScreen_MoveEffect_Contest_Tilemap[]; +extern const u16 gSummaryScreen_MoveEffect_Cancel_Tilemap[]; extern const u32 gMoveTypes_Gfx[]; extern const u32 gSummaryMoveSelect_Gfx[]; diff --git a/src/graphics.c b/src/graphics.c index d1a3654ea..51e585489 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1126,16 +1126,16 @@ const u32 gStatusPal_Icons[] = INCBIN_U32("graphics/interface/status_icons.gbapa const u32 gMoveTypes_Gfx[] = INCBIN_U32("graphics/types/move_types.4bpp.lz"); const u32 gMoveTypes_Pal[] = INCBIN_U32("graphics/types/move_types.gbapal.lz"); -const u32 gSummaryMoveSelect_Gfx[] = INCBIN_U32("graphics/interface/summary_frames.4bpp.lz"); -const u32 gSummaryMoveSelect_Pal[] = INCBIN_U32("graphics/interface/summary_frames.gbapal.lz"); +const u32 gSummaryMoveSelect_Gfx[] = INCBIN_U32("graphics/summary_screen/move_select.4bpp.lz"); +const u32 gSummaryMoveSelect_Pal[] = INCBIN_U32("graphics/summary_screen/move_select.gbapal.lz"); -const u32 gSummaryScreen_Gfx[] = INCBIN_U32("graphics/interface/summary_screen.4bpp.lz"); -const u32 gSummaryScreen_Pal[] = INCBIN_U32("graphics/interface/summary_screen.gbapal.lz"); -const u32 gSummaryPage_Info_Tilemap[] = INCBIN_U32("graphics/interface/summary_page_info.bin.lz"); -const u32 gSummaryPage_Skills_Tilemap[] = INCBIN_U32("graphics/interface/summary_page_skills.bin.lz"); -const u32 gSummaryPage_BattleMoves_Tilemap[] = INCBIN_U32("graphics/interface/summary_page_battle_moves.bin.lz"); -const u32 gSummaryPage_ContestMoves_Tilemap[] = INCBIN_U32("graphics/interface/summary_page_contest_moves.bin.lz"); -const u32 gSummaryPage_InfoCopy_Tilemap[] = INCBIN_U32("graphics/interface/summary_page_info_copy.bin.lz"); +const u32 gSummaryScreen_Gfx[] = INCBIN_U32("graphics/summary_screen/tiles.4bpp.lz"); +const u32 gSummaryScreen_Pal[] = INCBIN_U32("graphics/summary_screen/tiles.gbapal.lz"); +const u32 gSummaryPage_Info_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_info.bin.lz"); +const u32 gSummaryPage_Skills_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_skills.bin.lz"); +const u32 gSummaryPage_BattleMoves_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_battle_moves.bin.lz"); +const u32 gSummaryPage_ContestMoves_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_contest_moves.bin.lz"); +const u32 gSummaryPage_InfoEgg_Tilemap[] = INCBIN_U32("graphics/summary_screen/page_info_egg.bin.lz"); const u32 gBagMaleTiles[] = INCBIN_U32("graphics/misc/bag_male.4bpp.lz"); const u32 gBagFemaleTiles[] = INCBIN_U32("graphics/misc/bag_female.4bpp.lz"); @@ -1259,9 +1259,9 @@ const u32 gPokedexSearchMenu_Gfx[] = INCBIN_U32("graphics/pokedex/search_menu.4b const u32 gPokedexSearchMenuNational_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_national.bin.lz"); const u32 gPokedexSearchMenuHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_hoenn.bin.lz"); -const u16 gSummaryScreenPowAcc_Tilemap[] = INCBIN_U16("graphics/interface/powacc_tilemap.bin"); -const u16 gSummaryScreenAppealJam_Tilemap[] = INCBIN_U16("graphics/interface/appealjam_tilemap.bin"); -const u16 gSummaryScreenWindow_Tilemap[] = INCBIN_U16("graphics/interface/summary.bin"); +const u16 gSummaryScreen_MoveEffect_Battle_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_battle.bin"); +const u16 gSummaryScreen_MoveEffect_Contest_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_contest.bin"); +const u16 gSummaryScreen_MoveEffect_Cancel_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_cancel.bin"); const u16 gIntroCopyright_Pal[] = INCBIN_U16("graphics/intro/copyright.gbapal"); const u32 gIntroCopyright_Gfx[] = INCBIN_U32("graphics/intro/copyright.4bpp.lz"); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index c5aeb6b47..10c69a422 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -365,7 +365,7 @@ struct TilemapCtrl u8 field_9; }; -static const u16 sStatusTilemap[] = INCBIN_U16("graphics/interface/status_tilemap.bin"); +static const u16 sStatusTilemap[] = INCBIN_U16("graphics/summary_screen/status_tilemap.bin"); static const struct TilemapCtrl sStatusTilemapCtrl1 = { sStatusTilemap, 1, 10, 2, 0, 18 @@ -376,11 +376,11 @@ static const struct TilemapCtrl sStatusTilemapCtrl2 = }; static const struct TilemapCtrl sBattleMoveTilemapCtrl = { - gSummaryScreenPowAcc_Tilemap, 0, 10, 7, 0, 45 + gSummaryScreen_MoveEffect_Battle_Tilemap, 0, 10, 7, 0, 45 }; static const struct TilemapCtrl sContestMoveTilemapCtrl = { - gSummaryScreenAppealJam_Tilemap, 0, 10, 7, 0, 45 + gSummaryScreen_MoveEffect_Contest_Tilemap, 0, 10, 7, 0, 45 }; static const s8 sMultiBattleOrder[] = {0, 2, 3, 1, 4, 5}; static const struct WindowTemplate sSummaryTemplate[] = @@ -701,8 +701,8 @@ static const u8 sTextColors[][3] = {0, 7, 8} }; -static const u8 sSummaryAButtonBitmap[] = INCBIN_U8("graphics/interface/summary_a_button.4bpp"); -static const u8 sSummaryBButtonBitmap[] = INCBIN_U8("graphics/interface/summary_b_button.4bpp"); +static const u8 sAButton_Gfx[] = INCBIN_U8("graphics/summary_screen/a_button.4bpp"); +static const u8 sBButton_Gfx[] = INCBIN_U8("graphics/summary_screen/b_button.4bpp"); static void (*const sTextPrinterFunctions[])(void) = { @@ -1071,7 +1071,7 @@ static const struct SpriteTemplate sSpriteTemplate_StatusCondition = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const u16 sSummaryMarkingsPalette[] = INCBIN_U16("graphics/interface/summary_markings.gbapal"); +static const u16 sMarkings_Pal[] = INCBIN_U16("graphics/summary_screen/markings.gbapal"); // code void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)) @@ -1312,7 +1312,7 @@ static bool8 DecompressGraphics(void) } break; case 2: - LZDecompressWram(gSummaryPage_InfoCopy_Tilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][1]); + LZDecompressWram(gSummaryPage_InfoEgg_Tilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][1]); sMonSummaryScreen->switchCounter++; break; case 3: @@ -2551,6 +2551,7 @@ static void Task_ShowStatusWindow(u8 taskId) } } +// Toggles the "Cancel" window that appears when selecting a move static void TilemapFiveMovesDisplay(u16 *dst, u16 palette, bool8 remove) { u16 i, id; @@ -2561,18 +2562,18 @@ static void TilemapFiveMovesDisplay(u16 *dst, u16 palette, bool8 remove) { for (i = 0; i < 20; i++) { - dst[id + i] = gSummaryScreenWindow_Tilemap[i] + palette; - dst[id + i + 0x20] = gSummaryScreenWindow_Tilemap[i] + palette; - dst[id + i + 0x40] = gSummaryScreenWindow_Tilemap[i + 20] + palette; + dst[id + i] = gSummaryScreen_MoveEffect_Cancel_Tilemap[i] + palette; + dst[id + i + 0x20] = gSummaryScreen_MoveEffect_Cancel_Tilemap[i] + palette; + dst[id + i + 0x40] = gSummaryScreen_MoveEffect_Cancel_Tilemap[i + 20] + palette; } } else // Remove { for (i = 0; i < 20; i++) { - dst[id + i] = gSummaryScreenWindow_Tilemap[i + 20] + palette; - dst[id + i + 0x20] = gSummaryScreenWindow_Tilemap[i + 40] + palette; - dst[id + i + 0x40] = gSummaryScreenWindow_Tilemap[i + 40] + palette; + dst[id + i] = gSummaryScreen_MoveEffect_Cancel_Tilemap[i + 20] + palette; + dst[id + i + 0x20] = gSummaryScreen_MoveEffect_Cancel_Tilemap[i + 40] + palette; + dst[id + i + 0x40] = gSummaryScreen_MoveEffect_Cancel_Tilemap[i + 40] + palette; } } } @@ -2788,8 +2789,8 @@ static void PrintGenderSymbol(struct Pokemon *mon, u16 species) static void PrintAOrBButtonIcon(u8 windowId, bool8 bButton, u32 x) { - // sSummaryBButtonBitmap - 0x80 = sSummaryAButtonBitmap - BlitBitmapToWindow(windowId, (bButton) ? sSummaryBButtonBitmap : sSummaryBButtonBitmap - 0x80, x, 0, 16, 16); + // sBButton_Gfx - sizeof(sBButton_Gfx) = sAButton_Gfx + BlitBitmapToWindow(windowId, (bButton) ? sBButton_Gfx : sBButton_Gfx - sizeof(sBButton_Gfx), x, 0, 16, 16); } static void PrintPageNamesAndStats(void) @@ -4011,7 +4012,7 @@ static void StopPokemonAnimations(void) // A subtle effect, this function stops static void CreateMonMarkingsSprite(struct Pokemon *mon) { - struct Sprite *sprite = CreateMonMarkingAllCombosSprite(TAG_MON_MARKINGS, TAG_MON_MARKINGS, sSummaryMarkingsPalette); + struct Sprite *sprite = CreateMonMarkingAllCombosSprite(TAG_MON_MARKINGS, TAG_MON_MARKINGS, sMarkings_Pal); sMonSummaryScreen->markingsSprite = sprite; if (sprite != NULL) -- cgit v1.2.3