Merge branch 'master' into data_dump

data/data_835B488.s

@@ -511,30 +511,10 @@ gUnknown_83D35DC:: @ 83D35DC
 gUnknown_83D3728:: @ 83D3728
 	.incbin "baserom.gba", 0x3D3728, 0x18
 
-gUnknown_83D3740:: @ 83D3740
-	.incbin "baserom.gba", 0x3D3740, 0x60
-
-gUnknown_83D37A0:: @ 83D37A0
-	.incbin "baserom.gba", 0x3D37A0, 0x6E0
-
-gUnknown_83D3E80:: @ 83D3E80
-	.incbin "baserom.gba", 0x3D3E80, 0x1B8
-
-gUnknown_83D4038:: @ 83D4038
-	.incbin "baserom.gba", 0x3D4038, 0x30
-
-gUnknown_83D4068:: @ 83D4068
-	.incbin "baserom.gba", 0x3D4068, 0x44
-
-gUnknown_83D40AC:: @ 83D40AC
-	.incbin "baserom.gba", 0x3D40AC, 0x34
-
-gUnknown_83D40E0:: @ 83D40E0
-	.incbin "baserom.gba", 0x3D40E0, 0x8
-
-gUnknown_83D40E8:: @ 83D40E8
-	.incbin "baserom.gba", 0x3D40E8, 0x18
-
+	@ pokemon_icon
+	.section .rodata.83D4100
+	.align 2
+	@ fldeff_cut
 gUnknown_83D4100:: @ 83D4100
 	.incbin "baserom.gba", 0x3D4100, 0x4C
 

data/graphics.s

@@ -11848,9 +11848,7 @@ gMonShinyPalette_Deoxys:: @ 8E3A360
 	.align 2
 gMonIcon_Deoxys:: @ 8E3A388
 	.incbin "graphics/pokemon/deoxys/icon.4bpp"
-
-	.align 2
-gMonIcon_DeoxysAttack:: @ 8E3A788
+	@ Referenced as part of the same array as normal deoxys
 	.incbin "graphics/pokemon/deoxys/icon_attack.4bpp"
 
 	.align 2
@@ -11982,6 +11980,7 @@ gMonBackPic_UnownI:: @ 8E3F228
 	.incbin "graphics/pokemon/unown/i/back.4bpp.lz"
 
 	.align 2
+
 gMonIcon_UnownI:: @ 8E3F3D0
 	.incbin "graphics/pokemon/unown/i/icon.4bpp"
 
@@ -13698,7 +13697,7 @@ gFile_graphics_battle_interface_ball_status_bar_sheet:: @ 8E7BB04
 	.incbin "graphics/battle_interface/ball_status_bar.4bpp.lz"
 	
 	.align 2
-gUnknown_8E7BBB8:: @ 8E7BB88
+gMonIcon_Egg:: @ 8E7BB88
 	.incbin "baserom.gba", 0xE7BB88, 0x400 @UNKNOWN
 
 	.align 2