diff --git a/asm/party_menu.s b/asm/party_menu.s index 844043a95..27ec779e7 100755 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -10645,7 +10645,7 @@ party_menu_held_item_object: @ 81B5C14 bl GetMonData cmp r0, 0 beq _081B5C3C - ldr r0, =gUnknown_08615EC0 + ldr r0, =gSpriteTemplate_8615EC0 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] @@ -10671,7 +10671,7 @@ party_menu_link_mon_held_item_object: @ 81B5C48 lsrs r5, r1, 16 cmp r0, 0 beq _081B5C84 - ldr r0, =gUnknown_08615EC0 + ldr r0, =gSpriteTemplate_8615EC0 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] @@ -10896,7 +10896,7 @@ sub_81B5DF0: @ 81B5DF0 add r0, r8 adds r0, 0x43 ldrb r3, [r0] - ldr r0, =gUnknown_08615EC0 + ldr r0, =gSpriteTemplate_8615EC0 subs r3, 0x1 lsls r3, 24 lsrs r3, 24 @@ -10991,7 +10991,7 @@ party_menu_pokeball_object: @ 81B5ECC bl GetMonData cmp r0, 0 beq _081B5EEA - ldr r0, =gUnknown_08615F08 + ldr r0, =gSpriteTemplate_8615F08 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] ldrb r2, [r2, 0x7] @@ -11012,7 +11012,7 @@ party_menu_link_mon_pokeball_object: @ 81B5EF4 lsls r0, 16 cmp r0, 0 beq _081B5F24 - ldr r0, =gUnknown_08615F08 + ldr r0, =gSpriteTemplate_8615F08 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] ldrb r2, [r2, 0x7] @@ -11046,7 +11046,7 @@ sub_81B5F34: @ 81B5F34 lsrs r3, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, =gUnknown_08615F08 + ldr r0, =gSpriteTemplate_8615F08 adds r1, r3, 0 movs r3, 0x8 bl CreateSprite @@ -11078,7 +11078,7 @@ sub_81B5F74: @ 81B5F74 lsrs r3, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, =gUnknown_08615F78 + ldr r0, =gSpriteTemplate_8615F78 adds r1, r3, 0 movs r3, 0x8 bl CreateSprite @@ -11194,7 +11194,7 @@ party_menu_status_condition_object: @ 81B6064 bl GetMonData cmp r0, 0 beq _081B608C - ldr r0, =gUnknown_08616008 + ldr r0, =gSpriteTemplate_8616008 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] ldrb r2, [r2, 0x5] @@ -11220,7 +11220,7 @@ party_menu_link_mon_status_condition_object: @ 81B6098 lsrs r5, r1, 24 cmp r0, 0 beq _081B60D4 - ldr r0, =gUnknown_08616008 + ldr r0, =gSpriteTemplate_8616008 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] ldrb r2, [r2, 0x5] diff --git a/data/graphics.s b/data/graphics.s index 8733869b5..ce7c2c3ba 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -5042,11 +5042,11 @@ gUnknown_08DDD704:: @ 8DDD704 .align 2 gUnknown_08DDD728:: @ 8DDD728 - .incbin "graphics/interface/textbox.gbapal" @ textbox palette? + .incbin "graphics/text_window/message_box.gbapal" .align 2 -gUnknown_08DDD748:: @ 8DDD748 - .incbin "graphics/interface/textbox.4bpp" +gMessageBox_Gfx:: @ 8DDD748 + .incbin "graphics/text_window/message_box.4bpp" .align 2 gWallpaperIcon_Cross:: @@ -5142,7 +5142,7 @@ gUnknown_08DE0644:: @ 8DE0644 .align 2 gUnknown_08DE07C8:: @ 8DE07C8 - .incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but this is wrong? todo, investigate? (frontier pass pal) + .incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well .align 2 gUnknown_08DE08C8:: @ 8DE08C8 diff --git a/data/party_menu.s b/data/party_menu.s index 8013e5614..1319ce5d8 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -3,168 +3,294 @@ .section .rodata + .align 1 gUnknown_0861500C:: @ 861500C - .incbin "baserom.gba", 0x61500c, 0x3c + .2byte 0x0005, 0x000e, 0x0019, 0x0022, 0x0026, 0x0044, 0x0045, 0x0066, 0x0076, 0x0087, 0x008a, 0x0056, 0x0099, 0x009d, 0x00a4, 0x00df + .2byte 0x00cd, 0x00f4, 0x00ad, 0x00c4, 0x00cb, 0x00bd, 0x0008, 0x00cf, 0x00d6, 0x0081, 0x006f, 0x0009, 0x0007, 0x00d2 + .align 2 gUnknown_08615048:: @ 8615048 - .incbin "baserom.gba", 0x615048, 0x670 + .4byte 0x00000000, 0x25b4409a, 0x25b4409a, 0x25b4409a, 0x37b4e0ff, 0x37b4e0ff, 0x37b4e0ff, 0x05fdc0fd + .4byte 0x05fdc0fd, 0x05fdc0fd, 0x00000000, 0x00000000, 0x03944490, 0x00000000, 0x00000000, 0x23944092 + .4byte 0x03b44090, 0x03b44090, 0x03b44090, 0x07bc48b8, 0x07bc48b8, 0x03b44090, 0x03b44090, 0x01946098 + .4byte 0x01946098, 0x0fb5c8fd, 0x0fb5c8fd, 0x27b5e0fa, 0x27b5e0fa, 0x05b440b8, 0x05b440b8, 0x3dfce0fd + .4byte 0x05b440b8, 0x05b440b8, 0x3dfce0fd, 0x1df7cffd, 0x1df7cffd, 0x03944098, 0x03944098, 0x1df7ccfd + .4byte 0x1df7ccfd, 0x03944090, 0x03944090, 0x01944092, 0x01944092, 0x0194409a, 0x219440ba, 0x219440ba + .4byte 0x03944090, 0x03944090, 0x01b46098, 0x01b46098, 0x07be4498, 0x07be4498, 0x03fec0fd, 0x23fec0fd + .4byte 0x1ff6e1fd, 0x1ff6e1fd, 0x03944098, 0x03944098, 0x059c4098, 0x05fc41fd, 0x05fcc1fd, 0x19d6cdfd + .4byte 0x19d6cdfd, 0x19d6cdfd, 0x19f4e1fd, 0x19f4e1fd, 0x19f4e1fd, 0x01944092, 0x01944092, 0x0194409a + .4byte 0x019c4092, 0x019c4092, 0x15b5f1f9, 0x15b5f1f9, 0x35b5f1fd, 0x03944098, 0x03944098, 0x03be4c98 + .4byte 0x23feccfd, 0x03954890, 0x03954890, 0x03b6409a, 0x03b44098, 0x03b44098, 0x019c4098, 0x019c4098 + .4byte 0x19f4d088, 0x19f4d088, 0x039c5090, 0x039c5090, 0x01965480, 0x01965480, 0x19d6d5fd, 0x01b67098 + .4byte 0x19d6cdfd, 0x19d6cdfd, 0x21bc409a, 0x21bc409a, 0x03955880, 0x03955880, 0x01975490, 0x01975490 + .4byte 0x19bce0ff, 0x19bce0ff, 0x03b4e1fd, 0x1bf4e1fd, 0x1dffe4ff, 0x01955080, 0x01955080, 0x01bd60ba + .4byte 0x39bde0ff, 0x05bfcffd, 0x0196409a, 0x39fce0fd, 0x039c4090, 0x039c4090, 0x039c4090, 0x039c4090 + .4byte 0x039e4890, 0x039e4c90, 0x19f64dfd, 0x239440b2, 0x01fec5fd, 0x1bf4c8fd, 0x19b4c0fd, 0x219460da + .4byte 0x019c4098, 0x00000000, 0x019c4898, 0x019c4498, 0x00000000, 0x03b44098, 0x03bc4098, 0x03b44898 + .4byte 0x03b44098, 0x039e4c90, 0x019d6098, 0x019d60d8, 0x019d6098, 0x219d60de, 0x03946090, 0x1dffe1fd + .4byte 0x03bc4090, 0x03b44890, 0x03b44090, 0x039c4898, 0x039c4898, 0x3bfcc898, 0x1bfecdfd, 0x3fffffff + .4byte 0x01b440ba, 0x21b440ba, 0x21b440ba, 0x07b54098, 0x27b54098, 0x3fb5e0fd, 0x01fce0ff, 0x21fce0ff + .4byte 0x21fce0ff, 0x3ff5c098, 0x3ff5c098, 0x03b44490, 0x03b44490, 0x0bd5c093, 0x0bd5c093, 0x01944098 + .4byte 0x01944098, 0x03944090, 0x01944890, 0x01944890, 0x07b548fd, 0x05bf4ffd, 0x05bf4cfd, 0x07b74ffd + .4byte 0x07b74ffd, 0x03964c90, 0x03964c90, 0x07944898, 0x1f94c8fd, 0x1f94c8fd, 0x01944092, 0x07fdc0dd + .4byte 0x07fdc0dd, 0x1df7f0fd, 0x05bcc1fd, 0x05944092, 0x05944092, 0x05944092, 0x3ff4cdfd, 0x01944092 + .4byte 0x01944092, 0x03944490, 0x05f5c098, 0x05f5c0fd, 0x03b64498, 0x03b64498, 0x03be4c90, 0x23feccfd + .4byte 0x07964c90, 0x00000000, 0x00000000, 0x03b64c98, 0x059570b8, 0x059570b8, 0x05b76cb8, 0x239464b2 + .4byte 0x05b57098, 0x1df4c9fd, 0x1df4e9fd, 0x079d4892, 0x239440b2, 0x05b56098, 0x219460fa, 0x27fec4b2 + .4byte 0x3ff5c1ff, 0x3ff5e1ff, 0x05b56098, 0x05b56098, 0x05bc6098, 0x05bc6098, 0x05b57098, 0x07b44890 + .4byte 0x07b448d0, 0x03bc40fd, 0x03bc4098, 0x03b460b0, 0x03b444b8, 0x03b444b8, 0x039c4098, 0x05b540b8 + .4byte 0x05b560b8, 0x079e4c90, 0x03b64c98, 0x00000000, 0x03b460fc, 0x03b460fc, 0x01fec5fd, 0x1bf4c8fd + .4byte 0x19b4c0fd, 0x1dffe9fd, 0x05bdcffd, 0x03b64898, 0x03b64098, 0x03be4098, 0x01b46098, 0x01b46098 + .4byte 0x31b4e8fd, 0x03be4c98, 0x03b64c90, 0x07b64592, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x2bb4c0ff, 0x2bb4c0ff, 0x2bb4c0ff + .4byte 0x03b460ff, 0x3bb4e0ff, 0x3bb4e0ff, 0x05bd4098, 0x05fde0fd, 0x05fde0fd, 0x01b640b8, 0x01b640b8 + .4byte 0x27bd4898, 0x27bd4898, 0x00000000, 0x00000000, 0x03944090, 0x00000000, 0x03944090, 0x019c409a + .4byte 0x19fcc09a, 0x19fcc1ff, 0x0595509a, 0x27b7509e, 0x27b7509e, 0x21b44090, 0x23b44092, 0x21b44490 + .4byte 0x03b440b0, 0x03b440b0, 0x0194409a, 0x29b4c0ff, 0x1fffe5fd, 0x03bc4090, 0x03bc4090, 0x039e4090 + .4byte 0x039e4090, 0x059d4098, 0x059d4098, 0x07bf4c98, 0x07bf4c98, 0x3fffe9fd, 0x01b67490, 0x01b67490 + .4byte 0x1df5f898, 0x01b47098, 0x39f6c5fd, 0x01bc4090, 0x01bc6090, 0x039e4090, 0x21bc40ba, 0x23bc40ba + .4byte 0x039c4090, 0x03be4098, 0x23bc4090, 0x23bc4090, 0x01b46098, 0x03b46098, 0x33b46098, 0x19f4e1fd + .4byte 0x19f4e1fd, 0x03b44898, 0x03b44898, 0x05b56098, 0x05b57098, 0x05bd6098, 0x05bd6098, 0x05bd6098 + .4byte 0x29b4c0fb, 0x29b4c0ff, 0x019c4098, 0x059d5098, 0x07977498, 0x07977498, 0x07bd4098, 0x039e4498 + .4byte 0x1bfec4fd, 0x0fb5c9fd, 0x0fb5c9fd, 0x09fee0ff, 0x1bf6c5fd, 0x1bf6e5fd, 0x03b64498, 0x03b64498 + .4byte 0x00000000, 0x019e4498, 0x19fee5fd, 0x23b6409a, 0x39fce0fd, 0x39fce0fd, 0x39fce0fd, 0x1df5d4b8 + .4byte 0x1df5d4b8, 0x21b4409a, 0x1dffc0fd, 0x1dffe0fd, 0x1dffe0fd, 0x019c4098, 0x03bc4098, 0x03bc4098 + .4byte 0x23be6cba, 0x019e4c98, 0x01be4d98, 0x23b44098, 0x3ffde8ff, 0x01be6098, 0x25b56098, 0x25b56098 + .4byte 0x3dfde8fd, 0x079e4898, 0x0bf6c9fd, 0x0bf6c9fd, 0x01b66098, 0x01b66098, 0x21b4609a, 0x21b460da + .4byte 0x1dfe4c98, 0x1dfe4c98, 0x1dfe4c98, 0x21b46098, 0x25b56098, 0x27b56098, 0x00000000, 0x2ffff098 + .4byte 0x2ffff098, 0x1df7f8fd, 0x0dfff8fd, 0x0df7f8fd, 0x07be6898, 0x3fb7e8ff, 0x23be6898, 0x23be4c98 + .4byte 0x23be4c98, 0x1ffecd98, 0x1bfeecfd, 0x059f4490 + .align 2 gUnknown_086156B8:: @ 86156B8 - .incbin "baserom.gba", 0x6156b8, 0x2c + .4byte 0x000011f0, 0x000021e1, 0x000003c2 + .align 2 +gUnknown_086156C4:: @ 86156C4 + .4byte sub_81B2658, 0x0d280b18, 0x08201420, 0x08081440, 0x08182526, 0x08182535, 0x03302318, 0x1040220c + + .align 2 gUnknown_086156E4:: @ 86156E4 - .incbin "baserom.gba", 0x6156e4, 0x20 + .4byte sub_81B26BC, 0x0d280316, 0x08200c1e, 0x08080c3e, 0x08180c66, 0x08180c75, 0x03300a58, 0x1040044d + .align 2 gUnknown_08615704:: @ 8615704 - .incbin "baserom.gba", 0x615704, 0xc0 + .4byte 0x32142810, 0x22103432, 0x1c6c1268, 0x19661b88, 0x346c2a68, 0x31663388, 0x4c6c4268, 0x49664b88 + .4byte 0x646c5a68, 0x61666388, 0x7c6c7268, 0x79667b88, 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32 + .4byte 0x1c6c1268, 0x19661b88, 0x3c6c3268, 0x39663b88, 0x5c6c5268, 0x59665b88, 0x7c6c7268, 0x79667b88 + .4byte 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32, 0x246a1a68, 0x21662388, 0x3c6a3268, 0x39663b88 + .4byte 0x5c6a5268, 0x59665b88, 0x746a6a68, 0x71667388, 0x2a142010, 0x1a102c32, 0x2c6a2268, 0x29662b88 + .4byte 0x446a3a68, 0x41664388, 0x72146810, 0x62107432, 0x746a6a68, 0x71667388, 0x8c6a8268, 0x89668b88 + .align 1 gUnknown_086157C4:: @ 86157C4 - .incbin "baserom.gba", 0x6157c4, 0x1c + .incbin "graphics/interface/unknown_6157C4.bin" + .align 1 gUnknown_086157E0:: @ 86157E0 - .incbin "baserom.gba", 0x6157e0, 0x1c + .incbin "graphics/interface/unknown_6157E0.bin" gUnknown_086157FC:: @ 86157FC - .incbin "baserom.gba", 0x6157fc, 0x14 + .byte 0x00, 0x03, 0x02, 0x00 +gUnknown_08615800:: @ 8615800 + .byte 0x01, 0x06, 0x00, 0x0b, 0x0c, 0x01, 0x02, 0x03, 0x01, 0x08, 0x09, 0x00, 0x01, 0x02, 0x00, 0x00 + + .align 2 gUnknown_08615810:: @ 8615810 - .incbin "baserom.gba", 0x615810, 0x40 + window_template 0x00, 0x01, 0x03, 0x0a, 0x07, 0x03, 0x0063 + window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x04, 0x00a9 + window_template 0x00, 0x0c, 0x04, 0x12, 0x03, 0x05, 0x00df + window_template 0x00, 0x0c, 0x07, 0x12, 0x03, 0x06, 0x0115 + window_template 0x00, 0x0c, 0x0a, 0x12, 0x03, 0x07, 0x014b + window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0181 + window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df + null_window_template + .align 2 gUnknown_08615850:: @ 8615850 - .incbin "baserom.gba", 0x615850, 0x40 + window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063 + window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9 + window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x05, 0x00ef + window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125 + window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b + window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0191 + window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df + null_window_template + .align 2 gUnknown_08615890:: @ 8615890 - .incbin "baserom.gba", 0x615890, 0x40 + window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063 + window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9 + window_template 0x00, 0x0c, 0x02, 0x12, 0x03, 0x05, 0x00ef + window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125 + window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b + window_template 0x00, 0x0c, 0x0c, 0x12, 0x03, 0x08, 0x0191 + window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df + null_window_template + .align 2 gUnknown_086158D0:: @ 86158D0 - .incbin "baserom.gba", 0x6158d0, 0x38 + window_template 0x00, 0x01, 0x02, 0x0a, 0x07, 0x03, 0x0063 + window_template 0x00, 0x0c, 0x03, 0x12, 0x03, 0x05, 0x00a9 + window_template 0x00, 0x0c, 0x06, 0x12, 0x03, 0x06, 0x00df + window_template 0x02, 0x01, 0x0b, 0x0a, 0x07, 0x04, 0x0115 + window_template 0x02, 0x0c, 0x0c, 0x12, 0x03, 0x07, 0x016b + window_template 0x02, 0x0c, 0x0f, 0x12, 0x03, 0x08, 0x01a1 + null_window_template + .align 2 gUnknown_08615908:: @ 8615908 - .incbin "baserom.gba", 0x615908, 0x8 + window_template 0x00, 0x18, 0x11, 0x06, 0x02, 0x03, 0x01c7 + .align 2 gUnknown_08615910:: @ 8615910 - .incbin "baserom.gba", 0x615910, 0x8 + window_template 0x00, 0x18, 0x12, 0x06, 0x02, 0x03, 0x01c7 + .align 2 gUnknown_08615918:: @ 8615918 - .incbin "baserom.gba", 0x615918, 0x8 + window_template 0x00, 0x18, 0x10, 0x06, 0x02, 0x03, 0x01d3 + .align 2 gUnknown_08615920:: @ 8615920 - .incbin "baserom.gba", 0x615920, 0x8 + window_template 0x02, 0x01, 0x11, 0x15, 0x02, 0x0f, 0x024f + .align 2 gUnknown_08615928:: @ 8615928 - .incbin "baserom.gba", 0x615928, 0x8 + window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0279 + .align 2 gUnknown_08615930:: @ 8615930 - .incbin "baserom.gba", 0x615930, 0x8 + window_template 0x02, 0x01, 0x11, 0x14, 0x02, 0x0f, 0x0299 + .align 2 gUnknown_08615938:: @ 8615938 - .incbin "baserom.gba", 0x615938, 0x8 + window_template 0x02, 0x01, 0x11, 0x12, 0x02, 0x0f, 0x0299 + .align 2 gUnknown_08615940:: @ 8615940 - .incbin "baserom.gba", 0x615940, 0x8 + window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0299 + .align 2 gUnknown_08615948:: @ 8615948 - .incbin "baserom.gba", 0x615948, 0x8 + window_template 0x02, 0x01, 0x0f, 0x14, 0x04, 0x0f, 0x0299 + .align 2 gUnknown_08615950:: @ 8615950 - .incbin "baserom.gba", 0x615950, 0x8 + window_template 0x02, 0x17, 0x0d, 0x06, 0x06, 0x0e, 0x039d + .align 2 gUnknown_08615958:: @ 8615958 - .incbin "baserom.gba", 0x615958, 0x8 + window_template 0x02, 0x15, 0x0d, 0x08, 0x06, 0x0e, 0x039d + .align 2 gUnknown_08615960:: @ 8615960 - .incbin "baserom.gba", 0x615960, 0x8 + window_template 0x02, 0x13, 0x0b, 0x0a, 0x08, 0x0e, 0x02e9 + .align 2 gUnknown_08615968:: @ 8615968 - .incbin "baserom.gba", 0x615968, 0x8 + window_template 0x02, 0x15, 0x09, 0x05, 0x04, 0x0e, 0x02e9 + .align 2 gUnknown_08615970:: @ 8615970 - .incbin "baserom.gba", 0x615970, 0x18 + window_template 0x02, 0x13, 0x01, 0x0a, 0x0b, 0x0e, 0x02e9 + window_template 0x02, 0x02, 0x0f, 0x1b, 0x04, 0x0e, 0x01df + window_template 0x02, 0x00, 0x0d, 0x12, 0x03, 0x0c, 0x039d gUnknown_08615988:: @ 8615988 - .incbin "baserom.gba", 0x615988, 0x46 + .byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21 + .byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x3b, 0x3c, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3d, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f + .byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30 gUnknown_086159CE:: @ 86159CE - .incbin "baserom.gba", 0x6159ce, 0x46 + .byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21 + .byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x2a, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f + .byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30 gUnknown_08615A14:: @ 8615A14 - .incbin "baserom.gba", 0x615a14, 0x36 + .byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x34, 0x35, 0x33, 0x33, 0x33 + .byte 0x33, 0x33, 0x33, 0x36, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39 gUnknown_08615A4A:: @ 8615A4A - .incbin "baserom.gba", 0x615a4a, 0x36 + .byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21 + .byte 0x21, 0x21, 0x21, 0x32, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39 gUnknown_08615A80:: @ 8615A80 - .incbin "baserom.gba", 0x615a80, 0x36 + .byte 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x1f, 0x25, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x27 gUnknown_08615AB6:: @ 8615AB6 - .incbin "baserom.gba", 0x615ab6, 0x2 + .byte 0x0b, 0x0c gUnknown_08615AB8:: @ 8615AB8 - .incbin "baserom.gba", 0x615ab8, 0x2 + .byte 0x09, 0x0a gUnknown_08615ABA:: @ 8615ABA - .incbin "baserom.gba", 0x615aba, 0x3 + .byte 0x04, 0x05, 0x06 gUnknown_08615ABD:: @ 8615ABD - .incbin "baserom.gba", 0x615abd, 0x3 + .byte 0x01, 0x07, 0x08 gUnknown_08615AC0:: @ 8615AC0 - .incbin "baserom.gba", 0x615ac0, 0x3 + .byte 0x01, 0x0b, 0x0c gUnknown_08615AC3:: @ 8615AC3 - .incbin "baserom.gba", 0x615ac3, 0x2 + .byte 0x3b, 0x3c gUnknown_08615AC5:: @ 8615AC5 - .incbin "baserom.gba", 0x615ac5, 0x2 + .byte 0x4b, 0x4c gUnknown_08615AC7:: @ 8615AC7 - .incbin "baserom.gba", 0x615ac7, 0x2 + .byte 0x39, 0x3a gUnknown_08615AC9:: @ 8615AC9 - .incbin "baserom.gba", 0x615ac9, 0x2 + .byte 0x49, 0x4a gUnknown_08615ACB:: @ 8615ACB - .incbin "baserom.gba", 0x615acb, 0x2 + .byte 0x59, 0x5a gUnknown_08615ACD:: @ 8615ACD - .incbin "baserom.gba", 0x615acd, 0x3 + .byte 0x34, 0x35, 0x36 gUnknown_08615AD0:: @ 8615AD0 - .incbin "baserom.gba", 0x615ad0, 0x3 + .byte 0x44, 0x45, 0x46 gUnknown_08615AD3:: @ 8615AD3 - .incbin "baserom.gba", 0x615ad3, 0x3 + .byte 0x54, 0x55, 0x56 gUnknown_08615AD6:: @ 8615AD6 - .incbin "baserom.gba", 0x615ad6, 0x3 + .byte 0x74, 0x75, 0x76 gUnknown_08615AD9:: @ 8615AD9 - .incbin "baserom.gba", 0x615ad9, 0x3 + .byte 0x84, 0x85, 0x86 gUnknown_08615ADC:: @ 8615ADC - .incbin "baserom.gba", 0x615adc, 0x3 + .byte 0x94, 0x95, 0x96 gUnknown_08615ADF:: @ 8615ADF - .incbin "baserom.gba", 0x615adf, 0x3 + .byte 0x64, 0x65, 0x66 gUnknown_08615AE2:: @ 8615AE2 - .incbin "baserom.gba", 0x615ae2, 0x3 + .byte 0x31, 0x37, 0x38 gUnknown_08615AE5:: @ 8615AE5 - .incbin "baserom.gba", 0x615ae5, 0x3 + .byte 0x41, 0x47, 0x48 gUnknown_08615AE8:: @ 8615AE8 - .incbin "baserom.gba", 0x615ae8, 0x3 + .byte 0x51, 0x57, 0x58 gUnknown_08615AEB:: @ 8615AEB - .incbin "baserom.gba", 0x615aeb, 0x3 + .byte 0x61, 0x67, 0x68 gUnknown_08615AEE:: @ 8615AEE - .incbin "baserom.gba", 0x615aee, 0x3 + .byte 0xa1, 0xa7, 0xa8 gUnknown_08615AF1:: @ 8615AF1 - .incbin "baserom.gba", 0x615af1, 0x3 + .byte 0x11, 0x1b, 0x1c + .align 2 gUnknown_08615AF4:: @ 8615AF4 .4byte gUnknown_085E9E43 .4byte gUnknown_085EA010 @@ -209,68 +335,315 @@ gUnknown_08615B60:: @ 8615B60 .4byte gUnknown_085EA0D7 .4byte gUnknown_085EA0DC + .align 1 gUnknown_08615B94:: @ 8615B94 - .incbin "baserom.gba", 0x615b94, 0x74 + .2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071 + .2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068 + .2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d + .2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123 + .align 2 gUnknown_08615C08:: @ 8615C08 - .incbin "baserom.gba", 0x615c08, 0x130 + .4byte gText_Summary5, sub_81B37FC + .4byte gText_Switch2, brm_switch + .4byte gText_Cancel2, brm_cancel_1 + .4byte gText_Item, sub_81B4134 + .4byte gMenuText_Give, sub_81B4198 + .4byte gText_Take, sub_81B4724 + .4byte gText_Mail, sub_81B4A08 + .4byte gText_Take2, brm_take_2 + .4byte gText_Read2, sub_81B4A6C + .4byte gText_Cancel2, sub_81B4D78 + .4byte gText_Shift, brm_shift_sendout + .4byte gText_SendOut, brm_shift_sendout + .4byte gText_Enter, sub_81B4E8C + .4byte gText_NoEntry, sub_81B4FA8 + .4byte gText_Store, sub_81B50AC + .4byte gText_Register, sub_81B50C8 + .4byte gText_Trade4, brm_trade_1 + .4byte gText_Trade4, sub_81B52E4 + .4byte gMenuText_Toss, sub_81B47E0 + .4byte gMoveNames+195, sub_81B5470 + .4byte gMoveNames+1924, sub_81B5470 + .4byte gMoveNames+3237, sub_81B5470 + .4byte gMoveNames+910, sub_81B5470 + .4byte gMoveNames+741, sub_81B5470 + .4byte gMoveNames+247, sub_81B5470 + .4byte gMoveNames+3783, sub_81B5470 + .4byte gMoveNames+1651, sub_81B5470 + .4byte gMoveNames+1300, sub_81B5470 + .4byte gMoveNames+1183, sub_81B5470 + .4byte gMoveNames+3770, sub_81B5470 + .4byte gMoveNames+2704, sub_81B5470 + .4byte gMoveNames+1755, sub_81B5470 + .4byte gMoveNames+2990, sub_81B5470 +gUnknown_08615D10:: @ 8615D10 + .byte 0x00, 0x01, 0x02 + +gUnknown_08615D13:: @ 8615D13 + .byte 0x0a, 0x00, 0x02 + +gUnknown_08615D16:: @ 8615D16 + .byte 0x0b, 0x00, 0x02 + +gUnknown_08615D19:: @ 8615D19 + .byte 0x00, 0x02 + +gUnknown_08615D1B:: @ 8615D1B + .byte 0x0c, 0x00, 0x02 + +gUnknown_08615D1E:: @ 8615D1E + .byte 0x0d, 0x00, 0x02 + +gUnknown_08615D21:: @ 8615D21 + .byte 0x0e, 0x00, 0x02 + +gUnknown_08615D24:: @ 8615D24 + .byte 0x04, 0x05, 0x09 + +gUnknown_08615D27:: @ 8615D27 + .byte 0x08, 0x07, 0x09 + +gUnknown_08615D2A:: @ 8615D2A + .byte 0x0f, 0x00, 0x02 + +gUnknown_08615D2D:: @ 8615D2D + .byte 0x10, 0x00, 0x02 + +gUnknown_08615D30:: @ 8615D30 + .byte 0x11, 0x00, 0x02 + +gUnknown_08615D33:: @ 8615D33 + .byte 0x05, 0x12, 0x02 + + .align 2 gUnknown_08615D38:: @ 8615D38 - .incbin "baserom.gba", 0x615d38, 0x38 + .4byte NULL, gUnknown_08615D10, gUnknown_08615D13, gUnknown_08615D16, gUnknown_08615D1B, gUnknown_08615D1E, gUnknown_08615D21, gUnknown_08615D19 + .4byte gUnknown_08615D24, gUnknown_08615D27, gUnknown_08615D2A, gUnknown_08615D2D, gUnknown_08615D30, gUnknown_08615D33 gUnknown_08615D70:: @ 8615D70 - .incbin "baserom.gba", 0x615d70, 0xe + .byte 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 + .align 1 gUnknown_08615D7E:: @ 8615D7E - .incbin "baserom.gba", 0x615d7e, 0x1e + .2byte 0x000f, 0x0094, 0x00f9, 0x0046, 0x0039, 0x0013, 0x0123, 0x007f, 0x0064, 0x005b, 0x0122, 0x00d0, 0x0087, 0x00e6, 0x000e + .align 2 gUnknown_08615D9C:: @ 8615D9C - .incbin "baserom.gba", 0x615d9c, 0x70 + .4byte sub_80D3718, 0x00000007 + .4byte SetUpFieldMove_Flash, 0x0000000d + .4byte sub_8135654, 0x0000000d + .4byte hm_prepare_rocksmash, 0x0000000d + .4byte sub_81B5820, 0x00000008 + .4byte sub_81B5884, 0x0000000d + .4byte sub_81B5974, 0x0000000d + .4byte hm_prepare_waterfall, 0x0000000d + .4byte SetUpFieldMove_Teleport, 0x0000000d + .4byte sub_813572C, 0x0000000d + .4byte sub_80FA004, 0x0000000d + .4byte hm_prepare_dive_probably, 0x00000010 + .4byte hm_prepare_dive_probably, 0x00000010 + .4byte SetUpFieldMove_SweetScent, 0x0000000d + .align 2 gUnknown_08615E0C:: @ 8615E0C - .incbin "baserom.gba", 0x615e0c, 0x24 + .4byte gText_NotPkmnOtherTrainerWants + .4byte gText_ThatIsntAnEgg + .4byte gText_PkmnCantBeTradedNow + .4byte gText_PkmnCantBeTradedNow + .4byte gText_OtherTrainersPkmnCantBeTraded + .4byte gText_EggCantBeTradedNow + .4byte gText_OtherTrainerCantAcceptPkmn + .4byte gText_CantTradeWithTrainer + .4byte gText_CantTradeWithTrainer + .align 2 gUnknown_08615E30:: @ 8615E30 - .incbin "baserom.gba", 0x615e30, 0x40 + .incbin "graphics/interface/hold_icons.4bpp" + .align 2 gUnknown_08615E70:: @ 8615E70 - .incbin "baserom.gba", 0x615e70, 0x40 + .incbin "graphics/interface/hold_icons.gbapal" + .align 2 +gOamData_8615E90:: @ 8615E90 + .2byte 0x0000, 0x0000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_8615E98:: @ 8615E98 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615EA0:: @ 8615EA0 + .2byte 0x0001, 0x0001, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8615EA8:: @ 8615EA8 + .4byte gSpriteAnim_8615E98 + .4byte gSpriteAnim_8615EA0 + + .align 2 gUnknown_08615EB0:: @ 8615EB0 obj_tiles gUnknown_08615E30, 0x40, 55120 + .align 2 gUnknown_08615EB8:: @ 8615EB8 obj_pal gUnknown_08615E70, 55120 -gUnknown_08615EC0:: @ 8615EC0 - .incbin "baserom.gba", 0x615ec0, 0x38 + .align 2 +gSpriteTemplate_8615EC0:: @ 8615EC0 + spr_template 0xd750, 0xd750, gOamData_8615E90, gSpriteAnimTable_8615EA8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gOamData_8615ED8:: @ 8615ED8 + .2byte 0x0000, 0x8000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_8615EE0:: @ 8615EE0 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615EE8:: @ 8615EE8 + .2byte 0x0010, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8615EF0:: @ 8615EF0 + .4byte gSpriteAnim_8615EE0 + .4byte gSpriteAnim_8615EE8 + + .align 2 gUnknown_08615EF8:: @ 8615EF8 obj_tiles gPartyMenuPokeball_Gfx, 0x400, 1200 + .align 2 gUnknown_08615F00:: @ 8615F00 obj_pal gPartyMenuPokeball_Pal, 1200 -gUnknown_08615F08:: @ 8615F08 - .incbin "baserom.gba", 0x615f08, 0x68 + .align 2 +gSpriteTemplate_8615F08:: @ 8615F08 + spr_template 0x04b0, 0x04b0, gOamData_8615ED8, gSpriteAnimTable_8615EF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gOamData_8615F20:: @ 8615F20 + .2byte 0x0000, 0x4000, 0x0800, 0x0000 + + .align 2 +gSpriteAnim_8615F28:: @ 8615F28 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615F30:: @ 8615F30 + .2byte 0x0004, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615F38:: @ 8615F38 + .2byte 0x0008, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615F40:: @ 8615F40 + .2byte 0x000c, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615F48:: @ 8615F48 + .2byte 0x0010, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615F50:: @ 8615F50 + .2byte 0x0014, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8615F58:: @ 8615F58 + .4byte gSpriteAnim_8615F28 + .4byte gSpriteAnim_8615F30 + .4byte gSpriteAnim_8615F38 + .4byte gSpriteAnim_8615F40 + .4byte gSpriteAnim_8615F48 + .4byte gSpriteAnim_8615F50 + + .align 2 gUnknown_08615F70:: @ 8615F70 - .incbin "baserom.gba", 0x615f70, 0x8 + obj_tiles gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1 -gUnknown_08615F78:: @ 8615F78 - .incbin "baserom.gba", 0x615f78, 0x80 + .align 2 +gSpriteTemplate_8615F78:: @ 8615F78 + spr_template 0x04b1, 0x04b0, gOamData_8615F20, gSpriteAnimTable_8615F58, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 +gOamData_8615F90:: @ 8615F90 + .2byte 0x4000, 0x4000, 0x0400, 0x0000 + + .align 2 +gSpriteAnim_8615F98:: @ 8615F98 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FA0:: @ 8615FA0 + .2byte 0x0004, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FA8:: @ 8615FA8 + .2byte 0x0008, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FB0:: @ 8615FB0 + .2byte 0x000c, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FB8:: @ 8615FB8 + .2byte 0x0010, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FC0:: @ 8615FC0 + .2byte 0x0014, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FC8:: @ 8615FC8 + .2byte 0x0018, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnim_8615FD0:: @ 8615FD0 + .2byte 0x001c, 0x0000, 0xffff, 0x0000 + + .align 2 +gSpriteAnimTable_8615FD8:: @ 8615FD8 + .4byte gSpriteAnim_8615F98 + .4byte gSpriteAnim_8615FA0 + .4byte gSpriteAnim_8615FA8 + .4byte gSpriteAnim_8615FB0 + .4byte gSpriteAnim_8615FB8 + .4byte gSpriteAnim_8615FC0 + .4byte gSpriteAnim_8615FC8 + .4byte gSpriteAnim_8615FD0 + + .align 2 gUnknown_08615FF8:: @ 8615FF8 obj_tiles gStatusGfx_Icons, 0x400, 1202 + .align 2 gUnknown_08616000:: @ 8616000 obj_pal gStatusPal_Icons, 1202 -gUnknown_08616008:: @ 8616008 - .incbin "baserom.gba", 0x616008, 0x18 + .align 2 +gSpriteTemplate_8616008:: @ 8616008 + spr_template 0x04b2, 0x04b2, gOamData_8615F90, gSpriteAnimTable_8615FD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08616020:: @ 8616020 - .incbin "baserom.gba", 0x616020, 0x20 + .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 + .align 2 +gUnknown_08616028:: @ 8616028 + .4byte gText_HP4 + .4byte gText_Attack3 + .4byte gText_Defense3 + .4byte gText_SpAtk4 + .4byte gText_SpDef4 + .4byte gText_Speed2 + + .align 1 gUnknown_08616040:: @ 8616040 - .incbin "baserom.gba", 0x616040, 0x74 + .2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071 + .2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068 + .2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d + .2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123 + diff --git a/data/strings.s b/data/strings.s index 30969e452..96011f05c 100644 --- a/data/strings.s +++ b/data/strings.s @@ -567,16 +567,16 @@ gText_EmptyString2:: @ 85E8D03 gUnknown_085E8D04:: @ 85E8D04 .string "CANCEL$" -gUnknown_085E8D0B:: @ 85E8D0B +gText_Item:: @ 85E8D0B .string "ITEM$" -gUnknown_085E8D10:: @ 85E8D10 +gText_Mail:: @ 85E8D10 .string "MAIL$" -gUnknown_085E8D15:: @ 85E8D15 +gText_Take:: @ 85E8D15 .string "TAKE$" -gUnknown_085E8D1A:: @ 85E8D1A +gText_Store:: @ 85E8D1A .string "STORE$" gMenuText_Check:: @ 85E8D20 @@ -985,34 +985,34 @@ gText_TurnedOverVar1ForVar2:: @ 85E9677 gText_PokedollarVar1:: @ 85E969C .string "¥{STR_VAR_1}$" -gUnknown_085E96A0:: @ 85E96A0 +gText_Shift:: @ 85E96A0 .string "SHIFT$" -gUnknown_085E96A6:: @ 85E96A6 +gText_SendOut:: @ 85E96A6 .string "SEND OUT$" -gUnknown_085E96AF:: @ 85E96AF +gText_Switch2:: @ 85E96AF .string "SWITCH$" -gUnknown_085E96B6:: @ 85E96B6 +gText_Summary5:: @ 85E96B6 .string "SUMMARY$" gUnknown_085E96BE:: @ 85E96BE .string "MOVES$" -gUnknown_085E96C4:: @ 85E96C4 +gText_Enter:: @ 85E96C4 .string "ENTER$" -gUnknown_085E96CA:: @ 85E96CA +gText_NoEntry:: @ 85E96CA .string "NO ENTRY$" -gUnknown_085E96D3:: @ 85E96D3 +gText_Take2:: @ 85E96D3 .string "TAKE$" -gUnknown_085E96D8:: @ 85E96D8 +gText_Read2:: @ 85E96D8 .string "READ$" -gUnknown_085E96DD:: @ 85E96DD +gText_Trade4:: @ 85E96DD .string "TRADE$" gText_HP3:: @ 85E96E3 @@ -1341,19 +1341,19 @@ gText_OtherTrainersPkmnCantBeTraded:: @ 85EA250 .string "The other TRAINER’s POKéMON\ncan’t be traded now.$" .align 2 -gUnknown_085EA284:: @ 85EA284 +gText_OtherTrainerCantAcceptPkmn:: @ 85EA284 .string "The other TRAINER can’t accept\nthat POKéMON now.$" .align 2 -gUnknown_085EA2B8:: @ 85EA2B8 +gText_CantTradeWithTrainer:: @ 85EA2B8 .string "You can’t trade with that\nTRAINER now.$" .align 2 -gUnknown_085EA2E0:: @ 85EA2E0 +gText_NotPkmnOtherTrainerWants:: @ 85EA2E0 .string "That isn’t the type of POKéMON\nthat the other TRAINER wants.$" .align 2 -gUnknown_085EA320:: @ 85EA320 +gText_ThatIsntAnEgg:: @ 85EA320 .string "That isn’t an EGG.$" gText_Register:: @ 85EA333 diff --git a/data/text_window.s b/data/text_window.s index 716425100..8acbe5a25 100644 --- a/data/text_window.s +++ b/data/text_window.s @@ -2,169 +2,195 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 -gUnknown_0850E87C:: @ 850E87C - .incbin "baserom.gba", 0x50e87c, 0x120 + .align 2 +gTextWindowFrame1_Gfx:: @ 850E87C + .incbin "graphics/text_window/1.4bpp" -gUnknown_0850E99C:: @ 850E99C - .incbin "baserom.gba", 0x50e99c, 0x120 + .align 2 +gTextWindowFrame2_Gfx:: @ 850E99C + .incbin "graphics/text_window/2.4bpp" -gUnknown_0850EABC:: @ 850EABC - .incbin "baserom.gba", 0x50eabc, 0x120 + .align 2 +gTextWindowFrame3_Gfx:: @ 850EABC + .incbin "graphics/text_window/3.4bpp" -gUnknown_0850EBDC:: @ 850EBDC - .incbin "baserom.gba", 0x50ebdc, 0x120 + .align 2 +gTextWindowFrame4_Gfx:: @ 850EBDC + .incbin "graphics/text_window/4.4bpp" -gUnknown_0850ECFC:: @ 850ECFC - .incbin "baserom.gba", 0x50ecfc, 0x120 + .align 2 +gTextWindowFrame5_Gfx:: @ 850ECFC + .incbin "graphics/text_window/5.4bpp" -gUnknown_0850EE1C:: @ 850EE1C - .incbin "baserom.gba", 0x50ee1c, 0x120 + .align 2 +gTextWindowFrame6_Gfx:: @ 850EE1C + .incbin "graphics/text_window/6.4bpp" -gUnknown_0850EF3C:: @ 850EF3C - .incbin "baserom.gba", 0x50ef3c, 0x120 + .align 2 +gTextWindowFrame7_Gfx:: @ 850EF3C + .incbin "graphics/text_window/7.4bpp" -gUnknown_0850F05C:: @ 850F05C - .incbin "baserom.gba", 0x50f05c, 0x120 + .align 2 +gTextWindowFrame8_Gfx:: @ 850F05C + .incbin "graphics/text_window/8.4bpp" -gUnknown_0850F17C:: @ 850F17C - .incbin "baserom.gba", 0x50f17c, 0x120 + .align 2 +gTextWindowFrame9_Gfx:: @ 850F17C + .incbin "graphics/text_window/9.4bpp" -gUnknown_0850F29C:: @ 850F29C - .incbin "baserom.gba", 0x50f29c, 0x120 + .align 2 +gTextWindowFrame10_Gfx:: @ 850F29C + .incbin "graphics/text_window/10.4bpp" -gUnknown_0850F3BC:: @ 850F3BC - .incbin "baserom.gba", 0x50f3bc, 0x120 + .align 2 +gTextWindowFrame11_Gfx:: @ 850F3BC + .incbin "graphics/text_window/11.4bpp" -gUnknown_0850F4DC:: @ 850F4DC - .incbin "baserom.gba", 0x50f4dc, 0x120 + .align 2 +gTextWindowFrame12_Gfx:: @ 850F4DC + .incbin "graphics/text_window/12.4bpp" -gUnknown_0850F5FC:: @ 850F5FC - .incbin "baserom.gba", 0x50f5fc, 0x120 + .align 2 +gTextWindowFrame13_Gfx:: @ 850F5FC + .incbin "graphics/text_window/13.4bpp" -gUnknown_0850F71C:: @ 850F71C - .incbin "baserom.gba", 0x50f71c, 0x120 + .align 2 +gTextWindowFrame14_Gfx:: @ 850F71C + .incbin "graphics/text_window/14.4bpp" -gUnknown_0850F83C:: @ 850F83C - .incbin "baserom.gba", 0x50f83c, 0x120 + .align 2 +gTextWindowFrame15_Gfx:: @ 850F83C + .incbin "graphics/text_window/15.4bpp" -gUnknown_0850F95C:: @ 850F95C - .incbin "baserom.gba", 0x50f95c, 0x120 + .align 2 +gTextWindowFrame16_Gfx:: @ 850F95C + .incbin "graphics/text_window/16.4bpp" -gUnknown_0850FA7C:: @ 850FA7C - .incbin "baserom.gba", 0x50fa7c, 0x120 + .align 2 +gTextWindowFrame17_Gfx:: @ 850FA7C + .incbin "graphics/text_window/17.4bpp" -gUnknown_0850FB9C:: @ 850FB9C - .incbin "baserom.gba", 0x50fb9c, 0x120 + .align 2 +gTextWindowFrame18_Gfx:: @ 850FB9C + .incbin "graphics/text_window/18.4bpp" -gUnknown_0850FCBC:: @ 850FCBC - .incbin "baserom.gba", 0x50fcbc, 0x120 + .align 2 +gTextWindowFrame19_Gfx:: @ 850FCBC + .incbin "graphics/text_window/19.4bpp" -gUnknown_0850FDDC:: @ 850FDDC - .incbin "baserom.gba", 0x50fddc, 0x120 + .align 2 +gTextWindowFrame20_Gfx:: @ 850FDDC + .incbin "graphics/text_window/20.4bpp" -gUnknown_0850FEFC:: @ 850FEFC - .incbin "baserom.gba", 0x50fefc, 0x20 + .align 2 +gTextWindowFrame1_Pal:: @ 850FEFC + .incbin "graphics/text_window/1.gbapal" -gUnknown_0850FF1C:: @ 850FF1C - .incbin "baserom.gba", 0x50ff1c, 0x20 + .align 2 +gTextWindowFrame2_Pal:: @ 850FF1C + .incbin "graphics/text_window/2.gbapal" -gUnknown_0850FF3C:: @ 850FF3C - .incbin "baserom.gba", 0x50ff3c, 0x20 + .align 2 +gTextWindowFrame3_Pal:: @ 850FF3C + .incbin "graphics/text_window/3.gbapal" -gUnknown_0850FF5C:: @ 850FF5C - .incbin "baserom.gba", 0x50ff5c, 0x20 + .align 2 +gTextWindowFrame4_Pal:: @ 850FF5C + .incbin "graphics/text_window/4.gbapal" -gUnknown_0850FF7C:: @ 850FF7C - .incbin "baserom.gba", 0x50ff7c, 0x20 + .align 2 +gTextWindowFrame5_Pal:: @ 850FF7C + .incbin "graphics/text_window/5.gbapal" -gUnknown_0850FF9C:: @ 850FF9C - .incbin "baserom.gba", 0x50ff9c, 0x20 + .align 2 +gTextWindowFrame6_Pal:: @ 850FF9C + .incbin "graphics/text_window/6.gbapal" -gUnknown_0850FFBC:: @ 850FFBC - .incbin "baserom.gba", 0x50ffbc, 0x20 + .align 2 +gTextWindowFrame7_Pal:: @ 850FFBC + .incbin "graphics/text_window/7.gbapal" -gUnknown_0850FFDC:: @ 850FFDC - .incbin "baserom.gba", 0x50ffdc, 0x20 + .align 2 +gTextWindowFrame8_Pal:: @ 850FFDC + .incbin "graphics/text_window/8.gbapal" -gUnknown_0850FFFC:: @ 850FFFC - .incbin "baserom.gba", 0x50fffc, 0x20 + .align 2 +gTextWindowFrame9_Pal:: @ 850FFFC + .incbin "graphics/text_window/9.gbapal" -gUnknown_0851001C:: @ 851001C - .incbin "baserom.gba", 0x51001c, 0x20 + .align 2 +gTextWindowFrame10_Pal:: @ 851001C + .incbin "graphics/text_window/10.gbapal" -gUnknown_0851003C:: @ 851003C - .incbin "baserom.gba", 0x51003c, 0x20 + .align 2 +gTextWindowFrame11_Pal:: @ 851003C + .incbin "graphics/text_window/11.gbapal" -gUnknown_0851005C:: @ 851005C - .incbin "baserom.gba", 0x51005c, 0x20 + .align 2 +gTextWindowFrame12_Pal:: @ 851005C + .incbin "graphics/text_window/12.gbapal" -gUnknown_0851007C:: @ 851007C - .incbin "baserom.gba", 0x51007c, 0x20 + .align 2 +gTextWindowFrame13_Pal:: @ 851007C + .incbin "graphics/text_window/13.gbapal" -gUnknown_0851009C:: @ 851009C - .incbin "baserom.gba", 0x51009c, 0x20 + .align 2 +gTextWindowFrame14_Pal:: @ 851009C + .incbin "graphics/text_window/14.gbapal" -gUnknown_085100BC:: @ 85100BC - .incbin "baserom.gba", 0x5100bc, 0x20 + .align 2 +gTextWindowFrame15_Pal:: @ 85100BC + .incbin "graphics/text_window/15.gbapal" -gUnknown_085100DC:: @ 85100DC - .incbin "baserom.gba", 0x5100dc, 0x20 + .align 2 +gTextWindowFrame16_Pal:: @ 85100DC + .incbin "graphics/text_window/16.gbapal" -gUnknown_085100FC:: @ 85100FC - .incbin "baserom.gba", 0x5100fc, 0x20 + .align 2 +gTextWindowFrame17_Pal:: @ 85100FC + .incbin "graphics/text_window/17.gbapal" -gUnknown_0851011C:: @ 851011C - .incbin "baserom.gba", 0x51011c, 0x20 + .align 2 +gTextWindowFrame18_Pal:: @ 851011C + .incbin "graphics/text_window/18.gbapal" -gUnknown_0851013C:: @ 851013C - .incbin "baserom.gba", 0x51013c, 0x20 + .align 2 +gTextWindowFrame19_Pal:: @ 851013C + .incbin "graphics/text_window/19.gbapal" -gUnknown_0851015C:: @ 851015C - .incbin "baserom.gba", 0x51015c, 0x20 + .align 2 +gTextWindowFrame20_Pal:: @ 851015C + .incbin "graphics/text_window/20.gbapal" + .align 2 gUnknown_0851017C:: @ 851017C - .incbin "baserom.gba", 0x51017c, 0xA0 + .incbin "graphics/text_window/message_box.gbapal" + .incbin "graphics/text_window/text_pal1.gbapal" + .incbin "graphics/text_window/text_pal2.gbapal" + .incbin "graphics/text_window/text_pal3.gbapal" + .incbin "graphics/text_window/text_pal4.gbapal" + + .align 2 gUnknown_0851021C:: @ 851021C - .4byte gUnknown_0850E87C - .4byte gUnknown_0850FEFC - .4byte gUnknown_0850E99C - .4byte gUnknown_0850FF1C - .4byte gUnknown_0850EABC - .4byte gUnknown_0850FF3C - .4byte gUnknown_0850EBDC - .4byte gUnknown_0850FF5C - .4byte gUnknown_0850ECFC - .4byte gUnknown_0850FF7C - .4byte gUnknown_0850EE1C - .4byte gUnknown_0850FF9C - .4byte gUnknown_0850EF3C - .4byte gUnknown_0850FFBC - .4byte gUnknown_0850F05C - .4byte gUnknown_0850FFDC - .4byte gUnknown_0850F17C - .4byte gUnknown_0850FFFC - .4byte gUnknown_0850F29C - .4byte gUnknown_0851001C - .4byte gUnknown_0850F3BC - .4byte gUnknown_0851003C - .4byte gUnknown_0850F4DC - .4byte gUnknown_0851005C - .4byte gUnknown_0850F5FC - .4byte gUnknown_0851007C - .4byte gUnknown_0850F71C - .4byte gUnknown_0851009C - .4byte gUnknown_0850F83C - .4byte gUnknown_085100BC - .4byte gUnknown_0850F95C - .4byte gUnknown_085100DC - .4byte gUnknown_0850FA7C - .4byte gUnknown_085100FC - .4byte gUnknown_0850FB9C - .4byte gUnknown_0851011C - .4byte gUnknown_0850FCBC - .4byte gUnknown_0851013C - .4byte gUnknown_0850FDDC - .4byte gUnknown_0851015C + .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal + .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal + .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal + .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal + .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal + .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal + .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal + .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal + .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal + .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal + .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal + .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal + .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal + .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal + .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal + .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal + .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal + .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal + .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal + .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal diff --git a/data/trade.s b/data/trade.s index 4958d5717..d9708d0e6 100644 --- a/data/trade.s +++ b/data/trade.s @@ -266,7 +266,7 @@ gJPText_Shedinja:: @ 832DF94 .string "ヌケニン$" gUnknown_0832DF99:: @ 832DF99 - .incbin "baserom.gba", 0x32df99, 0x7 + .byte 0x04, 0x03, 0x13, 0x03, 0x00, 0x00, 0x00 .align 2 gTradeBallPalette:: @ 832DFA0 diff --git a/data/trainer_card.s b/data/trainer_card.s index 08bf4d8fa..f57973200 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.s @@ -2,7 +2,6 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 .macro unk_trainer_card_struct text1, text2, short1, short2, short3, short4 .4byte \text1 @@ -13,71 +12,100 @@ .2byte \short4 .endm + .align 2 gUnknown_0856F018:: @ 856F018 - .incbin "baserom.gba", 0x56f018, 0x194 + .incbin "graphics/trainer_card/stickers_fr.4bpp.lz" + .align 2 +gUnknown_0856F18C:: @ 856F18C + .incbin "graphics/trainer_card/unknown_56F18C.gbapal" + + .align 2 gEmeraldTrainerCard1Star_Pal:: @ 856F1AC - .incbin "baserom.gba", 0x56f1ac, 0x60 + .incbin "graphics/trainer_card/one_star.gbapal" + .align 2 gFireRedTrainerCard1Star_Pal:: @ 856F20C - .incbin "baserom.gba", 0x56f20c, 0x60 + .incbin "graphics/trainer_card/one_star_fr.gbapal" + .align 2 gEmeraldTrainerCard2Star_Pal:: @ 856F26C - .incbin "baserom.gba", 0x56f26c, 0x60 + .incbin "graphics/trainer_card/two_stars.gbapal" + .align 2 gFireRedTrainerCard2Star_Pal:: @ 856F2CC - .incbin "baserom.gba", 0x56f2cc, 0x60 + .incbin "graphics/trainer_card/two_stars_fr.gbapal" + .align 2 gEmeraldTrainerCard3Star_Pal:: @ 856F32C - .incbin "baserom.gba", 0x56f32c, 0x60 + .incbin "graphics/trainer_card/three_stars.gbapal" + .align 2 gFireRedTrainerCard3Star_Pal:: @ 856F38C - .incbin "baserom.gba", 0x56f38c, 0x60 + .incbin "graphics/trainer_card/three_stars_fr.gbapal" + .align 2 gEmeraldTrainerCard4Star_Pal:: @ 856F3EC - .incbin "baserom.gba", 0x56f3ec, 0x60 + .incbin "graphics/trainer_card/four_stars.gbapal" + .align 2 gFireRedTrainerCard4Star_Pal:: @ 856F44C - .incbin "baserom.gba", 0x56f44c, 0x60 + .incbin "graphics/trainer_card/four_stars_fr.gbapal" + .align 2 gUnknown_0856F4AC:: @ 856F4AC - .incbin "baserom.gba", 0x56f4ac, 0x20 + .incbin "graphics/trainer_card/female_bg.gbapal" + .align 2 gUnknown_0856F4CC:: @ 856F4CC - .incbin "baserom.gba", 0x56f4cc, 0x20 + .incbin "graphics/trainer_card/female_bg_fr.gbapal" + .align 2 gUnknown_0856F4EC:: @ 856F4EC - .incbin "baserom.gba", 0x56f4ec, 0x20 + .incbin "graphics/trainer_card/badges.gbapal" + .align 2 gUnknown_0856F50C:: @ 856F50C - .incbin "baserom.gba", 0x56f50c, 0x20 + .incbin "graphics/trainer_card/badges_fr.gbapal" + .align 2 gUnknown_0856F52C:: @ 856F52C - .incbin "baserom.gba", 0x56f52c, 0x20 + .incbin "graphics/trainer_card/gold.gbapal" + .align 2 gUnknown_0856F54C:: @ 856F54C - .incbin "baserom.gba", 0x56f54c, 0x20 + .incbin "graphics/trainer_card/stickers_fr1.gbapal" + .align 2 gUnknown_0856F56C:: @ 856F56C - .incbin "baserom.gba", 0x56f56c, 0x20 + .incbin "graphics/trainer_card/stickers_fr2.gbapal" + .align 2 gUnknown_0856F58C:: @ 856F58C - .incbin "baserom.gba", 0x56f58c, 0x20 + .incbin "graphics/trainer_card/stickers_fr3.gbapal" + .align 2 gUnknown_0856F5AC:: @ 856F5AC - .incbin "baserom.gba", 0x56f5ac, 0x20 + .incbin "graphics/trainer_card/stickers_fr4.gbapal" + .align 2 gUnknown_0856F5CC:: @ 856F5CC - .incbin "baserom.gba", 0x56f5cc, 0x248 + .incbin "graphics/trainer_card/badges.4bpp.lz" + .align 2 gUnknown_0856F814:: @ 856F814 - .incbin "baserom.gba", 0x56f814, 0x2a0 + .incbin "graphics/trainer_card/badges_fr.4bpp.lz" + .align 2 gUnknown_0856FAB4:: @ 856FAB4 - .incbin "baserom.gba", 0x56fab4, 0x10 + .4byte 0x000025b0, 0x000001d9, 0x000031e2, 0x003011f3 + .align 2 gUnknown_0856FAC4:: @ 856FAC4 - .incbin "baserom.gba", 0x56fac4, 0x20 + window_template 0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0253 + window_template 0x01, 0x01, 0x01, 0x1c, 0x12, 0x0f, 0x0001 + window_template 0x03, 0x13, 0x05, 0x09, 0x0a, 0x08, 0x0150 + null_window_template .align 2 gEmeraldTrainerCardStarPals:: @ 856FAE4 @@ -96,20 +124,21 @@ gFireRedTrainerCardStarPals:: @ 856FAF8 .4byte gFireRedTrainerCard4Star_Pal gUnknown_0856FB0C:: @ 856FB0C - .incbin "baserom.gba", 0x56fb0c, 0x3 + .byte 0x00, 0x02, 0x03 gUnknown_0856FB0F:: @ 856FB0F - .incbin "baserom.gba", 0x56fb0f, 0x3 + .byte 0x00, 0x04, 0x05 gUnknown_0856FB12:: @ 856FB12 - .incbin "baserom.gba", 0x56fb12, 0x6 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_0856FB18:: @ 856FB18 - .incbin "baserom.gba", 0x56fb18, 0x8 + .byte 0x0d, 0x04, 0x0d, 0x04, 0x01, 0x00, 0x01, 0x00 gUnknown_0856FB20:: @ 856FB20 - .incbin "baserom.gba", 0x56fb20, 0x8 + .byte 0x4e, 0x4f, 0x50, 0x51, 0x3c, 0x3f + .align 2 gUnknown_0856FB28:: @ 856FB28 .4byte sub_80C4998 .4byte sub_80C49D8 @@ -118,182 +147,233 @@ gUnknown_0856FB28:: @ 856FB28 .4byte sub_80C4C84 .4byte sub_80C4DB0 + .align 2 gUnknown_0856FB40:: @ 856FB40 .4byte gUnknown_0856FB0C .4byte gUnknown_0856FB12 gUnknown_0856FB48:: @ 856FB48 - .incbin "baserom.gba", 0x56fb48, 0x2 + .byte 0x71, 0x68 gUnknown_0856FB4A:: @ 856FB4A - .incbin "baserom.gba", 0x56fb4a, 0x2 + .byte 0x81, 0x78 gUnknown_0856FB4C:: @ 856FB4C - .incbin "baserom.gba", 0x56fb4c, 0x9 + .byte 0xfd, 0x02, 0xf0, 0xfd, 0x03, 0xf0, 0xfd, 0x04, 0xff gUnknown_0856FB55:: @ 856FB55 - .incbin "baserom.gba", 0x56fb55, 0x2 + .byte 0x08, 0x10 gUnknown_0856FB57:: @ 856FB57 - .incbin "baserom.gba", 0x56fb57, 0x5 + .byte 0xd8, 0xd8 + .align 2 gUnknown_0856FB5C:: @ 856FB5C .4byte gText_LinkBattles .4byte gText_LinkCableBattles .4byte gText_LinkBattles gUnknown_0856FB68:: @ 856FB68 - .incbin "baserom.gba", 0x56fb68, 0x6 + .byte 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a gUnknown_0856FB6E:: @ 856FB6E - .incbin "baserom.gba", 0x56fb6e, 0x6 + .byte 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14 gUnknown_0856FB74:: @ 856FB74 - .incbin "baserom.gba", 0x56fb74, 0x4 + .byte 0x0b, 0x0c, 0x0d, 0x0e gUnknown_0856FB78:: @ 856FB78 - .incbin "baserom.gba", 0x56fb78, 0x4 + .byte 0x07, 0x07 + .align 2 gUnknown_0856FB7C:: @ 856FB7C - .incbin "baserom.gba", 0x56fb7c, 0x20 + .incbin "graphics/frontier_pass/map_heads.gbapal" + .align 2 gUnknown_0856FB9C:: @ 856FB9C - .incbin "baserom.gba", 0x56fb9c, 0x20 + .incbin "graphics/frontier_pass/map_heads_female.gbapal" + .align 2 gUnknown_0856FBBC:: @ 856FBBC - .incbin "baserom.gba", 0x56fbbc, 0xFEC + .incbin "graphics/frontier_pass/map_screen.4bpp.lz" - .align 2 + .align 2 gFrontierPassCursor_Gfx:: @ 8570BA8 - .incbin "graphics/frontier_pass/cursor.4bpp.lz" + .incbin "graphics/frontier_pass/cursor.4bpp.lz" + .align 2 gUnknown_08570C44:: @ 8570C44 - .incbin "baserom.gba", 0x570c44, 0xBC + .incbin "graphics/frontier_pass/map_heads.4bpp.lz" - .align 2 + .align 2 gFrontierPassMapCursor_Gfx:: @ 8570D00 - .incbin "graphics/frontier_pass/map_cursor.4bpp.lz" + .incbin "graphics/frontier_pass/map_cursor.4bpp.lz" + .align 2 gUnknown_08570E00:: @ 8570E00 - .incbin "baserom.gba", 0x570e00, 0x260 + .incbin "graphics/frontier_pass/map_screen.bin.lz" + .align 2 gUnknown_08571060:: @ 8571060 - .incbin "baserom.gba", 0x571060, 0x260 + .incbin "graphics/frontier_pass/small_map_and_card.bin.lz" + .align 2 +gUnknown_08571298:: @ 8571298 + .incbin "graphics/frontier_pass/unknown_571298.bin" + + .align 2 gUnknown_085712C0:: @ 85712C0 - .incbin "baserom.gba", 0x5712c0, 0x38 + .incbin "graphics/frontier_pass/record_frame.bin.lz" + .align 2 gUnknown_085712F8:: @ 85712F8 - .incbin "baserom.gba", 0x5712f8, 0xe8 + .incbin "graphics/frontier_pass/small_map_and_card_affine.bin.lz" gUnknown_085713E0:: @ 85713E0 - .incbin "baserom.gba", 0x5713e0, 0x8 + .2byte 0x00d8, 0x0020, 0x00d8, 0x0080 + .align 2 gUnknown_085713E8:: @ 85713E8 - .incbin "baserom.gba", 0x5713e8, 0xc + .4byte 0x000011f8, 0x000021e1, 0x00000bd6 + .align 2 gUnknown_085713F4:: @ 85713F4 - .incbin "baserom.gba", 0x5713f4, 0xc + .4byte 0x000001f8, 0x000011e1, 0x000021d2 + .align 2 gUnknown_08571400:: @ 8571400 - .incbin "baserom.gba", 0x571400, 0x28 + window_template 0x00, 0x02, 0x03, 0x0c, 0x03, 0x0f, 0x0001 + window_template 0x00, 0x02, 0x0a, 0x0c, 0x03, 0x0f, 0x0026 + window_template 0x00, 0x02, 0x0d, 0x0c, 0x04, 0x0f, 0x004b + window_template 0x00, 0x00, 0x12, 0x1e, 0x03, 0x0f, 0x007c + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + .align 2 gUnknown_08571428:: @ 8571428 - .incbin "baserom.gba", 0x571428, 0x20 + window_template 0x00, 0x00, 0x01, 0x0f, 0x05, 0x0f, 0x0001 + window_template 0x00, 0x14, 0x01, 0x0a, 0x0e, 0x0f, 0x004d + window_template 0x00, 0x02, 0x10, 0x1a, 0x04, 0x0f, 0x00da + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 gUnknown_08571448:: @ 8571448 - .incbin "baserom.gba", 0x571448, 0x3 + .byte 0x00, 0x02, 0x03 gUnknown_0857144B:: @ 857144B - .incbin "baserom.gba", 0x57144b, 0x3 + .byte 0x00, 0x01, 0x09 gUnknown_0857144E:: @ 857144E - .incbin "baserom.gba", 0x57144e, 0x6 + .byte 0x00, 0x04, 0x05 + .align 2 gUnknown_08571454:: @ 8571454 - .incbin "baserom.gba", 0x571454, 0x68 + .2byte 0x001c, 0x004c, 0x0084, 0x00dc, 0x0054, 0x0084, 0x0084, 0x00dc, 0x0050, 0x0066, 0x0014, 0x006c, 0x0000, 0x0010, 0x0098, 0x00f0 + .2byte 0x006c, 0x0086, 0x0014, 0x006c, 0x0018, 0x0030, 0x0014, 0x006c, 0x0032, 0x0042, 0x0014, 0x0024, 0x0042, 0x0052, 0x0020, 0x0030 + .2byte 0x0032, 0x0042, 0x002c, 0x003c, 0x0042, 0x0052, 0x0038, 0x0048, 0x0032, 0x0042, 0x0044, 0x0054, 0x0042, 0x0052, 0x0050, 0x0060 + .2byte 0x0032, 0x0042, 0x005c, 0x006c + .align 2 gUnknown_085714BC:: @ 85714BC obj_tiles gFrontierPassCursor_Gfx, 0x100, 0 obj_tiles gFrontierPassMapCursor_Gfx, 0x400, 1 obj_tiles gFrontierPassMedals_Gfx, 0x380, 2 + .align 2 gUnknown_085714D4:: @ 85714D4 obj_tiles gUnknown_08570C44, 0x100, 4 null_obj_tiles + .align 2 gUnknown_085714E4:: @ 85714E4 - obj_pal gFrontierPassCursor_Pal, 0 - obj_pal gFrontierPassMapCursor_Pal, 1 - obj_pal gFrontierPassMedalsSilver_Pal, 2 - obj_pal gFrontierPassMedalsGold_Pal, 3 - obj_pal gUnknown_0856FB7C, 4 - obj_pal gUnknown_0856FB9C, 5 - null_obj_pal + obj_pal gFrontierPassCursor_Pal, 0 + obj_pal gFrontierPassMapCursor_Pal, 1 + obj_pal gFrontierPassMedalsSilver_Pal, 2 + obj_pal gFrontierPassMedalsGold_Pal, 3 + obj_pal gUnknown_0856FB7C, 4 + obj_pal gUnknown_0856FB9C, 5 + null_obj_pal - @ this doesnt look like its part of the same table. - .4byte 0x0, 0xFFFF + .align 2 +gSpriteAnim_857151C:: @ 857151C + .2byte 0x0000, 0x0000, 0xffff, 0x0000 -gUnknown_08571524:: @ 8571524 - .incbin "baserom.gba", 0x571524, 0x8 + .align 2 +gSpriteAnim_8571524:: @ 8571524 + .2byte 0x0000, 0x0000, 0xffff, 0x0000 -gUnknown_0857152C:: @ 857152C - .incbin "baserom.gba", 0x57152c, 0x8 + .align 2 +gSpriteAnim_857152C:: @ 857152C + .2byte 0x0004, 0x0000, 0xffff, 0x0000 -gUnknown_08571534:: @ 8571534 - .incbin "baserom.gba", 0x571534, 0x8 + .align 2 +gSpriteAnim_8571534:: @ 8571534 + .2byte 0x0008, 0x0000, 0xffff, 0x0000 -gUnknown_0857153C:: @ 857153C - .incbin "baserom.gba", 0x57153c, 0x8 + .align 2 +gSpriteAnim_857153C:: @ 857153C + .2byte 0x000c, 0x0000, 0xffff, 0x0000 -gUnknown_08571544:: @ 8571544 - .incbin "baserom.gba", 0x571544, 0x8 + .align 2 +gSpriteAnim_8571544:: @ 8571544 + .2byte 0x0010, 0x0000, 0xffff, 0x0000 -gUnknown_0857154C:: @ 857154C - .incbin "baserom.gba", 0x57154c, 0x8 + .align 2 +gSpriteAnim_857154C:: @ 857154C + .2byte 0x0014, 0x0000, 0xffff, 0x0000 -gUnknown_08571554:: @ 8571554 - .incbin "baserom.gba", 0x571554, 0x8 + .align 2 +gSpriteAnim_8571554:: @ 8571554 + .2byte 0x0018, 0x0000, 0xffff, 0x0000 -gUnknown_0857155C:: @ 857155C - .incbin "baserom.gba", 0x57155c, 0xC + .align 2 +gSpriteAnim_857155C:: @ 857155C + .2byte 0x0000, 0x002d, 0x0008, 0x002d, 0xfffe, 0x0000 -gUnknown_08571568:: @ 8571568 - .incbin "baserom.gba", 0x571568, 0xC + .align 2 +gSpriteAnim_8571568:: @ 8571568 + .2byte 0x0010, 0x002d, 0x0018, 0x002d, 0xfffe, 0x0000 -gUnknown_08571574:: @ 8571574 - .4byte gUnknown_08571524 - .4byte gUnknown_0857152C + .align 2 +gSpriteAnimTable_08571574:: @ 8571574 + .4byte gSpriteAnim_8571524 + .4byte gSpriteAnim_857152C -gUnknown_0857157C:: @ 857157C - .4byte gUnknown_08571524 - .4byte gUnknown_0857152C - .4byte gUnknown_08571534 - .4byte gUnknown_0857153C - .4byte gUnknown_08571544 - .4byte gUnknown_0857154C - .4byte gUnknown_08571554 + .align 2 +gSpriteAnimTable_0857157C:: @ 857157C + .4byte gSpriteAnim_8571524 + .4byte gSpriteAnim_857152C + .4byte gSpriteAnim_8571534 + .4byte gSpriteAnim_857153C + .4byte gSpriteAnim_8571544 + .4byte gSpriteAnim_857154C + .4byte gSpriteAnim_8571554 -gUnknown_08571598:: @ 8571598 - .4byte gUnknown_0857155C - .4byte gUnknown_08571568 + .align 2 +gSpriteAnimTable_08571598:: @ 8571598 + .4byte gSpriteAnim_857155C + .4byte gSpriteAnim_8571568 -gUnknown_085715A0:: @ 85715A0 - .incbin "baserom.gba", 0x5715a0, 0x10 + .align 2 +gSpriteAffineAnim_085715A0:: @ 85715A0 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 -gUnknown_085715B0:: @ 85715B0 - .4byte gUnknown_085715A0 + .align 2 +gSpriteAffineAnimTable_085715B0:: @ 85715B0 + .4byte gSpriteAffineAnim_085715A0 + .align 2 gUnknown_085715B4:: @ 85715B4 - spr_template 0, 0, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 1, 1, gUnknown_08524934, gUnknown_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0, 0, gUnknown_0852490C, gSpriteAnimTable_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 1, 1, gUnknown_08524934, gSpriteAnimTable_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_085715E4:: @ 85715E4 - spr_template 2, 2, gUnknown_0852490C, gUnknown_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 2, 2, gUnknown_0852490C, gSpriteAnimTable_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_085715FC:: @ 85715FC - spr_template 4, 4, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39 + spr_template 4, 4, gUnknown_0852490C, gSpriteAnimTable_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39 + .align 2 gUnknown_08571614:: @ 8571614 .4byte gUnknown_085EDA96 .4byte gUnknown_085ED932 @@ -311,6 +391,7 @@ gUnknown_08571614:: @ 8571614 .4byte gUnknown_085EDA78 .4byte gUnknown_085ED931 + .align 2 gUnknown_08571650:: @ 8571650 unk_trainer_card_struct gUnknown_085EDAB1, gUnknown_085EDB0F, 0x59, 0x28, 1, 0 unk_trainer_card_struct gUnknown_085EDABE, gUnknown_085EDB4E, 0x21, 0x2A, 1, 0 diff --git a/graphics/frontier_pass/map_heads.png b/graphics/frontier_pass/map_heads.png new file mode 100644 index 000000000..82ef1cd2e Binary files /dev/null and b/graphics/frontier_pass/map_heads.png differ diff --git a/graphics/frontier_pass/map_heads_female.pal b/graphics/frontier_pass/map_heads_female.pal new file mode 100644 index 000000000..2833b2613 --- /dev/null +++ b/graphics/frontier_pass/map_heads_female.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +98 98 115 +41 57 65 +164 106 82 +74 49 57 +205 205 222 +106 213 65 +65 172 32 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/frontier_pass/map_screen.bin b/graphics/frontier_pass/map_screen.bin new file mode 100644 index 000000000..2caaff89e Binary files /dev/null and b/graphics/frontier_pass/map_screen.bin differ diff --git a/graphics/frontier_pass/map_screen.png b/graphics/frontier_pass/map_screen.png new file mode 100644 index 000000000..5d2b4467f Binary files /dev/null and b/graphics/frontier_pass/map_screen.png differ diff --git a/graphics/frontier_pass/record_frame.bin b/graphics/frontier_pass/record_frame.bin new file mode 100644 index 000000000..ded0f8165 Binary files /dev/null and b/graphics/frontier_pass/record_frame.bin differ diff --git a/graphics/frontier_pass/small_map_and_card.bin b/graphics/frontier_pass/small_map_and_card.bin new file mode 100644 index 000000000..4578d7d7e Binary files /dev/null and b/graphics/frontier_pass/small_map_and_card.bin differ diff --git a/graphics/frontier_pass/small_map_and_card_affine.bin b/graphics/frontier_pass/small_map_and_card_affine.bin new file mode 100644 index 000000000..25cb407ae --- /dev/null +++ b/graphics/frontier_pass/small_map_and_card_affine.bin @@ -0,0 +1,2 @@ + + $%&'()*+,-./456789:;<=>?DEFGHIJKLMNOTUVWXYZ[\]^_defghijklmnotuvwxyz{|}~tuvwxyz{|}~ !"#0123@ABCPQRS \ No newline at end of file diff --git a/graphics/frontier_pass/unknown_571298.bin b/graphics/frontier_pass/unknown_571298.bin new file mode 100644 index 000000000..a781f0b39 --- /dev/null +++ b/graphics/frontier_pass/unknown_571298.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/graphics/interface/hold_icons.png b/graphics/interface/hold_icons.png new file mode 100644 index 000000000..53eeedde3 Binary files /dev/null and b/graphics/interface/hold_icons.png differ diff --git a/graphics/interface/textbox.png b/graphics/interface/textbox.png deleted file mode 100755 index ed8cd92ee..000000000 Binary files a/graphics/interface/textbox.png and /dev/null differ diff --git a/graphics/interface/unknown_6157C4.bin b/graphics/interface/unknown_6157C4.bin new file mode 100644 index 000000000..8c3c1be3d --- /dev/null +++ b/graphics/interface/unknown_6157C4.bin @@ -0,0 +1 @@ +#$ \ No newline at end of file diff --git a/graphics/interface/unknown_6157E0.bin b/graphics/interface/unknown_6157E0.bin new file mode 100644 index 000000000..7f11aaf4e --- /dev/null +++ b/graphics/interface/unknown_6157E0.bin @@ -0,0 +1,2 @@ + +            \ No newline at end of file diff --git a/graphics/text_window/1.png b/graphics/text_window/1.png new file mode 100644 index 000000000..5d8020eff Binary files /dev/null and b/graphics/text_window/1.png differ diff --git a/graphics/text_window/10.png b/graphics/text_window/10.png new file mode 100644 index 000000000..b01a75c6a Binary files /dev/null and b/graphics/text_window/10.png differ diff --git a/graphics/text_window/11.png b/graphics/text_window/11.png new file mode 100644 index 000000000..a0e576fce Binary files /dev/null and b/graphics/text_window/11.png differ diff --git a/graphics/text_window/12.png b/graphics/text_window/12.png new file mode 100644 index 000000000..8bff592ba Binary files /dev/null and b/graphics/text_window/12.png differ diff --git a/graphics/text_window/13.png b/graphics/text_window/13.png new file mode 100644 index 000000000..706d13451 Binary files /dev/null and b/graphics/text_window/13.png differ diff --git a/graphics/text_window/14.png b/graphics/text_window/14.png new file mode 100644 index 000000000..d50862250 Binary files /dev/null and b/graphics/text_window/14.png differ diff --git a/graphics/text_window/15.png b/graphics/text_window/15.png new file mode 100644 index 000000000..b5d2dbfcd Binary files /dev/null and b/graphics/text_window/15.png differ diff --git a/graphics/text_window/16.png b/graphics/text_window/16.png new file mode 100644 index 000000000..eb8ed2cea Binary files /dev/null and b/graphics/text_window/16.png differ diff --git a/graphics/text_window/17.png b/graphics/text_window/17.png new file mode 100644 index 000000000..62211b431 Binary files /dev/null and b/graphics/text_window/17.png differ diff --git a/graphics/text_window/18.png b/graphics/text_window/18.png new file mode 100644 index 000000000..c03fd75f5 Binary files /dev/null and b/graphics/text_window/18.png differ diff --git a/graphics/text_window/19.png b/graphics/text_window/19.png new file mode 100644 index 000000000..e60d8d579 Binary files /dev/null and b/graphics/text_window/19.png differ diff --git a/graphics/text_window/2.png b/graphics/text_window/2.png new file mode 100644 index 000000000..5e89b4116 Binary files /dev/null and b/graphics/text_window/2.png differ diff --git a/graphics/text_window/20.png b/graphics/text_window/20.png new file mode 100644 index 000000000..5786ae140 Binary files /dev/null and b/graphics/text_window/20.png differ diff --git a/graphics/text_window/3.png b/graphics/text_window/3.png new file mode 100644 index 000000000..b7af18de7 Binary files /dev/null and b/graphics/text_window/3.png differ diff --git a/graphics/text_window/4.png b/graphics/text_window/4.png new file mode 100644 index 000000000..c33ed48af Binary files /dev/null and b/graphics/text_window/4.png differ diff --git a/graphics/text_window/5.png b/graphics/text_window/5.png new file mode 100644 index 000000000..94a0bcdd9 Binary files /dev/null and b/graphics/text_window/5.png differ diff --git a/graphics/text_window/6.png b/graphics/text_window/6.png new file mode 100644 index 000000000..a0be4e49d Binary files /dev/null and b/graphics/text_window/6.png differ diff --git a/graphics/text_window/7.png b/graphics/text_window/7.png new file mode 100644 index 000000000..514f8b554 Binary files /dev/null and b/graphics/text_window/7.png differ diff --git a/graphics/text_window/8.png b/graphics/text_window/8.png new file mode 100644 index 000000000..480751a02 Binary files /dev/null and b/graphics/text_window/8.png differ diff --git a/graphics/text_window/9.png b/graphics/text_window/9.png new file mode 100644 index 000000000..7ac3ba811 Binary files /dev/null and b/graphics/text_window/9.png differ diff --git a/graphics/text_window/message_box.png b/graphics/text_window/message_box.png new file mode 100644 index 000000000..edc2d3d3a Binary files /dev/null and b/graphics/text_window/message_box.png differ diff --git a/graphics/text_window/text_pal1.pal b/graphics/text_window/text_pal1.pal new file mode 100644 index 000000000..df5d3c337 --- /dev/null +++ b/graphics/text_window/text_pal1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +255 255 255 +205 205 222 +205 205 222 +230 246 255 +205 205 222 +106 115 123 diff --git a/graphics/text_window/text_pal2.pal b/graphics/text_window/text_pal2.pal new file mode 100644 index 000000000..25f63978a --- /dev/null +++ b/graphics/text_window/text_pal2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +255 255 255 +74 205 238 +49 164 238 +0 90 131 +24 98 197 +16 115 230 diff --git a/graphics/text_window/text_pal3.pal b/graphics/text_window/text_pal3.pal new file mode 100644 index 000000000..9cbcdad4c --- /dev/null +++ b/graphics/text_window/text_pal3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +255 0 255 +205 213 213 +156 205 222 +98 115 123 +65 172 230 +131 164 180 diff --git a/graphics/text_window/text_pal4.pal b/graphics/text_window/text_pal4.pal new file mode 100644 index 000000000..a004a081a --- /dev/null +++ b/graphics/text_window/text_pal4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +57 98 115 +131 131 131 +164 164 164 +197 197 205 +230 230 238 +65 90 106 diff --git a/graphics/trainer_card/badges.png b/graphics/trainer_card/badges.png new file mode 100644 index 000000000..d06cfbe8a Binary files /dev/null and b/graphics/trainer_card/badges.png differ diff --git a/graphics/trainer_card/badges_fr.png b/graphics/trainer_card/badges_fr.png new file mode 100644 index 000000000..29a675e19 Binary files /dev/null and b/graphics/trainer_card/badges_fr.png differ diff --git a/graphics/trainer_card/female_bg.pal b/graphics/trainer_card/female_bg.pal new file mode 100644 index 000000000..9df82c665 --- /dev/null +++ b/graphics/trainer_card/female_bg.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +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 +230 123 139 +164 49 115 +0 0 0 +0 0 0 diff --git a/graphics/trainer_card/female_bg_fr.pal b/graphics/trainer_card/female_bg_fr.pal new file mode 100644 index 000000000..3e8a3ab52 --- /dev/null +++ b/graphics/trainer_card/female_bg_fr.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 98 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +189 148 16 +255 213 82 +230 148 82 +213 98 41 +197 197 197 +90 90 90 diff --git a/graphics/trainer_card/four_stars.pal b/graphics/trainer_card/four_stars.pal new file mode 100644 index 000000000..4e1d56b54 --- /dev/null +++ b/graphics/trainer_card/four_stars.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +246 246 222 +246 238 172 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +246 230 139 +230 213 49 +213 197 57 +156 115 57 +106 189 255 +205 205 205 +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 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/trainer_card/four_stars_fr.pal b/graphics/trainer_card/four_stars_fr.pal new file mode 100644 index 000000000..79027f0d8 --- /dev/null +++ b/graphics/trainer_card/four_stars_fr.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +255 246 230 +246 238 213 +246 246 197 +246 238 180 +246 222 106 +164 164 164 +98 98 115 +255 255 148 +246 222 49 +246 205 8 +238 189 0 +189 148 57 +255 255 197 +255 255 255 +246 230 82 +139 98 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +189 148 16 +255 213 82 +82 205 180 +65 172 164 +197 197 197 +90 90 90 +0 0 0 +32 65 123 +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 +0 0 0 diff --git a/graphics/trainer_card/gold.pal b/graphics/trainer_card/gold.pal new file mode 100644 index 000000000..ebd175e97 --- /dev/null +++ b/graphics/trainer_card/gold.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 98 115 +246 197 0 +205 164 0 +246 197 0 +246 197 0 +246 197 0 +246 197 0 +246 197 0 +0 0 0 +0 0 0 +189 148 16 +255 213 82 +0 0 0 +0 0 0 +189 148 16 +246 197 0 diff --git a/graphics/trainer_card/one_star.pal b/graphics/trainer_card/one_star.pal new file mode 100644 index 000000000..62c51c91f --- /dev/null +++ b/graphics/trainer_card/one_star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +238 255 246 +213 238 230 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +189 213 205 +148 180 164 +106 148 123 +65 115 90 +106 189 255 +205 205 205 +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 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/trainer_card/one_star_fr.pal b/graphics/trainer_card/one_star_fr.pal new file mode 100644 index 000000000..9215c7592 --- /dev/null +++ b/graphics/trainer_card/one_star_fr.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +222 255 230 +205 246 222 +197 238 213 +189 230 205 +246 205 148 +164 164 164 +98 98 115 +246 213 139 +180 205 148 +131 180 172 +115 156 156 +82 131 123 +255 246 189 +255 255 255 +156 205 197 +139 98 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +189 148 16 +255 213 82 +82 205 180 +65 172 164 +197 197 197 +90 90 90 +0 0 0 +32 65 123 +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 +0 0 0 diff --git a/graphics/trainer_card/stickers_fr.png b/graphics/trainer_card/stickers_fr.png new file mode 100644 index 000000000..12a67a30f Binary files /dev/null and b/graphics/trainer_card/stickers_fr.png differ diff --git a/graphics/trainer_card/stickers_fr1.pal b/graphics/trainer_card/stickers_fr1.pal new file mode 100644 index 000000000..774dbb486 --- /dev/null +++ b/graphics/trainer_card/stickers_fr1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 246 189 +255 255 255 +255 197 164 +238 246 246 +222 222 230 +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/trainer_card/stickers_fr2.pal b/graphics/trainer_card/stickers_fr2.pal new file mode 100644 index 000000000..9244e4a03 --- /dev/null +++ b/graphics/trainer_card/stickers_fr2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 246 189 +255 255 255 +98 197 238 +238 246 246 +222 222 230 +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/trainer_card/stickers_fr3.pal b/graphics/trainer_card/stickers_fr3.pal new file mode 100644 index 000000000..abe9e9206 --- /dev/null +++ b/graphics/trainer_card/stickers_fr3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 246 189 +255 255 255 +246 230 74 +238 246 246 +222 222 230 +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/trainer_card/stickers_fr4.pal b/graphics/trainer_card/stickers_fr4.pal new file mode 100644 index 000000000..422e986b1 --- /dev/null +++ b/graphics/trainer_card/stickers_fr4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 246 189 +255 255 255 +106 131 148 +238 246 246 +222 222 230 +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/trainer_card/three_stars.pal b/graphics/trainer_card/three_stars.pal new file mode 100644 index 000000000..21f3d83eb --- /dev/null +++ b/graphics/trainer_card/three_stars.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +246 246 255 +230 230 238 +189 189 197 +156 156 156 +156 106 41 +41 57 65 +57 106 139 +65 139 197 +230 230 238 +189 189 197 +156 156 156 +123 123 123 +106 189 255 +205 205 205 +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 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/trainer_card/three_stars_fr.pal b/graphics/trainer_card/three_stars_fr.pal new file mode 100644 index 000000000..e984eab42 --- /dev/null +++ b/graphics/trainer_card/three_stars_fr.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +238 246 246 +238 246 246 +238 238 238 +230 230 230 +246 205 148 +164 164 164 +98 98 115 +255 238 131 +205 205 164 +197 205 205 +172 180 172 +131 139 156 +246 246 197 +255 255 255 +213 222 222 +139 98 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +189 148 16 +255 213 82 +82 205 180 +65 172 164 +197 197 197 +90 90 90 +0 0 0 +32 65 123 +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 +0 0 0 diff --git a/graphics/trainer_card/two_stars.pal b/graphics/trainer_card/two_stars.pal new file mode 100644 index 000000000..bacce54f5 --- /dev/null +++ b/graphics/trainer_card/two_stars.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +255 246 230 +246 230 213 +205 156 90 +180 131 65 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +230 189 139 +205 156 115 +180 131 82 +156 106 41 +106 189 255 +205 205 205 +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 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/trainer_card/two_stars_fr.pal b/graphics/trainer_card/two_stars_fr.pal new file mode 100644 index 000000000..748e17aa8 --- /dev/null +++ b/graphics/trainer_card/two_stars_fr.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +246 246 205 +246 238 197 +238 230 189 +230 222 156 +246 205 148 +164 164 164 +98 98 115 +246 238 139 +222 197 139 +213 189 139 +197 180 123 +164 123 82 +255 255 205 +255 255 255 +230 205 156 +139 98 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +189 148 16 +255 213 82 +82 205 180 +65 172 164 +197 197 197 +90 90 90 +0 0 0 +32 65 123 +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 +0 0 0 diff --git a/graphics/trainer_card/unknown_56F18C.pal b/graphics/trainer_card/unknown_56F18C.pal new file mode 100644 index 000000000..25a3ac1d2 --- /dev/null +++ b/graphics/trainer_card/unknown_56F18C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 218ef68d7..efe38fbae 100755 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -21,9 +21,9 @@ extern const u8 gBirchHelpGfx[]; extern const u8 gBirchBagTilemap[]; extern const u8 gBirchGrassTilemap[]; extern const u16 gBirchBagGrassPal[]; -extern const u16 gUnknown_0850FEFC[]; +extern const u16 gTextWindowFrame1_Pal[]; extern const u16 gUnknown_0860F074[]; -extern const u32 gUnknown_0850E87C[]; +extern const u32 gTextWindowFrame1_Gfx[]; extern struct SaveSection gSaveDataBuffer; extern u8 gText_SaveFailedCheckingBackup[]; @@ -226,7 +226,7 @@ static void CB2_SaveFailedScreen(void) InitBgsFromTemplates(0, gUnknown_085EFD88, 3); SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]); CpuFill32(0, &gDecompressionBuffer[0x2000], 0x800); - LoadBgTiles(0, gUnknown_0850E87C, 0x120, 0x214); + LoadBgTiles(0, gTextWindowFrame1_Gfx, 0x120, 0x214); InitWindows(gUnknown_085EFD94); // AddWindowWithoutTileMap returns a u16/integer, but the info is clobbered into a u8 here resulting in lost info. Bug? gSaveFailedWindowIds[TEXT_WIN_ID] = AddWindowWithoutTileMap(gUnknown_085EFD9C); @@ -239,7 +239,7 @@ static void CB2_SaveFailedScreen(void) ResetPaletteFade(); LoadPalette(gBirchBagGrassPal, 0, 0x40); LoadPalette(sSaveFailedClockPal, 0x100, 0x20); - LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20); + LoadPalette(gTextWindowFrame1_Pal, 0xE0, 0x20); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); SetWindowBorderStyle(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE); diff --git a/src/text_window.c b/src/text_window.c index 336536c04..c5334b11e 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -8,7 +8,7 @@ extern u8 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset); extern void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); extern const struct TilesPal gUnknown_0851021C[]; -extern const u32 gUnknown_08DDD748[]; +extern const u32 gMessageBox_Gfx[]; extern const u16 gUnknown_0851017C[]; extern const u16 gUnknown_08DDD728[]; @@ -22,7 +22,7 @@ const struct TilesPal* sub_8098758(u8 id) void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset) { - LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gUnknown_08DDD748, 0x1C0, destOffset); + LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gMessageBox_Gfx, 0x1C0, destOffset); LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20); }