From 0a78cb5c9edf7d6b39297a5b4c874d59c6a69b39 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 10:04:47 -0500 Subject: Fix some battle dome graphics names --- graphics/battle_frontier/text_pp.pal | 19 ------------------- graphics/battle_frontier/tourney_bg.png | Bin 983 -> 0 bytes graphics/battle_frontier/tourney_line_mask_map.bin | Bin 2048 -> 0 bytes graphics/battle_frontier/tourney_tree.bin | Bin 0 -> 2048 bytes graphics/battle_frontier/tourney_tree.png | Bin 0 -> 983 bytes graphics/battle_interface/text_pp.pal | 19 +++++++++++++++++++ include/graphics.h | 4 ++-- src/battle_dome.c | 4 ++-- src/graphics.c | 6 +++--- 9 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 graphics/battle_frontier/text_pp.pal delete mode 100644 graphics/battle_frontier/tourney_bg.png delete mode 100644 graphics/battle_frontier/tourney_line_mask_map.bin create mode 100644 graphics/battle_frontier/tourney_tree.bin create mode 100644 graphics/battle_frontier/tourney_tree.png create mode 100644 graphics/battle_interface/text_pp.pal diff --git a/graphics/battle_frontier/text_pp.pal b/graphics/battle_frontier/text_pp.pal deleted file mode 100644 index 8c2a27418..000000000 --- a/graphics/battle_frontier/text_pp.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -213 197 0 -255 246 139 -255 131 0 -255 238 115 -230 24 0 -246 222 156 -74 74 74 -222 222 222 -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/battle_frontier/tourney_bg.png b/graphics/battle_frontier/tourney_bg.png deleted file mode 100644 index f60dd49d3..000000000 Binary files a/graphics/battle_frontier/tourney_bg.png and /dev/null differ diff --git a/graphics/battle_frontier/tourney_line_mask_map.bin b/graphics/battle_frontier/tourney_line_mask_map.bin deleted file mode 100644 index 7f3e36737..000000000 Binary files a/graphics/battle_frontier/tourney_line_mask_map.bin and /dev/null differ diff --git a/graphics/battle_frontier/tourney_tree.bin b/graphics/battle_frontier/tourney_tree.bin new file mode 100644 index 000000000..7f3e36737 Binary files /dev/null and b/graphics/battle_frontier/tourney_tree.bin differ diff --git a/graphics/battle_frontier/tourney_tree.png b/graphics/battle_frontier/tourney_tree.png new file mode 100644 index 000000000..f60dd49d3 Binary files /dev/null and b/graphics/battle_frontier/tourney_tree.png differ diff --git a/graphics/battle_interface/text_pp.pal b/graphics/battle_interface/text_pp.pal new file mode 100644 index 000000000..8c2a27418 --- /dev/null +++ b/graphics/battle_interface/text_pp.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 197 0 +255 246 139 +255 131 0 +255 238 115 +230 24 0 +246 222 156 +74 74 74 +222 222 222 +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/include/graphics.h b/include/graphics.h index e2fe5cf77..c072babf3 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4121,11 +4121,11 @@ extern const u32 gDomeTourneyInfoCardBg_Tilemap[]; extern const u32 gDomeTourneyTree_Pal[]; extern const u32 gDomeTourneyTreeButtons_Pal[]; extern const u32 gDomeTourneyMatchCardBg_Pal[]; -extern const u32 gDomeTourneyBg_Gfx[]; +extern const u32 gDomeTourneyTree_Gfx[]; extern const u32 gDomeTourneyLine_Gfx[]; extern const u32 gDomeTourneyLineDown_Tilemap[]; extern const u32 gDomeTourneyLineUp_Tilemap[]; -extern const u32 gDomeTourneyLineMask_Tilemap[]; +extern const u32 gDomeTourneyTree_Tilemap[]; extern const u32 gDomeTourneyTreeButtons_Gfx[]; extern const u16 gTilesetAnims_BattleDomePals0_0[]; extern const u16 gTilesetAnims_BattleDomePals0_1[]; diff --git a/src/battle_dome.c b/src/battle_dome.c index 2f77491c9..aadd85afd 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -5304,10 +5304,10 @@ static void Task_ShowTourneyTree(u8 taskId) break; case 2: sTilemapBuffer = AllocZeroed(BG_SCREEN_SIZE); - LZDecompressWram(gDomeTourneyLineMask_Tilemap, sTilemapBuffer); + LZDecompressWram(gDomeTourneyTree_Tilemap, sTilemapBuffer); SetBgTilemapBuffer(1, sTilemapBuffer); CopyBgTilemapBufferToVram(1); - DecompressAndLoadBgGfxUsingHeap(1, gDomeTourneyBg_Gfx, 0x2000, 0, 0); + DecompressAndLoadBgGfxUsingHeap(1, gDomeTourneyTree_Gfx, 0x2000, 0, 0); DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyLine_Gfx, 0x2000, 0, 0); DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyLineDown_Tilemap, 0x2000, 0, 1); DecompressAndLoadBgGfxUsingHeap(3, gDomeTourneyLineUp_Tilemap, 0x2000, 0, 1); diff --git a/src/graphics.c b/src/graphics.c index 47b82b6b7..b79d449ae 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -950,9 +950,9 @@ const u32 gVsLettersGfx[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz") #include "data/graphics/battle_terrain.h" // Battle Dome -const u32 gDomeTourneyBg_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_bg.4bpp.lz"); +const u32 gDomeTourneyTree_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_tree.4bpp.lz"); const u32 gDomeTourneyLine_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_line.4bpp.lz"); // the red glow mask for the tourney advancement lines -const u32 gDomeTourneyLineMask_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_line_mask_map.bin.lz"); +const u32 gDomeTourneyTree_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_tree.bin.lz"); const u32 gDomeTourneyLineDown_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_line_down_map.bin.lz"); const u32 gDomeTourneyLineUp_Tilemap[] = INCBIN_U32("graphics/battle_frontier/tourney_line_up_map.bin.lz"); const u32 gDomeTourneyInfoCard_Gfx[] = INCBIN_U32("graphics/battle_frontier/tourney_info_card.4bpp.lz"); @@ -967,7 +967,7 @@ const u32 gBattleArenaJudgementSymbolsGfx[] = INCBIN_U32("graphics/battle_fronti const u32 gBattleArenaJudgementSymbolsPalette[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.gbapal.lz"); const u32 gBattleWindowTextPalette[] = INCBIN_U32("graphics/battle_interface/text.gbapal.lz"); -const u16 gPPTextPalette[] = INCBIN_U16("graphics/battle_frontier/text_pp.gbapal"); +const u16 gPPTextPalette[] = INCBIN_U16("graphics/battle_interface/text_pp.gbapal"); const u16 gTilesetAnims_BattleDomePals0_0[] = INCBIN_U16("graphics/battle_frontier/dome_anim1.gbapal"); const u16 gTilesetAnims_BattleDomePals0_1[] = INCBIN_U16("graphics/battle_frontier/dome_anim2.gbapal"); -- cgit v1.2.3 From fde18b47746b577c4d2037ab065ce66062da2a67 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 10:42:00 -0500 Subject: Fix berry crusher graphics name --- decompress.sh | 5 +++++ graphics/berry_crush/crusher.bin | 1 - graphics/berry_crush/text_windows.bin | 1 + include/graphics.h | 2 +- src/berry_crush.c | 8 ++++---- src/graphics.c | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) create mode 100755 decompress.sh delete mode 100644 graphics/berry_crush/crusher.bin create mode 100644 graphics/berry_crush/text_windows.bin diff --git a/decompress.sh b/decompress.sh new file mode 100755 index 000000000..26b5a0db7 --- /dev/null +++ b/decompress.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +FILEPATH=$1 + +tools/gbagfx/gbagfx graphics/$FILEPATH.bin.lz graphics/$FILEPATH.bin diff --git a/graphics/berry_crush/crusher.bin b/graphics/berry_crush/crusher.bin deleted file mode 100644 index c6cc0edb1..000000000 --- a/graphics/berry_crush/crusher.bin +++ /dev/null @@ -1 +0,0 @@ -L@L@L@L@L@L@L@L@L@M@\@\@\@\@\@\@\@\@\@]@N@N@N@N@N@N@N@N@N@O@^@^@^@^@^@^@^@^@^@_@Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ú`é`é`é`é`é`é`é`é`é`ê`nDm@m@m@m@m@m@m@m@m@~D}@}@}@}@}@}@}@}@}@ÜdÛ`Û`Û`Û`Û`Û`Û`Û`Û`ìdë`ë`ë`ë`ë`ë`ë`ë`ë` \ No newline at end of file diff --git a/graphics/berry_crush/text_windows.bin b/graphics/berry_crush/text_windows.bin new file mode 100644 index 000000000..c6cc0edb1 --- /dev/null +++ b/graphics/berry_crush/text_windows.bin @@ -0,0 +1 @@ +L@L@L@L@L@L@L@L@L@M@\@\@\@\@\@\@\@\@\@]@N@N@N@N@N@N@N@N@N@O@^@^@^@^@^@^@^@^@^@_@Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ù`Ú`é`é`é`é`é`é`é`é`é`ê`nDm@m@m@m@m@m@m@m@m@~D}@}@}@}@}@}@}@}@}@ÜdÛ`Û`Û`Û`Û`Û`Û`Û`Û`ìdë`ë`ë`ë`ë`ë`ë`ë`ë` \ No newline at end of file diff --git a/include/graphics.h b/include/graphics.h index c072babf3..7b29a70b7 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -5002,7 +5002,7 @@ extern const u16 gUsePokeblockCondition_Pal[]; // Berry Crush extern const u32 gBerryCrush_Crusher_Gfx[]; extern const u16 gBerryCrush_Crusher_Pal[]; -extern const u32 gBerryCrush_Crusher_Tilemap[]; +extern const u32 gBerryCrush_TextWindows_Tilemap[]; // Pokenav extern const u32 gPokenavMessageBox_Gfx[]; diff --git a/src/berry_crush.c b/src/berry_crush.c index 9b8323e2d..e7a5df951 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -1947,15 +1947,15 @@ static void DrawPlayerNameWindows(struct BerryCrushGame *game) static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame *game) { u8 i = 0; - u8 * crusherGfx; + u8 * windowGfx; - LZ77UnCompWram(gBerryCrush_Crusher_Tilemap, gDecompressionBuffer); + LZ77UnCompWram(gBerryCrush_TextWindows_Tilemap, gDecompressionBuffer); - for (crusherGfx = gDecompressionBuffer; i < game->playerCount; i++) + for (windowGfx = gDecompressionBuffer; i < game->playerCount; i++) { CopyToBgTilemapBufferRect( 3, - &crusherGfx[game->gfx.playerCoords[i]->playerId * 40], + &windowGfx[game->gfx.playerCoords[i]->playerId * 40], game->gfx.playerCoords[i]->windowGfxX, game->gfx.playerCoords[i]->windowGfxY, 10, diff --git a/src/graphics.c b/src/graphics.c index b79d449ae..d1a3654ea 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1523,7 +1523,7 @@ const u16 gFrontierPassCancelButtonHighlighted_Tilemap[] = INCBIN_U16("graphics/ // Berry Crush const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/crusher.gbapal"); const u32 gBerryCrush_Crusher_Gfx[] = INCBIN_U32("graphics/berry_crush/crusher.4bpp.lz"); -const u32 gBerryCrush_Crusher_Tilemap[] = INCBIN_U32("graphics/berry_crush/crusher.bin.lz"); +const u32 gBerryCrush_TextWindows_Tilemap[] = INCBIN_U32("graphics/berry_crush/text_windows.bin.lz"); // random garbage at the end. static const u8 sEmpty3[0x54BAC] = {0}; -- cgit v1.2.3 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 From 565dd243098013c8665bc7f95106e2b5657e4e82 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 11:37:13 -0500 Subject: Move party menu graphics out of interface --- graphics/interface/party_menu_bg.bin | Bin 2048 -> 0 bytes graphics/interface/party_menu_bg.pal | 179 ----------------------- graphics/interface/party_menu_bg.png | Bin 613 -> 0 bytes graphics/interface/party_menu_cancel_button.bin | 2 - graphics/interface/party_menu_confirm_button.bin | 1 - graphics/interface/party_menu_hpbar.png | Bin 136 -> 0 bytes graphics/interface/party_menu_pokeball.png | Bin 330 -> 0 bytes graphics/interface/party_menu_pokeball_small.png | Bin 261 -> 0 bytes graphics/interface/unused_hpbar.png | Bin 0 -> 136 bytes graphics/party_menu/bg.bin | Bin 0 -> 2048 bytes graphics/party_menu/bg.pal | 179 +++++++++++++++++++++++ graphics/party_menu/bg.png | Bin 0 -> 613 bytes graphics/party_menu/cancel_button.bin | 2 + graphics/party_menu/confirm_button.bin | 1 + graphics/party_menu/pokeball.png | Bin 0 -> 330 bytes graphics/party_menu/pokeball_small.png | Bin 0 -> 261 bytes graphics_file_rules.mk | 2 +- src/data/party_menu.h | 32 ++-- src/graphics.c | 14 +- 19 files changed, 209 insertions(+), 203 deletions(-) delete mode 100644 graphics/interface/party_menu_bg.bin delete mode 100644 graphics/interface/party_menu_bg.pal delete mode 100644 graphics/interface/party_menu_bg.png delete mode 100644 graphics/interface/party_menu_cancel_button.bin delete mode 100644 graphics/interface/party_menu_confirm_button.bin delete mode 100644 graphics/interface/party_menu_hpbar.png delete mode 100644 graphics/interface/party_menu_pokeball.png delete mode 100644 graphics/interface/party_menu_pokeball_small.png create mode 100644 graphics/interface/unused_hpbar.png create mode 100644 graphics/party_menu/bg.bin create mode 100644 graphics/party_menu/bg.pal create mode 100644 graphics/party_menu/bg.png create mode 100644 graphics/party_menu/cancel_button.bin create mode 100644 graphics/party_menu/confirm_button.bin create mode 100644 graphics/party_menu/pokeball.png create mode 100644 graphics/party_menu/pokeball_small.png diff --git a/graphics/interface/party_menu_bg.bin b/graphics/interface/party_menu_bg.bin deleted file mode 100644 index d6ff1114d..000000000 Binary files a/graphics/interface/party_menu_bg.bin and /dev/null differ diff --git a/graphics/interface/party_menu_bg.pal b/graphics/interface/party_menu_bg.pal deleted file mode 100644 index 0b4b30f81..000000000 --- a/graphics/interface/party_menu_bg.pal +++ /dev/null @@ -1,179 +0,0 @@ -JASC-PAL -0100 -176 -123 156 115 -255 255 255 -106 106 106 -0 0 0 -65 205 255 -0 139 189 -49 189 238 -255 156 148 -189 90 82 -222 123 115 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -139 148 123 -74 74 98 -65 156 148 -139 156 41 -205 213 123 -180 180 90 -82 65 74 -32 16 24 -255 0 255 -255 0 255 -255 255 255 -230 238 139 -98 90 0 -255 0 255 -255 0 255 -115 90 180 -139 148 123 -255 115 49 -65 156 148 -139 156 41 -205 213 123 -180 180 90 -82 65 74 -82 82 90 -255 0 255 -255 0 255 -255 255 255 -123 205 180 -57 148 123 -255 0 255 -255 0 255 -164 115 246 -123 156 115 -74 74 98 -115 115 115 -255 255 255 -131 197 222 -57 148 222 -41 123 180 -131 197 222 -41 123 180 -115 255 172 -90 213 131 -65 205 255 -0 98 148 -82 82 82 -255 213 82 -255 180 65 -123 156 115 -74 74 98 -115 115 115 -255 255 255 -213 197 90 -197 164 24 -156 156 32 -213 197 90 -156 156 32 -255 230 57 -205 172 8 -255 156 148 -156 65 57 -82 82 82 -255 213 82 -255 180 65 -123 156 115 -74 74 98 -115 115 115 -255 255 255 -213 164 32 -197 106 16 -164 74 0 -213 164 32 -164 74 0 -255 115 49 -197 57 0 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 -123 156 115 -255 115 49 -115 115 115 -255 255 255 -180 255 164 -123 222 131 -123 156 98 -255 115 49 -255 115 49 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 -57 156 255 -255 115 49 -115 115 115 -255 255 255 -172 238 255 -123 213 238 -74 172 205 -255 115 49 -255 115 49 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 -57 156 255 -255 115 49 -115 115 115 -255 255 255 -246 246 148 -246 230 98 -222 197 32 -255 115 49 -255 115 49 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 -57 156 255 -255 115 49 -115 115 115 -255 255 255 -255 213 222 -255 189 148 -238 164 131 -255 115 49 -255 115 49 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 -57 156 255 -255 255 115 -115 115 115 -255 255 255 -180 255 164 -123 222 131 -131 172 106 -255 255 115 -255 255 115 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -82 82 82 -255 213 82 -255 180 65 diff --git a/graphics/interface/party_menu_bg.png b/graphics/interface/party_menu_bg.png deleted file mode 100644 index c58f3aae9..000000000 Binary files a/graphics/interface/party_menu_bg.png and /dev/null differ diff --git a/graphics/interface/party_menu_cancel_button.bin b/graphics/interface/party_menu_cancel_button.bin deleted file mode 100644 index 7f11aaf4e..000000000 --- a/graphics/interface/party_menu_cancel_button.bin +++ /dev/null @@ -1,2 +0,0 @@ - -            \ No newline at end of file diff --git a/graphics/interface/party_menu_confirm_button.bin b/graphics/interface/party_menu_confirm_button.bin deleted file mode 100644 index 8c3c1be3d..000000000 --- a/graphics/interface/party_menu_confirm_button.bin +++ /dev/null @@ -1 +0,0 @@ -#$ \ No newline at end of file diff --git a/graphics/interface/party_menu_hpbar.png b/graphics/interface/party_menu_hpbar.png deleted file mode 100644 index 763b91210..000000000 Binary files a/graphics/interface/party_menu_hpbar.png and /dev/null differ diff --git a/graphics/interface/party_menu_pokeball.png b/graphics/interface/party_menu_pokeball.png deleted file mode 100644 index 2aad54de8..000000000 Binary files a/graphics/interface/party_menu_pokeball.png and /dev/null differ diff --git a/graphics/interface/party_menu_pokeball_small.png b/graphics/interface/party_menu_pokeball_small.png deleted file mode 100644 index d2eec4d45..000000000 Binary files a/graphics/interface/party_menu_pokeball_small.png and /dev/null differ diff --git a/graphics/interface/unused_hpbar.png b/graphics/interface/unused_hpbar.png new file mode 100644 index 000000000..763b91210 Binary files /dev/null and b/graphics/interface/unused_hpbar.png differ diff --git a/graphics/party_menu/bg.bin b/graphics/party_menu/bg.bin new file mode 100644 index 000000000..d6ff1114d Binary files /dev/null and b/graphics/party_menu/bg.bin differ diff --git a/graphics/party_menu/bg.pal b/graphics/party_menu/bg.pal new file mode 100644 index 000000000..0b4b30f81 --- /dev/null +++ b/graphics/party_menu/bg.pal @@ -0,0 +1,179 @@ +JASC-PAL +0100 +176 +123 156 115 +255 255 255 +106 106 106 +0 0 0 +65 205 255 +0 139 189 +49 189 238 +255 156 148 +189 90 82 +222 123 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +139 148 123 +74 74 98 +65 156 148 +139 156 41 +205 213 123 +180 180 90 +82 65 74 +32 16 24 +255 0 255 +255 0 255 +255 255 255 +230 238 139 +98 90 0 +255 0 255 +255 0 255 +115 90 180 +139 148 123 +255 115 49 +65 156 148 +139 156 41 +205 213 123 +180 180 90 +82 65 74 +82 82 90 +255 0 255 +255 0 255 +255 255 255 +123 205 180 +57 148 123 +255 0 255 +255 0 255 +164 115 246 +123 156 115 +74 74 98 +115 115 115 +255 255 255 +131 197 222 +57 148 222 +41 123 180 +131 197 222 +41 123 180 +115 255 172 +90 213 131 +65 205 255 +0 98 148 +82 82 82 +255 213 82 +255 180 65 +123 156 115 +74 74 98 +115 115 115 +255 255 255 +213 197 90 +197 164 24 +156 156 32 +213 197 90 +156 156 32 +255 230 57 +205 172 8 +255 156 148 +156 65 57 +82 82 82 +255 213 82 +255 180 65 +123 156 115 +74 74 98 +115 115 115 +255 255 255 +213 164 32 +197 106 16 +164 74 0 +213 164 32 +164 74 0 +255 115 49 +197 57 0 +255 0 255 +255 0 255 +82 82 82 +255 213 82 +255 180 65 +123 156 115 +255 115 49 +115 115 115 +255 255 255 +180 255 164 +123 222 131 +123 156 98 +255 115 49 +255 115 49 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +82 82 82 +255 213 82 +255 180 65 +57 156 255 +255 115 49 +115 115 115 +255 255 255 +172 238 255 +123 213 238 +74 172 205 +255 115 49 +255 115 49 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +82 82 82 +255 213 82 +255 180 65 +57 156 255 +255 115 49 +115 115 115 +255 255 255 +246 246 148 +246 230 98 +222 197 32 +255 115 49 +255 115 49 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +82 82 82 +255 213 82 +255 180 65 +57 156 255 +255 115 49 +115 115 115 +255 255 255 +255 213 222 +255 189 148 +238 164 131 +255 115 49 +255 115 49 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +82 82 82 +255 213 82 +255 180 65 +57 156 255 +255 255 115 +115 115 115 +255 255 255 +180 255 164 +123 222 131 +131 172 106 +255 255 115 +255 255 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +82 82 82 +255 213 82 +255 180 65 diff --git a/graphics/party_menu/bg.png b/graphics/party_menu/bg.png new file mode 100644 index 000000000..c58f3aae9 Binary files /dev/null and b/graphics/party_menu/bg.png differ diff --git a/graphics/party_menu/cancel_button.bin b/graphics/party_menu/cancel_button.bin new file mode 100644 index 000000000..7f11aaf4e --- /dev/null +++ b/graphics/party_menu/cancel_button.bin @@ -0,0 +1,2 @@ + +            \ No newline at end of file diff --git a/graphics/party_menu/confirm_button.bin b/graphics/party_menu/confirm_button.bin new file mode 100644 index 000000000..8c3c1be3d --- /dev/null +++ b/graphics/party_menu/confirm_button.bin @@ -0,0 +1 @@ +#$ \ No newline at end of file diff --git a/graphics/party_menu/pokeball.png b/graphics/party_menu/pokeball.png new file mode 100644 index 000000000..2aad54de8 Binary files /dev/null and b/graphics/party_menu/pokeball.png differ diff --git a/graphics/party_menu/pokeball_small.png b/graphics/party_menu/pokeball_small.png new file mode 100644 index 000000000..d2eec4d45 Binary files /dev/null and b/graphics/party_menu/pokeball_small.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 7a37c5e4f..3b4bbeabf 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -429,7 +429,7 @@ $(MASKSGFXDIR)/unused_level_up.4bpp: %.4bpp: %.png $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 16 -$(INTERFACEGFXDIR)/party_menu_bg.4bpp: %.4bpp: %.png +graphics/party_menu/bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 62 $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp) diff --git a/src/data/party_menu.h b/src/data/party_menu.h index f3a8a50ec..f8321298c 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -1,3 +1,9 @@ +enum { + TAG_POKEBALL = 1200, + TAG_POKEBALL_SMALL, + TAG_STATUS_ICONS, +}; + static const struct BgTemplate sPartyMenuBgTemplates[] = { { @@ -112,8 +118,8 @@ static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] = }; // Used only when both Cancel and Confirm are present -static const u32 sConfirmButton_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_confirm_button.bin"); -static const u32 sCancelButton_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_cancel_button.bin"); +static const u32 sConfirmButton_Tilemap[] = INCBIN_U32("graphics/party_menu/confirm_button.bin"); +static const u32 sCancelButton_Tilemap[] = INCBIN_U32("graphics/party_menu/cancel_button.bin"); // Text colors for BG, FG, and Shadow in that order static const u8 sFontColorTable[][3] = @@ -969,19 +975,19 @@ static const union AnimCmd *const sSpriteAnimTable_MenuPokeball[] = static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeball = { - gPartyMenuPokeball_Gfx, 0x400, 0x04b0 + gPartyMenuPokeball_Gfx, 0x400, TAG_POKEBALL }; static const struct CompressedSpritePalette sSpritePalette_MenuPokeball = { - gPartyMenuPokeball_Pal, 0x04b0 + gPartyMenuPokeball_Pal, TAG_POKEBALL }; // Used for the pokeball sprite on each party slot / Cancel button static const struct SpriteTemplate sSpriteTemplate_MenuPokeball = { - .tileTag = 0x04b0, - .paletteTag = 0x04b0, + .tileTag = TAG_POKEBALL, + .paletteTag = TAG_POKEBALL, .oam = &sOamData_MenuPokeball, .anims = sSpriteAnimTable_MenuPokeball, .images = NULL, @@ -1055,14 +1061,14 @@ static const union AnimCmd *const sSpriteAnimTable_MenuPokeballSmall[] = static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeballSmall = { - gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1 + gPartyMenuPokeballSmall_Gfx, 0x0300, TAG_POKEBALL_SMALL }; // Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPokeball is used static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall = { - .tileTag = 1201, - .paletteTag = 1200, + .tileTag = TAG_POKEBALL_SMALL, + .paletteTag = TAG_POKEBALL, .oam = &sOamData_MenuPokeballSmall, .anims = sSpriteAnimTable_MenuPokeballSmall, .images = NULL, @@ -1149,18 +1155,18 @@ static const union AnimCmd *const sSpriteTemplate_StatusCondition[] = static const struct CompressedSpriteSheet sSpriteSheet_StatusIcons = { - gStatusGfx_Icons, 0x400, 1202 + gStatusGfx_Icons, 0x400, TAG_STATUS_ICONS }; static const struct CompressedSpritePalette sSpritePalette_StatusIcons = { - gStatusPal_Icons, 1202 + gStatusPal_Icons, TAG_STATUS_ICONS }; static const struct SpriteTemplate sSpriteTemplate_StatusIcons = { - .tileTag = 1202, - .paletteTag = 1202, + .tileTag = TAG_STATUS_ICONS, + .paletteTag = TAG_STATUS_ICONS, .oam = &sOamData_StatusCondition, .anims = sSpriteTemplate_StatusCondition, .images = NULL, diff --git a/src/graphics.c b/src/graphics.c index 51e585489..fda9a3fd5 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -147,7 +147,7 @@ const u32 gBattleAnimSpriteGfx_ClawSlash[] = INCBIN_U32("graphics/battle_anims/s const u32 gBattleAnimSpriteGfx_Scratch3[] = INCBIN_U32("graphics/battle_anims/sprites/scratch_3.4bpp.lz"); const u32 gBattleAnimSpriteGfx_Scratch2[] = INCBIN_U32("graphics/battle_anims/sprites/scratch_2.4bpp.lz"); -const u32 gPartyMenuHpBar_Gfx[] = INCBIN_U32("graphics/interface/party_menu_hpbar.4bpp.lz"); +const u32 gUnusedHpBar_Gfx[] = INCBIN_U32("graphics/interface/unused_hpbar.4bpp.lz"); const u32 gBattleAnimSpriteGfx_BubbleBurst2[] = INCBIN_U32("graphics/battle_anims/sprites/bubble_burst_2.4bpp.lz"); @@ -1112,13 +1112,13 @@ const u32 gBattleAnimSpritePal_Slash2[] = INCBIN_U32("graphics/battle_anims/spri const u32 gBattleAnimSpriteGfx_WhiteShadow[] = INCBIN_U32("graphics/battle_anims/sprites/white_shadow.4bpp.lz"); const u32 gBattleAnimSpritePal_WhiteShadow[] = INCBIN_U32("graphics/battle_anims/sprites/white_shadow.gbapal.lz"); -const u32 gPartyMenuBg_Gfx[] = INCBIN_U32("graphics/interface/party_menu_bg.4bpp.lz"); -const u32 gPartyMenuBg_Pal[] = INCBIN_U32("graphics/interface/party_menu_bg.gbapal.lz"); -const u32 gPartyMenuBg_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_bg.bin.lz"); +const u32 gPartyMenuBg_Gfx[] = INCBIN_U32("graphics/party_menu/bg.4bpp.lz"); +const u32 gPartyMenuBg_Pal[] = INCBIN_U32("graphics/party_menu/bg.gbapal.lz"); +const u32 gPartyMenuBg_Tilemap[] = INCBIN_U32("graphics/party_menu/bg.bin.lz"); -const u32 gPartyMenuPokeball_Gfx[] = INCBIN_U32("graphics/interface/party_menu_pokeball.4bpp.lz"); -const u32 gPartyMenuPokeballSmall_Gfx[] = INCBIN_U32("graphics/interface/party_menu_pokeball_small.4bpp.lz"); //unused -const u32 gPartyMenuPokeball_Pal[] = INCBIN_U32("graphics/interface/party_menu_pokeball.gbapal.lz"); +const u32 gPartyMenuPokeball_Gfx[] = INCBIN_U32("graphics/party_menu/pokeball.4bpp.lz"); +const u32 gPartyMenuPokeballSmall_Gfx[] = INCBIN_U32("graphics/party_menu/pokeball_small.4bpp.lz"); //unused +const u32 gPartyMenuPokeball_Pal[] = INCBIN_U32("graphics/party_menu/pokeball.gbapal.lz"); const u32 gStatusGfx_Icons[] = INCBIN_U32("graphics/interface/status_icons.4bpp.lz"); const u32 gStatusPal_Icons[] = INCBIN_U32("graphics/interface/status_icons.gbapal.lz"); -- cgit v1.2.3 From d782d3544dd3c43ac2034df4a9a445d7ccda1982 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 11:46:58 -0500 Subject: Move pokeblock graphics out of interface --- graphics/interface/pokeblock.bin | Bin 2048 -> 0 bytes graphics/interface/pokeblock_case_frame.pal | 99 ------------------------ graphics/interface/pokeblock_case_frame.png | Bin 426 -> 0 bytes graphics/interface/pokeblock_device.png | Bin 530 -> 0 bytes graphics/interface/pokeblock_feeding_bg_map.bin | Bin 2048 -> 0 bytes graphics/pokeblock/device.png | Bin 0 -> 530 bytes graphics/pokeblock/feeding_bg.bin | Bin 0 -> 2048 bytes graphics/pokeblock/menu.bin | Bin 0 -> 2048 bytes graphics/pokeblock/menu.pal | 99 ++++++++++++++++++++++++ graphics/pokeblock/menu.png | Bin 0 -> 426 bytes src/graphics.c | 13 ++-- 11 files changed, 106 insertions(+), 105 deletions(-) delete mode 100644 graphics/interface/pokeblock.bin delete mode 100644 graphics/interface/pokeblock_case_frame.pal delete mode 100644 graphics/interface/pokeblock_case_frame.png delete mode 100644 graphics/interface/pokeblock_device.png delete mode 100644 graphics/interface/pokeblock_feeding_bg_map.bin create mode 100644 graphics/pokeblock/device.png create mode 100644 graphics/pokeblock/feeding_bg.bin create mode 100644 graphics/pokeblock/menu.bin create mode 100644 graphics/pokeblock/menu.pal create mode 100644 graphics/pokeblock/menu.png diff --git a/graphics/interface/pokeblock.bin b/graphics/interface/pokeblock.bin deleted file mode 100644 index 1719bb5a6..000000000 Binary files a/graphics/interface/pokeblock.bin and /dev/null differ diff --git a/graphics/interface/pokeblock_case_frame.pal b/graphics/interface/pokeblock_case_frame.pal deleted file mode 100644 index ef58ae778..000000000 --- a/graphics/interface/pokeblock_case_frame.pal +++ /dev/null @@ -1,99 +0,0 @@ -JASC-PAL -0100 -96 -0 0 0 -123 205 189 -238 246 255 -213 230 255 -255 0 0 -115 131 238 -90 90 98 -123 180 189 -131 131 164 -0 0 0 -0 0 0 -197 197 197 -205 65 24 -255 123 90 -255 180 148 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -238 246 255 -0 0 0 -0 0 0 -90 90 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 197 197 -106 139 189 -148 213 255 -180 238 255 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -255 238 238 -0 0 0 -0 0 0 -90 90 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 197 197 -205 90 172 -255 156 197 -255 197 213 -255 255 255 -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 -106 180 115 -148 246 98 -205 255 139 -255 255 255 -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 -180 180 49 -246 230 49 -255 255 148 -255 255 255 -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 -148 148 139 -222 222 222 -238 238 238 -255 255 255 diff --git a/graphics/interface/pokeblock_case_frame.png b/graphics/interface/pokeblock_case_frame.png deleted file mode 100644 index ffc658821..000000000 Binary files a/graphics/interface/pokeblock_case_frame.png and /dev/null differ diff --git a/graphics/interface/pokeblock_device.png b/graphics/interface/pokeblock_device.png deleted file mode 100644 index 65b29a8b3..000000000 Binary files a/graphics/interface/pokeblock_device.png and /dev/null differ diff --git a/graphics/interface/pokeblock_feeding_bg_map.bin b/graphics/interface/pokeblock_feeding_bg_map.bin deleted file mode 100644 index 9feebf8bc..000000000 Binary files a/graphics/interface/pokeblock_feeding_bg_map.bin and /dev/null differ diff --git a/graphics/pokeblock/device.png b/graphics/pokeblock/device.png new file mode 100644 index 000000000..65b29a8b3 Binary files /dev/null and b/graphics/pokeblock/device.png differ diff --git a/graphics/pokeblock/feeding_bg.bin b/graphics/pokeblock/feeding_bg.bin new file mode 100644 index 000000000..9feebf8bc Binary files /dev/null and b/graphics/pokeblock/feeding_bg.bin differ diff --git a/graphics/pokeblock/menu.bin b/graphics/pokeblock/menu.bin new file mode 100644 index 000000000..1719bb5a6 Binary files /dev/null and b/graphics/pokeblock/menu.bin differ diff --git a/graphics/pokeblock/menu.pal b/graphics/pokeblock/menu.pal new file mode 100644 index 000000000..ef58ae778 --- /dev/null +++ b/graphics/pokeblock/menu.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +0 0 0 +123 205 189 +238 246 255 +213 230 255 +255 0 0 +115 131 238 +90 90 98 +123 180 189 +131 131 164 +0 0 0 +0 0 0 +197 197 197 +205 65 24 +255 123 90 +255 180 148 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +238 246 255 +0 0 0 +0 0 0 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 197 +106 139 189 +148 213 255 +180 238 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +255 238 238 +0 0 0 +0 0 0 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 197 +205 90 172 +255 156 197 +255 197 213 +255 255 255 +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 +106 180 115 +148 246 98 +205 255 139 +255 255 255 +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 +180 180 49 +246 230 49 +255 255 148 +255 255 255 +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 +148 148 139 +222 222 222 +238 238 238 +255 255 255 diff --git a/graphics/pokeblock/menu.png b/graphics/pokeblock/menu.png new file mode 100644 index 000000000..ffc658821 Binary files /dev/null and b/graphics/pokeblock/menu.png differ diff --git a/src/graphics.c b/src/graphics.c index fda9a3fd5..ebb7be3ca 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1163,13 +1163,14 @@ const u32 gMenuMoneyGfx[] = INCBIN_U32("graphics/interface/money.4bpp.lz"); // Pokeblock -const u32 gMenuPokeblock_Gfx[] = INCBIN_U32("graphics/interface/pokeblock_case_frame.4bpp.lz"); -const u32 gMenuPokeblock_Pal[] = INCBIN_U32("graphics/interface/pokeblock_case_frame.gbapal.lz"); +const u32 gMenuPokeblock_Gfx[] = INCBIN_U32("graphics/pokeblock/menu.4bpp.lz"); +const u32 gMenuPokeblock_Pal[] = INCBIN_U32("graphics/pokeblock/menu.gbapal.lz"); -const u32 gMenuPokeblockDevice_Gfx[] = INCBIN_U32("graphics/interface/pokeblock_device.4bpp.lz"); -const u32 gMenuPokeblockDevice_Pal[] = INCBIN_U32("graphics/interface/pokeblock_device.gbapal.lz"); +const u32 gMenuPokeblockDevice_Gfx[] = INCBIN_U32("graphics/pokeblock/device.4bpp.lz"); +const u32 gMenuPokeblockDevice_Pal[] = INCBIN_U32("graphics/pokeblock/device.gbapal.lz"); + +const u32 gMenuPokeblock_Tilemap[] = INCBIN_U32("graphics/pokeblock/menu.bin.lz"); -const u32 gMenuPokeblock_Tilemap[] = INCBIN_U32("graphics/interface/pokeblock.bin.lz"); const u32 gPokeblock_Gfx[] = INCBIN_U32("graphics/pokeblock/pokeblock.4bpp.lz"); const u32 gPokeblockRed_Pal[] = INCBIN_U32("graphics/pokeblock/red.gbapal.lz"); const u32 gPokeblockBlue_Pal[] = INCBIN_U32("graphics/pokeblock/blue.gbapal.lz"); @@ -1186,7 +1187,7 @@ const u32 gPokeblockBlack_Pal[] = INCBIN_U32("graphics/pokeblock/black.gbapal.lz const u32 gPokeblockWhite_Pal[] = INCBIN_U32("graphics/pokeblock/white.gbapal.lz"); const u32 gPokeblockGold_Pal[] = INCBIN_U32("graphics/pokeblock/gold.gbapal.lz"); -const u32 gPokeblockFeedBg_Tilemap[] = INCBIN_U32("graphics/interface/pokeblock_feeding_bg_map.bin.lz"); +const u32 gPokeblockFeedBg_Tilemap[] = INCBIN_U32("graphics/pokeblock/feeding_bg.bin.lz"); #include "data/graphics/berries.h" #include "data/graphics/rayquaza_scene.h" -- cgit v1.2.3 From 694aa3c65dd4d926616dcab414e8c1647f357c54 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 11:59:24 -0500 Subject: Move balls, shop, link, map popups, and bag out of interface --- graphics/bag/bag.pal | 19 ++ graphics/bag/bag_female.png | Bin 0 -> 1460 bytes graphics/bag/bag_male.png | Bin 0 -> 1637 bytes graphics/bag/bag_pyramid.pal | 35 +++ graphics/bag/bag_pyramid.png | Bin 0 -> 778 bytes graphics/bag/berry_tag.bin | Bin 0 -> 2048 bytes graphics/bag/berry_tag_screen.pal | 19 ++ graphics/bag/berry_tag_title.bin | Bin 0 -> 2048 bytes graphics/bag/check_berry.pal | 99 ++++++++ graphics/bag/check_berry.png | Bin 0 -> 743 bytes graphics/bag/check_berry_circle.png | Bin 0 -> 233 bytes graphics/bag/hm.png | Bin 0 -> 184 bytes graphics/bag/menu.bin | Bin 0 -> 2048 bytes graphics/bag/menu.png | Bin 0 -> 548 bytes graphics/bag/menu_female.pal | 35 +++ graphics/bag/menu_male.pal | 35 +++ graphics/bag/menu_pyramid.bin | Bin 0 -> 2048 bytes graphics/bag/menu_pyramid.pal | 19 ++ graphics/bag/rotating_ball.png | Bin 0 -> 212 bytes graphics/bag/select_button.png | Bin 0 -> 135 bytes graphics/balls/dive.png | Bin 0 -> 326 bytes graphics/balls/great.png | Bin 0 -> 257 bytes graphics/balls/luxury.png | Bin 0 -> 350 bytes graphics/balls/master.png | Bin 0 -> 260 bytes graphics/balls/nest.png | Bin 0 -> 266 bytes graphics/balls/net.png | Bin 0 -> 246 bytes graphics/balls/open.png | Bin 0 -> 215 bytes graphics/balls/poke.png | Bin 0 -> 249 bytes graphics/balls/premier.png | Bin 0 -> 289 bytes graphics/balls/repeat.png | Bin 0 -> 257 bytes graphics/balls/safari.png | Bin 0 -> 259 bytes graphics/balls/timer.png | Bin 0 -> 296 bytes graphics/balls/ultra.png | Bin 0 -> 245 bytes graphics/interface/bag_pyramid.pal | 35 --- graphics/interface/bag_pyramid.png | Bin 778 -> 0 bytes graphics/interface/bag_pyramid_interface.pal | 19 -- graphics/interface/bag_pyramid_tilemap.bin | Bin 2048 -> 0 bytes graphics/interface/bag_screen.png | Bin 548 -> 0 bytes graphics/interface/bag_screen_female.pal | 35 --- graphics/interface/bag_screen_male.pal | 35 --- graphics/interface/bag_screen_tilemap.bin | Bin 2048 -> 0 bytes graphics/interface/bag_spinner.png | Bin 212 -> 0 bytes graphics/interface/bag_swap.png | Bin 159 -> 0 bytes graphics/interface/ball/dive.png | Bin 326 -> 0 bytes graphics/interface/ball/great.png | Bin 257 -> 0 bytes graphics/interface/ball/luxury.png | Bin 350 -> 0 bytes graphics/interface/ball/master.png | Bin 260 -> 0 bytes graphics/interface/ball/nest.png | Bin 266 -> 0 bytes graphics/interface/ball/net.png | Bin 246 -> 0 bytes graphics/interface/ball/poke.png | Bin 249 -> 0 bytes graphics/interface/ball/premier.png | Bin 289 -> 0 bytes graphics/interface/ball/repeat.png | Bin 257 -> 0 bytes graphics/interface/ball/safari.png | Bin 259 -> 0 bytes graphics/interface/ball/timer.png | Bin 296 -> 0 bytes graphics/interface/ball/ultra.png | Bin 245 -> 0 bytes graphics/interface/ball_open.png | Bin 215 -> 0 bytes graphics/interface/berry_tag.bin | Bin 2048 -> 0 bytes graphics/interface/berry_tag_screen.pal | 19 -- graphics/interface/berry_tag_title.bin | Bin 2048 -> 0 bytes graphics/interface/check_berry.pal | 99 -------- graphics/interface/check_berry.png | Bin 743 -> 0 bytes graphics/interface/check_berry_circle.png | Bin 233 -> 0 bytes graphics/interface/comm_error_bg.png | Bin 71 -> 0 bytes graphics/interface/hm.png | Bin 184 -> 0 bytes graphics/interface/hold_icons.png | Bin 177 -> 0 bytes graphics/interface/link_test_digits.png | Bin 269 -> 0 bytes graphics/interface/map_popup/brick.png | Bin 412 -> 0 bytes graphics/interface/map_popup/brick_outline.png | Bin 461 -> 0 bytes graphics/interface/map_popup/marble.png | Bin 509 -> 0 bytes graphics/interface/map_popup/marble_outline.png | Bin 494 -> 0 bytes graphics/interface/map_popup/stone.png | Bin 201 -> 0 bytes graphics/interface/map_popup/stone2.png | Bin 201 -> 0 bytes graphics/interface/map_popup/stone2_outline.png | Bin 407 -> 0 bytes graphics/interface/map_popup/stone_outline.png | Bin 407 -> 0 bytes graphics/interface/map_popup/underwater.pal | 19 -- graphics/interface/map_popup/underwater.png | Bin 304 -> 0 bytes .../interface/map_popup/underwater_outline.png | Bin 485 -> 0 bytes graphics/interface/map_popup/wood.png | Bin 338 -> 0 bytes graphics/interface/map_popup/wood_outline.png | Bin 391 -> 0 bytes graphics/interface/mart_frame.bin | Bin 2048 -> 0 bytes graphics/interface/mart_frame.png | Bin 314 -> 0 bytes graphics/interface/money.png | Bin 210 -> 0 bytes graphics/interface/select_button.png | Bin 135 -> 0 bytes graphics/interface/swap_line.png | Bin 0 -> 159 bytes graphics/interface/wireless_info_screen.bin | Bin 2048 -> 0 bytes graphics/interface/wireless_info_screen.pal | 259 --------------------- graphics/interface/wireless_info_screen.png | Bin 1210 -> 0 bytes graphics/interface/wireless_link_display.bin | Bin 2048 -> 0 bytes graphics/interface/wireless_link_display.png | Bin 904 -> 0 bytes graphics/interface/wireless_link_icon.png | Bin 295 -> 0 bytes graphics/link/321start.png | Bin 0 -> 815 bytes graphics/link/321start_static.png | Bin 0 -> 778 bytes graphics/link/comm_error_bg.png | Bin 0 -> 71 bytes graphics/link/test_digits.png | Bin 0 -> 269 bytes graphics/link/wireless_display.bin | Bin 0 -> 2048 bytes graphics/link/wireless_display.png | Bin 0 -> 904 bytes graphics/link/wireless_icon.png | Bin 0 -> 295 bytes graphics/link/wireless_info_screen.bin | Bin 0 -> 2048 bytes graphics/link/wireless_info_screen.pal | 259 +++++++++++++++++++++ graphics/link/wireless_info_screen.png | Bin 0 -> 1210 bytes graphics/map_popup/brick.png | Bin 0 -> 412 bytes graphics/map_popup/brick_outline.png | Bin 0 -> 461 bytes graphics/map_popup/marble.png | Bin 0 -> 509 bytes graphics/map_popup/marble_outline.png | Bin 0 -> 494 bytes graphics/map_popup/stone.png | Bin 0 -> 201 bytes graphics/map_popup/stone2.png | Bin 0 -> 201 bytes graphics/map_popup/stone2_outline.png | Bin 0 -> 407 bytes graphics/map_popup/stone_outline.png | Bin 0 -> 407 bytes graphics/map_popup/underwater.pal | 19 ++ graphics/map_popup/underwater.png | Bin 0 -> 304 bytes graphics/map_popup/underwater_outline.png | Bin 0 -> 485 bytes graphics/map_popup/wood.png | Bin 0 -> 338 bytes graphics/map_popup/wood_outline.png | Bin 0 -> 391 bytes graphics/minigame_countdown/321start.png | Bin 815 -> 0 bytes graphics/minigame_countdown/321start_static.png | Bin 778 -> 0 bytes graphics/misc/bag.pal | 19 -- graphics/misc/bag_female.png | Bin 1460 -> 0 bytes graphics/misc/bag_male.png | Bin 1637 -> 0 bytes graphics/party_menu/hold_icons.png | Bin 0 -> 177 bytes graphics/shop/menu.bin | Bin 0 -> 2048 bytes graphics/shop/menu.png | Bin 0 -> 314 bytes graphics/shop/money.png | Bin 0 -> 210 bytes graphics_file_rules.mk | 2 +- include/graphics.h | 62 ++--- src/berry_tag_screen.c | 2 +- src/data/graphics/berries.h | 10 +- src/data/graphics/interface_pokeballs.h | 37 --- src/data/graphics/pokeballs.h | 37 +++ src/data/party_menu.h | 4 +- src/graphics.c | 43 ++-- src/item_menu.c | 2 +- src/item_menu_icons.c | 8 +- src/link.c | 12 +- src/link_rfu_3.c | 4 +- src/map_name_popup.c | 38 +-- src/menu_helpers.c | 4 +- src/minigame_countdown.c | 8 +- src/money.c | 6 +- src/pokeball.c | 48 ++-- src/shop.c | 6 +- src/wireless_communication_status_screen.c | 6 +- 141 files changed, 707 insertions(+), 710 deletions(-) create mode 100644 graphics/bag/bag.pal create mode 100644 graphics/bag/bag_female.png create mode 100644 graphics/bag/bag_male.png create mode 100644 graphics/bag/bag_pyramid.pal create mode 100644 graphics/bag/bag_pyramid.png create mode 100644 graphics/bag/berry_tag.bin create mode 100644 graphics/bag/berry_tag_screen.pal create mode 100644 graphics/bag/berry_tag_title.bin create mode 100644 graphics/bag/check_berry.pal create mode 100644 graphics/bag/check_berry.png create mode 100644 graphics/bag/check_berry_circle.png create mode 100644 graphics/bag/hm.png create mode 100644 graphics/bag/menu.bin create mode 100644 graphics/bag/menu.png create mode 100644 graphics/bag/menu_female.pal create mode 100644 graphics/bag/menu_male.pal create mode 100644 graphics/bag/menu_pyramid.bin create mode 100644 graphics/bag/menu_pyramid.pal create mode 100644 graphics/bag/rotating_ball.png create mode 100644 graphics/bag/select_button.png create mode 100644 graphics/balls/dive.png create mode 100644 graphics/balls/great.png create mode 100644 graphics/balls/luxury.png create mode 100644 graphics/balls/master.png create mode 100644 graphics/balls/nest.png create mode 100644 graphics/balls/net.png create mode 100644 graphics/balls/open.png create mode 100644 graphics/balls/poke.png create mode 100644 graphics/balls/premier.png create mode 100644 graphics/balls/repeat.png create mode 100644 graphics/balls/safari.png create mode 100644 graphics/balls/timer.png create mode 100644 graphics/balls/ultra.png delete mode 100644 graphics/interface/bag_pyramid.pal delete mode 100644 graphics/interface/bag_pyramid.png delete mode 100644 graphics/interface/bag_pyramid_interface.pal delete mode 100644 graphics/interface/bag_pyramid_tilemap.bin delete mode 100644 graphics/interface/bag_screen.png delete mode 100644 graphics/interface/bag_screen_female.pal delete mode 100644 graphics/interface/bag_screen_male.pal delete mode 100644 graphics/interface/bag_screen_tilemap.bin delete mode 100644 graphics/interface/bag_spinner.png delete mode 100644 graphics/interface/bag_swap.png delete mode 100644 graphics/interface/ball/dive.png delete mode 100644 graphics/interface/ball/great.png delete mode 100644 graphics/interface/ball/luxury.png delete mode 100644 graphics/interface/ball/master.png delete mode 100644 graphics/interface/ball/nest.png delete mode 100644 graphics/interface/ball/net.png delete mode 100644 graphics/interface/ball/poke.png delete mode 100644 graphics/interface/ball/premier.png delete mode 100644 graphics/interface/ball/repeat.png delete mode 100644 graphics/interface/ball/safari.png delete mode 100644 graphics/interface/ball/timer.png delete mode 100644 graphics/interface/ball/ultra.png delete mode 100644 graphics/interface/ball_open.png delete mode 100644 graphics/interface/berry_tag.bin delete mode 100644 graphics/interface/berry_tag_screen.pal delete mode 100644 graphics/interface/berry_tag_title.bin delete mode 100644 graphics/interface/check_berry.pal delete mode 100644 graphics/interface/check_berry.png delete mode 100644 graphics/interface/check_berry_circle.png delete mode 100644 graphics/interface/comm_error_bg.png delete mode 100644 graphics/interface/hm.png delete mode 100644 graphics/interface/hold_icons.png delete mode 100644 graphics/interface/link_test_digits.png delete mode 100644 graphics/interface/map_popup/brick.png delete mode 100644 graphics/interface/map_popup/brick_outline.png delete mode 100644 graphics/interface/map_popup/marble.png delete mode 100644 graphics/interface/map_popup/marble_outline.png delete mode 100644 graphics/interface/map_popup/stone.png delete mode 100644 graphics/interface/map_popup/stone2.png delete mode 100644 graphics/interface/map_popup/stone2_outline.png delete mode 100644 graphics/interface/map_popup/stone_outline.png delete mode 100644 graphics/interface/map_popup/underwater.pal delete mode 100644 graphics/interface/map_popup/underwater.png delete mode 100644 graphics/interface/map_popup/underwater_outline.png delete mode 100644 graphics/interface/map_popup/wood.png delete mode 100644 graphics/interface/map_popup/wood_outline.png delete mode 100644 graphics/interface/mart_frame.bin delete mode 100644 graphics/interface/mart_frame.png delete mode 100644 graphics/interface/money.png delete mode 100644 graphics/interface/select_button.png create mode 100644 graphics/interface/swap_line.png delete mode 100644 graphics/interface/wireless_info_screen.bin delete mode 100644 graphics/interface/wireless_info_screen.pal delete mode 100644 graphics/interface/wireless_info_screen.png delete mode 100644 graphics/interface/wireless_link_display.bin delete mode 100644 graphics/interface/wireless_link_display.png delete mode 100644 graphics/interface/wireless_link_icon.png create mode 100644 graphics/link/321start.png create mode 100644 graphics/link/321start_static.png create mode 100644 graphics/link/comm_error_bg.png create mode 100644 graphics/link/test_digits.png create mode 100644 graphics/link/wireless_display.bin create mode 100644 graphics/link/wireless_display.png create mode 100644 graphics/link/wireless_icon.png create mode 100644 graphics/link/wireless_info_screen.bin create mode 100644 graphics/link/wireless_info_screen.pal create mode 100644 graphics/link/wireless_info_screen.png create mode 100644 graphics/map_popup/brick.png create mode 100644 graphics/map_popup/brick_outline.png create mode 100644 graphics/map_popup/marble.png create mode 100644 graphics/map_popup/marble_outline.png create mode 100644 graphics/map_popup/stone.png create mode 100644 graphics/map_popup/stone2.png create mode 100644 graphics/map_popup/stone2_outline.png create mode 100644 graphics/map_popup/stone_outline.png create mode 100644 graphics/map_popup/underwater.pal create mode 100644 graphics/map_popup/underwater.png create mode 100644 graphics/map_popup/underwater_outline.png create mode 100644 graphics/map_popup/wood.png create mode 100644 graphics/map_popup/wood_outline.png delete mode 100644 graphics/minigame_countdown/321start.png delete mode 100644 graphics/minigame_countdown/321start_static.png delete mode 100644 graphics/misc/bag.pal delete mode 100644 graphics/misc/bag_female.png delete mode 100644 graphics/misc/bag_male.png create mode 100644 graphics/party_menu/hold_icons.png create mode 100644 graphics/shop/menu.bin create mode 100644 graphics/shop/menu.png create mode 100644 graphics/shop/money.png delete mode 100644 src/data/graphics/interface_pokeballs.h create mode 100644 src/data/graphics/pokeballs.h diff --git a/graphics/bag/bag.pal b/graphics/bag/bag.pal new file mode 100644 index 000000000..3c7c2370a --- /dev/null +++ b/graphics/bag/bag.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +115 255 139 +98 222 123 +82 197 106 +74 164 90 +57 139 74 +49 106 57 +32 82 41 +24 49 24 +8 24 8 +156 255 131 +213 213 222 +189 189 197 +98 98 115 +255 255 255 +0 0 0 diff --git a/graphics/bag/bag_female.png b/graphics/bag/bag_female.png new file mode 100644 index 000000000..65446e269 Binary files /dev/null and b/graphics/bag/bag_female.png differ diff --git a/graphics/bag/bag_male.png b/graphics/bag/bag_male.png new file mode 100644 index 000000000..a12c66f39 Binary files /dev/null and b/graphics/bag/bag_male.png differ diff --git a/graphics/bag/bag_pyramid.pal b/graphics/bag/bag_pyramid.pal new file mode 100644 index 000000000..200b001b5 --- /dev/null +++ b/graphics/bag/bag_pyramid.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +115 197 164 +255 197 106 +230 172 90 +205 148 74 +180 123 65 +164 98 49 +139 74 32 +115 49 24 +90 24 8 +74 0 0 +255 222 123 +164 131 255 +213 205 255 +98 98 115 +255 255 255 +0 0 0 +115 197 164 +255 197 106 +230 172 90 +205 148 74 +180 123 65 +164 98 49 +139 74 32 +115 49 24 +90 24 8 +74 0 0 +255 222 123 +255 49 0 +255 213 172 +98 98 115 +255 255 255 +0 0 0 diff --git a/graphics/bag/bag_pyramid.png b/graphics/bag/bag_pyramid.png new file mode 100644 index 000000000..42b709057 Binary files /dev/null and b/graphics/bag/bag_pyramid.png differ diff --git a/graphics/bag/berry_tag.bin b/graphics/bag/berry_tag.bin new file mode 100644 index 000000000..fc809d6a7 Binary files /dev/null and b/graphics/bag/berry_tag.bin differ diff --git a/graphics/bag/berry_tag_screen.pal b/graphics/bag/berry_tag_screen.pal new file mode 100644 index 000000000..a55550e8f --- /dev/null +++ b/graphics/bag/berry_tag_screen.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +0 0 0 +0 0 0 +189 131 65 +65 32 0 +238 222 172 diff --git a/graphics/bag/berry_tag_title.bin b/graphics/bag/berry_tag_title.bin new file mode 100644 index 000000000..560eb6cfa Binary files /dev/null and b/graphics/bag/berry_tag_title.bin differ diff --git a/graphics/bag/check_berry.pal b/graphics/bag/check_berry.pal new file mode 100644 index 000000000..f4f6cb4e3 --- /dev/null +++ b/graphics/bag/check_berry.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +0 0 0 +255 255 255 +238 246 238 +222 238 230 +213 230 213 +197 230 205 +189 222 189 +172 213 180 +164 213 172 +148 156 123 +115 106 90 +90 57 65 +222 49 8 +213 106 74 +205 164 139 +213 213 213 +0 0 0 +255 255 255 +213 246 205 +172 246 156 +139 246 106 +106 213 74 +74 180 41 +41 148 8 +246 230 8 +222 197 8 +205 164 8 +189 131 8 +172 98 8 +90 82 106 +172 98 8 +0 0 172 +0 0 0 +246 246 222 +230 213 222 +222 180 222 +205 148 222 +197 123 222 +180 90 222 +172 57 222 +156 24 222 +148 0 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 246 255 +230 238 246 +213 230 246 +197 222 238 +180 213 238 +164 205 230 +148 197 230 +131 189 230 +0 0 0 +0 0 0 +0 0 0 +246 230 8 +222 197 8 +205 164 8 +189 131 8 +0 0 0 +189 131 65 +197 131 98 +222 189 131 +123 82 24 +0 0 0 +0 0 0 +180 123 123 +238 222 172 +189 131 65 +65 32 0 +255 0 0 +106 180 213 +41 123 164 +123 148 49 +246 246 246 +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 +230 123 139 +164 49 115 +0 0 0 +0 0 0 diff --git a/graphics/bag/check_berry.png b/graphics/bag/check_berry.png new file mode 100644 index 000000000..56fc2966b Binary files /dev/null and b/graphics/bag/check_berry.png differ diff --git a/graphics/bag/check_berry_circle.png b/graphics/bag/check_berry_circle.png new file mode 100644 index 000000000..4d66237e5 Binary files /dev/null and b/graphics/bag/check_berry_circle.png differ diff --git a/graphics/bag/hm.png b/graphics/bag/hm.png new file mode 100644 index 000000000..d6c7e8de9 Binary files /dev/null and b/graphics/bag/hm.png differ diff --git a/graphics/bag/menu.bin b/graphics/bag/menu.bin new file mode 100644 index 000000000..c2ceaf139 Binary files /dev/null and b/graphics/bag/menu.bin differ diff --git a/graphics/bag/menu.png b/graphics/bag/menu.png new file mode 100644 index 000000000..e634cdb27 Binary files /dev/null and b/graphics/bag/menu.png differ diff --git a/graphics/bag/menu_female.pal b/graphics/bag/menu_female.pal new file mode 100644 index 000000000..07057ec9a --- /dev/null +++ b/graphics/bag/menu_female.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +98 98 115 +255 255 255 +205 205 205 +164 164 164 +123 123 123 +98 98 115 +57 49 57 +156 65 106 +98 41 65 +255 255 205 +255 230 139 +255 32 32 +230 123 139 +164 49 115 +189 156 90 +0 0 0 +98 98 115 +0 0 0 +255 255 255 +213 213 205 +189 156 90 +255 0 0 +180 180 180 +0 0 0 +0 0 0 +238 205 131 +255 255 205 +90 0 123 +230 123 139 +164 49 115 +106 180 213 +255 148 180 diff --git a/graphics/bag/menu_male.pal b/graphics/bag/menu_male.pal new file mode 100644 index 000000000..e773c384c --- /dev/null +++ b/graphics/bag/menu_male.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +98 98 115 +255 255 255 +205 205 205 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +41 82 115 +255 255 205 +255 230 139 +255 32 32 +213 106 255 +74 131 255 +189 156 90 +0 0 0 +98 98 115 +0 0 0 +255 255 255 +213 213 205 +189 156 90 +255 0 0 +180 180 180 +0 0 0 +0 0 0 +238 205 131 +255 255 205 +90 0 123 +213 106 255 +74 131 255 +255 0 0 +255 148 180 diff --git a/graphics/bag/menu_pyramid.bin b/graphics/bag/menu_pyramid.bin new file mode 100644 index 000000000..28ad3f927 Binary files /dev/null and b/graphics/bag/menu_pyramid.bin differ diff --git a/graphics/bag/menu_pyramid.pal b/graphics/bag/menu_pyramid.pal new file mode 100644 index 000000000..dcfdcf2ef --- /dev/null +++ b/graphics/bag/menu_pyramid.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 98 115 +255 255 255 +205 205 205 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +41 82 115 +255 255 205 +255 230 139 +255 32 32 +106 213 180 +41 164 123 +189 156 90 +0 0 0 diff --git a/graphics/bag/rotating_ball.png b/graphics/bag/rotating_ball.png new file mode 100644 index 000000000..4302bd77a Binary files /dev/null and b/graphics/bag/rotating_ball.png differ diff --git a/graphics/bag/select_button.png b/graphics/bag/select_button.png new file mode 100644 index 000000000..bded587fd Binary files /dev/null and b/graphics/bag/select_button.png differ diff --git a/graphics/balls/dive.png b/graphics/balls/dive.png new file mode 100644 index 000000000..5be9b1ed6 Binary files /dev/null and b/graphics/balls/dive.png differ diff --git a/graphics/balls/great.png b/graphics/balls/great.png new file mode 100644 index 000000000..0c054d7d3 Binary files /dev/null and b/graphics/balls/great.png differ diff --git a/graphics/balls/luxury.png b/graphics/balls/luxury.png new file mode 100644 index 000000000..8056416b2 Binary files /dev/null and b/graphics/balls/luxury.png differ diff --git a/graphics/balls/master.png b/graphics/balls/master.png new file mode 100644 index 000000000..9787a8896 Binary files /dev/null and b/graphics/balls/master.png differ diff --git a/graphics/balls/nest.png b/graphics/balls/nest.png new file mode 100644 index 000000000..a2fa81c1e Binary files /dev/null and b/graphics/balls/nest.png differ diff --git a/graphics/balls/net.png b/graphics/balls/net.png new file mode 100644 index 000000000..6fef48101 Binary files /dev/null and b/graphics/balls/net.png differ diff --git a/graphics/balls/open.png b/graphics/balls/open.png new file mode 100644 index 000000000..1030f4942 Binary files /dev/null and b/graphics/balls/open.png differ diff --git a/graphics/balls/poke.png b/graphics/balls/poke.png new file mode 100644 index 000000000..1e4aba669 Binary files /dev/null and b/graphics/balls/poke.png differ diff --git a/graphics/balls/premier.png b/graphics/balls/premier.png new file mode 100644 index 000000000..f5aaadbaf Binary files /dev/null and b/graphics/balls/premier.png differ diff --git a/graphics/balls/repeat.png b/graphics/balls/repeat.png new file mode 100644 index 000000000..5abe789a2 Binary files /dev/null and b/graphics/balls/repeat.png differ diff --git a/graphics/balls/safari.png b/graphics/balls/safari.png new file mode 100644 index 000000000..0dd49aef9 Binary files /dev/null and b/graphics/balls/safari.png differ diff --git a/graphics/balls/timer.png b/graphics/balls/timer.png new file mode 100644 index 000000000..2b63f6795 Binary files /dev/null and b/graphics/balls/timer.png differ diff --git a/graphics/balls/ultra.png b/graphics/balls/ultra.png new file mode 100644 index 000000000..1221cec4e Binary files /dev/null and b/graphics/balls/ultra.png differ diff --git a/graphics/interface/bag_pyramid.pal b/graphics/interface/bag_pyramid.pal deleted file mode 100644 index 200b001b5..000000000 --- a/graphics/interface/bag_pyramid.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -115 197 164 -255 197 106 -230 172 90 -205 148 74 -180 123 65 -164 98 49 -139 74 32 -115 49 24 -90 24 8 -74 0 0 -255 222 123 -164 131 255 -213 205 255 -98 98 115 -255 255 255 -0 0 0 -115 197 164 -255 197 106 -230 172 90 -205 148 74 -180 123 65 -164 98 49 -139 74 32 -115 49 24 -90 24 8 -74 0 0 -255 222 123 -255 49 0 -255 213 172 -98 98 115 -255 255 255 -0 0 0 diff --git a/graphics/interface/bag_pyramid.png b/graphics/interface/bag_pyramid.png deleted file mode 100644 index 42b709057..000000000 Binary files a/graphics/interface/bag_pyramid.png and /dev/null differ diff --git a/graphics/interface/bag_pyramid_interface.pal b/graphics/interface/bag_pyramid_interface.pal deleted file mode 100644 index dcfdcf2ef..000000000 --- a/graphics/interface/bag_pyramid_interface.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 98 115 -255 255 255 -205 205 205 -164 164 164 -123 123 123 -98 98 115 -41 57 65 -57 106 139 -41 82 115 -255 255 205 -255 230 139 -255 32 32 -106 213 180 -41 164 123 -189 156 90 -0 0 0 diff --git a/graphics/interface/bag_pyramid_tilemap.bin b/graphics/interface/bag_pyramid_tilemap.bin deleted file mode 100644 index 28ad3f927..000000000 Binary files a/graphics/interface/bag_pyramid_tilemap.bin and /dev/null differ diff --git a/graphics/interface/bag_screen.png b/graphics/interface/bag_screen.png deleted file mode 100644 index e634cdb27..000000000 Binary files a/graphics/interface/bag_screen.png and /dev/null differ diff --git a/graphics/interface/bag_screen_female.pal b/graphics/interface/bag_screen_female.pal deleted file mode 100644 index 07057ec9a..000000000 --- a/graphics/interface/bag_screen_female.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -98 98 115 -255 255 255 -205 205 205 -164 164 164 -123 123 123 -98 98 115 -57 49 57 -156 65 106 -98 41 65 -255 255 205 -255 230 139 -255 32 32 -230 123 139 -164 49 115 -189 156 90 -0 0 0 -98 98 115 -0 0 0 -255 255 255 -213 213 205 -189 156 90 -255 0 0 -180 180 180 -0 0 0 -0 0 0 -238 205 131 -255 255 205 -90 0 123 -230 123 139 -164 49 115 -106 180 213 -255 148 180 diff --git a/graphics/interface/bag_screen_male.pal b/graphics/interface/bag_screen_male.pal deleted file mode 100644 index e773c384c..000000000 --- a/graphics/interface/bag_screen_male.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -98 98 115 -255 255 255 -205 205 205 -164 164 164 -123 123 123 -98 98 115 -41 57 65 -57 106 139 -41 82 115 -255 255 205 -255 230 139 -255 32 32 -213 106 255 -74 131 255 -189 156 90 -0 0 0 -98 98 115 -0 0 0 -255 255 255 -213 213 205 -189 156 90 -255 0 0 -180 180 180 -0 0 0 -0 0 0 -238 205 131 -255 255 205 -90 0 123 -213 106 255 -74 131 255 -255 0 0 -255 148 180 diff --git a/graphics/interface/bag_screen_tilemap.bin b/graphics/interface/bag_screen_tilemap.bin deleted file mode 100644 index c2ceaf139..000000000 Binary files a/graphics/interface/bag_screen_tilemap.bin and /dev/null differ diff --git a/graphics/interface/bag_spinner.png b/graphics/interface/bag_spinner.png deleted file mode 100644 index 4302bd77a..000000000 Binary files a/graphics/interface/bag_spinner.png and /dev/null differ diff --git a/graphics/interface/bag_swap.png b/graphics/interface/bag_swap.png deleted file mode 100644 index a9bed1e8a..000000000 Binary files a/graphics/interface/bag_swap.png and /dev/null differ diff --git a/graphics/interface/ball/dive.png b/graphics/interface/ball/dive.png deleted file mode 100644 index 5be9b1ed6..000000000 Binary files a/graphics/interface/ball/dive.png and /dev/null differ diff --git a/graphics/interface/ball/great.png b/graphics/interface/ball/great.png deleted file mode 100644 index 0c054d7d3..000000000 Binary files a/graphics/interface/ball/great.png and /dev/null differ diff --git a/graphics/interface/ball/luxury.png b/graphics/interface/ball/luxury.png deleted file mode 100644 index 8056416b2..000000000 Binary files a/graphics/interface/ball/luxury.png and /dev/null differ diff --git a/graphics/interface/ball/master.png b/graphics/interface/ball/master.png deleted file mode 100644 index 9787a8896..000000000 Binary files a/graphics/interface/ball/master.png and /dev/null differ diff --git a/graphics/interface/ball/nest.png b/graphics/interface/ball/nest.png deleted file mode 100644 index a2fa81c1e..000000000 Binary files a/graphics/interface/ball/nest.png and /dev/null differ diff --git a/graphics/interface/ball/net.png b/graphics/interface/ball/net.png deleted file mode 100644 index 6fef48101..000000000 Binary files a/graphics/interface/ball/net.png and /dev/null differ diff --git a/graphics/interface/ball/poke.png b/graphics/interface/ball/poke.png deleted file mode 100644 index 1e4aba669..000000000 Binary files a/graphics/interface/ball/poke.png and /dev/null differ diff --git a/graphics/interface/ball/premier.png b/graphics/interface/ball/premier.png deleted file mode 100644 index f5aaadbaf..000000000 Binary files a/graphics/interface/ball/premier.png and /dev/null differ diff --git a/graphics/interface/ball/repeat.png b/graphics/interface/ball/repeat.png deleted file mode 100644 index 5abe789a2..000000000 Binary files a/graphics/interface/ball/repeat.png and /dev/null differ diff --git a/graphics/interface/ball/safari.png b/graphics/interface/ball/safari.png deleted file mode 100644 index 0dd49aef9..000000000 Binary files a/graphics/interface/ball/safari.png and /dev/null differ diff --git a/graphics/interface/ball/timer.png b/graphics/interface/ball/timer.png deleted file mode 100644 index 2b63f6795..000000000 Binary files a/graphics/interface/ball/timer.png and /dev/null differ diff --git a/graphics/interface/ball/ultra.png b/graphics/interface/ball/ultra.png deleted file mode 100644 index 1221cec4e..000000000 Binary files a/graphics/interface/ball/ultra.png and /dev/null differ diff --git a/graphics/interface/ball_open.png b/graphics/interface/ball_open.png deleted file mode 100644 index 1030f4942..000000000 Binary files a/graphics/interface/ball_open.png and /dev/null differ diff --git a/graphics/interface/berry_tag.bin b/graphics/interface/berry_tag.bin deleted file mode 100644 index fc809d6a7..000000000 Binary files a/graphics/interface/berry_tag.bin and /dev/null differ diff --git a/graphics/interface/berry_tag_screen.pal b/graphics/interface/berry_tag_screen.pal deleted file mode 100644 index a55550e8f..000000000 --- a/graphics/interface/berry_tag_screen.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -255 255 255 -98 98 98 -213 213 205 -230 8 8 -255 189 115 -32 156 8 -148 246 148 -49 82 205 -164 197 246 -0 0 0 -0 0 0 -0 0 0 -189 131 65 -65 32 0 -238 222 172 diff --git a/graphics/interface/berry_tag_title.bin b/graphics/interface/berry_tag_title.bin deleted file mode 100644 index 560eb6cfa..000000000 Binary files a/graphics/interface/berry_tag_title.bin and /dev/null differ diff --git a/graphics/interface/check_berry.pal b/graphics/interface/check_berry.pal deleted file mode 100644 index f4f6cb4e3..000000000 --- a/graphics/interface/check_berry.pal +++ /dev/null @@ -1,99 +0,0 @@ -JASC-PAL -0100 -96 -0 0 0 -255 255 255 -238 246 238 -222 238 230 -213 230 213 -197 230 205 -189 222 189 -172 213 180 -164 213 172 -148 156 123 -115 106 90 -90 57 65 -222 49 8 -213 106 74 -205 164 139 -213 213 213 -0 0 0 -255 255 255 -213 246 205 -172 246 156 -139 246 106 -106 213 74 -74 180 41 -41 148 8 -246 230 8 -222 197 8 -205 164 8 -189 131 8 -172 98 8 -90 82 106 -172 98 8 -0 0 172 -0 0 0 -246 246 222 -230 213 222 -222 180 222 -205 148 222 -197 123 222 -180 90 222 -172 57 222 -156 24 222 -148 0 222 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -246 246 255 -230 238 246 -213 230 246 -197 222 238 -180 213 238 -164 205 230 -148 197 230 -131 189 230 -0 0 0 -0 0 0 -0 0 0 -246 230 8 -222 197 8 -205 164 8 -189 131 8 -0 0 0 -189 131 65 -197 131 98 -222 189 131 -123 82 24 -0 0 0 -0 0 0 -180 123 123 -238 222 172 -189 131 65 -65 32 0 -255 0 0 -106 180 213 -41 123 164 -123 148 49 -246 246 246 -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 -230 123 139 -164 49 115 -0 0 0 -0 0 0 diff --git a/graphics/interface/check_berry.png b/graphics/interface/check_berry.png deleted file mode 100644 index 56fc2966b..000000000 Binary files a/graphics/interface/check_berry.png and /dev/null differ diff --git a/graphics/interface/check_berry_circle.png b/graphics/interface/check_berry_circle.png deleted file mode 100644 index 4d66237e5..000000000 Binary files a/graphics/interface/check_berry_circle.png and /dev/null differ diff --git a/graphics/interface/comm_error_bg.png b/graphics/interface/comm_error_bg.png deleted file mode 100644 index 83ba13d11..000000000 Binary files a/graphics/interface/comm_error_bg.png and /dev/null differ diff --git a/graphics/interface/hm.png b/graphics/interface/hm.png deleted file mode 100644 index d6c7e8de9..000000000 Binary files a/graphics/interface/hm.png and /dev/null differ diff --git a/graphics/interface/hold_icons.png b/graphics/interface/hold_icons.png deleted file mode 100644 index 53eeedde3..000000000 Binary files a/graphics/interface/hold_icons.png and /dev/null differ diff --git a/graphics/interface/link_test_digits.png b/graphics/interface/link_test_digits.png deleted file mode 100644 index fe71d3387..000000000 Binary files a/graphics/interface/link_test_digits.png and /dev/null differ diff --git a/graphics/interface/map_popup/brick.png b/graphics/interface/map_popup/brick.png deleted file mode 100644 index 8fef0a1c2..000000000 Binary files a/graphics/interface/map_popup/brick.png and /dev/null differ diff --git a/graphics/interface/map_popup/brick_outline.png b/graphics/interface/map_popup/brick_outline.png deleted file mode 100644 index be4b6f95a..000000000 Binary files a/graphics/interface/map_popup/brick_outline.png and /dev/null differ diff --git a/graphics/interface/map_popup/marble.png b/graphics/interface/map_popup/marble.png deleted file mode 100644 index d79b9ec34..000000000 Binary files a/graphics/interface/map_popup/marble.png and /dev/null differ diff --git a/graphics/interface/map_popup/marble_outline.png b/graphics/interface/map_popup/marble_outline.png deleted file mode 100644 index 54f3021ea..000000000 Binary files a/graphics/interface/map_popup/marble_outline.png and /dev/null differ diff --git a/graphics/interface/map_popup/stone.png b/graphics/interface/map_popup/stone.png deleted file mode 100644 index fe3b7e29d..000000000 Binary files a/graphics/interface/map_popup/stone.png and /dev/null differ diff --git a/graphics/interface/map_popup/stone2.png b/graphics/interface/map_popup/stone2.png deleted file mode 100644 index 261c3184a..000000000 Binary files a/graphics/interface/map_popup/stone2.png and /dev/null differ diff --git a/graphics/interface/map_popup/stone2_outline.png b/graphics/interface/map_popup/stone2_outline.png deleted file mode 100644 index b0c0748df..000000000 Binary files a/graphics/interface/map_popup/stone2_outline.png and /dev/null differ diff --git a/graphics/interface/map_popup/stone_outline.png b/graphics/interface/map_popup/stone_outline.png deleted file mode 100644 index 7c014d05e..000000000 Binary files a/graphics/interface/map_popup/stone_outline.png and /dev/null differ diff --git a/graphics/interface/map_popup/underwater.pal b/graphics/interface/map_popup/underwater.pal deleted file mode 100644 index 19b8cf9c4..000000000 --- a/graphics/interface/map_popup/underwater.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -0 0 0 -238 255 255 -65 65 123 -255 255 255 -180 222 255 -139 172 213 -98 123 172 -57 74 131 -16 24 90 -180 222 255 -139 172 213 -98 123 172 -57 74 131 -16 24 90 -255 255 255 diff --git a/graphics/interface/map_popup/underwater.png b/graphics/interface/map_popup/underwater.png deleted file mode 100644 index e6cf2b6c8..000000000 Binary files a/graphics/interface/map_popup/underwater.png and /dev/null differ diff --git a/graphics/interface/map_popup/underwater_outline.png b/graphics/interface/map_popup/underwater_outline.png deleted file mode 100644 index 2ffe3cb75..000000000 Binary files a/graphics/interface/map_popup/underwater_outline.png and /dev/null differ diff --git a/graphics/interface/map_popup/wood.png b/graphics/interface/map_popup/wood.png deleted file mode 100644 index e846a6bcd..000000000 Binary files a/graphics/interface/map_popup/wood.png and /dev/null differ diff --git a/graphics/interface/map_popup/wood_outline.png b/graphics/interface/map_popup/wood_outline.png deleted file mode 100644 index d143dbc2f..000000000 Binary files a/graphics/interface/map_popup/wood_outline.png and /dev/null differ diff --git a/graphics/interface/mart_frame.bin b/graphics/interface/mart_frame.bin deleted file mode 100644 index 63156b8d5..000000000 Binary files a/graphics/interface/mart_frame.bin and /dev/null differ diff --git a/graphics/interface/mart_frame.png b/graphics/interface/mart_frame.png deleted file mode 100644 index ece93b7c7..000000000 Binary files a/graphics/interface/mart_frame.png and /dev/null differ diff --git a/graphics/interface/money.png b/graphics/interface/money.png deleted file mode 100644 index d11fe06d1..000000000 Binary files a/graphics/interface/money.png and /dev/null differ diff --git a/graphics/interface/select_button.png b/graphics/interface/select_button.png deleted file mode 100644 index bded587fd..000000000 Binary files a/graphics/interface/select_button.png and /dev/null differ diff --git a/graphics/interface/swap_line.png b/graphics/interface/swap_line.png new file mode 100644 index 000000000..a9bed1e8a Binary files /dev/null and b/graphics/interface/swap_line.png differ diff --git a/graphics/interface/wireless_info_screen.bin b/graphics/interface/wireless_info_screen.bin deleted file mode 100644 index 7cd8123c2..000000000 Binary files a/graphics/interface/wireless_info_screen.bin and /dev/null differ diff --git a/graphics/interface/wireless_info_screen.pal b/graphics/interface/wireless_info_screen.pal deleted file mode 100644 index 8e0bc0581..000000000 --- a/graphics/interface/wireless_info_screen.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 0 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -57 57 57 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -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 -0 0 0 -0 0 0 -0 0 0 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -74 246 255 -57 57 57 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -74 246 255 -57 213 230 -57 57 57 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -74 246 255 -57 213 230 -49 180 205 -0 32 98 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -90 90 90 -90 90 90 -90 90 90 -74 246 255 -57 213 230 -49 180 205 -41 148 180 -0 32 98 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -90 90 90 -90 90 90 -74 246 255 -57 213 230 -49 180 205 -41 148 180 -24 123 164 -0 32 98 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -90 90 90 -74 246 255 -57 213 230 -49 180 205 -41 148 180 -24 123 164 -16 90 139 -0 32 98 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -74 246 255 -57 213 230 -49 180 205 -41 148 180 -24 123 164 -16 90 139 -8 57 115 -0 32 98 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -57 213 230 -49 180 205 -41 148 180 -24 123 164 -16 90 139 -8 57 115 -8 57 115 -57 57 57 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -49 180 205 -41 148 180 -24 123 164 -16 90 139 -8 57 115 -8 57 115 -90 90 90 -57 57 57 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -41 148 180 -24 123 164 -16 90 139 -8 57 115 -8 57 115 -90 90 90 -90 90 90 -57 57 57 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -24 123 164 -16 90 139 -8 57 115 -8 57 115 -90 90 90 -90 90 90 -90 90 90 -57 57 57 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -16 90 139 -8 57 115 -8 57 115 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -57 57 57 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -8 57 115 -8 57 115 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -57 57 57 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 -0 0 0 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -90 90 90 -57 57 57 -172 123 0 -90 90 90 -57 57 57 -164 164 164 -255 180 0 -106 106 106 -74 74 74 diff --git a/graphics/interface/wireless_info_screen.png b/graphics/interface/wireless_info_screen.png deleted file mode 100644 index 796b2771a..000000000 Binary files a/graphics/interface/wireless_info_screen.png and /dev/null differ diff --git a/graphics/interface/wireless_link_display.bin b/graphics/interface/wireless_link_display.bin deleted file mode 100644 index 1832ae850..000000000 Binary files a/graphics/interface/wireless_link_display.bin and /dev/null differ diff --git a/graphics/interface/wireless_link_display.png b/graphics/interface/wireless_link_display.png deleted file mode 100644 index 3946b9b22..000000000 Binary files a/graphics/interface/wireless_link_display.png and /dev/null differ diff --git a/graphics/interface/wireless_link_icon.png b/graphics/interface/wireless_link_icon.png deleted file mode 100644 index 62c9c0ef7..000000000 Binary files a/graphics/interface/wireless_link_icon.png and /dev/null differ diff --git a/graphics/link/321start.png b/graphics/link/321start.png new file mode 100644 index 000000000..2823feb81 Binary files /dev/null and b/graphics/link/321start.png differ diff --git a/graphics/link/321start_static.png b/graphics/link/321start_static.png new file mode 100644 index 000000000..343fd3e7d Binary files /dev/null and b/graphics/link/321start_static.png differ diff --git a/graphics/link/comm_error_bg.png b/graphics/link/comm_error_bg.png new file mode 100644 index 000000000..83ba13d11 Binary files /dev/null and b/graphics/link/comm_error_bg.png differ diff --git a/graphics/link/test_digits.png b/graphics/link/test_digits.png new file mode 100644 index 000000000..fe71d3387 Binary files /dev/null and b/graphics/link/test_digits.png differ diff --git a/graphics/link/wireless_display.bin b/graphics/link/wireless_display.bin new file mode 100644 index 000000000..1832ae850 Binary files /dev/null and b/graphics/link/wireless_display.bin differ diff --git a/graphics/link/wireless_display.png b/graphics/link/wireless_display.png new file mode 100644 index 000000000..3946b9b22 Binary files /dev/null and b/graphics/link/wireless_display.png differ diff --git a/graphics/link/wireless_icon.png b/graphics/link/wireless_icon.png new file mode 100644 index 000000000..62c9c0ef7 Binary files /dev/null and b/graphics/link/wireless_icon.png differ diff --git a/graphics/link/wireless_info_screen.bin b/graphics/link/wireless_info_screen.bin new file mode 100644 index 000000000..7cd8123c2 Binary files /dev/null and b/graphics/link/wireless_info_screen.bin differ diff --git a/graphics/link/wireless_info_screen.pal b/graphics/link/wireless_info_screen.pal new file mode 100644 index 000000000..8e0bc0581 --- /dev/null +++ b/graphics/link/wireless_info_screen.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +57 57 57 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +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 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +74 246 255 +57 57 57 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +74 246 255 +57 213 230 +57 57 57 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +74 246 255 +57 213 230 +49 180 205 +0 32 98 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +90 90 90 +90 90 90 +90 90 90 +74 246 255 +57 213 230 +49 180 205 +41 148 180 +0 32 98 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +90 90 90 +90 90 90 +74 246 255 +57 213 230 +49 180 205 +41 148 180 +24 123 164 +0 32 98 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +90 90 90 +74 246 255 +57 213 230 +49 180 205 +41 148 180 +24 123 164 +16 90 139 +0 32 98 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +74 246 255 +57 213 230 +49 180 205 +41 148 180 +24 123 164 +16 90 139 +8 57 115 +0 32 98 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +57 213 230 +49 180 205 +41 148 180 +24 123 164 +16 90 139 +8 57 115 +8 57 115 +57 57 57 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +49 180 205 +41 148 180 +24 123 164 +16 90 139 +8 57 115 +8 57 115 +90 90 90 +57 57 57 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +41 148 180 +24 123 164 +16 90 139 +8 57 115 +8 57 115 +90 90 90 +90 90 90 +57 57 57 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +24 123 164 +16 90 139 +8 57 115 +8 57 115 +90 90 90 +90 90 90 +90 90 90 +57 57 57 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +16 90 139 +8 57 115 +8 57 115 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +57 57 57 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +8 57 115 +8 57 115 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +57 57 57 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 +0 0 0 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +90 90 90 +57 57 57 +172 123 0 +90 90 90 +57 57 57 +164 164 164 +255 180 0 +106 106 106 +74 74 74 diff --git a/graphics/link/wireless_info_screen.png b/graphics/link/wireless_info_screen.png new file mode 100644 index 000000000..796b2771a Binary files /dev/null and b/graphics/link/wireless_info_screen.png differ diff --git a/graphics/map_popup/brick.png b/graphics/map_popup/brick.png new file mode 100644 index 000000000..8fef0a1c2 Binary files /dev/null and b/graphics/map_popup/brick.png differ diff --git a/graphics/map_popup/brick_outline.png b/graphics/map_popup/brick_outline.png new file mode 100644 index 000000000..be4b6f95a Binary files /dev/null and b/graphics/map_popup/brick_outline.png differ diff --git a/graphics/map_popup/marble.png b/graphics/map_popup/marble.png new file mode 100644 index 000000000..d79b9ec34 Binary files /dev/null and b/graphics/map_popup/marble.png differ diff --git a/graphics/map_popup/marble_outline.png b/graphics/map_popup/marble_outline.png new file mode 100644 index 000000000..54f3021ea Binary files /dev/null and b/graphics/map_popup/marble_outline.png differ diff --git a/graphics/map_popup/stone.png b/graphics/map_popup/stone.png new file mode 100644 index 000000000..fe3b7e29d Binary files /dev/null and b/graphics/map_popup/stone.png differ diff --git a/graphics/map_popup/stone2.png b/graphics/map_popup/stone2.png new file mode 100644 index 000000000..261c3184a Binary files /dev/null and b/graphics/map_popup/stone2.png differ diff --git a/graphics/map_popup/stone2_outline.png b/graphics/map_popup/stone2_outline.png new file mode 100644 index 000000000..b0c0748df Binary files /dev/null and b/graphics/map_popup/stone2_outline.png differ diff --git a/graphics/map_popup/stone_outline.png b/graphics/map_popup/stone_outline.png new file mode 100644 index 000000000..7c014d05e Binary files /dev/null and b/graphics/map_popup/stone_outline.png differ diff --git a/graphics/map_popup/underwater.pal b/graphics/map_popup/underwater.pal new file mode 100644 index 000000000..19b8cf9c4 --- /dev/null +++ b/graphics/map_popup/underwater.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +0 0 0 +238 255 255 +65 65 123 +255 255 255 +180 222 255 +139 172 213 +98 123 172 +57 74 131 +16 24 90 +180 222 255 +139 172 213 +98 123 172 +57 74 131 +16 24 90 +255 255 255 diff --git a/graphics/map_popup/underwater.png b/graphics/map_popup/underwater.png new file mode 100644 index 000000000..e6cf2b6c8 Binary files /dev/null and b/graphics/map_popup/underwater.png differ diff --git a/graphics/map_popup/underwater_outline.png b/graphics/map_popup/underwater_outline.png new file mode 100644 index 000000000..2ffe3cb75 Binary files /dev/null and b/graphics/map_popup/underwater_outline.png differ diff --git a/graphics/map_popup/wood.png b/graphics/map_popup/wood.png new file mode 100644 index 000000000..e846a6bcd Binary files /dev/null and b/graphics/map_popup/wood.png differ diff --git a/graphics/map_popup/wood_outline.png b/graphics/map_popup/wood_outline.png new file mode 100644 index 000000000..d143dbc2f Binary files /dev/null and b/graphics/map_popup/wood_outline.png differ diff --git a/graphics/minigame_countdown/321start.png b/graphics/minigame_countdown/321start.png deleted file mode 100644 index 2823feb81..000000000 Binary files a/graphics/minigame_countdown/321start.png and /dev/null differ diff --git a/graphics/minigame_countdown/321start_static.png b/graphics/minigame_countdown/321start_static.png deleted file mode 100644 index 343fd3e7d..000000000 Binary files a/graphics/minigame_countdown/321start_static.png and /dev/null differ diff --git a/graphics/misc/bag.pal b/graphics/misc/bag.pal deleted file mode 100644 index 3c7c2370a..000000000 --- a/graphics/misc/bag.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -115 255 139 -98 222 123 -82 197 106 -74 164 90 -57 139 74 -49 106 57 -32 82 41 -24 49 24 -8 24 8 -156 255 131 -213 213 222 -189 189 197 -98 98 115 -255 255 255 -0 0 0 diff --git a/graphics/misc/bag_female.png b/graphics/misc/bag_female.png deleted file mode 100644 index 65446e269..000000000 Binary files a/graphics/misc/bag_female.png and /dev/null differ diff --git a/graphics/misc/bag_male.png b/graphics/misc/bag_male.png deleted file mode 100644 index a12c66f39..000000000 Binary files a/graphics/misc/bag_male.png and /dev/null differ diff --git a/graphics/party_menu/hold_icons.png b/graphics/party_menu/hold_icons.png new file mode 100644 index 000000000..53eeedde3 Binary files /dev/null and b/graphics/party_menu/hold_icons.png differ diff --git a/graphics/shop/menu.bin b/graphics/shop/menu.bin new file mode 100644 index 000000000..63156b8d5 Binary files /dev/null and b/graphics/shop/menu.bin differ diff --git a/graphics/shop/menu.png b/graphics/shop/menu.png new file mode 100644 index 000000000..ece93b7c7 Binary files /dev/null and b/graphics/shop/menu.png differ diff --git a/graphics/shop/money.png b/graphics/shop/money.png new file mode 100644 index 000000000..d11fe06d1 Binary files /dev/null and b/graphics/shop/money.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 3b4bbeabf..25ac18142 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -440,7 +440,7 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ $(TYPESGFXDIR)/move_types_3.gbapal @cat $^ >$@ -$(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png +graphics/bag/menu.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 $(RAYQUAZAGFXDIR)/scene_2/rayquaza.8bpp: %.8bpp: %.png diff --git a/include/graphics.h b/include/graphics.h index 5c6a043cc..0972743c5 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -5,31 +5,31 @@ extern const u32 gMessageBox_Gfx[]; extern const u16 gMessageBox_Pal[]; -// interface pokeballs -extern const u32 gInterfaceGfx_PokeBall[]; -extern const u32 gInterfacePal_PokeBall[]; -extern const u32 gInterfaceGfx_GreatBall[]; -extern const u32 gInterfacePal_GreatBall[]; -extern const u32 gInterfaceGfx_SafariBall[]; -extern const u32 gInterfacePal_SafariBall[]; -extern const u32 gInterfaceGfx_UltraBall[]; -extern const u32 gInterfacePal_UltraBall[]; -extern const u32 gInterfaceGfx_MasterBall[]; -extern const u32 gInterfacePal_MasterBall[]; -extern const u32 gInterfaceGfx_NetBall[]; -extern const u32 gInterfacePal_NetBall[]; -extern const u32 gInterfaceGfx_DiveBall[]; -extern const u32 gInterfacePal_DiveBall[]; -extern const u32 gInterfaceGfx_NestBall[]; -extern const u32 gInterfacePal_NestBall[]; -extern const u32 gInterfaceGfx_RepeatBall[]; -extern const u32 gInterfacePal_RepeatBall[]; -extern const u32 gInterfaceGfx_TimerBall[]; -extern const u32 gInterfacePal_TimerBall[]; -extern const u32 gInterfaceGfx_LuxuryBall[]; -extern const u32 gInterfacePal_LuxuryBall[]; -extern const u32 gInterfaceGfx_PremierBall[]; -extern const u32 gInterfacePal_PremierBall[]; +// pokeballs +extern const u32 gBallGfx_Poke[]; +extern const u32 gBallPal_Poke[]; +extern const u32 gBallGfx_Great[]; +extern const u32 gBallPal_Great[]; +extern const u32 gBallGfx_Safari[]; +extern const u32 gBallPal_Safari[]; +extern const u32 gBallGfx_Ultra[]; +extern const u32 gBallPal_Ultra[]; +extern const u32 gBallGfx_Master[]; +extern const u32 gBallPal_Master[]; +extern const u32 gBallGfx_Net[]; +extern const u32 gBallPal_Net[]; +extern const u32 gBallGfx_Dive[]; +extern const u32 gBallPal_Dive[]; +extern const u32 gBallGfx_Nest[]; +extern const u32 gBallPal_Nest[]; +extern const u32 gBallGfx_Repeat[]; +extern const u32 gBallPal_Repeat[]; +extern const u32 gBallGfx_Timer[]; +extern const u32 gBallPal_Timer[]; +extern const u32 gBallGfx_Luxury[]; +extern const u32 gBallPal_Luxury[]; +extern const u32 gBallGfx_Premier[]; +extern const u32 gBallPal_Premier[]; extern const u32 gOpenPokeballGfx[]; // pokemon gfx @@ -4052,10 +4052,10 @@ extern const u32 gSummaryMoveSelect_Pal[]; extern const u32 gStatusGfx_Icons[]; extern const u32 gStatusPal_Icons[]; -extern const u32 gBuyMenuFrame_Gfx[]; -extern const u32 gBuyMenuFrame_Tilemap[]; -extern const u32 gMenuMoneyGfx[]; -extern const u32 gMenuMoneyPal[]; +extern const u32 gShopMenu_Gfx[]; +extern const u32 gShopMenu_Tilemap[]; +extern const u32 gShopMenu_Pal[]; +extern const u32 gShopMenuMoney_Gfx[]; extern const u32 gBattleInterface_BallStatusBarGfx[]; extern const u8 gBattleInterface_BallDisplayGfx[]; @@ -4094,8 +4094,8 @@ extern const u32 gBlankGfxCompressed[]; extern const u16 gBattleInterface_BallStatusBarPal[]; extern const u16 gBattleInterface_BallDisplayPal[]; -extern const u32 gBagSwapLineGfx[]; -extern const u32 gBagSwapLinePal[]; +extern const u32 gSwapLineGfx[]; +extern const u32 gSwapLinePal[]; extern const u32 gBattlePyramidBag_Gfx[]; extern const u32 gBattlePyramidBag_Pal[]; diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 92b1f65d1..219454ab2 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -92,7 +92,7 @@ static const struct BgTemplate sBackgroundTemplates[] = } }; -static const u16 sFontPalette[] = INCBIN_U16("graphics/interface/berry_tag_screen.gbapal"); +static const u16 sFontPalette[] = INCBIN_U16("graphics/bag/berry_tag_screen.gbapal"); static const u8 sTextColors[2][3] = { diff --git a/src/data/graphics/berries.h b/src/data/graphics/berries.h index eb3f9f4dc..e33384a84 100644 --- a/src/data/graphics/berries.h +++ b/src/data/graphics/berries.h @@ -1,10 +1,10 @@ -const u32 gBerryCheck_Gfx[] = INCBIN_U32("graphics/interface/check_berry.4bpp.lz"); -const u32 gBerryCheck_Pal[] = INCBIN_U32("graphics/interface/check_berry.gbapal.lz"); +const u32 gBerryCheck_Gfx[] = INCBIN_U32("graphics/bag/check_berry.4bpp.lz"); +const u32 gBerryCheck_Pal[] = INCBIN_U32("graphics/bag/check_berry.gbapal.lz"); -const u32 gBerryTag_Gfx[] = INCBIN_U32("graphics/interface/berry_tag.bin.lz"); -const u32 gBerryTag_Pal[] = INCBIN_U32("graphics/interface/berry_tag_title.bin.lz"); +const u32 gBerryTag_Gfx[] = INCBIN_U32("graphics/bag/berry_tag.bin.lz"); +const u32 gBerryTag_Pal[] = INCBIN_U32("graphics/bag/berry_tag_title.bin.lz"); -const u32 gBerryCheckCircle_Gfx[] = INCBIN_U32("graphics/interface/check_berry_circle.4bpp.lz"); +const u32 gBerryCheckCircle_Gfx[] = INCBIN_U32("graphics/bag/check_berry_circle.4bpp.lz"); const u32 gBerryPic_Cheri[] = INCBIN_U32("graphics/berries/cheri.4bpp.lz"); const u32 gBerryPic_Oran[] = INCBIN_U32("graphics/berries/oran.4bpp.lz"); diff --git a/src/data/graphics/interface_pokeballs.h b/src/data/graphics/interface_pokeballs.h deleted file mode 100644 index fe9a4e5be..000000000 --- a/src/data/graphics/interface_pokeballs.h +++ /dev/null @@ -1,37 +0,0 @@ -const u32 gInterfaceGfx_PokeBall[] = INCBIN_U32("graphics/interface/ball/poke.4bpp.lz"); -const u32 gInterfacePal_PokeBall[] = INCBIN_U32("graphics/interface/ball/poke.gbapal.lz"); - -const u32 gInterfaceGfx_GreatBall[] = INCBIN_U32("graphics/interface/ball/great.4bpp.lz"); -const u32 gInterfacePal_GreatBall[] = INCBIN_U32("graphics/interface/ball/great.gbapal.lz"); - -const u32 gInterfaceGfx_SafariBall[] = INCBIN_U32("graphics/interface/ball/safari.4bpp.lz"); -const u32 gInterfacePal_SafariBall[] = INCBIN_U32("graphics/interface/ball/safari.gbapal.lz"); - -const u32 gInterfaceGfx_UltraBall[] = INCBIN_U32("graphics/interface/ball/ultra.4bpp.lz"); -const u32 gInterfacePal_UltraBall[] = INCBIN_U32("graphics/interface/ball/ultra.gbapal.lz"); - -const u32 gInterfaceGfx_MasterBall[] = INCBIN_U32("graphics/interface/ball/master.4bpp.lz"); -const u32 gInterfacePal_MasterBall[] = INCBIN_U32("graphics/interface/ball/master.gbapal.lz"); - -const u32 gInterfaceGfx_NetBall[] = INCBIN_U32("graphics/interface/ball/net.4bpp.lz"); -const u32 gInterfacePal_NetBall[] = INCBIN_U32("graphics/interface/ball/net.gbapal.lz"); - -const u32 gInterfaceGfx_DiveBall[] = INCBIN_U32("graphics/interface/ball/dive.4bpp.lz"); -const u32 gInterfacePal_DiveBall[] = INCBIN_U32("graphics/interface/ball/dive.gbapal.lz"); - -const u32 gInterfaceGfx_NestBall[] = INCBIN_U32("graphics/interface/ball/nest.4bpp.lz"); -const u32 gInterfacePal_NestBall[] = INCBIN_U32("graphics/interface/ball/nest.gbapal.lz"); - -const u32 gInterfaceGfx_RepeatBall[] = INCBIN_U32("graphics/interface/ball/repeat.4bpp.lz"); -const u32 gInterfacePal_RepeatBall[] = INCBIN_U32("graphics/interface/ball/repeat.gbapal.lz"); - -const u32 gInterfaceGfx_TimerBall[] = INCBIN_U32("graphics/interface/ball/timer.4bpp.lz"); -const u32 gInterfacePal_TimerBall[] = INCBIN_U32("graphics/interface/ball/timer.gbapal.lz"); - -const u32 gInterfaceGfx_LuxuryBall[] = INCBIN_U32("graphics/interface/ball/luxury.4bpp.lz"); -const u32 gInterfacePal_LuxuryBall[] = INCBIN_U32("graphics/interface/ball/luxury.gbapal.lz"); - -const u32 gInterfaceGfx_PremierBall[] = INCBIN_U32("graphics/interface/ball/premier.4bpp.lz"); -const u32 gInterfacePal_PremierBall[] = INCBIN_U32("graphics/interface/ball/premier.gbapal.lz"); - -const u32 gOpenPokeballGfx[] = INCBIN_U32("graphics/interface/ball_open.4bpp.lz"); diff --git a/src/data/graphics/pokeballs.h b/src/data/graphics/pokeballs.h new file mode 100644 index 000000000..8203fca53 --- /dev/null +++ b/src/data/graphics/pokeballs.h @@ -0,0 +1,37 @@ +const u32 gBallGfx_Poke[] = INCBIN_U32("graphics/balls/poke.4bpp.lz"); +const u32 gBallPal_Poke[] = INCBIN_U32("graphics/balls/poke.gbapal.lz"); + +const u32 gBallGfx_Great[] = INCBIN_U32("graphics/balls/great.4bpp.lz"); +const u32 gBallPal_Great[] = INCBIN_U32("graphics/balls/great.gbapal.lz"); + +const u32 gBallGfx_Safari[] = INCBIN_U32("graphics/balls/safari.4bpp.lz"); +const u32 gBallPal_Safari[] = INCBIN_U32("graphics/balls/safari.gbapal.lz"); + +const u32 gBallGfx_Ultra[] = INCBIN_U32("graphics/balls/ultra.4bpp.lz"); +const u32 gBallPal_Ultra[] = INCBIN_U32("graphics/balls/ultra.gbapal.lz"); + +const u32 gBallGfx_Master[] = INCBIN_U32("graphics/balls/master.4bpp.lz"); +const u32 gBallPal_Master[] = INCBIN_U32("graphics/balls/master.gbapal.lz"); + +const u32 gBallGfx_Net[] = INCBIN_U32("graphics/balls/net.4bpp.lz"); +const u32 gBallPal_Net[] = INCBIN_U32("graphics/balls/net.gbapal.lz"); + +const u32 gBallGfx_Dive[] = INCBIN_U32("graphics/balls/dive.4bpp.lz"); +const u32 gBallPal_Dive[] = INCBIN_U32("graphics/balls/dive.gbapal.lz"); + +const u32 gBallGfx_Nest[] = INCBIN_U32("graphics/balls/nest.4bpp.lz"); +const u32 gBallPal_Nest[] = INCBIN_U32("graphics/balls/nest.gbapal.lz"); + +const u32 gBallGfx_Repeat[] = INCBIN_U32("graphics/balls/repeat.4bpp.lz"); +const u32 gBallPal_Repeat[] = INCBIN_U32("graphics/balls/repeat.gbapal.lz"); + +const u32 gBallGfx_Timer[] = INCBIN_U32("graphics/balls/timer.4bpp.lz"); +const u32 gBallPal_Timer[] = INCBIN_U32("graphics/balls/timer.gbapal.lz"); + +const u32 gBallGfx_Luxury[] = INCBIN_U32("graphics/balls/luxury.4bpp.lz"); +const u32 gBallPal_Luxury[] = INCBIN_U32("graphics/balls/luxury.gbapal.lz"); + +const u32 gBallGfx_Premier[] = INCBIN_U32("graphics/balls/premier.4bpp.lz"); +const u32 gBallPal_Premier[] = INCBIN_U32("graphics/balls/premier.gbapal.lz"); + +const u32 gOpenPokeballGfx[] = INCBIN_U32("graphics/balls/open.4bpp.lz"); diff --git a/src/data/party_menu.h b/src/data/party_menu.h index f8321298c..f8093a9b6 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -879,8 +879,8 @@ static const u8 *const sUnionRoomTradeMessages[] = [UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_2 - 1] = gText_CantTradeWithTrainer, }; -static const u32 sHeldItemGfx[] = INCBIN_U32("graphics/interface/hold_icons.4bpp"); -static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/interface/hold_icons.gbapal"); +static const u32 sHeldItemGfx[] = INCBIN_U32("graphics/party_menu/hold_icons.4bpp"); +static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/party_menu/hold_icons.gbapal"); static const struct OamData sOamData_HeldItem = { diff --git a/src/graphics.c b/src/graphics.c index ebb7be3ca..09cae59ce 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -16,7 +16,7 @@ const u32 gUnusedPal_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.gbap const u32 gSmokescreenImpactTiles[] = INCBIN_U32("graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz"); const u32 gSmokescreenImpactPalette[] = INCBIN_U32("graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz"); -#include "data/graphics/interface_pokeballs.h" +#include "data/graphics/pokeballs.h" const u32 gBlankGfxCompressed[] = INCBIN_U32("graphics/interface/blank.4bpp.lz"); @@ -1137,29 +1137,28 @@ const u32 gSummaryPage_BattleMoves_Tilemap[] = INCBIN_U32("graphics/summary_scr 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"); -const u32 gBagPalette[] = INCBIN_U32("graphics/misc/bag.gbapal.lz"); +const u32 gBagMaleTiles[] = INCBIN_U32("graphics/bag/bag_male.4bpp.lz"); +const u32 gBagFemaleTiles[] = INCBIN_U32("graphics/bag/bag_female.4bpp.lz"); +const u32 gBagPalette[] = INCBIN_U32("graphics/bag/bag.gbapal.lz"); -const u32 gBagScreenMale_Pal[] = INCBIN_U32("graphics/interface/bag_screen_male.gbapal.lz"); -const u32 gBagScreenFemale_Pal[] = INCBIN_U32("graphics/interface/bag_screen_female.gbapal.lz"); +const u32 gBagScreenMale_Pal[] = INCBIN_U32("graphics/bag/menu_male.gbapal.lz"); +const u32 gBagScreenFemale_Pal[] = INCBIN_U32("graphics/bag/menu_female.gbapal.lz"); -const u32 gBagScreen_Gfx[] = INCBIN_U32("graphics/interface/bag_screen.4bpp.lz"); -const u32 gBagScreen_GfxTileMap[] = INCBIN_U32("graphics/interface/bag_screen_tilemap.bin.lz"); +const u32 gBagScreen_Gfx[] = INCBIN_U32("graphics/bag/menu.4bpp.lz"); +const u32 gBagScreen_GfxTileMap[] = INCBIN_U32("graphics/bag/menu.bin.lz"); -const u32 gBattlePyramidBag_Gfx[] = INCBIN_U32("graphics/interface/bag_pyramid.4bpp.lz"); -const u32 gBattlePyramidBag_Pal[] = INCBIN_U32("graphics/interface/bag_pyramid.gbapal.lz"); // female palette is first and male is second. -const u32 gBattlePyramidBagTilemap[] = INCBIN_U32("graphics/interface/bag_pyramid_tilemap.bin.lz"); -const u32 gBattlePyramidBagInterface_Pal[] = INCBIN_U32("graphics/interface/bag_pyramid_interface.gbapal.lz"); +const u32 gBattlePyramidBag_Gfx[] = INCBIN_U32("graphics/bag/bag_pyramid.4bpp.lz"); +const u32 gBattlePyramidBag_Pal[] = INCBIN_U32("graphics/bag/bag_pyramid.gbapal.lz"); // female palette is first and male is second. +const u32 gBattlePyramidBagTilemap[] = INCBIN_U32("graphics/bag/menu_pyramid.bin.lz"); +const u32 gBattlePyramidBagInterface_Pal[] = INCBIN_U32("graphics/bag/menu_pyramid.gbapal.lz"); -const u32 gBagSwapLineGfx[] = INCBIN_U32("graphics/interface/bag_swap.4bpp.lz"); -const u32 gBagSwapLinePal[] = INCBIN_U32("graphics/interface/bag_swap.gbapal.lz"); +const u32 gSwapLineGfx[] = INCBIN_U32("graphics/interface/swap_line.4bpp.lz"); +const u32 gSwapLinePal[] = INCBIN_U32("graphics/interface/swap_line.gbapal.lz"); -const u32 gBuyMenuFrame_Gfx[] = INCBIN_U32("graphics/interface/mart_frame.4bpp.lz"); -const u32 gMenuMoneyPal[] = INCBIN_U32("graphics/interface/mart_frame.gbapal.lz"); -const u32 gBuyMenuFrame_Tilemap[] = INCBIN_U32("graphics/interface/mart_frame.bin.lz"); - -const u32 gMenuMoneyGfx[] = INCBIN_U32("graphics/interface/money.4bpp.lz"); +const u32 gShopMenu_Gfx[] = INCBIN_U32("graphics/shop/menu.4bpp.lz"); +const u32 gShopMenu_Pal[] = INCBIN_U32("graphics/shop/menu.gbapal.lz"); +const u32 gShopMenu_Tilemap[] = INCBIN_U32("graphics/shop/menu.bin.lz"); +const u32 gShopMenuMoney_Gfx[] = INCBIN_U32("graphics/shop/money.4bpp.lz"); // Pokeblock @@ -1271,14 +1270,12 @@ const u32 gIntroCopyright_Tilemap[] = INCBIN_U32("graphics/intro/copyright.bin.l const u16 gPokedexAreaScreenAreaUnknown_Pal[] = INCBIN_U16("graphics/pokedex/area_unknown.gbapal"); const u32 gPokedexAreaScreenAreaUnknown_Gfx[] = INCBIN_U32("graphics/pokedex/area_unknown.4bpp.lz"); -// seems to be fire red leftovers, but the menu elements is reused in the item menu for TM descriptions. - const u16 gMenuInfoElements1_Pal[] = INCBIN_U16("graphics/interface/menu_info1.gbapal"); const u16 gMenuInfoElements2_Pal[] = INCBIN_U16("graphics/interface/menu_info2.gbapal"); const u16 gMenuInfoElements3_Pal[] = INCBIN_U16("graphics/interface/menu_info3.gbapal"); -const u8 gMenuInfoElements_Gfx[] = INCBIN_U8("graphics/interface/menu_info.4bpp"); //the types are reused for item menu +const u8 gMenuInfoElements_Gfx[] = INCBIN_U8("graphics/interface/menu_info.4bpp"); -const u8 gBagMenuHMIcon_Gfx[] = INCBIN_U8("graphics/interface/hm.4bpp"); +const u8 gBagMenuHMIcon_Gfx[] = INCBIN_U8("graphics/bag/hm.4bpp"); // contest results screen diff --git a/src/item_menu.c b/src/item_menu.c index 56ef3cba3..9eaca9597 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -372,7 +372,7 @@ static const struct ScrollArrowsTemplate sBagScrollArrowsTemplate = { .palNum = 0, }; -static const u8 sRegisteredSelect_Gfx[] = INCBIN_U8("graphics/interface/select_button.4bpp"); +static const u8 sRegisteredSelect_Gfx[] = INCBIN_U8("graphics/bag/select_button.4bpp"); enum { COLORID_NORMAL, diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 60de132b0..a5c265f90 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -33,8 +33,8 @@ static void SpriteCB_SwitchPocketRotatingBallInit(struct Sprite *sprite); static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite); // static const rom data -static const u16 gRotatingBall_Pal[] = INCBIN_U16("graphics/interface/bag_spinner.gbapal"); -static const u8 gRotatingBall[] = INCBIN_U8("graphics/interface/bag_spinner.4bpp"); +static const u16 sRotatingBall_Pal[] = INCBIN_U16("graphics/bag/rotating_ball.gbapal"); +static const u8 sRotatingBall_Gfx[] = INCBIN_U8("graphics/bag/rotating_ball.4bpp"); static const u8 gCherryUnused[] = INCBIN_U8("graphics/unused/cherry.4bpp"); static const u16 gCherryUnused_Pal[] = INCBIN_U16("graphics/unused/cherry.gbapal"); @@ -200,12 +200,12 @@ static const union AffineAnimCmd *const sRotatingBallAnimCmds_FullRotation[] = static const struct SpriteSheet sRotatingBallTable = { - gRotatingBall, 0x80, TAG_ROTATING_BALL_GFX + sRotatingBall_Gfx, 0x80, TAG_ROTATING_BALL_GFX }; static const struct SpritePalette sRotatingBallPaletteTable = { - gRotatingBall_Pal, TAG_ROTATING_BALL_GFX + sRotatingBall_Pal, TAG_ROTATING_BALL_GFX }; static const struct SpriteTemplate sRotatingBallSpriteTemplate = diff --git a/src/link.c b/src/link.c index 1084d4a6d..aa9a0d73d 100644 --- a/src/link.c +++ b/src/link.c @@ -158,13 +158,13 @@ static void DoSend(void); static void StopTimer(void); static void SendRecvDone(void); -static const u16 sWirelessLinkDisplayPal[] = INCBIN_U16("graphics/interface/wireless_link_display.gbapal"); -static const u32 sWirelessLinkDisplayGfx[] = INCBIN_U32("graphics/interface/wireless_link_display.4bpp.lz"); -static const u32 sWirelessLinkDisplayTilemap[] = INCBIN_U32("graphics/interface/wireless_link_display.bin.lz"); -static const u16 sLinkTestDigitsPal[] = INCBIN_U16("graphics/interface/link_test_digits.gbapal"); -static const u16 sLinkTestDigitsGfx[] = INCBIN_U16("graphics/interface/link_test_digits.4bpp"); +static const u16 sWirelessLinkDisplayPal[] = INCBIN_U16("graphics/link/wireless_display.gbapal"); +static const u32 sWirelessLinkDisplayGfx[] = INCBIN_U32("graphics/link/wireless_display.4bpp.lz"); +static const u32 sWirelessLinkDisplayTilemap[] = INCBIN_U32("graphics/link/wireless_display.bin.lz"); +static const u16 sLinkTestDigitsPal[] = INCBIN_U16("graphics/link/test_digits.gbapal"); +static const u16 sLinkTestDigitsGfx[] = INCBIN_U16("graphics/link/test_digits.4bpp"); static const u8 sUnusedTransparentWhite[] = _("{HIGHLIGHT TRANSPARENT}{COLOR WHITE}"); -static const u16 sCommErrorBg_Gfx[] = INCBIN_U16("graphics/interface/comm_error_bg.4bpp"); +static const u16 sCommErrorBg_Gfx[] = INCBIN_U16("graphics/link/comm_error_bg.4bpp"); static const struct BlockRequest sBlockRequests[] = { [BLOCK_REQ_SIZE_NONE] = {gBlockSendBuffer, 200}, [BLOCK_REQ_SIZE_200] = {gBlockSendBuffer, 200}, diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c index 571f305d0..1e1fe5b34 100644 --- a/src/link_rfu_3.c +++ b/src/link_rfu_3.c @@ -34,8 +34,8 @@ EWRAM_DATA u8 gWirelessStatusIndicatorSpriteId = 0; static u8 sSequenceArrayValOffset; -static const u16 sWirelessLinkIconPalette[] = INCBIN_U16("graphics/interface/wireless_link_icon.gbapal"); -static const u32 sWirelessLinkIconPic[] = INCBIN_U32("graphics/interface/wireless_link_icon.4bpp.lz"); +static const u16 sWirelessLinkIconPalette[] = INCBIN_U16("graphics/link/wireless_icon.gbapal"); +static const u32 sWirelessLinkIconPic[] = INCBIN_U32("graphics/link/wireless_icon.4bpp.lz"); // Most of the below two tables won't make sense with ASCII encoding. static const u8 sWireless_ASCIItoRSETable[256] = { diff --git a/src/map_name_popup.c b/src/map_name_popup.c index e44fb3383..8cf1a6bab 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -38,35 +38,35 @@ static EWRAM_DATA u8 sPopupTaskId = 0; // .rodata static const u8 sMapPopUp_Table[][960] = { - [MAPPOPUP_THEME_WOOD] = INCBIN_U8("graphics/interface/map_popup/wood.4bpp"), - [MAPPOPUP_THEME_MARBLE] = INCBIN_U8("graphics/interface/map_popup/marble.4bpp"), - [MAPPOPUP_THEME_STONE] = INCBIN_U8("graphics/interface/map_popup/stone.4bpp"), - [MAPPOPUP_THEME_BRICK] = INCBIN_U8("graphics/interface/map_popup/brick.4bpp"), - [MAPPOPUP_THEME_UNDERWATER] = INCBIN_U8("graphics/interface/map_popup/underwater.4bpp"), - [MAPPOPUP_THEME_STONE2] = INCBIN_U8("graphics/interface/map_popup/stone2.4bpp"), + [MAPPOPUP_THEME_WOOD] = INCBIN_U8("graphics/map_popup/wood.4bpp"), + [MAPPOPUP_THEME_MARBLE] = INCBIN_U8("graphics/map_popup/marble.4bpp"), + [MAPPOPUP_THEME_STONE] = INCBIN_U8("graphics/map_popup/stone.4bpp"), + [MAPPOPUP_THEME_BRICK] = INCBIN_U8("graphics/map_popup/brick.4bpp"), + [MAPPOPUP_THEME_UNDERWATER] = INCBIN_U8("graphics/map_popup/underwater.4bpp"), + [MAPPOPUP_THEME_STONE2] = INCBIN_U8("graphics/map_popup/stone2.4bpp"), }; static const u8 sMapPopUp_OutlineTable[][960] = { - [MAPPOPUP_THEME_WOOD] = INCBIN_U8("graphics/interface/map_popup/wood_outline.4bpp"), - [MAPPOPUP_THEME_MARBLE] = INCBIN_U8("graphics/interface/map_popup/marble_outline.4bpp"), - [MAPPOPUP_THEME_STONE] = INCBIN_U8("graphics/interface/map_popup/stone_outline.4bpp"), - [MAPPOPUP_THEME_BRICK] = INCBIN_U8("graphics/interface/map_popup/brick_outline.4bpp"), - [MAPPOPUP_THEME_UNDERWATER] = INCBIN_U8("graphics/interface/map_popup/underwater_outline.4bpp"), - [MAPPOPUP_THEME_STONE2] = INCBIN_U8("graphics/interface/map_popup/stone2_outline.4bpp"), + [MAPPOPUP_THEME_WOOD] = INCBIN_U8("graphics/map_popup/wood_outline.4bpp"), + [MAPPOPUP_THEME_MARBLE] = INCBIN_U8("graphics/map_popup/marble_outline.4bpp"), + [MAPPOPUP_THEME_STONE] = INCBIN_U8("graphics/map_popup/stone_outline.4bpp"), + [MAPPOPUP_THEME_BRICK] = INCBIN_U8("graphics/map_popup/brick_outline.4bpp"), + [MAPPOPUP_THEME_UNDERWATER] = INCBIN_U8("graphics/map_popup/underwater_outline.4bpp"), + [MAPPOPUP_THEME_STONE2] = INCBIN_U8("graphics/map_popup/stone2_outline.4bpp"), }; static const u16 sMapPopUp_PaletteTable[][16] = { - [MAPPOPUP_THEME_WOOD] = INCBIN_U16("graphics/interface/map_popup/wood.gbapal"), - [MAPPOPUP_THEME_MARBLE] = INCBIN_U16("graphics/interface/map_popup/marble_outline.gbapal"), - [MAPPOPUP_THEME_STONE] = INCBIN_U16("graphics/interface/map_popup/stone_outline.gbapal"), - [MAPPOPUP_THEME_BRICK] = INCBIN_U16("graphics/interface/map_popup/brick_outline.gbapal"), - [MAPPOPUP_THEME_UNDERWATER] = INCBIN_U16("graphics/interface/map_popup/underwater_outline.gbapal"), - [MAPPOPUP_THEME_STONE2] = INCBIN_U16("graphics/interface/map_popup/stone2_outline.gbapal"), + [MAPPOPUP_THEME_WOOD] = INCBIN_U16("graphics/map_popup/wood.gbapal"), + [MAPPOPUP_THEME_MARBLE] = INCBIN_U16("graphics/map_popup/marble_outline.gbapal"), + [MAPPOPUP_THEME_STONE] = INCBIN_U16("graphics/map_popup/stone_outline.gbapal"), + [MAPPOPUP_THEME_BRICK] = INCBIN_U16("graphics/map_popup/brick_outline.gbapal"), + [MAPPOPUP_THEME_UNDERWATER] = INCBIN_U16("graphics/map_popup/underwater_outline.gbapal"), + [MAPPOPUP_THEME_STONE2] = INCBIN_U16("graphics/map_popup/stone2_outline.gbapal"), }; -static const u16 sMapPopUp_Palette_Underwater[16] = INCBIN_U16("graphics/interface/map_popup/underwater.gbapal"); +static const u16 sMapPopUp_Palette_Underwater[16] = INCBIN_U16("graphics/map_popup/underwater.gbapal"); static const u8 sRegionMapSectionId_To_PopUpThemeIdMapping[] = { diff --git a/src/menu_helpers.c b/src/menu_helpers.c index d5cf83bd2..e9f3e571f 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -71,12 +71,12 @@ static const union AnimCmd *const sAnims_SwapLine[] = static const struct CompressedSpriteSheet sSpriteSheet_SwapLine = { - gBagSwapLineGfx, 0x100, TAG_SWAP_LINE + gSwapLineGfx, 0x100, TAG_SWAP_LINE }; static const struct CompressedSpritePalette sSpritePalette_SwapLine = { - gBagSwapLinePal, TAG_SWAP_LINE + gSwapLinePal, TAG_SWAP_LINE }; static const struct SpriteTemplate sSpriteTemplate_SwapLine = diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c index 178b6d5b7..4c72136d4 100644 --- a/src/minigame_countdown.c +++ b/src/minigame_countdown.c @@ -48,8 +48,8 @@ static void Task_StaticCountdown_Free(u8 taskId); static void Task_StaticCountdown_Start(u8 taskId); static void Task_StaticCountdown_Run(u8 taskId); -static const u16 s321Start_Static_Pal[] = INCBIN_U16("graphics/minigame_countdown/321start_static.gbapal"); -static const u32 s321Start_Static_Gfx[] = INCBIN_U32("graphics/minigame_countdown/321start_static.4bpp.lz"); +static const u16 s321Start_Static_Pal[] = INCBIN_U16("graphics/link/321start_static.gbapal"); +static const u32 s321Start_Static_Gfx[] = INCBIN_U32("graphics/link/321start_static.4bpp.lz"); static const struct CompressedSpriteSheet sSpriteSheet_321Start_Static[] = { @@ -374,8 +374,8 @@ static void CreateStartSprite(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subprior static void InitStartGraphic(u8 spriteId1, u8 spriteId2, u8 spriteId3); static void SpriteCB_Start(struct Sprite *sprite); -static const u16 s321Start_Pal[] = INCBIN_U16("graphics/minigame_countdown/321start.gbapal"); -static const u32 s321Start_Gfx[] = INCBIN_U32("graphics/minigame_countdown/321start.4bpp.lz"); +static const u16 s321Start_Pal[] = INCBIN_U16("graphics/link/321start.gbapal"); +static const u32 s321Start_Gfx[] = INCBIN_U32("graphics/link/321start.4bpp.lz"); #define tState data[0] #define tTilesTag data[2] diff --git a/src/money.c b/src/money.c index c331462d4..592ce9f75 100644 --- a/src/money.c +++ b/src/money.c @@ -58,14 +58,14 @@ static const struct SpriteTemplate sSpriteTemplate_MoneyLabel = static const struct CompressedSpriteSheet sSpriteSheet_MoneyLabel = { - .data = gMenuMoneyGfx, + .data = gShopMenuMoney_Gfx, .size = 256, .tag = MONEY_LABEL_TAG, }; static const struct CompressedSpritePalette sSpritePalette_MoneyLabel = { - .data = gMenuMoneyPal, + .data = gShopMenu_Pal, .tag = MONEY_LABEL_TAG }; @@ -146,7 +146,7 @@ void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed) txtPtr = gStringVar4; while (strLength-- > 0) - *(txtPtr++) = 0x77; + *(txtPtr++) = CHAR_SPACER; StringExpandPlaceholders(txtPtr, gText_PokedollarVar1); AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, x, y, speed, NULL); diff --git a/src/pokeball.c b/src/pokeball.c index cb68d6883..0250a0c5b 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -59,34 +59,34 @@ static u16 GetBattlerPokeballItemId(u8 battlerId); const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] = { - [BALL_POKE] = {gInterfaceGfx_PokeBall, 384, GFX_TAG_POKEBALL}, - [BALL_GREAT] = {gInterfaceGfx_GreatBall, 384, GFX_TAG_GREATBALL}, - [BALL_SAFARI] = {gInterfaceGfx_SafariBall, 384, GFX_TAG_SAFARIBALL}, - [BALL_ULTRA] = {gInterfaceGfx_UltraBall, 384, GFX_TAG_ULTRABALL}, - [BALL_MASTER] = {gInterfaceGfx_MasterBall, 384, GFX_TAG_MASTERBALL}, - [BALL_NET] = {gInterfaceGfx_NetBall, 384, GFX_TAG_NETBALL}, - [BALL_DIVE] = {gInterfaceGfx_DiveBall, 384, GFX_TAG_DIVEBALL}, - [BALL_NEST] = {gInterfaceGfx_NestBall, 384, GFX_TAG_NESTBALL}, - [BALL_REPEAT] = {gInterfaceGfx_RepeatBall, 384, GFX_TAG_REPEATBALL}, - [BALL_TIMER] = {gInterfaceGfx_TimerBall, 384, GFX_TAG_TIMERBALL}, - [BALL_LUXURY] = {gInterfaceGfx_LuxuryBall, 384, GFX_TAG_LUXURYBALL}, - [BALL_PREMIER] = {gInterfaceGfx_PremierBall, 384, GFX_TAG_PREMIERBALL}, + [BALL_POKE] = {gBallGfx_Poke, 384, GFX_TAG_POKEBALL}, + [BALL_GREAT] = {gBallGfx_Great, 384, GFX_TAG_GREATBALL}, + [BALL_SAFARI] = {gBallGfx_Safari, 384, GFX_TAG_SAFARIBALL}, + [BALL_ULTRA] = {gBallGfx_Ultra, 384, GFX_TAG_ULTRABALL}, + [BALL_MASTER] = {gBallGfx_Master, 384, GFX_TAG_MASTERBALL}, + [BALL_NET] = {gBallGfx_Net, 384, GFX_TAG_NETBALL}, + [BALL_DIVE] = {gBallGfx_Dive, 384, GFX_TAG_DIVEBALL}, + [BALL_NEST] = {gBallGfx_Nest, 384, GFX_TAG_NESTBALL}, + [BALL_REPEAT] = {gBallGfx_Repeat, 384, GFX_TAG_REPEATBALL}, + [BALL_TIMER] = {gBallGfx_Timer, 384, GFX_TAG_TIMERBALL}, + [BALL_LUXURY] = {gBallGfx_Luxury, 384, GFX_TAG_LUXURYBALL}, + [BALL_PREMIER] = {gBallGfx_Premier, 384, GFX_TAG_PREMIERBALL}, }; const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] = { - [BALL_POKE] = {gInterfacePal_PokeBall, GFX_TAG_POKEBALL}, - [BALL_GREAT] = {gInterfacePal_GreatBall, GFX_TAG_GREATBALL}, - [BALL_SAFARI] = {gInterfacePal_SafariBall, GFX_TAG_SAFARIBALL}, - [BALL_ULTRA] = {gInterfacePal_UltraBall, GFX_TAG_ULTRABALL}, - [BALL_MASTER] = {gInterfacePal_MasterBall, GFX_TAG_MASTERBALL}, - [BALL_NET] = {gInterfacePal_NetBall, GFX_TAG_NETBALL}, - [BALL_DIVE] = {gInterfacePal_DiveBall, GFX_TAG_DIVEBALL}, - [BALL_NEST] = {gInterfacePal_NestBall, GFX_TAG_NESTBALL}, - [BALL_REPEAT] = {gInterfacePal_RepeatBall, GFX_TAG_REPEATBALL}, - [BALL_TIMER] = {gInterfacePal_TimerBall, GFX_TAG_TIMERBALL}, - [BALL_LUXURY] = {gInterfacePal_LuxuryBall, GFX_TAG_LUXURYBALL}, - [BALL_PREMIER] = {gInterfacePal_PremierBall, GFX_TAG_PREMIERBALL}, + [BALL_POKE] = {gBallPal_Poke, GFX_TAG_POKEBALL}, + [BALL_GREAT] = {gBallPal_Great, GFX_TAG_GREATBALL}, + [BALL_SAFARI] = {gBallPal_Safari, GFX_TAG_SAFARIBALL}, + [BALL_ULTRA] = {gBallPal_Ultra, GFX_TAG_ULTRABALL}, + [BALL_MASTER] = {gBallPal_Master, GFX_TAG_MASTERBALL}, + [BALL_NET] = {gBallPal_Net, GFX_TAG_NETBALL}, + [BALL_DIVE] = {gBallPal_Dive, GFX_TAG_DIVEBALL}, + [BALL_NEST] = {gBallPal_Nest, GFX_TAG_NESTBALL}, + [BALL_REPEAT] = {gBallPal_Repeat, GFX_TAG_REPEATBALL}, + [BALL_TIMER] = {gBallPal_Timer, GFX_TAG_TIMERBALL}, + [BALL_LUXURY] = {gBallPal_Luxury, GFX_TAG_LUXURYBALL}, + [BALL_PREMIER] = {gBallPal_Premier, GFX_TAG_PREMIERBALL}, }; static const struct OamData sBallOamData = diff --git a/src/shop.c b/src/shop.c index f41ae315f..b65cace09 100755 --- a/src/shop.c +++ b/src/shop.c @@ -674,9 +674,9 @@ static void BuyMenuInitBgs(void) static void BuyMenuDecompressBgGraphics(void) { - DecompressAndCopyTileDataToVram(1, gBuyMenuFrame_Gfx, 0x3A0, 0x3E3, 0); - LZDecompressWram(gBuyMenuFrame_Tilemap, sShopData->tilemapBuffers[0]); - LoadCompressedPalette(gMenuMoneyPal, 0xC0, 0x20); + DecompressAndCopyTileDataToVram(1, gShopMenu_Gfx, 0x3A0, 0x3E3, 0); + LZDecompressWram(gShopMenu_Tilemap, sShopData->tilemapBuffers[0]); + LoadCompressedPalette(gShopMenu_Pal, 0xC0, 0x20); } static void BuyMenuInitWindows(void) diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index ffb86488a..1fbd83fcd 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -51,9 +51,9 @@ static void Task_WirelessCommunicationScreen(u8); static void WCSS_AddTextPrinterParameterized(u8, u8, const u8 *, u8, u8, u8); static bool32 UpdateCommunicationCounts(u32 *, u32 *, u32 *, u8); -static const u16 sBgTiles_Pal[] = INCBIN_U16("graphics/interface/wireless_info_screen.gbapal"); -static const u32 sBgTiles_Gfx[] = INCBIN_U32("graphics/interface/wireless_info_screen.4bpp.lz"); -static const u32 sBgTiles_Tilemap[] = INCBIN_U32("graphics/interface/wireless_info_screen.bin.lz"); +static const u16 sBgTiles_Pal[] = INCBIN_U16("graphics/link/wireless_info_screen.gbapal"); +static const u32 sBgTiles_Gfx[] = INCBIN_U32("graphics/link/wireless_info_screen.4bpp.lz"); +static const u32 sBgTiles_Tilemap[] = INCBIN_U32("graphics/link/wireless_info_screen.bin.lz"); static const struct BgTemplate sBgTemplates[] = { { -- cgit v1.2.3 From 01af8e877f039a0e1427de5e52442602446719cc Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 11 Jan 2022 14:18:22 -0500 Subject: Move starter choose out of interface/misc --- graphics/battle_interface/hpbar_anim_unused.png | Bin 0 -> 192 bytes graphics/battle_interface/hpbar_unused.png | Bin 0 -> 136 bytes graphics/battle_interface/numbers1.png | Bin 0 -> 201 bytes graphics/battle_interface/numbers2.png | Bin 0 -> 215 bytes graphics/interface/hpbar_anim.png | Bin 192 -> 0 bytes graphics/interface/mon_markings.png | Bin 0 -> 489 bytes graphics/interface/mon_markings_menu.png | Bin 0 -> 353 bytes graphics/interface/numbers1.png | Bin 201 -> 0 bytes graphics/interface/numbers2.png | Bin 215 -> 0 bytes graphics/interface/unused_hpbar.png | Bin 136 -> 0 bytes graphics/link/gba.png | Bin 1253 -> 0 bytes graphics/link/gba_pal2.pal | 51 ------------------------ graphics/misc/birch_bag.png | Bin 1304 -> 0 bytes graphics/misc/birch_bag_map.bin | Bin 1280 -> 0 bytes graphics/misc/birch_grass.png | Bin 691 -> 0 bytes graphics/misc/birch_grass_map.bin | Bin 2048 -> 0 bytes graphics/misc/mon_markings.png | Bin 489 -> 0 bytes graphics/misc/mon_markings_menu.png | Bin 353 -> 0 bytes graphics/misc/pokeball_selection.png | Bin 635 -> 0 bytes graphics/misc/starter_circle.png | Bin 349 -> 0 bytes graphics/starter_choose/birch_bag.bin | Bin 0 -> 1280 bytes graphics/starter_choose/birch_bag.png | Bin 0 -> 1304 bytes graphics/starter_choose/birch_grass.bin | Bin 0 -> 2048 bytes graphics/starter_choose/birch_grass.png | Bin 0 -> 691 bytes graphics/starter_choose/pokeball_selection.png | Bin 0 -> 635 bytes graphics/starter_choose/starter_circle.png | Bin 0 -> 349 bytes graphics/trade/gba.png | Bin 0 -> 1253 bytes graphics/trade/gba_pal2.pal | 51 ++++++++++++++++++++++++ graphics_file_rules.mk | 9 +++-- src/graphics.c | 14 +++---- src/mon_markings.c | 4 +- src/starter_choose.c | 18 ++++----- 32 files changed, 74 insertions(+), 73 deletions(-) create mode 100644 graphics/battle_interface/hpbar_anim_unused.png create mode 100644 graphics/battle_interface/hpbar_unused.png create mode 100644 graphics/battle_interface/numbers1.png create mode 100644 graphics/battle_interface/numbers2.png delete mode 100644 graphics/interface/hpbar_anim.png create mode 100644 graphics/interface/mon_markings.png create mode 100644 graphics/interface/mon_markings_menu.png delete mode 100644 graphics/interface/numbers1.png delete mode 100644 graphics/interface/numbers2.png delete mode 100644 graphics/interface/unused_hpbar.png delete mode 100644 graphics/link/gba.png delete mode 100644 graphics/link/gba_pal2.pal delete mode 100644 graphics/misc/birch_bag.png delete mode 100644 graphics/misc/birch_bag_map.bin delete mode 100644 graphics/misc/birch_grass.png delete mode 100644 graphics/misc/birch_grass_map.bin delete mode 100644 graphics/misc/mon_markings.png delete mode 100644 graphics/misc/mon_markings_menu.png delete mode 100644 graphics/misc/pokeball_selection.png delete mode 100644 graphics/misc/starter_circle.png create mode 100644 graphics/starter_choose/birch_bag.bin create mode 100644 graphics/starter_choose/birch_bag.png create mode 100644 graphics/starter_choose/birch_grass.bin create mode 100644 graphics/starter_choose/birch_grass.png create mode 100644 graphics/starter_choose/pokeball_selection.png create mode 100644 graphics/starter_choose/starter_circle.png create mode 100644 graphics/trade/gba.png create mode 100644 graphics/trade/gba_pal2.pal diff --git a/graphics/battle_interface/hpbar_anim_unused.png b/graphics/battle_interface/hpbar_anim_unused.png new file mode 100644 index 000000000..d4e79fdae Binary files /dev/null and b/graphics/battle_interface/hpbar_anim_unused.png differ diff --git a/graphics/battle_interface/hpbar_unused.png b/graphics/battle_interface/hpbar_unused.png new file mode 100644 index 000000000..763b91210 Binary files /dev/null and b/graphics/battle_interface/hpbar_unused.png differ diff --git a/graphics/battle_interface/numbers1.png b/graphics/battle_interface/numbers1.png new file mode 100644 index 000000000..f15757958 Binary files /dev/null and b/graphics/battle_interface/numbers1.png differ diff --git a/graphics/battle_interface/numbers2.png b/graphics/battle_interface/numbers2.png new file mode 100644 index 000000000..4ddf364bf Binary files /dev/null and b/graphics/battle_interface/numbers2.png differ diff --git a/graphics/interface/hpbar_anim.png b/graphics/interface/hpbar_anim.png deleted file mode 100644 index d4e79fdae..000000000 Binary files a/graphics/interface/hpbar_anim.png and /dev/null differ diff --git a/graphics/interface/mon_markings.png b/graphics/interface/mon_markings.png new file mode 100644 index 000000000..013173292 Binary files /dev/null and b/graphics/interface/mon_markings.png differ diff --git a/graphics/interface/mon_markings_menu.png b/graphics/interface/mon_markings_menu.png new file mode 100644 index 000000000..818446557 Binary files /dev/null and b/graphics/interface/mon_markings_menu.png differ diff --git a/graphics/interface/numbers1.png b/graphics/interface/numbers1.png deleted file mode 100644 index f15757958..000000000 Binary files a/graphics/interface/numbers1.png and /dev/null differ diff --git a/graphics/interface/numbers2.png b/graphics/interface/numbers2.png deleted file mode 100644 index 4ddf364bf..000000000 Binary files a/graphics/interface/numbers2.png and /dev/null differ diff --git a/graphics/interface/unused_hpbar.png b/graphics/interface/unused_hpbar.png deleted file mode 100644 index 763b91210..000000000 Binary files a/graphics/interface/unused_hpbar.png and /dev/null differ diff --git a/graphics/link/gba.png b/graphics/link/gba.png deleted file mode 100644 index 1a0909468..000000000 Binary files a/graphics/link/gba.png and /dev/null differ diff --git a/graphics/link/gba_pal2.pal b/graphics/link/gba_pal2.pal deleted file mode 100644 index e2fb95b4a..000000000 --- a/graphics/link/gba_pal2.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 57 8 -255 90 8 -255 131 8 -255 172 8 -255 213 8 -255 255 8 -255 255 131 -255 255 255 -255 255 0 -65 0 0 -115 16 0 -172 32 0 -230 57 8 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -230 230 230 -205 205 205 -180 180 180 -156 156 156 -213 180 106 -205 156 82 -49 255 106 -0 0 0 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -0 16 172 -32 32 106 -16 16 90 -0 0 74 -255 255 189 -230 230 164 -205 205 148 -189 180 115 -139 139 90 -74 74 57 -8 32 32 diff --git a/graphics/misc/birch_bag.png b/graphics/misc/birch_bag.png deleted file mode 100644 index 86bfbbbc0..000000000 Binary files a/graphics/misc/birch_bag.png and /dev/null differ diff --git a/graphics/misc/birch_bag_map.bin b/graphics/misc/birch_bag_map.bin deleted file mode 100644 index ddfad5ec9..000000000 Binary files a/graphics/misc/birch_bag_map.bin and /dev/null differ diff --git a/graphics/misc/birch_grass.png b/graphics/misc/birch_grass.png deleted file mode 100644 index 838fa5f4c..000000000 Binary files a/graphics/misc/birch_grass.png and /dev/null differ diff --git a/graphics/misc/birch_grass_map.bin b/graphics/misc/birch_grass_map.bin deleted file mode 100644 index b7332940c..000000000 Binary files a/graphics/misc/birch_grass_map.bin and /dev/null differ diff --git a/graphics/misc/mon_markings.png b/graphics/misc/mon_markings.png deleted file mode 100644 index 013173292..000000000 Binary files a/graphics/misc/mon_markings.png and /dev/null differ diff --git a/graphics/misc/mon_markings_menu.png b/graphics/misc/mon_markings_menu.png deleted file mode 100644 index 818446557..000000000 Binary files a/graphics/misc/mon_markings_menu.png and /dev/null differ diff --git a/graphics/misc/pokeball_selection.png b/graphics/misc/pokeball_selection.png deleted file mode 100644 index d2f0a3d97..000000000 Binary files a/graphics/misc/pokeball_selection.png and /dev/null differ diff --git a/graphics/misc/starter_circle.png b/graphics/misc/starter_circle.png deleted file mode 100644 index 3501dfec4..000000000 Binary files a/graphics/misc/starter_circle.png and /dev/null differ diff --git a/graphics/starter_choose/birch_bag.bin b/graphics/starter_choose/birch_bag.bin new file mode 100644 index 000000000..ddfad5ec9 Binary files /dev/null and b/graphics/starter_choose/birch_bag.bin differ diff --git a/graphics/starter_choose/birch_bag.png b/graphics/starter_choose/birch_bag.png new file mode 100644 index 000000000..86bfbbbc0 Binary files /dev/null and b/graphics/starter_choose/birch_bag.png differ diff --git a/graphics/starter_choose/birch_grass.bin b/graphics/starter_choose/birch_grass.bin new file mode 100644 index 000000000..b7332940c Binary files /dev/null and b/graphics/starter_choose/birch_grass.bin differ diff --git a/graphics/starter_choose/birch_grass.png b/graphics/starter_choose/birch_grass.png new file mode 100644 index 000000000..838fa5f4c Binary files /dev/null and b/graphics/starter_choose/birch_grass.png differ diff --git a/graphics/starter_choose/pokeball_selection.png b/graphics/starter_choose/pokeball_selection.png new file mode 100644 index 000000000..d2f0a3d97 Binary files /dev/null and b/graphics/starter_choose/pokeball_selection.png differ diff --git a/graphics/starter_choose/starter_circle.png b/graphics/starter_choose/starter_circle.png new file mode 100644 index 000000000..3501dfec4 Binary files /dev/null and b/graphics/starter_choose/starter_circle.png differ diff --git a/graphics/trade/gba.png b/graphics/trade/gba.png new file mode 100644 index 000000000..1a0909468 Binary files /dev/null and b/graphics/trade/gba.png differ diff --git a/graphics/trade/gba_pal2.pal b/graphics/trade/gba_pal2.pal new file mode 100644 index 000000000..e2fb95b4a --- /dev/null +++ b/graphics/trade/gba_pal2.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 57 8 +255 90 8 +255 131 8 +255 172 8 +255 213 8 +255 255 8 +255 255 131 +255 255 255 +255 255 0 +65 0 0 +115 16 0 +172 32 0 +230 57 8 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +230 230 230 +205 205 205 +180 180 180 +156 156 156 +213 180 106 +205 156 82 +49 255 106 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +0 16 172 +32 32 106 +16 16 90 +0 0 74 +255 255 189 +230 230 164 +205 205 148 +189 180 115 +139 139 90 +74 74 57 +8 32 32 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 25ac18142..cb12b9c18 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -19,6 +19,7 @@ OBJEVENTGFXDIR := graphics/object_events MISCGFXDIR := graphics/misc JPCONTESTGFXDIR := graphics/contest/japanese POKEDEXGFXDIR := graphics/pokedex +STARTERGFXDIR := graphics/starter_choose types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -371,9 +372,9 @@ $(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp @cat $^ >$@ -$(INTERFACEGFXDIR)/battle_bar.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \ - $(INTERFACEGFXDIR)/numbers1.4bpp \ - $(INTERFACEGFXDIR)/numbers2.4bpp +$(BATINTGFXDIR)/battle_bar.4bpp: $(BATINTGFXDIR)/hpbar_anim_unused.4bpp \ + $(BATINTGFXDIR)/numbers1.4bpp \ + $(BATINTGFXDIR)/numbers2.4bpp @cat $^ >$@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ @@ -707,5 +708,5 @@ $(POKEDEXGFXDIR)/region_map.8bpp: %.8bpp: %.png $(POKEDEXGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 233 -$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp +$(STARTERGFXDIR)/birch_help.4bpp: $(STARTERGFXDIR)/birch_bag.4bpp $(STARTERGFXDIR)/birch_grass.4bpp @cat $^ >$@ diff --git a/src/graphics.c b/src/graphics.c index 09cae59ce..9f708f18b 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -147,7 +147,7 @@ const u32 gBattleAnimSpriteGfx_ClawSlash[] = INCBIN_U32("graphics/battle_anims/s const u32 gBattleAnimSpriteGfx_Scratch3[] = INCBIN_U32("graphics/battle_anims/sprites/scratch_3.4bpp.lz"); const u32 gBattleAnimSpriteGfx_Scratch2[] = INCBIN_U32("graphics/battle_anims/sprites/scratch_2.4bpp.lz"); -const u32 gUnusedHpBar_Gfx[] = INCBIN_U32("graphics/interface/unused_hpbar.4bpp.lz"); +const u32 gUnusedHpBar_Gfx[] = INCBIN_U32("graphics/battle_interface/hpbar_unused.4bpp.lz"); const u32 gBattleAnimSpriteGfx_BubbleBurst2[] = INCBIN_U32("graphics/battle_anims/sprites/bubble_burst_2.4bpp.lz"); @@ -165,7 +165,7 @@ const u32 gBattleAnimSpriteGfx_PinkHeart2[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleInterfaceGfx_UnusedWindow1[] = INCBIN_U32("graphics/battle_interface/unused_window.4bpp.lz"); const u32 gBattleInterfacePal_UnusedWindow1[] = INCBIN_U32("graphics/battle_interface/unused_window.gbapal.lz"); -const u32 gBattleInterfaceGfx_BattleBar[] = INCBIN_U32("graphics/interface/battle_bar.4bpp.lz"); +const u32 gBattleInterfaceGfx_BattleBar[] = INCBIN_U32("graphics/battle_interface/battle_bar.4bpp.lz"); const u32 gBattleAnimSpriteGfx_SapDrip[] = INCBIN_U32("graphics/battle_anims/sprites/sap_drip.4bpp.lz"); const u32 gBattleAnimSpritePal_SapDrip[] = INCBIN_U32("graphics/battle_anims/sprites/sap_drip.gbapal.lz"); @@ -1329,8 +1329,8 @@ const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/city_zoom_ const u16 gPokenavConditionCancel_Pal[] = INCBIN_U16("graphics/pokenav/condition/cancel.gbapal"); const u8 gPokenavConditionCancel_Gfx[] = INCBIN_U8("graphics/pokenav/condition/cancel.4bpp"); -const u16 gMonMarkingsMenu_Pal[] = INCBIN_U16("graphics/misc/mon_markings_menu.gbapal"); -const u8 gMonMarkingsMenu_Gfx[] = INCBIN_U8("graphics/misc/mon_markings_menu.4bpp"); +const u16 gMonMarkingsMenu_Pal[] = INCBIN_U16("graphics/interface/mon_markings_menu.gbapal"); +const u8 gMonMarkingsMenu_Gfx[] = INCBIN_U8("graphics/interface/mon_markings_menu.4bpp"); const u16 gBerryBlenderMiscPalette[] = INCBIN_U16("graphics/berry_blender/misc.gbapal"); const u16 gBerryBlenderArrowPalette[] = INCBIN_U16("graphics/berry_blender/arrow.gbapal"); @@ -1447,9 +1447,9 @@ const u32 gTilesetTiles_General[] = INCBIN_U32("data/tilesets/primary/general/ti // trade/egg hatch -const u16 gTradeGba_Pal[] = INCBIN_U16("graphics/link/gba.gbapal"); -const u16 gTradeGba2_Pal[] = INCBIN_U16("graphics/link/gba_pal2.gbapal"); -const u8 gTradeGba_Gfx[] = INCBIN_U8("graphics/link/gba.4bpp"); +const u16 gTradeGba_Pal[] = INCBIN_U16("graphics/trade/gba.gbapal"); +const u16 gTradeGba2_Pal[] = INCBIN_U16("graphics/trade/gba_pal2.gbapal"); +const u8 gTradeGba_Gfx[] = INCBIN_U8("graphics/trade/gba.4bpp"); static const u16 sEmptyPal[16] = {0}; diff --git a/src/mon_markings.c b/src/mon_markings.c index dbd5a2fa8..1e03179e9 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -22,8 +22,8 @@ static void SpriteCB_Marking(struct Sprite *); static void SpriteCB_Cursor(struct Sprite *); static struct Sprite *CreateMarkingComboSprite(u16, u16, const u16 *, u16); -static const u16 sMonMarkings_Pal[] = INCBIN_U16("graphics/misc/mon_markings.gbapal"); -static const u8 sMonMarkings_Gfx[] = INCBIN_U8("graphics/misc/mon_markings.4bpp"); +static const u16 sMonMarkings_Pal[] = INCBIN_U16("graphics/interface/mon_markings.gbapal"); +static const u8 sMonMarkings_Gfx[] = INCBIN_U8("graphics/interface/mon_markings.4bpp"); static const struct OamData sOamData_MenuWindow = { diff --git a/src/starter_choose.c b/src/starter_choose.c index ca393c4d8..81a88e771 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -53,17 +53,17 @@ static u16 sStarterLabelWindowId; const u16 gBirchBagGrassPal[][16] = { - INCBIN_U16("graphics/misc/birch_bag.gbapal"), - INCBIN_U16("graphics/misc/birch_grass.gbapal"), + INCBIN_U16("graphics/starter_choose/birch_bag.gbapal"), + INCBIN_U16("graphics/starter_choose/birch_grass.gbapal"), }; -static const u16 sPokeballSelection_Pal[] = INCBIN_U16("graphics/misc/pokeball_selection.gbapal"); -static const u16 sStarterCircle_Pal[] = INCBIN_U16("graphics/misc/starter_circle.gbapal"); -const u32 gBirchBagTilemap[] = INCBIN_U32("graphics/misc/birch_bag_map.bin.lz"); -const u32 gBirchGrassTilemap[] = INCBIN_U32("graphics/misc/birch_grass_map.bin.lz"); -const u32 gBirchHelpGfx[] = INCBIN_U32("graphics/misc/birch_help.4bpp.lz"); // Birch bag and grass combined -const u32 gPokeballSelection_Gfx[] = INCBIN_U32("graphics/misc/pokeball_selection.4bpp.lz"); -static const u32 sStarterCircle_Gfx[] = INCBIN_U32("graphics/misc/starter_circle.4bpp.lz"); +static const u16 sPokeballSelection_Pal[] = INCBIN_U16("graphics/starter_choose/pokeball_selection.gbapal"); +static const u16 sStarterCircle_Pal[] = INCBIN_U16("graphics/starter_choose/starter_circle.gbapal"); +const u32 gBirchBagTilemap[] = INCBIN_U32("graphics/starter_choose/birch_bag.bin.lz"); +const u32 gBirchGrassTilemap[] = INCBIN_U32("graphics/starter_choose/birch_grass.bin.lz"); +const u32 gBirchHelpGfx[] = INCBIN_U32("graphics/starter_choose/birch_help.4bpp.lz"); // Birch bag and grass combined +const u32 gPokeballSelection_Gfx[] = INCBIN_U32("graphics/starter_choose/pokeball_selection.4bpp.lz"); +static const u32 sStarterCircle_Gfx[] = INCBIN_U32("graphics/starter_choose/starter_circle.4bpp.lz"); static const struct WindowTemplate sWindowTemplates[] = { -- cgit v1.2.3 From 4dec9b83a3a0b424284dae02506d159931cc1408 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 14 Jan 2022 12:29:30 -0500 Subject: Move more graphics out of misc --- decompress.sh | 5 --- graphics/birch_speech/unused_beauty.png | Bin 0 -> 2183 bytes graphics/cave_transition/black.pal | 19 ++++++++++ graphics/cave_transition/enter.pal | 11 ++++++ graphics/cave_transition/exit.pal | 11 ++++++ graphics/cave_transition/tilemap.bin | Bin 0 -> 2048 bytes graphics/cave_transition/tiles.png | Bin 0 -> 194 bytes graphics/cave_transition/white.pal | 19 ++++++++++ graphics/decorations/put_away_cursor.png | Bin 0 -> 87 bytes graphics/diploma/hoenn.pal | 19 ++++++++++ graphics/diploma/national.pal | 19 ++++++++++ graphics/diploma/tilemap.bin | Bin 0 -> 4096 bytes graphics/diploma/tiles.png | Bin 0 -> 2064 bytes graphics/field_effects/palettes/deoxys_rock_1.pal | 19 ++++++++++ graphics/field_effects/palettes/deoxys_rock_10.pal | 19 ++++++++++ graphics/field_effects/palettes/deoxys_rock_11.pal | 19 ++++++++++ graphics/field_effects/palettes/deoxys_rock_2.pal | 19 ++++++++++ graphics/field_effects/palettes/deoxys_rock_3.pal | 19 ++++++++++ graphics/field_effects/palettes/deoxys_rock_4.pal | 19 ++++++++++ graphics/field_effects/palettes/deoxys_rock_5.pal | 19 ++++++++++ graphics/field_effects/palettes/deoxys_rock_6.pal | 19 ++++++++++ graphics/field_effects/palettes/deoxys_rock_7.pal | 19 ++++++++++ graphics/field_effects/palettes/deoxys_rock_8.pal | 19 ++++++++++ graphics/field_effects/palettes/deoxys_rock_9.pal | 19 ++++++++++ .../pics/deoxys_rock_fragment_bottom_left.png | Bin 0 -> 100 bytes .../pics/deoxys_rock_fragment_bottom_right.png | Bin 0 -> 91 bytes .../pics/deoxys_rock_fragment_top_left.png | Bin 0 -> 99 bytes .../pics/deoxys_rock_fragment_top_right.png | Bin 0 -> 102 bytes .../field_effects/pics/emotion_exclamation.png | Bin 0 -> 108 bytes graphics/field_effects/pics/emotion_heart.png | Bin 0 -> 126 bytes graphics/field_effects/pics/emotion_question.png | Bin 0 -> 117 bytes graphics/field_effects/pics/field_move_streaks.bin | Bin 0 -> 640 bytes graphics/field_effects/pics/field_move_streaks.png | Bin 0 -> 157 bytes .../pics/field_move_streaks_indoors.bin | Bin 0 -> 640 bytes .../pics/field_move_streaks_indoors.png | Bin 0 -> 159 bytes graphics/field_effects/pics/hof_monitor_big.png | Bin 0 -> 184 bytes graphics/field_effects/pics/hof_monitor_small.png | Bin 0 -> 177 bytes graphics/field_effects/pics/pokeball_glow.png | Bin 0 -> 100 bytes .../field_effects/pics/pokecenter_monitor/0.png | Bin 0 -> 143 bytes .../field_effects/pics/pokecenter_monitor/1.png | Bin 0 -> 150 bytes graphics/field_effects/pics/spotlight.png | Bin 0 -> 312 bytes graphics/interface/main_menu_bg.pal | 19 ++++++++++ graphics/interface/main_menu_text.pal | 19 ++++++++++ graphics/interface/option_menu_equals_sign.png | Bin 0 -> 81 bytes graphics/interface/option_menu_text.pal | 19 ++++++++++ graphics/misc/cave_transition.png | Bin 194 -> 0 bytes graphics/misc/cave_transition_black.pal | 19 ---------- graphics/misc/cave_transition_enter.pal | 11 ------ graphics/misc/cave_transition_exit.pal | 11 ------ graphics/misc/cave_transition_map.bin | Bin 2048 -> 0 bytes graphics/misc/cave_transition_white.pal | 19 ---------- graphics/misc/darkness_field_move_streaks.png | Bin 159 -> 0 bytes graphics/misc/darkness_field_move_streaks_map.bin | Bin 640 -> 0 bytes graphics/misc/decoration_putting_away_cursor.png | Bin 87 -> 0 bytes graphics/misc/deoxys1.pal | 19 ---------- graphics/misc/deoxys10.pal | 19 ---------- graphics/misc/deoxys11.pal | 19 ---------- graphics/misc/deoxys2.pal | 19 ---------- graphics/misc/deoxys3.pal | 19 ---------- graphics/misc/deoxys4.pal | 19 ---------- graphics/misc/deoxys5.pal | 19 ---------- graphics/misc/deoxys6.pal | 19 ---------- graphics/misc/deoxys7.pal | 19 ---------- graphics/misc/deoxys8.pal | 19 ---------- graphics/misc/deoxys9.pal | 19 ---------- graphics/misc/deoxys_rock_fragment_bottom_left.png | Bin 100 -> 0 bytes .../misc/deoxys_rock_fragment_bottom_right.png | Bin 91 -> 0 bytes graphics/misc/deoxys_rock_fragment_top_left.png | Bin 99 -> 0 bytes graphics/misc/deoxys_rock_fragment_top_right.png | Bin 102 -> 0 bytes graphics/misc/diploma.png | Bin 2064 -> 0 bytes graphics/misc/diploma_hoenn.pal | 19 ---------- graphics/misc/diploma_map.bin | Bin 4096 -> 0 bytes graphics/misc/diploma_national.pal | 19 ---------- graphics/misc/emotion_exclamation.png | Bin 108 -> 0 bytes graphics/misc/emotion_heart.png | Bin 126 -> 0 bytes graphics/misc/emotion_question.png | Bin 117 -> 0 bytes graphics/misc/field_move_streaks.png | Bin 157 -> 0 bytes graphics/misc/field_move_streaks_map.bin | Bin 640 -> 0 bytes graphics/misc/hof_monitor_big.png | Bin 184 -> 0 bytes graphics/misc/hof_monitor_small.png | Bin 177 -> 0 bytes graphics/misc/main_menu_bg.pal | 19 ---------- graphics/misc/main_menu_text.pal | 19 ---------- graphics/misc/option_menu_equals_sign.png | Bin 81 -> 0 bytes graphics/misc/option_menu_text.pal | 19 ---------- graphics/misc/pokeball_glow.png | Bin 100 -> 0 bytes graphics/misc/pokecenter_monitor/0.png | Bin 143 -> 0 bytes graphics/misc/pokecenter_monitor/1.png | Bin 150 -> 0 bytes graphics/misc/rotating_gate_1.png | Bin 119 -> 0 bytes graphics/misc/rotating_gate_2.png | Bin 136 -> 0 bytes graphics/misc/rotating_gate_3.png | Bin 136 -> 0 bytes graphics/misc/rotating_gate_4.png | Bin 136 -> 0 bytes graphics/misc/rotating_gate_5.png | Bin 122 -> 0 bytes graphics/misc/rotating_gate_6.png | Bin 144 -> 0 bytes graphics/misc/rotating_gate_7.png | Bin 144 -> 0 bytes graphics/misc/rotating_gate_8.png | Bin 142 -> 0 bytes graphics/misc/spotlight.png | Bin 312 -> 0 bytes graphics/misc/trainer_hill_ereader.pal | 19 ---------- graphics/rotating_gates/l1.png | Bin 0 -> 119 bytes graphics/rotating_gates/l2.png | Bin 0 -> 136 bytes graphics/rotating_gates/l3.png | Bin 0 -> 136 bytes graphics/rotating_gates/l4.png | Bin 0 -> 136 bytes graphics/rotating_gates/t1.png | Bin 0 -> 122 bytes graphics/rotating_gates/t2.png | Bin 0 -> 144 bytes graphics/rotating_gates/t3.png | Bin 0 -> 144 bytes graphics/rotating_gates/t4.png | Bin 0 -> 142 bytes graphics/trainer_hill/ereader.pal | 19 ++++++++++ graphics/unused/intro_birch_beauty.png | Bin 2183 -> 0 bytes graphics_file_rules.mk | 2 +- src/decoration.c | 2 +- src/diploma.c | 8 ++--- src/field_effect.c | 39 +++++++++++---------- src/field_specials.c | 22 ++++++------ src/fldeff_flash.c | 12 +++---- src/main_menu.c | 4 +-- src/option_menu.c | 4 +-- src/rotating_gate.c | 16 ++++----- src/trainer_hill.c | 2 +- src/trainer_see.c | 6 ++-- 118 files changed, 442 insertions(+), 446 deletions(-) delete mode 100755 decompress.sh create mode 100644 graphics/birch_speech/unused_beauty.png create mode 100644 graphics/cave_transition/black.pal create mode 100644 graphics/cave_transition/enter.pal create mode 100644 graphics/cave_transition/exit.pal create mode 100644 graphics/cave_transition/tilemap.bin create mode 100644 graphics/cave_transition/tiles.png create mode 100644 graphics/cave_transition/white.pal create mode 100644 graphics/decorations/put_away_cursor.png create mode 100644 graphics/diploma/hoenn.pal create mode 100644 graphics/diploma/national.pal create mode 100644 graphics/diploma/tilemap.bin create mode 100644 graphics/diploma/tiles.png create mode 100644 graphics/field_effects/palettes/deoxys_rock_1.pal create mode 100644 graphics/field_effects/palettes/deoxys_rock_10.pal create mode 100644 graphics/field_effects/palettes/deoxys_rock_11.pal create mode 100644 graphics/field_effects/palettes/deoxys_rock_2.pal create mode 100644 graphics/field_effects/palettes/deoxys_rock_3.pal create mode 100644 graphics/field_effects/palettes/deoxys_rock_4.pal create mode 100644 graphics/field_effects/palettes/deoxys_rock_5.pal create mode 100644 graphics/field_effects/palettes/deoxys_rock_6.pal create mode 100644 graphics/field_effects/palettes/deoxys_rock_7.pal create mode 100644 graphics/field_effects/palettes/deoxys_rock_8.pal create mode 100644 graphics/field_effects/palettes/deoxys_rock_9.pal create mode 100644 graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png create mode 100644 graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png create mode 100644 graphics/field_effects/pics/deoxys_rock_fragment_top_left.png create mode 100644 graphics/field_effects/pics/deoxys_rock_fragment_top_right.png create mode 100644 graphics/field_effects/pics/emotion_exclamation.png create mode 100644 graphics/field_effects/pics/emotion_heart.png create mode 100644 graphics/field_effects/pics/emotion_question.png create mode 100644 graphics/field_effects/pics/field_move_streaks.bin create mode 100644 graphics/field_effects/pics/field_move_streaks.png create mode 100644 graphics/field_effects/pics/field_move_streaks_indoors.bin create mode 100644 graphics/field_effects/pics/field_move_streaks_indoors.png create mode 100644 graphics/field_effects/pics/hof_monitor_big.png create mode 100644 graphics/field_effects/pics/hof_monitor_small.png create mode 100644 graphics/field_effects/pics/pokeball_glow.png create mode 100644 graphics/field_effects/pics/pokecenter_monitor/0.png create mode 100644 graphics/field_effects/pics/pokecenter_monitor/1.png create mode 100644 graphics/field_effects/pics/spotlight.png create mode 100644 graphics/interface/main_menu_bg.pal create mode 100644 graphics/interface/main_menu_text.pal create mode 100644 graphics/interface/option_menu_equals_sign.png create mode 100644 graphics/interface/option_menu_text.pal delete mode 100644 graphics/misc/cave_transition.png delete mode 100644 graphics/misc/cave_transition_black.pal delete mode 100644 graphics/misc/cave_transition_enter.pal delete mode 100644 graphics/misc/cave_transition_exit.pal delete mode 100644 graphics/misc/cave_transition_map.bin delete mode 100644 graphics/misc/cave_transition_white.pal delete mode 100644 graphics/misc/darkness_field_move_streaks.png delete mode 100644 graphics/misc/darkness_field_move_streaks_map.bin delete mode 100644 graphics/misc/decoration_putting_away_cursor.png delete mode 100644 graphics/misc/deoxys1.pal delete mode 100644 graphics/misc/deoxys10.pal delete mode 100644 graphics/misc/deoxys11.pal delete mode 100644 graphics/misc/deoxys2.pal delete mode 100644 graphics/misc/deoxys3.pal delete mode 100644 graphics/misc/deoxys4.pal delete mode 100644 graphics/misc/deoxys5.pal delete mode 100644 graphics/misc/deoxys6.pal delete mode 100644 graphics/misc/deoxys7.pal delete mode 100644 graphics/misc/deoxys8.pal delete mode 100644 graphics/misc/deoxys9.pal delete mode 100644 graphics/misc/deoxys_rock_fragment_bottom_left.png delete mode 100644 graphics/misc/deoxys_rock_fragment_bottom_right.png delete mode 100644 graphics/misc/deoxys_rock_fragment_top_left.png delete mode 100644 graphics/misc/deoxys_rock_fragment_top_right.png delete mode 100644 graphics/misc/diploma.png delete mode 100644 graphics/misc/diploma_hoenn.pal delete mode 100644 graphics/misc/diploma_map.bin delete mode 100644 graphics/misc/diploma_national.pal delete mode 100644 graphics/misc/emotion_exclamation.png delete mode 100644 graphics/misc/emotion_heart.png delete mode 100644 graphics/misc/emotion_question.png delete mode 100644 graphics/misc/field_move_streaks.png delete mode 100644 graphics/misc/field_move_streaks_map.bin delete mode 100644 graphics/misc/hof_monitor_big.png delete mode 100644 graphics/misc/hof_monitor_small.png delete mode 100644 graphics/misc/main_menu_bg.pal delete mode 100644 graphics/misc/main_menu_text.pal delete mode 100644 graphics/misc/option_menu_equals_sign.png delete mode 100644 graphics/misc/option_menu_text.pal delete mode 100644 graphics/misc/pokeball_glow.png delete mode 100644 graphics/misc/pokecenter_monitor/0.png delete mode 100644 graphics/misc/pokecenter_monitor/1.png delete mode 100644 graphics/misc/rotating_gate_1.png delete mode 100644 graphics/misc/rotating_gate_2.png delete mode 100644 graphics/misc/rotating_gate_3.png delete mode 100644 graphics/misc/rotating_gate_4.png delete mode 100644 graphics/misc/rotating_gate_5.png delete mode 100644 graphics/misc/rotating_gate_6.png delete mode 100644 graphics/misc/rotating_gate_7.png delete mode 100644 graphics/misc/rotating_gate_8.png delete mode 100644 graphics/misc/spotlight.png delete mode 100644 graphics/misc/trainer_hill_ereader.pal create mode 100644 graphics/rotating_gates/l1.png create mode 100644 graphics/rotating_gates/l2.png create mode 100644 graphics/rotating_gates/l3.png create mode 100644 graphics/rotating_gates/l4.png create mode 100644 graphics/rotating_gates/t1.png create mode 100644 graphics/rotating_gates/t2.png create mode 100644 graphics/rotating_gates/t3.png create mode 100644 graphics/rotating_gates/t4.png create mode 100644 graphics/trainer_hill/ereader.pal delete mode 100644 graphics/unused/intro_birch_beauty.png diff --git a/decompress.sh b/decompress.sh deleted file mode 100755 index 26b5a0db7..000000000 --- a/decompress.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -FILEPATH=$1 - -tools/gbagfx/gbagfx graphics/$FILEPATH.bin.lz graphics/$FILEPATH.bin diff --git a/graphics/birch_speech/unused_beauty.png b/graphics/birch_speech/unused_beauty.png new file mode 100644 index 000000000..f13221cf5 Binary files /dev/null and b/graphics/birch_speech/unused_beauty.png differ diff --git a/graphics/cave_transition/black.pal b/graphics/cave_transition/black.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/cave_transition/black.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +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 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/cave_transition/enter.pal b/graphics/cave_transition/enter.pal new file mode 100644 index 000000000..fea15a176 --- /dev/null +++ b/graphics/cave_transition/enter.pal @@ -0,0 +1,11 @@ +JASC-PAL +0100 +8 +148 197 172 +16 16 16 +32 32 32 +49 49 49 +65 65 65 +82 82 82 +98 98 98 +115 115 115 diff --git a/graphics/cave_transition/exit.pal b/graphics/cave_transition/exit.pal new file mode 100644 index 000000000..09eb37624 --- /dev/null +++ b/graphics/cave_transition/exit.pal @@ -0,0 +1,11 @@ +JASC-PAL +0100 +8 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 diff --git a/graphics/cave_transition/tilemap.bin b/graphics/cave_transition/tilemap.bin new file mode 100644 index 000000000..4293bfd1c Binary files /dev/null and b/graphics/cave_transition/tilemap.bin differ diff --git a/graphics/cave_transition/tiles.png b/graphics/cave_transition/tiles.png new file mode 100644 index 000000000..dd265149f Binary files /dev/null and b/graphics/cave_transition/tiles.png differ diff --git a/graphics/cave_transition/white.pal b/graphics/cave_transition/white.pal new file mode 100644 index 000000000..98a1fb3c8 --- /dev/null +++ b/graphics/cave_transition/white.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/decorations/put_away_cursor.png b/graphics/decorations/put_away_cursor.png new file mode 100644 index 000000000..2dc8ed604 Binary files /dev/null and b/graphics/decorations/put_away_cursor.png differ diff --git a/graphics/diploma/hoenn.pal b/graphics/diploma/hoenn.pal new file mode 100644 index 000000000..2890eb24a --- /dev/null +++ b/graphics/diploma/hoenn.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 222 +246 238 230 +205 230 139 +172 222 49 +238 238 222 +222 230 230 +255 222 197 +222 222 189 +246 246 180 +238 230 180 +213 213 156 +230 230 139 +255 255 123 +238 238 106 +255 205 172 diff --git a/graphics/diploma/national.pal b/graphics/diploma/national.pal new file mode 100644 index 000000000..03c37bf22 --- /dev/null +++ b/graphics/diploma/national.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 82 +255 255 222 +255 255 189 +230 238 90 +213 222 0 +238 238 222 +222 230 230 +255 222 197 +222 222 189 +246 246 180 +238 230 180 +213 213 156 +230 230 139 +255 255 123 +238 238 106 +255 205 172 diff --git a/graphics/diploma/tilemap.bin b/graphics/diploma/tilemap.bin new file mode 100644 index 000000000..e9a47fa44 Binary files /dev/null and b/graphics/diploma/tilemap.bin differ diff --git a/graphics/diploma/tiles.png b/graphics/diploma/tiles.png new file mode 100644 index 000000000..d9607dce6 Binary files /dev/null and b/graphics/diploma/tiles.png differ diff --git a/graphics/field_effects/palettes/deoxys_rock_1.pal b/graphics/field_effects/palettes/deoxys_rock_1.pal new file mode 100644 index 000000000..d90c4cb38 --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +180 180 180 +148 148 148 +90 90 98 +57 57 74 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 222 222 +0 0 0 diff --git a/graphics/field_effects/palettes/deoxys_rock_10.pal b/graphics/field_effects/palettes/deoxys_rock_10.pal new file mode 100644 index 000000000..8bdd860fb --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +246 197 156 +238 82 82 +189 32 32 +123 8 8 +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/field_effects/palettes/deoxys_rock_11.pal b/graphics/field_effects/palettes/deoxys_rock_11.pal new file mode 100644 index 000000000..9a9ee2530 --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 205 156 +255 82 82 +205 32 32 +131 8 8 +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/field_effects/palettes/deoxys_rock_2.pal b/graphics/field_effects/palettes/deoxys_rock_2.pal new file mode 100644 index 000000000..38806db0f --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +180 180 172 +156 139 139 +98 82 90 +57 49 65 +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/field_effects/palettes/deoxys_rock_3.pal b/graphics/field_effects/palettes/deoxys_rock_3.pal new file mode 100644 index 000000000..24db0e343 --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +189 180 172 +164 131 131 +106 74 82 +65 41 57 +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/field_effects/palettes/deoxys_rock_4.pal b/graphics/field_effects/palettes/deoxys_rock_4.pal new file mode 100644 index 000000000..5db08f366 --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +197 180 172 +172 123 123 +123 65 74 +74 41 49 +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/field_effects/palettes/deoxys_rock_5.pal b/graphics/field_effects/palettes/deoxys_rock_5.pal new file mode 100644 index 000000000..25a62aae6 --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +205 189 164 +189 115 115 +131 65 65 +82 32 41 +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/field_effects/palettes/deoxys_rock_6.pal b/graphics/field_effects/palettes/deoxys_rock_6.pal new file mode 100644 index 000000000..0f636873e --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +213 189 164 +197 115 115 +148 57 65 +90 32 41 +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/field_effects/palettes/deoxys_rock_7.pal b/graphics/field_effects/palettes/deoxys_rock_7.pal new file mode 100644 index 000000000..2dba57eef --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +222 189 164 +205 106 106 +156 49 57 +98 24 32 +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/field_effects/palettes/deoxys_rock_8.pal b/graphics/field_effects/palettes/deoxys_rock_8.pal new file mode 100644 index 000000000..d46c26996 --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +230 197 156 +222 98 98 +164 49 49 +106 16 24 +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/field_effects/palettes/deoxys_rock_9.pal b/graphics/field_effects/palettes/deoxys_rock_9.pal new file mode 100644 index 000000000..f65fee065 --- /dev/null +++ b/graphics/field_effects/palettes/deoxys_rock_9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +238 197 156 +230 90 90 +180 41 41 +115 16 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 diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png new file mode 100644 index 000000000..3f5b8d5c3 Binary files /dev/null and b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png differ diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png new file mode 100644 index 000000000..7684451e4 Binary files /dev/null and b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png differ diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png new file mode 100644 index 000000000..d601cb6e5 Binary files /dev/null and b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png differ diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png new file mode 100644 index 000000000..01f10cd07 Binary files /dev/null and b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png differ diff --git a/graphics/field_effects/pics/emotion_exclamation.png b/graphics/field_effects/pics/emotion_exclamation.png new file mode 100644 index 000000000..595566d2f Binary files /dev/null and b/graphics/field_effects/pics/emotion_exclamation.png differ diff --git a/graphics/field_effects/pics/emotion_heart.png b/graphics/field_effects/pics/emotion_heart.png new file mode 100644 index 000000000..9995984b4 Binary files /dev/null and b/graphics/field_effects/pics/emotion_heart.png differ diff --git a/graphics/field_effects/pics/emotion_question.png b/graphics/field_effects/pics/emotion_question.png new file mode 100644 index 000000000..7376fd058 Binary files /dev/null and b/graphics/field_effects/pics/emotion_question.png differ diff --git a/graphics/field_effects/pics/field_move_streaks.bin b/graphics/field_effects/pics/field_move_streaks.bin new file mode 100644 index 000000000..466f456be Binary files /dev/null and b/graphics/field_effects/pics/field_move_streaks.bin differ diff --git a/graphics/field_effects/pics/field_move_streaks.png b/graphics/field_effects/pics/field_move_streaks.png new file mode 100644 index 000000000..8becc4413 Binary files /dev/null and b/graphics/field_effects/pics/field_move_streaks.png differ diff --git a/graphics/field_effects/pics/field_move_streaks_indoors.bin b/graphics/field_effects/pics/field_move_streaks_indoors.bin new file mode 100644 index 000000000..f7c2f2142 Binary files /dev/null and b/graphics/field_effects/pics/field_move_streaks_indoors.bin differ diff --git a/graphics/field_effects/pics/field_move_streaks_indoors.png b/graphics/field_effects/pics/field_move_streaks_indoors.png new file mode 100644 index 000000000..825d695eb Binary files /dev/null and b/graphics/field_effects/pics/field_move_streaks_indoors.png differ diff --git a/graphics/field_effects/pics/hof_monitor_big.png b/graphics/field_effects/pics/hof_monitor_big.png new file mode 100644 index 000000000..510e6a232 Binary files /dev/null and b/graphics/field_effects/pics/hof_monitor_big.png differ diff --git a/graphics/field_effects/pics/hof_monitor_small.png b/graphics/field_effects/pics/hof_monitor_small.png new file mode 100644 index 000000000..dcff33095 Binary files /dev/null and b/graphics/field_effects/pics/hof_monitor_small.png differ diff --git a/graphics/field_effects/pics/pokeball_glow.png b/graphics/field_effects/pics/pokeball_glow.png new file mode 100644 index 000000000..1c1133b76 Binary files /dev/null and b/graphics/field_effects/pics/pokeball_glow.png differ diff --git a/graphics/field_effects/pics/pokecenter_monitor/0.png b/graphics/field_effects/pics/pokecenter_monitor/0.png new file mode 100644 index 000000000..474883908 Binary files /dev/null and b/graphics/field_effects/pics/pokecenter_monitor/0.png differ diff --git a/graphics/field_effects/pics/pokecenter_monitor/1.png b/graphics/field_effects/pics/pokecenter_monitor/1.png new file mode 100644 index 000000000..1a2606011 Binary files /dev/null and b/graphics/field_effects/pics/pokecenter_monitor/1.png differ diff --git a/graphics/field_effects/pics/spotlight.png b/graphics/field_effects/pics/spotlight.png new file mode 100644 index 000000000..62e21e411 Binary files /dev/null and b/graphics/field_effects/pics/spotlight.png differ diff --git a/graphics/interface/main_menu_bg.pal b/graphics/interface/main_menu_bg.pal new file mode 100644 index 000000000..7aca54c52 --- /dev/null +++ b/graphics/interface/main_menu_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 148 255 +255 255 255 +49 57 82 +90 98 115 +8 8 16 +148 156 172 +205 222 238 +180 180 189 +189 205 222 +32 32 49 +123 131 139 +49 82 123 +41 123 197 +57 139 213 +90 164 230 +139 197 246 diff --git a/graphics/interface/main_menu_text.pal b/graphics/interface/main_menu_text.pal new file mode 100644 index 000000000..25a3ac1d2 --- /dev/null +++ b/graphics/interface/main_menu_text.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/interface/option_menu_equals_sign.png b/graphics/interface/option_menu_equals_sign.png new file mode 100644 index 000000000..7e56e3cc3 Binary files /dev/null and b/graphics/interface/option_menu_equals_sign.png differ diff --git a/graphics/interface/option_menu_text.pal b/graphics/interface/option_menu_text.pal new file mode 100644 index 000000000..e7d6c330a --- /dev/null +++ b/graphics/interface/option_menu_text.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 180 82 +197 123 0 +255 139 131 +255 49 24 +74 74 74 +213 213 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 diff --git a/graphics/misc/cave_transition.png b/graphics/misc/cave_transition.png deleted file mode 100644 index dd265149f..000000000 Binary files a/graphics/misc/cave_transition.png and /dev/null differ diff --git a/graphics/misc/cave_transition_black.pal b/graphics/misc/cave_transition_black.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/graphics/misc/cave_transition_black.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -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 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/misc/cave_transition_enter.pal b/graphics/misc/cave_transition_enter.pal deleted file mode 100644 index fea15a176..000000000 --- a/graphics/misc/cave_transition_enter.pal +++ /dev/null @@ -1,11 +0,0 @@ -JASC-PAL -0100 -8 -148 197 172 -16 16 16 -32 32 32 -49 49 49 -65 65 65 -82 82 82 -98 98 98 -115 115 115 diff --git a/graphics/misc/cave_transition_exit.pal b/graphics/misc/cave_transition_exit.pal deleted file mode 100644 index 09eb37624..000000000 --- a/graphics/misc/cave_transition_exit.pal +++ /dev/null @@ -1,11 +0,0 @@ -JASC-PAL -0100 -8 -131 131 131 -148 148 148 -164 164 164 -180 180 180 -197 197 197 -213 213 213 -230 230 230 -255 255 255 diff --git a/graphics/misc/cave_transition_map.bin b/graphics/misc/cave_transition_map.bin deleted file mode 100644 index 4293bfd1c..000000000 Binary files a/graphics/misc/cave_transition_map.bin and /dev/null differ diff --git a/graphics/misc/cave_transition_white.pal b/graphics/misc/cave_transition_white.pal deleted file mode 100644 index 98a1fb3c8..000000000 --- a/graphics/misc/cave_transition_white.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 -255 255 255 diff --git a/graphics/misc/darkness_field_move_streaks.png b/graphics/misc/darkness_field_move_streaks.png deleted file mode 100644 index 825d695eb..000000000 Binary files a/graphics/misc/darkness_field_move_streaks.png and /dev/null differ diff --git a/graphics/misc/darkness_field_move_streaks_map.bin b/graphics/misc/darkness_field_move_streaks_map.bin deleted file mode 100644 index f7c2f2142..000000000 Binary files a/graphics/misc/darkness_field_move_streaks_map.bin and /dev/null differ diff --git a/graphics/misc/decoration_putting_away_cursor.png b/graphics/misc/decoration_putting_away_cursor.png deleted file mode 100644 index 2dc8ed604..000000000 Binary files a/graphics/misc/decoration_putting_away_cursor.png and /dev/null differ diff --git a/graphics/misc/deoxys1.pal b/graphics/misc/deoxys1.pal deleted file mode 100644 index d90c4cb38..000000000 --- a/graphics/misc/deoxys1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -180 180 180 -148 148 148 -90 90 98 -57 57 74 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -222 222 222 -0 0 0 diff --git a/graphics/misc/deoxys10.pal b/graphics/misc/deoxys10.pal deleted file mode 100644 index 8bdd860fb..000000000 --- a/graphics/misc/deoxys10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -246 197 156 -238 82 82 -189 32 32 -123 8 8 -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/misc/deoxys11.pal b/graphics/misc/deoxys11.pal deleted file mode 100644 index 9a9ee2530..000000000 --- a/graphics/misc/deoxys11.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 205 156 -255 82 82 -205 32 32 -131 8 8 -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/misc/deoxys2.pal b/graphics/misc/deoxys2.pal deleted file mode 100644 index 38806db0f..000000000 --- a/graphics/misc/deoxys2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -180 180 172 -156 139 139 -98 82 90 -57 49 65 -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/misc/deoxys3.pal b/graphics/misc/deoxys3.pal deleted file mode 100644 index 24db0e343..000000000 --- a/graphics/misc/deoxys3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -189 180 172 -164 131 131 -106 74 82 -65 41 57 -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/misc/deoxys4.pal b/graphics/misc/deoxys4.pal deleted file mode 100644 index 5db08f366..000000000 --- a/graphics/misc/deoxys4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -197 180 172 -172 123 123 -123 65 74 -74 41 49 -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/misc/deoxys5.pal b/graphics/misc/deoxys5.pal deleted file mode 100644 index 25a62aae6..000000000 --- a/graphics/misc/deoxys5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -205 189 164 -189 115 115 -131 65 65 -82 32 41 -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/misc/deoxys6.pal b/graphics/misc/deoxys6.pal deleted file mode 100644 index 0f636873e..000000000 --- a/graphics/misc/deoxys6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -213 189 164 -197 115 115 -148 57 65 -90 32 41 -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/misc/deoxys7.pal b/graphics/misc/deoxys7.pal deleted file mode 100644 index 2dba57eef..000000000 --- a/graphics/misc/deoxys7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -222 189 164 -205 106 106 -156 49 57 -98 24 32 -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/misc/deoxys8.pal b/graphics/misc/deoxys8.pal deleted file mode 100644 index d46c26996..000000000 --- a/graphics/misc/deoxys8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -230 197 156 -222 98 98 -164 49 49 -106 16 24 -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/misc/deoxys9.pal b/graphics/misc/deoxys9.pal deleted file mode 100644 index f65fee065..000000000 --- a/graphics/misc/deoxys9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -238 197 156 -230 90 90 -180 41 41 -115 16 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 diff --git a/graphics/misc/deoxys_rock_fragment_bottom_left.png b/graphics/misc/deoxys_rock_fragment_bottom_left.png deleted file mode 100644 index 3f5b8d5c3..000000000 Binary files a/graphics/misc/deoxys_rock_fragment_bottom_left.png and /dev/null differ diff --git a/graphics/misc/deoxys_rock_fragment_bottom_right.png b/graphics/misc/deoxys_rock_fragment_bottom_right.png deleted file mode 100644 index 7684451e4..000000000 Binary files a/graphics/misc/deoxys_rock_fragment_bottom_right.png and /dev/null differ diff --git a/graphics/misc/deoxys_rock_fragment_top_left.png b/graphics/misc/deoxys_rock_fragment_top_left.png deleted file mode 100644 index d601cb6e5..000000000 Binary files a/graphics/misc/deoxys_rock_fragment_top_left.png and /dev/null differ diff --git a/graphics/misc/deoxys_rock_fragment_top_right.png b/graphics/misc/deoxys_rock_fragment_top_right.png deleted file mode 100644 index 01f10cd07..000000000 Binary files a/graphics/misc/deoxys_rock_fragment_top_right.png and /dev/null differ diff --git a/graphics/misc/diploma.png b/graphics/misc/diploma.png deleted file mode 100644 index d9607dce6..000000000 Binary files a/graphics/misc/diploma.png and /dev/null differ diff --git a/graphics/misc/diploma_hoenn.pal b/graphics/misc/diploma_hoenn.pal deleted file mode 100644 index 2890eb24a..000000000 --- a/graphics/misc/diploma_hoenn.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 222 -246 238 230 -205 230 139 -172 222 49 -238 238 222 -222 230 230 -255 222 197 -222 222 189 -246 246 180 -238 230 180 -213 213 156 -230 230 139 -255 255 123 -238 238 106 -255 205 172 diff --git a/graphics/misc/diploma_map.bin b/graphics/misc/diploma_map.bin deleted file mode 100644 index e9a47fa44..000000000 Binary files a/graphics/misc/diploma_map.bin and /dev/null differ diff --git a/graphics/misc/diploma_national.pal b/graphics/misc/diploma_national.pal deleted file mode 100644 index 03c37bf22..000000000 --- a/graphics/misc/diploma_national.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -24 41 82 -255 255 222 -255 255 189 -230 238 90 -213 222 0 -238 238 222 -222 230 230 -255 222 197 -222 222 189 -246 246 180 -238 230 180 -213 213 156 -230 230 139 -255 255 123 -238 238 106 -255 205 172 diff --git a/graphics/misc/emotion_exclamation.png b/graphics/misc/emotion_exclamation.png deleted file mode 100644 index 595566d2f..000000000 Binary files a/graphics/misc/emotion_exclamation.png and /dev/null differ diff --git a/graphics/misc/emotion_heart.png b/graphics/misc/emotion_heart.png deleted file mode 100644 index 9995984b4..000000000 Binary files a/graphics/misc/emotion_heart.png and /dev/null differ diff --git a/graphics/misc/emotion_question.png b/graphics/misc/emotion_question.png deleted file mode 100644 index 7376fd058..000000000 Binary files a/graphics/misc/emotion_question.png and /dev/null differ diff --git a/graphics/misc/field_move_streaks.png b/graphics/misc/field_move_streaks.png deleted file mode 100644 index 8becc4413..000000000 Binary files a/graphics/misc/field_move_streaks.png and /dev/null differ diff --git a/graphics/misc/field_move_streaks_map.bin b/graphics/misc/field_move_streaks_map.bin deleted file mode 100644 index 466f456be..000000000 Binary files a/graphics/misc/field_move_streaks_map.bin and /dev/null differ diff --git a/graphics/misc/hof_monitor_big.png b/graphics/misc/hof_monitor_big.png deleted file mode 100644 index 510e6a232..000000000 Binary files a/graphics/misc/hof_monitor_big.png and /dev/null differ diff --git a/graphics/misc/hof_monitor_small.png b/graphics/misc/hof_monitor_small.png deleted file mode 100644 index dcff33095..000000000 Binary files a/graphics/misc/hof_monitor_small.png and /dev/null differ diff --git a/graphics/misc/main_menu_bg.pal b/graphics/misc/main_menu_bg.pal deleted file mode 100644 index 7aca54c52..000000000 --- a/graphics/misc/main_menu_bg.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -139 148 255 -255 255 255 -49 57 82 -90 98 115 -8 8 16 -148 156 172 -205 222 238 -180 180 189 -189 205 222 -32 32 49 -123 131 139 -49 82 123 -41 123 197 -57 139 213 -90 164 230 -139 197 246 diff --git a/graphics/misc/main_menu_text.pal b/graphics/misc/main_menu_text.pal deleted file mode 100644 index 25a3ac1d2..000000000 --- a/graphics/misc/main_menu_text.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -255 255 255 -98 98 98 -213 213 205 -230 8 8 -255 189 115 -32 156 8 -148 246 148 -49 82 205 -164 197 246 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/misc/option_menu_equals_sign.png b/graphics/misc/option_menu_equals_sign.png deleted file mode 100644 index 7e56e3cc3..000000000 Binary files a/graphics/misc/option_menu_equals_sign.png and /dev/null differ diff --git a/graphics/misc/option_menu_text.pal b/graphics/misc/option_menu_text.pal deleted file mode 100644 index e7d6c330a..000000000 --- a/graphics/misc/option_menu_text.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -255 180 82 -197 123 0 -255 139 131 -255 49 24 -74 74 74 -213 213 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 diff --git a/graphics/misc/pokeball_glow.png b/graphics/misc/pokeball_glow.png deleted file mode 100644 index 1c1133b76..000000000 Binary files a/graphics/misc/pokeball_glow.png and /dev/null differ diff --git a/graphics/misc/pokecenter_monitor/0.png b/graphics/misc/pokecenter_monitor/0.png deleted file mode 100644 index 474883908..000000000 Binary files a/graphics/misc/pokecenter_monitor/0.png and /dev/null differ diff --git a/graphics/misc/pokecenter_monitor/1.png b/graphics/misc/pokecenter_monitor/1.png deleted file mode 100644 index 1a2606011..000000000 Binary files a/graphics/misc/pokecenter_monitor/1.png and /dev/null differ diff --git a/graphics/misc/rotating_gate_1.png b/graphics/misc/rotating_gate_1.png deleted file mode 100644 index 93680dbfb..000000000 Binary files a/graphics/misc/rotating_gate_1.png and /dev/null differ diff --git a/graphics/misc/rotating_gate_2.png b/graphics/misc/rotating_gate_2.png deleted file mode 100644 index 1d320ed77..000000000 Binary files a/graphics/misc/rotating_gate_2.png and /dev/null differ diff --git a/graphics/misc/rotating_gate_3.png b/graphics/misc/rotating_gate_3.png deleted file mode 100644 index 6e43079d0..000000000 Binary files a/graphics/misc/rotating_gate_3.png and /dev/null differ diff --git a/graphics/misc/rotating_gate_4.png b/graphics/misc/rotating_gate_4.png deleted file mode 100644 index 77c269dc5..000000000 Binary files a/graphics/misc/rotating_gate_4.png and /dev/null differ diff --git a/graphics/misc/rotating_gate_5.png b/graphics/misc/rotating_gate_5.png deleted file mode 100644 index d8a0889b1..000000000 Binary files a/graphics/misc/rotating_gate_5.png and /dev/null differ diff --git a/graphics/misc/rotating_gate_6.png b/graphics/misc/rotating_gate_6.png deleted file mode 100644 index 668feebfb..000000000 Binary files a/graphics/misc/rotating_gate_6.png and /dev/null differ diff --git a/graphics/misc/rotating_gate_7.png b/graphics/misc/rotating_gate_7.png deleted file mode 100644 index d92ae872c..000000000 Binary files a/graphics/misc/rotating_gate_7.png and /dev/null differ diff --git a/graphics/misc/rotating_gate_8.png b/graphics/misc/rotating_gate_8.png deleted file mode 100644 index 5e3a947c5..000000000 Binary files a/graphics/misc/rotating_gate_8.png and /dev/null differ diff --git a/graphics/misc/spotlight.png b/graphics/misc/spotlight.png deleted file mode 100644 index 62e21e411..000000000 Binary files a/graphics/misc/spotlight.png and /dev/null differ diff --git a/graphics/misc/trainer_hill_ereader.pal b/graphics/misc/trainer_hill_ereader.pal deleted file mode 100644 index 4b0812f09..000000000 --- a/graphics/misc/trainer_hill_ereader.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -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 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/rotating_gates/l1.png b/graphics/rotating_gates/l1.png new file mode 100644 index 000000000..93680dbfb Binary files /dev/null and b/graphics/rotating_gates/l1.png differ diff --git a/graphics/rotating_gates/l2.png b/graphics/rotating_gates/l2.png new file mode 100644 index 000000000..1d320ed77 Binary files /dev/null and b/graphics/rotating_gates/l2.png differ diff --git a/graphics/rotating_gates/l3.png b/graphics/rotating_gates/l3.png new file mode 100644 index 000000000..6e43079d0 Binary files /dev/null and b/graphics/rotating_gates/l3.png differ diff --git a/graphics/rotating_gates/l4.png b/graphics/rotating_gates/l4.png new file mode 100644 index 000000000..77c269dc5 Binary files /dev/null and b/graphics/rotating_gates/l4.png differ diff --git a/graphics/rotating_gates/t1.png b/graphics/rotating_gates/t1.png new file mode 100644 index 000000000..d8a0889b1 Binary files /dev/null and b/graphics/rotating_gates/t1.png differ diff --git a/graphics/rotating_gates/t2.png b/graphics/rotating_gates/t2.png new file mode 100644 index 000000000..668feebfb Binary files /dev/null and b/graphics/rotating_gates/t2.png differ diff --git a/graphics/rotating_gates/t3.png b/graphics/rotating_gates/t3.png new file mode 100644 index 000000000..d92ae872c Binary files /dev/null and b/graphics/rotating_gates/t3.png differ diff --git a/graphics/rotating_gates/t4.png b/graphics/rotating_gates/t4.png new file mode 100644 index 000000000..5e3a947c5 Binary files /dev/null and b/graphics/rotating_gates/t4.png differ diff --git a/graphics/trainer_hill/ereader.pal b/graphics/trainer_hill/ereader.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/trainer_hill/ereader.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +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 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/intro_birch_beauty.png b/graphics/unused/intro_birch_beauty.png deleted file mode 100644 index f13221cf5..000000000 Binary files a/graphics/unused/intro_birch_beauty.png and /dev/null differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index cb12b9c18..9e5c19193 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -502,7 +502,7 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu. $(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp @cat $^ >$@ -$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png +graphics/birch_speech/unused_beauty.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 822 diff --git a/src/decoration.c b/src/decoration.c index 118b4918e..c5a05f7cc 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -440,7 +440,7 @@ static const struct YesNoFuncTable sStopPuttingAwayDecorationsYesNoFunctions = .noFunc = ContinuePuttingAwayDecorations, }; -static const u8 sDecorationPuttingAwayCursor[] = INCBIN_U8("graphics/misc/decoration_putting_away_cursor.4bpp"); +static const u8 sDecorationPuttingAwayCursor[] = INCBIN_U8("graphics/decorations/put_away_cursor.4bpp"); static const struct SpritePalette sSpritePal_PuttingAwayCursorBrendan = { diff --git a/src/diploma.c b/src/diploma.c index 76b4ae65c..ce31578dc 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -40,12 +40,12 @@ static void VBlankCB(void) static const u16 sDiplomaPalettes[][16] = { - INCBIN_U16("graphics/misc/diploma_national.gbapal"), - INCBIN_U16("graphics/misc/diploma_hoenn.gbapal"), + INCBIN_U16("graphics/diploma/national.gbapal"), + INCBIN_U16("graphics/diploma/hoenn.gbapal"), }; -static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/misc/diploma_map.bin.lz"); -static const u32 sDiplomaTiles[] = INCBIN_U32("graphics/misc/diploma.4bpp.lz"); +static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/diploma/tilemap.bin.lz"); +static const u32 sDiplomaTiles[] = INCBIN_U32("graphics/diploma/tiles.4bpp.lz"); void CB2_ShowDiploma(void) { diff --git a/src/field_effect.c b/src/field_effect.c index 3f0ba2455..446d3cc27 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -243,32 +243,33 @@ extern u8 *gFieldEffectScriptPointers[]; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; static const u32 sNewGameBirch_Gfx[] = INCBIN_U32("graphics/birch_speech/birch.4bpp"); -static const u32 sUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp"); +static const u32 sUnusedBirchBeauty[] = INCBIN_U32("graphics/birch_speech/unused_beauty.4bpp"); static const u16 sNewGameBirch_Pal[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal"); -static const u32 sPokeballGlow_Gfx[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp"); + +static const u32 sPokeballGlow_Gfx[] = INCBIN_U32("graphics/field_effects/pics/pokeball_glow.4bpp"); static const u16 sPokeballGlow_Pal[16] = INCBIN_U16("graphics/field_effects/palettes/pokeball_glow.gbapal"); -static const u32 sPokecenterMonitor0_Gfx[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp"); -static const u32 sPokecenterMonitor1_Gfx[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp"); -static const u32 sHofMonitorBig_Gfx[] = INCBIN_U32("graphics/misc/hof_monitor_big.4bpp"); -static const u8 sHofMonitorSmall_Gfx[] = INCBIN_U8("graphics/misc/hof_monitor_small.4bpp"); +static const u32 sPokecenterMonitor0_Gfx[] = INCBIN_U32("graphics/field_effects/pics/pokecenter_monitor/0.4bpp"); +static const u32 sPokecenterMonitor1_Gfx[] = INCBIN_U32("graphics/field_effects/pics/pokecenter_monitor/1.4bpp"); +static const u32 sHofMonitorBig_Gfx[] = INCBIN_U32("graphics/field_effects/pics/hof_monitor_big.4bpp"); +static const u8 sHofMonitorSmall_Gfx[] = INCBIN_U8("graphics/field_effects/pics/hof_monitor_small.4bpp"); static const u16 sHofMonitor_Pal[16] = INCBIN_U16("graphics/field_effects/palettes/hof_monitor.gbapal"); // Graphics for the lights streaking past your Pokemon when it uses a field move. -static const u32 sFieldMoveStreaksOutdoors_Gfx[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp"); -static const u16 sFieldMoveStreaksOutdoors_Pal[16] = INCBIN_U16("graphics/misc/field_move_streaks.gbapal"); -static const u16 sFieldMoveStreaksOutdoors_Tilemap[320] = INCBIN_U16("graphics/misc/field_move_streaks_map.bin"); +static const u32 sFieldMoveStreaksOutdoors_Gfx[] = INCBIN_U32("graphics/field_effects/pics/field_move_streaks.4bpp"); +static const u16 sFieldMoveStreaksOutdoors_Pal[16] = INCBIN_U16("graphics/field_effects/pics/field_move_streaks.gbapal"); +static const u16 sFieldMoveStreaksOutdoors_Tilemap[320] = INCBIN_U16("graphics/field_effects/pics/field_move_streaks.bin"); // The following light streaks effect is used when the map is indoors -static const u32 sFieldMoveStreaksIndoors_Gfx[] = INCBIN_U32("graphics/misc/darkness_field_move_streaks.4bpp"); -static const u16 sFieldMoveStreaksIndoors_Pal[16] = INCBIN_U16("graphics/misc/darkness_field_move_streaks.gbapal"); -static const u16 sFieldMoveStreaksIndoors_Tilemap[320] = INCBIN_U16("graphics/misc/darkness_field_move_streaks_map.bin"); - -static const u16 sSpotlight_Pal[16] = INCBIN_U16("graphics/misc/spotlight.gbapal"); -static const u8 sSpotlight_Gfx[] = INCBIN_U8("graphics/misc/spotlight.4bpp"); -static const u8 sRockFragment_TopLeft[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_top_left.4bpp"); -static const u8 sRockFragment_TopRight[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_top_right.4bpp"); -static const u8 sRockFragment_BottomLeft[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_bottom_left.4bpp"); -static const u8 sRockFragment_BottomRight[] = INCBIN_U8("graphics/misc/deoxys_rock_fragment_bottom_right.4bpp"); +static const u32 sFieldMoveStreaksIndoors_Gfx[] = INCBIN_U32("graphics/field_effects/pics/field_move_streaks_indoors.4bpp"); +static const u16 sFieldMoveStreaksIndoors_Pal[16] = INCBIN_U16("graphics/field_effects/pics/field_move_streaks_indoors.gbapal"); +static const u16 sFieldMoveStreaksIndoors_Tilemap[320] = INCBIN_U16("graphics/field_effects/pics/field_move_streaks_indoors.bin"); + +static const u16 sSpotlight_Pal[16] = INCBIN_U16("graphics/field_effects/pics/spotlight.gbapal"); +static const u8 sSpotlight_Gfx[] = INCBIN_U8("graphics/field_effects/pics/spotlight.4bpp"); +static const u8 sRockFragment_TopLeft[] = INCBIN_U8("graphics/field_effects/pics/deoxys_rock_fragment_top_left.4bpp"); +static const u8 sRockFragment_TopRight[] = INCBIN_U8("graphics/field_effects/pics/deoxys_rock_fragment_top_right.4bpp"); +static const u8 sRockFragment_BottomLeft[] = INCBIN_U8("graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.4bpp"); +static const u8 sRockFragment_BottomRight[] = INCBIN_U8("graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.4bpp"); bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = { diff --git a/src/field_specials.c b/src/field_specials.c index 0a7236913..45585bcd3 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3194,17 +3194,17 @@ void DoDeoxysRockInteraction(void) } static const u16 sDeoxysRockPalettes[][16] = { - INCBIN_U16("graphics/misc/deoxys1.gbapal"), - INCBIN_U16("graphics/misc/deoxys2.gbapal"), - INCBIN_U16("graphics/misc/deoxys3.gbapal"), - INCBIN_U16("graphics/misc/deoxys4.gbapal"), - INCBIN_U16("graphics/misc/deoxys5.gbapal"), - INCBIN_U16("graphics/misc/deoxys6.gbapal"), - INCBIN_U16("graphics/misc/deoxys7.gbapal"), - INCBIN_U16("graphics/misc/deoxys8.gbapal"), - INCBIN_U16("graphics/misc/deoxys9.gbapal"), - INCBIN_U16("graphics/misc/deoxys10.gbapal"), - INCBIN_U16("graphics/misc/deoxys11.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_1.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_2.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_3.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_4.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_5.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_6.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_7.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_8.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_9.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_10.gbapal"), + INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_11.gbapal"), }; static const u8 sDeoxysRockCoords[][2] = { diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 9c166d008..a303b8423 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -61,13 +61,13 @@ static const struct FlashStruct sTransitionTypes[] = {}, }; -static const u16 sCaveTransitionPalette_White[] = INCBIN_U16("graphics/misc/cave_transition_white.gbapal"); -static const u16 sCaveTransitionPalette_Black[] = INCBIN_U16("graphics/misc/cave_transition_black.gbapal"); +static const u16 sCaveTransitionPalette_White[] = INCBIN_U16("graphics/cave_transition/white.gbapal"); +static const u16 sCaveTransitionPalette_Black[] = INCBIN_U16("graphics/cave_transition/black.gbapal"); -static const u16 sCaveTransitionPalette_Enter[] = INCBIN_U16("graphics/misc/cave_transition_enter.gbapal"); -static const u16 sCaveTransitionPalette_Exit[] = INCBIN_U16("graphics/misc/cave_transition_exit.gbapal"); -static const u32 sCaveTransitionTilemap[] = INCBIN_U32("graphics/misc/cave_transition_map.bin.lz"); -static const u32 sCaveTransitionTiles[] = INCBIN_U32("graphics/misc/cave_transition.4bpp.lz"); +static const u16 sCaveTransitionPalette_Enter[] = INCBIN_U16("graphics/cave_transition/enter.gbapal"); +static const u16 sCaveTransitionPalette_Exit[] = INCBIN_U16("graphics/cave_transition/exit.gbapal"); +static const u32 sCaveTransitionTilemap[] = INCBIN_U32("graphics/cave_transition/tilemap.bin.lz"); +static const u32 sCaveTransitionTiles[] = INCBIN_U32("graphics/cave_transition/tiles.4bpp.lz"); bool8 SetUpFieldMove_Flash(void) { diff --git a/src/main_menu.c b/src/main_menu.c index e7802b1e7..54a4f6891 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -403,8 +403,8 @@ static const struct WindowTemplate gNewGameBirchSpeechTextWindows[] = DUMMY_WIN_TEMPLATE }; -static const u16 sMainMenuBgPal[] = INCBIN_U16("graphics/misc/main_menu_bg.gbapal"); -static const u16 sMainMenuTextPal[] = INCBIN_U16("graphics/misc/main_menu_text.gbapal"); +static const u16 sMainMenuBgPal[] = INCBIN_U16("graphics/interface/main_menu_bg.gbapal"); +static const u16 sMainMenuTextPal[] = INCBIN_U16("graphics/interface/main_menu_text.gbapal"); static const u8 sTextColor_Headers[] = {TEXT_DYNAMIC_COLOR_1, TEXT_DYNAMIC_COLOR_2, TEXT_DYNAMIC_COLOR_3}; static const u8 sTextColor_MenuInfo[] = {TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_3}; diff --git a/src/option_menu.c b/src/option_menu.c index e66bddd7f..2991913d7 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -79,9 +79,9 @@ static void DrawBgWindowFrames(void); EWRAM_DATA static bool8 sArrowPressed = FALSE; -static const u16 sOptionMenuText_Pal[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal"); +static const u16 sOptionMenuText_Pal[] = INCBIN_U16("graphics/interface/option_menu_text.gbapal"); // note: this is only used in the Japanese release -static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp"); +static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/interface/option_menu_equals_sign.4bpp"); static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] = { diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 23fbb3e1d..78ffcabc9 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -219,14 +219,14 @@ static const struct RotatingGatePuzzle sRotatingGate_TrickHousePuzzleConfig[] = {10, 19, GATE_SHAPE_L3, GATE_ORIENTATION_180}, }; -static const u8 sRotatingGateTiles_1[] = INCBIN_U8("graphics/misc/rotating_gate_1.4bpp"); -static const u8 sRotatingGateTiles_2[] = INCBIN_U8("graphics/misc/rotating_gate_2.4bpp"); -static const u8 sRotatingGateTiles_3[] = INCBIN_U8("graphics/misc/rotating_gate_3.4bpp"); -static const u8 sRotatingGateTiles_4[] = INCBIN_U8("graphics/misc/rotating_gate_4.4bpp"); -static const u8 sRotatingGateTiles_5[] = INCBIN_U8("graphics/misc/rotating_gate_5.4bpp"); -static const u8 sRotatingGateTiles_6[] = INCBIN_U8("graphics/misc/rotating_gate_6.4bpp"); -static const u8 sRotatingGateTiles_7[] = INCBIN_U8("graphics/misc/rotating_gate_7.4bpp"); -static const u8 sRotatingGateTiles_8[] = INCBIN_U8("graphics/misc/rotating_gate_8.4bpp"); +static const u8 sRotatingGateTiles_1[] = INCBIN_U8("graphics/rotating_gates/l1.4bpp"); +static const u8 sRotatingGateTiles_2[] = INCBIN_U8("graphics/rotating_gates/l2.4bpp"); +static const u8 sRotatingGateTiles_3[] = INCBIN_U8("graphics/rotating_gates/l3.4bpp"); +static const u8 sRotatingGateTiles_4[] = INCBIN_U8("graphics/rotating_gates/l4.4bpp"); +static const u8 sRotatingGateTiles_5[] = INCBIN_U8("graphics/rotating_gates/t1.4bpp"); +static const u8 sRotatingGateTiles_6[] = INCBIN_U8("graphics/rotating_gates/t2.4bpp"); +static const u8 sRotatingGateTiles_7[] = INCBIN_U8("graphics/rotating_gates/t3.4bpp"); +static const u8 sRotatingGateTiles_8[] = INCBIN_U8("graphics/rotating_gates/t4.4bpp"); static const struct OamData sOamData_RotatingGateLarge = { diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 3ada262e5..8d5be0116 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -199,7 +199,7 @@ static const u16 *const *const sPrizeListSets[] = sPrizeLists2 }; -static const u16 sEReader_Pal[] = INCBIN_U16("graphics/misc/trainer_hill_ereader.gbapal"); +static const u16 sEReader_Pal[] = INCBIN_U16("graphics/trainer_hill/ereader.gbapal"); static const u8 sRecordWinColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY}; static const struct TrHillTag *const sDataPerTag[] = diff --git a/src/trainer_see.c b/src/trainer_see.c index ce06c5e9c..07021a316 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -59,9 +59,9 @@ bool8 gTrainerApproachedPlayer; EWRAM_DATA u8 gApproachingTrainerId = 0; // const rom data -static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion_exclamation.4bpp"); -static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp"); -static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp"); +static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_exclamation.4bpp"); +static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_question.4bpp"); +static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/field_effects/pics/emotion_heart.4bpp"); static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) = { -- cgit v1.2.3 From bd43b905b7ce5489224d3a2144504df6f7687f1f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 14 Jan 2022 12:39:00 -0500 Subject: Apply palettes to some field effect pngs --- .../pics/deoxys_rock_fragment_bottom_left.png | Bin 100 -> 155 bytes .../pics/deoxys_rock_fragment_bottom_right.png | Bin 91 -> 146 bytes .../pics/deoxys_rock_fragment_top_left.png | Bin 99 -> 157 bytes .../pics/deoxys_rock_fragment_top_right.png | Bin 102 -> 157 bytes graphics/field_effects/pics/emotion_exclamation.png | Bin 108 -> 166 bytes graphics/field_effects/pics/emotion_heart.png | Bin 126 -> 183 bytes graphics/field_effects/pics/emotion_question.png | Bin 117 -> 175 bytes graphics/field_effects/pics/hof_monitor_big.png | Bin 184 -> 189 bytes graphics/field_effects/pics/hof_monitor_small.png | Bin 177 -> 236 bytes graphics/field_effects/pics/pokeball_glow.png | Bin 100 -> 155 bytes src/field_effect.c | 4 ++-- 11 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png index 3f5b8d5c3..bc4f27a40 100644 Binary files a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png and b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png differ diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png index 7684451e4..48cd43d97 100644 Binary files a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png and b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png differ diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png index d601cb6e5..f0eb9c0cb 100644 Binary files a/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png and b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png differ diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png index 01f10cd07..1fac486c9 100644 Binary files a/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png and b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png differ diff --git a/graphics/field_effects/pics/emotion_exclamation.png b/graphics/field_effects/pics/emotion_exclamation.png index 595566d2f..798b83092 100644 Binary files a/graphics/field_effects/pics/emotion_exclamation.png and b/graphics/field_effects/pics/emotion_exclamation.png differ diff --git a/graphics/field_effects/pics/emotion_heart.png b/graphics/field_effects/pics/emotion_heart.png index 9995984b4..783a1e3bd 100644 Binary files a/graphics/field_effects/pics/emotion_heart.png and b/graphics/field_effects/pics/emotion_heart.png differ diff --git a/graphics/field_effects/pics/emotion_question.png b/graphics/field_effects/pics/emotion_question.png index 7376fd058..4907f14b7 100644 Binary files a/graphics/field_effects/pics/emotion_question.png and b/graphics/field_effects/pics/emotion_question.png differ diff --git a/graphics/field_effects/pics/hof_monitor_big.png b/graphics/field_effects/pics/hof_monitor_big.png index 510e6a232..c70046ad7 100644 Binary files a/graphics/field_effects/pics/hof_monitor_big.png and b/graphics/field_effects/pics/hof_monitor_big.png differ diff --git a/graphics/field_effects/pics/hof_monitor_small.png b/graphics/field_effects/pics/hof_monitor_small.png index dcff33095..368bbfce4 100644 Binary files a/graphics/field_effects/pics/hof_monitor_small.png and b/graphics/field_effects/pics/hof_monitor_small.png differ diff --git a/graphics/field_effects/pics/pokeball_glow.png b/graphics/field_effects/pics/pokeball_glow.png index 1c1133b76..6e074afc3 100644 Binary files a/graphics/field_effects/pics/pokeball_glow.png and b/graphics/field_effects/pics/pokeball_glow.png differ diff --git a/src/field_effect.c b/src/field_effect.c index 446d3cc27..f57ce8cdd 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2620,7 +2620,7 @@ static void FieldMoveShowMonOutdoorsEffect_LoadGfx(struct Task *task) u16 delta = ((REG_BG0CNT >> 8) << 11); CpuCopy16(sFieldMoveStreaksOutdoors_Gfx, (void *)(VRAM + offset), 0x200); CpuFill32(0, (void *)(VRAM + delta), 0x800); - LoadPalette(sFieldMoveStreaksOutdoors_Pal, 0xf0, 0x20); + LoadPalette(sFieldMoveStreaksOutdoors_Pal, 0xf0, sizeof(sFieldMoveStreaksOutdoors_Pal)); LoadFieldMoveOutdoorStreaksTilemap(delta); task->tState++; } @@ -2783,7 +2783,7 @@ static void FieldMoveShowMonIndoorsEffect_LoadGfx(struct Task *task) task->data[12] = delta; CpuCopy16(sFieldMoveStreaksIndoors_Gfx, (void *)(VRAM + offset), 0x80); CpuFill32(0, (void *)(VRAM + delta), 0x800); - LoadPalette(sFieldMoveStreaksIndoors_Pal, 0xf0, 0x20); + LoadPalette(sFieldMoveStreaksIndoors_Pal, 0xf0, sizeof(sFieldMoveStreaksIndoors_Pal)); task->tState++; } -- cgit v1.2.3