diff options
| -rwxr-xr-x | asm/party_menu.s | 18 | ||||
| -rw-r--r-- | data/party_menu.s | 543 | ||||
| -rw-r--r-- | data/strings.s | 34 | ||||
| -rw-r--r-- | graphics/interface/hold_icons.png | bin | 0 -> 177 bytes | |||
| -rw-r--r-- | graphics/interface/unknown_6157C4.bin | 1 | ||||
| -rw-r--r-- | graphics/interface/unknown_6157E0.bin | 2 |
6 files changed, 487 insertions, 111 deletions
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/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_08615810:: @ 8615810 - .incbin "baserom.gba", 0x615810, 0x40 +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 + 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 -gUnknown_08615F70:: @ 8615F70 - .incbin "baserom.gba", 0x615f70, 0x8 + .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 -gUnknown_08615F78:: @ 8615F78 - .incbin "baserom.gba", 0x615f78, 0x80 + .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 + obj_tiles gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1 + + .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/graphics/interface/hold_icons.png b/graphics/interface/hold_icons.png Binary files differnew file mode 100644 index 000000000..53eeedde3 --- /dev/null +++ b/graphics/interface/hold_icons.png 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 |
