start decompiling pokenav data

2 files changed, 74 insertions, 105 deletions

diff --git a/data/pokenav.s b/data/pokenav.s
index 15c5ee534..6a9416c71 100644
--- a/data/pokenav.s
+++ b/data/pokenav.s
@@ -3,113 +3,8 @@
 
 	.section .rodata
 
-	.align 2
-gUnknown_083DFEC8:: @ 83DFEC8
-	.4byte gTileBuffer
-
-	.align 1
-gUnknown_083DFECC:: @ 83DFECC
-	.incbin "graphics/pokenav/83DFECC.gbapal"
-
-	.align 1
-gUnknown_083DFEEC:: @ 83DFEEC
-	.incbin "graphics/pokenav/83DFEEC.4bpp"
-
-	.align 2
-gUnknown_083DFF8C:: @ 83DFF8C
-	.incbin "graphics/pokenav/83DFF8C.bin.lz"
-
-	.align 1
-gUnknown_083E003C:: @ 83E003C
-	.incbin "graphics/pokenav/83E003C.gbapal"
-
-	.align 1
-gUnknown_083E005C:: @ 83E005C
-	.incbin "graphics/pokenav/83E005C.4bpp"
-
-	.align 2
-gUnknown_083E007C:: @ 83E007C
-	.incbin "graphics/pokenav/83E007C.bin.lz"
-
-	.align 1
-gUnknown_083E0124:: @ 83E0124
-	.incbin "graphics/pokenav/83E0124_pal.bin"
-
-	.align 1
-gUnknown_083E0144:: @ 83E0144
-	.incbin "graphics/pokenav/83E0144_pal.bin"
-
-	.align 1
-	.incbin "graphics/pokenav/83E0164.bin"
-
-	.align 1
-gUnknown_083E01AC:: @ 83E01AC
-	.incbin "graphics/pokenav/83E01AC.bin"
-
-	.align 1
-gUnknown_083E01F4:: @ 83E01F4
-	.incbin "graphics/pokenav/83E01F4.bin"
-
-	.align 1
-gUnknown_083E0254:: @ 83E0254
-	.incbin "graphics/pokenav/83E0254.gbapal"
-
-	.align 1
-gUnknown_083E0274:: @ 83E0274
-	.incbin "graphics/pokenav/83E0274.gbapal"
-
-	.align 2
-gPokenavConditionSearch2_Pal:: @ 83E0294
-	.incbin "graphics/pokenav/condition_search2.gbapal"
-
-	.align 1
-gUnknown_083E02B4:: @ 83E02B4
-	.incbin "graphics/pokenav/83E02B4.gbapal"
-
-	.align 1
-	.incbin "graphics/pokenav/83E02D4.bin"
-
-	.align 1
-gUnknown_083E0314:: @ 83E0314
-	.incbin "graphics/pokenav/83E0314.gbapal"
-
-	.align 1
-gUnknown_083E0334:: @ 83E0334
-	.incbin "graphics/pokenav/trainereyes_misc_pal.bin" @ the original bytes have an "FF FF" instance which is incompatible with gbagfx to produce the bytes needed to match the original ROM, so I am forced to include it as a .bin until the lowest bit is properly handled or a better workaround is produced
-
-	.align 2
-gUnknown_083E0354:: @ 83E0354
-	.incbin "graphics/pokenav/trainereyes_misc.4bpp.lz"
 
-	.align 1
-gUnknown_083E039C:: @ 83E039C
-	.2byte 0x4280, 0x4282
-
-	.align 1
-gUnknown_083E03A0:: @ 83E03A0
-	.2byte 0x4000, 0x4000, 0x4281, 0x4283
-
-	.align 1
-gUnknown_083E03A8:: @ 83E03A8
-	.incbin "graphics/pokenav/83E03A8.gbapal"
-
-	.align 1
-	.incbin "graphics/pokenav/83E03C8.bin"
 
