From 0c2c8e2c2886c55aaf1b929e3e7be51d38edd8ee Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Fri, 29 Nov 2019 10:51:23 -0500
Subject: [PATCH 1/2] Dump data/naming_screen

---
 baserom.ips                                  | Bin 158660 -> 151672 bytes
 data/graphics.s                              |  57 ++-
 data/naming_screen.s                         | 401 ++++++++++++++++---
 graphics/interface/naming_screen_83E1800.png | Bin 0 -> 205 bytes
 graphics/interface/naming_screen_83E18C0.png | Bin 0 -> 216 bytes
 graphics/interface/naming_screen_83E1980.png | Bin 0 -> 704 bytes
 graphics/interface/naming_screen_8E98004.pal |  19 +
 graphics/interface/naming_screen_8E98024.pal |  19 +
 graphics/interface/naming_screen_8E98044.pal |  19 +
 graphics/interface/naming_screen_8E98064.pal |  19 +
 graphics/interface/naming_screen_8E98084.pal |  19 +
 graphics/interface/naming_screen_8E980A4.pal |  19 +
 graphics/interface/naming_screen_8E980C4.pal |  19 +
 graphics/interface/naming_screen_8E985D8.png | Bin 0 -> 266 bytes
 graphics/interface/naming_screen_8E98858.png | Bin 0 -> 297 bytes
 graphics/interface/naming_screen_8E98A38.png | Bin 0 -> 277 bytes
 graphics/interface/naming_screen_8E98C18.png | Bin 0 -> 203 bytes
 graphics/interface/naming_screen_8E98CB8.png | Bin 0 -> 199 bytes
 graphics/interface/naming_screen_8E98D58.png | Bin 0 -> 206 bytes
 graphics/interface/naming_screen_8E98DF8.png | Bin 0 -> 175 bytes
 graphics/interface/naming_screen_8E98E98.png | Bin 0 -> 178 bytes
 graphics/interface/naming_screen_8E98F38.png | Bin 0 -> 187 bytes
 graphics/interface/naming_screen_8E98FD8.png | Bin 0 -> 158 bytes
 graphics/interface/naming_screen_8E990D8.png | Bin 0 -> 166 bytes
 graphics/interface/naming_screen_8E990F8.png | Bin 0 -> 150 bytes
 25 files changed, 537 insertions(+), 54 deletions(-)
 create mode 100644 graphics/interface/naming_screen_83E1800.png
 create mode 100644 graphics/interface/naming_screen_83E18C0.png
 create mode 100644 graphics/interface/naming_screen_83E1980.png
 create mode 100644 graphics/interface/naming_screen_8E98004.pal
 create mode 100644 graphics/interface/naming_screen_8E98024.pal
 create mode 100644 graphics/interface/naming_screen_8E98044.pal
 create mode 100644 graphics/interface/naming_screen_8E98064.pal
 create mode 100644 graphics/interface/naming_screen_8E98084.pal
 create mode 100644 graphics/interface/naming_screen_8E980A4.pal
 create mode 100644 graphics/interface/naming_screen_8E980C4.pal
 create mode 100644 graphics/interface/naming_screen_8E985D8.png
 create mode 100644 graphics/interface/naming_screen_8E98858.png
 create mode 100644 graphics/interface/naming_screen_8E98A38.png
 create mode 100644 graphics/interface/naming_screen_8E98C18.png
 create mode 100644 graphics/interface/naming_screen_8E98CB8.png
 create mode 100644 graphics/interface/naming_screen_8E98D58.png
 create mode 100644 graphics/interface/naming_screen_8E98DF8.png
 create mode 100644 graphics/interface/naming_screen_8E98E98.png
 create mode 100644 graphics/interface/naming_screen_8E98F38.png
 create mode 100644 graphics/interface/naming_screen_8E98FD8.png
 create mode 100644 graphics/interface/naming_screen_8E990D8.png
 create mode 100644 graphics/interface/naming_screen_8E990F8.png

diff --git a/baserom.ips b/baserom.ips
index c9e739d73d7c1fa201efa7c8567b8d8183d4ce1f..a72abbfcb45178f8c610d35070c869ac0d6bc828 100644
GIT binary patch
delta 45
zcmV+|0Mh@&*9rKb39zQNgV)8k*Tn&|I06DFw~YP)C;|oPfaC=9x0C?_^aQua5d!>K
D7#|hC

delta 5778
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
EUt6QM%K!iX

diff --git a/data/graphics.s b/data/graphics.s
index 818b01e3a..ff8c08e51 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16086,10 +16086,28 @@ gUnknown_8E97EC4:: @ 8E97EC4
 	.incbin "baserom.gba", 0xE97EC4, 0x120
 
 gUnknown_8E97FE4:: @ 8E97FE4
-	.incbin "baserom.gba", 0xE97FE4, 0x40 @UNKNOWN
+	.incbin "baserom.gba", 0xE97FE4, 0x20 @UNKNOWN
+
+gUnknown_8E98004:: @ 8E98004
+	.incbin "graphics/interface/naming_screen_8E98004.gbapal"
 
 gUnknown_8E98024:: @ 8E98024
-	.incbin "baserom.gba", 0xE98024, 0xC0 @UNKNOWN
+	.incbin "graphics/interface/naming_screen_8E98024.gbapal"
+
+gUnknown_8E98044:: @ 8E98044
+	.incbin "graphics/interface/naming_screen_8E98044.gbapal"
+
+gUnknown_8E98064:: @ 8E98064
+	.incbin "graphics/interface/naming_screen_8E98064.gbapal"
+
+gUnknown_8E98084:: @ 8E98084
+	.incbin "graphics/interface/naming_screen_8E98084.gbapal"
+
+gUnknown_8E980A4:: @ 8E980A4
+	.incbin "graphics/interface/naming_screen_8E980A4.gbapal"
+
+gUnknown_8E980C4:: @ 8E980C4
+	.incbin "graphics/interface/naming_screen_8E980C4.gbapal"
 
 gUnknown_8E980E4:: @ 8E980E4
 	.incbin "baserom.gba", 0xE980E4, 0x1D8
