From cfe17cc552c29b7aece3e9b978b429d2ef14180e Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 28 Dec 2017 22:05:30 -0500 Subject: [PATCH] fifteenth wave of graphics.s dumps --- asm/item_menu.s | 2 +- asm/menu.s | 8 +- asm/mon_markings.s | 4 +- asm/pokedex_area_screen.s | 2 +- asm/pokenav.s | 26 +-- data/graphics.s | 231 ++++++++++++------- data/pokedex_area_screen.s | 2 +- data/pokenav.s | 32 +-- graphics/berry_blender/arrow_old.png | Bin 0 -> 228 bytes graphics/contest/clink_tilemap1.bin | Bin 0 -> 40 bytes graphics/contest/clink_tilemap10.bin | 1 + graphics/contest/clink_tilemap11.bin | Bin 0 -> 24 bytes graphics/contest/clink_tilemap2.bin | Bin 0 -> 40 bytes graphics/contest/clink_tilemap3.bin | Bin 0 -> 40 bytes graphics/contest/clink_tilemap4.bin | Bin 0 -> 40 bytes graphics/contest/clink_tilemap5.bin | Bin 0 -> 20 bytes graphics/contest/clink_tilemap6.bin | Bin 0 -> 20 bytes graphics/contest/clink_tilemap7.bin | 1 + graphics/contest/clink_tilemap8.bin | 1 + graphics/contest/clink_tilemap9.bin | 1 + graphics/interface/hm.png | Bin 0 -> 184 bytes graphics/interface_fr/menu.png | Bin 0 -> 1904 bytes graphics/interface_fr/menu1.pal | 19 ++ graphics/interface_fr/menu2.pal | 19 ++ graphics/interface_fr/menu3.pal | 19 ++ graphics/pokedex/area_unknown.png | Bin 0 -> 397 bytes graphics/pokenav/cancel.pal | 35 +++ graphics/pokenav/cancel.png | Bin 0 -> 180 bytes graphics/pokenav/condition.bin | Bin 0 -> 2048 bytes graphics/pokenav/condition.png | Bin 0 -> 1603 bytes graphics/pokenav/header.bin | Bin 0 -> 2048 bytes graphics/pokenav/header.png | Bin 0 -> 479 bytes graphics/pokenav/left_headers/beauty.png | Bin 0 -> 315 bytes graphics/pokenav/left_headers/condition.png | Bin 0 -> 287 bytes graphics/pokenav/left_headers/cool.png | Bin 0 -> 259 bytes graphics/pokenav/left_headers/cute.png | Bin 0 -> 293 bytes graphics/pokenav/left_headers/hoenn_map.png | Bin 0 -> 444 bytes graphics/pokenav/left_headers/main_menu.png | Bin 0 -> 298 bytes graphics/pokenav/left_headers/match_call.png | Bin 0 -> 298 bytes graphics/pokenav/left_headers/palette.pal | 83 +++++++ graphics/pokenav/left_headers/party.png | Bin 0 -> 323 bytes graphics/pokenav/left_headers/ribbons.png | Bin 0 -> 274 bytes graphics/pokenav/left_headers/search.png | Bin 0 -> 300 bytes graphics/pokenav/left_headers/smart.png | Bin 0 -> 308 bytes graphics/pokenav/left_headers/tough.png | Bin 0 -> 287 bytes graphics/pokenav/marker.png | Bin 0 -> 353 bytes graphics/pokenav/message.bin | Bin 0 -> 1280 bytes graphics/pokenav/message.png | Bin 0 -> 159 bytes graphics/pokenav/options/beauty.png | Bin 0 -> 259 bytes graphics/pokenav/options/cancel.png | Bin 0 -> 273 bytes graphics/pokenav/options/condition.png | Bin 0 -> 295 bytes graphics/pokenav/options/cool.png | Bin 0 -> 212 bytes graphics/pokenav/options/cute.png | Bin 0 -> 228 bytes graphics/pokenav/options/hoenn_map.png | Bin 0 -> 305 bytes graphics/pokenav/options/match_call.png | Bin 0 -> 304 bytes graphics/pokenav/options/options.bin | 1 + graphics/pokenav/options/options.pal | 83 +++++++ graphics/pokenav/options/party.png | Bin 0 -> 318 bytes graphics/pokenav/options/ribbons.png | Bin 0 -> 291 bytes graphics/pokenav/options/search.png | Bin 0 -> 286 bytes graphics/pokenav/options/smart.png | Bin 0 -> 256 bytes graphics/pokenav/options/switch_off.png | Bin 0 -> 314 bytes graphics/pokenav/options/tough.png | Bin 0 -> 239 bytes graphics/pokenav/zoom.png | Bin 0 -> 536 bytes graphics_file_rules.mk | 8 + 65 files changed, 459 insertions(+), 119 deletions(-) create mode 100755 graphics/berry_blender/arrow_old.png create mode 100755 graphics/contest/clink_tilemap1.bin create mode 100755 graphics/contest/clink_tilemap10.bin create mode 100755 graphics/contest/clink_tilemap11.bin create mode 100755 graphics/contest/clink_tilemap2.bin create mode 100755 graphics/contest/clink_tilemap3.bin create mode 100755 graphics/contest/clink_tilemap4.bin create mode 100755 graphics/contest/clink_tilemap5.bin create mode 100755 graphics/contest/clink_tilemap6.bin create mode 100755 graphics/contest/clink_tilemap7.bin create mode 100755 graphics/contest/clink_tilemap8.bin create mode 100755 graphics/contest/clink_tilemap9.bin create mode 100755 graphics/interface/hm.png create mode 100755 graphics/interface_fr/menu.png create mode 100755 graphics/interface_fr/menu1.pal create mode 100755 graphics/interface_fr/menu2.pal create mode 100755 graphics/interface_fr/menu3.pal create mode 100755 graphics/pokedex/area_unknown.png create mode 100755 graphics/pokenav/cancel.pal create mode 100755 graphics/pokenav/cancel.png create mode 100755 graphics/pokenav/condition.bin create mode 100755 graphics/pokenav/condition.png create mode 100755 graphics/pokenav/header.bin create mode 100755 graphics/pokenav/header.png create mode 100755 graphics/pokenav/left_headers/beauty.png create mode 100755 graphics/pokenav/left_headers/condition.png create mode 100755 graphics/pokenav/left_headers/cool.png create mode 100755 graphics/pokenav/left_headers/cute.png create mode 100755 graphics/pokenav/left_headers/hoenn_map.png create mode 100755 graphics/pokenav/left_headers/main_menu.png create mode 100755 graphics/pokenav/left_headers/match_call.png create mode 100755 graphics/pokenav/left_headers/palette.pal create mode 100755 graphics/pokenav/left_headers/party.png create mode 100755 graphics/pokenav/left_headers/ribbons.png create mode 100755 graphics/pokenav/left_headers/search.png create mode 100755 graphics/pokenav/left_headers/smart.png create mode 100755 graphics/pokenav/left_headers/tough.png create mode 100755 graphics/pokenav/marker.png create mode 100755 graphics/pokenav/message.bin create mode 100755 graphics/pokenav/message.png create mode 100755 graphics/pokenav/options/beauty.png create mode 100755 graphics/pokenav/options/cancel.png create mode 100755 graphics/pokenav/options/condition.png create mode 100755 graphics/pokenav/options/cool.png create mode 100755 graphics/pokenav/options/cute.png create mode 100755 graphics/pokenav/options/hoenn_map.png create mode 100755 graphics/pokenav/options/match_call.png create mode 100755 graphics/pokenav/options/options.bin create mode 100755 graphics/pokenav/options/options.pal create mode 100755 graphics/pokenav/options/party.png create mode 100755 graphics/pokenav/options/ribbons.png create mode 100755 graphics/pokenav/options/search.png create mode 100755 graphics/pokenav/options/smart.png create mode 100755 graphics/pokenav/options/switch_off.png create mode 100755 graphics/pokenav/options/tough.png create mode 100755 graphics/pokenav/zoom.png diff --git a/asm/item_menu.s b/asm/item_menu.s index 9aedd3f5b2..db3d38668e 100755 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -1164,7 +1164,7 @@ _081AB570: lsrs r0, 16 cmp r0, 0x7 bhi _081AB5BE - ldr r1, =gUnknown_08DC6378 + ldr r1, =gBagMenuHMIcon_Gfx subs r3, r7, 0x1 lsls r3, 16 lsrs r3, 16 diff --git a/asm/menu.s b/asm/menu.s index 64644504ef..fac6ed72a0 100755 --- a/asm/menu.s +++ b/asm/menu.s @@ -5257,15 +5257,15 @@ sub_819A2BC: @ 819A2BC cmp r1, 0x2 beq _0819A2E4 _0819A2D2: - ldr r0, =gUnknown_08DC4318 + ldr r0, =gFireRedMenuElements1_Pal b _0819A2E6 .pool _0819A2DC: - ldr r0, =gUnknown_08DC4338 + ldr r0, =gFireRedMenuElements2_Pal b _0819A2E6 .pool _0819A2E4: - ldr r0, =gUnknown_08DC4358 + ldr r0, =gFireRedMenuElements3_Pal _0819A2E6: adds r1, r2, 0 movs r2, 0x20 @@ -5292,7 +5292,7 @@ blit_move_info_icon: @ 819A2F8 adds r1, r4 ldrh r5, [r1, 0x2] lsls r5, 5 - ldr r4, =gUnknown_08DC4378 + ldr r4, =gFireRedMenuElements_Gfx adds r5, r4 movs r4, 0x80 str r4, [sp] diff --git a/asm/mon_markings.s b/asm/mon_markings.s index 7c927399f4..1624fddca8 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -480,7 +480,7 @@ sub_811FC80: @ 811FC80 adds r0, 0x1E strh r5, [r0] add r1, sp, 0x20 - ldr r0, =gUnknown_08DC9628 + ldr r0, =gPokenavConditionMarker_Gfx str r0, [sp, 0x20] movs r0, 0xC8 lsls r0, 2 @@ -503,7 +503,7 @@ sub_811FC80: @ 811FC80 add r0, sp, 0x34 strh r6, [r0] add r1, sp, 0x38 - ldr r0, =gUnknown_08DC9608 + ldr r0, =gPokenavConditionMarker_Pal str r0, [sp, 0x38] adds r0, r6, 0x1 strh r0, [r1, 0x4] diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index a222c43f9e..5f9e019748 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -1781,7 +1781,7 @@ sub_813D8A8: @ 813D8A8 str r1, [sp] ldr r0, =0x00030600 str r0, [sp, 0x4] - ldr r0, =gUnknown_08DC4140 + ldr r0, =gPokedexAreaScreenAreaUnknown_Gfx bl LZ77UnCompWram mov r0, sp bl LoadSpriteSheet diff --git a/asm/pokenav.s b/asm/pokenav.s index a011178687..35df4d6b75 100755 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -683,7 +683,7 @@ _081C77B0: movs r0, 0 bl sub_81C763C adds r4, r0, 0 - ldr r1, =gUnknown_08DC7B80 + ldr r1, =gPokenavHeader_Gfx movs r0, 0 str r0, [sp] movs r2, 0 @@ -693,12 +693,12 @@ _081C77B0: movs r0, 0 adds r1, r4, 0 bl SetBgTilemapBuffer - ldr r1, =gUnknown_08DC7D84 + ldr r1, =gPokenavHeader_Tilemap movs r0, 0 movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer - ldr r0, =gUnknown_08DC7B60 + ldr r0, =gPokenavHeader_Pal movs r1, 0 movs r2, 0x20 bl sub_81C7944 @@ -1571,7 +1571,7 @@ sub_81C7E58: @ 81C7E58 bl sub_8034974 adds r5, r0, 0 lsls r4, 5 - ldr r0, =gUnknown_08DC7F00 + ldr r0, =gPokenavLeftHeader_Pal adds r4, r0 movs r0, 0x1 bl IndexOfSpritePaletteTag @@ -1653,7 +1653,7 @@ sub_81C7F24: @ 81C7F24 bl sub_8034974 adds r5, r0, 0 lsls r4, 5 - ldr r0, =gUnknown_08DC7F00 + ldr r0, =gPokenavLeftHeader_Pal adds r4, r0 movs r0, 0x2 bl IndexOfSpritePaletteTag @@ -5198,7 +5198,7 @@ _081C9A5C: ldr r0, =gUnknown_08620194 movs r1, 0x3 bl sub_81C7B54 - ldr r1, =gUnknown_08DC90E0 + ldr r1, =gPokenavMessageBox_Gfx movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -5209,14 +5209,14 @@ _081C9A5C: adds r1, 0x8C movs r0, 0x1 bl SetBgTilemapBuffer - ldr r1, =gUnknown_08DC9130 + ldr r1, =gPokenavMessageBox_Tilemap movs r0, 0x1 movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer movs r0, 0x1 bl CopyBgTilemapBufferToVram - ldr r0, =gUnknown_08DC90C0 + ldr r0, =gPokenavMessageBox_Pal movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 @@ -11374,7 +11374,7 @@ sub_81CCA1C: @ 81CCA1C movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 - ldr r0, =gUnknown_08DC91E8 + ldr r0, =gHoennMapZoomIcons_Pal movs r1, 0x30 movs r2, 0x20 bl sub_81C7944 @@ -13941,7 +13941,7 @@ _081CDF18: ldr r1, =0x0000040b movs r0, 0x52 bl SetGpuReg - ldr r1, =gUnknown_08DC6548 + ldr r1, =gPokenavCondition_Gfx movs r0, 0 str r0, [sp] movs r0, 0x3 @@ -13973,7 +13973,7 @@ _081CDFB8: beq _081CDFC4 b _081CE2C0 _081CDFC4: - ldr r0, =gUnknown_08DC6DFC + ldr r0, =gPokenavCondition_Tilemap adds r4, r5, 0x4 adds r1, r4, 0 bl LZ77UnCompVram @@ -13983,7 +13983,7 @@ _081CDFC4: bl sub_81CDD5C cmp r0, 0x1 bne _081CDFF2 - ldr r1, =gUnknown_08DC7070 + ldr r1, =gPokenavOptions_Tilemap movs r0, 0x9 str r0, [sp] movs r0, 0x4 @@ -13995,7 +13995,7 @@ _081CDFC4: _081CDFF2: movs r0, 0x3 bl CopyBgTilemapBufferToVram - ldr r0, =gUnknown_08DC6528 + ldr r0, =gPokenavCondition_Pal movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 diff --git a/data/graphics.s b/data/graphics.s index 2ac0915c97..528b88d2da 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4236,149 +4236,218 @@ gIntroCopyright_Tilemap:: @ 8DC3FD4 .incbin "graphics/intro/copyright.bin.lz" .align 2 -gUnknown_08DC4120:: @ 8DC4120 - .incbin "baserom.gba", 0xdc4120, 0x20 +gPokedexAreaScreenAreaUnknown_Pal:: @ 8DC4120 + .incbin "graphics/pokedex/area_unknown.gbapal" -gUnknown_08DC4140:: @ 8DC4140 - .incbin "baserom.gba", 0xdc4140, 0x1d8 + .align 2 +gPokedexAreaScreenAreaUnknown_Gfx:: @ 8DC4140 + .incbin "graphics/pokedex/area_unknown.4bpp.lz" -gUnknown_08DC4318:: @ 8DC4318 - .incbin "baserom.gba", 0xdc4318, 0x20 + @ seems to be fire red leftovers, but the menu elements is reused in the item menu for TM descriptions. -gUnknown_08DC4338:: @ 8DC4338 - .incbin "baserom.gba", 0xdc4338, 0x20 + .align 2 +gFireRedMenuElements1_Pal:: @ 8DC4318 + .incbin "graphics/interface_fr/menu1.gbapal" -gUnknown_08DC4358:: @ 8DC4358 - .incbin "baserom.gba", 0xdc4358, 0x20 + .align 2 +gFireRedMenuElements2_Pal:: @ 8DC4338 + .incbin "graphics/interface_fr/menu2.gbapal" -gUnknown_08DC4378:: @ 8DC4378 - .incbin "baserom.gba", 0xdc4378, 0x2000 + .align 2 +gFireRedMenuElements3_Pal:: @ 8DC4358 + .incbin "graphics/interface_fr/menu3.gbapal" -gUnknown_08DC6378:: @ 8DC6378 - .incbin "baserom.gba", 0xdc6378, 0x80 + .align 2 +gFireRedMenuElements_Gfx:: @ 8DC4378 + .incbin "graphics/interface_fr/menu.4bpp" @ the types are reused for item menu + .align 2 +gBagMenuHMIcon_Gfx:: @ 8DC6378 + .incbin "graphics/interface/hm.4bpp" + + @ contest link stuff, appears to be a set of tilemaps + + .align 2 gUnknown_08DC63F8:: @ 8DC63F8 - .incbin "baserom.gba", 0xdc63f8, 0x28 + .incbin "graphics/contest/clink_tilemap1.bin" + .align 2 gUnknown_08DC6420:: @ 8DC6420 - .incbin "baserom.gba", 0xdc6420, 0x28 + .incbin "graphics/contest/clink_tilemap2.bin" + .align 2 gUnknown_08DC6448:: @ 8DC6448 - .incbin "baserom.gba", 0xdc6448, 0x28 + .incbin "graphics/contest/clink_tilemap3.bin" + .align 2 gUnknown_08DC6470:: @ 8DC6470 - .incbin "baserom.gba", 0xdc6470, 0x28 + .incbin "graphics/contest/clink_tilemap4.bin" + .align 2 gUnknown_08DC6498:: @ 8DC6498 - .incbin "baserom.gba", 0xdc6498, 0x14 + .incbin "graphics/contest/clink_tilemap5.bin" + .align 2 gUnknown_08DC64AC:: @ 8DC64AC - .incbin "baserom.gba", 0xdc64ac, 0x14 + .incbin "graphics/contest/clink_tilemap6.bin" + .align 2 gUnknown_08DC64C0:: @ 8DC64C0 - .incbin "baserom.gba", 0xdc64c0, 0x14 + .incbin "graphics/contest/clink_tilemap7.bin" + .align 2 gUnknown_08DC64D4:: @ 8DC64D4 - .incbin "baserom.gba", 0xdc64d4, 0x14 + .incbin "graphics/contest/clink_tilemap8.bin" + .align 2 gUnknown_08DC64E8:: @ 8DC64E8 - .incbin "baserom.gba", 0xdc64e8, 0x14 + .incbin "graphics/contest/clink_tilemap9.bin" + .align 2 gUnknown_08DC64FC:: @ 8DC64FC - .incbin "baserom.gba", 0xdc64fc, 0x14 + .incbin "graphics/contest/clink_tilemap10.bin" + .align 2 gUnknown_08DC6510:: @ 8DC6510 - .incbin "baserom.gba", 0xdc6510, 0x18 + .incbin "graphics/contest/clink_tilemap11.bin" -gUnknown_08DC6528:: @ 8DC6528 - .incbin "baserom.gba", 0xdc6528, 0x20 + @ pokenav -gUnknown_08DC6548:: @ 8DC6548 - .incbin "baserom.gba", 0xdc6548, 0x8b4 + .align 2 +gPokenavCondition_Pal:: @ 8DC6528 + .incbin "graphics/pokenav/condition.gbapal" -gUnknown_08DC6DFC:: @ 8DC6DFC - .incbin "baserom.gba", 0xdc6dfc, 0x274 + .align 2 +gPokenavCondition_Gfx:: @ 8DC6548 + .incbin "graphics/pokenav/condition.4bpp.lz" -gUnknown_08DC7070:: @ 8DC7070 - .incbin "baserom.gba", 0xdc7070, 0xaf0 + .align 2 +gPokenavCondition_Tilemap:: @ 8DC6DFC + .incbin "graphics/pokenav/condition.bin.lz" -gUnknown_08DC7B60:: @ 8DC7B60 - .incbin "baserom.gba", 0xdc7b60, 0x20 + .align 2 +gPokenavOptions_Tilemap:: @ 8DC7070 + .incbin "graphics/pokenav/options/options.bin" -gUnknown_08DC7B80:: @ 8DC7B80 - .incbin "baserom.gba", 0xdc7b80, 0x204 + .align 2 +gPokenavOptions_Gfx:: + .incbin "graphics/pokenav/options/options.4bpp.lz" -gUnknown_08DC7D84:: @ 8DC7D84 - .incbin "baserom.gba", 0xdc7d84, 0x17c + .align 2 +gPokenavOptions_Pal:: + .incbin "graphics/pokenav/options/options.gbapal" -gUnknown_08DC7F00:: @ 8DC7F00 - .incbin "baserom.gba", 0xdc7f00, 0xA0 + .align 2 +gPokenavHeader_Pal:: @ 8DC7B60 + .incbin "graphics/pokenav/header.gbapal" -gUnknown_08DC7FA0:: @ 8DC7FA0 - .incbin "baserom.gba", 0xdc7fa0, 0x13C + .align 2 +gPokenavHeader_Gfx:: @ 8DC7B80 + .incbin "graphics/pokenav/header.4bpp.lz" @ TODO: use width 9 and makefile rule for cleanliness, make wasnt behaving, didnt want to apply num_tiles to this -gUnknown_08DC80DC:: @ 8DC80DC - .incbin "baserom.gba", 0xdc80dc, 0x12C + .align 2 +gPokenavHeader_Tilemap:: @ 8DC7D84 + .incbin "graphics/pokenav/header.bin.lz" -gUnknown_08DC8208:: @ 8DC8208 - .incbin "baserom.gba", 0xdc8208, 0x184 + .align 2 +gPokenavLeftHeader_Pal:: @ 8DC7F00 + .incbin "graphics/pokenav/left_headers/palette.gbapal" -gUnknown_08DC838C:: @ 8DC838C - .incbin "baserom.gba", 0xdc838c, 0x120 + .align 2 +gPokenavLeftHeaderBeauty_Gfx:: @ 8DC7FA0 + .incbin "graphics/pokenav/left_headers/beauty.4bpp.lz" -gUnknown_08DC84AC:: @ 8DC84AC - .incbin "baserom.gba", 0xdc84ac, 0x1A0 + .align 2 +gPokenavLeftHeaderSmart_Gfx:: @ 8DC80DC + .incbin "graphics/pokenav/left_headers/smart.4bpp.lz" -gUnknown_08DC864C:: @ 8DC864C - .incbin "baserom.gba", 0xdc864c, 0x1AC + .align 2 +gPokenavLeftHeaderCondition_Gfx:: @ 8DC8208 + .incbin "graphics/pokenav/left_headers/condition.4bpp.lz" -gUnknown_08DC87F8:: @ 8DC87F8 - .incbin "baserom.gba", 0xdc87f8, 0x2AC + .align 2 +gPokenavLeftHeaderCute_Gfx:: @ 8DC838C + .incbin "graphics/pokenav/left_headers/cute.4bpp.lz" -gUnknown_08DC8AA4:: @ 8DC8AA4 - .incbin "baserom.gba", 0xdc8aa4, 0x170 + .align 2 +gPokenavLeftHeaderMatchCall_Gfx:: @ 8DC84AC + .incbin "graphics/pokenav/left_headers/match_call.4bpp.lz" -gUnknown_08DC8C14:: @ 8DC8C14 - .incbin "baserom.gba", 0xdc8c14, 0x13C + .align 2 +gPokenavLeftHeaderMainMenu_Gfx:: @ 8DC864C + .incbin "graphics/pokenav/left_headers/main_menu.4bpp.lz" -gUnknown_08DC8D50:: @ 8DC8D50 - .incbin "baserom.gba", 0xdc8d50, 0x114 + .align 2 +gPokenavLeftHeaderHoennMap_Gfx:: @ 8DC87F8 + .incbin "graphics/pokenav/left_headers/hoenn_map.4bpp.lz" -gUnknown_08DC8E64:: @ 8DC8E64 - .incbin "baserom.gba", 0xdc8e64, 0x100 + .align 2 +gPokenavLeftHeaderRibbons_Gfx:: @ 8DC8AA4 + .incbin "graphics/pokenav/left_headers/ribbons.4bpp.lz" -gUnknown_08DC8F64:: @ 8DC8F64 - .incbin "baserom.gba", 0xdc8f64, 0x15C + .align 2 +gPokenavLeftHeaderSearch_Gfx:: @ 8DC8C14 + .incbin "graphics/pokenav/left_headers/search.4bpp.lz" -gUnknown_08DC90C0:: @ 8DC90C0 - .incbin "baserom.gba", 0xdc90c0, 0x20 + .align 2 +gPokenavLeftHeaderTough_Gfx:: @ 8DC8D50 + .incbin "graphics/pokenav/left_headers/tough.4bpp.lz" -gUnknown_08DC90E0:: @ 8DC90E0 - .incbin "baserom.gba", 0xdc90e0, 0x50 + .align 2 +gPokenavLeftHeaderCool_Gfx:: @ 8DC8E64 + .incbin "graphics/pokenav/left_headers/cool.4bpp.lz" -gUnknown_08DC9130:: @ 8DC9130 - .incbin "baserom.gba", 0xdc9130, 0xb8 + .align 2 +gPokenavLeftHeaderParty_Gfx:: @ 8DC8F64 + .incbin "graphics/pokenav/left_headers/party.4bpp.lz" -gUnknown_08DC91E8:: @ 8DC91E8 - .incbin "baserom.gba", 0xdc91e8, 0x20 + .align 2 +gPokenavMessageBox_Pal:: @ 8DC90C0 + .incbin "graphics/pokenav/message.gbapal" -gUnknown_08DC9208:: @ 8DC9208 - .incbin "baserom.gba", 0xdc9208, 0x400 + .align 2 +gPokenavMessageBox_Gfx:: @ 8DC90E0 + .incbin "graphics/pokenav/message.4bpp.lz" -gUnknown_08DC9608:: @ 8DC9608 - .incbin "baserom.gba", 0xdc9608, 0x20 + .align 2 +gPokenavMessageBox_Tilemap:: @ 8DC9130 + .incbin "graphics/pokenav/message.bin.lz" -gUnknown_08DC9628:: @ 8DC9628 - .incbin "baserom.gba", 0xdc9628, 0x320 + .align 2 +gHoennMapZoomIcons_Pal:: @ 8DC91E8 + .incbin "graphics/pokenav/zoom.gbapal" + .align 2 +gHoennMapZoomIcons_Gfx:: @ 8DC9208 + .incbin "graphics/pokenav/zoom.4bpp.lz" + + .align 2 +gPokenavConditionCancel_Pal:: + .incbin "graphics/pokenav/cancel.gbapal" + + .align 2 +gPokenavConditionCancel_Gfx:: + .incbin "graphics/pokenav/cancel.4bpp" + + .align 2 +gPokenavConditionMarker_Pal:: @ 8DC9608 + .incbin "graphics/pokenav/marker.gbapal" + + .align 2 +gPokenavConditionMarker_Gfx:: @ 8DC9628 + .incbin "graphics/pokenav/marker.4bpp" + + .align 2 gBerryBlenderMiscPalette:: @ 8DCAB88 .incbin "graphics/berry_blender/misc.gbapal" + .align 2 gBerryBlenderArrowPalette:: @ 8DC9948 .incbin "graphics/berry_blender/arrow.gbapal" -gUnknown_8DC9988:: @ 8DC9988 - .incbin "baserom.gba", 0xdc9988, 0x200 + .align 2 +gBerryBlenderBetaArrow_Gfx:: @ 8DC9988 + .incbin "graphics/berry_blender/arrow_old.4bpp" @ unused .align 2 gBerryBlenderMarubatsuTiles:: @ 8DC9B88 diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index e55f03fab7..77d17a0479 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -79,7 +79,7 @@ AreaMarkerTiles:: @ 85B406C .align 2 gUnknown_085B40EC:: @ 85B40EC - obj_pal gUnknown_08DC4120, 0x0003 + obj_pal gPokedexAreaScreenAreaUnknown_Pal, 0x0003 .align 2 gOamData_85B40F4:: @ 85B40F4 diff --git a/data/pokenav.s b/data/pokenav.s index 89ec3c3a6d..82eee2446e 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -147,24 +147,24 @@ gUnknown_0861FA54:: @ 861FA54 obj_pal NULL, 0 gUnknown_0861FA64:: @ 861FA64 - obj_tiles gUnknown_08DC87F8, 0xC00, 2 + obj_tiles gPokenavLeftHeaderHoennMap_Gfx, 0xC00, 2 gUnknown_0861FA6C:: @ 861FA6C - obj_tiles gUnknown_08DC864C, 0x20, 3 - obj_tiles gUnknown_08DC8208, 0x20, 1 - obj_tiles gUnknown_08DC8AA4, 0x20, 2 - obj_tiles gUnknown_08DC84AC, 0x20, 4 - obj_tiles gUnknown_08DC87F8, 0x20, 0 - obj_tiles gUnknown_08DC87F8, 0x40, 0 + obj_tiles gPokenavLeftHeaderMainMenu_Gfx, 0x20, 3 + obj_tiles gPokenavLeftHeaderCondition_Gfx, 0x20, 1 + obj_tiles gPokenavLeftHeaderRibbons_Gfx, 0x20, 2 + obj_tiles gPokenavLeftHeaderMatchCall_Gfx, 0x20, 4 + obj_tiles gPokenavLeftHeaderHoennMap_Gfx, 0x20, 0 + obj_tiles gPokenavLeftHeaderHoennMap_Gfx, 0x40, 0 gUnknown_0861FA9C:: @ 861FA9C - .4byte gUnknown_08DC8F64, 1 - .4byte gUnknown_08DC8C14, 1 - .4byte gUnknown_08DC8E64, 4 - .4byte gUnknown_08DC7FA0, 1 - .4byte gUnknown_08DC838C, 2 - .4byte gUnknown_08DC80DC, 0 - .4byte gUnknown_08DC8D50, 0 + .4byte gPokenavLeftHeaderParty_Gfx, 1 + .4byte gPokenavLeftHeaderSearch_Gfx, 1 + .4byte gPokenavLeftHeaderCool_Gfx, 4 + .4byte gPokenavLeftHeaderBeauty_Gfx, 1 + .4byte gPokenavLeftHeaderCute_Gfx, 2 + .4byte gPokenavLeftHeaderSmart_Gfx, 0 + .4byte gPokenavLeftHeaderTough_Gfx, 0 gUnknown_0861FAD4:: @ 861FAD4 .2byte 0x0 @@ -1511,10 +1511,10 @@ gUnknown_086230E4:: @ 86230E4 .4byte sub_81CC95C gUnknown_086230F8:: @ 86230F8 - obj_tiles gUnknown_08DC9208, 0x800, 6 + obj_tiles gHoennMapZoomIcons_Gfx, 0x800, 6 gUnknown_08623100:: @ 8623100 - obj_pal gUnknown_08DC91E8, 11 + obj_pal gHoennMapZoomIcons_Pal, 11 obj_pal NULL, 0 gUnknown_08623110:: @ 8623110 diff --git a/graphics/berry_blender/arrow_old.png b/graphics/berry_blender/arrow_old.png new file mode 100755 index 0000000000000000000000000000000000000000..12d57c07e4b03852e2e2257a49069f3b4e982a3f GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!VDxI2ESSgqznRlLR^9L|NsB5-g~#@=(8zn z?iEit8&rMNFlq1qEoc81C;c~MIP2)RS3+WnfPj}}HwQyd`huPDKt1`ME{-7@6VFcA zD9E75!SeEep6A;36Jot{3_rCpoBaH7|Hxd{hi*!XHgTkz-bwXp7dRkxDMn(2K|rFf zF@sumh1t_tSCT!~6@O4s_b;`*@!24Odz~Inh{TEw%LExFo7za%_`cexa{cOboBH4L b-+#6#71`7IBHXbbXf=bUtDnm{r-UW|*5X=6 literal 0 HcmV?d00001 diff --git a/graphics/contest/clink_tilemap1.bin b/graphics/contest/clink_tilemap1.bin new file mode 100755 index 0000000000000000000000000000000000000000..e22f2183944b66b77daf98aa91a1d68d8cedfa03 GIT binary patch literal 40 qcmV~$fdPOJ006L^qI5vwE8+m9*V}^4E;>}rts73sB`c=KYx(?bU}rts73sB`c=KYx(?gbOvbv literal 0 HcmV?d00001 diff --git a/graphics/contest/clink_tilemap3.bin b/graphics/contest/clink_tilemap3.bin new file mode 100755 index 0000000000000000000000000000000000000000..d4bb7bae701f2594fc5f51e33ff291d654ae0bed GIT binary patch literal 40 qcmV~$fdPOJ006MvqjW&xA>sg~*V}^4E;>}rts73sB`c=KYx(?lhz6Sg literal 0 HcmV?d00001 diff --git a/graphics/contest/clink_tilemap4.bin b/graphics/contest/clink_tilemap4.bin new file mode 100755 index 0000000000000000000000000000000000000000..32f24abd665e7ee85c977eb49f56331116c050b0 GIT binary patch literal 40 qcmV~$!2y5}006*yD-DoXkQhK|_3nbrE;>}rts73sB`c=KYx(?F2nAaJ literal 0 HcmV?d00001 diff --git a/graphics/contest/clink_tilemap5.bin b/graphics/contest/clink_tilemap5.bin new file mode 100755 index 0000000000000000000000000000000000000000..cc07b0f1ab42e0a003c1c6312d6e92aaf1353912 GIT binary patch literal 20 bcmZQ#U}j)pU}a!q5MmH!5MdBy5MuxU1B3v1 literal 0 HcmV?d00001 diff --git a/graphics/contest/clink_tilemap6.bin b/graphics/contest/clink_tilemap6.bin new file mode 100755 index 0000000000000000000000000000000000000000..f3939831e12f93ee3f3c8a89594dff9490e3d721 GIT binary patch literal 20 ccmX@WaFF2;!(oOa3>O$KGF)P~%y5MP097alTGXMYofA#9wy>p`e zGcat~vIQst1nhb@vj(;;b!K|4-S{`O+O^sI#YwV+hC0FVdQ&MBb@0O1Bq1poj5 literal 0 HcmV?d00001 diff --git a/graphics/interface_fr/menu.png b/graphics/interface_fr/menu.png new file mode 100755 index 0000000000000000000000000000000000000000..a04c981d5d4b4abc92491723d7f17d38186e8628 GIT binary patch literal 1904 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 B%U%Eg literal 0 HcmV?d00001 diff --git a/graphics/pokenav/header.bin b/graphics/pokenav/header.bin new file mode 100755 index 0000000000000000000000000000000000000000..f405a6dfcfbbacf7f2864d071d019e9c9a0a0084 GIT binary patch literal 2048 zcmeH{w+;d^5JcY*Og1@(Bj*hN|849d9nc_(D`>z=^fV zkR>PCe6@P=HX=ulK6wfhDd8pk^M5^@XO7|nYvkG{iBA4c2o)LEt1iC@`>A znjKU=a6PE%EnTSOPF>S86xv&Osp%)-mMR^^A^m;<<(I@U-xM98@>+cjpacgDbRVj? zwiH~MH>m9Zvrx$YSzFEJXlX^adi3B>%q(fbVp%J%3e_}H|C{Il)oV$@u25*H9NG5) zYaoxHAo>#7BKQ7J{6YHzsHPVwhltmUwQ}72Gcq&oen`WI%DZZ`3ZULkqpWxBw!`)Laz`xrj4{x-EJ&}Ele z#4fwB+Ck>Ph8@fej0WG;e#fb~$Vd;!o0M?FchpU=aPc z*yj0#<7|4zIepkJ*&lkUaA1P7{F?KO0!4EUq%b7>W4JKc<8{Ux_ZuMJdAj9R z|6S6vDL^rXte|^GxBL%sT#|J38;B1EK$RB%+#-PNRh}-6As(G?r)(5#G2mgzbbNK7 z>&`OSm96;?S3hY8QnH63DH78gStCi1La?ICtCEu_rBH&Nk4 zN7@m_9Y^0Y*esH~$oNrGibaU|6t94LlzyWMTYjxU2}Amc6>l82^30yCC_V3E+o_Pt zdsz0l$W&atlK-pT!F>AXZRZ$rqKnv%EHz|1vX7ssld+X?D&rddLSY-*HH8g%zp6$5 aEEDZt`~F4K+#|vuA9%X@xvXZfdYM=E{-7BmUz|xU*&L+jrz?rv47$Eem=48 z14(JdCChFq#_xCD_3uujYM4uheng_)pW1}LXIu$pX9PZdwchfK)w}L<(^BWX2`gn| qHhgT8GIL=0&2)$7_x;D_-*+&0yo!BdtMGk0$f=&LelF{r5}E+N&tQ%K literal 0 HcmV?d00001 diff --git a/graphics/pokenav/left_headers/cute.png b/graphics/pokenav/left_headers/cute.png new file mode 100755 index 0000000000000000000000000000000000000000..6da0f49733e144418fe2405091abb19f782da867 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;4BxV{{;yeb*2@vZfdQb(drt+df!qzAE{-7f@Rpir-tulOlzg;TqnZ-8Wcqyyqo51~<*C8tN7vtFwZ)2vV)*3v2 z{_x(~vBjCkDZ$v<|JLC%3fty8X6!%D5U@ZXAlR5~`Tv5ad=5+>*zDg+*i^k-?4D!a zT)KAV>jwbejMG literal 0 HcmV?d00001 diff --git a/graphics/pokenav/left_headers/hoenn_map.png b/graphics/pokenav/left_headers/hoenn_map.png new file mode 100755 index 0000000000000000000000000000000000000000..7ee6c8e99af847a70ef11f0ab989de115223385d GIT binary patch literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^4nUm1!VDziUuWJ1QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;3<^iHrub3-NU;wDHJLiQp0|TSGr;B5VN9WsVrv(oy@VMM-Gs+n}rIQ4F5fOHnUY;Mi>Py26k-)|?xvn3D_g%@8W4N3gt=<^DaPGVL=NYZ5Q?D}`T}^Yd ze-K-ud0j1%VWONs{SwA4-!4ga9Is=X;C|nMx7(kWw_#hqRn&snhu95Sml_6Cu!ub3 zkPYf)N|HUrB(g_TrR8+HTBw@%t+UDr%YVy1Z-@@9pTfUGFQQ~c-=~E~Vh{G7KByso z!RPCS_=fl2zB}(_((G;2(Oz(xJ-L?g#Hv6$ljnQY4=TtnVRifIu*1ec=75I$5q*9+ gL8-vP=ZEcIb7syfn=2~uMHLjnp00i_>zopr0Dq~j*8l(j literal 0 HcmV?d00001 diff --git a/graphics/pokenav/left_headers/main_menu.png b/graphics/pokenav/left_headers/main_menu.png new file mode 100755 index 0000000000000000000000000000000000000000..713de58b3f292b32a18e14c71473ce6e51c8a3b4 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ipS0MfW|No#MuQhAdd^>9R z|6S6vDL^rXEo-XpU0u>#?FHh%08k|hSB3$QyVcXhF~pIN#4sjxMj!IRZ))raUr@zfv*|TkRVBxgt@4d4Kglw-^GWPKxKKGEIQsX5f8x0vo0wk< ztm6;3-|+6aV=D92)gROLR7Gr&I-O;__L<=hwUY;Dnm+dX&&%`rQ)N^-gN0*%>H+nL jHUAxVT|U3~!R|W@$_by>C$zjX1Nq0()z4*}Q$iB}*pzw< literal 0 HcmV?d00001 diff --git a/graphics/pokenav/left_headers/match_call.png b/graphics/pokenav/left_headers/match_call.png new file mode 100755 index 0000000000000000000000000000000000000000..5de8e41ab10f87d2011a03223db45f8175e23795 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ipS0MfW|No#MuQhAdd^>9R z|6S6vDL^rX|Bed(r$lW5F;PJF;bYZ6fvuh{jv*eMZ?Bx@J*>dP_Fzpye!~1c%PcEf z*Im%ej^py2y(^3V=>dNik1w8TjvMYa0` f&E416bp8{=Fa2Mj-y1yT#!heW>AV2pWu@7_xX>rmiJ~aHSc-Nu73yQ NOHWrnmvv4FO#pLAg^vIL literal 0 HcmV?d00001 diff --git a/graphics/pokenav/left_headers/ribbons.png b/graphics/pokenav/left_headers/ribbons.png new file mode 100755 index 0000000000000000000000000000000000000000..ed4f94b93089aba06d5078100227eb3603dc3cac GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ipS0MfW|No#MuQhAdd^>9R z|6S6vDL^rXZ&_LY*DN{fE#WG*63IA) zH79TbTf9!1R@e!y`co1@Kg1`0(M&4ToA=Ma?|$aV|L!#M=eBqVe-UtD z_;u!LlbZB}+PGy#MfwKw_Wv~!YnMB+i<`ytrQR0*gv;+2OpyuHyIbP0l+XkK4K{cN literal 0 HcmV?d00001 diff --git a/graphics/pokenav/left_headers/smart.png b/graphics/pokenav/left_headers/smart.png new file mode 100755 index 0000000000000000000000000000000000000000..e959df2b8ac268b326ec98add68432f822e910e9 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;3<^iHrub3-NU;wDHJLiQpkh|a0#WBR9_w1yNyoU{VShgOr-^9Qv z9_QR9zFB+S1W}vR6)YW^r!+6kykf5Y@T*A3yp^XIbgt%aNL*HUSUiAJ@hi(R-UtRa zH-&c>8)I+g2(0`1_TCrXMeW}bu1ES_JvA|lrSg~Hl9&C0XBzb9E%1FH>*$?Z&uH$e zp26v1xAD8&KbE!r6PC*#+;vTJ)fM--i%uz(c4@tC(mZABvRGz9p!kASZg&ma8D13C uIGj)rDY0bnv22)f*q%?{;RM4S_2b+#72SCiV&~5X`OMSR&t;ucLK6U>sdj<@ literal 0 HcmV?d00001 diff --git a/graphics/pokenav/left_headers/tough.png b/graphics/pokenav/left_headers/tough.png new file mode 100755 index 0000000000000000000000000000000000000000..fbb4715729633cf3495a51ded0226ace1fb57de5 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;3<^iHrub3-NU;wDHJLiQpkh{v$#WBR9_w2=kyoU`qSOeC72oz`7 z$RVa(()z~U$x}&H;!<{Kbj-bjKmYWUTP|*#{#lm6NaL=;misJzzyC5Cv=lb~5SeSV zt;p)iTk9!rxAUcQPkE4$*!W^ugL#LY@r{2zZ8zm&6}2Mv3yH39krW52+A;f?gY3O|N^SBI8!pTCXQwNSj6d9~|!r;~S4rL% zHa>}JnU$6ou@{kyDZnb?Gs zl@T`g_TDPh{mjIz9?X{h+Ow{xU1aw4&Fj^E)S6B7yrY)=|89!PKDl*{+b7g(x1#dlo2;6@33w{}Cvm<>}%W!Z9;B;Q+&_#7u_?SuL8*>Yi$<1_1}OR_5@q jx!q9pb#7FU=vHCaA0YX>ZTrEWAmcn;{an^LB{Ts5z$`05 literal 0 HcmV?d00001 diff --git a/graphics/pokenav/options/beauty.png b/graphics/pokenav/options/beauty.png new file mode 100755 index 0000000000000000000000000000000000000000..194cc0c5395adea3d35685fbbc7fe38938bd180c GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;3|T?(QA$$SaYUmL)S@`Mve!sWpi?_ z|6)mNd#7%5xcKr^@r7q1o=Yb)Es#jHSm+YIhHLMZ`3H-BvtDC2`(ViOK|Vc$SFmrH ypr7Xk_ZpVRtZxdQe&eo5mfO$#ztW|`x?g&=J7Z>o`*m56D?MHPT-G@yGywqWlVwQ& literal 0 HcmV?d00001 diff --git a/graphics/pokenav/options/cancel.png b/graphics/pokenav/options/cancel.png new file mode 100755 index 0000000000000000000000000000000000000000..4093674a48d4e3b0bfe860764fbcbf7093d3ddd3 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;3|rPz-@Ce`x!McFfdQaO7Oo5fAa{FWe4iY*;kr5t4& zwjbcpNj&sFR=?riZHD_h^mGo#&CUyQah-A^DK+EeAITCsdq$hqeV;j%Id(enJ27W4 zy-RH4oS9hF#39%6{$Xvy7X>%jgwH=Y_f0(h{(yZyhy3RXh8u_fF_dKRnAFZmYb#w};>oCTHTbmi3NY zOcwL)ohN?&6Eo0OJ77L9qb1~G)2fH7776bEYj@cFSBCQ4g@0AvGu9vAGULDK{OQ5- k3}2oPv+e$|Pph?IT=0eeZhKql5s*(jUHx3vIVCg!01Lu+8vpZfdcWKE{-7Bn<=527`VZN|NAirUCwD77m z1=@F}czoBKq@X3WWOK~kb7Cv)CM}qC-gr)wn<3+oH%!Vrd%52*H?%ujuIl0wKds?8 u@!8~s%YF*#ocnLM#lrsJzvTZPKON`oa1_&*7g==>WVffQpUXO@geCxKTuUYZ literal 0 HcmV?d00001 diff --git a/graphics/pokenav/options/cute.png b/graphics/pokenav/options/cute.png new file mode 100755 index 0000000000000000000000000000000000000000..9aad1e9614778fd99bace58e612dd3fc87c02035 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;4BxV{{;yeb*2@vZfdQb(drt+df!usg7sn8b-nSPH@*Ys&U=0Xs;5~KH z^!DZWgQ9abt?(6I@OE#fgUy~5j2)}^y#gLSmMqg_N_=PP5VAymniXS~fsptE)*0SA z77D&of0UTKRjU4s9iMJkz>2SqXWiRo9qVtf_}9Pi=tto-wQFi?-aKZRwn}Ux$MUJG PK`!xh^>bP0l+XkK)3aAV literal 0 HcmV?d00001 diff --git a/graphics/pokenav/options/hoenn_map.png b/graphics/pokenav/options/hoenn_map.png new file mode 100755 index 0000000000000000000000000000000000000000..00e9724dc6d433efb941c97b8793317e2e6521d7 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;3<^iHrub3-NU;wDHJLiQpkh{mz#WBR9_v(d%yoU`qSOdZucpY?{ zj&PjinyI=tWag&(etaA6YOM_k)%vx3`3we^;%Jitb8>Clb8qKO5_)q+^xf+y2cFCY zPfQKOExvE~b#%9_K_O$Rb=8zjTTb5T$;ixZsf^g){^q)Tg1ozt&749ZqcTUMma8GX zpIGExwXiQW3Mu~}7&3v!Bq8kBWPv4ro@QuGRuFwP`Lc|)1YhHmCl>6N^7r?Am|Fd1 r!9B+szDv!q=L&iE?>zqhz*AefhGe0P`Fe5>K;H6n^>bP0l+XkK4taW1 literal 0 HcmV?d00001 diff --git a/graphics/pokenav/options/match_call.png b/graphics/pokenav/options/match_call.png new file mode 100755 index 0000000000000000000000000000000000000000..6c7effc9b0244ead9bb964e59f947925d0d2054b GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;4F4S!{!fY80%D?o?8C>ZfdacdT^vI!daqu%$a&a+hb3Tb!L0*_x^HB( zq_m!y6zH{VP0Hkeo2`GQTso!L;-2H}zU9~=&amFEa(#~@B6cb;^UD3+r(oEF+ mfQ&eEHuCpX)g0$Vq6Z>0>qwDXmM87$o@1ePt;gKVQ(Vla~ zuE%2HJ7&CQV=!PS>+iDd^7Y;#c4~pJI7eyFwxqsuOaGnO;QP^CW20%-mqnAq6j%c; zh(>g9M>sxz%Cq#Sp5zWjrEA^S^}ek8*1eo(k-!Fq37aQ`Iohx>|2$yI=~TCvd7oKe z!>ljXx}4wH`jS0s?%Z(y%lDt5l5N^YYo8An?BtqEj>$jd-5~JAed6?8IUo;uy85}S Ib4q9e04{=m(*OVf literal 0 HcmV?d00001 diff --git a/graphics/pokenav/options/ribbons.png b/graphics/pokenav/options/ribbons.png new file mode 100755 index 0000000000000000000000000000000000000000..6b7daaa6a87cd71d52c728f9fadd0fd6e6e8953c GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;4F4S!{!fY80%D?o?8C>ZfdcD1T^vI!df!es&C9IFJpuLtl)uorv6TsQxZQvur%8$PKiupKAKj`_PsV;Ni}H^SKRffkx``yYv&z! zz!>b_%zpcmN*4PJi{eLi?cP4CoGjAcF35Sk{=l`b<_#iW6ps45;FC~%z_8Ffp-v`Y z2VczH#f=sf3@(0?+2u|98CBl%wRk8!G_!f7ueHciq;P??#r3b|A9`)-*#CT**aL+nn{L$*Pne(9@mb(dL}-xnhOhKdwE;$`^2M zYCFLB!Zm?q@650S_DPSM;<}$~6MyjZ^t504%}g&3IcO=oZFf3;^m aZ0tAZFl3HnesA#tb3-NU;wDHJLiQpklXF);uvDl`}V>?&cg;gtO08m>~Adn zH0!LVc15dCzj6E4i(!@ s@qKKQ63)LB|8c~oj{V=~jt>_7=B?HoS!wg*Pk>zM>FVdQ&MBb@0MVXhjQ{`u literal 0 HcmV?d00001 diff --git a/graphics/pokenav/options/switch_off.png b/graphics/pokenav/options/switch_off.png new file mode 100755 index 0000000000000000000000000000000000000000..01b5393838732e7e13e670d6fefdfe5da649f9ac GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;3|rPz-@Ce`x!McFfdQaO7Oo5fAor-Ji(`mI@6`*|LWdQ2SOV55+-+F9 zLoLLrDR$Y@DUs6ZZWH1sp7gmgqcXW=i{hGnhgeqstm4^vP1QRnc%rPHQnwT51z{eR z*9UD}zFm;xszrjEI^r0MUR)>q5 zHuOjc-nv#TX8Cjm-v-Vbne03NH?mcfx%%Jmix&GM63FCivB}_A;H4e4b011qdWd-1 zDlqX`e7KOza%=_PgvRUPb`3@c@<08Mub6#Yv{UBAy#GOqE`a>!>FVdQ&MBb@0GsW3 At^fc4 literal 0 HcmV?d00001 diff --git a/graphics/pokenav/options/tough.png b/graphics/pokenav/options/tough.png new file mode 100755 index 0000000000000000000000000000000000000000..bea12edbe6f4b36fb167289e38b1061478f19893 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+A9B|Ns9%L0)Uttoe4- z@c+A{XH$S;3|rPz-@Ce`x!McFfdQaO7Oo5fAh*iX#WBR9_w9v)oCgdzSOda4q(e4& zG;61{zOi>Qb#l~wG9ix3bkgC)Q-3h-()YM<^Sberru3C3s{9qMC@XCL+fh(#0L1{bgKFLY=A8fk=H}*eASpqEO3i~(@54q?0004_ zNkl?vHB#%$gKXJ20jo9}4>JKsbGI;HXS9W0wa0yG-bnTsFna0a{q9`bTs zU{hEw6g~r*&McM=@RJ&IPB|eXjTlpsMK%f2;N}6OQF@6~9(j;08{-kk+Dtr*1n>gn zWI(2c(kH+aY54*iEMOsXFXY`yjF@>pd5hjWF%}b{JC__X$U5xo_mAap`U!RQt0000$@ + +$(pknvoptionsdir)/options.4bpp: $(pknvoptionsdir)/hoenn_map.4bpp $(pknvoptionsdir)/condition.4bpp $(pknvoptionsdir)/match_call.4bpp $(pknvoptionsdir)/ribbons.4bpp $(pknvoptionsdir)/switch_off.4bpp $(pknvoptionsdir)/party.4bpp $(pknvoptionsdir)/search.4bpp $(pknvoptionsdir)/cool.4bpp $(pknvoptionsdir)/beauty.4bpp $(pknvoptionsdir)/cute.4bpp $(pknvoptionsdir)/smart.4bpp $(pknvoptionsdir)/tough.4bpp $(pknvoptionsdir)/cancel.4bpp + @cat $^ >$@ + +$(pknvdir)/header.4bpp: $(pknvdir)/header.png + $(GFX) $< $@ -num_tiles 53