fix merge conflict

7 files changed, 105 insertions, 0 deletions

diff --git a/data/graphics/trainers/back_pic_coords.inc b/data/graphics/trainers/back_pic_coords.inc
new file mode 100644
index 000000000..57a45c71e
--- /dev/null
+++ b/data/graphics/trainers/back_pic_coords.inc
@@ -0,0 +1,10 @@
+	.align 2
+gTrainerBackPicCoords:: @ 8305D2C
+	.byte 0x08, 0x04, 0x00, 0x00
+	.byte 0x08, 0x04, 0x00, 0x00
+	.byte 0x08, 0x05, 0x00, 0x00
+	.byte 0x08, 0x05, 0x00, 0x00
+	.byte 0x08, 0x04, 0x00, 0x00
+	.byte 0x08, 0x04, 0x00, 0x00
+	.byte 0x08, 0x04, 0x00, 0x00
+	.byte 0x08, 0x04, 0x00, 0x00
diff --git a/data/graphics/trainers/trainer_back_pic_palette_table.inc b/data/graphics/trainers/back_pic_palette_table.inc
index 46e56f2ac..46e56f2ac 100644
--- a/data/graphics/trainers/trainer_back_pic_palette_table.inc
+++ b/data/graphics/trainers/back_pic_palette_table.inc
diff --git a/data/graphics/trainers/trainer_back_pic_table.inc b/data/graphics/trainers/back_pic_table.inc
index e67c2a073..e67c2a073 100644
--- a/data/graphics/trainers/trainer_back_pic_table.inc
+++ b/data/graphics/trainers/back_pic_table.inc
diff --git a/data/graphics/trainers/front_pic_coords.inc b/data/graphics/trainers/front_pic_coords.inc
new file mode 100644
index 000000000..8d20f0a9e
--- /dev/null
+++ b/data/graphics/trainers/front_pic_coords.inc
@@ -0,0 +1,95 @@
+	.align 2
+gTrainerFrontPicCoords:: @ 83054E0
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x02, 0x00, 0x00
+	.byte 0x08, 0x02, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x02, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x02, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x02, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x02, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
+	.byte 0x08, 0x01, 0x00, 0x00
diff --git a/data/graphics/trainers/trainer_front_pic_palette_table.inc b/data/graphics/trainers/front_pic_palette_table.inc
index 44cf98dab..44cf98dab 100644
--- a/data/graphics/trainers/trainer_front_pic_palette_table.inc
+++ b/data/graphics/trainers/front_pic_palette_table.inc
diff --git a/data/graphics/trainers/trainer_front_pic_table.inc b/data/graphics/trainers/front_pic_table.inc
index 91294d170..91294d170 100644
--- a/data/graphics/trainers/trainer_front_pic_table.inc
+++ b/data/graphics/trainers/front_pic_table.inc
diff --git a/data/graphics/trainers/trainer_graphics.inc b/data/graphics/trainers/graphics.inc
index 897cb9ffb..897cb9ffb 100644
--- a/data/graphics/trainers/trainer_graphics.inc
+++ b/data/graphics/trainers/graphics.inc