new game Birch pic

4 files changed, 79 insertions, 10 deletions

diff --git a/data/data2.s b/data/data2.s
index ea412697c..4ac7f5600 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -3417,7 +3417,23 @@ gUnknown_08553A78: ; 8553A78
 	.incbin "base_emerald.gba", 0x553a78, 0x4
 
 gUnknown_08553A7C: ; 8553A7C
-	.incbin "base_emerald.gba", 0x553a7c, 0x6f14
+	.incbin "base_emerald.gba", 0x553a7c, 0x14
+
+	.align 2, 0
+
+gNewGameBirchPic: ; 8553A90
+	.incbin "data/graphics/new_game/birch.4bpp"
+
+	.incbin "base_emerald.gba", 0x554290, 0x66c0
+
+	.align 2, 0
+
+gNewGameBirchPalette: ; 855A950
+	.incbin "data/graphics/new_game/birch.gbapal"
+
+	.align 2, 0
+
+	.incbin "base_emerald.gba", 0x55a970, 0x20
 
 	.align 2, 0
 
@@ -3458,14 +3474,48 @@ gUnknown_0855B630: ; 855B630
 gUnknown_0855C1F0: ; 855C1F0
 	.incbin "base_emerald.gba", 0x55c1f0, 0x20
 
-gUnknown_0855C210: ; 855C210
-	.incbin "base_emerald.gba", 0x55c210, 0x20
+	.align 2, 0
+
+; TODO: something else uses these too
+gNewGameBirchOamAttributes: ; 855C210
+	.4byte OAM_SIZE_64x64
+	.2byte 0
+
+	.align 2, 0
+
+	.incbin "base_emerald.gba", 0x55c218, 0x10
 
-gUnknown_0855C230: ; 855C230
-	.incbin "base_emerald.gba", 0x55c230, 0x14
+	.align 2, 0
+
+gNewGameBirchPicTable: ; 855C228
+	obj_tiles gNewGameBirchPic, 0x800
+
+	.align 2, 0
+
+gNewGameBirchObjectPaletteInfo: ; 855C230
+	obj_pal gNewGameBirchPalette, 0x1006
+
+	.align 2, 0
+
+gNewGameBirchImageAnim: ; 855C238
+	obj_image_anim_frame 0, 1
+	obj_image_anim_end
+
+	.align 2, 0
+
+gNewGameBirchImageAnimTable: ; 855C240
+	.4byte gNewGameBirchImageAnim
+
+	.align 2, 0
 
-gUnknown_0855C244: ; 855C244
-	.incbin "base_emerald.gba", 0x55c244, 0x18
+gNewGameBirchObjectTemplate: ; 855C244
+	.2byte 0xFFFF ; tiles tag
+	.2byte 0x1006 ; palette tag
+	.4byte gNewGameBirchOamAttributes
+	.4byte gNewGameBirchImageAnimTable
+	.4byte gNewGameBirchPicTable
+	.4byte gDummyObjectRotScalAnimTable
+	.4byte DummyObjectCallback
 
 	.align 2, 0
 
diff --git a/data/graphics/field_objects/field_effect_objects.s b/data/graphics/field_objects/field_effect_objects.s
index 9f1c3cc1f..af54ce775 100644
--- a/data/graphics/field_objects/field_effect_objects.s
+++ b/data/graphics/field_objects/field_effect_objects.s
@@ -299,7 +299,7 @@ gFieldEffectObjectTemplate_Arrow: ; 850CC5C
 	.4byte gFieldEffectObjectImageAnimTable_Arrow
 	.4byte gFieldEffectObjectPicTable_Arrow
 	.4byte gDummyObjectRotScalAnimTable
-	.4byte nullsub_12
+	.4byte DummyObjectCallback
 
 	.align 2, 0
 
@@ -945,7 +945,7 @@ gFieldEffectObjectTemplate_Unknown21: ; 850D28C
 	.4byte gDummyObjectImageAnimTable
 	.4byte NULL
 	.4byte gFieldEffectObjectRotScalAnimTable_Unknown21
-	.4byte nullsub_12
+	.4byte DummyObjectCallback
 
 	.align 2, 0
 
@@ -1137,7 +1137,7 @@ gFieldEffectObjectTemplate_Bird: ; 850D4A8
 	.4byte gFieldEffectObjectImageAnimTable_Bird
 	.4byte gFieldEffectObjectPicTable_Bird
 	.4byte gDummyObjectRotScalAnimTable
-	.4byte nullsub_12
+	.4byte DummyObjectCallback
 
 	.align 2, 0
 
diff --git a/data/graphics/new_game/birch.pal b/data/graphics/new_game/birch.pal
new file mode 100644
index 000000000..b89a5861a
--- /dev/null
+++ b/data/graphics/new_game/birch.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 230 205
+222 189 148
+197 148 115
+106 74 65
+98 98 115
+41 57 65
+180 115 82
+115 74 57
+205 205 222
+148 148 148
+189 156 90
+139 115 57
+74 49 24
+255 255 255
+0 0 24
diff --git a/data/graphics/new_game/birch.png b/data/graphics/new_game/birch.png
new file mode 100644
index 000000000..2a2d7b6a9
--- /dev/null
+++ b/data/graphics/new_game/birch.png