diff --git a/asm/link.s b/asm/link.s index a84191883..c9fd1ff96 100644 --- a/asm/link.s +++ b/asm/link.s @@ -44323,7 +44323,7 @@ _080202AC: movs r1, 0x1 negs r1, r1 str r1, [sp, 0x4] - ldr r0, =gUnknown_082F2DC4 + ldr r0, =gText_Ellipsis str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0 @@ -45129,7 +45129,7 @@ sub_80209AC: @ 80209AC push {r4,lr} adds r4, r0, 0 lsls r4, 2 - ldr r0, =gUnknown_082F2DF2 + ldr r0, =gUnknown_082F2DF0+2 adds r4, r0 movs r0, 0 bl IndexOfSpritePaletteTag diff --git a/charmap.txt b/charmap.txt index d7fd15e2e..4f2f10e0b 100644 --- a/charmap.txt +++ b/charmap.txt @@ -691,6 +691,7 @@ UNK_CTRL_F801 = F8 01 UNK_CTRL_F80A = F8 0A UNK_CTRL_F80C = F8 0C +UNK_CTRL_F9 = F9 UNK_CTRL_F904 = F9 04 UNK_CTRL_F905 = F9 05 UNK_CTRL_F907 = F9 07 diff --git a/data/data2.s b/data/data2.s index cd8c43f65..a3fcbd536 100644 --- a/data/data2.s +++ b/data/data2.s @@ -2313,110 +2313,734 @@ gUnknown_082F1D60:: @ 82F1D60 .4byte 0x00007001, gWonderCardBgGfx8, gWonderCardBgTilemap8, gWonderCardBgPal8 gUnknown_082F1DE0:: @ 82F1DE0 - .incbin "baserom.gba", 0x2f1de0, 0x8 + .byte 0x00, 0x02, 0x03, 0x00, 0x01, 0x02, 0x00, 0x00 gUnknown_082F1DE8:: @ 82F1DE8 - .incbin "baserom.gba", 0x2f1de8, 0x10 + window_template 0x00, 0x01, 0x00, 0x1C, 0x03, 0x02, 0x02AC + window_template 0x02, 0x01, 0x03, 0x1C, 0x14, 0x02, 0x007C gUnknown_082F1DF8:: @ 82F1DF8 - .incbin "baserom.gba", 0x2f1df8, 0x6d0 + .4byte 0x0318e802, 0x000098e8, 0x10000002, 0x00001000 + .align 2 +gWonderNewsPal1:: @ 82F1E08 + .incbin "graphics/interface/wonder_news_1.gbapal" + + .align 2 +gWonderNewsPal7:: @ 82F1E28 + .incbin "graphics/interface/wonder_news_7.gbapal" + + .align 2 +gWonderNewsPal8:: @ 82F1E48 + .incbin "graphics/interface/wonder_news_8.gbapal" + + .align 2 +gWonderNewsGfx1:: @ 82F1E68 + .incbin "graphics/interface/wonder_news_1.4bpp.lz" + + .align 2 +gWonderNewsTilemap1:: @ 82F1EE8 + .incbin "graphics/interface/wonder_news_1.bin.lz" + + .align 2 +gWonderNewsGfx2:: @ 82F1FC4 + .incbin "graphics/interface/wonder_news_2.4bpp.lz" + + .align 2 +gWonderNewsTilemap2:: @ 82F1FF4 + .incbin "graphics/interface/wonder_news_2.bin.lz" + + .align 2 +gWonderNewsGfx3:: @ 82F20B4 + .incbin "graphics/interface/wonder_news_3.4bpp.lz" + + .align 2 +gWonderNewsTilemap3:: @ 82F2124 + .incbin "graphics/interface/wonder_news_3.bin.lz" + + .align 2 +gWonderNewsGfx7:: @ 82F21F0 + .incbin "graphics/interface/wonder_news_7.4bpp.lz" + + .align 2 +gWonderNewsTilemap7:: @ 82F2280 + .incbin "graphics/interface/wonder_news_7.bin.lz" + + .align 2 +gWonderNewsGfx8:: @ 82F235C + .incbin "graphics/interface/wonder_news_8.4bpp.lz" + + .align 2 +gWonderNewsTilemap8:: @ 82F23EC + .incbin "graphics/interface/wonder_news_8.bin.lz" + + .align 2 gUnknown_082F24C8:: @ 82F24C8 - .incbin "baserom.gba", 0x2f24c8, 0x80 + .4byte 0x00000001, gWonderNewsGfx1, gWonderNewsTilemap1, gWonderNewsPal1 + .4byte 0x00000001, gWonderNewsGfx2, gWonderNewsTilemap2, gWonderCardBgPal2 + .4byte 0x00000001, gWonderNewsGfx3, gWonderNewsTilemap3, gWonderCardBgPal3 + .4byte 0x00000001, gWonderNewsGfx3, gWonderNewsTilemap3, gWonderCardBgPal4 + .4byte 0x00000001, gWonderNewsGfx3, gWonderNewsTilemap3, gWonderCardBgPal5 + .4byte 0x00000001, gWonderNewsGfx3, gWonderNewsTilemap3, gWonderCardBgPal6 + .4byte 0x00000001, gWonderNewsGfx7, gWonderNewsTilemap7, gWonderNewsPal7 + .4byte 0x00000001, gWonderNewsGfx8, gWonderNewsTilemap8, gWonderNewsPal8 + .align 2 gUnknown_082F2548:: @ 82F2548 - .incbin "baserom.gba", 0x2f2548, 0x14 + .4byte sub_801D1AC + .4byte sub_801D1B4 + .4byte sub_801D1B8 + .4byte sub_801D1D4 + .4byte sub_801D1F0 + .align 2 gUnknown_082F255C:: @ 82F255C - .incbin "baserom.gba", 0x2f255c, 0x3c + .4byte sub_801D5D0 + .4byte sub_801D5F8 + .4byte sub_801D5FC + .4byte sub_801D61C + .4byte sub_801D63C + .4byte sub_801D810 + .4byte sub_801D828 + .4byte sub_801D860 + .align 2 +gText_CanceledReadingCard:: @ 82F257C + .string "Canceled reading\nthe Card.$" + + .align 2 gUnknown_082F2598:: @ 82F2598 - .incbin "baserom.gba", 0x2f2598, 0x3f4 + .byte 0x02, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .align 2 +gUnknown_082F25A8:: @ 82F25A8 + .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F25C8:: @ 82F25C8 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F25D8:: @ 82F25D8 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F25E8:: @ 82F25E8 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F25F8:: @ 82F25F8 + .byte 0x02, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00 + .byte 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 + .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F2628:: @ 82F2628 + .byte 0x02, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00 + .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F2650:: @ 82F2650 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F2660:: @ 82F2660 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F2670:: @ 82F2670 + .byte 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F2698:: @ 82F2698 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F26A8:: @ 82F26A8 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F26B8:: @ 82F26B8 + .byte 0x02, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00 + .byte 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00 + .byte 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F26F8:: @ 82F26F8 + .byte 0x12, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F25C8 + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x12, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F25D8 + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x12, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F2698 + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F2788:: @ 82F2788 + .byte 0x12, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F26B8 + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00 + + .4byte gText_CanceledReadingCard + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F27D0:: @ 82F27D0 + .byte 0x12, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F2650 + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F2800:: @ 82F2800 + .byte 0x12, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F2628 + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F27D0 + .byte 0x12, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F2660 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F2884:: @ 82F2884 + .byte 0x12, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F25F8 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_082F28E4:: @ 82F28E4 + .byte 0x12, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F2670 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F2884 + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F2788 + + .align 2 +gUnknown_082F292C:: @ 82F292C + .byte 0x12, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F26A8 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 + .byte 0x10, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F25E8 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .align 2 gUnknown_082F298C:: @ 82F298C - .incbin "baserom.gba", 0x2f298c, 0x60 + .byte 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 + .byte 0x20, 0x00, 0x00, 0x00 + .4byte gUnknown_082F25A8 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F26F8 + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F2800 + + .align 2 gUnknown_082F29EC:: @ 82F29EC - .incbin "baserom.gba", 0x2f29ec, 0x90 + .byte 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x12, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 + .4byte gUnknown_082F25A8 + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F26F8 + .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F28E4 + .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F2884 + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .4byte gUnknown_082F292C + + .align 2 gUnknown_082F2A7C:: @ 82F2A7C - .incbin "baserom.gba", 0x2f2a7c, 0x28 + .4byte sub_801DFAC + .4byte sub_801E030 + .4byte sub_801E120 + .4byte sub_801E240 + .4byte sub_801E764 + .4byte sub_801E838 + .4byte sub_801E460 + .4byte sub_801E5C4 + .4byte sub_801E668 + .4byte sub_801E978 + .align 2 gUnknown_082F2AA4:: @ 82F2AA4 - .incbin "baserom.gba", 0x2f2aa4, 0x4 + .byte 0x09, 0x09, 0x09, 0x09 + .align 2 gUnknown_082F2AA8:: @ 82F2AA8 - .incbin "baserom.gba", 0x2f2aa8, 0x100 + .byte 0x00, 0x16, 0x17, 0x68, 0x19, 0x1a, 0x1b, 0x1c + .byte 0x1d, 0x1e, 0x00, 0x20, 0x21, 0x22, 0x23, 0x24 + .byte 0x25, 0x26, 0x27, 0x28, 0x29, 0x15, 0x01, 0x02 + .byte 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00 + .byte 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 + .byte 0x13, 0x14, 0x2a, 0x2b, 0x2c, 0x2d, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x36, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x53, 0x54, 0x55, 0x56, 0x00 + .byte 0x00, 0x00, 0x6f, 0x5b, 0x5c, 0x5d, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x84, 0x85, 0x86, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7 + .byte 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf + .byte 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7 + .byte 0xb8, 0xb9, 0xba, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9 + .byte 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1 + .byte 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9 + .byte 0xea, 0xeb, 0xec, 0xed, 0xee, 0xbb, 0xbc, 0xbd + .byte 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5 + .byte 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd + .byte 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xef + .byte 0xf0, 0xf4, 0xf5, 0xf6, 0xf1, 0xf2, 0xf3, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .align 2 gUnknown_082F2BA8:: @ 82F2BA8 - .incbin "baserom.gba", 0x2f2ba8, 0x78 + .4byte gUnknown_0862B9F9 + .4byte gUnknown_0862B9FF + .4byte gUnknown_0862BA05 + .4byte gUnknown_0862BA0B + .4byte gUnknown_0862BA11 + .4byte gUnknown_0862BA17 + .4byte gUnknown_0862BA1D + .4byte gUnknown_0862BA23 + .4byte gUnknown_0862BA29 + .4byte gUnknown_0862BA2F + .4byte gUnknown_0862BA35 + .4byte gUnknown_0862BA3B + .4byte gUnknown_0862BA41 + .4byte gUnknown_0862BA47 + .4byte gUnknown_0862BA4D + .4byte gUnknown_0862BA53 + .4byte gUnknown_0862BA59 + .4byte gUnknown_0862BA5F + .4byte gUnknown_0862BA65 + .4byte gUnknown_0862BA6B + .4byte gUnknown_0862BA79 + .4byte gUnknown_0862BA84 + .4byte gUnknown_0862BA8F + .4byte gUnknown_0862BA9A + .4byte gUnknown_0862BAA3 + .4byte gUnknown_0862BAAE + .4byte gUnknown_0862BAB9 + .4byte gUnknown_0862BAC4 + .4byte gUnknown_0862BACF + .4byte gUnknown_0862BADA + .align 2 gUnknown_082F2C20:: @ 82F2C20 - .incbin "baserom.gba", 0x2f2c20, 0x20 + .incbin "graphics/interface/unk_palette1.gbapal" + .align 2 gUnknown_082F2C40:: @ 82F2C40 - .incbin "baserom.gba", 0x2f2c40, 0x20 + .incbin "graphics/interface/unk_palette2.gbapal" -gUnknown_082F2C60:: @ 82F2C60 - .incbin "baserom.gba", 0x2f2c60, 0x10 + .align 2 +gUnknown_082F2C60:: @ 82F2C60 struct BgTemplate + .4byte 0x00000070, 0x000011fd, 0x0000217a, 0x000070f7 + .align 2 gUnknown_082F2C70:: @ 82F2C70 - .incbin "baserom.gba", 0x2f2c70, 0x28 + window_template 0x03, 0x08, 0x01, 0x15, 0x13, 0x0f, 0x0001 + window_template 0x01, 0x09, 0x12, 0x0f, 0x02, 0x0c, 0x007a + window_template 0x01, 0x00, 0x02, 0x06, 0x0f, 0x07, 0x0020 + window_template 0x00, 0x01, 0x02, 0x07, 0x09, 0x0e, 0x0013 + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + .align 2 gUnknown_082F2C98:: @ 82F2C98 - .incbin "baserom.gba", 0x2f2c98, 0xa8 + .4byte 0x00000000, sub_801F658 + .4byte 0x00000003, sub_801F6F8 + .4byte 0x00000004, sub_801F730 + .4byte 0x00000005, sub_801F768 + .4byte 0x00000001, sub_801F7D4 + .4byte 0x00000006, sub_801F7E0 + .4byte 0x00000007, sub_801F82C + .4byte 0x00000008, sub_801F870 + .4byte 0x00000009, sub_801F8DC + .4byte 0x0000000a, sub_801F984 + .4byte 0x0000000b, sub_801FA2C + .4byte 0x0000000c, sub_801FA68 + .4byte 0x00000002, sub_801FB44 + .4byte 0x0000000d, sub_801FB70 + .4byte 0x00000012, sub_801FBB4 + .4byte 0x00000013, sub_801FBF8 + .4byte 0x0000000e, sub_801FC4C + .4byte 0x0000000f, sub_801FC9C + .4byte 0x00000010, sub_801FCEC + .4byte 0x00000011, sub_801FD30 + .4byte 0x00000014, sub_801FD88 + .align 2 gUnknown_082F2D40:: @ 82F2D40 - .incbin "baserom.gba", 0x2f2d40, 0x84 + .4byte gUnknown_085ED265 + .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 -gUnknown_082F2DC4:: @ 82F2DC4 - .incbin "baserom.gba", 0x2f2dc4, 0x4 + .4byte gUnknown_085ED274 + .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 + .4byte gUnknown_085ED289 + .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 + + .4byte gUnknown_085ED29D + .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 + + .4byte gUnknown_085ED2E8 + .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 + + .4byte gUnknown_085ED2FA + .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00 + + .4byte gUnknown_085ED325 + .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 + + .4byte gUnknown_085ED368 + .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 + + .4byte gUnknown_085ED3A3 + .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 + + .4byte gUnknown_085ED3C5 + .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 + + .4byte gUnknown_085ED3D8 + .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 + + .align 2 +gText_Ellipsis:: @ 82F2DC4 + .string "…$" + + .align 2 gUnknown_082F2DC8:: @ 82F2DC8 - .incbin "baserom.gba", 0x2f2dc8, 0x2a + .4byte gUnknown_085ED23C, 0x00000000 + .4byte gUnknown_085ED242, 0x00000000 + .4byte gUnknown_085ED24F, 0x00000000 + .4byte gUnknown_085ED257, 0x00000000 + .4byte gUnknown_085ED260, 0x00000000 -gUnknown_082F2DF2:: @ 82F2DF2 - .incbin "baserom.gba", 0x2f2df2, 0x342 + .align 2 +gUnknown_082F2DF0:: @ 82F2DF0 + .incbin "graphics/interface/unk_palette3.gbapal" + .align 2 +gUnknown_082F2E10:: @ 82F2E10 + .incbin "graphics/interface/unk_cursor.4bpp.lz" + + .align 2 +gUnknown_082F3094:: @ 82F3094 + .incbin "graphics/interface/unk_dash.4bpp.lz" + + .align 2 +gUnknown_082F30B4:: @ 82F30B4 + .incbin "graphics/interface/unk_cursor_arrow.4bpp.lz" + + .align 2 +gUnknown_082F30E0:: @ 82F30E0 + .incbin "graphics/interface/unk_rbutton.4bpp.lz" + + .align 2 gUnknown_082F3134:: @ 82F3134 - .incbin "baserom.gba", 0x2f3134, 0x28 + .4byte gUnknown_082F2E10 + .2byte 0x1000, 0x0000 -gUnknown_082F315C:: @ 82F315C - .incbin "baserom.gba", 0x2f315c, 0x40 + .4byte gUnknown_082F30B4 + .2byte 0x0040, 0x0001 + .4byte gUnknown_082F3094 + .2byte 0x0040, 0x0002 + + .4byte gUnknown_082F30E0 + .2byte 0x0080, 0x0003 + + .4byte gUnknown_08DD4CF8 + .2byte 0x0400, 0x0004 + + .align 2 +gUnknown_082F315C:: @ 82F315C struct SpritePalette + .4byte gUnknown_082F2DF0 + .2byte 0x0000 + + .align 2 +gUnknown_082F3164:: @ 82F3164 + .2byte 0x4000, 0xc000, 0x0400, 0x0000 + + .align 2 +gUnknown_082F316C:: @ 82F316C + .2byte 0x0000, 0x001e, 0xffff, 0x0000 + + .align 2 +gUnknown_082F3174:: @ 82F3174 + .2byte 0x0020, 0x001e, 0xffff, 0x0000 + + .align 2 +gUnknown_082F317C:: @ 82F317C + .2byte 0x0040, 0x001e, 0xffff, 0x0000 + + .align 2 +gUnknown_082F3184:: @ 82F3184 + .2byte 0x0060, 0x001e, 0xffff, 0x0000 + +gUnknown_082F318C:: @ 82F318C + .4byte gUnknown_082F316C + .4byte gUnknown_082F3174 + .4byte gUnknown_082F317C + .4byte gUnknown_082F3184 + + .align 2 gUnknown_082F319C:: @ 82F319C - .incbin "baserom.gba", 0x2f319c, 0x20 + .2byte 0x0000 @ tileTag + .2byte 0x0000 @ paletteTag + .4byte gUnknown_082F3164 + .4byte gUnknown_082F318C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + .align 2 +gUnknown_082F31B4:: @ 82F31B4 + .byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 + + .align 2 gUnknown_082F31BC:: @ 82F31BC - .incbin "baserom.gba", 0x2f31bc, 0x18 + .2byte 0x0002 @ tileTag + .2byte 0x0000 @ paletteTag + .4byte gUnknown_082F31B4 + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_8020ABC + .align 2 gUnknown_082F31D4:: @ 82F31D4 - .incbin "baserom.gba", 0x2f31d4, 0x58 + .2byte 0x0001 @ tileTag + .2byte 0x0000 @ paletteTag + .4byte gUnknown_082F31B4 + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_8020AF4 + .align 2 +gUnknown_082F31EC:: @ 82F31EC + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 + + .align 2 +gUnknown_082F31F4:: @ 82F31F4 + .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 + + .align 2 +gUnknown_082F31FC:: @ 82F31FC + .2byte 0x0000, 0x0002, 0xffff, 0x0000 + + .align 2 +gUnknown_082F3204:: @ 82F3204 + .2byte 0x0008, 0x0002, 0xffff, 0x0000 + + .align 2 +gUnknown_082F320C:: @ 82F320C + .2byte 0x0010, 0x0002, 0xffff, 0x0000 + + .align 2 +gUnknown_082F3214:: @ 82F3214 + .2byte 0x0018, 0x0002, 0xffff, 0x0000 + + .align 2 +gUnknown_082F321C:: @ 82F321C + .4byte gUnknown_082F31FC + .4byte gUnknown_082F3204 + .4byte gUnknown_082F320C + .4byte gUnknown_082F3214 + + .align 2 gUnknown_082F322C:: @ 82F322C - .incbin "baserom.gba", 0x2f322c, 0x18 + .2byte 0x0003 @ tileTag + .2byte 0x0000 @ paletteTag + .4byte gUnknown_082F31EC + .4byte gDummySpriteAnimTable + .4byte 0x00000000 + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + .align 2 gUnknown_082F3244:: @ 82F3244 - .incbin "baserom.gba", 0x2f3244, 0x18 + .2byte 0x0004 @ tileTag + .2byte 0x0000 @ paletteTag + .4byte gUnknown_082F31F4 + .4byte gUnknown_082F321C + .4byte 0x00000000 + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + .align 2 gUnknown_082F325C:: @ 82F325C - .incbin "baserom.gba", 0x2f325c, 0x8 + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 + .align 2 gUnknown_082F3264:: @ 82F3264 - .incbin "baserom.gba", 0x2f3264, 0x8 + .byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00 + .align 2 gUnknown_082F326C:: @ 82F326C - .incbin "baserom.gba", 0x2f326c, 0x24 + .byte 0x04, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04 + .byte 0x02, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04, 0x02 + .byte 0x00, 0xfe, 0x00, 0x00, 0x00, 0x06, 0x03, 0x01 + .byte 0xff, 0xfd, 0xff, 0x00, 0x06, 0x04, 0x01, 0xfe + .byte 0xfc, 0xfe, 0x00, 0x00 + .align 2 gUnknown_082F3290:: @ 82F3290 - .incbin "baserom.gba", 0x2f3290, 0x14 + .byte 0x03, 0x02, 0x01, 0x00, 0x03, 0x03, 0x01, 0x00 + .byte 0x03, 0x03, 0x02, 0x00, 0x03, 0x04, 0x02, 0x00 + .byte 0x03, 0x05, 0x03, 0x00 + .align 2 gUnknown_082F32A4:: @ 82F32A4 - .incbin "baserom.gba", 0x2f32a4, 0x24 + .4byte gUnknown_085ED5F0 + .4byte gUnknown_085ED62C + .4byte gUnknown_085ED65C + .4byte gUnknown_085ED6C8 + .4byte gUnknown_085ED704 + .4byte gUnknown_085ED724 + .4byte gUnknown_085ED754 + .4byte gUnknown_085ED788 + .4byte gUnknown_085ED7BC -gUnknown_082F32C8:: @ 82F32C8 - .incbin "baserom.gba", 0x2f32c8, 0x4 + .align 2 +gUnknown_082F32C8:: @ 82F32C8 struct BgTemplate + .4byte 0x000000F8 + .align 2 gUnknown_082F32CC:: @ 82F32CC .incbin "baserom.gba", 0x2f32cc, 0xc diff --git a/data/data_emerald2.s b/data/data_emerald2.s index a6ae64e25..7efcbbecf 100644 --- a/data/data_emerald2.s +++ b/data/data_emerald2.s @@ -932,4 +932,114 @@ gUnknown_0862B7E8:: @ 862B7E8 .incbin "baserom.gba", 0x62b7e8, 0x14 gUnknown_0862B7FC:: @ 862B7FC - .incbin "baserom.gba", 0x62b7fc, 0x2e8 + .incbin "baserom.gba", 0x62b7fc, 0x14 + + .align 2 + .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$" + .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$" + .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" + .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" + .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$" + .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$" + .string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $" + .string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $" + .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$" + .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$" + .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" + .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" + .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $" + .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $" + .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$" + .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $" + +gUnknown_0862B9F9:: @ 862B9F9 + .string "ABCDE$" + +gUnknown_0862B9FF:: @ 862B9FF + .string "FGHIJ$" + +gUnknown_0862BA05:: @ 862BA05 + .string "KLMNO$" + +gUnknown_0862BA0B:: @ 862BA0B + .string "PQRST$" + +gUnknown_0862BA11:: @ 862BA11 + .string "UVWXY$" + +gUnknown_0862BA17:: @ 862BA17 + .string "Z $" + +gUnknown_0862BA1D:: @ 862BA1D + .string "01234$" + +gUnknown_0862BA23:: @ 862BA23 + .string "56789$" + +gUnknown_0862BA29:: @ 862BA29 + .string ".,!? $" + +gUnknown_0862BA2F:: @ 862BA2F + .string "-/&… $" + +gUnknown_0862BA35:: @ 862BA35 + .string "abcde$" + +gUnknown_0862BA3B:: @ 862BA3B + .string "fghij$" + +gUnknown_0862BA41:: @ 862BA41 + .string "klmno$" + +gUnknown_0862BA47:: @ 862BA47 + .string "pqrst$" + +gUnknown_0862BA4D:: @ 862BA4D + .string "uvwxy$" + +gUnknown_0862BA53:: @ 862BA53 + .string "z $" + +gUnknown_0862BA59:: @ 862BA59 + .string "01234$" + +gUnknown_0862BA5F:: @ 862BA5F + .string "56789$" + +gUnknown_0862BA65:: @ 862BA65 + .string ".,!? $" + +gUnknown_0862BA6B:: @ 862BA6B + .string "-/&… $" + + .string "$$$$$$$$" + +gUnknown_0862BA79:: @ 862BA79 + .string "{UNK_CTRL_F9 245}{UNK_CTRL_F9 246}{UNK_CTRL_F9 247}{UNK_CTRL_F9 248}{UNK_CTRL_F9 254}$" + +gUnknown_0862BA84:: @ 862BA84 + .string "{UNK_CTRL_F9 249}{UNK_CTRL_F9 250}{UNK_CTRL_F9 252}{UNK_CTRL_F9 251}{UNK_CTRL_F9 253}$" + +gUnknown_0862BA8F:: @ 862BA8F + .string "{UNK_CTRL_F9 236}{UNK_CTRL_F9 237}{UNK_CTRL_F9 238}{UNK_CTRL_F9 235}{UNK_CTRL_F9 234}$" + +gUnknown_0862BA9A:: @ 862BA9A + .string "♂♀{UNK_CTRL_F9 212}{UNK_CTRL_F9 213}{UNK_CTRL_F9 211}$" + +gUnknown_0862BAA3:: @ 862BAA3 + .string "{UNK_CTRL_F9 216}{UNK_CTRL_F9 217}{UNK_CTRL_F9 242}{UNK_CTRL_F9 243}{UNK_CTRL_F9 244}$" + +gUnknown_0862BAAE:: @ 862BAAE + .string "{UNK_CTRL_F9 218}{UNK_CTRL_F9 241}{UNK_CTRL_F9 224}{UNK_CTRL_F9 226}{UNK_CTRL_F9 227}$" + +gUnknown_0862BAB9:: @ 862BAB9 + .string "{UNK_CTRL_F9 240}{UNK_CTRL_F9 239}{UNK_CTRL_F9 225}{UNK_CTRL_F9 214}{UNK_CTRL_F9 215}$" + +gUnknown_0862BAC4:: @ 862BAC4 + .string "{UNK_CTRL_F9 228}{UNK_CTRL_F9 229}{UNK_CTRL_F9 230}{UNK_CTRL_F9 231}{UNK_CTRL_F9 232}$" + +gUnknown_0862BACF:: @ 862BACF + .string "{UNK_CTRL_F9 233}{UNK_CTRL_F9 220}{UNK_CTRL_F9 221}{UNK_CTRL_F9 222}{UNK_CTRL_F9 209}$" + +gUnknown_0862BADA:: @ 862BADA + .string "{UNK_CTRL_F9 210}{UNK_CTRL_F9 208}ょ: $" diff --git a/data/fonts.s b/data/fonts.s index 1904eb4df..aa8423acf 100644 --- a/data/fonts.s +++ b/data/fonts.s @@ -7,6 +7,7 @@ gFont8LatinGlyphs:: @ 862BAE4 .incbin "data/graphics/fonts/font8.latfont" + .align 2 gFont8LatinGlyphWidths:: @ 8633AE4 .include "data/graphics/fonts/font8_latin_widths.inc" @@ -14,6 +15,7 @@ gFont8LatinGlyphWidths:: @ 8633AE4 gFont0LatinGlyphs:: @ 8633CE4 .incbin "data/graphics/fonts/font0.latfont" + .align 2 gFont0LatinGlyphWidths:: @ 863BCE4 .include "data/graphics/fonts/font0_latin_widths.inc" @@ -21,6 +23,7 @@ gFont0LatinGlyphWidths:: @ 863BCE4 gFont7LatinGlyphs:: @ 863BEE4 .incbin "data/graphics/fonts/font7.latfont" + .align 2 gFont7LatinGlyphWidths:: @ 8643EE4 .include "data/graphics/fonts/font7_latin_widths.inc" @@ -28,6 +31,7 @@ gFont7LatinGlyphWidths:: @ 8643EE4 gFont2LatinGlyphs:: @ 86440E4 .incbin "data/graphics/fonts/font2.latfont" + .align 2 gFont2LatinGlyphWidths:: @ 864C0E4 .include "data/graphics/fonts/font2_latin_widths.inc" @@ -35,6 +39,7 @@ gFont2LatinGlyphWidths:: @ 864C0E4 gFont1LatinGlyphs:: @ 864C2E4 .incbin "data/graphics/fonts/font1.latfont" + .align 2 gFont1LatinGlyphWidths:: @ 86542E4 .include "data/graphics/fonts/font1_latin_widths.inc" @@ -50,6 +55,7 @@ gFont1JapaneseGlyphs:: @ 86584E4 gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs:: @ 865C4E4 .incbin "data/graphics/fonts/unused_frlg_male.fwjpnfont" + .align 2 gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths:: @ 86644E4 .include "data/graphics/fonts/unused_japanese_frlg_male_font_widths.inc" @@ -57,6 +63,7 @@ gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths:: @ 86644E4 gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs:: @ 86646E4 .incbin "data/graphics/fonts/unused_frlg_female.fwjpnfont" + .align 2 gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: @ 866C6E4 .include "data/graphics/fonts/unused_japanese_frlg_female_font_widths.inc" @@ -64,5 +71,6 @@ gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: @ 866C6E4 gFont2JapaneseGlyphs:: @ 866C8E4 .incbin "data/graphics/fonts/font2.fwjpnfont" + .align 2 gFont2JapaneseGlyphWidths:: @ 86748E4 .include "data/graphics/fonts/font2_japanese_widths.inc" diff --git a/data/graphics.s b/data/graphics.s index 25925e5c8..bf080fd95 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -952,7 +952,11 @@ gUnknown_08DD4BF0:: @ 8DD4BF0 .incbin "baserom.gba", 0xdd4bf0, 0x5c gUnknown_08DD4C4C:: @ 8DD4C4C - .incbin "baserom.gba", 0xdd4c4c, 0x1c4 + .incbin "baserom.gba", 0xdd4c4c, 0xac + + .align 2 +gUnknown_08DD4CF8:: @ 8DD4CF8 + .incbin "graphics/interface/unk_change_case.4bpp.lz" .align 2 gTilesetPalettes_General:: @ 8DD4E10 diff --git a/data/strings.s b/data/strings.s index 790252952..2f74c5566 100644 --- a/data/strings.s +++ b/data/strings.s @@ -2173,15 +2173,35 @@ gUnknown_085ED233:: @ 85ED233 gUnknown_085ED238:: @ 85ED238 .string "{COLOR BORDER_COLOR2}$" + +gUnknown_085ED23C:: @ 85ED23C .string "UPPER$" + +gUnknown_085ED242:: @ 85ED242 .string "lower$" + +gUnknown_085ED248:: @ 85ED248 .string "OTHERS$" + +gUnknown_085ED24F:: @ 85ED24F .string "SYMBOLS$" + +gUnknown_085ED257:: @ 85ED257 .string "REGISTER$" + +gUnknown_085ED260:: @ 85ED260 .string "EXIT$" + +gUnknown_085ED265:: @ 85ED265 .string "Quit chatting?$" + +gUnknown_085ED274:: @ 85ED274 .string "Register text where?$" + +gUnknown_085ED289:: @ 85ED289 .string "Register text here?$" + +gUnknown_085ED29D:: @ 85ED29D .string "Input text.$" gUnknown_085ED2A9:: @ 85ED2A9 @@ -2189,14 +2209,28 @@ gUnknown_085ED2A9:: @ 85ED2A9 gUnknown_085ED2BD:: @ 85ED2BD .string "{SPECIAL_F7 0x00} left the chat.$" - .string "{SPECIAL_F7 0x00}ç{SPECIAL_F7 0x01}éÊò:$" - .string "{SPECIAL_F7 0x00}ç{SPECIAL_F7 0x01}éÊòè ÁまÓ+$" + .string "{SPECIAL_F7 0x00}の{SPECIAL_F7 0x01}ひきめ:$" @ "{SPECIAL_F7 0x00}'s {SPECIAL_F7 0x01}hikime" + .string "{SPECIAL_F7 0x00}の{SPECIAL_F7 0x01}ひきめは いません$" @ "{SPECIAL_F7 0x00}'s {SPECIAL_F7 0x01}hikimeha imasen" + +gUnknown_085ED2E8:: @ 85ED2E8 .string "Exiting the chat…$" + +gUnknown_085ED2FA:: @ 85ED2FA .string "The LEADER, {SPECIAL_F7 0x00}, has\nleft, ending the chat.$" + +gUnknown_085ED325:: @ 85ED325 .string "The registered text has been changed.\nIs it okay to save the game?$" + +gUnknown_085ED368:: @ 85ED368 .string "There is already a saved file.\nIs it okay to overwrite it?$" + +gUnknown_085ED3A3:: @ 85ED3A3 .string "SAVING…\nDON’T TURN OFF THE POWER.$" + +gUnknown_085ED3C5:: @ 85ED3C5 .string "{SPECIAL_F7 0x00} saved the game.$" + +gUnknown_085ED3D8:: @ 85ED3D8 .string "If the LEADER leaves, the chat\nwill end. Is that okay?$" gUnknown_085ED40F:: @ 85ED40F @@ -2250,30 +2284,39 @@ gUnknown_085ED5BE:: @ 85ED5BE .string "Would you like to nickname the newly\nhatched {STR_VAR_1}?$" .align 2 +gUnknown_085ED5F0:: @ 85ED5F0 .string "Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p$" .align 2 +gUnknown_085ED62C:: @ 85ED62C .string "Please wait while each member\nchooses a BERRY.$" .align 2 +gUnknown_085ED65C:: @ 85ED65C .string "{PAUSE_MUSIC}{PLAY_BGM BGM_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p$" .align 2 +gUnknown_085ED6C8:: @ 85ED6C8 .string "Recording your game results in the\nsave file.\lPlease wait.$" .align 2 +gUnknown_085ED704:: @ 85ED704 .string "Want to play BERRY CRUSH again?$" .align 2 +gUnknown_085ED724:: @ 85ED724 .string "You have no BERRIES.\nThe game will be canceled.$" .align 2 +gUnknown_085ED754:: @ 85ED754 .string "A member dropped out.\nThe game will be canceled.$" .align 2 +gUnknown_085ED788:: @ 85ED788 .string "Time’s up.\pGood BERRY POWDER could not be\nmade…\p$" .align 2 +gUnknown_085ED7BC:: @ 85ED7BC .string "Communication standby…$" .align 2 diff --git a/graphics/interface/unk_change_case.png b/graphics/interface/unk_change_case.png new file mode 100644 index 000000000..185c4abf5 Binary files /dev/null and b/graphics/interface/unk_change_case.png differ diff --git a/graphics/interface/unk_cursor.png b/graphics/interface/unk_cursor.png new file mode 100644 index 000000000..fac4e0a93 Binary files /dev/null and b/graphics/interface/unk_cursor.png differ diff --git a/graphics/interface/unk_cursor_arrow.4bpp.lz.bak b/graphics/interface/unk_cursor_arrow.4bpp.lz.bak new file mode 100644 index 000000000..4f741ccd1 Binary files /dev/null and b/graphics/interface/unk_cursor_arrow.4bpp.lz.bak differ diff --git a/graphics/interface/unk_cursor_arrow.png b/graphics/interface/unk_cursor_arrow.png new file mode 100644 index 000000000..574758cdf Binary files /dev/null and b/graphics/interface/unk_cursor_arrow.png differ diff --git a/graphics/interface/unk_dash.png b/graphics/interface/unk_dash.png new file mode 100644 index 000000000..34c3709cf Binary files /dev/null and b/graphics/interface/unk_dash.png differ diff --git a/graphics/interface/unk_palette1.pal b/graphics/interface/unk_palette1.pal new file mode 100644 index 000000000..12bc76261 --- /dev/null +++ b/graphics/interface/unk_palette1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +255 255 255 +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 +0 0 0 +0 0 0 diff --git a/graphics/interface/unk_palette2.pal b/graphics/interface/unk_palette2.pal new file mode 100644 index 000000000..d2a55fec6 --- /dev/null +++ b/graphics/interface/unk_palette2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +246 246 255 +0 0 0 +205 205 230 +49 213 0 +222 230 213 +0 0 255 +205 213 222 +255 0 0 +222 213 197 +255 189 0 +230 230 222 +197 197 197 +41 32 32 +0 0 0 +57 57 57 diff --git a/graphics/interface/unk_palette3.pal b/graphics/interface/unk_palette3.pal new file mode 100644 index 000000000..071f73b42 --- /dev/null +++ b/graphics/interface/unk_palette3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 197 98 +255 49 49 +156 49 49 +49 98 255 +0 0 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 230 255 +213 213 255 +172 172 172 +115 115 115 +255 255 255 +65 65 65 diff --git a/graphics/interface/unk_rbutton.png b/graphics/interface/unk_rbutton.png new file mode 100644 index 000000000..168a293f3 Binary files /dev/null and b/graphics/interface/unk_rbutton.png differ diff --git a/graphics/interface/wonder_news_1.4bpp.bak b/graphics/interface/wonder_news_1.4bpp.bak new file mode 100644 index 000000000..937b84e84 Binary files /dev/null and b/graphics/interface/wonder_news_1.4bpp.bak differ diff --git a/graphics/interface/wonder_news_1.pal b/graphics/interface/wonder_news_1.pal new file mode 100644 index 000000000..970736bbb --- /dev/null +++ b/graphics/interface/wonder_news_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 213 +74 74 74 +98 106 106 +213 189 74 +238 213 82 +246 246 213 +255 255 255 +230 230 213 +238 238 213 +246 246 238 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/interface/wonder_news_1.png b/graphics/interface/wonder_news_1.png new file mode 100644 index 000000000..1c227c7ec Binary files /dev/null and b/graphics/interface/wonder_news_1.png differ diff --git a/graphics/interface/wonder_news_2.bin b/graphics/interface/wonder_news_2.bin new file mode 100644 index 000000000..72c7ea278 Binary files /dev/null and b/graphics/interface/wonder_news_2.bin differ diff --git a/graphics/interface/wonder_news_2.png b/graphics/interface/wonder_news_2.png new file mode 100644 index 000000000..6a269f861 Binary files /dev/null and b/graphics/interface/wonder_news_2.png differ diff --git a/graphics/interface/wonder_news_3.bin b/graphics/interface/wonder_news_3.bin new file mode 100644 index 000000000..c7b2e3e21 Binary files /dev/null and b/graphics/interface/wonder_news_3.bin differ diff --git a/graphics/interface/wonder_news_3.png b/graphics/interface/wonder_news_3.png new file mode 100644 index 000000000..518283c86 Binary files /dev/null and b/graphics/interface/wonder_news_3.png differ diff --git a/graphics/interface/wonder_news_7.bin b/graphics/interface/wonder_news_7.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/graphics/interface/wonder_news_7.bin differ diff --git a/graphics/interface/wonder_news_7.pal b/graphics/interface/wonder_news_7.pal new file mode 100644 index 000000000..01832b5e2 --- /dev/null +++ b/graphics/interface/wonder_news_7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +164 156 90 +164 148 90 +197 197 90 +213 205 90 +222 213 90 +213 213 106 +238 246 98 +230 222 98 +213 205 98 +197 180 98 +238 230 98 +246 238 106 diff --git a/graphics/interface/wonder_news_7.png b/graphics/interface/wonder_news_7.png new file mode 100644 index 000000000..6e26cdc06 Binary files /dev/null and b/graphics/interface/wonder_news_7.png differ diff --git a/graphics/interface/wonder_news_8.bin b/graphics/interface/wonder_news_8.bin new file mode 100644 index 000000000..f8185b28e Binary files /dev/null and b/graphics/interface/wonder_news_8.bin differ diff --git a/graphics/interface/wonder_news_8.pal b/graphics/interface/wonder_news_8.pal new file mode 100644 index 000000000..28a498b57 --- /dev/null +++ b/graphics/interface/wonder_news_8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 123 148 +213 213 213 +74 74 74 +115 123 123 +156 156 156 +139 139 148 +180 180 197 +197 189 205 +205 205 222 +189 189 189 +197 230 222 +189 213 213 +180 197 197 +156 164 172 +222 222 230 +230 230 238 diff --git a/graphics/interface/wonder_news_8.png b/graphics/interface/wonder_news_8.png new file mode 100644 index 000000000..f224e1845 Binary files /dev/null and b/graphics/interface/wonder_news_8.png differ