option menu fix conflicts

1 files changed, 30 insertions, 28 deletions

diff --git a/data/graphics.s b/data/graphics.s
index 414985125..11244eb99 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -4824,27 +4824,27 @@ gNamingScreenMenu_Gfx:: @ 8DD3838
 	.incbin "graphics/naming_screen/menu.4bpp.lz"
 
 	.align 2
-gNamingScreenRWindow_Gfx::
+gNamingScreenRWindow_Gfx:: @ 8DD3A04
 	.incbin "graphics/naming_screen/rwindow.4bpp"
 
 	.align 2
-gNamingScreenROptions_Gfx::
+gNamingScreenROptions_Gfx:: @ 8DD4044
 	.incbin "graphics/naming_screen/roptions.4bpp"
 
 	.align 2
-gNamingScreenCursor_Gfx::
+gNamingScreenCursor_Gfx:: @ 8DD4224
 	.incbin "graphics/naming_screen/cursor.4bpp"
 
 	.align 2
-gNamingScreenKeyboardButton_Gfx::
+gNamingScreenKeyboardButton_Gfx:: @ 8DD43E4
 	.incbin "graphics/naming_screen/keyboard_button.4bpp"
 
 	.align 2
-gNamingScreenRightPointingTriangleTiles::
+gNamingScreenRightPointingTriangleTiles:: @ 8DD4504
 	.incbin "graphics/naming_screen/right_pointing_triangle.4bpp"
 
 	.align 2
-gNamingScreenUnderscoreTiles::
+gNamingScreenUnderscoreTiles:: @ 8DD4524
 	.incbin "graphics/naming_screen/underscore.4bpp"
 
 	.align 2
@@ -5042,47 +5042,49 @@ gUnknown_08DDD704:: @ 8DDD704
 
 	.align 2
 gUnknown_08DDD728:: @ 8DDD728
-	.incbin "graphics/interface/textbox.gbapal" @ textbox palette?
+	.incbin "graphics/text_window/message_box.gbapal"
 
 	.align 2
-gUnknown_08DDD748:: @ 8DDD748
-	.incbin "graphics/interface/textbox.4bpp"
+gMessageBox_Gfx:: @ 8DDD748
+	.incbin "graphics/text_window/message_box.4bpp"
 
 	.align 2
-gUnknown_08DDD908::
-	.incbin "graphics/unknown/unknown_DDD908.bin.lz"
+gWallpaperIcon_Cross::
+	.incbin "graphics/pokemon_storage/cross_icon.4bpp.lz"
 
 	.align 2
-gUnknown_08DDD920::
-	.incbin "graphics/unknown/unknown_DDD920.bin.lz"
+gWallpaperIcon_Bolt::
+	.incbin "graphics/pokemon_storage/bolt_icon.4bpp.lz"
 
 	.align 2
-gUnknown_08DDD938::
-	.incbin "graphics/unknown/unknown_DDD938.bin.lz"
+gWallpaperIcon_Plusle::
+	.incbin "graphics/pokemon_storage/plusle_icon.4bpp.lz"
 
 	.align 2
-gUnknown_08DDD950::
-	.incbin "graphics/pokemon_storage/pss_window.gbapal"
+gWallpaperPalettes_Horizontal:: @ 8DDD950
+	.incbin "graphics/pokemon_storage/friends_frame2.gbapal"
+	.incbin "graphics/pokemon_storage/horizontal_bg.gbapal"
 
 	.align 2
-gUnknown_08DDD990::
-	.incbin "graphics/pokemon_storage/pss_window.4bpp.lz"
+gWallpaperTiles_Horizontal:: @ 8DDD990
+	.incbin "graphics/pokemon_storage/horizontal.4bpp.lz"
 
 	.align 2
-gUnknown_08DDDB80:: @ 8DDDB80
-	.incbin "graphics/unknown/unknown_DDDB80.bin.lz"
+gWallpaperTilemap_Horizontal:: @ 8DDDB80
+	.incbin "graphics/pokemon_storage/horizontal.bin.lz"
 
 	.align 2
-gUnknown_08DDDC8C::
-	.incbin "graphics/pokemon_storage/pss_window2.gbapal"
+gWallpaperPalettes_Ribbon:: @ 8DDDC8C
+	.incbin "graphics/pokemon_storage/ribbon_frame.gbapal"
+	.incbin "graphics/pokemon_storage/ribbon_bg.gbapal"
 
 	.align 2
-gUnknown_08DDDCCC::
-	.incbin "graphics/pokemon_storage/pss_window2.4bpp.lz"
+gWallpaperTiles_Ribbon:: @ 8DDDCCC
+	.incbin "graphics/pokemon_storage/ribbon.4bpp.lz"
 
 	.align 2
-gUnknown_08DDDEDC::
-	.incbin "graphics/pokemon_storage/pss_window2.bin.lz"
+gWallpaperTilemap_Ribbon:: @ 8DDDEDC
+	.incbin "graphics/pokemon_storage/ribbon.bin.lz"
 
 	@ pokenav
 
@@ -5140,7 +5142,7 @@ gUnknown_08DE0644:: @ 8DE0644
 
 	.align 2
 gUnknown_08DE07C8:: @ 8DE07C8
-	.incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but this is wrong? todo, investigate? (frontier pass pal)
+	.incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well
 
 	.align 2
 gUnknown_08DE08C8:: @ 8DE08C8