dump rest of pokenav gfx

2 files changed, 90 insertions, 69 deletions

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