@@ -16107,7 +16125,40 @@ gUnknown_8E98518:: @ 8E98518
 	.incbin "baserom.gba", 0xE98518, 0xC0
 	
 gUnknown_8E985D8:: @ 8E985D8
-	.incbin "baserom.gba", 0xE985D8, 0xB40 @UNKNOWN, FALSEPOSITIVE?
+	.incbin "graphics/interface/naming_screen_8E985D8"
+
+gUnknown_8E98858:: @ 8E98858
+	.incbin "graphics/interface/naming_screen_8E98858"
+
+gUnknown_8E98A38:: @ 8E98A38
+    .incbin "graphics/interface/naming_screen_8E98A38"
+
+gUnknown_8E98C18:: @ 8E98C18
+    .incbin "graphics/interface/naming_screen_8E98C18"
+
+gUnknown_8E98CB8:: @ 8E98CB8
+    .incbin "graphics/interface/naming_screen_8E98CB8"
+
+gUnknown_8E98D58:: @ 8E98D58
+    .incbin "graphics/interface/naming_screen_8E98D58"
+
+gUnknown_8E98DF8:: @ 8E98DF8
+    .incbin "graphics/interface/naming_screen_8E98DF8"
+
+gUnknown_8E98E98:: @ 8E98E98
+    .incbin "graphics/interface/naming_screen_8E98E98"
+
+gUnknown_8E98F38:: @ 8E98F38
+    .incbin "graphics/interface/naming_screen_8E98F38"
+
+gUnknown_8E98FD8:: @ 8E98FD8
+    .incbin "graphics/interface/naming_screen_8E98FD8"
+
+gUnknown_8E990D8:: @ 8E990D8
+    .incbin "graphics/interface/naming_screen_8E990D8"
+
+gUnknown_8E990F8:: @ 8E990F8
+    .incbin "graphics/interface/naming_screen_8E990F8"
 
 gUnknown_8E99118:: @ 8E99118
 	.incbin "graphics/tm_case/unk_8E99118.4bpp"
diff --git a/data/naming_screen.s b/data/naming_screen.s
index 5d49b2581..121d05c88 100644
--- a/data/naming_screen.s
+++ b/data/naming_screen.s
@@ -6,154 +6,453 @@
 	.section .rodata
 	.align 2
 
-	.incbin "baserom.gba", 0x3E1800, 0xA80
+gUnknown_83E1800:: @ 83E1800
+	.incbin "graphics/interface/naming_screen_83E1800.4bpp"
+
+gUnknown_83E18C0:: @ 83E18C0
+	.incbin "graphics/interface/naming_screen_83E18C0.4bpp"
+
+gUnknown_83E1980:: @ 83E1980
+	.incbin "graphics/interface/naming_screen_83E1980.4bpp"
 
 gUnknown_83E2280:: @ 83E2280
-	.incbin "baserom.gba", 0x3E2280, 0x10
+	.4byte Text_1A5CF1
+	.4byte Text_1A5D31
+	.4byte Text_1A5D6E
+	.4byte Text_1A5DB1
 
 gUnknown_83E2290:: @ 83E2290
-	.incbin "baserom.gba", 0x3E2290, 0x10
+	.4byte 0x000001e0
+	@ {
+	@   .bg = 0,
+	@   .charBaseIndex = 0,
+	@   .mapBaseIndex = 30,
+	@   .screenSize = 0,
+	@   .paletteMode = 0,
+	@   .priority = 0,
+	@   .baseTile = 0x0000
+	@ }
+	.4byte 0x000011d9
+	@ {
+	@   .bg = 1,
+	@   .charBaseIndex = 2,
+	@   .mapBaseIndex = 29,
+	@   .screenSize = 0,
+	@   .paletteMode = 0,
+	@   .priority = 1,
+	@   .baseTile = 0x0000
+	@ }
+	.4byte 0x000021ca
+	@ {
+	@   .bg = 2,
+	@   .charBaseIndex = 2,
+	@   .mapBaseIndex = 28,
+	@   .screenSize = 0,
+	@   .paletteMode = 0,
+	@   .priority = 2,
+	@   .baseTile = 0x0000
+	@ }
+	.4byte 0x000031ff
+	@ {
+	@   .bg = 3,
+	@   .charBaseIndex = 3,
+	@   .mapBaseIndex = 31,
+	@   .screenSize = 0,
+	@   .paletteMode = 0,
+	@   .priority = 3,
+	@   .baseTile = 0x0000
+	@ }
 
 gUnknown_83E22A0:: @ 83E22A0
-	.incbin "baserom.gba", 0x3E22A0, 0x30
+	.byte 1, 3, 10, 19, 8, 10
+	.2byte 0x0030
+	@ {
+	@   .bg = 1,
+	@   .tilemapLeft = 3,
+	@   .tilemapTop = 10,
+	@   .width = 19,
+	@   .height = 8,
+	@   .paletteNum = 10,
+	@   .baseBlock = 0x0030
+	@ }
+	.byte 2, 3, 10, 19, 8, 10
+	.2byte 0x00c8
+	@ {
+	@   .bg = 2,
+	@   .tilemapLeft = 3,
+	@   .tilemapTop = 10,
+	@   .width = 19,
+	@   .height = 8,
+	@   .paletteNum = 10,
+	@   .baseBlock = 0x00c8
+	@ }
+	.byte 3, 8, 6, 14, 2, 10
+	.2byte 0x0030
+	@ {
+	@   .bg = 3,
+	@   .tilemapLeft = 8,
+	@   .tilemapTop = 6,
+	@   .width = 14,
+	@   .height = 2,
+	@   .paletteNum = 10,
+	@   .baseBlock = 0x0030
+	@ }
+	.byte 3, 9, 4, 16, 2, 10
+	.2byte 0x004c
+	@ {
+	@   .bg = 3,
+	@   .tilemapLeft = 9,
+	@   .tilemapTop = 4,
+	@   .width = 16,
+	@   .height = 2,
+	@   .paletteNum = 10,
+	@   .baseBlock = 0x004c
+	@ }
+	.byte 0, 0, 0, 30, 2, 11
+	.2byte 0x006c
+	@ {
+	@   .bg = 0,
+	@   .tilemapLeft = 0,
+	@   .tilemapTop = 0,
+	@   .width = 30,
+	@   .height = 2,
+	@   .paletteNum = 11,
+	@   .baseBlock = 0x006c
+	@ }
+	.byte 255, 0, 0, 0, 0, 0
+	.2byte 0x0000
+	@ {
+	@   .bg = 255,
+	@   .tilemapLeft = 0,
+	@   .tilemapTop = 0,
+	@   .width = 0,
+	@   .height = 0,
+	@   .paletteNum = 0,
+	@   .baseBlock = 0x0000
+	@ }
 
 gUnknown_83E22D0:: @ 83E22D0
