diff --git a/engine/pack.asm b/engine/pack.asm index e765bab7e..fb19d385c 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1688,4 +1688,4 @@ PackMenuGFX: INCBIN "gfx/misc/pack_menu.2bpp" PackGFX: -INCBIN "gfx/misc/pack.w40.2bpp" +INCBIN "gfx/misc/pack.2bpp" diff --git a/gfx/misc/badges.png b/gfx/misc/badges.png new file mode 100644 index 000000000..4e5820da8 Binary files /dev/null and b/gfx/misc/badges.png differ diff --git a/gfx/misc/badges.w16.2bpp b/gfx/misc/badges.w16.2bpp deleted file mode 100644 index 52cf24e1b..000000000 Binary files a/gfx/misc/badges.w16.2bpp and /dev/null differ diff --git a/gfx/misc/font.png b/gfx/misc/font.png new file mode 100644 index 000000000..7119c0691 Binary files /dev/null and b/gfx/misc/font.png differ diff --git a/gfx/misc/font.w128.1bpp b/gfx/misc/font.w128.1bpp deleted file mode 100644 index ff8d2d4fe..000000000 Binary files a/gfx/misc/font.w128.1bpp and /dev/null differ diff --git a/gfx/misc/font_battle_extra.2bpp b/gfx/misc/font_battle_extra.2bpp deleted file mode 100644 index 77c2f3576..000000000 Binary files a/gfx/misc/font_battle_extra.2bpp and /dev/null differ diff --git a/gfx/misc/font_battle_extra.png b/gfx/misc/font_battle_extra.png new file mode 100644 index 000000000..15e25a40c Binary files /dev/null and b/gfx/misc/font_battle_extra.png differ diff --git a/gfx/misc/font_extra.2bpp b/gfx/misc/font_extra.2bpp deleted file mode 100644 index 50d66916f..000000000 Binary files a/gfx/misc/font_extra.2bpp and /dev/null differ diff --git a/gfx/misc/font_extra.png b/gfx/misc/font_extra.png new file mode 100644 index 000000000..7ca840c3a Binary files /dev/null and b/gfx/misc/font_extra.png differ diff --git a/gfx/misc/font_inversed.png b/gfx/misc/font_inversed.png new file mode 100644 index 000000000..519339f39 Binary files /dev/null and b/gfx/misc/font_inversed.png differ diff --git a/gfx/misc/font_inversed.w128.1bpp b/gfx/misc/font_inversed.w128.1bpp deleted file mode 100644 index 39a7e73d6..000000000 --- a/gfx/misc/font_inversed.w128.1bpp +++ /dev/null @@ -1 +0,0 @@ -׻}}{{}}ý{}}}{ýa}}}}}}}www{woO7{}}9Um}}}}=]muy}ǻ}}}}}ǻ}}u}}w{}{}}}}}}}}}}mU99}9׻9}߿ûýmmmmýÿ}mmU;׹߁׻}}ǻ}}}}}}ûý=}7w?i?l?a?A?]ouu'Www1ϗͥ3?ýǫmǻߏߏ׻߿ǻdz9999Ó39?99999999 \ No newline at end of file diff --git a/gfx/misc/footprints.png b/gfx/misc/footprints.png new file mode 100644 index 000000000..b1e350436 Binary files /dev/null and b/gfx/misc/footprints.png differ diff --git a/gfx/misc/footprints.w128.1bpp b/gfx/misc/footprints.w128.1bpp deleted file mode 100644 index 005bfee0f..000000000 --- a/gfx/misc/footprints.w128.1bpp +++ /dev/null @@ -1 +0,0 @@ -/w'7'o/7'7'_o/????????'#???????????????w7##?o'ogGG????????????_??oO????????oG??χOO?????ϟ???????????????????????????_'7'ތccCÇ???????????/'?ߟ??????????LJ?/o??????OG????ߏ????sCϟ?=q????_O?OG????g???oO??ߏߏ?ߟ???Ϗ?????????????;37???ߟ????????????OOOOϏ??Ϗ????ߏoO733cgG????????LJ??{913#o''''g/''χ????????OO????????'?_??_???????????????????ϟsc?O????????????????????????????????????·??s??????????????????????????7''_O?_wgoO?????????????????_OG????????O?????????c7?O? ??????????? ???????Ç??O?G???g''o????Ǐ????ߟ_?'????????OGoggOO?7# 7# 7#+7##7##?O???????? \ No newline at end of file diff --git a/gfx/misc/pack.png b/gfx/misc/pack.png new file mode 100644 index 000000000..b85fc0990 Binary files /dev/null and b/gfx/misc/pack.png differ diff --git a/gfx/misc/pack.w40.2bpp b/gfx/misc/pack.w40.2bpp deleted file mode 100644 index 22be55081..000000000 Binary files a/gfx/misc/pack.w40.2bpp and /dev/null differ diff --git a/gfx/misc/pack_f.png b/gfx/misc/pack_f.png new file mode 100644 index 000000000..fbe120bd1 Binary files /dev/null and b/gfx/misc/pack_f.png differ diff --git a/gfx/misc/pack_f.w40.2bpp b/gfx/misc/pack_f.w40.2bpp deleted file mode 100644 index 60d6b7f91..000000000 Binary files a/gfx/misc/pack_f.w40.2bpp and /dev/null differ diff --git a/main.asm b/main.asm index 7a8862f27..8e98c2c4e 100644 --- a/main.asm +++ b/main.asm @@ -27686,8 +27686,8 @@ CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp" LeaderGFX: INCBIN "gfx/misc/leaders.w24.2bpp" LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp" -BadgeGFX: INCBIN "gfx/misc/badges.w16.2bpp" -BadgeGFX2: INCBIN "gfx/misc/badges.w16.2bpp" +BadgeGFX: INCBIN "gfx/misc/badges.2bpp" +BadgeGFX2: INCBIN "gfx/misc/badges.2bpp" CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp" @@ -40845,7 +40845,7 @@ PackFGFXPointers: ; 48e93 ; 48e9b PackFGFX: ; 48e9b -INCBIN "gfx/misc/pack_f.w40.2bpp" +INCBIN "gfx/misc/pack_f.2bpp" ; 4925b Function4925b: ; 4925b @@ -79966,7 +79966,7 @@ INCLUDE "gfx/pics/kanto_frames.asm" SECTION "bank36", ROMX, BANK[$36] -FontInversed: INCBIN "gfx/misc/font_inversed.w128.1bpp" +FontInversed: INCBIN "gfx/misc/font_inversed.1bpp" SECTION "Pic Animations 3", ROMX, BANK[$36] @@ -88988,7 +88988,7 @@ FontExtra: INCBIN "gfx/misc/font_extra.2bpp" Font: -INCBIN "gfx/misc/font.w128.1bpp" +INCBIN "gfx/misc/font.1bpp" FontBattleExtra: INCBIN "gfx/misc/font_battle_extra.2bpp" @@ -89063,7 +89063,7 @@ INCBIN "gfx/unknown/0f9424.2bpp" ; f9434 Footprints: ; f9434 -INCBIN "gfx/misc/footprints.w128.1bpp" +INCBIN "gfx/misc/footprints.1bpp" ; fb434 Unknown_fb434: