Extract contest painting

data/contest.s

@@ -10,55 +10,127 @@ gUnknown_08587A6C:: @ 8587A6C
 gUnknown_08587A70:: @ 8587A70
 	.byte 0x24, 0x4c, 0x74, 0x9c
 
+	.align 2
 gUnknown_08587A74:: @ 8587A74
-	.incbin "baserom.gba", 0x587a74, 0x5c
+	obj_tiles gUnknown_08C19450, 0x0020, 0x4e20
 
+	.align 2
+gUnknown_08587A7C:: @ 8587A7C
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	.align 2
+gUnknown_08587A84:: @ 8587A84
+	.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gUnknown_08587A94:: @ 8587A94
+	.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff6, 0xfff6, 0x14ec, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gUnknown_08587AAC:: @ 8587AAC
+	.2byte 0x0038, 0x0038, 0x0000, 0x0000, 0x000a, 0x000a, 0x1414, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gUnknown_08587AC4:: @ 8587AC4
+	.4byte gUnknown_08587A84
+	.4byte gUnknown_08587A94
+	.4byte gUnknown_08587AAC
+
+	.align 2
 gUnknown_08587AD0:: @ 8587AD0
-	.incbin "baserom.gba", 0x587ad0, 0x18
+	spr_template 0x4e20, 0xabe0, gUnknown_08587A7C, gDummySpriteAnimTable, NULL, gUnknown_08587AC4, SpriteCallbackDummy
 
+	.align 2
 gUnknown_08587AE8:: @ 8587AE8
-	.incbin "baserom.gba", 0x587ae8, 0x20
+	obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e22
+	obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e23
+	obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e24
+	obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e25
 
+	.align 2
 gUnknown_08587B08:: @ 8587B08
-	.incbin "baserom.gba", 0x587b08, 0x10
+	obj_pal gUnknown_08D8ECA4, 0x4e22
 
+	.align 2
+gUnknown_08587B10:: @ 8587B10
+	.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
+
+	.align 2
 gUnknown_08587B18:: @ 8587B18
-	.incbin "baserom.gba", 0x587b18, 0x68
+	spr_template 0x4e22, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0x4e23, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0x4e24, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0x4e25, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
+gUnknown_08587B78:: @ 8587B78
+	.byte 0xe4, 0xfc, 0x05, 0x00, 0x04, 0xfc, 0x45, 0x00
+
+	.align 2
 gUnknown_08587B80:: @ 8587B80
-	.incbin "baserom.gba", 0x587b80, 0x30
+	.4byte 0x00000002, gUnknown_08587B78
 
+	.align 2
+gUnknown_08587B88:: @ 8587B88
+	obj_tiles gUnknown_08C19168, 0x0180, 0xabe1
+
+	.align 2
+gUnknown_08587B90:: @ 8587B90
+	.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
+
+	.align 2
+gUnknown_08587B98:: @ 8587B98
+	spr_template 0xabe1, 0xabe0, gUnknown_08587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+	.align 2
 gUnknown_08587BB0:: @ 8587BB0
-	.incbin "baserom.gba", 0x587bb0, 0x8
+	obj_tiles gUnknown_08D8EAE4, 0x0400, 0xabe2
 
+	.align 2
 gUnknown_08587BB8:: @ 8587BB8
-	.incbin "baserom.gba", 0x587bb8, 0x10
+	obj_pal gUnknown_08D8ECA4, 0xabe2
 
+	.align 2
+gUnknown_08587BC0:: @ 8587BC0
+	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
+
+	.align 2
 gUnknown_08587BC8:: @ 8587BC8
-	.incbin "baserom.gba", 0x587bc8, 0x20
+	spr_template 0xabe2, 0xabe2, gUnknown_08587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
+gUnknown_08587BE0:: @ 8587BE0
+	.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x2c, 0x00, 0x00
+
+	.align 2
 gUnknown_08587BE8:: @ 8587BE8
-	.incbin "baserom.gba", 0x587be8, 0x18
+	spr_template 0x4e21, 0x4e21, gUnknown_08587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_08587C00:: @ 8587C00
-	.incbin "baserom.gba", 0x587c00, 0x8
+	obj_tiles gUnknown_08C1C3E4, 0x0800, 0x4e21
 
