diff --git a/asm/item_menu.s b/asm/item_menu.s index 9aedd3f5b..db3d38668 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 64644504e..fac6ed72a 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 7c927399f..1624fddca 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 a222c43f9..5f9e01974 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 a01117868..35df4d6b7 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 2ac0915c9..528b88d2d 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 e55f03fab..77d17a047 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 89ec3c3a6..82eee2446 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 000000000..12d57c07e Binary files /dev/null and b/graphics/berry_blender/arrow_old.png differ diff --git a/graphics/contest/clink_tilemap1.bin b/graphics/contest/clink_tilemap1.bin new file mode 100755 index 000000000..e22f21839 Binary files /dev/null and b/graphics/contest/clink_tilemap1.bin differ diff --git a/graphics/contest/clink_tilemap10.bin b/graphics/contest/clink_tilemap10.bin new file mode 100755 index 000000000..2a91bb78d --- /dev/null +++ b/graphics/contest/clink_tilemap10.bin @@ -0,0 +1 @@ +å@æ@ç@è@é@õ@ö@÷@ø@ù@ \ No newline at end of file diff --git a/graphics/contest/clink_tilemap11.bin b/graphics/contest/clink_tilemap11.bin new file mode 100755 index 000000000..3b46e00b8 Binary files /dev/null and b/graphics/contest/clink_tilemap11.bin differ diff --git a/graphics/contest/clink_tilemap2.bin b/graphics/contest/clink_tilemap2.bin new file mode 100755 index 000000000..21c804d12 Binary files /dev/null and b/graphics/contest/clink_tilemap2.bin differ diff --git a/graphics/contest/clink_tilemap3.bin b/graphics/contest/clink_tilemap3.bin new file mode 100755 index 000000000..d4bb7bae7 Binary files /dev/null and b/graphics/contest/clink_tilemap3.bin differ diff --git a/graphics/contest/clink_tilemap4.bin b/graphics/contest/clink_tilemap4.bin new file mode 100755 index 000000000..32f24abd6 Binary files /dev/null and b/graphics/contest/clink_tilemap4.bin differ diff --git a/graphics/contest/clink_tilemap5.bin b/graphics/contest/clink_tilemap5.bin new file mode 100755 index 000000000..cc07b0f1a Binary files /dev/null and b/graphics/contest/clink_tilemap5.bin differ diff --git a/graphics/contest/clink_tilemap6.bin b/graphics/contest/clink_tilemap6.bin new file mode 100755 index 000000000..f3939831e Binary files /dev/null and b/graphics/contest/clink_tilemap6.bin differ diff --git a/graphics/contest/clink_tilemap7.bin b/graphics/contest/clink_tilemap7.bin new file mode 100755 index 000000000..fe02ec0b5 --- /dev/null +++ b/graphics/contest/clink_tilemap7.bin @@ -0,0 +1 @@ +ÅÆÇÈÉÕÖ×ØÙ \ No newline at end of file diff --git a/graphics/contest/clink_tilemap8.bin b/graphics/contest/clink_tilemap8.bin new file mode 100755 index 000000000..d37d6df3c --- /dev/null +++ b/graphics/contest/clink_tilemap8.bin @@ -0,0 +1 @@ +Ê Ë Ì Í Î Ú Û Ü Ý Þ \ No newline at end of file diff --git a/graphics/contest/clink_tilemap9.bin b/graphics/contest/clink_tilemap9.bin new file mode 100755 index 000000000..79d2e3fbb --- /dev/null +++ b/graphics/contest/clink_tilemap9.bin @@ -0,0 +1 @@ +à0á0â0ã0ä0ð0ñ0ò0ó0ô0 \ No newline at end of file diff --git a/graphics/interface/hm.png b/graphics/interface/hm.png new file mode 100755 index 000000000..d6c7e8de9 Binary files /dev/null and b/graphics/interface/hm.png differ diff --git a/graphics/interface_fr/menu.png b/graphics/interface_fr/menu.png new file mode 100755 index 000000000..a04c981d5 Binary files /dev/null and b/graphics/interface_fr/menu.png differ diff --git a/graphics/interface_fr/menu1.pal b/graphics/interface_fr/menu1.pal new file mode 100755 index 000000000..ab57da621 --- /dev/null +++ b/graphics/interface_fr/menu1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 156 131 +238 238 238 +0 0 0 +213 213 189 +172 164 123 +255 131 123 +238 49 0 +222 49 16 +197 49 41 +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_fr/menu2.pal b/graphics/interface_fr/menu2.pal new file mode 100755 index 000000000..16a03be2c --- /dev/null +++ b/graphics/interface_fr/menu2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 156 131 +238 49 0 +246 131 49 +255 180 16 +222 230 49 +123 205 82 +156 222 222 +106 148 246 +164 65 164 +172 172 123 +222 222 197 +189 164 57 +255 90 139 +82 123 139 +65 65 65 +255 255 255 diff --git a/graphics/interface_fr/menu3.pal b/graphics/interface_fr/menu3.pal new file mode 100755 index 000000000..99b5b3464 --- /dev/null +++ b/graphics/interface_fr/menu3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +255 255 255 +230 230 230 +197 197 197 +238 238 238 +197 197 197 +148 148 148 +255 0 0 +180 0 0 +255 197 197 +82 82 255 +49 49 180 +197 197 255 diff --git a/graphics/pokedex/area_unknown.png b/graphics/pokedex/area_unknown.png new file mode 100755 index 000000000..ebde8d6fc Binary files /dev/null and b/graphics/pokedex/area_unknown.png differ diff --git a/graphics/pokenav/cancel.pal b/graphics/pokenav/cancel.pal new file mode 100755 index 000000000..f32b77d07 --- /dev/null +++ b/graphics/pokenav/cancel.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +255 255 139 +0 0 0 +255 180 8 +106 106 123 +0 0 8 +246 115 82 +255 123 90 +156 172 164 +246 189 131 +255 197 139 +222 246 230 +230 255 222 +238 246 246 +255 255 255 +0 98 98 +0 0 0 +255 255 139 +123 123 156 +246 255 255 +106 106 123 +0 0 8 +246 115 82 +255 123 90 +156 172 164 +246 189 131 +255 197 139 +222 246 230 +230 255 222 +238 246 246 +255 255 255 +0 98 98 +0 0 0 diff --git a/graphics/pokenav/cancel.png b/graphics/pokenav/cancel.png new file mode 100755 index 000000000..1d57a4488 Binary files /dev/null and b/graphics/pokenav/cancel.png differ diff --git a/graphics/pokenav/condition.bin b/graphics/pokenav/condition.bin new file mode 100755 index 000000000..4c04c5f0d Binary files /dev/null and b/graphics/pokenav/condition.bin differ diff --git a/graphics/pokenav/condition.png b/graphics/pokenav/condition.png new file mode 100755 index 000000000..eadd2c0aa Binary files /dev/null and b/graphics/pokenav/condition.png differ diff --git a/graphics/pokenav/header.bin b/graphics/pokenav/header.bin new file mode 100755 index 000000000..f405a6dfc Binary files /dev/null and b/graphics/pokenav/header.bin differ diff --git a/graphics/pokenav/header.png b/graphics/pokenav/header.png new file mode 100755 index 000000000..7fe891e22 Binary files /dev/null and b/graphics/pokenav/header.png differ diff --git a/graphics/pokenav/left_headers/beauty.png b/graphics/pokenav/left_headers/beauty.png new file mode 100755 index 000000000..a9a85ce0c Binary files /dev/null and b/graphics/pokenav/left_headers/beauty.png differ diff --git a/graphics/pokenav/left_headers/condition.png b/graphics/pokenav/left_headers/condition.png new file mode 100755 index 000000000..aaece5a38 Binary files /dev/null and b/graphics/pokenav/left_headers/condition.png differ diff --git a/graphics/pokenav/left_headers/cool.png b/graphics/pokenav/left_headers/cool.png new file mode 100755 index 000000000..4dd069495 Binary files /dev/null and b/graphics/pokenav/left_headers/cool.png differ diff --git a/graphics/pokenav/left_headers/cute.png b/graphics/pokenav/left_headers/cute.png new file mode 100755 index 000000000..6da0f4973 Binary files /dev/null and b/graphics/pokenav/left_headers/cute.png differ diff --git a/graphics/pokenav/left_headers/hoenn_map.png b/graphics/pokenav/left_headers/hoenn_map.png new file mode 100755 index 000000000..7ee6c8e99 Binary files /dev/null and b/graphics/pokenav/left_headers/hoenn_map.png differ diff --git a/graphics/pokenav/left_headers/main_menu.png b/graphics/pokenav/left_headers/main_menu.png new file mode 100755 index 000000000..713de58b3 Binary files /dev/null and b/graphics/pokenav/left_headers/main_menu.png differ diff --git a/graphics/pokenav/left_headers/match_call.png b/graphics/pokenav/left_headers/match_call.png new file mode 100755 index 000000000..5de8e41ab Binary files /dev/null and b/graphics/pokenav/left_headers/match_call.png differ diff --git a/graphics/pokenav/left_headers/palette.pal b/graphics/pokenav/left_headers/palette.pal new file mode 100755 index 000000000..eb13b1a87 --- /dev/null +++ b/graphics/pokenav/left_headers/palette.pal @@ -0,0 +1,83 @@ +JASC-PAL +0100 +80 +0 0 0 +255 255 255 +82 82 74 +172 172 172 +246 197 49 +255 238 98 +230 148 0 +0 0 0 +32 197 106 +148 255 98 +74 139 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 255 255 +82 82 74 +172 172 172 +246 197 49 +255 238 98 +230 148 0 +0 0 0 +106 82 222 +197 180 255 +82 65 164 +98 197 246 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 255 255 +82 82 74 +172 172 172 +246 197 49 +255 238 98 +230 148 0 +0 0 0 +246 106 106 +255 172 164 +205 74 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 255 255 +82 82 74 +172 172 172 +246 197 49 +255 238 98 +230 148 0 +0 0 0 +180 172 123 +222 213 164 +131 123 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 255 255 +82 82 74 +172 172 172 +246 197 49 +255 238 98 +230 148 0 +0 0 0 +255 65 32 +255 148 90 +180 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/left_headers/party.png b/graphics/pokenav/left_headers/party.png new file mode 100755 index 000000000..39e0461b1 Binary files /dev/null and b/graphics/pokenav/left_headers/party.png differ diff --git a/graphics/pokenav/left_headers/ribbons.png b/graphics/pokenav/left_headers/ribbons.png new file mode 100755 index 000000000..ed4f94b93 Binary files /dev/null and b/graphics/pokenav/left_headers/ribbons.png differ diff --git a/graphics/pokenav/left_headers/search.png b/graphics/pokenav/left_headers/search.png new file mode 100755 index 000000000..7e01e7779 Binary files /dev/null and b/graphics/pokenav/left_headers/search.png differ diff --git a/graphics/pokenav/left_headers/smart.png b/graphics/pokenav/left_headers/smart.png new file mode 100755 index 000000000..e959df2b8 Binary files /dev/null and b/graphics/pokenav/left_headers/smart.png differ diff --git a/graphics/pokenav/left_headers/tough.png b/graphics/pokenav/left_headers/tough.png new file mode 100755 index 000000000..fbb471572 Binary files /dev/null and b/graphics/pokenav/left_headers/tough.png differ diff --git a/graphics/pokenav/marker.png b/graphics/pokenav/marker.png new file mode 100755 index 000000000..818446557 Binary files /dev/null and b/graphics/pokenav/marker.png differ diff --git a/graphics/pokenav/message.bin b/graphics/pokenav/message.bin new file mode 100755 index 000000000..5f9930568 Binary files /dev/null and b/graphics/pokenav/message.bin differ diff --git a/graphics/pokenav/message.png b/graphics/pokenav/message.png new file mode 100755 index 000000000..7df840d3a Binary files /dev/null and b/graphics/pokenav/message.png differ diff --git a/graphics/pokenav/options/beauty.png b/graphics/pokenav/options/beauty.png new file mode 100755 index 000000000..194cc0c53 Binary files /dev/null and b/graphics/pokenav/options/beauty.png differ diff --git a/graphics/pokenav/options/cancel.png b/graphics/pokenav/options/cancel.png new file mode 100755 index 000000000..4093674a4 Binary files /dev/null and b/graphics/pokenav/options/cancel.png differ diff --git a/graphics/pokenav/options/condition.png b/graphics/pokenav/options/condition.png new file mode 100755 index 000000000..8820babbd Binary files /dev/null and b/graphics/pokenav/options/condition.png differ diff --git a/graphics/pokenav/options/cool.png b/graphics/pokenav/options/cool.png new file mode 100755 index 000000000..e87a10810 Binary files /dev/null and b/graphics/pokenav/options/cool.png differ diff --git a/graphics/pokenav/options/cute.png b/graphics/pokenav/options/cute.png new file mode 100755 index 000000000..9aad1e961 Binary files /dev/null and b/graphics/pokenav/options/cute.png differ diff --git a/graphics/pokenav/options/hoenn_map.png b/graphics/pokenav/options/hoenn_map.png new file mode 100755 index 000000000..00e9724dc Binary files /dev/null and b/graphics/pokenav/options/hoenn_map.png differ diff --git a/graphics/pokenav/options/match_call.png b/graphics/pokenav/options/match_call.png new file mode 100755 index 000000000..6c7effc9b Binary files /dev/null and b/graphics/pokenav/options/match_call.png differ diff --git a/graphics/pokenav/options/options.bin b/graphics/pokenav/options/options.bin new file mode 100755 index 000000000..b7928d640 --- /dev/null +++ b/graphics/pokenav/options/options.bin @@ -0,0 +1 @@ +ÁÂÂÂÂÂÂÂÃÄÅÄÅÆÇÇÇÇÇÇÇÈ \ No newline at end of file diff --git a/graphics/pokenav/options/options.pal b/graphics/pokenav/options/options.pal new file mode 100755 index 000000000..eb13b1a87 --- /dev/null +++ b/graphics/pokenav/options/options.pal @@ -0,0 +1,83 @@ +JASC-PAL +0100 +80 +0 0 0 +255 255 255 +82 82 74 +172 172 172 +246 197 49 +255 238 98 +230 148 0 +0 0 0 +32 197 106 +148 255 98 +74 139 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 255 255 +82 82 74 +172 172 172 +246 197 49 +255 238 98 +230 148 0 +0 0 0 +106 82 222 +197 180 255 +82 65 164 +98 197 246 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 255 255 +82 82 74 +172 172 172 +246 197 49 +255 238 98 +230 148 0 +0 0 0 +246 106 106 +255 172 164 +205 74 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 255 255 +82 82 74 +172 172 172 +246 197 49 +255 238 98 +230 148 0 +0 0 0 +180 172 123 +222 213 164 +131 123 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 255 255 +82 82 74 +172 172 172 +246 197 49 +255 238 98 +230 148 0 +0 0 0 +255 65 32 +255 148 90 +180 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/options/party.png b/graphics/pokenav/options/party.png new file mode 100755 index 000000000..67a1f231f Binary files /dev/null and b/graphics/pokenav/options/party.png differ diff --git a/graphics/pokenav/options/ribbons.png b/graphics/pokenav/options/ribbons.png new file mode 100755 index 000000000..6b7daaa6a Binary files /dev/null and b/graphics/pokenav/options/ribbons.png differ diff --git a/graphics/pokenav/options/search.png b/graphics/pokenav/options/search.png new file mode 100755 index 000000000..946d0cac7 Binary files /dev/null and b/graphics/pokenav/options/search.png differ diff --git a/graphics/pokenav/options/smart.png b/graphics/pokenav/options/smart.png new file mode 100755 index 000000000..b0665aadb Binary files /dev/null and b/graphics/pokenav/options/smart.png differ diff --git a/graphics/pokenav/options/switch_off.png b/graphics/pokenav/options/switch_off.png new file mode 100755 index 000000000..01b539383 Binary files /dev/null and b/graphics/pokenav/options/switch_off.png differ diff --git a/graphics/pokenav/options/tough.png b/graphics/pokenav/options/tough.png new file mode 100755 index 000000000..bea12edbe Binary files /dev/null and b/graphics/pokenav/options/tough.png differ diff --git a/graphics/pokenav/zoom.png b/graphics/pokenav/zoom.png new file mode 100755 index 000000000..4e2b41be6 Binary files /dev/null and b/graphics/pokenav/zoom.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 8f33245a2..78ebad569 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -14,6 +14,8 @@ bttransgfxdir := graphics/battle_transitions typesdir := graphics/types raydir := graphics/rayquaza_scene roulgfxdir := graphics/roulette +pknvdir := graphics/pokenav/ +pknvoptionsdir := graphics/pokenav/options 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 @@ -420,3 +422,9 @@ $(bttransgfxdir)/frontier_square_3.4bpp: $(bttransgfxdir)/frontier_squares_blank $(bttransgfxdir)/frontier_square_4.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp $(bttransgfxdir)/frontier_squares_4.4bpp @cat $^ >$@ + +$(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