diff options
40 files changed, 2334 insertions, 567 deletions
diff --git a/asm/rom_81370FC.s b/asm/rom_81370FC.s index 02d8fb350..d2d770472 100644 --- a/asm/rom_81370FC.s +++ b/asm/rom_81370FC.s @@ -5214,7 +5214,7 @@ sub_8139B60: @ 8139B60 movs r1, 0x1 adds r2, r4, 0 bl PrintTextOnWindow - ldr r6, =gUnknown_085B2BB4 + ldr r6, =gElevatorFloorsTable ldr r4, =gSpecialVar_0x8005 ldrh r0, [r4] lsls r0, 2 diff --git a/data/battle_records.s b/data/battle_records.s new file mode 100644 index 000000000..22c487e4c --- /dev/null +++ b/data/battle_records.s @@ -0,0 +1,37 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_085B3484:: @ 85B3484 + .incbin "graphics/unknown/unknown_5B3484.4bpp" + + .align 2 +gUnknown_085B3544:: @ 85B3544 + .incbin "graphics/unknown/unknown_5B3484.gbapal" + + .align 2 +gUnknown_085B3564:: @ 85B3564 + .incbin "graphics/unknown/unknown_5B3564.bin" + + .align 2 +gUnknown_085B3D64:: @ 85B3D64 + .4byte 0x000001f0, 0x000031e7 + + .align 2 +gUnknown_085B3D6C:: @ 85B3D6C + window_template 0x00, 0x02, 0x01, 0x1a, 0x12, 0x0f, 0x0014 + window_template_terminator + + .align 2 +gUnknown_085B3D7C:: @ 85B3D7C + window_template 0x00, 0x02, 0x01, 0x1a, 0x11, 0x0f, 0x0001 + +gUnknown_085B3D84:: @ 85B3D84 + .string "-------$" + +gUnknown_085B3D8C:: @ 85B3D8C + .string "----$" + diff --git a/data/coord_event_weather.s b/data/coord_event_weather.s index 907a7c09f..c7b995912 100644 --- a/data/coord_event_weather.s +++ b/data/coord_event_weather.s @@ -5,4 +5,17 @@ .align 2, 0 gUnknown_085102E0:: @ 85102E0 - .incbin "baserom.gba", 0x5102e0, 0x68 + .4byte 0x00000001, sub_809D7BC + .4byte 0x00000002, sub_809D7C8 + .4byte 0x00000003, sub_809D7D4 + .4byte 0x00000004, sub_809D7E0 + .4byte 0x00000005, sub_809D7EC + .4byte 0x00000006, sub_809D7F8 + .4byte 0x00000007, sub_809D804 + .4byte 0x00000008, sub_809D810 + .4byte 0x00000009, sub_809D81C + .4byte 0x0000000a, sub_809D828 + .4byte 0x0000000b, sub_809D834 + .4byte 0x00000014, sub_809D840 + .4byte 0x00000015, sub_809D84C + diff --git a/data/data4.s b/data/data4.s deleted file mode 100644 index a49cebbe6..000000000 --- a/data/data4.s +++ /dev/null @@ -1,18 +0,0 @@ -@ the fourth big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -.align 2 - -gUnknown_085B09E4:: @ 85B09E4 - .incbin "baserom.gba", 0x5b09e4, 0x10 - -gUnknown_085B09F4:: @ 85B09F4 - .incbin "baserom.gba", 0x5b09f4, 0x4 - -gUnknown_085B09F8:: @ 85B09F8 - .incbin "baserom.gba", 0x5b09f8, 0x8 - diff --git a/data/data4d.s b/data/data4d.s index 57dc8befc..cbf109f67 100644 --- a/data/data4d.s +++ b/data/data4d.s @@ -1,268 +1,9 @@ -@ the fourth big chunk of data .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata -gUnknown_085B27C8:: @ 85B27C8 - .incbin "baserom.gba", 0x5b27c8, 0x88 - -gUnknown_085B2850:: @ 85B2850 - .incbin "baserom.gba", 0x5b2850, 0x20 - -gUnknown_085B2870:: @ 85B2870 - .incbin "baserom.gba", 0x5b2870, 0x20 - -gUnknown_085B2890:: @ 85B2890 - .incbin "baserom.gba", 0x5b2890, 0x10 - -gUnknown_085B28A0:: @ 85B28A0 - .incbin "baserom.gba", 0x5b28a0, 0x10 - -gUnknown_085B28B0:: @ 85B28B0 - .incbin "baserom.gba", 0x5b28b0, 0x1e0 - -gUnknown_085B2A90:: @ 85B2A90 - .incbin "baserom.gba", 0x5b2a90, 0xb4 - -gUnknown_085B2B44:: @ 85B2B44 - .incbin "baserom.gba", 0x5b2b44, 0x18 - -gUnknown_085B2B5C:: @ 85B2B5C - .incbin "baserom.gba", 0x5b2b5c, 0x4 - -gUnknown_085B2B60:: @ 85B2B60 - .incbin "baserom.gba", 0x5b2b60, 0x8 - -gUnknown_085B2B68:: @ 85B2B68 - .incbin "baserom.gba", 0x5b2b68, 0x10 - -gUnknown_085B2B78:: @ 85B2B78 - .incbin "baserom.gba", 0x5b2b78, 0x6 - -gUnknown_085B2B7E:: @ 85B2B7E - .incbin "baserom.gba", 0x5b2b7e, 0xa - -gUnknown_085B2B88:: @ 85B2B88 - .incbin "baserom.gba", 0x5b2b88, 0xc - -gUnknown_085B2B94:: @ 85B2B94 - .incbin "baserom.gba", 0x5b2b94, 0xc - -gUnknown_085B2BA0:: @ 85B2BA0 - .incbin "baserom.gba", 0x5b2ba0, 0xc - -gUnknown_085B2BAC:: @ 85B2BAC - .incbin "baserom.gba", 0x5b2bac, 0x8 - -gUnknown_085B2BB4:: @ 85B2BB4 - .incbin "baserom.gba", 0x5b2bb4, 0x40 - -gUnknown_085B2BF4:: @ 85B2BF4 - .incbin "baserom.gba", 0x5b2bf4, 0x12 - -gUnknown_085B2C06:: @ 85B2C06 - .incbin "baserom.gba", 0x5b2c06, 0x12 - -gUnknown_085B2C18:: @ 85B2C18 - .incbin "baserom.gba", 0x5b2c18, 0x9 - -gUnknown_085B2C21:: @ 85B2C21 - .incbin "baserom.gba", 0x5b2c21, 0x9 - -gUnknown_085B2C2A:: @ 85B2C2A - .incbin "baserom.gba", 0x5b2c2a, 0x26 - -gUnknown_085B2C50:: @ 85B2C50 - .incbin "baserom.gba", 0x5b2c50, 0x78 - -gUnknown_085B2CC8:: @ 85B2CC8 - .incbin "baserom.gba", 0x5b2cc8, 0x14 - -gUnknown_085B2CDC:: @ 85B2CDC - .incbin "baserom.gba", 0x5b2cdc, 0x14 - -gUnknown_085B2CF0:: @ 85B2CF0 - .incbin "baserom.gba", 0x5b2cf0, 0x340 - -gUnknown_085B3030:: @ 85B3030 - .incbin "baserom.gba", 0x5b3030, 0x10 - -gUnknown_085B3040:: @ 85B3040 - .incbin "baserom.gba", 0x5b3040, 0x64 - -gUnknown_085B30A4:: @ 85B30A4 - .incbin "baserom.gba", 0x5b30a4, 0x30 - -gUnknown_085B30D4:: @ 85B30D4 - .incbin "baserom.gba", 0x5b30d4, 0x30 - -gUnknown_085B3104:: @ 85B3104 - .incbin "baserom.gba", 0x5b3104, 0x18 - -gUnknown_085B311C:: @ 85B311C - .incbin "baserom.gba", 0x5b311c, 0x8 - -gUnknown_085B3124:: @ 85B3124 - .incbin "baserom.gba", 0x5b3124, 0x8 - -gUnknown_085B312C:: @ 85B312C - .incbin "baserom.gba", 0x5b312c, 0x16 - -gUnknown_085B3142:: @ 85B3142 - .incbin "baserom.gba", 0x5b3142, 0xc - -gUnknown_085B314E:: @ 85B314E - .incbin "baserom.gba", 0x5b314e, 0xe - -gUnknown_085B315C:: @ 85B315C - .incbin "baserom.gba", 0x5b315c, 0x14 - -gUnknown_085B3170:: @ 85B3170 - .incbin "baserom.gba", 0x5b3170, 0x2c - -gUnknown_085B319C:: @ 85B319C - .incbin "baserom.gba", 0x5b319c, 0x18 - -gUnknown_085B31B4:: @ 85B31B4 - .incbin "baserom.gba", 0x5b31b4, 0x1c - -gUnknown_085B31D0:: @ 85B31D0 - .incbin "baserom.gba", 0x5b31d0, 0x28 - -gUnknown_085B31F8:: @ 85B31F8 - .incbin "baserom.gba", 0x5b31f8, 0x14 - -gUnknown_085B320C:: @ 85B320C - .incbin "baserom.gba", 0x5b320c, 0x14 - -gUnknown_085B3220:: @ 85B3220 - .incbin "baserom.gba", 0x5b3220, 0x8 - -gUnknown_085B3228:: @ 85B3228 - .incbin "baserom.gba", 0x5b3228, 0x2c - -gUnknown_085B3254:: @ 85B3254 - .incbin "baserom.gba", 0x5b3254, 0x2c - -gUnknown_085B3280:: @ 85B3280 - .incbin "baserom.gba", 0x5b3280, 0x160 - -gUnknown_085B33E0:: @ 85B33E0 - .incbin "baserom.gba", 0x5b33e0, 0x16 - -gUnknown_085B33F6:: @ 85B33F6 - .incbin "baserom.gba", 0x5b33f6, 0xa - -gUnknown_085B3400:: @ 85B3400 - .incbin "baserom.gba", 0x5b3400, 0x10 - -gUnknown_085B3410:: @ 85B3410 - .incbin "baserom.gba", 0x5b3410, 0x10 - -gUnknown_085B3420:: @ 85B3420 - .incbin "baserom.gba", 0x5b3420, 0x24 - -gUnknown_085B3444:: @ 85B3444 - .incbin "baserom.gba", 0x5b3444, 0x2c - -gUnknown_085B3470:: @ 85B3470 - .incbin "baserom.gba", 0x5b3470, 0x4 - -gUnknown_085B3474:: @ 85B3474 - .incbin "baserom.gba", 0x5b3474, 0x8 - -gUnknown_085B347C:: @ 85B347C - .incbin "baserom.gba", 0x5b347c, 0x8 - -gUnknown_085B3484:: @ 85B3484 - .incbin "baserom.gba", 0x5b3484, 0xc0 - -gUnknown_085B3544:: @ 85B3544 - .incbin "baserom.gba", 0x5b3544, 0x20 - -gUnknown_085B3564:: @ 85B3564 - .incbin "baserom.gba", 0x5b3564, 0x800 - -gUnknown_085B3D64:: @ 85B3D64 - .incbin "baserom.gba", 0x5b3d64, 0x8 - -gUnknown_085B3D6C:: @ 85B3D6C - .incbin "baserom.gba", 0x5b3d6c, 0x10 - -gUnknown_085B3D7C:: @ 85B3D7C - .incbin "baserom.gba", 0x5b3d7c, 0x8 - -gUnknown_085B3D84:: @ 85B3D84 - .incbin "baserom.gba", 0x5b3d84, 0x8 - -gUnknown_085B3D8C:: @ 85B3D8C - .incbin "baserom.gba", 0x5b3d8c, 0x8 - -gUnknown_085B3D94:: @ 85B3D94 - .incbin "baserom.gba", 0x5b3d94, 0x20 - -gUnknown_085B3DB4:: @ 85B3DB4 - .incbin "baserom.gba", 0x5b3db4, 0x134 - -gUnknown_085B3EE8:: @ 85B3EE8 - .incbin "baserom.gba", 0x5b3ee8, 0x2 - -gUnknown_085B3EEA:: @ 85B3EEA - .incbin "baserom.gba", 0x5b3eea, 0x6 - -gUnknown_085B3EF0:: @ 85B3EF0 - .incbin "baserom.gba", 0x5b3ef0, 0xc - -gUnknown_085B3EFC:: @ 85B3EFC - .incbin "baserom.gba", 0x5b3efc, 0x1c - -gUnknown_085B3F18:: @ 85B3F18 - .incbin "baserom.gba", 0x5b3f18, 0x100 - -gUnknown_085B4018:: @ 85B4018 - .incbin "baserom.gba", 0x5b4018, 0x4 - -gUnknown_085B401C:: @ 85B401C - .incbin "baserom.gba", 0x5b401c, 0x8 - -gUnknown_085B4024:: @ 85B4024 - .incbin "baserom.gba", 0x5b4024, 0x10 - -gUnknown_085B4034:: @ 85B4034 - .incbin "baserom.gba", 0x5b4034, 0xb8 - -gUnknown_085B40EC:: @ 85B40EC - .incbin "baserom.gba", 0x5b40ec, 0x10 - -gUnknown_085B40FC:: @ 85B40FC - .incbin "baserom.gba", 0x5b40fc, 0x38 - -gUnknown_085B4134:: @ 85B4134 - .incbin "baserom.gba", 0x5b4134, 0x6f8 - -gUnknown_085B482C:: @ 85B482C - .incbin "baserom.gba", 0x5b482c, 0x4e4 - -gUnknown_085B4D10:: @ 85B4D10 - .incbin "baserom.gba", 0x5b4d10, 0x4d4 - -gUnknown_085B51E4:: @ 85B51E4 - .incbin "baserom.gba", 0x5b51e4, 0x6a0 - -gUnknown_085B5884:: @ 85B5884 - .incbin "baserom.gba", 0x5b5884, 0x40 - -gText_ShedinjaJapaneseName2:: @ 85B58C4 - .incbin "baserom.gba", 0x5b58c4, 0x5 - -gUnknown_085B58C9:: @ 85B58C9 - .incbin "baserom.gba", 0x5b58c9, 0x10 - -gUnknown_085B58D9:: @ 85B58D9 - .incbin "baserom.gba", 0x5b58d9, 0x323 - gUnknown_085B5BFC:: @ 85B5BFC .incbin "baserom.gba", 0x5b5bfc, 0x200 diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s new file mode 100644 index 000000000..46d35924c --- /dev/null +++ b/data/pokedex_area_screen.s @@ -0,0 +1,79 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_085B3D94:: @ 85B3D94 + .incbin "graphics/unknown/unknown_5B3D94.gbapal" + + .align 2 +gUnknown_085B3DB4:: @ 85B3DB4 + .incbin "graphics/unknown/unknown_5B3DB4.4bpp.lz" + + .align 1 +gUnknown_085B3EE8:: @ 85B3EE8 + .2byte 0x0168 + + .align 1 +gUnknown_085B3EEA:: @ 85B3EEA + .2byte 0x00cb, 0x00cc, 0x00cd + + .align 1 +gUnknown_085B3EF0:: @ 85B3EF0 + .2byte 0x0148, 0x0000, 0x0022, 0x019c, 0x0000, 0x0000 + + .align 1 +gUnknown_085B3EFC:: @ 85B3EFC + .2byte 0x0055, 0x08be, 0x0044, 0x08a7, 0x00d2, 0x08dd, 0x00c7, 0x0078, 0x00d1, 0x08de, 0x00ca, 0x08df, 0x00d5, 0x0000 + +gUnknown_085B3F18:: @ 85B3F18 + .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x11, 0x20, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + .byte 0x12, 0x21, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x13, 0x22, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + .byte 0x14, 0x01, 0x23, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x15, 0x20, 0x23, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + .byte 0x16, 0x21, 0x23, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x17, 0x22, 0x23, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + .byte 0x18, 0x01, 0x24, 0x03, 0x04, 0x05, 0x06, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x19, 0x20, 0x24, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + .byte 0x1a, 0x21, 0x24, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1b, 0x22, 0x24, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + .byte 0x1c, 0x01, 0x25, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1d, 0x20, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + .byte 0x1e, 0x21, 0x25, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1f, 0x22, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + + .align 2 +gUnknown_085B4018:: @ 85B4018 + .4byte 0x00002003 + + .align 2 +gUnknown_085B401C:: @ 85B401C + obj_tiles gUnknown_085B406C, 0x0080, 0x0002 + + .align 2 +gUnknown_085B4024:: @ 85B4024 + obj_pal gUnknown_085B404C, 0x0002 + + .align 2 +gUnknown_085B402C:: @ 85B402C + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00 + + .align 2 +gUnknown_085B4034:: @ 85B4034 + spr_template 0x0002, 0x0002, gUnknown_085B402C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_085B404C:: @ 85B404C + .incbin "graphics/unknown/unknown_5B404C.gbapal" + + .align 2 +gUnknown_085B406C:: @ 85B406C + .incbin "graphics/unknown/unknown_5B406C.4bpp" + + .align 2 +gUnknown_085B40EC:: @ 85B40EC + obj_pal gUnknown_08DC4120, 0x0003 + + .align 2 +gUnknown_085B40F4:: @ 85B40F4 + .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x04, 0x00, 0x00 + + .align 2 +gUnknown_085B40FC:: @ 85B40FC + spr_template 0x0003, 0x0003, gUnknown_085B40F4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/rom_81370FC.s b/data/rom_81370FC.s new file mode 100644 index 000000000..2cd824d44 --- /dev/null +++ b/data/rom_81370FC.s @@ -0,0 +1,613 @@ +@ the fourth big chunk of data + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_085B27C8:: @ 85B27C8 + .byte 0x01, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + .byte 0x02, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + .byte 0x03, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + .byte 0x05, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + .byte 0x06, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + .byte 0x07, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + .byte 0x08, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + .byte 0x09, 0x04, 0x01, 0x00 + .4byte sub_81375A8 + .byte 0x04, 0x01, 0x00, 0x01 + .4byte sub_81373F0 + .byte 0x04, 0x02, 0x00, 0x01 + .4byte sub_81373F0 + .byte 0x04, 0x03, 0x00, 0x01 + .4byte sub_81373F0 + .byte 0x04, 0x05, 0x00, 0x01 + .4byte sub_81373F0 + .byte 0x04, 0x06, 0x00, 0x01 + .4byte sub_81373F0 + .byte 0x04, 0x07, 0x00, 0x01 + .4byte sub_81373F0 + .byte 0x04, 0x08, 0x00, 0x01 + .4byte sub_81373F0 + .byte 0x04, 0x09, 0x00, 0x01 + .4byte sub_81373F0 + .byte 0x00, 0x00, 0x00, 0x00 + .4byte NULL + + .align 2 +gUnknown_085B2850:: @ 85B2850 + .incbin "graphics/unknown/unknown_5B2850.gbapal" + + .align 2 +gUnknown_085B2870:: @ 85B2870 + .incbin "graphics/unknown/unknown_5B2870.gbapal" + + .align 2 +gUnknown_085B2890:: @ 85B2890 + .incbin "graphics/unknown/unknown_5B2890.gbapal" + + .align 2 +gUnknown_085B28A0:: @ 85B28A0 + .incbin "graphics/unknown/unknown_5B28A0.gbapal" + + .align 2 +gUnknown_085B28B0:: @ 85B28B0 + .incbin "graphics/unknown/unknown_5B28B0.bin.lz" + + .align 2 +gUnknown_085B2A90:: @ 85B2A90 + .incbin "graphics/unknown/unknown_5B2A90.4bpp.lz" + +gUnknown_085B2B44:: @ 85B2B44 + .byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01 + + .align 2 +gUnknown_085B2B5C:: @ 85B2B5C + .byte 0x07, 0x09, 0x08, 0x0a + + .align 2 +gUnknown_085B2B60:: @ 85B2B60 + .byte 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00 + +gUnknown_085B2B68:: @ 85B2B68 + .byte 0x07, 0x16, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0a, 0x10, 0x00, 0x00, 0x0f, 0x10, 0x00, 0x00 + +gUnknown_085B2B78:: @ 85B2B78 + .byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x00 + + .align 1 +gUnknown_085B2B7E:: @ 85B2B7E + .2byte 0x0218, 0x0219, 0x021a, 0x021b, 0x021c + +gUnknown_085B2B88:: @ 85B2B88 + .byte 0x0c, 0x02, 0x04, 0x05, 0x01, 0x08, 0x07, 0x0b, 0x03, 0x0a, 0x09, 0x06 + +gUnknown_085B2B94:: @ 85B2B94 + .byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x05 + +gUnknown_085B2BA0:: @ 85B2BA0 + .byte 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05 + + .align 2 +gUnknown_085B2BAC:: @ 85B2BAC + .byte 0x00, 0x15, 0x01, 0x08, 0x04, 0x0f, 0x08, 0x00 + + .align 2 +gElevatorFloorsTable:: @ 85B2BB4 + .4byte gText_B4F + .4byte gText_B3F + .4byte gText_B2F + .4byte gText_B1F + .4byte gText_1F + .4byte gText_2F + .4byte gText_3F + .4byte gText_4F + .4byte gText_5F + .4byte gText_6F + .4byte gText_7F + .4byte gText_8F + .4byte gText_9F + .4byte gText_10F + .4byte gText_11F + .4byte gText_Rooftop + + .align 1 +gUnknown_085B2BF4:: @ 85B2BF4 + .2byte 0x0329, 0x032a, 0x032b, 0x0331, 0x0332, 0x0333, 0x0339, 0x033a, 0x033b + + .align 1 +gUnknown_085B2C06:: @ 85B2C06 + .2byte 0x0329, 0x032b, 0x032a, 0x0331, 0x0333, 0x0332, 0x0339, 0x033b, 0x033a + +gUnknown_085B2C18:: @ 85B2C18 + .byte 0x08, 0x10, 0x18, 0x20, 0x26, 0x2e, 0x34, 0x38, 0x39 + +gUnknown_085B2C21:: @ 85B2C21 + .byte 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15, 0x18, 0x1b + + .align 1 +gUnknown_085B2C2A:: @ 85B2C2A + .2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a + .2byte 0x1a35, 0x193c, 0xffff + + .align 2 +gUnknown_085B2C50:: @ 85B2C50 + .4byte BattleFrontier_Lounge2_Text_260971 + .4byte BattleFrontier_Lounge2_Text_260A1E + .4byte BattleFrontier_Lounge2_Text_260AE7 + .4byte BattleFrontier_Lounge2_Text_2619AC + .4byte BattleFrontier_Lounge2_Text_261A91 + .4byte BattleFrontier_Lounge2_Text_261B0C + .4byte BattleFrontier_Lounge2_Text_261B95 + .4byte BattleFrontier_Lounge2_Text_261B95 + .4byte BattleFrontier_Lounge2_Text_261B95 + .4byte BattleFrontier_Lounge2_Text_261C1A + .4byte BattleFrontier_Lounge2_Text_261C1A + .4byte BattleFrontier_Lounge2_Text_261C1A + .4byte BattleFrontier_Lounge2_Text_260BC4 + .4byte BattleFrontier_Lounge2_Text_260C6D + .4byte BattleFrontier_Lounge2_Text_260D3A + .4byte BattleFrontier_Lounge2_Text_260E1E + .4byte BattleFrontier_Lounge2_Text_260EC7 + .4byte BattleFrontier_Lounge2_Text_260F74 + .4byte BattleFrontier_Lounge2_Text_2614E6 + .4byte BattleFrontier_Lounge2_Text_261591 + .4byte BattleFrontier_Lounge2_Text_26166F + .4byte BattleFrontier_Lounge2_Text_261282 + .4byte BattleFrontier_Lounge2_Text_261329 + .4byte BattleFrontier_Lounge2_Text_261403 + .4byte BattleFrontier_Lounge2_Text_261026 + .4byte BattleFrontier_Lounge2_Text_2610CC + .4byte BattleFrontier_Lounge2_Text_261194 + .4byte BattleFrontier_Lounge2_Text_26174D + .4byte BattleFrontier_Lounge2_Text_2617F9 + .4byte BattleFrontier_Lounge2_Text_2618C4 + +gUnknown_085B2CC8:: @ 85B2CC8 + .byte 0x15, 0x38, 0x15, 0x23, 0xff, 0xff, 0xff, 0xff, 0x02, 0x04, 0x07, 0x15, 0x07, 0x15, 0x0e, 0x1c, 0x0d, 0x70, 0x07, 0x38 + + .align 1 +gUnknown_085B2CDC:: @ 85B2CDC + .2byte 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x0031, 0x003f, 0x004d, 0x005b, 0x0000 + + .align 2 +gUnknown_085B2CF0:: @ 85B2CF0 + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_BlueFlute + .4byte gText_YellowFlute + .4byte gText_RedFlute + .4byte gText_WhiteFlute + .4byte gText_BlackFlute + .4byte gText_PrettyChair + .4byte gText_PrettyDesk + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_0Pts + .4byte gText_10Pts + .4byte gText_20Pts + .4byte gText_30Pts + .4byte gText_40Pts + .4byte gText_50Pts + .4byte gText_60Pts + .4byte gText_70Pts + .4byte gText_80Pts + .4byte gText_90Pts + .4byte gText_100Pts + .4byte gText_QuestionMark + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_KissPoster16BP + .4byte gText_KissCushion32BP + .4byte gText_SmoochumDoll32BP + .4byte gText_TogepiDoll48BP + .4byte gText_MeowthDoll48BP + .4byte gText_ClefairyDoll48BP + .4byte gText_DittoDoll48BP + .4byte gText_CyndaquilDoll80BP + .4byte gText_ChikoritaDoll80BP + .4byte gText_TotodileDoll80BP + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_LaprasDoll128BP + .4byte gText_SnorlaxDoll128BP + .4byte gText_VenusaurDoll256BP + .4byte gText_CharizardDoll256BP + .4byte gText_BlastoiseDoll256BP + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_Protein1BP + .4byte gText_Calcium1BP + .4byte gText_Iron1BP + .4byte gText_Zinc1BP + .4byte gText_Carbos1BP + .4byte gText_HpUp1BP + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_Leftovers48BP + .4byte gText_WhiteHerb48BP + .4byte gText_QuickClaw48BP + .4byte gText_MentalHerb48BP + .4byte gText_BrightPowder64BP + .4byte gText_ChoiceBand64BP + .4byte gText_KingsRock64BP + .4byte gText_FocusBand64BP + .4byte gText_ScopeLens64BP + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_EnergyPowder50 + .4byte gText_EnergyRoot80 + .4byte gText_HealPowder50 + .4byte gText_RevivalHerb300 + .4byte gText_Protein1000 + .4byte gText_Iron1000 + .4byte gText_Carbos1000 + .4byte gText_Calcium1000 + .4byte gText_Zinc1000 + .4byte gText_HPUp1000 + .4byte gText_PPUp3000 + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_BattleTower2 + .4byte gText_BattleDome + .4byte gText_BattlePalace + .4byte gText_BattleArena + .4byte gText_BattleFactory + .4byte gText_BattlePike + .4byte gText_BattlePyramid + .4byte gText_RankingHall + .4byte gText_ExchangeService + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_Softboiled16BP + .4byte gText_SeismicToss24BP + .4byte gText_DreamEater24BP + .4byte gText_MegaPunch24BP + .4byte gText_MegaKick48BP + .4byte gText_BodySlam48BP + .4byte gText_RockSlide48BP + .4byte gText_Counter48BP + .4byte gText_ThunderWave48BP + .4byte gText_SwordsDance48BP + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_DefenseCurl16BP + .4byte gText_Snore24BP + .4byte gText_MudSlap24BP + .4byte gText_Swift24BP + .4byte gText_IcyWind24BP + .4byte gText_Endure48BP + .4byte gText_PsychUp48BP + .4byte gText_IcePunch48BP + .4byte gText_ThunderPunch48BP + .4byte gText_FirePunch48BP + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_SlateportCity + .4byte gText_BattleFrontier + .4byte gText_SouthernIsland + .4byte gText_NavelRock + .4byte gText_BirthIsland + .4byte gText_FarawayIsland + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .4byte gText_BattleTrainers + .4byte gText_BattleBasics + .4byte gText_PokemonNature + .4byte gText_PokemonMoves + .4byte gText_Underpowered + .4byte gText_WhenInDanger + .4byte gText_Exit + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + .4byte NULL + + .align 2 +gUnknown_085B3030:: @ 85B3030 + .4byte 0x03000002, 0x00000000, 0x07d00000, 0x00000064 + + .align 2 +gUnknown_085B3040:: @ 85B3040 + .4byte BattleFrontier_Lounge5_Text_26468D + .4byte BattleFrontier_Lounge5_Text_2646E5 + .4byte BattleFrontier_Lounge5_Text_264741 + .4byte BattleFrontier_Lounge5_Text_2647A4 + .4byte BattleFrontier_Lounge5_Text_2647FC + .4byte BattleFrontier_Lounge5_Text_264858 + .4byte BattleFrontier_Lounge5_Text_2648BE + .4byte BattleFrontier_Lounge5_Text_264916 + .4byte BattleFrontier_Lounge5_Text_264972 + .4byte BattleFrontier_Lounge5_Text_2649D5 + .4byte BattleFrontier_Lounge5_Text_264A3F + .4byte BattleFrontier_Lounge5_Text_264A9B + .4byte BattleFrontier_Lounge5_Text_264AF3 + .4byte BattleFrontier_Lounge5_Text_264B5D + .4byte BattleFrontier_Lounge5_Text_2648BE + .4byte BattleFrontier_Lounge5_Text_264BC3 + .4byte BattleFrontier_Lounge5_Text_264C36 + .4byte BattleFrontier_Lounge5_Text_2648BE + .4byte BattleFrontier_Lounge5_Text_264C95 + .4byte BattleFrontier_Lounge5_Text_264D01 + .4byte BattleFrontier_Lounge5_Text_264D6B + .4byte BattleFrontier_Lounge5_Text_264DD7 + .4byte BattleFrontier_Lounge5_Text_264E33 + .4byte BattleFrontier_Lounge5_Text_264E8F + .4byte BattleFrontier_Lounge5_Text_2648BE + + .align 2 +gUnknown_085B30A4:: @ 85B30A4 + .4byte BattleFrontier_Lounge3_Text_262261 + .4byte BattleFrontier_Lounge3_Text_26230D + .4byte BattleFrontier_Lounge3_Text_2623B9 + .4byte BattleFrontier_Lounge3_Text_262464 + .4byte BattleFrontier_Lounge3_Text_26250E + .4byte BattleFrontier_Lounge3_Text_2625B8 + .4byte BattleFrontier_Lounge3_Text_26266A + .4byte BattleFrontier_Lounge3_Text_26271C + .4byte BattleFrontier_Lounge3_Text_2627C9 + .4byte BattleFrontier_Lounge3_Text_262876 + .4byte BattleFrontier_Lounge3_Text_26291A + .4byte BattleFrontier_Lounge3_Text_2629BC + + .align 2 +gUnknown_085B30D4:: @ 85B30D4 + .4byte BattleFrontier_Lounge3_Text_262C04 + .4byte BattleFrontier_Lounge3_Text_262C90 + .4byte BattleFrontier_Lounge3_Text_262D1C + .4byte BattleFrontier_Lounge3_Text_262DA7 + .4byte BattleFrontier_Lounge3_Text_262E34 + .4byte BattleFrontier_Lounge3_Text_262EC1 + .4byte BattleFrontier_Lounge3_Text_262F56 + .4byte BattleFrontier_Lounge3_Text_262FEB + .4byte BattleFrontier_Lounge3_Text_263078 + .4byte BattleFrontier_Lounge3_Text_263105 + .4byte BattleFrontier_Lounge3_Text_26318C + .4byte BattleFrontier_Lounge3_Text_263211 + + .align 1 +gUnknown_085B3104:: @ 85B3104 + .2byte 0x0000, 0x0001, 0x0002, 0x0100, 0x0101, 0x0400, 0x0401, 0x0200, 0x0201, 0x0300, 0x0500, 0x0600 + + .align 2 +gUnknown_085B311C:: @ 85B311C + window_template 0x00, 0x01, 0x01, 0x06, 0x02, 0x0f, 0x0008 + + .align 2 +gUnknown_085B3124:: @ 85B3124 + window_template 0x00, 0x02, 0x09, 0x04, 0x04, 0x0f, 0x0014 + + .align 1 +gUnknown_085B312C:: @ 85B312C + .2byte 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xffff + + .align 1 +gUnknown_085B3142:: @ 85B3142 + .2byte 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xffff + + .align 1 +gUnknown_085B314E:: @ 85B314E + .2byte 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xffff + + .align 1 +gUnknown_085B315C:: @ 85B315C + .2byte 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xffff + + .align 2 +gUnknown_085B3170:: @ 85B3170 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260201 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260287 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E + .4byte gText_Exit + + .align 2 +gUnknown_085B319C:: @ 85B319C + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C + .4byte gText_Exit + + .align 2 +gUnknown_085B31B4:: @ 85B31B4 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260397 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260436 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C + .4byte gText_Exit + + .align 2 +gUnknown_085B31D0:: @ 85B31D0 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260542 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260575 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2 + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260613 + .4byte gText_Exit + + .align 1 +gUnknown_085B31F8:: @ 85B31F8 + .2byte 0x0087, 0x0045, 0x008a, 0x0005, 0x0019, 0x0022, 0x009d, 0x0044, 0x0056, 0x000e + + .align 1 +gUnknown_085B320C:: @ 85B320C + .2byte 0x006f, 0x00ad, 0x00bd, 0x0081, 0x00c4, 0x00cb, 0x00f4, 0x0008, 0x0009, 0x0007 + + .align 2 +gUnknown_085B3220:: @ 85B3220 + window_template 0x00, 0x01, 0x07, 0x0c, 0x06, 0x0f, 0x001c + + .align 2 +gUnknown_085B3228:: @ 85B3228 + .4byte BattleFrontier_Lounge7_Text_265E30 + .4byte BattleFrontier_Lounge7_Text_265E5B + .4byte BattleFrontier_Lounge7_Text_265E8A + .4byte BattleFrontier_Lounge7_Text_265EC0 + .4byte BattleFrontier_Lounge7_Text_265EED + .4byte BattleFrontier_Lounge7_Text_265F1C + .4byte BattleFrontier_Lounge7_Text_265F47 + .4byte BattleFrontier_Lounge7_Text_265F77 + .4byte BattleFrontier_Lounge7_Text_265FAA + .4byte BattleFrontier_Lounge7_Text_265FDD + .4byte gText_Exit + + .align 2 +gUnknown_085B3254:: @ 85B3254 + .4byte BattleFrontier_Lounge7_Text_26600A + .4byte BattleFrontier_Lounge7_Text_26603E + .4byte BattleFrontier_Lounge7_Text_266070 + .4byte BattleFrontier_Lounge7_Text_2660A6 + .4byte BattleFrontier_Lounge7_Text_2660D0 + .4byte BattleFrontier_Lounge7_Text_2660FF + .4byte BattleFrontier_Lounge7_Text_26612D + .4byte BattleFrontier_Lounge7_Text_26615F + .4byte BattleFrontier_Lounge7_Text_266185 + .4byte BattleFrontier_Lounge7_Text_2661B5 + .4byte gText_Exit + + .align 2 +gUnknown_085B3280:: @ 85B3280 + .incbin "graphics/unknown/unknown_5B3280.gbapal" + +gUnknown_085B33E0:: @ 85B33E0 + .byte 0x0f, 0x0c, 0x0b, 0x0e, 0x0f, 0x08, 0x13, 0x0e, 0x0c, 0x0b, 0x12, 0x0b, 0x0f, 0x0e, 0x0b, 0x0e, 0x13, 0x0e, 0x0f, 0x0f, 0x0f, 0x0a + +gUnknown_085B33F6:: @ 85B33F6 + .byte 0x04, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x06, 0x03, 0x03 + +gUnknown_085B3400:: @ 85B3400 + .byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c + +gUnknown_085B3410:: @ 85B3410 + .byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c + +gUnknown_085B3420:: @ 85B3420 + .byte 0x02, 0x04, 0x01, 0x04, 0x04, 0x01, 0x05, 0x00, 0x01, 0x06, 0x03, 0x01, 0x08, 0x06, 0x01, 0x09, 0x0d, 0x01, 0x0a, 0x07, 0x01, 0x0b, 0x07, 0x01, 0x0c, 0x04, 0x01, 0x0e, 0x05, 0x01, 0x0f, 0x04 + .byte 0x01, 0x1a, 0x37, 0x01 + + .align 1 +gUnknown_085B3444:: @ 85B3444 + .2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a + .2byte 0x1a35, 0x1918, 0x1919, 0x191a, 0x191b, 0xffff + +gUnknown_085B3470:: @ 85B3470 + .byte 0x02, 0x01, 0x02, 0x01 + +gUnknown_085B3474:: @ 85B3474 + .byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + +gUnknown_085B347C:: @ 85B347C + .byte 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09 + diff --git a/data/script_menu.s b/data/script_menu.s index cf4a5df01..8dd58262c 100644 --- a/data/script_menu.s +++ b/data/script_menu.s @@ -233,11 +233,11 @@ gUnknown_0858B040:: @ 58B040 .4byte gText_Exit, 0 gUnknown_0858B050:: @ 58B050 - .4byte gUnknown_085EB676, 0 - .4byte gUnknown_085EB673, 0 - .4byte gUnknown_085EB670, 0 - .4byte gUnknown_085EB66D, 0 - .4byte gUnknown_085EB66A, 0 + .4byte gText_5F, 0 + .4byte gText_4F, 0 + .4byte gText_3F, 0 + .4byte gText_2F, 0 + .4byte gText_1F, 0 .4byte gText_Exit, 0 gUnknown_0858B080:: @ 58B080 @@ -494,11 +494,11 @@ gUnknown_0858B578:: @ 58B578 .4byte gText_Exit, 0 gUnknown_0858B5A8:: @ 58B5A8 - .4byte gUnknown_085EB4EB, 0 - .4byte gUnknown_085EB4F9, 0 - .4byte gUnknown_085EB508, 0 - .4byte gUnknown_085EB516, 0 - .4byte gUnknown_085EB523, 0 + .4byte gText_BattleBasics, 0 + .4byte gText_PokemonNature, 0 + .4byte gText_PokemonMoves, 0 + .4byte gText_Underpowered, 0 + .4byte gText_WhenInDanger, 0 .4byte gText_Exit, 0 gUnknown_0858B5D8:: @ 58B5D8 @@ -559,7 +559,7 @@ gUnknown_0858B6D0:: @ 58B6D0 .4byte gText_Exit, 0 gUnknown_0858B700:: @ 58B700 - .4byte gUnknown_085EB5A6, 0 + .4byte gText_BattleTrainers, 0 .4byte gUnknown_085EB45C, 0 .4byte gUnknown_085EB469, 0 .4byte gUnknown_085EB475, 0 diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc index 9184f3cd3..2a39d844b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -661,104 +661,104 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D: @ 826012D .string "the BATTLE facilities, they start\l" .string "giving you more and more Battle Points.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA: @ 82601AA +BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA:: @ 82601AA .string "A large poster with a SMOOCHUM print.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0: @ 82601D0 +BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0:: @ 82601D0 .string "A SMOOCHUM cushion.\n" .string "Place it on a mat or a desk.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_260201: @ 8260201 +BattleFrontier_BattlePointExchangeServiceCorner_Text_260201:: @ 8260201 .string "A SMOOCHUM DOLL.\n" .string "Place it on a mat or a desk.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F: @ 826022F +BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F:: @ 826022F .string "A TOGEPI DOLL.\n" .string "Place it on a mat or a desk.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B: @ 826025B +BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B:: @ 826025B .string "A MEOWTH DOLL.\n" .string "Place it on a mat or a desk.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_260287: @ 8260287 +BattleFrontier_BattlePointExchangeServiceCorner_Text_260287:: @ 8260287 .string "A CLEFAIRY DOLL.\n" .string "Place it on a mat or a desk.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5: @ 82602B5 +BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5:: @ 82602B5 .string "A DITTO DOLL.\n" .string "Place it on a mat or a desk.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0: @ 82602E0 +BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0:: @ 82602E0 .string "A CYNDAQUIL DOLL.\n" .string "Place it on a mat or a desk.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F: @ 826030F +BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F:: @ 826030F .string "A CHIKORITA DOLL.\n" .string "Place it on a mat or a desk.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E: @ 826033E +BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E:: @ 826033E .string "A TOTODILE DOLL.\n" .string "Place it on a mat or a desk.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C: @ 826036C +BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C:: @ 826036C .string "A large DOLL.\n" .string "Place it on a mat or a desk.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_260397: @ 8260397 +BattleFrontier_BattlePointExchangeServiceCorner_Text_260397:: @ 8260397 .string "Raises the stat ATTACK of one\n" .string "POKéMON.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE: @ 82603BE +BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE:: @ 82603BE .string "Raises the stat SP. ATK of one\n" .string "POKéMON.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6: @ 82603E6 +BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6:: @ 82603E6 .string "Raises the stat DEFENSE of one\n" .string "POKéMON.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E: @ 826040E +BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E:: @ 826040E .string "Raises the stat SP. DEF of one\n" .string "POKéMON.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_260436: @ 8260436 +BattleFrontier_BattlePointExchangeServiceCorner_Text_260436:: @ 8260436 .string "Raises the stat SPEED of one\n" .string "POKéMON.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C: @ 826045C +BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C:: @ 826045C .string "Raises the HP of one POKéMON.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A: @ 826047A +BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A:: @ 826047A .string "A hold item that gradually restores\n" .string "HP in battle.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC: @ 82604AC +BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC:: @ 82604AC .string "A hold item that restores any\n" .string "lowered stat.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8: @ 82604D8 +BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8:: @ 82604D8 .string "A hold item that occasionally allows\n" .string "the first strike.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F: @ 826050F +BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F:: @ 826050F .string "A hold item that snaps POKéMON out\n" .string "of infatuation.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_260542: @ 8260542 +BattleFrontier_BattlePointExchangeServiceCorner_Text_260542:: @ 8260542 .string "A hold item that casts a glare to\n" .string "reduce accuracy.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_260575: @ 8260575 +BattleFrontier_BattlePointExchangeServiceCorner_Text_260575:: @ 8260575 .string "Raises a move’s power, but permits\n" .string "only that move.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8: @ 82605A8 +BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8:: @ 82605A8 .string "A hold item that may cause flinching\n" .string "when the foe is hit.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2: @ 82605E2 +BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2:: @ 82605E2 .string "A hold item that occasionally\n" .string "prevents fainting.$" -BattleFrontier_BattlePointExchangeServiceCorner_Text_260613: @ 8260613 +BattleFrontier_BattlePointExchangeServiceCorner_Text_260613:: @ 8260613 .string "A hold item that raises the\n" .string "critical-hit rate.$" diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/scripts/maps/BattleFrontier_Lounge2.inc index d5fee28e9..bbb298b5b 100644 --- a/data/scripts/maps/BattleFrontier_Lounge2.inc +++ b/data/scripts/maps/BattleFrontier_Lounge2.inc @@ -117,7 +117,7 @@ BattleFrontier_Lounge2_EventScript_26075D:: @ 826075D msgbox BattleFrontier_Lounge2_Text_261D5C, 2 end -BattleFrontier_Lounge2_Text_260766: @ 8260766 +BattleFrontier_Lounge2_Text_260766:: @ 8260766 .string "Howdy! When it comes to news about\n" .string "the BATTLE FRONTIER, I’m no. 1.\p" .string "You can think of me as\n" @@ -127,33 +127,33 @@ BattleFrontier_Lounge2_Text_260766: @ 8260766 .string "I’ll happily share the hottest news\n" .string "I gathered about the BATTLE FRONTIER.$" -BattleFrontier_Lounge2_Text_260857: @ 8260857 +BattleFrontier_Lounge2_Text_260857:: @ 8260857 .string "Howdy! Did you swing by to grill me\n" .string "about the latest word? Oh, all right!$" -BattleFrontier_Lounge2_Text_2608A1: @ 82608A1 +BattleFrontier_Lounge2_Text_2608A1:: @ 82608A1 .string "Well? Well? Well?\p" .string "I’m sure my information’s been\n" .string "seriously useful to you, right?$" -BattleFrontier_Lounge2_Text_2608F2: @ 82608F2 +BattleFrontier_Lounge2_Text_2608F2:: @ 82608F2 .string "Let’s see now…\p" .string "It sounds like the {STR_VAR_1}\n" .string "is the hottest place going.$" -BattleFrontier_Lounge2_Text_260933: @ 8260933 +BattleFrontier_Lounge2_Text_260933:: @ 8260933 .string "Let’s see now…\p" .string "It sounds like BATTLE TOWER\n" .string "{STR_VAR_1} is the hottest.$" -BattleFrontier_Lounge2_Text_260971: @ 8260971 +BattleFrontier_Lounge2_Text_260971:: @ 8260971 .string "Bet you didn’t know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" .string "It’s this mysterious TRAINER called\n" .string "the SALON MAIDEN that runs the place.$" -BattleFrontier_Lounge2_Text_260A1E: @ 8260A1E +BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E .string "Have you battled the SALON MAIDEN?\p" .string "When she’s measuring up her opponent,\n" .string "she apparently uses these POKéMON:\p" @@ -161,7 +161,7 @@ BattleFrontier_Lounge2_Text_260A1E: @ 8260A1E .string "a FIRE-type VOLCANO POKéMON,\l" .string "and a NORMAL-type SLEEPING POKéMON.$" -BattleFrontier_Lounge2_Text_260AE7: @ 8260AE7 +BattleFrontier_Lounge2_Text_260AE7:: @ 8260AE7 .string "Have you battled the SALON MAIDEN\n" .string "when she’s serious?\p" .string "When she’s battling flat out,\n" @@ -170,14 +170,14 @@ BattleFrontier_Lounge2_Text_260AE7: @ 8260AE7 .string "an ELECTRIC-type THUNDER POKéMON,\l" .string "and a NORMAL-type SLEEPING POKéMON.$" -BattleFrontier_Lounge2_Text_260BC4: @ 8260BC4 +BattleFrontier_Lounge2_Text_260BC4:: @ 8260BC4 .string "Bet you didn’t know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" .string "It’s this flamboyant TRAINER called\n" .string "the DOME ACE that runs the place.$" -BattleFrontier_Lounge2_Text_260C6D: @ 8260C6D +BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D .string "Have you battled the DOME ACE?\p" .string "When he’s treating the opponent\n" .string "lightly, he uses these three POKéMON:\p" @@ -185,7 +185,7 @@ BattleFrontier_Lounge2_Text_260C6D: @ 8260C6D .string "a WATER & GROUND MUD FISH POKéMON,\l" .string "and a FIRE & FLYING FLAME POKéMON.$" -BattleFrontier_Lounge2_Text_260D3A: @ 8260D3A +BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A .string "Have you battled the DOME ACE\n" .string "when he’s serious?\p" .string "When he’s demonstrating his strategy,\n" @@ -195,14 +195,14 @@ BattleFrontier_Lounge2_Text_260D3A: @ 8260D3A .string "and a STEEL- & PSYCHIC-type IRON LEG\l" .string "POKéMON.$" -BattleFrontier_Lounge2_Text_260E1E: @ 8260E1E +BattleFrontier_Lounge2_Text_260E1E:: @ 8260E1E .string "Bet you didn’t know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" .string "It’s this freaky TRAINER called\n" .string "the FACTORY HEAD that runs the place.$" -BattleFrontier_Lounge2_Text_260EC7: @ 8260EC7 +BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7 .string "Have you battled the FACTORY HEAD\n" .string "already?\p" .string "Let me think… When he goes to battle,\n" @@ -210,7 +210,7 @@ BattleFrontier_Lounge2_Text_260EC7: @ 8260EC7 .string "He battles under pretty much the same\n" .string "conditions as you.$" -BattleFrontier_Lounge2_Text_260F74: @ 8260F74 +BattleFrontier_Lounge2_Text_260F74:: @ 8260F74 .string "Have you battled the FACTORY HEAD\n" .string "when he’s serious?\p" .string "When he goes seriously to battle,\n" @@ -218,14 +218,14 @@ BattleFrontier_Lounge2_Text_260F74: @ 8260F74 .string "He battles under virtually the same\n" .string "conditions as you.$" -BattleFrontier_Lounge2_Text_261026: @ 8261026 +BattleFrontier_Lounge2_Text_261026:: @ 8261026 .string "Bet you didn’t know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" .string "It’s this scary TRAINER called\n" .string "the PIKE QUEEN that runs the place.$" -BattleFrontier_Lounge2_Text_2610CC: @ 82610CC +BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC .string "Have you battled the PIKE QUEEN\n" .string "before?\p" .string "When she’s in a good mood, they say\n" @@ -234,7 +234,7 @@ BattleFrontier_Lounge2_Text_2610CC: @ 82610CC .string "a BUG & ROCK MOLD POKéMON,\l" .string "and a WATER-type TENDER POKéMON.$" -BattleFrontier_Lounge2_Text_261194: @ 8261194 +BattleFrontier_Lounge2_Text_261194:: @ 8261194 .string "Have you battled the PIKE QUEEN\n" .string "when she’s serious?\p" .string "When she’s seriously annoyed, they say\n" @@ -244,14 +244,14 @@ BattleFrontier_Lounge2_Text_261194: @ 8261194 .string "and a WATER- & FLYING-type ATROCIOUS\l" .string "POKéMON.$" -BattleFrontier_Lounge2_Text_261282: @ 8261282 +BattleFrontier_Lounge2_Text_261282:: @ 8261282 .string "Bet you didn’t know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" .string "It’s this cute TRAINER called\n" .string "the ARENA TYCOON that runs the place.$" -BattleFrontier_Lounge2_Text_261329: @ 8261329 +BattleFrontier_Lounge2_Text_261329:: @ 8261329 .string "Have you battled the ARENA TYCOON\n" .string "before?\p" .string "When she’s assessing the foe’s ability,\n" @@ -260,7 +260,7 @@ BattleFrontier_Lounge2_Text_261329: @ 8261329 .string "a DARK-type MOONLIGHT POKéMON,\l" .string "and a BUG & GHOST SHED POKéMON.$" -BattleFrontier_Lounge2_Text_261403: @ 8261403 +BattleFrontier_Lounge2_Text_261403:: @ 8261403 .string "Have you battled the ARENA TYCOON\n" .string "when she’s serious?\p" .string "When she battles for keeps,\n" @@ -270,14 +270,14 @@ BattleFrontier_Lounge2_Text_261403: @ 8261403 .string "and a GRASS- & FIGHTING-type\l" .string "MUSHROOM POKéMON.$" -BattleFrontier_Lounge2_Text_2614E6: @ 82614E6 +BattleFrontier_Lounge2_Text_2614E6:: @ 82614E6 .string "Bet you didn’t know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" .string "It’s this sinister TRAINER called\n" .string "the PALACE MAVEN that runs the place.$" -BattleFrontier_Lounge2_Text_261591: @ 8261591 +BattleFrontier_Lounge2_Text_261591:: @ 8261591 .string "Have you battled the PALACE MAVEN\n" .string "before?\p" .string "When he’s testing the opponent’s\n" @@ -286,7 +286,7 @@ BattleFrontier_Lounge2_Text_261591: @ 8261591 .string "a NORMAL-type LAZY POKéMON, and a\l" .string "WATER- & ICE-type TRANSPORT POKéMON.$" -BattleFrontier_Lounge2_Text_26166F: @ 826166F +BattleFrontier_Lounge2_Text_26166F:: @ 826166F .string "Have you battled the PALACE MAVEN\n" .string "when he’s serious?\p" .string "When he throws his entire might into\n" @@ -295,14 +295,14 @@ BattleFrontier_Lounge2_Text_26166F: @ 826166F .string "a NORMAL-type LAZY POKéMON,\l" .string "and a WATER-type AURORA POKéMON.$" -BattleFrontier_Lounge2_Text_26174D: @ 826174D +BattleFrontier_Lounge2_Text_26174D:: @ 826174D .string "Bet you didn’t know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" .string "It’s this fiery-hot TRAINER called\n" .string "the PYRAMID KING that runs the place.$" -BattleFrontier_Lounge2_Text_2617F9: @ 82617F9 +BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9 .string "Have you battled the PYRAMID KING\n" .string "before?\p" .string "When he’s checking the foe’s power,\n" @@ -311,7 +311,7 @@ BattleFrontier_Lounge2_Text_2617F9: @ 82617F9 .string "an ICE-type ICEBERG POKéMON,\l" .string "and a STEEL-type IRON POKéMON.$" -BattleFrontier_Lounge2_Text_2618C4: @ 82618C4 +BattleFrontier_Lounge2_Text_2618C4:: @ 82618C4 .string "Have you battled the PYRAMID KING\n" .string "when he’s serious?\p" .string "When he’s pumped with hot power,\n" @@ -321,7 +321,7 @@ BattleFrontier_Lounge2_Text_2618C4: @ 82618C4 .string "and a FIRE- & FLYING-type FLAME\l" .string "POKéMON.$" -BattleFrontier_Lounge2_Text_2619AC: @ 82619AC +BattleFrontier_Lounge2_Text_2619AC:: @ 82619AC .string "Sure, there are several places where\n" .string "you can enter DOUBLE BATTLES.\p" .string "But the DOUBLE BATTLE ROOMS of\n" @@ -330,44 +330,44 @@ BattleFrontier_Lounge2_Text_2619AC: @ 82619AC .string "how DOUBLE BATTLES are played here\l" .string "in the BATTLE FRONTIER.$" -BattleFrontier_Lounge2_Text_261A91: @ 8261A91 +BattleFrontier_Lounge2_Text_261A91:: @ 8261A91 .string "Watch yourself in the battles here.\p" .string "I hear there are TRAINERS that have\n" .string "strategies they developed just for\l" .string "DOUBLE BATTLES.$" -BattleFrontier_Lounge2_Text_261B0C: @ 8261B0C +BattleFrontier_Lounge2_Text_261B0C:: @ 8261B0C .string "Once you’re confident and comfortable\n" .string "with DOUBLE BATTLES here, you should\l" .string "think about challenging other places\l" .string "offering DOUBLE BATTLES.$" -BattleFrontier_Lounge2_Text_261B95: @ 8261B95 +BattleFrontier_Lounge2_Text_261B95:: @ 8261B95 .string "All sorts of TRAINERS gather in\n" .string "the BATTLE SALON.\p" .string "Just think--you may run into your\n" .string "friends or followers!\l" .string "You should look carefully!$" -BattleFrontier_Lounge2_Text_261C1A: @ 8261C1A +BattleFrontier_Lounge2_Text_261C1A:: @ 8261C1A .string "If you’re with a friend, head for the\n" .string "LINK MULTI BATTLE ROOM.\p" .string "If you play with a strong friend,\n" .string "you can expect to see tough foes!$" -BattleFrontier_Lounge2_Text_261C9C: @ 8261C9C +BattleFrontier_Lounge2_Text_261C9C:: @ 8261C9C .string "What amazing news-gathering power!\n" .string "My mentor’s like none other!$" -BattleFrontier_Lounge2_Text_261CDC: @ 8261CDC +BattleFrontier_Lounge2_Text_261CDC:: @ 8261CDC .string "What amazing powers of observation!\n" .string "My mentor’s like none other!$" -BattleFrontier_Lounge2_Text_261D1D: @ 8261D1D +BattleFrontier_Lounge2_Text_261D1D:: @ 8261D1D .string "What amazing power of persuasion!\n" .string "My mentor’s like none other!$" -BattleFrontier_Lounge2_Text_261D5C: @ 8261D5C +BattleFrontier_Lounge2_Text_261D5C:: @ 8261D5C .string "…What is this place?\n" .string "It’s scaring me…$" diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/scripts/maps/BattleFrontier_Lounge3.inc index b8d52deec..4568dd2c8 100644 --- a/data/scripts/maps/BattleFrontier_Lounge3.inc +++ b/data/scripts/maps/BattleFrontier_Lounge3.inc @@ -211,12 +211,12 @@ BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1 release end -BattleFrontier_Lounge3_Text_261FFE: @ 8261FFE +BattleFrontier_Lounge3_Text_261FFE:: @ 8261FFE .string "…What’s that you want?\p" .string "Can’t you see we’re kind of busy here?\n" .string "Can’t your business wait till later?$" -BattleFrontier_Lounge3_Text_262061: @ 8262061 +BattleFrontier_Lounge3_Text_262061:: @ 8262061 .string "…Huh?\n" .string "You look to me like a tough TRAINER.\p" .string "Heheh…\n" @@ -236,201 +236,201 @@ BattleFrontier_Lounge3_Text_262061: @ 8262061 .string "Sounds simple, huh?\n" .string "So, anyway…$" -BattleFrontier_Lounge3_Text_262261: @ 8262261 +BattleFrontier_Lounge3_Text_262261:: @ 8262261 .string "What I’m looking for is a TRAINER who’s\n" .string "going to be challenging the BATTLE\l" .string "TOWER’s SINGLE BATTLE ROOMS.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_26230D: @ 826230D +BattleFrontier_Lounge3_Text_26230D:: @ 826230D .string "What I’m looking for is a TRAINER who’s\n" .string "going to be challenging the BATTLE\l" .string "TOWER’s DOUBLE BATTLE ROOMS.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_2623B9: @ 82623B9 +BattleFrontier_Lounge3_Text_2623B9:: @ 82623B9 .string "What I’m looking for is a TRAINER who’s\n" .string "going to be challenging the BATTLE\l" .string "TOWER’s MULTI BATTLE ROOMS.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_262464: @ 8262464 +BattleFrontier_Lounge3_Text_262464:: @ 8262464 .string "What I’m looking for is a TRAINER who’s\n" .string "going to be entering the BATTLE\l" .string "DOME’s SINGLE BATTLE Tourney.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_26250E: @ 826250E +BattleFrontier_Lounge3_Text_26250E:: @ 826250E .string "What I’m looking for is a TRAINER who’s\n" .string "going to be entering the BATTLE\l" .string "DOME’s DOUBLE BATTLE Tourney.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_2625B8: @ 82625B8 +BattleFrontier_Lounge3_Text_2625B8:: @ 82625B8 .string "What I’m looking for is a TRAINER who’s\n" .string "going to be entering the BATTLE\l" .string "FACTORY’s Battle Swap Single Tourney.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_26266A: @ 826266A +BattleFrontier_Lounge3_Text_26266A:: @ 826266A .string "What I’m looking for is a TRAINER who’s\n" .string "going to be entering the BATTLE\l" .string "FACTORY’s Battle Swap Double Tourney.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_26271C: @ 826271C +BattleFrontier_Lounge3_Text_26271C:: @ 826271C .string "What I’m looking for is a TRAINER who’s\n" .string "going to be challenging the BATTLE\l" .string "PALACE’s SINGLE BATTLE HALLS.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_2627C9: @ 82627C9 +BattleFrontier_Lounge3_Text_2627C9:: @ 82627C9 .string "What I’m looking for is a TRAINER who’s\n" .string "going to be challenging the BATTLE\l" .string "PALACE’s DOUBLE BATTLE HALLS.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_262876: @ 8262876 +BattleFrontier_Lounge3_Text_262876:: @ 8262876 .string "What I’m looking for is a TRAINER who’s\n" .string "going to be entering the BATTLE\l" .string "ARENA’s Set KO Tourney.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_26291A: @ 826291A +BattleFrontier_Lounge3_Text_26291A:: @ 826291A .string "What I’m looking for is a TRAINER who’s\n" .string "going to be entering the BATTLE PIKE’s\l" .string "Battle Choice.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_2629BC: @ 82629BC +BattleFrontier_Lounge3_Text_2629BC:: @ 82629BC .string "What I’m looking for is a TRAINER who’s\n" .string "going to be entering the BATTLE\l" .string "PYRAMID’s Battle Quest.\p" .string "But so far, I haven’t seen a TRAINER\n" .string "that has that winning quality.$" -BattleFrontier_Lounge3_Text_262A60: @ 8262A60 +BattleFrontier_Lounge3_Text_262A60:: @ 8262A60 .string "I’ll see to it that you benefit, too.\n" .string "So how about it?\l" .string "How about entering that event for me?$" -BattleFrontier_Lounge3_Text_262ABD: @ 8262ABD +BattleFrontier_Lounge3_Text_262ABD:: @ 8262ABD .string "All right, that’s perfect.\n" .string "So, uh… How about spotting me some\l" .string "of your Battle Points?\p" .string "Trust me, I’ll show you my gratitude\n" .string "afterward.$" -BattleFrontier_Lounge3_Text_262B42: @ 8262B42 +BattleFrontier_Lounge3_Text_262B42:: @ 8262B42 .string "Great, great!\n" .string "So, how much can you spot me?$" -BattleFrontier_Lounge3_Text_262B6E: @ 8262B6E +BattleFrontier_Lounge3_Text_262B6E:: @ 8262B6E .string "Oh, no, no, no!\n" .string "You don’t have enough Battle Points!\p" .string "I wish you wouldn’t monkey around and\n" .string "waste everyone’s time!$" -BattleFrontier_Lounge3_Text_262BE0: @ 8262BE0 +BattleFrontier_Lounge3_Text_262BE0:: @ 8262BE0 .string "Heheh! Thanks much!\n" .string "So, off you go!$" -BattleFrontier_Lounge3_Text_262C04: @ 8262C04 +BattleFrontier_Lounge3_Text_262C04:: @ 8262C04 .string "Get to the BATTLE TOWER’s\n" .string "SINGLE BATTLE ROOMS pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_262C90: @ 8262C90 +BattleFrontier_Lounge3_Text_262C90:: @ 8262C90 .string "Get to the BATTLE TOWER’s\n" .string "DOUBLE BATTLE ROOMS pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_262D1C: @ 8262D1C +BattleFrontier_Lounge3_Text_262D1C:: @ 8262D1C .string "Get to the BATTLE TOWER’s\n" .string "MULTI BATTLE ROOMS pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_262DA7: @ 8262DA7 +BattleFrontier_Lounge3_Text_262DA7:: @ 8262DA7 .string "Get to the BATTLE DOME’s\n" .string "SINGLE BATTLE Tourney pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_262E34: @ 8262E34 +BattleFrontier_Lounge3_Text_262E34:: @ 8262E34 .string "Get to the BATTLE DOME’s\n" .string "DOUBLE BATTLE Tourney pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_262EC1: @ 8262EC1 +BattleFrontier_Lounge3_Text_262EC1:: @ 8262EC1 .string "Get to the BATTLE FACTORY’s\n" .string "Battle Swap Single Tourney pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_262F56: @ 8262F56 +BattleFrontier_Lounge3_Text_262F56:: @ 8262F56 .string "Get to the BATTLE FACTORY’s\n" .string "Battle Swap Double Tourney pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_262FEB: @ 8262FEB +BattleFrontier_Lounge3_Text_262FEB:: @ 8262FEB .string "Get to the BATTLE PALACE’s\n" .string "SINGLE BATTLE HALLS pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_263078: @ 8263078 +BattleFrontier_Lounge3_Text_263078:: @ 8263078 .string "Get to the BATTLE PALACE’s\n" .string "DOUBLE BATTLE HALLS pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_263105: @ 8263105 +BattleFrontier_Lounge3_Text_263105:: @ 8263105 .string "Get to the BATTLE ARENA’s\n" .string "Set KO Tourney pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_26318C: @ 826318C +BattleFrontier_Lounge3_Text_26318C:: @ 826318C .string "Get to the BATTLE PIKE’s\n" .string "Battle Choice pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_263211: @ 8263211 +BattleFrontier_Lounge3_Text_263211:: @ 8263211 .string "Get to the BATTLE PYRAMID’s\n" .string "Battle Quest pronto!\p" .string "It’s a must-win situation!\n" .string "Don’t blow your chance!\l" .string "Both of our futures depend on you!$" -BattleFrontier_Lounge3_Text_263298: @ 8263298 +BattleFrontier_Lounge3_Text_263298:: @ 8263298 .string "Oh, it’s you…\n" .string "Nice try…\p" .string "I hate to break it to you, but I can’t\n" @@ -438,7 +438,7 @@ BattleFrontier_Lounge3_Text_263298: @ 8263298 .string "I guess we’ll have to let it motivate\n" .string "us to try harder next time!$" -BattleFrontier_Lounge3_Text_263334: @ 8263334 +BattleFrontier_Lounge3_Text_263334:: @ 8263334 .string "Oh, yes!\n" .string "Hello there, champ!\p" .string "I knew you could!\n" @@ -447,36 +447,36 @@ BattleFrontier_Lounge3_Text_263334: @ 8263334 .string "I’ll return your Battle Points and,\n" .string "of course, a little extra from me!$" -BattleFrontier_Lounge3_Text_2633D4: @ 82633D4 +BattleFrontier_Lounge3_Text_2633D4:: @ 82633D4 .string "{PLAYER} obtained\n" .string "{STR_VAR_1} Battle Points.$" -BattleFrontier_Lounge3_Text_2633F2: @ 82633F2 +BattleFrontier_Lounge3_Text_2633F2:: @ 82633F2 .string "If you’re up for another challenge,\n" .string "please do think of me!$" -BattleFrontier_Lounge3_Text_26342D: @ 826342D +BattleFrontier_Lounge3_Text_26342D:: @ 826342D .string "Not interested?! You shouldn’t be\n" .string "so afraid to take a chance!$" -BattleFrontier_Lounge3_Text_26346B: @ 826346B +BattleFrontier_Lounge3_Text_26346B:: @ 826346B .string "Oh…$" -BattleFrontier_Lounge3_Text_26346F: @ 826346F +BattleFrontier_Lounge3_Text_26346F:: @ 826346F .string "I backed the wrong TRAINER again!\p" .string "Maybe I should be battling normally\n" .string "like everyone else…$" -BattleFrontier_Lounge3_Text_2634C9: @ 82634C9 +BattleFrontier_Lounge3_Text_2634C9:: @ 82634C9 .string "That TRAINER…\p" .string "He’s good, but he gets rattled too\n" .string "easily to survive the BATTLE DOME…$" -BattleFrontier_Lounge3_Text_26351D: @ 826351D +BattleFrontier_Lounge3_Text_26351D:: @ 826351D .string "Giggle!\n" .string "I know a winner when I see one!$" -BattleFrontier_Lounge3_Text_263545: @ 8263545 +BattleFrontier_Lounge3_Text_263545:: @ 8263545 .string "Those TRAINERS…\n" .string "What are they doing?\l" .string "They should be taking challenges.$" diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/scripts/maps/BattleFrontier_Lounge5.inc index 497857b63..a06927424 100644 --- a/data/scripts/maps/BattleFrontier_Lounge5.inc +++ b/data/scripts/maps/BattleFrontier_Lounge5.inc @@ -44,162 +44,162 @@ BattleFrontier_Lounge5_EventScript_264629:: @ 8264629 msgbox BattleFrontier_Lounge5_Text_264FAB, 2 end -BattleFrontier_Lounge5_Text_264632: @ 8264632 +BattleFrontier_Lounge5_Text_264632:: @ 8264632 .string "Ehehe!\n" .string "I can tell what POKéMON are thinking!\p" .string "Please!\n" .string "Can I see your POKéMON?$" -BattleFrontier_Lounge5_Text_26467F: @ 826467F +BattleFrontier_Lounge5_Text_26467F:: @ 826467F .string "Boo!\n" .string "Cheapie!$" -BattleFrontier_Lounge5_Text_26468D: @ 826468D +BattleFrontier_Lounge5_Text_26468D:: @ 826468D .string "Hmhm…\p" .string "This one says it likes to battle!\n" .string "It will battle even if it has a lot\l" .string "of ouchies!$" -BattleFrontier_Lounge5_Text_2646E5: @ 82646E5 +BattleFrontier_Lounge5_Text_2646E5:: @ 82646E5 .string "Hmhm…\p" .string "This one says it likes to be sneaky!\n" .string "But if it gets enough ouchies,\l" .string "it will hit back!$" -BattleFrontier_Lounge5_Text_264741: @ 8264741 +BattleFrontier_Lounge5_Text_264741:: @ 8264741 .string "Hmhm…\p" .string "This one says it likes to battle!\n" .string "But if it gets enough ouchies,\l" .string "it will worry about itself!$" -BattleFrontier_Lounge5_Text_2647A4: @ 82647A4 +BattleFrontier_Lounge5_Text_2647A4:: @ 82647A4 .string "Hmhm…\p" .string "This one says it likes to battle!\n" .string "It will battle even if it has a lot\l" .string "of ouchies!$" -BattleFrontier_Lounge5_Text_2647FC: @ 82647FC +BattleFrontier_Lounge5_Text_2647FC:: @ 82647FC .string "Hmhm…\p" .string "This one says it looks after itself!\n" .string "But if it gets enough ouchies,\l" .string "it will hit back!$" -BattleFrontier_Lounge5_Text_264858: @ 8264858 +BattleFrontier_Lounge5_Text_264858:: @ 8264858 .string "Hmhm…\p" .string "This one says it likes to be sneaky!\n" .string "But if it gets enough ouchies,\l" .string "it will worry about itself!$" -BattleFrontier_Lounge5_Text_2648BE: @ 82648BE +BattleFrontier_Lounge5_Text_2648BE:: @ 82648BE .string "Hmhm…\p" .string "This one says it likes to battle!\n" .string "It will battle even if it has a lot\l" .string "of ouchies!$" -BattleFrontier_Lounge5_Text_264916: @ 8264916 +BattleFrontier_Lounge5_Text_264916:: @ 8264916 .string "Hmhm…\p" .string "This one says it likes to be sneaky!\n" .string "But if it gets enough ouchies,\l" .string "it will hit back!$" -BattleFrontier_Lounge5_Text_264972: @ 8264972 +BattleFrontier_Lounge5_Text_264972:: @ 8264972 .string "Hmhm…\p" .string "This one says it likes to battle!\n" .string "But if it gets enough ouchies,\l" .string "it will worry about itself!$" -BattleFrontier_Lounge5_Text_2649D5: @ 82649D5 +BattleFrontier_Lounge5_Text_2649D5:: @ 82649D5 .string "Hmhm…\p" .string "This one says it likes to be sneaky!\n" .string "It says it likes to be sneaky even\l" .string "if it has a lot of ouchies!$" -BattleFrontier_Lounge5_Text_264A3F: @ 8264A3F +BattleFrontier_Lounge5_Text_264A3F:: @ 8264A3F .string "Hmhm…\p" .string "This one says it likes to battle!\n" .string "But if it gets enough ouchies,\l" .string "it will turn sneaky!$" -BattleFrontier_Lounge5_Text_264A9B: @ 8264A9B +BattleFrontier_Lounge5_Text_264A9B:: @ 8264A9B .string "Hmhm…\p" .string "This one says it likes to battle!\n" .string "It will battle even if it has a lot\l" .string "of ouchies!$" -BattleFrontier_Lounge5_Text_264AF3: @ 8264AF3 +BattleFrontier_Lounge5_Text_264AF3:: @ 8264AF3 .string "Hmhm…\p" .string "This one says it likes to be sneaky!\n" .string "It says it likes to be sneaky even\l" .string "if it has a lot of ouchies!$" -BattleFrontier_Lounge5_Text_264B5D: @ 8264B5D +BattleFrontier_Lounge5_Text_264B5D:: @ 8264B5D .string "Hmhm…\p" .string "This one says it likes to be sneaky!\n" .string "But if it gets enough ouchies,\l" .string "it will worry about itself!$" -BattleFrontier_Lounge5_Text_264BC3: @ 8264BC3 +BattleFrontier_Lounge5_Text_264BC3:: @ 8264BC3 .string "Hmhm…\p" .string "This one says it looks after itself!\n" .string "It says it worries about itself whether\l" .string "or not it has a lot of ouchies!$" -BattleFrontier_Lounge5_Text_264C36: @ 8264C36 +BattleFrontier_Lounge5_Text_264C36:: @ 8264C36 .string "Hmhm…\p" .string "This one says it looks after itself!\n" .string "But if it gets enough ouchies,\l" .string "it will turn sneaky!$" -BattleFrontier_Lounge5_Text_264C95: @ 8264C95 +BattleFrontier_Lounge5_Text_264C95:: @ 8264C95 .string "Hmhm…\p" .string "This one says it looks after itself!\n" .string "It says it worries about itself even\l" .string "if it has a lot of ouchies!$" -BattleFrontier_Lounge5_Text_264D01: @ 8264D01 +BattleFrontier_Lounge5_Text_264D01:: @ 8264D01 .string "Hmhm…\p" .string "This one says it likes to be sneaky!\n" .string "It says it likes to be sneaky even\l" .string "if it has a lot of ouchies!$" -BattleFrontier_Lounge5_Text_264D6B: @ 8264D6B +BattleFrontier_Lounge5_Text_264D6B:: @ 8264D6B .string "Hmhm…\p" .string "This one says it looks after itself!\n" .string "It says it worries about itself even\l" .string "if it has a lot of ouchies!$" -BattleFrontier_Lounge5_Text_264DD7: @ 8264DD7 +BattleFrontier_Lounge5_Text_264DD7:: @ 8264DD7 .string "Hmhm…\p" .string "This one says it looks after itself!\n" .string "But if it gets enough ouchies,\l" .string "it will hit back!$" -BattleFrontier_Lounge5_Text_264E33: @ 8264E33 +BattleFrontier_Lounge5_Text_264E33:: @ 8264E33 .string "Hmhm…\p" .string "This one says it likes to battle!\n" .string "But if it gets enough ouchies,\l" .string "it will turn sneaky!$" -BattleFrontier_Lounge5_Text_264E8F: @ 8264E8F +BattleFrontier_Lounge5_Text_264E8F:: @ 8264E8F .string "Hmhm…\p" .string "This one says it looks after itself!\n" .string "But if it gets enough ouchies,\l" .string "it will turn sneaky!$" -BattleFrontier_Lounge5_Text_264EEE: @ 8264EEE +BattleFrontier_Lounge5_Text_264EEE:: @ 8264EEE .string "That’s silly! An EGG is asleep!\n" .string "I can’t talk to it!$" -BattleFrontier_Lounge5_Text_264F22: @ 8264F22 +BattleFrontier_Lounge5_Text_264F22:: @ 8264F22 .string "How charming!\n" .string "That little lady claims she can\l" .string "understand POKéMON!$" -BattleFrontier_Lounge5_Text_264F64: @ 8264F64 +BattleFrontier_Lounge5_Text_264F64:: @ 8264F64 .string "I have this feeling that the little girl\n" .string "is saying something profound.$" -BattleFrontier_Lounge5_Text_264FAB: @ 8264FAB +BattleFrontier_Lounge5_Text_264FAB:: @ 8264FAB .string "I know something!\p" .string "That little girl plays at the red house\n" .string "a lot!$" diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/scripts/maps/BattleFrontier_Lounge7.inc index b12c911ce..f6f957cae 100644 --- a/data/scripts/maps/BattleFrontier_Lounge7.inc +++ b/data/scripts/maps/BattleFrontier_Lounge7.inc @@ -380,102 +380,102 @@ BattleFrontier_Lounge7_Text_265D17: @ 8265D17 .string "but feel this…\p" .string "Time is so cruel…$" -BattleFrontier_Lounge7_Text_265E30: @ 8265E30 +BattleFrontier_Lounge7_Text_265E30:: @ 8265E30 .string "Recovers up to\n" .string "half the user’s\n" .string "maximum HP.$" -BattleFrontier_Lounge7_Text_265E5B: @ 8265E5B +BattleFrontier_Lounge7_Text_265E5B:: @ 8265E5B .string "Inflicts damage\n" .string "identical to the\n" .string "user’s level.$" -BattleFrontier_Lounge7_Text_265E8A: @ 8265E8A +BattleFrontier_Lounge7_Text_265E8A:: @ 8265E8A .string "Recovers half the\n" .string "damage inflicted\n" .string "on a sleeping foe.$" -BattleFrontier_Lounge7_Text_265EC0: @ 8265EC0 +BattleFrontier_Lounge7_Text_265EC0:: @ 8265EC0 .string "A strong punch\n" .string "thrown with\n" .string "incredible power.$" -BattleFrontier_Lounge7_Text_265EED: @ 8265EED +BattleFrontier_Lounge7_Text_265EED:: @ 8265EED .string "An extremely\n" .string "powerful kick with\n" .string "intense force.$" -BattleFrontier_Lounge7_Text_265F1C: @ 8265F1C +BattleFrontier_Lounge7_Text_265F1C:: @ 8265F1C .string "A full-body slam\n" .string "that may cause\n" .string "paralysis.$" -BattleFrontier_Lounge7_Text_265F47: @ 8265F47 +BattleFrontier_Lounge7_Text_265F47:: @ 8265F47 .string "Large boulders\n" .string "are hurled. May\n" .string "cause flinching.$" -BattleFrontier_Lounge7_Text_265F77: @ 8265F77 +BattleFrontier_Lounge7_Text_265F77:: @ 8265F77 .string "Retaliates any\n" .string "physical hit with\n" .string "double the power.$" -BattleFrontier_Lounge7_Text_265FAA: @ 8265FAA +BattleFrontier_Lounge7_Text_265FAA:: @ 8265FAA .string "A weak jolt of\n" .string "electricity that\n" .string "paralyzes the foe.$" -BattleFrontier_Lounge7_Text_265FDD: @ 8265FDD +BattleFrontier_Lounge7_Text_265FDD:: @ 8265FDD .string "A fighting dance\n" .string "that sharply\n" .string "raises ATTACK.$" -BattleFrontier_Lounge7_Text_26600A: @ 826600A +BattleFrontier_Lounge7_Text_26600A:: @ 826600A .string "Curls up to con-\n" .string "ceal weak spots\n" .string "and raise DEFENSE.$" -BattleFrontier_Lounge7_Text_26603E: @ 826603E +BattleFrontier_Lounge7_Text_26603E:: @ 826603E .string "A loud attack\n" .string "that can be used\n" .string "only while asleep.$" -BattleFrontier_Lounge7_Text_266070: @ 8266070 +BattleFrontier_Lounge7_Text_266070:: @ 8266070 .string "Hurls mud in the\n" .string "foe’s face to re-\n" .string "duce its accuracy.$" -BattleFrontier_Lounge7_Text_2660A6: @ 82660A6 +BattleFrontier_Lounge7_Text_2660A6:: @ 82660A6 .string "Sprays star-\n" .string "shaped rays\n" .string "that never miss.$" -BattleFrontier_Lounge7_Text_2660D0: @ 82660D0 +BattleFrontier_Lounge7_Text_2660D0:: @ 82660D0 .string "A chilling attack\n" .string "that lowers the\n" .string "foe’s SPEED.$" -BattleFrontier_Lounge7_Text_2660FF: @ 82660FF +BattleFrontier_Lounge7_Text_2660FF:: @ 82660FF .string "Endures any at-\n" .string "tack for 1 turn,\n" .string "leaving 1HP.$" -BattleFrontier_Lounge7_Text_26612D: @ 826612D +BattleFrontier_Lounge7_Text_26612D:: @ 826612D .string "Copies the foe’s\n" .string "effect(s) and\n" .string "gives to the user.$" -BattleFrontier_Lounge7_Text_26615F: @ 826615F +BattleFrontier_Lounge7_Text_26615F:: @ 826615F .string "An icy punch\n" .string "that may\n" .string "freeze the foe.$" -BattleFrontier_Lounge7_Text_266185: @ 8266185 +BattleFrontier_Lounge7_Text_266185:: @ 8266185 .string "An electrified\n" .string "punch that may\n" .string "paralyze the foe.$" -BattleFrontier_Lounge7_Text_2661B5: @ 82661B5 +BattleFrontier_Lounge7_Text_2661B5:: @ 82661B5 .string "A fiery punch\n" .string "that may burn\n" .string "the foe.$" diff --git a/data/strings.s b/data/strings.s index 9e147c012..a0661f13d 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1619,16 +1619,16 @@ gText_DecorationReturnedToPC:: @ 85EAAC5 gText_NoDecorationsInUse:: @ 85EAAEC .string "There are no decorations in use.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EAB0F:: @ 85EAB0F +gText_Tristan:: @ 85EAB0F .string "TRISTAN$" -gUnknown_085EAB17:: @ 85EAB17 +gText_Philip:: @ 85EAB17 .string "PHILIP$" -gUnknown_085EAB1E:: @ 85EAB1E +gText_Dennis:: @ 85EAB1E .string "DENNIS$" -gUnknown_085EAB25:: @ 85EAB25 +gText_Roberto:: @ 85EAB25 .string "ROBERTO$" gText_TurnOff:: @ 85EAB2D @@ -2282,19 +2282,19 @@ gUnknown_085EB4D4:: @ 85EB4D4 gUnknown_085EB4E0:: @ 85EB4E0 .string "OPEN LEVEL$" -gUnknown_085EB4EB:: @ 85EB4EB +gText_BattleBasics:: @ 85EB4EB .string "BATTLE BASICS$" -gUnknown_085EB4F9:: @ 85EB4F9 +gText_PokemonNature:: @ 85EB4F9 .string "POKéMON NATURE$" -gUnknown_085EB508:: @ 85EB508 +gText_PokemonMoves:: @ 85EB508 .string "POKéMON MOVES$" -gUnknown_085EB516:: @ 85EB516 +gText_Underpowered:: @ 85EB516 .string "UNDERPOWERED$" -gUnknown_085EB523:: @ 85EB523 +gText_WhenInDanger:: @ 85EB523 .string "WHEN IN DANGER$" gUnknown_085EB532:: @ 85EB532 @@ -2321,7 +2321,7 @@ gUnknown_085EB589:: @ 85EB589 gUnknown_085EB597:: @ 85EB597 .string "BATTLE POKéMON$" -gUnknown_085EB5A6:: @ 85EB5A6 +gText_BattleTrainers:: @ 85EB5A6 .string "BATTLE TRAINERS$" gUnknown_085EB5B6:: @ 85EB5B6 @@ -2363,73 +2363,73 @@ gText_Son:: @ 85EB60A gText_Daughter:: @ 85EB60E .string "daughter$" -gUnknown_085EB617:: @ 85EB617 +gText_BlueFlute:: @ 85EB617 .string "BLUE FLUTE$" -gUnknown_085EB622:: @ 85EB622 +gText_YellowFlute:: @ 85EB622 .string "YELLOW FLUTE$" -gUnknown_085EB62F:: @ 85EB62F +gText_RedFlute:: @ 85EB62F .string "RED FLUTE$" -gUnknown_085EB639:: @ 85EB639 +gText_WhiteFlute:: @ 85EB639 .string "WHITE FLUTE$" -gUnknown_085EB645:: @ 85EB645 +gText_BlackFlute:: @ 85EB645 .string "BLACK FLUTE$" -gUnknown_085EB651:: @ 85EB651 +gText_PrettyChair:: @ 85EB651 .string "PRETTY CHAIR$" -gUnknown_085EB65E:: @ 85EB65E +gText_PrettyDesk:: @ 85EB65E .string "PRETTY DESK$" -gUnknown_085EB66A:: @ 85EB66A +gText_1F:: @ 85EB66A .string "1F$" -gUnknown_085EB66D:: @ 85EB66D +gText_2F:: @ 85EB66D .string "2F$" -gUnknown_085EB670:: @ 85EB670 +gText_3F:: @ 85EB670 .string "3F$" -gUnknown_085EB673:: @ 85EB673 +gText_4F:: @ 85EB673 .string "4F$" -gUnknown_085EB676:: @ 85EB676 +gText_5F:: @ 85EB676 .string "5F$" -gUnknown_085EB679:: @ 85EB679 +gText_6F:: @ 85EB679 .string "6F$" -gUnknown_085EB67C:: @ 85EB67C +gText_7F:: @ 85EB67C .string "7F$" -gUnknown_085EB67F:: @ 85EB67F +gText_8F:: @ 85EB67F .string "8F$" -gUnknown_085EB682:: @ 85EB682 +gText_9F:: @ 85EB682 .string "9F$" -gUnknown_085EB685:: @ 85EB685 +gText_10F:: @ 85EB685 .string "10F$" -gUnknown_085EB689:: @ 85EB689 +gText_11F:: @ 85EB689 .string "11F$" -gUnknown_085EB68D:: @ 85EB68D +gText_B1F:: @ 85EB68D .string "B1F$" -gUnknown_085EB691:: @ 85EB691 +gText_B2F:: @ 85EB691 .string "B2F$" -gUnknown_085EB695:: @ 85EB695 +gText_B3F:: @ 85EB695 .string "B3F$" -gUnknown_085EB699:: @ 85EB699 +gText_B4F:: @ 85EB699 .string "B4F$" -gUnknown_085EB69D:: @ 85EB69D +gText_Rooftop:: @ 85EB69D .string "ROOFTOP$" gText_ElevatorNowOn:: @ 85EB6A5 @@ -2438,43 +2438,43 @@ gText_ElevatorNowOn:: @ 85EB6A5 gText_BP:: @ 85EB6AD .string "BP$" -gUnknown_085EB6B0:: @ 85EB6B0 +gText_EnergyPowder50:: @ 85EB6B0 .string "ENERGYPOWDER{CLEAR_TO 0x72}{SIZE 0}50$" -gUnknown_085EB6C5:: @ 85EB6C5 +gText_EnergyRoot80:: @ 85EB6C5 .string "ENERGY ROOT{CLEAR_TO 0x72}{SIZE 0}80$" -gUnknown_085EB6D9:: @ 85EB6D9 +gText_HealPowder50:: @ 85EB6D9 .string "HEAL POWDER{CLEAR_TO 0x72}{SIZE 0}50$" -gUnknown_085EB6ED:: @ 85EB6ED +gText_RevivalHerb300:: @ 85EB6ED .string "REVIVAL HERB{CLEAR_TO 0x6C}{SIZE 0}300$" -gUnknown_085EB703:: @ 85EB703 +gText_Protein1000:: @ 85EB703 .string "PROTEIN{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB716:: @ 85EB716 +gText_Iron1000:: @ 85EB716 .string "IRON{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB726:: @ 85EB726 +gText_Carbos1000:: @ 85EB726 .string "CARBOS{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB738:: @ 85EB738 +gText_Calcium1000:: @ 85EB738 .string "CALCIUM{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB74B:: @ 85EB74B +gText_Zinc1000:: @ 85EB74B .string "ZINC{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB75B:: @ 85EB75B +gText_HPUp1000:: @ 85EB75B .string "HP UP{CLEAR_TO 0x63}{SIZE 0}1,000$" -gUnknown_085EB76C:: @ 85EB76C +gText_PPUp3000:: @ 85EB76C .string "PP UP{CLEAR_TO 0x63}{SIZE 0}3,000$" -gUnknown_085EB77D:: @ 85EB77D +gText_RankingHall:: @ 85EB77D .string "RANKING HALL$" -gUnknown_085EB78A:: @ 85EB78A +gText_ExchangeService:: @ 85EB78A .string "EXCHANGE SERVICE$" gText_LilycoveCity:: @ 85EB79B @@ -3293,190 +3293,190 @@ gText_Second:: @ 85ECB80 gText_Third:: @ 85ECB87 .string "third$" -gUnknown_085ECB8D:: @ 85ECB8D +gText_0Pts:: @ 85ECB8D .string "0 pts$" -gUnknown_085ECB93:: @ 85ECB93 +gText_10Pts:: @ 85ECB93 .string "10 pts$" -gUnknown_085ECB9A:: @ 85ECB9A +gText_20Pts:: @ 85ECB9A .string "20 pts$" -gUnknown_085ECBA1:: @ 85ECBA1 +gText_30Pts:: @ 85ECBA1 .string "30 pts$" -gUnknown_085ECBA8:: @ 85ECBA8 +gText_40Pts:: @ 85ECBA8 .string "40 pts$" -gUnknown_085ECBAF:: @ 85ECBAF +gText_50Pts:: @ 85ECBAF .string "50 pts$" -gUnknown_085ECBB6:: @ 85ECBB6 +gText_60Pts:: @ 85ECBB6 .string "60 pts$" -gUnknown_085ECBBD:: @ 85ECBBD +gText_70Pts:: @ 85ECBBD .string "70 pts$" -gUnknown_085ECBC4:: @ 85ECBC4 +gText_80Pts:: @ 85ECBC4 .string "80 pts$" -gUnknown_085ECBCB:: @ 85ECBCB +gText_90Pts:: @ 85ECBCB .string "90 pts$" -gUnknown_085ECBD2:: @ 85ECBD2 +gText_100Pts:: @ 85ECBD2 .string "100 pts$" -gUnknown_085ECBDA:: @ 85ECBDA +gText_QuestionMark:: @ 85ECBDA .string "?$" -gUnknown_085ECBDC:: @ 85ECBDC +gText_KissPoster16BP:: @ 85ECBDC .string "KISS POSTER{CLEAR_TO 0x5E}16BP$" -gUnknown_085ECBEF:: @ 85ECBEF +gText_KissCushion32BP:: @ 85ECBEF .string "KISS CUSHION{CLEAR_TO 0x5E}32BP$" -gUnknown_085ECC03:: @ 85ECC03 +gText_SmoochumDoll32BP:: @ 85ECC03 .string "SMOOCHUM DOLL{CLEAR_TO 0x5E}32BP$" -gUnknown_085ECC18:: @ 85ECC18 +gText_TogepiDoll48BP:: @ 85ECC18 .string "TOGEPI DOLL{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECC2B:: @ 85ECC2B +gText_MeowthDoll48BP:: @ 85ECC2B .string "MEOWTH DOLL{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECC3E:: @ 85ECC3E +gText_ClefairyDoll48BP:: @ 85ECC3E .string "CLEFAIRY DOLL{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECC53:: @ 85ECC53 +gText_DittoDoll48BP:: @ 85ECC53 .string "DITTO DOLL{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECC65:: @ 85ECC65 +gText_CyndaquilDoll80BP:: @ 85ECC65 .string "CYNDAQUIL DOLL{CLEAR_TO 0x5E}80BP$" -gUnknown_085ECC7B:: @ 85ECC7B +gText_ChikoritaDoll80BP:: @ 85ECC7B .string "CHIKORITA DOLL{CLEAR_TO 0x5E}80BP$" -gUnknown_085ECC91:: @ 85ECC91 +gText_TotodileDoll80BP:: @ 85ECC91 .string "TOTODILE DOLL{CLEAR_TO 0x5E}80BP$" -gUnknown_085ECCA6:: @ 85ECCA6 +gText_LaprasDoll128BP:: @ 85ECCA6 .string "LAPRAS DOLL{CLEAR_TO 0x58}128BP$" -gUnknown_085ECCBA:: @ 85ECCBA +gText_SnorlaxDoll128BP:: @ 85ECCBA .string "SNORLAX DOLL{CLEAR_TO 0x58}128BP$" -gUnknown_085ECCCF:: @ 85ECCCF +gText_VenusaurDoll256BP:: @ 85ECCCF .string "VENUSAUR DOLL{CLEAR_TO 0x58}256BP$" -gUnknown_085ECCE5:: @ 85ECCE5 +gText_CharizardDoll256BP:: @ 85ECCE5 .string "CHARIZARD DOLL{CLEAR_TO 0x58}256BP$" -gUnknown_085ECCFC:: @ 85ECCFC +gText_BlastoiseDoll256BP:: @ 85ECCFC .string "BLASTOISE DOLL{CLEAR_TO 0x58}256BP$" -gUnknown_085ECD13:: @ 85ECD13 +gText_Protein1BP:: @ 85ECD13 .string "PROTEIN{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD21:: @ 85ECD21 +gText_Calcium1BP:: @ 85ECD21 .string "CALCIUM{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD2F:: @ 85ECD2F +gText_Iron1BP:: @ 85ECD2F .string "IRON{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD3A:: @ 85ECD3A +gText_Zinc1BP:: @ 85ECD3A .string "ZINC{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD45:: @ 85ECD45 +gText_Carbos1BP:: @ 85ECD45 .string "CARBOS{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD52:: @ 85ECD52 +gText_HpUp1BP:: @ 85ECD52 .string "HP UP{CLEAR_TO 0x64}1BP$" -gUnknown_085ECD5E:: @ 85ECD5E +gText_Leftovers48BP:: @ 85ECD5E .string "LEFTOVERS{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECD6F:: @ 85ECD6F +gText_WhiteHerb48BP:: @ 85ECD6F .string "WHITE HERB{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECD81:: @ 85ECD81 +gText_QuickClaw48BP:: @ 85ECD81 .string "QUICK CLAW{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECD93:: @ 85ECD93 +gText_MentalHerb48BP:: @ 85ECD93 .string "MENTAL HERB{CLEAR_TO 0x5E}48BP$" -gUnknown_085ECDA6:: @ 85ECDA6 +gText_BrightPowder64BP:: @ 85ECDA6 .string "BRIGHTPOWDER{CLEAR_TO 0x5E}64BP$" -gUnknown_085ECDBA:: @ 85ECDBA +gText_ChoiceBand64BP:: @ 85ECDBA .string "CHOICE BAND{CLEAR_TO 0x5E}64BP$" -gUnknown_085ECDCD:: @ 85ECDCD +gText_KingsRock64BP:: @ 85ECDCD .string "KING’S ROCK{CLEAR_TO 0x5E}64BP$" -gUnknown_085ECDE0:: @ 85ECDE0 +gText_FocusBand64BP:: @ 85ECDE0 .string "FOCUS BAND{CLEAR_TO 0x5E}64BP$" -gUnknown_085ECDF2:: @ 85ECDF2 +gText_ScopeLens64BP:: @ 85ECDF2 .string "SCOPE LENS{CLEAR_TO 0x5E}64BP$" -gUnknown_085ECE04:: @ 85ECE04 +gText_Softboiled16BP:: @ 85ECE04 .string "SOFTBOILED{CLEAR_TO 0x4E}16BP$" -gUnknown_085ECE16:: @ 85ECE16 +gText_SeismicToss24BP:: @ 85ECE16 .string "SEISMIC TOSS{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECE2A:: @ 85ECE2A +gText_DreamEater24BP:: @ 85ECE2A .string "DREAM EATER{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECE3D:: @ 85ECE3D +gText_MegaPunch24BP:: @ 85ECE3D .string "MEGA PUNCH{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECE4F:: @ 85ECE4F +gText_MegaKick48BP:: @ 85ECE4F .string "MEGA KICK{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECE60:: @ 85ECE60 +gText_BodySlam48BP:: @ 85ECE60 .string "BODY SLAM{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECE71:: @ 85ECE71 +gText_RockSlide48BP:: @ 85ECE71 .string "ROCK SLIDE{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECE83:: @ 85ECE83 +gText_Counter48BP:: @ 85ECE83 .string "COUNTER{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECE92:: @ 85ECE92 +gText_ThunderWave48BP:: @ 85ECE92 .string "THUNDER WAVE{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECEA6:: @ 85ECEA6 +gText_SwordsDance48BP:: @ 85ECEA6 .string "SWORDS DANCE{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECEBA:: @ 85ECEBA +gText_DefenseCurl16BP:: @ 85ECEBA .string "DEFENSE CURL{CLEAR_TO 0x4E}16BP$" -gUnknown_085ECECE:: @ 85ECECE +gText_Snore24BP:: @ 85ECECE .string "SNORE{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECEDB:: @ 85ECEDB +gText_MudSlap24BP:: @ 85ECEDB .string "MUD-SLAP{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECEEB:: @ 85ECEEB +gText_Swift24BP:: @ 85ECEEB .string "SWIFT{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECEF8:: @ 85ECEF8 +gText_IcyWind24BP:: @ 85ECEF8 .string "ICY WIND{CLEAR_TO 0x4E}24BP$" -gUnknown_085ECF08:: @ 85ECF08 +gText_Endure48BP:: @ 85ECF08 .string "ENDURE{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECF16:: @ 85ECF16 +gText_PsychUp48BP:: @ 85ECF16 .string "PSYCH UP{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECF26:: @ 85ECF26 +gText_IcePunch48BP:: @ 85ECF26 .string "ICE PUNCH{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECF37:: @ 85ECF37 +gText_ThunderPunch48BP:: @ 85ECF37 .string "THUNDERPUNCH{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECF4B:: @ 85ECF4B +gText_FirePunch48BP:: @ 85ECF4B .string "FIRE PUNCH{CLEAR_TO 0x4E}48BP$" gText_PkmnFainted3:: @ 85ECF5D diff --git a/data/trader.s b/data/trader.s new file mode 100644 index 000000000..1fe929ae7 --- /dev/null +++ b/data/trader.s @@ -0,0 +1,22 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_085B09E4:: @ 85B09E4 + .4byte gText_Tristan + .4byte gText_Philip + .4byte gText_Dennis + .4byte gText_Roberto + + .align 2 +gUnknown_085B09F4:: @ 85B09F4 + .byte 0x5b, 0x6b, 0x25, 0x15 + + .align 2 +gUnknown_085B09F8:: @ 85B09F8 + .4byte 0x0a010100, 0x00010f0a + + diff --git a/graphics/evolution_scene/bg.bin b/graphics/evolution_scene/bg.bin Binary files differnew file mode 100644 index 000000000..583ebac2b --- /dev/null +++ b/graphics/evolution_scene/bg.bin diff --git a/graphics/evolution_scene/bg.png b/graphics/evolution_scene/bg.png Binary files differnew file mode 100644 index 000000000..d62ac543e --- /dev/null +++ b/graphics/evolution_scene/bg.png diff --git a/graphics/evolution_scene/bg2.bin b/graphics/evolution_scene/bg2.bin Binary files differnew file mode 100644 index 000000000..7afab112a --- /dev/null +++ b/graphics/evolution_scene/bg2.bin diff --git a/graphics/evolution_scene/gray_transition_darken.pal b/graphics/evolution_scene/gray_transition_darken.pal new file mode 100644 index 000000000..97d117330 --- /dev/null +++ b/graphics/evolution_scene/gray_transition_darken.pal @@ -0,0 +1,211 @@ +JASC-PAL +0100 +208 +0 0 0 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +98 106 106 +0 0 0 +0 0 0 +0 0 0 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +98 106 106 +115 123 123 +0 0 0 +0 0 0 +0 0 0 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +0 0 0 +0 0 0 +0 0 0 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +0 0 0 +0 0 0 +0 0 0 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +0 0 0 +0 0 0 +0 0 0 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +0 0 0 +0 0 0 +0 0 0 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +0 0 0 +0 0 0 +0 0 0 +115 123 123 +98 106 106 +90 90 90 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +98 106 106 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/gray_transition_intro.pal b/graphics/evolution_scene/gray_transition_intro.pal new file mode 100644 index 000000000..323623a15 --- /dev/null +++ b/graphics/evolution_scene/gray_transition_intro.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +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 +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 +0 0 0 +90 90 90 +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 +90 90 90 +98 106 106 +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 +90 90 90 +98 106 106 +115 123 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 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +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 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +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 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +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 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +0 0 0 +0 0 0 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +0 0 0 +0 0 0 +0 0 0 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +246 246 246 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/gray_transition_lighten.pal b/graphics/evolution_scene/gray_transition_lighten.pal new file mode 100644 index 000000000..813db93dc --- /dev/null +++ b/graphics/evolution_scene/gray_transition_lighten.pal @@ -0,0 +1,179 @@ +JASC-PAL +0100 +176 +0 0 0 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +0 0 0 +0 0 0 +0 0 0 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +0 0 0 +0 0 0 +0 0 0 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +0 0 0 +0 0 0 +0 0 0 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +0 0 0 +0 0 0 +0 0 0 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +0 0 0 +0 0 0 +0 0 0 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +0 0 0 +0 0 0 +0 0 0 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +0 0 0 +0 0 0 +0 0 0 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +0 0 0 +0 0 0 +0 0 0 +230 230 230 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +0 0 0 +0 0 0 +0 0 0 +246 246 246 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/gray_transition_outro.pal b/graphics/evolution_scene/gray_transition_outro.pal new file mode 100644 index 000000000..f122f40fe --- /dev/null +++ b/graphics/evolution_scene/gray_transition_outro.pal @@ -0,0 +1,211 @@ +JASC-PAL +0100 +208 +0 0 0 +246 246 246 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 230 230 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 213 213 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 205 205 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 189 189 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +172 172 172 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +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 +156 164 164 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +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 +148 148 148 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +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 +131 131 131 +115 123 123 +98 106 106 +90 90 90 +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 +115 123 123 +98 106 106 +90 90 90 +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 +98 106 106 +90 90 90 +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 +90 90 90 +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 +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 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/transition.pal b/graphics/evolution_scene/transition.pal new file mode 100644 index 000000000..b0f4d3815 --- /dev/null +++ b/graphics/evolution_scene/transition.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +16 16 16 +24 32 32 +41 49 49 +49 65 74 +65 82 90 +74 98 115 +90 115 131 +106 131 148 +115 148 172 +131 164 189 +139 180 213 +156 197 230 +172 213 255 +0 0 0 +0 0 0 +0 0 0 +65 90 106 +74 98 115 +82 106 131 +90 115 139 +98 131 156 +106 139 164 +115 148 180 +123 156 189 +131 172 205 +139 180 213 +148 189 230 +156 197 238 +172 213 255 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/unknown_5B4114.pal b/graphics/evolution_scene/unknown_5B4114.pal new file mode 100644 index 000000000..2cd4981fd --- /dev/null +++ b/graphics/evolution_scene/unknown_5B4114.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_5B2850.pal b/graphics/unknown/unknown_5B2850.pal new file mode 100644 index 000000000..98a1fb3c8 --- /dev/null +++ b/graphics/unknown/unknown_5B2850.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/unknown/unknown_5B2870.pal b/graphics/unknown/unknown_5B2870.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/unknown/unknown_5B2870.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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_5B2890.pal b/graphics/unknown/unknown_5B2890.pal new file mode 100644 index 000000000..fea15a176 --- /dev/null +++ b/graphics/unknown/unknown_5B2890.pal @@ -0,0 +1,11 @@ +JASC-PAL +0100 +8 +148 197 172 +16 16 16 +32 32 32 +49 49 49 +65 65 65 +82 82 82 +98 98 98 +115 115 115 diff --git a/graphics/unknown/unknown_5B28A0.pal b/graphics/unknown/unknown_5B28A0.pal new file mode 100644 index 000000000..09eb37624 --- /dev/null +++ b/graphics/unknown/unknown_5B28A0.pal @@ -0,0 +1,11 @@ +JASC-PAL +0100 +8 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 diff --git a/graphics/unknown/unknown_5B28B0.bin b/graphics/unknown/unknown_5B28B0.bin Binary files differnew file mode 100644 index 000000000..4293bfd1c --- /dev/null +++ b/graphics/unknown/unknown_5B28B0.bin diff --git a/graphics/unknown/unknown_5B2A90.png b/graphics/unknown/unknown_5B2A90.png Binary files differnew file mode 100644 index 000000000..dd265149f --- /dev/null +++ b/graphics/unknown/unknown_5B2A90.png diff --git a/graphics/unknown/unknown_5B3280.pal b/graphics/unknown/unknown_5B3280.pal new file mode 100644 index 000000000..a23813afb --- /dev/null +++ b/graphics/unknown/unknown_5B3280.pal @@ -0,0 +1,179 @@ +JASC-PAL +0100 +176 +115 197 164 +180 180 180 +148 148 148 +90 90 98 +57 57 74 +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 +222 222 222 +0 0 0 +115 197 164 +180 180 172 +156 139 139 +98 82 90 +57 49 65 +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 +115 197 164 +189 180 172 +164 131 131 +106 74 82 +65 41 57 +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 +115 197 164 +197 180 172 +172 123 123 +123 65 74 +74 41 49 +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 +115 197 164 +205 189 164 +189 115 115 +131 65 65 +82 32 41 +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 +115 197 164 +213 189 164 +197 115 115 +148 57 65 +90 32 41 +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 +115 197 164 +222 189 164 +205 106 106 +156 49 57 +98 24 32 +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 +115 197 164 +230 197 156 +222 98 98 +164 49 49 +106 16 24 +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 +115 197 164 +238 197 156 +230 90 90 +180 41 41 +115 16 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 +115 197 164 +246 197 156 +238 82 82 +189 32 32 +123 8 8 +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 +115 197 164 +255 205 156 +255 82 82 +205 32 32 +131 8 8 +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/unknown/unknown_5B3484.png b/graphics/unknown/unknown_5B3484.png Binary files differnew file mode 100644 index 000000000..1a39ccb74 --- /dev/null +++ b/graphics/unknown/unknown_5B3484.png diff --git a/graphics/unknown/unknown_5B3544.pal b/graphics/unknown/unknown_5B3544.pal new file mode 100644 index 000000000..d6994a324 --- /dev/null +++ b/graphics/unknown/unknown_5B3544.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +74 74 74 +189 131 156 +230 156 213 +222 238 255 +230 246 255 +148 115 139 +197 213 222 +172 164 189 +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/unknown/unknown_5B3564.bin b/graphics/unknown/unknown_5B3564.bin Binary files differnew file mode 100644 index 000000000..a3691cfd7 --- /dev/null +++ b/graphics/unknown/unknown_5B3564.bin diff --git a/graphics/unknown/unknown_5B3D94.pal b/graphics/unknown/unknown_5B3D94.pal new file mode 100644 index 000000000..905a16c23 --- /dev/null +++ b/graphics/unknown/unknown_5B3D94.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 139 139 +255 115 115 +255 213 213 +255 65 65 +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/unknown/unknown_5B3DB4.png b/graphics/unknown/unknown_5B3DB4.png Binary files differnew file mode 100644 index 000000000..a54dd61d5 --- /dev/null +++ b/graphics/unknown/unknown_5B3DB4.png diff --git a/graphics/unknown/unknown_5B404C.pal b/graphics/unknown/unknown_5B404C.pal new file mode 100644 index 000000000..fabc36fad --- /dev/null +++ b/graphics/unknown/unknown_5B404C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 180 0 +0 0 0 +255 0 0 +255 49 49 +255 230 230 +255 156 156 +255 205 205 +255 255 255 +255 255 49 +106 255 255 +172 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_5B406C.png b/graphics/unknown/unknown_5B406C.png Binary files differnew file mode 100644 index 000000000..55c401eb9 --- /dev/null +++ b/graphics/unknown/unknown_5B406C.png diff --git a/ld_script.txt b/ld_script.txt index 394264024..e88c04f3d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -424,10 +424,14 @@ SECTIONS { data/slot_machine.o(.rodata); data/contest_painting.o(.rodata); src/battle_ai_script_commands.o(.rodata); - data/data4.o(.rodata); + data/trader.o(.rodata); data/starter_choose.o(.rodata); src/wallclock.o(.rodata); src/pokeblock.o(.rodata); + data/rom_81370FC.o(.rodata); + data/battle_records.o(.rodata); + data/pokedex_area_screen.o(.rodata); + src/evolution_scene.o(.rodata); data/data4d.o(.rodata); src/battle_controller_link_partner.o(.rodata); src/battle_message.o(.rodata); diff --git a/src/evolution_scene.c b/src/evolution_scene.c index bfb558444..580e88ad7 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -60,16 +60,8 @@ extern u8 gBattleCommunication[]; extern const struct WindowTemplate gUnknown_0833900C; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; -extern const u8 gUnknown_085B58C9[][4]; -extern const u16 gUnknown_085B5884[]; -extern const u8 gUnknown_085B58D9[]; -extern const u16 gUnknown_085B51E4[]; -extern const u32 gUnknown_085B4134[]; -extern const u32 gUnknown_085B482C[]; -extern const u32 gUnknown_085B4D10[]; // strings -extern const u8 gText_ShedinjaJapaneseName2[]; extern const u8 gText_PkmnIsEvolving[]; extern const u8 gText_CongratsPkmnEvolved[]; extern const u8 gText_BattleYesNoChoice[]; @@ -108,6 +100,80 @@ static void InitMovingBackgroundTask(bool8 isLink); static void sub_813FEE8(u8 taskId); static void sub_8140174(void); +// const data +static const u16 sUnknown_085B4114[] = INCBIN_U16("graphics/evolution_scene/unknown_5B4114.gbapal"); +static const u32 sUnknown_085B4134[] = INCBIN_U32("graphics/evolution_scene/bg.4bpp.lz"); +static const u32 sUnknown_085B482C[] = INCBIN_U32("graphics/evolution_scene/bg.bin.lz"); +static const u32 sUnknown_085B4D10[] = INCBIN_U32("graphics/evolution_scene/bg2.bin.lz"); +static const u16 sUnknown_085B51E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_intro.gbapal"); +static const u16 sUnknown_085B53E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_lighten.gbapal"); +static const u16 sUnknown_085B5544[] = INCBIN_U16("graphics/evolution_scene/gray_transition_darken.gbapal"); +static const u16 sUnknown_085B56E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_outro.gbapal"); +static const u16 sUnknown_085B5884[] = INCBIN_U16("graphics/evolution_scene/transition.gbapal"); + +static const u8 Text_ShedinjaJapaneseName[] = _("ヌケニン"); + +static const u8 sUnknown_085B58C9[][4] = +{ + { 0x00, 0x0C, 0x01, 0x06 }, + { 0x0D, 0x24, 0x05, 0x02 }, + { 0x0D, 0x18, 0x01, 0x02 }, + { 0x25, 0x31, 0x01, 0x06 }, +}; + +static const u8 sUnknown_085B58D9[][16] = { + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x0B, 0x00, 0x00 }, + { 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00 }, + { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x00 }, + { 0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x00, 0x00 }, + { 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x00, 0x00 }, + { 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x00, 0x00 }, + { 0x00, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x00, 0x00 }, + { 0x00, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x00, 0x00 }, + { 0x00, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x00, 0x00 }, + { 0x00, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x00, 0x00 }, + { 0x00, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x00, 0x00 }, + { 0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x00, 0x00 }, + { 0x00, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x00, 0x00 }, + { 0x00, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x00, 0x00 }, + { 0x00, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00 }, + { 0x00, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x00, 0x00 }, + { 0x00, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x00, 0x00 }, + { 0x00, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00 }, + { 0x00, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00 }, + { 0x00, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00 }, + { 0x00, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00 }, + { 0x00, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00, 0x00 }, + { 0x00, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00 }, + { 0x00, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x00 }, + { 0x00, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x00, 0x00 }, + { 0x00, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00 }, + { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x00 }, + { 0x00, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00 }, + { 0x00, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } +}; + static void CB2_BeginEvolutionScene(void) { UpdatePaletteFade(); @@ -544,7 +610,7 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon) if (GetMonData(Shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA && GetMonData(Shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE && GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NINJASK) - SetMonData(Shedinja, MON_DATA_NICKNAME, gText_ShedinjaJapaneseName2); + SetMonData(Shedinja, MON_DATA_NICKNAME, Text_ShedinjaJapaneseName); } } @@ -1330,17 +1396,17 @@ static void sub_813FDEC(u8 taskId) if (data[5]++ < 20) return; - if (data[0]++ > gUnknown_085B58C9[data[2]][3]) + if (data[0]++ > sUnknown_085B58C9[data[2]][3]) { - if (gUnknown_085B58C9[data[2]][1] == data[1]) + if (sUnknown_085B58C9[data[2]][1] == data[1]) { data[3]++; - if (data[3] == gUnknown_085B58C9[data[2]][2]) + if (data[3] == sUnknown_085B58C9[data[2]][2]) { data[3] = 0; data[2]++; } - data[1] = gUnknown_085B58C9[data[2]][0]; + data[1] = sUnknown_085B58C9[data[2]][0]; } else { @@ -1411,7 +1477,7 @@ static void InitMovingBgValues(u16 *movingBgs) { for (j = 0; j < 16; j++) { - movingBgs[i * 16 + j] = gUnknown_085B5884[gUnknown_085B58D9[i * 16 + j]]; + movingBgs[i * 16 + j] = sUnknown_085B5884[sUnknown_085B58D9[i][j]]; } } } @@ -1428,11 +1494,11 @@ static void InitMovingBackgroundTask(bool8 isLink) else innerBgId = 1, outerBgId = 3; - LoadPalette(gUnknown_085B51E4, 0xA0, 0x20); + LoadPalette(sUnknown_085B51E4, 0xA0, 0x20); - copy_decompressed_tile_data_to_vram_autofree(1, gUnknown_085B4134, FALSE, 0, 0); - CopyToBgTilemapBuffer(1, gUnknown_085B482C, 0, 0); - CopyToBgTilemapBuffer(outerBgId, gUnknown_085B4D10, 0, 0); + copy_decompressed_tile_data_to_vram_autofree(1, sUnknown_085B4134, FALSE, 0, 0); + CopyToBgTilemapBuffer(1, sUnknown_085B482C, 0, 0); + CopyToBgTilemapBuffer(outerBgId, sUnknown_085B4D10, 0, 0); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(outerBgId); |