+	.align 2
 gUnknown_08587C08:: @ 8587C08
-	.incbin "baserom.gba", 0x587c08, 0x8
+	obj_tiles gUnknown_08C19284, 0x0380, 0xabe0
 
+	.align 2
 gUnknown_08587C10:: @ 8587C10
-	.incbin "baserom.gba", 0x587c10, 0x8
+	obj_pal gUnknown_08C19428, 0xabe0
 
+	.align 2
 gUnknown_08587C18:: @ 8587C18
-	.incbin "baserom.gba", 0x587c18, 0x18
+	spr_template 0xabe0, 0xabe0, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_08587C30:: @ 8587C30
-	.incbin "baserom.gba", 0x587c30, 0x20
+	.incbin "graphics/unknown/unknown_587C30.gbapal"
 
 @ 8587C50
 	.include "data/text/contest_text_pointers.inc"
 
-@ 8587D5C
+	.align 2
+gUnknown_08587D5C:: @ 8587D5C
 	.4byte gText_0827D5C1
 	.4byte gText_0827D5DC
 	.4byte gText_0827D600
@@ -73,6 +145,7 @@ gUnknown_08587C30:: @ 8587C30
 	.4byte gText_0827D706
 	.4byte gText_0827D71D
 
+	.align 2
 gUnknown_08587D90:: @ 8587D90
 	.4byte gText_0827D743
 	.4byte gText_0827D764
@@ -107,6 +180,7 @@ gUnknown_08587D90:: @ 8587D90
 	.4byte gText_0827DB1F
 	.4byte gText_0827DB4E
 
+	.align 2
 gUnknown_08587E10:: @ 8587E10
 	.4byte gText_827DB75
 	.4byte gText_827DBB0
@@ -171,6 +245,7 @@ gUnknown_08587E10:: @ 8587E10
 	.4byte gText_0827E6C4
 	.4byte gText_0827E7BA
 
+	.align 2
 gUnknown_08587F08:: @ 8587F08
 	.4byte gText_0827E85F
 	.4byte gText_0827E868
@@ -178,6 +253,7 @@ gUnknown_08587F08:: @ 8587F08
 	.4byte gText_0827E878
 	.4byte gText_0827E882
 
+	.align 2
 gUnknown_08587F1C:: @ 8587F1C
 	.4byte gText_0827E894
 	.4byte gText_0827E89E
@@ -186,33 +262,83 @@ gUnknown_08587F1C:: @ 8587F1C
 	.4byte gText_0827E8BF
 	.4byte gText_0827E8CA
 
+	.align 2
 gUnknown_08587F34:: @ 8587F34
-	.incbin "baserom.gba", 0x587f34, 0x10
+	.4byte 0x00000580, 0x000015e9, 0x000005c2, 0x000031a3
 
+	.align 2
 gUnknown_08587F44:: @ 8587F44
-	.incbin "baserom.gba", 0x587f44, 0x60
+	window_template 0x00, 0x12, 0x00, 0x0c, 0x02, 0x0f, 0x0200
+	window_template 0x00, 0x12, 0x05, 0x0c, 0x02, 0x0f, 0x0218
+	window_template 0x00, 0x12, 0x0a, 0x0c, 0x02, 0x0f, 0x0230
+	window_template 0x00, 0x12, 0x0f, 0x0c, 0x02, 0x0f, 0x0248
+	window_template 0x00, 0x01, 0x0f, 0x11, 0x04, 0x0f, 0x0260
+	window_template 0x00, 0x01, 0x1f, 0x09, 0x02, 0x0f, 0x02a4
+	window_template 0x00, 0x01, 0x21, 0x09, 0x02, 0x0f, 0x02b6
+	window_template 0x00, 0x01, 0x23, 0x09, 0x02, 0x0f, 0x02c8
+	window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da
+	window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec
+	window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee
+	window_template_terminator
 
+	.align 2
 gUnknown_08587FA4:: @ 8587FA4
 	.incbin "baserom.gba", 0x587fa4, 0x100
 
+	.align 2
 gUnknown_085880A4:: @ 85880A4
 	.incbin "baserom.gba", 0x5880a4, 0x1740
 
