diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 34 | ||||
| -rw-r--r-- | data/graphics.s | 62 |
2 files changed, 88 insertions, 8 deletions
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 |