-gUnknown_083E040C:: @ 83E040C
-	.incbin "graphics/misc/ribbons_half.4bpp.lz"
-
-	.align 2
-gPokenavOutlinePalette:: @ 83E05D4
-	.incbin "graphics/pokenav/outline.gbapal"
-
-	.align 2
-gPokenavOutlineTiles:: @ 83E05F4
-	.incbin "graphics/pokenav/outline.4bpp.lz"
-
-	.align 2
-gPokenavOutlineTilemap:: @ 83E0804
-	.incbin "graphics/pokenav/outline_map.bin.lz"
 
 	.align 2
 gPokenavCityMap_Lavaridge_0:: @ 83E096C
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index 3150629b7..d2d88a1e1 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -104,6 +104,80 @@ struct UnkPokenavStruct *const gPokenavStructPtr = (struct UnkPokenavStruct *)gS
 
 extern u16 gKeyRepeatStartDelay;
 
+// rodata?
+const u8 *const gUnknown_083DFEC8 = gTileBuffer;
+
+const u8 gUnknown_083DFECC[] = INCBIN_U8("graphics/pokenav/83DFECC.gbapal");
+
+const u8 gUnknown_083DFEEC[] = INCBIN_U8("graphics/pokenav/83DFEEC.4bpp");
+const u8 gUnknown_083DFF8C[] = INCBIN_U8("graphics/pokenav/83DFF8C.bin.lz");
+const u16 gUnknown_083E003C[] = INCBIN_U16("graphics/pokenav/83E003C.gbapal");
+
+const u8 gUnknown_083E005C[] = INCBIN_U8("graphics/pokenav/83E005C.4bpp");
+const u8 gUnknown_083E007C[] = INCBIN_U8("graphics/pokenav/83E007C.bin.lz");
+const u16 gUnknown_083E0124[] = INCBIN_U16("graphics/pokenav/83E0124_pal.bin");
+
+const u16 gUnknown_083E0144[] = INCBIN_U16("graphics/pokenav/83E0144_pal.bin");
+
+const u16 gUnknown_083E0164[] = INCBIN_U16("graphics/pokenav/83E0164.bin");//?
+
+const u8 gUnknown_083E01AC[] = INCBIN_U8("graphics/pokenav/83E01AC.bin");
+const u8 gUnknown_083E01F4[] = INCBIN_U8("graphics/pokenav/83E01F4.bin");
+const u8 gUnknown_083E0254[] = INCBIN_U8("graphics/pokenav/83E0254.gbapal");
+const u16 gUnknown_083E0274[] = INCBIN_U16("graphics/pokenav/83E0274.gbapal");
+
+const u16 gPokenavConditionSearch2_Pal[] = INCBIN_U16("graphics/pokenav/condition_search2.gbapal");
+
+const u16 gUnknown_083E02B4[] = INCBIN_U16("graphics/pokenav/83E02B4.gbapal");
+
+const u16 gUnknown_083E02D4[] =  INCBIN_U16("graphics/pokenav/83E02D4.bin");//?
+
+const u8 gUnknown_083E0314[] = INCBIN_U8("graphics/pokenav/83E0314.gbapal");
+const u8 gUnknown_083E0334[] = INCBIN_U8("graphics/pokenav/trainereyes_misc_pal.bin");
+
+const u8 gUnknown_083E0354[] = INCBIN_U8("graphics/pokenav/trainereyes_misc.4bpp.lz");
+
+const u8 gUnknown_083E039C[][4] = 
+{
+    {0x80, 0x42, 0x82, 0x42},
+};
+
+const u8 gUnknown_083E03A0[][8] = 
+{
+    {0x00, 0x40, 0x00, 0x40, 0x81, 0x42, 0x83, 0x42},
+};
+
+const u16 gUnknown_083E03A8[] = INCBIN_U16("graphics/pokenav/83E03A8.gbapal");
+const u16 gUnknown_083E03C8[] = INCBIN_U16("graphics/pokenav/83E03C8.bin");
+const u8 gUnknown_083E040C[] = INCBIN_U8("graphics/misc/ribbons_half.4bpp.lz");
+const u8 gPokenavOutlinePalette[] = INCBIN_U8("graphics/pokenav/outline.gbapal");
+const u8 gPokenavOutlineTiles[] = INCBIN_U8("graphics/pokenav/outline.4bpp.lz");
+const u8 gPokenavOutlineTilemap[] = INCBIN_U8("graphics/pokenav/outline_map.bin.lz");
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void sub_80EBA5C()
 {
     switch (gMain.state)