+	.align 2
 gUnknown_085897E4:: @ 85897E4
-	.incbin "baserom.gba", 0x005897e4, 0xc0
+	.incbin "baserom.gba", 0x5897e4, 0xc0
 
 gUnknown_085898A4:: @ 85898A4
-	.incbin "baserom.gba", 0x5898a4, 0x60
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
+	.byte 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02
 
+	.align 2
 gUnknown_08589904:: @ 8589904
-	.incbin "baserom.gba", 0x589904, 0x20
+	obj_tiles gUnknown_08C0237C, 0x1000, 0x80e8
+	obj_tiles gUnknown_08C0237C, 0x1000, 0x80e9
+	obj_tiles gUnknown_08C0237C, 0x1000, 0x80ea
+	obj_tiles gUnknown_08C0237C, 0x1000, 0x80eb
 
-gUnknown_08589924:: @ 8589924
+	.align 2
-	.incbin "baserom.gba", 0x589924, 0x68
+gUnknown_08589924:: @ 8589924 Yup this is super dangerous but that's how it is here
+	obj_pal gHeap + 0x1A0A4, 0x80e8
+	obj_pal gHeap + 0x1A0C4, 0x80e9
+	obj_pal gHeap + 0x1A0E4, 0x80ea
+	obj_pal gHeap + 0x1A104, 0x80eb
 
+	.align 2
+gUnknown_08589944:: @ 8589944
+	.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
+
+	.align 2
+gUnknown_0858994C:: @ 858994C
+	.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gUnknown_0858995C:: @ 858995C
+	.2byte 0x0003, 0x0003, 0x0f00, 0x0000, 0xfffd, 0xfffd, 0x0f00, 0x0000, 0x0003, 0x0003, 0x0f00, 0x0000, 0xfffd, 0xfffd, 0x0f00, 0x0000
+	.2byte 0x7fff, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gUnknown_08589984:: @ 8589984
+	.4byte gUnknown_0858994C
+	.4byte gUnknown_0858995C
+
+	.align 2
 gUnknown_0858998C:: @ 858998C
-	.incbin "baserom.gba", 0x58998c, 0x60
+	spr_template 0x80e8, 0x80e8, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy
+	spr_template 0x80e9, 0x80e9, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy
+	spr_template 0x80ea, 0x80ea, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy
+	spr_template 0x80eb, 0x80eb, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy
 
+	.align 2
 gUnknown_085899EC:: @ 85899EC
-	.incbin "baserom.gba", 0x5899ec, 0x1c
+	.2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000
+
 

data/contest_link_80F57C4.s

@@ -4,43 +4,82 @@
 	.include "constants/constants.inc"
 
 	.section .rodata
-    .align 2, 0
+    .align 2
-
 gUnknown_0858D6B0:: @ 858D6B0
-	.incbin "baserom.gba", 0x58d6b0, 0x20
+	.incbin "graphics/unknown/unknown_58D6B0.gbapal"
 
+    .align 2
 gUnknown_0858D6D0:: @ 858D6D0
-	.incbin "baserom.gba", 0x58d6d0, 0x128
+	.incbin "graphics/unknown/unknown_58D6D0.4bpp"
 
+    .align 2
+gUnknown_0858D7D0:: @ 858D7D0
+	.incbin "graphics/interface/blank.gbapal"
+
+    .align 2
+gUnknown_0858D7F0:: @ 858D7F0
+	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x2c, 0x00, 0x00
+
+    .align 2
 gUnknown_0858D7F8:: @ 858D7F8
-	.incbin "baserom.gba", 0x58d7f8, 0x18
+	spr_template 0x0bc1, 0x0bc1, gUnknown_0858D7F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+    .align 2
 gUnknown_0858D810:: @ 858D810
-	.incbin "baserom.gba", 0x58d810, 0x40
+	obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc1
+	obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc2
+	obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc3
+	obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc4
+	obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc5
+	obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc6
+	obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc7
+	obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc8
 
+    .align 2
 gUnknown_0858D850:: @ 858D850
-	.incbin "baserom.gba", 0x58d850, 0x10
+	obj_pal gUnknown_0858D7D0, 0x0bc1
 