-	.incbin "baserom.gba", 0x3E22D0, 0x60
+	.string "abcdef .", 8
+	.string "ghijkl ,", 8
+	.string "mnopqrs",  8
+	.string "tuvwxyz",  8
+	.string "ABCDEF .", 8
+	.string "GHIJKL ,", 8
+	.string "MNOPQRS",  8
+	.string "TUVWXYZ",  8
+	.string "01234",    8
+	.string "56789",    8
+	.string "!?♂♀/-",   8
+	.string "…“”‘'",    8
 
 gUnknown_83E2330:: @ 83E2330
-	.incbin "baserom.gba", 0x3E2330, 0x3
+	.byte 0x08, 0x08, 0x06
 
 gUnknown_83E2333:: @ 83E2333
-	.incbin "baserom.gba", 0x3E2333, 0x18
+	.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x16, 0x2c, 0x42, 0x58, 0x6e, 0x00, 0x00
 
 gUnknown_83E234B:: @ 83E234B
-	.incbin "baserom.gba", 0x3E234B, 0x3
+	.byte 0x00, 0x02, 0x01
 
 gUnknown_83E234E:: @ 83E234E
-	.incbin "baserom.gba", 0x3E234E, 0x3
+	.byte 0x01, 0x00, 0x02
 
 gUnknown_83E2351:: @ 83E2351
-	.incbin "baserom.gba", 0x3E2351, 0x3
+	.byte 0x02, 0x01, 0x00
 
 gUnknown_83E2354:: @ 83E2354
-	.incbin "baserom.gba", 0x3E2354, 0x10
+	.4byte sub_809E384
+	.4byte sub_809E3AC
+	.4byte sub_809E440
+	.4byte sub_809E4D4
 
 gUnknown_83E2364:: @ 83E2364
-	.incbin "baserom.gba", 0x3E2364, 0x8
+	.2byte 0x0000, 0xfffc, 0xfffe, 0xffff
 
 gUnknown_83E236C:: @ 83E236C
-	.incbin "baserom.gba", 0x3E236C, 0x8
+	.2byte 0x0002, 0x0003, 0x0002, 0x0001
 
 gUnknown_83E2374:: @ 83E2374
-	.incbin "baserom.gba", 0x3E2374, 0x4
+	.byte 0x01, 0x02, 0x03, 0x00
 
 gUnknown_83E2378:: @ 83E2378
-	.incbin "baserom.gba", 0x3E2378, 0x10
+	.4byte sub_809EC7C
+	.4byte sub_809ECD0
+	.4byte sub_809ECD4
+	.4byte sub_809ED48
 
 gUnknown_83E2388:: @ 83E2388
-	.incbin "baserom.gba", 0x3E2388, 0x6
+	.2byte 0x0001, 0x0003, 0x0002
 
 gUnknown_83E238E:: @ 83E238E
-	.incbin "baserom.gba", 0x3E238E, 0x6
+	.2byte 0x0004, 0x0006, 0x0005
 
 gUnknown_83E2394:: @ 83E2394
-	.incbin "baserom.gba", 0x3E2394, 0x28
+	.4byte nullsub_54
+	.4byte sub_809EF54
+	.4byte sub_809EFB0
+	.4byte sub_809EFF0
+	.4byte sub_809F04C
+
+gUnknown_83E23A8:: @ 83E23A8
+	obj_image_anim_frame 0, 10
+	obj_image_anim_frame 24, 10
+	obj_image_anim_frame 0, 10
+	obj_image_anim_frame 32, 10
+	obj_image_anim_jump 0
 
 gUnknown_83E23BC:: @ 83E23BC
-	.incbin "baserom.gba", 0x3E23BC, 0x4
+	.4byte gUnknown_83E23A8
 
 gUnknown_83E23C0:: @ 83E23C0
-	.incbin "baserom.gba", 0x3E23C0, 0x8
+	obj_tiles gUnknown_83E1980, 0x0900, 255
 
 gUnknown_83E23C8:: @ 83E23C8
-	.incbin "baserom.gba", 0x3E23C8, 0x8
+	obj_pal gUnknown_8E98004, 255
 
 gUnknown_83E23D0:: @ 83E23D0
-	.incbin "baserom.gba", 0x3E23D0, 0x10
+	.4byte sub_809F11C
+	.4byte KeyboardKeyHandler_Page
+	.4byte KeyboardKeyHandler_Backspace
+	.4byte KeyboardKeyHandler_OK
 
 gUnknown_83E23E0:: @ 83E23E0
-	.incbin "baserom.gba", 0x3E23E0, 0x8
+	.4byte InputState_Disabled
+	.4byte InputState_Enabled
 
 gUnknown_83E23E8:: @ 83E23E8
-	.incbin "baserom.gba", 0x3E23E8, 0xA
+	.2byte 0x0000, 0x0000, 0x0000, 0xffff, 0x0001
 
 gUnknown_83E23F2:: @ 83E23F2
-	.incbin "baserom.gba", 0x3E23F2, 0xA
+	.2byte 0x0000, 0xffff, 0x0001, 0x0000, 0x0000
 
 gUnknown_83E23FC:: @ 83E23FC
-	.incbin "baserom.gba", 0x3E23FC, 0x8
+	.2byte 0x0000, 0x0001, 0x0001, 0x0002
 
 gUnknown_83E2404:: @ 83E2404
