naming screen graphics

24 files changed, 203 insertions, 9 deletions

diff --git a/asm/rom5.s b/asm/rom5.s
index 2af2d09fa..72c6bc0b3 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -123928,7 +123928,7 @@ sub_80B75B0: @ 80B75B0
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B75C0: .4byte gUnknown_08E86198
+_080B75C0: .4byte gNamingScreenPalettes
 	thumb_func_end sub_80B75B0
 
 	thumb_func_start sub_80B75C4
diff --git a/data/data2.s b/data/data2.s
index 9b4a73123..55a8ca5b3 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -13346,20 +13346,44 @@ gSpriteTemplate_83CE670:: @ 83CE670
 gSpriteTemplate_83CE688:: @ 83CE688
 	spr_template 0xFFFF, 0, gOamData_83CE498, gSpriteAnimTable_83CE5C4, gSpriteImageTable_83CE588, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_083CE6A0:: @ 83CE6A0
-	.incbin "baserom.gba", 0x003ce6a0, 0x68
+	obj_tiles gNamingScreenBackButtonTiles, 0x1E0, 0
+	obj_tiles gNamingScreenOKButtonTiles, 0x1E0, 1
+	obj_tiles gNamingScreenChangeKeyboardBoxTiles, 0x280, 2
+	obj_tiles gNamingScreenChangeKeyboardButtonTiles, 0x100, 3
+	obj_tiles gNamingScreenLowerTextTiles, 0x60, 4
+	obj_tiles gNamingScreenUpperTextTiles, 0x60, 5
+	obj_tiles gNamingScreenOthersTextTiles, 0x60, 6
+	obj_tiles gNamingScreenCursorTiles, 0x80, 7
+	obj_tiles gNamingScreenActiveCursorSmallTiles, 0x80, 8
+	obj_tiles gNamingScreenActiveCursorBigTiles, 0x80, 9
+	obj_tiles gNamingScreenRightPointingTriangleTiles, 0x20, 10
+	obj_tiles gNamingScreenUnderscoreTiles, 0x20, 11
+	null_obj_tiles
 
+	.align 2
 gUnknown_083CE708:: @ 83CE708
-	.incbin "baserom.gba", 0x003ce708, 0x40
+	obj_pal gNamingScreenPalettes + 0x20 * 0, 0
+	obj_pal gNamingScreenPalettes + 0x20 * 1, 1
+	obj_pal gNamingScreenPalettes + 0x20 * 2, 2
+	obj_pal gNamingScreenPalettes + 0x20 * 3, 3
+	obj_pal gNamingScreenPalettes + 0x20 * 4, 4
+	obj_pal gNamingScreenPalettes + 0x20 * 5, 5
+	obj_pal gNamingScreenPalettes + 0x20 * 4, 6
+	null_obj_pal
 
+	.align 2
 gUnknown_083CE748:: @ 83CE748
-	.incbin "baserom.gba", 0x003ce748, 0x4b0
+	.incbin "graphics/naming_screen/lower_keyboard_map.bin"
 
+	.align 2
 gUnknown_083CEBF8:: @ 83CEBF8
-	.incbin "baserom.gba", 0x003cebf8, 0x4b0
+	.incbin "graphics/naming_screen/upper_keyboard_map.bin"
 
+	.align 2
 gUnknown_083CF0A8:: @ 83CF0A8
-	.incbin "baserom.gba", 0x003cf0a8, 0x4b0
+	.incbin "graphics/naming_screen/others_keyboard_map.bin"
 
 	.align 2
 gOamData_83CF558:: @ 83CF558
diff --git a/data/graphics.s b/data/graphics.s
index 00c5d8768..6ae62fc69 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -3122,13 +3122,69 @@ gMailTilemap_Fab:: @ 8E84B6C
 gMailTilemap_Retro:: @ 8E84C84
 	.incbin "graphics/mail/retro/map.bin.lz"
 
