diff options
Diffstat (limited to 'data')
138 files changed, 10496 insertions, 3534 deletions
diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s index 1b27b1044..c3768b355 100644 --- a/data/battle_anim_80A9C70.s +++ b/data/battle_anim_80A9C70.s @@ -3,7 +3,86 @@ .section .rodata - .incbin "baserom.gba", 0x53ede4, 0x14c + .align 2 +gUnknown_0853EDE4:: @ 853EDE4 + .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0xfffe, 0x0000 + + .align 2 +gUnknown_0853EDF8:: @ 853EDF8 + .4byte gUnknown_0853EDE4 + + .align 2 +gUnknown_0853EDFC:: @ 853EDFC + spr_template 0x2714, 0x2714, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC + spr_template 0x2714, 0x2714, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C + + .align 2 +gUnknown_0853EE2C:: @ 853EE2C + .2byte 0x0000, 0x0003, 0xfffe, 0x0000 + + .align 2 +gUnknown_0853EE34:: @ 853EE34 + .4byte gUnknown_0853EE2C + + .align 2 +gUnknown_0853EE38:: @ 853EE38 + spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30 + spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4 + + .align 2 +gUnknown_0853EE68:: @ 853EE68 + .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0x0040, 0x0003, 0xffff, 0x0000 + + .align 2 +gUnknown_0853EE80:: @ 853EE80 + .4byte gUnknown_0853EE68 + + .align 2 +gUnknown_0853EE84:: @ 853EE84 + spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64 + spr_template 0x2743, 0x2743, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC + + .align 2 +gUnknown_0853EEB4:: @ 853EEB4 + .2byte 0x0000, 0x0005, 0xfffe, 0x0000 + + .align 2 +gUnknown_0853EEBC:: @ 853EEBC + .2byte 0x0000, 0x0005, 0xfffe, 0x0000 + + .align 2 +gUnknown_0853EEC4:: @ 853EEC4 + .2byte 0x0000, 0x0005, 0xfffe, 0x0000 + + .align 2 +gUnknown_0853EECC:: @ 853EECC + .4byte gUnknown_0853EEB4 + .4byte gUnknown_0853EEBC + .4byte gUnknown_0853EEC4 + + .align 2 +gUnknown_0853EED8:: @ 853EED8 + spr_template 0x2797, 0x2797, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC + + .align 2 +gUnknown_0853EEF0:: @ 853EEF0 + .2byte 0x0000, 0x000f, 0xfffe, 0x0000 + + .align 2 +gUnknown_0853EEF8:: @ 853EEF8 + .4byte gUnknown_0853EEF0 + + .align 2 +gUnknown_0853EEFC:: @ 853EEFC + .2byte 0x0060, 0x0060, 0x0000, 0x0000, 0x0002, 0x0002, 0x0100, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000 + + .align 2 +gUnknown_0853EF14:: @ 853EF14 + .4byte gUnknown_0853EEFC + + .align 2 +gUnknown_0853EF18:: @ 853EF18 + spr_template 0x2714, 0x2714, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C .align 2 gUnknown_0853EF30:: @ 853EF30 diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s index d89a83daf..f8ebc0971 100644 --- a/data/battle_anim_815A0D4.s +++ b/data/battle_anim_815A0D4.s @@ -164,64 +164,327 @@ gUnknown_085CE284:: @ 85CE284 .align 2 gUnknown_085CE288:: @ 85CE288 spr_template 0x27f5, 0x27f5, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0 - + + .align 2 gUnknown_085CE2A0:: @ 85CE2A0 - .incbin "baserom.gba", 0x5ce2a0, 0xb0 + .2byte 0xfff4, 0x0008, 0x0400, 0x0000, 0x0014, 0xffec, 0x0400, 0x0000, 0xfff8, 0x000c, 0x0400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE2C0:: @ 85CE2C0 + .2byte 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE2C8:: @ 85CE2C8 + .4byte gUnknown_085CE2C0 + + .align 2 +gUnknown_085CE2CC:: @ 85CE2CC + .2byte 0x0000, 0x0000, 0x2805, 0x0000, 0x0000, 0x0000, 0x0a0a, 0x0000, 0x0000, 0x0000, 0x0a0f, 0x0000, 0x0000, 0x0000, 0x2814, 0x0000 + .2byte 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE2F4:: @ 85CE2F4 + .4byte gUnknown_085CE2CC + + .align 2 +gUnknown_085CE2F8:: @ 85CE2F8 + spr_template 0x27f6, 0x27f6, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C + + .align 2 +gUnknown_085CE310:: @ 85CE310 + .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0x0020, 0x0043, 0x0010, 0x0043, 0x0000, 0x0043, 0xfffd, 0x0001 + .2byte 0xffff, 0x0000 + + .align 2 +gUnknown_085CE334:: @ 85CE334 + .4byte gUnknown_085CE310 + + .align 2 +gUnknown_085CE338:: @ 85CE338 + spr_template 0x27fa, 0x27fa, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 + .align 2 gUnknown_085CE350:: @ 85CE350 - .incbin "baserom.gba", 0x5ce350, 0x38 + .2byte 0xfff4, 0x0014, 0x0800, 0x0000, 0x000c, 0xffec, 0x0800, 0x0000, 0x7ffd, 0x0002, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + .align 2 +gUnknown_085CE370:: @ 85CE370 + spr_template 0x27f2, 0x27f2, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394 + + .align 2 gUnknown_085CE388:: @ 85CE388 - .incbin "baserom.gba", 0x5ce388, 0x18 + spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C + .align 2 gUnknown_085CE3A0:: @ 85CE3A0 - .incbin "baserom.gba", 0x5ce3a0, 0x18 + spr_template 0x27f9, 0x27f9, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570 + .align 2 gUnknown_085CE3B8:: @ 85CE3B8 - .incbin "baserom.gba", 0x5ce3b8, 0x28 + .2byte 0x0008, 0xfff8, 0x0c00, 0x0000, 0xfff0, 0x0010, 0x0c00, 0x0000, 0x0008, 0xfff8, 0x0c00, 0x0000, 0x7ffd, 0x0001, 0x0000, 0x0000 + .2byte 0x7fff, 0x0000, 0x0000, 0x0000 + .align 2 gUnknown_085CE3E0:: @ 85CE3E0 - .incbin "baserom.gba", 0x5ce3e0, 0x50 + .2byte 0x0000, 0x0006, 0x1400, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000, 0x0000, 0xffee, 0x0600, 0x0000, 0xffee, 0xffee, 0x0300, 0x0000 + .2byte 0x0000, 0x0000, 0x0f00, 0x0000, 0x0004, 0x0004, 0x0d00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE418:: @ 85CE418 + spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C + .align 2 gUnknown_085CE430:: @ 85CE430 - .incbin "baserom.gba", 0x5ce430, 0x30 + .2byte 0x0000, 0x0006, 0x1400, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000, 0x0007, 0xffe2, 0x0600, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000 + .2byte 0xfffe, 0x0003, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + .align 2 gUnknown_085CE460:: @ 85CE460 - .incbin "baserom.gba", 0x5ce460, 0x2c + .byte 0xe8, 0x18, 0xfc, 0x00 + + .align 2 +gUnknown_085CE464:: @ 85CE464 + .2byte 0x0000, 0x0006, 0x0004, 0x0006, 0xfffe, 0x0000 + + .align 2 +gUnknown_085CE470:: @ 85CE470 + .2byte 0x0008, 0x0006, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE478:: @ 85CE478 + .2byte 0x000c, 0x0006, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE480:: @ 85CE480 + .4byte gUnknown_085CE464 + .4byte gUnknown_085CE470 + .4byte gUnknown_085CE478 + .align 2 gUnknown_085CE48C:: @ 85CE48C - .incbin "baserom.gba", 0x5ce48c, 0x18 + spr_template 0x2801, 0x2801, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04 + .align 2 gUnknown_085CE4A4:: @ 85CE4A4 - .incbin "baserom.gba", 0x5ce4a4, 0x4 + .byte 0x78, 0x50, 0x28, 0x00 + .align 2 gUnknown_085CE4A8:: @ 85CE4A8 - .incbin "baserom.gba", 0x5ce4a8, 0x8 + .2byte 0x0000, 0x0000, 0x0032, 0x0000 + .align 2 gUnknown_085CE4B0:: @ 85CE4B0 - .incbin "baserom.gba", 0x5ce4b0, 0x140 + .2byte 0x0000, 0xfff1, 0x0700, 0x0000, 0x0000, 0x000f, 0x0700, 0x0000, 0x7ffd, 0x0002, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE4D0:: @ 85CE4D0 + spr_template 0x2767, 0x2767, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815C400 + + .align 2 +gUnknown_085CE4E8:: @ 85CE4E8 + .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0003, 0x0088, 0x0002, 0x0088, 0x0000, 0x0088, 0x0001, 0x0088 + .2byte 0xfffe, 0x0000 + + .align 2 +gUnknown_085CE50C:: @ 85CE50C + .2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0003, 0x00c8, 0x0002, 0x00c8, 0x0000, 0x00c8, 0x0001, 0x00c8 + .2byte 0xfffe, 0x0000 + + .align 2 +gUnknown_085CE530:: @ 85CE530 + .2byte 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE538:: @ 85CE538 + .4byte gUnknown_085CE4E8 + .4byte gUnknown_085CE50C + .4byte gUnknown_085CE530 + + .align 2 +gUnknown_085CE544:: @ 85CE544 + spr_template 0x27fe, 0x27fe, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0 + + .align 2 +gUnknown_085CE55C:: @ 85CE55C + .byte 0x0c, 0x18, 0x10, 0x16, 0x13, 0x13, 0x15, 0x10, 0x17, 0x0c, 0x16, 0x07, 0x13, 0x04, 0x10, 0x01, 0x0b, 0x00, 0x06, 0x01, 0x04, 0x04, 0x01, 0x07, 0x00, 0x0c, 0x02, 0x11, 0x04, 0x13, 0x08, 0x16 + + .align 2 +gUnknown_085CE57C:: @ 85CE57C + .2byte 0x0000, 0x0005, 0x0004, 0x0009, 0x0008, 0x0005, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE58C:: @ 85CE58C + .4byte gUnknown_085CE57C + + .align 2 +gUnknown_085CE590:: @ 85CE590 + spr_template 0x27ff, 0x27ff, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C + spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88 + spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94 + spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4 + .align 2 gUnknown_085CE5F0:: @ 85CE5F0 - .incbin "baserom.gba", 0x5ce5f0, 0x15c + .2byte 0x0010, 0x0000, 0x0400, 0x0000, 0x0000, 0xfffd, 0x1000, 0x0000, 0x0004, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000 + .2byte 0xfffb, 0x0003, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + .align 2 +gUnknown_085CE620:: @ 85CE620 + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0xfff8, 0xfff8, 0x0800, 0x0000, 0x0008, 0x0008, 0x0800, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE640:: @ 85CE640 + .2byte 0x00c0, 0x00c0, 0x0000, 0x0000, 0x0008, 0x0008, 0x0800, 0x0000, 0xfff8, 0xfff8, 0x0800, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE660:: @ 85CE660 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0008, 0x0008, 0x0800, 0x0000, 0xfff8, 0xfff8, 0x0800, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE680:: @ 85CE680 + .4byte gUnknown_085CE620 + .4byte gUnknown_085CE640 + .4byte gUnknown_085CE660 + + .align 2 +gUnknown_085CE68C:: @ 85CE68C + spr_template 0x2802, 0x2802, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4 + + .align 2 +gUnknown_085CE6A4:: @ 85CE6A4 + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0xfffc, 0xfffa, 0x1000, 0x0000, 0x0004, 0x0006, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE6C4:: @ 85CE6C4 + .2byte 0x00c0, 0x00c0, 0x0000, 0x0000, 0x0004, 0x0006, 0x1000, 0x0000, 0xfffc, 0xfffa, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE6E4:: @ 85CE6E4 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0004, 0x0006, 0x1000, 0x0000, 0xfffc, 0xfffa, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE704:: @ 85CE704 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0008, 0x000a, 0x1e00, 0x0000, 0xfff8, 0xfff6, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE724:: @ 85CE724 + .4byte gUnknown_085CE6A4 + .4byte gUnknown_085CE6C4 + .4byte gUnknown_085CE6E4 + .4byte gUnknown_085CE704 + + .align 2 +gUnknown_085CE734:: @ 85CE734 + spr_template 0x2802, 0x2802, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870 + + .align 2 gUnknown_085CE74C:: @ 85CE74C - .incbin "baserom.gba", 0x5ce74c, 0x20 + .2byte 0xfff0, 0x0010, 0x0600, 0x0000, 0x0010, 0xfff0, 0x0c00, 0x0000, 0xfff0, 0x0010, 0x0600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + .align 2 gUnknown_085CE76C:: @ 85CE76C - .incbin "baserom.gba", 0x5ce76c, 0x18 + spr_template 0x2803, 0x2803, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC + .align 2 gUnknown_085CE784:: @ 85CE784 - .incbin "baserom.gba", 0x5ce784, 0x68 + .byte 0x3c, 0x07, 0xbc, 0x16, 0x5b, 0x22, 0xdb, 0x2d, 0x5a, 0x3d, 0xfa, 0x48, 0x79, 0x54, 0x19, 0x64, 0x19, 0x5c, 0x19, 0x50, 0x19, 0x40, 0x19, 0x34, 0x1a, 0x28, 0x1a, 0x18, 0x1a, 0x0c, 0x1b, 0x00 + .byte 0x3b, 0x00, 0xbb, 0x00, 0x3b, 0x01, 0x9b, 0x01, 0x1c, 0x02, 0x7c, 0x02, 0xfc, 0x02, 0x7d, 0x03 + + .align 2 +gUnknown_085CE7B4:: @ 85CE7B4 + .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0xfffe, 0x0000 + + .align 2 +gUnknown_085CE7C0:: @ 85CE7C0 + .2byte 0x0020, 0x0003, 0x0030, 0x0003, 0xfffe, 0x0000 + + .align 2 +gUnknown_085CE7CC:: @ 85CE7CC + .4byte gUnknown_085CE7B4 + .4byte gUnknown_085CE7C0 + + .align 2 +gUnknown_085CE7D4:: @ 85CE7D4 + spr_template 0x2745, 0x2745, gUnknown_08524914, gUnknown_085CE7CC, NULL, gDummySpriteAffineAnimTable, sub_815E01C + .align 2 gUnknown_085CE7EC:: @ 85CE7EC - .incbin "baserom.gba", 0x5ce7ec, 0x60 + spr_template 0x2808, 0x2808, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404 + spr_template 0x280c, 0x280c, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444 + + .align 2 +gUnknown_085CE81C:: @ 85CE81C + .2byte 0x0000, 0x0000, 0x18fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE82C:: @ 85CE82C + .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x1804, 0x0000 + .2byte 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE844:: @ 85CE844 + .4byte gUnknown_085CE81C + .4byte gUnknown_085CE82C + .align 2 gUnknown_085CE84C:: @ 85CE84C - .incbin "baserom.gba", 0x5ce84c, 0x30 + spr_template 0x280e, 0x280e, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy + spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8 + .align 2 gUnknown_085CE87C:: @ 85CE87C - .incbin "baserom.gba", 0x5ce87c, 0x14c + .2byte 0x0000, 0xfff0, 0x0600, 0x0000, 0x0000, 0x0010, 0x0600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE894:: @ 85CE894 + spr_template 0x280f, 0x280f, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954 + spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14 + spr_template 0x2812, 0x2812, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84 + spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C + spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 + spr_template 0x280a, 0x280a, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C + spr_template 0x27f0, 0x27f0, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80 + + .align 2 +gUnknown_085CE93C:: @ 85CE93C + .2byte 0x0000, 0x0004, 0x0040, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE948:: @ 85CE948 + .4byte gUnknown_085CE93C + + .align 2 +gUnknown_085CE94C:: @ 85CE94C + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x08fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE964:: @ 85CE964 + .2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE97C:: @ 85CE97C + .4byte gUnknown_085CE94C + .4byte gUnknown_085CE964 + + .align 2 +gUnknown_085CE984:: @ 85CE984 + spr_template 0x2825, 0x2825, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338 + + .align 2 +gUnknown_085CE99C:: @ 85CE99C + .2byte 0x0000, 0x0000, 0x40fc, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE9AC:: @ 85CE9AC + .4byte gUnknown_085CE99C + + .align 2 +gUnknown_085CE9B0:: @ 85CE9B0 + spr_template 0x2826, 0x2826, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8 + .align 2 gUnknown_085CE9C8:: @ 85CE9C8 - .incbin "baserom.gba", 0x5ce9c8, 0x1e8 + .2byte 0x0000, 0x0010, 0x0400, 0x0000, 0xfffe, 0x0000, 0x0800, 0x0000, 0x0000, 0x0004, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000 + .2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000, 0x03e0, 0x001f, 0x001c, 0x001a, 0x0018, 0x0000, 0x0000, 0x0000 + .2byte 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6318, 0x0000, 0x7fff diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s index a32f3151b..de0d0cb46 100644 --- a/data/battle_frontier_1.s +++ b/data/battle_frontier_1.s @@ -5,12 +5,207 @@ .section .rodata - .align 2, 0 gUnknown_0860B358:: @ 860B358 - .incbin "baserom.gba", 0x60b358, 0x1630 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x01, 0x00, 0x00, 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 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 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, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 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, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 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, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 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, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01 gUnknown_0860C988:: @ 860C988 - .incbin "baserom.gba", 0x60c988, 0x269 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 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 + .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 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 + .byte 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 + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_0860CBF1:: @ 860CBF1 .byte 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10 @@ -35,18 +230,22 @@ gUnknown_0860CBF1:: @ 860CBF1 .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x1d, 0xff, 0xff, 0x1c, 0x1d, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00 .byte 0x00, 0x00, 0x00 + .align 2 gUnknown_0860CE74:: @ 860CE74 - .incbin "baserom.gba", 0x60ce74, 0x10 + .4byte 0x000001c0, 0x000011d5, 0x000021ea, 0x000021fb + .align 2 gUnknown_0860CE84:: @ 860CE84 - .incbin "baserom.gba", 0x60ce84, 0x10 + .4byte 0x00000740, 0x00000785, 0x000017ca, 0x0000107b + .align 2 gUnknown_0860CE94:: @ 860CE94 window_template 0x00, 0x00, 0x03, 0x08, 0x10, 0x0f, 0x0010 window_template 0x00, 0x16, 0x03, 0x08, 0x10, 0x0f, 0x0090 window_template 0x00, 0x08, 0x01, 0x0e, 0x02, 0x0f, 0x0110 window_template_terminator + .align 2 gUnknown_0860CEB4:: @ 860CEB4 window_template 0x00, 0x02, 0x02, 0x1a, 0x02, 0x0f, 0x0001 window_template 0x00, 0x10, 0x05, 0x08, 0x02, 0x0f, 0x0035 @@ -67,30 +266,126 @@ gUnknown_0860CEB4:: @ 860CEB4 window_template 0x01, 0x14, 0x05, 0x08, 0x02, 0x0f, 0x0164 window_template 0x01, 0x02, 0x10, 0x1a, 0x02, 0x0f, 0x0174 + .align 2 gUnknown_0860CF44:: @ 860CF44 - .incbin "baserom.gba", 0x60cf44, 0xc + .4byte 0x0400000e, 0xa2600001, 0x00000001 + .align 2 gUnknown_0860CF50:: @ 860CF50 - .incbin "baserom.gba", 0x60cf50, 0x58 + obj_tiles gUnknown_08D85058, 0x0600, 0x0000 + null_obj_tiles + .align 2 +gUnknown_0860CF60:: @ 860CF60 + obj_pal gUnknown_08D85444, 0x0000 + null_obj_pal + + .align 2 +gUnknown_0860CF70:: @ 860CF70 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_0860CF78:: @ 860CF78 + .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00 + + .align 2 +gUnknown_0860CF80:: @ 860CF80 + .byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00 + + .align 2 +gUnknown_0860CF88:: @ 860CF88 + .byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00 + + .align 2 +gUnknown_0860CF90:: @ 860CF90 + .2byte 0x0014, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860CF98:: @ 860CF98 + .2byte 0x0018, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860CFA0:: @ 860CFA0 + .4byte gUnknown_0860CF90 + .4byte gUnknown_0860CF98 + + .align 2 gUnknown_0860CFA8:: @ 860CFA8 - .incbin "baserom.gba", 0x60cfa8, 0x30 + spr_template 0x0000, 0xffff, gUnknown_0860CF70, gUnknown_0860CFA0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_0860CFC0:: @ 860CFC0 + .2byte 0x0008, 0x0001, 0xffff, 0x0000 + .align 2 +gUnknown_0860CFC8:: @ 860CFC8 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860CFD0:: @ 860CFD0 + .4byte gUnknown_0860CFC0 + .4byte gUnknown_0860CFC8 + + .align 2 gUnknown_0860CFD8:: @ 860CFD8 - .incbin "baserom.gba", 0x60cfd8, 0x30 + spr_template 0x0000, 0xffff, gUnknown_0860CF78, gUnknown_0860CFD0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_0860CFF0:: @ 860CFF0 + .2byte 0x0028, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860CFF8:: @ 860CFF8 + .2byte 0x0020, 0x0001, 0xffff, 0x0000 + .align 2 +gUnknown_0860D000:: @ 860D000 + .4byte gUnknown_0860CFF0 + .4byte gUnknown_0860CFF8 + + .align 2 gUnknown_0860D008:: @ 860D008 - .incbin "baserom.gba", 0x60d008, 0x48 + spr_template 0x0000, 0xffff, gUnknown_0860CF78, gUnknown_0860D000, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_0860D020:: @ 860D020 + .2byte 0x0012, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860D028:: @ 860D028 + .2byte 0x0012, 0x0081, 0xffff, 0x0000 + + .align 2 +gUnknown_0860D030:: @ 860D030 + .2byte 0x0010, 0x0041, 0xffff, 0x0000 + .align 2 +gUnknown_0860D038:: @ 860D038 + .2byte 0x0010, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_0860D040:: @ 860D040 + .4byte gUnknown_0860D020 + .4byte gUnknown_0860D028 + + .align 2 +gUnknown_0860D048:: @ 860D048 + .4byte gUnknown_0860D030 + .4byte gUnknown_0860D038 + + .align 2 gUnknown_0860D050:: @ 860D050 - .incbin "baserom.gba", 0x60d050, 0x18 + spr_template 0x0000, 0xffff, gUnknown_0860CF88, gUnknown_0860D048, NULL, gDummySpriteAffineAnimTable, sub_8190B40 + .align 2 gUnknown_0860D068:: @ 860D068 - .incbin "baserom.gba", 0x60d068, 0x18 + spr_template 0x0000, 0xffff, gUnknown_0860CF80, gUnknown_0860D040, NULL, gDummySpriteAffineAnimTable, sub_8190C6C + .align 2 gUnknown_0860D080:: @ 860D080 .byte 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01 + .align 2 gUnknown_0860D090:: @ 860D090 .4byte sub_818E9CC .4byte sub_818EA84 @@ -116,32 +411,41 @@ gUnknown_0860D090:: @ 860D090 .4byte sub_8194F58 .4byte sub_818F02C + .align 2 gUnknown_0860D0EC:: @ 860D0EC .4byte 0x00000004, 0x00000008, 0x00100000, 0x00200000 + .align 2 gUnknown_0860D0FC:: @ 860D0FC .4byte 0xfffffffb, 0xfffffff7, 0xffefffff, 0xffdfffff + .align 2 gUnknown_0860D10C:: @ 860D10C .byte 0x08, 0x00, 0x04, 0x08, 0x09, 0x0c, 0x08, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x0b, 0x04, 0x00, 0x08, 0x0c, 0x00, 0x04, 0x08, 0x0d, 0x0c, 0x08, 0x00, 0x0e, 0x08, 0x0c, 0x00, 0x0f, 0x04, 0x00, 0x08 .byte 0x00, 0x00, 0x04, 0x08, 0x01, 0x0c, 0x08, 0x00, 0x02, 0x08, 0x0c, 0x00, 0x03, 0x04, 0x00, 0x08, 0x04, 0x00, 0x04, 0x08, 0x05, 0x0c, 0x08, 0x00, 0x06, 0x08, 0x0c, 0x00, 0x07, 0x04, 0x00, 0x08 + .align 2 gUnknown_0860D14C:: @ 860D14C .byte 0x00, 0x08, 0x04, 0x0c, 0x07, 0x0f, 0x03, 0x0b, 0x02, 0x0a, 0x06, 0x0e, 0x05, 0x0d, 0x01, 0x09 + .align 2 gUnknown_0860D15C:: @ 860D15C .byte 0x00, 0x08, 0x0c, 0x0e, 0x00, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e .byte 0x04, 0x0a, 0x0d, 0x0e, 0x04, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e + .align 2 gUnknown_0860D19C:: @ 860D19C .byte 0x17, 0x1b, 0x1d, 0x1e + .align 2 gUnknown_0860D1A0:: @ 860D1A0 .byte 0x10, 0x18, 0x1c, 0x1e, 0x11, 0x18, 0x1c, 0x1e, 0x12, 0x19, 0x1c, 0x1e, 0x13, 0x19, 0x1c, 0x1e, 0x14, 0x1a, 0x1d, 0x1e, 0x15, 0x1a, 0x1d, 0x1e, 0x16, 0x1b, 0x1d, 0x1e, 0x17, 0x1b, 0x1d, 0x1e + .align 2 gUnknown_0860D1C0:: @ 860D1C0 .byte 0x00, 0x0f, 0x08, 0x07, 0x03, 0x0c, 0x0b, 0x04, 0x01, 0x0e, 0x09, 0x06, 0x02, 0x0d, 0x0a, 0x05 + .align 2 gBattleDomePotentialPointers:: @ 860D1D0 .4byte gBattleDomeOpponentPotential1 .4byte gBattleDomeOpponentPotential2 @@ -161,6 +465,7 @@ gBattleDomePotentialPointers:: @ 860D1D0 .4byte gBattleDomeOpponentPotential16 .4byte gBattleDomeOpponentPotential17 + .align 2 gBattleDomeOpponentStylePointers:: @ 860D214 .4byte gBattleDomeOpponentStyle1 .4byte gBattleDomeOpponentStyle2 @@ -195,6 +500,7 @@ gBattleDomeOpponentStylePointers:: @ 860D214 .4byte gBattleDomeOpponentStyleUnused3 .4byte gBattleDomeOpponentStyleUnused4 + .align 2 gBattleDomeOpponentStatsPointers:: @ 860D294 .4byte gBattleDomeOpponentStats1 .4byte gBattleDomeOpponentStats2 @@ -252,6 +558,7 @@ gUnknown_0860D346:: @ 860D346 gUnknown_0860D349:: @ 860D349 .byte 0x00, 0x05, 0x09, 0x0c, 0x0e, 0x00, 0x00 + .align 2 gBattleDomeMatchNumberPointers:: @ 860D350 .4byte gBattleDomeMatchNumber1 .4byte gBattleDomeMatchNumber2 @@ -269,6 +576,7 @@ gBattleDomeMatchNumberPointers:: @ 860D350 .4byte gBattleDomeMatchNumber14 .4byte gBattleDomeMatchNumber15 + .align 2 gBattleDomeWinStringsPointers:: @ 860D38C .4byte gBattleDomeWinStrings1 .4byte gBattleDomeWinStrings2 @@ -306,15 +614,18 @@ gUnknown_0860D3F1:: @ 860D3F1 gUnknown_0860D3F2:: @ 860D3F2 .byte 0x00, 0x01, 0x70, 0x01, 0x00, 0x00, 0x70, 0x00, 0x30, 0x01, 0x40, 0x01, 0x30, 0x00, 0x40, 0x00, 0x10, 0x01, 0x60, 0x01, 0x10, 0x00, 0x60, 0x00, 0x20, 0x01, 0x50, 0x01, 0x20, 0x00, 0x50 -gUnknown_0860D411:: @ 860D411 - .incbin "baserom.gba", 0x60d411, 0x3f //struct - byte 1 and 2 loaded seperately, 2 added to move 1 addr across +gUnknown_0860D411:: @ 860D411 struct - byte 1 and 2 loaded seperately, 2 added to move 1 addr across + .byte 0x44, 0x21, 0x44, 0x31, 0x44, 0x41, 0x44, 0x51, 0x44, 0x61, 0x44, 0x71, 0x44, 0x81, 0x44, 0x91, 0xac, 0x21, 0xac, 0x31, 0xac, 0x41, 0xac, 0x51, 0xac, 0x61, 0xac, 0x71, 0xac, 0x81, 0xac, 0x91 + .byte 0x57, 0x29, 0x57, 0x49, 0x57, 0x69, 0x57, 0x89, 0x99, 0x29, 0x99, 0x49, 0x99, 0x69, 0x99, 0x89, 0x5f, 0x39, 0x5f, 0x79, 0x91, 0x39, 0x91, 0x79, 0x67, 0x59, 0x89, 0x59, 0x78, 0x59, 0x00 + .align 2 gUnknown_0860d450:: @ 860D450 .4byte 0x60210409 .4byte 0x6023040a .4byte 0x6047050a .4byte 0x6043050b + .align 2 gUnknown_0860d460:: @ 860D460 .4byte 0x60210409 .4byte 0x6023040a @@ -324,6 +635,7 @@ gUnknown_0860d460:: @ 860D460 .4byte 0x6047070b .4byte 0x6043070c + .align 2 gUnknown_0860d47c:: @ 860D47C .4byte 0x60210409 .4byte 0x6023040a @@ -337,6 +649,7 @@ gUnknown_0860d47c:: @ 860D47C .4byte 0x60270a0c .4byte 0x603b0b0c + .align 2 gUnknown_0860d4a8:: @ 860D4A8 .4byte 0x60210409 .4byte 0x6023040a @@ -352,12 +665,14 @@ gUnknown_0860d4a8:: @ 860D4A8 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d4dc:: @ 860D4DC .4byte 0x60210609 .4byte 0x6021060a .4byte 0x6027050a .4byte 0x6043050b + .align 2 gUnknown_0860d4ec:: @ 860D4EC .4byte 0x60210609 .4byte 0x6021060a @@ -367,6 +682,7 @@ gUnknown_0860d4ec:: @ 860D4EC .4byte 0x6047070b .4byte 0x6043070c + .align 2 gUnknown_0860d508:: @ 860D508 .4byte 0x60210609 .4byte 0x6021060a @@ -380,6 +696,7 @@ gUnknown_0860d508:: @ 860D508 .4byte 0x60270a0c .4byte 0x603b0b0c + .align 2 gUnknown_0860d534:: @ 860D534 .4byte 0x60210609 .4byte 0x6021060a @@ -395,12 +712,14 @@ gUnknown_0860d534:: @ 860D534 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d568:: @ 860D568 .4byte 0x60210809 .4byte 0x6023080a .4byte 0x6047090a .4byte 0x6021090b + .align 2 gUnknown_0860d578:: @ 860D578 .4byte 0x60210809 .4byte 0x6023080a @@ -410,6 +729,7 @@ gUnknown_0860d578:: @ 860D578 .4byte 0x6027070b .4byte 0x6043070c + .align 2 gUnknown_0860d594:: @ 860D594 .4byte 0x60210809 .4byte 0x6023080a @@ -423,6 +743,7 @@ gUnknown_0860d594:: @ 860D594 .4byte 0x60270a0c .4byte 0x603b0b0c + .align 2 gUnknown_0860d5c0:: @ 860D5C0 .4byte 0x60210809 .4byte 0x6023080a @@ -438,12 +759,14 @@ gUnknown_0860d5c0:: @ 860D5C0 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d5f4:: @ 860D5F4 .4byte 0x60210a09 .4byte 0x60210a0a .4byte 0x6027090a .4byte 0x6021090b + .align 2 gUnknown_0860d604:: @ 860D604 .4byte 0x60210a09 .4byte 0x60210a0a @@ -453,6 +776,7 @@ gUnknown_0860d604:: @ 860D604 .4byte 0x6027070b .4byte 0x6043070c + .align 2 gUnknown_0860d620:: @ 860D620 .4byte 0x60210a09 .4byte 0x60210a0a @@ -466,6 +790,7 @@ gUnknown_0860d620:: @ 860D620 .4byte 0x60270a0c .4byte 0x603b0b0c + .align 2 gUnknown_0860d64c:: @ 860D64C .4byte 0x60210a09 .4byte 0x60210a0a @@ -481,12 +806,14 @@ gUnknown_0860d64c:: @ 860D64C .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d680:: @ 860D680 .4byte 0x60210c09 .4byte 0x60230c0a .4byte 0x60470d0a .4byte 0x60430d0b + .align 2 gUnknown_0860d690:: @ 860D690 .4byte 0x60210c09 .4byte 0x60230c0a @@ -496,6 +823,7 @@ gUnknown_0860d690:: @ 860D690 .4byte 0x60470f0b .4byte 0x60210f0c + .align 2 gUnknown_0860d6ac:: @ 860D6AC .4byte 0x60210c09 .4byte 0x60230c0a @@ -509,6 +837,7 @@ gUnknown_0860d6ac:: @ 860D6AC .4byte 0x60310c0c .4byte 0x60300b0c + .align 2 gUnknown_0860d6d8:: @ 860D6D8 .4byte 0x60210c09 .4byte 0x60230c0a @@ -524,12 +853,14 @@ gUnknown_0860d6d8:: @ 860D6D8 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d70c:: @ 860D70C .4byte 0x60210e09 .4byte 0x60210e0a .4byte 0x60270d0a .4byte 0x60430d0b + .align 2 gUnknown_0860d71c:: @ 860D71C .4byte 0x60210e09 .4byte 0x60210e0a @@ -539,6 +870,7 @@ gUnknown_0860d71c:: @ 860D71C .4byte 0x60470f0b .4byte 0x60210f0c + .align 2 gUnknown_0860d738:: @ 860D738 .4byte 0x60210e09 .4byte 0x60210e0a @@ -552,6 +884,7 @@ gUnknown_0860d738:: @ 860D738 .4byte 0x60310c0c .4byte 0x60300b0c + .align 2 gUnknown_0860d764:: @ 860D764 .4byte 0x60210e09 .4byte 0x60210e0a @@ -567,12 +900,14 @@ gUnknown_0860d764:: @ 860D764 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d798:: @ 860D798 .4byte 0x60211009 .4byte 0x6023100a .4byte 0x6047110a .4byte 0x6021110b + .align 2 gUnknown_0860d7a8:: @ 860D7A8 .4byte 0x60211009 .4byte 0x6023100a @@ -582,6 +917,7 @@ gUnknown_0860d7a8:: @ 860D7A8 .4byte 0x60270f0b .4byte 0x60210f0c + .align 2 gUnknown_0860d7c4:: @ 860D7C4 .4byte 0x60211009 .4byte 0x6023100a @@ -595,6 +931,7 @@ gUnknown_0860d7c4:: @ 860D7C4 .4byte 0x60310c0c .4byte 0x60300b0c + .align 2 gUnknown_0860d7f0:: @ 860D7F0 .4byte 0x60211009 .4byte 0x6023100a @@ -610,12 +947,14 @@ gUnknown_0860d7f0:: @ 860D7F0 .4byte 0x602c0b0d .4byte 0x602d0b0e + .align 2 gUnknown_0860d824:: @ 860D824 .4byte 0x602b1209 .4byte 0x602b120a .4byte 0x6027110a .4byte 0x6021110b + .align 2 gUnknown_0860d834:: @ 860D834 .4byte 0x602b1209 .4byte 0x602b120a @@ -625,6 +964,7 @@ gUnknown_0860d834:: @ 860D834 .4byte 0x60270f0b .4byte 0x60210f0c + .align 2 gUnknown_0860d850:: @ 860D850 .4byte 0x602b1209 .4byte 0x602b120a @@ -638,6 +978,7 @@ gUnknown_0860d850:: @ 860D850 .4byte 0x60310c0c .4byte 0x60300b0c + .align 2 gUnknown_0860d87c:: @ 860D87C .4byte 0x602b1209 .4byte 0x602b120a @@ -652,13 +993,15 @@ gUnknown_0860d87c:: @ 860D87C .4byte 0x60300b0c .4byte 0x602c0b0d .4byte 0x602d0b0e - + + .align 2 gUnknown_0860d8b0:: @ 860D8B0 .4byte 0x60210414 .4byte 0x60250413 .4byte 0x60490513 .4byte 0x60450512 + .align 2 gUnknown_0860d8c0:: @ 860D8C0 .4byte 0x60210414 .4byte 0x60250413 @@ -668,6 +1011,7 @@ gUnknown_0860d8c0:: @ 860D8C0 .4byte 0x60490712 .4byte 0x60450711 + .align 2 gUnknown_0860d8dc:: @ 860D8DC .4byte 0x60210414 .4byte 0x60250413 @@ -681,6 +1025,7 @@ gUnknown_0860d8dc:: @ 860D8DC .4byte 0x60290a11 .4byte 0x603c0b11 + .align 2 gUnknown_0860d908:: @ 860D908 .4byte 0x60210414 .4byte 0x60250413 @@ -696,12 +1041,14 @@ gUnknown_0860d908:: @ 860D908 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860d93c:: @ 860D93C .4byte 0x60210614 .4byte 0x60210613 .4byte 0x60290513 .4byte 0x60450512 + .align 2 gUnknown_0860d94c:: @ 860D94C .4byte 0x60210614 .4byte 0x60210613 @@ -711,6 +1058,7 @@ gUnknown_0860d94c:: @ 860D94C .4byte 0x60490712 .4byte 0x60450711 + .align 2 gUnknown_0860d968:: @ 860D968 .4byte 0x60210614 .4byte 0x60210613 @@ -724,6 +1072,7 @@ gUnknown_0860d968:: @ 860D968 .4byte 0x60290a11 .4byte 0x603c0b11 + .align 2 gUnknown_0860d994:: @ 860D994 .4byte 0x60210614 .4byte 0x60210613 @@ -739,12 +1088,14 @@ gUnknown_0860d994:: @ 860D994 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860d9c8:: @ 860D9C8 .4byte 0x60210814 .4byte 0x60250813 .4byte 0x60490913 .4byte 0x60210912 + .align 2 gUnknown_0860d9d8:: @ 860D9D8 .4byte 0x60210814 .4byte 0x60250813 @@ -754,6 +1105,7 @@ gUnknown_0860d9d8:: @ 860D9D8 .4byte 0x60290712 .4byte 0x60450711 + .align 2 gUnknown_0860d9f4:: @ 860D9F4 .4byte 0x60210814 .4byte 0x60250813 @@ -767,6 +1119,7 @@ gUnknown_0860d9f4:: @ 860D9F4 .4byte 0x60290a11 .4byte 0x603c0b11 + .align 2 gUnknown_0860da20:: @ 860DA20 .4byte 0x60210814 .4byte 0x60250813 @@ -782,12 +1135,14 @@ gUnknown_0860da20:: @ 860DA20 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860da54:: @ 860DA54 .4byte 0x60210a14 .4byte 0x60210a13 .4byte 0x60290913 .4byte 0x60210912 + .align 2 gUnknown_0860da64:: @ 860DA64 .4byte 0x60210a14 .4byte 0x60210a13 @@ -797,6 +1152,7 @@ gUnknown_0860da64:: @ 860DA64 .4byte 0x60290712 .4byte 0x60450711 + .align 2 gUnknown_0860da80:: @ 860DA80 .4byte 0x60210a14 .4byte 0x60210a13 @@ -810,6 +1166,7 @@ gUnknown_0860da80:: @ 860DA80 .4byte 0x60290a11 .4byte 0x603c0b11 + .align 2 gUnknown_0860daac:: @ 860DAAC .4byte 0x60210a14 .4byte 0x60210a13 @@ -825,12 +1182,14 @@ gUnknown_0860daac:: @ 860DAAC .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860dae0:: @ 860DAE0 .4byte 0x60210c14 .4byte 0x60250c13 .4byte 0x60490d13 .4byte 0x60450d12 - + + .align 2 gUnknown_0860daf0:: @ 860DAF0 .4byte 0x60210c14 .4byte 0x60250c13 @@ -840,6 +1199,7 @@ gUnknown_0860daf0:: @ 860DAF0 .4byte 0x60490f12 .4byte 0x60210f11 + .align 2 gUnknown_0860db0c:: @ 860DB0C .4byte 0x60210c14 .4byte 0x60250c13 @@ -853,6 +1213,7 @@ gUnknown_0860db0c:: @ 860DB0C .4byte 0x60360c11 .4byte 0x60350b11 + .align 2 gUnknown_0860db38:: @ 860DB38 .4byte 0x60210c14 .4byte 0x60250c13 @@ -868,12 +1229,14 @@ gUnknown_0860db38:: @ 860DB38 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860db6c:: @ 860DB6C .4byte 0x60210e14 .4byte 0x60210e13 .4byte 0x60290d13 .4byte 0x60450d12 + .align 2 gUnknown_0860db7c:: @ 860DB7C .4byte 0x60210e14 .4byte 0x60210e13 @@ -883,6 +1246,7 @@ gUnknown_0860db7c:: @ 860DB7C .4byte 0x60490f12 .4byte 0x60210f11 + .align 2 gUnknown_0860db98:: @ 860DB98 .4byte 0x60210e14 .4byte 0x60210e13 @@ -896,6 +1260,7 @@ gUnknown_0860db98:: @ 860DB98 .4byte 0x60360c11 .4byte 0x60350b11 + .align 2 gUnknown_0860dbc4:: @ 860DBC4 .4byte 0x60210e14 .4byte 0x60210e13 @@ -911,12 +1276,14 @@ gUnknown_0860dbc4:: @ 860DBC4 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860dbf8:: @ 860DBF8 .4byte 0x60211014 .4byte 0x60251013 .4byte 0x60491113 .4byte 0x60211112 + .align 2 gUnknown_0860dc08:: @ 860DC08 .4byte 0x60211014 .4byte 0x60251013 @@ -926,6 +1293,7 @@ gUnknown_0860dc08:: @ 860DC08 .4byte 0x60290f12 .4byte 0x60210f11 + .align 2 gUnknown_0860dc24:: @ 860DC24 .4byte 0x60211014 .4byte 0x60251013 @@ -938,7 +1306,8 @@ gUnknown_0860dc24:: @ 860DC24 .4byte 0x60370d11 .4byte 0x60360c11 .4byte 0x60350b11 - + + .align 2 gUnknown_0860dc50:: @ 860DC50 .4byte 0x60211014 .4byte 0x60251013 @@ -954,12 +1323,14 @@ gUnknown_0860dc50:: @ 860DC50 .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860dc84:: @ 860DC84 .4byte 0x602b1214 .4byte 0x602b1213 .4byte 0x60291113 .4byte 0x60211112 + .align 2 gUnknown_0860dc94:: @ 860DC94 .4byte 0x602b1214 .4byte 0x602b1213 @@ -968,7 +1339,8 @@ gUnknown_0860dc94:: @ 860DC94 .4byte 0x60291012 .4byte 0x60290f12 .4byte 0x60210f11 - + + .align 2 gUnknown_0860dcb0:: @ 860DCB0 .4byte 0x602b1214 .4byte 0x602b1213 @@ -982,6 +1354,7 @@ gUnknown_0860dcb0:: @ 860DCB0 .4byte 0x60360c11 .4byte 0x60350b11 + .align 2 gUnknown_0860dcdc:: @ 860DCDC .4byte 0x602b1214 .4byte 0x602b1213 @@ -997,6 +1370,7 @@ gUnknown_0860dcdc:: @ 860DCDC .4byte 0x602f0b10 .4byte 0x602e0b0f + .align 2 gUnknown_0860DD10:: @ 860DD10 .4byte gUnknown_0860d450 .4byte gUnknown_0860d460 @@ -1067,6 +1441,7 @@ gUnknown_0860DE10:: @ 860DE10 .byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d .byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d + .align 2 gUnknown_0860DE50:: @ 860DE50 .4byte sub_8195980 .4byte sub_8195A38 @@ -1091,9 +1466,74 @@ gUnknown_0860DE98:: @ 860DE98 gUnknown_0860DEA8:: @ 860DEA8 .4byte 0xffffffef, 0xffffffdf, 0xffbfffff, 0xff7fffff + .align 2 gUnknown_0860DEB8:: @ 860DEB8 //struct - .incbin "baserom.gba", 0x60deb8, 0x500 - + .2byte 0x0025, 0x0000, 0x0108, 0x0208, 0x0308, 0x0103, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x02e1, 0x0000, 0x010c, 0x020c, 0x030c, 0x013e, 0x000c, 0x010c, 0x020c, 0x0000 + .2byte 0x002c, 0x0000, 0x010c, 0x020c, 0x030c, 0x0104, 0x000c, 0x010c, 0x020c, 0x0000 + .2byte 0x0039, 0x0000, 0x0102, 0x0202, 0x0302, 0x0105, 0x0002, 0x0102, 0x0202, 0x0000 + .2byte 0x0040, 0x0000, 0x0101, 0x0201, 0x0301, 0x0106, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x02af, 0x0004, 0x0101, 0x0201, 0x0301, 0x013d, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x02ff, 0x0000, 0x010a, 0x020a, 0x030a, 0x0140, 0x000a, 0x010a, 0x020a, 0x0000 + .2byte 0x005e, 0x0000, 0x0109, 0x0209, 0x0309, 0x0108, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x004e, 0x0000, 0x0106, 0x0206, 0x0306, 0x0107, 0x0006, 0x0106, 0x0206, 0x0000 + .2byte 0x006c, 0x0000, 0x0108, 0x0208, 0x0308, 0x0109, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x0072, 0x0000, 0x0108, 0x0208, 0x0308, 0x010a, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x0090, 0x0000, 0x0108, 0x020a, 0x030a, 0x010e, 0x000a, 0x0108, 0x020a, 0x0000 + .2byte 0x007f, 0x0000, 0x010a, 0x020a, 0x030a, 0x010b, 0x000a, 0x0108, 0x020a, 0x0000 + .2byte 0x0088, 0x0000, 0x0104, 0x0204, 0x0304, 0x010c, 0x0004, 0x0104, 0x0204, 0x0000 + .2byte 0x008f, 0x0000, 0x0107, 0x0207, 0x0307, 0x010d, 0x0007, 0x0107, 0x0207, 0x0000 + .2byte 0x009b, 0x0000, 0x0105, 0x0205, 0x0305, 0x010f, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x00b7, 0x0000, 0x0103, 0x0203, 0x0303, 0x0110, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x02a0, 0x0000, 0x0103, 0x0203, 0x0303, 0x013b, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x00c3, 0x0000, 0x0106, 0x0206, 0x0306, 0x0111, 0x0006, 0x0106, 0x0206, 0x0000 + .2byte 0x00c4, 0x0000, 0x0104, 0x0204, 0x0304, 0x0112, 0x0004, 0x0104, 0x0204, 0x0000 + .2byte 0x00ce, 0x0000, 0x010b, 0x020b, 0x030b, 0x0113, 0x000b, 0x010b, 0x020b, 0x0000 + .2byte 0x00d8, 0x0000, 0x0101, 0x0201, 0x0301, 0x0114, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x02a9, 0x0003, 0x010c, 0x020c, 0x030c, 0x013c, 0x000c, 0x010c, 0x020c, 0x0000 + .2byte 0x00e2, 0x0000, 0x0107, 0x0207, 0x0307, 0x0115, 0x0007, 0x0107, 0x0207, 0x0000 + .2byte 0x00ee, 0x0000, 0x0104, 0x0204, 0x0304, 0x0116, 0x0001, 0x0104, 0x0204, 0x0000 + .2byte 0x00f9, 0x0000, 0x0108, 0x0208, 0x0308, 0x0117, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x00fe, 0x0000, 0x010c, 0x020c, 0x030c, 0x0118, 0x000c, 0x010c, 0x020c, 0x0000 + .2byte 0x0118, 0x0000, 0x0102, 0x0202, 0x0302, 0x011a, 0x0002, 0x0102, 0x0202, 0x0000 + .2byte 0x0111, 0x0000, 0x0101, 0x0201, 0x0301, 0x0119, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x011f, 0x0006, 0x0109, 0x0209, 0x0309, 0x011b, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x012e, 0x0000, 0x010e, 0x020e, 0x030e, 0x011d, 0x000e, 0x010e, 0x020e, 0x0000 + .2byte 0x0125, 0x0000, 0x010b, 0x020b, 0x030b, 0x011c, 0x000b, 0x010b, 0x020b, 0x0000 + .2byte 0x0133, 0x0000, 0x010c, 0x020c, 0x030c, 0x011e, 0x000c, 0x010c, 0x020c, 0x0000 + .2byte 0x0139, 0x0000, 0x010d, 0x020d, 0x030d, 0x011f, 0x000d, 0x010d, 0x020d, 0x0000 + .2byte 0x013e, 0x0000, 0x0101, 0x0201, 0x0301, 0x0120, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x0153, 0x0000, 0x0103, 0x0203, 0x0303, 0x0121, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x0178, 0x0000, 0x0105, 0x0205, 0x0305, 0x0126, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x0171, 0x0000, 0x0109, 0x0209, 0x0309, 0x0125, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x0166, 0x0000, 0x0109, 0x0209, 0x0309, 0x0123, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x016c, 0x0000, 0x0105, 0x0205, 0x0305, 0x0124, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x0182, 0x0000, 0x0109, 0x0209, 0x0309, 0x0128, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x0161, 0x0000, 0x0105, 0x0205, 0x0305, 0x0122, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x0179, 0x0000, 0x0105, 0x0205, 0x0305, 0x0127, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x0188, 0x0000, 0x0104, 0x0204, 0x0304, 0x0129, 0x0004, 0x0104, 0x0204, 0x0000 + .2byte 0x0196, 0x0000, 0x0106, 0x0206, 0x0306, 0x012a, 0x0006, 0x0106, 0x0206, 0x0000 + .2byte 0x01a3, 0x0000, 0x0101, 0x0201, 0x0301, 0x012b, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x01ab, 0x0000, 0x0109, 0x0209, 0x0309, 0x012c, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x01b2, 0x0000, 0x0108, 0x0208, 0x0308, 0x012d, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x01c1, 0x0000, 0x0109, 0x0209, 0x0309, 0x012e, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x01da, 0x0000, 0x0102, 0x0202, 0x0302, 0x012f, 0x0002, 0x0102, 0x0202, 0x0000 + .2byte 0x01e1, 0x0002, 0x0102, 0x0202, 0x0302, 0x0130, 0x0001, 0x0102, 0x0202, 0x0000 + .2byte 0x01ec, 0x0000, 0x0103, 0x0203, 0x0303, 0x0131, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x02e4, 0x0000, 0x0103, 0x0203, 0x0303, 0x013f, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x0200, 0x0000, 0x0107, 0x0207, 0x0307, 0x0132, 0x0007, 0x0107, 0x0207, 0x0000 + .2byte 0x0221, 0x0000, 0x0108, 0x0208, 0x0308, 0x0134, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x021a, 0x0000, 0x0105, 0x0205, 0x0305, 0x0133, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x0009, 0x0000, 0x0108, 0x0208, 0x0308, 0x0102, 0x0008, 0x0108, 0x0208, 0x0000 + .2byte 0x022f, 0x0000, 0x0109, 0x0209, 0x0309, 0x0136, 0x0009, 0x0109, 0x0209, 0x0000 + .2byte 0x0228, 0x0000, 0x0105, 0x0205, 0x0305, 0x0135, 0x0005, 0x0105, 0x0205, 0x0000 + .2byte 0x025c, 0x0000, 0x0102, 0x0202, 0x0302, 0x0137, 0x0002, 0x0102, 0x0202, 0x0000 + .2byte 0x026d, 0x0000, 0x0101, 0x0201, 0x0301, 0x0138, 0x0001, 0x0101, 0x0201, 0x0000 + .2byte 0x0273, 0x0000, 0x0103, 0x0203, 0x0303, 0x0139, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x0001, 0x0000, 0x010f, 0x0203, 0x0303, 0x0101, 0x0003, 0x0103, 0x0203, 0x0000 + .2byte 0x0282, 0x0001, 0x0109, 0x0209, 0x0309, 0x013a, 0x0009, 0x0109, 0x0209, 0x0000 + + .align 2 gUnknown_0860E3B8:: @ 860E3B8 .4byte BattleFrontier_PokeNav_2A971C, 0x00ff0200 .4byte BattleFrontier_PokeNav_2A9798, 0x00ff0200 @@ -1111,6 +1551,7 @@ gUnknown_0860E3B8:: @ 860E3B8 .4byte BattleFrontier_PokeNav_2A9E70, 0x00ff0200 .4byte BattleFrontier_PokeNav_2A9EFD, 0x00ff0200 + .align 2 gUnknown_0860E430:: @ 860E430 .4byte BattleFrontier_PokeNav_2A9FAB, 0x00ffff00 .4byte BattleFrontier_PokeNav_2AA028, 0x00ffff00 @@ -1127,6 +1568,7 @@ gUnknown_0860E430:: @ 860E430 .4byte BattleFrontier_PokeNav_2AA5AD, 0x00ffff00 .4byte BattleFrontier_PokeNav_2AA64D, 0x00ffff00 + .align 2 gUnknown_0860E4A0:: @ 860E4A0 .4byte BattleFrontier_PokeNav_2AA6AF, 0x00ff0300 .4byte BattleFrontier_PokeNav_2AA730, 0x00ff0300 @@ -1142,7 +1584,8 @@ gUnknown_0860E4A0:: @ 860E4A0 .4byte BattleFrontier_PokeNav_2AAC9D, 0x00ff0300 .4byte BattleFrontier_PokeNav_2AAD41, 0x00ff0300 .4byte BattleFrontier_PokeNav_2AAE00, 0x00ff0300 - + + .align 2 gUnknown_0860E510:: @ 860E510 .4byte BattleFrontier_PokeNav_2AAE7F, 0x00ff0100 .4byte BattleFrontier_PokeNav_2AAEF1, 0x00ff0100 @@ -1158,7 +1601,8 @@ gUnknown_0860E510:: @ 860E510 .4byte BattleFrontier_PokeNav_2AB4B0, 0x00ff0100 .4byte BattleFrontier_PokeNav_2AB538, 0x00ff0100 .4byte BattleFrontier_PokeNav_2AB5E4, 0x00ff0100 - + + .align 2 gUnknown_0860E580:: @ 860E580 .4byte BattleFrontier_PokeNav_2AB670, 0x00ff0100 .4byte BattleFrontier_PokeNav_2AB6CD, 0x00ff0100 @@ -1175,6 +1619,7 @@ gUnknown_0860E580:: @ 860E580 .4byte BattleFrontier_PokeNav_2ABE5E, 0x00ff0100 .4byte BattleFrontier_PokeNav_2ABF36, 0x00ff0100 + .align 2 gUnknown_0860E5F0:: @ 860E5F0 .4byte BattleFrontier_PokeNav_2AC009, 0x00ff0100 .4byte BattleFrontier_PokeNav_2AC0BD, 0x00ffff00 @@ -1241,6 +1686,7 @@ gUnknown_0860E5F0:: @ 860E5F0 .4byte BattleFrontier_PokeNav_2AFA39, 0x00ffff00 .4byte BattleFrontier_PokeNav_2AFB26, 0x00ffff00 + .align 2 gUnknown_0860E7F0:: @860E7F0 .4byte BattleFrontier_PokeNav_2AFC07, 0x00050400 .4byte BattleFrontier_PokeNav_2AFC78, 0x00050400 @@ -1257,6 +1703,7 @@ gUnknown_0860E7F0:: @860E7F0 .4byte BattleFrontier_PokeNav_2B02D9, 0x00050400 .4byte BattleFrontier_PokeNav_2B0366, 0x00050400 + .align 2 gUnknown_0860E860:: @860E860 .4byte BattleFrontier_PokeNav_2B03E6, 0x00050400 .4byte BattleFrontier_PokeNav_2B0457, 0x00050400 @@ -1273,6 +1720,7 @@ gUnknown_0860E860:: @860E860 .4byte BattleFrontier_PokeNav_2B0AB8, 0x00050400 .4byte BattleFrontier_PokeNav_2B0B45, 0x00050400 + .align 2 gUnknown_0860E8D0:: @860E8D0 .4byte BattleFrontier_PokeNav_2B0BC5, 0x00050400 .4byte BattleFrontier_PokeNav_2B0C4A, 0x00050400 @@ -1289,6 +1737,7 @@ gUnknown_0860E8D0:: @860E8D0 .4byte BattleFrontier_PokeNav_2B124D, 0x00050400 .4byte BattleFrontier_PokeNav_2B12D0, 0x00050400 + .align 2 gUnknown_0860E940:: @860E940 .4byte BattleFrontier_PokeNav_2B1347, 0x00050400 .4byte BattleFrontier_PokeNav_2B13B1, 0x00050400 @@ -1305,6 +1754,7 @@ gUnknown_0860E940:: @860E940 .4byte BattleFrontier_PokeNav_2B19C7, 0x00050400 .4byte BattleFrontier_PokeNav_2B1A4C, 0x00050400 + .align 2 gUnknown_0860E9B0:: @860E9B0 .4byte BattleFrontier_PokeNav_2B1ACA, 0x00050400 .4byte BattleFrontier_PokeNav_2B1B50, 0x00050400 @@ -1321,15 +1771,18 @@ gUnknown_0860E9B0:: @860E9B0 .4byte BattleFrontier_PokeNav_2B2175, 0x00050400 .4byte BattleFrontier_PokeNav_2B21FC, 0x00050400 + .align 2 gUnknown_0860EA20:: @ 860EA20 .4byte gUnknown_0860E3B8 .4byte gUnknown_0860E430 .4byte gUnknown_0860E4A0 + .align 2 gUnknown_0860EA2C:: @ 860EA2C .4byte gUnknown_0860E510 .4byte gUnknown_0860E580 + .align 2 gUnknown_0860EA34:: @ 860EA34 .4byte gUnknown_0860E5F0 .4byte gUnknown_0860E7F0 @@ -1338,21 +1791,27 @@ gUnknown_0860EA34:: @ 860EA34 .4byte gUnknown_0860E940 .4byte gUnknown_0860E9B0 + .align 2 gUnknown_0860EA4C:: @ 860EA4C - .incbin "baserom.gba", 0x60ea4c, 0x20 + .incbin "graphics/unknown/unknown_60EA4C.gbapal" + .align 2 gUnknown_0860EA6C:: @ 860EA6C - .incbin "baserom.gba", 0x60ea6c, 0x100 + .incbin "graphics/interface/menu_border.4bpp" + .align 2 gUnknown_0860EB6C:: @ 860EB6C - .incbin "baserom.gba", 0x60eb6c, 0x20 + .incbin "graphics/pokenav/icon.gbapal" + .align 2 gUnknown_0860EB8C:: @ 860EB8C - .incbin "baserom.gba", 0x60eb8c, 0x3e4 + .incbin "graphics/pokenav/icon.4bpp.lz" -gUnknown_0860EF70:: @ 860EF70 - .incbin "baserom.gba", 0x60ef70, 0x8 + .align 2 +gText_PokenavCallEllipsis:: @ 860EF70 + .string "………………\p$" + .align 2 gUnknown_0860EF78:: @ 860EF78 .4byte sub_819612C .4byte sub_81961F0 @@ -1363,14 +1822,17 @@ gUnknown_0860EF78:: @ 860EF78 .4byte sub_8196390 .4byte sub_81963F0 + .align 2 gUnknown_0860EF98:: @ 860EF98 - .incbin "baserom.gba", 0x60ef98, 0x8 + window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0f, 0x0200 + .align 2 gUnknown_0860EFA0:: @ 860EFA0 .4byte gStringVar1 .4byte gStringVar2 .4byte gStringVar3 + .align 2 gUnknown_0860EFAC:: @ 860EFAC .4byte sub_8196A44 .4byte sub_8196A9C @@ -1379,10 +1841,16 @@ gUnknown_0860EFAC:: @ 860EFAC .4byte sub_8196CF4 .4byte sub_8196D14 + .align 2 gUnknown_0860EFC4:: @ 860EFC4 - .2byte 0x0282, 0x0000, 0xfa72, 0x085e, 0x01e1, 0x0000, 0xfa77, 0x085e, 0x02a9, 0x0000, 0xfa7b, 0x085e, 0x02af, 0x0000, 0xfa80, 0x085e - .2byte 0x0033, 0x0000, 0xfa84, 0x085e, 0x011f, 0x0000, 0xfa8a, 0x085e - + .4byte 0x00000282, gText_Kira + .4byte 0x000001e1, gText_Amy + .4byte 0x000002a9, gText_John + .4byte 0x000002af, gText_Roy + .4byte 0x00000033, gText_Gabby + .4byte 0x0000011f, gText_Anna + + .align 2 gUnknown_0860EFF4:: @ 860EFF4 .4byte gText_BattleTower2 .4byte gText_BattleDome @@ -1392,6 +1860,7 @@ gUnknown_0860EFF4:: @ 860EFF4 .4byte gText_BattleFactory .4byte gText_BattlePyramid + .align 2 gUnknown_0860F010:: @ 860F010 .2byte FLAG_BADGE01_GET .2byte FLAG_BADGE02_GET diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index 74abbe788..bfb99f97d 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -5,291 +5,1334 @@ .section .rodata + .align 2 gUnknown_0860F13C:: @ 860F13C - .incbin "baserom.gba", 0x60f13c, 0x1100 + .incbin "graphics/unknown/unknown_60F13C.gbapal" + + .align 2 +gUnknown_0860F15C:: @ 860F15C + .incbin "graphics/unknown/unknown_60F15C.gbapal" + + .align 2 +gUnknown_0860F17C:: @ 860F17C + .incbin "graphics/unknown/unknown_60F17C.gbapal" + + .align 2 +gUnknown_0860F1BC:: @ 860F1BC + .incbin "graphics/unknown/unknown_60F1BC.4bpp" + + .align 2 +gUnknown_0860F3BC:: @ 860F3BC + .incbin "graphics/unknown/unknown_60F3BC.4bpp" + + .align 2 +gUnknown_0860F43C:: @ 860F43C + .incbin "graphics/unknown/unknown_60F43C.4bpp" + + .align 2 +gUnknown_0860F53C:: @ 860F53C + .incbin "graphics/unknown/unknown_60F53C.4bpp" + + .align 2 +gUnknown_0860F63C:: @ 860F63C + .incbin "graphics/unknown/unknown_60F63C.4bpp" + + .align 2 +gUnknown_0860F6BC:: @ 860F6BC + .incbin "graphics/unknown/unknown_60F6BC.4bpp" + + .align 2 +gUnknown_0860F7BC:: @ 860F7BC + .incbin "graphics/unknown/unknown_60F7BC.4bpp" + + .align 2 +gUnknown_0860F83C:: @ 860F83C + .incbin "graphics/unknown/unknown_60F83C.4bpp" + + .align 2 +gUnknown_0860F93C:: @ 860F93C + .incbin "graphics/unknown/unknown_60F93C.4bpp" + + .align 2 +gUnknown_0860FA3C:: @ 860FA3C + .incbin "graphics/unknown/unknown_60FA3C.4bpp" + .align 2 gUnknown_0861023C:: @ 861023C - .incbin "baserom.gba", 0x61023c, 0x100 + .incbin "graphics/unknown/unknown_61023C.bin" + .align 2 gUnknown_0861033C:: @ 861033C - .incbin "baserom.gba", 0x61033c, 0x60 + .incbin "graphics/unknown/unknown_61033C.4bpp" + .align 2 gUnknown_0861039C:: @ 861039C - .incbin "baserom.gba", 0x61039c, 0x20 + .incbin "graphics/unknown/unknown_61039C.gbapal" + .align 2 gUnknown_086103BC:: @ 86103BC - .incbin "baserom.gba", 0x6103bc, 0x28 + obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065 + obj_tiles gUnknown_0860F43C, 0x0100, 0x0066 + obj_tiles gUnknown_0860F53C, 0x0100, 0x0067 + obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d + null_obj_tiles + .align 2 gUnknown_086103E4:: @ 86103E4 - .incbin "baserom.gba", 0x6103e4, 0x10 + obj_tiles gUnknown_085B18AC, 0x0800, 0x0064 + null_obj_tiles + .align 2 gUnknown_086103F4:: @ 86103F4 - .incbin "baserom.gba", 0x6103f4, 0x28 + obj_pal gUnknown_0860F13C, 0x0064 + obj_pal gUnknown_0860F15C, 0x0065 + obj_pal gUnknown_0860F17C, 0x0066 + obj_pal gUnknown_0861039C, 0x0067 + null_obj_pal + .align 2 gUnknown_0861041C:: @ 861041C - .incbin "baserom.gba", 0x61041c, 0xc + .4byte sub_819BCCC + .4byte sub_819BC30 + .4byte sub_819BCD0 + .align 2 gUnknown_08610428:: @ 8610428 - .incbin "baserom.gba", 0x610428, 0xc + .4byte 0x00000180, 0x00003195, 0x000021bb + .align 2 gUnknown_08610434:: @ 8610434 - .incbin "baserom.gba", 0x610434, 0x38 - + window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001 + window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019 + window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f + window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b + window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b + window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb + window_template_terminator + + .align 1 gUnknown_0861046C:: @ 861046C - .incbin "baserom.gba", 0x61046c, 0xa + .incbin "graphics/unknown/unknown_61046C.gbapal" gUnknown_08610476:: @ 8610476 - .incbin "baserom.gba", 0x610476, 0x3 + .byte 0x00, 0x02, 0x00 gUnknown_08610479:: @ 8610479 - .incbin "baserom.gba", 0x610479, 0x15f + .byte 0x00, 0x04, 0x00 + + .align 2 +gUnknown_0861047C:: @ 861047C + .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_08610484:: @ 8610484 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_0861048C:: @ 861048C + .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 + + .align 2 +gUnknown_08610494:: @ 8610494 + .byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00 + + .align 2 +gUnknown_0861049C:: @ 861049C + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_086104A4:: @ 86104A4 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_086104AC:: @ 86104AC + .2byte 0x0000, 0x001e, 0xffff, 0x0000 + .align 2 +gUnknown_086104B4:: @ 86104B4 + .2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004 + .2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008 + .2byte 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_086104FC:: @ 86104FC + .4byte gUnknown_0861049C + + .align 2 +gUnknown_08610500:: @ 8610500 + .4byte gUnknown_086104A4 + + .align 2 +gUnknown_08610504:: @ 8610504 + .4byte gUnknown_086104AC + .4byte gUnknown_086104B4 + + .align 2 +gUnknown_0861050C:: @ 861050C + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_0861056C:: @ 861056C + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_086105BC:: @ 86105BC + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_086105CC:: @ 86105CC + .4byte gUnknown_0861050C + .4byte gUnknown_0861056C + .4byte gUnknown_086105BC + + .align 2 gUnknown_086105D8:: @ 86105D8 - .incbin "baserom.gba", 0x6105d8, 0x18 + spr_template 0x0064, 0x0064, gUnknown_0861047C, gUnknown_08610504, NULL, gDummySpriteAffineAnimTable, sub_819A44C + .align 2 gUnknown_086105F0:: @ 86105F0 - .incbin "baserom.gba", 0x6105f0, 0x18 + spr_template 0x0065, 0x0066, gUnknown_08610484, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610608:: @ 8610608 - .incbin "baserom.gba", 0x610608, 0x18 + spr_template 0x0066, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610620:: @ 8610620 - .incbin "baserom.gba", 0x610620, 0x18 + spr_template 0x0067, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610638:: @ 8610638 - .incbin "baserom.gba", 0x610638, 0x18 + spr_template 0x006d, 0x0067, gUnknown_08610494, gUnknown_08610500, NULL, gUnknown_086105CC, SpriteCallbackDummy + .align 2 gUnknown_08610650:: @ 8610650 - .incbin "baserom.gba", 0x610650, 0x50 + obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065 + obj_tiles gUnknown_0860F43C, 0x0100, 0x0066 + obj_tiles gUnknown_0860F53C, 0x0100, 0x0067 + obj_tiles gUnknown_0860F63C, 0x0080, 0x0068 + obj_tiles gUnknown_0860F6BC, 0x0100, 0x0069 + obj_tiles gUnknown_0860F7BC, 0x0100, 0x006a + obj_tiles gUnknown_0860F83C, 0x0100, 0x006b + obj_tiles gUnknown_0860F93C, 0x0100, 0x006c + obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d + null_obj_tiles + .align 2 gUnknown_086106A0:: @ 86106A0 - .incbin "baserom.gba", 0x6106a0, 0x10 + obj_tiles gUnknown_085B18AC, 0x0800, 0x0064 + null_obj_tiles + .align 2 gUnknown_086106B0:: @ 86106B0 - .incbin "baserom.gba", 0x6106b0, 0x184 + obj_pal gUnknown_0860F13C, 0x0064 + obj_pal gUnknown_0860F15C, 0x0065 + obj_pal gUnknown_0860F17C, 0x0066 + obj_pal gUnknown_0861039C, 0x0067 + null_obj_pal + .align 2 +gUnknown_086106D8:: @ 86106D8 + .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_086106E0:: @ 86106E0 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_086106E8:: @ 86106E8 + .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 + + .align 2 +gUnknown_086106F0:: @ 86106F0 + .byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00 + + .align 2 +gUnknown_086106F8:: @ 86106F8 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08610700:: @ 8610700 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08610708:: @ 8610708 + .2byte 0x0000, 0x001e, 0xffff, 0x0000 + + .align 2 +gUnknown_08610710:: @ 8610710 + .2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004 + .2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008 + .2byte 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_08610758:: @ 8610758 + .4byte gUnknown_086106F8 + + .align 2 +gUnknown_0861075C:: @ 861075C + .4byte gUnknown_08610700 + + .align 2 +gUnknown_08610760:: @ 8610760 + .4byte gUnknown_08610708 + .4byte gUnknown_08610710 + + .align 2 +gUnknown_08610768:: @ 8610768 + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_086107C8:: @ 86107C8 + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_08610818:: @ 8610818 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_08610828:: @ 8610828 + .4byte gUnknown_08610768 + .4byte gUnknown_086107C8 + .4byte gUnknown_08610818 + + .align 2 gUnknown_08610834:: @ 8610834 - .incbin "baserom.gba", 0x610834, 0x18 + spr_template 0x0064, 0x0064, gUnknown_086106D8, gUnknown_08610760, NULL, gDummySpriteAffineAnimTable, sub_819A44C + .align 2 gUnknown_0861084C:: @ 861084C - .incbin "baserom.gba", 0x61084c, 0x18 + spr_template 0x0065, 0x0066, gUnknown_086106E0, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610864:: @ 8610864 - .incbin "baserom.gba", 0x610864, 0x18 + spr_template 0x0066, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0861087C:: @ 861087C - .incbin "baserom.gba", 0x61087c, 0x18 + spr_template 0x0067, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610894:: @ 8610894 - .incbin "baserom.gba", 0x610894, 0x18 + spr_template 0x006d, 0x0067, gUnknown_086106F0, gUnknown_0861075C, NULL, gUnknown_08610828, SpriteCallbackDummy + .align 2 gUnknown_086108AC:: @ 86108AC - .incbin "baserom.gba", 0x6108ac, 0xc + .4byte sub_819F114 + .4byte sub_819F0CC + .4byte sub_819F134 + .align 2 gUnknown_086108B8:: @ 86108B8 - .incbin "baserom.gba", 0x6108b8, 0x10 + .4byte 0x00001180, 0x00003195, 0x000001aa, 0x000021bb + .align 2 gUnknown_086108C8:: @ 86108C8 - .incbin "baserom.gba", 0x6108c8, 0x50 + window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001 + window_template 0x02, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019 + window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f + window_template 0x00, 0x15, 0x0e, 0x09, 0x06, 0x0f, 0x006b + window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x00a1 + window_template 0x02, 0x15, 0x0f, 0x09, 0x05, 0x0e, 0x006b + window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1 + window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9 + window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df + window_template_terminator gUnknown_08610918:: @ 8610918 - .incbin "baserom.gba", 0x610918, 0xa + .byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00 gUnknown_08610922:: @ 8610922 - .incbin "baserom.gba", 0x610922, 0x3 + .byte 0x00, 0x02, 0x00 gUnknown_08610925:: @ 8610925 - .incbin "baserom.gba", 0x610925, 0x3 + .byte 0x00, 0x04, 0x00 + .align 2 gUnknown_08610928:: @ 8610928 - .incbin "baserom.gba", 0x610928, 0x20 + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000003, sub_819F1AC + .align 2 gUnknown_08610948:: @ 8610948 - .incbin "baserom.gba", 0x610948, 0x28 + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000002, sub_819F1DC + .4byte 0x00000003, sub_819F1AC + .align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data gUnknown_08610970:: @ 8610970 - .incbin "baserom.gba", 0x610970, 0x34 - -gUnknown_086109A4:: @ 86109A4 - .incbin "baserom.gba", 0x6109a4, 0x16 - -gUnknown_086109BA:: @ 86109BA - .incbin "baserom.gba", 0x6109ba, 0x536 + .incbin "baserom.gba", 0x610970, 0x580 + .align 2 gUnknown_08610EF0:: @ 8610EF0 - .incbin "baserom.gba", 0x610ef0, 0x100 + .4byte gText_082B7229 + .4byte gText_082B731C + .4byte gText_082B735B + .4byte gText_082B7423 + .4byte gText_082B74C1 + .4byte gText_082B756F + .4byte gText_082B75B2 + .4byte gText_082B763F + .4byte gText_082B76AC + .4byte gText_082B7772 + .4byte gText_082B77CE + .4byte gText_082B7871 + .4byte gText_082B78D4 + .4byte gText_082B7B1A + .4byte gText_082B7C13 + .4byte gText_082B7D18 + .4byte gText_082B7DD4 + .4byte gText_082B7EE5 + .4byte gText_082B7F35 + .4byte gText_082B7FE8 + .4byte gText_082B8087 + .4byte gText_082B822B + .4byte gText_082B8286 + .4byte gText_082B8356 + .4byte gText_082B83CE + .4byte gText_082B84FC + .4byte gText_082B8559 + .4byte gText_082B8656 + .4byte gText_082B86EA + .4byte gText_082B87DA + .4byte gText_082B887C + .4byte gText_082B8957 + .4byte gText_082B89C6 + .4byte gText_082B8ACF + .4byte gText_082B8B66 + .4byte gText_082B8C20 + .4byte gText_082B8CAA + .4byte gText_082B8DD3 + .4byte gText_082B8E24 + .4byte gText_082B8ED5 + .4byte gText_082B8F45 + .4byte gText_082B905F + .4byte gText_082B910E + .4byte gText_082B9204 + .4byte gText_082B929C + .4byte gText_082B9438 + .4byte gText_082B9488 + .4byte gText_082B9564 + .4byte gText_082B95D8 + .4byte gText_082B9763 + .4byte gText_082B97E5 + .4byte gText_082B989A + .4byte gText_082B992D + .4byte gText_082B9A84 + .4byte gText_082B9AB9 + .4byte gText_082B9B76 + .4byte gText_082B9BF2 + .4byte gText_082B9D83 + .4byte gText_082B9DF9 + .4byte gText_082B9EAA + .4byte gText_082B9F55 + .4byte gText_082BA084 + .4byte gText_082BA11D + .4byte gText_082BA1F3 + .align 2 gUnknown_08610FF0:: @ 8610FF0 - .incbin "baserom.gba", 0x610ff0, 0x80 + .4byte gText_082BE50D + .4byte gText_082BE5F5 + .4byte gText_082BE679 + .4byte gText_082BE71E + .4byte gText_082BE762 + .4byte gText_082BE7F8 + .4byte gText_082BE850 + .4byte gText_082BE99C + .4byte gText_082BEA1B + .4byte gText_082BEAE9 + .4byte gText_082BEB72 + .4byte gText_082BEC8E + .4byte gText_082BED16 + .4byte gText_082BEE29 + .4byte gText_082BEEB4 + .4byte gText_082BEFE2 + .4byte gText_082BF04E + .4byte gText_082BF11D + .4byte gText_082BF1A8 + .4byte gText_082BF268 + .4byte gText_082BF2D1 + .4byte gText_082BF3CF + .4byte gText_082BF46A + .4byte gText_082BF551 + .4byte gText_082BF5C3 + .4byte gText_082BF6E5 + .4byte gText_082BF773 + .4byte gText_082BF869 + .4byte gText_082BF8DD + .4byte gText_082BF9BA + .4byte gText_082BFA5A + .4byte gText_082BFB4E + .align 2 gUnknown_08611070:: @ 8611070 - .incbin "baserom.gba", 0x611070, 0x140 + .4byte gText_082BA2A3 + .4byte gText_082BA34E + .4byte gText_082BA380 + .4byte gText_082BA3D2 + .4byte gText_082BA448 + .4byte gText_082BA4D3 + .4byte gText_082BA58C + .4byte gText_082BA5BF + .4byte gText_082BA5F3 + .4byte gText_082BA635 + .4byte gText_082BA6E6 + .4byte gText_082BA742 + .4byte gText_082BA770 + .4byte gText_082BA78F + .4byte gText_082BA7D8 + .4byte gText_082BA867 + .4byte gText_082BA96B + .4byte gText_082BA9B7 + .4byte gText_082BAA1B + .4byte gText_082BAA81 + .4byte gText_082BAB22 + .4byte gText_082BAC43 + .4byte gText_082BAC78 + .4byte gText_082BAD17 + .4byte gText_082BADB6 + .4byte gText_082BAE36 + .4byte gText_082BAF4E + .4byte gText_082BAF8F + .4byte gText_082BAFDB + .4byte gText_082BB05F + .4byte gText_082BB0D4 + .4byte gText_082BB18C + .4byte gText_082BB1CE + .4byte gText_082BB242 + .4byte gText_082BB2D9 + .4byte gText_082BB370 + .4byte gText_082BB4C3 + .4byte gText_082BB4FB + .4byte gText_082BB575 + .4byte gText_082BB5E1 + .4byte gText_082BB656 + .4byte gText_082BB6E5 + .4byte gText_082BB72C + .4byte gText_082BB7A2 + .4byte gText_082BB84A + .4byte gText_082BB8CD + .4byte gText_082BB970 + .4byte gText_082BB9AE + .4byte gText_082BBA05 + .4byte gText_082BBA6C + .4byte gText_082BBB01 + .4byte gText_082BBC1C + .4byte gText_082BBC4B + .4byte gText_082BBCF6 + .4byte gText_082BBD90 + .4byte gText_082BBE0B + .4byte gText_082BBEE5 + .4byte gText_082BBF25 + .4byte gText_082BBFA4 + .4byte gText_082BC024 + .4byte gText_082BC0C8 + .4byte gText_082BC213 + .4byte gText_082BC247 + .4byte gText_082BC2DD + .4byte gText_082BC373 + .4byte gText_082BC40E + .4byte gText_082BC514 + .4byte gText_082BC555 + .4byte gText_082BC5CE + .4byte gText_082BC666 + .4byte gText_082BC714 + .4byte gText_082BC808 + .4byte gText_082BC84D + .4byte gText_082BC8EA + .4byte gText_082BC984 + .4byte gText_082BCA4D + .4byte gText_082BCB75 + .4byte gText_082BCBA6 + .4byte gText_082BCBFC + .4byte gText_082BCCA4 + .align 2 gUnknown_086111B0:: @ 86111B0 - .incbin "baserom.gba", 0x6111b0, 0x80 + .4byte gText_082BFBF2 + .4byte gText_082BFCAE + .4byte gText_082BFD26 + .4byte gText_082BFDB1 + .4byte gText_082BFE24 + .4byte gText_082BFEAD + .4byte gText_082BFF0A + .4byte gText_082C0032 + .4byte gText_082C0090 + .4byte gText_082C016E + .4byte gText_082C01F7 + .4byte gText_082C034C + .4byte gText_082C03CA + .4byte gText_082C046E + .4byte gText_082C04F9 + .4byte gText_082C0598 + .4byte gText_082C0602 + .4byte gText_082C06D8 + .4byte gText_082C074A + .4byte gText_082C0809 + .4byte gText_082C086E + .4byte gText_082C0982 + .4byte gText_082C0A1D + .4byte gText_082C0AFD + .4byte gText_082C0B6F + .4byte gText_082C0C7D + .4byte gText_082C0D0B + .4byte gText_082C0DFE + .4byte gText_082C0E71 + .4byte gText_082C0F6D + .4byte gText_082C1003 + .4byte gText_082C1122 + .align 2 gUnknown_08611230:: @ 8611230 - .incbin "baserom.gba", 0x611230, 0x80 + .4byte gText_082BCD68 + .4byte gText_082BCE64 + .4byte gText_082BCEF2 + .4byte gText_082BCF61 + .4byte gText_082BCFA1 + .4byte gText_082BD03C + .4byte gText_082BD06D + .4byte gText_082BD18A + .4byte gText_082BD222 + .4byte gText_082BD325 + .4byte gText_082BD3B1 + .4byte gText_082BD493 + .4byte gText_082BD51C + .4byte gText_082BD609 + .4byte gText_082BD697 + .4byte gText_082BD797 + .4byte gText_082BD806 + .4byte gText_082BD8F5 + .4byte gText_082BD9BE + .4byte gText_082BDAE1 + .4byte gText_082BDB4E + .4byte gText_082BDC6B + .4byte gText_082BDD0D + .4byte gText_082BDDEC + .4byte gText_082BDE68 + .4byte gText_082BDF4D + .4byte gText_082BDFD8 + .4byte gText_082BE0FD + .4byte gText_082BE189 + .4byte gText_082BE2A5 + .4byte gText_082BE33E + .4byte gText_082BE46C + .align 2 gUnknown_086112B0:: @ 86112B0 - .incbin "baserom.gba", 0x6112b0, 0x80 + .4byte gText_082C11D1 + .4byte gText_082C12D5 + .4byte gText_082C13AB + .4byte gText_082C1444 + .4byte gText_082C1501 + .4byte gText_082C15B6 + .4byte gText_082C165E + .4byte gText_082C174F + .4byte gText_082C1862 + .4byte gText_082C19A0 + .4byte gText_082C1A76 + .4byte gText_082C1C16 + .4byte gText_082C1CF5 + .4byte gText_082C1DC1 + .4byte gText_082C1EDC + .4byte gText_082C1FEC + .4byte gText_082C20D1 + .4byte gText_082C21FF + .4byte gText_082C231C + .4byte gText_082C2407 + .4byte gText_082C24B5 + .4byte gText_082C25B1 + .4byte gText_082C2707 + .4byte gText_082C27D4 + .4byte gText_082C28D6 + .4byte gText_082C2A0B + .4byte gText_082C2B50 + .4byte gText_082C2C77 + .4byte gText_082C2D67 + .4byte gText_082C2E41 + .4byte gText_082C2EF5 + .4byte gText_082C3023 + .align 2 gUnknown_08611330:: @ 8611330 - .incbin "baserom.gba", 0x611330, 0x40 + .4byte gText_082B6EA5 + .4byte gText_082B6EEC + .4byte gText_082B6F16 + .4byte gText_082B6F4C + .4byte gText_082B6F92 + .4byte gText_082B6FC9 + .4byte gText_082B700C + .4byte gText_082B703A + .4byte gText_082B706A + .4byte gText_082B709C + .4byte gText_082B70CC + .4byte gText_082B710A + .4byte gText_082B714D + .4byte gText_082B7185 + .4byte gText_082B71C1 + .4byte gText_082B71F9 gUnknown_08611370:: @ 8611370 - .incbin "baserom.gba", 0x611370, 0x163 + .byte 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00 + .byte 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01 + .byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01 + .byte 0x01, 0x01, 0x01 gUnknown_086114D3:: @ 86114D3 - .incbin "baserom.gba", 0x6114d3, 0xd + .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00 + .align 2 gUnknown_086114E0:: @ 86114E0 - .incbin "baserom.gba", 0x6114e0, 0x68 + .4byte sub_81A093C + .4byte sub_81A0964 + .4byte sub_81A0978 + .4byte sub_819FC60 + .4byte sub_81A0984 + .4byte sub_81A0990 + .4byte sub_81A09D0 + .4byte sub_81A0A20 + .4byte sub_81A0C9C + .4byte sub_81A087C + .4byte sub_81A1638 + .4byte sub_81A0CC0 + .4byte sub_81A09B4 + .4byte sub_81A0D40 + .4byte sub_81A0DD4 + .4byte sub_81A0FE4 + .4byte sub_81A0FFC + .4byte sub_81A0D80 + .4byte sub_81A11F8 + .4byte sub_81A1218 + .4byte sub_81A1224 + .4byte sub_81A1438 + .4byte sub_81A150C + .4byte sub_81A15A4 + .4byte sub_81A1644 + .4byte sub_81A1370 + .align 2 gUnknown_08611548:: @ 8611548 - .incbin "baserom.gba", 0x611548, 0x8 + .byte 0x00, 0x01, 0x02, 0x03, 0x06, 0x07, 0x08, 0x09 + .align 2 gUnknown_08611550:: @ 8611550 - .incbin "baserom.gba", 0x611550, 0x1c + .byte 0x23, 0x46, 0x23, 0x01, 0x04, 0x09, 0x05, 0x00, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x38, 0x1c, 0x01, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x8c, 0x38, 0x01, 0x15, 0x46, 0x23, 0x00 + .align 2 gUnknown_0861156C:: @ 861156C - .incbin "baserom.gba", 0x61156c, 0xc + .byte 0x41, 0x00, 0xb3, 0x00, 0x18, 0x0f, 0x6a, 0x00, 0x98, 0x98, 0x64, 0x00 + .align 2 gUnknown_08611578:: @ 8611578 - .incbin "baserom.gba", 0x611578, 0x33c + .2byte 0x0009, 0x0007, 0x0008, 0x0032, 0x00f4, 0x008d, 0x0118, 0x9864, 0x0098, 0x0664, 0x007e, 0x015b, 0x00d8, 0x002e, 0x008f, 0x00b7 + .2byte 0x0318, 0x9898, 0x0000, 0x646a, 0x0022, 0x00bb, 0x0119, 0x00f7, 0x00f3, 0x008d, 0x0f1f, 0x009e, 0x64fc, 0x0000, 0x0055, 0x015b + .2byte 0x0073, 0x009c, 0x0198, 0x00b3, 0x0f1f, 0x00fc, 0x06fc, 0x0000, 0x005e, 0x015b, 0x0069, 0x0151, 0x008f, 0x0086, 0x031f, 0xfcfc + .2byte 0x0000, 0x0006, 0x00ae, 0x00d8, 0x009c, 0x00f7, 0x011d, 0x00c4, 0x0214, 0x9898, 0x006a, 0x0064, 0x0039, 0x0059, 0x003a, 0x0044 + .2byte 0x018d, 0x008d, 0x0314, 0x9898, 0x646a, 0x0000, 0x0059, 0x0118, 0x0151, 0x014c, 0x0006, 0x00b4, 0x1114, 0x9864, 0x986a, 0x0000 + .2byte 0x013b, 0x009d, 0x014c, 0x0059, 0x011d, 0x00c8, 0x021f, 0xfcfc, 0x0006, 0x0000, 0x0039, 0x0059, 0x003a, 0x00f3, 0x0190, 0x00b7 + .2byte 0x021f, 0xfcfc, 0x0006, 0x0000, 0x005e, 0x0135, 0x0059, 0x00b6, 0x0197, 0x0086, 0x0f1f, 0x00fc, 0x06fc, 0x0000, 0x0055, 0x005e + .2byte 0x015b, 0x009c, 0x00a9, 0x00b3, 0x0310, 0x0098, 0x9800, 0x6a64, 0x006d, 0x0068, 0x005c, 0x0013, 0x016e, 0x00c6, 0x0010, 0x9898 + .2byte 0x6a00, 0x0064, 0x0059, 0x00cf, 0x00f7, 0x0118, 0x0083, 0x00b7, 0x1110, 0x0000, 0x00fc, 0x986a, 0x003a, 0x0020, 0x006d, 0x00b6 + .2byte 0x003b, 0x00b4, 0x0b1f, 0xfc06, 0x00fc, 0x0000, 0x013b, 0x00f5, 0x002e, 0x00b6, 0x016e, 0x00c6, 0x001f, 0xfc06, 0xfc00, 0x0000 + .2byte 0x003f, 0x0059, 0x00f7, 0x0119, 0x00f5, 0x00bb, 0x0b1f, 0x00fc, 0x06fc, 0x0000, 0x003b, 0x0039, 0x002c, 0x015b, 0x00d6, 0x00aa + .2byte 0x0d14, 0x986a, 0x9800, 0x6400, 0x00e0, 0x013d, 0x00cb, 0x00b3, 0x00c5, 0x00c8, 0x1414, 0x0098, 0x0064, 0x6a98, 0x0022, 0x006d + .2byte 0x005e, 0x00b9, 0x012f, 0x00b3, 0x0314, 0xfc00, 0xfc06, 0x0000, 0x00f7, 0x00d8, 0x006d, 0x014c, 0x00c5, 0x0086, 0x141f, 0x00fc + .2byte 0x0000, 0x06fc, 0x0026, 0x006d, 0x009c, 0x005e, 0x005e, 0x00c8, 0x0f1f, 0x00fc, 0x00fc, 0x0006, 0x005e, 0x005f, 0x008a, 0x00c2 + .2byte 0x0133, 0x008d, 0x0d1f, 0xfc06, 0xfc00, 0x0000, 0x0093, 0x0108, 0x00ca, 0x001d, 0x018f, 0x008e, 0x021f, 0xfc00, 0x00fc, 0x0006 + .2byte 0x0071, 0x005e, 0x0073, 0x00e8, 0x00e3, 0x008e, 0x081f, 0x00fc, 0x0000, 0xfc06, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x008e + .2byte 0x031f, 0xfc00, 0x0000, 0x06fc, 0x0055, 0x00b6, 0x004c, 0x0151, 0x018f, 0x008e, 0x021f, 0xfc00, 0x00fc, 0x0006, 0x0071, 0x005e + .2byte 0x0073, 0x00e8, 0x00e3, 0x008e, 0x081f, 0x00fc, 0x0000, 0xfc06, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x008e, 0x031f, 0xfc00 + .2byte 0x0000, 0x06fc, 0x0055, 0x00b6, 0x004c, 0x0151, 0x017b, 0x00b7, 0x0210, 0x00fc, 0x00fc, 0x0006, 0x00cf, 0x00f2, 0x0131, 0x00ca + .2byte 0x00d5, 0x0086, 0x0510, 0x00fc, 0x0000, 0xfc6a, 0x005c, 0x00c9, 0x00b6, 0x009c, 0x0149, 0x00c8, 0x0f10, 0x0098, 0x0064, 0x6a98 + .2byte 0x003a, 0x00f3, 0x0039, 0x0069, 0x017b, 0x00c4, 0x051f, 0x00fc, 0x0000, 0x06fc, 0x00cf, 0x00f2, 0x00bc, 0x00ca, 0x00d0, 0x00b3 + .2byte 0x021f, 0x00fc, 0x0000, 0xfc06, 0x0059, 0x009d, 0x0099, 0x0067, 0x0082, 0x0086, 0x031f, 0x06fc, 0x0000, 0xfc00, 0x015d, 0x00d8 + .2byte 0x002e, 0x009c, 0x0191, 0x00b7, 0x0310, 0x9898, 0x0000, 0x646a, 0x0099, 0x0114, 0x0059, 0x00f6, 0x0193, 0x00c8, 0x0310, 0x9898 + .2byte 0x0000, 0xc806, 0x0059, 0x00e8, 0x005c, 0x014e, 0x0192, 0x0086, 0x0f10, 0x006a, 0x0098, 0x9864, 0x003a, 0x0085, 0x0057, 0x009c + .2byte 0x0090, 0x00c6, 0x101f, 0x0006, 0xfcfc, 0x0000, 0x003b, 0x0160, 0x014c, 0x0073, 0x0091, 0x008d, 0x101f, 0x0006, 0xfcfc, 0x0000 + .2byte 0x0057, 0x00c5, 0x0041, 0x0071, 0x0092, 0x00b3, 0x101f, 0x0006, 0xfcfc, 0x0000, 0x007e, 0x003f, 0x014c, 0x00db gUnknown_086118B4:: @ 86118B4 - .incbin "baserom.gba", 0x6118b4, 0x348 + .byte 0x01, 0x02, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x03, 0x04, 0x04 + .byte 0x01, 0x01, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x02, 0x02, 0x00, 0x00 + .byte 0x05, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x05, 0x06, 0x06, 0x02, 0x02, 0x00, 0x00, 0x05, 0x06, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x05, 0x06, 0x07, 0x07, 0x03, 0x03, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x05, 0x06, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x07, 0x08, 0x08, 0x03, 0x03, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x06, 0x00, 0x00 + .byte 0x04, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x08, 0x09, 0x09, 0x04, 0x04, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 + .byte 0x08, 0x00, 0x00, 0x00, 0x08, 0x09, 0x0a, 0x0a, 0x04, 0x04, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x07, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 + .byte 0x09, 0x0a, 0x0b, 0x0b, 0x05, 0x05, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0c, 0x0c + .byte 0x05, 0x05, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x0d, 0x0d, 0x06, 0x06, 0x00, 0x00 + .byte 0x09, 0x0a, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x0e, 0x0e, 0x06, 0x06, 0x00, 0x00, 0x09, 0x0a, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 + .byte 0x09, 0x0a, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x0a, 0x00, 0x00 + .byte 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 + .byte 0x0c, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x08, 0x08, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00 + .byte 0x0f, 0x0f, 0x0f, 0x0f, 0x09, 0x09, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f + .byte 0x09, 0x09, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0b, 0x0c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0a, 0x00, 0x00 + .byte 0x0d, 0x0e, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0a, 0x0a, 0x00, 0x00, 0x0d, 0x0e, 0x00, 0x00 + .byte 0x0e, 0x00, 0x00, 0x00, 0x0c, 0x0d, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0b, 0x0b, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00 + .byte 0x0d, 0x0e, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0b, 0x0b, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x00, 0x00 + .byte 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00 + .byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00 + .byte 0x0f, 0x0f, 0x0f, 0x0f, 0x0d, 0x0d, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f + .byte 0x0d, 0x0d, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x00, 0x00 + .byte 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00 + .byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00 + .byte 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00 + .byte 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00 + .align 2 gUnknown_08611BFC:: @ 8611BFC - .incbin "baserom.gba", 0x611bfc, 0x1c + .2byte 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080, 0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000 + .align 2 gUnknown_08611C18:: @ 8611C18 - .incbin "baserom.gba", 0x611c18, 0x5c + .4byte sub_81A17A0 + .4byte sub_81A1830 + .4byte sub_81A1968 + .4byte sub_81A1AD4 + .4byte sub_81A1B1C + .4byte sub_81A1B28 + .4byte sub_81A1B38 + .4byte sub_81A1B98 + .4byte sub_81A31FC + .4byte sub_81A35EC + .4byte sub_81A3B00 + .4byte sub_81A3B64 + .4byte sub_81A3D30 + .4byte sub_81A3D58 + .4byte sub_81A3DA0 + .4byte sub_81A3FD4 + .4byte sub_81A4224 + .4byte sub_81A4230 + .4byte sub_81A43A8 + .4byte sub_81A4410 + .4byte sub_81A443C + .4byte sub_81A447C + .4byte sub_81A457C + .align 2 gUnknown_08611C74:: @ 8611C74 - .incbin "baserom.gba", 0x611c74, 0x8 + window_template 0x00, 0x01, 0x01, 0x1c, 0x12, 0x0f, 0x0001 + .align 2 gUnknown_08611C7C:: @ 8611C7C - .incbin "baserom.gba", 0x611c7c, 0x8 + window_template 0x00, 0x02, 0x02, 0x1a, 0x0f, 0x0f, 0x0001 + .align 2 gUnknown_08611C84:: @ 8611C84 - .incbin "baserom.gba", 0x611c84, 0x8 + window_template 0x00, 0x02, 0x01, 0x1a, 0x11, 0x0f, 0x0001 gUnknown_08611C8C:: @ 8611C8C - .incbin "baserom.gba", 0x611c8c, 0xe + .byte 0x46, 0x01, 0x47, 0x00, 0x49, 0x00, 0x48, 0x01, 0x4a, 0x00, 0x4b, 0x01, 0xea, 0x00 gUnknown_08611C9A:: @ 8611C9A - .incbin "baserom.gba", 0x611c9a, 0x16 + .2byte 0x0097, 0x0096, 0x00fa, 0x00f9, 0x00fb, 0x0194, 0x0195, 0x0196, 0x0199, 0x019a, 0xffff + .align 2 gUnknown_08611CB0:: @ 8611CB0 - .incbin "baserom.gba", 0x611cb0, 0x50 + .4byte gText_BattleTower2 + .4byte gUnknown_085ED164 + .4byte gText_BattleTower2 + .4byte gUnknown_085ED170 + .4byte gText_BattleTower2 + .4byte gUnknown_085ED17C + .4byte gText_BattleDome + .4byte gUnknown_085ED164 + .4byte gText_BattlePalace + .4byte gUnknown_085ED164 + .4byte gText_BattleArena + .4byte gUnknown_085ED190 + .4byte gText_BattleFactory + .4byte gUnknown_085ED164 + .4byte gText_BattlePike + .4byte gUnknown_085ED190 + .4byte gText_BattlePyramid + .4byte gUnknown_085ED190 + .4byte gText_BattleTower2 + .4byte gUnknown_085ED188 + .align 2 gUnknown_08611D00:: @ 8611D00 - .incbin "baserom.gba", 0x611d00, 0x8 + .4byte gUnknown_085EE3B0 + .4byte gUnknown_085EE3B8 + .align 2 gUnknown_08611D08:: @ 8611D08 - .incbin "baserom.gba", 0x611d08, 0x28 - + .4byte gUnknown_085EE3C4 + .4byte gUnknown_085EE3C4 + .4byte gUnknown_085EE3C4 + .4byte gUnknown_085EE3D4 + .4byte gUnknown_085EE3C4 + .4byte gUnknown_085EE3FC + .4byte gUnknown_085EE3C4 + .4byte gUnknown_085EE3E8 + .4byte gUnknown_085EE410 + .4byte gUnknown_085EE3C4 + + .align 1 gUnknown_08611D30:: @ 8611D30 - .incbin "baserom.gba", 0x611d30, 0x80 + .2byte 0x0325, 0x0326, 0x0327, 0x0328, 0x0329, 0x032a, 0x032b, 0x0000 + + .align 2 +gUnknown_08611D40:: @ 8611D40 + .4byte gText_082C843F + .4byte gText_082C848B + .4byte gText_082C8628 + .4byte gText_082C85B4 + .4byte gText_082C8512 + .4byte gText_082C859D + .4byte gText_082C86C3 + + .align 2 +gUnknown_08611D5C:: @ 8611D5C + .4byte gText_082C8458 + .4byte gText_082C84C1 + .4byte gText_082C8662 + .4byte gText_082C85E3 + .4byte gText_082C853B + .4byte gText_082C85A4 + .4byte gText_082C86FE + + .align 2 +gUnknown_08611D78:: @ 8611D78 + .4byte gText_082C846C + .4byte gText_082C84D0 + .4byte gText_082C8682 + .4byte gText_082C85F5 + .4byte gText_082C8561 + .4byte gText_082C85A9 + .4byte gText_082C8739 + + .align 2 +gUnknown_08611D94:: @ 8611D94 + .4byte gText_082C8480 + .4byte gText_082C84F7 + .4byte gText_082C86B3 + .4byte gText_082C8611 + .4byte gText_082C8589 + .4byte gText_082C85AE + .4byte gText_082C877B + .align 2 gUnknown_08611DB0:: @ 8611DB0 - .incbin "baserom.gba", 0x611db0, 0x8 + .4byte gUnknown_08611D40 + .4byte gUnknown_08611D78 + .align 2 gUnknown_08611DB8:: @ 8611DB8 - .incbin "baserom.gba", 0x611db8, 0x8 + .4byte gUnknown_08611D5C + .4byte gUnknown_08611D94 @ 8611DC0 .include "data/battle_frontier/battle_arena_move_mind_ratings.inc" .align 2 -@ 8611F24 - .incbin "baserom.gba", 0x611f24, 0x38 +gUnknown_08611F24:: @ 8611F24 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0xf0, 0x00, 0x00 + .align 2 +gUnknown_08611F2C:: @ 8611F2C + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08611F34:: @ 8611F34 + .2byte 0x0004, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08611F3C:: @ 8611F3C + .2byte 0x0008, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08611F44:: @ 8611F44 + .2byte 0x000c, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08611F4C:: @ 8611F4C + .4byte gUnknown_08611F2C + .4byte gUnknown_08611F34 + .4byte gUnknown_08611F3C + .4byte gUnknown_08611F44 + + .align 2 gUnknown_08611F5C:: @ 8611F5C - .incbin "baserom.gba", 0x611f5c, 0x18 + spr_template 0x03e8, 0xffff, gUnknown_08611F24, gUnknown_08611F4C, NULL, gDummySpriteAffineAnimTable, sub_81A5698 + .align 2 gUnknown_08611F74:: @ 8611F74 - .incbin "baserom.gba", 0x611f74, 0x10 + obj_tiles gUnknown_08D854E8, 0x0200, 0x03e8 + null_obj_tiles + .align 2 gUnknown_08611F84:: @ 8611F84 - .incbin "baserom.gba", 0x611f84, 0x1c - + .4byte sub_81A58B4 + .4byte sub_81A5964 + .4byte sub_81A59FC + .4byte sub_81A5AC4 + .4byte sub_81A5B08 + .4byte sub_81A5B88 + .4byte sub_81A5BE0 + + .align 1 gUnknown_08611FA0:: @ 8611FA0 - .incbin "baserom.gba", 0x611fa0, 0xc + .2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 + .align 1 gUnknown_08611FAC:: @ 8611FAC - .incbin "baserom.gba", 0x611fac, 0x14 + .2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba, 0x0000 @ 8611FC0 .include "data/battle_frontier/battle_factory_style_move_lists.inc" + .align 2 gUnknown_08612120:: @ 8612120 - .incbin "baserom.gba", 0x612120, 0x44 + .4byte sub_81A5E94 + .4byte sub_81A5FA8 + .4byte sub_81A6054 + .4byte sub_81A613C + .4byte nullsub_75 + .4byte nullsub_123 + .4byte sub_81A6188 + .4byte sub_81A6198 + .4byte sub_81A61A4 + .4byte sub_81A63CC + .4byte sub_81A64C4 + .4byte sub_81A63B8 + .4byte sub_81A61B0 + .4byte sub_81A67EC + .4byte sub_81A6A08 + .4byte sub_81A6AEC + .4byte sub_81A6C1C + .align 2 gUnknown_08612164:: @ 8612164 - .incbin "baserom.gba", 0x612164, 0x10 + .4byte 0x00000100, 0x00000200, 0x01000000, 0x02000000 + .align 2 gUnknown_08612174:: @ 8612174 - .incbin "baserom.gba", 0x612174, 0x10 + .4byte 0xfffffeff, 0xfffffdff, 0xfeffffff, 0xfdffffff gUnknown_08612184:: @ 8612184 - .incbin "baserom.gba", 0x612184, 0x10 + .byte 0x03, 0x06, 0x06, 0x09, 0x09, 0x0c, 0x0c, 0x0f, 0x0f, 0x12, 0x15, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f + .align 1 gUnknown_08612194:: @ 8612194 - .incbin "baserom.gba", 0x612194, 0x180 + .2byte 0x006e, 0x00c7, 0x00a2, 0x010a, 0x010b, 0x0173, 0x0174, 0x01d3, 0x01d4, 0x0233, 0x0234, 0x0293, 0x0294, 0x02f3, 0x0174, 0x0351 + .2byte 0x0174, 0x01d3, 0x01d4, 0x0233, 0x0234, 0x0293, 0x0294, 0x02f3, 0x0174, 0x0371, 0x0174, 0x0371, 0x0174, 0x0371, 0x0174, 0x0371 + + .align 1 +gUnknown_086121D4:: @ 86121D4 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x016a, 0x0005, 0x0105, 0x00d4 + .2byte 0x005c, 0x0145 + + .align 1 +gUnknown_086121F8:: @ 86121F8 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x0065, 0x0005, 0x0099, 0x0078 + .2byte 0x0057, 0x005c + + .align 1 +gUnknown_0861221C:: @ 861221C + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x0133, 0x0005, 0x0093, 0x004e + .2byte 0x004d, 0x00ed + + .align 1 +gUnknown_08612240:: @ 8612240 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x00ca, 0x0005, 0x0044, 0x00f3 + .2byte 0x00db, 0x00c2 + + .align 2 +gUnknown_08612264:: @ 8612264 + .4byte gUnknown_086121D4 + .4byte gUnknown_086121F8 + .4byte gUnknown_0861221C + .4byte gUnknown_08612240 + + .align 1 +gUnknown_08612274:: @ 8612274 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x016a, 0x0005, 0x0105, 0x00d4 + .2byte 0x005c, 0x003a + + .align 1 +gUnknown_08612298:: @ 8612298 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x0065, 0x0005, 0x0099, 0x0078 + .2byte 0x0057, 0x005c + + .align 1 +gUnknown_086122BC:: @ 86122BC + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x0133, 0x0005, 0x0093, 0x004e + .2byte 0x004d, 0x00ed + + .align 1 +gUnknown_086122E0:: @ 86122E0 + .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x00ca, 0x0005, 0x0044, 0x00f3 + .2byte 0x00db, 0x00e3 + + .align 2 +gUnknown_08612304:: @ 8612304 + .4byte gUnknown_08612274 + .4byte gUnknown_08612298 + .4byte gUnknown_086122BC + .4byte gUnknown_086122E0 + .align 2 gUnknown_08612314:: @ 8612314 - .incbin "baserom.gba", 0x612314, 0x8 + .4byte gUnknown_08612264 + .4byte gUnknown_08612304 + .align 2 gUnknown_0861231C:: @ 861231C - .incbin "baserom.gba", 0x61231c, 0xc8 + .2byte 0x0012 + .byte 0x03, 0x05, 0x06 + + .align 2 + .2byte 0x0005 + .byte 0x0d, 0x20, 0x25 + + .align 2 + .2byte 0x0011 + .byte 0x08, 0x0b, 0x0c + + .align 2 + .2byte 0x0024 + .byte 0x22, 0x1e, 0x21 + + .align 2 + .2byte 0x0015 + .byte 0x00, 0x00, 0x00 + + .align 2 + .2byte 0x001e + .byte 0x01, 0x01, 0x01 + + .align 2 + .2byte 0x002c + .byte 0x16, 0x17, 0x1b + + .align 2 + .2byte 0x0037 + .byte 0x08, 0x16, 0x1f + + .align 2 + .2byte 0x000e + .byte 0x0d, 0x27, 0x15 + + .align 2 + .2byte 0x0014 + .byte 0x02, 0x04, 0x11 + + .align 2 + .2byte 0x0038 + .byte 0x1e, 0x14, 0x24 + + .align 2 + .2byte 0x0042 + .byte 0x1c, 0x22, 0x19 + .align 2 + .2byte 0x0026 + .byte 0x17, 0x26, 0x1a + + .align 2 + .2byte 0x0032 + .byte 0x17, 0x1e, 0x0b + + .align 2 + .2byte 0x002f + .byte 0x0f, 0x13, 0x0e + + .align 2 + .2byte 0x0027 + .byte 0x02, 0x1d, 0x1a + + .align 2 + .2byte 0x0033 + .byte 0x25, 0x0c, 0x20 + + .align 2 + .2byte 0x0021 + .byte 0x18, 0x17, 0x26 + + .align 2 + .2byte 0x0018 + .byte 0x05, 0x16, 0x04 + + .align 2 + .2byte 0x000b + .byte 0x29, 0x25, 0x23 + + .align 2 + .2byte 0x0035 + .byte 0x27, 0x0e, 0x0d + + .align 2 + .2byte 0x0030 + .byte 0x0a, 0x07, 0x09 + + .align 2 + .2byte 0x000c + .byte 0x28, 0x14, 0x10 + + .align 2 + .2byte 0x0034 + .byte 0x12, 0x0d, 0x15 + + .align 2 + .2byte 0x0013 + .byte 0x16, 0x1f, 0x1b + + .align 2 gUnknown_086123E4:: @ 86123E4 - .incbin "baserom.gba", 0x6123e4, 0x1f8 + .byte 0x29, 0x0a, 0x30, 0x06, 0x01, 0x0a, 0x0f, 0x14, 0x20, 0x10, 0x0e, 0x27 + .byte 0x2a, 0x0a, 0x1d, 0x08, 0x1b, 0x06, 0x34, 0x10, 0x20, 0x1e, 0x29, 0x0a + .byte 0x22, 0x1e, 0x31, 0x12, 0x01, 0x0a, 0x18, 0x10, 0x1a, 0x1c, 0x03, 0x0c + .byte 0x0f, 0x1e, 0x0b, 0x10, 0x39, 0x10, 0x0f, 0x20, 0x2b, 0x10, 0x14, 0x0a + .byte 0x3b, 0x10, 0x02, 0x0a, 0x1e, 0x16, 0x20, 0x10, 0x3e, 0x14, 0x03, 0x0c + .byte 0x31, 0x0a, 0x02, 0x0e, 0x15, 0x0e, 0x36, 0x14, 0x37, 0x10, 0x0a, 0x1e + .byte 0x29, 0x0a, 0x25, 0x10, 0x2a, 0x14, 0x34, 0x10, 0x0f, 0x1e, 0x1b, 0x0a + .byte 0x01, 0x0a, 0x07, 0x0e, 0x2a, 0x12, 0x0f, 0x1e, 0x1f, 0x06, 0xff, 0xff + .byte 0x35, 0x1a, 0x36, 0x10, 0x0f, 0x0e, 0x01, 0x0a, 0x21, 0x26, 0x0f, 0x1e + .byte 0x25, 0x0e, 0x2f, 0x10, 0x2d, 0x06, 0x1e, 0x20, 0x03, 0x0c, 0xff, 0xff + .byte 0x1d, 0x0c, 0x1d, 0x08, 0x2b, 0x0a, 0x0f, 0x10, 0x02, 0x0a, 0x03, 0x0c + .byte 0x2a, 0x0a, 0x3e, 0x0a, 0x00, 0x20, 0x27, 0x10, 0x08, 0x1c, 0x04, 0x0c + .byte 0x01, 0x0a, 0x12, 0x12, 0x01, 0x0a, 0x00, 0x10, 0x2d, 0x06, 0xff, 0xff + .byte 0x22, 0x1e, 0x31, 0x12, 0x01, 0x0a, 0x18, 0x10, 0x1c, 0x1c, 0x03, 0x0c + .byte 0x01, 0x0a, 0x0b, 0x06, 0x30, 0x10, 0x28, 0x0a, 0x49, 0x25, 0x24, 0x06 + .byte 0x14, 0x10, 0x2c, 0x0a, 0x15, 0x04, 0x42, 0x16, 0x1b, 0x1e, 0x03, 0x0c + .byte 0x28, 0x06, 0x0f, 0x1a, 0x0b, 0x10, 0x17, 0x20, 0x00, 0x0c, 0xff, 0xff + .byte 0x01, 0x0a, 0x15, 0x10, 0x47, 0x16, 0x0f, 0x1e, 0x39, 0x0e, 0x36, 0x0e + .byte 0x01, 0x0a, 0x17, 0x10, 0x20, 0x16, 0x19, 0x0e, 0x31, 0x0a, 0x38, 0x0c + .byte 0x1d, 0x0c, 0x1d, 0x08, 0x00, 0x0c, 0x22, 0x10, 0x12, 0x1c, 0x0b, 0x02 + .byte 0x29, 0x10, 0x04, 0x14, 0x2f, 0x10, 0x06, 0x10, 0x28, 0x1e, 0x1c, 0x1c + .byte 0x29, 0x10, 0x20, 0x0e, 0x28, 0x10, 0x16, 0x1c, 0x29, 0x1e, 0x03, 0x0c + .byte 0x0f, 0x1e, 0x0b, 0x10, 0x2f, 0x0e, 0x38, 0x06, 0x0c, 0x10, 0xff, 0xff + .byte 0x29, 0x0a, 0x08, 0x14, 0x2f, 0x10, 0x1e, 0x06, 0x2c, 0x10, 0xff, 0xff + .byte 0x23, 0x10, 0x0b, 0x10, 0x1d, 0x08, 0x2d, 0x06, 0x37, 0x10, 0x14, 0x0a + .byte 0x29, 0x0a, 0x22, 0x10, 0x08, 0x14, 0x2f, 0x10, 0x1e, 0x16, 0x29, 0x10 + .byte 0x01, 0x06, 0x2c, 0x10, 0x01, 0x0a, 0x15, 0x10, 0x39, 0x0e, 0x36, 0x0e + .byte 0x20, 0x10, 0x0b, 0x02, 0x3f, 0x10, 0x12, 0x1c, 0x04, 0x0c, 0xff, 0xff + .byte 0x18, 0x10, 0x02, 0x0a, 0x3a, 0x10, 0x46, 0x04, 0x0e, 0x02, 0x03, 0x0c + .byte 0x10, 0x1e, 0x0b, 0x02, 0x0a, 0x1e, 0x0b, 0x10, 0x3a, 0x06, 0xff, 0xff + .byte 0x02, 0x0a, 0x12, 0x12, 0x0f, 0x1e, 0x0b, 0x10, 0x38, 0x06, 0x03, 0x0c + .byte 0x22, 0x1e, 0x00, 0x10, 0x1b, 0x16, 0x3f, 0x10, 0x0f, 0x1e, 0x03, 0x0c + .byte 0x29, 0x0a, 0x1e, 0x0e, 0x25, 0x10, 0x26, 0x1e, 0x00, 0x0c, 0xff, 0xff + .byte 0x01, 0x0a, 0x1e, 0x0e, 0x36, 0x12, 0x2f, 0x10, 0x0b, 0x12, 0x04, 0x0c + .byte 0x05, 0x28, 0x0f, 0x1e, 0x1b, 0x0a, 0x0b, 0x10, 0x20, 0x10, 0x3b, 0x06 + .byte 0x01, 0x0a, 0x1f, 0x10, 0x3e, 0x0a, 0x37, 0x10, 0x20, 0x10, 0x28, 0x06 + .byte 0x26, 0x10, 0x31, 0x0a, 0x29, 0x1e, 0x1c, 0x1c, 0x01, 0x0a, 0x12, 0x12 + .byte 0x0a, 0x0c, 0x00, 0x0c, 0x29, 0x10, 0x1c, 0x10, 0x0f, 0x1e, 0x23, 0x0c + .byte 0x28, 0x0a, 0x0e, 0x02, 0x0f, 0x10, 0x39, 0x10, 0x2a, 0x14, 0x04, 0x0c + .byte 0x28, 0x0a, 0x0e, 0x02, 0x0f, 0x10, 0x20, 0x06, 0x2f, 0x10, 0x3c, 0x04 + .byte 0x39, 0x0c, 0x39, 0x0c, 0x00, 0x0c, 0x29, 0x0a, 0x17, 0x20, 0x39, 0x0c + .byte 0x5c, 0x26, 0x0b, 0x10, 0x20, 0x10, 0x30, 0x12, 0x05, 0x1e, 0x0c, 0x10 gUnknown_086125DC:: @ 86125DC - .incbin "baserom.gba", 0x6125dc, 0x1c + .byte 0x23, 0x46, 0x23, 0x01, 0x04, 0x09, 0x05, 0x00, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x38, 0x1c, 0x01, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x8c, 0x38, 0x01, 0x15, 0x46, 0x23, 0x00 + .align 2 gUnknown_086125F8:: @ 86125F8 - .incbin "baserom.gba", 0x6125f8, 0x74 + .4byte sub_81A705C + .4byte sub_81A7140 + .4byte sub_81A7248 + .4byte sub_81A73B8 + .4byte sub_81A7070 + .4byte sub_81A73EC + .4byte sub_81A7400 + .4byte sub_81A740C + .4byte sub_81A7418 + .4byte nullsub_76 + .4byte nullsub_124 + .4byte sub_81A7468 + .4byte sub_81A74CC + .4byte sub_81A74E0 + .4byte sub_81A7508 + .4byte sub_81A7580 + .4byte sub_81A8090 + .4byte sub_81A80DC + .4byte sub_81A825C + .4byte sub_81A827C + .4byte sub_81A84B4 + .4byte sub_81A84EC + .4byte sub_81A863C + .4byte sub_81A8658 + .4byte sub_81A869C + .4byte sub_81A86C0 + .4byte sub_81A8794 + .4byte sub_81A87E8 + .4byte sub_81A8830 gUnknown_0861266C:: @ 861266C - .incbin "baserom.gba", 0x61266c, 0x9 + .byte 0x03, 0x03, 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x04 gUnknown_08612675:: @ 8612675 - .incbin "baserom.gba", 0x612675, 0x13 + .byte 0x02, 0x01, 0x00, 0x02, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x01, 0x02, 0x00 + .align 2 gUnknown_08612688:: @ 8612688 - .incbin "baserom.gba", 0x612688, 0x8 + .4byte sub_81A7D8C + .4byte sub_81A7DE8 + .align 2 gUnknown_08612690:: @ 8612690 - .incbin "baserom.gba", 0x612690, 0x8 + .4byte 0x00000400, 0x00000800 gUnknown_08612698:: @ 8612698 - .incbin "baserom.gba", 0x612698, 0x4 + step_94 + step_right + step_95 + step_end gUnknown_0861269C:: @ 861269C - .incbin "baserom.gba", 0x61269c, 0x4 + step_94 + step_down + step_95 + step_end gUnknown_086126A0:: @ 86126A0 - .incbin "baserom.gba", 0x6126a0, 0x4 + step_94 + step_left + step_95 + step_end gUnknown_086126A4:: @ 86126A4 - .incbin "baserom.gba", 0x6126a4, 0x4 + step_94 + step_up + step_95 + step_end gUnknown_086126A8:: @ 86126A8 - .incbin "baserom.gba", 0x6126a8, 0x2 + step_03 + step_end gUnknown_086126AA:: @ 86126AA - .incbin "baserom.gba", 0x6126aa, 0x2 + step_00 + step_end gUnknown_086126AC:: @ 86126AC - .incbin "baserom.gba", 0x6126ac, 0x2 + step_02 + step_end gUnknown_086126AE:: @ 86126AE - .incbin "baserom.gba", 0x6126ae, 0x2 + step_01 + step_end @ 86126B0 .include "data/battle_frontier/battle_pyramid_level_50_wild_mons.inc" @@ -297,53 +1340,497 @@ gUnknown_086126AE:: @ 86126AE @ 8612E80 .include "data/battle_frontier/battle_pyramid_open_level_wild_mons.inc" + .align 2 gUnknown_08613650:: @ 8613650 - .incbin "baserom.gba", 0x613650, 0x5 - -gUnknown_08613655:: @ 8613655 - .incbin "baserom.gba", 0x613655, 0xfb + .byte 0x07, 0x03, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x00, 0x00, 0x00, 0x06, 0x03, 0x00, 0x00, 0x80, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x00 + .byte 0x05, 0x03, 0x00, 0x00, 0x78, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x78, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x00, 0x00, 0x00 + .byte 0x04, 0x04, 0x00, 0x01, 0x70, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x00, 0x00, 0x00, 0x03, 0x05, 0x00, 0x02, 0x70, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x00, 0x00 + .byte 0x03, 0x05, 0x00, 0x00, 0x68, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x00, 0x00, 0x02, 0x04, 0x00, 0x01, 0x68, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x00, 0x00, 0x00 + .byte 0x04, 0x05, 0x00, 0x02, 0x60, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x00, 0x00, 0x03, 0x06, 0x00, 0x04, 0x60, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x00, 0x00 + .byte 0x02, 0x03, 0x00, 0x00, 0x58, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x58, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x00, 0x00, 0x00 + .byte 0x03, 0x07, 0x00, 0x00, 0x50, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, 0x50, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x00, 0x00, 0x00 + .byte 0x03, 0x06, 0x00, 0x00, 0x50, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x03, 0x08, 0x00, 0x00, 0x50, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00 gUnknown_08613750:: @ 8613750 - .incbin "baserom.gba", 0x613750, 0x44 + .byte 0x28, 0x00, 0x46, 0x01, 0x5a, 0x02, 0x64, 0x03, 0x23, 0x01, 0x37, 0x02, 0x4b, 0x03, 0x5a, 0x04, 0x64, 0x0a, 0x23, 0x02, 0x37, 0x03, 0x4b, 0x04, 0x5a, 0x05, 0x64, 0x0b, 0x23, 0x03, 0x37, 0x04 + .byte 0x4b, 0x05, 0x5a, 0x06, 0x64, 0x0c, 0x23, 0x04, 0x37, 0x05, 0x4b, 0x06, 0x5a, 0x07, 0x64, 0x0d, 0x23, 0x05, 0x37, 0x06, 0x4b, 0x07, 0x5a, 0x08, 0x64, 0x0e, 0x23, 0x06, 0x37, 0x07, 0x4b, 0x08 + .byte 0x5a, 0x09, 0x64, 0x0f gUnknown_08613794:: @ 8613794 - .incbin "baserom.gba", 0x613794, 0x8 + .byte 0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00 + .align 1 gUnknown_0861379C:: @ 861379C - .incbin "baserom.gba", 0x61379c, 0x190 - + .2byte 0x0015, 0x0051, 0x0085, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x0087, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x0088, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x0086, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db + .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 + .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 + .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db + .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 + .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 + .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 + + .align 1 gUnknown_0861392C:: @ 861392C - .incbin "baserom.gba", 0x61392c, 0x190 + .2byte 0x0015, 0x0051, 0x0085, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x0087, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x0088, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x0086, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db + .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 + .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 + .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db + .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 + .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 + .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 + .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c + .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 gUnknown_08613ABC:: @ 8613ABC - .incbin "baserom.gba", 0x613abc, 0x7e + .byte 0x1f, 0x00, 0x2e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06, 0x61, 0x07, 0x64, 0x08, 0x0f, 0x00, 0x2e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06 + .byte 0x61, 0x08, 0x64, 0x09, 0x0f, 0x00, 0x1e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06, 0x61, 0x07, 0x64, 0x08, 0x1c, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04 + .byte 0x58, 0x05, 0x5c, 0x07, 0x60, 0x08, 0x64, 0x09, 0x0f, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x07, 0x64, 0x09, 0x0f, 0x00, 0x1e, 0x01, 0x3a, 0x02 + .byte 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x07, 0x64, 0x08, 0x1c, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x08, 0x64, 0x09 gUnknown_08613B3A:: @ 8613B3A - .incbin "baserom.gba", 0x613b3a, 0xa + .byte 0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36, 0x00, 0x00, 0x00 + .align 2 gUnknown_08613B44:: @ 8613B44 - .incbin "baserom.gba", 0x613b44, 0xd8 + .byte 0x03, 0x06 + + .align 2 + .byte 0x0b, 0x06 + + .align 2 + .byte 0x0d, 0x06 + + .align 2 + .byte 0x0f, 0x01 + + .align 2 + .byte 0x2b, 0x04 + + .align 2 + .byte 0x2d, 0x01 + + .align 2 + .byte 0x24, 0x09 + + .align 2 + .byte 0x29, 0x04 + + .align 2 + .byte 0x05, 0x05 + + .align 2 + .byte 0x18, 0x04 + + .align 2 + .byte 0x2f, 0x00 + + .align 2 + .byte 0x2e, 0x09 + + .align 2 + .byte 0x11, 0x0c + + .align 2 + .byte 0x10, 0x0b + + .align 2 + .byte 0x1e, 0x0d + + .align 2 + .byte 0x08, 0x01 + + .align 2 + .byte 0x17, 0x03 + + .align 2 + .byte 0x0c, 0x04 + + .align 2 + .byte 0x38, 0x04 + + .align 2 + .byte 0x1c, 0x03 + + .align 2 + .byte 0x1a, 0x00 + + .align 2 + .byte 0x19, 0x0b + + .align 2 + .byte 0x09, 0x07 + + .align 2 + .byte 0x31, 0x07 + + .align 2 + .byte 0x35, 0x07 + + .align 2 + .byte 0x36, 0x01 + + .align 2 + .byte 0x33, 0x00 + + .align 2 + .byte 0x2a, 0x03 + + .align 2 + .byte 0x16, 0x0d + + .align 2 + .byte 0x0e, 0x03 + + .align 2 + .byte 0x15, 0x01 + + .align 2 + .byte 0x14, 0x01 + + .align 2 + .byte 0x2c, 0x01 + + .align 2 + .byte 0x1b, 0x02 + + .align 2 + .byte 0x04, 0x01 + + .align 2 + .byte 0x07, 0x03 + + .align 2 + .byte 0x34, 0x05 + + .align 2 + .byte 0x32, 0x00 + + .align 2 + .byte 0x37, 0x02 + + .align 2 + .byte 0x1d, 0x04 + + .align 2 + .byte 0x22, 0x09 + + .align 2 + .byte 0x1f, 0x01 + + .align 2 + .byte 0x25, 0x00 + + .align 2 + .byte 0x0a, 0x04 + + .align 2 + .byte 0x28, 0x00 + .align 2 + .byte 0x06, 0x05 + + .align 2 + .byte 0x27, 0x0b + + .align 2 + .byte 0x26, 0x00 + + .align 2 + .byte 0x13, 0x00 + + .align 2 + .byte 0x12, 0x02 + + .align 2 + .byte 0x39, 0x08 + + .align 2 + .byte 0x02, 0x0b + + .align 2 + .byte 0x20, 0x01 + + .align 2 + .byte 0x21, 0x00 + + .align 2 gUnknown_08613C1C:: @ 8613C1C - .incbin "baserom.gba", 0x613c1c, 0x2a4 + .byte 0x0d, 0x03, 0x0e, 0x04, 0x10, 0x01, 0x11, 0x00, 0x03, 0x02, 0x12, 0x03, 0x0c, 0x03, 0x13, 0x03, 0x14, 0x03, 0x15, 0x02, 0x17, 0x02, 0x07, 0x02, 0x0a, 0x04, 0x19, 0x02, 0x1a, 0x02, 0x1b, 0x00 + .byte 0x1d, 0x02, 0x1e, 0x02, 0x1f, 0x03, 0x20, 0x04, 0x26, 0x00, 0x27, 0x01, 0x29, 0x04, 0x2a, 0x05, 0x09, 0x04, 0x16, 0x05, 0x2b, 0x00, 0x2d, 0x04, 0x2e, 0x02, 0x30, 0x02, 0x32, 0x02, 0x31, 0x03 + .byte 0x2f, 0x03, 0x33, 0x03, 0x34, 0x02, 0x04, 0x02, 0x35, 0x00, 0x36, 0x03, 0x37, 0x03, 0x38, 0x03, 0x1c, 0x01, 0x3a, 0x02, 0x05, 0x02, 0x42, 0x02, 0x02, 0x03, 0x44, 0x02, 0x45, 0x03, 0x47, 0x03 + .byte 0x43, 0x00, 0x00, 0x04 + + .align 2 +gUnknown_08613C80:: @ 8613C80 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D2D + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D57 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D81 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252DAB + .align 2 +gUnknown_08613C90:: @ 8613C90 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25330B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2532CC + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25328B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253248 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253206 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2531C4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253183 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253140 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530FD + + .align 2 +gUnknown_08613CB4:: @ 8613CB4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2544A6 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25445A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25440B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2543BA + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25436A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25431A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2542CB + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25427A + + .align 2 +gUnknown_08613CD4:: @ 8613CD4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252DD5 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E03 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E31 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E5F + + .align 2 +gUnknown_08613CE4:: @ 8613CE4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25362E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2535D4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253578 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25351A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2534BD + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253460 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253404 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2533A6 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25334D + + .align 2 +gUnknown_08613D08:: @ 8613D08 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25471E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2546CC + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25467C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25462A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2545D9 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254588 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254538 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2544E6 + + .align 2 +gUnknown_08613D28:: @ 8613D28 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E8D + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EAA + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EC7 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EE4 + + .align 2 +gUnknown_08613D38:: @ 8613D38 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2539EC + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253980 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253915 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2538A8 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25383C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2537D0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253765 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2536F8 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25368B + + .align 2 +gUnknown_08613D5C:: @ 8613D5C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A0B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2549AE + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25494D + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2548EB + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25488A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254829 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2547C9 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254767 + + .align 2 +gUnknown_08613D7C:: @ 8613D7C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F01 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F3A + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F73 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252FAC + + .align 2 +gUnknown_08613D8C:: @ 8613D8C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253D3E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253CE0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253C87 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253C2C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253BD2 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253B78 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253B1F + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253AC4 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253A69 + + .align 2 +gUnknown_08613DB0:: @ 8613DB0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254C3E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254BF1 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254BAE + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254B69 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254B25 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254AE1 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A9E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A59 + + .align 2 +gUnknown_08613DD0:: @ 8613DD0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252FE5 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253000 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25301B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253036 + + .align 2 +gUnknown_08613DE0:: @ 8613DE0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253F6C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253F34 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253EFA + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253EBE + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E83 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E48 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E0E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253DD2 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253D96 + + .align 2 +gUnknown_08613E04:: @ 8613E04 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254E6E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254E27 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254DE0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D97 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D4F + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D07 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254CC0 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254C77 + + .align 2 +gUnknown_08613E24:: @ 8613E24 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253051 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25307C + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530A7 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530D2 + + .align 2 +gUnknown_08613E34:: @ 8613E34 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25422B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2541DD + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25418D + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25413B + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2540EA + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254099 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254049 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253FF7 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253FA5 + + .align 2 +gUnknown_08613E58:: @ 8613E58 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_255068 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25502F + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254FF6 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254FBB + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F81 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F47 + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F0E + .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254ED3 + + .align 2 +gUnknown_08613E78:: @ 8613E78 + .4byte gUnknown_08613C80 + .4byte gUnknown_08613C90 + .4byte gUnknown_08613CB4 + + .align 2 +gUnknown_08613E84:: @ 8613E84 + .4byte gUnknown_08613CD4 + .4byte gUnknown_08613CE4 + .4byte gUnknown_08613D08 + + .align 2 +gUnknown_08613E90:: @ 8613E90 + .4byte gUnknown_08613D28 + .4byte gUnknown_08613D38 + .4byte gUnknown_08613D5C + + .align 2 +gUnknown_08613E9C:: @ 8613E9C + .4byte gUnknown_08613D7C + .4byte gUnknown_08613D8C + .4byte gUnknown_08613DB0 + + .align 2 +gUnknown_08613EA8:: @ 8613EA8 + .4byte gUnknown_08613DD0 + .4byte gUnknown_08613DE0 + .4byte gUnknown_08613E04 + + .align 2 +gUnknown_08613EB4:: @ 8613EB4 + .4byte gUnknown_08613E24 + .4byte gUnknown_08613E34 + .4byte gUnknown_08613E58 + + .align 2 gUnknown_08613EC0:: @ 8613EC0 - .incbin "baserom.gba", 0x613ec0, 0x18 + .4byte gUnknown_08613E78 + .4byte gUnknown_08613E84 + .4byte gUnknown_08613E90 + .4byte gUnknown_08613E9C + .4byte gUnknown_08613EA8 + .4byte gUnknown_08613EB4 gUnknown_08613ED8:: @ 8613ED8 - .incbin "baserom.gba", 0x613ed8, 0x8 + .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x03, 0x04 + .align 2 gUnknown_08613EE0:: @ 8613EE0 - .incbin "baserom.gba", 0x613ee0, 0x48 - + .4byte sub_81A8E9C + .4byte sub_81A8F38 + .4byte sub_81A9048 + .4byte sub_81A9134 + .4byte sub_81A917C + .4byte sub_81A91FC + .4byte sub_81A9254 + .4byte CalculateBattlePyramidItemBallItemId + .4byte sub_81A93C8 + .4byte sub_81A9414 + .4byte sub_81A9424 + .4byte sub_81A9618 + .4byte sub_81A966C + .4byte sub_81A9684 + .4byte sub_81A975C + .4byte sub_81A97C8 + .4byte sub_81A9828 + .4byte sub_81A9834 + + .align 1 gUnknown_08613F28:: @ 8613F28 - .incbin "baserom.gba", 0x613f28, 0xc + .2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 + .align 2 gUnknown_08613F34:: @ 8613F34 - .incbin "baserom.gba", 0x613f34, 0x12 + .2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba gUnknown_08613F46:: @ 8613F46 - .incbin "baserom.gba", 0x613f46, 0x40 + .byte 0x01, 0x04, 0xff, 0xff, 0x00, 0x02, 0x05, 0xff, 0x01, 0x03, 0x06, 0xff, 0x02, 0x07, 0xff, 0xff, 0x00, 0x05, 0x08, 0xff, 0x01, 0x04, 0x06, 0x09, 0x02, 0x05, 0x07, 0x0a, 0x03, 0x06, 0x0b, 0xff + .byte 0x04, 0x09, 0x0c, 0xff, 0x05, 0x08, 0x0a, 0x0d, 0x06, 0x09, 0x0b, 0x0e, 0x07, 0x0a, 0x0f, 0xff, 0x08, 0x0d, 0xff, 0xff, 0x09, 0x0c, 0x0e, 0xff, 0x0a, 0x0d, 0x0f, 0xff, 0x0b, 0x0e, 0xff, 0xff gUnknown_08613F86:: @ 8613F86 - .incbin "baserom.gba", 0x613f86, 0xa + .byte 0x1e, 0x28, 0x32, 0x3c, 0x46, 0x50, 0x55, 0x5a, 0x5f, 0x64 + 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/battle_tent.s b/data/battle_tent.s index 0fd1f28ea..06cfac50e 100644 --- a/data/battle_tent.s +++ b/data/battle_tent.s @@ -3,20 +3,49 @@ .section .rodata + .align 2 gUnknown_086160B4:: @ 86160B4 - .incbin "baserom.gba", 0x6160b4, 0x20 + .4byte sub_81B99D4 + .4byte sub_81B9A28 + .4byte sub_81B9A44 + .4byte sub_81B9A60 + .4byte sub_81B9A90 + .4byte sub_81B9ABC + .4byte sub_81B9B00 + .4byte sub_81B9B28 + .align 2 gUnknown_086160D4:: @ 86160D4 - .incbin "baserom.gba", 0x6160d4, 0x4 + .4byte 0x00000008 + .align 2 gUnknown_086160D8:: @ 86160D8 - .incbin "baserom.gba", 0x6160d8, 0x1c + .4byte sub_81B9BA0 + .4byte sub_81B9BF4 + .4byte sub_81B9C10 + .4byte sub_81B9C2C + .4byte sub_81B9C70 + .4byte sub_81B9C98 + .4byte sub_81B9CF0 + .align 2 gUnknown_086160F4:: @ 86160F4 - .incbin "baserom.gba", 0x6160f4, 0x4 + .4byte 0x00000015 + .align 2 gUnknown_086160F8:: @ 86160F8 - .incbin "baserom.gba", 0x6160f8, 0x28 + .4byte sub_81B9D28 + .4byte sub_81B9D7C + .4byte sub_81B9D98 + .4byte sub_81B9DB4 + .4byte sub_81B9DF8 + .4byte sub_81B9E20 + .4byte sub_81B9E78 + .4byte sub_81B9E88 + .4byte sub_81BA040 + .4byte sub_81B9EC0 + .align 2 gUnknown_08616120:: @ 8616120 - .incbin "baserom.gba", 0x616120, 0x4 + .4byte 0x00000017 + diff --git a/data/battle_tower.s b/data/battle_tower.s index b3926d19a..d28303263 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -20,34 +20,634 @@ .include "data/battle_frontier/battle_frontier_mons.inc" gUnknown_085DCEDC:: @ 85DCEDC - .incbin "baserom.gba", 0x5dcedc, 0x1e + .byte 0x0e, 0x11, 0x03, 0x15, 0x17, 0x07, 0x0a, 0x19, 0x1a, 0x1b, 0x1d, 0x1e, 0x20, 0x26, 0x29, 0x09, 0x2b, 0x2d, 0x2e, 0x30, 0x32, 0x34, 0x04, 0x35, 0x3a, 0x05, 0x42, 0x44, 0x43, 0x00 gUnknown_085DCEFA:: @ 85DCEFA - .incbin "baserom.gba", 0x5dcefa, 0x14 + .byte 0x0d, 0x10, 0x12, 0x0c, 0x13, 0x14, 0x1f, 0x27, 0x2a, 0x16, 0x2f, 0x31, 0x33, 0x36, 0x37, 0x38, 0x1c, 0x02, 0x45, 0x47 gUnknown_085DCF0E:: @ 85DCF0E - .incbin "baserom.gba", 0x5dcf0e, 0x1e + .byte 0x37, 0x36, 0x21, 0x0f, 0x27, 0x33, 0x2c, 0x42, 0x42, 0x1f, 0x27, 0x25, 0x30, 0x26, 0x19, 0x15, 0x23, 0x32, 0x38, 0x33, 0x33, 0x21, 0x42, 0x05, 0x31, 0x27, 0x41, 0x1f, 0x24, 0x37 gUnknown_085DCF2C:: @ 85DCF2C - .incbin "baserom.gba", 0x5dcf2c, 0x14 + .byte 0x14, 0x35, 0x22, 0x28, 0x14, 0x2d, 0x2f, 0x0e, 0x12, 0x16, 0x39, 0x34, 0x34, 0x0e, 0x22, 0x34, 0x20, 0x14, 0x20, 0x2f gUnknown_085DCF40:: @ 85DCF40 - .incbin "baserom.gba", 0x5dcf40, 0x5c0 - + .byte 0x00, 0x0b, 0x01, 0x01, 0x02, 0x06, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x06, 0x10, 0x07, 0x11, 0x08, 0x03, 0x09, 0x12, 0x0a, 0x0c, 0x0b, 0x13, 0x0c, 0x14, 0x0d, 0x15, 0x0e, 0x17, 0x0f, 0x07 + .byte 0x10, 0x0a, 0x11, 0x19, 0x12, 0x1a, 0x13, 0x1b, 0x14, 0x1d, 0x15, 0x1e, 0x16, 0x1f, 0x17, 0x20, 0x18, 0x21, 0x19, 0x22, 0x1a, 0x23, 0x1b, 0x24, 0x1c, 0x25, 0x1d, 0x26, 0x1e, 0x27, 0x1f, 0x28 + .byte 0x20, 0x29, 0x21, 0x2a, 0x22, 0x09, 0x23, 0x16, 0x24, 0x2b, 0x25, 0x2c, 0x26, 0x2d, 0x27, 0x2e, 0x28, 0x2f, 0x29, 0x30, 0x2a, 0x31, 0x2b, 0x32, 0x2c, 0x33, 0x2d, 0x34, 0x2e, 0x04, 0x2f, 0x35 + .byte 0x30, 0x36, 0x31, 0x37, 0x32, 0x38, 0x33, 0x1c, 0x34, 0x39, 0x35, 0x3a, 0x38, 0x05, 0x39, 0x3b, 0x3a, 0x3c, 0x3b, 0x3d, 0x3c, 0x3e, 0x3d, 0x3f, 0x3e, 0x40, 0x3f, 0x41, 0x40, 0x42, 0x41, 0x02 + .byte 0x42, 0x44, 0x43, 0x45, 0x44, 0x46, 0x45, 0x08, 0x46, 0x18, 0x47, 0x47, 0x48, 0x43, 0x49, 0x00, 0x4a, 0x48, 0x4b, 0x49, 0x4c, 0x4a, 0x00, 0x00 + + .align 2 +gUnknown_085DCFD8:: @ 85DCFD8 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244383 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244413 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6 + + .align 2 +gUnknown_085DCFEC:: @ 85DCFEC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244549 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5 + + .align 2 +gUnknown_085DD000:: @ 85DD000 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244618 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244643 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4 + + .align 2 +gUnknown_085DD014:: @ 85DD014 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7 + + .align 2 +gUnknown_085DD028:: @ 85DD028 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244939 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244989 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6 + + .align 2 +gUnknown_085DD03C:: @ 85DD03C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93 + + .align 2 +gUnknown_085DD050:: @ 85DD050 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07 + + .align 2 +gUnknown_085DD064:: @ 85DD064 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B + + .align 2 +gUnknown_085DD078:: @ 85DD078 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98 + + .align 2 +gUnknown_085DD08C:: @ 85DD08C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245013 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245087 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0 + + .align 2 +gUnknown_085DD0A0:: @ 85DD0A0 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245196 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A + + .align 2 +gUnknown_085DD0B4:: @ 85DD0B4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245406 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245464 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3 + + .align 2 +gUnknown_085DD0C8:: @ 85DD0C8 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245535 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245656 + + .align 2 +gUnknown_085DD0DC:: @ 85DD0DC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245740 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F + + .align 2 +gUnknown_085DD0F0:: @ 85DD0F0 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245851 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245923 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F + + .align 2 +gUnknown_085DD104:: @ 85DD104 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E + + .align 2 +gUnknown_085DD118:: @ 85DD118 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D + + .align 2 +gUnknown_085DD12C:: @ 85DD12C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07 + + .align 2 +gUnknown_085DD140:: @ 85DD140 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0 + + .align 2 +gUnknown_085DD154:: @ 85DD154 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC + + .align 2 +gUnknown_085DD168:: @ 85DD168 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246002 + + .align 2 +gUnknown_085DD17C:: @ 85DD17C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246020 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246051 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246082 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D + + .align 2 +gUnknown_085DD190:: @ 85DD190 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5 + + .align 2 +gUnknown_085DD1A4:: @ 85DD1A4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246244 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4 + + .align 2 +gUnknown_085DD1B8:: @ 85DD1B8 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF + + .align 2 +gUnknown_085DD1CC:: @ 85DD1CC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246449 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246478 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246529 + + .align 2 +gUnknown_085DD1E0:: @ 85DD1E0 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246571 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246605 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A + + .align 2 +gUnknown_085DD1F4:: @ 85DD1F4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246662 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246686 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A + + .align 2 +gUnknown_085DD208:: @ 85DD208 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246741 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246760 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246791 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6 + + .align 2 +gUnknown_085DD21C:: @ 85DD21C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246831 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246864 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE + + .align 2 +gUnknown_085DD230:: @ 85DD230 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1 + + .align 2 +gUnknown_085DD244:: @ 85DD244 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7 + + .align 2 +gUnknown_085DD258:: @ 85DD258 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9 + + .align 2 +gUnknown_085DD26C:: @ 85DD26C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9 + + .align 2 +gUnknown_085DD280:: @ 85DD280 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3 + + .align 2 +gUnknown_085DD294:: @ 85DD294 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE + + .align 2 +gUnknown_085DD2A8:: @ 85DD2A8 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247013 + + .align 2 +gUnknown_085DD2BC:: @ 85DD2BC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A + + .align 2 +gUnknown_085DD2D0:: @ 85DD2D0 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247238 + + .align 2 +gUnknown_085DD2E4:: @ 85DD2E4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247268 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247291 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247313 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247348 + + .align 2 +gUnknown_085DD2F8:: @ 85DD2F8 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247438 + + .align 2 +gUnknown_085DD30C:: @ 85DD30C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247470 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247484 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D + + .align 2 +gUnknown_085DD320:: @ 85DD32 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5 + + .align 2 +gUnknown_085DD334:: @ 85DD334 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247629 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247655 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED + + .align 2 +gUnknown_085DD348:: @ 85DD348 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247724 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247749 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247807 + + .align 2 +gUnknown_085DD35C:: @ 85DD35C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247838 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247854 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247889 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D + + .align 2 +gUnknown_085DD370:: @ 85DD370 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247942 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247991 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18 + + .align 2 +gUnknown_085DD384:: @ 85DD384 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16 + + .align 2 +gUnknown_085DD398:: @ 85DD398 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23 + + .align 2 +gUnknown_085DD3AC:: @ 85DD3AC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E + + .align 2 +gUnknown_085DD3C0:: @ 85DD3C0 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E + + .align 2 +gUnknown_085DD3D4:: @ 85DD3D4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D + + .align 2 +gUnknown_085DD3E8:: @ 85DD3E8 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248031 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E + + .align 2 +gUnknown_085DD3FC:: @ 85DD3FC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248128 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248151 + + .align 2 +gUnknown_085DD410:: @ 85DD410 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248221 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F + + .align 2 +gUnknown_085DD424:: @ 85DD424 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248297 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248321 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D + + .align 2 +gUnknown_085DD438:: @ 85DD438 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248369 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248401 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248431 + + .align 2 +gUnknown_085DD44C:: @ 85DD44C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248467 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248477 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248517 + + .align 2 +gUnknown_085DD460:: @ 85DD460 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248553 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248614 + + .align 2 +gUnknown_085DD474:: @ 85DD474 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248661 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248671 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF + + .align 2 +gUnknown_085DD488:: @ 85DD488 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248725 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248751 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248781 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7 + + .align 2 +gUnknown_085DD49C:: @ 85DD49C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248829 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248892 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248908 + + .align 2 +gUnknown_085DD4B0:: @ 85DD4B0 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7 + + .align 2 +gUnknown_085DD4C4:: @ 85DD4C4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB + + .align 2 +gUnknown_085DD4D8:: @ 85DD4D8 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE + + .align 2 +gUnknown_085DD4EC:: @ 85DD4EC + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90 + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04 + + .align 2 gUnknown_085DD500:: @ 85DD500 - .incbin "baserom.gba", 0x5dd500, 0x190 - + .4byte 0x00000047, gUnknown_085DD118 + .4byte 0x0000002b, gUnknown_085DD12C + .4byte 0x00000000, gUnknown_085DD140 + .4byte 0x00000014, gUnknown_085DD154 + .4byte 0x0000002d, gUnknown_085DD168 + .4byte 0x00000013, gUnknown_085DD17C + .4byte 0x0000002f, gUnknown_085DD190 + .4byte 0x00000043, gUnknown_085DD1A4 + .4byte 0x00000026, gUnknown_085DD1B8 + .4byte 0x00000015, gUnknown_085DD1CC + .4byte 0x0000000a, gUnknown_085DD1E0 + .4byte 0x00000010, gUnknown_085DD1F4 + .4byte 0x0000000c, gUnknown_085DD208 + .4byte 0x00000042, gUnknown_085DD21C + .4byte 0x00000031, gUnknown_085DD230 + .4byte 0x00000030, gUnknown_085DD244 + .4byte 0x00000036, gUnknown_085DD258 + .4byte 0x0000002e, gUnknown_085DD26C + .4byte 0x00000011, gUnknown_085DD280 + .4byte 0x00000019, gUnknown_085DD294 + .4byte 0x00000020, gUnknown_085DD2A8 + .4byte 0x00000029, gUnknown_085DD2BC + .4byte 0x00000009, gUnknown_085DD2D0 + .4byte 0x00000016, gUnknown_085DD2E4 + .4byte 0x00000034, gUnknown_085DD2F8 + .4byte 0x00000004, gUnknown_085DD30C + .4byte 0x00000035, gUnknown_085DD320 + .4byte 0x00000037, gUnknown_085DD334 + .4byte 0x0000001d, gUnknown_085DD348 + .4byte 0x0000003a, gUnknown_085DD35C + .4byte 0x00000005, gUnknown_085DD370 + .4byte 0x00000044, gUnknown_085DD384 + .4byte 0x00000045, gUnknown_085DD398 + .4byte 0x0000000d, gUnknown_085DD3AC + .4byte 0x0000000e, gUnknown_085DD3C0 + .4byte 0x00000003, gUnknown_085DD3D4 + .4byte 0x00000012, gUnknown_085DD3E8 + .4byte 0x00000017, gUnknown_085DD3FC + .4byte 0x0000001a, gUnknown_085DD410 + .4byte 0x0000001b, gUnknown_085DD424 + .4byte 0x0000001c, gUnknown_085DD438 + .4byte 0x0000001e, gUnknown_085DD44C + .4byte 0x0000001f, gUnknown_085DD460 + .4byte 0x00000027, gUnknown_085DD474 + .4byte 0x00000002, gUnknown_085DD488 + .4byte 0x0000002a, gUnknown_085DD49C + .4byte 0x00000038, gUnknown_085DD4B0 + .4byte 0x00000032, gUnknown_085DD4C4 + .4byte 0x00000033, gUnknown_085DD4D8 + .4byte 0x00000007, gUnknown_085DD4EC + + .align 2 gUnknown_085DD690:: @ 85DD690 - .incbin "baserom.gba", 0x5dd690, 0x40 + .4byte gUnknown_085DCFD8 + .4byte gUnknown_085DCFEC + .4byte gUnknown_085DD000 + .4byte gUnknown_085DD014 + .4byte gUnknown_085DD028 + .4byte gUnknown_085DD03C + .4byte gUnknown_085DD050 + .4byte gUnknown_085DD064 + .4byte gUnknown_085DD078 + .4byte gUnknown_085DD08C + .4byte gUnknown_085DD0A0 + .4byte gUnknown_085DD0B4 + .4byte gUnknown_085DD0C8 + .4byte gUnknown_085DD0DC + .4byte gUnknown_085DD0F0 + .4byte gUnknown_085DD104 gUnknown_085DD6D0:: @ 85DD6D0 - .incbin "baserom.gba", 0x5dd6d0, 0x5 + .byte 0x8f, 0x01, 0x1f, 0x2a, 0x02 gUnknown_085DD6D5:: @ 85DD6D5 - .incbin "baserom.gba", 0x5dd6d5, 0x7 + .byte 0x00, 0xfc, 0xfc, 0x00, 0x06, 0x00, 0x00 + .align 1 gUnknown_085DD6DC:: @ 85DD6DC - .incbin "baserom.gba", 0x5dd6dc, 0x30 + .2byte 0x0071, 0x005e, 0x0073, 0x00e8, 0x00e3, 0x2b1f, 0xfc08, 0x0000, 0x0600, 0x00fc, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x2c1f + .2byte 0x0003, 0x00fc, 0xfc00, 0x0006, 0x0057, 0x00b6, 0x004c, 0x0151 @ 85DD70C .include "data/battle_frontier/slateport_battle_tent_trainer_mons.inc" @@ -76,32 +676,56 @@ gUnknown_085DD6DC:: @ 85DD6DC @ 85DF69C .include "data/battle_frontier/fallarbor_battle_tent_mons.inc" + .align 2 gUnknown_085DF96C:: @ 85DF96C - .incbin "baserom.gba", 0x5df96c, 0x40 - + .4byte sub_8161F94 + .4byte sub_8162054 + .4byte sub_81620F4 + .4byte sub_81623F0 + .4byte sub_81621C0 + .4byte sub_816502C + .4byte sub_8164040 + .4byte sub_8163914 + .4byte nullsub_61 + .4byte nullsub_116 + .4byte sub_81642A0 + .4byte sub_8164828 + .4byte sub_8164B74 + .4byte sub_8164DCC + .4byte sub_8164DE4 + .4byte sub_8164E04 + + .align 2 gUnknown_085DF9AC:: @ 85DF9AC - .incbin "baserom.gba", 0x5df9ac, 0x20 + .4byte 0x00000001, 0x00000002, 0x00004000, 0x00008000, 0x00010000, 0x00020000, 0x00040000, 0x00080000 + .align 2 gUnknown_085DF9CC:: @ 85DF9CC - .incbin "baserom.gba", 0x5df9cc, 0x20 + .4byte 0xfffffffe, 0xfffffffd, 0xffffbfff, 0xffff7fff, 0xfffeffff, 0xfffdffff, 0xfffbffff, 0xfff7ffff gUnknown_085DF9EC:: @ 85DF9EC - .incbin "baserom.gba", 0x5df9ec, 0xa + .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c gUnknown_085DF9F6:: @ 85DF9F6 - .incbin "baserom.gba", 0x5df9f6, 0x4 + .byte 0x03, 0x04, 0x02, 0x02 + .align 1 gUnknown_085DF9FA:: @ 85DF9FA - .incbin "baserom.gba", 0x5df9fa, 0x20 + .2byte 0x0000, 0x0063, 0x0050, 0x0077, 0x0064, 0x008b, 0x0078, 0x009f, 0x008c, 0x00b3, 0x00a0, 0x00c7, 0x00b4, 0x00db, 0x00c8, 0x012b + .align 1 gUnknown_085DFA1A:: @ 85DFA1A - .incbin "baserom.gba", 0x5dfa1a, 0x28 + .2byte 0x0064, 0x0077, 0x0078, 0x008b, 0x008c, 0x009f, 0x00a0, 0x00b3, 0x00b4, 0x00c7, 0x00c8, 0x00db, 0x00dc, 0x00ef, 0x00c8, 0x012b + .2byte 0x00b3, 0x008d, 0x00c8, 0x00b7 gUnknown_085DFA42:: @ 85DFA42 - .incbin "baserom.gba", 0x5dfa42, 0x4 + .byte 0x03, 0x04, 0x02, 0x02 + .align 1 gUnknown_085DFA46:: @ 85DFA46 - .incbin "baserom.gba", 0x5dfa46, 0xc + .2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01 + .align 1 gUnknown_085DFA52:: @ 85DFA52 - .incbin "baserom.gba", 0x5dfa52, 0xe + .2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04, 0x0000 + diff --git a/data/battle_transition.s b/data/battle_transition.s new file mode 100644 index 000000000..bd0386e2b --- /dev/null +++ b/data/battle_transition.s @@ -0,0 +1,784 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +sBigPokeball_Tileset:: @ 85B9330 + .incbin "graphics/battle_transitions/big_pokeball.4bpp" + + .align 2 +sPokeballTrail_Tileset:: @ 85B98B0 + .incbin "graphics/battle_transitions/pokeball_trail.4bpp" + + .align 2 +sSpriteImage_85B98F0:: @ 85B98F0 + .incbin "graphics/battle_transitions/pokeball.4bpp" + + .align 2 +sUnknown_085B9AF0:: @ 85B9AF0 + .incbin "graphics/battle_transitions/elite_four_bg.4bpp" + + .align 2 +sSpriteImage_85B9CD0:: @ 85B9CD0 + .incbin "graphics/battle_transitions/unused_brendan.4bpp" + + .align 2 +sSpriteImage_85BA4D0:: @ 85BA4D0 + .incbin "graphics/battle_transitions/unused_lass.4bpp" + + .align 2 +sShrinkingBoxTileset:: @ 85BACD0 + .incbin "graphics/battle_transitions/shrinking_box.4bpp" + + .align 2 +sEvilTeam_Palette:: @ 85BAEB0 + .incbin "graphics/battle_transitions/evil_team.gbapal" + + .align 2 +sTeamAqua_Tileset:: @ 85BAED0 + .incbin "graphics/battle_transitions/team_aqua.4bpp.lz" + + .align 2 +sTeamAqua_Tilemap:: @ 85BB248 + .incbin "graphics/battle_transitions/team_aqua.bin.lz" + + .align 2 +sTeamMagma_Tileset:: @ 85BB4A4 + .incbin "graphics/battle_transitions/team_magma.4bpp.lz" + + .align 2 +sTeamMagma_Tilemap:: @ 85BB930 + .incbin "graphics/battle_transitions/team_magma.bin.lz" + + .align 2 +gUnknown_085BBC14:: @ 85BBC14 + .incbin "graphics/battle_transitions/85BBC14.4bpp" + + .align 2 +gUnknown_085BC2B4:: @ 85BC2B4 + .incbin "graphics/battle_transitions/85BC2B4.gbapal" + + .align 2 +gUnknown_085BC2D4:: @ 85BC2D4 + .incbin "graphics/battle_transitions/85BC2D4.gbapal" + + .align 2 +gUnknown_085BC2F4:: @ 85BC2F4 + .incbin "graphics/battle_transitions/85BC2F4.gbapal" + + .align 2 +gUnknown_085BC314:: @ 85BC314 + .incbin "graphics/battle_transitions/85BC314.bin" + + .align 2 +gUnknown_085BCB14:: @ 85BCB14 + .incbin "graphics/battle_transitions/85BCB14.bin" + + .align 2 +gUnknown_085BD314:: @ 85BD314 + .incbin "graphics/battle_transitions/85BD314.bin" + + .align 2 +gUnknown_085BDB14:: @ 85BDB14 + .incbin "graphics/battle_transitions/85BDB14.gbapal" + + .align 2 +gUnknown_085BDB34:: @ 85BDB34 + .incbin "graphics/battle_transitions/kyogre.4bpp.lz" + + .align 2 +gUnknown_085BE1E8:: @ 85BE1E8 + .incbin "graphics/battle_transitions/kyogre.bin.lz" + + .align 2 +gUnknown_085BE51C:: @ 85BE51C + .incbin "graphics/battle_transitions/groudon.4bpp.lz" + + .align 2 +gUnknown_085BEA88:: @ 85BEA88 + .incbin "graphics/battle_transitions/groudon.bin.lz" + + .align 2 +gUnknown_085BEDA0:: @ 85BEDA0 + .incbin "graphics/battle_transitions/kyogre_pt1.gbapal" + + .align 2 +gUnknown_085BEEE0:: @ 85BEEE0 + .incbin "graphics/battle_transitions/kyogre_pt2.gbapal" + + .align 2 +gUnknown_085BF0A0:: @ 85BF0A0 + .incbin "graphics/battle_transitions/groudon_pt1.gbapal" + + .align 2 +gUnknown_085BF2A0:: @ 85BF2A0 + .incbin "graphics/battle_transitions/groudon_pt2.gbapal" + + .align 2 +gUnknown_085BF4A0:: @ 85BF4A0 + .incbin "graphics/battle_transitions/rayquaza.gbapal" + + .align 2 +gUnknown_085BF6A0:: @ 85BF6A0 + .incbin "graphics/battle_transitions/rayquaza.4bpp" + + .align 2 +gUnknown_085C6BE0:: @ 85C6BE0 + .incbin "graphics/battle_transitions/rayquaza.bin" + + .align 2 +gUnknown_085C7BE0:: @ 85C7BE0 + .incbin "graphics/battle_transitions/frontier_brain.gbapal" + + .align 2 +gUnknown_085C7C00:: @ 85C7C00 + .incbin "graphics/battle_transitions/frontier_brain.4bpp.lz" + + .align 2 +gUnknown_085C828C:: @ 85C828C + .incbin "graphics/battle_transitions/frontier_brain.bin.lz" + + .align 2 +gUnknown_085C8578:: @ 85C8578 + .incbin "graphics/battle_transitions/frontier_squares_blanktiles.gbapal" + + .align 2 +gUnknown_085C8598:: @ 85C8598 + .incbin "graphics/battle_transitions/frontier_square_1.4bpp.lz" + + .align 2 +gUnknown_085C86F4:: @ 85C86F4 + .incbin "graphics/battle_transitions/frontier_square_2.4bpp.lz" + + .align 2 +gUnknown_085C87F4:: @ 85C87F4 + .incbin "graphics/battle_transitions/frontier_square_3.4bpp.lz" + + .align 2 +gUnknown_085C88A4:: @ 85C88A4 + .incbin "graphics/battle_transitions/frontier_square_4.4bpp.lz" + + .align 2 +gUnknown_085C8928:: @ 85C8928 + .incbin "graphics/battle_transitions/frontier_squares.bin" + + .align 2 +sPhase1_Tasks:: @ 85C8948 + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + .4byte sub_81460BC + + .align 2 +sPhase2_Tasks:: @ 85C89F0 + .4byte sub_814610C + .4byte sub_8146204 + .4byte sub_8146384 + .4byte sub_8146514 + .4byte sub_8146F94 + .4byte sub_8147204 + .4byte sub_8147718 + .4byte sub_81478EC + .4byte sub_81484D0 + .4byte sub_8149578 + .4byte sub_814995C + .4byte sub_8149A6C + .4byte sub_8147AE4 + .4byte sub_8147B04 + .4byte sub_8147B24 + .4byte sub_8147B44 + .4byte sub_8147B64 + .4byte sub_814654C + .4byte sub_8146584 + .4byte sub_81465BC + .4byte sub_81465F4 + .4byte sub_814662C + .4byte sub_8146664 + .4byte sub_8149140 + .4byte sub_814927C + .4byte sub_8148760 + .4byte sub_8148B54 + .4byte sub_8148B8C + .4byte sub_8148E54 + .4byte sub_814A3BC + .4byte sub_814A3F4 + .4byte sub_814A6F0 + .4byte sub_814A760 + .4byte sub_814A728 + .4byte sub_81DABDC + .4byte sub_81DACB4 + .4byte sub_81DAD8C + .4byte sub_81DAE78 + .4byte sub_81DAF68 + .4byte sub_81DB060 + .4byte sub_81DB158 + .4byte sub_81DB258 + + .align 2 +sMainTransitionPhases:: @ 85C8A98 + .4byte sub_8145FE0 + .4byte sub_8146030 + .4byte sub_8146064 + .4byte sub_814608C + + .align 2 +sPhase2_Transition_Blur_Funcs:: @ 85C8AA8 + .4byte sub_8146144 + .4byte sub_8146178 + .4byte sub_81461D8 + + .align 2 +sPhase2_Transition_Swirl_Funcs:: @ 85C8AB4 + .4byte sub_814623C + .4byte sub_81462A8 + + .align 2 +sPhase2_Transition_Shuffle_Funcs:: @ 85C8ABC + .4byte sub_81463BC + .4byte sub_8146420 + + .align 2 +gUnknown_085C8AC4:: @ 85C8AC4 + .4byte sub_814670C + .4byte sub_81468E4 + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146D90 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8AE0:: @ 85C8AE0 + .4byte sub_8146760 + .4byte sub_814692C + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146D90 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8AFC:: @ 85C8AFC + .4byte sub_8146800 + .4byte sub_8146854 + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8B14:: @ 85C8B14 + .4byte sub_81467B4 + .4byte sub_8146974 + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8B2C:: @ 85C8B2C + .4byte sub_81467B4 + .4byte sub_81469CC + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8B44:: @ 85C8B44 + .4byte sub_81467B4 + .4byte sub_8146A24 + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C8B5C:: @ 85C8B5C + .4byte sub_8146DAC + .4byte sub_8146DD8 + .4byte sub_8146A7C + .4byte sub_8146AC8 + .4byte sub_8146B24 + .4byte sub_8146D90 + .4byte sub_8146B7C + .4byte sub_8146BA8 + + .align 2 +sPhase2_Transition_PokeballsTrail_Funcs:: @ 85C8B7C + .4byte sub_8146FCC + .4byte sub_8147018 + .4byte sub_81470A4 + + .align 1 +sUnknown_085C8B88:: @ 85C8B88 + .2byte 0xfff0, 0x0100 + + .align 1 +sUnknown_085C8B8C:: @ 85C8B8C + .2byte 0x0000, 0x0020, 0x0040, 0x0012, 0x0030 + + .align 1 +sUnknown_085C8B96:: @ 85C8B96 + .2byte 0x0008, 0xfff8, 0x0000 + + .align 2 +sPhase2_Transition_Clockwise_BlackFade_Funcs:: @ 85C8B9C + .4byte sub_814723C + .4byte sub_81472A4 + .4byte sub_8147334 + .4byte sub_8147428 + .4byte sub_81474B0 + .4byte sub_81475B0 + .4byte sub_8147648 + + .align 2 +sPhase2_Transition_Ripple_Funcs:: @ 85C8BB8 + .4byte sub_8147750 + .4byte sub_81477A8 + + .align 2 +sPhase2_Transition_Wave_Funcs:: @ 85C8BC0 + .4byte sub_8147924 + .4byte sub_814797C + .4byte sub_8147A18 + + .align 2 +sPhase2_Mugshot_Transition_Funcs:: @ 85C8BCC + .4byte sub_8147BBC + .4byte sub_8147C24 + .4byte sub_8147CE4 + .4byte sub_8147DD0 + .4byte sub_8147E4C + .4byte sub_8147E88 + .4byte sub_8147F40 + .4byte sub_8148008 + .4byte sub_8148040 + .4byte sub_814808C + +sMugshotsTrainerPicIDsTable:: @ 85C8BF4 + .byte 0x24, 0x25, 0x26, 0x27, 0x36, 0x00 + + .align 1 +sMugshotsOpponentRotationScales:: @ 85C8BFA + .2byte 0x0200, 0x0200, 0x0200, 0x0200, 0x01b0, 0x01b0, 0x01a0, 0x01a0, 0x0188, 0x0188 + + .align 1 +sMugshotsOpponentCoords:: @ 85C8C0E + .2byte 0x0000, 0x0000, 0x0000, 0x0000, 0xfffc, 0x0004, 0x0000, 0x0005, 0xfff8, 0x0007, 0x0000 + + .align 2 +sUnknown_085C8C24:: @ 85C8C24 + .4byte sub_81483A8 + .4byte sub_81483AC + .4byte sub_81483F8 + .4byte sub_814842C + .4byte sub_81483A8 + .4byte sub_8148458 + .4byte sub_81483A8 + + .align 1 +sUnknown_085C8C40:: @ 85C8C40 + .2byte 0x000c, 0xfff4 + + .align 1 +sUnknown_085C8C44:: @ 85C8C44 + .2byte 0xffff, 0x0001 + + .align 2 +gUnknown_085C8C48:: @ 85C8C48 + .4byte sub_8148508 + .4byte sub_8148590 + .4byte sub_814865C + + .align 2 +gUnknown_085C8C54:: @ 85C8C54 + .4byte sub_8148798 + .4byte sub_8148864 + .4byte sub_8148AD4 + .4byte sub_8148B14 + + .align 1 +gUnknown_085C8C64:: @ 85C8C64 + .2byte 0x7727 + + .align 1 +gUnknown_085C8C66:: @ 85C8C66 + .2byte 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_085C8C6C:: @ 85C8C6C + .4byte sub_8148BC4 + .4byte sub_8148CE8 + .4byte sub_8148C28 + + .align 2 +gUnknown_085C8C78:: @ 85C8C78 + .4byte sub_8148BC4 + .4byte sub_8148D6C + + .align 1 +gUnknown_085C8C80:: @ 85C8C80 + .2byte 0xfffa, 0x0004 + + .align 2 +gUnknown_085C8C84:: @ 85C8C84 + .4byte sub_8148E8C + .4byte sub_8148F4C + .4byte sub_8149008 + +gUnknown_085C8C90:: @ 85C8C90 + .2byte 0x0001, 0x001b, 0x0113, 0xffff + +gUnknown_085C8C98:: @ 85C8C98 + .2byte 0x0002, 0x01e6, 0xffff + +gUnknown_085C8C9E:: @ 85C8C9E + .2byte 0x0003, 0x0106, 0xffff + +gUnknown_085C8CA4:: @ 85C8CA4 + .2byte 0x0004, 0x01fb, 0xfffe + +gUnknown_085C8CAA:: @ 85C8CAA + .2byte 0x0001, 0x00d5, 0xffff + +gUnknown_085C8CB0:: @ 85C8CB0 + .2byte 0x0002, 0x0224, 0xfffe + +gUnknown_085C8CB6:: @ 85C8CB6 + .2byte 0x0003, 0x00c4, 0xffff + +gUnknown_085C8CBC:: @ 85C8CBC + .2byte 0x0004, 0x023d, 0x0135, 0xffff + +gUnknown_085C8CC4:: @ 85C8CC4 + .2byte 0x0001, 0x01da, 0xffff + +gUnknown_085C8CCA:: @ 85C8CCA + .2byte 0x0002, 0x0127, 0x0020, 0xffff + +gUnknown_085C8CD2:: @ 85C8CD2 + .2byte 0x0003, 0x003a, 0xffff + +gUnknown_085C8CD8:: @ 85C8CD8 + .2byte 0x0004, 0x01c7, 0xffff + +gUnknown_085C8CDE:: @ 85C8CDE + .2byte 0x0001, 0x021c, 0xffff + +gUnknown_085C8CE4:: @ 85C8CE4 + .2byte 0x0002, 0x00e5, 0xffff + +gUnknown_085C8CEA:: @ 85C8CEA + .2byte 0x0003, 0x00f4, 0x001c, 0xffff + +gUnknown_085C8CF2:: @ 85C8CF2 + .2byte 0x0004, 0x0205, 0xffff + + .align 2 +gUnknown_085C8CF8:: @ 85C8CF8 + .4byte gUnknown_085C8C90 + .4byte gUnknown_085C8CA4 + .4byte gUnknown_085C8C98 + .4byte gUnknown_085C8C9E + .4byte gUnknown_085C8CEA + .4byte gUnknown_085C8CE4 + .4byte gUnknown_085C8CF2 + .4byte gUnknown_085C8CDE + + .align 2 +gUnknown_085C8D18:: @ 85C8D18 + .4byte gUnknown_085C8CBC + .4byte gUnknown_085C8CB0 + .4byte gUnknown_085C8CB6 + .4byte gUnknown_085C8CAA + .4byte gUnknown_085C8CCA + .4byte gUnknown_085C8CD8 + .4byte gUnknown_085C8CC4 + .4byte gUnknown_085C8CD2 + + .align 2 +gUnknown_085C8D38:: @ 85C8D38 + .4byte gUnknown_085C8CF8 + .4byte gUnknown_085C8D18 + + .align 2 +gUnknown_085C8D40:: @ 85C8D40 + .4byte sub_8146DAC + .4byte sub_8146DD8 + .4byte sub_8149178 + .4byte sub_81491C8 + .4byte sub_8149224 + .4byte sub_8146D90 + .4byte sub_8146B7C + .4byte sub_8146BA8 + + .align 2 +gUnknown_085C8D60:: @ 85C8D60 + .4byte sub_8146DAC + .4byte sub_8146DD8 + .4byte sub_81492B4 + .4byte sub_8149358 + .4byte sub_8149388 + .4byte sub_81493D8 + .4byte sub_8149410 + .4byte sub_814943C + .4byte sub_814946C + .4byte sub_8148CE8 + .4byte sub_8148C28 + + .align 2 +gUnknown_085C8D8C:: @ 85C8D8C + .4byte sub_81495B0 + .4byte sub_8149628 + .4byte sub_814969C + .4byte sub_81496D8 + .4byte sub_8149740 + + .align 1 +sUnknown_085C8DA0:: @ 85C8DA0 + .2byte 0x0000, 0x0014, 0x000f, 0x0028, 0x000a, 0x0019, 0x0023, 0x0005 + + .align 2 +sUnknown_085C8DB0:: @ 85C8DB0 + .4byte sub_8149994 + .4byte sub_81499E8 + .4byte sub_8149A40 + + .align 2 +sPhase2_Transition_Shards_Funcs:: @ 85C8DBC + .4byte sub_8149AA4 + .4byte sub_8149B08 + .4byte sub_8149B84 + .4byte sub_8149C60 + .4byte sub_8149CCC + + .align 1 +sUnknown_085C8DD0:: @ 85C8DD0 + .2byte 0x0038, 0x0000, 0x0000, 0x00a0, 0x0000, 0x0068, 0x00a0, 0x00f0, 0x0058, 0x0001, 0x00f0, 0x0048, 0x0038, 0x0000, 0x0001, 0x0000 + .2byte 0x0020, 0x0090, 0x00a0, 0x0000, 0x0090, 0x00a0, 0x00b8, 0x0000, 0x0001, 0x0038, 0x0000, 0x00a8, 0x00a0, 0x0000, 0x00a8, 0x00a0 + .2byte 0x0030, 0x0000, 0x0001 + + .align 1 +sUnknown_085C8E16:: @ 85C8E16 + .2byte 0x0008, 0x0004, 0x0002, 0x0001, 0x0001, 0x0001, 0x0000 + + .align 2 +sPhase1_TransitionAll_Funcs:: @ 85C8E24 + .4byte sub_8149E34 + .4byte sub_8149E90 + + .align 2 +sSpriteImageTable_85C8E2C:: @ 85C8E2C + obj_frame_tiles sSpriteImage_85B98F0, 0x0200 + + .align 2 +sSpriteAnim_85C8E34:: @ 85C8E34 + obj_image_anim_frame 0, 1 + obj_image_anim_end + + .align 2 +sSpriteAnimTable_85C8E3C:: @ 85C8E3C + .4byte sSpriteAnim_85C8E34 + + .align 2 +sSpriteAffineAnim_85C8E40:: @ 85C8E40 + obj_rot_scal_anim_frame 0, 0, -4, 1 + obj_rot_scal_anim_jump 0 + + .align 2 +sSpriteAffineAnim_85C8E50:: @ 85C8E50 + obj_rot_scal_anim_frame 0, 0, 4, 1 + obj_rot_scal_anim_jump 0 + + .align 2 +sSpriteAffineAnimTable_85C8E60:: @ 85C8E60 + .4byte sSpriteAffineAnim_85C8E40 + .4byte sSpriteAffineAnim_85C8E50 + + .align 2 +gUnknown_085C8E68:: @ 85C8E68 + spr_template 0xffff, 0x1009, gFieldObjectBaseOam_32x32, sSpriteAnimTable_85C8E3C, sSpriteImageTable_85C8E2C, sSpriteAffineAnimTable_85C8E60, sub_814713C + + .align 2 +gOamData_85C8E80:: @ 85C8E80 + .2byte 0x0000, 0xc000, 0x0000, 0x0000 + + .align 2 +sSpriteImageTable_85C8E88:: @ 85C8E88 + obj_frame_tiles sSpriteImage_85B9CD0, 0x0800 + + .align 2 +sSpriteImageTable_85C8E90:: @ 85C8E90 + obj_frame_tiles sSpriteImage_85BA4D0, 0x0800 + + .align 2 +sSpriteAnim_85C8E98:: @ 85C8E98 + obj_image_anim_frame 0, 1 + obj_image_anim_end + + .align 2 +sSpriteAnimTable_85C8EA0:: @ 85C8EA0 + .4byte sSpriteAnim_85C8E98 + + .align 2 +sSpriteTemplate_85C8EA4:: @ 85C8EA4 + spr_template 0xffff, 0x100a, gOamData_85C8E80, sSpriteAnimTable_85C8EA0, sSpriteImageTable_85C8E88, gDummySpriteAffineAnimTable, sub_8148380 + + .align 2 +sSpriteTemplate_85C8EBC:: @ 85C8EBC + spr_template 0xffff, 0x100a, gOamData_85C8E80, sSpriteAnimTable_85C8EA0, sSpriteImageTable_85C8E90, gDummySpriteAffineAnimTable, sub_8148380 + + .align 2 +gFieldEffectObjectPalette10:: @ 85C8ED4 + .incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal" + + .align 2 +gFieldEffectObjectPaletteInfo10:: @ 85C8EF4 + obj_pal gFieldEffectObjectPalette10, 0x1009 + + .align 2 +sMugshotPal_Sidney:: @ 85C8EFC + .incbin "graphics/battle_transitions/sidney_bg.gbapal" + + .align 2 +sMugshotPal_Phoebe:: @ 85C8F1C + .incbin "graphics/battle_transitions/phoebe_bg.gbapal" + + .align 2 +sMugshotPal_Glacia:: @ 85C8F3C + .incbin "graphics/battle_transitions/glacia_bg.gbapal" + + .align 2 +sMugshotPal_Drake:: @ 85C8F5C + .incbin "graphics/battle_transitions/drake_bg.gbapal" + + .align 2 +sMugshotPal_Wallace:: @ 85C8F7C + .incbin "graphics/battle_transitions/wallace_bg.gbapal" + + .align 2 +sMugshotPal_Brendan:: @ 85C8F9C + .incbin "graphics/battle_transitions/brendan_bg.gbapal" + + .align 2 +sMugshotPal_May:: @ 85C8EFC + .incbin "graphics/battle_transitions/may_bg.gbapal" + + .align 2 +sOpponentMugshotsPals:: @ 85C8FDC + .4byte sMugshotPal_Sidney + .4byte sMugshotPal_Phoebe + .4byte sMugshotPal_Glacia + .4byte sMugshotPal_Drake + .4byte sMugshotPal_Wallace + + .align 2 +sPlayerMugshotsPals:: @ 85C8FF0 + .4byte sMugshotPal_Brendan + .4byte sMugshotPal_May + + .align 2 +sUnusedTrainerPalette:: @ 85C8EF8 + .incbin "graphics/battle_transitions/unused_trainer.gbapal" + + .align 2 +sSpritePalette_UnusedTrainer:: @ 85C8EFC + obj_pal sUnusedTrainerPalette, 0x100A + + .align 2 +sBigPokeball_Tilemap:: @ 85C9020 + .incbin "graphics/battle_transitions/big_pokeball_map.bin" + + .align 2 +sMugshotsTilemap:: @ 85C94D0 + .incbin "graphics/battle_transitions/elite_four_bg_map.bin" + + .align 2 +gUnknown_085C99D0:: @ 85C99D0 + .4byte sub_814A324 + .4byte sub_814A374 + .4byte sub_8146BF8 + .4byte sub_8146C8C + .4byte sub_8146D20 + .4byte sub_8146DF8 + + .align 2 +gUnknown_085C99E8:: @ 85C99E8 + .4byte sub_814A42C + .4byte sub_814A4D4 + .4byte sub_814A500 + .4byte sub_814A550 + + .align 2 +gUnknown_085C99F8:: @ 85C99F8 + .4byte sub_814A798 + .4byte sub_814A828 + .4byte sub_814A898 + .4byte sub_814ABA0 + + .align 2 +gUnknown_085C9A08:: @ 85C9A08 + .4byte sub_814A960 + .4byte sub_814AA04 + .4byte sub_814AA84 + .4byte sub_814AAB8 + .4byte sub_814ABA0 + + .align 2 +gUnknown_085C9A1C:: @ 85C9A1C + .4byte sub_814AC38 + .4byte sub_814AD48 + .4byte sub_814ADB4 + .4byte sub_814ADD8 + .4byte sub_814AE40 + +gUnknown_085C9A30:: @ 85C9A30 + .byte 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x1b, 0x14, 0x0d, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x07, 0x0e, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x13, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x0f + .byte 0x10, 0x11, 0x12 + +gUnknown_085C9A53:: @ 85C9A53 + .byte 0x00, 0x10, 0x29, 0x16, 0x2c, 0x02, 0x2b, 0x15, 0x2e, 0x1b, 0x09, 0x30, 0x26, 0x05, 0x39, 0x3b, 0x0c, 0x3f, 0x23, 0x1c, 0x0a, 0x35, 0x07, 0x31, 0x27, 0x17, 0x37, 0x01, 0x3e, 0x11, 0x3d, 0x1e + .byte 0x06, 0x22, 0x0f, 0x33, 0x20, 0x3a, 0x0d, 0x2d, 0x25, 0x34, 0x0b, 0x18, 0x3c, 0x13, 0x38, 0x21, 0x1d, 0x32, 0x28, 0x36, 0x0e, 0x03, 0x2f, 0x14, 0x12, 0x19, 0x04, 0x24, 0x1a, 0x2a, 0x1f, 0x08 + .byte 0x00 + diff --git a/data/contest.s b/data/contest.s index 66a055b7d..970a5d9b8 100644 --- a/data/contest.s +++ b/data/contest.s @@ -10,55 +10,143 @@ gUnknown_08587A6C:: @ 8587A6C gUnknown_08587A70:: @ 8587A70 .byte 0x24, 0x4c, 0x74, 0x9c + .align 2 gUnknown_08587A74:: @ 8587A74 - .incbin "baserom.gba", 0x587a74, 0x5c - -gUnknown_08587AD0:: @ 8587AD0 - .incbin "baserom.gba", 0x587ad0, 0x18 - + obj_tiles gUnknown_08C19450, 0x0020, 0x4e20 + + .align 2 +gOamData_8587A7C:: @ 8587A7C + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + + .align 2 +gSpriteAffineAnim_8587A84:: @ 8587A84 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_8587A94:: @ 8587A94 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, -20, 20 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_8587AAC:: @ 8587AAC + obj_rot_scal_anim_frame 0x38, 0x38, 0, 0 + obj_rot_scal_anim_frame 0xA, 0xA, 20, 20 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_8587AC4:: @ 8587AC4 + .4byte gSpriteAffineAnim_8587A84 + .4byte gSpriteAffineAnim_8587A94 + .4byte gSpriteAffineAnim_8587AAC + + .align 2 +gSpriteTemplate_8587AD0:: @ 8587AD0 + spr_template 0x4e20, 0xabe0, gOamData_8587A7C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8587AC4, SpriteCallbackDummy + + .align 2 gUnknown_08587AE8:: @ 8587AE8 - .incbin "baserom.gba", 0x587ae8, 0x20 + obj_tiles gContestNextTurnGfx, 0x0100, 0x4e22 + obj_tiles gContestNextTurnGfx, 0x0100, 0x4e23 + obj_tiles gContestNextTurnGfx, 0x0100, 0x4e24 + obj_tiles gContestNextTurnGfx, 0x0100, 0x4e25 + .align 2 gUnknown_08587B08:: @ 8587B08 - .incbin "baserom.gba", 0x587b08, 0x10 - -gUnknown_08587B18:: @ 8587B18 - .incbin "baserom.gba", 0x587b18, 0x68 - -gUnknown_08587B80:: @ 8587B80 - .incbin "baserom.gba", 0x587b80, 0x30 - + obj_pal gContestPal, 0x4e22 + + .align 2 +gOamData_8587B10:: @ 8587B10 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0000 + + .align 2 +gSpriteTemplate_8587B18:: @ 8587B18 + spr_template 0x4e22, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0x4e23, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0x4e24, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0x4e25, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSubspriteTable_8587B78:: @ 8587B78 + subsprite -28, -4, 0, 0, 32x8 + subsprite 4, -4, 0, 4, 32x8 + + .align 2 +gSubspriteTables_8587B80:: @ 8587B80 + .4byte 2, gSubspriteTable_8587B78 + + .align 2 +gUnknown_08587B88:: @ 8587B88 + obj_tiles gUnknown_08C19168, 0x0180, 0xabe1 + + .align 2 +gOamData_8587B90:: @ 8587B90 + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0000 + + .align 2 +gSpriteTemplate_8587B98:: @ 8587B98 + spr_template 0xabe1, 0xabe0, gOamData_8587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 gUnknown_08587BB0:: @ 8587BB0 - .incbin "baserom.gba", 0x587bb0, 0x8 + obj_tiles gContestApplauseGfx, 0x0400, 0xabe2 + .align 2 gUnknown_08587BB8:: @ 8587BB8 - .incbin "baserom.gba", 0x587bb8, 0x10 + obj_pal gContestPal, 0xabe2 + + .align 2 +gOamData_8587BC0:: @ 8587BC0 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x0000 -gUnknown_08587BC8:: @ 8587BC8 - .incbin "baserom.gba", 0x587bc8, 0x20 + .align 2 +gSpriteTemplate_8587BC8:: @ 8587BC8 + spr_template 0xabe2, 0xabe2, gOamData_8587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_08587BE8:: @ 8587BE8 - .incbin "baserom.gba", 0x587be8, 0x18 + .align 2 +gOamData_8587BE0:: @ 8587BE0 + .2byte 0x0000 + .2byte 0xC000 + .2byte 0x2C00 + .align 2 +gSpriteTemplate_8587BE8:: @ 8587BE8 + spr_template 0x4e21, 0x4e21, gOamData_8587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 gUnknown_08587C00:: @ 8587C00 - .incbin "baserom.gba", 0x587c00, 0x8 + obj_tiles gContestJudgeGfx, 0x0800, 0x4e21 + .align 2 gUnknown_08587C08:: @ 8587C08 - .incbin "baserom.gba", 0x587c08, 0x8 + obj_tiles gContestJudgeSymbolsGfx, 0x0380, 0xabe0 + .align 2 gUnknown_08587C10:: @ 8587C10 - .incbin "baserom.gba", 0x587c10, 0x8 + obj_pal gContest3Pal, 0xabe0 -gUnknown_08587C18:: @ 8587C18 - .incbin "baserom.gba", 0x587c18, 0x18 + .align 2 +gSpriteTemplate_8587C18:: @ 8587C18 + spr_template 0xabe0, 0xabe0, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08587C30:: @ 8587C30 - .incbin "baserom.gba", 0x587c30, 0x20 + .incbin "graphics/unknown/unknown_587C30.gbapal" @ 8587C50 .include "data/text/contest_text_pointers.inc" -@ 8587D5C + .align 2 +gUnknown_08587D5C:: @ 8587D5C .4byte gText_0827D5C1 .4byte gText_0827D5DC .4byte gText_0827D600 @@ -73,6 +161,7 @@ gUnknown_08587C30:: @ 8587C30 .4byte gText_0827D706 .4byte gText_0827D71D + .align 2 gUnknown_08587D90:: @ 8587D90 .4byte gText_0827D743 .4byte gText_0827D764 @@ -107,6 +196,7 @@ gUnknown_08587D90:: @ 8587D90 .4byte gText_0827DB1F .4byte gText_0827DB4E + .align 2 gUnknown_08587E10:: @ 8587E10 .4byte gText_827DB75 .4byte gText_827DBB0 @@ -171,6 +261,7 @@ gUnknown_08587E10:: @ 8587E10 .4byte gText_0827E6C4 .4byte gText_0827E7BA + .align 2 gUnknown_08587F08:: @ 8587F08 .4byte gText_0827E85F .4byte gText_0827E868 @@ -178,6 +269,7 @@ gUnknown_08587F08:: @ 8587F08 .4byte gText_0827E878 .4byte gText_0827E882 + .align 2 gUnknown_08587F1C:: @ 8587F1C .4byte gText_0827E894 .4byte gText_0827E89E @@ -186,33 +278,89 @@ gUnknown_08587F1C:: @ 8587F1C .4byte gText_0827E8BF .4byte gText_0827E8CA + .align 2 gUnknown_08587F34:: @ 8587F34 - .incbin "baserom.gba", 0x587f34, 0x10 + .4byte 0x00000580, 0x000015e9, 0x000005c2, 0x000031a3 + .align 2 gUnknown_08587F44:: @ 8587F44 - .incbin "baserom.gba", 0x587f44, 0x60 - + window_template 0x00, 0x12, 0x00, 0x0c, 0x02, 0x0f, 0x0200 + window_template 0x00, 0x12, 0x05, 0x0c, 0x02, 0x0f, 0x0218 + window_template 0x00, 0x12, 0x0a, 0x0c, 0x02, 0x0f, 0x0230 + window_template 0x00, 0x12, 0x0f, 0x0c, 0x02, 0x0f, 0x0248 + window_template 0x00, 0x01, 0x0f, 0x11, 0x04, 0x0f, 0x0260 + window_template 0x00, 0x01, 0x1f, 0x09, 0x02, 0x0f, 0x02a4 + window_template 0x00, 0x01, 0x21, 0x09, 0x02, 0x0f, 0x02b6 + window_template 0x00, 0x01, 0x23, 0x09, 0x02, 0x0f, 0x02c8 + window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da + window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec + window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee + window_template_terminator + + .align 2 gUnknown_08587FA4:: @ 8587FA4 .incbin "baserom.gba", 0x587fa4, 0x100 + .align 2 gUnknown_085880A4:: @ 85880A4 .incbin "baserom.gba", 0x5880a4, 0x1740 + .align 2 gUnknown_085897E4:: @ 85897E4 - .incbin "baserom.gba", 0x005897e4, 0xc0 + .incbin "baserom.gba", 0x5897e4, 0xc0 gUnknown_085898A4:: @ 85898A4 - .incbin "baserom.gba", 0x5898a4, 0x60 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 + .byte 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02 + .align 2 gUnknown_08589904:: @ 8589904 - .incbin "baserom.gba", 0x589904, 0x20 - -gUnknown_08589924:: @ 8589924 - .incbin "baserom.gba", 0x589924, 0x68 - -gUnknown_0858998C:: @ 858998C - .incbin "baserom.gba", 0x58998c, 0x60 - + obj_tiles gBlankGfxCompressed, 0x1000, 0x80e8 + obj_tiles gBlankGfxCompressed, 0x1000, 0x80e9 + obj_tiles gBlankGfxCompressed, 0x1000, 0x80ea + obj_tiles gBlankGfxCompressed, 0x1000, 0x80eb + + .align 2 +gUnknown_08589924:: @ 8589924 Yup this is super dangerous but that's how it is here + obj_pal gHeap + 0x1A0A4, 0x80e8 + obj_pal gHeap + 0x1A0C4, 0x80e9 + obj_pal gHeap + 0x1A0E4, 0x80ea + obj_pal gHeap + 0x1A104, 0x80eb + + .align 2 +gOamData_8589944:: @ 8589944 + .2byte 0x0700 + .2byte 0xC000 + .2byte 0x0000 + + .align 2 +gSpriteAffineAnim_858994C:: @ 858994C + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_858995C:: @ 858995C + obj_rot_scal_anim_frame 0x3, 0x3, 0, 15 + obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15 + obj_rot_scal_anim_frame 0x3, 0x3, 0, 15 + obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_8589984:: @ 8589984 + .4byte gSpriteAffineAnim_858994C + .4byte gSpriteAffineAnim_858995C + + .align 2 +gSpriteTemplate_858998C:: @ 858998C + spr_template 0x80e8, 0x80e8, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy + spr_template 0x80e9, 0x80e9, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy + spr_template 0x80ea, 0x80ea, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy + spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy + + .align 2 gUnknown_085899EC:: @ 85899EC - .incbin "baserom.gba", 0x5899ec, 0x1c + .2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000 + diff --git a/data/contest_link_80F57C4.s b/data/contest_link_80F57C4.s index 7d30cea57..6bf51d174 100644 --- a/data/contest_link_80F57C4.s +++ b/data/contest_link_80F57C4.s @@ -1,46 +1,88 @@ -@ the third big chunk of data - .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 gUnknown_0858D6B0:: @ 858D6B0 - .incbin "baserom.gba", 0x58d6b0, 0x20 + .incbin "graphics/unknown/unknown_58D6B0.gbapal" + .align 2 gUnknown_0858D6D0:: @ 858D6D0 - .incbin "baserom.gba", 0x58d6d0, 0x128 + .incbin "graphics/unknown/unknown_58D6D0.4bpp" + + .align 2 +gMiscBlank_Pal:: @ 858D7D0 + .incbin "graphics/interface/blank.gbapal" + + .align 2 +gOamData_858D7F0:: @ 858D7F0 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x2C00 -gUnknown_0858D7F8:: @ 858D7F8 - .incbin "baserom.gba", 0x58d7f8, 0x18 + .align 2 +gSpriteTemplate_858D7F8:: @ 858D7F8 + spr_template 0x0bc1, 0x0bc1, gOamData_858D7F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0858D810:: @ 858D810 - .incbin "baserom.gba", 0x58d810, 0x40 + obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc1 + obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc2 + obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc3 + obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc4 + obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc5 + obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc6 + obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc7 + obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc8 + .align 2 gUnknown_0858D850:: @ 858D850 - .incbin "baserom.gba", 0x58d850, 0x10 + obj_pal gMiscBlank_Pal, 0x0bc1 -gUnknown_0858D860:: @ 858D860 - .incbin "baserom.gba", 0x58d860, 0x18 + .align 2 +gOamData_858D858:: @ 858D858 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .align 2 +gSpriteTemplate_858D860:: @ 858D860 + spr_template 0x0bc9, 0x0bc9, gOamData_858D858, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F7768 + + .align 2 gUnknown_0858D878:: @ 858D878 - .incbin "baserom.gba", 0x58d878, 0x8 + obj_tiles gContestConfetti_Gfx, 0x0220, 0x0bc9 + .align 2 gUnknown_0858D880:: @ 858D880 - .incbin "baserom.gba", 0x58d880, 0x8 + obj_pal gContestConfetti_Pal, 0x0bc9 + .align 2 gUnknown_0858D888:: @ 858D888 - .incbin "baserom.gba", 0x58d888, 0x10 + .4byte 0x000001e0, 0x00003181, 0x000031c2, 0x000031a3 + .align 2 gUnknown_0858D898:: @ 858D898 - .incbin "baserom.gba", 0x58d898, 0x30 + window_template 0x01, 0x07, 0x04, 0x0c, 0x02, 0x0f, 0x0302 + window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a + window_template 0x01, 0x07, 0x0a, 0x0c, 0x02, 0x0f, 0x0332 + window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a + window_template_terminator + + .align 2 +gUnknown_0858D8C0:: @ 858D8C0 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00 -gUnknown_0858D8C8:: @ 858D8C8 - .incbin "baserom.gba", 0x58d8c8, 0x18 + .align 2 +gSpriteTemplate_858D8C8:: @ 858D8C8 + spr_template 0x56ce, 0x0000, gUnknown_0858D8C0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0858D8E0:: @ 858D8E0 - .incbin "baserom.gba", 0x58d8e0, 0x8 + obj_tiles gMiscBlank_Gfx, 0x0200, 0x56ce + .align 2 gUnknown_0858D8E8:: @ 858D8E8 - .incbin "baserom.gba", 0x58d8e8, 0x4 + .byte 0x01, 0x0f, 0x0e, 0x00 + diff --git a/data/contest_painting.s b/data/contest_painting.s index fca82a2b5..42d76f9bc 100644 --- a/data/contest_painting.s +++ b/data/contest_painting.s @@ -4,47 +4,68 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 gUnknown_085A989C:: @ 85A989C - .incbin "baserom.gba", 0x5a989c, 0x200 + .incbin "graphics/picture_frame/bg.gbapal" + .align 2 gUnknown_085A9A9C:: @ 85A9A9C - .incbin "baserom.gba", 0x5a9a9c, 0x1084 + .incbin "graphics/picture_frame/frame0.4bpp.rl" + .align 2 gUnknown_085AAB20:: @ 85AAB20 - .incbin "baserom.gba", 0x5aab20, 0xc30 + .incbin "graphics/picture_frame/frame1.4bpp.rl" + .align 2 gUnknown_085AB750:: @ 85AB750 - .incbin "baserom.gba", 0x5ab750, 0xb38 + .incbin "graphics/picture_frame/frame2.4bpp.rl" + .align 2 gUnknown_085AC288:: @ 85AC288 - .incbin "baserom.gba", 0x5ac288, 0xfb8 + .incbin "graphics/picture_frame/frame3.4bpp.rl" + .align 2 gUnknown_085AD240:: @ 85AD240 - .incbin "baserom.gba", 0x5ad240, 0x1130 + .incbin "graphics/picture_frame/frame4.4bpp.rl" + .align 2 gUnknown_085AE370:: @ 85AE370 - .incbin "baserom.gba", 0x5ae370, 0x604 + .incbin "graphics/picture_frame/frame5.4bpp.rl" + .align 2 gUnknown_085AE974:: @ 85AE974 - .incbin "baserom.gba", 0x5ae974, 0x50c + .incbin "graphics/picture_frame/frame0_map.bin.rl" + .align 2 gUnknown_085AEE80:: @ 85AEE80 - .incbin "baserom.gba", 0x5aee80, 0x50c + .incbin "graphics/picture_frame/frame1_map.bin.rl" + .align 2 gUnknown_085AF38C:: @ 85AF38C - .incbin "baserom.gba", 0x5af38c, 0x50c + .incbin "graphics/picture_frame/frame2_map.bin.rl" + .align 2 gUnknown_085AF898:: @ 85AF898 - .incbin "baserom.gba", 0x5af898, 0x50c + .incbin "graphics/picture_frame/frame3_map.bin.rl" + .align 2 gUnknown_085AFDA4:: @ 85AFDA4 - .incbin "baserom.gba", 0x5afda4, 0x50c + .incbin "graphics/picture_frame/frame4_map.bin.rl" + .align 2 gUnknown_085B02B0:: @ 85B02B0 - .incbin "baserom.gba", 0x5b02b0, 0x524 + .incbin "graphics/picture_frame/frame5_map.bin.rl" + .align 2 +gUnknown_085B07C0:: @ 85B07C0 + .4byte gContestCoolness + .4byte gContestBeauty + .4byte gContestCuteness + .4byte gContestSmartness + .4byte gContestToughness + + .align 2 gContestRankTextPointers:: @ 85B07D4 .4byte gContestRankNormal .4byte gContestRankSuper @@ -52,12 +73,15 @@ gContestRankTextPointers:: @ 85B07D4 .4byte gContestRankMaster .4byte gContestLink + .align 2 gUnknown_085B07E8:: @ 85B07E8 - .incbin "baserom.gba", 0x5b07e8, 0x4 + .4byte 0x000010a5 + .align 2 gUnknown_085B07EC:: @ 85B07EC - .incbin "baserom.gba", 0x5b07ec, 0x8 + window_template 0x01, 0x02, 0x0e, 0x1a, 0x04, 0x0f, 0x0001 + .align 2 gContestPaintingDescriptionPointers:: @ 85B07F4 .4byte gContestPaintingCool1 .4byte gContestPaintingCool2 @@ -79,4 +103,4 @@ gUnknown_085B0830:: @ 85B0830 .4byte 0xc0003000, 0x00000000 gUnknown_085B0838:: @ 85B0838 - .incbin "baserom.gba", 0x5b0838, 0x4 + .2byte 0x0000, 0x0000 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 deleted file mode 100644 index 57dc8befc..000000000 --- a/data/data4d.s +++ /dev/null @@ -1,745 +0,0 @@ -@ 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 - -gUnknown_085B5DFC:: @ 85B5DFC - .incbin "baserom.gba", 0x5b5dfc, 0x1a4 - -gUnknown_085B5FA0:: @ 85B5FA0 - .incbin "baserom.gba", 0x5b5fa0, 0x1a0 - -gUnknown_085B6140:: @ 85B6140 - .incbin "baserom.gba", 0x5b6140, 0xc - -gUnknown_085B614C:: @ 85B614C - .incbin "baserom.gba", 0x5b614c, 0x8 - -gUnknown_085B6154:: @ 85B6154 - .incbin "baserom.gba", 0x5b6154, 0xc - -gUnknown_085B6160:: @ 85B6160 - .incbin "baserom.gba", 0x5b6160, 0x184 - -gUnknown_085B62E4:: @ 85B62E4 - .incbin "baserom.gba", 0x5b62e4, 0x4 - -gUnknown_085B62E8:: @ 85B62E8 - .incbin "baserom.gba", 0x5b62e8, 0x5c - -gUnknown_085B6344:: @ 85B6344 - .incbin "baserom.gba", 0x5b6344, 0x4 - -gUnknown_085B6348:: @ 85B6348 - .incbin "baserom.gba", 0x5b6348, 0x40 - -gUnknown_085B6388:: @ 85B6388 - .incbin "baserom.gba", 0x5b6388, 0x68 - -gUnknown_085B63F0:: @ 85B63F0 - .incbin "baserom.gba", 0x5b63f0, 0x18 - -gUnknown_085B6408:: @ 85B6408 - .incbin "baserom.gba", 0x5b6408, 0x8 - -gUnknown_085B6410:: @ 85B6410 - .incbin "baserom.gba", 0x5b6410, 0x8 - -gUnknown_085B6418:: @ 85B6418 - .incbin "baserom.gba", 0x5b6418, 0x6 - -gUnknown_085B641E:: @ 85B641E - .incbin "baserom.gba", 0x5b641e, 0x4 - -gUnknown_085B6422:: @ 85B6422 - .incbin "baserom.gba", 0x5b6422, 0xa - -gUnknown_085B642C:: @ 85B642C - .incbin "baserom.gba", 0x5b642c, 0x10 - -gUnknown_085B643C:: @ 85B643C - .incbin "baserom.gba", 0x5b643c, 0xc - -gUnknown_085B6448:: @ 85B6448 - .incbin "baserom.gba", 0x5b6448, 0xf3c - -gUnknown_085B7384:: @ 85B7384 - .incbin "baserom.gba", 0x5b7384, 0x98 - -gUnknown_085B741C:: @ 85B741C - .incbin "baserom.gba", 0x5b741c, 0x6c - -gUnknown_085B7488:: @ 85B7488 - .incbin "baserom.gba", 0x5b7488, 0x8 - -gUnknown_085B7490:: @ 85B7490 - .incbin "baserom.gba", 0x5b7490, 0x78 - -gUnknown_085B7508:: @ 85B7508 - .incbin "baserom.gba", 0x5b7508, 0x60 - -gUnknown_085B7568:: @ 85B7568 - .incbin "baserom.gba", 0x5b7568, 0x48 - -gUnknown_085B75B0:: @ 85B75B0 - .incbin "baserom.gba", 0x5b75b0, 0x60 - -gUnknown_085B7610:: @ 85B7610 - .incbin "baserom.gba", 0x5b7610, 0x140 - -gUnknown_085B7750:: @ 85B7750 - .incbin "baserom.gba", 0x5b7750, 0x94 - -gUnknown_085B77E4:: @ 85B77E4 - .incbin "baserom.gba", 0x5b77e4, 0x18 - -gUnknown_085B77FC:: @ 85B77FC - .incbin "baserom.gba", 0x5b77fc, 0x18 - -gUnknown_085B7814:: @ 85B7814 - .incbin "baserom.gba", 0x5b7814, 0x18 - -gUnknown_085B782C:: @ 85B782C - .incbin "baserom.gba", 0x5b782c, 0x18 - -gUnknown_085B7844:: @ 85B7844 - .incbin "baserom.gba", 0x5b7844, 0x20 - -gUnknown_085B7864:: @ 85B7864 - .incbin "baserom.gba", 0x5b7864, 0xc4 - -gUnknown_085B7928:: @ 85B7928 - .incbin "baserom.gba", 0x5b7928, 0x20 - -gUnknown_085B7948:: @ 85B7948 - .incbin "baserom.gba", 0x5b7948, 0x8 - -gUnknown_085B7950:: @ 85B7950 - .incbin "baserom.gba", 0x5b7950, 0x28 - -gUnknown_085B7978:: @ 85B7978 - .incbin "baserom.gba", 0x5b7978, 0x80 - -gUnknown_085B79F8:: @ 85B79F8 - .incbin "baserom.gba", 0x5b79f8, 0x18 - -gUnknown_085B7A10:: @ 85B7A10 - .incbin "baserom.gba", 0x5b7a10, 0x30 - -gUnknown_085B7A40:: @ 85B7A40 - .incbin "baserom.gba", 0x5b7a40, 0x7c - -gUnknown_085B7ABC:: @ 85B7ABC - .incbin "baserom.gba", 0x5b7abc, 0x30 - -gUnknown_085B7AEC:: @ 85B7AEC - .incbin "baserom.gba", 0x5b7aec, 0x18 - -gUnknown_085B7B04:: @ 85B7B04 - .incbin "baserom.gba", 0x5b7b04, 0x6 - -gUnknown_085B7B0A:: @ 85B7B0A - .incbin "baserom.gba", 0x5b7b0a, 0x8 - -gUnknown_085B7B12:: @ 85B7B12 - .incbin "baserom.gba", 0x5b7b12, 0x8 - -gUnknown_085B7B1A:: @ 85B7B1A - .incbin "baserom.gba", 0x5b7b1a, 0x14 - -gUnknown_085B7B2E:: @ 85B7B2E - .incbin "baserom.gba", 0x5b7b2e, 0x18 - -gUnknown_085B7B46:: @ 85B7B46 - .incbin "baserom.gba", 0x5b7b46, 0x2 - -gUnknown_085B7B48:: @ 85B7B48 - .incbin "baserom.gba", 0x5b7b48, 0x8d0 - -gUnknown_085B8418:: @ 85B8418 - .incbin "baserom.gba", 0x5b8418, 0x20 - -gUnknown_085B8438:: @ 85B8438 - .incbin "baserom.gba", 0x5b8438, 0x338 - -gUnknown_085B8770:: @ 85B8770 - .incbin "baserom.gba", 0x5b8770, 0x480 - -gUnknown_085B8BF0:: @ 85B8BF0 - .incbin "baserom.gba", 0x5b8bf0, 0x20 - -gUnknown_085B8C10:: @ 85B8C10 - .incbin "baserom.gba", 0x5b8c10, 0x20 - -gUnknown_085B8C30:: @ 85B8C30 - .incbin "baserom.gba", 0x5b8c30, 0x2 - -gUnknown_085B8C32:: @ 85B8C32 - .incbin "baserom.gba", 0x5b8c32, 0x36 - -gUnknown_085B8C68:: @ 85B8C68 - .incbin "baserom.gba", 0x5b8c68, 0x18 - -gUnknown_085B8C80:: @ 85B8C80 - .incbin "baserom.gba", 0x5b8c80, 0x10 - -gUnknown_085B8C90:: @ 85B8C90 - .incbin "baserom.gba", 0x5b8c90, 0x528 - -gUnknown_085B91B8:: @ 85B91B8 - .incbin "baserom.gba", 0x5b91b8, 0x178 - -gUnknown_085B9330:: @ 85B9330 - .incbin "baserom.gba", 0x5b9330, 0x580 - -gUnknown_085B98B0:: @ 85B98B0 - .incbin "baserom.gba", 0x5b98b0, 0x240 - -gUnknown_085B9AF0:: @ 85B9AF0 - .incbin "baserom.gba", 0x5b9af0, 0x11e0 - -gUnknown_085BACD0:: @ 85BACD0 - .incbin "baserom.gba", 0x5bacd0, 0x1e0 - -gUnknown_085BAEB0:: @ 85BAEB0 - .incbin "baserom.gba", 0x5baeb0, 0x20 - -gUnknown_085BAED0:: @ 85BAED0 - .incbin "baserom.gba", 0x5baed0, 0x378 - -gUnknown_085BB248:: @ 85BB248 - .incbin "baserom.gba", 0x5bb248, 0x25c - -gUnknown_085BB4A4:: @ 85BB4A4 - .incbin "baserom.gba", 0x5bb4a4, 0x48c - -gUnknown_085BB930:: @ 85BB930 - .incbin "baserom.gba", 0x5bb930, 0x2e4 - -gUnknown_085BBC14:: @ 85BBC14 - .incbin "baserom.gba", 0x5bbc14, 0x6a0 - -gUnknown_085BC2B4:: @ 85BC2B4 - .incbin "baserom.gba", 0x5bc2b4, 0x20 - -gUnknown_085BC2D4:: @ 85BC2D4 - .incbin "baserom.gba", 0x5bc2d4, 0x20 - -gUnknown_085BC2F4:: @ 85BC2F4 - .incbin "baserom.gba", 0x5bc2f4, 0x20 - -gUnknown_085BC314:: @ 85BC314 - .incbin "baserom.gba", 0x5bc314, 0x800 - -gUnknown_085BCB14:: @ 85BCB14 - .incbin "baserom.gba", 0x5bcb14, 0x800 - -gUnknown_085BD314:: @ 85BD314 - .incbin "baserom.gba", 0x5bd314, 0x820 - -gUnknown_085BDB34:: @ 85BDB34 - .incbin "baserom.gba", 0x5bdb34, 0x6b4 - -gUnknown_085BE1E8:: @ 85BE1E8 - .incbin "baserom.gba", 0x5be1e8, 0x334 - -gUnknown_085BE51C:: @ 85BE51C - .incbin "baserom.gba", 0x5be51c, 0x56c - -gUnknown_085BEA88:: @ 85BEA88 - .incbin "baserom.gba", 0x5bea88, 0x318 - -gUnknown_085BEDA0:: @ 85BEDA0 - .incbin "baserom.gba", 0x5beda0, 0x140 - -gUnknown_085BEEE0:: @ 85BEEE0 - .incbin "baserom.gba", 0x5beee0, 0x1c0 - -gUnknown_085BF0A0:: @ 85BF0A0 - .incbin "baserom.gba", 0x5bf0a0, 0x200 - -gUnknown_085BF2A0:: @ 85BF2A0 - .incbin "baserom.gba", 0x5bf2a0, 0x200 - -gUnknown_085BF4A0:: @ 85BF4A0 - .incbin "baserom.gba", 0x5bf4a0, 0xa0 - -gUnknown_085BF540:: @ 85BF540 - .incbin "baserom.gba", 0x5bf540, 0x160 - -gUnknown_085BF6A0:: @ 85BF6A0 - .incbin "baserom.gba", 0x5bf6a0, 0x7540 - -gUnknown_085C6BE0:: @ 85C6BE0 - .incbin "baserom.gba", 0x5c6be0, 0x1000 - -gUnknown_085C7BE0:: @ 85C7BE0 - .incbin "baserom.gba", 0x5c7be0, 0x20 - -gUnknown_085C7C00:: @ 85C7C00 - .incbin "baserom.gba", 0x5c7c00, 0x68c - -gUnknown_085C828C:: @ 85C828C - .incbin "baserom.gba", 0x5c828c, 0x2ec - -gUnknown_085C8578:: @ 85C8578 - .incbin "baserom.gba", 0x5c8578, 0x20 - -gUnknown_085C8598:: @ 85C8598 - .incbin "baserom.gba", 0x5c8598, 0x15c - -gUnknown_085C86F4:: @ 85C86F4 - .incbin "baserom.gba", 0x5c86f4, 0x100 - -gUnknown_085C87F4:: @ 85C87F4 - .incbin "baserom.gba", 0x5c87f4, 0xb0 - -gUnknown_085C88A4:: @ 85C88A4 - .incbin "baserom.gba", 0x5c88a4, 0x84 - -gUnknown_085C8928:: @ 85C8928 - .incbin "baserom.gba", 0x5c8928, 0x20 - -gUnknown_085C8948:: @ 85C8948 - .incbin "baserom.gba", 0x5c8948, 0xa8 - -gUnknown_085C89F0:: @ 85C89F0 - .incbin "baserom.gba", 0x5c89f0, 0xa8 - -gUnknown_085C8A98:: @ 85C8A98 - .incbin "baserom.gba", 0x5c8a98, 0x10 - -gUnknown_085C8AA8:: @ 85C8AA8 - .incbin "baserom.gba", 0x5c8aa8, 0xc - -gUnknown_085C8AB4:: @ 85C8AB4 - .incbin "baserom.gba", 0x5c8ab4, 0x8 - -gUnknown_085C8ABC:: @ 85C8ABC - .incbin "baserom.gba", 0x5c8abc, 0x8 - -gUnknown_085C8AC4:: @ 85C8AC4 - .incbin "baserom.gba", 0x5c8ac4, 0x1c - -gUnknown_085C8AE0:: @ 85C8AE0 - .incbin "baserom.gba", 0x5c8ae0, 0x1c - -gUnknown_085C8AFC:: @ 85C8AFC - .incbin "baserom.gba", 0x5c8afc, 0x18 - -gUnknown_085C8B14:: @ 85C8B14 - .incbin "baserom.gba", 0x5c8b14, 0x18 - -gUnknown_085C8B2C:: @ 85C8B2C - .incbin "baserom.gba", 0x5c8b2c, 0x18 - -gUnknown_085C8B44:: @ 85C8B44 - .incbin "baserom.gba", 0x5c8b44, 0x18 - -gUnknown_085C8B5C:: @ 85C8B5C - .incbin "baserom.gba", 0x5c8b5c, 0x20 - -gUnknown_085C8B7C:: @ 85C8B7C - .incbin "baserom.gba", 0x5c8b7c, 0xc - -gUnknown_085C8B88:: @ 85C8B88 - .incbin "baserom.gba", 0x5c8b88, 0x4 - -gUnknown_085C8B8C:: @ 85C8B8C - .incbin "baserom.gba", 0x5c8b8c, 0xa - -gUnknown_085C8B96:: @ 85C8B96 - .incbin "baserom.gba", 0x5c8b96, 0x6 - -gUnknown_085C8B9C:: @ 85C8B9C - .incbin "baserom.gba", 0x5c8b9c, 0x1c - -gUnknown_085C8BB8:: @ 85C8BB8 - .incbin "baserom.gba", 0x5c8bb8, 0x8 - -gUnknown_085C8BC0:: @ 85C8BC0 - .incbin "baserom.gba", 0x5c8bc0, 0xc - -gUnknown_085C8BCC:: @ 85C8BCC - .incbin "baserom.gba", 0x5c8bcc, 0x28 - -gUnknown_085C8BF4:: @ 85C8BF4 - .incbin "baserom.gba", 0x5c8bf4, 0x6 - -gUnknown_085C8BFA:: @ 85C8BFA - .incbin "baserom.gba", 0x5c8bfa, 0x14 - -gUnknown_085C8C0E:: @ 85C8C0E - .incbin "baserom.gba", 0x5c8c0e, 0x16 - -gUnknown_085C8C24:: @ 85C8C24 - .incbin "baserom.gba", 0x5c8c24, 0x1c - -gUnknown_085C8C40:: @ 85C8C40 - .incbin "baserom.gba", 0x5c8c40, 0x4 - -gUnknown_085C8C44:: @ 85C8C44 - .incbin "baserom.gba", 0x5c8c44, 0x4 - -gUnknown_085C8C48:: @ 85C8C48 - .incbin "baserom.gba", 0x5c8c48, 0xc - -gUnknown_085C8C54:: @ 85C8C54 - .incbin "baserom.gba", 0x5c8c54, 0x10 - -gUnknown_085C8C64:: @ 85C8C64 - .incbin "baserom.gba", 0x5c8c64, 0x2 - -gUnknown_085C8C66:: @ 85C8C66 - .incbin "baserom.gba", 0x5c8c66, 0x6 - -gUnknown_085C8C6C:: @ 85C8C6C - .incbin "baserom.gba", 0x5c8c6c, 0xc - -gUnknown_085C8C78:: @ 85C8C78 - .incbin "baserom.gba", 0x5c8c78, 0x8 - -gUnknown_085C8C80:: @ 85C8C80 - .incbin "baserom.gba", 0x5c8c80, 0x4 - -gUnknown_085C8C84:: @ 85C8C84 - .incbin "baserom.gba", 0x5c8c84, 0xb4 - -gUnknown_085C8D38:: @ 85C8D38 - .incbin "baserom.gba", 0x5c8d38, 0x8 - -gUnknown_085C8D40:: @ 85C8D40 - .incbin "baserom.gba", 0x5c8d40, 0x20 - -gUnknown_085C8D60:: @ 85C8D60 - .incbin "baserom.gba", 0x5c8d60, 0x2c - -gUnknown_085C8D8C:: @ 85C8D8C - .incbin "baserom.gba", 0x5c8d8c, 0x14 - -gUnknown_085C8DA0:: @ 85C8DA0 - .incbin "baserom.gba", 0x5c8da0, 0x10 - -gUnknown_085C8DB0:: @ 85C8DB0 - .incbin "baserom.gba", 0x5c8db0, 0xc - -gUnknown_085C8DBC:: @ 85C8DBC - .incbin "baserom.gba", 0x5c8dbc, 0x14 - -gUnknown_085C8DD0:: @ 85C8DD0 - .incbin "baserom.gba", 0x5c8dd0, 0x46 - -gUnknown_085C8E16:: @ 85C8E16 - .incbin "baserom.gba", 0x5c8e16, 0xe - -gUnknown_085C8E24:: @ 85C8E24 - .incbin "baserom.gba", 0x5c8e24, 0x44 - -gUnknown_085C8E68:: @ 85C8E68 - .incbin "baserom.gba", 0x5c8e68, 0x6c - - .align 2 -gFieldEffectObjectPalette10:: @ 85C8ED4 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal" - - .align 2 -gFieldEffectObjectPaletteInfo10:: @ 85C8EF4 - obj_pal gFieldEffectObjectPalette10, 0x1009 - - .incbin "baserom.gba", 0x5c8efc, 0xe0 - -gUnknown_085C8FDC:: @ 85C8FDC - .incbin "baserom.gba", 0x5c8fdc, 0x14 - -gUnknown_085C8FF0:: @ 85C8FF0 - .incbin "baserom.gba", 0x5c8ff0, 0x30 - -gUnknown_085C9020:: @ 85C9020 - .incbin "baserom.gba", 0x5c9020, 0x4b0 - -gUnknown_085C94D0:: @ 85C94D0 - .incbin "baserom.gba", 0x5c94d0, 0x500 - -gUnknown_085C99D0:: @ 85C99D0 - .incbin "baserom.gba", 0x5c99d0, 0x18 - -gUnknown_085C99E8:: @ 85C99E8 - .incbin "baserom.gba", 0x5c99e8, 0x10 - -gUnknown_085C99F8:: @ 85C99F8 - .incbin "baserom.gba", 0x5c99f8, 0x10 - -gUnknown_085C9A08:: @ 85C9A08 - .incbin "baserom.gba", 0x5c9a08, 0x14 - -gUnknown_085C9A1C:: @ 85C9A1C - .incbin "baserom.gba", 0x5c9a1c, 0x14 - -gUnknown_085C9A30:: @ 85C9A30 - .incbin "baserom.gba", 0x5c9a30, 0x23 - -gUnknown_085C9A53:: @ 85C9A53 - .incbin "baserom.gba", 0x5c9a53, 0x41 diff --git a/data/event_scripts.s b/data/event_scripts.s index 30db7638c..d0f286848 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1481,7 +1481,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 return OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43 - specialvar VAR_RESULT, sub_8139540 + specialvar VAR_RESULT, IsPokerusInParty compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F compare VAR_RESULT, 0 @@ -1724,7 +1724,7 @@ EventScript_271D2A:: @ 8271D2A copyvar VAR_0x8004, VAR_0x8008 msgbox gUnknown_08272A9A, 4 special sub_80EDCE8 - special sub_8138BC8 + special SetFlagInVar releaseall end @@ -1761,7 +1761,7 @@ EventScript_271D89:: @ 8271D89 EventScript_271D92:: @ 8271D92 lockall setvar VAR_0x8004, 0 - special sp0D9_ComputerRelated + special DoPCTurnOnEffect playse SE_PC_ON msgbox Text_27265A, 4 goto EventScript_271DAC @@ -1815,7 +1815,7 @@ EventScript_271E3E:: @ 8271E3E EventScript_271E47:: @ 8271E47 setvar VAR_0x8004, 0 playse SE_PC_OFF - special sub_8138E20 + special DoPCTurnOffEffect releaseall end @@ -1823,7 +1823,7 @@ EventScript_271E54:: @ 8271E54 checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_271E47 playse SE_PC_LOGIN - special sub_8137C28 + special AccessHallOfFamePC waitstate goto EventScript_271DBC end @@ -2202,7 +2202,7 @@ EventScript_27208F:: @ 827208F lockall msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, 4 fadescreen 1 - special sub_8138C94 + special FieldShowRegionMap waitstate releaseall end @@ -2292,7 +2292,7 @@ Route101_EventScript_27216F:: @ 827216F Route101_EventScript_272179:: @ 8272179 copyvar VAR_0x8004, VAR_0x8009 - special sub_8137C10 + special ShowPokedexRatingMessage waitmessage waitbuttonpress return @@ -2300,7 +2300,7 @@ Route101_EventScript_272179:: @ 8272179 EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184 Route101_EventScript_272184:: @ 8272184 setvar VAR_0x8004, 0 - specialvar VAR_RESULT, sub_8137A4C + specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 copyvar VAR_0x800A, VAR_RESULT @@ -2311,7 +2311,7 @@ Route101_EventScript_272184:: @ 8272184 compare VAR_0x800A, 0 goto_eq Route101_EventScript_27374E setvar VAR_0x8004, 1 - specialvar VAR_RESULT, sub_8137A4C + specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8006 buffernumberstring 0, VAR_0x8008 @@ -4594,7 +4594,7 @@ EventScript_275BE8:: @ 8275BE8 setfieldeffectargument 0, VAR_RESULT setorcopyvar VAR_0x8004, VAR_RESULT lockall - special sub_8139200 + special GetSecretBaseNearbyMapName msgbox Text_276A3D, 5 compare VAR_RESULT, 0 goto_eq EventScript_275CDE @@ -10192,54 +10192,71 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 step_31 step_end +gText_082B6EA5:: @ 82B6EA5 .string "Um, I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "Snivel… This tension is getting to me…$" +gText_082B6EEC:: @ 82B6EEC .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" .string "Here we come!$" +gText_082B6F16:: @ 82B6F16 .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}!\n" .string "Accept my challenge!$" +gText_082B6F4C:: @ 82B6F4C .string "Um… I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…\n" .string "Do you think someone like me can win?$" +gText_082B6F92:: @ 82B6F92 .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" .string "I’ll let you challenge me!$" +gText_082B6FC9:: @ 82B6FC9 .string "I’m horribly busy, but I also happen\n" .string "to be {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$" +gText_082B700C:: @ 82B700C .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "Glad to meet you!$" +gText_082B703A:: @ 82B703A .string "I serve as {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "May I begin?$" +gText_082B706A:: @ 82B706A .string "Eek! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" .string "I’ll do my best!$" +gText_082B709C:: @ 82B709C .string "Yeehaw! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" .string "Put ’em up!$" +gText_082B70CC:: @ 82B70CC .string "I’m {STR_VAR_1}’s 1,000th apprentice!\n" .string "Actually, I’m no. {STR_VAR_2}! Here goes!$" +gText_082B710A:: @ 82B710A .string "Yeah, I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" .string "Let’s get rockin’ and a-rollin’!$" +gText_082B714D:: @ 82B714D .string "Yippee-yahoo! I’m what you call\n" .string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" +gText_082B7185:: @ 82B7185 .string "Cough! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "Good to meet you! Cough!$" +gText_082B71C1:: @ 82B71C1 .string "This is nerve-racking…\n" .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" +gText_082B71F9:: @ 82B71F9 .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice,\n" .string "and that’s no lie.$" +gText_082B7229:: @ 82B7229 .string "Are you… {PLAYER}?\n" .string "Oh! Sniff…sob…\p" .string "Oh! S-sorry…\n" @@ -10251,11 +10268,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please, please, {PLAYER}!\n" .string "Please teach me about POKéMON!$" +gText_082B731C:: @ 82B731C .string "Oh… B-but…\n" .string "Snivel… Waaaaaaah!\p" .string "Please!\n" .string "I’m begging you, please!$" +gText_082B735B:: @ 82B735B .string "Oh, really? You will?\n" .string "Awesome! Wicked! Awoooh!\p" .string "Oh… I’m sorry…\n" @@ -10265,6 +10284,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which would be better for me: Level 50\n" .string "or the Open Level?$" +gText_082B7423:: @ 82B7423 .string "{STR_VAR_1}?\n" .string "Waaaaah!\p" .string "Oh! I’m so sorry!\n" @@ -10274,6 +10294,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thank you so much!\l" .string "Please talk with me again!$" +gText_082B74C1:: @ 82B74C1 .string "Wowee! You’re {PLAYER}, aren’t you?\n" .string "You’re awesomely strong, aren’t you?\p" .string "I’m {STR_VAR_1}!\n" @@ -10282,21 +10303,25 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Can you be my teacher and tell me\l" .string "lots about being a TRAINER?$" +gText_082B756F:: @ 82B756F .string "Aww, why?\n" .string "Oh, please? Pretty please?\l" .string "Please be my teacher, please!$" +gText_082B75B2:: @ 82B75B2 .string "Yay! Great!\p" .string "The first thing I wanted to ask you is\n" .string "about the BATTLE TOWER!\p" .string "The Level 50 and Open Level Rooms…\n" .string "Which would be perfect for me?$" +gText_082B763F:: @ 82B763F .string "{STR_VAR_1}, huh? That’s true!\n" .string "I’ll do my best there!\p" .string "If we meet here again, please teach\n" .string "me something else, teacher!$" +gText_082B76AC:: @ 82B76AC .string "Um… Are you {PLAYER}?\n" .string "My name is {STR_VAR_1}.\p" .string "I want to become a POKéMON TRAINER,\n" @@ -10305,11 +10330,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "advice because you’re so famous.\p" .string "{PLAYER}, could you give me advice?$" +gText_082B7772:: @ 82B7772 .string "Oh, but…\p" .string "I sincerely want to become a POKéMON\n" .string "TRAINER!\p" .string "Please, can you answer my questions?$" +gText_082B77CE:: @ 82B77CE .string "Thank you!\n" .string "Here’s my first question right away!\p" .string "The BATTLE TOWER has two levels,\n" @@ -10317,11 +10344,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which level do you think is more\n" .string "suitable for me?$" +gText_082B7871:: @ 82B7871 .string "Oh, the {STR_VAR_1} challenge?\n" .string "Understood!\p" .string "If I have another question, I’ll come\n" .string "back here for your advice!$" +gText_082B78D4:: @ 82B78D4 .string "Oh? Huh? You’re…\n" .string "No, that can’t be true.\p" .string "There isn’t any way that someone\n" @@ -10345,6 +10374,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "…Or will you be so kind as to give\n" .string "me advice?$" +gText_082B7B1A:: @ 82B7B1A .string "I knew it…\p" .string "It had to happen because I’m such\n" .string "a really boring nobody…\p" @@ -10355,6 +10385,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please, will you be so kind as to give\n" .string "me advice?$" +gText_082B7C13:: @ 82B7C13 .string "Really? I can’t believe it!\n" .string "I can’t believe you’ll advise me!\l" .string "I… I’m so happy…\p" @@ -10365,6 +10396,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which course do you think even I may\n" .string "have a chance at?$" +gText_082B7D18:: @ 82B7D18 .string "{STR_VAR_1}? Okay!\n" .string "But do you really think someone like\l" .string "me would have a chance?\p" @@ -10373,6 +10405,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thank you very much for spending\n" .string "time with someone like me.$" +gText_082B7DD4:: @ 82B7DD4 .string "Oh! You’re {PLAYER}{STRING 5}, aren’t you?\p" .string "I’ve heard that you’re tough at\n" .string "POKéMON!\p" @@ -10385,10 +10418,12 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I’m willing to listen to your advice.\n" .string "You’ll agree, of course?$" +gText_082B7EE5:: @ 82B7EE5 .string "Huh? Why are you refusing me?\n" .string "It’s me who’s asking you!\l" .string "You have to reconsider!$" +gText_082B7F35:: @ 82B7F35 .string "Okay, so there is this something.\n" .string "I want you to decide it for me.\p" .string "You know that the BATTLE TOWER has\n" @@ -10396,6 +10431,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which do you think would be good\n" .string "for me, {PLAYER}{STRING 5}?$" +gText_082B7FE8:: @ 82B7FE8 .string "Okay, {STR_VAR_1} is suitable for me?\n" .string "Thank you!\p" .string "Knowing that you made the decision,\n" @@ -10404,6 +10440,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082B8087:: @ 82B8087 .string "Oh, hi, there! {PLAYER}{STRING 5}!\n" .string "I know you because you’re famous!\l" .string "Call me {STR_VAR_1}! Glad to meet you!\p" @@ -10418,11 +10455,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, {PLAYER}{STRING 5}, how about sharing your\l" .string "wisdom with me every so often?$" +gText_082B822B:: @ 82B822B .string "Oh, but, please?\n" .string "A guy like me needs someone like\l" .string "you, {PLAYER}{STRING 5}!\p" .string "Honestly, I need your advice!$" +gText_082B8286:: @ 82B8286 .string "Thank you! That’s more like it!\n" .string "So, let’s start with an easy one!\p" .string "You know about the BATTLE TOWER’s\n" @@ -10431,11 +10470,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Me being a busy guy, which one should\n" .string "I gear up for?$" +gText_082B8356:: @ 82B8356 .string "{STR_VAR_1}, huh? Okay, gotcha.\n" .string "I’ll find time somehow and give it a go!\p" .string "…Whoops, I’d better go to work!\n" .string "Thanks! See you around!$" +gText_082B83CE:: @ 82B83CE .string "No way! Uh-uh!\n" .string "Are you maybe the real {PLAYER}?\p" .string "A-hah! Awesome! I’m {STR_VAR_1},\n" @@ -10449,10 +10490,12 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Isn’t it a great idea?\n" .string "Please, I want your advice!$" +gText_082B84FC:: @ 82B84FC .string "Ahahaha, you can pretend to be mean,\n" .string "but you can’t fool me!\l" .string "You really mean okay, don’t you?$" +gText_082B8559:: @ 82B8559 .string "Yay! I knew you’d have a big heart,\n" .string "{PLAYER}!\p" .string "What should I ask you first?\n" @@ -10464,6 +10507,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Level 50 or Open Level?\n" .string "Which suits me more?$" +gText_082B8656:: @ 82B8656 .string "Oh-oh-oh!\n" .string "{STR_VAR_1}, you say!\l" .string "Thank you for a totally cool reply!\p" @@ -10472,6 +10516,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082B86EA:: @ 82B86EA .string "I beg your pardon, but…\n" .string "Are you {PLAYER}?\p" .string "I’m {STR_VAR_1}, and I am delighted to\n" @@ -10484,6 +10529,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "May I become your apprentice,\n" .string "{PLAYER}?$" +gText_082B87DA:: @ 82B87DA .string "Oh…!\p" .string "… … … … … …\n" .string "… … … … … …\p" @@ -10492,6 +10538,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please! Please say that you will\n" .string "accept me as your apprentice!$" +gText_082B887C:: @ 82B887C .string "Oh… I’m delighted!\p" .string "I don’t wish to waste your time,\n" .string "so please advise me on this.\p" @@ -10501,12 +10548,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which would be most suitable for me?\n" .string "Level 50 or Open Level?$" +gText_082B8957:: @ 82B8957 .string "{STR_VAR_1} is your choice!\n" .string "I see. I will do my best!\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082B89C6:: @ 82B89C6 .string "Eek! Eek! {PLAYER}!\n" .string "You spoke to me!\l" .string "I… I’m overjoyed!\p" @@ -10519,6 +10568,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please take me in as your apprentice!\n" .string "I want to learn from you!$" +gText_082B8ACF:: @ 82B8ACF .string "Waaaah!\n" .string "{PLAYER} turned me down…\l" .string "It… It’s an invaluable experience!\p" @@ -10526,6 +10576,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "an affirmative answer this time!\p" .string "I beg you for your guidance!$" +gText_082B8B66:: @ 82B8B66 .string "Hieeeeh! {PLAYER} said yes!\n" .string "{PLAYER} said yes!\p" .string "I won’t be able to sleep tonight…\n" @@ -10534,12 +10585,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "At the BATTLE TOWER, what is right\n" .string "for me, Level 50 or Open Level?$" +gText_082B8C20:: @ 82B8C20 .string "{STR_VAR_1}! Perfectly understood!\n" .string "I understand perfectly!\l" .string "I’m deliriously delighted!\p" .string "I hope you’ll be willing to teach me\n" .string "some more another time.$" +gText_082B8CAA:: @ 82B8CAA .string "Whoa! Could you be…\n" .string "Might you be… {PLAYER}{STRING 5}?!\l" .string "That strong and famous TRAINER?\l" @@ -10552,11 +10605,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, there you have it, {PLAYER}{STRING 5}!\n" .string "Let me apprentice under you!$" +gText_082B8DD3:: @ 82B8DD3 .string "Gwaaaah!\n" .string "You’re quite cool and tough…\p" .string "Don’t be that way, please.\n" .string "I’m asking you!$" +gText_082B8E24:: @ 82B8E24 .string "Oh, yeah! That’s a solid reply!\n" .string "Excellent, I might add!\p" .string "So how about a first piece of advice\n" @@ -10564,12 +10619,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If I were to go, what would be better?\n" .string "Level 50 or Open Level?$" +gText_082B8ED5:: @ 82B8ED5 .string "Uh-huh, {STR_VAR_1} it is!\n" .string "OK, A-OK!\l" .string "I’ll go show my mettle, like, jam!\p" .string "All right, I’ll look to you as my mentor!\n" .string "Adios!$" +gText_082B8F45:: @ 82B8F45 .string "Oh, hey, {PLAYER}{STRING 5}, right?\n" .string "The police were looking for you!\p" .string "… … …\n" @@ -10582,6 +10639,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, how about you becoming my master\n" .string "about all things POKéMON?$" +gText_082B905F:: @ 82B905F .string "If you’re going to act cold like that,\n" .string "I’ll show you what I’ll do!\p" .string "Waaah! Waaah! Waaah!\n" @@ -10590,6 +10648,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Come on, will you please be\n" .string "my POKéMON master?$" +gText_082B910E:: @ 82B910E .string "Yippee!\n" .string "I’ll buy you a boat for that!\p" .string "Of course I’m lying again!\n" @@ -10600,6 +10659,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "level I should challenge…\p" .string "Can you decide for me, master?$" +gText_082B9204:: @ 82B9204 .string "Okay, so {STR_VAR_1} is better!\n" .string "I’ll go to the other level, then!\p" .string "Just kidding!\n" @@ -10607,6 +10667,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082B929C:: @ 82B929C .string "A-H-O-Y!\n" .string "And that spells ahoy, and it means hi!\p" .string "I’m {STR_VAR_1}, the rappin’ SAILOR\n" @@ -10624,11 +10685,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s make that a celebration!\n" .string "Become my mentor for commemoration!$" +gText_082B9438:: @ 82B9438 .string "But!\n" .string "You have to work with me!\p" .string "Don’t be such a tease!\n" .string "Become my mentor, please!$" +gText_082B9488:: @ 82B9488 .string "That’s it!\n" .string "{PLAYER}, you’ve got the spirit!\p" .string "So here’s my first question\n" @@ -10638,11 +10701,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Level 50 and Open Level there be,\n" .string "which is the one that’s good for me?$" +gText_082B9564:: @ 82B9564 .string "Okay, {STR_VAR_1} it is, you say!\n" .string "I’ll go and take it on my way!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082B95D8:: @ 82B95D8 .string "Say, hey, aren’t you {PLAYER}?\n" .string "What should I do? Talk to you?\l" .string "Why not? I’m already talking to you!\p" @@ -10658,11 +10723,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}, let me be your underling!\n" .string "I want you to teach me everything!$" +gText_082B9763:: @ 82B9763 .string "You’re turning me down, then?\n" .string "I’ll just have to ask you again!\p" .string "{PLAYER}, I beg to be your underling!\n" .string "I need you to teach me everything!$" +gText_082B97E5:: @ 82B97E5 .string "Lucky, yeah, woohoo!\n" .string "Should I pop a question to you?\p" .string "Since we’re near the BATTLE TOWER,\n" @@ -10670,12 +10737,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Of the choices you see,\n" .string "which is the right one for me?$" +gText_082B989A:: @ 82B989A .string "If {STR_VAR_1} is what you suggest,\n" .string "it must be the very best!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082B992D:: @ 82B992D .string "Oh, hi! You there!\n" .string "Can I get you to massage my shoulder?\p" .string "…Yes, there! That’s it!\n" @@ -10690,10 +10759,12 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Listen, can I get you to give me\n" .string "advice?$" +gText_082B9A84:: @ 82B9A84 .string "Oh, why?\p" .string "I won’t be a big bother, I promise!\n" .string "Please?$" +gText_082B9AB9:: @ 82B9AB9 .string "Thank you. Mighty good of you!\n" .string "…Cough! Cough!\p" .string "Oogh, I have to toughen up quick…\p" @@ -10701,11 +10772,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "right away, but what would be better\l" .string "for me? Level 50 or Open Level?$" +gText_082B9B76:: @ 82B9B76 .string "Hm, all right. That’s {STR_VAR_1}.\n" .string "I’ll go there right away.\p" .string "I hope I can keep hitting you up for\n" .string "help--after all, you’re my mentor!$" +gText_082B9BF2:: @ 82B9BF2 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…?\p" .string "Please, don’t look at me that way.\n" @@ -10722,11 +10795,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Could you become my teacher and\n" .string "give me advice?$" +gText_082B9D83:: @ 82B9D83 .string "Please don’t brush me off like this!\n" .string "I can’t live with the humiliation.\p" .string "Please become my teacher!\n" .string "I need your advice!$" +gText_082B9DF9:: @ 82B9DF9 .string "Th-thank you…\p" .string "But please don’t look at me like that.\n" .string "It makes me all flustered.\p" @@ -10735,6 +10810,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "At the BATTLE TOWER…\n" .string "Which level should I attempt?$" +gText_082B9EAA:: @ 82B9EAA .string "Oh… Okay!\n" .string "I’ll try my hand at that.\p" .string "I hope I can make a valiant challenge\n" @@ -10743,6 +10819,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082B9F55:: @ 82B9F55 .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really real?\p" .string "You may call me {STR_VAR_1}.\p" @@ -10754,6 +10831,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I merely want you to recognize me\l" .string "as your apprentice.$" +gText_082BA084:: @ 82BA084 .string "Oh?\n" .string "But what would compel you to refuse?\p" .string "I apologize for being skeptical about\n" @@ -10761,6 +10839,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please accept my apology and\n" .string "accept me as your apprentice.$" +gText_082BA11D:: @ 82BA11D .string "You really are accepting me?\n" .string "I don’t wish to celebrate prematurely.\p" .string "If it is true, I apologize.\n" @@ -10769,6 +10848,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "what would be worthy of me?\l" .string "Level 50 or Open Level?$" +gText_082BA1F3:: @ 82BA1F3 .string "{STR_VAR_1}?\n" .string "Are you certain?\p" .string "I see. If that’s the case, that’s fine.\n" @@ -10777,6 +10857,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "me that you have accepted me.\p" .string "Let us meet again!$" +gText_082BA2A3:: @ 82BA2A3 .string "Sigh… Sob…\n" .string "Oh, {PLAYER}!\p" .string "I’m all tangled up in a dilemma\n" @@ -10786,25 +10867,30 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please tell me, {PLAYER}.\n" .string "What item should I make it hold?$" +gText_082BA34E:: @ 82BA34E .string "Oh, really? I shouldn’t make\n" .string "my {STR_VAR_1} hold anything?$" +gText_082BA380:: @ 82BA380 .string "Oh, okay! I’m delighted it’s settled!\n" .string "Awesome! Wicked! Awoooh!\p" .string "Thank you so much!$" +gText_082BA3D2:: @ 82BA3D2 .string "Oh, I’m so glad…\n" .string "I think I have that {STR_VAR_1}, too.\p" .string "I’m delighted it’s settled!\n" .string "Awesome! Wicked! Awoooh!\p" .string "Thank you so much!$" +gText_082BA448:: @ 82BA448 .string "Waaaah! Please don’t be mean!\p" .string "That item {STR_VAR_1} was already\n" .string "recommended to me before, sob…\p" .string "Or do you mean I shouldn’t make\n" .string "my {STR_VAR_2} hold anything?$" +gText_082BA4D3:: @ 82BA4D3 .string "Yay! It’s {PLAYER}!\n" .string "Great! I wanted to ask you something!\p" .string "Do you make your POKéMON hold items?\n" @@ -10813,38 +10899,47 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_1} to hold?\p" .string "What do you think?$" +gText_082BA58C:: @ 82BA58C .string "Huh? You mean my {STR_VAR_1} doesn’t\n" .string "have to hold anything?$" +gText_082BA5BF:: @ 82BA5BF .string "Oh, I get it! I’ll do that!\n" .string "Thanks for teaching me!$" +gText_082BA5F3:: @ 82BA5F3 .string "Oh, wow! One {STR_VAR_1}, huh?\n" .string "Okay, I’ll do that!\p" .string "Thanks for teaching me!$" +gText_082BA635:: @ 82BA635 .string "Oh, uh, no, that’s not what I meant.\n" .string "I want to know about a different item\l" .string "than the ones I already know.\p" .string "Or do you mean that my POKéMON doesn’t\n" .string "have to hold anything this time?$" +gText_082BA6E6:: @ 82BA6E6 .string "{PLAYER}, hello!\n" .string "It’s about my {STR_VAR_1}…\p" .string "I want to make it hold a good item.\n" .string "What would be good for it?$" +gText_082BA742:: @ 82BA742 .string "Oh, then my {STR_VAR_1} doesn’t have\n" .string "to hold anything?$" +gText_082BA770:: @ 82BA770 .string "Okay, I got it!\n" .string "See you again!$" +gText_082BA78F:: @ 82BA78F .string "Oh, the item {STR_VAR_1}?\n" .string "Understood!\p" .string "I’ll do my best to find one!\n" .string "See you again!$" +gText_082BA7D8:: @ 82BA7D8 .string "Somebody taught me about\n" .string "the {STR_VAR_1} already.\p" .string "I want my POKéMON to hold a different\n" @@ -10852,6 +10947,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Or do you think {STR_VAR_2} doesn’t\n" .string "have to hold anything?$" +gText_082BA867:: @ 82BA867 .string "Hello, {PLAYER}…\n" .string "I’m sorry to disturb you, but I have\l" .string "something else I wanted to ask you.\p" @@ -10862,19 +10958,23 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}, please, could you decide\n" .string "for me?$" +gText_082BA96B:: @ 82BA96B .string "A POKéMON belonging to someone like me\n" .string "would be better off without an item?$" +gText_082BA9B7:: @ 82BA9B7 .string "I understand…\n" .string "You’re saying I shouldn’t rely on items.\l" .string "I’ll do my best not to!\p" .string "Thank you very much!$" +gText_082BAA1B:: @ 82BAA1B .string "The item {STR_VAR_1}, okay.\n" .string "I’m not sure if I can get one…\l" .string "No! I’ll do my best to get it.\p" .string "Thank you very much!$" +gText_082BAA81:: @ 82BAA81 .string "Oh, but…\n" .string "I think I’ve heard about that before…\p" .string "Is it maybe because I haven’t handled\n" @@ -10882,6 +10982,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Or do you mean I shouldn’t make\n" .string "my {STR_VAR_2} hold anything?$" +gText_082BAB22:: @ 82BAB22 .string "Oh, {PLAYER}{STRING 5}.\n" .string "There’s something I wanted to ask you.\p" .string "You know how you decided which\n" @@ -10893,9 +10994,11 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "What would be good? I want to make\n" .string "my {STR_VAR_1} hold something.$" +gText_082BAC43:: @ 82BAC43 .string "Oh! So my {STR_VAR_1} should do\n" .string "the best it can empty-handed?$" +gText_082BAC78:: @ 82BAC78 .string "If you think that’s best, I’ll do that.\p" .string "Knowing that you made the decision,\n" .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" @@ -10903,6 +11006,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082BAD17:: @ 82BAD17 .string "The item {STR_VAR_1}, huh?\n" .string "Not bad. I’ll use it!\p" .string "Knowing that you made the decision,\n" @@ -10911,12 +11015,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082BADB6:: @ 82BADB6 .string "Huh? What are you saying?\n" .string "You told me about the {STR_VAR_1}\l" .string "already before.\p" .string "Or do you mean my {STR_VAR_2} should\n" .string "do the best it can empty-handed?$" +gText_082BAE36:: @ 82BAE36 .string "Yo, {PLAYER}{STRING 5}!\p" .string "We’re both busy, but we seem to run\n" .string "into each other often anyway!\p" @@ -10928,26 +11034,31 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "giving me advice on what I should make\l" .string "my {STR_VAR_1} hold?$" +gText_082BAF4E:: @ 82BAF4E .string "Oh, so me being a busy guy, you say\n" .string "my {STR_VAR_1} doesn’t need anything?$" +gText_082BAF8F:: @ 82BAF8F .string "Okay, gotcha.\n" .string "I won’t need any time for that.\p" .string "Thanks today!\n" .string "See you around!$" +gText_082BAFDB:: @ 82BAFDB .string "Okay, gotcha.\n" .string "I’ll find time somehow and find\l" .string "that {STR_VAR_1} you recommended.\p" .string "I’m glad I met a good mentor in you.\n" .string "Thanks! See you around!$" +gText_082BB05F:: @ 82BB05F .string "Huh? I already know about\n" .string "that {STR_VAR_1}.\p" .string "Oh, right, I get it.\n" .string "So me being a busy guy, you say\l" .string "my {STR_VAR_2} doesn’t need anything?$" +gText_082BB0D4:: @ 82BB0D4 .string "Hiya, {PLAYER}! It’s me!\n" .string "I need to tap your mind again today.\l" .string "Please, I need your advice!\p" @@ -10956,15 +11067,18 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If I want to make my {STR_VAR_1} hold\n" .string "an item, what should it be?$" +gText_082BB18C:: @ 82BB18C .string "Is that right? My {STR_VAR_1} doesn’t\n" .string "need to hold an item, you’re saying.$" +gText_082BB1CE:: @ 82BB1CE .string "Okay, that’s what I’ll do!\p" .string "I guess that’s about all I wanted\n" .string "to ask you today.\p" .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082BB242:: @ 82BB242 .string "Uh-huh! One {STR_VAR_1}.\n" .string "What a cool choice!\l" .string "I’ll definitely try that!\p" @@ -10973,6 +11087,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082BB2D9:: @ 82BB2D9 .string "Ahahah! That’s silly!\n" .string "You already told me about that\l" .string "{STR_VAR_1} before!\p" @@ -10980,6 +11095,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Oh, wait! My {STR_VAR_2} doesn’t\n" .string "need to hold an item, you’re saying.$" +gText_082BB370:: @ 82BB370 .string "Hello, {PLAYER}. I hope you’ve been\n" .string "keeping well.\p" .string "May I approach you for advice?\p" @@ -10993,26 +11109,31 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "It would please me if you could decide\n" .string "what would be right for my POKéMON…$" +gText_082BB4C3:: @ 82BB4C3 .string "In other words… My POKéMON has\n" .string "no need to hold an item?$" +gText_082BB4FB:: @ 82BB4FB .string "I understand clearly now!\n" .string "I will keep trying like this.\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082BB575:: @ 82BB575 .string "One {STR_VAR_1} it is!\n" .string "I will order it right away.\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082BB5E1:: @ 82BB5E1 .string "You’ve already told me about that,\n" .string "and I already have it.\p" .string "Or are you saying… My POKéMON has\n" .string "no need to hold an item?$" +gText_082BB656:: @ 82BB656 .string "Eek! {PLAYER}!\n" .string "I… I’m overjoyed to see you again!\p" .string "Oh-oh-oh! There’s something I just\n" @@ -11020,14 +11141,17 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please decide what my {STR_VAR_1}\n" .string "should be holding!$" +gText_082BB6E5:: @ 82BB6E5 .string "Oh, wow! I didn’t expect that answer!\n" .string "So, a hold item isn’t necessary?$" +gText_082BB72C:: @ 82BB72C .string "Perfectly understood!\n" .string "I’ll keep at this without an item!\p" .string "I hope you’ll be willing to teach me\n" .string "some more another time.$" +gText_082BB7A2:: @ 82BB7A2 .string "{STR_VAR_1}! I’ll use that!\p" .string "Um… Could it be, {PLAYER}, you also\n" .string "make your POKéMON hold that item?\p" @@ -11035,12 +11159,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I hope you’ll be willing to teach me\l" .string "some more another time.$" +gText_082BB84A:: @ 82BB84A .string "Oh? You recommended that\n" .string "{STR_VAR_1} before, too.\p" .string "Or is it the best thing to hold?\n" .string "Or do you mean that my {STR_VAR_2}\l" .string "doesn’t need anything to hold?$" +gText_082BB8CD:: @ 82BB8CD .string "Hola!\n" .string "My maestro, {PLAYER}{STRING 5}!\p" .string "I want to hit you up for advice on\n" @@ -11050,26 +11176,31 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Don’t be shy now.\n" .string "Let’s blurt it out!$" +gText_082BB970:: @ 82BB970 .string "Oh? So, you’re saying my {STR_VAR_1}\n" .string "can win without holding any item?$" +gText_082BB9AE:: @ 82BB9AE .string "Si, bueno!\n" .string "I’ll give it my best shot, like, slam!\p" .string "All right, thanks, as always!\n" .string "Adios!$" +gText_082BBA05:: @ 82BBA05 .string "Uh-huh, that’s one {STR_VAR_1}?\n" .string "Si, bueno!\l" .string "I’ll go find me one, like, bam!\p" .string "All right, thanks, as always!\n" .string "Adios!$" +gText_082BBA6C:: @ 82BBA6C .string "No, no! You already told me about\n" .string "that {STR_VAR_1} thing before.\p" .string "Oh, now wait just one minute here…\n" .string "So, you’re saying my {STR_VAR_2}\l" .string "can win without holding any item?$" +gText_082BBB01:: @ 82BBB01 .string "{PLAYER}{STRING 5}, something unbelievable\n" .string "has happened!\p" .string "I woke up this morning, and my POKéMON\n" @@ -11082,9 +11213,11 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, how about deciding for me what\n" .string "my {STR_VAR_1} should hold, master?$" +gText_082BBC1C:: @ 82BBC1C .string "What’s that mean?\n" .string "Don’t make it hold anything?$" +gText_082BBC4B:: @ 82BBC4B .string "Okay, so it shouldn’t hold anything.\n" .string "Then, I’d better get something for it!\p" .string "Just kidding!\n" @@ -11092,6 +11225,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082BBCF6:: @ 82BBCF6 .string "Okay, so it’s one {STR_VAR_1}!\n" .string "I’ll make it hold anything but that!\p" .string "Just kidding!\n" @@ -11099,12 +11233,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082BBD90:: @ 82BBD90 .string "Um, you told me about that before,\n" .string "didn’t you?\p" .string "Isn’t there something else?\p" .string "Or do you mean, don’t make\n" .string "my {STR_VAR_2} hold anything?$" +gText_082BBE0B:: @ 82BBE0B .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" .string "The rappin’ SAILOR am I!\n" @@ -11115,21 +11251,25 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "My {STR_VAR_1} needs an item to hold,\n" .string "What should it be, if I may be bold?$" +gText_082BBEE5:: @ 82BBEE5 .string "Is that right?\n" .string "My {STR_VAR_1} doesn’t need to be\l" .string "holding anything tight?$" +gText_082BBF25:: @ 82BBF25 .string "Okay, I hear you, sure I do!\n" .string "My POKéMON will go empty-handed, too!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082BBFA4:: @ 82BBFA4 .string "Okay, one {STR_VAR_1},\n" .string "that’s what I’ll use.\l" .string "I was right to make you choose!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082BC024:: @ 82BC024 .string "Okay, one {STR_VAR_1}, you say?\n" .string "You told me that the other day.\l" .string "I need a new idea, a brand new way.\p" @@ -11137,6 +11277,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "My POKéMON doesn’t need to hold\l" .string "anything tight?$" +gText_082BC0C8:: @ 82BC0C8 .string "Say, hey, {PLAYER}!\n" .string "I found you again today!\p" .string "What should I do? Get your advice?\n" @@ -11150,21 +11291,25 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my {STR_VAR_1} that’d be good.\l" .string "My indecision is making me brood.$" +gText_082BC213:: @ 82BC213 .string "My {STR_VAR_1} needs nothing?\n" .string "Doesn’t need to hold anything?$" +gText_082BC247:: @ 82BC247 .string "If holding nothing is the best,\n" .string "I’ll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082BC2DD:: @ 82BC2DD .string "If holding that {STR_VAR_1} is\n" .string "the best, I’ll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082BC373:: @ 82BC373 .string "Haven’t I heard about that\n" .string "{STR_VAR_1} before?\l" .string "I’m certain I have, that’s for sure!\p" @@ -11172,6 +11317,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Or, my {STR_VAR_2} needs nothing?\l" .string "Doesn’t need to hold anything?$" +gText_082BC40E:: @ 82BC40E .string "Gwah! Ouch! {PLAYER}{STRING 5}, my arm’s broken!\n" .string "Don’t touch it, please!\p" .string "I must’ve broken it while I was trying\n" @@ -11182,21 +11328,25 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}{STRING 5}, what do you think would be\n" .string "good for my {STR_VAR_1} to hold?$" +gText_082BC514:: @ 82BC514 .string "Ouch…\p" .string "So your suggestion is my {STR_VAR_1}\n" .string "doesn’t have to hold anything?$" +gText_082BC555:: @ 82BC555 .string "Hm, all right. That would be easier\n" .string "for me, the way things are now.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" +gText_082BC5CE:: @ 82BC5CE .string "Hm, all right. That’s one {STR_VAR_1}.\n" .string "My POKéMON’s arm is fine, so I’ll make\l" .string "it hold that item right away.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" +gText_082BC666:: @ 82BC666 .string "No, no, you told me about that\n" .string "{STR_VAR_1} before, remember?\p" .string "How about telling me something\n" @@ -11205,6 +11355,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So your suggestion is my {STR_VAR_2}\l" .string "doesn’t have to hold anything?$" +gText_082BC714:: @ 82BC714 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…\p" .string "Please, don’t look at me that way.\n" @@ -11216,9 +11367,11 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}{STRING 5}, what do you think would\n" .string "be good?$" +gText_082BC808:: @ 82BC808 .string "Oh… Then, you think it would be better\n" .string "if my {STR_VAR_1} didn’t have an item?$" +gText_082BC84D:: @ 82BC84D .string "Oh… Okay!\n" .string "I’ll go without an item.\p" .string "This is nerve-racking, though.\n" @@ -11227,6 +11380,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082BC8EA:: @ 82BC8EA .string "Oh… Okay!\n" .string "I’ll go with that {STR_VAR_1}.\p" .string "This is nerve-racking, though.\n" @@ -11235,6 +11389,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082BC984:: @ 82BC984 .string "B-but I already heard about that.\p" .string "Please don’t brush me off like this!\n" .string "I can’t live with the humiliation.\p" @@ -11242,6 +11397,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Do you think it would be better if\l" .string "my {STR_VAR_2} didn’t have an item?$" +gText_082BCA4D:: @ 82BCA4D .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really?\l" .string "Perhaps you’re a twin?\p" @@ -11254,13 +11410,16 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "to make hold a convenient item.\p" .string "What would be worthy of it?$" +gText_082BCB75:: @ 82BCB75 .string "It’s better if it held nothing?\n" .string "Are you certain?$" +gText_082BCBA6:: @ 82BCBA6 .string "I see. If that’s the case, that’s fine.\n" .string "I thank you for your time.\p" .string "Let us meet again!$" +gText_082BCBFC:: @ 82BCBFC .string "One {STR_VAR_1}?\n" .string "Are you certain?\p" .string "I see. If that’s the case, that’s fine.\n" @@ -11269,6 +11428,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "put it to good use.\p" .string "Let us meet again!$" +gText_082BCCA4:: @ 82BCCA4 .string "No, no, wait a minute.\n" .string "I believe you taught me that before.\p" .string "I would like you to recommend\n" @@ -11277,6 +11437,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my {STR_VAR_2} should hold nothing?\l" .string "Are you certain?$" +gText_082BCD68:: @ 82BCD68 .string "Waah, {PLAYER}!\n" .string "I have a dilemma, sob…\p" .string "I want to begin battling other people,\n" @@ -11287,6 +11448,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If you were me, which of these POKéMON\l" .string "would you send out first?$" +gText_082BCE64:: @ 82BCE64 .string "My {STR_VAR_1} should go first?\n" .string "Waaaaah!\p" .string "Oh! I’m so sorry!\n" @@ -11294,25 +11456,30 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my first POKéMON, and it’s made me cry…\p" .string "Thank you so much!$" +gText_082BCEF2:: @ 82BCEF2 .string "Yay! It’s {PLAYER}!\n" .string "Great! I wanted to ask you something!\p" .string "Um, of my POKéMON, which do you\n" .string "think should go out first?$" +gText_082BCF61:: @ 82BCF61 .string "My {STR_VAR_1}? That’s true.\n" .string "Okay, I’ll do that!\p" .string "Thanks for teaching me!$" +gText_082BCFA1:: @ 82BCFA1 .string "{PLAYER}, hello!\p" .string "I think, in a battle, it’s very important\n" .string "which POKéMON comes out first.\p" .string "Out of the POKéMON that I have,\n" .string "which would be good to send out first?$" +gText_082BD03C:: @ 82BD03C .string "My {STR_VAR_1} goes first?\n" .string "Okay, I got it!\p" .string "See you again!$" +gText_082BD06D:: @ 82BD06D .string "Hello, {PLAYER}…\n" .string "I’m sorry to disturb you again with\l" .string "another question.\p" @@ -11324,6 +11491,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which of my POKéMON should I send\n" .string "out first in a battle?$" +gText_082BD18A:: @ 82BD18A .string "My {STR_VAR_1}?\n" .string "Understood!\p" .string "I can’t believe that you would bother\n" @@ -11331,6 +11499,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I’m so grateful that you would even\n" .string "speak with me… Thank you!$" +gText_082BD222:: @ 82BD222 .string "Oh, {PLAYER}{STRING 5}! It’s me!\n" .string "I’m so glad to see you because I have\l" .string "this little problem.\p" @@ -11341,6 +11510,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "How about deciding just the first\n" .string "POKéMON for me?$" +gText_082BD325:: @ 82BD325 .string "My {STR_VAR_1}? That’s great!\p" .string "Knowing that you made the decision,\n" .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" @@ -11348,6 +11518,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082BD3B1:: @ 82BD3B1 .string "Hi, my teacher {PLAYER}{STRING 5}!\n" .string "I’m busy again today!\p" .string "I have to do some cycling, shopping,\n" @@ -11357,12 +11528,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, how about checking out my team?\n" .string "Which one should go first?$" +gText_082BD493:: @ 82BD493 .string "Okay, gotcha.\n" .string "I have enough time at least to put\l" .string "my {STR_VAR_1} at the head of the line!\p" .string "Whoops, my girlfriend’s waiting!\n" .string "Thanks! See you around!$" +gText_082BD51C:: @ 82BD51C .string "Yoohoo! Hiya, {PLAYER}!\n" .string "You always walk around looking tough!\p" .string "Listen, I need something from you\n" @@ -11372,6 +11545,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which POKéMON of mine should be first\n" .string "to go out in a battle?$" +gText_082BD609:: @ 82BD609 .string "Hmhm!\n" .string "My {STR_VAR_1}, you say!\l" .string "Thanks for a most cool answer!\p" @@ -11380,6 +11554,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082BD697:: @ 82BD697 .string "Thank you so much for stopping to\n" .string "chat with me, {PLAYER}.\p" .string "I know I’m taking advantage of your\n" @@ -11389,12 +11564,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "It would please me if you could decide\n" .string "which POKéMON should come first.$" +gText_082BD797:: @ 82BD797 .string "My {STR_VAR_1} it is!\n" .string "I will put it first right away!\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082BD806:: @ 82BD806 .string "Eek! {PLAYER}!\n" .string "I… I’m overjoyed to see you again!\p" .string "My POKéMON have become much\n" @@ -11405,6 +11582,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please decide which of my POKéMON\n" .string "should go out first!$" +gText_082BD8F5:: @ 82BD8F5 .string "Sigh… I’m overwhelmed with happiness…\p" .string "It’s like a dream having you decide\n" .string "for me, {PLAYER}.\p" @@ -11413,6 +11591,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I hope you’ll be willing to teach me\n" .string "some more another time.$" +gText_082BD9BE:: @ 82BD9BE .string "Hello, hello!\n" .string "My mentor, {PLAYER}{STRING 5}!\l" .string "Hit me with your sage advice today!\p" @@ -11425,12 +11604,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Don’t be shy now.\n" .string "Let’s blurt it out!$" +gText_082BDAE1:: @ 82BDAE1 .string "Uh-huh, my {STR_VAR_1} leads off!\n" .string "OK, A-OK!\l" .string "I’ll reorder the lineup, like, wham!\p" .string "All right, thanks, as always!\n" .string "Adios!$" +gText_082BDB4E:: @ 82BDB4E .string "{PLAYER}{STRING 5}, listen!\n" .string "It’s a crisis!\p" .string "My POKéMON, all three of them, go into\n" @@ -11443,6 +11624,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So, how about deciding for me which\n" .string "POKéMON should go first, master?$" +gText_082BDC6B:: @ 82BDC6B .string "Okay, so it’s my {STR_VAR_1} you chose?\n" .string "I’ll let any but that one go first!\p" .string "Just kidding!\n" @@ -11450,6 +11632,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082BDD0D:: @ 82BDD0D .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" .string "The rappin’ SAILOR am I!\n" @@ -11460,11 +11643,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Out of this lot, which should go first\n" .string "as the first on the spot?$" +gText_082BDDEC:: @ 82BDDEC .string "Okay, I hear you, sure I do!\n" .string "I’ll switch them up, that I’ll do!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082BDE68:: @ 82BDE68 .string "Yahoo, {PLAYER}!\n" .string "How do you do?\p" .string "What should I do? Go ahead and ask?\n" @@ -11475,12 +11660,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "POKéMON is the first to ride!\l" .string "Into battle, I mean to say.$" +gText_082BDF4D:: @ 82BDF4D .string "My {STR_VAR_1}? Yes!\n" .string "That’ll do, there’s no distress!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082BDFD8:: @ 82BDFD8 .string "…Oof…ooch… {PLAYER}{STRING 5}…\n" .string "My stomach’s hurting all of a sudden…\p" .string "…It’s getting better now…\p" @@ -11492,6 +11679,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}{STRING 5}, which of my POKéMON should\n" .string "go first? So I’d win, I mean.$" +gText_082BE0FD:: @ 82BE0FD .string "Hm, all right.\n" .string "My {STR_VAR_1} goes first.\p" .string "I’ll fix the lineup like that after\n" @@ -11499,6 +11687,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I hope I can keep hitting you up\n" .string "for help like this.$" +gText_082BE189:: @ 82BE189 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}?\p" .string "Please, don’t look at me that way.\n" @@ -11511,6 +11700,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which POKéMON should I send out first\n" .string "so I at least look capable?$" +gText_082BE2A5:: @ 82BE2A5 .string "Oh… Okay!\n" .string "I’ll lead with my {STR_VAR_1}.\p" .string "I hope I can do my best without\n" @@ -11519,6 +11709,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082BE33E:: @ 82BE33E .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really?\l" .string "Perhaps you’re a clever look-alike?\p" @@ -11530,6 +11721,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I would like you to tell me which one\l" .string "should go first in a battle.$" +gText_082BE46C:: @ 82BE46C .string "My {STR_VAR_1}…\n" .string "You aren’t pulling my leg?\p" .string "I see. If that’s the case, that’s fine.\n" @@ -11538,6 +11730,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my best.\p" .string "Let us meet again!$" +gText_082BE50D:: @ 82BE50D .string "Snivel…\n" .string "Oh, {PLAYER}!\p" .string "What perfect timing!\n" @@ -11549,6 +11742,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}, which do you think will give\n" .string "even me a chance at winning?$" +gText_082BE5F5:: @ 82BE5F5 .string "Snivel… I… I understand!\n" .string "Oh! I’m so sorry!\l" .string "You’ve made me so happy, I’m crying…\p" @@ -11556,6 +11750,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_1}!\p" .string "Thank you so much!$" +gText_082BE679:: @ 82BE679 .string "Yay! It’s {PLAYER}!\n" .string "Yay, you came at the right time, too!\l" .string "I need your advice again!\p" @@ -11564,10 +11759,12 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which do you think I should raise,\n" .string "{PLAYER}?$" +gText_082BE71E:: @ 82BE71E .string "Oh, so my {STR_VAR_1} is better!\n" .string "Okay, I’ll do that!\p" .string "Thanks for teaching me!$" +gText_082BE762:: @ 82BE762 .string "{PLAYER}, hello!\n" .string "I have a question I wanted to ask.\p" .string "I’m in a dilemma over whether I should\n" @@ -11575,12 +11772,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which POKéMON do you think will\n" .string "be stronger?$" +gText_082BE7F8:: @ 82BE7F8 .string "{STR_VAR_1} is your choice?\n" .string "Okay, I got it!\p" .string "I’ll go catch a strong {STR_VAR_1}\n" .string "right away!\p" .string "See you again!$" +gText_082BE850:: @ 82BE850 .string "Hello, {PLAYER}…\p" .string "Um, you’ve probably already forgotten\n" .string "about someone like me…\p" @@ -11594,6 +11793,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}, you probably don’t want to\n" .string "bother, but please decide for me.$" +gText_082BE99C:: @ 82BE99C .string "But will a wild {STR_VAR_1} even pay\n" .string "attention to me?\p" .string "I will try!\p" @@ -11601,6 +11801,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "No! I’ll do my best!\p" .string "Thank you!$" +gText_082BEA1B:: @ 82BEA1B .string "Oh, {PLAYER}{STRING 5}! I’m so glad to see you!\n" .string "I was about to go looking for you!\p" .string "Can you decide what kind of POKéMON\n" @@ -11611,6 +11812,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which one do you think would be\n" .string "better?$" +gText_082BEAE9:: @ 82BEAE9 .string "{STR_VAR_1}? That’s great!\p" .string "Knowing that you made the decision,\n" .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" @@ -11618,6 +11820,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082BEB72:: @ 82BEB72 .string "If it isn’t {PLAYER}{STRING 5}! How’s it going?\n" .string "I’m busy again as always!\p" .string "I want to do good with POKéMON, too,\n" @@ -11628,12 +11831,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}{STRING 5}, give me some of your good\n" .string "advice! Which one’d be good for me?$" +gText_082BEC8E:: @ 82BEC8E .string "Okay, gotcha.\n" .string "I’ll find time somehow and catch me\l" .string "that {STR_VAR_1} you recommended.\p" .string "I’m glad I met a good mentor in you.\n" .string "Thanks! See you around!$" +gText_082BED16:: @ 82BED16 .string "Oh!\n" .string "Yay, it’s {PLAYER}!\p" .string "I didn’t waste any time boasting to\n" @@ -11646,6 +11851,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "and the choices were one {STR_VAR_1}\l" .string "or {STR_VAR_2}, which should it be?$" +gText_082BEE29:: @ 82BEE29 .string "Ahhh!\n" .string "{STR_VAR_1}, you say!\l" .string "Thanks for a most cool answer!\p" @@ -11654,6 +11860,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082BEEB4:: @ 82BEEB4 .string "Oh, is it you, {PLAYER}?\n" .string "I’m delighted to see you again!\p" .string "Ever since I became your apprentice,\n" @@ -11666,12 +11873,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_1} or {STR_VAR_2}…\l" .string "Which POKéMON is right for me?$" +gText_082BEFE2:: @ 82BEFE2 .string "One {STR_VAR_1} it is!\n" .string "I will find one right away!\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082BF04E:: @ 82BF04E .string "Eek! {PLAYER}! I met you again!\n" .string "I… I’m overjoyed!\p" .string "Oh-oh-oh, I know!\n" @@ -11681,12 +11890,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please decide which would be better,\n" .string "{STR_VAR_1} or {STR_VAR_2}!$" +gText_082BF11D:: @ 82BF11D .string "Wow! You decided for me!\n" .string "One {STR_VAR_1} is what I’ll raise to\l" .string "the best of my ability.\p" .string "I hope you’ll be willing to teach me\n" .string "some more another time.$" +gText_082BF1A8:: @ 82BF1A8 .string "Hey, hey!\n" .string "My mentor, {PLAYER}{STRING 5}!\p" .string "Hello, I’ve been looking for you\n" @@ -11696,12 +11907,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Don’t be shy now.\n" .string "Let’s blurt it out!$" +gText_082BF268:: @ 82BF268 .string "Uh-huh, one {STR_VAR_1} it is!\n" .string "OK, A-OK!\l" .string "I’ll get one in a BALL, like, cram!\p" .string "All right, thanks, as always!\n" .string "Adios!$" +gText_082BF2D1:: @ 82BF2D1 .string "{PLAYER}{STRING 5}, listen! Big news!\n" .string "I caught a mirage POKéMON!\p" .string "Of course I’m lying!\n" @@ -11715,6 +11928,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which would be better?\n" .string "{STR_VAR_1} or {STR_VAR_2}?$" +gText_082BF3CF:: @ 82BF3CF .string "Okay, so it’s {STR_VAR_1} you chose?\n" .string "I’ll grab the other kind, then!\p" .string "Just kidding!\n" @@ -11722,6 +11936,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082BF46A:: @ 82BF46A .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" .string "The rappin’ SAILOR am I!\n" @@ -11732,11 +11947,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_1} and {STR_VAR_2}, you see.\l" .string "Which is the one to catch for me?$" +gText_082BF551:: @ 82BF551 .string "{STR_VAR_1}, you say, hey, hey!\n" .string "I’ll go get me one right away!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082BF5C3:: @ 82BF5C3 .string "Oh, wow, if it isn’t {PLAYER}!\p" .string "What should I do? Get your advice?\n" .string "Why not? I’m already talking to you!\p" @@ -11748,12 +11965,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "It’s either {STR_VAR_1} or {STR_VAR_2}.\l" .string "Which do you choose?$" +gText_082BF6E5:: @ 82BF6E5 .string "If that {STR_VAR_1} is the best,\n" .string "I’ll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082BF773:: @ 82BF773 .string "Oh, hi, {PLAYER}{STRING 5}…\n" .string "I have this horrible headache…\p" .string "I must’ve worried too much about\n" @@ -11764,11 +11983,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "the POKéMON {STR_VAR_1} and\l" .string "{STR_VAR_2}, which should it be?$" +gText_082BF869:: @ 82BF869 .string "Hm, one {STR_VAR_1}, all right.\n" .string "I’ll go look for one when I get better.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" +gText_082BF8DD:: @ 82BF8DD .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…?\p" .string "Please, don’t look at me that way.\n" @@ -11779,6 +12000,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If the choices were {STR_VAR_1} or\n" .string "{STR_VAR_2}, which would be better?$" +gText_082BF9BA:: @ 82BF9BA .string "Oh… Okay!\n" .string "I’ll do my best with one {STR_VAR_1}.\p" .string "I hope I can do my best without\n" @@ -11787,6 +12009,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082BFA5A:: @ 82BFA5A .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really real?\p" .string "No, no, if you are real, it’s fine.\n" @@ -11797,6 +12020,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_1} and {STR_VAR_2}, which is\l" .string "more worthy of me?$" +gText_082BFB4E:: @ 82BFB4E .string "{STR_VAR_1}?\n" .string "Are you certain?\p" .string "I see. If that’s the case, that’s fine.\n" @@ -11805,6 +12029,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "handle with aplomb.\p" .string "Let us meet again!$" +gText_082BFBF2:: @ 82BFBF2 .string "Waaah! Oh, {PLAYER}!\n" .string "Snivel… Hiccup…\p" .string "I have a dilemma!\n" @@ -11816,6 +12041,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "be the better choice: {STR_VAR_2}\l" .string "or {STR_VAR_3}?$" +gText_082BFCAE:: @ 82BFCAE .string "{STR_VAR_1}?\n" .string "Waaaaah!\p" .string "Oh! I’m so sorry, {PLAYER}!\n" @@ -11824,6 +12050,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Snivel…\n" .string "Thank you so much!$" +gText_082BFD26:: @ 82BFD26 .string "Yay! Hi, {PLAYER}!\n" .string "I need your advice again!\p" .string "I want to teach my {STR_VAR_1}\n" @@ -11832,11 +12059,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_2} or {STR_VAR_3}.\l" .string "What’s your recommendation?$" +gText_082BFDB1:: @ 82BFDB1 .string "{STR_VAR_1} is better? I guess so!\n" .string "Okay, I’ll go with that!\p" .string "If we meet here again, please teach\n" .string "me something else, teacher!$" +gText_082BFE24:: @ 82BFE24 .string "{PLAYER}, hello!\n" .string "It’s about my {STR_VAR_1}, but I’m\l" .string "worried about its moves.\p" @@ -11845,12 +12074,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which is stronger and better for\n" .string "my {STR_VAR_1}?$" +gText_082BFEAD:: @ 82BFEAD .string "{STR_VAR_1} is your choice?\n" .string "Okay, I got it!\p" .string "I’ll go teach {STR_VAR_1} to\n" .string "my POKéMON right away!\p" .string "See you again!$" +gText_082BFF0A:: @ 82BFF0A .string "Ohhh, {PLAYER}…\n" .string "I’m hopeless, no, really!\p" .string "I’ve decided to raise a POKéMON,\n" @@ -11864,12 +12095,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If you could even choose between\n" .string "{STR_VAR_2} and {STR_VAR_3}…$" +gText_082C0032:: @ 82C0032 .string "I understand!\p" .string "But will it even be willing to learn\n" .string "{STR_VAR_1} for me…\l" .string "No! I’ll do my best!\p" .string "Thank you!$" +gText_082C0090:: @ 82C0090 .string "Oh, {PLAYER}{STRING 5}!\n" .string "I was just hoping to see you, too!\p" .string "I was wondering what move would\n" @@ -11880,6 +12113,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_2} and {STR_VAR_3}?\l" .string "Which one would be better?$" +gText_082C016E:: @ 82C016E .string "{STR_VAR_1}? That’s great!\p" .string "Knowing that you made the decision,\n" .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" @@ -11887,6 +12121,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Okay, I’ll look to you for advice again.\n" .string "Bye!$" +gText_082C01F7:: @ 82C01F7 .string "How could things be this busy?\n" .string "Hey, if it isn’t {PLAYER}{STRING 5}!\l" .string "How’s it going?\p" @@ -11900,12 +12135,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}{STRING 5}, give me some of your good\n" .string "advice! Which move’d be good for me?$" +gText_082C034C:: @ 82C034C .string "Okay, gotcha.\n" .string "I’ll make room in my schedule and\l" .string "teach that move.\p" .string "I’m glad I met a good mentor in you.\n" .string "Thanks! See you around!$" +gText_082C03CA:: @ 82C03CA .string "Oh! Lucky!\n" .string "I met you again, {PLAYER}!\l" .string "I need to tap your mind again today.\p" @@ -11915,6 +12152,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "best suited, {STR_VAR_2} or\l" .string "{STR_VAR_3}?$" +gText_082C046E:: @ 82C046E .string "Ahhh!\n" .string "{STR_VAR_1}, you say!\l" .string "Thanks for a most cool answer!\p" @@ -11923,6 +12161,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Let’s meet here again, okay?\n" .string "Thanks!$" +gText_082C04F9:: @ 82C04F9 .string "Oh, hello, {PLAYER}.\n" .string "I trust you’ve been well?\p" .string "I have to seek your advice again.\n" @@ -11931,12 +12170,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my lovable {STR_VAR_1}?\l" .string "{STR_VAR_2} or {STR_VAR_3}?$" +gText_082C0598:: @ 82C0598 .string "{STR_VAR_1} it is!\n" .string "I will teach that right away!\p" .string "Thank you, {PLAYER}.\n" .string "I hope I can count on you again.\l" .string "Please take care!$" +gText_082C0602:: @ 82C0602 .string "Eek! {PLAYER}! I met you again!\n" .string "I… I’m overjoyed!\p" .string "Whenever I’m in need, you’re always\n" @@ -11948,12 +12189,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which move would be better,\n" .string "{STR_VAR_2} or {STR_VAR_3}?$" +gText_082C06D8:: @ 82C06D8 .string "Oh-oh-oh! Thank you!\n" .string "{STR_VAR_1} is it!\l" .string "Perfectly understood!\p" .string "I hope you’ll be willing to teach me\n" .string "some more another time.$" +gText_082C074A:: @ 82C074A .string "Hola, {PLAYER}{STRING 5}, bueno!\n" .string "I’m hoping for some more of\l" .string "your sage advice today!\p" @@ -11964,12 +12207,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Would it be {STR_VAR_2}?\n" .string "Or {STR_VAR_3}?$" +gText_082C0809:: @ 82C0809 .string "Uh-huh, {STR_VAR_1} it is!\n" .string "Si, bueno!\l" .string "I’ll get it taught, like, ka-blam!\p" .string "All right, thanks, as always!\n" .string "Adios!$" +gText_082C086E:: @ 82C086E .string "{PLAYER}{STRING 5}, it’s completely wild!\p" .string "My POKéMON!\n" .string "It learned six moves!\p" @@ -11983,6 +12228,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_2} or {STR_VAR_3}--which\n" .string "would go with my {STR_VAR_1} best?$" +gText_082C0982:: @ 82C0982 .string "Okay, so it’s {STR_VAR_1} you chose?\n" .string "I’ll choose another move, then!\p" .string "Just kidding!\n" @@ -11990,6 +12236,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks, master!\n" .string "I hope you’ll keep teaching me!$" +gText_082C0A1D:: @ 82C0A1D .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" .string "The rappin’ SAILOR am I!\n" @@ -12000,11 +12247,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "the moves. What would be the best\l" .string "for my {STR_VAR_1} so it grooves?$" +gText_082C0AFD:: @ 82C0AFD .string "{STR_VAR_1}, you say, hey, hey!\n" .string "I’ll go teach that right away!\p" .string "If it’s advice I ever need,\n" .string "{PLAYER}, your word I’ll always heed!$" +gText_082C0B6F:: @ 82C0B6F .string "Oh, yeahah, if it isn’t {PLAYER}!\p" .string "What should I do? Get your advice?\n" .string "Why not? I’m already talking to you!\p" @@ -12016,12 +12265,14 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "It’s {STR_VAR_2} or {STR_VAR_3},\l" .string "what do you choose?$" +gText_082C0C7D:: @ 82C0C7D .string "If that {STR_VAR_1} is the best,\n" .string "I’ll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" .string "but don’t you forget about me.\p" .string "See you again, my smart friend!$" +gText_082C0D0B:: @ 82C0D0B .string "Gahack! Gaah! Oh, {PLAYER}{STRING 5}…\n" .string "I have this lousy cold, I do…\p" .string "I want to pick a move for my POKéMON,\n" @@ -12032,11 +12283,13 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{STR_VAR_2} and {STR_VAR_3} for\l" .string "my {STR_VAR_1}, which would it be?$" +gText_082C0DFE:: @ 82C0DFE .string "Hm, {STR_VAR_1}, all right. Cough!\n" .string "I’ll go teach it when I get better.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" +gText_082C0E71:: @ 82C0E71 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…?\p" .string "Please, don’t look at me that way.\n" @@ -12049,6 +12302,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If the choices were {STR_VAR_2} or\l" .string "{STR_VAR_3}, which would be better?$" +gText_082C0F6D:: @ 82C0F6D .string "Oh… Okay!\n" .string "I’ll try that {STR_VAR_1}.\p" .string "I hope I can teach that move…\n" @@ -12057,6 +12311,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If we meet again, I hope you will be\l" .string "as helpful.$" +gText_082C1003:: @ 82C1003 .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really real?\p" .string "Perhaps you’re one of those popular\n" @@ -12069,6 +12324,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Which move would be better for it to\n" .string "use, {STR_VAR_2} or {STR_VAR_3}?$" +gText_082C1122:: @ 82C1122 .string "{STR_VAR_1}?\n" .string "There’s no question about that?\p" .string "I see. If that’s the case, that’s fine.\n" @@ -12077,6 +12333,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "my POKéMON can learn.\p" .string "Let us meet again!$" +gText_082C11D1:: @ 82C11D1 .string "Oh… {PLAYER}?\n" .string "It is {PLAYER}!\l" .string "Oh! Sniff…sob… Please, listen!\p" @@ -12088,6 +12345,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Could you maybe teach me something\l" .string "cool to say when I win so I don’t cry?$" +gText_082C12D5:: @ 82C12D5 .string "{STR_VAR_1}\p" .string "Awesome! Wicked! Awoooh!\n" .string "It’s really cool!\p" @@ -12100,6 +12358,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "{PLAYER}…\n" .string "Next time… We should battle!$" +gText_082C13AB:: @ 82C13AB .string "Yay! It’s {PLAYER}! Hello!\n" .string "I wanted to ask you something!\p" .string "I want to say something cool when\n" @@ -12107,6 +12366,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Do you have a cool saying that\n" .string "you could recommend?$" +gText_082C1444:: @ 82C1444 .string "{STR_VAR_1}\p" .string "Oh, wow! That is so cool!\n" .string "Okay, I’ll say that!\p" @@ -12116,6 +12376,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "When we meet again, it’ll be for\n" .string "a battle!$" +gText_082C1501:: @ 82C1501 .string "{PLAYER}, hello!\p" .string "My POKéMON and I are ready for\n" .string "anything, except for one thing.\p" @@ -12124,6 +12385,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Could you think up something good\n" .string "to say?$" +gText_082C15B6:: @ 82C15B6 .string "{STR_VAR_1}\p" .string "…Cool!\n" .string "I will use that!\p" @@ -12134,6 +12396,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Next time, let’s meet at a place\n" .string "of battle!$" +gText_082C165E:: @ 82C165E .string "Hello, {PLAYER}…\n" .string "I’m sorry to bug you, but I’m hopeless…\p" .string "Even when…\n" @@ -12145,6 +12408,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please, {PLAYER}, what should I say\n" .string "if I win a battle?$" +gText_082C174F:: @ 82C174F .string "{STR_VAR_1}\p" .string "That’s inspired…\p" .string "Uh… Is it okay for someone like me\n" @@ -12157,6 +12421,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "someone like me, but let’s meet\l" .string "somewhere again!$" +gText_082C1862:: @ 82C1862 .string "Oh, {PLAYER}{STRING 5}.\n" .string "There’s something I want you to hear.\p" .string "I know that I don’t always sound\n" @@ -12169,6 +12434,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "But I can’t think of anything good!\n" .string "Could you think something up for me?$" +gText_082C19A0:: @ 82C19A0 .string "{STR_VAR_1}\p" .string "Not bad!\n" .string "Yup, that’s what I’ll go with!\p" @@ -12180,6 +12446,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Next time, we battle, okay?\n" .string "See you!$" +gText_082C1A76:: @ 82C1A76 .string "Oh, I can’t get over how busy I am!\n" .string "Oh, hey, I was looking for you, {PLAYER}{STRING 5}.\p" .string "Are you well as usual?\n" @@ -12193,6 +12460,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "underline my coolness when I’m done\l" .string "and walking away? {PLAYER}{STRING 5}, help me!$" +gText_082C1C16:: @ 82C1C16 .string "{STR_VAR_1}\p" .string "Okay, gotcha.\n" .string "I can find time to say that!\p" @@ -12203,6 +12471,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thanks for everything, {PLAYER}{STRING 5}!\n" .string "We have to battle, you and me, one day!$" +gText_082C1CF5:: @ 82C1CF5 .string "I lucked out again!\n" .string "{PLAYER}! Am I glad to see you!\l" .string "Like usual, I need your advice!\p" @@ -12212,6 +12481,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "it with a cool flourish, what\l" .string "should I say?$" +gText_082C1DC1:: @ 82C1DC1 .string "{STR_VAR_1}\p" .string "That… That’s fabulous!\n" .string "It’s dignified and cool! I claim it!\p" @@ -12224,6 +12494,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "we battle!\p" .string "Thank you for everything!$" +gText_082C1EDC:: @ 82C1EDC .string "Oh, {PLAYER}.\n" .string "I’m so glad I met you!\p" .string "I no longer have any concerns with\n" @@ -12236,6 +12507,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Please, what should I say when\n" .string "I win a battle?$" +gText_082C1FEC:: @ 82C1FEC .string "{STR_VAR_1}\p" .string "Ah! That saying! It refreshes me\n" .string "and makes me feel reborn!\p" @@ -12247,6 +12519,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Perhaps one day…\n" .string "Farewell!$" +gText_082C20D1:: @ 82C20D1 .string "Eek! I spotted {PLAYER}!\n" .string "I… I’m overjoyed to see you!\p" .string "Oh-oh-oh! There’s something I just\n" @@ -12258,6 +12531,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "So now, {PLAYER}, please, I want you to\n" .string "think up an exit line for when I win!$" +gText_082C21FF:: @ 82C21FF .string "{STR_VAR_1}\p" .string "Waaaaah!\n" .string "I’m going to say that?!\l" @@ -12271,6 +12545,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I’ve got to go now, but let’s meet\n" .string "in battle one day!$" +gText_082C231C:: @ 82C231C .string "Hola, bueno!\n" .string "{PLAYER}{STRING 5}!\p" .string "You know, I’m getting the itch to roam\n" @@ -12281,6 +12556,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "be a good boast I could say to my\l" .string "fallen TRAINER opponent?$" +gText_082C2407:: @ 82C2407 .string "{STR_VAR_1}\p" .string "Uh-huh, that’s sweet!\n" .string "Si, bueno!\l" @@ -12290,6 +12566,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Give me a battle one day, OK?\n" .string "Adios!$" +gText_082C24B5:: @ 82C24B5 .string "{PLAYER}{STRING 5}, there’s big trouble!\p" .string "When I win a battle, I brag about it\n" .string "for an hour at least!\p" @@ -12301,6 +12578,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I should say after winning a battle,\l" .string "master?$" +gText_082C25B1:: @ 82C25B1 .string "{STR_VAR_1}\p" .string "That’s what I should say, huh?\n" .string "Then, I’ll stay away from that!\p" @@ -12316,6 +12594,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "That’s all!\n" .string "Farewell, my master!$" +gText_082C2707:: @ 82C2707 .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" .string "The rappin’ SAILOR am I!\n" @@ -12326,6 +12605,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "If I win a match, what can I say\n" .string "in a real cool way?$" +gText_082C27D4:: @ 82C27D4 .string "{STR_VAR_1}\p" .string "Perfect! That’s what I’ll use.\n" .string "I was right to make you choose!\p" @@ -12337,6 +12617,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "And that spells bon voyage,\l" .string "to you this is my homage!$" +gText_082C28D6:: @ 82C28D6 .string "Oh, yeah, {PLAYER}!\n" .string "I found you again today!\p" .string "What should I do? Ask you again?\n" @@ -12350,6 +12631,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "a battle ends well.\p" .string "Come on, I wanna hear you say it!$" +gText_082C2A0B:: @ 82C2A0B .string "{STR_VAR_1}\p" .string "All right, all right!\n" .string "I’ll use that because it’s so tight!\p" @@ -12363,6 +12645,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Take care, {PLAYER}!\n" .string "Love ya!$" +gText_082C2B50:: @ 82C2B50 .string "{PLAYER}{STRING 5}, I’m finished…\n" .string "My nose won’t stop dripping…\p" .string "I was trying to think up something\n" @@ -12374,6 +12657,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "When I win a battle,\n" .string "what should I say?$" +gText_082C2C77:: @ 82C2C77 .string "{STR_VAR_1}\p" .string "… … …That’s good.\n" .string "No, it’s awe inspiring!\l" @@ -12385,6 +12669,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "From now on, we’re rivals!\n" .string "Thanks for everything!$" +gText_082C2D67:: @ 82C2D67 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…\p" .string "Please, don’t look at me that way.\n" @@ -12395,6 +12680,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "but what if I win a battle?\l" .string "What should I say?$" +gText_082C2E41:: @ 82C2E41 .string "{STR_VAR_1}\p" .string "Oh… Okay!\n" .string "I’ll try to say that!\l" @@ -12404,6 +12690,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "I’ll obey all that you’ve taught me,\n" .string "{PLAYER}{STRING 5}, and do the best I can.$" +gText_082C2EF5:: @ 82C2EF5 .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really?\l" .string "Perhaps a clever {PLAYER} DOLL?\p" @@ -12416,6 +12703,7 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "More precisely, what should I say\n" .string "if I win a battle?$" +gText_082C3023:: @ 82C3023 .string "{STR_VAR_1}\p" .string "… … … … … …\n" .string "When I win a match…\p" @@ -14325,77 +14613,105 @@ EventScript_TestSignpostMsg:: @ 82C8436 msgbox Text_ThisIsATestSignpostMsg, 3 end +gText_082C843F:: @ 82C843F .string "It’s very disappointing…$" +gText_082C8458:: @ 82C8458 .string "Okay, I understand…$" +gText_082C846C:: @ 82C846C .string "I’m terribly sorry…$" +gText_082C8480:: @ 82C8480 .string "Thank you…$" +gText_082C848B:: @ 82C848B .string "Ahahaha! Aren’t you embarrassed?\n" .string "Everyone’s watching!$" +gText_082C84C1:: @ 82C84C1 .string "Grr…\n" .string "What the…$" +gText_082C84D0:: @ 82C84D0 .string "My DOME ACE title isn’t just for show!$" +gText_082C84F7:: @ 82C84F7 .string "Ahahaha!\n" .string "You’re inspiring!$" +gText_082C8512:: @ 82C8512 .string "Way to work!\n" .string "That was a good lesson, eh?$" +gText_082C853B:: @ 82C853B .string "Good job!\n" .string "You know what you’re doing!$" +gText_082C8561:: @ 82C8561 .string "Hey, hey, hey!\n" .string "You’re finished already?$" +gText_082C8589:: @ 82C8589 .string "What happened here?$" +gText_082C859D:: @ 82C859D .string "Humph…$" +gText_082C85A4:: @ 82C85A4 .string "Urk…$" +gText_082C85A9:: @ 82C85A9 .string "Hah!$" +gText_082C85AE:: @ 82C85AE .string "Darn!$" +gText_082C85B4:: @ 82C85B4 .string "Oh, come on!\n" .string "You have to try harder than that!$" +gText_082C85E3:: @ 82C85E3 .string "No way!\n" .string "Good job!$" +gText_082C85F5:: @ 82C85F5 .string "Heheh!\n" .string "What did you expect?$" +gText_082C8611:: @ 82C8611 .string "Huh?\n" .string "Are you serious?!$" +gText_082C8628:: @ 82C8628 .string "Your POKéMON are wimpy because\n" .string "you’re wimpy as a TRAINER!$" +gText_082C8662:: @ 82C8662 .string "Ah…\n" .string "Now this is something else…$" +gText_082C8682:: @ 82C8682 .string "Gwahahaha!\n" .string "My brethren, we have nothing to fear!$" +gText_082C86B3:: @ 82C86B3 .string "Gwah!\n" .string "Hahahaha!$" +gText_082C86C3:: @ 82C86C3 .string "Hey! What’s wrong with you!\n" .string "Let’s see some effort! Get up!$" +gText_082C86FE:: @ 82C86FE .string "That’s it! You’ve done great!\n" .string "You’ve worked hard for this!$" +gText_082C8739:: @ 82C8739 .string "Hey! Don’t you give up now!\n" .string "Get up! Don’t lose faith in yourself!$" +gText_082C877B:: @ 82C877B .string "That’s it! You’ve done it!\n" .string "You kept working for this!$" diff --git a/data/field_specials.s b/data/field_specials.s new file mode 100644 index 000000000..8f9734a01 --- /dev/null +++ b/data/field_specials.s @@ -0,0 +1,547 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .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/fldeff_flash.s b/data/fldeff_flash.s new file mode 100644 index 000000000..3c3071b37 --- /dev/null +++ b/data/fldeff_flash.s @@ -0,0 +1,81 @@ + .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 +gCaveTransitionPalette_White:: @ 85B2850 + .incbin "graphics/misc/cave_transition_white.gbapal" + + .align 2 +gCaveTransitionPalette_Black:: @ 85B2870 + .incbin "graphics/misc/cave_transition_black.gbapal" + + .align 2 +gUnknown_085B2890:: @ 85B2890 + .incbin "graphics/misc/85B2890.gbapal" + + .align 2 +gUnknown_085B28A0:: @ 85B28A0 + .incbin "graphics/misc/85B28A0.gbapal" + + .align 2 +gCaveTransitionTilemap:: @ 85B28B0 + .incbin "graphics/misc/cave_transition_map.bin.lz" + + .align 2 +gCaveTransitionTiles:: @ 85B2A90 + .incbin "graphics/misc/cave_transition.4bpp.lz" diff --git a/data/graphics.s b/data/graphics.s index aebe35093..ff1034587 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -20,7 +20,7 @@ gUnknown_08C01644:: @ 8C01644 gUnknown_08C01724:: @ 8C01724 .incbin "baserom.gba", 0xc01724, 0x18 - + .align 2 gInterfaceGfx_PokeBall:: .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC @@ -120,29 +120,29 @@ gInterfacePal_PremierBall:: gOpenPokeballGfx:: @ 8C02300 .incbin "baserom.gba", 0xc02300, 0x7c -gUnknown_08C0237C:: @ 8C0237C +gBlankGfxCompressed:: @ 8C0237C .incbin "baserom.gba", 0xc0237c, 0x7074 gUnknown_08C093F0:: @ 8C093F0 .incbin "baserom.gba", 0xc093f0, 0x87ac - .align 2 + .align 2 gBattleInterface_BallStatusBarPal:: @ 8C11B9C .incbin "graphics/battle_interface/ball_status_bar.gbapal" - .align 2 + .align 2 gBattleInterface_BallDisplayPal:: @ 8C11BBC .incbin "graphics/battle_interface/ball_display.gbapal" - .align 2 + .align 2 gHealthboxElementsGfxTable:: @ 8C11BDC .incbin "baserom.gba", 0xc11bdc, 0x840 - .align 2 + .align 2 gBattleInterface_BallDisplayGfx:: @ 8C1241C .incbin "graphics/battle_interface/ball_display.4bpp" - .align 2 + .align 2 gUnknown_08C1249C:: @ 8C1249C .incbin "baserom.gba", 0xc1249c, 0x49f4 @@ -162,7 +162,19 @@ gUnknown_08C17AB0:: @ 8C17AB0 .incbin "baserom.gba", 0xc17ab0, 0xa5c gUnknown_08C1850C:: @ 8C1850C - .incbin "baserom.gba", 0xc1850c, 0x107c + .incbin "baserom.gba", 0xc1850c, 0xc5c + +gUnknown_08C19168:: @ 8C19168 + .incbin "baserom.gba", 0xc19168, 0x11c + +gContestJudgeSymbolsGfx:: @ 8C19284 + .incbin "baserom.gba", 0xc19284, 0x1a4 + +gContest3Pal:: @ 8C19428 + .incbin "baserom.gba", 0xc19428, 0x28 + +gUnknown_08C19450:: @ 8C19450 + .incbin "baserom.gba", 0xc19450, 0x138 gUnknown_08C19588:: @ 8C19588 .incbin "baserom.gba", 0xc19588, 0x964 @@ -183,7 +195,10 @@ gUnknown_08C1A490:: @ 8C1A490 .incbin "baserom.gba", 0xc1a490, 0xD4 gUnknown_08C1A564:: @ 8C1A564 - .incbin "baserom.gba", 0xc1a564, 0x2154 + .incbin "baserom.gba", 0xc1a564, 0x1E80 + +gContestJudgeGfx:: @ 8C1C3E4 + .incbin "baserom.gba", 0xc1c3e4, 0x2d4 gUnknown_08C1C6B8:: @ 8C1C6B8 .incbin "baserom.gba", 0xc1c6b8, 0x9f4 @@ -253,28 +268,28 @@ gSubstituteDollGfx:: @ 8C2CEE0 gSubstituteDollTilemap:: @ 8C2D120 .incbin "baserom.gba", 0xc2d120, 552 - + gUnknown_08C2D348:: @ 8C2D348 .incbin "baserom.gba", 0xC2D348, 196 - + gUnknown_08C2D40C:: @ 8C2D40C .incbin "baserom.gba", 0xC2D40C, 28 - + gContestConfetti_Gfx:: @ 8C2D428 .incbin "baserom.gba", 0xC2D428, 288 - + gContestConfetti_Pal:: @ 8C2D548 .incbin "baserom.gba", 0xC2D548, 40 - + gUnknown_08C2D570:: @ 8C2D570 .incbin "baserom.gba", 0xC2D570, 316 - + gUnknown_08C2D6AC:: @ 8C2D6AC .incbin "baserom.gba", 0xC2D6AC, 36 - + gUnknown_08C2D6D0:: @ 8C2D6D0 .incbin "baserom.gba", 0xC2D6D0, 40 - + gUnknown_08C2D6F8:: @ 8C2D6F8 .incbin "baserom.gba", 0xC2D6F8, 40 @@ -569,7 +584,10 @@ gUnknown_08D84970:: @ 8D84970 .incbin "baserom.gba", 0xd84970, 0x590 gUnknown_08D84F00:: @ 8D84F00 - .incbin "baserom.gba", 0xd84f00, 0x458 + .incbin "baserom.gba", 0xd84f00, 0x158 + +gUnknown_08D85058:: @ 8D85058 + .incbin "baserom.gba", 0xd85058, 0x300 gUnknown_08D85358:: @ 8D85358 .incbin "baserom.gba", 0xd85358, 0xec @@ -578,7 +596,10 @@ gUnknown_08D85444:: @ 8D85444 .incbin "baserom.gba", 0xd85444, 0x84 gUnknown_08D854C8:: @ 8D854C8 - .incbin "baserom.gba", 0xd854c8, 0x120 + .incbin "baserom.gba", 0xd854c8, 0x20 + +gUnknown_08D854E8:: @ 8D854E8 + .incbin "baserom.gba", 0xd854E8, 0x100 gUnknown_08D855E8:: @ 8D855E8 .incbin "baserom.gba", 0xd855e8, 0x18 @@ -751,16 +772,25 @@ gUnknown_08D8D58C:: @ 8D8D58C .incbin "baserom.gba", 0xd8d58c, 0x52c gUnknown_08D8DAB8:: @ 8D8DAB8 - .incbin "baserom.gba", 0xd8dab8, 0xefc + .incbin "baserom.gba", 0xd8dab8, 0xe84 + +gContestNextTurnGfx:: @ 8D8E93C + .incbin "baserom.gba", 0xd8e93c, 0x78 gUnknown_08D8E9B4:: @ 8D8E9B4 .incbin "baserom.gba", 0xd8e9b4, 0x80 gUnknown_08D8EA34:: @ 8D8EA34 - .incbin "baserom.gba", 0xd8ea34, 0x1f0 + .incbin "baserom.gba", 0xd8ea34, 0xb0 + +gContestApplauseGfx:: @ 8D8EAE4 + .incbin "baserom.gba", 0xd8eaE4, 0x140 gUnknown_08D8EC24:: @ 8D8EC24 - .incbin "baserom.gba", 0xd8ec24, 0xf78 + .incbin "baserom.gba", 0xd8ec24, 0x80 + +gContestPal:: @ 8D8ECA4 + .incbin "baserom.gba", 0xd8eca4, 0xef8 gUnknown_08D8FB9C:: @ 8D8FB9C .incbin "baserom.gba", 0xd8fb9c, 0x24 @@ -821,10 +851,31 @@ gUnknown_08D96AB4:: @ 8D96AB4 .incbin "baserom.gba", 0xd96ab4, 0xec gUnknown_08D96BA0:: @ 8D96BA0 - .incbin "baserom.gba", 0xd96ba0, 0xfe4 + .incbin "baserom.gba", 0xd96ba0, 0x138 + +gUnknown_08D96CD8:: @ 8D96CD8 + .incbin "baserom.gba", 0xd96cd8, 0x294 + +gUnknown_08D96F6C:: @ 8D96F6C + .incbin "baserom.gba", 0xd96f6c, 0x24 + +gUnknown_08D96F90:: @ 8D96F90 + .incbin "baserom.gba", 0xd96f90, 0x1F8 + +gUnknown_08D97188:: @ 8D97188 + .incbin "baserom.gba", 0xd97188, 0x28 + +gUnknown_08D971B0:: @ 8D971B0 + .incbin "baserom.gba", 0xd971b0, 0x9D4 gUnknown_08D97B84:: @ 8D97B84 - .incbin "baserom.gba", 0xd97b84, 0x188 + .incbin "baserom.gba", 0xd97b84, 0x68 + +gUnknown_08D97BEC:: @ 8D97BEC + .incbin "baserom.gba", 0xd97bec, 0x108 + +gUnknown_08D97CF4:: @ 8D97CF4 + .incbin "baserom.gba", 0xd97cf4, 0x18 gUnknown_08D97D0C:: @ 8D97D0C .incbin "baserom.gba", 0xd97d0c, 0x830 @@ -876,25 +927,25 @@ gMenuMoneyPal:: @ 8D9B0C8 gBuyMenuFrame_Tilemap:: @ 8D9B0F0 .incbin "baserom.gba", 0xd9b0f0, 0x140 - + gMenuMoneyGfx:: @ 8D9B230 - .incbin "baserom.gba", 0xd9b230, 0x84 + .incbin "baserom.gba", 0xd9b230, 0x84 gMenuPokeblock_Gfx:: @ 8D9B2B4 .incbin "baserom.gba", 0xd9b2b4, 0x1bc gMenuPokeblock_Pal:: @ 8D9B470 .incbin "baserom.gba", 0xd9b470, 0x70 - + gMenuPokeblockDevice_Gfx:: @ 8D9B4E0 .incbin "baserom.gba", 0xd9b4e0, 0x2c0 - + gMenuPokeblockDevice_Pal:: @ 8D9B7A0 .incbin "baserom.gba", 0xd9b7a0, 0x28 gMenuPokeblock_Tilemap:: @ 8D9B7C8 .incbin "baserom.gba", 0xd9b7c8, 0x148 - + .align 2 gPokeblock_Gfx:: .incbin "graphics/pokeblock/pokeblock.4bpp.lz" @@ -973,8 +1024,29 @@ gUnknown_08D9C13C:: @ 8D9C13C @ 8D9C3A8 .include "data/graphics/berries/berry_graphics.inc" -@ 8DA1E78 - .incbin "baserom.gba", 0xda1e78, 0x1548 +gUnknown_08DA1E78:: @ 8DA1E78 + .incbin "baserom.gba", 0xda1e78, 0xBE4 + +gUnknown_08DA2A5C:: @ 8DA2A5C + .incbin "baserom.gba", 0xDA2A5C, 0xCC + +gUnknown_08DA2B28:: @ 8DA2B28 + .incbin "baserom.gba", 0xDA2B28, 0x1F4 + +gUnknown_08DA2D1C:: @ 8DA2D1C + .incbin "baserom.gba", 0xDA2D1C, 0x534 + +gUnknown_08DA3250:: @ 8DA3250 + .incbin "baserom.gba", 0xDA3250, 0x54 + +gUnknown_08DA32A4:: @ 8DA32A4 + .incbin "baserom.gba", 0xDA32A4, 0xCC + +gUnknown_08DA3370:: @ 8DA3370 + .incbin "baserom.gba", 0xDA3370, 0x28 + +gUnknown_08DA3398:: @ 8DA3398 + .incbin "baserom.gba", 0xDA3398, 0x28 gUnknown_08DA33C0:: @ 8DA33C0 .incbin "baserom.gba", 0xda33c0, 0x428 @@ -989,7 +1061,13 @@ gUnknown_08DA3988:: @ 8DA3988 .incbin "baserom.gba", 0xda3988, 0x100 gUnknown_08DA3A88:: @ 8DA3A88 - .incbin "baserom.gba", 0xda3a88, 0x20c + .incbin "baserom.gba", 0xda3a88, 0x138 + +gUnknown_08DA3BC0:: @ 8DA3BC0 + .incbin "baserom.gba", 0xDA3BC0, 0xBC + +gUnknown_08DA3C7C:: @ 8DA3C7C + .incbin "baserom.gba", 0xDA3C7C, 0x18 gUnknown_08DA3C94:: @ 8DA3C94 .incbin "baserom.gba", 0xda3c94, 0x1114 @@ -1004,7 +1082,13 @@ gUnknown_08DA4F70:: @ 8DA4F70 .incbin "baserom.gba", 0xda4f70, 0x1148 gUnknown_08DA60B8:: @ 8DA60B8 - .incbin "baserom.gba", 0xda60b8, 0x904 + .incbin "baserom.gba", 0xda60b8, 0x388 + +gUnknown_08DA6440:: @ 8DA6440 + .incbin "baserom.gba", 0xDA6440, 0x46C + +gUnknown_08DA68AC:: @ 8DA68AC + .incbin "baserom.gba", 0xDA68AC, 0x110 gUnknown_08DA69BC:: @ 8DA69BC .incbin "baserom.gba", 0xda69bc, 0xb6c @@ -1043,7 +1127,37 @@ gUnknown_08DA8D6C:: @ 8DA8D6C .incbin "baserom.gba", 0xda8d6c, 0x118 gUnknown_08DA8E84:: @ 8DA8E84 - .incbin "baserom.gba", 0xda8e84, 0x1a30 + .incbin "baserom.gba", 0xda8e84, 0x54 + +gUnknown_08DA8ED8:: @ 8DA8ED8 + .incbin "baserom.gba", 0xDA8ED8, 0x798 + +gUnknown_08DA9670:: @ 8DA9670 + .incbin "baserom.gba", 0xDA9670, 0x44 + +gUnknown_08DA96B4:: @ 8DA96B4 + .incbin "baserom.gba", 0xDA96B4, 0x248 + +gUnknown_08DA98FC:: @ 8DA98FC + .incbin "baserom.gba", 0xDA98FC, 0xCA8 + +gUnknown_08DAA5A4:: @ 8DAA5A4 + .incbin "baserom.gba", 0xDAA5A4, 0x1F0 + +gUnknown_08DAA794:: @ 8DAA794 + .incbin "baserom.gba", 0xDAA794, 0x98 + +gUnknown_08DAA82C:: @ 8DAA82C + .incbin "baserom.gba", 0xDAA82C, 0x28 + +gUnknown_08DAA854:: @ 8DAA854 + .incbin "baserom.gba", 0xDAA854, 0x28 + +gUnknown_08DAA87C:: @ 8DAA87C + .incbin "baserom.gba", 0xDAA87C, 0x28 + +gUnknown_08DAA8A4:: @ 8DAA8A4 + .incbin "baserom.gba", 0xDAA8A4, 0x10 gUnknown_08DAA8B4:: @ 8DAA8B4 .incbin "baserom.gba", 0xdaa8b4, 0x270 @@ -1070,7 +1184,7 @@ gUnknown_08DAAFEC:: @ 8DAAFEC .include "data/graphics/decorations/decoration_graphics.inc" @ 8DBA14C - .incbin "baserom.gba", 0xdba14c, 0x3cc + .incbin "baserom.gba", 0xdba14c, 0x3cc gUnknown_08DBA518:: @ 8DBA518 .incbin "baserom.gba", 0xdba518, 0x80 @@ -1099,8 +1213,29 @@ gCableCarCord_Gfx:: @ 8DBC2C0 gUnknown_08DBC2E8:: @ 8DBC2E8 .incbin "baserom.gba", 0xdbc2e8, 0x72c -gUnknown_08DBCA14:: @ 0x08DBCA14 - .incbin "baserom.gba", 0xdbca14, 0x1e04 + .align 2 +gRouletteWheelTiles:: @ 0x08DBCA14 + .incbin "graphics/roulette/wheel.8bpp.lz" + + .align 2 +gRouletteCenter_Gfx:: @ 0x08DBDABC + .incbin "graphics/roulette/center.4bpp.lz" + + .align 2 +gRouletteHeadersTiles:: @ 0x08DBDE38 + .incbin "graphics/roulette/headers.4bpp.lz" + + .align 2 +gRouletteCreditTiles:: @ 0x08DBE45C + .incbin "graphics/roulette/credit.4bpp.lz" + + .align 2 +gRouletteNumbersTiles:: @ 0x08DBE5AC + .incbin "graphics/roulette/numbers.4bpp.lz" + + .align 2 +gRouletteMultiplierTiles:: @ 0x08DBE690 + .incbin "graphics/roulette/multiplier.4bpp.lz" gUnknown_08DBE818:: @ 0x08DBE818 .incbin "baserom.gba", 0xdbe818, 0x20 @@ -1217,10 +1352,25 @@ gUnknown_08DC0754:: @ 8DC0754 .incbin "baserom.gba", 0xdc0754, 0x440 gUnknown_08DC0B94:: @ 8DC0B94 - .incbin "baserom.gba", 0xdc0b94, 0xb62 + .incbin "baserom.gba", 0xdc0b94, 0x800 + +gUnknown_08DC1394:: @ 8DC1394 + .incbin "baserom.gba", 0xdc1394, 0x2E0 + +gUnknown_08DC1674:: @ 8DC1674 + .incbin "baserom.gba", 0xdc1674, 0x20 + +gUnknown_08DC1694:: @ 8DC1694 + .incbin "baserom.gba", 0xdc1694, 0x20 + +gUnknown_08DC16B4:: @ 8DC16B4 + .incbin "baserom.gba", 0xdc16b4, 0x20 -gUnknown_08DC16F6:: @ 8DC16F6 - .incbin "baserom.gba", 0xdc16f6, 0x60 +gUnknown_08DC16D4:: @ 8DC16D4 + .incbin "baserom.gba", 0xdc16d4, 0x20 + +gUnknown_08DC16F4:: @ 8DC16F4 + .incbin "baserom.gba", 0xdc16f4, 0x62 gUnknown_08DC1756:: @ 8DC1756 .incbin "baserom.gba", 0xdc1756, 0x60 @@ -1232,7 +1382,10 @@ gUnknown_08DC1876:: @ 8DC1876 .incbin "baserom.gba", 0xdc1876, 0xbe gUnknown_08DC1934:: @ 8DC1934 - .incbin "baserom.gba", 0xdc1934, 0x10d4 + .incbin "baserom.gba", 0xdc1934, 0xA18 + +gUnknown_08DC234C:: @ 8DC234C + .incbin "baserom.gba", 0xDC234C, 0x6BC gUnknown_08DC2A08:: @ 8DC2A08 .incbin "baserom.gba", 0xdc2a08, 0x114 @@ -1365,7 +1518,43 @@ gUnknown_08DC7D84:: @ 8DC7D84 .incbin "baserom.gba", 0xdc7d84, 0x17c gUnknown_08DC7F00:: @ 8DC7F00 - .incbin "baserom.gba", 0xdc7f00, 0x11c0 + .incbin "baserom.gba", 0xdc7f00, 0xA0 + +gUnknown_08DC7FA0:: @ 8DC7FA0 + .incbin "baserom.gba", 0xdc7fa0, 0x13C + +gUnknown_08DC80DC:: @ 8DC80DC + .incbin "baserom.gba", 0xdc80dc, 0x12C + +gUnknown_08DC8208:: @ 8DC8208 + .incbin "baserom.gba", 0xdc8208, 0x184 + +gUnknown_08DC838C:: @ 8DC838C + .incbin "baserom.gba", 0xdc838c, 0x120 + +gUnknown_08DC84AC:: @ 8DC84AC + .incbin "baserom.gba", 0xdc84ac, 0x1A0 + +gUnknown_08DC864C:: @ 8DC864C + .incbin "baserom.gba", 0xdc864c, 0x1AC + +gUnknown_08DC87F8:: @ 8DC87F8 + .incbin "baserom.gba", 0xdc87f8, 0x2AC + +gUnknown_08DC8AA4:: @ 8DC8AA4 + .incbin "baserom.gba", 0xdc8aa4, 0x170 + +gUnknown_08DC8C14:: @ 8DC8C14 + .incbin "baserom.gba", 0xdc8c14, 0x13C + +gUnknown_08DC8D50:: @ 8DC8D50 + .incbin "baserom.gba", 0xdc8d50, 0x114 + +gUnknown_08DC8E64:: @ 8DC8E64 + .incbin "baserom.gba", 0xdc8e64, 0x100 + +gUnknown_08DC8F64:: @ 8DC8F64 + .incbin "baserom.gba", 0xdc8f64, 0x15C gUnknown_08DC90C0:: @ 8DC90C0 .incbin "baserom.gba", 0xdc90c0, 0x20 @@ -1377,50 +1566,53 @@ gUnknown_08DC9130:: @ 8DC9130 .incbin "baserom.gba", 0xdc9130, 0xb8 gUnknown_08DC91E8:: @ 8DC91E8 - .incbin "baserom.gba", 0xdc91e8, 0x420 + .incbin "baserom.gba", 0xdc91e8, 0x20 + +gUnknown_08DC9208:: @ 8DC9208 + .incbin "baserom.gba", 0xdc9208, 0x400 gUnknown_08DC9608:: @ 8DC9608 .incbin "baserom.gba", 0xdc9608, 0x20 gUnknown_08DC9628:: @ 8DC9628 .incbin "baserom.gba", 0xdc9628, 0x320 - + gBerryBlenderMiscPalette:: @ 8DCAB88 .incbin "graphics/berry_blender/misc.gbapal" - + gBerryBlenderArrowPalette:: @ 8DC9948 .incbin "graphics/berry_blender/arrow.gbapal" gUnknown_8DC9988:: @ 8DC9988 - .incbin "baserom.gba", 0xdc9988, 0x200 - + .incbin "baserom.gba", 0xdc9988, 0x200 + .align 2 gBerryBlenderMarubatsuTiles:: @ 8DC9B88 .incbin "graphics/berry_blender/marubatsu.4bpp" - + .align 2 gBerryBlenderParticlesTiles:: @ 8E90818 .incbin "graphics/berry_blender/particles.4bpp" - + .space 0x120 .align 2 gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88 .incbin "graphics/berry_blender/countdown_numbers.4bpp" - + .align 2 gBerryBlenderStartTiles:: @ 8DCA588 .incbin "graphics/berry_blender/start.4bpp" - - .space 0x200 - + + .space 0x200 + .align 2 gBerryBlenderArrowTiles:: @ 8DCAB88 .incbin "graphics/berry_blender/arrow.4bpp" gUnknown_08DCB388:: @ 8DCB388 .incbin "baserom.gba", 0xdcb388, 0xA28 - + gUnknown_08DCBDB0:: @ 8DCBDB0 .incbin "baserom.gba", 0xdcbdb0, 0x20 @@ -1443,10 +1635,19 @@ gUnknown_08DCC648:: @ 8DCC648 .incbin "baserom.gba", 0xdcc648, 0x2c0 gUnknown_08DCC908:: @ 8DCC908 - .incbin "baserom.gba", 0xdcc908, 0x2b0 + .incbin "baserom.gba", 0xdcc908, 0x290 + +gUnknown_08DCCB98:: @ 8DCCB98 + .incbin "baserom.gba", 0xdccb98, 0x20 gUnknown_08DCCBB8:: @ 8DCCBB8 - .incbin "baserom.gba", 0xdccbb8, 0x3a4 + .incbin "baserom.gba", 0xdccbb8, 0x184 + +gUnknown_08DCCD3C:: @ 8DCCD3C + .incbin "baserom.gba", 0xdccd3c, 0x20 + +gUnknown_08DCCD5C:: @ 8DCCD5C + .incbin "baserom.gba", 0xdccd5c, 0x200 gUnknown_08DCCF5C:: @ 8DCCF5C .incbin "baserom.gba", 0xdccf5c, 0x20 @@ -1473,22 +1674,28 @@ gUnknown_08DCEC70:: @ 8DCEC70 .incbin "baserom.gba", 0xdcec70, 0x13e0 gUnknown_08DD0050:: @ 8DD0050 - .incbin "baserom.gba", 0xdd0050, 0x1a68 + .incbin "baserom.gba", 0xdd0050, 0x1A08 + +gUnknown_08DD1A58:: @ 8DD1A58 + .incbin "baserom.gba", 0xdd1a58, 0x60 gUnknown_08DD1AB8:: @ 8DD1AB8 - .incbin "baserom.gba", 0xdd1ab8, 0x4c0 + .incbin "baserom.gba", 0xdd1ab8, 0x4C0 gUnknown_08DD1F78:: @ 8DD1F78 - .incbin "baserom.gba", 0xdd1f78, 0x98 + .incbin "baserom.gba", 0xdd1f78, 0x98 gUnknown_08DD2010:: @ 8DD2010 - .incbin "baserom.gba", 0xdd2010, 0x1a0 + .incbin "baserom.gba", 0xdd2010, 0x1A0 gUnknown_08DD21B0:: @ 8DD21B0 - .incbin "baserom.gba", 0xdd21b0, 0xdc + .incbin "baserom.gba", 0xdd21b0, 0xDC gUnknown_08DD228C:: @ 8DD228C - .incbin "baserom.gba", 0xdd228c, 0x1e0 + .incbin "baserom.gba", 0xdd228c, 0x180 + +gUnknown_08DD240C:: @ 8DD240C + .incbin "baserom.gba", 0xdd240c, 0x60 gUnknown_08DD246C:: @ 8DD246C .incbin "baserom.gba", 0xdd246c, 0x674 @@ -1531,7 +1738,7 @@ gUnknown_08DD46E0:: @ 8DD46E0 gUnknown_08DD47A0:: @ 8DD47A0 .incbin "baserom.gba", 0xdd47a0, 0xc0 - + gUnknown_08DD4860:: @ 8DD4860 .incbin "baserom.gba", 0xdd4860, 0x20 @@ -1553,7 +1760,7 @@ gUnknown_08DD4BF0:: @ 8DD4BF0 gUnknown_08DD4C4C:: @ 8DD4C4C .incbin "baserom.gba", 0xdd4c4c, 0xac - .align 2 + .align 2 gUnknown_08DD4CF8:: @ 8DD4CF8 .incbin "graphics/interface/unk_change_case.4bpp.lz" @@ -1587,61 +1794,61 @@ gUnknown_08DD7300:: @ 8DD7300 .incbin "baserom.gba", 0xdd7300, 0x60 gUnknown_08DD7360:: @ 8DD7360 - .incbin "baserom.gba", 0xdd7360, 0x1420 + .incbin "baserom.gba", 0xdd7360, 0x1420 gUnknown_08DD8780:: @ 8DD8780 - .incbin "baserom.gba", 0xdd8780, 0x40 + .incbin "baserom.gba", 0xdd8780, 0x40 gUnknown_08DD87C0:: @ 8DD87C0 - .incbin "baserom.gba", 0xdd87c0, 0x720 + .incbin "baserom.gba", 0xdd87c0, 0x720 gUnknown_08DD8EE0:: @ 8DD8EE0 - .incbin "baserom.gba", 0xdd8ee0, 0x1a0 + .incbin "baserom.gba", 0xdd8ee0, 0x1a0 gUnknown_08DD9080:: @ 8DD9080 - .incbin "baserom.gba", 0xdd9080, 0x60 + .incbin "baserom.gba", 0xdd9080, 0x60 gUnknown_08DD90E0:: @ 8DD90E0 - .incbin "baserom.gba", 0xdd90e0, 0x638 + .incbin "baserom.gba", 0xdd90e0, 0x638 gUnknown_08DD9718:: @ 8DD9718 - .incbin "baserom.gba", 0xdd9718, 0x15c + .incbin "baserom.gba", 0xdd9718, 0x15c gUnknown_08DD9874:: @ 8DD9874 - .incbin "baserom.gba", 0xdd9874, 0x40 + .incbin "baserom.gba", 0xdd9874, 0x40 gUnknown_08DD98B4:: @ 8DD98B4 - .incbin "baserom.gba", 0xdd98b4, 0x5a4 + .incbin "baserom.gba", 0xdd98b4, 0x5a4 gUnknown_08DD9E58:: @ 8DD9E58 - .incbin "baserom.gba", 0xdd9e58, 0x194 + .incbin "baserom.gba", 0xdd9e58, 0x194 gUnknown_08DD9FEC:: @ 8DD9FEC - .incbin "baserom.gba", 0xdd9fec, 0x40 + .incbin "baserom.gba", 0xdd9fec, 0x40 gUnknown_08DDA02C:: @ 8DDA02C - .incbin "baserom.gba", 0xdda02c, 0x610 + .incbin "baserom.gba", 0xdda02c, 0x610 gUnknown_08DDA63C:: @ 8DDA63C - .incbin "baserom.gba", 0xdda63c, 0x1c4 + .incbin "baserom.gba", 0xdda63c, 0x1c4 gUnknown_08DDA800:: @ 8DDA800 - .incbin "baserom.gba", 0xdda800, 0x40 + .incbin "baserom.gba", 0xdda800, 0x40 gUnknown_08DDA840:: @ 8DDA840 - .incbin "baserom.gba", 0xdda840, 0x600 + .incbin "baserom.gba", 0xdda840, 0x600 gUnknown_08DDAE40:: @ 8DDAE40 - .incbin "baserom.gba", 0xddae40, 0x1a0 + .incbin "baserom.gba", 0xddae40, 0x1a0 gUnknown_08DDAFE0:: @ 8DDAFE0 - .incbin "baserom.gba", 0xddafe0, 0x40 + .incbin "baserom.gba", 0xddafe0, 0x40 gUnknown_08DDB020:: @ 8DDB020 - .incbin "baserom.gba", 0xddb020, 0x2a4 + .incbin "baserom.gba", 0xddb020, 0x2a4 gUnknown_08DDB2C4:: @ 8DDB2C4 - .incbin "baserom.gba", 0xddb2c4, 0x120 + .incbin "baserom.gba", 0xddb2c4, 0x120 gUnknown_08DDB3E4:: @ 8DDB3E4 .incbin "baserom.gba", 0xddb3e4, 0x80 diff --git a/data/graphics/field_objects/field_object_oam.inc b/data/graphics/field_objects/field_object_oam.inc index 0e02efa57..ea4da1c02 100644 --- a/data/graphics/field_objects/field_object_oam.inc +++ b/data/graphics/field_objects/field_object_oam.inc @@ -40,26 +40,26 @@ gFieldObjectBaseOam_64x64:: @ 8509524 .align 2 gFieldObjectSpriteOamTable_16x16_0:: @ 850952C - sprite_oam -8, -8, 2, 0, 16x16 + subsprite -8, -8, 2, 0, 16x16 .align 2 gFieldObjectSpriteOamTable_16x16_1:: @ 8509530 - sprite_oam -8, -8, 1, 0, 16x16 + subsprite -8, -8, 1, 0, 16x16 .align 2 gFieldObjectSpriteOamTable_16x16_2:: @ 8509534 - sprite_oam -8, -8, 2, 0, 16x8 - sprite_oam -8, 0, 3, 2, 16x8 + subsprite -8, -8, 2, 0, 16x8 + subsprite -8, 0, 3, 2, 16x8 .align 2 gFieldObjectSpriteOamTable_16x16_3:: @ 850953C - sprite_oam -8, -8, 2, 0, 16x16 - sprite_oam -8, -8, 3, 0, 16x16 + subsprite -8, -8, 2, 0, 16x16 + subsprite -8, -8, 3, 0, 16x16 .align 2 gFieldObjectSpriteOamTable_16x16_4:: @ 8509544 - sprite_oam -8, -8, 1, 0, 16x16 - sprite_oam -8, -8, 3, 0, 16x16 + subsprite -8, -8, 1, 0, 16x16 + subsprite -8, -8, 3, 0, 16x16 .align 2 gFieldObjectSpriteOamTables_16x16:: @ 850954C @@ -83,27 +83,27 @@ gFieldObjectSpriteOamTables_16x16:: @ 850954C .align 2 gFieldObjectSpriteOamTable_16x32_0:: @ 850957C - sprite_oam -8, -16, 2, 0, 16x32 + subsprite -8, -16, 2, 0, 16x32 .align 2 gFieldObjectSpriteOamTable_16x32_1:: @ 8509580 - sprite_oam -8, -16, 1, 0, 16x32 + subsprite -8, -16, 1, 0, 16x32 .align 2 gFieldObjectSpriteOamTable_16x32_2:: @ 8509584 - sprite_oam -8, -16, 2, 0, 16x16 - sprite_oam -8, 0, 2, 4, 16x8 - sprite_oam -8, 8, 3, 6, 16x8 + subsprite -8, -16, 2, 0, 16x16 + subsprite -8, 0, 2, 4, 16x8 + subsprite -8, 8, 3, 6, 16x8 .align 2 gFieldObjectSpriteOamTable_16x32_3:: @ 8509590 - sprite_oam -8, -16, 2, 0, 16x16 - sprite_oam -8, 0, 3, 4, 16x16 + subsprite -8, -16, 2, 0, 16x16 + subsprite -8, 0, 3, 4, 16x16 .align 2 gFieldObjectSpriteOamTable_16x32_4:: @ 8509598 - sprite_oam -8, -16, 1, 0, 16x16 - sprite_oam -8, 0, 3, 4, 16x16 + subsprite -8, -16, 1, 0, 16x16 + subsprite -8, 0, 3, 4, 16x16 .align 2 gFieldObjectSpriteOamTables_16x32:: @ 85095A0 @@ -127,27 +127,27 @@ gFieldObjectSpriteOamTables_16x32:: @ 85095A0 .align 2 gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0 - sprite_oam -16, -16, 2, 0, 32x32 + subsprite -16, -16, 2, 0, 32x32 .align 2 gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4 - sprite_oam -16, -16, 1, 0, 32x32 + subsprite -16, -16, 1, 0, 32x32 .align 2 gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8 - sprite_oam -16, -16, 2, 0, 32x16 - sprite_oam -16, 0, 2, 8, 32x8 - sprite_oam -16, 8, 3, 12, 32x8 + subsprite -16, -16, 2, 0, 32x16 + subsprite -16, 0, 2, 8, 32x8 + subsprite -16, 8, 3, 12, 32x8 .align 2 gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4 - sprite_oam -16, -16, 2, 0, 32x16 - sprite_oam -16, 0, 3, 8, 32x16 + subsprite -16, -16, 2, 0, 32x16 + subsprite -16, 0, 3, 8, 32x16 .align 2 gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC - sprite_oam -16, -16, 1, 0, 32x16 - sprite_oam -16, 0, 3, 8, 32x16 + subsprite -16, -16, 1, 0, 32x16 + subsprite -16, 0, 3, 8, 32x16 .align 2 gFieldObjectSpriteOamTables_32x32:: @ 85095F4 @@ -171,18 +171,18 @@ gFieldObjectSpriteOamTables_32x32:: @ 85095F4 .align 2 gFieldObjectSpriteOamTable_Truck_0:: @ 8509624 - sprite_oam -24, -24, 2, 0, 32x8 - sprite_oam 8, -24, 2, 4, 16x8 - sprite_oam -24, -16, 2, 6, 32x8 - sprite_oam 8, -16, 2, 10, 16x8 - sprite_oam -24, -8, 2, 12, 32x8 - sprite_oam 8, -8, 2, 16, 16x8 - sprite_oam -24, 0, 2, 18, 32x8 - sprite_oam 8, 0, 2, 22, 16x8 - sprite_oam -24, 8, 2, 24, 32x8 - sprite_oam 8, 8, 2, 28, 16x8 - sprite_oam -24, 16, 2, 30, 32x8 - sprite_oam 8, 16, 2, 34, 16x8 + subsprite -24, -24, 2, 0, 32x8 + subsprite 8, -24, 2, 4, 16x8 + subsprite -24, -16, 2, 6, 32x8 + subsprite 8, -16, 2, 10, 16x8 + subsprite -24, -8, 2, 12, 32x8 + subsprite 8, -8, 2, 16, 16x8 + subsprite -24, 0, 2, 18, 32x8 + subsprite 8, 0, 2, 22, 16x8 + subsprite -24, 8, 2, 24, 32x8 + subsprite 8, 8, 2, 28, 16x8 + subsprite -24, 16, 2, 30, 32x8 + subsprite 8, 16, 2, 34, 16x8 .align 2 gFieldObjectSpriteOamTables_Truck:: @ 8509654 @@ -206,19 +206,19 @@ gFieldObjectSpriteOamTables_Truck:: @ 8509654 .align 2 gFieldObjectSpriteOamTable_Unused_0:: @ 8509684 - sprite_oam -32, -16, 2, 0, 64x32 + subsprite -32, -16, 2, 0, 64x32 .align 2 gFieldObjectSpriteOamTable_Unused_1:: @ 8509688 - sprite_oam -32, -16, 1, 0, 64x32 + subsprite -32, -16, 1, 0, 64x32 .align 2 gFieldObjectSpriteOamTable_Unused_2:: @ 850968C - sprite_oam -32, -16, 2, 0, 64x32 + subsprite -32, -16, 2, 0, 64x32 .align 2 gFieldObjectSpriteOamTable_Unused_3:: @ 8509690 - sprite_oam -32, -16, 2, 0, 64x32 + subsprite -32, -16, 2, 0, 64x32 .align 2 gFieldObjectSpriteOamTables_Unused:: @ 8509694 @@ -242,19 +242,19 @@ gFieldObjectSpriteOamTables_Unused:: @ 8509694 .align 2 gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4 - sprite_oam -32, -32, 2, 0, 64x64 + subsprite -32, -32, 2, 0, 64x64 .align 2 gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8 - sprite_oam -32, -32, 1, 0, 64x64 + subsprite -32, -32, 1, 0, 64x64 .align 2 gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC - sprite_oam -32, -32, 2, 0, 64x64 + subsprite -32, -32, 2, 0, 64x64 .align 2 gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0 - sprite_oam -32, -32, 2, 0, 64x64 + subsprite -32, -32, 2, 0, 64x64 .align 2 gFieldObjectSpriteOamTables_64x64:: @ 85096D4 @@ -278,75 +278,75 @@ gFieldObjectSpriteOamTables_64x64:: @ 85096D4 .align 2 gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704 - sprite_oam -48, -20, 2, 0, 32x8 - sprite_oam -16, -20, 2, 4, 32x8 - sprite_oam 16, -20, 2, 8, 32x8 - sprite_oam -48, -12, 2, 12, 32x8 - sprite_oam -16, -12, 2, 16, 32x8 - sprite_oam 16, -12, 2, 20, 32x8 - sprite_oam -48, -4, 2, 24, 32x8 - sprite_oam -16, -4, 2, 28, 32x8 - sprite_oam 16, -4, 2, 32, 32x8 - sprite_oam -48, 4, 2, 36, 32x8 - sprite_oam -16, 4, 2, 40, 32x8 - sprite_oam 16, 4, 2, 44, 32x8 - sprite_oam -48, 12, 2, 48, 32x8 - sprite_oam -16, 12, 2, 52, 32x8 - sprite_oam 16, 12, 2, 56, 32x8 + subsprite -48, -20, 2, 0, 32x8 + subsprite -16, -20, 2, 4, 32x8 + subsprite 16, -20, 2, 8, 32x8 + subsprite -48, -12, 2, 12, 32x8 + subsprite -16, -12, 2, 16, 32x8 + subsprite 16, -12, 2, 20, 32x8 + subsprite -48, -4, 2, 24, 32x8 + subsprite -16, -4, 2, 28, 32x8 + subsprite 16, -4, 2, 32, 32x8 + subsprite -48, 4, 2, 36, 32x8 + subsprite -16, 4, 2, 40, 32x8 + subsprite 16, 4, 2, 44, 32x8 + subsprite -48, 12, 2, 48, 32x8 + subsprite -16, 12, 2, 52, 32x8 + subsprite 16, 12, 2, 56, 32x8 .align 2 gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740 - sprite_oam -48, -20, 1, 0, 32x8 - sprite_oam -16, -20, 1, 4, 32x8 - sprite_oam 16, -20, 1, 8, 32x8 - sprite_oam -48, -12, 1, 12, 32x8 - sprite_oam -16, -12, 1, 16, 32x8 - sprite_oam 16, -12, 1, 20, 32x8 - sprite_oam -48, -4, 1, 24, 32x8 - sprite_oam -16, -4, 1, 28, 32x8 - sprite_oam 16, -4, 1, 32, 32x8 - sprite_oam -48, 4, 1, 36, 32x8 - sprite_oam -16, 4, 1, 40, 32x8 - sprite_oam 16, 4, 1, 44, 32x8 - sprite_oam -48, 12, 1, 48, 32x8 - sprite_oam -16, 12, 1, 52, 32x8 - sprite_oam 16, 12, 1, 56, 32x8 + subsprite -48, -20, 1, 0, 32x8 + subsprite -16, -20, 1, 4, 32x8 + subsprite 16, -20, 1, 8, 32x8 + subsprite -48, -12, 1, 12, 32x8 + subsprite -16, -12, 1, 16, 32x8 + subsprite 16, -12, 1, 20, 32x8 + subsprite -48, -4, 1, 24, 32x8 + subsprite -16, -4, 1, 28, 32x8 + subsprite 16, -4, 1, 32, 32x8 + subsprite -48, 4, 1, 36, 32x8 + subsprite -16, 4, 1, 40, 32x8 + subsprite 16, 4, 1, 44, 32x8 + subsprite -48, 12, 1, 48, 32x8 + subsprite -16, 12, 1, 52, 32x8 + subsprite 16, 12, 1, 56, 32x8 .align 2 gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C - sprite_oam -48, -20, 2, 0, 32x8 - sprite_oam -16, -20, 2, 4, 32x8 - sprite_oam 16, -20, 2, 8, 32x8 - sprite_oam -48, -12, 2, 12, 32x8 - sprite_oam -16, -12, 2, 16, 32x8 - sprite_oam 16, -12, 2, 20, 32x8 - sprite_oam -48, -4, 2, 24, 32x8 - sprite_oam -16, -4, 2, 28, 32x8 - sprite_oam 16, -4, 2, 32, 32x8 - sprite_oam -48, 4, 2, 36, 32x8 - sprite_oam -16, 4, 2, 40, 32x8 - sprite_oam 16, 4, 2, 44, 32x8 - sprite_oam -48, 12, 2, 48, 32x8 - sprite_oam -16, 12, 2, 52, 32x8 - sprite_oam 16, 12, 2, 56, 32x8 + subsprite -48, -20, 2, 0, 32x8 + subsprite -16, -20, 2, 4, 32x8 + subsprite 16, -20, 2, 8, 32x8 + subsprite -48, -12, 2, 12, 32x8 + subsprite -16, -12, 2, 16, 32x8 + subsprite 16, -12, 2, 20, 32x8 + subsprite -48, -4, 2, 24, 32x8 + subsprite -16, -4, 2, 28, 32x8 + subsprite 16, -4, 2, 32, 32x8 + subsprite -48, 4, 2, 36, 32x8 + subsprite -16, 4, 2, 40, 32x8 + subsprite 16, 4, 2, 44, 32x8 + subsprite -48, 12, 2, 48, 32x8 + subsprite -16, 12, 2, 52, 32x8 + subsprite 16, 12, 2, 56, 32x8 .align 2 gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8 - sprite_oam -48, -20, 1, 0, 32x8 - sprite_oam -16, -20, 1, 4, 32x8 - sprite_oam 16, -20, 1, 8, 32x8 - sprite_oam -48, -12, 1, 12, 32x8 - sprite_oam -16, -12, 1, 16, 32x8 - sprite_oam 16, -12, 1, 20, 32x8 - sprite_oam -48, -4, 2, 24, 32x8 - sprite_oam -16, -4, 2, 28, 32x8 - sprite_oam 16, -4, 2, 32, 32x8 - sprite_oam -48, 4, 2, 36, 32x8 - sprite_oam -16, 4, 2, 40, 32x8 - sprite_oam 16, 4, 2, 44, 32x8 - sprite_oam -48, 12, 2, 48, 32x8 - sprite_oam -16, 12, 2, 52, 32x8 - sprite_oam 16, 12, 2, 56, 32x8 + subsprite -48, -20, 1, 0, 32x8 + subsprite -16, -20, 1, 4, 32x8 + subsprite 16, -20, 1, 8, 32x8 + subsprite -48, -12, 1, 12, 32x8 + subsprite -16, -12, 1, 16, 32x8 + subsprite 16, -12, 1, 20, 32x8 + subsprite -48, -4, 2, 24, 32x8 + subsprite -16, -4, 2, 28, 32x8 + subsprite 16, -4, 2, 32, 32x8 + subsprite -48, 4, 2, 36, 32x8 + subsprite -16, 4, 2, 40, 32x8 + subsprite 16, 4, 2, 44, 32x8 + subsprite -48, 12, 2, 48, 32x8 + subsprite -16, 12, 2, 52, 32x8 + subsprite 16, 12, 2, 56, 32x8 .align 2 gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4 @@ -370,79 +370,79 @@ gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4 .align 2 gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824 - sprite_oam -48, -20, 2, 0, 32x8 - sprite_oam -16, -20, 2, 4, 32x8 - sprite_oam 16, -20, 2, 8, 16x8 - sprite_oam 32, -20, 2, 10, 8x8 - sprite_oam -48, -12, 2, 11, 32x8 - sprite_oam -16, -12, 2, 15, 32x8 - sprite_oam 16, -12, 2, 19, 16x8 - sprite_oam 32, -12, 2, 21, 8x8 - sprite_oam -48, -4, 2, 22, 32x8 - sprite_oam -16, -4, 2, 26, 32x8 - sprite_oam 16, -4, 2, 30, 16x8 - sprite_oam 32, -4, 2, 32, 8x8 - sprite_oam -48, 4, 2, 33, 32x8 - sprite_oam -16, 4, 2, 37, 32x8 - sprite_oam 16, 4, 2, 41, 16x8 - sprite_oam 32, 4, 2, 43, 8x8 + subsprite -48, -20, 2, 0, 32x8 + subsprite -16, -20, 2, 4, 32x8 + subsprite 16, -20, 2, 8, 16x8 + subsprite 32, -20, 2, 10, 8x8 + subsprite -48, -12, 2, 11, 32x8 + subsprite -16, -12, 2, 15, 32x8 + subsprite 16, -12, 2, 19, 16x8 + subsprite 32, -12, 2, 21, 8x8 + subsprite -48, -4, 2, 22, 32x8 + subsprite -16, -4, 2, 26, 32x8 + subsprite 16, -4, 2, 30, 16x8 + subsprite 32, -4, 2, 32, 8x8 + subsprite -48, 4, 2, 33, 32x8 + subsprite -16, 4, 2, 37, 32x8 + subsprite 16, 4, 2, 41, 16x8 + subsprite 32, 4, 2, 43, 8x8 .align 2 gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864 - sprite_oam -48, -20, 1, 0, 32x8 - sprite_oam -16, -20, 1, 4, 32x8 - sprite_oam 16, -20, 1, 8, 16x8 - sprite_oam 32, -20, 1, 10, 8x8 - sprite_oam -48, -12, 1, 11, 32x8 - sprite_oam -16, -12, 1, 15, 32x8 - sprite_oam 16, -12, 1, 19, 16x8 - sprite_oam 32, -12, 1, 21, 8x8 - sprite_oam -48, -4, 1, 22, 32x8 - sprite_oam -16, -4, 1, 26, 32x8 - sprite_oam 16, -4, 1, 30, 16x8 - sprite_oam 32, -4, 1, 32, 8x8 - sprite_oam -48, 4, 1, 33, 32x8 - sprite_oam -16, 4, 1, 37, 32x8 - sprite_oam 16, 4, 1, 41, 16x8 - sprite_oam 32, 4, 1, 43, 8x8 + subsprite -48, -20, 1, 0, 32x8 + subsprite -16, -20, 1, 4, 32x8 + subsprite 16, -20, 1, 8, 16x8 + subsprite 32, -20, 1, 10, 8x8 + subsprite -48, -12, 1, 11, 32x8 + subsprite -16, -12, 1, 15, 32x8 + subsprite 16, -12, 1, 19, 16x8 + subsprite 32, -12, 1, 21, 8x8 + subsprite -48, -4, 1, 22, 32x8 + subsprite -16, -4, 1, 26, 32x8 + subsprite 16, -4, 1, 30, 16x8 + subsprite 32, -4, 1, 32, 8x8 + subsprite -48, 4, 1, 33, 32x8 + subsprite -16, 4, 1, 37, 32x8 + subsprite 16, 4, 1, 41, 16x8 + subsprite 32, 4, 1, 43, 8x8 .align 2 gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4 - sprite_oam -48, -20, 2, 0, 32x8 - sprite_oam -16, -20, 2, 4, 32x8 - sprite_oam 16, -20, 2, 8, 16x8 - sprite_oam 32, -20, 2, 10, 8x8 - sprite_oam -48, -12, 2, 11, 32x8 - sprite_oam -16, -12, 2, 15, 32x8 - sprite_oam 16, -12, 2, 19, 16x8 - sprite_oam 32, -12, 2, 21, 8x8 - sprite_oam -48, -4, 2, 22, 32x8 - sprite_oam -16, -4, 2, 26, 32x8 - sprite_oam 16, -4, 2, 30, 16x8 - sprite_oam 32, -4, 2, 32, 8x8 - sprite_oam -48, 4, 2, 33, 32x8 - sprite_oam -16, 4, 2, 37, 32x8 - sprite_oam 16, 4, 2, 41, 16x8 - sprite_oam 32, 4, 2, 43, 8x8 + subsprite -48, -20, 2, 0, 32x8 + subsprite -16, -20, 2, 4, 32x8 + subsprite 16, -20, 2, 8, 16x8 + subsprite 32, -20, 2, 10, 8x8 + subsprite -48, -12, 2, 11, 32x8 + subsprite -16, -12, 2, 15, 32x8 + subsprite 16, -12, 2, 19, 16x8 + subsprite 32, -12, 2, 21, 8x8 + subsprite -48, -4, 2, 22, 32x8 + subsprite -16, -4, 2, 26, 32x8 + subsprite 16, -4, 2, 30, 16x8 + subsprite 32, -4, 2, 32, 8x8 + subsprite -48, 4, 2, 33, 32x8 + subsprite -16, 4, 2, 37, 32x8 + subsprite 16, 4, 2, 41, 16x8 + subsprite 32, 4, 2, 43, 8x8 .align 2 gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4 - sprite_oam -48, -20, 1, 0, 32x8 - sprite_oam -16, -20, 1, 4, 32x8 - sprite_oam 16, -20, 1, 8, 16x8 - sprite_oam 32, -20, 1, 10, 8x8 - sprite_oam -48, -12, 1, 11, 32x8 - sprite_oam -16, -12, 1, 15, 32x8 - sprite_oam 16, -12, 1, 19, 16x8 - sprite_oam 32, -12, 1, 21, 8x8 - sprite_oam -48, -4, 2, 22, 32x8 - sprite_oam -16, -4, 2, 26, 32x8 - sprite_oam 16, -4, 2, 30, 16x8 - sprite_oam 32, -4, 2, 32, 8x8 - sprite_oam -48, 4, 2, 33, 32x8 - sprite_oam -16, 4, 2, 37, 32x8 - sprite_oam 16, 4, 2, 41, 16x8 - sprite_oam 32, 4, 2, 43, 8x8 + subsprite -48, -20, 1, 0, 32x8 + subsprite -16, -20, 1, 4, 32x8 + subsprite 16, -20, 1, 8, 16x8 + subsprite 32, -20, 1, 10, 8x8 + subsprite -48, -12, 1, 11, 32x8 + subsprite -16, -12, 1, 15, 32x8 + subsprite 16, -12, 1, 19, 16x8 + subsprite 32, -12, 1, 21, 8x8 + subsprite -48, -4, 2, 22, 32x8 + subsprite -16, -4, 2, 26, 32x8 + subsprite 16, -4, 2, 30, 16x8 + subsprite 32, -4, 2, 32, 8x8 + subsprite -48, 4, 2, 33, 32x8 + subsprite -16, 4, 2, 37, 32x8 + subsprite 16, 4, 2, 41, 16x8 + subsprite 32, 4, 2, 43, 8x8 .align 2 gFieldObjectSpriteOamTables_SubmarineShadow:: @ 8509924 diff --git a/data/graphics/pokemon/icon_palette_indices.inc b/data/graphics/pokemon/icon_palette_indices.inc deleted file mode 100644 index f1d57466c..000000000 --- a/data/graphics/pokemon/icon_palette_indices.inc +++ /dev/null @@ -1,442 +0,0 @@ - .align 2 -gMonIconPaletteIndices:: @ 857C388 - .byte 0 @ ?????????? - .byte 1 @ Bulbasaur - .byte 1 @ Ivysaur - .byte 1 @ Venusaur - .byte 0 @ Charmander - .byte 0 @ Charmeleon - .byte 0 @ Charizard - .byte 0 @ Squirtle - .byte 2 @ Wartortle - .byte 2 @ Blastoise - .byte 1 @ Caterpie - .byte 1 @ Metapod - .byte 0 @ Butterfree - .byte 1 @ Weedle - .byte 2 @ Kakuna - .byte 2 @ Beedrill - .byte 0 @ Pidgey - .byte 0 @ Pidgeotto - .byte 0 @ Pidgeot - .byte 2 @ Rattata - .byte 1 @ Raticate - .byte 0 @ Spearow - .byte 0 @ Fearow - .byte 2 @ Ekans - .byte 2 @ Arbok - .byte 2 @ Pikachu - .byte 0 @ Raichu - .byte 2 @ Sandshrew - .byte 2 @ Sandslash - .byte 2 @ Nidoran♀ - .byte 2 @ Nidorina - .byte 2 @ Nidoqueen - .byte 2 @ Nidoran♂ - .byte 2 @ Nidorino - .byte 2 @ Nidoking - .byte 0 @ Clefairy - .byte 0 @ Clefable - .byte 2 @ Vulpix - .byte 1 @ Ninetales - .byte 0 @ Jigglypuff - .byte 0 @ Wigglytuff - .byte 2 @ Zubat - .byte 2 @ Golbat - .byte 1 @ Oddish - .byte 0 @ Gloom - .byte 0 @ Vileplume - .byte 0 @ Paras - .byte 0 @ Parasect - .byte 0 @ Venonat - .byte 2 @ Venomoth - .byte 2 @ Diglett - .byte 2 @ Dugtrio - .byte 1 @ Meowth - .byte 1 @ Persian - .byte 1 @ Psyduck - .byte 2 @ Golduck - .byte 1 @ Mankey - .byte 2 @ Primeape - .byte 0 @ Growlithe - .byte 0 @ Arcanine - .byte 0 @ Poliwag - .byte 0 @ Poliwhirl - .byte 0 @ Poliwrath - .byte 2 @ Abra - .byte 2 @ Kadabra - .byte 2 @ Alakazam - .byte 0 @ Machop - .byte 2 @ Machoke - .byte 0 @ Machamp - .byte 1 @ Bellsprout - .byte 1 @ Weepinbell - .byte 1 @ Victreebel - .byte 2 @ Tentacool - .byte 2 @ Tentacruel - .byte 1 @ Geodude - .byte 1 @ Graveler - .byte 1 @ Golem - .byte 0 @ Ponyta - .byte 0 @ Rapidash - .byte 0 @ Slowpoke - .byte 0 @ Slowbro - .byte 0 @ Magnemite - .byte 0 @ Magneton - .byte 1 @ Farfetch'd - .byte 2 @ Doduo - .byte 2 @ Dodrio - .byte 2 @ Seel - .byte 2 @ Dewgong - .byte 2 @ Grimer - .byte 2 @ Muk - .byte 2 @ Shellder - .byte 2 @ Cloyster - .byte 2 @ Gastly - .byte 2 @ Haunter - .byte 2 @ Gengar - .byte 2 @ Onix - .byte 2 @ Drowzee - .byte 1 @ Hypno - .byte 2 @ Krabby - .byte 2 @ Kingler - .byte 0 @ Voltorb - .byte 0 @ Electrode - .byte 0 @ Exeggcute - .byte 1 @ Exeggutor - .byte 1 @ Cubone - .byte 1 @ Marowak - .byte 2 @ Hitmonlee - .byte 2 @ Hitmonchan - .byte 1 @ Lickitung - .byte 2 @ Koffing - .byte 2 @ Weezing - .byte 1 @ Rhyhorn - .byte 1 @ Rhydon - .byte 0 @ Chansey - .byte 0 @ Tangela - .byte 1 @ Kangaskhan - .byte 0 @ Horsea - .byte 0 @ Seadra - .byte 0 @ Goldeen - .byte 0 @ Seaking - .byte 2 @ Staryu - .byte 2 @ Starmie - .byte 0 @ Mr. mime - .byte 1 @ Scyther - .byte 2 @ Jynx - .byte 1 @ Electabuzz - .byte 0 @ Magmar - .byte 2 @ Pinsir - .byte 2 @ Tauros - .byte 0 @ Magikarp - .byte 0 @ Gyarados - .byte 2 @ Lapras - .byte 2 @ Ditto - .byte 2 @ Eevee - .byte 0 @ Vaporeon - .byte 0 @ Jolteon - .byte 0 @ Flareon - .byte 0 @ Porygon - .byte 0 @ Omanyte - .byte 0 @ Omastar - .byte 2 @ Kabuto - .byte 2 @ Kabutops - .byte 0 @ Aerodactyl - .byte 1 @ Snorlax - .byte 0 @ Articuno - .byte 0 @ Zapdos - .byte 0 @ Moltres - .byte 0 @ Dratini - .byte 0 @ Dragonair - .byte 2 @ Dragonite - .byte 2 @ Mewtwo - .byte 0 @ Mew - .byte 1 @ Chikorita - .byte 1 @ Bayleef - .byte 1 @ Meganium - .byte 1 @ Cyndaquil - .byte 1 @ Quilava - .byte 1 @ Typhlosion - .byte 2 @ Totodile - .byte 2 @ Croconaw - .byte 2 @ Feraligatr - .byte 2 @ Sentret - .byte 2 @ Furret - .byte 2 @ Hoothoot - .byte 2 @ Noctowl - .byte 0 @ Ledyba - .byte 0 @ Ledian - .byte 1 @ Spinarak - .byte 0 @ Ariados - .byte 2 @ Crobat - .byte 2 @ Chinchou - .byte 0 @ Lanturn - .byte 0 @ Pichu - .byte 0 @ Cleffa - .byte 1 @ Igglybuff - .byte 2 @ Togepi - .byte 2 @ Togetic - .byte 0 @ Natu - .byte 0 @ Xatu - .byte 2 @ Mareep - .byte 0 @ Flaaffy - .byte 0 @ Ampharos - .byte 1 @ Bellossom - .byte 2 @ Marill - .byte 2 @ Azumarill - .byte 1 @ Sudowoodo - .byte 1 @ Politoed - .byte 1 @ Hoppip - .byte 1 @ Skiploom - .byte 2 @ Jumpluff - .byte 2 @ Aipom - .byte 1 @ Sunkern - .byte 1 @ Sunflora - .byte 1 @ Yanma - .byte 0 @ Wooper - .byte 0 @ Quagsire - .byte 2 @ Espeon - .byte 2 @ Umbreon - .byte 2 @ Murkrow - .byte 0 @ Slowking - .byte 0 @ Misdreavus - .byte 0 @ Unown A - .byte 0 @ Wobbuffet - .byte 1 @ Girafarig - .byte 0 @ Pineco - .byte 2 @ Forretress - .byte 2 @ Dunsparce - .byte 2 @ Gligar - .byte 0 @ Steelix - .byte 0 @ Snubbull - .byte 2 @ Granbull - .byte 0 @ Qwilfish - .byte 0 @ Scizor - .byte 1 @ Shuckle - .byte 2 @ Heracross - .byte 0 @ Sneasel - .byte 0 @ Teddiursa - .byte 2 @ Ursaring - .byte 0 @ Slugma - .byte 0 @ Magcargo - .byte 2 @ Swinub - .byte 2 @ Piloswine - .byte 0 @ Corsola - .byte 0 @ Remoraid - .byte 0 @ Octillery - .byte 0 @ Delibird - .byte 2 @ Mantine - .byte 0 @ Skarmory - .byte 0 @ Houndour - .byte 0 @ Houndoom - .byte 0 @ Kingdra - .byte 0 @ Phanpy - .byte 0 @ Donphan - .byte 0 @ Porygon2 - .byte 2 @ Stantler - .byte 1 @ Smeargle - .byte 2 @ Tyrogue - .byte 2 @ Hitmontop - .byte 1 @ Smoochum - .byte 1 @ Elekid - .byte 1 @ Magby - .byte 1 @ Miltank - .byte 1 @ Blissey - .byte 0 @ Raikou - .byte 2 @ Entei - .byte 0 @ Suicune - .byte 1 @ Larvitar - .byte 0 @ Pupitar - .byte 1 @ Tyranitar - .byte 0 @ Lugia - .byte 1 @ Ho-Oh - .byte 1 @ Celebi - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 0 @ ? - .byte 1 @ Treecko - .byte 0 @ Grovyle - .byte 1 @ Sceptile - .byte 0 @ Torchic - .byte 0 @ Combusken - .byte 0 @ Blaziken - .byte 0 @ Mudkip - .byte 0 @ Marshtomp - .byte 0 @ Swampert - .byte 2 @ Poochyena - .byte 2 @ Mightyena - .byte 2 @ Zigzagoon - .byte 2 @ Linoone - .byte 0 @ Wurmple - .byte 2 @ Silcoon - .byte 0 @ Beautifly - .byte 2 @ Cascoon - .byte 1 @ Dustox - .byte 1 @ Lotad - .byte 1 @ Lombre - .byte 1 @ Ludicolo - .byte 1 @ Seedot - .byte 1 @ Nuzleaf - .byte 0 @ Shiftry - .byte 1 @ Nincada - .byte 1 @ Ninjask - .byte 1 @ Shedinja - .byte 2 @ Taillow - .byte 2 @ Swellow - .byte 1 @ Shroomish - .byte 1 @ Breloom - .byte 1 @ Spinda - .byte 0 @ Wingull - .byte 0 @ Pelipper - .byte 2 @ Surskit - .byte 0 @ Masquerain - .byte 2 @ Wailmer - .byte 0 @ Wailord - .byte 0 @ Skitty - .byte 2 @ Delcatty - .byte 1 @ Kecleon - .byte 1 @ Baltoy - .byte 0 @ Claydol - .byte 0 @ Nosepass - .byte 1 @ Torkoal - .byte 2 @ Sableye - .byte 0 @ Barboach - .byte 0 @ Whiscash - .byte 0 @ Luvdisc - .byte 0 @ Corphish - .byte 0 @ Crawdaunt - .byte 2 @ Feebas - .byte 0 @ Milotic - .byte 0 @ Carvanha - .byte 0 @ Sharpedo - .byte 1 @ Trapinch - .byte 1 @ Vibrava - .byte 1 @ Flygon - .byte 2 @ Makuhita - .byte 1 @ Hariyama - .byte 1 @ Electrike - .byte 0 @ Manectric - .byte 1 @ Numel - .byte 0 @ Camerupt - .byte 2 @ Spheal - .byte 2 @ Sealeo - .byte 0 @ Walrein - .byte 1 @ Cacnea - .byte 1 @ Cacturne - .byte 2 @ Snorunt - .byte 0 @ Glalie - .byte 1 @ Lunatone - .byte 0 @ Solrock - .byte 2 @ Azurill - .byte 0 @ Spoink - .byte 2 @ Grumpig - .byte 0 @ Plusle - .byte 0 @ Minun - .byte 2 @ Mawile - .byte 0 @ Meditite - .byte 0 @ Medicham - .byte 0 @ Swablu - .byte 0 @ Altaria - .byte 0 @ Wynaut - .byte 0 @ Duskull - .byte 0 @ Dusclops - .byte 0 @ Roselia - .byte 2 @ Slakoth - .byte 2 @ Vigoroth - .byte 1 @ Slaking - .byte 1 @ Gulpin - .byte 2 @ Swalot - .byte 1 @ Tropius - .byte 0 @ Whismur - .byte 2 @ Loudred - .byte 2 @ Exploud - .byte 0 @ Clamperl - .byte 0 @ Huntail - .byte 0 @ Gorebyss - .byte 0 @ Absol - .byte 0 @ Shuppet - .byte 0 @ Banette - .byte 2 @ Seviper - .byte 0 @ Zangoose - .byte 1 @ Relicanth - .byte 2 @ Aron - .byte 2 @ Lairon - .byte 2 @ Aggron - .byte 0 @ Castform - .byte 0 @ Volbeat - .byte 2 @ Illumise - .byte 2 @ Lileep - .byte 0 @ Cradily - .byte 0 @ Anorith - .byte 0 @ Armaldo - .byte 1 @ Ralts - .byte 1 @ Kirlia - .byte 1 @ Gardevoir - .byte 2 @ Bagon - .byte 2 @ Shelgon - .byte 0 @ Salamence - .byte 0 @ Beldum - .byte 0 @ Metang - .byte 0 @ Metagross - .byte 2 @ Regirock - .byte 2 @ Regice - .byte 2 @ Registeel - .byte 2 @ Kyogre - .byte 0 @ Groudon - .byte 1 @ Rayquaza - .byte 0 @ Latias - .byte 2 @ Latios - .byte 0 @ Jirachi - .byte 0 @ Deoxys - .byte 0 @ Chimecho - .byte 1 @ Egg - .byte 0 @ Unown B - .byte 0 @ Unown C - .byte 0 @ Unown D - .byte 0 @ Unown E - .byte 0 @ Unown F - .byte 0 @ Unown G - .byte 0 @ Unown H - .byte 0 @ Unown I - .byte 0 @ Unown J - .byte 0 @ Unown K - .byte 0 @ Unown L - .byte 0 @ Unown M - .byte 0 @ Unown N - .byte 0 @ Unown O - .byte 0 @ Unown P - .byte 0 @ Unown Q - .byte 0 @ Unown R - .byte 0 @ Unown S - .byte 0 @ Unown T - .byte 0 @ Unown U - .byte 0 @ Unown V - .byte 0 @ Unown W - .byte 0 @ Unown X - .byte 0 @ Unown Y - .byte 0 @ Unown Z - .byte 0 @ Unown Exclamation Mark - .byte 0 @ Unown Question Mark diff --git a/data/graphics/pokemon/icon_palette_table.inc b/data/graphics/pokemon/icon_palette_table.inc deleted file mode 100644 index eb7919423..000000000 --- a/data/graphics/pokemon/icon_palette_table.inc +++ /dev/null @@ -1,11 +0,0 @@ - .align 2 -gMonIconPaletteTable:: @ 857C540 - obj_pal gMonIconPalettes + 0 * 32, 56000 - obj_pal gMonIconPalettes + 1 * 32, 56001 - obj_pal gMonIconPalettes + 2 * 32, 56002 - -@ These palettes are actually part of the title screen BG palette and are not -@ used for Pokémon icons. - obj_pal gMonIconPalettes + 3 * 32, 56003 - obj_pal gMonIconPalettes + 4 * 32, 56004 - obj_pal gMonIconPalettes + 5 * 32, 56005 diff --git a/data/graphics/pokemon/icon_table.inc b/data/graphics/pokemon/icon_table.inc deleted file mode 100644 index 06a86de43..000000000 --- a/data/graphics/pokemon/icon_table.inc +++ /dev/null @@ -1,442 +0,0 @@ - .align 2 -gMonIconTable:: @ 857BCA8 - .4byte gMonIcon_Bulbasaur - .4byte gMonIcon_Bulbasaur - .4byte gMonIcon_Ivysaur - .4byte gMonIcon_Venusaur - .4byte gMonIcon_Charmander - .4byte gMonIcon_Charmeleon - .4byte gMonIcon_Charizard - .4byte gMonIcon_Squirtle - .4byte gMonIcon_Wartortle - .4byte gMonIcon_Blastoise - .4byte gMonIcon_Caterpie - .4byte gMonIcon_Metapod - .4byte gMonIcon_Butterfree - .4byte gMonIcon_Weedle - .4byte gMonIcon_Kakuna - .4byte gMonIcon_Beedrill - .4byte gMonIcon_Pidgey - .4byte gMonIcon_Pidgeotto - .4byte gMonIcon_Pidgeot - .4byte gMonIcon_Rattata - .4byte gMonIcon_Raticate - .4byte gMonIcon_Spearow - .4byte gMonIcon_Fearow - .4byte gMonIcon_Ekans - .4byte gMonIcon_Arbok - .4byte gMonIcon_Pikachu - .4byte gMonIcon_Raichu - .4byte gMonIcon_Sandshrew - .4byte gMonIcon_Sandslash - .4byte gMonIcon_NidoranF - .4byte gMonIcon_Nidorina - .4byte gMonIcon_Nidoqueen - .4byte gMonIcon_NidoranM - .4byte gMonIcon_Nidorino - .4byte gMonIcon_Nidoking - .4byte gMonIcon_Clefairy - .4byte gMonIcon_Clefable - .4byte gMonIcon_Vulpix - .4byte gMonIcon_Ninetales - .4byte gMonIcon_Jigglypuff - .4byte gMonIcon_Wigglytuff - .4byte gMonIcon_Zubat - .4byte gMonIcon_Golbat - .4byte gMonIcon_Oddish - .4byte gMonIcon_Gloom - .4byte gMonIcon_Vileplume - .4byte gMonIcon_Paras - .4byte gMonIcon_Parasect - .4byte gMonIcon_Venonat - .4byte gMonIcon_Venomoth - .4byte gMonIcon_Diglett - .4byte gMonIcon_Dugtrio - .4byte gMonIcon_Meowth - .4byte gMonIcon_Persian - .4byte gMonIcon_Psyduck - .4byte gMonIcon_Golduck - .4byte gMonIcon_Mankey - .4byte gMonIcon_Primeape - .4byte gMonIcon_Growlithe - .4byte gMonIcon_Arcanine - .4byte gMonIcon_Poliwag - .4byte gMonIcon_Poliwhirl - .4byte gMonIcon_Poliwrath - .4byte gMonIcon_Abra - .4byte gMonIcon_Kadabra - .4byte gMonIcon_Alakazam - .4byte gMonIcon_Machop - .4byte gMonIcon_Machoke - .4byte gMonIcon_Machamp - .4byte gMonIcon_Bellsprout - .4byte gMonIcon_Weepinbell - .4byte gMonIcon_Victreebel - .4byte gMonIcon_Tentacool - .4byte gMonIcon_Tentacruel - .4byte gMonIcon_Geodude - .4byte gMonIcon_Graveler - .4byte gMonIcon_Golem - .4byte gMonIcon_Ponyta - .4byte gMonIcon_Rapidash - .4byte gMonIcon_Slowpoke - .4byte gMonIcon_Slowbro - .4byte gMonIcon_Magnemite - .4byte gMonIcon_Magneton - .4byte gMonIcon_Farfetchd - .4byte gMonIcon_Doduo - .4byte gMonIcon_Dodrio - .4byte gMonIcon_Seel - .4byte gMonIcon_Dewgong - .4byte gMonIcon_Grimer - .4byte gMonIcon_Muk - .4byte gMonIcon_Shellder - .4byte gMonIcon_Cloyster - .4byte gMonIcon_Gastly - .4byte gMonIcon_Haunter - .4byte gMonIcon_Gengar - .4byte gMonIcon_Onix - .4byte gMonIcon_Drowzee - .4byte gMonIcon_Hypno - .4byte gMonIcon_Krabby - .4byte gMonIcon_Kingler - .4byte gMonIcon_Voltorb - .4byte gMonIcon_Electrode - .4byte gMonIcon_Exeggcute - .4byte gMonIcon_Exeggutor - .4byte gMonIcon_Cubone - .4byte gMonIcon_Marowak - .4byte gMonIcon_Hitmonlee - .4byte gMonIcon_Hitmonchan - .4byte gMonIcon_Lickitung - .4byte gMonIcon_Koffing - .4byte gMonIcon_Weezing - .4byte gMonIcon_Rhyhorn - .4byte gMonIcon_Rhydon - .4byte gMonIcon_Chansey - .4byte gMonIcon_Tangela - .4byte gMonIcon_Kangaskhan - .4byte gMonIcon_Horsea - .4byte gMonIcon_Seadra - .4byte gMonIcon_Goldeen - .4byte gMonIcon_Seaking - .4byte gMonIcon_Staryu - .4byte gMonIcon_Starmie - .4byte gMonIcon_Mrmime - .4byte gMonIcon_Scyther - .4byte gMonIcon_Jynx - .4byte gMonIcon_Electabuzz - .4byte gMonIcon_Magmar - .4byte gMonIcon_Pinsir - .4byte gMonIcon_Tauros - .4byte gMonIcon_Magikarp - .4byte gMonIcon_Gyarados - .4byte gMonIcon_Lapras - .4byte gMonIcon_Ditto - .4byte gMonIcon_Eevee - .4byte gMonIcon_Vaporeon - .4byte gMonIcon_Jolteon - .4byte gMonIcon_Flareon - .4byte gMonIcon_Porygon - .4byte gMonIcon_Omanyte - .4byte gMonIcon_Omastar - .4byte gMonIcon_Kabuto - .4byte gMonIcon_Kabutops - .4byte gMonIcon_Aerodactyl - .4byte gMonIcon_Snorlax - .4byte gMonIcon_Articuno - .4byte gMonIcon_Zapdos - .4byte gMonIcon_Moltres - .4byte gMonIcon_Dratini - .4byte gMonIcon_Dragonair - .4byte gMonIcon_Dragonite - .4byte gMonIcon_Mewtwo - .4byte gMonIcon_Mew - .4byte gMonIcon_Chikorita - .4byte gMonIcon_Bayleef - .4byte gMonIcon_Meganium - .4byte gMonIcon_Cyndaquil - .4byte gMonIcon_Quilava - .4byte gMonIcon_Typhlosion - .4byte gMonIcon_Totodile - .4byte gMonIcon_Croconaw - .4byte gMonIcon_Feraligatr - .4byte gMonIcon_Sentret - .4byte gMonIcon_Furret - .4byte gMonIcon_Hoothoot - .4byte gMonIcon_Noctowl - .4byte gMonIcon_Ledyba - .4byte gMonIcon_Ledian - .4byte gMonIcon_Spinarak - .4byte gMonIcon_Ariados - .4byte gMonIcon_Crobat - .4byte gMonIcon_Chinchou - .4byte gMonIcon_Lanturn - .4byte gMonIcon_Pichu - .4byte gMonIcon_Cleffa - .4byte gMonIcon_Igglybuff - .4byte gMonIcon_Togepi - .4byte gMonIcon_Togetic - .4byte gMonIcon_Natu - .4byte gMonIcon_Xatu - .4byte gMonIcon_Mareep - .4byte gMonIcon_Flaaffy - .4byte gMonIcon_Ampharos - .4byte gMonIcon_Bellossom - .4byte gMonIcon_Marill - .4byte gMonIcon_Azumarill - .4byte gMonIcon_Sudowoodo - .4byte gMonIcon_Politoed - .4byte gMonIcon_Hoppip - .4byte gMonIcon_Skiploom - .4byte gMonIcon_Jumpluff - .4byte gMonIcon_Aipom - .4byte gMonIcon_Sunkern - .4byte gMonIcon_Sunflora - .4byte gMonIcon_Yanma - .4byte gMonIcon_Wooper - .4byte gMonIcon_Quagsire - .4byte gMonIcon_Espeon - .4byte gMonIcon_Umbreon - .4byte gMonIcon_Murkrow - .4byte gMonIcon_Slowking - .4byte gMonIcon_Misdreavus - .4byte gMonIcon_UnownA - .4byte gMonIcon_Wobbuffet - .4byte gMonIcon_Girafarig - .4byte gMonIcon_Pineco - .4byte gMonIcon_Forretress - .4byte gMonIcon_Dunsparce - .4byte gMonIcon_Gligar - .4byte gMonIcon_Steelix - .4byte gMonIcon_Snubbull - .4byte gMonIcon_Granbull - .4byte gMonIcon_Qwilfish - .4byte gMonIcon_Scizor - .4byte gMonIcon_Shuckle - .4byte gMonIcon_Heracross - .4byte gMonIcon_Sneasel - .4byte gMonIcon_Teddiursa - .4byte gMonIcon_Ursaring - .4byte gMonIcon_Slugma - .4byte gMonIcon_Magcargo - .4byte gMonIcon_Swinub - .4byte gMonIcon_Piloswine - .4byte gMonIcon_Corsola - .4byte gMonIcon_Remoraid - .4byte gMonIcon_Octillery - .4byte gMonIcon_Delibird - .4byte gMonIcon_Mantine - .4byte gMonIcon_Skarmory - .4byte gMonIcon_Houndour - .4byte gMonIcon_Houndoom - .4byte gMonIcon_Kingdra - .4byte gMonIcon_Phanpy - .4byte gMonIcon_Donphan - .4byte gMonIcon_Porygon2 - .4byte gMonIcon_Stantler - .4byte gMonIcon_Smeargle - .4byte gMonIcon_Tyrogue - .4byte gMonIcon_Hitmontop - .4byte gMonIcon_Smoochum - .4byte gMonIcon_Elekid - .4byte gMonIcon_Magby - .4byte gMonIcon_Miltank - .4byte gMonIcon_Blissey - .4byte gMonIcon_Raikou - .4byte gMonIcon_Entei - .4byte gMonIcon_Suicune - .4byte gMonIcon_Larvitar - .4byte gMonIcon_Pupitar - .4byte gMonIcon_Tyranitar - .4byte gMonIcon_Lugia - .4byte gMonIcon_HoOh - .4byte gMonIcon_Celebi - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_QuestionMark - .4byte gMonIcon_Treecko - .4byte gMonIcon_Grovyle - .4byte gMonIcon_Sceptile - .4byte gMonIcon_Torchic - .4byte gMonIcon_Combusken - .4byte gMonIcon_Blaziken - .4byte gMonIcon_Mudkip - .4byte gMonIcon_Marshtomp - .4byte gMonIcon_Swampert - .4byte gMonIcon_Poochyena - .4byte gMonIcon_Mightyena - .4byte gMonIcon_Zigzagoon - .4byte gMonIcon_Linoone - .4byte gMonIcon_Wurmple - .4byte gMonIcon_Silcoon - .4byte gMonIcon_Beautifly - .4byte gMonIcon_Cascoon - .4byte gMonIcon_Dustox - .4byte gMonIcon_Lotad - .4byte gMonIcon_Lombre - .4byte gMonIcon_Ludicolo - .4byte gMonIcon_Seedot - .4byte gMonIcon_Nuzleaf - .4byte gMonIcon_Shiftry - .4byte gMonIcon_Nincada - .4byte gMonIcon_Ninjask - .4byte gMonIcon_Shedinja - .4byte gMonIcon_Taillow - .4byte gMonIcon_Swellow - .4byte gMonIcon_Shroomish - .4byte gMonIcon_Breloom - .4byte gMonIcon_Spinda - .4byte gMonIcon_Wingull - .4byte gMonIcon_Pelipper - .4byte gMonIcon_Surskit - .4byte gMonIcon_Masquerain - .4byte gMonIcon_Wailmer - .4byte gMonIcon_Wailord - .4byte gMonIcon_Skitty - .4byte gMonIcon_Delcatty - .4byte gMonIcon_Kecleon - .4byte gMonIcon_Baltoy - .4byte gMonIcon_Claydol - .4byte gMonIcon_Nosepass - .4byte gMonIcon_Torkoal - .4byte gMonIcon_Sableye - .4byte gMonIcon_Barboach - .4byte gMonIcon_Whiscash - .4byte gMonIcon_Luvdisc - .4byte gMonIcon_Corphish - .4byte gMonIcon_Crawdaunt - .4byte gMonIcon_Feebas - .4byte gMonIcon_Milotic - .4byte gMonIcon_Carvanha - .4byte gMonIcon_Sharpedo - .4byte gMonIcon_Trapinch - .4byte gMonIcon_Vibrava - .4byte gMonIcon_Flygon - .4byte gMonIcon_Makuhita - .4byte gMonIcon_Hariyama - .4byte gMonIcon_Electrike - .4byte gMonIcon_Manectric - .4byte gMonIcon_Numel - .4byte gMonIcon_Camerupt - .4byte gMonIcon_Spheal - .4byte gMonIcon_Sealeo - .4byte gMonIcon_Walrein - .4byte gMonIcon_Cacnea - .4byte gMonIcon_Cacturne - .4byte gMonIcon_Snorunt - .4byte gMonIcon_Glalie - .4byte gMonIcon_Lunatone - .4byte gMonIcon_Solrock - .4byte gMonIcon_Azurill - .4byte gMonIcon_Spoink - .4byte gMonIcon_Grumpig - .4byte gMonIcon_Plusle - .4byte gMonIcon_Minun - .4byte gMonIcon_Mawile - .4byte gMonIcon_Meditite - .4byte gMonIcon_Medicham - .4byte gMonIcon_Swablu - .4byte gMonIcon_Altaria - .4byte gMonIcon_Wynaut - .4byte gMonIcon_Duskull - .4byte gMonIcon_Dusclops - .4byte gMonIcon_Roselia - .4byte gMonIcon_Slakoth - .4byte gMonIcon_Vigoroth - .4byte gMonIcon_Slaking - .4byte gMonIcon_Gulpin - .4byte gMonIcon_Swalot - .4byte gMonIcon_Tropius - .4byte gMonIcon_Whismur - .4byte gMonIcon_Loudred - .4byte gMonIcon_Exploud - .4byte gMonIcon_Clamperl - .4byte gMonIcon_Huntail - .4byte gMonIcon_Gorebyss - .4byte gMonIcon_Absol - .4byte gMonIcon_Shuppet - .4byte gMonIcon_Banette - .4byte gMonIcon_Seviper - .4byte gMonIcon_Zangoose - .4byte gMonIcon_Relicanth - .4byte gMonIcon_Aron - .4byte gMonIcon_Lairon - .4byte gMonIcon_Aggron - .4byte gMonIcon_Castform - .4byte gMonIcon_Volbeat - .4byte gMonIcon_Illumise - .4byte gMonIcon_Lileep - .4byte gMonIcon_Cradily - .4byte gMonIcon_Anorith - .4byte gMonIcon_Armaldo - .4byte gMonIcon_Ralts - .4byte gMonIcon_Kirlia - .4byte gMonIcon_Gardevoir - .4byte gMonIcon_Bagon - .4byte gMonIcon_Shelgon - .4byte gMonIcon_Salamence - .4byte gMonIcon_Beldum - .4byte gMonIcon_Metang - .4byte gMonIcon_Metagross - .4byte gMonIcon_Regirock - .4byte gMonIcon_Regice - .4byte gMonIcon_Registeel - .4byte gMonIcon_Kyogre - .4byte gMonIcon_Groudon - .4byte gMonIcon_Rayquaza - .4byte gMonIcon_Latias - .4byte gMonIcon_Latios - .4byte gMonIcon_Jirachi - .4byte gMonIcon_Deoxys - .4byte gMonIcon_Chimecho - .4byte gMonIcon_Egg - .4byte gMonIcon_UnownB - .4byte gMonIcon_UnownC - .4byte gMonIcon_UnownD - .4byte gMonIcon_UnownE - .4byte gMonIcon_UnownF - .4byte gMonIcon_UnownG - .4byte gMonIcon_UnownH - .4byte gMonIcon_UnownI - .4byte gMonIcon_UnownJ - .4byte gMonIcon_UnownK - .4byte gMonIcon_UnownL - .4byte gMonIcon_UnownM - .4byte gMonIcon_UnownN - .4byte gMonIcon_UnownO - .4byte gMonIcon_UnownP - .4byte gMonIcon_UnownQ - .4byte gMonIcon_UnownR - .4byte gMonIcon_UnownS - .4byte gMonIcon_UnownT - .4byte gMonIcon_UnownU - .4byte gMonIcon_UnownV - .4byte gMonIcon_UnownW - .4byte gMonIcon_UnownX - .4byte gMonIcon_UnownY - .4byte gMonIcon_UnownZ - .4byte gMonIcon_UnownExclamationMark - .4byte gMonIcon_UnownQuestionMark diff --git a/data/learn_move.s b/data/learn_move.s index bcb8aeba1..94805bacb 100644 --- a/data/learn_move.s +++ b/data/learn_move.s @@ -2,6 +2,8 @@ .include "constants/constants.inc" .section .rodata +gUnknown_085CEA18:: @ 85CEA18 + .incbin "baserom.gba", 0x5ceA18, 0x198 gUnknown_085CEBB0:: @ 85CEBB0 .incbin "baserom.gba", 0x5cebb0, 0x8 diff --git a/data/party_menu.s b/data/party_menu.s index 36ee4f960..95d9bb78e 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -166,10 +166,51 @@ gUnknown_08615AF1:: @ 8615AF1 .incbin "baserom.gba", 0x615af1, 0x3 gUnknown_08615AF4:: @ 8615AF4 - .incbin "baserom.gba", 0x615af4, 0x6c + .4byte gUnknown_085E9E43 + .4byte gUnknown_085EA010 + .4byte gUnknown_085EA02A + .4byte gUnknown_085E9E55 + .4byte gUnknown_085E9E64 + .4byte gUnknown_085E9E79 + .4byte gUnknown_085E9E8F + .4byte gUnknown_085E9EBC + .4byte gUnknown_085E9ED4 + .4byte gUnknown_085E9EE9 + .4byte gUnknown_085E9FDB + .4byte gUnknown_085EA046 + .4byte gUnknown_085EA05B + .4byte gUnknown_085E9F01 + .4byte gUnknown_085E9F58 + .4byte gUnknown_085E9F6F + .4byte gUnknown_085E9F81 + .4byte gUnknown_085E9F90 + .4byte gUnknown_085E9FA7 + .4byte gUnknown_085E9FC2 + .4byte gText_EmptyString2 + .4byte gUnknown_085E9EA6 + .4byte gUnknown_085E9F16 + .4byte gUnknown_085E9F2A + .4byte gUnknown_085E9F42 + .4byte gUnknown_085E9FF9 + .4byte gUnknown_085EA073 gUnknown_08615B60:: @ 8615B60 - .incbin "baserom.gba", 0x615b60, 0xa8 + .4byte gUnknown_085EA091 + .4byte gUnknown_085EA099 + .4byte gUnknown_085EA09E + .4byte gUnknown_085EA0A4 + .4byte gUnknown_085EA0AB + .4byte gUnknown_085EA0E7 + .4byte gUnknown_085EA0B1 + .4byte gUnknown_085EA0B6 + .4byte gUnknown_085EA0BF + .4byte gUnknown_085EA0C5 + .4byte gUnknown_085EA0CF + .4byte gUnknown_085EA0D7 + .4byte gUnknown_085EA0DC + +gUnknown_08615B94:: @ 8615B94 + .incbin "baserom.gba", 0x615b94, 0x74 gUnknown_08615C08:: @ 8615C08 .incbin "baserom.gba", 0x615c08, 0x130 @@ -187,22 +228,28 @@ gUnknown_08615D9C:: @ 8615D9C .incbin "baserom.gba", 0x615d9c, 0x70 gUnknown_08615E0C:: @ 8615E0C - .incbin "baserom.gba", 0x615e0c, 0xa4 + .incbin "baserom.gba", 0x615e0c, 0x24 + +gUnknown_08615E30:: @ 8615E30 + .incbin "baserom.gba", 0x615e30, 0x40 + +gUnknown_08615E70:: @ 8615E70 + .incbin "baserom.gba", 0x615e70, 0x40 gUnknown_08615EB0:: @ 8615EB0 - .incbin "baserom.gba", 0x615eb0, 0x8 + obj_tiles gUnknown_08615E30, 0x40, 55120 gUnknown_08615EB8:: @ 8615EB8 - .incbin "baserom.gba", 0x615eb8, 0x8 + obj_pal gUnknown_08615E70, 55120 gUnknown_08615EC0:: @ 8615EC0 .incbin "baserom.gba", 0x615ec0, 0x38 gUnknown_08615EF8:: @ 8615EF8 - .incbin "baserom.gba", 0x615ef8, 0x8 + obj_tiles gUnknown_08D96CD8, 0x400, 1200 gUnknown_08615F00:: @ 8615F00 - .incbin "baserom.gba", 0x615f00, 0x8 + obj_pal gUnknown_08D96F6C, 1200 gUnknown_08615F08:: @ 8615F08 .incbin "baserom.gba", 0x615f08, 0x68 @@ -214,10 +261,10 @@ gUnknown_08615F78:: @ 8615F78 .incbin "baserom.gba", 0x615f78, 0x80 gUnknown_08615FF8:: @ 8615FF8 - .incbin "baserom.gba", 0x615ff8, 0x8 + obj_tiles gUnknown_08D96F90, 0x400, 1202 gUnknown_08616000:: @ 8616000 - .incbin "baserom.gba", 0x616000, 0x8 + obj_pal gUnknown_08D97188, 1202 gUnknown_08616008:: @ 8616008 .incbin "baserom.gba", 0x616008, 0x18 diff --git a/data/pokedex.s b/data/pokedex.s index 3ba94dbc5..3b783be34 100644 --- a/data/pokedex.s +++ b/data/pokedex.s @@ -1,62 +1,26 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0855C6A4:: @ 855C6A4 - .incbin "baserom.gba", 0x55c6a4, 0x336 - -gUnknown_0855C9DA:: @ 855C9DA - .incbin "baserom.gba", 0x55c9da, 0x304 - -gUnknown_0855CCDE:: @ 855CCDE - .incbin "baserom.gba", 0x55ccde, 0x4b6 - -gUnknown_0855D194:: @ 855D194 - .incbin "baserom.gba", 0x55d194, 0x18 - -gUnknown_0855D1AC:: @ 855D1AC - .incbin "baserom.gba", 0x55d1ac, 0x18 - -gUnknown_0855D1C4:: @ 855D1C4 - .incbin "baserom.gba", 0x55d1c4, 0x18 - -gUnknown_0855D1DC:: @ 855D1DC - .incbin "baserom.gba", 0x55d1dc, 0x18 - -gUnknown_0855D1F4:: @ 855D1F4 - .incbin "baserom.gba", 0x55d1f4, 0x18 - -gUnknown_0855D20C:: @ 855D20C - .incbin "baserom.gba", 0x55d20c, 0x18 - -gUnknown_0855D224:: @ 855D224 - .incbin "baserom.gba", 0x55d224, 0x18 - -gUnknown_0855D23C:: @ 855D23C - .incbin "baserom.gba", 0x55d23c, 0x18 - -gUnknown_0855D254:: @ 855D254 - .incbin "baserom.gba", 0x55d254, 0x18 - -gUnknown_0855D26C:: @ 855D26C - .incbin "baserom.gba", 0x55d26c, 0x10 - -gUnknown_0855D27C:: @ 855D27C - .incbin "baserom.gba", 0x55d27c, 0x10 - -gUnknown_0855D28C:: @ 855D28C - .incbin "baserom.gba", 0x55d28c, 0x5 - -gUnknown_0855D291:: @ 855D291 - .incbin "baserom.gba", 0x55d291, 0x7 - -gUnknown_0855D298:: @ 855D298 - .incbin "baserom.gba", 0x55d298, 0x10 - -gUnknown_0855D2A8:: @ 855D2A8 - .incbin "baserom.gba", 0x55d2a8, 0x10 + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +.macro unk_dex_struct texts, a2, a3, a4 + .4byte \texts + .byte \a2, \a3, \a4 + .byte 0 @padding +.endm + +.macro unk_dex_struct_2 text, a2, a3, a4, a5, a6, a7 + .4byte \text + .byte \a2, \a3, \a4, \a5, \a6, \a7 + .2byte 0 @padding +.endm + +.macro unk_dex_struct_3 text, a2, a3, a4 + .4byte \text + .byte \a2, \a3, \a4 + .byte 0 @padding +.endm gUnknown_0855D2B8:: @ 855D2B8 .incbin "baserom.gba", 0x55d2b8, 0x6 @@ -64,8 +28,10 @@ gUnknown_0855D2B8:: @ 855D2B8 gUnknown_0855D2BE:: @ 855D2BE .incbin "baserom.gba", 0x55d2be, 0x40 -gUnknown_0855D2FE:: @ 855D2FE - .incbin "baserom.gba", 0x55d2fe, 0xe +sText_TenDashes:: @ 855D2FE + .string "----------$" + +.align 2 gUnknown_0855D30C:: @ 855D30C .string "$" @@ -101,10 +67,18 @@ gUnknown_0856ED08:: @ 856ED08 .incbin "baserom.gba", 0x56ed08, 0x28 gUnknown_0856ED30:: @ 856ED30 - .incbin "baserom.gba", 0x56ed30, 0x18 + unk_dex_struct_3 gUnknown_085E87A5, 0, 0, 5 + unk_dex_struct_3 gUnknown_085E87D6, 6, 0, 5 + unk_dex_struct_3 gUnknown_085E87EF, 12, 0, 5 gUnknown_0856ED48:: @ 856ED48 - .incbin "baserom.gba", 0x56ed48, 0x54 + unk_dex_struct_2 gUnknown_085E8840, 0, 2, 5, 5, 2, 12 + unk_dex_struct_2 gUnknown_085E887C, 0, 4, 5, 5, 4, 12 + unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 5, 6, 6 + unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 11, 6, 6 + unk_dex_struct_2 gUnknown_085E881F, 0, 8, 5, 5, 8, 12 + unk_dex_struct_2 gUnknown_085E8806, 0, 10, 5, 5, 10, 12 + unk_dex_struct_2 gUnknown_085E88C8, 0, 12, 5, 0, 0, 0 gUnknown_0856ED9C:: @ 856ED9C .incbin "baserom.gba", 0x56ed9c, 0x1c @@ -119,19 +93,119 @@ gUnknown_0856EDF0:: @ 856EDF0 .incbin "baserom.gba", 0x56edf0, 0x1c gUnknown_0856EE0C:: @ 856EE0C - .incbin "baserom.gba", 0x56ee0c, 0x18 + .4byte gUnknown_085E89A4 + .4byte gUnknown_085E88DF + .4byte gUnknown_085E89BB + .4byte gUnknown_085E88E9 + .4byte NULL + .4byte NULL gUnknown_0856EE24:: @ 856EE24 - .incbin "baserom.gba", 0x56ee24, 0x38 + .4byte gUnknown_085E89D4 + .4byte gUnknown_085E88F6 + .4byte gUnknown_085E8A02 + .4byte gUnknown_085E8905 + .4byte gUnknown_085E8A37 + .4byte gUnknown_085E8911 + .4byte gUnknown_085E8A73 + .4byte gUnknown_085E891F + .4byte gUnknown_085E8AAF + .4byte gUnknown_085E892D + .4byte gUnknown_085E8AEA + .4byte gUnknown_085E893A + .4byte 0 + .4byte 0 gUnknown_0856EE5C:: @ 856EE5C - .incbin "baserom.gba", 0x56ee5c, 0x58 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8B26 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8948 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E894C + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8950 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8954 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8958 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E895C + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8960 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8964 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8968 + .4byte 0 + .4byte 0 gUnknown_0856EEB4:: @ 856EEB4 - .incbin "baserom.gba", 0x56eeb4, 0x60 - + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8B26 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E896B + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E896F + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8974 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E897B + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8981 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8987 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E898D + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8994 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8999 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E899F + .4byte 0 + .4byte 0 + +@ read from type table for each type except ???, entry is 7 byte of length gUnknown_0856EF14:: @ 856EF14 - .incbin "baserom.gba", 0x56ef14, 0x98 + .4byte gUnknown_085E8B25 + .4byte gUnknown_085E8B35 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 0 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 7 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 14 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 21 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 28 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 35 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 42 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 49 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 56 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 70 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 77 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 84 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 91 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 98 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 105 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 112 + .4byte gUnknown_085E8B25 + .4byte gTypeNames + 119 + .4byte 0 + .4byte 0 gUnknown_0856EFAC:: @ 856EFAC .incbin "baserom.gba", 0x56efac, 0x2 @@ -143,7 +217,12 @@ gUnknown_0856EFB4:: @ 856EFB4 .incbin "baserom.gba", 0x56efb4, 0x14 gUnknown_0856EFC8:: @ 856EFC8 - .incbin "baserom.gba", 0x56efc8, 0x30 + unk_dex_struct gUnknown_0856EE5C, 6, 7, 10 + unk_dex_struct gUnknown_0856EEB4, 8, 9, 11 + unk_dex_struct gUnknown_0856EF14, 10,11, 18 + unk_dex_struct gUnknown_0856EF14, 12, 13, 18 + unk_dex_struct gUnknown_0856EE24, 4, 5, 6 + unk_dex_struct gUnknown_0856EE0C, 2, 3, 2 gUnknown_0856EFF8:: @ 856EFF8 .incbin "baserom.gba", 0x56eff8, 0x10 diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s new file mode 100644 index 000000000..e55f03fab --- /dev/null +++ b/data/pokedex_area_screen.s @@ -0,0 +1,92 @@ +#include "constants/flags.h" +#include "constants/region_map_sections.h" +#include "constants/species.h" + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_085B3D94:: @ 85B3D94 + .incbin "graphics/pokedex/area_glow.gbapal" + + .align 2 +gUnknown_085B3DB4:: @ 85B3DB4 + .incbin "graphics/pokedex/area_glow.4bpp.lz" + + .align 1 +gUnknown_085B3EE8:: @ 85B3EE8 + .2byte 0x0168 + + .align 1 +gUnknown_085B3EEA:: @ 85B3EEA + .2byte MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_TERRA_CAVE + + .align 1 +gUnknown_085B3EF0:: @ 85B3EF0 + .2byte SPECIES_FEEBAS, 0x0000, 0x0022 + .2byte SPECIES_EGG, 0x0000, 0x0000 + + .align 1 +gUnknown_085B3EFC:: @ 85B3EFC + .2byte MAPSEC_SKY_PILLAR, FLAG_LANDMARK_SKY_PILLAR + .2byte MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN + .2byte MAPSEC_ALTERING_CAVE_2, FLAG_LANDMARK_ALTERING_CAVE + .2byte MAPSEC_MIRAGE_TOWER, FLAG_LANDMARK_MIRAGE_TOWER + .2byte MAPSEC_DESERT_UNDERPASS, FLAG_LANDMARK_DESERT_UNDERPASS + .2byte MAPSEC_ARTISAN_CAVE, FLAG_0x8DF + .2byte MAPSEC_NONE, 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 AreaMarkerTiles, 0x0080, 0x0002 + + .align 2 +gUnknown_085B4024:: @ 85B4024 + obj_pal AreaMarkerPalette, 0x0002 + + .align 2 +gUnknown_085B402C:: @ 85B402C + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0400 + + .align 2 +gUnknown_085B4034:: @ 85B4034 + spr_template 0x0002, 0x0002, gUnknown_085B402C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +AreaMarkerPalette:: @ 85B404C + .incbin "graphics/pokedex/area_marker.gbapal" + + .align 2 +AreaMarkerTiles:: @ 85B406C + .incbin "graphics/pokedex/area_marker.4bpp" + + .align 2 +gUnknown_085B40EC:: @ 85B40EC + obj_pal gUnknown_08DC4120, 0x0003 + + .align 2 +gOamData_85B40F4:: @ 85B40F4 + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0400 + + .align 2 +gSpriteTemplate_85B40FC:: @ 85B40FC + spr_template 0x0003, 0x0003, gOamData_85B40F4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s new file mode 100644 index 000000000..4b84c3ece --- /dev/null +++ b/data/pokedex_cry_screen.s @@ -0,0 +1,110 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +CryMeterNeedlePalette: @ 85B7B58 + .incbin "graphics/pokedex/cry_meter_needle.gbapal" + + .align 2 +CryMeterNeedleTiles: @ 85B7B78 + .incbin "graphics/pokedex/cry_meter_needle.4bpp" + + .align 1 +gUnknown_085B8378:: @ 85B8378 + .incbin "graphics/pokedex/cry_meter_map.bin" + + .align 1 +gUnknown_085B8418:: @ 85B8418 + .incbin "graphics/pokedex/cry_meter.gbapal" + + .align 2 +gUnknown_085B8438:: @ 85B8438 + .incbin "graphics/pokedex/cry_meter.4bpp.lz" + + .align 1 +gUnknown_085B8770:: @ 85B8770 + .2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C + .2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C + .2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D + .2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D + .2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E + .2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E + .2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F + .2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F + + .align 1 +gUnknown_085B8BF0:: @ 85B8BF0 + .incbin "graphics/pokedex/85B8BF0.gbapal" + +gUnknown_085B8C10:: @ 85B8C10 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 + +gUnknown_085B8C30:: @ 85B8C30 + .byte 0xF0, 0x0F + +gUnknown_085B8C32:: @ 85B8C32 + .byte 0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F + .byte 0xF0,0xE0,0xD0,0xC0,0xB0,0xA0,0x90,0x80,0x80,0x90,0xA0,0xB0,0xC0,0xD0,0xE0,0xF0 + + .align 2 +gSpriteAnim_85B8C54:: @ 85B8C54 + obj_image_anim_frame 0, 30 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B8C5C:: @ 85B8C5C + .4byte gSpriteAnim_85B8C54 + + .align 2 +gOamData_85B8C60:: @ 85B8C60 + .2byte 0x01A0 + .2byte 0xC000 + .2byte 0x0400 + + .align 2 +gUnknown_085B8C68:: @ 85B8C68 + spr_template 8192, 8192, gOamData_85B8C60, gSpriteAnimTable_85B8C5C, NULL, gDummySpriteAffineAnimTable, sub_814596C + + .align 2 +gCryMeterNeedleSpriteSheets:: @ 85B8C80 + obj_tiles CryMeterNeedleTiles, 0x800, 8192 + null_obj_tiles + + .align 2 +gCryMeterNeedleSpritePalettes:: @ 85B8C90 + obj_pal CryMeterNeedlePalette, 8192 + null_obj_pal diff --git a/data/pokedex_entries.inc b/data/pokedex_entries.inc index 76eedf023..ce98a7b26 100644 --- a/data/pokedex_entries.inc +++ b/data/pokedex_entries.inc @@ -1,11 +1,11 @@ .align 2 gPokedexEntries:: @ 856B5B0 .string "UNKNOWN$", 12 - pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0 + pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0 .string "SEED$", 12 pokedex_entry 7, 69, gBulbasaurPokedexText, 356, 17, 256, 0 .string "SEED$", 12 - pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0 + pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0 .string "SEED$", 12 pokedex_entry 20, 1000, gVenusaurPokedexText, 256, 0, 388, 6 .string "LIZARD$", 12 @@ -23,37 +23,37 @@ gPokedexEntries:: @ 856B5B0 .string "WORM$", 12 pokedex_entry 3, 29, gCaterpiePokedexText, 549, 22, 256, 0 .string "COCOON$", 12 - pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0 + pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0 .string "BUTTERFLY$", 12 pokedex_entry 11, 320, gButterfreePokedexText, 312, 2, 256, 0 .string "HAIRY BUG$", 12 - pokedex_entry 3, 32, gWeedlePokedexText, 455, 22, 256, 0 + pokedex_entry 3, 32, gWeedlePokedexText, 455, 22, 256, 0 .string "COCOON$", 12 - pokedex_entry 6, 100, gKakunaPokedexText, 424, 17, 256, 0 + pokedex_entry 6, 100, gKakunaPokedexText, 424, 17, 256, 0 .string "POISON BEE$", 12 pokedex_entry 10, 295, gBeedrillPokedexText, 366, 2, 256, 0 .string "TINY BIRD$", 12 - pokedex_entry 3, 18, gPidgeyPokedexText, 508, -3, 256, 0 + pokedex_entry 3, 18, gPidgeyPokedexText, 508, -3, 256, 0 .string "BIRD$", 12 pokedex_entry 11, 300, gPidgeottoPokedexText, 331, 10, 256, 0 .string "BIRD$", 12 - pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0 + pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0 .string "MOUSE$", 12 - pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0 + pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0 .string "MOUSE$", 12 pokedex_entry 7, 185, gRaticatePokedexText, 459, 18, 256, 0 .string "TINY BIRD$", 12 - pokedex_entry 3, 20, gSpearowPokedexText, 571, 22, 256, 0 + pokedex_entry 3, 20, gSpearowPokedexText, 571, 22, 256, 0 .string "BEAK$", 12 - pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0 + pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0 .string "SNAKE$", 12 - pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0 + pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0 .string "COBRA$", 12 - pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2 + pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2 .string "MOUSE$", 12 - pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0 + pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0 .string "MOUSE$", 12 - pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0 + pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0 .string "MOUSE$", 12 pokedex_entry 6, 120, gSandshrewPokedexText, 365, 18, 256, 0 .string "MOUSE$", 12 @@ -75,7 +75,7 @@ gPokedexEntries:: @ 856B5B0 .string "FAIRY$", 12 pokedex_entry 13, 400, gClefablePokedexText, 256, 5, 256, 0 .string "FOX$", 12 - pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0 + pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0 .string "FOX$", 12 pokedex_entry 11, 199, gNinetalesPokedexText, 339, 10, 256, 0 .string "BALLOON$", 12 @@ -83,37 +83,37 @@ gPokedexEntries:: @ 856B5B0 .string "BALLOON$", 12 pokedex_entry 10, 120, gWigglytuffPokedexText, 328, 11, 256, 0 .string "BAT$", 12 - pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0 + pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0 .string "BAT$", 12 - pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0 + pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0 .string "WEED$", 12 - pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0 + pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0 .string "WEED$", 12 - pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0 + pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0 .string "FLOWER$", 12 pokedex_entry 12, 186, gVileplumePokedexText, 256, 4, 256, 0 .string "MUSHROOM$", 12 - pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0 + pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0 .string "MUSHROOM$", 12 pokedex_entry 10, 295, gParasectPokedexText, 307, 8, 256, 0 .string "INSECT$", 12 - pokedex_entry 10, 300, gVenonatPokedexText, 360, 0, 256, -1 + pokedex_entry 10, 300, gVenonatPokedexText, 360, 0, 256, -1 .string "POISON MOTH$", 12 pokedex_entry 15, 125, gVenomothPokedexText, 285, 2, 256, 1 .string "MOLE$", 12 - pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0 + pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0 .string "MOLE$", 12 - pokedex_entry 7, 333, gDugtrioPokedexText, 406, 18, 256, 0 + pokedex_entry 7, 333, gDugtrioPokedexText, 406, 18, 256, 0 .string "SCRATCH CAT$", 12 - pokedex_entry 4, 42, gMeowthPokedexText, 480, 19, 256, 0 + pokedex_entry 4, 42, gMeowthPokedexText, 480, 19, 256, 0 .string "CLASSY CAT$", 12 - pokedex_entry 10, 320, gPersianPokedexText, 320, 10, 256, 0 + pokedex_entry 10, 320, gPersianPokedexText, 320, 10, 256, 0 .string "DUCK$", 12 - pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0 + pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0 .string "DUCK$", 12 - pokedex_entry 17, 766, gGolduckPokedexText, 256, 1, 273, 1 + pokedex_entry 17, 766, gGolduckPokedexText, 256, 1, 273, 1 .string "PIG MONKEY$", 12 - pokedex_entry 5, 280, gMankeyPokedexText, 404, 19, 256, 0 + pokedex_entry 5, 280, gMankeyPokedexText, 404, 19, 256, 0 .string "PIG MONKEY$", 12 pokedex_entry 10, 320, gPrimeapePokedexText, 326, 10, 256, 0 .string "PUPPY$", 12 @@ -121,23 +121,23 @@ gPokedexEntries:: @ 856B5B0 .string "LEGENDARY$", 12 pokedex_entry 19, 1550, gArcaninePokedexText, 256, 1, 312, 4 .string "TADPOLE$", 12 - pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0 + pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0 .string "TADPOLE$", 12 pokedex_entry 10, 200, gPoliwhirlPokedexText, 288, 11, 256, 0 .string "TADPOLE$", 12 pokedex_entry 13, 540, gPoliwrathPokedexText, 256, 6, 256, 0 .string "PSI$", 12 - pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0 + pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0 .string "PSI$", 12 - pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0 + pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0 .string "PSI$", 12 pokedex_entry 15, 480, gAlakazamPokedexText, 256, 3, 256, 0 .string "SUPERPOWER$", 12 - pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0 + pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0 .string "SUPERPOWER$", 12 - pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0 + pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0 .string "SUPERPOWER$", 12 - pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1 + pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1 .string "FLOWER$", 12 pokedex_entry 7, 40, gBellsproutPokedexText, 354, 16, 256, 0 .string "FLYCATCHER$", 12 @@ -149,19 +149,19 @@ gPokedexEntries:: @ 856B5B0 .string "JELLYFISH$", 12 pokedex_entry 16, 550, gTentacruelPokedexText, 256, 0, 312, 1 .string "ROCK$", 12 - pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0 + pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0 .string "ROCK$", 12 pokedex_entry 10, 1050, gGravelerPokedexText, 256, 2, 256, 0 .string "MEGATON$", 12 - pokedex_entry 14, 3000, gGolemPokedexText, 256, 3, 296, 2 + pokedex_entry 14, 3000, gGolemPokedexText, 256, 3, 296, 2 .string "FIRE HORSE$", 12 - pokedex_entry 10, 300, gPonytaPokedexText, 283, 8, 256, 0 + pokedex_entry 10, 300, gPonytaPokedexText, 283, 8, 256, 0 .string "FIRE HORSE$", 12 pokedex_entry 17, 950, gRapidashPokedexText, 256, 0, 289, 1 .string "DOPEY$", 12 pokedex_entry 12, 360, gSlowpokePokedexText, 256, 10, 256, 0 .string "HERMIT CRAB$", 12 - pokedex_entry 16, 785, gSlowbroPokedexText, 256, 6, 296, 2 + pokedex_entry 16, 785, gSlowbroPokedexText, 256, 6, 296, 2 .string "MAGNET$", 12 pokedex_entry 3, 60, gMagnemitePokedexText, 288, -9, 256, 0 .string "MAGNET$", 12 @@ -169,39 +169,39 @@ gPokedexEntries:: @ 856B5B0 .string "WILD DUCK$", 12 pokedex_entry 8, 150, gFarfetchdPokedexText, 330, 2, 293, 2 .string "TWIN BIRD$", 12 - pokedex_entry 14, 392, gDoduoPokedexText, 256, 3, 257, -1 + pokedex_entry 14, 392, gDoduoPokedexText, 256, 3, 257, -1 .string "TRIPLE BIRD$", 12 - pokedex_entry 18, 852, gDodrioPokedexText, 256, 0, 268, 0 + pokedex_entry 18, 852, gDodrioPokedexText, 256, 0, 268, 0 .string "SEA LION$", 12 - pokedex_entry 11, 900, gSeelPokedexText, 297, 8, 256, 0 + pokedex_entry 11, 900, gSeelPokedexText, 297, 8, 256, 0 .string "SEA LION$", 12 - pokedex_entry 17, 1200, gDewgongPokedexText, 256, 0, 275, 0 + pokedex_entry 17, 1200, gDewgongPokedexText, 256, 0, 275, 0 .string "SLUDGE$", 12 - pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0 + pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0 .string "SLUDGE$", 12 - pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0 + pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0 .string "BIVALVE$", 12 pokedex_entry 3, 40, gShellderPokedexText, 675, 24, 256, 0 .string "BIVALVE$", 12 pokedex_entry 15, 1325, gCloysterPokedexText, 256, 0, 269, 1 .string "GAS$", 12 - pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0 + pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0 .string "GAS$", 12 - pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2 + pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2 .string "SHADOW$", 12 - pokedex_entry 15, 405, gGengarPokedexText, 256, 2, 302, 2 + pokedex_entry 15, 405, gGengarPokedexText, 256, 2, 302, 2 .string "ROCK SNAKE$", 12 - pokedex_entry 88, 2100, gOnixPokedexText, 256, 1, 515, 14 + pokedex_entry 88, 2100, gOnixPokedexText, 256, 1, 515, 14 .string "HYPNOSIS$", 12 - pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0 + pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0 .string "HYPNOSIS$", 12 - pokedex_entry 16, 756, gHypnoPokedexText, 256, 3, 257, 0 + pokedex_entry 16, 756, gHypnoPokedexText, 256, 3, 257, 0 .string "RIVER CRAB$", 12 - pokedex_entry 4, 65, gKrabbyPokedexText, 469, 20, 256, 0 + pokedex_entry 4, 65, gKrabbyPokedexText, 469, 20, 256, 0 .string "PINCER$", 12 - pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0 + pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0 .string "BALL$", 12 - pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0 + pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0 .string "BALL$", 12 pokedex_entry 12, 666, gElectrodePokedexText, 256, 0, 256, 0 .string "EGG$", 12 @@ -209,9 +209,9 @@ gPokedexEntries:: @ 856B5B0 .string "COCONUT$", 12 pokedex_entry 20, 1200, gExeggutorPokedexText, 256, 0, 309, 5 .string "LONELY$", 12 - pokedex_entry 4, 65, gCubonePokedexText, 545, 21, 256, 0 + pokedex_entry 4, 65, gCubonePokedexText, 545, 21, 256, 0 .string "BONE KEEPER$", 12 - pokedex_entry 10, 450, gMarowakPokedexText, 293, 12, 256, 0 + pokedex_entry 10, 450, gMarowakPokedexText, 293, 12, 256, 0 .string "KICKING$", 12 pokedex_entry 15, 498, gHitmonleePokedexText, 256, 3, 259, 1 .string "PUNCHING$", 12 @@ -219,101 +219,101 @@ gPokedexEntries:: @ 856B5B0 .string "LICKING$", 12 pokedex_entry 12, 655, gLickitungPokedexText, 256, 4, 256, 0 .string "POISON GAS$", 12 - pokedex_entry 6, 10, gKoffingPokedexText, 369, -1, 256, 0 + pokedex_entry 6, 10, gKoffingPokedexText, 369, -1, 256, 0 .string "POISON GAS$", 12 - pokedex_entry 12, 95, gWeezingPokedexText, 305, 3, 256, 0 + pokedex_entry 12, 95, gWeezingPokedexText, 305, 3, 256, 0 .string "SPIKES$", 12 - pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0 + pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0 .string "DRILL$", 12 - pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2 + pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2 .string "EGG$", 12 - pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0 + pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0 .string "VINE$", 12 - pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0 + pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0 .string "PARENT$", 12 pokedex_entry 22, 800, gKangaskhanPokedexText, 256, 0, 387, 8 .string "DRAGON$", 12 - pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0 + pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0 .string "DRAGON$", 12 - pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0 + pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0 .string "GOLDFISH$", 12 - pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0 + pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0 .string "GOLDFISH$", 12 - pokedex_entry 13, 390, gSeakingPokedexText, 256, 3, 256, 0 + pokedex_entry 13, 390, gSeakingPokedexText, 256, 3, 256, 0 .string "STAR SHAPE$", 12 - pokedex_entry 8, 345, gStaryuPokedexText, 326, 1, 256, 0 + pokedex_entry 8, 345, gStaryuPokedexText, 326, 1, 256, 0 .string "MYSTERIOUS$", 12 - pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0 + pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0 .string "BARRIER$", 12 - pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0 + pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0 .string "MANTIS$", 12 - pokedex_entry 15, 560, gScytherPokedexText, 256, 1, 293, 2 + pokedex_entry 15, 560, gScytherPokedexText, 256, 1, 293, 2 .string "HUMAN SHAPE$", 12 - pokedex_entry 14, 406, gJynxPokedexText, 256, 3, 300, 1 + pokedex_entry 14, 406, gJynxPokedexText, 256, 3, 300, 1 .string "ELECTRIC$", 12 pokedex_entry 11, 300, gElectabuzzPokedexText, 351, 8, 256, 0 .string "SPITFIRE$", 12 - pokedex_entry 13, 445, gMagmarPokedexText, 277, 5, 256, 0 + pokedex_entry 13, 445, gMagmarPokedexText, 277, 5, 256, 0 .string "STAG BEETLE$", 12 - pokedex_entry 15, 550, gPinsirPokedexText, 256, 2, 257, 0 + pokedex_entry 15, 550, gPinsirPokedexText, 256, 2, 257, 0 .string "WILD BULL$", 12 - pokedex_entry 14, 884, gTaurosPokedexText, 256, 0, 256, 0 + pokedex_entry 14, 884, gTaurosPokedexText, 256, 0, 256, 0 .string "FISH$", 12 pokedex_entry 9, 100, gMagikarpPokedexText, 310, 4, 256, 0 .string "ATROCIOUS$", 12 pokedex_entry 65, 2350, gGyaradosPokedexText, 256, 6, 481, 13 .string "TRANSPORT$", 12 - pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8 + pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8 .string "TRANSFORM$", 12 - pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0 + pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0 .string "EVOLUTION$", 12 - pokedex_entry 3, 65, gEeveePokedexText, 476, 18, 256, 0 + pokedex_entry 3, 65, gEeveePokedexText, 476, 18, 256, 0 .string "BUBBLE JET$", 12 pokedex_entry 10, 290, gVaporeonPokedexText, 316, 8, 256, 0 .string "LIGHTNING$", 12 - pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0 + pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0 .string "FLAME$", 12 - pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0 + pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0 .string "VIRTUAL$", 12 - pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0 + pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0 .string "SPIRAL$", 12 - pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0 + pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0 .string "SPIRAL$", 12 - pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0 + pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0 .string "SHELLFISH$", 12 - pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0 + pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0 .string "SHELLFISH$", 12 pokedex_entry 13, 405, gKabutopsPokedexText, 271, 3, 256, 0 .string "FOSSIL$", 12 pokedex_entry 18, 590, gAerodactylPokedexText, 256, 0, 302, 4 .string "SLEEPING$", 12 - pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11 + pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11 .string "FREEZE$", 12 pokedex_entry 17, 554, gArticunoPokedexText, 256, 0, 309, 2 .string "ELECTRIC$", 12 - pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3 + pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3 .string "FLAME$", 12 - pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8 + pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8 .string "DRAGON$", 12 - pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6 + pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6 .string "DRAGON$", 12 pokedex_entry 40, 165, gDragonairPokedexText, 256, 0, 411, 5 .string "DRAGON$", 12 pokedex_entry 22, 2100, gDragonitePokedexText, 256, 0, 309, 4 .string "GENETIC$", 12 - pokedex_entry 20, 1220, gMewtwoPokedexText, 256, 0, 309, 4 + pokedex_entry 20, 1220, gMewtwoPokedexText, 256, 0, 309, 4 .string "NEW SPECIES$", 12 - pokedex_entry 4, 40, gMewPokedexText, 457, -2, 256, 0 + pokedex_entry 4, 40, gMewPokedexText, 457, -2, 256, 0 .string "LEAF$", 12 pokedex_entry 9, 64, gChikoritaPokedexText, 512, 20, 256, 0 .string "LEAF$", 12 - pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0 + pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0 .string "HERB$", 12 pokedex_entry 18, 1005, gMeganiumPokedexText, 256, 0, 277, 1 .string "FIRE MOUSE$", 12 pokedex_entry 5, 79, gCyndaquilPokedexText, 539, 21, 256, 0 .string "VOLCANO$", 12 - pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0 + pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0 .string "VOLCANO$", 12 pokedex_entry 17, 795, gTyphlosionPokedexText, 256, 0, 268, 1 .string "BIG JAW$", 12 @@ -323,51 +323,51 @@ gPokedexEntries:: @ 856B5B0 .string "BIG JAW$", 12 pokedex_entry 23, 888, gFeraligatrPokedexText, 256, 0, 342, 7 .string "SCOUT$", 12 - pokedex_entry 8, 60, gSentretPokedexText, 439, 12, 256, 0 + pokedex_entry 8, 60, gSentretPokedexText, 439, 12, 256, 0 .string "LONG BODY$", 12 - pokedex_entry 18, 325, gFurretPokedexText, 346, 11, 256, 0 + pokedex_entry 18, 325, gFurretPokedexText, 346, 11, 256, 0 .string "OWL$", 12 pokedex_entry 7, 212, gHoothootPokedexText, 380, -2, 256, 0 .string "OWL$", 12 - pokedex_entry 16, 408, gNoctowlPokedexText, 278, 3, 256, 0 + pokedex_entry 16, 408, gNoctowlPokedexText, 278, 3, 256, 0 .string "FIVE STAR$", 12 - pokedex_entry 10, 108, gLedybaPokedexText, 256, 4, 256, 0 + pokedex_entry 10, 108, gLedybaPokedexText, 256, 4, 256, 0 .string "FIVE STAR$", 12 - pokedex_entry 14, 356, gLedianPokedexText, 256, 2, 256, 0 + pokedex_entry 14, 356, gLedianPokedexText, 256, 2, 256, 0 .string "STRING SPIT$", 12 pokedex_entry 5, 85, gSpinarakPokedexText, 414, 21, 256, 0 .string "LONG LEG$", 12 - pokedex_entry 11, 335, gAriadosPokedexText, 316, 8, 256, 0 + pokedex_entry 11, 335, gAriadosPokedexText, 316, 8, 256, 0 .string "BAT$", 12 - pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1 + pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1 .string "ANGLER$", 12 pokedex_entry 5, 120, gChinchouPokedexText, 424, -2, 256, 0 .string "LIGHT$", 12 - pokedex_entry 12, 225, gLanturnPokedexText, 269, 6, 256, 0 + pokedex_entry 12, 225, gLanturnPokedexText, 269, 6, 256, 0 .string "TINY MOUSE$", 12 - pokedex_entry 3, 20, gPichuPokedexText, 508, 20, 256, 0 + pokedex_entry 3, 20, gPichuPokedexText, 508, 20, 256, 0 .string "STAR SHAPE$", 12 - pokedex_entry 3, 30, gCleffaPokedexText, 462, 23, 256, 0 + pokedex_entry 3, 30, gCleffaPokedexText, 462, 23, 256, 0 .string "BALLOON$", 12 pokedex_entry 3, 10, gIgglybuffPokedexText, 457, -1, 256, 0 .string "SPIKE BALL$", 12 - pokedex_entry 3, 15, gTogepiPokedexText, 507, 23, 256, 0 + pokedex_entry 3, 15, gTogepiPokedexText, 507, 23, 256, 0 .string "HAPPINESS$", 12 - pokedex_entry 6, 32, gTogeticPokedexText, 424, 17, 256, 0 + pokedex_entry 6, 32, gTogeticPokedexText, 424, 17, 256, 0 .string "TINY BIRD$", 12 - pokedex_entry 2, 20, gNatuPokedexText, 610, 25, 256, 0 + pokedex_entry 2, 20, gNatuPokedexText, 610, 25, 256, 0 .string "MYSTIC$", 12 - pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4 + pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4 .string "WOOL$", 12 - pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0 + pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0 .string "WOOL$", 12 - pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0 + pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0 .string "LIGHT$", 12 pokedex_entry 14, 615, gAmpharosPokedexText, 256, 4, 256, 0 .string "FLOWER$", 12 pokedex_entry 4, 58, gBellossomPokedexText, 472, 21, 256, 0 .string "AQUA MOUSE$", 12 - pokedex_entry 4, 85, gMarillPokedexText, 476, 20, 256, 0 + pokedex_entry 4, 85, gMarillPokedexText, 476, 20, 256, 0 .string "AQUA RABBIT$", 12 pokedex_entry 8, 285, gAzumarillPokedexText, 448, 16, 256, 0 .string "IMITATION$", 12 @@ -375,49 +375,49 @@ gPokedexEntries:: @ 856B5B0 .string "FROG$", 12 pokedex_entry 11, 339, gPolitoedPokedexText, 289, 6, 256, 0 .string "COTTONWEED$", 12 - pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0 + pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0 .string "COTTONWEED$", 12 pokedex_entry 6, 10, gSkiploomPokedexText, 387, 0, 256, 0 .string "COTTONWEED$", 12 pokedex_entry 8, 30, gJumpluffPokedexText, 418, -4, 256, 0 .string "LONG TAIL$", 12 - pokedex_entry 8, 115, gAipomPokedexText, 363, 6, 256, 0 + pokedex_entry 8, 115, gAipomPokedexText, 363, 6, 256, 0 .string "SEED$", 12 - pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0 + pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0 .string "SUN$", 12 pokedex_entry 8, 85, gSunfloraPokedexText, 444, 15, 256, 0 .string "CLEAR WING$", 12 - pokedex_entry 12, 380, gYanmaPokedexText, 274, -1, 256, 0 + pokedex_entry 12, 380, gYanmaPokedexText, 274, -1, 256, 0 .string "WATER FISH$", 12 - pokedex_entry 4, 85, gWooperPokedexText, 479, 21, 256, 0 + pokedex_entry 4, 85, gWooperPokedexText, 479, 21, 256, 0 .string "WATER FISH$", 12 pokedex_entry 14, 750, gQuagsirePokedexText, 256, 4, 256, 0 .string "SUN$", 12 - pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0 + pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0 .string "MOONLIGHT$", 12 - pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0 + pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0 .string "DARKNESS$", 12 - pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1 + pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1 .string "ROYAL$", 12 pokedex_entry 20, 795, gSlowkingPokedexText, 256, 0, 309, 5 .string "SCREECH$", 12 pokedex_entry 7, 10, gMisdreavusPokedexText, 407, -8, 256, 0 .string "SYMBOL$", 12 - pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0 + pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0 .string "PATIENT$", 12 pokedex_entry 13, 285, gWobbuffetPokedexText, 274, 4, 256, 0 .string "LONG NECK$", 12 pokedex_entry 15, 415, gGirafarigPokedexText, 281, 1, 256, 0 .string "BAGWORM$", 12 - pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0 + pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0 .string "BAGWORM$", 12 pokedex_entry 12, 1258, gForretressPokedexText, 293, 5, 256, 0 .string "LAND SNAKE$", 12 pokedex_entry 15, 140, gDunsparcePokedexText, 316, 17, 256, 0 .string "FLYSCORPION$", 12 - pokedex_entry 11, 648, gGligarPokedexText, 350, -1, 256, 0 + pokedex_entry 11, 648, gGligarPokedexText, 350, -1, 256, 0 .string "IRON SNAKE$", 12 - pokedex_entry 92, 4000, gSteelixPokedexText, 256, 0, 516, 13 + pokedex_entry 92, 4000, gSteelixPokedexText, 256, 0, 516, 13 .string "FAIRY$", 12 pokedex_entry 6, 78, gSnubbullPokedexText, 465, 19, 256, 0 .string "FAIRY$", 12 @@ -425,27 +425,27 @@ gPokedexEntries:: @ 856B5B0 .string "BALLOON$", 12 pokedex_entry 5, 39, gQwilfishPokedexText, 430, 0, 256, 0 .string "PINCER$", 12 - pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0 + pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0 .string "MOLD$", 12 - pokedex_entry 6, 205, gShucklePokedexText, 485, 18, 256, 0 + pokedex_entry 6, 205, gShucklePokedexText, 485, 18, 256, 0 .string "SINGLE HORN$", 12 pokedex_entry 15, 540, gHeracrossPokedexText, 256, 0, 256, 0 .string "SHARP CLAW$", 12 - pokedex_entry 9, 280, gSneaselPokedexText, 413, -3, 256, 0 + pokedex_entry 9, 280, gSneaselPokedexText, 413, -3, 256, 0 .string "LITTLE BEAR$", 12 pokedex_entry 6, 88, gTeddiursaPokedexText, 455, 19, 256, 0 .string "HIBERNATOR$", 12 pokedex_entry 18, 1258, gUrsaringPokedexText, 256, 0, 256, 0 .string "LAVA$", 12 - pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0 + pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0 .string "LAVA$", 12 pokedex_entry 8, 550, gMagcargoPokedexText, 332, 15, 256, 0 .string "PIG$", 12 - pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0 + pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0 .string "SWINE$", 12 pokedex_entry 11, 558, gPiloswinePokedexText, 306, 10, 256, 0 .string "CORAL$", 12 - pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0 + pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0 .string "JET$", 12 pokedex_entry 6, 120, gRemoraidPokedexText, 316, 4, 256, 0 .string "JET$", 12 @@ -453,7 +453,7 @@ gPokedexEntries:: @ 856B5B0 .string "DELIVERY$", 12 pokedex_entry 9, 160, gDelibirdPokedexText, 293, 11, 256, 0 .string "KITE$", 12 - pokedex_entry 21, 2200, gMantinePokedexText, 256, 0, 342, 7 + pokedex_entry 21, 2200, gMantinePokedexText, 256, 0, 342, 7 .string "ARMOR BIRD$", 12 pokedex_entry 17, 505, gSkarmoryPokedexText, 256, 0, 271, 1 .string "DARK$", 12 @@ -461,11 +461,11 @@ gPokedexEntries:: @ 856B5B0 .string "DARK$", 12 pokedex_entry 14, 350, gHoundoomPokedexText, 256, 4, 256, 0 .string "DRAGON$", 12 - pokedex_entry 18, 1520, gKingdraPokedexText, 256, 0, 287, 0 + pokedex_entry 18, 1520, gKingdraPokedexText, 256, 0, 287, 0 .string "LONG NOSE$", 12 - pokedex_entry 5, 335, gPhanpyPokedexText, 465, 21, 256, 0 + pokedex_entry 5, 335, gPhanpyPokedexText, 465, 21, 256, 0 .string "ARMOR$", 12 - pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0 + pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0 .string "VIRTUAL$", 12 pokedex_entry 6, 325, gPorygon2PokedexText, 320, 17, 256, 0 .string "BIG HORN$", 12 @@ -473,51 +473,51 @@ gPokedexEntries:: @ 856B5B0 .string "PAINTER$", 12 pokedex_entry 12, 580, gSmearglePokedexText, 287, 5, 256, 0 .string "SCUFFLE$", 12 - pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0 + pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0 .string "HANDSTAND$", 12 pokedex_entry 14, 480, gHitmontopPokedexText, 256, 2, 257, 0 .string "KISS$", 12 pokedex_entry 4, 60, gSmoochumPokedexText, 440, 20, 256, 0 .string "ELECTRIC$", 12 - pokedex_entry 6, 235, gElekidPokedexText, 363, 14, 256, 0 + pokedex_entry 6, 235, gElekidPokedexText, 363, 14, 256, 0 .string "LIVE COAL$", 12 - pokedex_entry 7, 214, gMagbyPokedexText, 284, 13, 256, 0 + pokedex_entry 7, 214, gMagbyPokedexText, 284, 13, 256, 0 .string "MILK COW$", 12 - pokedex_entry 12, 755, gMiltankPokedexText, 280, 5, 256, 0 + pokedex_entry 12, 755, gMiltankPokedexText, 280, 5, 256, 0 .string "HAPPINESS$", 12 - pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3 + pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3 .string "THUNDER$", 12 - pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7 + pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7 .string "VOLCANO$", 12 - pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7 + pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7 .string "AURORA$", 12 - pokedex_entry 20, 1870, gSuicunePokedexText, 269, 0, 345, 7 + pokedex_entry 20, 1870, gSuicunePokedexText, 269, 0, 345, 7 .string "ROCK SKIN$", 12 pokedex_entry 6, 720, gLarvitarPokedexText, 472, 18, 256, 0 .string "HARD SHELL$", 12 - pokedex_entry 12, 1520, gPupitarPokedexText, 292, 8, 256, 0 + pokedex_entry 12, 1520, gPupitarPokedexText, 292, 8, 256, 0 .string "ARMOR$", 12 pokedex_entry 20, 2020, gTyranitarPokedexText, 256, 0, 345, 7 .string "DIVING$", 12 - pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19 + pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19 .string "RAINBOW$", 12 - pokedex_entry 38, 1990, gHoOhPokedexText, 256, 0, 610, 17 + pokedex_entry 38, 1990, gHoOhPokedexText, 256, 0, 610, 17 .string "TIME TRAVEL$", 12 - pokedex_entry 6, 50, gCelebiPokedexText, 393, -10, 256, 0 + pokedex_entry 6, 50, gCelebiPokedexText, 393, -10, 256, 0 .string "WOOD GECKO$", 12 - pokedex_entry 5, 50, gTreeckoPokedexText, 541, 19, 256, 0 + pokedex_entry 5, 50, gTreeckoPokedexText, 541, 19, 256, 0 .string "WOOD GECKO$", 12 - pokedex_entry 9, 216, gGrovylePokedexText, 360, 5, 256, 0 + pokedex_entry 9, 216, gGrovylePokedexText, 360, 5, 256, 0 .string "FOREST$", 12 pokedex_entry 17, 522, gSceptilePokedexText, 256, -1, 275, 2 .string "CHICK$", 12 - pokedex_entry 4, 25, gTorchicPokedexText, 566, 19, 256, 0 + pokedex_entry 4, 25, gTorchicPokedexText, 566, 19, 256, 0 .string "YOUNG FOWL$", 12 pokedex_entry 9, 195, gCombuskenPokedexText, 343, 5, 256, 0 .string "BLAZE$", 12 pokedex_entry 19, 520, gBlazikenPokedexText, 256, 0, 301, 4 .string "MUD FISH$", 12 - pokedex_entry 4, 76, gMudkipPokedexText, 535, 20, 256, 0 + pokedex_entry 4, 76, gMudkipPokedexText, 535, 20, 256, 0 .string "MUD FISH$", 12 pokedex_entry 7, 280, gMarshtompPokedexText, 340, 7, 256, 0 .string "MUD FISH$", 12 @@ -529,91 +529,91 @@ gPokedexEntries:: @ 856B5B0 .string "TINYRACCOON$", 12 pokedex_entry 4, 175, gZigzagoonPokedexText, 560, 22, 256, 0 .string "RUSHING$", 12 - pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0 + pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0 .string "WORM$", 12 - pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0 + pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0 .string "COCOON$", 12 - pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0 + pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0 .string "BUTTERFLY$", 12 pokedex_entry 10, 284, gBeautiflyPokedexText, 298, -1, 256, 0 .string "COCOON$", 12 - pokedex_entry 7, 115, gCascoonPokedexText, 391, 20, 256, 0 + pokedex_entry 7, 115, gCascoonPokedexText, 391, 20, 256, 0 .string "POISON MOTH$", 12 - pokedex_entry 12, 316, gDustoxPokedexText, 269, 1, 256, 0 + pokedex_entry 12, 316, gDustoxPokedexText, 269, 1, 256, 0 .string "WATER WEED$", 12 - pokedex_entry 5, 26, gLotadPokedexText, 406, 19, 256, 0 + pokedex_entry 5, 26, gLotadPokedexText, 406, 19, 256, 0 .string "JOLLY$", 12 - pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0 + pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0 .string "CAREFREE$", 12 pokedex_entry 15, 550, gLudicoloPokedexText, 256, 0, 268, -1 .string "ACORN$", 12 - pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0 + pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0 .string "WILY$", 12 - pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0 + pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0 .string "WICKED$", 12 - pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0 + pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0 .string "TINYSWALLOW$", 12 - pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0 + pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0 .string "SWALLOW$", 12 - pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0 + pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0 .string "SEAGULL$", 12 - pokedex_entry 6, 95, gWingullPokedexText, 295, -2, 256, 0 + pokedex_entry 6, 95, gWingullPokedexText, 295, -2, 256, 0 .string "WATER BIRD$", 12 pokedex_entry 12, 280, gPelipperPokedexText, 288, 1, 256, 0 .string "FEELING$", 12 - pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0 + pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0 .string "EMOTION$", 12 - pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0 + pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0 .string "EMBRACE$", 12 pokedex_entry 16, 484, gGardevoirPokedexText, 256, 0, 256, 0 .string "POND SKATER$", 12 - pokedex_entry 5, 17, gSurskitPokedexText, 375, 17, 256, 0 + pokedex_entry 5, 17, gSurskitPokedexText, 375, 17, 256, 0 .string "EYEBALL$", 12 pokedex_entry 8, 36, gMasquerainPokedexText, 378, 8, 256, 0 .string "MUSHROOM$", 12 pokedex_entry 4, 45, gShroomishPokedexText, 513, 22, 256, 0 .string "MUSHROOM$", 12 - pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0 + pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0 .string "SLACKER$", 12 - pokedex_entry 8, 240, gSlakothPokedexText, 291, 16, 256, 0 + pokedex_entry 8, 240, gSlakothPokedexText, 291, 16, 256, 0 .string "WILD MONKEY$", 12 pokedex_entry 14, 465, gVigorothPokedexText, 301, 2, 256, 0 .string "LAZY$", 12 - pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1 + pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1 .string "TRAINEE$", 12 - pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0 + pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0 .string "NINJA$", 12 - pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0 + pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0 .string "SHED$", 12 pokedex_entry 8, 12, gShedinjaPokedexText, 372, -8, 256, 0 .string "WHISPER$", 12 - pokedex_entry 6, 163, gWhismurPokedexText, 373, 17, 256, 0 + pokedex_entry 6, 163, gWhismurPokedexText, 373, 17, 256, 0 .string "BIG VOICE$", 12 - pokedex_entry 10, 405, gLoudredPokedexText, 356, 10, 256, 0 + pokedex_entry 10, 405, gLoudredPokedexText, 356, 10, 256, 0 .string "LOUD NOISE$", 12 - pokedex_entry 15, 840, gExploudPokedexText, 284, 1, 256, 0 + pokedex_entry 15, 840, gExploudPokedexText, 284, 1, 256, 0 .string "GUTS$", 12 pokedex_entry 10, 864, gMakuhitaPokedexText, 256, 10, 256, 0 .string "ARM THRUST$", 12 pokedex_entry 23, 2538, gHariyamaPokedexText, 256, 0, 343, 7 .string "POLKA DOT$", 12 - pokedex_entry 2, 20, gAzurillPokedexText, 603, 23, 256, 0 + pokedex_entry 2, 20, gAzurillPokedexText, 603, 23, 256, 0 .string "COMPASS$", 12 pokedex_entry 10, 970, gNosepassPokedexText, 256, 9, 289, 3 .string "KITTEN$", 12 - pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0 + pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0 .string "PRIM$", 12 pokedex_entry 11, 326, gDelcattyPokedexText, 322, 10, 256, 0 .string "DARKNESS$", 12 - pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0 + pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0 .string "DECEIVER$", 12 - pokedex_entry 6, 115, gMawilePokedexText, 466, 17, 256, 0 + pokedex_entry 6, 115, gMawilePokedexText, 466, 17, 256, 0 .string "IRON ARMOR$", 12 - pokedex_entry 4, 600, gAronPokedexText, 419, 23, 256, 0 + pokedex_entry 4, 600, gAronPokedexText, 419, 23, 256, 0 .string "IRON ARMOR$", 12 - pokedex_entry 9, 1200, gLaironPokedexText, 275, 12, 256, 0 + pokedex_entry 9, 1200, gLaironPokedexText, 275, 12, 256, 0 .string "IRON ARMOR$", 12 - pokedex_entry 21, 3600, gAggronPokedexText, 256, -1, 350, 6 + pokedex_entry 21, 3600, gAggronPokedexText, 256, -1, 350, 6 .string "MEDITATE$", 12 pokedex_entry 6, 112, gMedititePokedexText, 465, 17, 256, 0 .string "MEDITATE$", 12 @@ -623,61 +623,61 @@ gPokedexEntries:: @ 856B5B0 .string "DISCHARGE$", 12 pokedex_entry 15, 402, gManectricPokedexText, 256, 3, 257, 0 .string "CHEERING$", 12 - pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0 + pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0 .string "CHEERING$", 12 - pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0 + pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0 .string "FIREFLY$", 12 - pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0 + pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0 .string "FIREFLY$", 12 pokedex_entry 6, 177, gIllumisePokedexText, 572, 19, 256, 0 .string "THORN$", 12 - pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0 + pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0 .string "STOMACH$", 12 - pokedex_entry 4, 103, gGulpinPokedexText, 593, 23, 256, 0 + pokedex_entry 4, 103, gGulpinPokedexText, 593, 23, 256, 0 .string "POISON BAG$", 12 - pokedex_entry 17, 800, gSwalotPokedexText, 256, 6, 345, 3 + pokedex_entry 17, 800, gSwalotPokedexText, 256, 6, 345, 3 .string "SAVAGE$", 12 pokedex_entry 8, 208, gCarvanhaPokedexText, 362, 0, 256, 0 .string "BRUTAL$", 12 pokedex_entry 18, 888, gSharpedoPokedexText, 256, 0, 317, 3 .string "BALL WHALE$", 12 - pokedex_entry 20, 1300, gWailmerPokedexText, 256, 2, 493, 0 + pokedex_entry 20, 1300, gWailmerPokedexText, 256, 2, 493, 0 .string "FLOAT WHALE$", 12 - pokedex_entry 145, 3980, gWailordPokedexText, 256, 0, 1352, 18 + pokedex_entry 145, 3980, gWailordPokedexText, 256, 0, 1352, 18 .string "NUMB$", 12 - pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0 + pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0 .string "ERUPTION$", 12 pokedex_entry 19, 2200, gCameruptPokedexText, 256, 7, 345, 6 .string "COAL$", 12 - pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0 + pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0 .string "BOUNCE$", 12 - pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0 + pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0 .string "MANIPULATE$", 12 - pokedex_entry 9, 715, gGrumpigPokedexText, 358, 10, 256, 0 + pokedex_entry 9, 715, gGrumpigPokedexText, 358, 10, 256, 0 .string "SPOT PANDA$", 12 - pokedex_entry 11, 50, gSpindaPokedexText, 321, 4, 256, 0 + pokedex_entry 11, 50, gSpindaPokedexText, 321, 4, 256, 0 .string "ANT PIT$", 12 pokedex_entry 7, 150, gTrapinchPokedexText, 298, 17, 256, 0 .string "VIBRATION$", 12 - pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0 + pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0 .string "MYSTIC$", 12 - pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1 + pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1 .string "CACTUS$", 12 - pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0 + pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0 .string "SCARECROW$", 12 pokedex_entry 13, 774, gCacturnePokedexText, 327, 5, 256, 0 .string "COTTON BIRD$", 12 - pokedex_entry 4, 12, gSwabluPokedexText, 422, -8, 256, 0 + pokedex_entry 4, 12, gSwabluPokedexText, 422, -8, 256, 0 .string "HUMMING$", 12 - pokedex_entry 11, 206, gAltariaPokedexText, 327, 0, 256, 0 + pokedex_entry 11, 206, gAltariaPokedexText, 327, 0, 256, 0 .string "CAT FERRET$", 12 pokedex_entry 13, 403, gZangoosePokedexText, 256, 3, 256, 0 .string "FANG SNAKE$", 12 - pokedex_entry 27, 525, gSeviperPokedexText, 275, 7, 256, 0 + pokedex_entry 27, 525, gSeviperPokedexText, 275, 7, 256, 0 .string "METEORITE$", 12 pokedex_entry 10, 1680, gLunatonePokedexText, 300, 3, 256, 0 .string "METEORITE$", 12 - pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0 + pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0 .string "WHISKERS$", 12 pokedex_entry 4, 19, gBarboachPokedexText, 581, -3, 256, 0 .string "WHISKERS$", 12 @@ -687,90 +687,90 @@ gPokedexEntries:: @ 856B5B0 .string "ROGUE$", 12 pokedex_entry 11, 328, gCrawdauntPokedexText, 365, 9, 256, 0 .string "CLAY DOLL$", 12 - pokedex_entry 5, 215, gBaltoyPokedexText, 457, 21, 256, 0 + pokedex_entry 5, 215, gBaltoyPokedexText, 457, 21, 256, 0 .string "CLAY DOLL$", 12 - pokedex_entry 15, 1080, gClaydolPokedexText, 256, 3, 280, 1 + pokedex_entry 15, 1080, gClaydolPokedexText, 256, 3, 280, 1 .string "SEA LILY$", 12 - pokedex_entry 10, 238, gLileepPokedexText, 305, 8, 256, 0 + pokedex_entry 10, 238, gLileepPokedexText, 305, 8, 256, 0 .string "BARNACLE$", 12 - pokedex_entry 15, 604, gCradilyPokedexText, 267, 0, 256, 0 + pokedex_entry 15, 604, gCradilyPokedexText, 267, 0, 256, 0 .string "OLD SHRIMP$", 12 - pokedex_entry 7, 125, gAnorithPokedexText, 296, 4, 256, 0 + pokedex_entry 7, 125, gAnorithPokedexText, 296, 4, 256, 0 .string "PLATE$", 12 - pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0 + pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0 .string "FISH$", 12 - pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0 + pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0 .string "TENDER$", 12 - pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7 + pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7 .string "WEATHER$", 12 - pokedex_entry 3, 8, gCastformPokedexText, 435, -5, 256, 0 + pokedex_entry 3, 8, gCastformPokedexText, 435, -5, 256, 0 .string "COLOR SWAP$", 12 - pokedex_entry 10, 220, gKecleonPokedexText, 316, 10, 256, 0 + pokedex_entry 10, 220, gKecleonPokedexText, 316, 10, 256, 0 .string "PUPPET$", 12 - pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0 + pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0 .string "MARIONETTE$", 12 - pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0 + pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0 .string "REQUIEM$", 12 - pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0 + pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0 .string "BECKON$", 12 pokedex_entry 16, 306, gDusclopsPokedexText, 256, 3, 299, 1 .string "FRUIT$", 12 - pokedex_entry 20, 1000, gTropiusPokedexText, 256, 0, 344, 7 + pokedex_entry 20, 1000, gTropiusPokedexText, 256, 0, 344, 7 .string "WIND CHIME$", 12 pokedex_entry 6, 10, gChimechoPokedexText, 505, 0, 256, 0 .string "DISASTER$", 12 - pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0 + pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0 .string "BRIGHT$", 12 - pokedex_entry 6, 140, gWynautPokedexText, 484, 19, 256, 0 + pokedex_entry 6, 140, gWynautPokedexText, 484, 19, 256, 0 .string "SNOW HAT$", 12 - pokedex_entry 7, 168, gSnoruntPokedexText, 380, 15, 256, 0 + pokedex_entry 7, 168, gSnoruntPokedexText, 380, 15, 256, 0 .string "FACE$", 12 - pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0 + pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0 .string "CLAP$", 12 - pokedex_entry 8, 395, gSphealPokedexText, 315, 16, 256, 0 + pokedex_entry 8, 395, gSphealPokedexText, 315, 16, 256, 0 .string "BALL ROLL$", 12 - pokedex_entry 11, 876, gSealeoPokedexText, 338, 13, 256, 0 + pokedex_entry 11, 876, gSealeoPokedexText, 338, 13, 256, 0 .string "ICE BREAK$", 12 - pokedex_entry 14, 1506, gWalreinPokedexText, 316, 4, 256, 0 + pokedex_entry 14, 1506, gWalreinPokedexText, 316, 4, 256, 0 .string "BIVALVE$", 12 pokedex_entry 4, 525, gClamperlPokedexText, 691, 22, 256, 0 .string "DEEP SEA$", 12 - pokedex_entry 17, 270, gHuntailPokedexText, 307, 1, 256, 0 + pokedex_entry 17, 270, gHuntailPokedexText, 307, 1, 256, 0 .string "SOUTH SEA$", 12 pokedex_entry 18, 226, gGorebyssPokedexText, 278, 5, 256, 0 .string "LONGEVITY$", 12 pokedex_entry 10, 234, gRelicanthPokedexText, 316, 7, 256, 0 .string "RENDEZVOUS$", 12 - pokedex_entry 6, 87, gLuvdiscPokedexText, 371, 2, 256, 0 + pokedex_entry 6, 87, gLuvdiscPokedexText, 371, 2, 256, 0 .string "ROCK HEAD$", 12 - pokedex_entry 6, 421, gBagonPokedexText, 448, 18, 256, 0 + pokedex_entry 6, 421, gBagonPokedexText, 448, 18, 256, 0 .string "ENDURANCE$", 12 - pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0 + pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0 .string "DRAGON$", 12 pokedex_entry 15, 1026, gSalamencePokedexText, 256, 0, 256, 0 .string "IRON BALL$", 12 - pokedex_entry 6, 952, gBeldumPokedexText, 414, -1, 256, 0 + pokedex_entry 6, 952, gBeldumPokedexText, 414, -1, 256, 0 .string "IRON CLAW$", 12 - pokedex_entry 12, 2025, gMetangPokedexText, 256, 6, 256, 0 + pokedex_entry 12, 2025, gMetangPokedexText, 256, 6, 256, 0 .string "IRON LEG$", 12 pokedex_entry 16, 5500, gMetagrossPokedexText, 256, 4, 447, 9 .string "ROCK PEAK$", 12 pokedex_entry 17, 2300, gRegirockPokedexText, 256, 2, 309, 1 .string "ICEBERG$", 12 - pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2 + pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2 .string "IRON$", 12 pokedex_entry 19, 2050, gRegisteelPokedexText, 256, 0, 359, 6 .string "EON$", 12 - pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0 + pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0 .string "EON$", 12 - pokedex_entry 20, 600, gLatiosPokedexText, 256, 0, 294, 3 + pokedex_entry 20, 600, gLatiosPokedexText, 256, 0, 294, 3 .string "SEA BASIN$", 12 - pokedex_entry 45, 3520, gKyogrePokedexText, 256, 0, 614, 13 + pokedex_entry 45, 3520, gKyogrePokedexText, 256, 0, 614, 13 .string "CONTINENT$", 12 - pokedex_entry 35, 9500, gGroudonPokedexText, 256, 0, 515, 14 + pokedex_entry 35, 9500, gGroudonPokedexText, 256, 0, 515, 14 .string "SKY HIGH$", 12 pokedex_entry 70, 2065, gRayquazaPokedexText, 256, 0, 448, 12 .string "WISH$", 12 - pokedex_entry 3, 11, gJirachiPokedexText, 608, -8, 256, 0 + pokedex_entry 3, 11, gJirachiPokedexText, 608, -8, 256, 0 .string "DNA$", 12 - pokedex_entry 17, 608, gDeoxysPokedexText, 256, 0, 290, 2 + pokedex_entry 17, 608, gDeoxysPokedexText, 256, 0, 290, 2 diff --git a/data/pokemon_icon.s b/data/pokemon_icon.s deleted file mode 100644 index 9d6c7ac2e..000000000 --- a/data/pokemon_icon.s +++ /dev/null @@ -1,27 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -@ 857BCA8 - .include "data/graphics/pokemon/icon_table.inc" - -@ 857C388 - .include "data/graphics/pokemon/icon_palette_indices.inc" - -@ 857C540 - .include "data/graphics/pokemon/icon_palette_table.inc" - -gUnknown_0857C570:: @ 857C570 - .incbin "baserom.gba", 0x57c570, 0x44 - -gUnknown_0857C5B4:: @ 857C5B4 - .incbin "baserom.gba", 0x57c5b4, 0x14 - .incbin "baserom.gba", 0x57c5c8, 0x20 - -gUnknown_0857C5E8:: @ 857C5E8 - .incbin "baserom.gba", 0x57c5e8, 0x8 - -gUnknown_0857C5F0:: @ 857C5F0 - .incbin "baserom.gba", 0x57c5f0, 0x18 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 4f2815713..e419db55a 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -1,23 +1,8 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 - -gUnknown_085716C0:: @ 85716C0 - .incbin "baserom.gba", 0x5716c0, 0x28 - -gUnknown_085716E8:: @ 85716E8 - .incbin "baserom.gba", 0x5716e8, 0x28 - -gUnknown_08571710:: @ 8571710 - .incbin "baserom.gba", 0x571710, 0x24 - -gUnknown_08571734:: @ 8571734 - .incbin "baserom.gba", 0x571734, 0x3 - -gUnknown_08571737:: @ 8571737 - .incbin "baserom.gba", 0x571737, 0x5 + .section .rodata + .align 2, 0 gUnknown_0857173C:: @ 857173C .incbin "baserom.gba", 0x57173c, 0x20 @@ -59,7 +44,13 @@ gUnknown_085724A4:: @ 85724A4 .incbin "baserom.gba", 0x5724a4, 0x18 gUnknown_085724BC:: @ 85724BC - .incbin "baserom.gba", 0x5724bc, 0x238 + .incbin "baserom.gba", 0x5724bc, 0x18 + +gUnknown_085724D4:: @ 85724D4 + .incbin "baserom.gba", 0x5724d4, 0x20 + +gUnknown_085724F4:: @ 85724F4 + .incbin "baserom.gba", 0x5724f4, 0x200 gUnknown_085726F4:: @ 85726F4 .incbin "baserom.gba", 0x5726f4, 0x20 @@ -71,28 +62,126 @@ gUnknown_08572734:: @ 8572734 .incbin "baserom.gba", 0x572734, 0x10 gUnknown_08572744:: @ 8572744 - .incbin "baserom.gba", 0x572744, 0x8 + obj_pal gUnknown_085724D4, 0xDACA gUnknown_0857274C:: @ 857274C - .incbin "baserom.gba", 0x57274c, 0x8 + obj_tiles gUnknown_085724F4, 0x1C0, 5 gUnknown_08572754:: @ 8572754 - .incbin "baserom.gba", 0x572754, 0x18 + spr_template 2, 0xDAC6, gOamData_857286C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_0857276C:: @ 857276C - .incbin "baserom.gba", 0x57276c, 0xf8 + .4byte gUnknown_085EB7EF, 0 + .4byte gUnknown_085EB802, 0 + .4byte gUnknown_085EB81A, 0 + .4byte gUnknown_085EB82F, 0 + .4byte gUnknown_085EB843, 1 + .4byte gUnknown_085EB853, 0 + .4byte gUnknown_085EB866, 0 + .4byte gUnknown_085EB87C, 1 + .4byte gUnknown_085EB88E, 0 + .4byte gUnknown_085EB89F, 0 + .4byte gUnknown_085EB8B5, 4 + .4byte gUnknown_085EB8C6, 6 + .4byte gUnknown_085EB8D3, 0 + .4byte gUnknown_085EB8E6, 0 + .4byte gUnknown_085EB900, 0 + .4byte gUnknown_085EB913, 0 + .4byte gUnknown_085EB92D, 0 + .4byte gUnknown_085EB946, 0 + .4byte gUnknown_085EB960, 0 + .4byte gUnknown_085EB979, 1 + .4byte gUnknown_085EB987, 0 + .4byte gUnknown_085EB9A1, 0 + .4byte gUnknown_085EB9AB, 0 + .4byte gUnknown_085EB843, 7 + .4byte gUnknown_085EB9C3, 0 + .4byte gUnknown_085EB9D6, 7 + .4byte gUnknown_085EB9EE, 0 + .4byte gUnknown_085EB9FF, 0 + .4byte gUnknown_085EBA19, 7 + .4byte gUnknown_085EBA29, 7 + .4byte gUnknown_085EBA38, 0 + + .align 2 gUnknown_08572864:: @ 8572864 - .incbin "baserom.gba", 0x572864, 0x58 + window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x5C + + .align 2 +gOamData_857286C:: @ 857286C + .2byte 0x0000 + .2byte 0xC000 + .2byte 0x0000 + + .align 2 +gOamData_8572874:: @ 8572874 + .2byte 0x4000 + .2byte 0x0000 + .2byte 0x0000 + + .align 2 +gSpriteAnim_857287C:: @ 857287C + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_8572884:: @ 8572884 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 4, 8 + obj_image_anim_frame 6, 8 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_8572894:: @ 8572894 + obj_image_anim_frame 8, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_857289C:: @ 857289C + obj_image_anim_frame 10, 8 + obj_image_anim_frame 4, 8 + obj_image_anim_frame 12, 8 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_85728AC:: @ 85728AC + .4byte gSpriteAnim_857287C + .4byte gSpriteAnim_8572884 + .4byte gSpriteAnim_8572894 + .4byte gSpriteAnim_857289C gUnknown_085728BC:: @ 85728BC - .incbin "baserom.gba", 0x5728bc, 0x18 + spr_template 5, 0xDACA, gOamData_8572874, gSpriteAnimTable_85728AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_085728D4:: @ 85728D4 - .incbin "baserom.gba", 0x5728d4, 0x48 - -gUnknown_0857291C:: @ 857291C - .incbin "baserom.gba", 0x57291c, 0x4c58 + spr_template 0x12, 0xDAC0, gOamData_85728EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gOamData_85728EC:: @ 85728EC + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0000 + + .align 2 +gSpriteAffineAnim_85728F4:: @ 85728F4 + obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 120 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_8572904:: @ 8572904 + obj_rot_scal_anim_frame 0x10, 0x10, 0, 0 + obj_rot_scal_anim_frame 0x10, 0x10, 0, 15 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_857291C:: @ 857291C + .4byte gSpriteAffineAnim_85728F4 + .4byte gSpriteAffineAnim_8572904 + +gUnknown_08572924:: @ 8572924 + .incbin "baserom.gba", 0x572924, 0x4c50 gUnknown_08577574:: @ 8577574 .incbin "baserom.gba", 0x577574, 0x44 diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index fc1c79096..d3cb51fca 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -121,7 +121,12 @@ gUnknown_0861F2C0:: @ 861F2C0 .incbin "baserom.gba", 0x61f2c0, 0x18 gUnknown_0861F2D8:: @ 861F2D8 - .incbin "baserom.gba", 0x61f2d8, 0x30 + .4byte gMenuText_Use, sub_81C61E0 + .4byte gMenuText_Toss, sub_81C62C4 + .4byte gMenuText_Give, sub_81C6648 + .4byte gText_Cancel2, sub_81C6258 + .4byte gMenuText_Use, sub_81C679C + .4byte gText_EmptyString2, NULL gUnknown_0861F308:: @ 861F308 .incbin "baserom.gba", 0x61f308, 0x4 @@ -136,7 +141,8 @@ gUnknown_0861F310:: @ 861F310 .incbin "baserom.gba", 0x61f310, 0x4 gUnknown_0861F314:: @ 861F314 - .incbin "baserom.gba", 0x61f314, 0x8 + .4byte sub_81C654C + .4byte sub_81C63D0 gUnknown_0861F31C:: @ 861F31C .incbin "baserom.gba", 0x61f31c, 0xc diff --git a/data/pokenav.s b/data/pokenav.s index 8e8e24b65..89ec3c3a6 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -4,7 +4,117 @@ .section .rodata gUnknown_0861F3EC:: @ 861F3EC - .incbin "baserom.gba", 0x61f3ec, 0x618 + .4byte sub_81C9298 + .4byte sub_81C941C + .4byte sub_81C9924 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81C9298 + .4byte sub_81C941C + .4byte sub_81C9940 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81C9338 + .4byte sub_81C941C + .4byte sub_81C9940 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81C9368 + .4byte sub_81C941C + .4byte sub_81C9940 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81C92CC + .4byte sub_81C941C + .4byte sub_81C9940 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81C9304 + .4byte sub_81C941C + .4byte sub_81C9940 + .4byte sub_81C9990 + .4byte sub_81C99C0 + .4byte sub_81C9430 + .4byte sub_81C99D4 + .4byte sub_81CC4D4 + .4byte sub_81CC554 + .4byte sub_81CC5F4 + .4byte sub_81CC62C + .4byte sub_81CC65C + .4byte sub_81CC524 + .4byte sub_81CC670 + .4byte sub_81CCFD8 + .4byte sub_81CD070 + .4byte sub_81CDDD4 + .4byte sub_81CDE2C + .4byte sub_81CDE64 + .4byte sub_81CD1C0 + .4byte sub_81CECA0 + .4byte sub_81CEF3C + .4byte sub_81CEFDC + .4byte sub_81CF330 + .4byte sub_81CF3A0 + .4byte sub_81CF3D0 + .4byte sub_81CEFF0 + .4byte sub_81CF3F8 + .4byte sub_81CD024 + .4byte sub_81CD070 + .4byte sub_81CDDD4 + .4byte sub_81CDE2C + .4byte sub_81CDE64 + .4byte sub_81CD1C0 + .4byte sub_81CECA0 + .4byte sub_81CEF98 + .4byte sub_81CEFDC + .4byte sub_81CF368 + .4byte sub_81CF3A0 + .4byte sub_81CF3D0 + .4byte sub_81CEFF0 + .4byte sub_81CF3F8 + .4byte sub_81CAAE8 + .4byte sub_81CAB24 + .4byte sub_81CB260 + .4byte sub_81CB29C + .4byte sub_81CB2CC + .4byte sub_81CAB38 + .4byte sub_81CB2E0 + .4byte sub_81CF9BC + .4byte sub_81CFA34 + .4byte sub_81CFDD0 + .4byte sub_81CFE40 + .4byte sub_81CFE70 + .4byte sub_81CFA48 + .4byte sub_81CFE98 + .4byte sub_81D0450 + .4byte sub_81D04A0 + .4byte sub_81D0978 + .4byte sub_81D09B0 + .4byte sub_81D09E0 + .4byte sub_81D04B8 + .4byte sub_81D09F4 + .4byte sub_81CFA04 + .4byte sub_81CFA34 + .4byte sub_81CFE08 + .4byte sub_81CFE40 + .4byte sub_81CFE70 + .4byte sub_81CFA48 + .4byte sub_81CFE98 + +gUnknown_0861F590:: @ 861F590 + .incbin "baserom.gba", 0x61F590, 0x20 + +gUnknown_0861F5B0:: @ 861F5B0 + .incbin "baserom.gba", 0x61f5b0, 0x454 gUnknown_0861FA04:: @ 861FA04 .incbin "baserom.gba", 0x61fa04, 0x4 @@ -13,31 +123,86 @@ gUnknown_0861FA08:: @ 861FA08 .incbin "baserom.gba", 0x61fa08, 0x10 gUnknown_0861FA18:: @ 861FA18 - .incbin "baserom.gba", 0x61fa18, 0x30 + .4byte gUnknown_085EBED5 + .4byte gUnknown_085EBED9 + .4byte gUnknown_085EBEE9 + .4byte gUnknown_085EBEF9 + .4byte gUnknown_085EBF0E + .4byte gUnknown_085EBF22 + .4byte gUnknown_085EBF39 + .4byte gUnknown_085EBF49 + .4byte gUnknown_085EBF57 + .4byte gUnknown_085EBF60 + .4byte gUnknown_085EBF73 + .4byte gUnknown_085EBF84 gUnknown_0861FA48:: @ 861FA48 .incbin "baserom.gba", 0x61fa48, 0x4 gUnknown_0861FA4C:: @ 861FA4C - .incbin "baserom.gba", 0x61fa4c, 0x8 + obj_tiles gUnknown_0861F5B0, 0x1000, 0 gUnknown_0861FA54:: @ 861FA54 - .incbin "baserom.gba", 0x61fa54, 0x10 + obj_pal gUnknown_0861F590, 0 + obj_pal NULL, 0 gUnknown_0861FA64:: @ 861FA64 - .incbin "baserom.gba", 0x61fa64, 0x8 + obj_tiles gUnknown_08DC87F8, 0xC00, 2 gUnknown_0861FA6C:: @ 861FA6C - .incbin "baserom.gba", 0x61fa6c, 0x30 + obj_tiles gUnknown_08DC864C, 0x20, 3 + obj_tiles gUnknown_08DC8208, 0x20, 1 + obj_tiles gUnknown_08DC8AA4, 0x20, 2 + obj_tiles gUnknown_08DC84AC, 0x20, 4 + obj_tiles gUnknown_08DC87F8, 0x20, 0 + obj_tiles gUnknown_08DC87F8, 0x40, 0 gUnknown_0861FA9C:: @ 861FA9C - .incbin "baserom.gba", 0x61fa9c, 0x68 + .4byte gUnknown_08DC8F64, 1 + .4byte gUnknown_08DC8C14, 1 + .4byte gUnknown_08DC8E64, 4 + .4byte gUnknown_08DC7FA0, 1 + .4byte gUnknown_08DC838C, 2 + .4byte gUnknown_08DC80DC, 0 + .4byte gUnknown_08DC8D50, 0 + +gUnknown_0861FAD4:: @ 861FAD4 + .2byte 0x0 + .2byte 0x8000 + .2byte 0x0 + .2byte 0x0 + +gUnknown_0861FADC:: + obj_image_anim_frame 0, 8 + obj_image_anim_frame 16, 8 + obj_image_anim_frame 32, 8 + obj_image_anim_frame 48, 8 + obj_image_anim_frame 64, 8 + obj_image_anim_frame 80, 8 + obj_image_anim_frame 96, 8 + obj_image_anim_frame 112, 8 + obj_image_anim_jump 0 + +gUnknown_0861FB00:: + .4byte gUnknown_0861FADC gUnknown_0861FB04:: @ 861FB04 - .incbin "baserom.gba", 0x61fb04, 0x28 + spr_template 0, 0, gUnknown_0861FAD4, gUnknown_0861FB00, NULL, gDummySpriteAffineAnimTable, sub_81C7CB4 + +gUnknown_0861FB1C:: + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x400 + .2byte 0x0 + +gUnknown_0861FB24:: + .2byte 0x4000 + .2byte 0x8000 + .2byte 0x400 + .2byte 0x0 gUnknown_0861FB2C:: @ 861FB2C - .incbin "baserom.gba", 0x61fb2c, 0x18 + spr_template 2, 1, gUnknown_0861FB1C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_0861FB44:: @ 861FB44 .incbin "baserom.gba", 0x61fb44, 0xa0 @@ -118,7 +283,20 @@ gUnknown_086202CC:: @ 86202CC .incbin "baserom.gba", 0x6202cc, 0x8 gUnknown_086202D4:: @ 86202D4 - .incbin "baserom.gba", 0x6202d4, 0x38 + .4byte gUnknown_085EBCC5 + .4byte gUnknown_085EBCE8 + .4byte gUnknown_085EBD01 + .4byte gUnknown_085EBD1C + .4byte gUnknown_085EBD34 + .4byte gUnknown_085EBD83 + .4byte gUnknown_085EBDA2 + .4byte gUnknown_085EBDBF + .4byte gUnknown_085EBDDB + .4byte gUnknown_085EBDEE + .4byte gUnknown_085EBE06 + .4byte gUnknown_085EBE19 + .4byte gUnknown_085EBE2D + .4byte gUnknown_085EBE41 gUnknown_0862030C:: @ 862030C .incbin "baserom.gba", 0x62030c, 0x3 @@ -133,10 +311,1026 @@ gUnknown_0862036C:: @ 862036C .incbin "baserom.gba", 0x62036c, 0x18 gUnknown_08620384:: @ 8620384 - .incbin "baserom.gba", 0x620384, 0x1ca4 + .incbin "baserom.gba", 0x620384, 0xC + +gUnknown_08620390:: @ 8620390 + .string "Becalm fighting emotions.$" + +gUnknown_086203AA:: @ 86203AA + .string "Fragrant GRASS POKéMON.$" + +gUnknown_086203C2:: @ 86203C2 + .string "Soothing aromas make the$" + +gUnknown_086203DB:: @ 86203DB + .string "body and mind healthy.$" + +gUnknown_086203F2:: @ 86203F2 + .string "I’m not very good at this.$" + +gUnknown_0862040D:: @ 862040D + .string "Ruin-exploration partners.$" + +gUnknown_08620428:: @ 8620428 + .string "I am searching for undersea$" + +gUnknown_08620444:: @ 8620444 + .string "ruins and relics.$" + +gUnknown_08620456:: @ 8620456 + .string "Overwhelm with power!$" + +gUnknown_0862046C:: @ 862046C + .string "Craggy ROCK POKéMON.$" + +gUnknown_08620481:: @ 8620481 + .string "In search of ancient lore,$" + +gUnknown_0862049C:: @ 862049C + .string "I travel the world.$" + +gUnknown_086204B0:: @ 86204B0 + .string "I’m going to try hard!$" + +gUnknown_086204C7:: @ 86204C7 + .string "Good swimmer POKéMON.$" + +gUnknown_086204DD:: @ 86204DD + .string "I wish I could swim without$" + +gUnknown_086204F9:: @ 86204F9 + .string "using an inner tube.$" + +gUnknown_0862050E:: @ 862050E + .string "I don’t know. I’ll try hard.$" + +gUnknown_0862052B:: @ 862052B + .string "WATER POKéMON are buddies.$" + +gUnknown_08620546:: @ 8620546 + .string "It’s not like I can’t swim.$" + +gUnknown_08620562:: @ 8620562 + .string "I just like my inner tube.$" + +gUnknown_0862057D:: @ 862057D + .string "We split our duties.$" + +gUnknown_08620592:: @ 8620592 + .string "We like friendly POKéMON.$" + +gUnknown_086205AC:: @ 86205AC + .string "We enjoy POKéMON together$" + +gUnknown_086205C6:: @ 86205C6 + .string "as sister and brother.$" + +gUnknown_086205DD:: @ 86205DD + .string "I finish with power moves!$" + +gUnknown_086205F8:: @ 86205F8 + .string "A mix of different types.$" + +gUnknown_08620612:: @ 8620612 + .string "I aim to become the ultimate$" + +gUnknown_0862062F:: @ 862062F + .string "TRAINER!$" + +gUnknown_08620638:: @ 8620638 + .string "Exploit the foe’s weakness.$" + +gUnknown_08620654:: @ 8620654 + .string "Balance is crucial.$" + +gUnknown_08620668:: @ 8620668 + .string "My goal is to become the$" + +gUnknown_08620681:: @ 8620681 + .string "POKéMON CHAMPION.$" + +gUnknown_08620693:: @ 8620693 + .string "Upset the opponent.$" + +gUnknown_086206A7:: @ 86206A7 + .string "Type doesn’t matter.$" + +gUnknown_086206BC:: @ 86206BC + .string "I’m a top student at the$" + +gUnknown_086206D5:: @ 86206D5 + .string "TRAINER’S SCHOOL.$" + +gUnknown_086206E7:: @ 86206E7 + .string "Slow, steady suffering.$" + +gUnknown_086206FF:: @ 86206FF + .string "Scary to meet at night.$" + +gUnknown_08620717:: @ 8620717 + .string "I see things that others$" + +gUnknown_08620730:: @ 8620730 + .string "can’t see...$" + +gUnknown_0862073D:: @ 862073D + .string "Anything to win.$" + +gUnknown_0862074E:: @ 862074E + .string "Gorgeous type!$" + +gUnknown_0862075D:: @ 862075D + .string "I have a pool specially for$" + +gUnknown_08620779:: @ 8620779 + .string "my POKéMON at home.$" + +gUnknown_0862078D:: @ 862078D + .string "You’ll fall under my spell!$" + +gUnknown_086207A9:: @ 86207A9 + .string "Mature WATER type.$" + +gUnknown_086207BC:: @ 86207BC + .string "I dream of cruising around$" + +gUnknown_086207D7:: @ 86207D7 + .string "the world on a luxury liner.$" + +gUnknown_086207F4:: @ 86207F4 + .string "I’ll lead you astray.$" + +gUnknown_0862080A:: @ 862080A + .string "Cute, of course.$" + +gUnknown_0862081B:: @ 862081B + .string "I love the SAFARI ZONE.$" + +gUnknown_08620833:: @ 8620833 + .string "I seem to end up there.$" + +gUnknown_0862084B:: @ 862084B + .string "Strategy? Who needs it?$" + +gUnknown_08620863:: @ 8620863 + .string "I spent big money on it!$" + +gUnknown_0862087C:: @ 862087C + .string "I, being rich, sleep in a$" + +gUnknown_08620896:: @ 8620896 + .string "custom POKéMON bed.$" + +gUnknown_086208AA:: @ 86208AA + .string "Wrestle down with power.$" + +gUnknown_086208C3:: @ 86208C3 + .string "Took all night to catch.$" + +gUnknown_086208DC:: @ 86208DC + .string "Big, burly, and buff$" + +gUnknown_086208F1:: @ 86208F1 + .string "POKéMON are the best...$" + +gUnknown_08620909:: @ 8620909 + .string "Ram at full speed!$" + +gUnknown_0862091C:: @ 862091C + .string "Funky WATER type!$" + +gUnknown_0862092E:: @ 862092E + .string "If I can’t be out swimming,$" + +gUnknown_0862094A:: @ 862094A + .string "I’ll be pumping weights.$" + +gUnknown_08620963:: @ 8620963 + .string "Grand slam pummeling!$" + +gUnknown_08620979:: @ 8620979 + .string "FIGHTING type.$" + +gUnknown_08620988:: @ 8620988 + .string "Not to brag, but I can bust$" + +gUnknown_086209A4:: @ 86209A4 + .string "ten roof tiles!$" + +gUnknown_086209B4:: @ 86209B4 + .string "Witness karate power!$" + +gUnknown_086209CA:: @ 86209CA + .string "My partners in training!$" + +gUnknown_086209E3:: @ 86209E3 + .string "Let us discuss matters of$" + +gUnknown_086209FD:: @ 86209FD + .string "the world with bare fists!$" + +gUnknown_08620A18:: @ 8620A18 + .string "Rock to stunning sounds!$" + +gUnknown_08620A31:: @ 8620A31 + .string "Electric-and-sound combo!$" + +gUnknown_08620A4B:: @ 8620A4B + .string "My compositions will shock$" + +gUnknown_08620A66:: @ 8620A66 + .string "you and stun you!$" + +gUnknown_08620A78:: @ 8620A78 + .string "I’ll electrify you!$" + +gUnknown_08620A8C:: @ 8620A8C + .string "They’re ELECTRIC!$" + +gUnknown_08620A9E:: @ 8620A9E + .string "I want to make people cry$" + +gUnknown_08620AB8:: @ 8620AB8 + .string "with songs from my heart.$" + +gUnknown_08620AD2:: @ 8620AD2 + .string "Burn it all down!$" + +gUnknown_08620AE4:: @ 8620AE4 + .string "Burn-inducing POKéMON.$" + +gUnknown_08620AFB:: @ 8620AFB + .string "When you light a campfire,$" + +gUnknown_08620B16:: @ 8620B16 + .string "be sure there’s some water.$" + +gUnknown_08620B32:: @ 8620B32 + .string "Hang in and be tenacious!$" + +gUnknown_08620B4C:: @ 8620B4C + .string "I’ll raise any POKéMON.$" + +gUnknown_08620B64:: @ 8620B64 + .string "POKéMON raised in the wild$" + +gUnknown_08620B7F:: @ 8620B7F + .string "grow strong!$" + +gUnknown_08620B8C:: @ 8620B8C + .string "Our love lets us prevail.$" + +gUnknown_08620BA6:: @ 8620BA6 + .string "We’ve had them for years.$" + +gUnknown_08620BC0:: @ 8620BC0 + .string "Married 50 years, we’ve$" + +gUnknown_08620BD8:: @ 8620BD8 + .string "devotedly raised POKéMON.$" + +gUnknown_08620BF2:: @ 8620BF2 + .string "Attack in waves!$" + +gUnknown_08620C03:: @ 8620C03 + .string "BUG POKéMON are cool.$" + +gUnknown_08620C19:: @ 8620C19 + .string "I go into the forest every$" + +gUnknown_08620C34:: @ 8620C34 + .string "day to catch BUG POKéMON.$" + +gUnknown_08620C4E:: @ 8620C4E + .string "Daze and confuse!$" + +gUnknown_08620C60:: @ 8620C60 + .string "Ones with weird powers.$" + +gUnknown_08620C78:: @ 8620C78 + .string "I can see through exactly$" + +gUnknown_08620C92:: @ 8620C92 + .string "what you’re thinking!$" + +gUnknown_08620CA8:: @ 8620CA8 + .string "Battle at full power.$" + +gUnknown_08620CBE:: @ 8620CBE + .string "POKéMON of many mysteries.$" + +gUnknown_08620CD9:: @ 8620CD9 + .string "When we spoke, I was really$" + +gUnknown_08620CF5:: @ 8620CF5 + .string "using telepathy.$" + +gUnknown_08620D06:: @ 8620D06 + .string "Calm and collected.$" + +gUnknown_08620D1A:: @ 8620D1A + .string "POKéMON of distinction.$" + +gUnknown_08620D32:: @ 8620D32 + .string "We enjoy a spot of tea$" + +gUnknown_08620D49:: @ 8620D49 + .string "every day. It’s imported.$" + +gUnknown_08620D63:: @ 8620D63 + .string "I use my head to battle.$" + +gUnknown_08620D7C:: @ 8620D7C + .string "I love any kind of POKéMON!$" + +gUnknown_08620D98:: @ 8620D98 + .string "My daddy gives me spending$" + +gUnknown_08620DB3:: @ 8620DB3 + .string "money if I ace a test.$" + +gUnknown_08620DCA:: @ 8620DCA + .string "My knowledge rules!$" + +gUnknown_08620DDE:: @ 8620DDE + .string "Any smart POKéMON!$" + +gUnknown_08620DF1:: @ 8620DF1 + .string "I want to be a POKéMON$" + +gUnknown_08620E08:: @ 8620E08 + .string "researcher in the future.$" + +gUnknown_08620E22:: @ 8620E22 + .string "We talk it over first.$" + +gUnknown_08620E39:: @ 8620E39 + .string "POKéMON that we both like.$" + +gUnknown_08620E54:: @ 8620E54 + .string "We’re senior and junior$" + +gUnknown_08620E6C:: @ 8620E6C + .string "students into POKéMON!$" + +gUnknown_08620E83:: @ 8620E83 + .string "Go for it, my dears!$" + +gUnknown_08620E98:: @ 8620E98 + .string "I have no likes or dislikes.$" + +gUnknown_08620EB5:: @ 8620EB5 + .string "While out shopping for$" + +gUnknown_08620ECC:: @ 8620ECC + .string "supper, I battle too.$" + +gUnknown_08620EE2:: @ 8620EE2 + .string "I battle with love!$" + +gUnknown_08620EF6:: @ 8620EF6 + .string "A POKéMON raised with love!$" + +gUnknown_08620F12:: @ 8620F12 + .string "It’s important to build$" + +gUnknown_08620F2A:: @ 8620F2A + .string "trust with your POKéMON.$" + +gUnknown_08620F43:: @ 8620F43 + .string "I see through your moves!$" + +gUnknown_08620F5D:: @ 8620F5D + .string "The essence of FIGHTING.$" + +gUnknown_08620F76:: @ 8620F76 + .string "I’m not ready to give way$" + +gUnknown_08620F90:: @ 8620F90 + .string "to the young yet!$" + +gUnknown_08620FA2:: @ 8620FA2 + .string "Attack while defending.$" + +gUnknown_08620FBA:: @ 8620FBA + .string "The FIGHTING type.$" + +gUnknown_08620FCD:: @ 8620FCD + .string "Being old, I have my own$" + +gUnknown_08620FE6:: @ 8620FE6 + .string "style of battling.$" + +gUnknown_08620FF9:: @ 8620FF9 + .string "I do what I can.$" + +gUnknown_0862100A:: @ 862100A + .string "I use different types.$" + +gUnknown_08621021:: @ 8621021 + .string "I’m going to keep working$" + +gUnknown_0862103B:: @ 862103B + .string "until I beat a GYM LEADER.$" + +gUnknown_08621056:: @ 8621056 + .string "I battle patiently.$" + +gUnknown_0862106A:: @ 862106A + .string "WATER POKéMON to battle!$" + +gUnknown_08621083:: @ 8621083 + .string "I’m the world’s only guy to$" + +gUnknown_0862109F:: @ 862109F + .string "catch a huge POKéMON!$" + +gUnknown_086210B5:: @ 86210B5 + .string "Exploit the environment!$" + +gUnknown_086210CE:: @ 86210CE + .string "All hail the WATER type!$" + +gUnknown_086210E7:: @ 86210E7 + .string "I won’t be beaten by some$" + +gUnknown_08621101:: @ 8621101 + .string "beach bum SWIMMER!$" + +gUnknown_08621114:: @ 8621114 + .string "Speed above all!$" + +gUnknown_08621125:: @ 8621125 + .string "I use a speedy POKéMON.$" + +gUnknown_0862113D:: @ 862113D + .string "A marathon is a challenge$" + +gUnknown_08621157:: @ 8621157 + .string "against your own self.$" + +gUnknown_0862116E:: @ 862116E + .string "Defense is crucial.$" + +gUnknown_08621182:: @ 8621182 + .string "My POKéMON is solid.$" + +gUnknown_08621197:: @ 8621197 + .string "I started this for dieting,$" + +gUnknown_086211B3:: @ 86211B3 + .string "but I got right into it.$" + +gUnknown_086211CC:: @ 86211CC + .string "Strike before stricken!$" + +gUnknown_086211E4:: @ 86211E4 + .string "A fast-running POKéMON!$" + +gUnknown_086211FC:: @ 86211FC + .string "If you ran and ran, you’d$" + +gUnknown_08621216:: @ 8621216 + .string "become one with the wind.$" + +gUnknown_08621230:: @ 8621230 + .string "All-out offensive!$" + +gUnknown_08621243:: @ 8621243 + .string "WATER POKéMON rule!$" + +gUnknown_08621257:: @ 8621257 + .string "I must swim over 6 miles$" + +gUnknown_08621270:: @ 8621270 + .string "every day.$" + +gUnknown_0862127B:: @ 862127B + .string "Push and push again!$" + +gUnknown_08621290:: @ 8621290 + .string "The strength of STEEL.$" + +gUnknown_086212A7:: @ 86212A7 + .string "If you’re sweating, get$" + +gUnknown_086212BF:: @ 86212BF + .string "fluids into you regularly.$" + +gUnknown_086212DA:: @ 86212DA + .string "Draw the power of WATER.$" + +gUnknown_086212F3:: @ 86212F3 + .string "Toughened WATER POKéMON.$" + +gUnknown_0862130C:: @ 862130C + .string "Training POKéMON is good,$" + +gUnknown_08621326:: @ 8621326 + .string "but don’t neglect yourself.$" + +gUnknown_08621342:: @ 8621342 + .string "It’s about POKéMON power!$" + +gUnknown_0862135C:: @ 862135C + .string "See the power of DRAGONS!$" + +gUnknown_08621376:: @ 8621376 + .string "I’ll become legendary as the$" + +gUnknown_08621393:: @ 8621393 + .string "strongest one day!$" + +gUnknown_086213A6:: @ 86213A6 + .string "I’ll show you my technique!$" + +gUnknown_086213C2:: @ 86213C2 + .string "Elegantly wheeling BIRDS.$" + +gUnknown_086213DC:: @ 86213DC + .string "My BIRD POKéMON, deliver my$" + +gUnknown_086213F8:: @ 86213F8 + .string "love to that girl!$" + +gUnknown_0862140B:: @ 862140B + .string "You’ll suffer from poison!$" + +gUnknown_08621426:: @ 8621426 + .string "Poisonous POKéMON.$" +gUnknown_08621439:: @ 8621439 + .string "I undertake training so$" + +gUnknown_08621451:: @ 8621451 + .string "that I may become a ninja.$" + +gUnknown_0862146C:: @ 862146C + .string "The first strike wins!$" + +gUnknown_08621483:: @ 8621483 + .string "Speedy FIGHTING type.$" + +gUnknown_08621499:: @ 8621499 + .string "If my POKéMON lose,$" + +gUnknown_086214AD:: @ 86214AD + .string "I’ll carry on the fight!$" + +gUnknown_086214C6:: @ 86214C6 + .string "Go, go, my POKéMON!$" + +gUnknown_086214DA:: @ 86214DA + .string "I’ll raise anything.$" + +gUnknown_086214EF:: @ 86214EF + .string "UV rays are your skin’s$" + +gUnknown_08621507:: @ 8621507 + .string "enemy. Get protected.$" + +gUnknown_0862151D:: @ 862151D + .string "No mercy!$" + +gUnknown_08621527:: @ 8621527 + .string "Cute WATER POKéMON.$" + +gUnknown_0862153B:: @ 862153B + .string "I have too many fans.$" + +gUnknown_08621551:: @ 8621551 + .string "I was interviewed on TV.$" + +gUnknown_0862156A:: @ 862156A + .string "I think about this & that.$" + +gUnknown_08621585:: @ 8621585 + .string "I like all POKéMON.$" + +gUnknown_08621599:: @ 8621599 + .string "What lies beyond that$" + +gUnknown_086215AF:: @ 86215AF + .string "yonder hill?$" + +gUnknown_086215BC:: @ 86215BC + .string "We battle together!$" + +gUnknown_086215D0:: @ 86215D0 + .string "We train together!$" + +gUnknown_086215E3:: @ 86215E3 + .string "We like the same POKéMON,$" + +gUnknown_086215FD:: @ 86215FD + .string "but different desserts.$" + +gUnknown_08621615:: @ 8621615 + .string "I force things with power!$" + +gUnknown_08621630:: @ 8621630 + .string "WATER and FIGHTING types.$" + +gUnknown_0862164A:: @ 862164A + .string "Seamen are rough spirits!$" + +gUnknown_08621664:: @ 8621664 + .string "Any complaints?$" + +gUnknown_08621674:: @ 8621674 + .string "Up for a fight anytime!$" + +gUnknown_0862168C:: @ 862168C + .string "WATER POKéMON are my faves!$" + +gUnknown_086216A8:: @ 86216A8 + .string "If you want to shout loud,$" + +gUnknown_086216C3:: @ 86216C3 + .string "suck in air with your belly!$" + +gUnknown_086216E0:: @ 86216E0 + .string "Protect POKéMON from harm.$" + +gUnknown_086216FB:: @ 86216FB + .string "I love rare POKéMON.$" + +gUnknown_08621710:: @ 8621710 + .string "I want to collect all the$" + +gUnknown_0862172A:: @ 862172A + .string "world’s rare POKéMON.$" + +gUnknown_08621740:: @ 8621740 + .string "I count on power.$" + +gUnknown_08621752:: @ 8621752 + .string "POKéMON are my children.$" + +gUnknown_0862176B:: @ 862176B + .string "It takes knowledge and$" + +gUnknown_08621782:: @ 8621782 + .string "love to raise POKéMON.$" + +gUnknown_08621799:: @ 8621799 + .string "Full-on attack!$" + +gUnknown_086217A9:: @ 86217A9 + .string "Anything. I’ll raise it.$" + +gUnknown_086217C2:: @ 86217C2 + .string "I give them {POKEBLOCK}S for$" + +gUnknown_086217D9:: @ 86217D9 + .string "going after CONTEST titles.$" + +gUnknown_086217F5:: @ 86217F5 + .string "I raise POKéMON with care.$" + +gUnknown_08621810:: @ 8621810 + .string "Fun-to-raise POKéMON.$" + +gUnknown_08621826:: @ 8621826 + .string "Treat every POKéMON you$" + +gUnknown_0862183E:: @ 862183E + .string "meet with respect.$" + +gUnknown_08621851:: @ 8621851 + .string "I believe in my POKéMON.$" + +gUnknown_0862186A:: @ 862186A + .string "I like strong POKéMON.$" + +gUnknown_08621881:: @ 8621881 + .string "I’m training for rescue$" + +gUnknown_08621899:: @ 8621899 + .string "work with my POKéMON.$" + +gUnknown_086218AF:: @ 86218AF + .string "Attack in waves!$" + +gUnknown_086218C0:: @ 86218C0 + .string "I use different types.$" + +gUnknown_086218D7:: @ 86218D7 + .string "Those who destroy nature$" + +gUnknown_086218F0:: @ 86218F0 + .string "must never be forgiven!$" + +gUnknown_08621908:: @ 8621908 + .string "I’ll show you some guts!$" + +gUnknown_08621921:: @ 8621921 + .string "Cute POKéMON are my faves!$" + +gUnknown_0862193C:: @ 862193C + .string "After a battle, I always$" + +gUnknown_08621955:: @ 8621955 + .string "bathe with my POKéMON.$" + +gUnknown_0862196C:: @ 862196C + .string "Lightning-fast attack!$" + +gUnknown_08621983:: @ 8621983 + .string "BUG POKéMON are number 1!$" + +gUnknown_0862199D:: @ 862199D + .string "If you want to catch BUG$" + +gUnknown_086219B6:: @ 86219B6 + .string "POKéMON, wake up early.$" + +gUnknown_086219CE:: @ 86219CE + .string "I battle with power.$" + +gUnknown_086219E3:: @ 86219E3 + .string "Hard-bodied POKéMON.$" + +gUnknown_086219F8:: @ 86219F8 + .string "I’ve been planning a month$" + +gUnknown_08621A13:: @ 8621A13 + .string "for today’s hike.$" + +gUnknown_08621A25:: @ 8621A25 + .string "I like it hot!$" + +gUnknown_08621A34:: @ 8621A34 + .string "Hot POKéMON!$" + +gUnknown_08621A41:: @ 8621A41 + .string "As much as I love POKéMON,$" + +gUnknown_08621A5C:: @ 8621A5C + .string "I surely like hiking!$" + +gUnknown_08621A72:: @ 8621A72 + .string "Lovey-dovey strategy!$" + +gUnknown_08621A88:: @ 8621A88 + .string "Lovey-dovey POKéMON!$" + +gUnknown_08621A9D:: @ 8621A9D + .string "We’re lovey-dovey!$" + +gUnknown_08621AB0:: @ 8621AB0 + .string "Forever lovey-dovey!$" + +gUnknown_08621AC5:: @ 8621AC5 + .string "We let it all hang out.$" + +gUnknown_08621ADD:: @ 8621ADD + .string "The 1st POKéMON I caught.$" + +gUnknown_08621AF7:: @ 8621AF7 + .string "POKéMON and I have grown$" + +gUnknown_08621B10:: @ 8621B10 + .string "stronger together.$" + +gUnknown_08621B23:: @ 8621B23 + .string "ROCK-type power attack.$" + +gUnknown_08621B3B:: @ 8621B3B + .string "I prefer rock-hard POKéMON.$" + +gUnknown_08621B57:: @ 8621B57 + .string "A LEADER of a big GYM bears$" + +gUnknown_08621B73:: @ 8621B73 + .string "a lot of responsibility.$" + +gUnknown_08621B8C:: @ 8621B8C + .string "Direct physical action!$" + +gUnknown_08621BA4:: @ 8621BA4 + .string "FIGHTING POKéMON rule!$" + +gUnknown_08621BBB:: @ 8621BBB + .string "The world awaits me as the$" + +gUnknown_08621BD6:: @ 8621BD6 + .string "next big wave!$" + +gUnknown_08621BE5:: @ 8621BE5 + .string "I choose to electrify.$" + +gUnknown_08621BFC:: @ 8621BFC + .string "Get shocked by electricity!$" + +gUnknown_08621C18:: @ 8621C18 + .string "One must never throw a$" + +gUnknown_08621C2F:: @ 8621C2F + .string "match. Even I must not.$" + +gUnknown_08621C47:: @ 8621C47 + .string "Battle aggressively.$" + +gUnknown_08621C5C:: @ 8621C5C + .string "Burn with passion!$" + +gUnknown_08621C6F:: @ 8621C6F + .string "Completely wash away daily$" + +gUnknown_08621C8A:: @ 8621C8A + .string "fatigue in hot springs!$" + +gUnknown_08621CA2:: @ 8621CA2 + .string "I flexibly adapt my style.$" + +gUnknown_08621CBD:: @ 8621CBD + .string "Grown in a balanced manner.$" + +gUnknown_08621CD9:: @ 8621CD9 + .string "I walk the 30 minutes from$" + +gUnknown_08621CF4:: @ 8621CF4 + .string "home to here every day.$" + +gUnknown_08621D0C:: @ 8621D0C + .string "I take advantage of speed.$" + +gUnknown_08621D27:: @ 8621D27 + .string "Graceful sky dancers.$" + +gUnknown_08621D3D:: @ 8621D3D + .string "The ultimate would be to$" + +gUnknown_08621D56:: @ 8621D56 + .string "live as one with nature.$" + +gUnknown_08621D6F:: @ 8621D6F + .string "We battle in cooperation.$" + +gUnknown_08621D89:: @ 8621D89 + .string "Always friendly POKéMON.$" + +gUnknown_08621DA2:: @ 8621DA2 + .string "Papa has trouble telling$" + +gUnknown_08621DBB:: @ 8621DBB + .string "the two of us apart!$" + +gUnknown_08621DD0:: @ 8621DD0 + .string "I use splendid waterpower.$" + +gUnknown_08621DEB:: @ 8621DEB + .string "POKéMON of elegance!$" + +gUnknown_08621E00:: @ 8621E00 + .string "The adulation of beautiful$" + +gUnknown_08621E1B:: @ 8621E1B + .string "ladies fills me with energy!$" + +gUnknown_08621E38:: @ 8621E38 + .string "Offense over defense!$" + +gUnknown_08621E4E:: @ 8621E4E + .string "The DARK side’s beauties.$" + +gUnknown_08621E68:: @ 8621E68 + .string "They said I was a punk, but$" + +gUnknown_08621E84:: @ 8621E84 + .string "I’m one of the ELITE FOUR!$" + +gUnknown_08621E9F:: @ 8621E9F + .string "Confuse and confound.$" + +gUnknown_08621EB5:: @ 8621EB5 + .string "There’s nothing definite.$" + +gUnknown_08621ECF:: @ 8621ECF + .string "I wonder how my grandma at$" + +gUnknown_08621EEA:: @ 8621EEA + .string "MT. PYRE is doing?$" + +gUnknown_08621EFD:: @ 8621EFD + .string "I use items for help.$" + +gUnknown_08621F13:: @ 8621F13 + .string "Flaming passion in icy cold!$" + +gUnknown_08621F30:: @ 8621F30 + .string "The ICE type can be better$" + +gUnknown_08621F4B:: @ 8621F4B + .string "trained in this hot land.$" + +gUnknown_08621F65:: @ 8621F65 + .string "Harness strong abilities.$" + +gUnknown_08621F7F:: @ 8621F7F + .string "The raw power of DRAGONS!$" + +gUnknown_08621F99:: @ 8621F99 + .string "I dedicate myself to the$" + +gUnknown_08621FB2:: @ 8621FB2 + .string "POKéMON that saved me.$" + +gUnknown_08621FC9:: @ 8621FC9 + .string "Dignity and respect.$" + +gUnknown_08621FDE:: @ 8621FDE + .string "I prefer POKéMON of grace.$" + +gUnknown_08621FF9:: @ 8621FF9 + .string "I represent beauty as$" + +gUnknown_0862200F:: @ 862200F + .string "well as intelligence.$" + +.align 2 + +@ strategy, mon text, introduction1, introduction2 gUnknown_08622028:: @ 8622028 - .incbin "baserom.gba", 0x622028, 0x4e0 + .4byte gUnknown_08620390, gUnknown_086203AA, gUnknown_086203C2, gUnknown_086203DB + .4byte gUnknown_086203F2, gUnknown_0862040D, gUnknown_08620428, gUnknown_08620444 + .4byte gUnknown_08620456, gUnknown_0862046C, gUnknown_08620481, gUnknown_0862049C + .4byte gUnknown_086204B0, gUnknown_086204C7, gUnknown_086204DD, gUnknown_086204F9 + .4byte gUnknown_0862050E, gUnknown_0862052B, gUnknown_08620546, gUnknown_08620562 + .4byte gUnknown_0862057D, gUnknown_08620592, gUnknown_086205AC, gUnknown_086205C6 + .4byte gUnknown_086205DD, gUnknown_086205F8, gUnknown_08620612, gUnknown_0862062F + .4byte gUnknown_08620638, gUnknown_08620654, gUnknown_08620668, gUnknown_08620681 + .4byte gUnknown_08620693, gUnknown_086206A7, gUnknown_086206BC, gUnknown_086206D5 + .4byte gUnknown_086206E7, gUnknown_086206FF, gUnknown_08620717, gUnknown_08620730 + .4byte gUnknown_0862073D, gUnknown_0862074E, gUnknown_0862075D, gUnknown_08620779 + .4byte gUnknown_0862078D, gUnknown_086207A9, gUnknown_086207BC, gUnknown_086207D7 + .4byte gUnknown_086207F4, gUnknown_0862080A, gUnknown_0862081B, gUnknown_08620833 + .4byte gUnknown_0862084B, gUnknown_08620863, gUnknown_0862087C, gUnknown_08620896 + .4byte gUnknown_086208AA, gUnknown_086208C3, gUnknown_086208DC, gUnknown_086208F1 + .4byte gUnknown_08620909, gUnknown_0862091C, gUnknown_0862092E, gUnknown_0862094A + .4byte gUnknown_08620963, gUnknown_08620979, gUnknown_08620988, gUnknown_086209A4 + .4byte gUnknown_086209B4, gUnknown_086209CA, gUnknown_086209E3, gUnknown_086209FD + .4byte gUnknown_08620A18, gUnknown_08620A31, gUnknown_08620A4B, gUnknown_08620A66 + .4byte gUnknown_08620A78, gUnknown_08620A8C, gUnknown_08620A9E, gUnknown_08620AB8 + .4byte gUnknown_08620AD2, gUnknown_08620AE4, gUnknown_08620AFB, gUnknown_08620B16 + .4byte gUnknown_08620B32, gUnknown_08620B4C, gUnknown_08620B64, gUnknown_08620B7F + .4byte gUnknown_08620B8C, gUnknown_08620BA6, gUnknown_08620BC0, gUnknown_08620BD8 + .4byte gUnknown_08620BF2, gUnknown_08620C03, gUnknown_08620C19, gUnknown_08620C34 + .4byte gUnknown_08620C4E, gUnknown_08620C60, gUnknown_08620C78, gUnknown_08620C92 + .4byte gUnknown_08620CA8, gUnknown_08620CBE, gUnknown_08620CD9, gUnknown_08620CF5 + .4byte gUnknown_08620D06, gUnknown_08620D1A, gUnknown_08620D32, gUnknown_08620D49 + .4byte gUnknown_08620D63, gUnknown_08620D7C, gUnknown_08620D98, gUnknown_08620DB3 + .4byte gUnknown_08620DCA, gUnknown_08620DDE, gUnknown_08620DF1, gUnknown_08620E08 + .4byte gUnknown_08620E22, gUnknown_08620E39, gUnknown_08620E54, gUnknown_08620E6C + .4byte gUnknown_08620E83, gUnknown_08620E98, gUnknown_08620EB5, gUnknown_08620ECC + .4byte gUnknown_08620EE2, gUnknown_08620EF6, gUnknown_08620F12, gUnknown_08620F2A + .4byte gUnknown_08620F43, gUnknown_08620F5D, gUnknown_08620F76, gUnknown_08620F90 + .4byte gUnknown_08620FA2, gUnknown_08620FBA, gUnknown_08620FCD, gUnknown_08620FE6 + .4byte gUnknown_08620FF9, gUnknown_0862100A, gUnknown_08621021, gUnknown_0862103B + .4byte gUnknown_08621056, gUnknown_0862106A, gUnknown_08621083, gUnknown_0862109F + .4byte gUnknown_086210B5, gUnknown_086210CE, gUnknown_086210E7, gUnknown_08621101 + .4byte gUnknown_08621114, gUnknown_08621125, gUnknown_0862113D, gUnknown_08621157 + .4byte gUnknown_0862116E, gUnknown_08621182, gUnknown_08621197, gUnknown_086211B3 + .4byte gUnknown_086211CC, gUnknown_086211E4, gUnknown_086211FC, gUnknown_08621216 + .4byte gUnknown_08621230, gUnknown_08621243, gUnknown_08621257, gUnknown_08621270 + .4byte gUnknown_0862127B, gUnknown_08621290, gUnknown_086212A7, gUnknown_086212BF + .4byte gUnknown_086212DA, gUnknown_086212F3, gUnknown_0862130C, gUnknown_08621326 + .4byte gUnknown_08621342, gUnknown_0862135C, gUnknown_08621376, gUnknown_08621393 + .4byte gUnknown_086213A6, gUnknown_086213C2, gUnknown_086213DC, gUnknown_086213F8 + .4byte gUnknown_0862140B, gUnknown_08621426, gUnknown_08621439, gUnknown_08621451 + .4byte gUnknown_0862146C, gUnknown_08621483, gUnknown_08621499, gUnknown_086214AD + .4byte gUnknown_086214C6, gUnknown_086214DA, gUnknown_086214EF, gUnknown_08621507 + .4byte gUnknown_0862151D, gUnknown_08621527, gUnknown_0862153B, gUnknown_08621551 + .4byte gUnknown_0862156A, gUnknown_08621585, gUnknown_08621599, gUnknown_086215AF + .4byte gUnknown_086215BC, gUnknown_086215D0, gUnknown_086215E3, gUnknown_086215FD + .4byte gUnknown_08621615, gUnknown_08621630, gUnknown_0862164A, gUnknown_08621664 + .4byte gUnknown_08621674, gUnknown_0862168C, gUnknown_086216A8, gUnknown_086216C3 + .4byte gUnknown_086216E0, gUnknown_086216FB, gUnknown_08621710, gUnknown_0862172A + .4byte gUnknown_08621740, gUnknown_08621752, gUnknown_0862176B, gUnknown_08621782 + .4byte gUnknown_08621799, gUnknown_086217A9, gUnknown_086217C2, gUnknown_086217D9 + .4byte gUnknown_086217F5, gUnknown_08621810, gUnknown_08621826, gUnknown_0862183E + .4byte gUnknown_08621851, gUnknown_0862186A, gUnknown_08621881, gUnknown_08621899 + .4byte gUnknown_086218AF, gUnknown_086218C0, gUnknown_086218D7, gUnknown_086218F0 + .4byte gUnknown_08621908, gUnknown_08621921, gUnknown_0862193C, gUnknown_08621955 + .4byte gUnknown_0862196C, gUnknown_08621983, gUnknown_0862199D, gUnknown_086219B6 + .4byte gUnknown_086219CE, gUnknown_086219E3, gUnknown_086219F8, gUnknown_08621A13 + .4byte gUnknown_08621A25, gUnknown_08621A34, gUnknown_08621A41, gUnknown_08621A5C + .4byte gUnknown_08621A72, gUnknown_08621A88, gUnknown_08621A9D, gUnknown_08621AB0 + .4byte gUnknown_08621AC5, gUnknown_08621ADD, gUnknown_08621AF7, gUnknown_08621B10 + .4byte gUnknown_08621B23, gUnknown_08621B3B, gUnknown_08621B57, gUnknown_08621B73 + .4byte gUnknown_08621B8C, gUnknown_08621BA4, gUnknown_08621BBB, gUnknown_08621BD6 + .4byte gUnknown_08621BE5, gUnknown_08621BFC, gUnknown_08621C18, gUnknown_08621C2F + .4byte gUnknown_08621C47, gUnknown_08621C5C, gUnknown_08621C6F, gUnknown_08621C8A + .4byte gUnknown_08621CA2, gUnknown_08621CBD, gUnknown_08621CD9, gUnknown_08621CF4 + .4byte gUnknown_08621D0C, gUnknown_08621D27, gUnknown_08621D3D, gUnknown_08621D56 + .4byte gUnknown_08621D6F, gUnknown_08621D89, gUnknown_08621DA2, gUnknown_08621DBB + .4byte gUnknown_08621DD0, gUnknown_08621DEB, gUnknown_08621E00, gUnknown_08621E1B + .4byte gUnknown_08621E38, gUnknown_08621E4E, gUnknown_08621E68, gUnknown_08621E84 + .4byte gUnknown_08621E9F, gUnknown_08621EB5, gUnknown_08621ECF, gUnknown_08621EEA + .4byte gUnknown_08621EFD, gUnknown_08621F13, gUnknown_08621F30, gUnknown_08621F4B + .4byte gUnknown_08621F65, gUnknown_08621F7F, gUnknown_08621F99, gUnknown_08621FB2 + .4byte gUnknown_08621FC9, gUnknown_08621FDE, gUnknown_08621FF9, gUnknown_0862200F gUnknown_08622508:: @ 8622508 .incbin "baserom.gba", 0x622508, 0x2 @@ -151,7 +1345,10 @@ gUnknown_08622530:: @ 8622530 .incbin "baserom.gba", 0x622530, 0xa4 gUnknown_086225D4:: @ 86225D4 - .incbin "baserom.gba", 0x6225d4, 0x10c + .incbin "baserom.gba", 0x6225d4, 0xC4 + +gUnknown_08622698:: @ 8622698 + .incbin "baserom.gba", 0x622698, 0x48 gUnknown_086226E0:: @ 86226E0 .incbin "baserom.gba", 0x6226e0, 0x20 @@ -172,7 +1369,22 @@ gUnknown_08622794:: @ 8622794 .incbin "baserom.gba", 0x622794, 0x4 gUnknown_08622798:: @ 8622798 - .incbin "baserom.gba", 0x622798, 0x40 + .4byte NULL + .4byte sub_81CB510 + .4byte sub_81CB588 + .4byte sub_81CB600 + .4byte sub_81CB678 + .4byte sub_81CB6F0 + .4byte sub_81CB734 + .4byte sub_81CB75C + .4byte sub_81CB7A0 + .4byte sub_81CB824 + .4byte sub_81CB888 + .4byte sub_81CB93C + .4byte sub_81CBAD4 + .4byte sub_81CB9C8 + .4byte sub_81CBA68 + .4byte sub_81CBB74 gUnknown_086227D8:: @ 86227D8 .incbin "baserom.gba", 0x6227d8, 0x8 @@ -181,7 +1393,9 @@ gUnknown_086227E0:: @ 86227E0 .incbin "baserom.gba", 0x6227e0, 0x8 gUnknown_086227E8:: @ 86227E8 - .incbin "baserom.gba", 0x6227e8, 0xc + .4byte gUnknown_085EC017 + .4byte gUnknown_085EC01C + .4byte gUnknown_085EC022 gUnknown_086227F4:: @ 86227F4 .incbin "baserom.gba", 0x6227f4, 0x14 @@ -193,40 +1407,151 @@ gUnknown_08622810:: @ 8622810 .incbin "baserom.gba", 0x622810, 0x8 gUnknown_08622818:: @ 8622818 - .incbin "baserom.gba", 0x622818, 0x18 + obj_pal gUnknown_08622698, 12 + obj_pal NULL, 0 + +gUnknown_08622828:: @ 8622828 + .2byte 0x8000 + .2byte 0x0 + .2byte 0x400 + .2byte 0x0 gUnknown_08622830:: @ 8622830 - .incbin "baserom.gba", 0x622830, 0x20 + spr_template 7, 12, gUnknown_08622828, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81CC34C + +gUnknown_08622848:: @ 8622848 + .2byte 0x0 + .2byte 0xC000 + .2byte 0x400 + .2byte 0x0 gUnknown_08622850:: @ 8622850 - .incbin "baserom.gba", 0x622850, 0x18 + spr_template 8, 13, gUnknown_08622848, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08622868:: @ 8622868 .incbin "baserom.gba", 0x622868, 0x20 gUnknown_08622888:: @ 8622888 - .incbin "baserom.gba", 0x622888, 0x850 + .incbin "baserom.gba", 0x622888, 0x1F4 + +gUnknown_08622A7C:: @ 8622A7C + .incbin "baserom.gba", 0x622a7c, 0x44 + +gUnknown_08622AC0:: @ 8622AC0 + .incbin "baserom.gba", 0x622ac0, 0x48 + +gUnknown_08622B08:: @ 8622B08 + .incbin "baserom.gba", 0x622b08, 0x50 + +gUnknown_08622B58:: @ 8622B58 + .incbin "baserom.gba", 0x622b58, 0x60 + +gUnknown_08622BB8:: @ 8622BB8 + .incbin "baserom.gba", 0x622bb8, 0x4C + +gUnknown_08622C04:: @ 8622C04 + .incbin "baserom.gba", 0x622c04, 0x54 + +gUnknown_08622C58:: @ 8622C58 + .incbin "baserom.gba", 0x622c58, 0x54 + +gUnknown_08622CAC:: @ 8622CAC + .incbin "baserom.gba", 0x622cac, 0x40 + +gUnknown_08622CEC:: @ 8622CEC + .incbin "baserom.gba", 0x622cec, 0x58 + +gUnknown_08622D44:: @ 8622D44 + .incbin "baserom.gba", 0x622d44, 0x54 + +gUnknown_08622D98:: @ 8622D98 + .incbin "baserom.gba", 0x622d98, 0x30 + +gUnknown_08622DC8:: @ 8622DC8 + .incbin "baserom.gba", 0x622dc8, 0x4C + +gUnknown_08622E14:: @ 8622E14 + .incbin "baserom.gba", 0x622e14, 0x58 + +gUnknown_08622E6C:: @ 8622E6C + .incbin "baserom.gba", 0x622e6c, 0x30 + +gUnknown_08622E9C:: @ 8622E9C + .incbin "baserom.gba", 0x622e9c, 0x38 + +gUnknown_08622ED4:: @ 8622ED4 + .incbin "baserom.gba", 0x622ed4, 0x40 + +gUnknown_08622F14:: @ 8622F14 + .incbin "baserom.gba", 0x622f14, 0x48 + +gUnknown_08622F5C:: @ 8622F5C + .incbin "baserom.gba", 0x622f5c, 0x44 + +gUnknown_08622FA0:: @ 8622FA0 + .incbin "baserom.gba", 0x622fa0, 0x38 + +gUnknown_08622FD8:: @ 8622FD8 + .incbin "baserom.gba", 0x622fd8, 0x48 + +gUnknown_08623020:: @ 8623020 + .incbin "baserom.gba", 0x623020, 0x5C + +gUnknown_0862307C:: @ 862307C + .incbin "baserom.gba", 0x62307c, 0x5C gUnknown_086230D8:: @ 86230D8 .incbin "baserom.gba", 0x6230d8, 0xc gUnknown_086230E4:: @ 86230E4 - .incbin "baserom.gba", 0x6230e4, 0x14 + .4byte NULL + .4byte sub_81CC848 + .4byte sub_81CC878 + .4byte sub_81CC8D8 + .4byte sub_81CC95C gUnknown_086230F8:: @ 86230F8 - .incbin "baserom.gba", 0x6230f8, 0x8 + obj_tiles gUnknown_08DC9208, 0x800, 6 gUnknown_08623100:: @ 8623100 - .incbin "baserom.gba", 0x623100, 0x10 + obj_pal gUnknown_08DC91E8, 11 + obj_pal NULL, 0 gUnknown_08623110:: @ 8623110 .incbin "baserom.gba", 0x623110, 0x8 gUnknown_08623118:: @ 8623118 - .incbin "baserom.gba", 0x623118, 0xb8 + .4byte 0, gUnknown_08622E6C + .4byte 1, gUnknown_08622D98 + .4byte 2, gUnknown_08622E9C + .4byte 3, gUnknown_08622A7C + .4byte 4, gUnknown_08622AC0 + .4byte 5, gUnknown_08622FA0 + .4byte 6, gUnknown_08622CAC + .4byte 7, gUnknown_0862307C + .4byte 8, gUnknown_08622B58 + .4byte 0x10008, gUnknown_08622BB8 + .4byte 9, gUnknown_08622D44 + .4byte 0x10009, gUnknown_08622CEC + .4byte 0xA, gUnknown_08622C04 + .4byte 0x1000A, gUnknown_08622C58 + .4byte 0xB, gUnknown_08622B08 + .4byte 0xC, gUnknown_08622E14 + .4byte 0x1000C, gUnknown_08622DC8 + .4byte 0xD, gUnknown_08623020 + .4byte 0x1000D, gUnknown_08622FD8 + .4byte 0xE, gUnknown_08622ED4 + .4byte 0xF, gUnknown_08622F14 + .4byte 0x1000F, gUnknown_08622F5C + +gUnknown_086231C8:: @ 86231C8 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x400 + .2byte 0x0 gUnknown_086231D0:: @ 86231D0 - .incbin "baserom.gba", 0x6231d0, 0x18 + spr_template 6, 11, gUnknown_086231C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81CCEF4 gUnknown_086231E8:: @ 86231E8 .incbin "baserom.gba", 0x6231e8, 0x20 @@ -259,13 +1584,22 @@ gUnknown_0862337C:: @ 862337C .incbin "baserom.gba", 0x62337c, 0x8 gUnknown_08623384:: @ 8623384 - .incbin "baserom.gba", 0x623384, 0x1c + .4byte NULL + .4byte sub_81CE37C + .4byte sub_81CE2D0 + .4byte sub_81CE4D8 + .4byte sub_81CE5E4 + .4byte sub_81CE6BC + .4byte sub_81CE700 gUnknown_086233A0:: @ 86233A0 .incbin "baserom.gba", 0x6233a0, 0x14 gUnknown_086233B4:: @ 86233B4 - .incbin "baserom.gba", 0x6233b4, 0x10 + .4byte sub_81CF134 + .4byte sub_81CF1C4 + .4byte sub_81CF1D8 + .4byte sub_81CF278 gUnknown_086233C4:: @ 86233C4 .incbin "baserom.gba", 0x6233c4, 0x20 @@ -286,7 +1620,13 @@ gUnknown_08623594:: @ 8623594 .incbin "baserom.gba", 0x623594, 0x4 gUnknown_08623598:: @ 8623598 - .incbin "baserom.gba", 0x623598, 0x1c + .4byte NULL + .4byte sub_81CF578 + .4byte sub_81CF5F0 + .4byte sub_81CF668 + .4byte sub_81CF6E0 + .4byte sub_81CF758 + .4byte sub_81CF798 gUnknown_086235B4:: @ 86235B4 .incbin "baserom.gba", 0x6235b4, 0x8 @@ -301,7 +1641,9 @@ gUnknown_086235D4:: @ 86235D4 .incbin "baserom.gba", 0x6235d4, 0x4 gUnknown_086235D8:: @ 86235D8 - .incbin "baserom.gba", 0x6235d8, 0xc + .4byte sub_81CFB8C + .4byte sub_81CFC2C + .4byte sub_81CFC40 gUnknown_086235E4:: @ 86235E4 .incbin "baserom.gba", 0x6235e4, 0x20 @@ -322,7 +1664,13 @@ gUnknown_086237B4:: @ 86237B4 .incbin "baserom.gba", 0x6237b4, 0x4 gUnknown_086237B8:: @ 86237B8 - .incbin "baserom.gba", 0x6237b8, 0x1c + .4byte NULL + .4byte sub_81CFFFC + .4byte sub_81D0074 + .4byte sub_81D00EC + .4byte sub_81D0164 + .4byte sub_81D01DC + .4byte sub_81D021C gUnknown_086237D4:: @ 86237D4 .incbin "baserom.gba", 0x6237d4, 0x8 @@ -346,19 +1694,39 @@ gUnknown_086237F8:: @ 86237F8 .include "data/text/gift_ribbon_descriptions.inc" gUnknown_08623FF8:: @ 8623FF8 - .incbin "baserom.gba", 0x623ff8, 0xa0 + .incbin "baserom.gba", 0x623ff8, 0x20 + +gUnknown_08624018:: @ 8624018 + .incbin "baserom.gba", 0x624018, 0x20 + +gUnknown_08624038:: @ 8624038 + .incbin "baserom.gba", 0x624038, 0x20 + +gUnknown_08624058:: @ 8624058 + .incbin "baserom.gba", 0x624058, 0x20 + +gUnknown_08624078:: @ 8624078 + .incbin "baserom.gba", 0x624078, 0x20 gUnknown_08624098:: @ 8624098 - .incbin "baserom.gba", 0x624098, 0x20 + .incbin "baserom.gba", 0x624098, 0x20 gUnknown_086240B8:: @ 86240B8 - .incbin "baserom.gba", 0x6240b8, 0xae0 + .incbin "baserom.gba", 0x6240b8, 0x1C8 + +gUnknown_08624280:: @ 8624280 + .incbin "baserom.gba", 0x624280, 0x918 gUnknown_08624B98:: @ 8624B98 .incbin "baserom.gba", 0x624b98, 0x8 gUnknown_08624BA0:: @ 8624BA0 - .incbin "baserom.gba", 0x624ba0, 0x18 + .4byte NULL + .4byte sub_81D0C84 + .4byte sub_81D0D2C + .4byte sub_81D0D8C + .4byte sub_81D0E00 + .4byte sub_81D0C54 gUnknown_08624BB8:: @ 8624BB8 .incbin "baserom.gba", 0x624bb8, 0x8 @@ -385,37 +1753,156 @@ gUnknown_08624BF8:: @ 8624BF8 .incbin "baserom.gba", 0x624bf8, 0x80 gUnknown_08624C78:: @ 8624C78 - .incbin "baserom.gba", 0x624c78, 0x8 + obj_tiles gUnknown_08624280, 0x1800, 9 gUnknown_08624C80:: @ 8624C80 - .incbin "baserom.gba", 0x624c80, 0x84 + obj_pal gUnknown_08623FF8, 15 + obj_pal gUnknown_08624018, 16 + obj_pal gUnknown_08624038, 17 + obj_pal gUnknown_08624058, 18 + obj_pal gUnknown_08624078, 19 + obj_pal NULL, 0 + +gUnknown_08624CB0:: @ 8624CB0 + .incbin "baserom.gba", 0x624cb0, 0x54 gUnknown_08624D04:: @ 8624D04 - .incbin "baserom.gba", 0x624d04, 0x5a4 + .incbin "baserom.gba", 0x624d04, 0x78 + +gUnknown_08624D7C:: @ 8624D7C + .incbin "baserom.gba", 0x624d7c, 0x60 + +gUnknown_08624DDC:: @ 8624DDC + .incbin "baserom.gba", 0x624ddc, 0x14 + +gUnknown_08624DF0:: @ 8624DF0 + .incbin "baserom.gba", 0x624df0, 0x2C + +gUnknown_08624E1C:: @ 8624E1C + .incbin "baserom.gba", 0x624e1c, 0x50 + +gUnknown_08624E6C:: @ 8624E6C + .incbin "baserom.gba", 0x624e6c, 0x90 + +gUnknown_08624EFC:: @ 8624EFC + .incbin "baserom.gba", 0x624efc, 0x90 + +gUnknown_08624F8C:: @ 8624F8C + .incbin "baserom.gba", 0x624f8c, 0x60 + +gUnknown_08624FEC:: @ 8624FEC + .incbin "baserom.gba", 0x624fec, 0x54 + +gUnknown_08625040:: @ 8625040 + .incbin "baserom.gba", 0x625040, 0x38 + +gUnknown_08625078:: @ 8625078 + .incbin "baserom.gba", 0x625078, 0x3C + +gUnknown_086250B4:: @ 86250B4 + .incbin "baserom.gba", 0x6250b4, 0x3C + +gUnknown_086250F0:: @ 86250F0 + .incbin "baserom.gba", 0x6250f0, 0x3C + +gUnknown_0862512C:: @ 862512C + .incbin "baserom.gba", 0x62512c, 0x3C + +gUnknown_08625168:: @ 8625168 + .incbin "baserom.gba", 0x625168, 0x3C + +gUnknown_086251A4:: @ 86251A4 + .incbin "baserom.gba", 0x6251a4, 0x3C + +gUnknown_086251E0:: @ 86251E0 + .incbin "baserom.gba", 0x6251e0, 0x24 + +gUnknown_08625204:: @ 8625204 + .incbin "baserom.gba", 0x625204, 0x24 + +gUnknown_08625228:: @ 8625228 + .incbin "baserom.gba", 0x625228, 0x24 + +gUnknown_0862524C:: @ 862524C + .incbin "baserom.gba", 0x62524c, 0x24 + +gUnknown_08625270:: @ 8625270 + .incbin "baserom.gba", 0x625270, 0x24 + +gUnknown_08625294:: @ 8625294 + .incbin "baserom.gba", 0x625294, 0x14 gUnknown_086252A8:: @ 86252A8 - .incbin "baserom.gba", 0x6252a8, 0x54 + .4byte gUnknown_08624D7C + .4byte gUnknown_08624DF0 + .4byte gUnknown_08624F8C + .4byte gUnknown_08624EFC + .4byte gUnknown_08624FEC + .4byte gUnknown_08624DDC + .4byte gUnknown_08624E1C + .4byte gUnknown_08624E6C + .4byte gUnknown_08625040 + .4byte gUnknown_08625078 + .4byte gUnknown_086250B4 + .4byte gUnknown_086250F0 + .4byte gUnknown_0862512C + .4byte gUnknown_08625168 + .4byte gUnknown_086251A4 + .4byte gUnknown_086251E0 + .4byte gUnknown_08625204 + .4byte gUnknown_08625228 + .4byte gUnknown_0862524C + .4byte gUnknown_08625270 + .4byte gUnknown_08625294 gUnknown_086252FC:: @ 86252FC - .incbin "baserom.gba", 0x6252fc, 0x14 + .4byte sub_81D1628 + .4byte sub_81D164C + .4byte sub_81D1670 + .4byte sub_81D1694 + .4byte sub_81D16CC gUnknown_08625310:: @ 8625310 - .incbin "baserom.gba", 0x625310, 0x14 + .4byte sub_81D1714 + .4byte sub_81D1718 + .4byte sub_81D171C + .4byte sub_81D1750 + .4byte sub_81D1754 gUnknown_08625324:: @ 8625324 - .incbin "baserom.gba", 0x625324, 0x14 + .4byte sub_81D178C + .4byte sub_81D1790 + .4byte sub_81D17C0 + .4byte sub_81D17E0 + .4byte sub_81D17E4 gUnknown_08625338:: @ 8625338 - .incbin "baserom.gba", 0x625338, 0x14 + .4byte sub_81D1840 + .4byte sub_81D1844 + .4byte sub_81D1848 + .4byte sub_81D184C + .4byte sub_81D1850 gUnknown_0862534C:: @ 862534C - .incbin "baserom.gba", 0x62534c, 0x14 + .4byte sub_81D1888 + .4byte sub_81D188C + .4byte sub_81D1890 + .4byte sub_81D1894 + .4byte sub_81D1898 gUnknown_08625360:: @ 8625360 - .incbin "baserom.gba", 0x625360, 0x14 + .4byte sub_81D18D0 + .4byte sub_81D18DC + .4byte sub_81D18FC + .4byte sub_81D1908 + .4byte sub_81D1914 gUnknown_08625374:: @ 8625374 - .incbin "baserom.gba", 0x625374, 0x14 + .4byte sub_81D1AB0 + .4byte sub_81D1ABC + .4byte sub_81D1ADC + .4byte sub_81D1AF4 + .4byte sub_81D1B00 gUnknown_08625388:: @ 8625388 .incbin "baserom.gba", 0x625388, 0x60 @@ -475,7 +1962,12 @@ gUnknown_08625B2C:: @ 8625B2C .incbin "baserom.gba", 0x625b2c, 0x28 gUnknown_08625B54:: @ 8625B54 - .incbin "baserom.gba", 0x625b54, 0x18 + .4byte gUnknown_085EEA46 + .4byte gUnknown_085EEA4E + .4byte gUnknown_085EEA55 + .4byte gUnknown_085EEA63 + .4byte gUnknown_085EEA6B + .4byte gUnknown_085EEA5D gUnknown_08625B6C:: @ 8625B6C .incbin "baserom.gba", 0x625b6c, 0x520 @@ -502,10 +1994,30 @@ gUnknown_0862A5F8:: @ 862A5F8 .incbin "baserom.gba", 0x62a5f8, 0x20 gUnknown_0862A618:: @ 862A618 - .incbin "baserom.gba", 0x62a618, 0x48 + .4byte sub_81D581C + .4byte sub_81D58D8 + .4byte sub_81D5924 + .4byte sub_81D59D0 + .4byte sub_81D5A70 + .4byte sub_81D5AB4 + .4byte sub_81D5AD0 + .4byte sub_81D5B2C + .4byte sub_81D5BBC + .4byte sub_81D5C00 + .4byte sub_81D5C5C + .4byte sub_81D62B4 + .4byte sub_81D64AC + .4byte sub_81D64DC + .4byte sub_81D64FC + .4byte sub_81D6518 + .4byte sub_81D6568 + .4byte sub_81D65A0 gUnknown_0862A660:: @ 862A660 - .incbin "baserom.gba", 0x62a660, 0x10 + .4byte gUnknown_085EB32D + .4byte gUnknown_085EB33E + .4byte gUnknown_085EB350 + .4byte gUnknown_085EB361 gUnknown_0862A670:: @ 862A670 .incbin "baserom.gba", 0x62a670, 0x18 diff --git a/data/rayquaza_scene.s b/data/rayquaza_scene.s deleted file mode 100644 index 51a285285..000000000 --- a/data/rayquaza_scene.s +++ /dev/null @@ -1,160 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0862A6A0:: @ 862A6A0 - .incbin "baserom.gba", 0x62a6a0, 0x8c - -gUnknown_0862A72C:: @ 862A72C - .incbin "baserom.gba", 0x62a72c, 0x24 - -gUnknown_0862A750:: @ 862A750 - .incbin "baserom.gba", 0x62a750, 0x24 - -gUnknown_0862A774:: @ 862A774 - .incbin "baserom.gba", 0x62a774, 0xa8 - -gUnknown_0862A81C:: @ 862A81C - .incbin "baserom.gba", 0x62a81c, 0x30 - -gUnknown_0862A84C:: @ 862A84C - .incbin "baserom.gba", 0x62a84c, 0x18 - -gUnknown_0862A864:: @ 862A864 - .incbin "baserom.gba", 0x62a864, 0x18 - -gUnknown_0862A87C:: @ 862A87C - .incbin "baserom.gba", 0x62a87c, 0xc - -gUnknown_0862A888:: @ 862A888 - .incbin "baserom.gba", 0x62a888, 0x3c - -gUnknown_0862A8C4:: @ 862A8C4 - .incbin "baserom.gba", 0x62a8c4, 0x8 - -gUnknown_0862A8CC:: @ 862A8CC - .incbin "baserom.gba", 0x62a8cc, 0x8 - -gUnknown_0862A8D4:: @ 862A8D4 - .incbin "baserom.gba", 0x62a8d4, 0x24 - -gUnknown_0862A8F8:: @ 862A8F8 - .incbin "baserom.gba", 0x62a8f8, 0x8 - -gUnknown_0862A900:: @ 862A900 - .incbin "baserom.gba", 0x62a900, 0x24 - -gUnknown_0862A924:: @ 862A924 - .incbin "baserom.gba", 0x62a924, 0x8 - -gUnknown_0862A92C:: @ 862A92C - .incbin "baserom.gba", 0x62a92c, 0xa8 - -gUnknown_0862A9D4:: @ 862A9D4 - .incbin "baserom.gba", 0x62a9d4, 0x8 - -gUnknown_0862A9DC:: @ 862A9DC - .incbin "baserom.gba", 0x62a9dc, 0x8 - -gUnknown_0862A9E4:: @ 862A9E4 - .incbin "baserom.gba", 0x62a9e4, 0x30 - -gUnknown_0862AA14:: @ 862AA14 - .incbin "baserom.gba", 0x62aa14, 0x8 - -gUnknown_0862AA1C:: @ 862AA1C - .incbin "baserom.gba", 0x62aa1c, 0x18 - -gUnknown_0862AA34:: @ 862AA34 - .incbin "baserom.gba", 0x62aa34, 0x8 - -gUnknown_0862AA3C:: @ 862AA3C - .incbin "baserom.gba", 0x62aa3c, 0x18 - -gUnknown_0862AA54:: @ 862AA54 - .incbin "baserom.gba", 0x62aa54, 0x3c - -gUnknown_0862AA90:: @ 862AA90 - .incbin "baserom.gba", 0x62aa90, 0x8 - -gUnknown_0862AA98:: @ 862AA98 - .incbin "baserom.gba", 0x62aa98, 0x8 - -gUnknown_0862AAA0:: @ 862AAA0 - .incbin "baserom.gba", 0x62aaa0, 0x18 - -gUnknown_0862AAB8:: @ 862AAB8 - .incbin "baserom.gba", 0x62aab8, 0x14 - -gUnknown_0862AACC:: @ 862AACC - .incbin "baserom.gba", 0x62aacc, 0x30 - -gUnknown_0862AAFC:: @ 862AAFC - .incbin "baserom.gba", 0x62aafc, 0x8 - -gUnknown_0862AB04:: @ 862AB04 - .incbin "baserom.gba", 0x62ab04, 0x8 - -gUnknown_0862AB0C:: @ 862AB0C - .incbin "baserom.gba", 0x62ab0c, 0x8 - -gUnknown_0862AB14:: @ 862AB14 - .incbin "baserom.gba", 0x62ab14, 0x18 - -gUnknown_0862AB2C:: @ 862AB2C - .incbin "baserom.gba", 0x62ab2c, 0x18 - -gUnknown_0862AB44:: @ 862AB44 - .incbin "baserom.gba", 0x62ab44, 0xe4 - -gUnknown_0862AC28:: @ 862AC28 - .incbin "baserom.gba", 0x62ac28, 0x8 - -gUnknown_0862AC30:: @ 862AC30 - .incbin "baserom.gba", 0x62ac30, 0x8 - -gUnknown_0862AC38:: @ 862AC38 - .incbin "baserom.gba", 0x62ac38, 0x8 - -gUnknown_0862AC40:: @ 862AC40 - .incbin "baserom.gba", 0x62ac40, 0x8 - -gUnknown_0862AC48:: @ 862AC48 - .incbin "baserom.gba", 0x62ac48, 0x8 - -gUnknown_0862AC50:: @ 862AC50 - .incbin "baserom.gba", 0x62ac50, 0x8 - -gUnknown_0862AC58:: @ 862AC58 - .incbin "baserom.gba", 0x62ac58, 0x8 - -gUnknown_0862AC60:: @ 862AC60 - .incbin "baserom.gba", 0x62ac60, 0x8 - -gUnknown_0862AC68:: @ 862AC68 - .incbin "baserom.gba", 0x62ac68, 0x8 - -gUnknown_0862AC70:: @ 862AC70 - .incbin "baserom.gba", 0x62ac70, 0x8 - -gUnknown_0862AC78:: @ 862AC78 - .incbin "baserom.gba", 0x62ac78, 0x18 - -gUnknown_0862AC90:: @ 862AC90 - .incbin "baserom.gba", 0x62ac90, 0x18 - -gUnknown_0862ACA8:: @ 862ACA8 - .incbin "baserom.gba", 0x62aca8, 0x18 - -gUnknown_0862ACC0:: @ 862ACC0 - .incbin "baserom.gba", 0x62acc0, 0x18 - -gUnknown_0862ACD8:: @ 862ACD8 - .incbin "baserom.gba", 0x62acd8, 0x18 - -gUnknown_0862ACF0:: @ 862ACF0 - .incbin "baserom.gba", 0x62acf0, 0x18 - -gUnknown_0862AD08:: @ 862AD08 - .incbin "baserom.gba", 0x62ad08, 0xc diff --git a/data/record_mixing.s b/data/record_mixing.s index 6531633a5..0ef0a776a 100644 --- a/data/record_mixing.s +++ b/data/record_mixing.s @@ -2,7 +2,7 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2, 0 gUnknown_0858CF8C:: @ 858CF8C .incbin "baserom.gba", 0x58cf8c, 0x2 diff --git a/data/reset_rtc_screen.s b/data/reset_rtc_screen.s index f680a87bc..37c532497 100644 --- a/data/reset_rtc_screen.s +++ b/data/reset_rtc_screen.s @@ -1,8 +1,8 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata + .align 2, 0 gUnknown_08510404:: @ 8510404 struct BgTemplate .4byte 0x000001f0 diff --git a/data/rom_8486FEC.s b/data/rom_8486FEC.s index 9b7834a32..850ae5032 100644 --- a/data/rom_8486FEC.s +++ b/data/rom_8486FEC.s @@ -1,8 +1,8 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata + .align 2, 0 gUnknown_8486FEC:: @ 8486FEC .incbin "baserom.gba", 0x486fec, 0xFFA0 diff --git a/data/rom_8525F58.s b/data/rom_8525F58.s index 808300deb..d95af7e20 100644 --- a/data/rom_8525F58.s +++ b/data/rom_8525F58.s @@ -1,34 +1,34 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata + .section .rodata - .align 2 + .align 2 gUnknown_08525F58:: @ 8525F58 .byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00 .byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00 .byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00 .byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00 - .align 2 + .align 2 gCastformFrontSpriteCoords:: @ 8525F78 .byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00 .byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00 - .align 2 + .align 2 gUnknown_08525F88:: @ 8525F88 .byte 0x0d, 0x0e, 0x0d, 0x0d - .align 2 + .align 2 gUnknown_08525F8C:: @ 8525F8C .byte 0x00, 0x00, 0x00, 0x00 - .align 2 + .align 2 gUnknown_08525F90:: @ 8525F90 spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - .align 2 + .align 2 gUnknown_08525FC0:: @ 8525FC0 obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755 obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756 diff --git a/data/roulette.s b/data/roulette.s new file mode 100644 index 000000000..3cb412084 --- /dev/null +++ b/data/roulette.s @@ -0,0 +1,928 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 1 +gUnknown_085B5BFC:: @ 85B5BFC + .incbin "graphics/roulette/85B5BFC.gbapal" + + .align 2 +gUnknown_085B5DFC:: @ 85B5DFC + .incbin "graphics/roulette/85B5DFC.bin.lz" + + .align 2 +gUnknown_085B5FA0:: @ 85B5FA0 + .incbin "graphics/roulette/wheel_map.bin.lz" + + .align 2 +gUnknown_085B6140:: @ 85B6140 + .4byte 0x000001f8, 0x00001241, 0x00002a66 + + .align 2 +gUnknown_085B614C:: @ 85B614C + window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x00c5 + + .align 2 +gUnknown_085B6154:: @ 85B6154 + .byte 0xFF, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0C, 0x14, 0x00, 0x11, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x42, 0x08, 0x01, 0x00, 0x00, 0xE0, 0x00, 0x00 + .byte 0x0D, 0x24, 0x00, 0x14, 0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x84, 0x10, 0x02, 0x00, 0x00, 0xE0, 0x00, 0x00 + .byte 0x0E, 0x34, 0x00, 0x17, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x21, 0x04, 0x00, 0x00, 0xE0, 0x00, 0x00 + .byte 0x0F, 0x44, 0x00, 0x1A, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x42, 0x08, 0x00, 0x00, 0xE0, 0x00, 0x00 + .byte 0x10, 0x03, 0x01, 0x0E, 0x0A, 0x00, 0x0C, 0x00, 0x20, 0x00, 0x00, 0x00, 0xE0, 0x03, 0x00, 0x00, 0x49, 0x02, 0x00, 0x00 + .byte 0x00, 0x1C, 0x01, 0x11, 0x0A, 0x03, 0x03, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00 + .byte 0x09, 0x2C, 0x01, 0x14, 0x0A, 0x03, 0x03, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00 + .byte 0x06, 0x3C, 0x01, 0x17, 0x0A, 0x03, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00 + .byte 0x03, 0x4C, 0x01, 0x1A, 0x0A, 0x03, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00 + .byte 0x11, 0x03, 0x02, 0x0E, 0x0D, 0x03, 0x0F, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x92, 0x04, 0x00, 0x00 + .byte 0x04, 0x1C, 0x02, 0x11, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00 + .byte 0x01, 0x2C, 0x02, 0x14, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00 + .byte 0x0A, 0x3C, 0x02, 0x17, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00 + .byte 0x07, 0x4C, 0x02, 0x1A, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x80, 0x20, 0x00, 0x00 + .byte 0x12, 0x03, 0x03, 0x0E, 0x10, 0x06, 0x12, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x0F, 0x00, 0x24, 0x09, 0x00, 0x00 + .byte 0x08, 0x1C, 0x03, 0x11, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x21, 0x00, 0x00 + .byte 0x05, 0x2C, 0x03, 0x14, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x20, 0x20, 0x00, 0x00 + .byte 0x02, 0x3C, 0x03, 0x17, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x20, 0x00, 0x00 + .byte 0x0B, 0x4C, 0x03, 0x1A, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x28, 0x00, 0x00 + + .align 2 +gUnknown_085B62E4:: @ 85B62E4 + .byte 0, 1, 6, 0, 64, 0, 0, 0 + .byte 1, 3, 12, 0, 0, 16, 0, 0 + .byte 2, 5, 18, 0, 0, 0, 4, 0 + .byte 3, 7, 9, 0, 0, 2, 0, 0 + .byte 4, 9, 11, 0, 0, 8, 0, 0 + .byte 5, 11, 17, 0, 0, 0, 2, 0 + .byte 6, 13, 8, 0, 0, 1, 0, 0 + .byte 7, 15, 14, 0, 0, 64, 0, 0 + .byte 8, 17, 16, 0, 0, 0, 1, 0 + .byte 9, 19, 7, 0, 128, 0, 0, 0 + .byte 10, 21, 13, 0, 0, 32, 0, 0 + .byte 11, 23, 19, 0, 0, 0, 8, 0 + +gUnknown_085B6344:: @ 85B6344 + .byte 1, 3 + .byte 1, 6 + + .align 2 +gUnknown_085B6348:: @ 85B6348 + .byte 0x01, 0x3C, 0x1E, 0x01, 0x01, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x1E, 0x00, 0x01, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x1B, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x68, 0x01, 0x00, 0x00, 0x00, 0xBF + .byte 0x03, 0x1E, 0x0F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x3C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0E, 0x01, 0x00, 0x00, 0x80, 0xBF + + .align 2 +gUnknown_085B6388:: @ 85B6388 + .byte 0x00, 0x80, 0x05, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x0A, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x15, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x55, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x5A, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x65, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x75, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x7A, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x85, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x95, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x9A, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0xA5, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0xD6, 0x77, 0x28, 0x00, 0x02, 0x0A, 0xFF, 0x4E + + .align 1 +gUnknown_085B63F0:: @ 85B63F0 + .2byte 0x53FF + .2byte 0x0101 + .2byte 0x1E05 + .2byte 0x4EFF + .2byte 0x7FFB + .2byte 0x0106 + .2byte 0x1E05 + .2byte 0x4EFF + .2byte 0x7F7F + .2byte 0x010B + .2byte 0x1E05 + .2byte 0x4EFF + + .align 2 +gUnknown_085B6408:: @ 85B6408 + .4byte sub_8142918 + .4byte sub_814297C + + .align 2 +gUnknown_085B6410:: @ 85B6410 + .4byte sub_8140968 + .4byte sub_8140994 + + .align 1 +gUnknown_085B6418:: @ 85B6418 + .2byte 0x2898 + .2byte 0x1A6A + .2byte 0x2898 + +gUnknown_085B641E:: @ 85B641E + .byte 0xFB, 0x05, 0xFF, 0x01 + + .align 1 +gUnknown_085B6422:: @ 85B6422 + .2byte 0, 180 + .2byte 90, 270 + + .align 2 +gUnknown_085B642C:: @ 85B642C + .4byte 0x10842 + .4byte 0x21084 + .4byte 0x42108 + .4byte 0x84210 + + .align 2 +gUnknown_085B643C:: @ 85B643C + .4byte 0x3E0 + .4byte 0x7C00 + .4byte 0xF8000 + +gUnknown_085B6448:: @ 85B6448 + .byte 0, 3, 4, 6, 12 + + .align 2 +RouletteSpritePalette_01: @ 85B6450 + .incbin "graphics/roulette/shadow.gbapal" + + .align 2 +RouletteSpritePalette_02: @ 85B6470 + .incbin "graphics/roulette/ball.gbapal" + + .align 2 +RouletteSpritePalette_03: @ 85B6490 + .incbin "graphics/roulette/ball_counter.gbapal" + + .align 2 +RouletteSpritePalette_04: @ 85B64B0 + .incbin "graphics/roulette/cursor.gbapal" + + .align 2 +RouletteSpritePalette_05: @ 85B64D0 + .incbin "graphics/roulette/credit.gbapal" + + .align 2 +RouletteSpritePalette_06: @ 85B64F0 + .incbin "graphics/roulette/shroomish.gbapal" + + .align 2 +RouletteSpritePalette_07: @ 85B6510 + .incbin "graphics/roulette/tailow.gbapal" + + .align 2 +RouletteSpritePalette_08: @ 85B6530 + .incbin "graphics/roulette/poke_icons.gbapal" + + .align 2 +RouletteSpritePalette_09: @ 85B6550 + .incbin "graphics/roulette/wynaut.gbapal" + + .align 2 +RouletteSpritePalette_10: @ 85B6570 + .incbin "graphics/roulette/azurill.gbapal" + + .align 2 +RouletteSpritePalette_11: @ 85B6590 + .incbin "graphics/roulette/skitty.gbapal" + + .align 2 +RouletteSpritePalette_12: @ 85B65B0 + .incbin "graphics/roulette/makuhita.gbapal" + + .align 2 +RouletteSpritePalette_13: @ 85B65D0 + .incbin "graphics/roulette/85B65D0.gbapal" + + .align 2 +RouletteSpritePalette_14: @ 85B65F0 + .incbin "graphics/roulette/85B65F0.gbapal" + + .align 2 +RouletteSpritePalette_15: @ 85B6610 + .incbin "graphics/roulette/85B6610.gbapal" + + .align 2 +RouletteSpritePalette_16: @ 85B6630 + .incbin "graphics/roulette/85B6630.gbapal" + + .align 2 +gUnknown_085B6650:: @ 85B6650 + .incbin "graphics/roulette/ball.4bpp.lz" + + .align 2 +RouletteBallCounterTiles: @ 85B6798 + .incbin "graphics/roulette/ball_counter.4bpp.lz" + + .align 2 +gUnknown_085B67FC:: @ 85B67FC + .incbin "graphics/roulette/roulette_tilt.4bpp.lz" + + .align 2 +RoulettePokeIconsTiles: @ 85B6BEC + .incbin "graphics/roulette/poke_icons.4bpp.lz" + + .align 2 +RoulettePokeIcons2Tiles: @ 85B6D90 + .incbin "graphics/roulette/poke_icons2.4bpp.lz" + + .align 2 +gUnknown_085B7290:: @ 85B7290 + .incbin "graphics/roulette/shadow.4bpp.lz" + + .align 2 +RouletteCursorTiles: @ 85B7328 + .incbin "graphics/roulette/cursor.4bpp.lz" + + .align 2 +gUnknown_085B7384:: @ 85B7384 + obj_pal RouletteSpritePalette_01, 1 + obj_pal RouletteSpritePalette_02, 2 + obj_pal RouletteSpritePalette_03, 3 + obj_pal RouletteSpritePalette_04, 4 + obj_pal RouletteSpritePalette_05, 5 + obj_pal RouletteSpritePalette_06, 6 + obj_pal RouletteSpritePalette_07, 7 + obj_pal RouletteSpritePalette_08, 8 + obj_pal RouletteSpritePalette_09, 9 + obj_pal RouletteSpritePalette_10, 10 + obj_pal RouletteSpritePalette_11, 11 + obj_pal RouletteSpritePalette_12, 12 + null_obj_pal + + .align 2 +gOamData_85B73EC:: @ 85B73EC + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0400 + + .align 2 +gOamData_85B73F4:: @ 85B73F4 + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0400 + + .align 2 +gOamData_85B73FC:: @ 85B73FC + .2byte 0x833C + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gSpriteAnim_85B7404:: @ 85B7404 + obj_image_anim_frame 0, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B740C:: @ 85B740C + .4byte gSpriteAnim_85B7404 + + .align 2 +gSpriteAffineAnim_85B7410:: @ 85B7410 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_85B7418:: @ 85B7418 + .4byte gSpriteAffineAnim_85B7410 + + .align 2 +gUnknown_085B741C:: @ 85B741C + obj_tiles RoulettePokeIcons2Tiles, 0xC00, 0 + + .align 2 +gSpriteAnim_85B7420:: @ 85B7420 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 32, 0 + obj_image_anim_frame 64, 0 + obj_image_anim_frame 72, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_frame 40, 0 + obj_image_anim_frame 48, 0 + obj_image_anim_frame 80, 0 + obj_image_anim_frame 16, 0 + obj_image_anim_frame 24, 0 + obj_image_anim_frame 56, 0 + obj_image_anim_frame 88, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B7458:: @ 85B7458 + .4byte gSpriteAnim_85B7420 + + .align 2 +gSpriteAnimTable_85B745C:: @ 85B745C + .4byte gSpriteAnim_85B7420 + 0x4 + + .align 2 +gSpriteAnimTable_85B7460:: @ 85B7460 + .4byte gSpriteAnim_85B7420 + 0x8 + + .align 2 +gSpriteAnimTable_85B7464:: @ 85B7464 + .4byte gSpriteAnim_85B7420 + 0xC + + .align 2 +gSpriteAnimTable_85B7468:: @ 85B7468 + .4byte gSpriteAnim_85B7420 + 0x10 + + .align 2 +gSpriteAnimTable_85B746C:: @ 85B746C + .4byte gSpriteAnim_85B7420 + 0x14 + + .align 2 +gSpriteAnimTable_85B7470:: @ 85B7470 + .4byte gSpriteAnim_85B7420 + 0x18 + + .align 2 +gSpriteAnimTable_85B7474:: @ 85B7474 + .4byte gSpriteAnim_85B7420 + 0x1C + + .align 2 +gSpriteAnimTable_85B7478:: @ 85B7478 + .4byte gSpriteAnim_85B7420 + 0x20 + + .align 2 +gSpriteAnimTable_85B747C:: @ 85B747C + .4byte gSpriteAnim_85B7420 + 0x24 + + .align 2 +gSpriteAnimTable_85B7480:: @ 85B7480 + .4byte gSpriteAnim_85B7420 + 0x28 + + .align 2 +gSpriteAnimTable_85B7484:: @ 85B7484 + .4byte gSpriteAnim_85B7420 + 0x2C + + .align 2 +gUnknown_085B7488:: @ 85B7488 + obj_tiles gRouletteHeadersTiles, 0x1600, 4 + + .align 2 +gUnknown_085B7490:: @ 85B7490 + obj_tiles RoulettePokeIconsTiles, 0x400, 5 + + .align 2 +gSpriteAnim_85B7498:: @ 85B7498 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 16, 0 + obj_image_anim_frame 32, 0 + obj_image_anim_frame 48, 0 + obj_image_anim_frame 64, 0 + obj_image_anim_frame 80, 0 + obj_image_anim_frame 96, 0 + obj_image_anim_frame 112, 0 + obj_image_anim_frame 128, 0 + obj_image_anim_frame 144, 0 + obj_image_anim_frame 160, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B74C8:: @ 85B74C8 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 4, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_frame 12, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B74DC:: @ 85B74DC + .4byte gSpriteAnim_85B7498 + + .align 2 +gSpriteAnimTable_85B74E0:: @ 85B74E0 + .4byte gSpriteAnim_85B7498 + 0x8 + + .align 2 +gSpriteAnimTable_85B74E4:: @ 85B74E4 + .4byte gSpriteAnim_85B7498 + 0x10 + + .align 2 +gSpriteAnimTable_85B74E8:: @ 85B74E8 + .4byte gSpriteAnim_85B7498 + 0x18 + + .align 2 +gSpriteAnimTable_85B74EC:: @ 85B74EC + .4byte gSpriteAnim_85B7498 + 0x20 + + .align 2 +gSpriteAnimTable_85B74F0:: @ 85B74F0 + .4byte gSpriteAnim_85B7498 + 0x24 + + .align 2 +gSpriteAnimTable_85B74F4:: @ 85B74F4 + .4byte gSpriteAnim_85B7498 + 0x28 + + .align 2 +gSpriteAnimTable_85B74F8:: @ 85B74F8 + .4byte gSpriteAnim_85B74C8 + + .align 2 +gSpriteAnimTable_85B74FC:: @ 85B74FC + .4byte gSpriteAnim_85B74C8 + 0x4 + + .align 2 +gSpriteAnimTable_85B7500:: @ 85B7500 + .4byte gSpriteAnim_85B74C8 + 0x8 + + .align 2 +gSpriteAnimTable_85B7504:: @ 85B7504 + .4byte gSpriteAnim_85B74C8 + 0xC + + .align 2 +gSpriteTemplate_85B7508:: @ 85B7508 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74DC, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7520:: @ 85B7520 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E0, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7538:: @ 85B7538 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E4, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7550:: @ 85B7550 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E8, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7568:: @ 85B7568 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74EC, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7580:: @ 85B7580 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74F0, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7598:: @ 85B7598 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74F4, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B75B0:: @ 85B75B0 + spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B74F8, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B75C8:: @ 85B75C8 + spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B74FC, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B75E0:: @ 85B75E0 + spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B7500, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B75F8:: @ 85B75F8 + spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B7504, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7610:: @ 85B7610 + spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7458, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7628:: @ 85B7628 + spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B745C, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7640:: @ 85B7640 + spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7460, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7658:: @ 85B7658 + spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7464, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7670:: @ 85B7670 + spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7468, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7688:: @ 85B7688 + spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B746C, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B76A0:: @ 85B76A0 + spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7470, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B76B8:: @ 85B76B8 + spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7474, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B76D0:: @ 85B76D0 + spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7478, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B76E8:: @ 85B76E8 + spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B747C, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7700:: @ 85B7700 + spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7480, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7718:: @ 85B7718 + spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7484, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gOamData_85B7730:: @ 85B7730 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x0400 + + .align 2 +gOamData_85B7738:: @ 85B7738 + .2byte 0x8000 + .2byte 0x0000 + .2byte 0x0400 + + .align 2 +gOamData_85B7740:: @ 85B7740 + .2byte 0x4000 + .2byte 0x8000 + .2byte 0x0400 + + .align 2 +gOamData_85B7748:: @ 85B7748 + .2byte 0x4000 + .2byte 0x0000 + .2byte 0x0400 + + .align 2 +gUnknown_085B7750:: @ 85B7750 + obj_tiles gRouletteCreditTiles, 0x400, 7 + obj_tiles gRouletteNumbersTiles, 0x280, 8 + obj_tiles gRouletteMultiplierTiles, 0x500, 9 + obj_tiles RouletteBallCounterTiles, 0x140, 10 + obj_tiles RouletteCursorTiles, 0x200, 11 + null_obj_tiles + + .align 2 +gSpriteAnim_85B7780:: @ 85B7780 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 2, 0 + obj_image_anim_frame 4, 0 + obj_image_anim_frame 6, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_frame 10, 0 + obj_image_anim_frame 12, 0 + obj_image_anim_frame 14, 0 + obj_image_anim_frame 16, 0 + obj_image_anim_frame 18, 0 + + .align 2 +gSpriteAnimTable_85B77A8:: @ 85B77A8 + .4byte gSpriteAnim_85B7780 + + .align 2 +gSpriteAnim_85B77AC:: @ 85B77AC + obj_image_anim_frame 0, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_frame 16, 0 + obj_image_anim_frame 24, 0 + obj_image_anim_frame 32, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B77C4:: @ 85B77C4 + .4byte gSpriteAnim_85B77AC + + .align 2 +gSpriteAnim_85B77C8:: @ 85B77C8 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 2, 0 + obj_image_anim_frame 4, 0 + obj_image_anim_frame 6, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B77E0:: @ 85B77E0 + .4byte gSpriteAnim_85B77C8 + + .align 2 +gSpriteTemplate_85B77E4:: @ 85B77E4 + spr_template 7, 5, gOamData_85B7730, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_085B77FC:: @ 85B77FC + spr_template 8, 5, gOamData_85B7738, gSpriteAnimTable_85B77A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_085B7814:: @ 85B7814 + spr_template 9, 5, gOamData_85B7740, gSpriteAnimTable_85B77C4, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gUnknown_085B782C:: @ 85B782C + spr_template 10, 3, gOamData_85B7748, gSpriteAnimTable_85B77E0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_085B7844:: @ 85B7844 + spr_template 11, 5, gOamData_85B73EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gOamData_85B785C:: @ 85B785C + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0800 + + .align 2 +gUnknown_085B7864:: @ 85B7864 + obj_tiles gUnknown_085B6650, 0x200, 0xC + + .align 2 +gSpriteAnim_85B786C:: @ 85B786C + obj_image_anim_frame 0, 5 + obj_image_anim_frame 4, 5 + obj_image_anim_frame 8, 5 + obj_image_anim_frame 4, 5 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B7880:: @ 85B7880 + obj_image_anim_frame 0, 10 + obj_image_anim_frame 4, 10 + obj_image_anim_frame 8, 10 + obj_image_anim_frame 4, 10 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B7894:: @ 85B7894 + obj_image_anim_frame 0, 15 + obj_image_anim_frame 4, 15 + obj_image_anim_frame 8, 15 + obj_image_anim_frame 4, 15 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B78A8:: @ 85B78A8 + obj_image_anim_frame 4, 2 + obj_image_anim_frame 8, 5 + obj_image_anim_frame 4, 5 + obj_image_anim_frame 12, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B78BC:: @ 85B78BC + obj_image_anim_frame 4, 2 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 8, 4 + obj_image_anim_frame 12, 4 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B78D4:: @ 85B78D4 + obj_image_anim_frame 0, 2 + obj_image_anim_frame 4, 5 + obj_image_anim_frame 8, 5 + obj_image_anim_frame 12, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B78E8:: @ 85B78E8 + obj_image_anim_frame 12, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B78F0:: @ 85B78F0 + obj_image_anim_frame 8, 2 + obj_image_anim_frame 4, 5 + obj_image_anim_frame 0, 5 + obj_image_anim_frame 12, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B7904:: @ 85B7904 + .4byte gSpriteAnim_85B786C + .4byte gSpriteAnim_85B7880 + .4byte gSpriteAnim_85B7894 + .4byte gSpriteAnim_85B78A8 + .4byte gSpriteAnim_85B78F0 + .4byte gSpriteAnim_85B78BC + .4byte gSpriteAnim_85B78D4 + .4byte gSpriteAnim_85B78D4 + .4byte gSpriteAnim_85B78E8 + + .align 2 +gSpriteTemplate_85B7928:: @ 85B7928 + spr_template 12, 2, gOamData_85B785C, gSpriteAnimTable_85B7904, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gOamData_85B7940:: @ 85B7940 + .2byte 0x0351 + .2byte 0xC000 + .2byte 0x0800 + + .align 2 +gUnknown_085B7948:: @ 85B7948 + obj_tiles gRouletteCenter_Gfx, 2048, 0x0006 + + .align 2 +gSpriteTemplate_85B7950:: @ 85B7950 + spr_template 6, 2, gOamData_85B7940, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_814399C + + .align 2 +gOamData_85B7968:: @ 85B7968 + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gOamData_85B7970:: @ 85B7970 + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gUnknown_085B7978:: @ 85B7978 + obj_tiles gUnknown_085B67FC, 0xE00, 0x000D + + .align 2 +gSpriteAnim_85B7980:: @ 85B7980 + obj_image_anim_frame 0x00, 6 + obj_image_anim_frame 0x10, 6 + obj_image_anim_frame 0x20, 6 + obj_image_anim_frame 0x30, 6 + obj_image_anim_frame 0x20, 6 + obj_image_anim_frame 0x40, 6 + obj_image_anim_jump 2 + + .align 2 +gSpriteAnim_85B799C:: @ 85B799C + obj_image_anim_frame 0x50, 10 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B79A4:: @ 85B79A4 + obj_image_anim_frame 0x50, 10, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_end + + .align 2 +gSpriteAnim_85B79AC:: @ 85B79AC + obj_image_anim_frame 0x50, 20 + obj_image_anim_frame 0x60, 20 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B79B8:: @ 85B79B8 + obj_image_anim_frame 0x50, 20, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 0x60, 20, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B79C4:: @ 85B79C4 + obj_image_anim_frame 0x50, 10 + obj_image_anim_frame 0x60, 10 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B79D0:: @ 85B79D0 + obj_image_anim_frame 0x50, 10, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 0x60, 10, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_85B79DC:: @ 85B79DC + .4byte gSpriteAnim_85B7980 + + .align 2 +gSpriteAnimTable_85B79E0:: @ 85B79E0 + .4byte gSpriteAnim_85B799C + .4byte gSpriteAnim_85B79A4 + .4byte gSpriteAnim_85B79AC + .4byte gSpriteAnim_85B79B8 + .4byte gSpriteAnim_85B79C4 + .4byte gSpriteAnim_85B79D0 + + .align 2 +gSpriteTemplate_85B79F8:: @ 85B79F8 + spr_template 13, 6, gOamData_85B7968, gSpriteAnimTable_85B79DC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_85B7A10:: @ 85B7A10 + spr_template 13, 7, gOamData_85B7970, gSpriteAnimTable_85B79E0, NULL, gDummySpriteAffineAnimTable, sub_8145294 + + .align 2 +gOamData_85B7A28:: @ 85B7A28 + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0800 + + .align 2 +gOamData_85B7A30:: @ 85B7A30 + .2byte 0x4000 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gOamData_85B7A38:: @ 85B7A38 + .2byte 0x4100 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gUnknown_085B7A40:: @ 85B7A40 + obj_tiles gUnknown_085B7290, 0x180, 0x000E + + .align 2 +gSpriteAffineAnim_85B7A48:: @ 85B7A48 + obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 + obj_rot_scal_anim_frame 0x2, 0x2, 0, 60 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_85B7A60:: @ 85B7A60 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_frame 0xFFFE, 0x0, 0, 15 + obj_rot_scal_anim_frame 0xFFFF, 0xFFFE, 0, 15 + obj_rot_scal_anim_frame 0xFFFF, 0xFFFB, 0, 24 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_85B7A88:: @ 85B7A88 + .4byte gSpriteAffineAnim_85B7A48 + + .align 2 +gSpriteAffineAnimTable_85B7A8C:: @ 85B7A8C + .4byte gSpriteAffineAnim_85B7A60 + + .align 2 +gSpriteAffineAnim_85B7A90:: @ 85B7A90 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_85B7AA0:: @ 85B7AA0 + .4byte gSpriteAffineAnim_85B7A90 + + .align 2 +gSpriteAnim_85B7AA4:: @ 85B7AA4 + obj_image_anim_frame 0, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B7AAC:: @ 85B7AAC + obj_image_anim_frame 4, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B7AB4:: @ 85B7AB4 + .4byte gSpriteAnim_85B7AA4 + + .align 2 +gSpriteAnimTable_85B7AB8:: @ 85B7AB8 + .4byte gSpriteAnim_85B7AAC + + .align 2 +gSpriteTemplate_85B7ABC:: @ 85B7ABC + spr_template 14, 1, gOamData_85B7A28, gSpriteAnimTable_85B7AB4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_83FA5D8:: @ 83FA5D8 + spr_template 14, 1, gOamData_85B7A30, gSpriteAnimTable_85B7AB8, NULL, gDummySpriteAffineAnimTable, sub_8144E60 + + .align 2 +gUnknown_085B7AEC:: @ 85B7AEC + spr_template 14, 1, gOamData_85B7A38, gSpriteAnimTable_85B7AB8, NULL, gSpriteAffineAnimTable_85B7A8C, sub_8145294 + +gUnknown_085B7B04:: @ 85B7B04 + .byte 0, 1, 2, 3, 4 + + .align 1 +gUnknown_085B7B0A:: @ 85B7B0A + .2byte 0x74, 0x2C + .2byte 0x74, 0x70 + + .align 1 +gUnknown_085B7B12:: @ 85B7B12 + .2byte 256, 84 + .2byte -16, 84 + + .align 1 +gUnknown_085B7B1A:: @ 85B7B1A + .2byte 0x907 + .2byte 0x808 + .2byte 0x709 + .2byte 0x60A + .2byte 0x50B + .2byte 0x40C + .2byte 0x30D + .2byte 0x20E + .2byte 0x10F + .2byte 0x10 + + .align 1 +gUnknown_085B7B2E:: @ 85B7B2E + .2byte -1, 0, 1, 0 + .2byte -2, 0, 2, 0 + .2byte -3, 0, 3, 0 + +gUnknown_085B7B46:: @ 85B7B46 + .byte -1, 1 + +gUnknown_085B7B48:: @ 85B7B48 + .byte 2, 0 + .byte 2, 0 + .byte 2, -1 + .byte 2, -1 + .byte 2, -1 + .byte 2, -1 + .byte 2, -2 + .byte 2, -2 diff --git a/data/save.s b/data/save.s index 15e201baa..23a8d3928 100644 --- a/data/save.s +++ b/data/save.s @@ -4,17 +4,17 @@ .section .rodata gSaveSectionOffsets:: @ 85CDC00 - .2byte 0, 0xF2C - .2byte 0, 0xF80 - .2byte 0xF80, 0xF80 - .2byte 0x1F00, 0xF80 - .2byte 0x2E80, 0xF08 - .2byte 0, 0xF80 - .2byte 0xF80, 0xF80 - .2byte 0x1F00, 0xF80 - .2byte 0x2E80, 0xF80 - .2byte 0x3E00, 0xF80 - .2byte 0x4D80, 0xF80 - .2byte 0x5D00, 0xF80 - .2byte 0x6C80, 0xF80 - .2byte 0x7C00, 0x7D0 + .2byte 0, 0xF2C + .2byte 0, 0xF80 + .2byte 0xF80, 0xF80 + .2byte 0x1F00, 0xF80 + .2byte 0x2E80, 0xF08 + .2byte 0, 0xF80 + .2byte 0xF80, 0xF80 + .2byte 0x1F00, 0xF80 + .2byte 0x2E80, 0xF80 + .2byte 0x3E00, 0xF80 + .2byte 0x4D80, 0xF80 + .2byte 0x5D00, 0xF80 + .2byte 0x6C80, 0xF80 + .2byte 0x7C00, 0x7D0 diff --git a/data/script_menu.s b/data/script_menu.s index cf4a5df01..6cd7bf381 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 @@ -728,7 +728,7 @@ gUnknown_0858BAF0:: @ 858BAF0 gUnknown_0858BB68:: @ 858BB68 .byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F - .align 2 + .align 2 gUnknown_0858BB70:: @ 858BB70 .4byte gText_SomeonesPC .4byte gText_LanettesPC diff --git a/data/script_pokemon_util_80F87D8.s b/data/script_pokemon_util_80F87D8.s index beda525c8..dcf9edeea 100644 --- a/data/script_pokemon_util_80F87D8.s +++ b/data/script_pokemon_util_80F87D8.s @@ -2,6 +2,6 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2, 0 gUnknown_0858D8EC:: @ 858D8EC - .incbin "baserom.gba", 0x58d8ec, 0x4 + .byte 3, 4, 5, 14 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index d20cfa799..07ed1b82d 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -67,7 +67,7 @@ Route117_EventScript_291CE8:: @ 8291CE8 special GetDaycareMonNicknames msgbox Route117_Text_292299, 4 special SetDaycareCompatibilityString - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress setvar VAR_0x8004, 0 diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/scripts/maps/AbandonedShip_Deck.inc index d049423a1..1f0c0e2f2 100644 --- a/data/scripts/maps/AbandonedShip_Deck.inc +++ b/data/scripts/maps/AbandonedShip_Deck.inc @@ -3,6 +3,6 @@ AbandonedShip_Deck_MapScripts:: @ 823799A .byte 0 AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0 - setflag FLAG_0x89E + setflag FLAG_LANDMARK_ABANDONED_SHIP end diff --git a/data/scripts/maps/AlteringCave.inc b/data/scripts/maps/AlteringCave.inc index c5f1286d2..a9faddc36 100644 --- a/data/scripts/maps/AlteringCave.inc +++ b/data/scripts/maps/AlteringCave.inc @@ -3,6 +3,6 @@ AlteringCave_MapScripts:: @ 823B177 .byte 0 AlteringCave_MapScript1_23B17D: @ 823B17D - setflag FLAG_0x8DD + setflag FLAG_LANDMARK_ALTERING_CAVE end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index f97c3fc5a..3cd0b9eff 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -17,7 +17,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD return AncientTomb_MapScript1_238FE1: @ 8238FE1 - setflag FLAG_0x8B9 + setflag FLAG_LANDMARK_ANCIENT_TOMB checkflag FLAG_0x1BD call_if 0, AncientTomb_EventScript_238FEE end 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_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index bf031e090..cff676124 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -189,470 +189,596 @@ BattleFrontier_BattlePyramidEmptySquare_Text_252CFB:: @ 8252CFB .string "Are you sure you want to quit your\n" .string "PYRAMID quest?$" +BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D .string "This floor’s exit is in\n" .string "that direction: {UP_ARROW}$" +BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57 .string "This floor’s exit is in\n" .string "that direction: {LEFT_ARROW}$" +BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81 .string "This floor’s exit is in\n" .string "that direction: {RIGHT_ARROW}$" +BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB .string "This floor’s exit is in\n" .string "that direction: {DOWN_ARROW}$" +BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5 .string "The exit on this floor is in\n" .string "the {UP_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252E03:: @ 8252E03 .string "The exit on this floor is in\n" .string "the {LEFT_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252E31:: @ 8252E31 .string "The exit on this floor is in\n" .string "the {RIGHT_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252E5F:: @ 8252E5F .string "The exit on this floor is in\n" .string "the {DOWN_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252E8D:: @ 8252E8D .string "The exit is over\n" .string "that {UP_ARROW} way.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252EAA:: @ 8252EAA .string "The exit is over\n" .string "that {LEFT_ARROW} way.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252EC7:: @ 8252EC7 .string "The exit is over\n" .string "that {RIGHT_ARROW} way.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252EE4:: @ 8252EE4 .string "The exit is over\n" .string "that {DOWN_ARROW} way.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252F01:: @ 8252F01 .string "On this floor, the exit is somewhere\n" .string "in the {UP_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252F3A:: @ 8252F3A .string "On this floor, the exit is somewhere\n" .string "in the {LEFT_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252F73:: @ 8252F73 .string "On this floor, the exit is somewhere\n" .string "in the {RIGHT_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC .string "On this floor, the exit is somewhere\n" .string "in the {DOWN_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5 .string "The exit?\n" .string "It’s that {UP_ARROW} way.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000 .string "The exit?\n" .string "It’s that {LEFT_ARROW} way.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B .string "The exit?\n" .string "It’s that {RIGHT_ARROW} way.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036 .string "The exit?\n" .string "It’s that {DOWN_ARROW} way.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051 .string "The exit happens to be in\n" .string "the {UP_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25307C:: @ 825307C .string "The exit happens to be in\n" .string "the {LEFT_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2530A7:: @ 82530A7 .string "The exit happens to be in\n" .string "the {RIGHT_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2530D2:: @ 82530D2 .string "The exit happens to be in\n" .string "the {DOWN_ARROW} direction.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2530FD:: @ 82530FD .string "Are you looking for items?\p" .string "There are eight items left to\n" .string "be found.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253140:: @ 8253140 .string "Are you looking for items?\p" .string "There are seven items left to\n" .string "be found.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253183:: @ 8253183 .string "Are you looking for items?\p" .string "There are six items left to\n" .string "be found.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2531C4:: @ 82531C4 .string "Are you looking for items?\p" .string "There are five items left to\n" .string "be found.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253206:: @ 8253206 .string "Are you looking for items?\p" .string "There are four items left to\n" .string "be found.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253248:: @ 8253248 .string "Are you looking for items?\p" .string "There are three items left to\n" .string "be found.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25328B:: @ 825328B .string "Are you looking for items?\p" .string "There are two items left to\n" .string "be found.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC .string "Are you looking for items?\p" .string "There is one item left to\n" .string "be found.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B .string "Are you looking for items?\p" .string "There isn’t anything left to\n" .string "be found!$" +BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D .string "Because you won, I’ll tell you\n" .string "a little secret!\p" .string "There are eight items\n" .string "lying around here.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6 .string "Because you won, I’ll tell you\n" .string "a little secret!\p" .string "There are seven items left\n" .string "lying around here.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404 .string "Because you won, I’ll tell you\n" .string "a little secret!\p" .string "There are six items left\n" .string "lying around here.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460 .string "Because you won, I’ll tell you\n" .string "a little secret!\p" .string "There are five items left\n" .string "lying around here.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD .string "Because you won, I’ll tell you\n" .string "a little secret!\p" .string "There are four items left\n" .string "lying around here.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A .string "Because you won, I’ll tell you\n" .string "a little secret!\p" .string "There are three items left\n" .string "lying around here.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578 .string "Because you won, I’ll tell you\n" .string "a little secret!\p" .string "There are two items left\n" .string "lying around here.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4 .string "Because you won, I’ll tell you\n" .string "a little secret!\p" .string "There is just one item\n" .string "lying around here.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E .string "Because you won, I’ll tell you\n" .string "a little secret!\p" .string "There isn’t anything left\n" .string "lying around here.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B .string "How’s your stock of items holding up?\p" .string "I reckon there are eight items left\n" .string "waiting to be found on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8 .string "How’s your stock of items holding up?\p" .string "I reckon there are seven items left\n" .string "waiting to be found on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765 .string "How’s your stock of items holding up?\p" .string "I reckon there are six items left\n" .string "waiting to be found on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0 .string "How’s your stock of items holding up?\p" .string "I reckon there are five items left\n" .string "waiting to be found on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C .string "How’s your stock of items holding up?\p" .string "I reckon there are four items left\n" .string "waiting to be found on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8 .string "How’s your stock of items holding up?\p" .string "I reckon there are three items left\n" .string "waiting to be found on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915 .string "How’s your stock of items holding up?\p" .string "I reckon there are two items left\n" .string "waiting to be found on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980 .string "How’s your stock of items holding up?\p" .string "I reckon there’s but one item left\n" .string "waiting to be found on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC .string "How’s your stock of items holding up?\p" .string "I reckon there are no more items\n" .string "waiting to be found on this floor.\l" .string "You take care now!$" +BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69 .string "You’re strong, so you’ve earned\n" .string "a hint!\p" .string "There appear to be eight more\n" .string "items on the ground.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4 .string "You’re strong, so you’ve earned\n" .string "a hint!\p" .string "There appear to be seven more\n" .string "items on the ground.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F .string "You’re strong, so you’ve earned\n" .string "a hint!\p" .string "There appear to be six more\n" .string "items on the ground.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78 .string "You’re strong, so you’ve earned\n" .string "a hint!\p" .string "There appear to be five more\n" .string "items on the ground.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2 .string "You’re strong, so you’ve earned\n" .string "a hint!\p" .string "There appear to be four more\n" .string "items on the ground.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C .string "You’re strong, so you’ve earned\n" .string "a hint!\p" .string "There appear to be three more\n" .string "items on the ground.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87 .string "You’re strong, so you’ve earned\n" .string "a hint!\p" .string "There appear to be two more\n" .string "items on the ground.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0 .string "You’re strong, so you’ve earned\n" .string "a hint!\p" .string "There appears to be only one more\n" .string "item on the ground.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E .string "You’re strong, so you’ve earned\n" .string "a hint!\p" .string "There appear to be no more\n" .string "items on the ground.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253D96:: @ 8253D96 .string "On this floor of the PYRAMID,\n" .string "I hear there are eight items…$" +BattleFrontier_BattlePyramidEmptySquare_Text_253DD2:: @ 8253DD2 .string "On this floor of the PYRAMID,\n" .string "I hear there are seven items…$" +BattleFrontier_BattlePyramidEmptySquare_Text_253E0E:: @ 8253E0E .string "On this floor of the PYRAMID,\n" .string "I hear there are six items…$" +BattleFrontier_BattlePyramidEmptySquare_Text_253E48:: @ 8253E48 .string "On this floor of the PYRAMID,\n" .string "I hear there are five items…$" +BattleFrontier_BattlePyramidEmptySquare_Text_253E83:: @ 8253E83 .string "On this floor of the PYRAMID,\n" .string "I hear there are four items…$" +BattleFrontier_BattlePyramidEmptySquare_Text_253EBE:: @ 8253EBE .string "On this floor of the PYRAMID,\n" .string "I hear there are three items…$" +BattleFrontier_BattlePyramidEmptySquare_Text_253EFA:: @ 8253EFA .string "On this floor of the PYRAMID,\n" .string "I hear there are two items…$" +BattleFrontier_BattlePyramidEmptySquare_Text_253F34:: @ 8253F34 .string "On this floor of the PYRAMID,\n" .string "I hear there is one item…$" +BattleFrontier_BattlePyramidEmptySquare_Text_253F6C:: @ 8253F6C .string "On this floor of the PYRAMID,\n" .string "I hear there are no items…$" +BattleFrontier_BattlePyramidEmptySquare_Text_253FA5:: @ 8253FA5 .string "Have you collected any items?\p" .string "I believe there are eight more\n" .string "items on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_253FF7:: @ 8253FF7 .string "Have you collected any items?\p" .string "I believe there are seven more\n" .string "items on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254049:: @ 8254049 .string "Have you collected any items?\p" .string "I believe there are six more\n" .string "items on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254099:: @ 8254099 .string "Have you collected any items?\p" .string "I believe there are five more\n" .string "items on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2540EA:: @ 82540EA .string "Have you collected any items?\p" .string "I believe there are four more\n" .string "items on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25413B:: @ 825413B .string "Have you collected any items?\p" .string "I believe there are three more\n" .string "items on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25418D:: @ 825418D .string "Have you collected any items?\p" .string "I believe there are two more\n" .string "items on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_2541DD:: @ 82541DD .string "Have you collected any items?\p" .string "I believe there is one more\n" .string "item on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25422B:: @ 825422B .string "Have you collected any items?\p" .string "I believe there are no more\n" .string "items on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_25427A:: @ 825427A .string "You were really awesome!\p" .string "But there are still seven tough\n" .string "TRAINERS other than me!$" +BattleFrontier_BattlePyramidEmptySquare_Text_2542CB:: @ 82542CB .string "You were really awesome!\p" .string "But there are still six tough\n" .string "TRAINERS other than me!$" +BattleFrontier_BattlePyramidEmptySquare_Text_25431A:: @ 825431A .string "You were really awesome!\p" .string "But there are still five tough\n" .string "TRAINERS other than me!$" +BattleFrontier_BattlePyramidEmptySquare_Text_25436A:: @ 825436A .string "You were really awesome!\p" .string "But there are still four tough\n" .string "TRAINERS other than me!$" +BattleFrontier_BattlePyramidEmptySquare_Text_2543BA:: @ 82543BA .string "You were really awesome!\p" .string "But there are still three tough\n" .string "TRAINERS other than me!$" +BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B .string "You were really awesome!\p" .string "But there are still two tough\n" .string "TRAINERS other than me!$" +BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A .string "You were really awesome!\p" .string "But there’s still one tough\n" .string "TRAINER other than me!$" +BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6 .string "You were really awesome!\p" .string "There’s no one left that\n" .string "can beat you!$" +BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6 .string "This is so upsetting!\p" .string "But there are seven TRAINERS left!\n" .string "Someone will humble you!$" +BattleFrontier_BattlePyramidEmptySquare_Text_254538:: @ 8254538 .string "This is so upsetting!\p" .string "But there are six TRAINERS left!\n" .string "Someone will humble you!$" +BattleFrontier_BattlePyramidEmptySquare_Text_254588:: @ 8254588 .string "This is so upsetting!\p" .string "But there are five TRAINERS left!\n" .string "Someone will humble you!$" +BattleFrontier_BattlePyramidEmptySquare_Text_2545D9:: @ 82545D9 .string "This is so upsetting!\p" .string "But there are four TRAINERS left!\n" .string "Someone will humble you!$" +BattleFrontier_BattlePyramidEmptySquare_Text_25462A:: @ 825462A .string "This is so upsetting!\p" .string "But there are three TRAINERS left!\n" .string "Someone will humble you!$" +BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C .string "This is so upsetting!\p" .string "But there are two TRAINERS left!\n" .string "Someone will humble you!$" +BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC .string "This is so upsetting!\p" .string "But there’s one TRAINER left!\n" .string "I’m sure you will be humbled!$" +BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E .string "This is so upsetting!\p" .string "But there are no more TRAINERS\n" .string "who can engage you!$" +BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767 .string "That’s pretty impressive!\p" .string "But there are seven more TRAINERS\n" .string "on this floor. Can you beat them all?$" +BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9 .string "That’s pretty impressive!\p" .string "But there are six more TRAINERS\n" .string "on this floor. Can you beat them all?$" +BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829 .string "That’s pretty impressive!\p" .string "But there are five more TRAINERS\n" .string "on this floor. Can you beat them all?$" +BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A .string "That’s pretty impressive!\p" .string "But there are four more TRAINERS\n" .string "on this floor. Can you beat them all?$" +BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB .string "That’s pretty impressive!\p" .string "But there are three more TRAINERS\n" .string "on this floor. Can you beat them all?$" +BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D .string "That’s pretty impressive!\p" .string "But there are two more TRAINERS\n" .string "on this floor. Can you beat them both?$" +BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE .string "That’s pretty impressive!\p" .string "But there’s still one more TRAINER\n" .string "on this floor. Can you prevail?$" +BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B .string "That’s pretty impressive!\p" .string "You’ve gone through all the TRAINERS\n" .string "on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59 .string "Maybe you could sweep through\n" .string "the seven TRAINERS left on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254A9E:: @ 8254A9E .string "Maybe you could sweep through\n" .string "the six TRAINERS left on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254AE1:: @ 8254AE1 .string "Maybe you could sweep through\n" .string "the five TRAINERS left on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254B25:: @ 8254B25 .string "Maybe you could sweep through\n" .string "the four TRAINERS left on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254B69:: @ 8254B69 .string "Maybe you could sweep through\n" .string "the three TRAINERS left on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254BAE:: @ 8254BAE .string "Maybe you could sweep through\n" .string "the two TRAINERS left on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1 .string "Maybe you could complete your sweep\n" .string "with the one TRAINER left on this floor.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E .string "There isn’t a single person left who\n" .string "can defeat you now…$" +BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77 .string "You may have what it takes to beat\n" .string "the seven expert TRAINERS who remain.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254CC0:: @ 8254CC0 .string "You may have what it takes to beat\n" .string "the six expert TRAINERS who remain.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254D07:: @ 8254D07 .string "You may have what it takes to beat\n" .string "the five expert TRAINERS who remain.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254D4F:: @ 8254D4F .string "You may have what it takes to beat\n" .string "the four expert TRAINERS who remain.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254D97:: @ 8254D97 .string "You may have what it takes to beat\n" .string "the three expert TRAINERS who remain.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254DE0:: @ 8254DE0 .string "You may have what it takes to beat\n" .string "the two expert TRAINERS who remain.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254E27:: @ 8254E27 .string "You may have what it takes to beat\n" .string "the one expert TRAINER who remains.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254E6E:: @ 8254E6E .string "Your skills are beyond reproach.\p" .string "There are no more TRAINERS here\n" .string "who have any chance of beating you.$" +BattleFrontier_BattlePyramidEmptySquare_Text_254ED3:: @ 8254ED3 .string "Can you keep winning against\n" .string "the seven remaining TRAINERS?$" +BattleFrontier_BattlePyramidEmptySquare_Text_254F0E:: @ 8254F0E .string "Can you keep winning against\n" .string "the six remaining TRAINERS?$" +BattleFrontier_BattlePyramidEmptySquare_Text_254F47:: @ 8254F47 .string "Can you keep winning against\n" .string "the five remaining TRAINERS?$" +BattleFrontier_BattlePyramidEmptySquare_Text_254F81:: @ 8254F81 .string "Can you keep winning against\n" .string "the four remaining TRAINERS?$" +BattleFrontier_BattlePyramidEmptySquare_Text_254FBB:: @ 8254FBB .string "Can you keep winning against\n" .string "the three remaining TRAINERS?$" +BattleFrontier_BattlePyramidEmptySquare_Text_254FF6:: @ 8254FF6 .string "Can you keep winning against\n" .string "the two remaining TRAINERS?$" +BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F .string "Can you keep winning against\n" .string "the last remaining TRAINER?$" +BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068 .string "There aren’t any TRAINERS left that\n" .string "can take you on now…$" diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index c3ed02996..e334e2413 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -306,54 +306,68 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C: @ 824410C .string "Then, please find a partner from\n" .string "the TRAINERS gathered here.$" -BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 +BattleFrontier_BattleTowerMultiBattleRoom_Text_244149:: @ 8244149 .string "Thank you for choosing a partner.\p" .string "I will now show you to your\n" .string "MULTI BATTLE ROOM.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24419A:: @ 824419A .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "You can call me {STR_VAR_3}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2441CA:: @ 82441CA .string "On {STR_VAR_1}’s advice, I brought\n" .string "one {STR_VAR_3} with {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Please, let me join you as a tag team.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24422E:: @ 824422E .string "Thank you!\n" .string "I’ll go register right now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244255:: @ 8244255 .string "I really wanted to form a tag team\n" .string "with you, {PLAYER}…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244286:: @ 8244286 .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "My name is {STR_VAR_3}.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2 .string "I got advice from {STR_VAR_1} and chose\n" .string "one {STR_VAR_3} with {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2442E4:: @ 82442E4 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Please, let’s form a tag team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244313:: @ 8244313 .string "Thank you very much!\n" .string "I’ll be done with registration quickly!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244350:: @ 8244350 .string "{PLAYER}, I was hoping that I could\n" .string "partner up with you…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244383:: @ 8244383 .string "Um, my name’s {STR_VAR_3}, and I’m\n" .string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice.\p" .string "Snivel…\p" .string "I’m sorry!\n" .string "This tension is making me cry…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7:: @ 82443E7 .string "{STR_VAR_3} advised me, so I have\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244413:: @ 8244413 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Snivel…\n" .string "Please, please team up with me!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B:: @ 824444B .string "Oh, really? You will?\n" .string "Awesome! Wicked! Awoooh!\p" .string "Oh… I’m sorry…\n" @@ -361,95 +375,119 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "I’ll go register right away.\n" .string "Please don’t go away!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6:: @ 82444D6 .string "Oh, b-but…\n" .string "Sob… Waaaaah!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF:: @ 82444EF .string "Hi, there! I’m {STR_VAR_3}!\n" .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E .string "{STR_VAR_3} recommended my crew.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244549:: @ 8244549 .string "one {STR_VAR_2} with {STR_VAR_1},\n" .string "that’s what I have! Cool, huh?\p" .string "So come on!\n" .string "Let’s form a tag team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B:: @ 824459B .string "Yay! Great!\n" .string "Okay, I’ll go register, okay?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5:: @ 82445C5 .string "Aww, why?\n" .string "I wanted to team up, {PLAYER}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8:: @ 82445E8 .string "I’m {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n" .string "of the famous {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618 .string "I looked to {STR_VAR_3} for advice.\n" .string "One {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244643:: @ 8244643 .string "and one {STR_VAR_2} with {STR_VAR_1},\n" .string "that’s my pair.\p" .string "Please, will you join me in\n" .string "a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F:: @ 824468F .string "Thank you!\n" .string "I’ll register right away!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4:: @ 82446B4 .string "{PLAYER}, I had been hoping to join\n" .string "you in a tag team…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5:: @ 82446E5 .string "Um… I’m sincerely happy that you\n" .string "would take the time to talk to me.\p" .string "I’m {STR_VAR_3}.\n" .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D:: @ 824474D .string "{STR_VAR_3} gave me advice.\n" .string "I’m very grateful for it.\p" .string "I have a team of one {STR_VAR_2}\n" .string "with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E:: @ 824479E .string "one {STR_VAR_2} with {STR_VAR_1}.\n" .string "I know I’m asking a lot…\p" .string "I don’t think you’ll be willing to,\n" .string "but may I join you as a partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C:: @ 824480C .string "Really? I can’t believe it!\n" .string "I can’t believe you’ll let me join you!\l" .string "I… I won’t let you down!\p" .string "Um… If it’s really okay, I’ll go register\n" .string "right this instant!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7:: @ 82448A7 .string "Oh…\n" .string "I didn’t think I was good enough…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD:: @ 82448CD .string "Hi, I’m {STR_VAR_3}.\n" .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5:: @ 82448F5 .string "{STR_VAR_3} told me that it would be\n" .string "good to make this team:\l" .string "one {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244939:: @ 8244939 .string "and one {STR_VAR_2} that knows how\n" .string "to use {STR_VAR_1}.\p" .string "Not bad, huh?\n" .string "Want me to team up with you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244989:: @ 8244989 .string "Okay, glad to join you!\n" .string "I hope you won’t mess things up for me!\l" .string "I’ll do my registration now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6:: @ 82449E6 .string "Huh? Why did you turn me down?\n" .string "You’re no judge of character!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23:: @ 8244A23 .string "I’m {STR_VAR_3} and I’m a TRIATHLETE.\n" .string "I’m busy every day what with jogging,\l" .string "training, and rapping.\p" .string "I also happen to be {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9:: @ 8244AA9 .string "This is what {STR_VAR_3} recommended.\n" .string "One {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6:: @ 8244AD6 .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2}.\p" .string "I put a lot of effort into raising\n" @@ -457,90 +495,113 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "Let’s form a tag team\n" .string "and give it a go!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52:: @ 8244B52 .string "Thanks, that’s the spirit!\n" .string "Hang tight while I go register, okay?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93 .string "I took time from my busy schedule\n" .string "to be here! Give me a break!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2:: @ 8244BD2 .string "Hi!\n" .string "How’s it going?\p" .string "I’m {STR_VAR_3}, {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice. Glad to meet you!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18:: @ 8244C18 .string "Listen, listen! You have to hear about\n" .string "the POKéMON {STR_VAR_3} recommended.\l" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E:: @ 8244C6E .string "one {STR_VAR_2} with {STR_VAR_1}.\n" .string "Of course I raised them superbly!\p" .string "So, want to team up?\n" .string "I’m sure it’ll be a great combo!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6:: @ 8244CD6 .string "Yay, I think this will be fun!\n" .string "I’ll go register!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07:: @ 8244D07 .string "Oh, you’re mean!\n" .string "I come recommended, you know.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36:: @ 8244D36 .string "Please let me introduce myself.\n" .string "I am {STR_VAR_3}.\p" .string "I serve as {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82:: @ 8244D82 .string "I sought the sage advice of\n" .string "{STR_VAR_3} and raised my team\l" .string "of one {STR_VAR_2} with {STR_VAR_1}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6:: @ 8244DC6 .string "and one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Please agree to a tag team with me!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE:: @ 8244DFE .string "Oh… I’m delighted!\n" .string "I promise to give you my best!\p" .string "Of course I will register us!\n" .string "Please wait!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B:: @ 8244E5B .string "I had been hoping to join you,\n" .string "{PLAYER}…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E:: @ 8244E7E .string "Eek! You spoke to me!\n" .string "I… I’m overjoyed!\p" .string "I’m {STR_VAR_3}! I’m {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA:: @ 8244ECA .string "On {STR_VAR_3}’s advice, I trained\n" .string "one {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4 .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2}.\p" .string "Please, can you grant me my wish?\n" .string "I want to be your tag-team partner!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F:: @ 8244F4F .string "Eek! I… I feel giddy!\n" .string "Thank you so much!\l" .string "I’ll go register us right away!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98:: @ 8244F98 .string "Waaah! Don’t you feel any pity?\n" .string "But that makes you cooler…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3:: @ 8244FD3 .string "Yeehaw! I’m {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice!\p" .string "{STR_VAR_3}’s my name, hello, hello!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245013:: @ 8245013 .string "My mentor {STR_VAR_3} recommended\n" .string "one {STR_VAR_1}-master {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D:: @ 824503D .string "and one {STR_VAR_1}-master\n" .string "{STR_VAR_2}.\p" .string "Good stuff, huh?\n" .string "You’ll partner with me, won’t you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245087:: @ 8245087 .string "Okay, excellent!\n" .string "I’ll get the registration done quickly!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0:: @ 82450C0 .string "Gwaaah!\n" .string "You’re a calculating one, {PLAYER}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6:: @ 82450E6 .string "Hey! There’s big trouble! This is\n" .string "the BATTLE TOWER’s last day!\p" .string "… … … … … …\n" @@ -549,24 +610,29 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "I’m {STR_VAR_1}’s 1,000th apprentice!\l" .string "Actually, I’m no. {STR_VAR_2}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196 .string "{STR_VAR_3} gave me some advice.\n" .string "{STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD:: @ 82451BD .string "{STR_VAR_2} with {STR_VAR_1}.\n" .string "I’ve got ten of each kind!\l" .string "Actually, just one of each!\p" .string "How about it?\n" .string "Want to try tag battles with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F:: @ 824522F .string "Yippee!\n" .string "I’ll give you a POKéMON as my thanks!\p" .string "Just joking! But I will really go do\n" .string "the registration, okay?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A:: @ 824529A .string "Oh, that’s so cold! I’ll have to wreck\n" .string "the BATTLE TOWER for that!\p" .string "Of course I won’t!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF:: @ 82452EF .string "Hey, there, I’m rockin’ and a-rollin’!\n" .string "POKéMON, I be controllin’!\p" .string "I’m {STR_VAR_3} the rappin’ SAILOR.\n" @@ -574,29 +640,36 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" .string "Me, you shouldn’t be quick to dismiss!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4:: @ 82453B4 .string "With the advice of {STR_VAR_3} I did\n" .string "abide, put together my team of pride!\l" .string "One {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245406:: @ 8245406 .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2}!\p" .string "Our meeting we should commemorate,\n" .string "with a tag-team victory to celebrate!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245464:: @ 8245464 .string "Hey, hey, I like your style!\n" .string "Our registration, I will go file!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3:: @ 82454A3 .string "Oh, hey, {PLAYER}, now that’s cold!\n" .string "If I may be so bold!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6:: @ 82454D6 .string "Yippee-yahoo!\n" .string "Oh, don’t run! I was just having fun!\p" .string "Howdy! I’m {STR_VAR_3}!\n" .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245535:: @ 8245535 .string "{STR_VAR_3} told me what to do.\n" .string "So one {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F:: @ 824555F .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2}, I did choose.\p" .string "So, what do you say?\n" @@ -604,24 +677,29 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "Please, I’m begging you!\n" .string "Let me join you, don’t leave me blue!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC:: @ 82455EC .string "Yeahah! Luck is with me!\n" .string "It sure makes me happy!\p" .string "Before we go join the fray,\n" .string "I’ll go register right away!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245656:: @ 8245656 .string "You’re turning me down?\n" .string "{PLAYER}, you’re making me frown!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A:: @ 824568A .string "Cough!\p" .string "Oh, sorry, I have a cold.\n" .string "My POKéMON are fine, though.\p" .string "My name’s {STR_VAR_3}, {STR_VAR_1}’s\n" .string "no. {STR_VAR_2} apprentice. Cough!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5:: @ 82456F5 .string "I took {STR_VAR_3}’s advice to heart\n" .string "and put together my team of\l" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245740:: @ 8245740 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "I trained them every day,\n" .string "even in wind and rain.\p" @@ -630,853 +708,1115 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149: @ 8244149 .string "That’s what I’m about.\n" .string "Want to be my tag partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9 .string "Thanks, I appreciate this!\n" .string "Cough, cough!\l" .string "Hang on while I go register.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F:: @ 824581F .string "Oh, you won’t?\n" .string "{PLAYER}, I think we’d make a good pair.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245851:: @ 8245851 .string "Oh, hello!\n" .string "This is nerve-racking.\p" .string "I’m {STR_VAR_3}.\n" .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C:: @ 824589C .string "{STR_VAR_3} said this team’ll be good--\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE:: @ 82458CE .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "I’m feeling self-conscious about this,\n" .string "but will you let me join you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245923:: @ 8245923 .string "Oh, gee, thank you!\n" .string "I feel bashful, but I’ll do my best!\p" .string "I’ll go get the registration done.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F:: @ 824597F .string "Oh, please don’t say no!\n" .string "I feel self-conscious enough already…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE:: @ 82459BE .string "I am {STR_VAR_3}, and that’s no lie.\n" .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7:: @ 82459F7 .string "{STR_VAR_3} recommended my team.\p" .string "Since the advice sounded sincere,\n" .string "I decided to bring with me\l" .string "my {STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F:: @ 8245A5F .string "my {STR_VAR_1}-using {STR_VAR_2}.\p" .string "If possible, I would like you to accept\n" .string "me as your tag-team partner.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4:: @ 8245AB4 .string "You really will accept me?\n" .string "It would be too terrible otherwise.\p" .string "But since you’ve agreed, this is fine.\n" .string "I shall go register the both of us.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E .string "Hm? Now why would you refuse?\n" .string "Is this your idea of a joke?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79:: @ 8245B79 .string "I’m {STR_VAR_1}, and I’m a LASS!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91:: @ 8245B91 .string "What I have are one {STR_VAR_2}\n" .string "that uses {STR_VAR_1} and one$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD:: @ 8245BBD .string "{STR_VAR_2} that uses {STR_VAR_1}.\n" .string "Those are what I have with me.\p" .string "Will you be my partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05:: @ 8245C05 .string "Thank you!\n" .string "I’ll go do the registration!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D:: @ 8245C2D .string "You don’t want to be my partner?\n" .string "You’ll regret it later!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66:: @ 8245C66 .string "Hello!\p" .string "I’m YOUNGSTER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F .string "Want to know what I have?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC:: @ 8245CAC .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "You’ll be my tag-team partner,\n" .string "won’t you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6:: @ 8245CE6 .string "Yay!\n" .string "I’ll go and register, okay?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07:: @ 8245D07 .string "Aww! If you’d form a tag team with\n" .string "my POKéMON, we’d be unstoppable!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B:: @ 8245D4B .string "Yahoo!\n" .string "I’m HIKER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60:: @ 8245D60 .string "Know what I have with me?\n" .string "My {STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D:: @ 8245D8D .string "my {STR_VAR_1}-using {STR_VAR_2}!\p" .string "Sounds good, eh?\n" .string "Want to form a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7:: @ 8245DC7 .string "Yahoo!\n" .string "I’ll go do the registering, then.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0:: @ 8245DF0 .string "I would’ve liked to battle with you\n" .string "at my side.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20:: @ 8245E20 .string "Hello!\n" .string "I’m {STR_VAR_1}, and I’m a BEAUTY!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41:: @ 8245E41 .string "Do you know what I’ve been raising?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "What do you think?\n" .string "Want to make a tag team together?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD:: @ 8245EBD .string "Wonderful!\n" .string "I’ll get the registration done now!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC:: @ 8245EEC .string "How disappointing!\p" .string "We two together--we would’ve been\n" .string "the best!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B:: @ 8245F2B .string "Yo!\p" .string "You know who I am?\n" .string "I’m {STR_VAR_1} the FISHERMAN!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58:: @ 8245F58 .string "I’ve got with me a team of one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87 .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" .string "So, how about it?\n" .string "Will you battle at my side?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6:: @ 8245FC6 .string "Good, good!\n" .string "Leave it up to me!\p" .string "I’ll go and register us now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246002:: @ 8246002 .string "We matched up perfectly, too…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246020:: @ 8246020 .string "Glad to make your acquaintance.\n" .string "I am {STR_VAR_1}, a LADY.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246051:: @ 8246051 .string "I am accompanied by a team of\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246082:: @ 8246082 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "I hope I meet your approval.\n" .string "For I wish to have you as my partner.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5:: @ 82460D5 .string "I thank you sincerely.\n" .string "I shall handle the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D:: @ 824610D .string "I’m sure that you will regret not\n" .string "having me as your partner.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A:: @ 824614A .string "I’m TRIATHLETE {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D .string "What I have…\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D:: @ 824617D .string "one {STR_VAR_2} with {STR_VAR_1}!\n" .string "That’s my pair!\p" .string "Please?\n" .string "Will you form a tag team with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7:: @ 82461C7 .string "Gee, thanks!\n" .string "I’ll go register at the counter.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5:: @ 82461F5 .string "We two together, we would’ve been\n" .string "tough for certain!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A:: @ 824622A .string "Hiya!\n" .string "I’m BUG CATCHER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246244:: @ 8246244 .string "Check out what I have!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E:: @ 824626E .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "So, listen!\n" .string "Do you want to form a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA:: @ 82462AA .string "Gotcha!\p" .string "I’ll go do the registration stuff\n" .string "at the counter.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4:: @ 82462E4 .string "Aww, my POKéMON are awesome.\n" .string "I hope you won’t regret this!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F:: @ 824631F .string "Good day!\n" .string "I’m SCHOOL KID {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C:: @ 824633C .string "What I’ve been raising are one\n" .string "{STR_VAR_2} that uses {STR_VAR_1}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B:: @ 824636B .string "and one {STR_VAR_2} that uses\n" .string "{STR_VAR_1}.\p" .string "Not too bad, don’t you think?\n" .string "Would you care to form a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5:: @ 82463C5 .string "Thank you very much!\n" .string "I’ll get done with the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF:: @ 82463FF .string "That’s too bad…\p" .string "I was hoping that I could learn\n" .string "from you as your partner…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246449:: @ 8246449 .string "Yo! Let me tell you who I am!\n" .string "I’m RICH BOY {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478 .string "Guess what I got!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D:: @ 824649D .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "I’m willing to offer you the chance\n" .string "to be in a tag team with me.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE:: @ 82464EE .string "Smart move!\p" .string "I’ll finish up the registration\n" .string "process quick!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246529:: @ 8246529 .string "You’d turn me of all people down?\n" .string "You’ll regret that decision for sure!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246571:: @ 8246571 .string "Hiyah!\n" .string "I am BLACK BELT {STR_VAR_1}.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C:: @ 824658C .string "As my companions, I have\n" .string "one {STR_VAR_2} using {STR_VAR_1}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5:: @ 82465B5 .string "and one {STR_VAR_2} using\n" .string "{STR_VAR_1}.\p" .string "Please, grant me my wish!\n" .string "Allow me to be your tag partner!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246605:: @ 8246605 .string "Hiyah!\n" .string "I will go register forthwith!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A:: @ 824662A .string "I see… I hope for an opportunity\n" .string "the next time we meet…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246662:: @ 8246662 .string "Hi, there!\n" .string "I’m {STR_VAR_1}, and I’m a TUBER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246686:: @ 8246686 .string "I’ll tell you what I have.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4 .string "one {STR_VAR_2} with {STR_VAR_1}!\n" .string "May I please be on your tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6:: @ 82466E6 .string "Thank you!\n" .string "I’ll go register us now!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A:: @ 824670A .string "If we’d become partners, we could\n" .string "have been so strong!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246741:: @ 8246741 .string "Greetings…\n" .string "I am HEX MANIAC {STR_VAR_1}…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246760:: @ 8246760 .string "I bear with me one {STR_VAR_1}-using\n" .string "{STR_VAR_2} together with one$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246791:: @ 8246791 .string "{STR_VAR_1}-using {STR_VAR_2}…\p" .string "I beseech you…\n" .string "Join me in a tag team…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4:: @ 82467C4 .string "I thank you…\n" .string "I shall register us…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6:: @ 82467E6 .string "I so longed to join you…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF:: @ 82467FF .string "How do you do? I’m {STR_VAR_1},\n" .string "and I’m a POKéMON BREEDER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246831:: @ 8246831 .string "I’m raising a couple good ones!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "How about it?\n" .string "Feel like making a tag team with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7:: @ 82468A7 .string "Thank you kindly!\p" .string "I’ll go take care of the registration\n" .string "stuff, so you wait right here!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE .string "I was looking forward to being\n" .string "your partner…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B:: @ 824692B .string "Well, hello!\n" .string "I’m TRIATHLETE {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B:: @ 824694B .string "Want to know what I run with?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C:: @ 824697C .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Well?\n" .string "Want to be in a tag team with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4:: @ 82469B4 .string "Good going!\p" .string "I’ll be quick and get the registration\n" .string "all done!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1:: @ 82469F1 .string "You and me, we would’ve been tops.\n" .string "It’s too bad…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22:: @ 8246A22 .string "Hey, there! My name’s {STR_VAR_1}!\n" .string "I’m a TRIATHLETE!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E:: @ 8246A4E .string "I go on runs with my durable team--\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85:: @ 8246A85 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Not too shabby, huh?\n" .string "We should be in a tag team together!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF:: @ 8246ACF .string "All right!\n" .string "I’ll go register in a flash!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7:: @ 8246AF7 .string "I really wanted to battle as your\n" .string "tag-team partner…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B:: @ 8246B2B .string "I’m BATTLE GIRL {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F:: @ 8246B3F .string "I’ve been toughening up one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B .string "one {STR_VAR_1}-using {STR_VAR_2}!\p" .string "Do you like that combo?\n" .string "How about you and me join up?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2:: @ 8246BB2 .string "Why, thanks!\p" .string "I’ll get the registration done\n" .string "right now!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9 .string "With you, I thought we could form\n" .string "the ultimate tag team…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22:: @ 8246C22 .string "I’m TRIATHLETE {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35:: @ 8246C35 .string "I’ve been running with one {STR_VAR_2}\n" .string "that knows how to use {STR_VAR_1}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C:: @ 8246C6C .string "and one {STR_VAR_2} with {STR_VAR_1}!\p" .string "We could be in a tag team.\n" .string "Wouldn’t that be great?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3:: @ 8246CB3 .string "Thank you!\p" .string "I’ll go register us, and that’s\n" .string "right now!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9:: @ 8246CE9 .string "Aww, that’s too bad. We would’ve been\n" .string "the toughest tag team around!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D:: @ 8246D2D .string "Me?\n" .string "I’m TUBER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F .string "What do I have with me?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A:: @ 8246D6A .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Hey?\n" .string "You’ll team up with me, right?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E:: @ 8246D9E .string "Okay!\p" .string "I’ll go register!\n" .string "Let’s be excellent together!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3:: @ 8246DD3 .string "My POKéMON are tough for sure…\n" .string "It’s too bad you don’t want to team up.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A:: @ 8246E1A .string "Yay-hey!\n" .string "Call me GUITARIST {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39:: @ 8246E39 .string "Check out my entourage!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64:: @ 8246E64 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Yay-hey! Pretty wild, huh?\n" .string "We’ll have to do a duet in a tag team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6:: @ 8246EB6 .string "Yay-hey! Right on!\n" .string "I’ll do that registration stuff now!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE:: @ 8246EEE .string "My POKéMON rock hard!\n" .string "You’ll be sorry, I tell you!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21:: @ 8246F21 .string "Pleased to meet you.\n" .string "I am {STR_VAR_1}, a GENTLEMAN.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C:: @ 8246F4C .string "I am accompanied by my trusted\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B:: @ 8246F7B .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" .string "May I ask you to join me in a tag-team\n" .string "partnership arrangement?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC:: @ 8246FCC .string "Ah, I thank you for your trust.\n" .string "I shall be done with the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247013:: @ 8247013 .string "That is most unfortunate…\p" .string "I shall look forward to the next\n" .string "opportunity…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B:: @ 824705B .string "Hello, I’m {STR_VAR_1},\n" .string "and I’m a POKéFAN.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D .string "I have with me now one {STR_VAR_2}\n" .string "that knows the move {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2:: @ 82470B2 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Do you like what you see?\n" .string "Why don’t you be my tag partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD:: @ 82470FD .string "Thank you!\n" .string "I’ll look after the registration!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A:: @ 824712A .string "My POKéMON are top grade…\n" .string "It’s too bad you can’t appreciate that.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C:: @ 824716C .string "Hm!\n" .string "I am {STR_VAR_1}, and an EXPERT am I!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D:: @ 824718D .string "The POKéMON that I’ve toughened up are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7:: @ 82471C7 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "What say you to a tag team with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB:: @ 82471FB .string "Hm!\n" .string "I shall register us right away!\l" .string "Let us both do our best!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247238:: @ 8247238 .string "I will hope that your choice is\n" .string "indeed correct…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247268:: @ 8247268 .string "Hello, hello.\n" .string "I’m {STR_VAR_1}, and I’m an EXPERT.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247291:: @ 8247291 .string "I’ve raised my POKéMON thoroughly.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7:: @ 82472C7 .string "one {STR_VAR_2} with {STR_VAR_1}--\n" .string "they’re what I have.\p" .string "Wouldn’t you like to team up with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247313:: @ 8247313 .string "Good, good.\n" .string "I’ll see to the registration right away.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247348:: @ 8247348 .string "Perhaps we can form a team the next\n" .string "time we meet.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A:: @ 824737A .string "I’m DRAGON TAMER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F:: @ 824738F .string "The team I’ve been toughening up is\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "How about it?\n" .string "Want to be my partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB:: @ 82473FB .string "Okay, I’ll give it my best!\n" .string "I’ll go register now, all right?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247438:: @ 8247438 .string "You’re not going to find many tougher\n" .string "partners than me!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247470:: @ 8247470 .string "I’m BIRD KEEPER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484 .string "What POKéMON do I have?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF:: @ 82474AF .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Don’t you think we’d make a decent\n" .string "tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC:: @ 82474EC .string "Great, thanks!\n" .string "I’ll look after the registration!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D:: @ 824751D .string "My POKéMON and I are strong.\n" .string "What a letdown.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A:: @ 824754A .string "I’m NINJA BOY {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C .string "My POKéMON team consists of one\n" .string "{STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B:: @ 824758B .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Let’s be in a tag team together!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC:: @ 82475BC .string "Yay!\n" .string "Let me go register!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5:: @ 82475D5 .string "You’ll regret not having my tough\n" .string "POKéMON on your side!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D:: @ 824760D .string "Hello!\n" .string "I’m PARASOL LADY {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629 .string "Escorting me now are my {STR_VAR_2}\n" .string "that uses {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247655:: @ 8247655 .string "one {STR_VAR_2} that uses\n" .string "{STR_VAR_1}.\p" .string "Aren’t they nice?\n" .string "Care to join us in a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B:: @ 824769B .string "Thanks a bunch!\p" .string "I’ll go register at the counter.\n" .string "Let’s not disappoint each other!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED .string "My POKéMON are tremendously strong.\n" .string "How disappointing…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247724:: @ 8247724 .string "Hello.\n" .string "I’m {STR_VAR_1}, and I’m a BUG MANIAC!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247749:: @ 8247749 .string "I have found my POKéMON, yes.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A:: @ 824777A .string "one {STR_VAR_2} with {STR_VAR_1}--\n" .string "they are what I found.\p" .string "Could I interest you in forming\n" .string "a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE:: @ 82477CE .string "Okay!\n" .string "Understood!\p" .string "I won’t be long with the registration!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247807:: @ 8247807 .string "With the POKéMON I found, we wouldn’t\n" .string "have lost…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247838:: @ 8247838 .string "Ahoy, there!\n" .string "I’m SAILOR {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854 .string "Let me show you my pride and joy!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247889:: @ 8247889 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Of course you’re not going to turn\n" .string "me down. We will team up, right?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD:: @ 82478DD .string "I didn’t expect any less!\n" .string "I’ll go register now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D:: @ 824790D .string "We would’ve stormed through\n" .string "the opposition! Too bad!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247942:: @ 8247942 .string "Hi, I’m {STR_VAR_1}.\n" .string "I’m a COLLECTOR.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F:: @ 824795F .string "The jewels in my collection are\n" .string "my {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247991:: @ 8247991 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Swell, huh?\n" .string "We should be in a team together.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE:: @ 82479CE .string "Oh, yeah!\p" .string "Well, let’s not waste any time.\n" .string "I’ll go register the two of us.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18:: @ 8247A18 .string "Well, that’s upsetting.\n" .string "You don’t appreciate my POKéMON.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51:: @ 8247A51 .string "Howdy, I’m {STR_VAR_1}.\n" .string "I’m a POKéMON RANGER.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76 .string "Keeping me company are one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1:: @ 8247AA1 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Don’t you think we’d make an impressive\n" .string "tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3:: @ 8247AE3 .string "That’s super!\n" .string "I’ll deal with the registration now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16:: @ 8247B16 .string "Next time, choose my POKéMON,\n" .string "will you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E:: @ 8247B3E .string "My name’s {STR_VAR_1}.\n" .string "I’m a POKéMON RANGER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62:: @ 8247B62 .string "Let me tell you about my team. I have\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B:: @ 8247B9B .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "How would you like to form a tag team\n" .string "with my little posse?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7:: @ 8247BE7 .string "We’ll be at our best!\n" .string "I’ll get the registration done quick!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23:: @ 8247C23 .string "I hope you’ll choose my POKéMON\n" .string "next time.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E:: @ 8247C4E .string "Pleased to meet you. I’m {STR_VAR_1}.\n" .string "I consider myself an AROMA LADY.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C:: @ 8247C8C .string "I travel with one {STR_VAR_2}\n" .string "that uses {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2:: @ 8247CB2 .string "one {STR_VAR_2} that uses\n" .string "{STR_VAR_1}.\p" .string "I hope they strike your fancy.\n" .string "Would you care to be my partner?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07:: @ 8247D07 .string "I’m honored by your acceptance.\n" .string "I will go register right this instant.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E .string "It would be wonderful if we could form\n" .string "a tag team the next time we meet.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97:: @ 8247D97 .string "Want to know who I am?\n" .string "I’m {STR_VAR_1}, the RUIN MANIAC!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7:: @ 8247DC7 .string "The POKéMON that I have with me are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE:: @ 8247DFE .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Intriguing, eh?\n" .string "How about you and I partner up?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E:: @ 8247E3E .string "That’s a sound decision!\n" .string "I’ll go do the registration paperwork.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E:: @ 8247E7E .string "Hmm…\n" .string "I think my POKéMON are tough…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1:: @ 8247EA1 .string "I’m COOLTRAINER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5 .string "The POKéMON I have right now are one\n" .string "{STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9:: @ 8247EE9 .string "one {STR_VAR_2} with {STR_VAR_1}.\n" .string "Cool, huh?\p" .string "Don’t you think it’d be pretty cool\n" .string "if we made a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F:: @ 8247F3F .string "Cool!\n" .string "I’ll go do the registration in a flash!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D:: @ 8247F6D .string "I thought that we’d make just\n" .string "the greatest team ever.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3:: @ 8247FA3 .string "I’m COOLTRAINER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7:: @ 8247FB7 .string "The team I’ve been raising has one\n" .string "{STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Does that sound okay?\n" .string "How about we become tag partners?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248031:: @ 8248031 .string "Sounds A-OK!\n" .string "I’d better do the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E .string "I was thinking how we would be\n" .string "one tough team…$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D:: @ 824808D .string "Heyo!\n" .string "I’m {STR_VAR_1}, the POKéMANIAC!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB .string "What does a guy like me have?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC:: @ 82480DC .string "one {STR_VAR_2} with {STR_VAR_1},\n" .string "that’s what!\p" .string "Let’s do it!\n" .string "We’ll stomp around as a tag team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248128:: @ 8248128 .string "Good call!\n" .string "I’ll register the both of us!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248151:: @ 8248151 .string "My POKéMON are brutal!\n" .string "It’s not my fault if you regret this!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E:: @ 824818E .string "Yo, there!\n" .string "I’m KINDLER {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9:: @ 82481A9 .string "You know what my training cooked up?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1:: @ 82481E1 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Well, what do you say?\n" .string "Want to form a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248221:: @ 8248221 .string "All right!\n" .string "I’ll get on with the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F:: @ 824824F .string "Promise you’ll partner up with me\n" .string "the next time we run into each other.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248297:: @ 8248297 .string "I’m {STR_VAR_1}, and I’m a CAMPER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1:: @ 82482B1 .string "I’ve been raising one {STR_VAR_1}-\n" .string "using {STR_VAR_2} and one$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC:: @ 82482DC .string "{STR_VAR_1}-using {STR_VAR_2}.\p" .string "Do you think it’d be fun to team up?\n" .string "I bet it would be!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248321:: @ 8248321 .string "Yeah!\n" .string "Off I go to register!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D:: @ 824833D .string "Next time, okay?\n" .string "I want to be on your team.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248369:: @ 8248369 .string "Hello!\n" .string "I’m {STR_VAR_1}, and I’m a PICNICKER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D:: @ 824838D .string "The POKéMON I’ve been taking are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1:: @ 82483C1 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Are you interested in joining me\n" .string "on a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248401:: @ 8248401 .string "Why, thank you!\n" .string "I will do the registration now.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248431:: @ 8248431 .string "It would be nice if I could join you\n" .string "some other time.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248467:: @ 8248467 .string "I’m PSYCHIC {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248477:: @ 8248477 .string "The twosome I’ve been raising are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Would you like to form a tag team\n" .string "with me?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7:: @ 82484E7 .string "Sure thing!\n" .string "I’ll take care of the registration!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248517:: @ 8248517 .string "If we meet again, that’s when I’d like\n" .string "to team up with you.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248553:: @ 8248553 .string "I’m {STR_VAR_1}.\n" .string "I’m a PSYCHIC.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A:: @ 824856A .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D:: @ 824857D .string "one {STR_VAR_2} with {STR_VAR_1}--\n" .string "they’re my disciples.\p" .string "Doesn’t the idea of forming a tag-team\n" .string "partnership intrigue you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5:: @ 82485E5 .string "Thank you.\n" .string "I’ll go deal with the registration.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248614:: @ 8248614 .string "I hope there will be another chance\n" .string "to forge an alliance.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E:: @ 824864E .string "I’m SCHOOL KID {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248661:: @ 8248661 .string "One {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248671:: @ 8248671 .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2} are my POKéMON pair.\p" .string "May I please be your partner on\n" .string "a tag team?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6:: @ 82486C6 .string "Ooh, thank you!\n" .string "I’ll register at the counter right away!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF:: @ 82486FF .string "Please?\n" .string "May I join you the next time?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248725:: @ 8248725 .string "Hiya! The name’s {STR_VAR_1}!\n" .string "I’m a POKéMON BREEDER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248751:: @ 8248751 .string "The POKéMON I’ve raised are one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248781:: @ 8248781 .string "one {STR_VAR_1}-using {STR_VAR_2}.\p" .string "Sound interesting?\n" .string "How about we form a tag team, then?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9:: @ 82487C9 .string "All righty!\n" .string "You leave the registration to me!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7:: @ 82487F7 .string "You have to team up with me next time,\n" .string "all right?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248829:: @ 8248829 .string "I’m {STR_VAR_1}, and I’m proud to say\n" .string "that I am a POKéFAN.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B:: @ 824885B .string "The darling POKéMON I’ve raised are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248892:: @ 8248892 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Aren’t they just the cutest?\n" .string "We ought to make a team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8:: @ 82488D8 .string "Thank you, dear!\n" .string "I’ll be on my way to register!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248908:: @ 8248908 .string "My darling POKéMON are the best,\n" .string "I’ll have you know. How annoying!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B:: @ 824894B .string "Hi, I’m SWIMMER {STR_VAR_1}.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F:: @ 824895F .string "One {STR_VAR_1}-using {STR_VAR_2}$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F:: @ 824896F .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2} are what I’ve trained.\p" .string "You and me, let’s make a tag team.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD:: @ 82489BD .string "That’s cool!\n" .string "I’ll register the two of us.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7:: @ 82489E7 .string "If we meet again, you owe me\n" .string "a tag team!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10:: @ 8248A10 .string "What’s happening?\n" .string "I’m {STR_VAR_1}, and I’m a TRIATHLETE.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40 .string "I got a couple decent POKéMON.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72:: @ 8248A72 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "It’d be neat if we made a tag team\n" .string "together, so how about it?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0 .string "Right on!\n" .string "You wait while I register, okay?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB:: @ 8248AEB .string "I expect you’ll let me join you\n" .string "next time, how’s that?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22:: @ 8248B22 .string "I’m the TRIATHLETE {STR_VAR_1}!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39:: @ 8248B39 .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C:: @ 8248B4C .string "another {STR_VAR_2} that knows how\n" .string "to use {STR_VAR_1}. That’s my pair.\p" .string "What do you think?\n" .string "We’d make a good team, I’d say.$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4:: @ 8248BB4 .string "I like that answer!\n" .string "I’ll get done with registration fast!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE:: @ 8248BEE .string "You’ll give me another chance to form\n" .string "a partnership, won’t you?$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E:: @ 8248C2E .string "Hi, there! Hello!\n" .string "I’m {STR_VAR_1}, and I’m a SWIMMER!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B:: @ 8248C5B .string "Check out what I’ve been raising!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90:: @ 8248C90 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Sweet, huh?\n" .string "It’d be sweet to form a team, too!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF:: @ 8248CCF .string "Much obliged!\n" .string "I’ll get this registration thing done!$" +BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04:: @ 8248D04 .string "If we meet again, you have to team up\n" .string "with me. You’ll do that, right?$" diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/scripts/maps/BattleFrontier_Lounge1.inc index 5449fa8ee..ba8ca0cb6 100644 --- a/data/scripts/maps/BattleFrontier_Lounge1.inc +++ b/data/scripts/maps/BattleFrontier_Lounge1.inc @@ -30,7 +30,7 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 return BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF - specialvar VAR_RESULT, sub_81396E0 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 goto_eq BattleFrontier_Lounge1_EventScript_25E7FF special sub_8139D98 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..bb1feceec 100644 --- a/data/scripts/maps/BattleFrontier_Lounge5.inc +++ b/data/scripts/maps/BattleFrontier_Lounge5.inc @@ -13,7 +13,7 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 faceplayer compare VAR_0x8004, 255 goto_eq BattleFrontier_Lounge5_EventScript_26460D - specialvar VAR_RESULT, sub_81396E0 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 goto_eq BattleFrontier_Lounge5_EventScript_264603 special sub_813A7B8 @@ -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/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc index 7ecf83788..eca861f85 100644 --- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc +++ b/data/scripts/maps/BattleFrontier_ReceptionGate.inc @@ -4,7 +4,7 @@ BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA .byte 0 BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5 - setflag FLAG_UNLOCK_BATTLE_FRONTIER + setflag FLAG_LANDMARK_BATTLE_FRONTIER end BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index fdd8515e9..9137902f2 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -31,7 +31,7 @@ DesertRuins_EventScript_22D993:: @ 822D993 return DesertRuins_MapScript1_22D9CA: @ 822D9CA - setflag FLAG_0x8B6 + setflag FLAG_LANDMARK_DESERT_RUINS checkflag FLAG_0x1BB call_if 0, DesertRuins_EventScript_22D9D7 end diff --git a/data/scripts/maps/DesertUnderpass.inc b/data/scripts/maps/DesertUnderpass.inc index 0db62ff75..486bd2577 100644 --- a/data/scripts/maps/DesertUnderpass.inc +++ b/data/scripts/maps/DesertUnderpass.inc @@ -3,7 +3,7 @@ DesertUnderpass_MapScripts:: @ 823AF37 .byte 0 DesertUnderpass_MapScript1_23AF3D: @ 823AF3D - setflag FLAG_0x8DE + setflag FLAG_LANDMARK_DESERT_UNDERPASS end DesertUnderpass_EventScript_23AF41:: @ 823AF41 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 20192a4e6..5cb4ee7fd 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -53,7 +53,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 setrespawn 1 fadescreenspeed 1, 24 - special sub_8137734 + special GameClear waitstate releaseall end @@ -61,7 +61,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 setrespawn 2 fadescreenspeed 1, 24 - special sub_8137734 + special GameClear waitstate releaseall end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc index 63817688d..0a174bf0c 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD setrespawn 20 - setflag FLAG_SYS_POKEMON_LEAGUE_FLY + setflag FLAG_LANDMARK_POKEMON_LEAGUE checkflag FLAG_0x107 call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED end diff --git a/data/scripts/maps/FieryPath.inc b/data/scripts/maps/FieryPath.inc index 870b70e91..a040a5327 100644 --- a/data/scripts/maps/FieryPath.inc +++ b/data/scripts/maps/FieryPath.inc @@ -3,9 +3,9 @@ FieryPath_MapScripts:: @ 8230F24 .byte 0 FieryPath_MapScript1_230F2A: @ 8230F2A - checkflag FLAG_0x8AA + checkflag FLAG_LANDMARK_FIERY_PATH call_if 0, FieryPath_EventScript_230F37 - setflag FLAG_0x8AA + setflag FLAG_LANDMARK_FIERY_PATH end FieryPath_EventScript_230F37:: @ 8230F37 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index fb1798804..a96d13902 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -31,7 +31,7 @@ IslandCave_EventScript_238E62:: @ 8238E62 return IslandCave_MapScript1_238E99: @ 8238E99 - setflag FLAG_0x8B5 + setflag FLAG_LANDMARK_ISLAND_CAVE call IslandCave_EventScript_238F45 checkflag FLAG_0x1BC call_if 0, IslandCave_EventScript_238EAB diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index ed34cd953..90769b550 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F message LilycoveCity_CoveLilyMotel_2F_Text_21881C waitmessage call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E - special sub_8137CB4 + special Special_ShowDiploma waitstate release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 3eb61ed91..8de2d5d6f 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -26,10 +26,10 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 waitmovement 0 playse SE_PC_ON - special sub_8138EC0 + special DoLotteryCornerComputerEffect special PickLotteryCornerTicket delay 220 - special sub_8138FAC + special EndLotteryCornerComputerEffect delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E waitmovement 0 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index e60eccbaa..0fcdc46d5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034 end LittlerootTown_EventScript_1E805D:: @ 81E805D - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, 4 closemessage applymovement 1, LittlerootTown_Movement_2725A2 @@ -256,7 +256,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D end LittlerootTown_EventScript_1E807A:: @ 81E807A - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8CE3, 4 release end @@ -364,7 +364,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F waitmovement 0 applymovement 255, LittlerootTown_Movement_2725A4 waitmovement 0 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, 4 closemessage applymovement 1, LittlerootTown_Movement_2725A2 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 112311462..0f3fa1a0e 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 - special sub_8138B48 + special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4 setflag FLAG_0x057 setvar VAR_0x4082, 2 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index f1763753a..0e7ecbf22 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -256,7 +256,7 @@ gUnknown_081F860D:: @ 81F860D LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 setvar VAR_0x8004, 1 - special sp0D9_ComputerRelated + special DoPCTurnOnEffect playse SE_PC_ON msgbox gUnknown_08272D87, 4 special sub_816AE58 @@ -267,7 +267,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F setvar VAR_0x8004, 1 playse SE_PC_OFF - special sub_8138E20 + special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 2fdf79b03..e0229b9ea 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -98,7 +98,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 - special sub_8138B48 + special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4 setflag FLAG_0x057 setvar VAR_0x408C, 2 @@ -124,7 +124,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 compare VAR_0x408D, 3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F - special sub_8138B48 + special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4 release end @@ -148,7 +148,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4 release end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 3a983cdd4..327112d2f 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -317,7 +317,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 setvar VAR_0x8004, 2 - special sp0D9_ComputerRelated + special DoPCTurnOnEffect playse SE_PC_ON msgbox gUnknown_08272D87, 4 special sub_816AE58 @@ -328,7 +328,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F setvar VAR_0x8004, 2 playse SE_PC_OFF - special sub_8138E20 + special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 94da547d5..049833db0 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -49,30 +49,30 @@ MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4 MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF setvar VAR_0x8004, 0 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DEBD:: @ 820DEBD setvar VAR_0x8004, 1 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DECB:: @ 820DECB setvar VAR_0x8004, 2 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DED9:: @ 820DED9 setvar VAR_0x8004, 3 - special sub_81384F0 + special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_20DDBA end MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 - special sub_8138750 + special MauvilleGymSpecial3 end MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB @@ -102,7 +102,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B call_if 1, MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_271F43 - special sub_8138750 + special MauvilleGymSpecial3 special DrawWholeMapView playse SE_KI_GASYAN call MauvilleCity_Gym_EventScript_20DFB1 @@ -189,8 +189,8 @@ MauvilleCity_Gym_EventScript_20E068:: @ 820E068 end MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D - special sub_8138540 - special sub_81384F0 + special MauvilleGymSpecial2 + special MauvilleGymSpecial1 special DrawWholeMapView playse SE_KI_GASYAN checkflag FLAG_0x063 diff --git a/data/scripts/maps/MirageTower_1F.inc b/data/scripts/maps/MirageTower_1F.inc index 5b9725c9e..d7d9619b5 100644 --- a/data/scripts/maps/MirageTower_1F.inc +++ b/data/scripts/maps/MirageTower_1F.inc @@ -5,6 +5,6 @@ MirageTower_1F_MapScripts:: @ 823AD01 MirageTower_1F_MapScript1_23AD07: @ 823AD07 setflag FLAG_0x8DC setflag FLAG_0x09D - setflag FLAG_0x078 + setflag FLAG_LANDMARK_MIRAGE_TOWER end diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/scripts/maps/MirageTower_4F.inc index 19b8c6c91..10d465b74 100644 --- a/data/scripts/maps/MirageTower_4F.inc +++ b/data/scripts/maps/MirageTower_4F.inc @@ -53,7 +53,7 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA special sub_81BE994 waitstate setvar VAR_0x40CB, 1 - clearflag FLAG_0x078 + clearflag FLAG_LANDMARK_MIRAGE_TOWER warp ROUTE_111, 255, 19, 59 waitstate release diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index a06979ddf..b08d296c7 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -6,7 +6,7 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 faceplayer bufferleadmonspeciesname 0 msgbox MossdeepCity_House1_Text_22200F, 4 - specialvar VAR_RESULT, sub_81391D0 + specialvar VAR_RESULT, GetPokeblockNameByMonNature compare VAR_RESULT, 0 goto_eq MossdeepCity_House1_EventScript_221FFC msgbox MossdeepCity_House1_Text_22201D, 4 diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 0cd8ddf84..cb3cc0d16 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -21,7 +21,7 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 special sub_80E8BC8 compare VAR_RESULT, 0 goto_eq MossdeepCity_House4_EventScript_222E14 - special sub_8139200 + special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_222ECC, 4 release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 106dc5570..8fc55295f 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -53,7 +53,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 dodailyevents - specialvar VAR_RESULT, sub_8138BDC + specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012 @@ -75,7 +75,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 dodailyevents - specialvar VAR_RESULT, sub_8138BDC + specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 06621451e..1dd9c2725 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -47,7 +47,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C setvar VAR_0x8004, 1 setvar VAR_0x40A3, 2 incrementgamestat 48 - special sub_8138B8C + special CableCarWarp special sub_814FC9C waitstate release diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 9d13b5cf4..727b77985 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -18,7 +18,7 @@ NewMauville_Entrance_EventScript_2372C4:: @ 82372C4 return NewMauville_Entrance_MapScript1_2372FB: @ 82372FB - setflag FLAG_0x8A0 + setflag FLAG_LANDMARK_NEW_MAUVILLE end NewMauville_Entrance_EventScript_2372FF:: @ 82372FF diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index bf671d01e..0e87677e6 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -13,10 +13,10 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 checkflag FLAG_0x12C call_if 0, PacifidlogTown_House2_EventScript_203801 setflag FLAG_0x12C - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_203816 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_203845 goto PacifidlogTown_House2_EventScript_20384F diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index aa02cc017..ec97a639e 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -4,7 +4,7 @@ PacifidlogTown_House5_MapScripts:: @ 8204110 PacifidlogTown_House5_EventScript_204111:: @ 8204111 lock faceplayer - specialvar VAR_RESULT, sub_813793C + specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq PacifidlogTown_House5_EventScript_20412D msgbox PacifidlogTown_House5_Text_204140, 4 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 1f6de9966..0da686052 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -31,7 +31,7 @@ PetalburgCity_MapScript2_1DC31C: @ 81DC31C PetalburgCity_EventScript_1DC32E:: @ 81DC32E lockall special copy_player_party_to_sav1 - special sub_813946C + special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_1DC451 applymovement 255, PetalburgCity_Movement_1DC430 waitmovement 0 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index c07b89eec..060531c97 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -222,7 +222,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC clearflag FLAG_0x2D6 clearflag FLAG_0x362 setflag FLAG_0x379 - special sub_8137A0C + special InitBirchState warp PETALBURG_CITY, 255, 15, 8 waitstate release @@ -1204,12 +1204,12 @@ PetalburgCity_Gym_EventScript_205733:: @ 8205733 return PetalburgCity_Gym_EventScript_205746:: @ 8205746 - special sub_81388E4 + special PetalburgGymSpecial1 waitstate return PetalburgCity_Gym_EventScript_20574B:: @ 820574B - special sub_8138AA4 + special PetalburgGymSpecial2 return PetalburgCity_Gym_EventScript_20574F:: @ 820574F diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 8d5d79d73..f4a31854e 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -28,7 +28,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C lock faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 - specialvar VAR_RESULT, sub_81394D8 + specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 release diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 128888939..e672b7ad2 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -1035,14 +1035,14 @@ Route104_EventScript_1ED580:: @ 81ED580 Route104_EventScript_1ED597:: @ 81ED597 trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route104_Text_2952FE, 4 release end Route104_EventScript_1ED5B6:: @ 81ED5B6 trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route104_Text_29540D, 4 release end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 2e901b5f4..c0c3888e1 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -3,7 +3,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E .byte 0 Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 - setflag FLAG_0x89D + setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare VAR_0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_229D50 checkflag FLAG_0x0BC diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 3b7dcf601..5142a1282 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -3,7 +3,7 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C .byte 0 Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 - setflag FLAG_0x89C + setflag FLAG_LANDMARK_FLOWER_SHOP checkflag FLAG_0x07F goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B checkflag FLAG_BADGE03_GET diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index b8503593d..d708246de 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -328,7 +328,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E Route109_EventScript_1EE9B5:: @ 81EE9B5 lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString checkflag FLAG_0x118 goto_eq Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, 4 diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 90113bd5b..e70f91ca8 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -3,7 +3,7 @@ Route109_SeashoreHouse_MapScripts:: @ 82693F4 .byte 0 Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA - setflag FLAG_0x89F + setflag FLAG_LANDMARK_SEASHORE_HOUSE end Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 210354444..3c743fb3c 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -5,7 +5,7 @@ Route110_MapScripts:: @ 81EF269 .byte 0 Route110_MapScript1_1EF279: @ 81EF279 - special sub_8137F44 + special UpdateCyclingRoadState end Route110_MapScript1_1EF27D: @ 81EF27D @@ -24,7 +24,7 @@ Route110_MapScript2_1EF297: @ 81EF297 .2byte 0 Route110_EventScript_1EF2A1:: @ 81EF2A1 - special sub_8137D0C + special Special_BeginCyclingRoadChallenge setvar VAR_0x40A9, 2 return @@ -130,7 +130,7 @@ Route110_EventScript_1EF389:: @ 81EF389 Route110_EventScript_1EF392:: @ 81EF392 lockall - specialvar VAR_RESULT, sub_8137EFC + specialvar VAR_RESULT, GetRecordedCyclingRoadResults compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF3AD msgbox Route110_Text_1F0A1E, 4 @@ -145,7 +145,7 @@ Route110_EventScript_1EF3AD:: @ 81EF3AD Route110_EventScript_1EF3B7:: @ 81EF3B7 lock faceplayer - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF3E8 compare VAR_0x40A9, 0 @@ -326,7 +326,7 @@ Route110_EventScript_1EF661:: @ 81EF661 end Route110_EventScript_1EF673:: @ 81EF673 - special sub_8137E6C + special FinishCyclingRoadChallenge msgbox Route110_Text_1F03FF, 4 switch VAR_RESULT case 10, Route110_EventScript_1EF6FD diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc index 8772f96b8..053183b28 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc @@ -10,7 +10,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78 Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84 lockall - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 0 goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F setflag FLAG_SYS_CYCLING_ROAD diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc index ca7f558a8..602373825 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc @@ -22,7 +22,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4 Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0 lockall - specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation + specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 2 call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6 compare VAR_RESULT, 0 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index cafa9c827..a0aa5856c 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -13,7 +13,7 @@ Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 - special sub_8138FD4 + special SetTrickHouseEndRoomFlag end Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE @@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 call_if 1, Route110_TrickHouseEnd_EventScript_26B002 msgbox Route110_TrickHouseEnd_Text_26B69A, 4 call Route110_TrickHouseEnd_EventScript_26AFCF - special sub_8138FEC + special ResetTrickHouseEndRoomFlag release end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 580848838..4bf7eb10a 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 .byte 0 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 - setflag FLAG_0x8A2 + setflag FLAG_LANDMARK_TRICK_HOUSE compare VAR_0x40B5, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269AF3 compare VAR_0x40C1, 1 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 3d9914b83..8e1672dfe 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -170,7 +170,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 compare VAR_RESULT, 0 goto_eq Route111_EventScript_272054 setflag FLAG_0x92C - special sub_8138B10 + special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, 4 release end @@ -278,7 +278,7 @@ Route111_EventScript_1F0FBD:: @ 81F0FBD Route111_EventScript_1F0FC5:: @ 81F0FC5 lock faceplayer - setflag FLAG_0x8A3 + setflag FLAG_LANDMARK_WINSTRATE_FAMILY msgbox Route111_Text_1F1475, 5 compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F0FE7 diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index fbf150dff..015a584f4 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -3,7 +3,7 @@ Route111_OldLadysRestStop_MapScripts:: @ 822A916 .byte 0 Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C - setflag FLAG_0x8A1 + setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP end Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 4835dffa6..72c003d99 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -48,7 +48,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 setvar VAR_0x8004, 0 setvar VAR_0x40A3, 1 incrementgamestat 48 - special sub_8138B8C + special CableCarWarp special sub_814FC9C waitstate release diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 985a43805..5ea100567 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -3,7 +3,7 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 .byte 0 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 - setflag FLAG_0x8A4 + setflag FLAG_LANDMARK_GLASS_WORKSHOP compare VAR_0x40BE, 1 call_if 1, Route113_GlassWorkshop_EventScript_26ED18 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 44d4b9d9b..f14c15f9e 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -3,7 +3,7 @@ Route114_FossilManiacsHouse_MapScripts:: @ 822AD30 .byte 0 Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 - setflag FLAG_0x8B7 + setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE end Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index 961535930..00bb4f226 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -3,7 +3,7 @@ Route114_LanettesHouse_MapScripts:: @ 822B2C8 .byte 0 Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE - setflag FLAG_0x8A5 + setflag FLAG_LANDMARK_LANETTES_HOUSE end Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index d9d74911a..f9dbbd3f2 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -3,7 +3,7 @@ Route116_TunnelersRestHouse_MapScripts:: @ 822B850 .byte 0 Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 - setflag FLAG_0x8BA + setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE end Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/scripts/maps/Route117_PokemonDayCare.inc index 9f191616d..b2e9ddfaa 100644 --- a/data/scripts/maps/Route117_PokemonDayCare.inc +++ b/data/scripts/maps/Route117_PokemonDayCare.inc @@ -3,6 +3,6 @@ Route117_PokemonDayCare_MapScripts:: @ 822BBB1 .byte 0 Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7 - setflag FLAG_0x8A6 + setflag FLAG_LANDMARK_POKEMON_DAYCARE end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 53c2c14ff..72707186b 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -20,7 +20,7 @@ Route119_MapScript1_1F444D: @ 81F444D call Route119_EventScript_271EFB compare VAR_0x40B3, 1 call_if 1, Route119_EventScript_1F4466 - special sub_8139648 + special SetRoute119Weather end Route119_EventScript_1F4466:: @ 81F4466 diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index eb7032672..399692db3 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -15,7 +15,7 @@ Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 lock faceplayer - special sub_8138B10 + special GetPlayerBigGuyGirlString compare VAR_0x40B3, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index c1cc0c230..f89ac7e86 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -110,7 +110,7 @@ Route120_EventScript_1F5527:: @ 81F5527 call_if 1, Route120_EventScript_1F562F compare VAR_RESULT, 0 call_if 1, Route120_EventScript_1F5638 - specialvar VAR_RESULT, sub_8138AF0 + specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit switch VAR_RESULT case 0, Route120_EventScript_1F55CA case 5, Route120_EventScript_1F55CA diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 4b60f1428..1369b5721 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -91,7 +91,7 @@ Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF getpartysize compare VAR_RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9 - specialvar VAR_RESULT, sub_8139530 + specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index feec8adeb..f6d535e38 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -3,7 +3,7 @@ Route123_MapScripts:: @ 81F6147 .byte 0 Route123_MapScript1_1F614D: @ 81F614D - special sub_8139668 + special SetRoute123Weather end Route123_EventScript_1F6151:: @ 81F6151 @@ -12,7 +12,7 @@ Route123_EventScript_1F6151:: @ 81F6151 checkflag FLAG_0x0E8 goto_eq Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, 4 - special sub_81390E0 + special IsGrassTypeInParty compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E msgbox Route123_Text_1F645D, 4 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 245b828a9..9e865ad6a 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -3,7 +3,7 @@ Route123_BerryMastersHouse_MapScripts:: @ 826F83B .byte 0 Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841 - setflag FLAG_0x8C3 + setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE end Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 3480ad465..dd5218e1d 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -3,7 +3,7 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28 .byte 0 Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E - setflag FLAG_0x8BB + setflag FLAG_LANDMARK_HUNTERS_HOUSE end Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 0b9d85e30..26278cf50 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -5,7 +5,7 @@ Route130_MapScripts:: @ 81F735F Route130_MapScript1_1F7365: @ 81F7365 compare VAR_0x405E, 4 call_if 4, Route130_EventScript_1F73B5 - specialvar VAR_RESULT, sub_813793C + specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq Route130_EventScript_1F73B1 setflag FLAG_0x011 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index a3bf1ac36..ad10e2669 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -11,7 +11,7 @@ SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 .2byte 0 SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF - special sub_8137F90 + special SetSSTidalFlag setvar VAR_PORTHOLE, 2 lockall playse SE_PINPON @@ -28,14 +28,14 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015 end SSTidalRooms_EventScript_23C028:: @ 823C028 - special sub_8137F90 + special SetSSTidalFlag setvar VAR_PORTHOLE, 7 playse SE_PINPON msgbox SSTidalRooms_Text_23C462, 4 return SSTidalRooms_EventScript_23C03C:: @ 823C03C - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 4 playse SE_PINPON msgbox SSTidalRooms_Text_23C553, 4 @@ -49,7 +49,7 @@ SSTidalCorridor_EventScript_23C050:: @ 823C050 end SSTidalCorridor_EventScript_23C067:: @ 823C067 - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 3 lockall playse SE_PINPON @@ -58,7 +58,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067 end SSTidalCorridor_EventScript_23C07D:: @ 823C07D - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 8 lockall playse SE_PINPON @@ -67,7 +67,7 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D end SSTidalRooms_EventScript_23C093:: @ 823C093 - special sub_8137FB0 + special ResetSSTidalFlag setvar VAR_PORTHOLE, 8 playse SE_PINPON msgbox SSTidalRooms_Text_23C50F, 4 diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/scripts/maps/ScorchedSlab.inc index c435eb000..f83724ec5 100644 --- a/data/scripts/maps/ScorchedSlab.inc +++ b/data/scripts/maps/ScorchedSlab.inc @@ -3,6 +3,6 @@ ScorchedSlab_MapScripts:: @ 8239291 .byte 0 ScorchedSlab_MapScript1_239297: @ 8239297 - setflag FLAG_0x8B8 + setflag FLAG_LANDMARK_SCORCHED_SLAB end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 087459bbb..a2247286c 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -33,7 +33,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 special sub_80B05B4 waitstate msgbox SeafloorCavern_Room9_Text_235279, 4 - special sub_81379F8 + special WaitWeather waitstate setvar VAR_RESULT, 1 playse SE_W197 diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index a0e16c442..b7b55f256 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -10,7 +10,7 @@ SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 end SealedChamber_OuterRoom_MapScript1_239127: @ 8239127 - setflag FLAG_0x8BC + setflag FLAG_LANDMARK_SEALED_CHAMBER end SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index dcf29081a..f57a27c1d 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 - special sub_8137988 + special UpdateShoalTideFlag checkflag FLAG_SYS_SHOAL_TIDE goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236DD1 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/scripts/maps/SkyPillar_Entrance.inc index b565dff92..09ee9eae2 100644 --- a/data/scripts/maps/SkyPillar_Entrance.inc +++ b/data/scripts/maps/SkyPillar_Entrance.inc @@ -3,6 +3,6 @@ SkyPillar_Entrance_MapScripts:: @ 823929E .byte 0 SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4 - setflag FLAG_0x8BE + setflag FLAG_LANDMARK_SKY_PILLAR end diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc index aa0b51414..cced073aa 100644 --- a/data/scripts/maps/SkyPillar_Outside.inc +++ b/data/scripts/maps/SkyPillar_Outside.inc @@ -76,7 +76,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 setflag FLAG_SYS_WEATHER_CTRL setweather 15 doweather - special sub_81379F8 + special WaitWeather waitstate delay 30 msgbox SkyPillar_Outside_Text_23953A, 4 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 566c37a51..fe7cfc0fd 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -142,10 +142,10 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 faceplayer bufferleadmonspeciesname 0 msgbox SlateportCity_Text_1DD68A, 4 - specialvar VAR_RESULT, sub_8139348 + specialvar VAR_RESULT, LeadMonHasEffortRibbon compare VAR_RESULT, 1 call_if 1, SlateportCity_EventScript_1DCE38 - specialvar VAR_RESULT, sub_81393C8 + specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E msgbox SlateportCity_Text_1DD697, 4 @@ -153,7 +153,7 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 message SlateportCity_Text_1DD6E3 waitfanfare msgbox SlateportCity_Text_1DD702, 4 - special sub_8139370 + special GiveLeadMonEffortRibbon release end diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index f8ae54145..8ecc859f7 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -27,7 +27,7 @@ SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 end SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 - specialvar VAR_RESULT, sub_81396E0 + specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 goto_eq SlateportCity_House1_EventScript_209B46 special TV_CopyNicknameToStringVar1AndEnsureTerminated diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 19094db0d..192870003 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -144,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 end SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF - specialvar VAR_RESULT, sub_8139004 + specialvar VAR_RESULT, CheckLeadMonCool compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0 return @@ -154,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 return SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 - specialvar VAR_RESULT, sub_8139030 + specialvar VAR_RESULT, CheckLeadMonBeauty compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107 return @@ -164,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 return SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D - specialvar VAR_RESULT, sub_813905C + specialvar VAR_RESULT, CheckLeadMonCute compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E return @@ -174,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E return SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 - specialvar VAR_RESULT, sub_8139088 + specialvar VAR_RESULT, CheckLeadMonSmart compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135 return @@ -184,7 +184,7 @@ SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 return SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B - specialvar VAR_RESULT, sub_81390B4 + specialvar VAR_RESULT, CheckLeadMonTough compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C return @@ -217,7 +217,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E checkflag FLAG_0x116 goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index a274d1f78..793b6f4fd 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -202,7 +202,7 @@ SootopolisCity_MapScript2_1E5914: @ 81E5914 SootopolisCity_EventScript_1E5926:: @ 81E5926 lockall - special sub_8138AD0 + special StorePlayerCoordsInVars compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5A82 compare VAR_0x8005, 32 @@ -492,7 +492,7 @@ SootopolisCity_Movement_1E5BF7: @ 81E5BF7 SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE lockall - special sub_8138AD0 + special StorePlayerCoordsInVars compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5CCE compare VAR_0x8005, 32 @@ -541,7 +541,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 removeobject 11 - special sub_81379F8 + special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 3 @@ -594,7 +594,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 removeobject 11 - special sub_81379F8 + special WaitWeather waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 2 @@ -747,7 +747,7 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10 SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B dodailyevents - special sub_8138B10 + special GetPlayerBigGuyGirlString checkflag FLAG_0x932 goto_eq SootopolisCity_EventScript_1E5FBB msgbox SootopolisCity_Text_2A7BB0, 4 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index f5b867405..78c7303ae 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -46,14 +46,14 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD setvar VAR_0x40C0, 1 - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 setvar VAR_0x40C0, 2 - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index ba1c6caec..8784a6424 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 82429C8 .byte 0 SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE - setflag FLAG_UNLOCK_SOUTHERN_ISLAND + setflag FLAG_LANDMARK_SOUTHERN_ISLAND end SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc index 38ae5b85f..77b67fb14 100644 --- a/data/scripts/maps/TrainerHill_Entrance.inc +++ b/data/scripts/maps/TrainerHill_Entrance.inc @@ -7,7 +7,7 @@ TrainerHill_Entrance_MapScripts:: @ 82680AC .byte 0 TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6 - setflag FLAG_0x8E2 + setflag FLAG_LANDMARK_TRAINER_HILL getplayerxy VAR_0x400D, VAR_RESULT end diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 2e439d4d2..d3f0aa5e5 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B .byte 0 Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B - setflag FLAG_0x8A7 + setflag FLAG_LANDMARK_SEAFLOOR_CAVERN checkflag FLAG_0x081 goto_eq Underwater_SeafloorCavern_EventScript_234358 end diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index ee62be96e..28030d869 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 lock faceplayer msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, 4 - specialvar VAR_RESULT, sub_8138C04 + specialvar VAR_RESULT, GetLeadMonFriendshipScore switch VAR_RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094 case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_20309E diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 1597a66eb..327c0cbc6 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -816,7 +816,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 special sub_81203FC - special sub_8138AC0 + special ShowFieldMessageStringVar4 waitmessage yesnobox 20, 8 compare VAR_RESULT, 1 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 03ee0d510..0f705c841 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -680,7 +680,7 @@ LilycoveCity_ContestLobby_EventScript_29419D:: @ 829419D LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA fadescreen 1 - specialvar VAR_RESULT, sub_8138240 + specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 special SpawnLinkPartnerFieldObject diff --git a/data/specials.inc b/data/specials.inc index abc0a6e6c..f0c1fa114 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -1,11 +1,11 @@ .macro def_special ptr .set SPECIAL_\ptr, __special__ .set __special__, __special__ + 1 - .4byte \ptr - .endm + .4byte \ptr + .endm .set __special__, 0 - .align 2 + .align 2 gSpecials:: @ 81DBA64 def_special HealPlayerParty def_special sub_809D2BC @@ -45,7 +45,7 @@ gSpecials:: @ 81DBA64 def_special nullsub_37 def_special sub_80B3254 def_special sub_80B2FD8 - def_special sub_8138240 + def_special GetLinkPartnerNames def_special SpawnLinkPartnerFieldObject def_special copy_player_party_to_sav1 def_special copy_player_party_from_sav1 @@ -149,19 +149,19 @@ gSpecials:: @ 81DBA64 def_special sub_80F8864 def_special sub_80F8940 def_special ShowContestWinner - def_special sub_8138540 - def_special sub_81384F0 - def_special sub_8138AC0 + def_special MauvilleGymSpecial2 + def_special MauvilleGymSpecial1 + def_special ShowFieldMessageStringVar4 def_special DrawWholeMapView - def_special sub_8138AD0 - def_special sub_8138750 - def_special sub_81388E4 - def_special sub_8138AA4 - def_special sub_8138AF0 - def_special sub_8138B10 - def_special sub_8138B48 - def_special sub_8138BC8 - def_special sub_8138B8C + def_special StorePlayerCoordsInVars + def_special MauvilleGymSpecial3 + def_special PetalburgGymSpecial1 + def_special PetalburgGymSpecial2 + def_special GetPlayerTrainerIdOnesDigit + def_special GetPlayerBigGuyGirlString + def_special GetRivalSonDaughterString + def_special SetFlagInVar + def_special CableCarWarp def_special sub_814FC9C def_special Overworld_PlaySpecialMapMusic def_special StartWallClock @@ -213,34 +213,34 @@ gSpecials:: @ 81DBA64 def_special sp0C8_whiteout_maybe def_special sub_80FBE90 def_special sub_80FBED0 - def_special sub_8137F90 - def_special sub_8137FB0 + def_special SetSSTidalFlag + def_special ResetSSTidalFlag def_special EnterSafariMode def_special ExitSafariMode def_special GetPokeblockFeederInFront def_special OpenPokeblockCaseOnFeeder - def_special sub_813793C - def_special sub_8137988 - def_special sub_8137A0C - def_special sub_8137A4C - def_special sub_8137C10 - def_special sp0D9_ComputerRelated - def_special sub_8138E20 + def_special IsMirageIslandPresent + def_special UpdateShoalTideFlag + def_special InitBirchState + def_special ScriptGetPokedexInfo + def_special ShowPokedexRatingMessage + def_special DoPCTurnOnEffect + def_special DoPCTurnOffEffect def_special sub_8139994 - def_special sub_8138EC0 - def_special sub_8138FAC + def_special DoLotteryCornerComputerEffect + def_special EndLotteryCornerComputerEffect def_special sub_81B951C def_special sub_81B968C def_special sub_81B9770 def_special sub_81B9718 def_special sub_81B96D0 def_special sub_8160638 - def_special sub_8137EFC - def_special sub_8137D0C - def_special sp0E3_walkrun_bitfield_interpretation - def_special sub_8137E6C - def_special sub_8137F44 - def_special sub_8138C04 + def_special GetRecordedCyclingRoadResults + def_special Special_BeginCyclingRoadChallenge + def_special GetPlayerAvatarBike + def_special FinishCyclingRoadChallenge + def_special UpdateCyclingRoadState + def_special GetLeadMonFriendshipScore def_special sub_81A1780 def_special sub_8161F74 def_special sub_818E9AC @@ -261,39 +261,39 @@ gSpecials:: @ 81DBA64 def_special sub_80F94E8 def_special sub_816AE58 def_special sub_816AE98 - def_special sub_8138C94 + def_special FieldShowRegionMap def_special sub_807E73C def_special sub_807EA10 def_special sub_807F0E4 def_special sub_807E9D4 - def_special sub_8138BDC + def_special GetWeekCount def_special RetrieveLotteryNumber def_special PickLotteryCornerTicket def_special ShowBerryBlenderRecordWindow - def_special sub_8138FEC - def_special sub_8138FD4 + def_special ResetTrickHouseEndRoomFlag + def_special SetTrickHouseEndRoomFlag def_special sp109_CreatePCMenu - def_special sub_8137C28 - def_special sub_8137CB4 - def_special sub_8139004 - def_special sub_8139030 - def_special sub_813905C - def_special sub_8139088 - def_special sub_81390B4 + def_special AccessHallOfFamePC + def_special Special_ShowDiploma + def_special CheckLeadMonCool + def_special CheckLeadMonBeauty + def_special CheckLeadMonCute + def_special CheckLeadMonSmart + def_special CheckLeadMonTough def_special sub_80FB7A4 def_special DoSoftReset - def_special sub_8137734 + def_special GameClear def_special sub_8139A78 def_special nullsub_55 def_special SpawnScriptFieldObject def_special RemoveScriptFieldObject - def_special sub_81391D0 - def_special sub_8139200 + def_special GetPokeblockNameByMonNature + def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord def_special ShouldDoBrailleStrengthEffectOld def_special sub_80B0534 def_special sub_80B058C - def_special sub_81379F8 + def_special WaitWeather def_special sub_8139238 def_special sub_8139248 def_special player_get_direction_lower_nybble @@ -301,23 +301,23 @@ gSpecials:: @ 81DBA64 def_special sub_81392D4 def_special sub_81392F8 def_special sub_8139320 - def_special sub_8139348 - def_special sub_8139370 - def_special sub_81393C8 + def_special LeadMonHasEffortRibbon + def_special GiveLeadMonEffortRibbon + def_special Special_AreLeadMonEVsMaxedOut def_special sub_8098574 def_special sub_809859C def_special InitRoamer def_special sub_81393FC - def_special sub_81390E0 + def_special IsGrassTypeInParty def_special sub_80AFC60 - def_special sub_813946C - def_special sub_81394D8 + def_special PutZigzagoonInPlayerParty + def_special IsStarterInParty def_special sub_80E980C - def_special sub_8139530 + def_special ScriptCheckFreePokemonStorageSpace def_special DoSealedChamberShakingEffect1 def_special sub_8139B60 def_special sub_80FAC78 - def_special sub_8139540 + def_special IsPokerusInParty def_special sub_809E1C8 def_special sub_8139560 def_special StartGroudonKyogreBattle @@ -333,10 +333,10 @@ gSpecials:: @ 81DBA64 def_special sub_80F8EB8 def_special sub_8162794 def_special BattleSetup_StartLatiBattle - def_special sub_8139648 - def_special sub_8139668 + def_special SetRoute119Weather + def_special SetRoute123Weather def_special sub_80F8FA0 - def_special sub_81396E0 + def_special ScriptGetPartyMonSpecies def_special sub_81B98DC def_special nullsub_54 def_special sub_80E9B70 diff --git a/data/start_menu.s b/data/start_menu.s deleted file mode 100644 index 07e428d0d..000000000 --- a/data/start_menu.s +++ /dev/null @@ -1,29 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gSafariBallsWindowTemplate:: @ 8510508 - .incbin "baserom.gba", 0x510508, 0x8 - -gUnknown_08510510:: @ 8510510 - .incbin "baserom.gba", 0x510510, 0x20 - -gPyramidFloorWindowTemplate_2:: @ 8510530 - .incbin "baserom.gba", 0x510530, 0x8 - -gPyramidFloorWindowTemplate_1:: @ 8510538 - .incbin "baserom.gba", 0x510538, 0x8 - -sStartMenuItems:: @ 8510540 - .incbin "baserom.gba", 0x510540, 0x68 - -gUnknown_085105A8:: @ 85105A8 - .incbin "baserom.gba", 0x5105a8, 0x4 - -gUnknown_085105AC:: @ 85105AC - .incbin "baserom.gba", 0x5105ac, 0x10 - -gUnknown_085105BC:: @ 85105BC - .incbin "baserom.gba", 0x5105bc, 0x8 diff --git a/data/starter_choose.s b/data/starter_choose.s index a951a8987..160046d4c 100644 --- a/data/starter_choose.s +++ b/data/starter_choose.s @@ -1,7 +1,6 @@ -@ the fourth big chunk of data - .include "asm/macros.inc" .include "constants/constants.inc" + .include "include/constants/species.h" .section .rodata @@ -15,7 +14,10 @@ gBirchGrassTilemap:: @ 85B0C0C .incbin "baserom.gba", 0x5b0c0c, 0x1f8 gBirchHelpGfx:: @ 85B0E04 - .incbin "baserom.gba", 0x5b0e04, 0xfc8 + .incbin "baserom.gba", 0x5b0e04, 0xaa8 + +gUnknown_085B18AC:: @ 85B18AC + .incbin "baserom.gba", 0x5b18AC, 0x520 gUnknown_085B1DCC:: @ 85B1DCC .incbin "baserom.gba", 0x5b1dcc, 0x10 @@ -33,8 +35,11 @@ gStarterChoose_LabelCoords:: @ 85B1DF2 .incbin "baserom.gba", 0x5b1df2, 0x6 sStarterMon:: @ 85B1DF8 - .incbin "baserom.gba", 0x5b1df8, 0x8 + .2byte SPECIES_TREECKO + .2byte SPECIES_TORCHIC + .2byte SPECIES_MUDKIP +.align 2 gUnknown_085B1E00:: @ 85B1E00 .incbin "baserom.gba", 0x5b1e00, 0xc diff --git a/data/strings.s b/data/strings.s index e217a81e0..9e45b2e04 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 @@ -2705,34 +2705,34 @@ gUnknown_085EBB4F:: @ 85EBB4F gUnknown_085EBB56:: @ 85EBB56 .string "What would you like to do?$" -gUnknown_085EBB71:: @ 85EBB71 +gText_WithdrawPokemon:: @ 85EBB71 .string "WITHDRAW POKéMON$" -gUnknown_085EBB82:: @ 85EBB82 +gText_DepositPokemon:: @ 85EBB82 .string "DEPOSIT POKéMON$" -gUnknown_085EBB92:: @ 85EBB92 +gText_MovePokemon:: @ 85EBB92 .string "MOVE POKéMON$" -gUnknown_085EBB9F:: @ 85EBB9F +gText_MoveItems:: @ 85EBB9F .string "MOVE ITEMS$" -gUnknown_085EBBAA:: @ 85EBBAA +gText_SeeYa:: @ 85EBBAA .string "SEE YA!$" -gUnknown_085EBBB2:: @ 85EBBB2 +gText_WithdrawMonDescription:: @ 85EBBB2 .string "Move POKéMON stored in BOXES to\nyour party.$" -gUnknown_085EBBDE:: @ 85EBBDE +gText_DepositMonDescription:: @ 85EBBDE .string "Store POKéMON in your party in BOXES.$" -gUnknown_085EBC04:: @ 85EBC04 +gText_MoveMonDescription:: @ 85EBC04 .string "Organize the POKéMON in BOXES and\nin your party.$" -gUnknown_085EBC35:: @ 85EBC35 +gText_MoveItemsDescription:: @ 85EBC35 .string "Move items held by any POKéMON\nin a BOX or your party.$" -gUnknown_085EBC6C:: @ 85EBC6C +gText_SeeYaDescription:: @ 85EBC6C .string "Return to the previous menu.$" gText_JustOnePkmn:: @ 85EBC89 @@ -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 @@ -3521,10 +3521,10 @@ gText_Var1sTrainerCard:: @ 85ECFA6 gText_HallOfFameDebut:: @ 85ECFB8 .string "HALL OF FAME DEBUT $" -gUnknown_085ECFCD:: @ 85ECFCD +gText_LinkBattles:: @ 85ECFCD .string "LINK BATTLES$" -gUnknown_085ECFDA:: @ 85ECFDA +gText_LinkCableBattles:: @ 85ECFDA .string "LINK CABLE BATTLES$" gText_WinsLosses:: @ 85ECFED @@ -4488,34 +4488,34 @@ gUnknown_085EE6AD:: @ 85EE6AD gUnknown_085EE6B6:: @ 85EE6B6 .string "Updated time$" -gUnknown_085EE6C3:: @ 85EE6C3 +gText_MenuPokedex:: @ 85EE6C3 .string "POKéDEX$" -gUnknown_085EE6CB:: @ 85EE6CB +gText_MenuPokemon:: @ 85EE6CB .string "POKéMON$" -gUnknown_085EE6D3:: @ 85EE6D3 +gText_MenuBag:: @ 85EE6D3 .string "BAG$" -gUnknown_085EE6D7:: @ 85EE6D7 +gText_MenuPokenav:: @ 85EE6D7 .string "POKéNAV$" -gUnknown_085EE6DF:: @ 85EE6DF +gText_MenuPlayer:: @ 85EE6DF .string "{PLAYER}$" -gUnknown_085EE6E2:: @ 85EE6E2 +gText_MenuSave:: @ 85EE6E2 .string "SAVE$" -gUnknown_085EE6E7:: @ 85EE6E7 +gText_MenuOption:: @ 85EE6E7 .string "OPTION$" -gUnknown_085EE6EE:: @ 85EE6EE +gText_MenuExit:: @ 85EE6EE .string "EXIT$" -gUnknown_085EE6F3:: @ 85EE6F3 +gText_MenuRetire:: @ 85EE6F3 .string "RETIRE$" -gUnknown_085EE6FA:: @ 85EE6FA +gText_MenuRest:: @ 85EE6FA .string "REST$" gText_SafariBallStock:: @ 85EE6FF @@ -4524,28 +4524,28 @@ gText_SafariBallStock:: @ 85EE6FF gText_BattlePyramidFloor:: @ 85EE716 .string "Battle Pyramid\n{STR_VAR_1}$" -gUnknown_085EE728:: @ 85EE728 +gText_Floor1:: @ 85EE728 .string "Floor 1$" -gUnknown_085EE730:: @ 85EE730 +gText_Floor2:: @ 85EE730 .string "Floor 2$" -gUnknown_085EE738:: @ 85EE738 +gText_Floor3:: @ 85EE738 .string "Floor 3$" -gUnknown_085EE740:: @ 85EE740 +gText_Floor4:: @ 85EE740 .string "Floor 4$" -gUnknown_085EE748:: @ 85EE748 +gText_Floor5:: @ 85EE748 .string "Floor 5$" -gUnknown_085EE750:: @ 85EE750 +gText_Floor6:: @ 85EE750 .string "Floor 6$" -gUnknown_085EE758:: @ 85EE758 +gText_Floor7:: @ 85EE758 .string "Floor 7$" -gUnknown_085EE760:: @ 85EE760 +gText_Peak:: @ 85EE760 .string "Peak$" gText_LinkStandby2:: @ 85EE765 @@ -5217,22 +5217,22 @@ gText_Appeal2:: @ 85EFA67 gText_Jam2:: @ 85EFA6E .string "JAM$" -gUnknown_085EFA72:: @ 85EFA72 +gText_Kira:: @ 85EFA72 .string "KIRA$" -gUnknown_085EFA77:: @ 85EFA77 +gText_Amy:: @ 85EFA77 .string "AMY$" -gUnknown_085EFA7B:: @ 85EFA7B +gText_John:: @ 85EFA7B .string "JOHN$" -gUnknown_085EFA80:: @ 85EFA80 +gText_Roy:: @ 85EFA80 .string "ROY$" -gUnknown_085EFA84:: @ 85EFA84 +gText_Gabby:: @ 85EFA84 .string "GABBY$" -gUnknown_085EFA8A:: @ 85EFA8A +gText_Anna:: @ 85EFA8A .string "ANNA$" gText_ClearAllSaveData:: @ 85EFA8F @@ -5393,4 +5393,3 @@ gText_Berry:: @ 85EFCDF gText_Berries:: @ 85EFCE5 .string "BERRIES$" - diff --git a/data/text_window.s b/data/text_window.s index a7389572b..716425100 100644 --- a/data/text_window.s +++ b/data/text_window.s @@ -1,17 +1,170 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata + .align 2, 0 gUnknown_0850E87C:: @ 850E87C - .incbin "baserom.gba", 0x50e87c, 0x1680 + .incbin "baserom.gba", 0x50e87c, 0x120 + +gUnknown_0850E99C:: @ 850E99C + .incbin "baserom.gba", 0x50e99c, 0x120 + +gUnknown_0850EABC:: @ 850EABC + .incbin "baserom.gba", 0x50eabc, 0x120 + +gUnknown_0850EBDC:: @ 850EBDC + .incbin "baserom.gba", 0x50ebdc, 0x120 + +gUnknown_0850ECFC:: @ 850ECFC + .incbin "baserom.gba", 0x50ecfc, 0x120 + +gUnknown_0850EE1C:: @ 850EE1C + .incbin "baserom.gba", 0x50ee1c, 0x120 + +gUnknown_0850EF3C:: @ 850EF3C + .incbin "baserom.gba", 0x50ef3c, 0x120 + +gUnknown_0850F05C:: @ 850F05C + .incbin "baserom.gba", 0x50f05c, 0x120 + +gUnknown_0850F17C:: @ 850F17C + .incbin "baserom.gba", 0x50f17c, 0x120 + +gUnknown_0850F29C:: @ 850F29C + .incbin "baserom.gba", 0x50f29c, 0x120 + +gUnknown_0850F3BC:: @ 850F3BC + .incbin "baserom.gba", 0x50f3bc, 0x120 + +gUnknown_0850F4DC:: @ 850F4DC + .incbin "baserom.gba", 0x50f4dc, 0x120 + +gUnknown_0850F5FC:: @ 850F5FC + .incbin "baserom.gba", 0x50f5fc, 0x120 + +gUnknown_0850F71C:: @ 850F71C + .incbin "baserom.gba", 0x50f71c, 0x120 + +gUnknown_0850F83C:: @ 850F83C + .incbin "baserom.gba", 0x50f83c, 0x120 + +gUnknown_0850F95C:: @ 850F95C + .incbin "baserom.gba", 0x50f95c, 0x120 + +gUnknown_0850FA7C:: @ 850FA7C + .incbin "baserom.gba", 0x50fa7c, 0x120 + +gUnknown_0850FB9C:: @ 850FB9C + .incbin "baserom.gba", 0x50fb9c, 0x120 + +gUnknown_0850FCBC:: @ 850FCBC + .incbin "baserom.gba", 0x50fcbc, 0x120 + +gUnknown_0850FDDC:: @ 850FDDC + .incbin "baserom.gba", 0x50fddc, 0x120 gUnknown_0850FEFC:: @ 850FEFC - .incbin "baserom.gba", 0x50fefc, 0x280 + .incbin "baserom.gba", 0x50fefc, 0x20 + +gUnknown_0850FF1C:: @ 850FF1C + .incbin "baserom.gba", 0x50ff1c, 0x20 + +gUnknown_0850FF3C:: @ 850FF3C + .incbin "baserom.gba", 0x50ff3c, 0x20 + +gUnknown_0850FF5C:: @ 850FF5C + .incbin "baserom.gba", 0x50ff5c, 0x20 + +gUnknown_0850FF7C:: @ 850FF7C + .incbin "baserom.gba", 0x50ff7c, 0x20 + +gUnknown_0850FF9C:: @ 850FF9C + .incbin "baserom.gba", 0x50ff9c, 0x20 + +gUnknown_0850FFBC:: @ 850FFBC + .incbin "baserom.gba", 0x50ffbc, 0x20 + +gUnknown_0850FFDC:: @ 850FFDC + .incbin "baserom.gba", 0x50ffdc, 0x20 + +gUnknown_0850FFFC:: @ 850FFFC + .incbin "baserom.gba", 0x50fffc, 0x20 + +gUnknown_0851001C:: @ 851001C + .incbin "baserom.gba", 0x51001c, 0x20 + +gUnknown_0851003C:: @ 851003C + .incbin "baserom.gba", 0x51003c, 0x20 + +gUnknown_0851005C:: @ 851005C + .incbin "baserom.gba", 0x51005c, 0x20 + +gUnknown_0851007C:: @ 851007C + .incbin "baserom.gba", 0x51007c, 0x20 + +gUnknown_0851009C:: @ 851009C + .incbin "baserom.gba", 0x51009c, 0x20 + +gUnknown_085100BC:: @ 85100BC + .incbin "baserom.gba", 0x5100bc, 0x20 + +gUnknown_085100DC:: @ 85100DC + .incbin "baserom.gba", 0x5100dc, 0x20 + +gUnknown_085100FC:: @ 85100FC + .incbin "baserom.gba", 0x5100fc, 0x20 + +gUnknown_0851011C:: @ 851011C + .incbin "baserom.gba", 0x51011c, 0x20 + +gUnknown_0851013C:: @ 851013C + .incbin "baserom.gba", 0x51013c, 0x20 + +gUnknown_0851015C:: @ 851015C + .incbin "baserom.gba", 0x51015c, 0x20 gUnknown_0851017C:: @ 851017C - .incbin "baserom.gba", 0x51017c, 0xa0 + .incbin "baserom.gba", 0x51017c, 0xA0 gUnknown_0851021C:: @ 851021C - .incbin "baserom.gba", 0x51021c, 0xa0 + .4byte gUnknown_0850E87C + .4byte gUnknown_0850FEFC + .4byte gUnknown_0850E99C + .4byte gUnknown_0850FF1C + .4byte gUnknown_0850EABC + .4byte gUnknown_0850FF3C + .4byte gUnknown_0850EBDC + .4byte gUnknown_0850FF5C + .4byte gUnknown_0850ECFC + .4byte gUnknown_0850FF7C + .4byte gUnknown_0850EE1C + .4byte gUnknown_0850FF9C + .4byte gUnknown_0850EF3C + .4byte gUnknown_0850FFBC + .4byte gUnknown_0850F05C + .4byte gUnknown_0850FFDC + .4byte gUnknown_0850F17C + .4byte gUnknown_0850FFFC + .4byte gUnknown_0850F29C + .4byte gUnknown_0851001C + .4byte gUnknown_0850F3BC + .4byte gUnknown_0851003C + .4byte gUnknown_0850F4DC + .4byte gUnknown_0851005C + .4byte gUnknown_0850F5FC + .4byte gUnknown_0851007C + .4byte gUnknown_0850F71C + .4byte gUnknown_0851009C + .4byte gUnknown_0850F83C + .4byte gUnknown_085100BC + .4byte gUnknown_0850F95C + .4byte gUnknown_085100DC + .4byte gUnknown_0850FA7C + .4byte gUnknown_085100FC + .4byte gUnknown_0850FB9C + .4byte gUnknown_0851011C + .4byte gUnknown_0850FCBC + .4byte gUnknown_0851013C + .4byte gUnknown_0850FDDC + .4byte gUnknown_0851015C diff --git a/data/time_events.s b/data/time_events.s new file mode 100644 index 000000000..7a543fff5 --- /dev/null +++ b/data/time_events.s @@ -0,0 +1,7 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +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 diff --git a/data/trade.s b/data/trade.s index b392fbc24..7308b92a3 100644 --- a/data/trade.s +++ b/data/trade.s @@ -1,9 +1,9 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 - .section .rodata - .align 2, 0 - gUnknown_0832C6A8:: @ 832C6A8 .incbin "baserom.gba", 0x32C6A8, 0x18 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/data/trainer_card.s b/data/trainer_card.s index 0d48cd0b6..8e49b040f 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.s @@ -1,11 +1,44 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata + .align 2, 0 + +.macro unk_trainer_card_struct text1, text2, short1, short2, short3, short4 + .4byte \text1 + .4byte \text2 + .2byte \short1 + .2byte \short2 + .2byte \short3 + .2byte \short4 +.endm gUnknown_0856F018:: @ 856F018 - .incbin "baserom.gba", 0x56f018, 0x494 + .incbin "baserom.gba", 0x56f018, 0x194 + +gUnknown_0856F1AC:: @ 856F1AC + .incbin "baserom.gba", 0x56f1ac, 0x60 + +gUnknown_0856F20C:: @ 856F20C + .incbin "baserom.gba", 0x56f20c, 0x60 + +gUnknown_0856F26C:: @ 856F26C + .incbin "baserom.gba", 0x56f26c, 0x60 + +gUnknown_0856F2CC:: @ 856F2CC + .incbin "baserom.gba", 0x56f2cc, 0x60 + +gUnknown_0856F32C:: @ 856F32C + .incbin "baserom.gba", 0x56f32c, 0x60 + +gUnknown_0856F38C:: @ 856F38C + .incbin "baserom.gba", 0x56f38c, 0x60 + +gUnknown_0856F3EC:: @ 856F3EC + .incbin "baserom.gba", 0x56f3ec, 0x60 + +gUnknown_0856F44C:: @ 856F44C + .incbin "baserom.gba", 0x56f44c, 0x60 gUnknown_0856F4AC:: @ 856F4AC .incbin "baserom.gba", 0x56f4ac, 0x20 @@ -47,16 +80,27 @@ gUnknown_0856FAC4:: @ 856FAC4 .incbin "baserom.gba", 0x56fac4, 0x20 gUnknown_0856FAE4:: @ 856FAE4 - .incbin "baserom.gba", 0x56fae4, 0x14 + .4byte gUnknown_08DD1A58 + .4byte gUnknown_0856F1AC + .4byte gUnknown_0856F26C + .4byte gUnknown_0856F32C + .4byte gUnknown_0856F3EC gUnknown_0856FAF8:: @ 856FAF8 - .incbin "baserom.gba", 0x56faf8, 0x14 + .4byte gUnknown_08DD240C + .4byte gUnknown_0856F20C + .4byte gUnknown_0856F2CC + .4byte gUnknown_0856F38C + .4byte gUnknown_0856F44C gUnknown_0856FB0C:: @ 856FB0C .incbin "baserom.gba", 0x56fb0c, 0x3 gUnknown_0856FB0F:: @ 856FB0F - .incbin "baserom.gba", 0x56fb0f, 0x9 + .incbin "baserom.gba", 0x56fb0f, 0x3 + +gUnknown_0856FB12:: @ 856FB12 + .incbin "baserom.gba", 0x56fb12, 0x6 gUnknown_0856FB18:: @ 856FB18 .incbin "baserom.gba", 0x56fb18, 0x8 @@ -65,10 +109,16 @@ gUnknown_0856FB20:: @ 856FB20 .incbin "baserom.gba", 0x56fb20, 0x8 gUnknown_0856FB28:: @ 856FB28 - .incbin "baserom.gba", 0x56fb28, 0x18 + .4byte sub_80C4998 + .4byte sub_80C49D8 + .4byte sub_80C4B08 + .4byte sub_80C4C1C + .4byte sub_80C4C84 + .4byte sub_80C4DB0 gUnknown_0856FB40:: @ 856FB40 - .incbin "baserom.gba", 0x56fb40, 0x8 + .4byte gUnknown_0856FB0C + .4byte gUnknown_0856FB12 gUnknown_0856FB48:: @ 856FB48 .incbin "baserom.gba", 0x56fb48, 0x2 @@ -86,7 +136,9 @@ gUnknown_0856FB57:: @ 856FB57 .incbin "baserom.gba", 0x56fb57, 0x5 gUnknown_0856FB5C:: @ 856FB5C - .incbin "baserom.gba", 0x56fb5c, 0xc + .4byte gText_LinkBattles + .4byte gText_LinkCableBattles + .4byte gText_LinkBattles gUnknown_0856FB68:: @ 856FB68 .incbin "baserom.gba", 0x56fb68, 0x6 @@ -98,10 +150,25 @@ gUnknown_0856FB74:: @ 856FB74 .incbin "baserom.gba", 0x56fb74, 0x4 gUnknown_0856FB78:: @ 856FB78 - .incbin "baserom.gba", 0x56fb78, 0x44 + .incbin "baserom.gba", 0x56fb78, 0x4 + +gUnknown_0856FB7C:: @ 856FB7C + .incbin "baserom.gba", 0x56fb7c, 0x20 + +gUnknown_0856FB9C:: @ 856FB9C + .incbin "baserom.gba", 0x56fb9c, 0x20 gUnknown_0856FBBC:: @ 856FBBC - .incbin "baserom.gba", 0x56fbbc, 0x1244 + .incbin "baserom.gba", 0x56fbbc, 0xFEC + +gUnknown_08570BA8:: @ 8570BA8 + .incbin "baserom.gba", 0x570ba8, 0x9C + +gUnknown_08570C44:: @ 8570C44 + .incbin "baserom.gba", 0x570c44, 0xBC + +gUnknown_08570D00:: @ 8570D00 + .incbin "baserom.gba", 0x570d00, 0x100 gUnknown_08570E00:: @ 8570E00 .incbin "baserom.gba", 0x570e00, 0x260 @@ -143,25 +210,106 @@ gUnknown_08571454:: @ 8571454 .incbin "baserom.gba", 0x571454, 0x68 gUnknown_085714BC:: @ 85714BC - .incbin "baserom.gba", 0x5714bc, 0x18 + obj_tiles gUnknown_08570BA8, 0x100, 0 + obj_tiles gUnknown_08570D00, 0x400, 1 + obj_tiles gUnknown_08DC1394, 0x380, 2 gUnknown_085714D4:: @ 85714D4 - .incbin "baserom.gba", 0x5714d4, 0x10 + obj_tiles gUnknown_08570C44, 0x100, 4 + obj_tiles NULL, 0, 0 gUnknown_085714E4:: @ 85714E4 - .incbin "baserom.gba", 0x5714e4, 0xd0 + obj_pal gUnknown_08DC1674, 0 + obj_pal gUnknown_08DC1694, 1 + obj_pal gUnknown_08DC16B4, 2 + obj_pal gUnknown_08DC16D4, 3 + obj_pal gUnknown_0856FB7C, 4 + obj_pal gUnknown_0856FB9C, 5 + obj_pal NULL, 0 + obj_pal NULL, 0xFFFF + +gUnknown_08571524:: @ 8571524 + .incbin "baserom.gba", 0x571524, 0x8 + +gUnknown_0857152C:: @ 857152C + .incbin "baserom.gba", 0x57152c, 0x8 + +gUnknown_08571534:: @ 8571534 + .incbin "baserom.gba", 0x571534, 0x8 + +gUnknown_0857153C:: @ 857153C + .incbin "baserom.gba", 0x57153c, 0x8 + +gUnknown_08571544:: @ 8571544 + .incbin "baserom.gba", 0x571544, 0x8 + +gUnknown_0857154C:: @ 857154C + .incbin "baserom.gba", 0x57154c, 0x8 + +gUnknown_08571554:: @ 8571554 + .incbin "baserom.gba", 0x571554, 0x8 + +gUnknown_0857155C:: @ 857155C + .incbin "baserom.gba", 0x57155c, 0xC + +gUnknown_08571568:: @ 8571568 + .incbin "baserom.gba", 0x571568, 0xC + +gUnknown_08571574:: @ 8571574 + .4byte gUnknown_08571524 + .4byte gUnknown_0857152C + +gUnknown_0857157C:: @ 857157C + .4byte gUnknown_08571524 + .4byte gUnknown_0857152C + .4byte gUnknown_08571534 + .4byte gUnknown_0857153C + .4byte gUnknown_08571544 + .4byte gUnknown_0857154C + .4byte gUnknown_08571554 + +gUnknown_08571598:: @ 8571598 + .4byte gUnknown_0857155C + .4byte gUnknown_08571568 + +gUnknown_085715A0:: @ 85715A0 + .incbin "baserom.gba", 0x5715a0, 0x10 + +gUnknown_085715B0:: @ 85715B0 + .4byte gUnknown_085715A0 gUnknown_085715B4:: @ 85715B4 - .incbin "baserom.gba", 0x5715b4, 0x30 + spr_template 0, 0, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 1, 1, gUnknown_08524934, gUnknown_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085715E4:: @ 85715E4 - .incbin "baserom.gba", 0x5715e4, 0x18 + spr_template 2, 2, gUnknown_0852490C, gUnknown_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085715FC:: @ 85715FC - .incbin "baserom.gba", 0x5715fc, 0x18 + spr_template 4, 4, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39 gUnknown_08571614:: @ 8571614 - .incbin "baserom.gba", 0x571614, 0x3c + .4byte gUnknown_085EDA96 + .4byte gUnknown_085ED932 + .4byte gUnknown_085ED94D + .4byte gUnknown_085ED961 + .4byte gUnknown_085ED977 + .4byte gUnknown_085ED993 + .4byte gUnknown_085ED9AF + .4byte gUnknown_085ED9C7 + .4byte gUnknown_085ED9E5 + .4byte gUnknown_085EDA02 + .4byte gUnknown_085EDA21 + .4byte gUnknown_085EDA3C + .4byte gUnknown_085EDA5E + .4byte gUnknown_085EDA78 + .4byte gUnknown_085ED931 gUnknown_08571650:: @ 8571650 - .incbin "baserom.gba", 0x571650, 0x70 + unk_trainer_card_struct gUnknown_085EDAB1, gUnknown_085EDB0F, 0x59, 0x28, 1, 0 + unk_trainer_card_struct gUnknown_085EDABE, gUnknown_085EDB4E, 0x21, 0x2A, 1, 0 + unk_trainer_card_struct gUnknown_085EDACA, gUnknown_085EDB8B, 0x78, 0x56, 0, 0 + unk_trainer_card_struct gUnknown_085EDAD8, gUnknown_085EDBC2, 0x72, 0x3B, 0, 0 + unk_trainer_card_struct gUnknown_085EDAE5, gUnknown_085EDC00, 0x19, 0x43, 0, 0 + unk_trainer_card_struct gUnknown_085EDAF4, gUnknown_085EDC45, 0x39, 0x39, 1, 0 + unk_trainer_card_struct gUnknown_085EDB00, gUnknown_085EDC84, 0x86, 0x29, 1, 0 diff --git a/data/trainer_money.inc b/data/trainer_money.inc index 1e06668bd..00aaa6cfb 100644 --- a/data/trainer_money.inc +++ b/data/trainer_money.inc @@ -1,59 +1,59 @@ @ This is a factor in how much money you get for beating a trainer. .align 2 gTrainerMoneyTable:: @ 831AEB8 - .byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0 - .byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0 - .byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0 - .byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_TUBER_1, 1, 0, 0 - .byte TRAINER_CLASS_NAME_TUBER_2, 1, 0, 0 - .byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0 - .byte TRAINER_CLASS_NAME_COOLTRAINER_1, 12, 0, 0 - .byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0 - .byte TRAINER_CLASS_NAME_LADY, 50, 0, 0 - .byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0 - .byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0 - .byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0 - .byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0 - .byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0 - .byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0 - .byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0 - .byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0 - .byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0 - .byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0 - .byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0 - .byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0 - .byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0 - .byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0 - .byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0 - .byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0 - .byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0 - .byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0 - .byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0 - .byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0 - .byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0 - .byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0 - .byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0 - .byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0 - .byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0 - .byte TRAINER_CLASS_NAME_PKMN_TRAINER_3, 15, 0, 0 - .byte TRAINER_CLASS_NAME_PKMN_BREEDER, 10, 0, 0 - .byte TRAINER_CLASS_NAME_PKMN_RANGER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0 - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0 - .byte TRAINER_CLASS_NAME_LASS, 4, 0, 0 - .byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0 - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0 - .byte TRAINER_CLASS_LEADER_1, 10, 0, 0 - .byte -1, 5, 0, 0 + .byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0 + .byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0 + .byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0 + .byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0 + .byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0 + .byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0 + .byte TRAINER_CLASS_NAME_TUBER_1, 1, 0, 0 + .byte TRAINER_CLASS_NAME_TUBER_2, 1, 0, 0 + .byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0 + .byte TRAINER_CLASS_NAME_COOLTRAINER_1, 12, 0, 0 + .byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0 + .byte TRAINER_CLASS_NAME_LADY, 50, 0, 0 + .byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0 + .byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0 + .byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0 + .byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0 + .byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0 + .byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0 + .byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0 + .byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0 + .byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0 + .byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0 + .byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0 + .byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0 + .byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0 + .byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0 + .byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0 + .byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0 + .byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0 + .byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0 + .byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0 + .byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0 + .byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0 + .byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0 + .byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0 + .byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0 + .byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0 + .byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0 + .byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0 + .byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0 + .byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0 + .byte TRAINER_CLASS_NAME_PKMN_TRAINER_3, 15, 0, 0 + .byte TRAINER_CLASS_NAME_PKMN_BREEDER, 10, 0, 0 + .byte TRAINER_CLASS_NAME_PKMN_RANGER, 12, 0, 0 + .byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0 + .byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0 + .byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0 + .byte TRAINER_CLASS_NAME_LASS, 4, 0, 0 + .byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0 + .byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0 + .byte TRAINER_CLASS_LEADER_1, 10, 0, 0 + .byte -1, 5, 0, 0 diff --git a/data/type_effectiveness.inc b/data/type_effectiveness.inc index a24615592..0739199c2 100644 --- a/data/type_effectiveness.inc +++ b/data/type_effectiveness.inc @@ -1,119 +1,119 @@ @ format: attacking type, defending type, damage multiplier @ the multiplier is a (decimal) fixed-point number: -@ 20 is ×2.0 -@ 05 is ×0.5 -@ 00 is ×0 +@ 20 is ×2.0 +@ 05 is ×0.5 +@ 00 is ×0 gTypeEffectiveness:: @ 831ACE8 - .byte TYPE_NORMAL, TYPE_ROCK, 5 - .byte TYPE_NORMAL, TYPE_STEEL, 5 - .byte TYPE_FIRE, TYPE_FIRE, 5 - .byte TYPE_FIRE, TYPE_WATER, 5 - .byte TYPE_FIRE, TYPE_GRASS, 20 - .byte TYPE_FIRE, TYPE_ICE, 20 - .byte TYPE_FIRE, TYPE_BUG, 20 - .byte TYPE_FIRE, TYPE_ROCK, 5 - .byte TYPE_FIRE, TYPE_DRAGON, 5 - .byte TYPE_FIRE, TYPE_STEEL, 20 - .byte TYPE_WATER, TYPE_FIRE, 20 - .byte TYPE_WATER, TYPE_WATER, 5 - .byte TYPE_WATER, TYPE_GRASS, 5 - .byte TYPE_WATER, TYPE_GROUND, 20 - .byte TYPE_WATER, TYPE_ROCK, 20 - .byte TYPE_WATER, TYPE_DRAGON, 5 - .byte TYPE_ELECTRIC, TYPE_WATER, 20 + .byte TYPE_NORMAL, TYPE_ROCK, 5 + .byte TYPE_NORMAL, TYPE_STEEL, 5 + .byte TYPE_FIRE, TYPE_FIRE, 5 + .byte TYPE_FIRE, TYPE_WATER, 5 + .byte TYPE_FIRE, TYPE_GRASS, 20 + .byte TYPE_FIRE, TYPE_ICE, 20 + .byte TYPE_FIRE, TYPE_BUG, 20 + .byte TYPE_FIRE, TYPE_ROCK, 5 + .byte TYPE_FIRE, TYPE_DRAGON, 5 + .byte TYPE_FIRE, TYPE_STEEL, 20 + .byte TYPE_WATER, TYPE_FIRE, 20 + .byte TYPE_WATER, TYPE_WATER, 5 + .byte TYPE_WATER, TYPE_GRASS, 5 + .byte TYPE_WATER, TYPE_GROUND, 20 + .byte TYPE_WATER, TYPE_ROCK, 20 + .byte TYPE_WATER, TYPE_DRAGON, 5 + .byte TYPE_ELECTRIC, TYPE_WATER, 20 .byte TYPE_ELECTRIC, TYPE_ELECTRIC, 5 - .byte TYPE_ELECTRIC, TYPE_GRASS, 5 + .byte TYPE_ELECTRIC, TYPE_GRASS, 5 .byte TYPE_ELECTRIC, TYPE_GROUND, 0 .byte TYPE_ELECTRIC, TYPE_FLYING, 20 .byte TYPE_ELECTRIC, TYPE_DRAGON, 5 - .byte TYPE_GRASS, TYPE_FIRE, 5 - .byte TYPE_GRASS, TYPE_WATER, 20 - .byte TYPE_GRASS, TYPE_GRASS, 5 - .byte TYPE_GRASS, TYPE_POISON, 5 - .byte TYPE_GRASS, TYPE_GROUND, 20 - .byte TYPE_GRASS, TYPE_FLYING, 5 - .byte TYPE_GRASS, TYPE_BUG, 5 - .byte TYPE_GRASS, TYPE_ROCK, 20 - .byte TYPE_GRASS, TYPE_DRAGON, 5 - .byte TYPE_GRASS, TYPE_STEEL, 5 - .byte TYPE_ICE, TYPE_WATER, 5 - .byte TYPE_ICE, TYPE_GRASS, 20 - .byte TYPE_ICE, TYPE_ICE, 5 - .byte TYPE_ICE, TYPE_GROUND, 20 - .byte TYPE_ICE, TYPE_FLYING, 20 - .byte TYPE_ICE, TYPE_DRAGON, 20 - .byte TYPE_ICE, TYPE_STEEL, 5 - .byte TYPE_ICE, TYPE_FIRE, 5 + .byte TYPE_GRASS, TYPE_FIRE, 5 + .byte TYPE_GRASS, TYPE_WATER, 20 + .byte TYPE_GRASS, TYPE_GRASS, 5 + .byte TYPE_GRASS, TYPE_POISON, 5 + .byte TYPE_GRASS, TYPE_GROUND, 20 + .byte TYPE_GRASS, TYPE_FLYING, 5 + .byte TYPE_GRASS, TYPE_BUG, 5 + .byte TYPE_GRASS, TYPE_ROCK, 20 + .byte TYPE_GRASS, TYPE_DRAGON, 5 + .byte TYPE_GRASS, TYPE_STEEL, 5 + .byte TYPE_ICE, TYPE_WATER, 5 + .byte TYPE_ICE, TYPE_GRASS, 20 + .byte TYPE_ICE, TYPE_ICE, 5 + .byte TYPE_ICE, TYPE_GROUND, 20 + .byte TYPE_ICE, TYPE_FLYING, 20 + .byte TYPE_ICE, TYPE_DRAGON, 20 + .byte TYPE_ICE, TYPE_STEEL, 5 + .byte TYPE_ICE, TYPE_FIRE, 5 .byte TYPE_FIGHTING, TYPE_NORMAL, 20 - .byte TYPE_FIGHTING, TYPE_ICE, 20 + .byte TYPE_FIGHTING, TYPE_ICE, 20 .byte TYPE_FIGHTING, TYPE_POISON, 5 .byte TYPE_FIGHTING, TYPE_FLYING, 5 .byte TYPE_FIGHTING, TYPE_PSYCHIC, 5 - .byte TYPE_FIGHTING, TYPE_BUG, 5 - .byte TYPE_FIGHTING, TYPE_ROCK, 20 - .byte TYPE_FIGHTING, TYPE_DARK, 20 - .byte TYPE_FIGHTING, TYPE_STEEL, 20 - .byte TYPE_POISON, TYPE_GRASS, 20 + .byte TYPE_FIGHTING, TYPE_BUG, 5 + .byte TYPE_FIGHTING, TYPE_ROCK, 20 + .byte TYPE_FIGHTING, TYPE_DARK, 20 + .byte TYPE_FIGHTING, TYPE_STEEL, 20 + .byte TYPE_POISON, TYPE_GRASS, 20 .byte TYPE_POISON, TYPE_POISON, 5 .byte TYPE_POISON, TYPE_GROUND, 5 - .byte TYPE_POISON, TYPE_ROCK, 5 - .byte TYPE_POISON, TYPE_GHOST, 5 - .byte TYPE_POISON, TYPE_STEEL, 0 - .byte TYPE_GROUND, TYPE_FIRE, 20 + .byte TYPE_POISON, TYPE_ROCK, 5 + .byte TYPE_POISON, TYPE_GHOST, 5 + .byte TYPE_POISON, TYPE_STEEL, 0 + .byte TYPE_GROUND, TYPE_FIRE, 20 .byte TYPE_GROUND, TYPE_ELECTRIC, 20 - .byte TYPE_GROUND, TYPE_GRASS, 5 + .byte TYPE_GROUND, TYPE_GRASS, 5 .byte TYPE_GROUND, TYPE_POISON, 20 .byte TYPE_GROUND, TYPE_FLYING, 0 - .byte TYPE_GROUND, TYPE_BUG, 5 - .byte TYPE_GROUND, TYPE_ROCK, 20 - .byte TYPE_GROUND, TYPE_STEEL, 20 + .byte TYPE_GROUND, TYPE_BUG, 5 + .byte TYPE_GROUND, TYPE_ROCK, 20 + .byte TYPE_GROUND, TYPE_STEEL, 20 .byte TYPE_FLYING, TYPE_ELECTRIC, 5 - .byte TYPE_FLYING, TYPE_GRASS, 20 + .byte TYPE_FLYING, TYPE_GRASS, 20 .byte TYPE_FLYING, TYPE_FIGHTING, 20 - .byte TYPE_FLYING, TYPE_BUG, 20 - .byte TYPE_FLYING, TYPE_ROCK, 5 - .byte TYPE_FLYING, TYPE_STEEL, 5 + .byte TYPE_FLYING, TYPE_BUG, 20 + .byte TYPE_FLYING, TYPE_ROCK, 5 + .byte TYPE_FLYING, TYPE_STEEL, 5 .byte TYPE_PSYCHIC, TYPE_FIGHTING, 20 .byte TYPE_PSYCHIC, TYPE_POISON, 20 .byte TYPE_PSYCHIC, TYPE_PSYCHIC, 5 - .byte TYPE_PSYCHIC, TYPE_DARK, 0 - .byte TYPE_PSYCHIC, TYPE_STEEL, 5 - .byte TYPE_BUG, TYPE_FIRE, 5 - .byte TYPE_BUG, TYPE_GRASS, 20 - .byte TYPE_BUG, TYPE_FIGHTING, 5 - .byte TYPE_BUG, TYPE_POISON, 5 - .byte TYPE_BUG, TYPE_FLYING, 5 - .byte TYPE_BUG, TYPE_PSYCHIC, 20 - .byte TYPE_BUG, TYPE_GHOST, 5 - .byte TYPE_BUG, TYPE_DARK, 20 - .byte TYPE_BUG, TYPE_STEEL, 5 - .byte TYPE_ROCK, TYPE_FIRE, 20 - .byte TYPE_ROCK, TYPE_ICE, 20 - .byte TYPE_ROCK, TYPE_FIGHTING, 5 - .byte TYPE_ROCK, TYPE_GROUND, 5 - .byte TYPE_ROCK, TYPE_FLYING, 20 - .byte TYPE_ROCK, TYPE_BUG, 20 - .byte TYPE_ROCK, TYPE_STEEL, 5 - .byte TYPE_GHOST, TYPE_NORMAL, 0 - .byte TYPE_GHOST, TYPE_PSYCHIC, 20 - .byte TYPE_GHOST, TYPE_DARK, 5 - .byte TYPE_GHOST, TYPE_STEEL, 5 - .byte TYPE_GHOST, TYPE_GHOST, 20 + .byte TYPE_PSYCHIC, TYPE_DARK, 0 + .byte TYPE_PSYCHIC, TYPE_STEEL, 5 + .byte TYPE_BUG, TYPE_FIRE, 5 + .byte TYPE_BUG, TYPE_GRASS, 20 + .byte TYPE_BUG, TYPE_FIGHTING, 5 + .byte TYPE_BUG, TYPE_POISON, 5 + .byte TYPE_BUG, TYPE_FLYING, 5 + .byte TYPE_BUG, TYPE_PSYCHIC, 20 + .byte TYPE_BUG, TYPE_GHOST, 5 + .byte TYPE_BUG, TYPE_DARK, 20 + .byte TYPE_BUG, TYPE_STEEL, 5 + .byte TYPE_ROCK, TYPE_FIRE, 20 + .byte TYPE_ROCK, TYPE_ICE, 20 + .byte TYPE_ROCK, TYPE_FIGHTING, 5 + .byte TYPE_ROCK, TYPE_GROUND, 5 + .byte TYPE_ROCK, TYPE_FLYING, 20 + .byte TYPE_ROCK, TYPE_BUG, 20 + .byte TYPE_ROCK, TYPE_STEEL, 5 + .byte TYPE_GHOST, TYPE_NORMAL, 0 + .byte TYPE_GHOST, TYPE_PSYCHIC, 20 + .byte TYPE_GHOST, TYPE_DARK, 5 + .byte TYPE_GHOST, TYPE_STEEL, 5 + .byte TYPE_GHOST, TYPE_GHOST, 20 .byte TYPE_DRAGON, TYPE_DRAGON, 20 - .byte TYPE_DRAGON, TYPE_STEEL, 5 - .byte TYPE_DARK, TYPE_FIGHTING, 5 - .byte TYPE_DARK, TYPE_PSYCHIC, 20 - .byte TYPE_DARK, TYPE_GHOST, 20 - .byte TYPE_DARK, TYPE_DARK, 5 - .byte TYPE_DARK, TYPE_STEEL, 5 - .byte TYPE_STEEL, TYPE_FIRE, 5 - .byte TYPE_STEEL, TYPE_WATER, 5 - .byte TYPE_STEEL, TYPE_ELECTRIC, 5 - .byte TYPE_STEEL, TYPE_ICE, 20 - .byte TYPE_STEEL, TYPE_ROCK, 20 - .byte TYPE_STEEL, TYPE_STEEL, 5 - .byte 0xFE, 0xFE, 0 - .byte TYPE_NORMAL, TYPE_GHOST, 0 - .byte TYPE_FIGHTING, TYPE_GHOST, 0 - .byte 0xFF, 0xFF, 0 + .byte TYPE_DRAGON, TYPE_STEEL, 5 + .byte TYPE_DARK, TYPE_FIGHTING, 5 + .byte TYPE_DARK, TYPE_PSYCHIC, 20 + .byte TYPE_DARK, TYPE_GHOST, 20 + .byte TYPE_DARK, TYPE_DARK, 5 + .byte TYPE_DARK, TYPE_STEEL, 5 + .byte TYPE_STEEL, TYPE_FIRE, 5 + .byte TYPE_STEEL, TYPE_WATER, 5 + .byte TYPE_STEEL, TYPE_ELECTRIC, 5 + .byte TYPE_STEEL, TYPE_ICE, 20 + .byte TYPE_STEEL, TYPE_ROCK, 20 + .byte TYPE_STEEL, TYPE_STEEL, 5 + .byte 0xFE, 0xFE, 0 + .byte TYPE_NORMAL, TYPE_GHOST, 0 + .byte TYPE_FIGHTING, TYPE_GHOST, 0 + .byte 0xFF, 0xFF, 0 diff --git a/data/unk_sprite_file.s b/data/unk_sprite_file.s index 837e87c3f..2d5c9c12a 100644 --- a/data/unk_sprite_file.s +++ b/data/unk_sprite_file.s @@ -7,16 +7,36 @@ gUnknown_0862AD54:: @ 862AD54 .incbin "baserom.gba", 0x62ad54, 0x1dc gUnknown_0862AF30:: @ 862AF30 - .incbin "baserom.gba", 0x62af30, 0x60c + .incbin "baserom.gba", 0x62af30, 0x1AC + +gUnknown_0862B0DC:: @ 862B0DC + .incbin "baserom.gba", 0x62b0dc, 0x460 gUnknown_0862B53C:: @ 862B53C - .incbin "baserom.gba", 0x62b53c, 0x1e8 + .incbin "baserom.gba", 0x62b53c, 0x1E0 + +gUnknown_0862B71C:: @ 862B71C + .incbin "baserom.gba", 0x62b71c, 0x8 gUnknown_0862B724:: @ 862B724 - .incbin "baserom.gba", 0x62b724, 0x8 + obj_tiles gUnknown_0862B0DC, 0x1800, 11920 gUnknown_0862B72C:: @ 862B72C - .incbin "baserom.gba", 0x62b72c, 0x2c + obj_pal gUnknown_0862B53C, 11920 + +gUnknown_0862B734:: @ 862B734 + .incbin "baserom.gba", 0x62b734, 0x8 + +gUnknown_0862B73C:: @ 862B73C + .incbin "baserom.gba", 0x62b73c, 0x8 + +gUnknown_0862B744:: @ 862B744 + .incbin "baserom.gba", 0x62b744, 0x8 + +gUnknown_0862B74C:: @ 862B74C + .4byte gUnknown_0862B734 + .4byte gUnknown_0862B73C + .4byte gUnknown_0862B744 gUnknown_0862B758:: @ 862B758 - .incbin "baserom.gba", 0x62b758, 0x18 + spr_template 11920, 11920, gUnknown_0862B71C, gUnknown_0862B74C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index a45ea27e1..7a2f26233 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -2,7 +2,7 @@ .include "constants/constants.inc" .section .rodata - + gUnknown_085DFA60:: @ 85DFA60 .incbin "baserom.gba", 0x5dfa60, 0x20 @@ -47,10 +47,10 @@ sContestStatNames:: @ 85DFD04 .4byte gText_Beauty3 gUnknown_085DFD18:: @ 85DFD18 - .incbin "baserom.gba", 0x5dfd18, 0x8 + obj_tiles gUnknown_08DCCD5C, 0x200, 0 gUnknown_085DFD20:: @ 85DFD20 - .incbin "baserom.gba", 0x5dfd20, 0x8 + obj_pal gUnknown_08DCCD3C, 0 gUnknown_085DFD28:: @ 85DFD28 .incbin "baserom.gba", 0x5dfd28, 0x34 @@ -62,4 +62,5 @@ gUnknown_085DFDA0:: @ 85DFDA0 .incbin "baserom.gba", 0x5dfda0, 0x18 gUnknown_085DFDB8:: @ 85DFDB8 - .incbin "baserom.gba", 0x5dfdb8, 0x8 + .4byte gUnknown_08DCCB98 + .4byte 1 diff --git a/data/wild_encounter.s b/data/wild_encounter.s index 0b46e3d35..914471769 100644 --- a/data/wild_encounter.s +++ b/data/wild_encounter.s @@ -1,9 +1,9 @@ #include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata - .align 2, 0 + .section .rodata + .align 2, 0 @ 85507E4 .include "data/wild_mons.inc" |