+    .align 2
+gUnknown_0858D858:: @ 858D858
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+    .align 2
 gUnknown_0858D860:: @ 858D860
-	.incbin "baserom.gba", 0x58d860, 0x18
+	spr_template 0x0bc9, 0x0bc9, gUnknown_0858D858, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F7768
 
+    .align 2
 gUnknown_0858D878:: @ 858D878
-	.incbin "baserom.gba", 0x58d878, 0x8
+	obj_tiles gContestConfetti_Gfx, 0x0220, 0x0bc9
 
+    .align 2
 gUnknown_0858D880:: @ 858D880
-	.incbin "baserom.gba", 0x58d880, 0x8
+	obj_pal gContestConfetti_Pal, 0x0bc9
 
+    .align 2
 gUnknown_0858D888:: @ 858D888
-	.incbin "baserom.gba", 0x58d888, 0x10
+	.4byte 0x000001e0, 0x00003181, 0x000031c2, 0x000031a3
 
+    .align 2
 gUnknown_0858D898:: @ 858D898
-	.incbin "baserom.gba", 0x58d898, 0x30
+	window_template 0x01, 0x07, 0x04, 0x0c, 0x02, 0x0f, 0x0302
+	window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a
+	window_template 0x01, 0x07, 0x0a, 0x0c, 0x02, 0x0f, 0x0332
+	window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a
+	window_template_terminator
 
+    .align 2
+gUnknown_0858D8C0:: @ 858D8C0
+	.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
+
+    .align 2
 gUnknown_0858D8C8:: @ 858D8C8
-	.incbin "baserom.gba", 0x58d8c8, 0x18
+	spr_template 0x56ce, 0x0000, gUnknown_0858D8C0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+    .align 2
 gUnknown_0858D8E0:: @ 858D8E0
-	.incbin "baserom.gba", 0x58d8e0, 0x8
+	obj_tiles gMiscBlank_Gfx, 0x0200, 0x56ce
 
+    .align 2
 gUnknown_0858D8E8:: @ 858D8E8
-	.incbin "baserom.gba", 0x58d8e8, 0x4
+	.byte 0x01, 0x0f, 0x0e, 0x00
+

data/contest_painting.s

@@ -4,47 +4,68 @@
 	.include "constants/constants.inc"
 
 	.section .rodata
-	.align 2, 0
 
+	.align 2
 gUnknown_085A989C:: @ 85A989C
-	.incbin "baserom.gba", 0x5a989c, 0x200
+	.incbin "graphics/picture_frame/bg.gbapal"
 
+	.align 2
 gUnknown_085A9A9C:: @ 85A9A9C
-	.incbin "baserom.gba", 0x5a9a9c, 0x1084
+	.incbin "graphics/picture_frame/frame0.4bpp.rl"
 
+	.align 2
 gUnknown_085AAB20:: @ 85AAB20
-	.incbin "baserom.gba", 0x5aab20, 0xc30
+	.incbin "graphics/picture_frame/frame1.4bpp.rl"
 
+	.align 2
 gUnknown_085AB750:: @ 85AB750
-	.incbin "baserom.gba", 0x5ab750, 0xb38
+	.incbin "graphics/picture_frame/frame2.4bpp.rl"
 
+	.align 2
 gUnknown_085AC288:: @ 85AC288
-	.incbin "baserom.gba", 0x5ac288, 0xfb8
+	.incbin "graphics/picture_frame/frame3.4bpp.rl"
 
+	.align 2
 gUnknown_085AD240:: @ 85AD240
-	.incbin "baserom.gba", 0x5ad240, 0x1130
+	.incbin "graphics/picture_frame/frame4.4bpp.rl"
 
+	.align 2
 gUnknown_085AE370:: @ 85AE370
-	.incbin "baserom.gba", 0x5ae370, 0x604
+	.incbin "graphics/picture_frame/frame5.4bpp.rl"
 
+	.align 2
 gUnknown_085AE974:: @ 85AE974
-	.incbin "baserom.gba", 0x5ae974, 0x50c
+	.incbin "graphics/picture_frame/frame0_map.bin.rl"
 
+	.align 2
 gUnknown_085AEE80:: @ 85AEE80