-	.incbin "baserom.gba", 0x00e84d98, 0xc00
+	.align 2
+gNamingScreenBackButtonTiles:: @ 8E84D98
+	.incbin "graphics/naming_screen/back_button.4bpp"
+
+	.align 2
+gNamingScreenRightPointingTriangleTiles:: @ 8E84F78
+	.incbin "graphics/naming_screen/right_pointing_triangle.4bpp"
+
+	.align 2
+gNamingScreenOKButtonTiles:: @ 8E84F98
+	.incbin "graphics/naming_screen/ok_button.4bpp"
+
+	.align 2
+gNamingScreenUnderscoreTiles:: @ 8E85178
+	.incbin "graphics/naming_screen/underscore.4bpp"
+
+	.align 2
+gNamingScreenChangeKeyboardBoxTiles:: @ 8E85198
+	.incbin "graphics/naming_screen/change_keyboard_box.4bpp"
+
+	.align 2
+gNamingScreenChangeKeyboardButtonTiles:: @ 8E85418
+	.incbin "graphics/naming_screen/change_keyboard_button.4bpp"
+
+	.space 128
+
+	.align 2
+gNamingScreenOthersTextTiles:: @ 8E85598
+	.incbin "graphics/naming_screen/others_text.4bpp"
+
+	.align 2
+gNamingScreenCursorTiles:: @ 8E855F8
+	.incbin "graphics/naming_screen/cursor.4bpp"
+
+	.align 2
+gNamingScreenActiveCursorSmallTiles:: @ 8E85678
+	.incbin "graphics/naming_screen/active_cursor_small.4bpp"
+
+	.align 2
+gNamingScreenActiveCursorBigTiles:: @ 8E856F8
+	.incbin "graphics/naming_screen/active_cursor_big.4bpp"
+
+	.align 2
+gNamingScreenLowerTextTiles:: @ 8E85778
+	.incbin "graphics/naming_screen/lower_text.4bpp"
+
+	.align 2
+gNamingScreenUpperTextTiles:: @ 8E857D8
+	.incbin "graphics/naming_screen/upper_text.4bpp"
+
+	.incbin "baserom.gba", 0x00e85838, 0x160
 
 gUnknown_08E85998:: @ 8E85998
 	.incbin "baserom.gba", 0x00e85998, 0x800
 
-gUnknown_08E86198:: @ 8E86198
-	.incbin "baserom.gba", 0x00e86198, 0xc0
+	.align 2
+gNamingScreenPalettes:: @ 8E86198
+	.incbin "graphics/naming_screen/0.gbapal"
+	.incbin "graphics/naming_screen/1.gbapal"
+	.incbin "graphics/naming_screen/2.gbapal"
+	.incbin "graphics/naming_screen/3.gbapal"
+	.incbin "graphics/naming_screen/4.gbapal"
+	.incbin "graphics/naming_screen/5.gbapal"
 
 gUnknown_08E86258:: @ 8E86258
 	.incbin "baserom.gba", 0x00e86258, 0x500