-	.incbin "baserom.gba", 0x3E2404, 0x8
+	.2byte 0x0000, 0x0000, 0x0003, 0x0000
 
 gUnknown_83E240C:: @ 83E240C
-	.incbin "baserom.gba", 0x3E240C, 0x14
+	.4byte sub_809F49C
+	.4byte sub_809F49C
+	.4byte sub_809F4F0
+	.4byte sub_809F4F0
+	.4byte sub_809F49C
 
 gUnknown_83E2420:: @ 83E2420
-	.incbin "baserom.gba", 0x3E2420, 0x8
+	.4byte nullsub_55
+	.4byte sub_809F5C4
 
 gUnknown_83E2428:: @ 83E2428
-	.incbin "baserom.gba", 0x3E2428, 0x14
+	.byte 0x00, 0x09, 0x08, 0x00
+	.byte 0x05, 0x04, 0x00, 0x00
+
+gUnknown_83E2430:: @ 83E2430
+	.byte 0x0d, 0x01, 0x02, 0x00
+
+gUnknown_83E2434:: @ 83E2434
+	.byte 0x0e, 0x01, 0x02, 0x00
+
+gUnknown_83E2438:: @ 83E2438
+	.byte 0x0f, 0x01, 0x02, 0x00
 
 gUnknown_83E243C:: @ 83E243C
-	.incbin "baserom.gba", 0x3E243C, 0x4
+	.byte 0xee, 0xdd, 0xff, 0x00
 
 gUnknown_83E2440:: @ 83E2440
-	.incbin "baserom.gba", 0x3E2440, 0xC
+	.4byte gUnknown_83E2434
+	.4byte gUnknown_83E2430
+	.4byte gUnknown_83E2438
 
 gUnknown_83E244C:: @ 83E244C
-	.incbin "baserom.gba", 0x3E244C, 0xC
+	.4byte gUnknown_8E98398
+	.4byte gUnknown_8E98458
+	.4byte gUnknown_8E98518
 
 gUnknown_83E2458:: @ 83E2458
-	.incbin "baserom.gba", 0x3E2458, 0x34
+	.byte 0x0f, 0x01, 0x02
+
+	.align 2
+gUnknown_83E245C:: @ 83E245C
+	.byte 0x00, 0x07, 0x01, 0x00, 0x01
+	.align 2
+	.4byte gUnknown_8418E47
+
+gUnknown_83E2468:: @ 83E2468
+	.byte 0x00, 0x08, 0x02, 0x00, 0x01
+	.align 2
+	.4byte gUnknown_8418E52
+
+gUnknown_83E2474:: @ 83E2474
+	.byte 0x00, 0x0a, 0x03, 0x01, 0x01
+	.align 2
+	.4byte gUnknown_8418E5C
+
+gUnknown_83E2480:: @ 83E2480
+	.byte 0x00, 0x07, 0x04, 0x00, 0x01
+	.align 2
+	.4byte gUnknown_8418E69
 
 gUnknown_83E248C:: @ 83E248C
-	.incbin "baserom.gba", 0x3E248C, 0x78
+	.4byte gUnknown_83E245C
+	.4byte gUnknown_83E2468
+	.4byte gUnknown_83E2474
+	.4byte gUnknown_83E2474
+	.4byte gUnknown_83E2480
+
+gUnknown_83E24A0:: @ 83E24A0
+	.4byte 0x00000000, 0x00000000
+
+gUnknown_83E24A8:: @ 3E24A8
+	.4byte 0x40000000, 0x00000000
+
+gUnknown_83E24B0:: @ 3E24B0
+	.4byte 0x80004000, 0x00000000
+
+gUnknown_83E24B8:: @ 83E24B8
+	subsprite 236, 240, 1, 0x0000, 32x8
+	subsprite 12, 240, 1, 0x0004, 8x8
+	subsprite 236, 248, 1, 0x0005, 32x8
+	subsprite 12, 248, 1, 0x0009, 8x8
+	subsprite 236, 0, 1, 0x000a, 32x8
+	subsprite 12, 0, 1, 0x000e, 8x8
+	subsprite 236, 8, 1, 0x000f, 32x8
+	subsprite 12, 8, 1, 0x0013, 8x8
+
+gUnknown_83E24D8:: @ 83E24D8
+	subsprite 244, 252, 1, 0x0000, 16x8
+	subsprite 4, 252, 1, 0x0002, 8x8
+
+gUnknown_83E24E0:: @ 83E24E0
+	subsprite 236, 244, 1, 0x0000, 32x8
+	subsprite 12, 244, 1, 0x0004, 8x8
+	subsprite 236, 252, 1, 0x0005, 32x8
+	subsprite 12, 252, 1, 0x0009, 8x8
+	subsprite 236, 4, 1, 0x000a, 32x8
+	subsprite 12, 4, 1, 0x000e, 8x8
+
+gUnknown_83E24F8::
+	subsprite 248, 244, 3, 0x0000, 16x8
+	subsprite 248, 252, 3, 0x0002, 16x8
+	subsprite 248, 4, 3, 0x0004, 16x8
 
 gUnknown_83E2504:: @ 83E2504
-	.incbin "baserom.gba", 0x3E2504, 0x8
+	.byte 0x08
+	.align 2
+	.4byte gUnknown_83E24B8
 
 gUnknown_83E250C:: @ 83E250C
-	.incbin "baserom.gba", 0x3E250C, 0x18
+	.byte 0x02
+	.align 2
+	.4byte gUnknown_83E24D8
+	.byte 0x02
+	.align 2
+	.4byte gUnknown_83E24D8
+	.byte 0x02
+	.align 2
+	.4byte gUnknown_83E24D8
 
 gUnknown_83E2524:: @ 83E2524
-	.incbin "baserom.gba", 0x3E2524, 0x8
+	.byte 0x06
+	.align 2
+	.4byte gUnknown_83E24E0
 
 gUnknown_83E252C:: @ 83E252C
