diff --git a/asm/item_menu.s b/asm/item_menu.s index 49f587939..9aedd3f5b 100755 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -637,7 +637,7 @@ _081AB0E8: .4byte _081AB1A8 _081AB0FC: bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08D9A620 + ldr r1, =gBagScreen_Gfx movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -670,14 +670,14 @@ _081AB13C: ldrb r0, [r0, 0x8] cmp r0, 0 beq _081AB164 - ldr r0, =gUnknown_08D9A5D4 + ldr r0, =gBagScreenFemale_Pal movs r1, 0 movs r2, 0x40 bl LoadCompressedPalette b _081AB1AE .pool _081AB164: - ldr r0, =gUnknown_08D9A588 + ldr r0, =gBagScreenMale_Pal movs r1, 0 movs r2, 0x40 bl LoadCompressedPalette diff --git a/asm/party_menu.s b/asm/party_menu.s index 4a70ab1da..a336b5d63 100755 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -487,7 +487,7 @@ _081B05F0: .4byte _081B0694 _081B0610: ldr r4, =gUnknown_0203CEE0 - ldr r0, =gUnknown_08D967EC + ldr r0, =gPartyMenuMisc_Gfx mov r1, sp bl malloc_and_decompress adds r1, r0, 0 @@ -505,14 +505,14 @@ _081B0638: lsls r0, 24 cmp r0, 0 bne _081B06B4 - ldr r0, =gUnknown_08D96BA0 + ldr r0, =gPartyMenuMisc_Tilemap ldr r1, =gUnknown_0203CEE4 ldr r1, [r1] bl LZDecompressWram b _081B069A .pool _081B0658: - ldr r0, =gUnknown_08D96AB4 + ldr r0, =gPartyMenuMisc_Pal movs r2, 0xB0 lsls r2, 1 movs r1, 0 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 5ae458d6d..51f322e1e 100755 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -2411,7 +2411,7 @@ _081C5264: .4byte _081C52D4 _081C5278: bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08D9A620 + ldr r1, =gBagScreen_Gfx movs r0, 0 str r0, [sp] movs r0, 0x2 diff --git a/data/graphics.s b/data/graphics.s index 732768158..f7ce42517 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3390,77 +3390,129 @@ gBattleAnimBackgroundImage_Surf:: @ 8D94AB8 gBattleAnimBackgroundPalette_Surf:: @ 8D95DD8 .incbin "graphics/battle_anims/backgrounds/water.gbapal.lz" + .align 2 gUnknown_08D95E00:: @ 8D95E00 - .incbin "baserom.gba", 0xd95e00, 0x2d0 + .incbin "graphics/unknown/unknown_D95E00.bin.lz" + .align 2 gUnknown_08D960D0:: @ 8D960D0 - .incbin "baserom.gba", 0xd960d0, 0x2d4 + .incbin "graphics/unknown/unknown_D960D0.bin.lz" + .align 2 gUnknown_08D963A4:: @ 8D963A4 - .incbin "baserom.gba", 0xd963a4, 0x448 + .incbin "graphics/unknown/unknown_D963A4.bin.lz" -gUnknown_08D967EC:: @ 8D967EC - .incbin "baserom.gba", 0xd967ec, 0x2c8 + .align 2 +gBattleAnimSpritePalette_286:: @ 8E71200 + .incbin "graphics/battle_anims/sprites/286.gbapal.lz" -gUnknown_08D96AB4:: @ 8D96AB4 - .incbin "baserom.gba", 0xd96ab4, 0xec + .align 2 +gBattleAnimSpriteSheet_188:: @ 8E71228 + .incbin "graphics/battle_anims/sprites/188.4bpp.lz" -gUnknown_08D96BA0:: @ 8D96BA0 - .incbin "baserom.gba", 0xd96ba0, 0x138 + .align 2 +gBattleAnimSpritePalette_188:: @ 8E7133C + .incbin "graphics/battle_anims/sprites/188.gbapal.lz" -gUnknown_08D96CD8:: @ 8D96CD8 - .incbin "baserom.gba", 0xd96cd8, 0x294 + .align 2 +gPartyMenuMisc_Gfx:: @ 8D967EC + .incbin "graphics/interface/party_menu_misc.4bpp.lz" -gUnknown_08D96F6C:: @ 8D96F6C - .incbin "baserom.gba", 0xd96f6c, 0x24 + .align 2 +gPartyMenuMisc_Pal:: @ 8D96AB4 + .incbin "graphics/interface/party_menu_misc.gbapal.lz" -gUnknown_08D96F90:: @ 8D96F90 - .incbin "baserom.gba", 0xd96f90, 0x1F8 + .align 2 +gPartyMenuMisc_Tilemap:: @ 8D96BA0 + .incbin "graphics/interface/party_menu_misc.bin.lz" -gUnknown_08D97188:: @ 8D97188 - .incbin "baserom.gba", 0xd97188, 0x28 + .align 2 +gPartyMenuPokeball_Gfx:: @ 8D96CD8 + .incbin "graphics/interface/party_menu_pokeball.4bpp.lz" -gUnknown_08D971B0:: @ 8D971B0 - .incbin "baserom.gba", 0xd971b0, 0x9D4 + .align 2 +gPartyMenuPokeballSmall_Gfx:: @ 8D96E58 + .incbin "graphics/interface/party_menu_pokeball_small.4bpp.lz" @ unused -gUnknown_08D97B84:: @ 8D97B84 - .incbin "baserom.gba", 0xd97b84, 0x68 + .align 2 +gPartyMenuPokeball_Pal:: @ 8D96F6C + .incbin "graphics/interface/party_menu_pokeball.gbapal.lz" + .align 2 +gStatusGfx_Icons:: @ 8D96F90 + .incbin "graphics/interface/status_icons.4bpp.lz" + + .align 2 +gStatusPal_Icons:: @ 8D97188 + .incbin "graphics/interface/status_icons.gbapal.lz" + + .align 2 +gMoveTypes_Gfx:: @ 8D971B0 + .incbin "graphics/types/move_types.4bpp.lz" + + .align 2 +gMoveTypes_Pal:: @ 8D97B84 + .incbin "graphics/types/move_types.gbapal.lz" + + .align 2 gUnknown_08D97BEC:: @ 8D97BEC - .incbin "baserom.gba", 0xd97bec, 0x108 + .incbin "graphics/interface/summary_frames.4bpp.lz" + .align 2 gUnknown_08D97CF4:: @ 8D97CF4 - .incbin "baserom.gba", 0xd97cf4, 0x18 + .incbin "graphics/interface/summary_frames.gbapal.lz" + .align 2 gUnknown_08D97D0C:: @ 8D97D0C - .incbin "baserom.gba", 0xd97d0c, 0x830 + .incbin "graphics/interface/status_screen.4bpp.lz" + .align 2 gUnknown_08D9853C:: @ 8D9853C - .incbin "baserom.gba", 0xd9853c, 0xf0 + .incbin "graphics/interface/status_screen.gbapal.lz" + .align 2 gUnknown_08D9862C:: @ 8D9862C - .incbin "baserom.gba", 0xd9862c, 0x1d0 + .incbin "graphics/interface/status_screen.bin.lz" + .align 2 gUnknown_08D987FC:: @ 8D987FC - .incbin "baserom.gba", 0xd987fc, 0x190 + .incbin "graphics/interface/status_tilemap1.bin.lz" + .align 2 gUnknown_08D9898C:: @ 8D9898C - .incbin "baserom.gba", 0xd9898c, 0x19c + .incbin "graphics/interface/status_tilemap2.bin.lz" + .align 2 gUnknown_08D98B28:: @ 8D98B28 - .incbin "baserom.gba", 0xd98b28, 0x1a0 + .incbin "graphics/interface/status_tilemap3.bin.lz" + .align 2 gUnknown_08D98CC8:: @ 8D98CC8 - .incbin "baserom.gba", 0xd98cc8, 0x18c0 + .incbin "graphics/interface/status_tilemap0.bin.lz" -gUnknown_08D9A588:: @ 8D9A588 - .incbin "baserom.gba", 0xd9a588, 0x4c + .align 2 +gBagMaleTiles:: @ 8E75024 + .incbin "graphics/misc/bag_male.4bpp.lz" -gUnknown_08D9A5D4:: @ 8D9A5D4 - .incbin "baserom.gba", 0xd9a5d4, 0x4c + .align 2 +gBagFemaleTiles:: @ 8E75BA0 + .incbin "graphics/misc/bag_female.4bpp.lz" -gUnknown_08D9A620:: @ 8D9A620 - .incbin "baserom.gba", 0xd9a620, 0x26c + .align 2 +gBagPalette:: @ 8E76700 + .incbin "graphics/misc/bag.gbapal.lz" + + .align 2 +gBagScreenMale_Pal:: @ 8D9A588 + .incbin "graphics/interface/bag_screen_male.gbapal.lz" + + .align 2 +gBagScreenFemale_Pal:: @ 8D9A5D4 + .incbin "graphics/interface/bag_screen_female.gbapal.lz" + + .align 2 +gBagScreen_Gfx:: @ 8D9A620 + .incbin "graphics/interface/bag_screen.4bpp.lz" gUnknown_08D9A88C:: @ 8D9A88C .incbin "baserom.gba", 0xd9a88c, 0x544 diff --git a/data/party_menu.s b/data/party_menu.s index 95d9bb78e..8013e5614 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -246,10 +246,10 @@ gUnknown_08615EC0:: @ 8615EC0 .incbin "baserom.gba", 0x615ec0, 0x38 gUnknown_08615EF8:: @ 8615EF8 - obj_tiles gUnknown_08D96CD8, 0x400, 1200 + obj_tiles gPartyMenuPokeball_Gfx, 0x400, 1200 gUnknown_08615F00:: @ 8615F00 - obj_pal gUnknown_08D96F6C, 1200 + obj_pal gPartyMenuPokeball_Pal, 1200 gUnknown_08615F08:: @ 8615F08 .incbin "baserom.gba", 0x615f08, 0x68 @@ -261,10 +261,10 @@ gUnknown_08615F78:: @ 8615F78 .incbin "baserom.gba", 0x615f78, 0x80 gUnknown_08615FF8:: @ 8615FF8 - obj_tiles gUnknown_08D96F90, 0x400, 1202 + obj_tiles gStatusGfx_Icons, 0x400, 1202 gUnknown_08616000:: @ 8616000 - obj_pal gUnknown_08D97188, 1202 + obj_pal gStatusPal_Icons, 1202 gUnknown_08616008:: @ 8616008 .incbin "baserom.gba", 0x616008, 0x18 diff --git a/graphics/interface/bag_screen.png b/graphics/interface/bag_screen.png new file mode 100755 index 000000000..e634cdb27 Binary files /dev/null and b/graphics/interface/bag_screen.png differ diff --git a/graphics/interface/bag_screen_female.pal b/graphics/interface/bag_screen_female.pal new file mode 100755 index 000000000..07057ec9a --- /dev/null +++ b/graphics/interface/bag_screen_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/interface/bag_screen_male.pal b/graphics/interface/bag_screen_male.pal new file mode 100755 index 000000000..e773c384c --- /dev/null +++ b/graphics/interface/bag_screen_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/interface/party_menu_misc.bin b/graphics/interface/party_menu_misc.bin new file mode 100755 index 000000000..d6ff1114d Binary files /dev/null and b/graphics/interface/party_menu_misc.bin differ diff --git a/graphics/interface/party_menu_misc.pal b/graphics/interface/party_menu_misc.pal new file mode 100755 index 000000000..0b4b30f81 --- /dev/null +++ b/graphics/interface/party_menu_misc.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/interface/party_menu_misc.png b/graphics/interface/party_menu_misc.png new file mode 100755 index 000000000..c58f3aae9 Binary files /dev/null and b/graphics/interface/party_menu_misc.png differ diff --git a/graphics/interface/party_menu_pokeball.png b/graphics/interface/party_menu_pokeball.png new file mode 100755 index 000000000..2aad54de8 Binary files /dev/null and b/graphics/interface/party_menu_pokeball.png differ diff --git a/graphics/interface/party_menu_pokeball_small.png b/graphics/interface/party_menu_pokeball_small.png new file mode 100755 index 000000000..d2eec4d45 Binary files /dev/null and b/graphics/interface/party_menu_pokeball_small.png differ diff --git a/graphics/interface/status_icons.png b/graphics/interface/status_icons.png new file mode 100755 index 000000000..fe802d7f6 Binary files /dev/null and b/graphics/interface/status_icons.png differ diff --git a/graphics/interface/status_screen.bin b/graphics/interface/status_screen.bin new file mode 100755 index 000000000..771d4db93 Binary files /dev/null and b/graphics/interface/status_screen.bin differ diff --git a/graphics/interface/status_screen.pal b/graphics/interface/status_screen.pal new file mode 100755 index 000000000..badbfe53b --- /dev/null +++ b/graphics/interface/status_screen.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/interface/status_screen.png b/graphics/interface/status_screen.png new file mode 100755 index 000000000..2f9f8db85 Binary files /dev/null and b/graphics/interface/status_screen.png differ diff --git a/graphics/interface/status_tilemap0.bin b/graphics/interface/status_tilemap0.bin new file mode 100755 index 000000000..a869a9d03 Binary files /dev/null and b/graphics/interface/status_tilemap0.bin differ diff --git a/graphics/interface/status_tilemap1.bin b/graphics/interface/status_tilemap1.bin new file mode 100755 index 000000000..19cb94637 Binary files /dev/null and b/graphics/interface/status_tilemap1.bin differ diff --git a/graphics/interface/status_tilemap2.bin b/graphics/interface/status_tilemap2.bin new file mode 100755 index 000000000..f835047d1 Binary files /dev/null and b/graphics/interface/status_tilemap2.bin differ diff --git a/graphics/interface/status_tilemap3.bin b/graphics/interface/status_tilemap3.bin new file mode 100755 index 000000000..9c11ccc4f Binary files /dev/null and b/graphics/interface/status_tilemap3.bin differ diff --git a/graphics/interface/summary_frames.png b/graphics/interface/summary_frames.png new file mode 100755 index 000000000..2a579b012 Binary files /dev/null and b/graphics/interface/summary_frames.png differ diff --git a/graphics/misc/bag.pal b/graphics/misc/bag.pal new file mode 100755 index 000000000..3c7c2370a --- /dev/null +++ b/graphics/misc/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/misc/bag_female.png b/graphics/misc/bag_female.png new file mode 100755 index 000000000..65446e269 Binary files /dev/null and b/graphics/misc/bag_female.png differ diff --git a/graphics/misc/bag_male.png b/graphics/misc/bag_male.png new file mode 100755 index 000000000..a12c66f39 Binary files /dev/null and b/graphics/misc/bag_male.png differ diff --git a/graphics/types/bug.png b/graphics/types/bug.png new file mode 100755 index 000000000..2f59a4838 Binary files /dev/null and b/graphics/types/bug.png differ diff --git a/graphics/types/contest_beauty.png b/graphics/types/contest_beauty.png new file mode 100755 index 000000000..b52fe3ca4 Binary files /dev/null and b/graphics/types/contest_beauty.png differ diff --git a/graphics/types/contest_cool.png b/graphics/types/contest_cool.png new file mode 100755 index 000000000..f0ca72323 Binary files /dev/null and b/graphics/types/contest_cool.png differ diff --git a/graphics/types/contest_cute.png b/graphics/types/contest_cute.png new file mode 100755 index 000000000..eeb86c431 Binary files /dev/null and b/graphics/types/contest_cute.png differ diff --git a/graphics/types/contest_smart.png b/graphics/types/contest_smart.png new file mode 100755 index 000000000..7659cc4f2 Binary files /dev/null and b/graphics/types/contest_smart.png differ diff --git a/graphics/types/contest_tough.png b/graphics/types/contest_tough.png new file mode 100755 index 000000000..f928596af Binary files /dev/null and b/graphics/types/contest_tough.png differ diff --git a/graphics/types/dark.png b/graphics/types/dark.png new file mode 100755 index 000000000..3380297da Binary files /dev/null and b/graphics/types/dark.png differ diff --git a/graphics/types/dragon.png b/graphics/types/dragon.png new file mode 100755 index 000000000..12430ad06 Binary files /dev/null and b/graphics/types/dragon.png differ diff --git a/graphics/types/electric.png b/graphics/types/electric.png new file mode 100755 index 000000000..0be6b890b Binary files /dev/null and b/graphics/types/electric.png differ diff --git a/graphics/types/fight.png b/graphics/types/fight.png new file mode 100755 index 000000000..95ff5a928 Binary files /dev/null and b/graphics/types/fight.png differ diff --git a/graphics/types/fire.png b/graphics/types/fire.png new file mode 100755 index 000000000..f6db950c8 Binary files /dev/null and b/graphics/types/fire.png differ diff --git a/graphics/types/flying.png b/graphics/types/flying.png new file mode 100755 index 000000000..2f34851ca Binary files /dev/null and b/graphics/types/flying.png differ diff --git a/graphics/types/ghost.png b/graphics/types/ghost.png new file mode 100755 index 000000000..b7347014d Binary files /dev/null and b/graphics/types/ghost.png differ diff --git a/graphics/types/grass.png b/graphics/types/grass.png new file mode 100755 index 000000000..4432a52e6 Binary files /dev/null and b/graphics/types/grass.png differ diff --git a/graphics/types/ground.png b/graphics/types/ground.png new file mode 100755 index 000000000..d3f6787b2 Binary files /dev/null and b/graphics/types/ground.png differ diff --git a/graphics/types/ice.png b/graphics/types/ice.png new file mode 100755 index 000000000..5ff2f69aa Binary files /dev/null and b/graphics/types/ice.png differ diff --git a/graphics/types/move_types_1.pal b/graphics/types/move_types_1.pal new file mode 100755 index 000000000..951aa69cb --- /dev/null +++ b/graphics/types/move_types_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 213 49 +246 131 49 +197 49 41 +230 197 106 +189 164 57 +139 106 49 +255 255 123 +172 172 123 +222 222 197 +115 90 74 +74 65 57 +189 189 213 +0 0 0 +131 123 115 +255 255 255 diff --git a/graphics/types/move_types_2.pal b/graphics/types/move_types_2.pal new file mode 100755 index 000000000..08dcea47c --- /dev/null +++ b/graphics/types/move_types_2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +205 197 255 +172 148 246 +115 90 156 +106 148 246 +156 222 222 +213 255 238 +74 57 82 +255 90 139 +255 197 180 +148 98 98 +164 65 164 +222 131 189 +148 148 164 +131 123 115 +255 255 255 diff --git a/graphics/types/move_types_3.pal b/graphics/types/move_types_3.pal new file mode 100755 index 000000000..4db37235b --- /dev/null +++ b/graphics/types/move_types_3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +197 255 98 +123 205 82 +90 131 65 +115 57 255 +74 57 148 +189 164 255 +172 189 32 +222 230 49 +123 148 16 +106 164 148 +115 205 180 +32 106 98 +0 0 0 +131 123 115 +255 255 255 diff --git a/graphics/types/mystery.png b/graphics/types/mystery.png new file mode 100755 index 000000000..a2ea01d55 Binary files /dev/null and b/graphics/types/mystery.png differ diff --git a/graphics/types/normal.png b/graphics/types/normal.png new file mode 100755 index 000000000..608a1f9c9 Binary files /dev/null and b/graphics/types/normal.png differ diff --git a/graphics/types/poison.png b/graphics/types/poison.png new file mode 100755 index 000000000..502dfae37 Binary files /dev/null and b/graphics/types/poison.png differ diff --git a/graphics/types/psychic.png b/graphics/types/psychic.png new file mode 100755 index 000000000..975d1fb55 Binary files /dev/null and b/graphics/types/psychic.png differ diff --git a/graphics/types/rock.png b/graphics/types/rock.png new file mode 100755 index 000000000..3793597f9 Binary files /dev/null and b/graphics/types/rock.png differ diff --git a/graphics/types/steel.png b/graphics/types/steel.png new file mode 100755 index 000000000..29748639c Binary files /dev/null and b/graphics/types/steel.png differ diff --git a/graphics/types/water.png b/graphics/types/water.png new file mode 100755 index 000000000..19ae3ebe3 Binary files /dev/null and b/graphics/types/water.png differ diff --git a/graphics/unknown/unknown_D95E00.bin b/graphics/unknown/unknown_D95E00.bin new file mode 100755 index 000000000..d48de1d6f Binary files /dev/null and b/graphics/unknown/unknown_D95E00.bin differ diff --git a/graphics/unknown/unknown_D960D0.bin b/graphics/unknown/unknown_D960D0.bin new file mode 100755 index 000000000..6a6f7c049 --- /dev/null +++ b/graphics/unknown/unknown_D960D0.bin @@ -0,0 +1 @@ +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000€ÀĀŀƀǀȀɀʀˀ̀̀000000000000000000ЀрҀӀԀՀր׀؀ـڀۀ܀݀ހ߀0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 \ No newline at end of file diff --git a/graphics/unknown/unknown_D963A4.bin b/graphics/unknown/unknown_D963A4.bin new file mode 100755 index 000000000..6312b8645 --- /dev/null +++ b/graphics/unknown/unknown_D963A4.bin @@ -0,0 +1 @@ +τ΄̈́̄˄ʄɄȄDŽƄńĄÄ„߄ބ݄܄ۄڄل؄ׄքՄԄӄ҄фЄ \ No newline at end of file diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 6172da9c7..86f2436a9 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -11,6 +11,10 @@ unknowngfxdir := graphics/unknown btintgfxdir := graphics/battle_interface masksgfxdir := graphics/battle_anims/masks bttransgfxdir := graphics/battle_transitions +typesdir := graphics/types + +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 $(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \ $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \ @@ -356,3 +360,15 @@ $(masksgfxdir)/unknown_C2EA50.4bpp: $(masksgfxdir)/unknown_C2EA50.png $(bttransgfxdir)/vs_frame.4bpp: $(bttransgfxdir)/vs_frame.png $(GFX) $< $@ -num_tiles 16 + +$(menudir)/party_menu_misc.4bpp: $(menudir)/party_menu_misc.png + $(GFX) $< $@ -num_tiles 62 + +$(typesdir)/move_types.4bpp: $(types:%=$(typesdir)/%.4bpp) $(contest_types:%=$(typesdir)/contest_%.4bpp) + @cat $^ >$@ + +$(typesdir)/move_types.gbapal: $(typesdir)/move_types_1.gbapal $(typesdir)/move_types_2.gbapal $(typesdir)/move_types_3.gbapal + @cat $(typesdir)/move_types_1.gbapal $(typesdir)/move_types_2.gbapal $(typesdir)/move_types_3.gbapal >$@ + +$(menudir)/bag_screen.4bpp: $(menudir)/bag_screen.png + $(GFX) $< $@ -num_tiles 53 diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index ba0c4dde7..45aaf0e08 100755 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -93,7 +93,7 @@ extern struct CompressedSpriteSheet gUnknown_0861D074; extern struct CompressedSpriteSheet gUnknown_0861D0F8; extern struct CompressedSpritePalette gUnknown_0861D100; extern struct CompressedSpritePalette gUnknown_0861D07C; -extern u8 gUnknown_08D97B84; +extern u8 gMoveTypes_Pal; extern u8 gUnknown_08D97D0C; extern void reset_temp_tile_data_buffers(); extern void decompress_and_copy_tile_data_to_vram(u8 a, void* tiledata, u8 b, u8 c, u8 d); @@ -648,7 +648,7 @@ u8 sub_81BFEB0() gUnknown_0203CF1C->unk40F0++; break; case 12: - LoadCompressedPalette(&gUnknown_08D97B84, 0x1D0, 0x60); + LoadCompressedPalette(&gMoveTypes_Pal, 0x1D0, 0x60); gUnknown_0203CF1C->unk40F0 = 0; return 1; }