diff --git a/graphics/naming_screen/0.pal b/graphics/naming_screen/0.pal
new file mode 100644
index 000000000..95d68e49f
--- /dev/null
+++ b/graphics/naming_screen/0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+82 65 98
+98 82 115
+98 98 98
+115 115 115
+139 139 139
+98 57 82
+115 49 65
+213 213 189
+156 32 32
+180 32 24
+139 41 49
+246 238 246
+164 148 123
+213 197 197
+255 255 255
diff --git a/graphics/naming_screen/1.pal b/graphics/naming_screen/1.pal
new file mode 100644
index 000000000..e8d943e45
--- /dev/null
+++ b/graphics/naming_screen/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+57 57 57
+115 115 115
+156 148 197
+180 172 222
+0 0 0
+230 213 255
+156 139 156
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+98 98 98
+205 180 238
diff --git a/graphics/naming_screen/2.pal b/graphics/naming_screen/2.pal
new file mode 100644
index 000000000..fd7ea1426
--- /dev/null
+++ b/graphics/naming_screen/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+57 57 57
+115 115 115
+106 172 156
+115 189 164
+0 0 0
+164 230 205
+131 164 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+98 98 98
+148 213 180
diff --git a/graphics/naming_screen/3.pal b/graphics/naming_screen/3.pal
new file mode 100644
index 000000000..b513391e0
--- /dev/null
+++ b/graphics/naming_screen/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+57 57 57
+115 115 115
+213 131 98
+230 156 123
+0 0 0
+246 205 180
+172 123 82
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+98 98 98
+255 180 148
diff --git a/graphics/naming_screen/4.pal b/graphics/naming_screen/4.pal
new file mode 100644
index 000000000..a87e6977f
--- /dev/null
+++ b/graphics/naming_screen/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+238 238 255
+57 57 57
+115 115 115
+156 148 197
+205 180 238
+106 164 148
+148 213 180
+213 131 98
+255 180 148
+205 180 41
+246 238 106
+98 98 98
+222 205 230
+98 98 98
+205 189 238
diff --git a/graphics/naming_screen/5.pal b/graphics/naming_screen/5.pal
new file mode 100644
index 000000000..0b1ecbde6
--- /dev/null
+++ b/graphics/naming_screen/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 8 8
+222 57 74
+180 65 82
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+205 189 238
diff --git a/graphics/naming_screen/active_cursor_big.png b/graphics/naming_screen/active_cursor_big.png
new file mode 100644
index 000000000..286ec102a
--- /dev/null
+++ b/graphics/naming_screen/active_cursor_big.png
diff --git a/graphics/naming_screen/active_cursor_small.png b/graphics/naming_screen/active_cursor_small.png
new file mode 100644
index 000000000..ebdbc3a4e
--- /dev/null
+++ b/graphics/naming_screen/active_cursor_small.png
diff --git a/graphics/naming_screen/back_button.png b/graphics/naming_screen/back_button.png
new file mode 100644
index 000000000..39d69ba1a
--- /dev/null
+++ b/graphics/naming_screen/back_button.png
diff --git a/graphics/naming_screen/change_keyboard_box.png b/graphics/naming_screen/change_keyboard_box.png
new file mode 100644
index 000000000..be09850be
--- /dev/null
+++ b/graphics/naming_screen/change_keyboard_box.png
diff --git a/graphics/naming_screen/change_keyboard_button.png b/graphics/naming_screen/change_keyboard_button.png
new file mode 100644
index 000000000..882bb5efd
--- /dev/null
+++ b/graphics/naming_screen/change_keyboard_button.png
diff --git a/graphics/naming_screen/cursor.png b/graphics/naming_screen/cursor.png
new file mode 100644
index 000000000..1560ffb3b
--- /dev/null
+++ b/graphics/naming_screen/cursor.png
diff --git a/graphics/naming_screen/lower_keyboard_map.bin b/graphics/naming_screen/lower_keyboard_map.bin
new file mode 100644
index 000000000..f4ab18773
--- /dev/null
+++ b/graphics/naming_screen/lower_keyboard_map.bin
diff --git a/graphics/naming_screen/lower_text.png b/graphics/naming_screen/lower_text.png
new file mode 100644
index 000000000..472e0abb0
--- /dev/null
+++ b/graphics/naming_screen/lower_text.png
diff --git a/graphics/naming_screen/ok_button.png b/graphics/naming_screen/ok_button.png
new file mode 100644
index 000000000..2e9e9806d
--- /dev/null
+++ b/graphics/naming_screen/ok_button.png
diff --git a/graphics/naming_screen/others_keyboard_map.bin b/graphics/naming_screen/others_keyboard_map.bin
new file mode 100644
index 000000000..14d0c66ce
--- /dev/null
+++ b/graphics/naming_screen/others_keyboard_map.bin
diff --git a/graphics/naming_screen/others_text.png b/graphics/naming_screen/others_text.png
new file mode 100644
index 000000000..ffd71701a
--- /dev/null
+++ b/graphics/naming_screen/others_text.png
diff --git a/graphics/naming_screen/right_pointing_triangle.png b/graphics/naming_screen/right_pointing_triangle.png
new file mode 100644
index 000000000..508bbf588
--- /dev/null
+++ b/graphics/naming_screen/right_pointing_triangle.png
diff --git a/graphics/naming_screen/underscore.png b/graphics/naming_screen/underscore.png
new file mode 100644
index 000000000..1f0cec0a4
--- /dev/null
+++ b/graphics/naming_screen/underscore.png
diff --git a/graphics/naming_screen/upper_keyboard_map.bin b/graphics/naming_screen/upper_keyboard_map.bin
new file mode 100644
index 000000000..cd8dda525
--- /dev/null
+++ b/graphics/naming_screen/upper_keyboard_map.bin
diff --git a/graphics/naming_screen/upper_text.png b/graphics/naming_screen/upper_text.png
new file mode 100644
index 000000000..58bfbed35
--- /dev/null
+++ b/graphics/naming_screen/upper_text.png