-	.incbin "baserom.gba", 0x3E252C, 0x48
+	.byte 0x03
+	.align 2
+	.4byte gUnknown_83E24F8
+
+gUnknown_83E2534:: @ 83E2534
+	obj_frame_tiles gUnknown_83E1800, 0x00c0
+	obj_frame_tiles gUnknown_83E18C0, 0x00c0
+
+gUnknown_83E2544:: @ 83E2544
+	obj_image_anim_frame 0, 1
+	obj_image_anim_jump 0
+
+gUnknown_83E254C:: @ 83E254C
+	obj_image_anim_frame 4, 8
+	obj_image_anim_frame 8, 8
+	obj_image_anim_end
+
+gUnknown_83E2558:: @ 83E2558
+	obj_image_anim_frame 0, 2
+	obj_image_anim_frame 1, 2
+	obj_image_anim_jump 0
+
+gUnknown_83E2564:: @ 83E2564
+	.4byte gUnknown_83E2544
+
+gUnknown_83E2568:: @ 83E2568
+	.4byte gUnknown_83E2544
+	.4byte gUnknown_83E254C
+
+gUnknown_83E2570:: @ 83E2570
+	.4byte gUnknown_83E2558
 
 gUnknown_83E2574:: @ 83E2574
-	.incbin "baserom.gba", 0x3E2574, 0x18
+	spr_template 2, 4, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809EC54
 
 gUnknown_83E258C:: @ 83E258C
-	.incbin "baserom.gba", 0x3E258C, 0x18
+	spr_template 3, 1, gUnknown_83E24B0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_83E25A4:: @ 83E25A4
-	.incbin "baserom.gba", 0x3E25A4, 0x18
+	spr_template 4, 4, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_83E25BC:: @ 83E25BC
-	.incbin "baserom.gba", 0x3E25BC, 0x18
+	spr_template 0, 6, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_83E25D4:: @ 83E25D4
-	.incbin "baserom.gba", 0x3E25D4, 0x18
+	spr_template 1, 7, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_83E25EC:: @ 83E25EC
-	.incbin "baserom.gba", 0x3E25EC, 0x18
+	spr_template 7, 5, gUnknown_83E24A8, gUnknown_83E2568, NULL, gDummySpriteAffineAnimTable, sub_809E700
 
 gUnknown_83E2604:: @ 83E2604
-	.incbin "baserom.gba", 0x3E2604, 0x18
+	spr_template 10, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E7F0
 
 gUnknown_83E261C:: @ 83E261C
-	.incbin "baserom.gba", 0x3E261C, 0x18
+	spr_template 11, 3, gUnknown_83E24A0, gUnknown_83E2564, NULL, gDummySpriteAffineAnimTable, sub_809E83C
 
 gUnknown_83E2634:: @ 83E2634
-	.incbin "baserom.gba", 0x3E2634, 0x18
+	spr_template 65535, 0, gUnknown_83E24A0, gUnknown_83E2570, gUnknown_83E2534, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_83E264C:: @ 83E264C
-	.incbin "baserom.gba", 0x3E264C, 0x30
+	.4byte gUnknown_847A955
+	.4byte gUnknown_847A976
+	.4byte gUnknown_847A997
+	.4byte gUnknown_847A9B8
+	.4byte gUnknown_847A9D9
+	.4byte gUnknown_847A9FA
+	.4byte gUnknown_847AA1B
+	.4byte gUnknown_847AA3C
+	.4byte gUnknown_847AA5D
+	.4byte gUnknown_847AA76
+	.4byte gUnknown_847AA8F
+	.4byte gUnknown_847AAA8
 
 gUnknown_83E267C:: @ 83E267C
-	.incbin "baserom.gba", 0x3E267C, 0x68
+	obj_tiles gUnknown_8E98858, 0x01e0, 0
+	obj_tiles gUnknown_8E98A38, 0x01e0, 1
+	obj_tiles gUnknown_8E985D8, 0x0280, 2
+	obj_tiles gUnknown_8E98FD8, 0x0100, 3
+	obj_tiles gUnknown_8E98C18, 0x0060, 4
+	obj_tiles gUnknown_8E98CB8, 0x0060, 5
+	obj_tiles gUnknown_8E98D58, 0x0060, 6
+	obj_tiles gUnknown_8E98DF8, 0x0080, 7
+	obj_tiles gUnknown_8E98E98, 0x0080, 8
+	obj_tiles gUnknown_8E98F38, 0x0080, 9
+	obj_tiles gUnknown_8E990D8, 0x0020, 10
+	obj_tiles gUnknown_8E990F8, 0x0020, 11
+	null_obj_tiles
 
 gUnknown_83E26E4:: @ 83E26E4
