diff options
44 files changed, 298 insertions, 97 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index de694322b..96fa15924 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -238212,7 +238212,7 @@ _080EEE90: bl LZ77UnCompVram b _080EEF18 .align 2, 0 -_080EEE9C: .4byte gUnknown_08E88D4C +_080EEE9C: .4byte gPokenavHoennMapMisc_Gfx _080EEEA0: .4byte 0x0600c000 _080EEEA4: ldr r0, _080EEEB0 @@ -238229,7 +238229,7 @@ _080EEEB8: bl LoadPalette b _080EEF18 .align 2, 0 -_080EEEC4: .4byte gUnknown_08E89628 +_080EEEC4: .4byte gPokenavHoennMap1_Pal _080EEEC8: movs r0, 0 bl sub_80EF58C @@ -239546,7 +239546,7 @@ _080EF92C: bl LZ77UnCompVram b _080EF9DC .align 2, 0 -_080EF938: .4byte gUnknown_08E892C4 +_080EF938: .4byte gPokenavHoennMapSquares_Gfx _080EF93C: .4byte 0x06005000 _080EF940: ldr r0, _080EF950 @@ -239556,7 +239556,7 @@ _080EF940: bl sub_80EFC3C b _080EF9DC .align 2, 0 -_080EF950: .4byte gUnknown_08E89648 +_080EF950: .4byte gPokenavHoennMapSquares_Pal _080EF954: bl sub_80EFC64 lsls r0, 24 @@ -240428,7 +240428,7 @@ _080F0028: bl LZ77UnCompVram b _080F0154 .align 2, 0 -_080F0034: .4byte gUnknown_08E89AD8 +_080F0034: .4byte gPokenavConditionView_Gfx _080F0038: .4byte 0x06005000 _080F003C: ldr r0, _080F0050 @@ -240442,7 +240442,7 @@ _080F003C: .align 2, 0 _080F0050: .4byte gUnknown_08E9AC4C _080F0054: .4byte 0x0600f000 -_080F0058: .4byte gUnknown_08E8A1C0 +_080F0058: .4byte gPokenavConditionMenu2_Pal _080F005C: ldr r0, _080F0088 ldr r0, [r0] @@ -240507,7 +240507,7 @@ _080F00AC: .align 2, 0 _080F00EC: .4byte gUnknown_083E0254 _080F00F0: .4byte gUnknownPalette_81E6692 -_080F00F4: .4byte gUnknown_08E8A1C0 + 0x2 +_080F00F4: .4byte gPokenavConditionMenu2_Pal + 0x2 _080F00F8: ldr r0, _080F0110 ldr r0, [r0] @@ -243347,7 +243347,7 @@ _080F17FE: bl LZ77UnCompVram b _080F1914 .align 2, 0 -_080F1808: .4byte gUnknown_08E89AD8 +_080F1808: .4byte gPokenavConditionView_Gfx _080F180C: .4byte 0x06005000 _080F1810: ldr r0, _080F1824 @@ -243361,7 +243361,7 @@ _080F1810: .align 2, 0 _080F1824: .4byte gUnknown_08E9AC4C _080F1828: .4byte 0x0600f000 -_080F182C: .4byte gUnknown_08E8A1C0 +_080F182C: .4byte gPokenavConditionMenu2_Pal _080F1830: ldr r0, _080F1850 ldr r3, _080F1854 @@ -243417,7 +243417,7 @@ _080F186C: .align 2, 0 _080F18AC: .4byte gUnknown_083E0254 _080F18B0: .4byte gUnknownPalette_81E6692 -_080F18B4: .4byte gUnknown_08E8A1C0 + 0x2 +_080F18B4: .4byte gPokenavConditionMenu2_Pal + 0x2 _080F18B8: ldr r0, _080F18D0 ldr r0, [r0] @@ -243754,7 +243754,7 @@ _080F1B34: lsls r2, 2 b _080F1B44 .align 2, 0 -_080F1B3C: .4byte gUnknown_08E884CC +_080F1B3C: .4byte gPokenavMenuOptions_Gfx _080F1B40: ldr r0, _080F1B4C ldr r2, _080F1B50 @@ -243763,7 +243763,7 @@ _080F1B44: bl LZ77UnCompWram b _080F1B6C .align 2, 0 -_080F1B4C: .4byte gUnknown_08E89668 +_080F1B4C: .4byte gPokenavConditionMenu_Gfx _080F1B50: .4byte 0x00001788 _080F1B54: ldr r0, _080F1B64 @@ -243773,7 +243773,7 @@ _080F1B54: movs r0, 0 b _080F1B7C .align 2, 0 -_080F1B64: .4byte gUnknown_08E8AD04 +_080F1B64: .4byte gPokenavConditionSearch_Gfx _080F1B68: .4byte 0x00002388 _080F1B6C: ldr r0, _080F1B84 @@ -245105,9 +245105,9 @@ _080F2532: ldr r0, _080F2554 b _080F257A .align 2, 0 -_080F254C: .4byte gUnknown_08E88A28 +_080F254C: .4byte gPokenavMenuOptions1_Pal _080F2550: .4byte 0xffff0000 -_080F2554: .4byte gUnknown_08E88A48 +_080F2554: .4byte gPokenavMenuOptions2_Pal _080F2558: ldr r0, _080F2564 str r0, [sp] @@ -245116,7 +245116,7 @@ _080F2558: strh r0, [r1, 0x4] b _080F2580 .align 2, 0 -_080F2564: .4byte gUnknown_08E89958 +_080F2564: .4byte gPokenavConditionMenu_Pal _080F2568: ldr r0, _080F2590 str r0, [sp] @@ -245139,8 +245139,8 @@ _080F2586: pop {r0} bx r0 .align 2, 0 -_080F2590: .4byte gUnknown_08E8B1C4 -_080F2594: .4byte gUnknown_08E8B1E4 +_080F2590: .4byte gPokenavCondition6_Pal +_080F2594: .4byte gPokenavCondition7_Pal thumb_func_end sub_80F2514 thumb_func_start sub_80F2598 @@ -245326,7 +245326,7 @@ _080F2704: ldr r2, _080F2718 b _080F279C .align 2, 0 -_080F2710: .4byte gUnknown_08E88358 +_080F2710: .4byte gPokenavMainMenu_Gfx _080F2714: .4byte gUnknown_083DFEC4 _080F2718: .4byte 0x00003b98 _080F271C: @@ -245336,7 +245336,7 @@ _080F271C: ldr r2, _080F2730 b _080F279C .align 2, 0 -_080F2728: .4byte gUnknown_08E89978 +_080F2728: .4byte gPokenavConditionMenuHeader_Gfx _080F272C: .4byte gUnknown_083DFEC4 _080F2730: .4byte 0x00004198 _080F2734: @@ -245346,7 +245346,7 @@ _080F2734: ldr r2, _080F2748 b _080F279C .align 2, 0 -_080F2740: .4byte gUnknown_08E8B3A0 +_080F2740: .4byte gPokenavRibbonsHeader_Gfx _080F2744: .4byte gUnknown_083DFEC4 _080F2748: .4byte 0x00004d98 _080F274C: @@ -245356,7 +245356,7 @@ _080F274C: ldr r2, _080F2760 b _080F279C .align 2, 0 -_080F2758: .4byte gUnknown_08E88A88 +_080F2758: .4byte gPokenavHoennMapHeader_Gfx _080F275C: .4byte gUnknown_083DFEC4 _080F2760: .4byte 0x00005398 _080F2764: @@ -245366,7 +245366,7 @@ _080F2764: ldr r2, _080F2778 b _080F279C .align 2, 0 -_080F2770: .4byte gUnknown_08E8A1E0 +_080F2770: .4byte gPokenavConditionMenuOptions_Gfx _080F2774: .4byte gUnknown_083DFEC4 _080F2778: .4byte 0x00005f98 _080F277C: @@ -245376,7 +245376,7 @@ _080F277C: ldr r2, _080F2790 b _080F279C .align 2, 0 -_080F2788: .4byte gUnknown_08E8A5D8 +_080F2788: .4byte gPokenavConditionMenuOptions2_Gfx _080F278C: .4byte gUnknown_083DFEC4 _080F2790: .4byte 0x00006798 _080F2794: @@ -245389,7 +245389,7 @@ _080F279C: bl LZ77UnCompWram b _080F27C0 .align 2, 0 -_080F27A4: .4byte gUnknown_08E8B204 +_080F27A4: .4byte gPokenavTrainersEyesHeader_Gfx _080F27A8: .4byte gUnknown_083DFEC4 _080F27AC: .4byte 0x00004798 _080F27B0: @@ -255407,7 +255407,7 @@ _080F7558: b _080F75FE .align 2, 0 _080F7580: .4byte 0x020388b8 -_080F7584: .4byte gUnknown_08E8A7C4 +_080F7584: .4byte gPokenavConditionMenuMisc_Gfx _080F7588: .4byte 0x03001770 _080F758C: movs r0, 0x80 @@ -255740,7 +255740,7 @@ _080F7770: b _080F787A .align 2, 0 _080F7820: .4byte 0x020388b8 -_080F7824: .4byte gUnknown_08E8A7C4 +_080F7824: .4byte gPokenavConditionMenuMisc_Gfx _080F7828: .4byte gUnknown_08E966B8 _080F782C: .4byte gUnknown_083E5214 _080F7830: .4byte gSpriteAnimTable_83E52AC diff --git a/data/data2.s b/data/data2.s index 019e8a874..06515cc1b 100644 --- a/data/data2.s +++ b/data/data2.s @@ -21715,31 +21715,42 @@ gUnknown_083E3270:: @ 83E3270 .4byte sub_80F0A24 .4byte sub_80F0A74 + .align 2 gPokenavIconPalette:: .incbin "graphics/pokenav/icon.gbapal" + .align 2 gUnknown_083E329C:: @ 83E329C .incbin "graphics/pokenav/icon.4bpp.lz" -gPokenavContestPokeballTiles:: - .incbin "graphics/pokenav/contest_pokeball.4bpp" + + .align 2 +gPokenavPokeballTiles:: + .incbin "graphics/pokenav/pokeball.4bpp" + + .align 2 gUnknown_083E3780: @ 83E3780 .incbin "baserom.gba", 0x3e3780, 0x20 .align 2 -gContestSparkle_Pal:: - .incbin "graphics/pokenav/contest_sparkle.gbapal" +gPokenavSparkle_Pal:: + .incbin "graphics/pokenav/sparkle.gbapal" .align 2 -gContestSparkle_Gfx:: - .incbin "graphics/pokenav/contest_sparkle.4bpp" +gPokenavSparkle_Gfx:: + .incbin "graphics/pokenav/sparkle.4bpp" + .align 2 gContestArrows_Gfx:: - .incbin "graphics/pokenav/contest_arrows.4bpp" + .incbin "graphics/pokenav/arrows.4bpp" + gUnknown_083E3BC0:: .incbin "baserom.gba", 0x003E3BC0, 0x20 + + .align 2 gTiles_083E3BE0:: .incbin "graphics/unknown/unknown_3E3BE0.4bpp" + .align 2 gUnknown_083E3C60:: @ 83E3C60 .incbin "graphics/misc/ribbons_cool.gbapal" .incbin "graphics/misc/ribbons_beauty.gbapal" @@ -21947,8 +21958,8 @@ gSpriteTemplate_83E4484:: @ 83E4484 spr_template 25, 17, gOamData_83E447C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F2654 gUnknown_083E449C:: @ 83E449C - obj_pal Palette_E88A68, 2 - obj_pal Palette_E8ACE4, 3 + obj_pal gPokenavMenuOptions3_Pal, 2 + obj_pal gPokenavCondition5_Pal, 3 obj_pal 0x0, 0 .align 2 @@ -22100,15 +22111,15 @@ gSpriteAnimTable_83E4620:: @ 83E4620 .align 2 gUnknown_083E4628:: @ 83E4628 - obj_tiles gPokenavContestPokeballTiles, 0x100, 3 + obj_tiles gPokenavPokeballTiles, 0x100, 3 obj_tiles gUnknown_083E3780, 0x20, 4 - obj_tiles gTiles_08E8A498, 0x100, 5 + obj_tiles gPokenavConditionMenuCancel_Gfx, 0x100, 5 null_obj_tiles .align 2 gUnknown_083E4648:: @ 83E4648 - obj_pal PokenavContestPokeballPalette, 4 - obj_pal Palette_E8A5B8, 5 + obj_pal gPokenavConditionPokeball_Pal, 4 + obj_pal gPokenavCondition4_Pal, 5 .space 8 .align 2 @@ -22156,11 +22167,11 @@ gSpriteTemplate_83E476C:: @ 83E476C .align 2 gUnknown_083E4784:: @ 83E4784 - obj_tiles gContestSparkle_Gfx, 896, 0x0017 + obj_tiles gPokenavSparkle_Gfx, 896, 0x0017 .align 2 gUnknown_083E478C:: @ 83E478C - obj_pal gContestSparkle_Pal, 0x000f + obj_pal gPokenavSparkle_Pal, 0x000f gUnknown_083E4794:: @ 83E4794 .incbin "baserom.gba", 0x003e4794, 0x28 @@ -31585,9 +31596,11 @@ gUnknown_08416E34:: @ 8416E34 obj_tiles gIntro2MayTiles, 0x2000, 1003 .space 8 + .align 2 gEvoSparklePalette: @ 8416E44 .incbin "graphics/misc/evo_sparkle.gbapal" + .align 2 gEvoSparkleTiles: @ 8416E64 .incbin "graphics/misc/evo_sparkle.4bpp.lz" diff --git a/data/graphics.s b/data/graphics.s index 89ba9e87c..0c8ffba20 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3669,106 +3669,114 @@ gPokedexMenuSearch_Pal:: @ 8E882D8 .incbin "graphics/pokedex/menu3.gbapal" .align 2 -gUnknown_08E88358:: @ 8E88358 - .incbin "baserom.gba", 0xE88358, 0x173 @ LZ, uncomp. size = 0x600 +gPokenavMainMenu_Gfx:: @ 8E88358 + .incbin "graphics/pokenav/mainmenu.4bpp.lz" .align 2 -gUnknown_08E884CC:: @ 8E884CC - .incbin "baserom.gba", 0xE884CC, 0x55A @ LZ, uncomp. size = 0x1400 +gPokenavMenuOptions_Gfx:: @ 8E884CC + .incbin "graphics/pokenav/menu_options.4bpp.lz" .align 2 -gUnknown_08E88A28:: @ 8E88A28 - .incbin "baserom.gba", 0x00e88a28, 0x20 +gPokenavMenuOptions1_Pal:: @ 8E88A28 + .incbin "graphics/pokenav/pokenav1.gbapal" .align 2 -gUnknown_08E88A48:: @ 8E88A48 - .incbin "baserom.gba", 0xe88a48, 0x20 +gPokenavMenuOptions2_Pal:: @ 8E88A48 + .incbin "graphics/pokenav/pokenav2.gbapal" .align 2 -Palette_E88A68:: @ 8E88A68 - .incbin "baserom.gba", 0xe88a68, 0x20 +gPokenavMenuOptions3_Pal:: @ 8E88A68 + .incbin "graphics/pokenav/pokenav3.gbapal" .align 2 -gUnknown_08E88A88:: @ 8E88A88 - .incbin "baserom.gba", 0xE88A88, 0x2C4 @ LZ, uncomp. size = 0xC00 +gPokenavHoennMapHeader_Gfx:: @ 8E88A88 + .incbin "graphics/pokenav/map_header.4bpp.lz" .align 2 -gUnknown_08E88D4C:: @ 8E88D4C - .incbin "baserom.gba", 0xE88D4C, 0x575 @ LZ, uncomp. size = 0x1200 +gPokenavHoennMapMisc_Gfx:: @ 8E88D4C + .incbin "graphics/pokenav/map_misc2.4bpp.lz" .align 2 -gUnknown_08E892C4:: @ 8E892C4 - .incbin "baserom.gba", 0xE892C4, 0x364 @ LZ, uncomp. size = 0x840 +gPokenavHoennMapSquares_Gfx:: @ 8E892C4 + .incbin "graphics/pokenav/map_squares.4bpp.lz" -gUnknown_08E89628:: @ 8E89628 - .incbin "baserom.gba", 0x00e89628, 0x20 + .align 2 +gPokenavHoennMap1_Pal:: @ 8E89628 + .incbin "graphics/pokenav/map_menu.gbapal" -gUnknown_08E89648:: @ 8E89648 + .align 2 +gPokenavHoennMapSquares_Pal:: @ 8E89648 .incbin "graphics/pokenav/map_squares.gbapal" .align 2 -gUnknown_08E89668:: @ 8E89668 - .incbin "baserom.gba", 0xE89668, 0x2EE @ LZ, uncomp. size = 0xC00 +gPokenavConditionMenu_Gfx:: @ 8E89668 + .incbin "graphics/pokenav/condition_menu.4bpp.lz" .align 2 -gUnknown_08E89958:: @ 8E89958 - .incbin "baserom.gba", 0x00e89958, 0x20 +gPokenavConditionMenu_Pal:: @ 8E89958 + .incbin "graphics/pokenav/condition1.gbapal" .align 2 -gUnknown_08E89978:: @ 8E89978 - .incbin "baserom.gba", 0xE89978, 0x15D @ LZ, uncomp. size = 0x600 +gPokenavConditionMenuHeader_Gfx:: @ 8E89978 + .incbin "graphics/pokenav/condition_menu_header.4bpp.lz" .align 2 -gUnknown_08E89AD8:: @ 8E89AD8 - .incbin "baserom.gba", 0xE89AD8, 0x6E6 @ LZ, uncomp. size = 0xFA0 +gPokenavConditionView_Gfx:: @ 8E89AD8 + .incbin "graphics/pokenav/condition_view.4bpp.lz" .align 2 -gUnknown_08E8A1C0:: @ 8E8A1C0 - .incbin "baserom.gba", 0x00e8a1c0, 0x20 +gPokenavConditionMenu2_Pal:: @ 8E8A1C0 + .incbin "graphics/pokenav/condition2.gbapal" .align 2 -gUnknown_08E8A1E0:: @ 8E8A1E0 - .incbin "baserom.gba", 0xE8A1E0, 0x2B8 @ LZ, uncomp. size = 0x800 +gPokenavConditionMenuOptions_Gfx:: @ 8E8A1E0 + .incbin "graphics/pokenav/condition_menu_options.4bpp.lz" -gTiles_08E8A498:: @ 8E8A498 - .incbin "baserom.gba", 0xe8a498, 0x100 + .align 2 +gPokenavConditionMenuCancel_Gfx:: @ 8E8A498 + .incbin "graphics/pokenav/condition_cancel.4bpp" -PokenavContestPokeballPalette:: @ 8E8A598 - .incbin "graphics/pokenav/contest_pokeball.gbapal" + .align 2 +gPokenavConditionPokeball_Pal:: @ 8E8A598 + .incbin "graphics/pokenav/condition3.gbapal" -Palette_E8A5B8:: @ 8E8A5B8 - .incbin "baserom.gba", 0xe8a5b8, 0x20 + .align 2 +gPokenavCondition4_Pal:: @ 8E8A5B8 + .incbin "graphics/pokenav/condition4.gbapal" .align 2 -gUnknown_08E8A5D8:: @ 8E8A5D8 - .incbin "baserom.gba", 0xE8A5D8, 0x1EB @ LZ, uncomp. size = 0x600 +gPokenavConditionMenuOptions2_Gfx:: @ 8E8A5D8 + .incbin "graphics/pokenav/condition_menu_options2.4bpp.lz" .align 2 -gUnknown_08E8A7C4:: @ 8E8A7C4 - .incbin "baserom.gba", 0xe8a7c4, 0x520 +gPokenavConditionMenuMisc_Gfx:: @ 8E8A7C4 + .incbin "graphics/pokenav/condition_menu_misc.4bpp" -Palette_E8ACE4:: @ 8E8ACE4 - .incbin "baserom.gba", 0xe8ace4, 0x20 + .align 2 +gPokenavCondition5_Pal:: @ 8E8ACE4 + .incbin "graphics/pokenav/condition5.gbapal" .align 2 -gUnknown_08E8AD04:: @ 8E8AD04 - .incbin "baserom.gba", 0xE8AD04, 0x4BE @ LZ, uncomp. size = 0x1800 +gPokenavConditionSearch_Gfx:: @ 8E8AD04 + .incbin "graphics/pokenav/condition_search.4bpp.lz" .align 2 -gUnknown_08E8B1C4:: @ 8E8B1C4 - .incbin "baserom.gba", 0x00e8b1c4, 0x20 +gPokenavCondition6_Pal:: @ 8E8B1C4 + .incbin "graphics/pokenav/condition6.gbapal" -gUnknown_08E8B1E4:: @ 8E8B1E4 - .incbin "baserom.gba", 0x00e8b1e4, 0x20 + .align 2 +gPokenavCondition7_Pal:: @ 8E8B1E4 + .incbin "graphics/pokenav/condition7.bin" @ another palette thats impossible to leave as native pal file due to 0xFFFF instead of 0x7FFF. .align 2 -gUnknown_08E8B204:: @ 8E8B204 - .incbin "baserom.gba", 0xE8B204, 0x19B @ LZ, uncomp. size = 0x600 +gPokenavTrainersEyesHeader_Gfx:: @ 8E8B204 + .incbin "graphics/pokenav/trainereyes.4bpp.lz" .align 2 -gUnknown_08E8B3A0:: @ 8E8B3A0 - .incbin "baserom.gba", 0xE8B3A0, 0x140 @ LZ, uncomp. size = 0x600 +gPokenavRibbonsHeader_Gfx:: @ 8E8B3A0 + .incbin "graphics/pokenav/ribbons.4bpp.lz" + .align 2 gUnknown_08E8B4E0:: @ 8E8B4E0 .incbin "baserom.gba", 0x00e8b4e0, 0x1400 @@ -4366,7 +4374,7 @@ gUnknown_08E9F7E4:: @ 8E9F7E4 .align 2 gPokenavContestArrowsPalette:: - .incbin "graphics/pokenav/contest_arrows.gbapal" + .incbin "graphics/pokenav/arrows.gbapal" gUnknown_08E9F988:: @ 8E9F988 .incbin "baserom.gba", 0xe9f988, 0x20 diff --git a/graphics/pokenav/contest_arrows.pal b/graphics/pokenav/arrows.pal index 5761a94e5..5761a94e5 100755..100644 --- a/graphics/pokenav/contest_arrows.pal +++ b/graphics/pokenav/arrows.pal diff --git a/graphics/pokenav/contest_arrows.png b/graphics/pokenav/arrows.png Binary files differindex 61282edc4..61282edc4 100755..100644 --- a/graphics/pokenav/contest_arrows.png +++ b/graphics/pokenav/arrows.png diff --git a/graphics/pokenav/condition1.pal b/graphics/pokenav/condition1.pal new file mode 100644 index 000000000..702fcbbf5 --- /dev/null +++ b/graphics/pokenav/condition1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +123 123 131 +205 205 197 +156 156 156 +82 82 74 +172 172 172 +197 180 255 +106 82 222 +82 65 164 +98 197 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/condition2.pal b/graphics/pokenav/condition2.pal new file mode 100644 index 000000000..19d9d2195 --- /dev/null +++ b/graphics/pokenav/condition2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +98 98 115 +131 131 148 +131 156 255 +189 180 197 +115 230 115 +222 238 255 +255 156 98 +246 255 255 +255 213 180 +255 246 57 +255 255 180 +213 255 189 +255 222 255 +255 172 213 +189 222 246 diff --git a/graphics/pokenav/contest_pokeball.pal b/graphics/pokenav/condition3.pal index 67350adee..67350adee 100755..100644 --- a/graphics/pokenav/contest_pokeball.pal +++ b/graphics/pokenav/condition3.pal diff --git a/graphics/pokenav/condition4.pal b/graphics/pokenav/condition4.pal new file mode 100644 index 000000000..5a31bb028 --- /dev/null +++ b/graphics/pokenav/condition4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +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/condition5.pal b/graphics/pokenav/condition5.pal new file mode 100644 index 000000000..f37881bec --- /dev/null +++ b/graphics/pokenav/condition5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 255 255 +82 82 74 +180 0 0 +246 65 41 +255 148 90 +255 255 255 +0 0 0 +0 0 0 +255 255 255 +82 82 74 +148 255 98 +32 197 106 +74 139 57 +255 238 98 +246 197 49 +230 148 0 diff --git a/graphics/pokenav/condition6.pal b/graphics/pokenav/condition6.pal new file mode 100644 index 000000000..84a168b49 --- /dev/null +++ b/graphics/pokenav/condition6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 230 0 +255 255 255 +82 82 74 +255 148 90 +255 65 32 +180 0 0 +197 180 255 +106 82 222 +82 65 164 +255 172 164 +246 106 106 +205 74 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/condition7.bin b/graphics/pokenav/condition7.bin Binary files differnew file mode 100644 index 000000000..1d621df35 --- /dev/null +++ b/graphics/pokenav/condition7.bin diff --git a/graphics/pokenav/condition_cancel.png b/graphics/pokenav/condition_cancel.png Binary files differnew file mode 100644 index 000000000..db4734b15 --- /dev/null +++ b/graphics/pokenav/condition_cancel.png diff --git a/graphics/pokenav/condition_menu.png b/graphics/pokenav/condition_menu.png Binary files differnew file mode 100644 index 000000000..8b682223e --- /dev/null +++ b/graphics/pokenav/condition_menu.png diff --git a/graphics/pokenav/condition_menu_header.png b/graphics/pokenav/condition_menu_header.png Binary files differnew file mode 100644 index 000000000..1a9c07273 --- /dev/null +++ b/graphics/pokenav/condition_menu_header.png diff --git a/graphics/pokenav/condition_menu_misc.png b/graphics/pokenav/condition_menu_misc.png Binary files differnew file mode 100644 index 000000000..3c87c867e --- /dev/null +++ b/graphics/pokenav/condition_menu_misc.png diff --git a/graphics/pokenav/condition_menu_options.png b/graphics/pokenav/condition_menu_options.png Binary files differnew file mode 100644 index 000000000..588c3b92f --- /dev/null +++ b/graphics/pokenav/condition_menu_options.png diff --git a/graphics/pokenav/condition_menu_options2.png b/graphics/pokenav/condition_menu_options2.png Binary files differnew file mode 100644 index 000000000..f17160c56 --- /dev/null +++ b/graphics/pokenav/condition_menu_options2.png diff --git a/graphics/pokenav/condition_search_beauty.png b/graphics/pokenav/condition_search_beauty.png Binary files differnew file mode 100644 index 000000000..8201ee306 --- /dev/null +++ b/graphics/pokenav/condition_search_beauty.png diff --git a/graphics/pokenav/condition_search_cancel.png b/graphics/pokenav/condition_search_cancel.png Binary files differnew file mode 100644 index 000000000..9a612fff0 --- /dev/null +++ b/graphics/pokenav/condition_search_cancel.png diff --git a/graphics/pokenav/condition_search_cool.png b/graphics/pokenav/condition_search_cool.png Binary files differnew file mode 100644 index 000000000..edf1a8770 --- /dev/null +++ b/graphics/pokenav/condition_search_cool.png diff --git a/graphics/pokenav/condition_search_cute.png b/graphics/pokenav/condition_search_cute.png Binary files differnew file mode 100644 index 000000000..0551a1c1a --- /dev/null +++ b/graphics/pokenav/condition_search_cute.png diff --git a/graphics/pokenav/condition_search_smart.png b/graphics/pokenav/condition_search_smart.png Binary files differnew file mode 100644 index 000000000..bae400440 --- /dev/null +++ b/graphics/pokenav/condition_search_smart.png diff --git a/graphics/pokenav/condition_search_tough.png b/graphics/pokenav/condition_search_tough.png Binary files differnew file mode 100644 index 000000000..85c0d107c --- /dev/null +++ b/graphics/pokenav/condition_search_tough.png diff --git a/graphics/pokenav/condition_view.png b/graphics/pokenav/condition_view.png Binary files differnew file mode 100644 index 000000000..d41c5794b --- /dev/null +++ b/graphics/pokenav/condition_view.png diff --git a/graphics/pokenav/mainmenu.png b/graphics/pokenav/mainmenu.png Binary files differnew file mode 100644 index 000000000..7908457cd --- /dev/null +++ b/graphics/pokenav/mainmenu.png diff --git a/graphics/pokenav/map_header.png b/graphics/pokenav/map_header.png Binary files differnew file mode 100644 index 000000000..0b7d73130 --- /dev/null +++ b/graphics/pokenav/map_header.png diff --git a/graphics/pokenav/map_menu.pal b/graphics/pokenav/map_menu.pal new file mode 100644 index 000000000..67111078c --- /dev/null +++ b/graphics/pokenav/map_menu.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 98 0 +255 255 255 +246 197 49 +255 238 98 +189 148 0 +197 197 205 +238 238 230 +246 148 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +148 148 148 diff --git a/graphics/pokenav/map_misc2.png b/graphics/pokenav/map_misc2.png Binary files differnew file mode 100644 index 000000000..1118afaf8 --- /dev/null +++ b/graphics/pokenav/map_misc2.png diff --git a/graphics/pokenav/map_squares.png b/graphics/pokenav/map_squares.png Binary files differnew file mode 100644 index 000000000..fb73235ff --- /dev/null +++ b/graphics/pokenav/map_squares.png diff --git a/graphics/pokenav/menu_condition.png b/graphics/pokenav/menu_condition.png Binary files differnew file mode 100644 index 000000000..e4d8f064f --- /dev/null +++ b/graphics/pokenav/menu_condition.png diff --git a/graphics/pokenav/menu_eyes.png b/graphics/pokenav/menu_eyes.png Binary files differnew file mode 100644 index 000000000..bbc0869c1 --- /dev/null +++ b/graphics/pokenav/menu_eyes.png diff --git a/graphics/pokenav/menu_hoennmap.png b/graphics/pokenav/menu_hoennmap.png Binary files differnew file mode 100644 index 000000000..06f7f5e7f --- /dev/null +++ b/graphics/pokenav/menu_hoennmap.png diff --git a/graphics/pokenav/menu_off.png b/graphics/pokenav/menu_off.png Binary files differnew file mode 100644 index 000000000..8a753d0f1 --- /dev/null +++ b/graphics/pokenav/menu_off.png diff --git a/graphics/pokenav/menu_ribbons.png b/graphics/pokenav/menu_ribbons.png Binary files differnew file mode 100644 index 000000000..5426e24bb --- /dev/null +++ b/graphics/pokenav/menu_ribbons.png diff --git a/graphics/pokenav/contest_pokeball.png b/graphics/pokenav/pokeball.png Binary files differindex 9eb7d9165..9eb7d9165 100755..100644 --- a/graphics/pokenav/contest_pokeball.png +++ b/graphics/pokenav/pokeball.png diff --git a/graphics/pokenav/pokenav1.pal b/graphics/pokenav/pokenav1.pal new file mode 100644 index 000000000..bdcd626cf --- /dev/null +++ b/graphics/pokenav/pokenav1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 74 +255 255 255 +230 148 0 +246 197 49 +255 238 98 +32 197 106 +74 139 57 +106 82 222 +82 57 156 +255 65 32 +180 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/pokenav2.pal b/graphics/pokenav/pokenav2.pal new file mode 100644 index 000000000..31491563b --- /dev/null +++ b/graphics/pokenav/pokenav2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +82 82 74 +123 123 131 +156 156 156 +205 205 197 +255 255 255 +32 197 106 +74 139 57 +106 82 222 +82 57 156 +246 106 106 +205 74 65 +230 148 0 +246 197 49 +255 238 98 +0 0 0 diff --git a/graphics/pokenav/pokenav3.pal b/graphics/pokenav/pokenav3.pal new file mode 100644 index 000000000..ee6ab364c --- /dev/null +++ b/graphics/pokenav/pokenav3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +148 255 255 +255 255 255 +123 123 131 +205 205 197 +156 156 156 +82 82 74 +148 255 98 +32 197 106 +74 139 57 +172 172 172 +255 172 164 +246 106 106 +205 74 65 +197 180 255 +106 82 222 +82 57 156 diff --git a/graphics/pokenav/ribbons.png b/graphics/pokenav/ribbons.png Binary files differnew file mode 100644 index 000000000..75ec59d25 --- /dev/null +++ b/graphics/pokenav/ribbons.png diff --git a/graphics/pokenav/contest_sparkle.pal b/graphics/pokenav/sparkle.pal index 114155fe4..114155fe4 100755..100644 --- a/graphics/pokenav/contest_sparkle.pal +++ b/graphics/pokenav/sparkle.pal diff --git a/graphics/pokenav/contest_sparkle.png b/graphics/pokenav/sparkle.png Binary files differindex 5949b376e..5949b376e 100755..100644 --- a/graphics/pokenav/contest_sparkle.png +++ b/graphics/pokenav/sparkle.png diff --git a/graphics/pokenav/trainereyes.png b/graphics/pokenav/trainereyes.png Binary files differnew file mode 100644 index 000000000..250b4c27e --- /dev/null +++ b/graphics/pokenav/trainereyes.png @@ -217,4 +217,13 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal $(TYPESGFXD @cat $(TYPESGFXDIR)/move_types_1.gbapal $(TYPESGFXDIR)/move_types_2.gbapal $(TYPESGFXDIR)/move_types_3.gbapal >$@ $(MENUGFXDIR)/status_screen.4bpp: $(MENUGFXDIR)/status_screen.png - $(GFX) $< $@ -num_tiles 217
\ No newline at end of file + $(GFX) $< $@ -num_tiles 217 + +$(PKNAVGFXDIR)/menu_options.4bpp: $(PKNAVGFXDIR)/menu_hoennmap.4bpp $(PKNAVGFXDIR)/menu_condition.4bpp $(PKNAVGFXDIR)/menu_eyes.4bpp $(PKNAVGFXDIR)/menu_ribbons.4bpp $(PKNAVGFXDIR)/menu_off.4bpp + @cat $(PKNAVGFXDIR)/menu_hoennmap.4bpp $(PKNAVGFXDIR)/menu_condition.4bpp $(PKNAVGFXDIR)/menu_eyes.4bpp $(PKNAVGFXDIR)/menu_ribbons.4bpp $(PKNAVGFXDIR)/menu_off.4bpp >$@ + +$(PKNAVGFXDIR)/condition_menu_misc.4bpp: $(PKNAVGFXDIR)/condition_menu_misc.png + $(GFX) $< $@ -num_tiles 41 + +$(PKNAVGFXDIR)/condition_search.4bpp: $(PKNAVGFXDIR)/condition_search_cool.4bpp $(PKNAVGFXDIR)/condition_search_beauty.4bpp $(PKNAVGFXDIR)/condition_search_cute.4bpp $(PKNAVGFXDIR)/condition_search_smart.4bpp $(PKNAVGFXDIR)/condition_search_tough.4bpp $(PKNAVGFXDIR)/condition_search_cancel.4bpp + @cat $(PKNAVGFXDIR)/condition_search_cool.4bpp $(PKNAVGFXDIR)/condition_search_beauty.4bpp $(PKNAVGFXDIR)/condition_search_cute.4bpp $(PKNAVGFXDIR)/condition_search_smart.4bpp $(PKNAVGFXDIR)/condition_search_tough.4bpp $(PKNAVGFXDIR)/condition_search_cancel.4bpp >$@ |