-	.incbin "baserom.gba", 0x5aee80, 0x50c
+	.incbin "graphics/picture_frame/frame1_map.bin.rl"
 
+	.align 2
 gUnknown_085AF38C:: @ 85AF38C
-	.incbin "baserom.gba", 0x5af38c, 0x50c
+	.incbin "graphics/picture_frame/frame2_map.bin.rl"
 
+	.align 2
 gUnknown_085AF898:: @ 85AF898
-	.incbin "baserom.gba", 0x5af898, 0x50c
+	.incbin "graphics/picture_frame/frame3_map.bin.rl"
 
+	.align 2
 gUnknown_085AFDA4:: @ 85AFDA4
-	.incbin "baserom.gba", 0x5afda4, 0x50c
+	.incbin "graphics/picture_frame/frame4_map.bin.rl"
 
+	.align 2
 gUnknown_085B02B0:: @ 85B02B0
-	.incbin "baserom.gba", 0x5b02b0, 0x524
+	.incbin "graphics/picture_frame/frame5_map.bin.rl"
 
+	.align 2
+gUnknown_085B07C0:: @ 85B07C0
+    .4byte gContestCoolness
+    .4byte gContestBeauty
+    .4byte gContestCuteness
+    .4byte gContestSmartness
+    .4byte gContestToughness
+
+	.align 2
 gContestRankTextPointers:: @ 85B07D4
 	.4byte gContestRankNormal
 	.4byte gContestRankSuper
@@ -52,12 +73,15 @@ gContestRankTextPointers:: @ 85B07D4
 	.4byte gContestRankMaster
 	.4byte gContestLink
 
+	.align 2
 gUnknown_085B07E8:: @ 85B07E8
-	.incbin "baserom.gba", 0x5b07e8, 0x4
+	.4byte 0x000010a5
 
+	.align 2
 gUnknown_085B07EC:: @ 85B07EC
-	.incbin "baserom.gba", 0x5b07ec, 0x8
+	window_template 0x01, 0x02, 0x0e, 0x1a, 0x04, 0x0f, 0x0001
 
+	.align 2
 gContestPaintingDescriptionPointers:: @ 85B07F4
 	.4byte gContestPaintingCool1
 	.4byte gContestPaintingCool2
@@ -79,4 +103,4 @@ gUnknown_085B0830:: @ 85B0830
 	.4byte 0xc0003000, 0x00000000
 
 gUnknown_085B0838:: @ 85B0838
-	.incbin "baserom.gba", 0x5b0838, 0x4
+	.2byte 0x0000, 0x0000

data/graphics.s

@@ -162,7 +162,19 @@ gUnknown_08C17AB0:: @ 8C17AB0
 	.incbin "baserom.gba", 0xc17ab0, 0xa5c
 
 gUnknown_08C1850C:: @ 8C1850C
-	.incbin "baserom.gba", 0xc1850c, 0x107c
+	.incbin "baserom.gba", 0xc1850c, 0xc5c
+
+gUnknown_08C19168:: @ 8C19168
+	.incbin "baserom.gba", 0xc19168, 0x11c
+
+gUnknown_08C19284:: @ 8C19284
+	.incbin "baserom.gba", 0xc19284, 0x1a4
+
+gUnknown_08C19428:: @ 8C19428
+	.incbin "baserom.gba", 0xc19428, 0x28
+
+gUnknown_08C19450:: @ 8C19450
+	.incbin "baserom.gba", 0xc19450, 0x138
 
 gUnknown_08C19588:: @ 8C19588
 	.incbin "baserom.gba", 0xc19588, 0x964
@@ -183,7 +195,10 @@ gUnknown_08C1A490:: @ 8C1A490
 	.incbin "baserom.gba", 0xc1a490, 0xD4
 
 gUnknown_08C1A564:: @ 8C1A564
-	.incbin "baserom.gba", 0xc1a564, 0x2154
+	.incbin "baserom.gba", 0xc1a564, 0x1E80
+
+gUnknown_08C1C3E4:: @ 8C1C3E4
+	.incbin "baserom.gba", 0xc1c3e4, 0x2d4
 
 gUnknown_08C1C6B8:: @ 8C1C6B8
 	.incbin "baserom.gba", 0xc1c6b8, 0x9f4