-	.incbin "baserom.gba", 0x3E26E4, 0x48
+	obj_pal gUnknown_8E98024, 0
+	obj_pal gUnknown_8E98044, 1
+	obj_pal gUnknown_8E98064, 2
+	obj_pal gUnknown_8E98084, 3
+	obj_pal gUnknown_8E980A4, 4
+	obj_pal gUnknown_8E980C4, 5
+	obj_pal gUnknown_8E980A4, 6
+	obj_pal gUnknown_8E980A4, 7
+	null_obj_pal
diff --git a/graphics/interface/naming_screen_83E1800.png b/graphics/interface/naming_screen_83E1800.png
new file mode 100644
index 0000000000000000000000000000000000000000..a24d40836350181d28495c818f999ae729b7a15d
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!VDxC`x5MdltF+`h-=oItN;K1FD@?b?rvVQ
zX35dLTb|v!di2?xtMB$c`*shg3J9*A4SIGj>fN*MZ|{!we0seAD8yJ2<QL4~@a#q!
zkmK#?;uyj)GdV$lU!s|jnYox<Lc+jcdmED@OGlw7$AO**1qBtR%dAFAxik3gq_DBY
zB|qlYDEs^WKXX!exV!u3yV4GB8WIa$G%+x!u;?9sFh%1Z&{zgfS3j3^P6<r_kg`g?

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_83E18C0.png b/graphics/interface/naming_screen_83E18C0.png
new file mode 100644
index 0000000000000000000000000000000000000000..1985816c39a5d3b4e203991623cc1099c696cb6a
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!VDxC`x5MdltF+`h-=oItN;K1FD@?b?rvVQ
zX35dLTb|v!di2?xtMB$c`*shg3J9*A4SIGj>fN*MZ|{!we0seAD8yJ2<QL4~@a#q!
zkQ3(V;uyj)GdV$lU!s|jnYox<Lc+k{dm}@~#gFnFaSbjGJR44M3ovy4Y3}^<<G-8|
z({)ysSO>N{DQs+U$&a};%KrZU&zuw<?(Y8iuC#-jhQxvwO$-dLd@Wa&)!Y9D+Q8uH
L>gTe~DWM4f;bKy`

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_83E1980.png b/graphics/interface/naming_screen_83E1980.png
new file mode 100644
index 0000000000000000000000000000000000000000..b69dadcc47f5b99739f669057cbd650d4743d7dd
GIT binary patch
literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq000mG00AHb0{{R3Ptfj50000mP)t-sbH$|p
z)wKV`l-`tcdqF|ftU;V=AZkh=bG-mTdjKFo5Y=;}q(O61AVKElF#rGnHx(Bz00001
zbW%=J06^y0W&i*JK1oDDR7i=<mBDJ;KoExaASe{XLh=BiO-}_Ah(rSgW2Ne;7oVIy
zK<X6~L`xyorGA&vlpaJtk5LFVaV(-h@#0r-W7C6(nEta`r?huR83g-F9?A26%+3mN
zFX2w?s^1!=uVNMRz3LsQXo6=2gwhaIuc!KhiIA#)f@dGaZ>3^YL=)jqoX72aA)I#p
zG~b30ub=$d+3Mm$a(~*|#RKtX<$2w2LO3sJ)uq!wI35cRUnWXZsyO)v(PvJUx8vD`
z5$OUKS4QT#@3`Z0qHA@fidf^`9Vo;E;Cfhr%#B#gg?Pm1)Cc4ieIR=WEI#Lku<YZl
z2tss|L6of6V1h7wC`pL<JSW80K)4<Y56N@p!{#3zA8nUmVeq&|Q4t$esDX-Ih->!F
z#QLD3hWrcj88Wd*MG1tMMu5QL@Y8|5W;=&FTbBncoYwAs$NWd=`NpVNWmF3)v;Ty<
z?9@Vz=XGT=&1|XmrG{cd8_ij7v@o+9Elhc%eSz~5?NhRQiH$aWW<;6gK8tgr%G7at
zZo8&jbCQj4+Uy_->>w&({xS1OeRd2$+&HgV7)0zkY?pO!xpSg3+goQBw!}sWZF&$n
z9Xp7e_jV8oGQoZs)bWDbCZp10F&d4uX`I=Z>IQl!{j<?Qy$tN2{vQ10BVX`FV=5l-
zn6@DeK=oLr+1QrYD4|9N_03)_<Y|Y@Tt-LfpEVyzsl_21IKS?q2|iV}KELQ@k5^gI
m(&UttCetkv2fxkvx86S$OB!5?mlIe30000<MNUMnLSTZg#YDRR

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E98004.pal b/graphics/interface/naming_screen_8E98004.pal
new file mode 100644
index 000000000..c3158adbf
--- /dev/null
+++ b/graphics/interface/naming_screen_8E98004.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 213 180
+255 197 148
+222 148 115
+123 65 65
+213 172 65
+156 106 32
+106 74 32
+115 189 0
+65 123 0
+32 65 16
+213 115 164
+164 65 115
+82 32 65
+230 230 49
+0 0 0
diff --git a/graphics/interface/naming_screen_8E98024.pal b/graphics/interface/naming_screen_8E98024.pal
new file mode 100644
index 000000000..2f5c86a56
--- /dev/null
+++ b/graphics/interface/naming_screen_8E98024.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+115 115 115
+139 139 131
+172 172 164
+197 189 180
+230 222 213
+197 230 156
+213 238 189
+230 246 222
+0 0 0
+0 0 0
+213 205 82
+230 222 90
+238 230 139
+246 238 197
diff --git a/graphics/interface/naming_screen_8E98044.pal b/graphics/interface/naming_screen_8E98044.pal
new file mode 100644
index 000000000..af5c2d1a5
--- /dev/null
+++ b/graphics/interface/naming_screen_8E98044.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+74 115 139
+98 139 164
+123 172 197
+156 205 230
+180 222 246
diff --git a/graphics/interface/naming_screen_8E98064.pal b/graphics/interface/naming_screen_8E98064.pal
new file mode 100644
index 000000000..0fac7e375
--- /dev/null
+++ b/graphics/interface/naming_screen_8E98064.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+172 115 74
+189 131 90
+213 156 115
+246 205 164
+255 230 197
diff --git a/graphics/interface/naming_screen_8E98084.pal b/graphics/interface/naming_screen_8E98084.pal
new file mode 100644
index 000000000..0bb9d4f71
--- /dev/null
+++ b/graphics/interface/naming_screen_8E98084.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+98 156 57
+123 172 82
+148 189 106
+197 230 156
+213 238 189
diff --git a/graphics/interface/naming_screen_8E980A4.pal b/graphics/interface/naming_screen_8E980A4.pal
new file mode 100644
index 000000000..fdf80bdb0
--- /dev/null
+++ b/graphics/interface/naming_screen_8E980A4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+139 139 131
+197 189 180
+230 222 213
+74 115 139
+123 172 197
+172 115 74
+213 156 115
+98 156 57
+148 189 106
+189 164 32
+230 222 90
+57 57 57
+57 57 57
diff --git a/graphics/interface/naming_screen_8E980C4.pal b/graphics/interface/naming_screen_8E980C4.pal
new file mode 100644
index 000000000..8950f9b34
--- /dev/null
+++ b/graphics/interface/naming_screen_8E980C4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+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
+230 222 213
+0 0 0
+230 222 213
+0 0 0
diff --git a/graphics/interface/naming_screen_8E985D8.png b/graphics/interface/naming_screen_8E985D8.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e8f409830c2d52e8e78829d0c11d66c3701ee47
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^8bGYT!VDxQHLDu~DT4r?5ZA0ZSO5S2Z)s^+TwDwk
zgMt4H3{bSD*lTZd)YUn~-_9=i|Lo}0D!WraMT{jue!&b5&u*jvIUSxZjv*Qo&rY)C
zYf#{E`^Z+rSj{RtH#X(_zr}^-Lc6c`?`L81)7!@;CCA&!vUFdezvzTzNi8wwn{LKT
z=+?8?bLaOScXO7=vVW~PcQ^lB^z63w91(VJADJarIkrVjxEVC1DZ!jOu|HVVF)62o
zwbgj-`ma;fR)0~v<#}qCyU(k8JC<MBQ$LB{=5f+h?{kM3K7xGV>FVdQ&MBb@0I^bL
A$N&HU

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E98858.png b/graphics/interface/naming_screen_8E98858.png
new file mode 100644
index 0000000000000000000000000000000000000000..57c4341942ac69be31c26c751113185c62c8445c
GIT binary patch
literal 297
zcmV+^0oMMBP)<h;3K|Lk000e1NJLTq001Ze000;S0{{R3da9!H0000mP)t-sYMj;o
z|NnDybBl|EtgNKPy|m`u)y3wV)$YCK_TB&h00000)y-1o-dgVFi}votjPmQC00001
zbW%=J06^y0W&i*Hr%6OXR2Y?okFgE{Aq<8|e1hgylvgm(*~Qy=X7=9TE`xD5Ho3jF
zaNdEC_?I-{qwQaeIW;n7H#Ry7yuK=($G5->RC*@(*hf^|HBGlehA{@fU=h%UDQ*z0
z4JoxyatQ$e1OmoRyZt*;jcfO1Pb~NB{;2!+Mhcnb6jJDEn8^_lq+pjJ&4T2{`sCbN
vIVkiB>8CP5-YT6o3;fQ^?morp-r4g5CAIq3DT!+<00000NkvXXu0mjfd^Lv&

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E98A38.png b/graphics/interface/naming_screen_8E98A38.png
new file mode 100644
index 0000000000000000000000000000000000000000..51acd15d1933f4c26581165324359fa51a6ab440
GIT binary patch
literal 277
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<;!VDy<RxSDrqznRlLR_=vT>bz5zon&Rad9zF
z3<mx)FhG%4ad%SplIk@_=bU}E<=!{<TiZ&2iWp0R{DK)Ap4~_TawdDaIEF|}?d{*q
zcgTRpRrxFT9`--HQ)j$%_*PT=tt6qHabvj4r@T3KnQt47RW6>KD!-0%d*X4`ni%1A
z8y?%9y8cr0N!Ok4pH)^@tIXfDetrDQ$-2R2OWyzYeKqU&yK8fvxjlQ=73db%xyQ@l
zz_!)tEKw>&i6UI5|4-A=vD6cBTvY5kXL5;$-lUN7Tf1Ic%4*L!DQ>pn=jE<xpMQZo
N<mu|?vd$@?2>`^kbJG9-

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E98C18.png b/graphics/interface/naming_screen_8E98C18.png
new file mode 100644
index 0000000000000000000000000000000000000000..68f0637b4e3cf8e3964605d951c63afa1bdafa53
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!VDxUYZhbxDT4r?5ZA0ZSO5S2Z)s`S-Q9e2
z@0Mrxu6h-BSFbs`rr7K1oZ_T8mQ(g-?Omeq>|PX54G^elJy`(M%UBZR7tG-B>_!@p
z<LT+*7{W0#_4Gzg216d_i)$9R{a!gS+x+9NkA*Bkj}A4l*Bi7l2-_ydFZMiXtIoE6
ydZ8lEtCP*=)b+#ScK%Q<dGMvD$k%#LE@K*_>?CK$ZB0N!89ZJ6T-G@yGywp;#7v<8

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E98CB8.png b/graphics/interface/naming_screen_8E98CB8.png
new file mode 100644
index 0000000000000000000000000000000000000000..741c5e5894bf6737e5b483daa9dabb86f355f6f5
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!VDxUYZhbxDT4r?5ZA0ZSO0Tx+_UuB;s{cN
z6+F9l6(|lN9qr05138Q(L4Lsu4$p3+0XeRoE{-7_GfU4H@*ObXak?0DQ2Kgm^TpY<
zx6PbqFA4hpqebFnowUEb1lt6UD#cdGPTA)If+h8Wr({KU=~w8SF52oHRl)dslUDLi
SeI_N46Fgo0T-G@yGywqi%sIgT

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E98D58.png b/graphics/interface/naming_screen_8E98D58.png
new file mode 100644
index 0000000000000000000000000000000000000000..32afa52821f461a3579be4861d55b0861acf8140
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!VDxUYZhbxDT4r?5ZA0ZSO5S2Z)s`S-Q9e2
z@0Mrxu6h-BSFbs`rr7K1oZ_T8mQ(g-?Omeq>|PX54G^elJy`(M%UBZR7tG-B>_!@p
z<KyY#7{W0#wa1X_fB_HlXV&%KtJi*dV)`#e*h@O&{E5SjCRL92d)nWfny-@-8z{8i
z#b^z`-KHr5irV%<;pc+IZ@mpTHu3W1d!GAeiyz9-yBT9@I1y+rgQu&X%Q~loCIIas
BPu2hc

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E98DF8.png b/graphics/interface/naming_screen_8E98DF8.png
new file mode 100644
index 0000000000000000000000000000000000000000..e34896cb9f6680f2bc736c7b722b08407b1d13f4
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!VDxUYZhbxDT4r?5ZA0ZSO5S2Z)s`S-Q9e2
z@0Mrxu6h-BSFbs`rr7K1oZ_T8mQ(g-?Omeq>|PX54G^elJy`(M%UBZR7tG-B>_!@p
zqwDG77{W0#IUzxSg^A7N0EdtW!>L9KgUAUCixqY$Oi^$Y$l~czIO7!3P$0$d<QLP*
T*265SK#dHZu6{1-oD!M<tiU>P

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E98E98.png b/graphics/interface/naming_screen_8E98E98.png
new file mode 100644
index 0000000000000000000000000000000000000000..45197320ded14c7de637c1609878055c29250e80
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!VDxUYZhbxDT4r?5ZA0ZSO5S2Z)s`S-Q9e2
z@0Mrxu6h-BSFbs`rr7K1oZ_T8mQ(g-?Omeq>|PX54G^elJy`(M%UBZR7tG-B>_!^M
zAWs*^5RRG22@Q<N1_=(VO$vsNC60;7$<8|#C<riUx(Vnqh&C55m=v+);bw;JV20RQ
Wc5dFy+8=;=89ZJ6T-G@yGywp8^*gix

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E98F38.png b/graphics/interface/naming_screen_8E98F38.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf1049e892e658ea122762a57d2ccb0b9a0f5201
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!VDxUYZhbxDT4r?5ZA0ZSO5S2Z)s`S-Q9e2
z@0Mrxu6h-BSFbs`rr7K1oZ_T8mQ(g-?Omeq>|PX54G^elJy`(M%UBZR7tG-B>_!@p
zW9jMQ7{W0#IUzxSg^7)gE!iNUfx&IU0)_xS6*Ue~5fL*pGZ7c@mLd;<7O7?>j?Dr*
f5BwUfcsUqsgL&qs*Cg`+4Po$f^>bP0l+XkK&wn|8

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E98FD8.png b/graphics/interface/naming_screen_8E98FD8.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c8fa888dfce502040b03e397874a9eee236788d
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h-=oItN;K1x3sh@E-nU&
z!N7k81}I9JV_Cf>Xv*HKqtE7CeYbb})Q(3$MT{jue!&b5&u*jvIWnFujv*3LlM@!O
qJ=ojLqQ}7cZV|&S&V(J!DGUr=`?7g2Ms*5+O!jp3b6Mw<&;$U4PcXg!

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E990D8.png b/graphics/interface/naming_screen_8E990D8.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd3f2a671512ec614bc30ea5008e60d7788815cf
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U41_3@Hu32-g{{R2q($ccKyZPwe
zEzj;<^(yYJUUPI!vDei(#YuB4r|iwzyF}sHy(pj>AW+kKvH+-;u_VYZn8D%MjWi%f
z#nZ(xgkxrMLQqmdLPAgwgP>P}6Qhd+181th^@hgAn==|28Fa2Q#hm@++X7V2;OXk;
Jvd$@?2>_F{I4}SJ

literal 0
HcmV?d00001

diff --git a/graphics/interface/naming_screen_8E990F8.png b/graphics/interface/naming_screen_8E990F8.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d631ce995d13d7072e3241cb779aadd54d75f9f
GIT binary patch
literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U41_3@Hu32-g{{R2q($ccKyZPwe
zEzj;<^(yYJUUPI!vDei(#YuB4r|iwzyF}sHy(pj>AW+kKvH+-;u_VYZn8D%MjWi%f
t#M8wwgkxrM!U66XQ>KVW%;@dqWneL8WLPjQ#Re$P;OXk;vd$@?2>?G}G7kU%

literal 0
HcmV?d00001


From 9c826fdb3ee3a70fa4d3f9bb38f15e8081eaaaa9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Fri, 29 Nov 2019 12:08:45 -0500
Subject: [PATCH 2/2] Fix incbins

---
 data/graphics.s | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/graphics.s b/data/graphics.s
index ff8c08e51..a886e2a56 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16125,40 +16125,40 @@ gUnknown_8E98518:: @ 8E98518
 	.incbin "baserom.gba", 0xE98518, 0xC0
 	
 gUnknown_8E985D8:: @ 8E985D8
-	.incbin "graphics/interface/naming_screen_8E985D8"
+	.incbin "graphics/interface/naming_screen_8E985D8.4bpp"
 
 gUnknown_8E98858:: @ 8E98858
-	.incbin "graphics/interface/naming_screen_8E98858"
+	.incbin "graphics/interface/naming_screen_8E98858.4bpp"
 
 gUnknown_8E98A38:: @ 8E98A38
-    .incbin "graphics/interface/naming_screen_8E98A38"
+    .incbin "graphics/interface/naming_screen_8E98A38.4bpp"
 
 gUnknown_8E98C18:: @ 8E98C18
-    .incbin "graphics/interface/naming_screen_8E98C18"
+    .incbin "graphics/interface/naming_screen_8E98C18.4bpp"
 
 gUnknown_8E98CB8:: @ 8E98CB8
-    .incbin "graphics/interface/naming_screen_8E98CB8"
+    .incbin "graphics/interface/naming_screen_8E98CB8.4bpp"
 
 gUnknown_8E98D58:: @ 8E98D58
-    .incbin "graphics/interface/naming_screen_8E98D58"
+    .incbin "graphics/interface/naming_screen_8E98D58.4bpp"
 
 gUnknown_8E98DF8:: @ 8E98DF8
-    .incbin "graphics/interface/naming_screen_8E98DF8"
+    .incbin "graphics/interface/naming_screen_8E98DF8.4bpp"
 
 gUnknown_8E98E98:: @ 8E98E98
-    .incbin "graphics/interface/naming_screen_8E98E98"
+    .incbin "graphics/interface/naming_screen_8E98E98.4bpp"
 
 gUnknown_8E98F38:: @ 8E98F38
-    .incbin "graphics/interface/naming_screen_8E98F38"
+    .incbin "graphics/interface/naming_screen_8E98F38.4bpp"
 
 gUnknown_8E98FD8:: @ 8E98FD8
-    .incbin "graphics/interface/naming_screen_8E98FD8"
+    .incbin "graphics/interface/naming_screen_8E98FD8.4bpp"
 
 gUnknown_8E990D8:: @ 8E990D8
-    .incbin "graphics/interface/naming_screen_8E990D8"
+    .incbin "graphics/interface/naming_screen_8E990D8.4bpp"
 
 gUnknown_8E990F8:: @ 8E990F8
-    .incbin "graphics/interface/naming_screen_8E990F8"
+    .incbin "graphics/interface/naming_screen_8E990F8.4bpp"
 
 gUnknown_8E99118:: @ 8E99118
 	.incbin "graphics/tm_case/unk_8E99118.4bpp"