3 files changed, 46 insertions, 27 deletions
diff --git a/data/bag/bag_window_pal.pal b/data/bag/bag_window_pal.pal
new file mode 100644
index 000000000..426ea279e
--- /dev/null
+++ b/data/bag/bag_window_pal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+0 0 0
+0 0 0
+0 0 0
+255 156 148
+255 255 255
+189 90 82
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index a855e5f7f..3bdef180f 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -1,3 +1,5 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 	.section .rodata
 
 	.align 2
@@ -3079,33 +3081,6 @@ gUnknown_8453092:: @ 8453092
 gUnknown_8453094:: @ 8453094
 	.incbin "baserom.gba", 0x453094, 0x4
 
-gUnknown_8453098:: @ 8453098
-	.incbin "baserom.gba", 0x453098, 0x20
-
-gUnknown_84530B8:: @ 84530B8
-	.incbin "baserom.gba", 0x4530B8, 0xC
-
-gUnknown_84530C4:: @ 84530C4
-	.incbin "baserom.gba", 0x4530C4, 0x20
-
-gUnknown_84530E4:: @ 84530E4
-	.incbin "baserom.gba", 0x4530E4, 0x20
-
-gUnknown_8453104:: @ 8453104
-	.incbin "baserom.gba", 0x453104, 0x18
-
-gUnknown_845311C:: @ 845311C
-	.incbin "baserom.gba", 0x45311C, 0x8
-
-gUnknown_8453124:: @ 8453124
-	.incbin "baserom.gba", 0x453124, 0x54
-
-gUnknown_8453178:: @ 8453178
-	.incbin "baserom.gba", 0x453178, 0xC
-
-gUnknown_8453184:: @ 8453184
-	.incbin "baserom.gba", 0x453184, 0x8
-
 	.section .rodata.8453F6C
 
 // item_pc.o
diff --git a/data/trainer_pokemon_sprites.s b/data/trainer_pokemon_sprites.s
new file mode 100644
index 000000000..6d5477040
--- /dev/null
+++ b/data/trainer_pokemon_sprites.s
@@ -0,0 +1,25 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+	.section .rodata
+
+	.align 2
+gUnknown_845312C:: @ 845312C
+	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x02a2
+	window_template 0x00, 0x06, 0x0f, 0x0e, 0x04, 0x0c, 0x02a2
+	window_template 0x00, 0x06, 0x0f, 0x0f, 0x04, 0x0c, 0x02da
+	window_template 0x00, 0x06, 0x0f, 0x10, 0x04, 0x0c, 0x0316
+	window_template 0x00, 0x06, 0x0f, 0x17, 0x04, 0x0c, 0x0356
+	window_template 0x00, 0x16, 0x11, 0x07, 0x02, 0x0f, 0x020a
+	window_template 0x00, 0x16, 0x0f, 0x07, 0x04, 0x0f, 0x020a
+	window_template 0x00, 0x16, 0x0d, 0x07, 0x06, 0x0f, 0x020a
+	window_template 0x00, 0x16, 0x0b, 0x07, 0x08, 0x0f, 0x020a
+
+gUnknown_8453174::
+	.byte 16, 8, 4, 0
+
+	.align 2
+gUnknown_8453178:: @ 8453178
+	.space 12
+
+gUnknown_8453184:: @ 8453184
+	.byte 0, 0, 0, 0xc0, 0, 0, 0, 0