@@ -757,16 +772,25 @@ gUnknown_08D8D58C:: @ 8D8D58C
 	.incbin "baserom.gba", 0xd8d58c, 0x52c
 
 gUnknown_08D8DAB8:: @ 8D8DAB8
-	.incbin "baserom.gba", 0xd8dab8, 0xefc
+	.incbin "baserom.gba", 0xd8dab8, 0xe84
+
+gUnknown_08D8E93C:: @ 8D8E93C
+	.incbin "baserom.gba", 0xd8e93c, 0x78
 
 gUnknown_08D8E9B4:: @ 8D8E9B4
 	.incbin "baserom.gba", 0xd8e9b4, 0x80
 
 gUnknown_08D8EA34:: @ 8D8EA34
-	.incbin "baserom.gba", 0xd8ea34, 0x1f0
+	.incbin "baserom.gba", 0xd8ea34, 0xb0
+
+gUnknown_08D8EAE4:: @ 8D8EAE4
+	.incbin "baserom.gba", 0xd8eaE4, 0x140
 
 gUnknown_08D8EC24:: @ 8D8EC24
-	.incbin "baserom.gba", 0xd8ec24, 0xf78
+	.incbin "baserom.gba", 0xd8ec24, 0x80
+
+gUnknown_08D8ECA4:: @ 8D8ECA4
+	.incbin "baserom.gba", 0xd8eca4, 0xef8
 
 gUnknown_08D8FB9C:: @ 8D8FB9C
 	.incbin "baserom.gba", 0xd8fb9c, 0x24

graphics/picture_frame/bg.pal

@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+0 0 0
+255 255 255
+230 230 230
+213 213 213
+197 197 197
+180 180 180
+164 164 164
+148 148 148
+131 131 131
+115 115 115
+98 98 98
+82 82 82
+65 65 65
+49 49 49
+32 32 32
+16 16 16
+0 0 0
+90 24 0
+139 65 16
+164 90 16
+189 115 16
+222 148 49
+255 180 82
+255 222 131
+98 172 115
+148 197 156
+222 255 230
+255 255 255
+205 189 164
+180 164 139
+164 139 115
+131 98 74
+0 0 0
+180 148 213
+180 164 197
+180 189 189
+180 205 180
+180 230 172
+189 255 164
+222 255 139
+246 238 123
+255 230 98
+255 205 139
+255 180 139
+238 164 189
+205 156 197
+255 246 255
+90 57 74
+0 0 0
+255 123 164
+255 139 180
+255 180 205
+255 213 255
+255 205 0
+255 213 57
+255 230 123
+255 238 189
+255 255 255
+90 24 0
+139 65 16
+205 189 164
+180 164 139
+164 139 115
+131 98 74
+0 0 0
+90 24 0
+139 65 16
+222 148 49
+255 222 131
+131 131 131
+65 65 65
+255 0 0
+255 82 82
+255 164 164
+255 98 197
+255 148 213
+255 197 230
+74 255 90
+131 255 139
+189 255 197
+0 0 0
+90 24 0
+139 65 16
+222 148 49
+255 222 131
+131 131 131
+65 65 65
+74 148 238
+131 180 238
+189 213 246
+74 255 90
+131 255 139
+189 255 197
+255 255 0
+255 255 123
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/unknown/unknown_587C30.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 74 74
+255 0 0
+0 255 0
+0 0 255
+255 255 0
+0 255 255
+255 0 255
+213 213 205
+0 0 0
+0 0 0
+230 230 238
+255 255 255
+156 205 255
+123 189 230
+255 255 255

graphics/unknown/unknown_58D6B0.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 74 74
+255 0 0
+0 255 0
+0 0 255
+255 255 0
+0 255 255
+255 0 255
+213 213 205
+0 0 0
+0 0 0
+230 230 238
+255 255 255
+156 205 255
+123 189 230
+255 255 255

graphics_file_rules.mk

@@ -292,3 +292,6 @@ graphics/pokenav/region_map.8bpp: %.8bpp: %.png
 
 graphics/misc/japanese_hof.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 29
+
+graphics/picture_frame/frame5.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 86