2 files changed, 38 insertions, 75 deletions
diff --git a/data/graphics.s b/data/graphics.s
index c4ba9f575..a6f7b77c9 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1031,7 +1031,13 @@ gUnknown_08DA4F70:: @ 8DA4F70
 	.incbin "baserom.gba", 0xda4f70, 0x1148
 
 gUnknown_08DA60B8:: @ 8DA60B8
-	.incbin "baserom.gba", 0xda60b8, 0x904
+	.incbin "baserom.gba", 0xda60b8, 0x388
+	
+gUnknown_08DA6440:: @ 8DA6440
+	.incbin "baserom.gba", 0xDA6440, 0x46C
+	
+gUnknown_08DA68AC:: @ 8DA68AC
+	.incbin "baserom.gba", 0xDA68AC, 0x110
 
 gUnknown_08DA69BC:: @ 8DA69BC
 	.incbin "baserom.gba", 0xda69bc, 0xb6c
@@ -1070,7 +1076,37 @@ gUnknown_08DA8D6C:: @ 8DA8D6C
 	.incbin "baserom.gba", 0xda8d6c, 0x118
 
 gUnknown_08DA8E84:: @ 8DA8E84
-	.incbin "baserom.gba", 0xda8e84, 0x1a30
+	.incbin "baserom.gba", 0xda8e84, 0x54
+	
+gUnknown_08DA8ED8:: @ 8DA8ED8
+	.incbin "baserom.gba", 0xDA8ED8, 0x798
+	
+gUnknown_08DA9670:: @ 8DA9670
+	.incbin "baserom.gba", 0xDA9670, 0x44
+	
+gUnknown_08DA96B4:: @ 8DA96B4
+	.incbin "baserom.gba", 0xDA96B4, 0x248
+	
+gUnknown_08DA98FC:: @ 8DA98FC
+	.incbin "baserom.gba", 0xDA98FC, 0xCA8
+	
+gUnknown_08DAA5A4:: @ 8DAA5A4
+	.incbin "baserom.gba", 0xDAA5A4, 0x1F0
+	
+gUnknown_08DAA794:: @ 8DAA794
+	.incbin "baserom.gba", 0xDAA794, 0x98
+	
+gUnknown_08DAA82C:: @ 8DAA82C
+	.incbin "baserom.gba", 0xDAA82C, 0x28
+	
+gUnknown_08DAA854:: @ 8DAA854
+	.incbin "baserom.gba", 0xDAA854, 0x28
+	
+gUnknown_08DAA87C:: @ 8DAA87C
+	.incbin "baserom.gba", 0xDAA87C, 0x28
+	
+gUnknown_08DAA8A4:: @ 8DAA8A4
+	.incbin "baserom.gba", 0xDAA8A4, 0x10
 
 gUnknown_08DAA8B4:: @ 8DAA8B4
 	.incbin "baserom.gba", 0xdaa8b4, 0x270
diff --git a/data/rayquaza_scene.s b/data/rayquaza_scene.s
deleted file mode 100644
index 88e426584..000000000
--- a/data/rayquaza_scene.s
+++ /dev/null
@@ -1,73 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_0862AAFC:: @ 862AAFC
-	.incbin "baserom.gba", 0x62aafc, 0x8
-
-gUnknown_0862AB04:: @ 862AB04
-	.incbin "baserom.gba", 0x62ab04, 0x8
-
-gUnknown_0862AB0C:: @ 862AB0C
-	.incbin "baserom.gba", 0x62ab0c, 0x8
-
-gUnknown_0862AB14:: @ 862AB14
-	.incbin "baserom.gba", 0x62ab14, 0x18
-
-gUnknown_0862AB2C:: @ 862AB2C
-	.incbin "baserom.gba", 0x62ab2c, 0x18
-
-gUnknown_0862AB44:: @ 862AB44
-	.incbin "baserom.gba", 0x62ab44, 0xe4
-
-gUnknown_0862AC28:: @ 862AC28
-	.incbin "baserom.gba", 0x62ac28, 0x8
-
-gUnknown_0862AC30:: @ 862AC30
-	.incbin "baserom.gba", 0x62ac30, 0x8
-
-gUnknown_0862AC38:: @ 862AC38
-	.incbin "baserom.gba", 0x62ac38, 0x8
-
-gUnknown_0862AC40:: @ 862AC40
-	.incbin "baserom.gba", 0x62ac40, 0x8
-
-gUnknown_0862AC48:: @ 862AC48
-	.incbin "baserom.gba", 0x62ac48, 0x8
-
-gUnknown_0862AC50:: @ 862AC50
-	.incbin "baserom.gba", 0x62ac50, 0x8
-
-gUnknown_0862AC58:: @ 862AC58
-	.incbin "baserom.gba", 0x62ac58, 0x8
-
-gUnknown_0862AC60:: @ 862AC60
-	.incbin "baserom.gba", 0x62ac60, 0x8
-
-gUnknown_0862AC68:: @ 862AC68
-	.incbin "baserom.gba", 0x62ac68, 0x8
-
-gUnknown_0862AC70:: @ 862AC70
-	.incbin "baserom.gba", 0x62ac70, 0x8
-
-gUnknown_0862AC78:: @ 862AC78
-	.incbin "baserom.gba", 0x62ac78, 0x18
-
-gUnknown_0862AC90:: @ 862AC90
-	.incbin "baserom.gba", 0x62ac90, 0x18
-
-gUnknown_0862ACA8:: @ 862ACA8
-	.incbin "baserom.gba", 0x62aca8, 0x18
-
-gUnknown_0862ACC0:: @ 862ACC0
-	.incbin "baserom.gba", 0x62acc0, 0x18
-
-gUnknown_0862ACD8:: @ 862ACD8
-	.incbin "baserom.gba", 0x62acd8, 0x18
-
-gUnknown_0862ACF0:: @ 862ACF0
-	.incbin "baserom.gba", 0x62acf0, 0x18
-
-gUnknown_0862AD08:: @ 862AD08
-	.incbin "baserom.gba", 0x62ad08, 0xc