diff options
Diffstat (limited to 'data')
51 files changed, 959 insertions, 6691 deletions
diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s index 892984c64..f82a657b9 100644 --- a/data/battle_anim_80A9C70.s +++ b/data/battle_anim_80A9C70.s @@ -1,3 +1,4 @@ +#include "constants/battle_anim.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -13,8 +14,8 @@ gUnknown_0853EDF8:: @ 853EDF8 .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 + spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC + spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C .align 2 gUnknown_0853EE2C:: @ 853EE2C @@ -26,11 +27,11 @@ gUnknown_0853EE34:: @ 853EE34 .align 2 gUnknown_0853EE38:: @ 853EE38 - spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30 + spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30 .align 2 gUnknown_0853EE50:: @ 853EE50 - spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4 + spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4 .align 2 gUnknown_0853EE68:: @ 853EE68 @@ -42,8 +43,8 @@ gUnknown_0853EE80:: @ 853EE80 .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 + spr_template ANIM_TAG_SPARKLE_4, ANIM_TAG_SPARKLE_4, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64 + spr_template ANIM_TAG_UNUSED_MONSTER_FOOT, ANIM_TAG_UNUSED_MONSTER_FOOT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC .align 2 gUnknown_0853EEB4:: @ 853EEB4 @@ -65,7 +66,7 @@ gUnknown_0853EECC:: @ 853EECC .align 2 gUnknown_0853EED8:: @ 853EED8 - spr_template 0x2797, 0x2797, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC + spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC .align 2 gUnknown_0853EEF0:: @ 853EEF0 @@ -85,4 +86,4 @@ gUnknown_0853EF14:: @ 853EF14 .align 2 gUnknown_0853EF18:: @ 853EF18 - spr_template 0x2714, 0x2714, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C + spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C diff --git a/data/battle_anim_80FE840.s b/data/battle_anim_80FE840.s deleted file mode 100644 index 856f379d9..000000000 --- a/data/battle_anim_80FE840.s +++ /dev/null @@ -1,3883 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_085920F0:: @ 85920F0 - .2byte 0x0000, 0x0005, 0x0002, 0x0005, 0x0004, 0x0005, 0x0006, 0x0005 - .2byte 0x0008, 0x0005, 0x000a, 0x0005, 0x000c, 0x0005, 0x000e, 0x0005 - .2byte 0xfffe, 0x0000 - - .align 2 -gUnknown_08592114:: @ 8592114 - .4byte gUnknown_085920F0 - - .align 2 -gSleepPowderParticleSpriteTemplate:: @ 8592118 - spr_template 0x2753, 0x2753, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840 - - .align 2 -gStunSporeParticleSpriteTemplate:: @ 8592130 - spr_template 0x2754, 0x2754, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840 - - .align 2 -gPoisonPowderParticleSpriteTemplate:: @ 8592148 - spr_template 0x2751, 0x2751, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840 - - .align 2 -gUnknown_08592160:: @ 8592160 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592168:: @ 8592168 - .2byte 0x0001, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592170:: @ 8592170 - .2byte 0x0002, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592178:: @ 8592178 - .2byte 0x0003, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592180:: @ 8592180 - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592188:: @ 8592188 - .2byte 0x0005, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592190:: @ 8592190 - .2byte 0x0006, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592198:: @ 8592198 - .2byte 0x0007, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085921A0:: @ 85921A0 - .2byte 0x0008, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085921A8:: @ 85921A8 - .4byte gUnknown_08592160 - .4byte gUnknown_08592168 - .4byte gUnknown_08592170 - .4byte gUnknown_08592178 - .4byte gUnknown_08592180 - .4byte gUnknown_08592188 - .4byte gUnknown_08592190 - - .align 2 -gUnknown_085921C4:: @ 85921C4 - .4byte gUnknown_08592198 - - .align 2 -gUnknown_085921C8:: @ 85921C8 - .4byte gUnknown_085921A0 - - .align 2 -gUnknown_085921CC:: @ 85921CC - .2byte 0xfffb, 0xfffb, 0x0100, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085921DC:: @ 85921DC - .4byte gUnknown_085921CC - - .align 2 -gUnknown_085921E0:: @ 859216E0 - spr_template 0x27a3, 0x27a3, gUnknown_08524A8C, gUnknown_085921C8, NULL, gUnknown_085921DC, sub_80FE8E0 - - .align 2 -gUnknown_085921F8:: @ 859216F8 - spr_template 0x27a3, 0x27a3, gUnknown_08524904, gUnknown_085921A8, NULL, gDummySpriteAffineAnimTable, sub_80FE930 - - .align 2 -gUnknown_08592210:: @ 8592210 - spr_template 0x27a3, 0x27a3, gUnknown_08524904, gUnknown_085921C4, NULL, gDummySpriteAffineAnimTable, sub_80FE988 - - .align 2 -gUnknown_08592228:: @ 8592228 - .2byte 0x0140, 0x0140, 0x0000, 0x0000, 0xfff2, 0xfff2, 0x0100, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08592240:: @ 8592240 - .4byte gUnknown_08592228 - - .align 2 -gUnknown_08592244:: @ 85922144 - spr_template 0x27fb, 0x27fb, gUnknown_085249C4, gDummySpriteAnimTable, NULL, gUnknown_08592240, sub_80FE8E0 - - .align 2 -gUnknown_0859225C:: @ 859225C - .2byte 0xfffb, 0xfffb, 0x0100, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859226C:: @ 859226C - .4byte gUnknown_0859225C - - .align 2 -gUnknown_08592270:: @ 8592270 - spr_template 0x27a3, 0x27a3, gUnknown_08524A8C, gUnknown_085921C8, NULL, gUnknown_0859226C, sub_80FEAD8 - - .align 2 -gUnknown_08592288:: @ 8592288 - spr_template 0x27a3, 0x27a3, gUnknown_08524904, gUnknown_085921A8, NULL, gDummySpriteAffineAnimTable, sub_80FEB44 - - .align 2 -gUnknown_085922A0:: @ 85922A0 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085922A8:: @ 85922A8 - .2byte 0x0004, 0x0007, 0x0008, 0x0007, 0xfffe, 0x0000 - - .align 2 -gUnknown_085922B4:: @ 85922B4 - .4byte gUnknown_085922A0 - .4byte gUnknown_085922A8 - - .align 2 -gLeechSeedSpriteTemplate:: @ 85922BC - spr_template 0x2716, 0x2716, gUnknown_0852490C, gUnknown_085922B4, NULL, gDummySpriteAffineAnimTable, sub_80FEC48 - - .align 2 -gUnknown_085922D4:: @ 85922D4 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085922DC:: @ 85922DC - .2byte 0x0004, 0x0007, 0xffff, 0x0000 - - .align 2 -gUnknown_085922E4:: @ 85922E4 - .4byte gUnknown_085922D4 - .4byte gUnknown_085922DC - - .align 2 -gUnknown_085922EC:: @ 85922EC - spr_template 0x27ae, 0x27ae, gUnknown_0852490C, gUnknown_085922E4, NULL, gDummySpriteAffineAnimTable, sub_80FED28 - - .align 2 -gUnknown_08592304:: @ 8592304 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_0859230C:: @ 859230C - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592314:: @ 8592314 - .4byte gUnknown_08592304 - - .align 2 -gUnknown_08592318:: @ 8592318 - .4byte gUnknown_0859230C - - .align 2 -gUnknown_0859231C:: @ 859231C - spr_template 0x27af, 0x27af, gUnknown_0852490C, gUnknown_08592314, NULL, gDummySpriteAffineAnimTable, sub_80FEE78 - - .align 2 -gUnknown_08592334:: @ 8592334 - spr_template 0x27af, 0x27af, gUnknown_08524904, gUnknown_08592318, NULL, gDummySpriteAffineAnimTable, sub_80FEF44 - - .align 2 -gUnknown_0859234C:: @ 859234C - .2byte 0x0000, 0x0005, 0x0004, 0x0005, 0x0008, 0x0005, 0x000c, 0x0005 - .2byte 0x0010, 0x0005, 0x0014, 0x0005, 0x0010, 0x0005, 0x000c, 0x0005 - .2byte 0x0008, 0x0005, 0x0004, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_08592378:: @ 8592378 - .2byte 0x0018, 0x0005, 0x001c, 0x0005, 0x0020, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08592388:: @ 8592388 - .4byte gUnknown_0859234C - .4byte gUnknown_08592378 - - .align 2 -gUnknown_08592390:: @ 8592390 - spr_template 0x274f, 0x274f, gUnknown_0852490C, gUnknown_08592388, NULL, gDummySpriteAffineAnimTable, sub_80FEFFC - - .align 2 -gUnknown_085923A8:: @ 85923A8 - spr_template 0x274f, 0x274f, gUnknown_0852490C, gUnknown_08592388, NULL, gDummySpriteAffineAnimTable, sub_80FF268 - - .align 2 -gUnknown_085923C0:: @ 85923C0 - .2byte 0x0000, 0x0003, 0x0000, 0x0043, 0x0000, 0x00c3, 0x0000, 0x0083, 0xfffe, 0x0000 - - .align 2 -gUnknown_085923D4:: @ 85923D4 - .4byte gUnknown_085923C0 - - .align 2 -gUnknown_085923D8:: @ 85923D8 - spr_template 0x27b0, 0x27b0, gUnknown_08524934, gUnknown_085923D4, NULL, gDummySpriteAffineAnimTable, sub_80FF0F4 - - .align 2 -gUnknown_085923F0:: @ 85923F0 - .2byte 0x0000, 0x0000, 0x0100, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08592400:: @ 8592400 - .4byte gUnknown_085923F0 - - .align 2 -gSwiftStarSpriteTemplate:: @ 8592404 - spr_template 0x27be, 0x27be, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08592400, sub_80FF0F4 - - .align 2 -gUnknown_0859241C:: @ 859241C - .2byte 0x0000, 0x0004, 0x0020, 0x0004, 0x0040, 0x0004, 0x0060, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08592430:: @ 8592430 - .2byte 0x0000, 0x0044, 0x0020, 0x0044, 0x0040, 0x0044, 0x0060, 0x0044, 0xffff, 0x0000 - - .align 2 -gUnknown_08592444:: @ 8592444 - .4byte gUnknown_0859241C - .4byte gUnknown_08592430 - - .align 2 -gUnknown_0859244C:: @ 859244C - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff5, 0x0000, 0x0600, 0x0000, 0x000b, 0x0000, 0x0600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859246C:: @ 859246C - .2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x000b, 0x0000, 0x0600, 0x0000, 0xfff5, 0x0000, 0x0600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859248C:: @ 859248C - .4byte gUnknown_0859244C - .4byte gUnknown_0859246C - - .align 2 -gUnknown_08592494:: @ 8592494 - spr_template 0x27ca, 0x27ca, gUnknown_0852499C, gUnknown_08592444, NULL, gUnknown_0859248C, sub_80FF374 - - .align 2 -gUnknown_085924AC:: @ 85924AC - .2byte 0x0000, 0x0000, 0x0000, 0x0000, 0x0030, 0x0030, 0x0e00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085924C4:: @ 85924C4 - .2byte 0xfff0, 0xfff0, 0x0100, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085924D4:: @ 85924D4 - .4byte gUnknown_085924AC - .4byte gUnknown_085924C4 - - .align 2 -gUnknown_085924DC:: @ 85924DC - spr_template 0x27a3, 0x27a3, gUnknown_085249CC, gUnknown_085921C8, NULL, gUnknown_085924D4, sub_80FF698 - - .align 2 -gUnknown_085924F4:: @ 85924F4 - .2byte 0x0000, 0x0007, 0x0010, 0x0007, 0x0020, 0x0007, 0x0030, 0x0007, 0xffff, 0x0000 - - .align 2 -gUnknown_08592508:: @ 8592508 - .2byte 0x0000, 0x0047, 0x0010, 0x0047, 0x0020, 0x0047, 0x0030, 0x0047, 0xffff, 0x0000 - - .align 2 -gUnknown_0859251C:: @ 859251C - .2byte 0x0000, 0x0007, 0x0010, 0x0007, 0x0020, 0x0007, 0xffff, 0x0000 - - .align 2 -gUnknown_0859252C:: @ 859252C - .2byte 0x0000, 0x0047, 0x0010, 0x0047, 0x0020, 0x0047, 0xffff, 0x0000 - - .align 2 -gUnknown_0859253C:: @ 859253C - .4byte gUnknown_085924F4 - .4byte gUnknown_08592508 - .4byte gUnknown_0859251C - .4byte gUnknown_0859252C - - .align 2 -gUnknown_0859254C:: @ 859254C - spr_template 0x27ef, 0x27ef, gUnknown_08524914, gUnknown_0859253C, NULL, gDummySpriteAffineAnimTable, sub_80FF768 - - .align 2 -gUnknown_08592564:: @ 8592564 - spr_template 0x27ef, 0x27ef, gUnknown_08524914, gUnknown_0859253C, NULL, gDummySpriteAffineAnimTable, sub_80FF7EC - - .align 2 -gUnknown_0859257C:: @ 859257C - .2byte 0x0003, 0x0003, 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_08592588:: @ 8592588 - .4byte gUnknown_0859257C - - .align 2 -gUnknown_0859258C:: @ 859258C - spr_template 0x27a3, 0x27a3, gUnknown_08524904, gUnknown_08592588, NULL, gDummySpriteAffineAnimTable, sub_80FF934 - - .align 2 -gUnknown_085925A4:: @ 85925A4 - .2byte 0x0000, 0x001e, 0xffff, 0x0000 - - .align 2 -gUnknown_085925AC:: @ 85925AC - .4byte gUnknown_085925A4 - - .align 2 -gUnknown_085925B0:: @ 85925B0 - .2byte 0x0000, 0x0000, 0x0afc, 0x0000, 0x0000, 0x0000, 0x1404, 0x0000 - .2byte 0x0000, 0x0000, 0x0afc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085925D0:: @ 85925D0 - .2byte 0x0000, 0x0000, 0x02ff, 0x0000, 0x0000, 0x0000, 0x0401, 0x0000 - .2byte 0x0000, 0x0000, 0x04ff, 0x0000, 0x0000, 0x0000, 0x0401, 0x0000 - .2byte 0x0000, 0x0000, 0x04ff, 0x0000, 0x0000, 0x0000, 0x0201, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08592608:: @ 8592608 - .4byte gUnknown_085925B0 - .4byte gUnknown_085925D0 - - .align 2 -gUnknown_08592610:: @ 8592610 - spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFB18 - - .align 2 -gBattleAnimSpriteTemplate_8592628:: @ 8592628 - spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFBF4 - - .align 2 -gUnknown_08592640:: @ 8592640 - .2byte 0x0000, 0x0004, 0x0004, 0x0004, 0x0008, 0x0004, 0x000c, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08592654:: @ 8592654 - .4byte gUnknown_08592640 - - .align 2 -gUnknown_08592658:: @ 8592658 - spr_template 0x27d3, 0x27d3, gUnknown_0852490C, gUnknown_08592654, NULL, gDummySpriteAffineAnimTable, sub_80FFC70 - - .align 2 -gUnknown_08592670:: @ 8592670 - spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFCB4 - - .align 2 -gUnknown_08592688:: @ 8592688 - .2byte 0x0000, 0x0000, 0x0300, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08592698:: @ 8592698 - .2byte 0x0000, 0xfff6, 0x0300, 0x0000, 0x0000, 0xfffa, 0x0300, 0x0000 - .2byte 0x0000, 0xfffe, 0x0300, 0x0000, 0x0000, 0x0000, 0x0300, 0x0000 - .2byte 0x0000, 0x0002, 0x0300, 0x0000, 0x0000, 0x0006, 0x0300, 0x0000 - .2byte 0x0000, 0x000a, 0x0300, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085926D8:: @ 85926D8 - .4byte gUnknown_08592688 - .4byte gUnknown_08592698 - .4byte gUnknown_085925B0 - .4byte gUnknown_085925D0 - - .align 2 -gUnknown_085926E8:: @ 85926E8 - spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_085926D8, sub_80FFDBC - - .align 2 -gUnknown_08592700:: @ 8592700 - .2byte 0x1805, 0x0001, 0x0004, 0x1008, 0x00ff, 0x0002, 0x1008, 0x0001 - .2byte 0x0002, 0x1008, 0x0001, 0x0002, 0x1008, 0x0001, 0x0010, 0x0000 - .2byte 0x007f, 0x0000 - - .align 2 -gUnknown_08592724:: @ 8592724 - .2byte 0x001c, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_0859272C:: @ 859272C - .2byte 0x0020, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592734:: @ 8592734 - .2byte 0x0014, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_0859273C:: @ 859273C - .2byte 0x001c, 0x0041, 0xffff, 0x0000 - - .align 2 -gUnknown_08592744:: @ 8592744 - .2byte 0x0010, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_0859274C:: @ 859274C - .2byte 0x0010, 0x0041, 0xffff, 0x0000 - - .align 2 -gUnknown_08592754:: @ 8592754 - .2byte 0x001c, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_0859275C:: @ 859275C - .4byte gUnknown_08592724 - .4byte gUnknown_0859272C - .4byte gUnknown_08592734 - .4byte gUnknown_0859273C - .4byte gUnknown_08592744 - .4byte gUnknown_0859274C - .4byte gUnknown_08592754 - - .align 2 -gUnknown_08592778:: @ 8592778 - spr_template 0x274f, 0x274f, gUnknown_0852490C, gUnknown_0859275C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08592790:: @ 8592790 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0104, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_085927A8:: @ 85927A8 - .4byte gUnknown_08592790 - - .align 2 -gUnknown_085927AC:: @ 85927AC - spr_template 0x27af, 0x27af, gUnknown_08524904, gUnknown_08592318, NULL, gDummySpriteAffineAnimTable, sub_8100640 - - .align 2 -gUnknown_085927C4:: @ 85927C4 - spr_template 0x27af, 0x27af, gUnknown_0852496C, gUnknown_08592314, NULL, gUnknown_085927A8, sub_8100640 - - .align 2 -gUnknown_085927DC:: @ 85927DC - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x01f6, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_085927F4:: @ 85927F4 - .2byte 0x00c0, 0x00c0, 0x0000, 0x0000, 0x0000, 0x0000, 0x01f4, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_0859280C:: @ 859280C - .2byte 0x008f, 0x008f, 0x0000, 0x0000, 0x0000, 0x0000, 0x01f1, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08592824:: @ 8592824 - .4byte gUnknown_085927DC - - .align 2 -gUnknown_08592828:: @ 8592828 - .4byte gUnknown_085927F4 - - .align 2 -gUnknown_0859282C:: @ 859282C - .4byte gUnknown_0859280C - - .align 2 -gUnknown_08592830:: @ 8592830 - spr_template 0x281f, 0x281f, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08592824, sub_8100640 - - .align 2 -gUnknown_08592848:: @ 8592848 - spr_template 0x281f, 0x281f, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08592828, sub_8100640 - - .align 2 -gUnknown_08592860:: @ 8592860 - spr_template 0x281f, 0x281f, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_0859282C, sub_8100640 - - .align 2 -gUnknown_08592878:: @ 8592878 - .2byte 0x001f, 0x027f, 0x03ff, 0x03e0, 0x7dc5, 0x7d56, 0x7eb6, 0x0000 - - .align 2 -gUnknown_08592888:: @ 8592888 - spr_template 0x281a, 0x281a, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8100898 - - .align 2 -gUnknown_085928A0:: @ 85928A0 - .2byte 0x0040, 0x0003, 0x0050, 0x0003, 0x0060, 0x0003, 0x0070, 0x0006, 0xffff, 0x0000 - - .align 2 -gUnknown_085928B4:: @ 85928B4 - .2byte 0x0040, 0x0043, 0x0050, 0x0043, 0x0060, 0x0043, 0x0070, 0x0046, 0xffff, 0x0000 - - .align 2 -gUnknown_085928C8:: @ 85928C8 - .4byte gUnknown_085928A0 - .4byte gUnknown_085928B4 - - .align 2 -gUnknown_085928D0:: @ 85928D0 - spr_template 0x2748, 0x2748, gUnknown_08524914, gUnknown_085928C8, NULL, gDummySpriteAffineAnimTable, sub_8100A50 - - .align 2 -gUnknown_085928E8:: @ 85928E8 - spr_template 0x282f, 0x282f, gUnknown_08524914, gUnknown_085928C8, NULL, gDummySpriteAffineAnimTable, sub_8100A50 - - .align 2 -gUnknown_08592900:: @ 8592900 - .2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0x0030, 0x0004, 0x0040, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08592918:: @ 8592918 - .4byte gUnknown_08592900 - - .align 2 -gUnknown_0859291C:: @ 859291C - spr_template 0x2725, 0x2725, gUnknown_08524914, gUnknown_08592918, NULL, gDummySpriteAffineAnimTable, sub_81009F8 - - .align 2 -gUnknown_08592934:: @ 8592934 - spr_template 0x2726, 0x2726, gUnknown_08524914, gUnknown_08592918, NULL, gDummySpriteAffineAnimTable, sub_81009F8 - - .align 2 -gUnknown_0859294C:: @ 859294C - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859295C:: @ 859295C - .2byte 0x0100, 0x0100, 0x0020, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859296C:: @ 859296C - .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859297C:: @ 859297C - .2byte 0x0100, 0x0100, 0x0060, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859298C:: @ 859298C - .2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859299C:: @ 859299C - .2byte 0x0100, 0x0100, 0x00a0, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085929AC:: @ 85929AC - .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085929BC:: @ 85929BC - .2byte 0x0100, 0x0100, 0x00e0, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085929CC:: @ 85929CC - .4byte gUnknown_0859294C - .4byte gUnknown_0859295C - .4byte gUnknown_0859296C - .4byte gUnknown_0859297C - .4byte gUnknown_0859298C - .4byte gUnknown_0859299C - .4byte gUnknown_085929AC - .4byte gUnknown_085929BC - - .align 2 -gUnknown_085929EC:: @ 85929EC - spr_template 0x279f, 0x279f, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085929CC, sub_8100A94 - - .align 2 -gUnknown_08592A04:: @ 8592A04 - .2byte 0x0000, 0x0005, 0x0010, 0x0005, 0x0020, 0x0005, 0x0030, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A18:: @ 8592A18 - .4byte gUnknown_08592A04 - - .align 2 -gCuttingSliceSpriteTemplate:: @ 8592A1C - spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100AE0 - - .align 2 -gUnknown_08592A34:: @ 8592A34 - spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100B88 - - .align 2 -gUnknown_08592A4C:: @ 8592A4C - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A54:: @ 8592A54 - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A5C:: @ 8592A5C - .2byte 0x0008, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A64:: @ 8592A64 - .2byte 0x000c, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A6C:: @ 8592A6C - .2byte 0x0010, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A74:: @ 8592A74 - .2byte 0x0014, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A7C:: @ 8592A7C - .2byte 0x0000, 0x0081, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A84:: @ 8592A84 - .2byte 0x0004, 0x0081, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A8C:: @ 8592A8C - .2byte 0x0008, 0x0081, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A94:: @ 8592A94 - .2byte 0x000c, 0x0081, 0xffff, 0x0000 - - .align 2 -gUnknown_08592A9C:: @ 8592A9C - .4byte gUnknown_08592A4C - .4byte gUnknown_08592A54 - .4byte gUnknown_08592A5C - .4byte gUnknown_08592A64 - .4byte gUnknown_08592A6C - .4byte gUnknown_08592A74 - .4byte gUnknown_08592A7C - .4byte gUnknown_08592A84 - .4byte gUnknown_08592A8C - .4byte gUnknown_08592A94 - - .align 2 -gUnknown_08592AC4:: @ 8592AC4 - spr_template 0x2758, 0x2758, gUnknown_0852490C, gUnknown_08592A9C, NULL, gDummySpriteAffineAnimTable, sub_8100E1C - - .align 2 -gUnknown_08592ADC:: @ 8592ADC - spr_template 0x2828, 0x2828, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8100EF0 - - .align 2 -gUnknown_08592AF4:: @ 8592AF4 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08592B04:: @ 8592B04 - .2byte 0x0000, 0x0000, 0x0c02, 0x0000, 0x0000, 0x0000, 0x0600, 0x0000 - .2byte 0x0000, 0x0000, 0x18fe, 0x0000, 0x0000, 0x0000, 0x0600, 0x0000 - .2byte 0x0000, 0x0000, 0x0c02, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08592B34:: @ 8592B34 - .4byte gUnknown_08592AF4 - .4byte gUnknown_08592B04 - - .align 2 -gUnknown_08592B3C:: @ 8592B3C - spr_template 0x2773, 0x2773, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08592B34, sub_81010CC - - .align 2 -gUnknown_08592B54:: @ 8592B54 - .2byte 0x0000, 0x0007, 0x0010, 0x0007, 0x0020, 0x0007, 0x0030, 0x0007 - .2byte 0x0040, 0x0007, 0x0050, 0x0007, 0x0060, 0x0007, 0x0070, 0x0007 - .2byte 0xfffe, 0x0000 - - .align 2 -gUnknown_08592B78:: @ 8592B78 - .4byte gUnknown_08592B54 - - .align 2 -gUnknown_08592B7C:: @ 8592B7C - spr_template 0x2741, 0x2741, gUnknown_08524914, gUnknown_08592B78, NULL, gDummySpriteAffineAnimTable, sub_810130C - - .align 2 -gUnknown_08592B94:: @ 8592B94 - spr_template 0x2741, 0x2741, gUnknown_08524914, gUnknown_08592B78, NULL, gDummySpriteAffineAnimTable, sub_810135C - - .align 2 -gUnknown_08592BAC:: @ 8592BAC - .2byte 0x0000, 0x000a, 0x0004, 0x000a, 0x0008, 0x000a, 0x000c, 0x000a - .2byte 0x0010, 0x001a, 0x0010, 0x0005, 0x0014, 0x0005, 0x0018, 0x000f - .2byte 0xffff, 0x0000 - - .align 2 -gUnknown_08592BD0:: @ 8592BD0 - .2byte 0x0000, 0x004a, 0x0004, 0x004a, 0x0008, 0x004a, 0x000c, 0x004a - .2byte 0x0010, 0x005a, 0x0010, 0x0045, 0x0014, 0x0045, 0x0018, 0x004f - .2byte 0xffff, 0x0000 - - .align 2 -gUnknown_08592BF4:: @ 8592BF4 - .4byte gUnknown_08592BAC - .4byte gUnknown_08592BD0 - - .align 2 -gUnknown_08592BFC:: @ 8592BFC - spr_template 0x2730, 0x2730, gUnknown_0852490C, gUnknown_08592BF4, NULL, gDummySpriteAffineAnimTable, sub_8101440 - - .align 2 -gUnknown_08592C14:: @ 8592C14 - .2byte 0x0000, 0x0028, 0xffff, 0x0000 - - .align 2 -gUnknown_08592C1C:: @ 8592C1C - .4byte gUnknown_08592C14 - - .align 2 -gUnknown_08592C20:: @ 8592C20 - .2byte 0x0014, 0x0014, 0x00e2, 0x0000, 0x0008, 0x0008, 0x1801, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000, 0x7ffd, 0x0000, 0x0000, 0x0000 - .2byte 0x0000, 0x0000, 0x1801, 0x0000, 0x7ffd, 0x000a, 0x0000, 0x0000 - - .align 2 -gUnknown_08592C50:: @ 8592C50 - .2byte 0x0014, 0x0014, 0x001e, 0x0000, 0x0008, 0x0008, 0x18ff, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000, 0x7ffd, 0x0000, 0x0000, 0x0000 - .2byte 0x0000, 0x0000, 0x18ff, 0x0000, 0x7ffd, 0x000a, 0x0000, 0x0000 - - .align 2 -gUnknown_08592C80:: @ 8592C80 - .4byte gUnknown_08592C20 - .4byte gUnknown_08592C50 - - .align 2 -gUnknown_08592C88:: @ 8592C88 - spr_template 0x27f4, 0x27f4, gUnknown_08524974, gUnknown_08592C1C, NULL, gUnknown_08592C80, sub_81014F4 - - .align 2 -gUnknown_08592CA0:: @ 8592CA0 - spr_template 0x271e, 0x271e, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81015AC - - .align 2 -gUnknown_08592CB8:: @ 8592CB8 - spr_template 0x271e, 0x271e, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8101898 - - .align 2 -gUnknown_08592CD0:: @ 8592CD0 - .byte 0x40, 0x40, 0x00, 0xc0, 0xc0, 0x40, 0x20, 0xe0 - - .align 2 -gUnknown_08592CD8:: @ 8592CD8 - spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8101940 - - .align 2 -gUnknown_08592CF0:: @ 8592CF0 - spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8101B90 - - .align 2 -gUnknown_08592D08:: @ 8592D08 - .2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0x0030, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08592D1C:: @ 8592D1C - .2byte 0x0030, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08592D24:: @ 8592D24 - .4byte gUnknown_08592D08 - .4byte gUnknown_08592D1C - - .align 2 -gUnknown_08592D2C:: @ 8592D2C - spr_template 0x27c7, 0x27c7, gUnknown_08524914, gUnknown_08592D24, NULL, gDummySpriteAffineAnimTable, sub_8101F40 - - .align 2 -gUnknown_08592D44:: @ 8592D44 - spr_template 0x282e, 0x282e, gUnknown_08524914, gUnknown_08592D24, NULL, gDummySpriteAffineAnimTable, sub_8101FA8 - - .align 2 -gUnknown_08592D5C:: @ 8592D5C - spr_template 0x282e, 0x282e, gUnknown_08524914, gUnknown_08592D24, NULL, gDummySpriteAffineAnimTable, sub_8101FF0 - - .align 2 -gUnknown_08592D74:: @ 8592D74 - .2byte 0x0000, 0x0004, 0x0008, 0x000c, 0x0010, 0x0004, 0x0018, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08592D88:: @ 8592D88 - .4byte gUnknown_08592D74 - - .align 2 -gUnknown_08592D8C:: @ 8592D8C - spr_template 0x27c8, 0x27c8, gUnknown_08524954, gUnknown_08592D88, NULL, gDummySpriteAffineAnimTable, sub_81020D8 - - .align 2 -gUnknown_08592DA4:: @ 8592DA4 - .2byte 0x0000, 0x0012, 0x0000, 0x0006, 0x0010, 0x0012, 0x0000, 0x0006 - .2byte 0x0010, 0x0006, 0x0020, 0x0012, 0x0010, 0x0006, 0x0020, 0x0006 - .2byte 0x0030, 0x0012, 0x0020, 0x0006, 0x0030, 0x0006, 0x0040, 0x0012 - .2byte 0x0030, 0x0006, 0x0040, 0x0036, 0xffff, 0x0000 - - .align 2 -gUnknown_08592DE0:: @ 8592DE0 - .4byte gUnknown_08592DA4 - - .align 2 -gUnknown_08592DE4:: @ 8592DE4 - spr_template 0x27c9, 0x27c9, gUnknown_08524914, gUnknown_08592DE0, NULL, gDummySpriteAffineAnimTable, sub_810217C - - .align 2 -gUnknown_08592DFC:: @ 8592DFC - spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation - - .align 2 -gUnknown_08592E14:: @ 8592E14 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003 - .2byte 0x0040, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_08592E2C:: @ 8592E2C - .4byte gUnknown_08592E14 - - .align 2 -gUnknown_08592E30:: @ 8592E30 - spr_template 0x272e, 0x272e, gUnknown_08524914, gUnknown_08592E2C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 - - .align 2 -gUnknown_08592E48:: @ 8592E48 - .2byte 0x0003, 0x0005, 0x0002, 0x0005, 0x0001, 0x0005, 0x0000, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08592E5C:: @ 8592E5C - .4byte gUnknown_08592E48 - - .align 2 -gUnknown_08592E60:: @ 8592E60 - .2byte 0x0200, 0x0200, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08592E70:: @ 8592E70 - .4byte gUnknown_08592E60 - - .align 2 -gUnknown_08592E74:: @ 8592E74 - spr_template 0x2722, 0x2722, gUnknown_08524AE4, gUnknown_08592E5C, NULL, gUnknown_08592E70, sub_8102268 - - .align 2 -gUnknown_08592E8C:: @ 8592E8C - .2byte 0x0000, 0x0005, 0x0001, 0x0005, 0x0002, 0x0005, 0x0003, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08592EA0:: @ 8592EA0 - .4byte gUnknown_08592E8C - - .align 2 -gUnknown_08592EA4:: @ 8592EA4 - spr_template 0x2722, 0x2722, gUnknown_08524AE4, gUnknown_08592EA0, NULL, gUnknown_08592E70, sub_810234C - - .align 2 -gUnknown_08592EBC:: @ 8592EBC - spr_template 0x27d2, 0x27d2, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81024E0 - - .align 2 -gUnknown_08592ED4:: @ 8592ED4 - .2byte 0x0000, 0x0008, 0x0004, 0x0008, 0x0008, 0x0008, 0x000c, 0x0008, 0xfffe, 0x0000 - - .align 2 -gUnknown_08592EE8:: @ 8592EE8 - .4byte gUnknown_08592ED4 - - .align 2 -gBattleAnimSpriteTemplate_8592EEC:: @ 8592EEC - spr_template 0x27d3, 0x27d3, gUnknown_0852490C, gUnknown_08592EE8, NULL, gDummySpriteAffineAnimTable, sub_8102540 - - .align 2 -gUnknown_08592F04:: @ 8592F04 - .2byte 0x0000, 0x0002, 0x0010, 0x0002, 0x0020, 0x0002, 0x0030, 0x0003 - .2byte 0x0040, 0x0005, 0x0050, 0x0003, 0x0060, 0x0002, 0x0000, 0x0002 - .2byte 0xffff, 0x0000 - - .align 2 -gUnknown_08592F28:: @ 8592F28 - .4byte gUnknown_08592F04 - - .align 2 -gUnknown_08592F2C:: @ 8592F2C - spr_template 0x272f, 0x272f, gUnknown_08524914, gUnknown_08592F28, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 - - .align 2 -gUnknown_08592F44:: @ 8592F44 - spr_template 0x2724, 0x2724, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8102844 - - .align 2 -gUnknown_08592F5C:: @ 8592F5C - .2byte 0x0000, 0x0002, 0x0010, 0x0002, 0x0020, 0x0002, 0x0030, 0x0002, 0xffff, 0x0000 - - .align 2 -gUnknown_08592F70:: @ 8592F70 - .4byte gUnknown_08592F5C - - .align 2 -gUnknown_08592F74:: @ 8592F74 - spr_template 0x27d0, 0x27d0, gUnknown_08524914, gUnknown_08592F70, NULL, gDummySpriteAffineAnimTable, sub_8102BCC - - .align 2 -gUnknown_08592F8C:: @ 8592F8C - .2byte 0x0000, 0x000a, 0xffff, 0x0000 - - .align 2 -gUnknown_08592F94:: @ 8592F94 - .2byte 0x0004, 0x000a, 0xffff, 0x0000 - - .align 2 -gUnknown_08592F9C:: @ 8592F9C - .2byte 0x0008, 0x0029, 0xffff, 0x0000 - - .align 2 -gUnknown_08592FA4:: @ 8592FA4 - .2byte 0x000c, 0x000a, 0xffff, 0x0000 - - .align 2 -gUnknown_08592FAC:: @ 8592FAC - .2byte 0x0010, 0x000a, 0xffff, 0x0000 - - .align 2 -gUnknown_08592FB4:: @ 8592FB4 - .2byte 0x0014, 0x000a, 0xffff, 0x0000 - - .align 2 -gUnknown_08592FBC:: @ 8592FBC - .2byte 0x0000, 0x008a, 0xffff, 0x0000 - - .align 2 -gUnknown_08592FC4:: @ 8592FC4 - .2byte 0x0004, 0x008a, 0xffff, 0x0000 - - .align 2 -gUnknown_08592FCC:: @ 8592FCC - .4byte gUnknown_08592F8C - .4byte gUnknown_08592F94 - .4byte gUnknown_08592F9C - .4byte gUnknown_08592FA4 - .4byte gUnknown_08592FAC - .4byte gUnknown_08592FB4 - .4byte gUnknown_08592FBC - .4byte gUnknown_08592FC4 - - .align 2 -gUnknown_08592FEC:: @ 8592FEC - .2byte 0x000c, 0x000c, 0x1000, 0x0000, 0xfff4, 0xfff4, 0x1000, 0x0000 - .2byte 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593004:: @ 8593004 - .4byte gUnknown_08592FEC - - .align 2 -gUnknown_08593008:: @ 8593008 - spr_template 0x2758, 0x2758, gUnknown_085249CC, gUnknown_08592FCC, NULL, gUnknown_08593004, sub_8102CD4 - - .align 2 -gUnknown_08593020:: @ 8593020 - .2byte 0x2758, 0x7fff, 0x735f, 0x6adf, 0x623f, 0x59bf, 0x2771, 0x7fff - .2byte 0x6bf9, 0x57f4, 0x43ef, 0x33ea, 0x27c9, 0x7fff, 0x63ff, 0x47ff - .2byte 0x2bff, 0x0fff, 0x27bf, 0x7fff, 0x7f9a, 0x7f55, 0x7f10, 0x7ecc - - .align 2 -gUnknown_08593050:: @ 8593050 - spr_template 0x2758, 0x2758, gUnknown_085249CC, gUnknown_08592FCC, NULL, gUnknown_08593004, sub_8102EB0 - - .align 2 -gUnknown_08593068:: @ 8593068 - spr_template 0x27d1, 0x27d1, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8102FB8 - - .align 2 -gUnknown_08593080:: @ 8593080 - .2byte 0x00a0, 0x00a0, 0x0000, 0x0000, 0x0004, 0x0004, 0x0100, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08593098:: @ 8593098 - .4byte gUnknown_08593080 - - .align 2 -gUnknown_0859309C:: @ 859309C - spr_template 0x2758, 0x2758, gUnknown_085249CC, gUnknown_08592FCC, NULL, gUnknown_08593098, sub_8103028 - - .align 2 -gUnknown_085930B4:: @ 85930B4 - .2byte 0x0000, 0x0042, 0x0010, 0x0042, 0x0020, 0x0042, 0x0030, 0x0042, 0xffff, 0x0000 - - .align 2 -gUnknown_085930C8:: @ 85930C8 - .2byte 0x0030, 0x0042, 0x0020, 0x0042, 0x0010, 0x0042, 0x0000, 0x0042, 0xffff, 0x0000 - - .align 2 -gUnknown_085930DC:: @ 85930DC - .2byte 0x0000, 0x0002, 0x0010, 0x0002, 0x0020, 0x0002, 0x0030, 0x0002, 0xffff, 0x0000 - - .align 2 -gUnknown_085930F0:: @ 85930F0 - .2byte 0x0030, 0x0002, 0x0020, 0x0002, 0x0010, 0x0002, 0x0000, 0x0002, 0xffff, 0x0000 - - .align 2 -gUnknown_08593104:: @ 8593104 - .4byte gUnknown_085930B4 - .4byte gUnknown_085930DC - .4byte gUnknown_085930C8 - .4byte gUnknown_085930F0 - - .align 2 -gUnknown_08593114:: @ 8593114 - spr_template 0x27e1, 0x27e1, gUnknown_08524914, gUnknown_08593104, NULL, gDummySpriteAffineAnimTable, sub_8103164 - - .align 2 -gUnknown_0859312C:: @ 859312C - .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x001e, 0x001e, 0x0800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593144:: @ 8593144 - .2byte 0x0000, 0x0000, 0x0b04, 0x0000, 0x0000, 0x0000, 0x0bfc, 0x0000 - .2byte 0x7ffd, 0x0002, 0x0000, 0x0000, 0xffe2, 0xffe2, 0x0800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000, 0x0010, 0x0010, 0x0000, 0x0000 - .2byte 0x001e, 0x001e, 0x0800, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000 - .2byte 0x7ffd, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0b04, 0x0000 - .2byte 0x0000, 0x0000, 0x0bfc, 0x0000, 0x7ffd, 0x0002, 0x0000, 0x0000 - .2byte 0xffe2, 0xffe2, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085931B4:: @ 85931B4 - .4byte gUnknown_0859312C - .4byte gUnknown_08593144 - - .align 2 -gUnknown_085931BC:: @ 85931BC - spr_template 0x2750, 0x2750, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085931B4, sub_8103208 - - .align 2 -gUnknown_085931D4:: @ 85931D4 - spr_template 0x2750, 0x2750, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085931B4, sub_8103284 - - .align 2 -gUnknown_085931EC:: @ 85931EC - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085931F4:: @ 85931F4 - .2byte 0x0000, 0x0041, 0xffff, 0x0000 - - .align 2 -gUnknown_085931FC:: @ 85931FC - .2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0x0010, 0x0004 - .2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_0859321C:: @ 859321C - .2byte 0x0000, 0x0044, 0x0010, 0x0044, 0x0020, 0x0044, 0x0010, 0x0044 - .2byte 0x0000, 0x0044, 0x0010, 0x0044, 0x0020, 0x0044, 0xffff, 0x0000 - - .align 2 -gUnknown_0859323C:: @ 859323C - .4byte gUnknown_085931EC - .4byte gUnknown_085931F4 - .4byte gUnknown_085931FC - .4byte gUnknown_0859321C - - .align 2 -gUnknown_0859324C:: @ 859324C - spr_template 0x27e6, 0x27e6, gUnknown_08524914, gUnknown_0859323C, NULL, gDummySpriteAffineAnimTable, sub_8103390 - - .align 2 -gUnknown_08593264:: @ 8593264 - spr_template 0x2750, 0x2750, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8103448 - - .align 2 -gUnknown_0859327C:: @ 859327C - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08593284:: @ 8593284 - .4byte gUnknown_0859327C - - .align 2 -gUnknown_08593288:: @ 8593288 - spr_template 0x2758, 0x2758, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8103498 - - .align 2 -gUnknown_085932A0:: @ 85932A0 - spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810358C - - .align 2 -gUnknown_085932B8:: @ 85932B8 - spr_template 0x27a1, 0x27a1, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08597060, sub_8103620 - - .align 2 -gUnknown_085932D0:: @ 85932D0 - .2byte 0x0000, 0x0009, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_085932E4:: @ 85932E4 - .4byte gUnknown_085932D0 - - .align 2 -gUnknown_085932E8:: @ 85932E8 - .2byte 0x0050, 0x0050, 0x0000, 0x0000, 0x0009, 0x0009, 0x1200, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593300:: @ 8593300 - .4byte gUnknown_085932E8 - - .align 2 -gUnknown_08593304:: @ 8593304 - spr_template 0x2717, 0x2717, gUnknown_08524974, gUnknown_085932E4, NULL, gUnknown_08593300, sub_80A77C8 - - .align 2 -gUnknown_0859331C:: @ 859331C - .2byte 0x0000, 0x0043, 0x0008, 0x0043, 0x0010, 0x0043, 0x0018, 0x0043 - .2byte 0x0020, 0x0043, 0x0028, 0x0043, 0x0030, 0x0043, 0xfffd, 0x0001 - .2byte 0xffff, 0x0000 - - .align 2 -gUnknown_08593340:: @ 8593340 - .4byte gUnknown_0859331C - - .align 2 -gUnknown_08593344:: @ 8593344 - spr_template 0x275b, 0x275b, gUnknown_08524934, gUnknown_08593340, NULL, gDummySpriteAffineAnimTable, sub_81037D8 - - .align 2 -gUnknown_0859335C:: @ 859335C - .2byte 0x0010, 0x0100, 0x0000, 0x0000, 0x0014, 0x0000, 0x0c00, 0x0000 - .2byte 0x0000, 0x0000, 0x2000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859337C:: @ 859337C - .4byte gUnknown_0859335C - - .align 2 -gBattleAnimSpriteTemplate_8593380:: @ 8593380 - spr_template 0x2715, 0x2715, gUnknown_08524ADC, gDummySpriteAnimTable, NULL, gUnknown_0859337C, sub_810387C - - .align 2 -gSonicBoomSpriteTemplate:: @ 8593398 - spr_template 0x2713, 0x2713, gUnknown_08524B14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81038C8 - - .align 2 -gUnknown_085933B0:: @ 85933B0 - spr_template 0x2713, 0x2713, gUnknown_08524A54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8103AA4 - - .align 2 -gUnknown_085933C8:: @ 85933C8 - .2byte 0x0020, 0x0020, 0x0000, 0x0000, 0x0007, 0x0007, 0xc800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085933E0:: @ 85933E0 - .2byte 0x0005, 0x0005, 0x0a00, 0x0000, 0xfff6, 0xfff6, 0x0a00, 0x0000 - .2byte 0x000a, 0x000a, 0x0a00, 0x0000, 0xfff6, 0xfff6, 0x0a00, 0x0000 - .2byte 0x000a, 0x000a, 0x0a00, 0x0000, 0xfff6, 0xfff6, 0x0a00, 0x0000 - .2byte 0x000a, 0x000a, 0x0a00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593420:: @ 8593420 - .4byte gUnknown_085933C8 - - .align 2 -gUnknown_08593424:: @ 8593424 - .4byte gUnknown_085933E0 - - .align 2 -gSupersonicWaveSpriteTemplate:: @ 8593428 - spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation - - .align 2 -gScreechWaveSpriteTemplate:: @ 8593440 - spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation - - .align 2 -gUnknown_08593458:: @ 8593458 - spr_template 0x2814, 0x2814, gUnknown_08524A1C, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation - - .align 2 -gUnknown_08593470:: @ 8593470 - spr_template 0x2830, 0x2830, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593424, sub_8108C94 - - .align 2 -gUnknown_08593488:: @ 8593488 - spr_template 0x27bf, 0x27bf, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC - - .align 2 -gUnknown_085934A0:: @ 85934A0 - spr_template 0x27c2, 0x27c2, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8103FE8 - - .align 2 -gUnknown_085934B8:: @ 85934B8 - .2byte 0x0008, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085934C0:: @ 85934C0 - .4byte gUnknown_085934B8 - - .align 2 -gUnknown_085934C4:: @ 85934C4 - .2byte 0x0000, 0x0000, 0x010a, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085934D4:: @ 85934D4 - .4byte gUnknown_085934C4 - - .align 2 -gUnknown_085934D8:: @ 85934D8 - spr_template 0x2774, 0x2774, gUnknown_0852496C, gUnknown_085934C0, NULL, gDummySpriteAffineAnimTable, sub_8104088 - - .align 2 -gUnknown_085934F0:: @ 85934F0 - spr_template 0x2774, 0x2774, gUnknown_0852496C, gUnknown_085934C0, NULL, gUnknown_085934D4, sub_810413C - - .align 2 -gUnknown_08593508:: @ 8593508 - .2byte 0x0000, 0x0000, 0x0114, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593518:: @ 8593518 - .4byte gUnknown_08593508 - - .align 2 -gUnknown_0859351C:: @ 859351C - spr_template 0x2716, 0x2716, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593518, sub_81041C4 - - .align 2 -gUnknown_08593534:: @ 8593534 - .2byte 0x0010, 0x0100, 0x0000, 0x0000, 0x0004, 0x0000, 0x2800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859354C:: @ 859354C - .4byte gUnknown_08593534 - - .align 2 -gUnknown_08593550:: @ 8593550 - spr_template 0x2719, 0x2719, gUnknown_085249BC, gDummySpriteAnimTable, NULL, gUnknown_0859354C, sub_8104304 - - .align 2 -gUnknown_08593568:: @ 8593568 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0014, 0xffff, 0x0000 - - .align 2 -gUnknown_08593578:: @ 8593578 - .2byte 0x0000, 0x00c3, 0x0010, 0x00c3, 0x0020, 0x00d4, 0xffff, 0x0000 - - .align 2 -gUnknown_08593588:: @ 8593588 - .4byte gUnknown_08593568 - .4byte gUnknown_08593578 - - .align 2 -gUnknown_08593590:: @ 8593590 - spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08593588, NULL, gDummySpriteAffineAnimTable, sub_8104364 - - .align 2 -gUnknown_085935A8:: @ 85935A8 - .2byte 0x0000, 0x0002, 0x0010, 0x0002, 0x0020, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085935B8:: @ 85935B8 - .2byte 0x0000, 0x00c2, 0x0010, 0x00c2, 0x0020, 0x00c1, 0xffff, 0x0000 - - .align 2 -gUnknown_085935C8:: @ 85935C8 - .4byte gUnknown_085935A8 - .4byte gUnknown_085935B8 - - .align 2 -gUnknown_085935D0:: @ 85935D0 - spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_085935C8, NULL, gDummySpriteAffineAnimTable, sub_8104414 - - .align 2 -gUnknown_085935E8:: @ 85935E8 - .2byte 0xfffa, 0x0004, 0x0800, 0x0000, 0x000a, 0xfff6, 0x0800, 0x0000 - .2byte 0xfffc, 0x0006, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593608:: @ 8593608 - .2byte 0xfffc, 0xfffb, 0x0c00, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000 - .2byte 0x0004, 0x0005, 0x0c00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593628:: @ 8593628 - .2byte 0x0000, 0x0044, 0x0004, 0x0068, 0x0008, 0x0044, 0x000c, 0x0044, 0xffff, 0x0000 - - .align 2 -gUnknown_0859363C:: @ 859363C - .2byte 0x0000, 0x0004, 0x0004, 0x0028, 0x0008, 0x0004, 0x000c, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08593650:: @ 8593650 - .4byte gUnknown_08593628 - .4byte gUnknown_0859363C - - .align 2 -gUnknown_08593658:: @ 8593658 - spr_template 0x2766, 0x2766, gUnknown_0852490C, gUnknown_08593650, NULL, gDummySpriteAffineAnimTable, sub_8104B1C - - .align 2 -gUnknown_08593670:: @ 8593670 - .2byte 0x000b, 0x000b, 0x0800, 0x0000, 0xfff5, 0xfff5, 0x0800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593688:: @ 8593688 - .4byte gUnknown_08593670 - - .align 2 -gUnknown_0859368C:: @ 859368C - spr_template 0x2767, 0x2767, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593688, sub_8104BAC - - .align 2 -gUnknown_085936A4:: @ 85936A4 - .2byte 0xfff6, 0x0009, 0x0700, 0x0000, 0x0014, 0xffec, 0x0700, 0x0000 - .2byte 0xffec, 0x0014, 0x0700, 0x0000, 0x000a, 0xfff7, 0x0700, 0x0000 - .2byte 0x7ffd, 0x0002, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085936D4:: @ 85936D4 - spr_template 0x2712, 0x2712, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810501C - - .align 2 -gUnknown_085936EC:: @ 85936EC - spr_template 0x27d5, 0x27d5, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7938 - - .align 2 -gUnknown_08593704:: @ 8593704 - .2byte 0x0000, 0x0005, 0x0010, 0x0005, 0x0020, 0x0005, 0x0030, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08593718:: @ 8593718 - .4byte gUnknown_08593704 - - .align 2 -gBattleAnimSpriteTemplate_859371C:: @ 859371C - spr_template 0x27d6, 0x27d6, gUnknown_08524914, gUnknown_08593718, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 - - .align 2 -gUnknown_08593734:: @ 8593734 - .2byte 0x0000, 0x0000, 0x02f8, 0x0000, 0x0000, 0x0000, 0x0408, 0x0000 - .2byte 0x0000, 0x0000, 0x02f8, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593754:: @ 8593754 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593764:: @ 8593764 - .2byte 0xfff8, 0x0004, 0x0800, 0x0000, 0x7ffd, 0x0000, 0x0000, 0x0000 - .2byte 0x0010, 0xfff8, 0x0800, 0x0000, 0xfff0, 0x0008, 0x0800, 0x0000 - .2byte 0x7ffd, 0x0001, 0x0000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000 - .2byte 0x0000, 0x0000, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085937A4:: @ 85937A4 - .4byte gUnknown_08593734 - .4byte gUnknown_08593754 - .4byte gUnknown_08593764 - - .align 2 -gUnknown_085937B0:: @ 85937B0 - spr_template 0x27da, 0x27da, gUnknown_08524AF4, gDummySpriteAnimTable, NULL, gUnknown_085937A4, sub_8105538 - - .align 2 -gUnknown_085937C8:: @ 85937C8 - .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0010, 0x1e00, 0x0000 - .2byte 0x7fff, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_085937E0:: @ 85937E0 - .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0020, 0x0020, 0x0f00, 0x0000 - .2byte 0x7fff, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_085937F8:: @ 85937F8 - .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x000b, 0x000b, 0x2d00, 0x0000 - .2byte 0x7fff, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08593810:: @ 8593810 - .4byte gUnknown_085937C8 - .4byte gUnknown_085937E0 - - .align 2 -gUnknown_08593818:: @ 8593818 - .4byte gUnknown_085937F8 - - .align 2 -gUnknown_0859381C:: @ 859381C - spr_template 0x27db, 0x27db, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_80A77C8 - - .align 2 -gUnknown_08593834:: @ 8593834 - .2byte 0x0200, 0x0200, 0x0000, 0x0000, 0xfff0, 0xfff0, 0x1e00, 0x0000 - .2byte 0x7fff, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_0859384C:: @ 859384C - .4byte gUnknown_08593834 - - .align 2 -gUnknown_08593850:: @ 8593850 - spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_0859384C, sub_80A77C8 - - .align 2 -gUnknown_08593868:: @ 8593868 - spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81051C4 - - .align 2 -gUnknown_08593880:: @ 8593880 - spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593818, sub_81052A4 - - .align 2 -gBattleAnimSpriteTemplate_8593898:: @ 8593898 - spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81054E8 - - .align 2 -gUnknown_085938B0:: @ 85938B0 - .2byte 0x0060, 0xfff3, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085938C0:: @ 85938C0 - .2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x0004, 0x0003 - .2byte 0x0000, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_085938D8:: @ 85938D8 - .4byte gUnknown_085938C0 - - .align 2 -gUnknown_085938DC:: @ 85938DC - spr_template 0x27df, 0x27df, gUnknown_0852490C, gUnknown_085938D8, NULL, gDummySpriteAffineAnimTable, sub_8105C48 - - .align 2 -gUnknown_085938F4:: @ 85938F4 - .2byte 0x1c1e, 0x18ec, 0x1a10, 0x1cf6 - - .align 2 -gUnknown_085938FC:: @ 85938FC - .2byte 0x0000, 0x0006, 0x0010, 0x0006, 0x0020, 0x000f, 0x0010, 0x0006 - .2byte 0x0000, 0x0006, 0x0010, 0x0046, 0x0020, 0x004f, 0x0010, 0x0046 - .2byte 0x0000, 0x0006, 0x0010, 0x0006, 0x0020, 0x000f, 0x0010, 0x0006 - .2byte 0x0000, 0x0006, 0xffff, 0x0000 - - .align 2 -gUnknown_08593934:: @ 8593934 - .4byte gUnknown_085938FC - - .align 2 -gUnknown_08593938:: @ 8593938 - spr_template 0x27dd, 0x27dd, gUnknown_08524914, gUnknown_08593934, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 - - .align 2 -gUnknown_08593950:: @ 8593950 - .2byte 0x27de, 0x270f, 0x270e, 0x0000 - - .align 2 -gUnknown_08593958:: @ 8593958 - spr_template 0x27de, 0x27de, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8105DE8 - - .align 2 -gUnknown_08593970:: @ 8593970 - spr_template 0x27e2, 0x27e2, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8105E60 - - .align 2 -gUnknown_08593988:: @ 8593988 - .2byte 0x000a, 0xfff3, 0x0a00, 0x0000, 0xfff6, 0x000d, 0x0a00, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085939A0:: @ 85939A0 - spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106140 - - .align 2 -gBattleAnimSpriteTemplate_85939B8:: @ 85939B8 - spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 - - .align 2 -gUnknown_085939D0:: @ 85939D0 - spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810624C - - .align 2 -gUnknown_085939E8:: @ 85939E8 - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0008, 0x0008, 0x0100, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08593A00:: @ 8593A00 - .4byte gUnknown_085939E8 - - .align 2 -gHiddenPowerOrbSpriteTemplate:: @ 8593A04 - spr_template 0x27e9, 0x27e9, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_810673C - - .align 2 -gHiddenPowerOrbScatterSpriteTemplate:: @ 8593A1C - spr_template 0x27e9, 0x27e9, gUnknown_085249CC, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_8106878 - - .align 2 -gUnknown_08593A34:: @ 8593A34 - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0008, 0x0008, 0x0100, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08593A4C:: @ 8593A4C - .4byte gUnknown_08593A34 - - .align 2 -gUnknown_08593A50:: @ 8593A50 - spr_template 0x27fd, 0x27fd, gUnknown_085249C4, gDummySpriteAnimTable, NULL, gUnknown_08593A4C, sub_8106944 - - .align 2 -gUnknown_08593A68:: @ 8593A68 - .2byte 0x0000, 0x0004, 0x0004, 0x0004, 0x0008, 0x0004, 0x0004, 0x0004 - .2byte 0x0000, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08593A80:: @ 8593A80 - .4byte gUnknown_08593A68 - - .align 2 -gUnknown_08593A84:: @ 8593A84 - spr_template 0x27ea, 0x27ea, gUnknown_0852490C, gUnknown_08593A80, NULL, gDummySpriteAffineAnimTable, sub_81069B8 - - .align 2 -gUnknown_08593A9C:: @ 8593A9C - .2byte 0x0000, 0x0018, 0xffff, 0x0000 - - .align 2 -gUnknown_08593AA4:: @ 8593AA4 - .4byte gUnknown_08593A9C - - .align 2 -gUnknown_08593AA8:: @ 8593AA8 - spr_template 0x27ec, 0x27ec, gUnknown_08524914, gUnknown_08593AA4, NULL, gDummySpriteAffineAnimTable, sub_81069D0 - - .align 2 -gUnknown_08593AC0:: @ 8593AC0 - spr_template 0x27eb, 0x27eb, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106AD0 - - .align 2 -gUnknown_08593AD8:: @ 8593AD8 - .2byte 0x0000, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_08593AE0:: @ 8593AE0 - .2byte 0x0010, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_08593AE8:: @ 8593AE8 - .4byte gUnknown_08593AD8 - .4byte gUnknown_08593AE0 - - .align 2 -gUnknown_08593AF0:: @ 8593AF0 - spr_template 0x27ed, 0x27ed, gUnknown_08524914, gUnknown_08593AE8, NULL, gDummySpriteAffineAnimTable, sub_8106B54 - - .align 2 -gUnknown_08593B08:: @ 8593B08 - .2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0x0030, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08593B1C:: @ 8593B1C - .2byte 0x0000, 0x0044, 0x0010, 0x0044, 0x0020, 0x0044, 0x0030, 0x0044, 0xffff, 0x0000 - - .align 2 -gUnknown_08593B30:: @ 8593B30 - .4byte gUnknown_08593B08 - .4byte gUnknown_08593B1C - - .align 2 -gUnknown_08593B38:: @ 8593B38 - spr_template 0x27ee, 0x27ee, gUnknown_08524914, gUnknown_08593B30, NULL, gDummySpriteAffineAnimTable, sub_8106C80 - - .align 2 -gUnknown_08593B50:: @ 8593B50 - .2byte 0x0000, 0x0008, 0x0010, 0x0008, 0x0020, 0x0008, 0x0010, 0x0008, 0xffff, 0x0000 - - .align 2 -gUnknown_08593B64:: @ 8593B64 - .2byte 0x0010, 0x0048, 0x0020, 0x0048, 0x0010, 0x0048, 0x0000, 0x0048, 0xffff, 0x0000 - - .align 2 -gUnknown_08593B78:: @ 8593B78 - .4byte gUnknown_08593B50 - .4byte gUnknown_08593B64 - - .align 2 -gUnknown_08593B80:: @ 8593B80 - spr_template 0x27e7, 0x27e7, gUnknown_08524914, gUnknown_08593B78, NULL, gDummySpriteAffineAnimTable, sub_8106CD0 - - .align 2 -gUnknown_08593B98:: @ 8593B98 - .2byte 0xfff4, 0x0008, 0x0400, 0x0000, 0x0014, 0xffec, 0x0400, 0x0000 - .2byte 0xfff8, 0x000c, 0x0400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gBattleAnimSpriteTemplate_8593BB8:: @ 8593BB8 - spr_template 0x27f1, 0x27f1, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106E00 - - .align 2 -gUnknown_08593BD0:: @ 8593BD0 - .2byte 0x0000, 0x0000, 0x0500, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593BE0:: @ 8593BE0 - .2byte 0x0000, 0x0000, 0x10f8, 0x0000, 0x7fff, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08593BF0:: @ 8593BF0 - .2byte 0x0000, 0x0000, 0x1008, 0x0000, 0x7fff, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08593C00:: @ 8593C00 - .4byte gUnknown_08593BD0 - .4byte gUnknown_08593BE0 - .4byte gUnknown_08593BF0 - - .align 2 -gUnknown_08593C0C:: @ 8593C0C - spr_template 0x27de, 0x27de, gUnknown_0852496C, gUnknown_08592FCC, NULL, gUnknown_08593C00, sub_8106F60 - - .align 2 -gUnknown_08593C24:: @ 8593C24 - spr_template 0x27de, 0x27de, gUnknown_0852496C, gUnknown_08592FCC, NULL, gUnknown_08593C00, sub_8106F00 - - .align 2 -gUnknown_08593C3C:: @ 8593C3C - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593C4C:: @ 8593C4C - .2byte 0x0200, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08593C5C:: @ 8593C5C - .4byte gUnknown_08593C3C - .4byte gUnknown_08593C4C - - .align 2 -gUnknown_08593C64:: @ 8593C64 - spr_template 0x2804, 0x2804, gUnknown_08524B1C, gDummySpriteAnimTable, NULL, gUnknown_08593C5C, sub_81070AC - - .align 2 - .incbin "graphics/unknown/unknown_593C80.4bpp" - - .align 2 - .incbin "graphics/unknown/unknown_593FFC.bin" - - .align 2 -gUnknown_08594FFC:: @ 8594FFC - .2byte 0x0000, 0x0002, 0x0008, 0x0002, 0x0010, 0x0002, 0x0018, 0x0006 - .2byte 0x0020, 0x0002, 0x0028, 0x0002, 0x0030, 0x0002, 0xffff, 0x0000 - - .align 2 -gUnknown_0859501C:: @ 859501C - .4byte gUnknown_08594FFC - - .align 2 -gUnknown_08595020:: @ 8595020 - spr_template 0x2783, 0x2783, gUnknown_08524954, gUnknown_0859501C, NULL, gDummySpriteAffineAnimTable, sub_810721C - - .align 2 -gUnknown_08595038:: @ 8595038 - .2byte 0xfffb, 0xfffb, 0x0a00, 0x0000, 0x0005, 0x0005, 0x0a00, 0x0000 - .2byte 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595050:: @ 8595050 - .4byte gUnknown_08595038 - - .align 2 -gUnknown_08595054:: @ 8595054 - .2byte 0x0000, 0x0001, 0x0004, 0x0005, 0x0008, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08595064:: @ 8595064 - .4byte gUnknown_08595054 - - .align 2 -gBattleAnimSpriteTemplate_8595068:: @ 8595068 - spr_template 0x27a2, 0x27a2, gUnknown_08524A8C, gUnknown_08595064, NULL, gUnknown_08595050, sub_8107260 - - .align 2 -gUnknown_08595080:: @ 8595080 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595088:: @ 8595088 - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595090:: @ 8595090 - .4byte gUnknown_08595080 - .4byte gUnknown_08595088 - - .align 2 -gUnknown_08595098:: @ 8595098 - .2byte 0x0000, 0x0000, 0x0100, 0x0000, 0x0060, 0x0060, 0x0100, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085950B0:: @ 85950B0 - .4byte gUnknown_08595098 - - .align 2 -gUnknown_085950B4:: @ 85950B4 - spr_template 0x279c, 0x279c, gUnknown_08524A04, gUnknown_08595090, NULL, gUnknown_085950B0, sub_810744C - - .align 2 -gUnknown_085950CC:: @ 85950CC - .2byte 0x0000, 0x0001, 0x0004, 0x0001, 0x0008, 0x0001, 0x000c, 0x0001, 0xfffe, 0x0000 - - .align 2 -gUnknown_085950E0:: @ 85950E0 - .4byte gUnknown_085950CC - - .align 2 -gUnknown_085950E4:: @ 85950E4 - spr_template 0x27a5, 0x27a5, gUnknown_08524A2C, gUnknown_085950E0, NULL, gDummySpriteAffineAnimTable, sub_81075EC - - .align 2 -gUnknown_085950FC:: @ 85950FC - spr_template 0x2813, 0x2813, gUnknown_08524A2C, gUnknown_085950E0, NULL, gDummySpriteAffineAnimTable, sub_81075EC - - .align 2 -gUnknown_08595114:: @ 8595114 - spr_template 0x2818, 0x2818, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81075EC - - .align 2 -gUnknown_0859512C:: @ 859512C - spr_template 0x2819, 0x2819, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81075EC - - .align 2 -gUnknown_08595144:: @ 8595144 - .2byte 0x0010, 0x0002, 0x0020, 0x0002, 0x0030, 0x0002, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595154:: @ 8595154 - .4byte gUnknown_08595144 - - .align 2 -gUnknown_08595158:: @ 8595158 - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08595154, NULL, gDummySpriteAffineAnimTable, sub_81075EC - - .align 2 -gUnknown_08595170:: @ 8595170 - spr_template 0x27b5, 0x27b5, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_81075EC - - .align 2 -gUnknown_08595188:: @ 8595188 - .2byte 0x0003, 0x0003, 0x320a, 0x0000, 0x0000, 0x0000, 0x0a00, 0x0000 - .2byte 0xffec, 0xffec, 0x14f6, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085951A8:: @ 85951A8 - .2byte 0x0150, 0x0150, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085951B8:: @ 85951B8 - .4byte gUnknown_08595188 - - .align 2 -gUnknown_085951BC:: @ 85951BC - .4byte gUnknown_085951A8 - - .align 2 -gUnknown_085951C0:: @ 85951C0 - spr_template 0x27a5, 0x27a5, gUnknown_08524AEC, gUnknown_085950E0, NULL, gUnknown_085951B8, sub_8107730 - - .align 2 -gUnknown_085951D8:: @ 85951D8 - spr_template 0x27a5, 0x27a5, gUnknown_08524AEC, gUnknown_085950E0, NULL, gUnknown_085951BC, sub_81077C0 - - .align 2 -gUnknown_085951F0:: @ 85951F0 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085951F8:: @ 85951F8 - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595200:: @ 8595200 - .4byte gUnknown_085951F0 - - .align 2 -gUnknown_08595204:: @ 8595204 - .4byte gUnknown_085951F8 - - .align 2 -gUnknown_08595208:: @ 8595208 - spr_template 0x27ab, 0x27ab, gUnknown_08524A2C, gUnknown_08595200, NULL, gDummySpriteAffineAnimTable, sub_80A78AC - - .align 2 -gUnknown_08595220:: @ 8595220 - spr_template 0x27ab, 0x27ab, gUnknown_08524AEC, gUnknown_08595204, NULL, gUnknown_08596208, sub_8107894 - - .align 2 -gUnknown_08595238:: @ 8595238 - spr_template 0x279d, 0x279d, gUnknown_08524904, gUnknown_08595AB8, NULL, gDummySpriteAffineAnimTable, sub_81078D0 - - .align 2 -gUnknown_08595250:: @ 8595250 - spr_template 0x27ab, 0x27ab, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8108034 - - .align 2 -gUnknown_08595268:: @ 8595268 - spr_template 0x281c, 0x281c, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810851C - - .align 2 -gUnknown_08595280:: @ 8595280 - .2byte 0x0008, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595288:: @ 8595288 - .2byte 0x0009, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595290:: @ 8595290 - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595298:: @ 8595298 - .4byte gUnknown_08595280 - .4byte gUnknown_08595288 - - .align 2 -gUnknown_085952A0:: @ 85952A0 - .4byte gUnknown_08595290 - - .align 2 -gUnknown_085952A4:: @ 85952A4 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff6, 0xfff6, 0x0f00, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085952BC:: @ 85952BC - .2byte 0x00e0, 0x00e0, 0x0000, 0x0000, 0xfff8, 0xfff8, 0x0f00, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085952D4:: @ 85952D4 - .2byte 0x0150, 0x0150, 0x0000, 0x0000, 0x0000, 0x0000, 0x0f00, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085952EC:: @ 85952EC - .4byte gUnknown_085952A4 - .4byte gUnknown_085952BC - - .align 2 -gUnknown_085952F4:: @ 85952F4 - .4byte gUnknown_085952D4 - - .align 2 -gUnknown_085952F8:: @ 85952F8 - spr_template 0x27ab, 0x27ab, gUnknown_08524904, gUnknown_08595298, NULL, gDummySpriteAffineAnimTable, sub_8108BE0 - - .align 2 -gUnknown_08595310:: @ 8595310 - spr_template 0x27ab, 0x27ab, gUnknown_08524964, gUnknown_08595298, NULL, gUnknown_085952EC, sub_8108C54 - - .align 2 -gUnknown_08595328:: @ 8595328 - spr_template 0x27ab, 0x27ab, gUnknown_0852496C, gUnknown_085952A0, NULL, gUnknown_085952F4, sub_80A8EE4 - - .align 2 -gUnknown_08595340:: @ 8595340 - .2byte 0x0010, 0x0004, 0x0020, 0x0004, 0x0030, 0x0004, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595350:: @ 8595350 - .2byte 0x0010, 0x00c4, 0x0020, 0x00c4, 0x0030, 0x00c4, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595360:: @ 8595360 - .4byte gUnknown_08595340 - .4byte gUnknown_08595350 - - .align 2 -gUnknown_08595368:: @ 8595368 - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08595360, NULL, gDummySpriteAffineAnimTable, sub_8108EC8 - - .align 2 -gUnknown_08595380:: @ 8595380 - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08595360, NULL, gDummySpriteAffineAnimTable, sub_8108F08 - - .align 2 -gUnknown_08595398:: @ 8595398 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003 - .2byte 0x0040, 0x0003, 0x0050, 0x0003, 0x0060, 0x0003, 0x0070, 0x0003 - .2byte 0xfffe, 0x0000 - - .align 2 -gUnknown_085953BC:: @ 85953BC - .4byte gUnknown_08595398 - - .align 2 -gUnknown_085953C0:: @ 85953C0 - .2byte 0x0000, 0x0005, 0x0010, 0x0005, 0x0020, 0x0005, 0x0030, 0x0005 - .2byte 0x0040, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_085953D8:: @ 85953D8 - .4byte gUnknown_085953C0 - - .align 2 -gUnknown_085953DC:: @ 85953DC - .2byte 0x0032, 0x0100, 0x0000, 0x0000, 0x0020, 0x0000, 0x0700, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085953F4:: @ 85953F4 - .4byte gUnknown_085953DC - - .align 2 -gUnknown_085953F8:: @ 85953F8 - spr_template 0x2731, 0x2731, gUnknown_08524974, gUnknown_085953BC, NULL, gUnknown_085953F4, sub_8108FBC - - .align 2 -gUnknown_08595410:: @ 8595410 - spr_template 0x2731, 0x2731, gUnknown_08524914, gUnknown_085953BC, NULL, gDummySpriteAffineAnimTable, sub_8108FBC - - .align 2 -gUnknown_08595428:: @ 8595428 - spr_template 0x2733, 0x2733, gUnknown_08524914, gUnknown_085953D8, NULL, gDummySpriteAffineAnimTable, sub_8108F4C - - .align 2 -gUnknown_08595440:: @ 8595440 - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085953D8, NULL, gDummySpriteAffineAnimTable, sub_8108F4C - - .align 2 -gUnknown_08595458:: @ 8595458 - .2byte 0x0010, 0x0006, 0x0020, 0x0006, 0x0030, 0x0006, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595468:: @ 8595468 - .4byte gUnknown_08595458 - - .align 2 -gUnknown_0859546C:: @ 859546C - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08595468, NULL, gDummySpriteAffineAnimTable, sub_8109064 - - .align 2 -gUnknown_08595484:: @ 8595484 - .2byte 0x0050, 0x0050, 0x0000, 0x0000, 0x0002, 0x0002, 0x010a, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_0859549C:: @ 859549C - .4byte gUnknown_08595484 - - .align 2 -gUnknown_085954A0:: @ 85954A0 - spr_template 0x27ad, 0x27ad, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_0859549C, sub_810916C - - .align 2 -gUnknown_085954B8:: @ 85954B8 - .2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0x0030, 0x0004 - .2byte 0x0040, 0x0004, 0xfffe, 0x0000 - - .align 2 -gUnknown_085954D0:: @ 85954D0 - .4byte gUnknown_085954B8 - - .align 2 -gEmberSpriteTemplate:: @ 85954D4 - spr_template 0x272d, 0x272d, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation - - .align 2 -gEmberFlareSpriteTemplate:: @ 85954EC - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8109198 - - .align 2 -gUnknown_08595504:: @ 8595504 - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8109200 - - .align 2 -gUnknown_0859551C:: @ 859551C - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_810921C - - .align 2 -gUnknown_08595534:: @ 8595534 - .2byte 0x0020, 0x0006, 0x0030, 0x0006, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595540:: @ 8595540 - .4byte gUnknown_08595534 - - .align 2 -gUnknown_08595544:: @ 8595544 - .2byte 0x0000, 0x0000, 0x0100, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595554:: @ 8595554 - .2byte 0x00a0, 0x00a0, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595564:: @ 8595564 - .4byte gUnknown_08595544 - .4byte gUnknown_08595554 - - .align 2 -gUnknown_0859556C:: @ 859556C - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08595540, NULL, gDummySpriteAffineAnimTable, sub_8109364 - - .align 2 -gBattleAnimSpriteTemplate_8595584:: @ 8595584 - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_81093A4 - - .align 2 -gUnknown_0859559C:: @ 859559C - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4 - - .align 2 -gUnknown_085955B4:: @ 85955B4 - spr_template 0x27d9, 0x27d9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81098EC - - .align 2 -gUnknown_085955CC:: @ 85955CC - .2byte 0xfffe, 0xfffb, 0xffff, 0xffff, 0x0003, 0xfffa, 0x0004, 0xfffe - .2byte 0x0002, 0xfff8, 0xfffb, 0xfffb, 0x0004, 0xfff9 - - .align 2 -gUnknown_085955E8:: @ 85955E8 - spr_template 0x27d9, 0x27d9, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8109A10 - - .align 2 -gUnknown_08595600:: @ 8595600 - .2byte 0x0000, 0x0005, 0x0004, 0x0005, 0x0008, 0x0005, 0x000c, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595614:: @ 8595614 - .2byte 0x0010, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_0859561C:: @ 859561C - .2byte 0x0014, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08595624:: @ 8595624 - .2byte 0x0014, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_0859562C:: @ 859562C - .4byte gUnknown_08595600 - .4byte gUnknown_08595614 - .4byte gUnknown_0859561C - .4byte gUnknown_08595624 - - .align 2 -gUnknown_0859563C:: @ 859563C - spr_template 0x27f7, 0x27f7, gUnknown_0852490C, gUnknown_0859562C, NULL, gDummySpriteAffineAnimTable, sub_8109AFC - - .align 2 -gUnknown_08595654:: @ 8595654 - .2byte 0x0000, 0x0005, 0x0010, 0x0005, 0x0020, 0x0005, 0x0030, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595668:: @ 8595668 - .4byte gUnknown_08595654 - - .align 2 -gUnknown_0859566C:: @ 859566C - spr_template 0x27f8, 0x27f8, gUnknown_08524914, gUnknown_08595668, NULL, gDummySpriteAffineAnimTable, sub_8109CB0 - - .align 2 -gUnknown_08595684:: @ 8595684 - .2byte 0xffff, 0x0100, 0x0001, 0xff00, 0x01ff, 0x0001, 0xff00, 0x0100 - - .align 2 -gUnknown_08595694:: @ 8595694 - .2byte 0x00ff, 0x0001, 0x01ff, 0xff00, 0x0100, 0xff00, 0x0100, 0x0100 - - .align 2 -gUnknown_085956A4:: @ 85956A4 - .2byte 0x0000, 0x0005, 0x0010, 0x0005, 0x0020, 0x0008, 0x0030, 0x0005 - .2byte 0x0040, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_085956BC:: @ 85956BC - .4byte gUnknown_085956A4 - - .align 2 -gUnknown_085956C0:: @ 85956C0 - spr_template 0x2735, 0x2735, gUnknown_08524914, gUnknown_085956BC, NULL, gDummySpriteAffineAnimTable, sub_810A1A8 - - .align 2 -gUnknown_085956D8:: @ 85956D8 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000 - .2byte 0x0000, 0x0000, 0x3cf0, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085956F8:: @ 85956F8 - .4byte gUnknown_085956D8 - - .align 2 -gUnknown_085956FC:: @ 85956FC - spr_template 0x279f, 0x279f, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085956F8, sub_810A214 - - .align 2 -gUnknown_08595714:: @ 8595714 - .2byte 0x0000, 0x0005, 0x0010, 0x0005, 0x0020, 0x0005, 0x0030, 0x0005 - .2byte 0x0040, 0x0005, 0x0050, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595730:: @ 8595730 - .4byte gUnknown_08595714 - - .align 2 -gUnknown_08595734:: @ 8595734 - spr_template 0x275f, 0x275f, gUnknown_08524914, gUnknown_08595730, NULL, gDummySpriteAffineAnimTable, sub_810A274 - - .align 2 -gBattleAnimSpriteTemplate_859574C:: @ 859574C - spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A308 - - .align 2 -gUnknown_08595764:: @ 8595764 - spr_template 0x27bb, 0x27bb, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation - - .align 2 -gUnknown_0859577C:: @ 859577C - .2byte 0x0000, 0x0000, 0x0114, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859578C:: @ 859578C - .4byte gUnknown_0859577C - - .align 2 -gUnknown_08595790:: @ 8595790 - spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_0859578C, sub_810A46C - - .align 2 -gUnknown_085957A8:: @ 85957A8 - .2byte 0x0000, 0x0006, 0x0010, 0x0006, 0x0020, 0x0006, 0xfffe, 0x0000 - - .align 2 -gUnknown_085957B8:: @ 85957B8 - .4byte gUnknown_085957A8 - - .align 2 -gUnknown_085957BC:: @ 85957BC - .2byte 0x00e8, 0x00e8, 0x0000, 0x0000, 0xfff8, 0xfff8, 0x0a00, 0x0000 - .2byte 0x0008, 0x0008, 0x0a00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_085957DC:: @ 85957DC - .4byte gUnknown_085957BC - - .align 2 -gBattleAnimSpriteTemplate_85957E0:: @ 85957E0 - spr_template 0x282a, 0x282a, gUnknown_08524974, gUnknown_085957B8, NULL, gUnknown_085957DC, sub_810A5BC - - .align 2 -gBattleAnimSpriteTemplate_85957F8:: @ 85957F8 - spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_0859578C, sub_810A628 - - .align 2 -gElectricitySpriteTemplate:: @ 8595810 - spr_template 0x271b, 0x271b, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A75C - - .align 2 -gUnknown_08595828:: @ 8595828 - spr_template 0x2711, 0x2711, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A9DC - - .align 2 -gUnknown_08595840:: @ 8595840 - spr_template 0x27bd, 0x27bd, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810AA2C - - .align 2 -gUnknown_08595858:: @ 8595858 - .byte 0x3a, 0xc4, 0xc8, 0xdc, 0x08, 0xc8, 0xf0, 0x38 - .byte 0x3a, 0xf6, 0xc6, 0x0a, 0x30, 0xee, 0xf8, 0x38 - .byte 0x10, 0xc8, 0xc6, 0xd6, 0x3a, 0x1e, 0xd0, 0x28 - .byte 0x0c, 0xd0, 0x30, 0xf4, 0xc8, 0x12, 0x30, 0x30 - - .align 2 -gUnknown_08595878:: @ 8595878 - .2byte 0x0003, 0x0001, 0x0002, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_0859588C:: @ 859588C - .2byte 0x0000, 0x0005, 0x0001, 0x0005, 0x0002, 0x0005, 0x0003, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_085958A0:: @ 85958A0 - .4byte gUnknown_08595878 - .4byte gUnknown_0859588C - - .align 2 -gUnknown_085958A8:: @ 85958A8 - spr_template 0x27e3, 0x27e3, gUnknown_08524904, gUnknown_085958A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_085958C0:: @ 85958C0 - .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0004, 0x0004, 0x3c00, 0x0000 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffd, 0x0000, 0x0000, 0x0000 - .2byte 0xfffc, 0xfffc, 0x0500, 0x0000, 0x0004, 0x0004, 0x0500, 0x0000 - .2byte 0x7ffd, 0x000a, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595900:: @ 8595900 - .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0008, 0x0008, 0x1e00, 0x0000 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfffc, 0xfffc, 0x0500, 0x0000 - .2byte 0x0004, 0x0004, 0x0500, 0x0000, 0x7ffe, 0x0003, 0x0000, 0x0000 - - .align 2 -gUnknown_08595930:: @ 8595930 - .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0008, 0x0008, 0x1e00, 0x0000 - .2byte 0xfff8, 0xfff8, 0x1e00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595950:: @ 8595950 - .4byte gUnknown_085958C0 - .4byte gUnknown_08595900 - .4byte gUnknown_08595930 - - .align 2 -gUnknown_0859595C:: @ 859595C - spr_template 0x27e4, 0x27e4, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08595950, sub_810ACD8 - - .align 2 -gUnknown_08595974:: @ 8595974 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_08595988:: @ 8595988 - .4byte gUnknown_08595974 - - .align 2 -gUnknown_0859598C:: @ 859598C - spr_template 0x27e5, 0x27e5, gUnknown_08524914, gUnknown_08595988, NULL, gDummySpriteAffineAnimTable, sub_810AD30 - - .align 2 -gUnknown_085959A4:: @ 85959A4 - spr_template 0x27e4, 0x27e4, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08595950, sub_810AD98 - - .align 2 -gUnknown_085959BC:: @ 85959BC - .2byte 0x0000, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_085959C4:: @ 85959C4 - .2byte 0x0002, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_085959CC:: @ 85959CC - .2byte 0x0004, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_085959D4:: @ 85959D4 - .2byte 0x0006, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_085959DC:: @ 85959DC - .4byte gUnknown_085959BC - .4byte gUnknown_085959C4 - .4byte gUnknown_085959CC - .4byte gUnknown_085959D4 - - .align 2 -gUnknown_085959EC:: @ 85959EC - .2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085959FC:: @ 85959FC - .4byte gUnknown_085959EC - - .align 2 -gUnknown_08595A00:: @ 8595A00 - spr_template 0x2711, 0x2711, gUnknown_08524A04, gUnknown_085959DC, NULL, gUnknown_085959FC, sub_810B1F0 - - .align 2 -gUnknown_08595A18:: @ 8595A18 - spr_template 0x27e4, 0x27e4, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08595950, sub_810B23C - - .align 2 -gUnknown_08595A30:: @ 8595A30 - spr_template 0x2711, 0x2711, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810B51C - - .align 2 -gUnknown_08595A48:: @ 8595A48 - .2byte 0x0000, 0x0045, 0x0001, 0x0045, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595A54:: @ 8595A54 - .4byte gUnknown_08595A48 - - .align 2 -gUnknown_08595A58:: @ 8595A58 - spr_template 0x279d, 0x279d, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810B6C4 - - .align 2 -gUnknown_08595A70:: @ 8595A70 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595A78:: @ 8595A78 - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595A80:: @ 8595A80 - .2byte 0x0006, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595A88:: @ 8595A88 - .2byte 0x0007, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595A90:: @ 8595A90 - .2byte 0x0008, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595A98:: @ 8595A98 - .2byte 0x000c, 0x0006, 0x000d, 0x0006, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595AA4:: @ 8595AA4 - .4byte gUnknown_08595A70 - - .align 2 -gUnknown_08595AA8:: @ 8595AA8 - .4byte gUnknown_08595A78 - - .align 2 -gUnknown_08595AAC:: @ 8595AAC - .4byte gUnknown_08595A80 - - .align 2 -gUnknown_08595AB0:: @ 8595AB0 - .4byte gUnknown_08595A88 - - .align 2 -gUnknown_08595AB4:: @ 8595AB4 - .4byte gUnknown_08595A90 - - .align 2 -gUnknown_08595AB8:: @ 8595AB8 - .4byte gUnknown_08595A98 - - .align 2 -gUnknown_08595ABC:: @ 8595ABC - .2byte 0x0000, 0x0000, 0x0128, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595ACC:: @ 8595ACC - .4byte gUnknown_08595ABC - - .align 2 -gUnknown_08595AD0:: @ 8595AD0 - spr_template 0x279d, 0x279d, gUnknown_08524B24, gUnknown_08595AA8, NULL, gUnknown_08595ACC, sub_810B8AC - - .align 2 -gUnknown_08595AE8:: @ 8595AE8 - spr_template 0x279d, 0x279d, gUnknown_08524A24, gUnknown_08595AAC, NULL, gDummySpriteAffineAnimTable, sub_810B8AC - - .align 2 -gUnknown_08595B00:: @ 8595B00 - .2byte 0x0000, 0x0000, 0x010a, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595B10:: @ 8595B10 - .4byte gUnknown_08595B00 - - .align 2 -gUnknown_08595B14:: @ 8595B14 - spr_template 0x279d, 0x279d, gUnknown_08524AC4, gUnknown_08595AA8, NULL, gUnknown_08595B10, sub_810B8EC - - .align 2 -gUnknown_08595B2C:: @ 8595B2C - spr_template 0x279d, 0x279d, gUnknown_08524A24, gUnknown_08595AAC, NULL, gDummySpriteAffineAnimTable, sub_810B8EC - - .align 2 -gUnknown_08595B44:: @ 8595B44 - .2byte 0x00ce, 0x00ce, 0x0000, 0x0000, 0x0005, 0x0005, 0x0a00, 0x0000 - .2byte 0x0000, 0x0000, 0x0600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595B64:: @ 8595B64 - .4byte gUnknown_08595B44 - - .align 2 -gUnknown_08595B68:: @ 8595B68 - spr_template 0x279d, 0x279d, gUnknown_08524AC4, gUnknown_08595AA8, NULL, gUnknown_08595B64, sub_810B974 - - .align 2 -gUnknown_08595B80:: @ 8595B80 - spr_template 0x279d, 0x279d, gUnknown_08524A84, gUnknown_08595AAC, NULL, gUnknown_08595B64, sub_810B974 - - .align 2 -gUnknown_08595B98:: @ 8595B98 - spr_template 0x279d, 0x279d, gUnknown_08524904, gUnknown_08595AB0, NULL, gDummySpriteAffineAnimTable, sub_810BA24 - - .align 2 -gUnknown_08595BB0:: @ 8595BB0 - spr_template 0x279d, 0x279d, gUnknown_0852490C, gUnknown_08595AB4, NULL, gDummySpriteAffineAnimTable, sub_810BC94 - - .align 2 -gUnknown_08595BC8:: @ 8595BC8 - spr_template 0x279d, 0x279d, gUnknown_08524904, gUnknown_08595AB0, NULL, gDummySpriteAffineAnimTable, sub_810BC94 - - .align 2 -gUnknown_08595BE0:: @ 8595BE0 - .2byte 0x0000, 0x0005, 0x0002, 0x0005, 0x0004, 0x0005, 0x0006, 0x0005 - .2byte 0x0004, 0x0005, 0x0002, 0x0005, 0x0000, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08595C00:: @ 8595C00 - .4byte gUnknown_08595BE0 - - .align 2 -gUnknown_08595C04:: @ 8595C04 - spr_template 0x279e, 0x279e, gUnknown_08524A64, gUnknown_08595C00, NULL, gDummySpriteAffineAnimTable, sub_810BE48 - - .align 2 -gUnknown_08595C1C:: @ 8595C1C - .2byte 0x0000, 0x0008, 0x0008, 0x0008, 0xfffe, 0x0000 - - .align 2 -gUnknown_08595C28:: @ 8595C28 - .4byte gUnknown_08595C1C - - .align 2 -gUnknown_08595C2C:: @ 8595C2C - spr_template 0x27a0, 0x27a0, gUnknown_08524A54, gUnknown_08595C28, NULL, gDummySpriteAffineAnimTable, sub_810BED0 - - .align 2 -gUnknown_08595C44:: @ 8595C44 - spr_template 0x27bc, 0x27bc, gUnknown_08524A54, gUnknown_08595C28, NULL, gDummySpriteAffineAnimTable, sub_810BED0 - - .align 2 -gUnknown_08595C5C:: @ 8595C5C - .byte 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x04 - .byte 0x04, 0x04, 0x05, 0x06, 0x06, 0x06, 0x06, 0x07 - .byte 0x08, 0x08, 0x08, 0x09 - - .align 2 -gUnknown_08595C70:: @ 8595C70 - spr_template 0x27ab, 0x27ab, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810C2F0 - - .align 2 -gUnknown_08595C88:: @ 8595C88 - .byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02 - .byte 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04 - .byte 0x04, 0x04, 0x04, 0x05 - - .align 2 -gUnknown_08595C9C:: @ 8595C9C - spr_template 0x27bc, 0x27bc, gUnknown_08524A54, gUnknown_08595C28, NULL, gDummySpriteAffineAnimTable, sub_810C560 - - .align 2 -gUnknown_08595CB4:: @ 8595CB4 - .byte 0x64, 0xe0, 0x01, 0x20, 0x55, 0xe0, 0x01, 0x00 - .byte 0xf2, 0xe0, 0x11, 0x10, 0x42, 0xe0, 0x21, 0x10 - .byte 0xb6, 0xe0, 0x31, 0x00, 0x3c, 0xe0, 0x01, 0x20 - .byte 0xd6, 0xe0, 0x11, 0x00, 0x71, 0xe0, 0x01, 0x10 - .byte 0xd2, 0xe0, 0x31, 0x10, 0x26, 0xe0, 0x21, 0x00 - - .align 2 -gUnknown_08595CDC:: @ 8595CDC - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595CEC:: @ 8595CEC - .2byte 0x00f0, 0x00f0, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595CFC:: @ 8595CFC - .2byte 0x00e0, 0x00e0, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595D0C:: @ 8595D0C - .2byte 0x0150, 0x0150, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595D1C:: @ 8595D1C - .4byte gUnknown_08595CDC - .4byte gUnknown_08595CEC - .4byte gUnknown_08595CFC - - .align 2 -gUnknown_08595D28:: @ 8595D28 - .4byte gUnknown_08595D0C - - .align 2 -gUnknown_08595D2C:: @ 8595D2C - spr_template 0x2817, 0x2817, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08595D1C, sub_810CB58 - - .align 2 -gUnknown_08595D44:: @ 8595D44 - spr_template 0x2817, 0x2817, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08595D28, sub_80A8EE4 - - .align 2 -gUnknown_08595D5C:: @ 8595D5C - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595D64:: @ 8595D64 - .2byte 0x0010, 0x0004, 0x0020, 0x0004, 0x0030, 0x0004, 0x0040, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08595D78:: @ 8595D78 - .4byte gUnknown_08595D5C - .4byte gUnknown_08595D64 - - .align 2 -gUnknown_08595D80:: @ 8595D80 - .2byte 0x00e0, 0x00e0, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595D90:: @ 8595D90 - .2byte 0x0118, 0x0118, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595DA0:: @ 8595DA0 - .2byte 0x0150, 0x0150, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595DB0:: @ 8595DB0 - .2byte 0x0180, 0x0180, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595DC0:: @ 8595DC0 - .2byte 0x01c0, 0x01c0, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08595DD0:: @ 8595DD0 - .4byte gUnknown_08595D80 - .4byte gUnknown_08595D90 - .4byte gUnknown_08595DA0 - .4byte gUnknown_08595DB0 - .4byte gUnknown_08595DC0 - - .align 2 -gUnknown_08595DE4:: @ 8595DE4 - spr_template 0x273b, 0x273b, gUnknown_085249D4, gUnknown_08595D78, NULL, gUnknown_08595DD0, unc_080B06FC - - .align 2 -gUnknown_08595DFC:: @ 8595DFC - spr_template 0x279d, 0x279d, gUnknown_08524904, gUnknown_08595AAC, NULL, gDummySpriteAffineAnimTable, sub_810CD4C - - .align 2 -gUnknown_08595E14:: @ 8595E14 - spr_template 0x2742, 0x2742, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, unc_080B08A0 - - .align 2 -gUnknown_08595E2C:: @ 8595E2C - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595E34:: @ 8595E34 - .2byte 0x0010, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595E3C:: @ 8595E3C - .2byte 0x0020, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595E44:: @ 8595E44 - .2byte 0x0030, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08595E4C:: @ 8595E4C - .2byte 0x0030, 0x0041, 0xffff, 0x0000 - - .align 2 -gUnknown_08595E54:: @ 8595E54 - .4byte gUnknown_08595E2C - - .align 2 -gUnknown_08595E58:: @ 8595E58 - .4byte gUnknown_08595E34 - .4byte gUnknown_08595E3C - - .align 2 -gUnknown_08595E60:: @ 8595E60 - .4byte gUnknown_08595E44 - .4byte gUnknown_08595E4C - - .align 2 -gUnknown_08595E68:: @ 8595E68 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CE68 - - .align 2 -gUnknown_08595E80:: @ 8595E80 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEB4 - - .align 2 -gFistFootSpriteTemplate:: @ 8595E98 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEE0 - - .align 2 -gUnknown_08595EB0:: @ 8595EB0 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CF30 - - .align 2 -gUnknown_08595EC8:: @ 8595EC8 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E60, NULL, gDummySpriteAffineAnimTable, sub_810D10C - - .align 2 -gUnknown_08595EE0:: @ 8595EE0 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E58, NULL, gDummySpriteAffineAnimTable, sub_810D1B4 - - .align 2 -gUnknown_08595EF8:: @ 8595EF8 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff8, 0xfff8, 0x0114, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08595F10:: @ 8595F10 - .4byte gUnknown_08595EF8 - - .align 2 -gUnknown_08595F14:: @ 8595F14 - spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F10, sub_810D278 - - .align 2 -gUnknown_08595F2C:: @ 8595F2C - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfffc, 0xfffc, 0x0114, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08595F44:: @ 8595F44 - .4byte gUnknown_08595F2C - - .align 2 -gMegaPunchKickSpriteTemplate:: @ 8595F48 - spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F44, sub_810D278 - - .align 2 -gUnknown_08595F60:: @ 8595F60 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E58, NULL, gDummySpriteAffineAnimTable, sub_810D2E4 - - .align 2 -gUnknown_08595F78:: @ 8595F78 - spr_template 0x2759, 0x2759, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D37C - - .align 2 -gUnknown_08595F90:: @ 8595F90 - spr_template 0x27b7, 0x27b7, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D40C - - .align 2 -gUnknown_08595FA8:: @ 8595FA8 - spr_template 0x27e0, 0x27e0, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D4F4 - - .align 2 -gUnknown_08595FC0:: @ 8595FC0 - .2byte 0x0020, 0x0020, 0x0000, 0x0000, 0x0004, 0x0004, 0x4000, 0x0000 - .2byte 0xfffa, 0xfffa, 0x0800, 0x0000, 0x0006, 0x0006, 0x0800, 0x0000 - .2byte 0x7ffe, 0x0002, 0x0000, 0x0000 - - .align 2 -gUnknown_08595FE8:: @ 8595FE8 - .4byte gUnknown_08595FC0 - - .align 2 -gUnknown_08595FEC:: @ 8595FEC - spr_template 0x27e4, 0x27e4, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08595FE8, sub_810D608 - - .align 2 -gUnknown_08596004:: @ 8596004 - spr_template 0x2811, 0x2811, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D714 - - .align 2 -gUnknown_0859601C:: @ 859601C - spr_template 0x2810, 0x2810, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D874 - - .align 2 -gUnknown_08596034:: @ 8596034 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810D984 - - .align 2 -gUnknown_0859604C:: @ 859604C - .2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_0859605C:: @ 859605C - .2byte 0x0000, 0x0084, 0x0010, 0x0084, 0x0020, 0x0084, 0xffff, 0x0000 - - .align 2 -gUnknown_0859606C:: @ 859606C - .2byte 0x0000, 0x0044, 0x0010, 0x0044, 0x0020, 0x0044, 0xffff, 0x0000 - - .align 2 -gUnknown_0859607C:: @ 859607C - .4byte gUnknown_0859604C - .4byte gUnknown_0859605C - .4byte gUnknown_0859606C - - .align 2 -gUnknown_08596088:: @ 8596088 - spr_template 0x2805, 0x2805, gUnknown_08524914, gUnknown_0859607C, NULL, gDummySpriteAffineAnimTable, sub_810DA10 - - .align 2 -gUnknown_085960A0:: @ 85960A0 - .2byte 0x0000, 0x0006, 0x0040, 0x0006, 0xffff, 0x0000 - - .align 2 -gUnknown_085960AC:: @ 85960AC - .2byte 0x0000, 0x00c6, 0x0040, 0x00c6, 0xffff, 0x0000 - - .align 2 -gUnknown_085960B8:: @ 85960B8 - .2byte 0x0000, 0x0046, 0x0040, 0x0046, 0xffff, 0x0000 - - .align 2 -gUnknown_085960C4:: @ 85960C4 - .4byte gUnknown_085960A0 - .4byte gUnknown_085960AC - .4byte gUnknown_085960B8 - - .align 2 -gUnknown_085960D0:: @ 85960D0 - spr_template 0x2806, 0x2806, gUnknown_0852491C, gUnknown_085960C4, NULL, gDummySpriteAffineAnimTable, sub_810DA10 - - .align 2 -gUnknown_085960E8:: @ 85960E8 - .2byte 0x0200, 0x0200, 0x0000, 0x0000, 0xffe0, 0xffe0, 0x0800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596100:: @ 8596100 - .4byte gUnknown_085960E8 - - .align 2 -gUnknown_08596104:: @ 8596104 - spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08596100, sub_810DA7C - - .align 2 -gUnknown_0859611C:: @ 859611C - .2byte 0x0000, 0x0005, 0x0008, 0x0005, 0x0010, 0x0005, 0x0018, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08596130:: @ 8596130 - .4byte gUnknown_0859611C - - .align 2 -gUnknown_08596134:: @ 8596134 - spr_template 0x27a7, 0x27a7, gUnknown_08524954, gUnknown_08596130, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 - - .align 2 -gUnknown_0859614C:: @ 859614C - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596154:: @ 8596154 - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_0859615C:: @ 859615C - .2byte 0x0008, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596164:: @ 8596164 - .4byte gUnknown_0859614C - - .align 2 -gUnknown_08596168:: @ 8596168 - .4byte gUnknown_08596154 - - .align 2 -gUnknown_0859616C:: @ 859616C - .4byte gUnknown_0859615C - - .align 2 -gUnknown_08596170:: @ 8596170 - .2byte 0x0160, 0x0160, 0x0000, 0x0000, 0xfff6, 0xfff6, 0x0a00, 0x0000 - .2byte 0x000a, 0x000a, 0x0a00, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596190:: @ 8596190 - .2byte 0x00ec, 0x00ec, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085961A0:: @ 85961A0 - .4byte gUnknown_08596170 - - .align 2 -gUnknown_085961A4:: @ 85961A4 - .4byte gUnknown_08596190 - - .align 2 -gUnknown_085961A8:: @ 85961A8 - spr_template 0x27a6, 0x27a6, gUnknown_085249CC, gUnknown_08596164, NULL, gUnknown_085961A0, sub_810DBAC - - .align 2 -gUnknown_085961C0:: @ 85961C0 - spr_template 0x27a6, 0x27a6, gUnknown_085249CC, gUnknown_08596164, NULL, gUnknown_085961A0, sub_810DC2C - - .align 2 -gUnknown_085961D8:: @ 85961D8 - spr_template 0x27a6, 0x27a6, gUnknown_0852496C, gUnknown_0859616C, NULL, gUnknown_085961A4, sub_810DCD0 - - .align 2 -gUnknown_085961F0:: @ 85961F0 - .2byte 0xfff0, 0x0010, 0x0600, 0x0000, 0x0010, 0xfff0, 0x0600, 0x0000 - .2byte 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596208:: @ 8596208 - .4byte gUnknown_085961F0 - - .align 2 -gUnknown_0859620C:: @ 859620C - spr_template 0x27a6, 0x27a6, gUnknown_085249CC, gUnknown_08596168, NULL, gUnknown_08596208, sub_810DD50 - - .align 2 -gUnknown_08596224:: @ 8596224 - .2byte 0x009c, 0x009c, 0x0000, 0x0000, 0x0005, 0x0005, 0x1400, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859623C:: @ 859623C - .4byte gUnknown_08596224 - - .align 2 -gPoisonBubbleSpriteTemplate:: @ 8596240 - spr_template 0x27a6, 0x27a6, gUnknown_0852496C, gUnknown_08596164, NULL, gUnknown_0859623C, sub_810DDC4 - - .align 2 -gWaterBubbleSpriteTemplate:: @ 8596258 - spr_template 0x27ab, 0x27ab, gUnknown_08524A8C, gUnknown_08595200, NULL, gUnknown_0859623C, sub_810DDC4 - - .align 2 -gUnknown_08596270:: @ 8596270 - spr_template 0x2719, 0x2719, gUnknown_0852495C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810DE70 - - .align 2 -gUnknown_08596288:: @ 8596288 - .2byte 0x0010, 0x0100, 0x0000, 0x0000, 0x000a, 0x0000, 0x1800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085962A0:: @ 85962A0 - .4byte gUnknown_08596288 - - .align 2 -gBattleAnimSpriteTemplate_85962A4:: @ 85962A4 - spr_template 0x2719, 0x2719, gUnknown_085249BC, gDummySpriteAnimTable, NULL, gUnknown_085962A0, sub_810DFA8 - - .align 2 -gUnknown_085962BC:: @ 85962BC - .2byte 0x0000, 0x0003, 0x0000, 0x0043, 0x0000, 0x0083, 0x0000, 0x00c3, 0xfffe, 0x0000 - - .align 2 -gUnknown_085962D0:: @ 85962D0 - .4byte gUnknown_085962BC - - .align 2 -gUnknown_085962D4:: @ 85962D4 - spr_template 0x27aa, 0x27aa, gUnknown_08524934, gUnknown_085962D0, NULL, gDummySpriteAffineAnimTable, sub_810E044 - - .align 2 -gUnknown_085962EC:: @ 85962EC - .2byte 0x0010, 0x0100, 0x0000, 0x0000, 0x0028, 0x0000, 0x0600, 0x0000 - .2byte 0x0000, 0xffe0, 0x0500, 0x0000, 0xfff0, 0x0020, 0x0a00, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596314:: @ 8596314 - .4byte gUnknown_085962EC - - .align 2 -gUnknown_08596318:: @ 8596318 - .2byte 0x0000, 0x0000, 0x0132, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596328:: @ 8596328 - .2byte 0x0000, 0x0000, 0x01d8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596338:: @ 8596338 - .4byte gUnknown_08596318 - .4byte gUnknown_08596328 - - .align 2 -gUnknown_08596340:: @ 8596340 - spr_template 0x27ac, 0x27ac, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_08596314, sub_810E13C - - .align 2 -gUnknown_08596358:: @ 8596358 - spr_template 0x27ac, 0x27ac, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gUnknown_08596338, sub_810E1C8 - - .align 2 -gUnknown_08596370:: @ 8596370 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_08596378:: @ 8596378 - .2byte 0x0010, 0x0040, 0xffff, 0x0000 - - .align 2 -gUnknown_08596380:: @ 8596380 - .4byte gUnknown_08596370 - .4byte gUnknown_08596378 - - .align 2 -gUnknown_08596388:: @ 8596388 - spr_template 0x281e, 0x281e, gUnknown_08524974, gUnknown_08596380, NULL, gDummySpriteAffineAnimTable, sub_810E314 - - .align 2 -gUnknown_085963A0:: @ 85963A0 - spr_template 0x27ab, 0x27ab, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810EA4C - - .align 2 -gUnknown_085963B8:: @ 85963B8 - .2byte 0x0000, 0x0001, 0x0008, 0x0001, 0x0010, 0x0001, 0x0008, 0x0041 - .2byte 0x0000, 0x0041, 0xffff, 0x0000 - - .align 2 -gUnknown_085963D0:: @ 85963D0 - .4byte gUnknown_085963B8 - - .align 2 -gUnknown_085963D4:: @ 85963D4 - spr_template 0x27b2, 0x27b2, gUnknown_08524934, gUnknown_085963D0, NULL, gDummySpriteAffineAnimTable, sub_810EAA0 - - .align 2 -gUnknown_085963EC:: @ 85963EC - .2byte 0x0010, 0x0100, 0x0000, 0x0000, 0x0028, 0x0000, 0x0600, 0x0000 - .2byte 0x0000, 0xffe0, 0x0500, 0x0000, 0xffec, 0x0000, 0x0700, 0x0000 - .2byte 0xffec, 0xffec, 0x0500, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859641C:: @ 859641C - .4byte gUnknown_085963EC - - .align 2 -gUnknown_08596420:: @ 8596420 - spr_template 0x27ac, 0x27ac, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_0859641C, sub_810EC34 - - .align 2 -gUnknown_08596438:: @ 8596438 - .2byte 0x00a0, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596448:: @ 8596448 - .4byte gUnknown_08596438 - - .align 2 -gUnknown_0859644C:: @ 859644C - spr_template 0x27ac, 0x27ac, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_08596448, sub_810EC94 - - .align 2 -gUnknown_08596464:: @ 8596464 - .2byte 0x0010, 0x0100, 0x0000, 0x0000, 0x0028, 0x0000, 0x0600, 0x0000 - .2byte 0x0000, 0xffe0, 0x0500, 0x0000, 0xfff0, 0x0020, 0x0a00, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859648C:: @ 859648C - .4byte gUnknown_08596464 - - .align 2 -gUnknown_08596490:: @ 8596490 - spr_template 0x27ac, 0x27ac, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_0859648C, sub_810ED28 - - .align 2 -gUnknown_085964A8:: @ 85964A8 - .2byte 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, 0x0c00, 0x0000 - .2byte 0x0000, 0xffe0, 0x0b00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085964C8:: @ 85964C8 - .4byte gUnknown_085964A8 - - .align 2 -gUnknown_085964CC:: @ 85964CC - spr_template 0x2820, 0x2820, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810EE14 - - .align 2 -gUnknown_085964E4:: @ 85964E4 - spr_template 0x2821, 0x2821, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810EEF8 - - .align 2 -gUnknown_085964FC:: @ 85964FC - spr_template 0x27e4, 0x27e4, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F004 - - .align 2 -gUnknown_08596514:: @ 8596514 - spr_template 0x282c, 0x282c, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F084 - - .align 2 -gUnknown_0859652C:: @ 859652C - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfffe, 0xfffe, 0x78f6, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596544:: @ 8596544 - .4byte gUnknown_0859652C - - .align 2 -gUnknown_08596548:: @ 8596548 - spr_template 0x27d4, 0x27d4, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08596544, sub_80A77C8 - - .align 2 -gUnknown_08596560:: @ 8596560 - spr_template 0x27b6, 0x27b6, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC - - .align 2 -gUnknown_08596578:: @ 8596578 - spr_template 0x27b7, 0x27b7, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC - - .align 2 -gUnknown_08596590:: @ 8596590 - spr_template 0x27b8, 0x27b8, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC - - .align 2 -gUnknown_085965A8:: @ 85965A8 - spr_template 0x27b9, 0x27b9, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC - - .align 2 -gUnknown_085965C0:: @ 85965C0 - spr_template 0x27ba, 0x27ba, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC - - .align 2 -gUnknown_085965D8:: @ 85965D8 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003 - .2byte 0x0040, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_085965F0:: @ 85965F0 - .4byte gUnknown_085965D8 - - .align 2 -gUnknown_085965F4:: @ 85965F4 - spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_085965F0, NULL, gDummySpriteAffineAnimTable, sub_810F58C - - .align 2 -gUnknown_0859660C:: @ 859660C - .2byte 0x0000, 0x0005, 0x0004, 0x0005, 0x0008, 0x0005, 0x000c, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08596620:: @ 8596620 - .4byte gUnknown_0859660C - - .align 2 -gUnknown_08596624:: @ 8596624 - spr_template 0x2756, 0x2756, gUnknown_0852490C, gUnknown_08596620, NULL, gDummySpriteAffineAnimTable, sub_810F58C - - .align 2 -gUnknown_0859663C:: @ 859663C - spr_template 0x27b3, 0x27b3, gUnknown_08524954, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation - - .align 2 -gUnknown_08596654:: @ 8596654 - .2byte 0x0008, 0x007c, 0x0010, 0x0045, 0x0008, 0x0045, 0x0000, 0x0045 - .2byte 0x0008, 0x0056, 0xfffd, 0x0000, 0x0010, 0x0045, 0x0008, 0x0045 - .2byte 0x0000, 0x0045, 0x0008, 0x0045, 0xfffd, 0x0001, 0x0008, 0x0056 - .2byte 0x0018, 0x0043, 0x0020, 0x0043, 0x0028, 0x0056, 0xffff, 0x0000 - - .align 2 -gUnknown_08596694:: @ 8596694 - .2byte 0x0008, 0x003c, 0x0010, 0x0005, 0x0008, 0x0005, 0x0000, 0x0005 - .2byte 0x0008, 0x0016, 0xfffd, 0x0000, 0x0010, 0x0005, 0x0008, 0x0005 - .2byte 0x0000, 0x0005, 0x0008, 0x0005, 0xfffd, 0x0001, 0x0008, 0x0016 - .2byte 0x0018, 0x0003, 0x0020, 0x0003, 0x0028, 0x0016, 0xffff, 0x0000 - - .align 2 -gUnknown_085966D4:: @ 85966D4 - .4byte gUnknown_08596654 - .4byte gUnknown_08596694 - - .align 2 -gUnknown_085966DC:: @ 85966DC - spr_template 0x2771, 0x2771, gUnknown_08524954, gUnknown_085966D4, NULL, gDummySpriteAffineAnimTable, sub_810F634 - - .align 2 -gUnknown_085966F4:: @ 85966F4 - .2byte 0x0000, 0x0006, 0x0010, 0x0006, 0x0020, 0x0006, 0x0030, 0x0006 - .2byte 0x0040, 0x0006, 0x0050, 0x0006, 0x0060, 0x0012, 0xffff, 0x0000 - - .align 2 -gUnknown_08596714:: @ 8596714 - .4byte gUnknown_085966F4 - - .align 2 -gUnknown_08596718:: @ 8596718 - .2byte 0x0000, 0x0000, 0x0404, 0x0000, 0x0000, 0x0000, 0x08fc, 0x0000 - .2byte 0x0000, 0x0000, 0x0404, 0x0000, 0x7ffd, 0x0002, 0x0000, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596740:: @ 8596740 - .4byte gUnknown_08596718 - - .align 2 -gUnknown_08596744:: @ 8596744 - spr_template 0x276d, 0x276d, gUnknown_08524914, gUnknown_08596714, NULL, gDummySpriteAffineAnimTable, sub_810F6B0 - - .align 2 -gUnknown_0859675C:: @ 859675C - .2byte 0xfff8, 0x000a, 0x1000, 0x0000, 0x0012, 0xffee, 0x1000, 0x0000 - .2byte 0xffec, 0x0010, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859677C:: @ 859677C - .2byte 0x0040, 0xfffc, 0x1400, 0x0000, 0x0000, 0x0000, 0xc800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596794:: @ 8596794 - spr_template 0x2809, 0x2809, gUnknown_08524A2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_085967AC:: @ 85967AC - spr_template 0x280a, 0x280a, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810FBA8 - - .align 2 -gUnknown_085967C4:: @ 85967C4 - .2byte 0xfff8, 0xfff8, 0x0800, 0x0000, 0x0008, 0x0008, 0x0800, 0x0000 - .2byte 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085967DC:: @ 85967DC - .2byte 0x00f0, 0x00f0, 0x0000, 0x0000, 0xfff8, 0xfff8, 0x0600, 0x0000 - .2byte 0x0008, 0x0008, 0x0800, 0x0000, 0xfff8, 0xfff8, 0x0200, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08596804:: @ 8596804 - .2byte 0x00d0, 0x00d0, 0x0000, 0x0000, 0xfff8, 0xfff8, 0x0400, 0x0000 - .2byte 0x0008, 0x0008, 0x0800, 0x0000, 0xfff8, 0xfff8, 0x0400, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_0859682C:: @ 859682C - .2byte 0x00b0, 0x00b0, 0x0000, 0x0000, 0xfff8, 0xfff8, 0x0200, 0x0000 - .2byte 0x0008, 0x0008, 0x0800, 0x0000, 0xfff8, 0xfff8, 0x0600, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08596854:: @ 8596854 - .4byte gUnknown_085967C4 - .4byte gUnknown_085967DC - .4byte gUnknown_08596804 - .4byte gUnknown_0859682C - - .align 2 -gUnknown_08596864:: @ 8596864 - spr_template 0x280b, 0x280b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08596854, sub_810FDF0 - - .align 2 -gUnknown_0859687C:: @ 859687C - .2byte 0x0020, 0x0020, 0x0000, 0x0000, 0x0004, 0x0004, 0x7800, 0x0000 - .2byte 0x7fff, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08596894:: @ 8596894 - .4byte gUnknown_0859687C - - .align 2 -gUnknown_08596898:: @ 8596898 - spr_template 0x281b, 0x281b, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596894, sub_80A77C8 - - .align 2 -gUnknown_085968B0:: @ 85968B0 - .2byte 0x0020, 0x0020, 0x0000, 0x0000, 0x0010, 0x0010, 0x1100, 0x0000 - .2byte 0x7ffd, 0x0000, 0x0000, 0x0000, 0xfff8, 0xfff8, 0x0a00, 0x0000 - .2byte 0x0008, 0x0008, 0x0a00, 0x0000, 0x7ffd, 0x0004, 0x0000, 0x0000 - .2byte 0x7ffd, 0x0000, 0x0000, 0x0000, 0xfff0, 0xfff0, 0x0500, 0x0000 - .2byte 0x0010, 0x0010, 0x0500, 0x0000, 0x7ffd, 0x0007, 0x0000, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596908:: @ 8596908 - .2byte 0xffec, 0x0018, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596918:: @ 8596918 - .4byte gUnknown_085968B0 - .4byte gUnknown_08596908 - - .align 2 -gUnknown_08596920:: @ 8596920 - spr_template 0x27e4, 0x27e4, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596918, sub_8110240 - - .align 2 -gUnknown_08596938:: @ 8596938 - .2byte 0x0100, 0x0100, 0x001e, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596948:: @ 8596948 - .2byte 0x0100, 0x0100, 0x009d, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596958:: @ 8596958 - .2byte 0x0100, 0x0100, 0x005e, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596968:: @ 8596968 - .4byte gUnknown_08596938 - .4byte gUnknown_08596948 - .4byte gUnknown_08596958 - - .align 2 -gUnknown_08596974:: @ 8596974 - spr_template 0x27a9, 0x27a9, gUnknown_085249F4, gDummySpriteAnimTable, NULL, gUnknown_08596968, sub_8110368 - - .align 2 -gUnknown_0859698C:: @ 859698C - .2byte 0x0000, 0x0000, 0x01df, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0859699C:: @ 859699C - .2byte 0x0000, 0x0000, 0x0160, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085969AC:: @ 85969AC - .2byte 0x0000, 0x0000, 0x01a0, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085969BC:: @ 85969BC - .4byte gUnknown_0859698C - .4byte gUnknown_0859699C - .4byte gUnknown_085969AC - - .align 2 -gUnknown_085969C8:: @ 85969C8 - spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_085969BC, sub_8110438 - - .align 2 -gUnknown_085969E0:: @ 85969E0 - spr_template 0x27c4, 0x27c4, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81104E4 - - .align 2 -gUnknown_085969F8:: @ 85969F8 - spr_template 0x27c3, 0x27c3, gUnknown_0852493C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81105B4 - - .align 2 -gUnknown_08596A10:: @ 8596A10 - .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0006, 0x0006, 0x0100, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08596A28:: @ 8596A28 - .4byte gUnknown_08596A10 - - .align 2 -gUnknown_08596A2C:: @ 8596A2C - spr_template 0x27c5, 0x27c5, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596A28, sub_811067C - - .align 2 -gLinearStingerSpriteTemplate:: @ 8596A44 - spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110720 - - .align 2 -gPinMissileSpriteTemplate:: @ 8596A5C - spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850 - - .align 2 -gIcicleSpearSpriteTemplate:: @ 8596A74 - spr_template 0x2816, 0x2816, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850 - - .align 2 -gUnknown_08596A8C:: @ 8596A8C - .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0008, 0x0008, 0x1200, 0x0000 - .2byte 0x7ffd, 0x0000, 0x0000, 0x0000, 0xfffb, 0xfffb, 0x0800, 0x0000 - .2byte 0x0005, 0x0005, 0x0800, 0x0000, 0x7ffd, 0x0005, 0x0000, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596AC4:: @ 8596AC4 - .4byte gUnknown_08596A8C - - .align 2 -gUnknown_08596AC8:: @ 8596AC8 - spr_template 0x27e4, 0x27e4, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08596AC4, sub_8110994 - - .align 2 -gUnknown_08596AE0:: @ 8596AE0 - .2byte 0x0020, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596AE8:: @ 8596AE8 - .2byte 0x0030, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596AF0:: @ 8596AF0 - .2byte 0x0040, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596AF8:: @ 8596AF8 - .4byte gUnknown_08596AE0 - .4byte gUnknown_08596AE8 - .4byte gUnknown_08596AF0 - - .align 2 -gUnknown_08596B04:: @ 8596B04 - spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_08596AF8, NULL, gDummySpriteAffineAnimTable, sub_81109F0 - - .align 2 -gUnknown_08596B1C:: @ 8596B1C - spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_08596AF8, NULL, gDummySpriteAffineAnimTable, sub_8110AB4 - - .align 2 -gUnknown_08596B34:: @ 8596B34 - spr_template 0x275a, 0x275a, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110B38 - - .align 2 -gUnknown_08596B4C:: @ 8596B4C - .2byte 0x00c0, 0x00c0, 0x0000, 0x0000, 0x0002, 0xfffd, 0x0500, 0x0000 - .2byte 0xfffe, 0x0003, 0x0500, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_08596B6C:: @ 8596B6C - .4byte gUnknown_08596B4C - - .align 2 -gUnknown_08596B70:: @ 8596B70 - spr_template 0x27a5, 0x27a5, gUnknown_08524A8C, gUnknown_085950E0, NULL, gUnknown_08596B6C, sub_8110B38 - - .align 2 -gUnknown_08596B88:: @ 8596B88 - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8110B38 - - .align 2 -gBattleAnimSpriteTemplate_8596BA0:: @ 8596BA0 - spr_template 0x2815, 0x2815, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110E4C - - .align 2 -gUnknown_08596BB8:: @ 8596BB8 - .2byte 0x00f0, 0x4009, 0x0010, 0x4089 - - .align 2 -gUnknown_08596BC0:: @ 8596BC0 - .2byte 0x0002, 0x0000 - - .align 2 -gUnknown_08596BC4:: @ 8596BC4 - .4byte gUnknown_08596BB8 - - .align 2 -gUnknown_08596BC8:: @ 8596BC8 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596BD0:: @ 8596BD0 - .2byte 0x0010, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596BD8:: @ 8596BD8 - .2byte 0x0020, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596BE0:: @ 8596BE0 - .2byte 0x0030, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596BE8:: @ 8596BE8 - .2byte 0x0040, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596BF0:: @ 8596BF0 - .2byte 0x0050, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08596BF8:: @ 8596BF8 - .4byte gUnknown_08596BC8 - .4byte gUnknown_08596BD0 - - .align 2 -gUnknown_08596C00:: @ 8596C00 - .4byte gUnknown_08596BD8 - .4byte gUnknown_08596BE0 - - .align 2 -gUnknown_08596C08:: @ 8596C08 - .4byte gUnknown_08596BE8 - .4byte gUnknown_08596BF0 - - .align 2 -gUnknown_08596C10:: @ 8596C10 - spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_08596BF8, NULL, gDummySpriteAffineAnimTable, sub_8110F30 - - .align 2 -gUnknown_08596C28:: @ 8596C28 - spr_template 0x275a, 0x275a, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811131C - - .align 2 -gUnknown_08596C40:: @ 8596C40 - spr_template 0x274a, 0x274a, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811131C - - .align 2 -gUnknown_08596C58:: @ 8596C58 - spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_08596BF8, NULL, gDummySpriteAffineAnimTable, sub_8111388 - - .align 2 -gUnknown_08596C70:: @ 8596C70 - .2byte 0x0000, 0x0000, 0x05fb, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596C80:: @ 8596C80 - .2byte 0x0000, 0x0000, 0x0505, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596C90:: @ 8596C90 - .4byte gUnknown_08596C70 - .4byte gUnknown_08596C80 - - .align 2 -gUnknown_08596C98:: @ 8596C98 - spr_template 0x274a, 0x274a, gUnknown_08524974, gUnknown_08596BF8, NULL, gUnknown_08596C90, sub_8111418 - - .align 2 -gUnknown_08596CB0:: @ 8596CB0 - spr_template 0x274a, 0x274a, gUnknown_08524974, gUnknown_08596BF8, NULL, gUnknown_08596C90, sub_8111444 - - .align 2 -gUnknown_08596CC8:: @ 8596CC8 - spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_08596C08, NULL, gUnknown_08596C90, sub_80FF268 - - .align 2 -gUnknown_08596CE0:: @ 8596CE0 - spr_template 0x274a, 0x274a, gUnknown_08524974, gUnknown_08596C00, NULL, gUnknown_08596C90, sub_80A8EE4 - - .align 2 -gUnknown_08596CF8:: @ 8596CF8 - .2byte 0x001e, 0x001e, 0x050a, 0x0000, 0xffe2, 0xffe2, 0x050a, 0x0000 - .2byte 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596D10:: @ 8596D10 - .4byte gUnknown_08596CF8 - - .align 2 -gUnknown_08596D14:: @ 8596D14 - spr_template 0x271d, 0x271d, gUnknown_085249CC, gDummySpriteAnimTable, NULL, gUnknown_08596D10, sub_811160C - - .align 2 -gUnknown_08596D2C:: @ 8596D2C - spr_template 0x271d, 0x271d, gUnknown_08524A2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81117F4 - - .align 2 -gUnknown_08596D44:: @ 8596D44 - .2byte 0x0000, 0x0000, 0x010a, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596D54:: @ 8596D54 - .4byte gUnknown_08596D44 - - .align 2 -gUnknown_08596D58:: @ 8596D58 - spr_template 0x27c0, 0x27c0, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08596D54, sub_81119E0 - - .align 2 -gUnknown_08596D70:: @ 8596D70 - .2byte 0x0000, 0x0002, 0x0008, 0x0002, 0x0010, 0x0002, 0x0018, 0x0002 - .2byte 0x0020, 0x0002, 0xffff, 0x0000 - - .align 2 -gUnknown_08596D88:: @ 8596D88 - .4byte gUnknown_08596D70 - - .align 2 -gUnknown_08596D8C:: @ 8596D8C - spr_template 0x27c1, 0x27c1, gUnknown_08524954, gUnknown_08596D88, NULL, gDummySpriteAffineAnimTable, sub_8111B9C - - .align 2 -gUnknown_08596DA4:: @ 8596DA4 - .2byte 0x0200, 0x0200, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596DB4:: @ 8596DB4 - .4byte gUnknown_08596DA4 - - .align 2 -gUnknown_08596DB8:: @ 8596DB8 - spr_template 0x27cc, 0x27cc, gUnknown_08524A5C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112264 - - .align 2 -gUnknown_08596DD0:: @ 8596DD0 - spr_template 0x27d7, 0x27d7, gUnknown_08524A54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81129F0 - - .align 2 -gBattleAnimSpriteTemplate_8596DE8:: @ 8596DE8 - spr_template 0x27d8, 0x27d8, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78 - - .align 2 -gBattleAnimSpriteTemplate_8596E00:: @ 8596E00 - spr_template 0x27ed, 0x27ed, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78 - - .align 2 -gUnknown_08596E18:: @ 8596E18 - .2byte 0x0000, 0x0004, 0x0008, 0x0004, 0x0010, 0x0004, 0x0018, 0x0004, 0xfffe, 0x0000 - - .align 2 -gUnknown_08596E2C:: @ 8596E2C - .4byte gUnknown_08596E18 - - .align 2 -gUnknown_08596E30:: @ 8596E30 - spr_template 0x280d, 0x280d, gUnknown_08524A74, gUnknown_08596E2C, NULL, gDummySpriteAffineAnimTable, sub_8112E9C - - .align 2 -gUnknown_08596E48:: @ 8596E48 - spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112F60 - - .align 2 -gUnknown_08596E60:: @ 8596E60 - .2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0x0030, 0x0004 - .2byte 0x0040, 0x0004, 0xfffe, 0x0000 - - .align 2 -gUnknown_08596E78:: @ 8596E78 - .4byte gUnknown_08596E60 - - .align 2 -gBattleAnimSpriteTemplate_8596E7C:: @ 8596E7C - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08596E78, NULL, gDummySpriteAffineAnimTable, sub_8113064 - - .align 2 -gUnknown_08596E94:: @ 8596E94 - .2byte 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_08596EA4:: @ 8596EA4 - .2byte 0x0010, 0x00c3, 0x0020, 0x00c3, 0x0030, 0x00c3, 0xfffe, 0x0000 - - .align 2 -gUnknown_08596EB4:: @ 8596EB4 - .4byte gUnknown_08596E94 - .4byte gUnknown_08596EA4 - - .align 2 -gUnknown_08596EBC:: @ 8596EBC - .2byte 0x0050, 0x0050, 0x007f, 0x0000, 0x000d, 0x000d, 0x6400, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596ED4:: @ 8596ED4 - .2byte 0x0050, 0x0050, 0x0000, 0x0000, 0x000d, 0x000d, 0x6400, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596EEC:: @ 8596EEC - .4byte gUnknown_08596EBC - .4byte gUnknown_08596ED4 - - .align 2 -gUnknown_08596EF4:: @ 8596EF4 - spr_template 0x272d, 0x272d, gUnknown_085249D4, gUnknown_08596EB4, NULL, gUnknown_08596EEC, sub_8113224 - - .align 2 -gUnknown_08596F0C:: @ 8596F0C - .2byte 0x0000, 0x0005, 0x0010, 0x0005, 0x0020, 0x0005, 0x0030, 0x0005 - .2byte 0x0040, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_08596F24:: @ 8596F24 - .4byte gUnknown_08596F0C - - .align 2 -gUnknown_08596F28:: @ 8596F28 - spr_template 0x2733, 0x2733, gUnknown_08524914, gUnknown_08596F24, NULL, gDummySpriteAffineAnimTable, sub_81131B4 - - .align 2 -gUnknown_08596F40:: @ 8596F40 - .2byte 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_08596F50:: @ 8596F50 - .4byte gUnknown_08596F40 - .4byte gUnknown_08596F40 - - .align 2 -gUnknown_08596F58:: @ 8596F58 - .2byte 0x0064, 0x0064, 0x017f, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596F68:: @ 8596F68 - .2byte 0x0064, 0x0064, 0x0100, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596F78:: @ 8596F78 - .4byte gUnknown_08596F58 - .4byte gUnknown_08596F68 - - .align 2 -gUnknown_08596F80:: @ 8596F80 - spr_template 0x272d, 0x272d, gUnknown_085249D4, gUnknown_08596F50, NULL, gUnknown_08596F78, sub_8113224 - - .align 2 -gUnknown_08596F98:: @ 8596F98 - spr_template 0x2809, 0x2809, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8113250 - - .align 2 -gUnknown_08596FB0:: @ 8596FB0 - spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08596E78, NULL, gDummySpriteAffineAnimTable, sub_81135EC - - .align 2 -gUnknown_08596FC8:: @ 8596FC8 - spr_template 0x271f, 0x271f, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81138D4 - - .align 2 -gUnknown_08596FE0:: @ 8596FE0 - .2byte 0x0000, 0x0000, 0x0100, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08596FF0:: @ 8596FF0 - .2byte 0x0000, 0x0000, 0x0120, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597000:: @ 8597000 - .2byte 0x0000, 0x0000, 0x0140, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597010:: @ 8597010 - .2byte 0x0000, 0x0000, 0x0160, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597020:: @ 8597020 - .2byte 0x0000, 0x0000, 0x0180, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597030:: @ 8597030 - .2byte 0x0000, 0x0000, 0x01a0, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597040:: @ 8597040 - .2byte 0x0000, 0x0000, 0x01c0, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597050:: @ 8597050 - .2byte 0x0000, 0x0000, 0x01e0, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597060:: @ 8597060 - .4byte gUnknown_08596FE0 - .4byte gUnknown_08596FF0 - .4byte gUnknown_08597000 - .4byte gUnknown_08597010 - .4byte gUnknown_08597020 - .4byte gUnknown_08597030 - .4byte gUnknown_08597040 - .4byte gUnknown_08597050 - - .align 2 -gUnknown_08597080:: @ 8597080 - spr_template 0x279b, 0x279b, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08597060, sub_81139DC - - .align 2 -gUnknown_08597098:: @ 8597098 - spr_template 0x27a1, 0x27a1, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08597060, sub_81139DC - - .align 2 -gUnknown_085970B0:: @ 85970B0 - .2byte 0x00c0, 0x00c0, 0x0050, 0x0000, 0x0000, 0x0000, 0x08fe, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085970C8:: @ 85970C8 - .2byte 0x00c0, 0x00c0, 0x00b0, 0x0000, 0x0000, 0x0000, 0x0802, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085970E0:: @ 85970E0 - .4byte gUnknown_085970B0 - .4byte gUnknown_085970C8 - - .align 2 -gUnknown_085970E8:: @ 85970E8 - spr_template 0x27ab, 0x27ab, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_085970E0, sub_8113A90 - - .align 2 -gUnknown_08597100:: @ 8597100 - .2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0x0030, 0x0004 - .2byte 0x0040, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_08597118:: @ 8597118 - .2byte 0x0000, 0x0044, 0x0010, 0x0044, 0x0020, 0x0044, 0x0030, 0x0044 - .2byte 0x0040, 0x0044, 0xffff, 0x0000 - - .align 2 -gUnknown_08597130:: @ 8597130 - .4byte gUnknown_08597100 - .4byte gUnknown_08597118 - - .align 2 -gBattleAnimSpriteTemplate_8597138:: @ 8597138 - spr_template 0x2737, 0x2737, gUnknown_08524914, gUnknown_08597130, NULL, gDummySpriteAffineAnimTable, sub_81144BC - - .align 2 -gUnknown_08597150:: @ 8597150 - .2byte 0x0000, 0x0000, 0x010f, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597160:: @ 8597160 - .2byte 0x0000, 0x0000, 0x0114, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597170:: @ 8597170 - .4byte gUnknown_08597150 - - .align 2 -gUnknown_08597174:: @ 8597174 - .4byte gUnknown_08597160 - - .align 2 -gUnknown_08597178:: @ 8597178 - spr_template 0x2710, 0x2710, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08597170, sub_8114994 - - .align 2 -gUnknown_08597190:: @ 8597190 - spr_template 0x2710, 0x2710, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08597174, sub_8114A7C - - .align 2 -gUnknown_085971A8:: @ 85971A8 - spr_template 0x275a, 0x275a, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8114AF0 - - .align 2 -gUnknown_085971C0:: @ 85971C0 - .2byte 0x0001, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085971C8:: @ 85971C8 - .4byte gUnknown_085971C0 - - .align 2 -gUnknown_085971CC:: @ 85971CC - spr_template 0x275a, 0x275a, gUnknown_0852490C, gUnknown_085971C8, NULL, gDummySpriteAffineAnimTable, sub_8114AF0 - - .align 2 -gUnknown_085971E4:: @ 85971E4 - spr_template 0x275a, 0x275a, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8114B80 - - .align 2 -gUnknown_085971FC:: @ 85971FC - spr_template 0x275a, 0x275a, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81151A0 - - .align 2 -gUnknown_08597214:: @ 8597214 - spr_template 0x2829, 0x2829, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8115244 - - .align 2 -gUnknown_0859722C:: @ 859722C - .2byte 0x0000, 0x0008, 0x0004, 0x0008, 0x0000, 0x0048, 0x0008, 0x0008, 0xfffe, 0x0000 - - .align 2 -gUnknown_08597240:: @ 8597240 - .2byte 0x0000, 0x0048, 0x0004, 0x0008, 0x0000, 0x0008, 0x0008, 0x0008, 0xfffe, 0x0000 - - .align 2 -gUnknown_08597254:: @ 8597254 - .4byte gUnknown_0859722C - .4byte gUnknown_08597240 - - .align 2 -gConfusionDuckSpriteTemplate:: @ 859725C - spr_template 0x2759, 0x2759, gUnknown_0852490C, gUnknown_08597254, NULL, gDummySpriteAffineAnimTable, sub_811572C - - .align 2 -gSimplePaletteBlendSpriteTemplate:: @ 8597274 - spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81157FC - - .align 2 -gComplexPaletteBlendSpriteTemplate:: @ 859728C - spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81158A4 - - .align 2 -gUnknown_085972A4:: @ 85972A4 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003 - .2byte 0x0040, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_085972BC:: @ 85972BC - .4byte gUnknown_085972A4 - - .align 2 -gUnknown_085972C0:: @ 85972C0 - spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_085972BC, NULL, gDummySpriteAffineAnimTable, sub_81159B4 - - .align 2 -gBattleAnimSpriteTemplate_85972D8:: @ 85972D8 - spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81160A4 - - .align 2 -gUnknown_085972F0:: @ 85972F0 - .2byte 0x0000, 0x0000, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597300:: @ 8597300 - .2byte 0x00d8, 0x00d8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597318:: @ 8597318 - .2byte 0x00b0, 0x00b0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597330:: @ 8597330 - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0000, 0x0000, 0x0800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08597348:: @ 8597348 - .4byte gUnknown_085972F0 - .4byte gUnknown_08597300 - .4byte gUnknown_08597318 - .4byte gUnknown_08597330 - - .align 2 -gBasicHitSplatSpriteTemplate:: @ 8597358 - spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388 - - .align 2 -gBattleAnimSpriteTemplate_8597370:: @ 8597370 - spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116420 - - .align 2 -gUnknown_08597388:: @ 8597388 - spr_template 0x27a4, 0x27a4, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388 - - .align 2 -gUnknown_085973A0:: @ 85973A0 - spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116458 - - .align 2 -gBattleAnimSpriteTemplate_85973B8:: @ 85973B8 - spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81164F0 - - .align 2 -gUnknown_085973D0:: @ 85973D0 - spr_template 0x282d, 0x282d, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8116560 - - .align 2 -gUnknown_085973E8:: @ 85973E8 - spr_template 0x2797, 0x2797, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81165A8 - - .align 2 -gUnknown_08597400:: @ 8597400 - spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81163D0 - -gUnknown_08597418:: @ 8597418 - .2byte 0x7fff - -gUnknown_0859741A:: @ 859741A - .byte 0x08, 0x0a, 0x0c, 0x0e - -gUnknown_0859741E:: @ 859741E - .byte 0x08, 0x0a, 0x0c, 0x0e - - .align 2 -gUnknown_08597424:: @ 8597424 - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_80BC47C - .4byte task00_battle_intro_80BC6C8 - .4byte task00_battle_intro_80BC6C8 - .4byte task00_battle_intro_80BC6C8 - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_anim - .4byte task_battle_intro_anim diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s index 660e5774b..208436f4c 100644 --- a/data/battle_anim_815A0D4.s +++ b/data/battle_anim_815A0D4.s @@ -1,3 +1,4 @@ +#include "constants/battle_anim.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -15,15 +16,15 @@ gUnknown_085CE01C:: @ 85CE01C .align 2 gUnknown_085CE020:: @ 85CE020 - spr_template 0x2799, 0x2799, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 + spr_template ANIM_TAG_SCRATCH, ANIM_TAG_SCRATCH, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 .align 2 gUnknown_085CE038:: @ 85CE038 - spr_template 0x2720, 0x2720, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4 + spr_template ANIM_TAG_BLACK_SMOKE, ANIM_TAG_BLACK_SMOKE, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4 .align 2 gUnknown_085CE050:: @ 85CE050 - spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC + spr_template ANIM_TAG_BLACK_BALL, ANIM_TAG_BLACK_BALL, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC .align 2 gUnknown_085CE068:: @ 85CE068 @@ -36,15 +37,15 @@ gUnknown_085CE078:: @ 85CE078 .align 2 gUnknown_085CE07C:: @ 85CE07C - spr_template 0x27ce, 0x27ce, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 + spr_template ANIM_TAG_OPENING_EYE, ANIM_TAG_OPENING_EYE, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 .align 2 gUnknown_085CE094:: - spr_template 0x27cf, 0x27cf, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0 + spr_template ANIM_TAG_ROUND_WHITE_HALO, ANIM_TAG_ROUND_WHITE_HALO, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0 .align 2 gUnknown_085CE0AC:: - spr_template 0x27cd, 0x27cd, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254 + spr_template ANIM_TAG_TEAL_ALERT, ANIM_TAG_TEAL_ALERT, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254 .align 2 gUnknown_085CE0C4:: @ 85CE0C4 @@ -66,11 +67,11 @@ gUnknown_085CE0FC:: @ 85CE0FC .align 2 gUnknown_085CE104:: @ 85CE104 - spr_template 0x27cb, 0x27cb, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0 + spr_template ANIM_TAG_EYE, ANIM_TAG_EYE, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0 .align 2 gUnknown_085CE11C:: @ 85CE11C - spr_template 0x27a8, 0x27a8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4 + spr_template ANIM_TAG_SPIKES, ANIM_TAG_SPIKES, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4 .align 2 gUnknown_085CE134:: @ 85CE134 @@ -84,7 +85,7 @@ gUnknown_085CE14C:: @ 85CE14C .align 2 gUnknown_085CE150:: @ 85CE150 - spr_template 0x272b, 0x272b, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0 + spr_template ANIM_TAG_LEER, ANIM_TAG_LEER, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0 .align 2 gUnknown_085CE168:: @ 85CE168 @@ -106,7 +107,7 @@ gUnknown_085CE18C:: @ 85CE18C .align 2 gUnknown_085CE190:: @ 85CE190 - spr_template 0x27f4, 0x27f4, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC + spr_template ANIM_TAG_LETTER_Z, ANIM_TAG_LETTER_Z, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC .align 2 gUnknown_085CE1A8:: @ 85CE1A8 @@ -128,7 +129,7 @@ gUnknown_085CE1D8:: @ 85CE1D8 .align 2 gUnknown_085CE1DC:: @ 85CE1DC - spr_template 0x27d0, 0x27d0, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC + spr_template ANIM_TAG_FANG_ATTACK, ANIM_TAG_FANG_ATTACK, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC .align 2 gUnknown_085CE1F4:: @ 85CE1F4 @@ -149,15 +150,15 @@ gUnknown_085CE224:: @ 85CE224 .align 2 gUnknown_085CE22C:: @ 85CE22C - spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934 + spr_template ANIM_TAG_SPOTLIGHT, ANIM_TAG_SPOTLIGHT, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934 .align 2 gUnknown_085CE244:: - spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4 + spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4 .align 2 gUnknown_085CE25C:: - spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0 + spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0 .align 2 gUnknown_085CE274:: @ 85CE274 @@ -170,7 +171,7 @@ gUnknown_085CE284:: @ 85CE284 .align 2 gUnknown_085CE288:: @ 85CE288 - spr_template 0x27f5, 0x27f5, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0 + spr_template ANIM_TAG_RAPID_SPIN, ANIM_TAG_RAPID_SPIN, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0 .align 2 gUnknown_085CE2A0:: @ 85CE2A0 @@ -195,7 +196,7 @@ gUnknown_085CE2F4:: @ 85CE2F4 .align 2 gUnknown_085CE2F8:: @ 85CE2F8 - spr_template 0x27f6, 0x27f6, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C + spr_template ANIM_TAG_TRI_FORCE_TRIANGLE, ANIM_TAG_TRI_FORCE_TRIANGLE, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C .align 2 gUnknown_085CE310:: @ 85CE310 @@ -208,7 +209,7 @@ gUnknown_085CE334:: @ 85CE334 .align 2 gUnknown_085CE338:: @ 85CE338 - spr_template 0x27fa, 0x27fa, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 + spr_template ANIM_TAG_ECLIPSING_ORB, ANIM_TAG_ECLIPSING_ORB, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 .align 2 gUnknown_085CE350:: @ 85CE350 @@ -216,15 +217,15 @@ gUnknown_085CE350:: @ 85CE350 .align 2 gUnknown_085CE370:: @ 85CE370 - spr_template 0x27f2, 0x27f2, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394 + spr_template ANIM_TAG_POKEBALL, ANIM_TAG_POKEBALL, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394 .align 2 gUnknown_085CE388:: @ 85CE388 - spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C + spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C .align 2 gUnknown_085CE3A0:: @ 85CE3A0 - spr_template 0x27f9, 0x27f9, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570 + spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570 .align 2 gUnknown_085CE3B8:: @ 85CE3B8 @@ -238,7 +239,7 @@ gUnknown_085CE3E0:: @ 85CE3E0 .align 2 gUnknown_085CE418:: @ 85CE418 - spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C + spr_template ANIM_TAG_BLUE_ORB, ANIM_TAG_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C .align 2 gUnknown_085CE430:: @ 85CE430 @@ -269,7 +270,7 @@ gUnknown_085CE480:: @ 85CE480 .align 2 gUnknown_085CE48C:: @ 85CE48C - spr_template 0x2801, 0x2801, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04 + spr_template ANIM_TAG_GREEN_STAR, ANIM_TAG_GREEN_STAR, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04 .align 2 gUnknown_085CE4A4:: @ 85CE4A4 @@ -285,7 +286,7 @@ gUnknown_085CE4B0:: @ 85CE4B0 .align 2 gUnknown_085CE4D0:: @ 85CE4D0 - spr_template 0x2767, 0x2767, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815C400 + spr_template ANIM_TAG_ANGER, ANIM_TAG_ANGER, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815C400 .align 2 gUnknown_085CE4E8:: @ 85CE4E8 @@ -309,7 +310,7 @@ gUnknown_085CE538:: @ 85CE538 .align 2 gUnknown_085CE544:: @ 85CE544 - spr_template 0x27fe, 0x27fe, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0 + spr_template ANIM_TAG_PINK_PETAL, ANIM_TAG_PINK_PETAL, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0 .align 2 gUnknown_085CE55C:: @ 85CE55C @@ -325,13 +326,13 @@ gUnknown_085CE58C:: @ 85CE58C .align 2 gUnknown_085CE590:: @ 85CE590 - spr_template 0x27ff, 0x27ff, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C + spr_template ANIM_TAG_PAIN_SPLIT, ANIM_TAG_PAIN_SPLIT, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C gUnknown_085CE5A8:: - spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88 + spr_template ANIM_TAG_CONFETTI, ANIM_TAG_CONFETTI, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88 gUnknown_085CE5C0:: - spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94 + spr_template ANIM_TAG_SPOTLIGHT, ANIM_TAG_SPOTLIGHT, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94 gBattleAnimSpriteTemplate_85CE5D8:: - spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4 + spr_template ANIM_TAG_BLUE_ORB, ANIM_TAG_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4 .align 2 gUnknown_085CE5F0:: @ 85CE5F0 @@ -358,7 +359,7 @@ gUnknown_085CE680:: @ 85CE680 .align 2 gUnknown_085CE68C:: @ 85CE68C - spr_template 0x2802, 0x2802, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4 + spr_template ANIM_TAG_PINK_CLOUD, ANIM_TAG_PINK_CLOUD, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4 .align 2 gUnknown_085CE6A4:: @ 85CE6A4 @@ -385,7 +386,7 @@ gUnknown_085CE724:: @ 85CE724 .align 2 gUnknown_085CE734:: @ 85CE734 - spr_template 0x2802, 0x2802, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870 + spr_template ANIM_TAG_PINK_CLOUD, ANIM_TAG_PINK_CLOUD, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870 .align 2 gUnknown_085CE74C:: @ 85CE74C @@ -393,7 +394,7 @@ gUnknown_085CE74C:: @ 85CE74C .align 2 gUnknown_085CE76C:: @ 85CE76C - spr_template 0x2803, 0x2803, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC + spr_template ANIM_TAG_SWEAT_DROP, ANIM_TAG_SWEAT_DROP, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC .align 2 gUnknown_085CE784:: @ 85CE784 @@ -415,13 +416,13 @@ gUnknown_085CE7CC:: @ 85CE7CC .align 2 gUnknown_085CE7D4:: @ 85CE7D4 - spr_template 0x2745, 0x2745, gUnknown_08524914, gUnknown_085CE7CC, NULL, gDummySpriteAffineAnimTable, sub_815E01C + spr_template ANIM_TAG_NOISE_LINE, ANIM_TAG_NOISE_LINE, gUnknown_08524914, gUnknown_085CE7CC, NULL, gDummySpriteAffineAnimTable, sub_815E01C .align 2 gUnknown_085CE7EC:: @ 85CE7EC - spr_template 0x2808, 0x2808, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404 + spr_template ANIM_TAG_SMALL_RED_EYE, ANIM_TAG_SMALL_RED_EYE, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404 gUnknown_085CE804:: - spr_template 0x280c, 0x280c, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444 + spr_template ANIM_TAG_PAW_PRINT, ANIM_TAG_PAW_PRINT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444 .align 2 gUnknown_085CE81C:: @ 85CE81C @@ -439,11 +440,11 @@ gUnknown_085CE844:: @ 85CE844 .align 2 gUnknown_085CE84C:: @ 85CE84C - spr_template 0x280e, 0x280e, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy + spr_template ANIM_TAG_RED_BALL, ANIM_TAG_RED_BALL, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy .align 2 gUnknown_085CE864:: - spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8 + spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8 .align 2 gUnknown_085CE87C:: @ 85CE87C @@ -451,19 +452,19 @@ gUnknown_085CE87C:: @ 85CE87C .align 2 gUnknown_085CE894:: @ 85CE894 - spr_template 0x280f, 0x280f, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954 + spr_template ANIM_TAG_SMELLINGSALT_EFFECT, ANIM_TAG_SMELLINGSALT_EFFECT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954 gUnknown_085CE8AC:: - spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14 + spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14 gUnknown_085CE8C4:: - spr_template 0x2812, 0x2812, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84 + spr_template ANIM_TAG_MAGNIFYING_GLASS, ANIM_TAG_MAGNIFYING_GLASS, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84 gUnknown_085CE8DC:: - spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C + spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C gUnknown_085CE8F4:: - spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 + spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 gUnknown_085CE90C:: - spr_template 0x280a, 0x280a, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C + spr_template ANIM_TAG_X_SIGN, ANIM_TAG_X_SIGN, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C gUnknown_085CE924:: - spr_template 0x27f0, 0x27f0, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80 + spr_template ANIM_TAG_ITEM_BAG, ANIM_TAG_ITEM_BAG, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80 .align 2 gUnknown_085CE93C:: @ 85CE93C @@ -488,7 +489,7 @@ gUnknown_085CE97C:: @ 85CE97C .align 2 gUnknown_085CE984:: @ 85CE984 - spr_template 0x2825, 0x2825, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338 + spr_template ANIM_TAG_SLAM_HIT_2, ANIM_TAG_SLAM_HIT_2, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338 .align 2 gUnknown_085CE99C:: @ 85CE99C @@ -500,7 +501,7 @@ gUnknown_085CE9AC:: @ 85CE9AC .align 2 gUnknown_085CE9B0:: @ 85CE9B0 - spr_template 0x2826, 0x2826, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8 + spr_template ANIM_TAG_RECYCLE, ANIM_TAG_RECYCLE, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8 .align 2 gUnknown_085CE9C8:: @ 85CE9C8 diff --git a/data/battle_anim_8170478.s b/data/battle_anim_8170478.s index 5ccf37c54..74bdce846 100644 --- a/data/battle_anim_8170478.s +++ b/data/battle_anim_8170478.s @@ -1,3 +1,4 @@ +#include "constants/battle_anim.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -141,7 +142,7 @@ gUnknown_085E5310:: @ 85E5310 .align 2 gBattleAnimSpriteTemplate_85E5338:: @ 85E5338 - spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C + spr_template ANIM_TAG_UNUSED_RED_BRICK, ANIM_TAG_UNUSED_RED_BRICK, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C .align 2 gUnknown_085E5350:: @ 8535350 @@ -152,5 +153,5 @@ gUnknown_085E5358:: @ 8535358 .4byte gUnknown_085E5350 .align 2 - spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_085E5358, NULL, gDummySpriteAffineAnimTable, sub_817330C + spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524914, gUnknown_085E5358, NULL, gDummySpriteAffineAnimTable, sub_817330C diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 1d9ff20ae..e86c7b784 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -423,7 +423,7 @@ gBattleAnims_Special:: Move_NONE: Move_MIRROR_MOVE: Move_POUND: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET @@ -435,7 +435,7 @@ Move_POUND: end Move_DOUBLE_SLAP: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim DoubleSlapLeft, DoubleSlapRight @@ -454,7 +454,7 @@ DoubleSlapRight: goto DoubleSlapContinue Move_POISON_POWDER: - loadspritegfx ANIM_TAG_065 + loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 @@ -479,7 +479,7 @@ Move_POISON_POWDER: end Move_STUN_SPORE: - loadspritegfx ANIM_TAG_068 + loadspritegfx ANIM_TAG_STUN_SPORE loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 createsprite gStunSporeParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 createsprite gStunSporeParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 @@ -503,7 +503,7 @@ Move_STUN_SPORE: end Move_SLEEP_POWDER: - loadspritegfx ANIM_TAG_067 + loadspritegfx ANIM_TAG_SLEEP_POWDER loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 createsprite gSleepPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 @@ -527,8 +527,8 @@ Move_SLEEP_POWDER: end Move_SWIFT: - loadspritegfx ANIM_TAG_174 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_YELLOW_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W129, SOUND_PAN_ATTACKER @@ -554,7 +554,7 @@ Move_SWIFT: end Move_STRENGTH: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -580,7 +580,7 @@ Move_STRENGTH: end Move_TACKLE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 @@ -594,7 +594,7 @@ Move_TACKLE: end Move_BODY_SLAM: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -620,7 +620,7 @@ Move_BODY_SLAM: end Move_SUPERSONIC: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING monbg ANIM_ATK_PARTNER monbgprio_2A ANIM_ATTACKER setalpha 12, 8 @@ -642,7 +642,7 @@ Supersonic1: return Move_SCREECH: - loadspritegfx ANIM_TAG_164 + loadspritegfx ANIM_TAG_PURPLE_RING createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 2, 1 call Screech1 call Screech1 @@ -699,8 +699,8 @@ FlameWheel1: @ Unused return Move_PIN_MISSILE: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -728,8 +728,8 @@ Move_PIN_MISSILE: end Move_ICICLE_SPEAR: - loadspritegfx ANIM_TAG_262 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ICICLE_SPEAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -757,7 +757,7 @@ Move_ICICLE_SPEAR: end Move_TAKE_DOWN: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10 @@ -780,7 +780,7 @@ Move_TAKE_DOWN: end Move_DOUBLE_EDGE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gComplexPaletteBlendSpriteTemplate, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish @@ -813,8 +813,8 @@ Move_DOUBLE_EDGE: end Move_POISON_STING: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -833,8 +833,8 @@ Move_POISON_STING: end Move_TWINEEDLE: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -936,8 +936,8 @@ Ember1: return Move_MEGA_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET delay 2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK @@ -979,8 +979,8 @@ SetImpactContestsBG: goto SetImpactBackgroundRet Move_MEGA_KICK: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET delay 2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK @@ -1004,8 +1004,8 @@ Move_MEGA_KICK: end Move_COMET_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim CometPunchLeft, CometPunchRight @@ -1027,7 +1027,7 @@ CometPunchRight: Move_SONIC_BOOM: loadspritegfx ANIM_TAG_AIR_WAVE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -1073,7 +1073,7 @@ Move_THUNDER_SHOCK: Move_THUNDERBOLT: loadspritegfx ANIM_TAG_SPARK - loadspritegfx ANIM_TAG_282 + loadspritegfx ANIM_TAG_SHOCK_3 loadspritegfx ANIM_TAG_SPARK_2 createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish @@ -1123,7 +1123,7 @@ Move_THUNDERBOLT: Move_THUNDER_WAVE: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SPARK_2 - loadspritegfx ANIM_TAG_173 + loadspritegfx ANIM_TAG_SPARK_H createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 @@ -1142,8 +1142,8 @@ Move_THUNDER_WAVE: end Move_BEAT_UP: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim BeatUpLeft, BeatUpRight @@ -1176,8 +1176,8 @@ BeatUpRight: goto BeatUpContinue Move_STOMP: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_TARGET @@ -1198,7 +1198,7 @@ Move_TAIL_WHIP: end Move_CUT: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W015, SOUND_PAN_TARGET @@ -1212,7 +1212,7 @@ Move_CUT: end Move_HIDDEN_POWER: - loadspritegfx ANIM_TAG_217 + loadspritegfx ANIM_TAG_RED_ORB playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish @@ -1242,9 +1242,9 @@ Move_HIDDEN_POWER: end Move_REVERSAL: - loadspritegfx ANIM_TAG_236 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_BLUE_ORB + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W197, SOUND_PAN_ATTACKER createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish @@ -1270,7 +1270,7 @@ Move_REVERSAL: end Move_PURSUIT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein @@ -1297,8 +1297,8 @@ PursuitOnSwitchout: goto PursuitContinue Move_SPIKE_CANNON: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -1336,7 +1336,7 @@ Move_SWORDS_DANCE: end Move_PSYCH_UP: - loadspritegfx ANIM_TAG_196 + loadspritegfx ANIM_TAG_SPIRAL monbg ANIM_ATK_PARTNER createvisualtask sub_8115B0C, 2, 1, 2, 6, 1, 11, 0 setalpha 12, 8 @@ -1356,8 +1356,8 @@ Move_PSYCH_UP: Move_DIZZY_PUNCH: loadspritegfx ANIM_TAG_DUCK - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 call DizzyPunch1 @@ -1417,7 +1417,7 @@ FireSpinEffect: return Move_FURY_CUTTER: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013, SOUND_PAN_TARGET @@ -1486,8 +1486,8 @@ SelfDestruct1: return Move_SLAM: - loadspritegfx ANIM_TAG_056 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SLAM_HIT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W004, SOUND_PAN_ATTACKER @@ -1510,7 +1510,7 @@ Move_SLAM: end Move_VINE_WHIP: - loadspritegfx ANIM_TAG_287 + loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 6 @@ -1521,8 +1521,8 @@ Move_VINE_WHIP: end Move_DRILL_PECK: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_162 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish @@ -1540,9 +1540,9 @@ Move_DRILL_PECK: end Move_WATERFALL: - loadspritegfx ANIM_TAG_148 - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 @@ -1654,7 +1654,7 @@ Explosion1: return Move_DEFENSE_CURL: - loadspritegfx ANIM_TAG_234 + loadspritegfx ANIM_TAG_ECLIPSING_ORB loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 createvisualtask sub_811489C, 5, 0, 0 createvisualtask sub_815B338, 5 @@ -1676,7 +1676,7 @@ Move_PROTECT: end Move_DETECT: - loadspritegfx ANIM_TAG_071 + loadspritegfx ANIM_TAG_SPARKLE_4 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE @@ -1691,7 +1691,7 @@ Move_DETECT: end Move_FRUSTRATION: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -1796,7 +1796,7 @@ Frustration_Weak: goto Frustration_Continue Move_SAFEGUARD: - loadspritegfx ANIM_TAG_244 + loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_ATK_PARTNER setalpha 8, 8 playsewithpan SE_W208, SOUND_PAN_ATTACKER @@ -1814,7 +1814,7 @@ Move_SAFEGUARD: end Move_PAIN_SPLIT: - loadspritegfx ANIM_TAG_239 + loadspritegfx ANIM_TAG_PAIN_SPLIT createsprite gUnknown_085CE590, 2, -8, -42, 0 createsprite gUnknown_085CE590, 130, -8, -42, 1 delay 10 @@ -1838,8 +1838,8 @@ Move_PAIN_SPLIT: end Move_VICE_GRIP: - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET @@ -1854,8 +1854,8 @@ Move_VICE_GRIP: end Move_GUILLOTINE: - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS @@ -1879,8 +1879,8 @@ Move_GUILLOTINE: end Move_PAY_DAY: - loadspritegfx ANIM_TAG_100 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_COIN + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -1942,7 +1942,7 @@ Outrage1: return Move_SPARK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) @@ -1988,7 +1988,7 @@ Move_SPARK: end Move_ATTRACT: - loadspritegfx ANIM_TAG_216 + loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER delay 15 @@ -2029,7 +2029,7 @@ Growth1: return Move_WHIRLWIND: - loadspritegfx ANIM_TAG_162 + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gUnknown_085963D4, 2, 0, -8, 1, 60, 0 createsprite gUnknown_085963D4, 2, 0, 0, 1, 60, 1 createsprite gUnknown_085963D4, 2, 0, 8, 1, 60, 2 @@ -2095,7 +2095,7 @@ Move_MEAN_LOOK: end Move_ROCK_THROW: - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS createsprite gBattleAnimSpriteTemplate_85972D8, 130, 6, 1, 15, 1 createsprite gUnknown_08596B04, 130, 0, 1, 0, 0 playsewithpan SE_W088, SOUND_PAN_TARGET @@ -2116,7 +2116,7 @@ Move_ROCK_THROW: end Move_ROCK_SLIDE: - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER createsprite gBattleAnimSpriteTemplate_85972D8, 2, 7, 1, 11, 1 createsprite gUnknown_08596B04, 130, -5, 1, -5, 1 @@ -2167,7 +2167,7 @@ RockSlide1: return Move_THIEF: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET delay 1 fadetobg BG_DARK @@ -2187,8 +2187,8 @@ Move_THIEF: end Move_BUBBLE_BEAM: - loadspritegfx ANIM_TAG_146 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -2225,8 +2225,8 @@ Bulbblebeam1: return Move_ICY_WIND: - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_142 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_ICE_SPIKES monbg ANIM_DEF_PARTNER createvisualtask sub_8116620, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE @@ -2382,8 +2382,8 @@ Move_CONVERSION_2: end Move_ROLLING_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 @@ -2404,7 +2404,7 @@ Move_ROLLING_KICK: end Move_HEADBUTT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish @@ -2420,7 +2420,7 @@ Move_HEADBUTT: end Move_HORN_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER @@ -2438,7 +2438,7 @@ Move_HORN_ATTACK: end Move_FURY_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createvisualtask sub_80D6134, 2, 4, 256, 0, 2 choosetwoturnanim FuryAttackRight, FuryAttackLeft @@ -2462,7 +2462,7 @@ FuryAttackLeft: goto FuryAttackContinue Move_HORN_DRILL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest HornDrillInContest fadetobg BG_DRILL @@ -2529,8 +2529,8 @@ HornDrillInContest: goto HornDrillContinue Move_THRASH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask sub_8104C38, 2 createvisualtask sub_8104CA4, 2 createsprite gUnknown_08595EB0, 131, 1, 10, 0 @@ -2547,7 +2547,7 @@ Move_THRASH: end Move_SING: - loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_MUSIC_NOTES monbg ANIM_DEF_PARTNER createvisualtask sub_8102BE8, 2 waitforvisualfinish @@ -2583,8 +2583,8 @@ Move_SING: end Move_LOW_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 createsprite gUnknown_08595EE0, 130, -24, 28, 40, 8, 160, 0 delay 4 @@ -2606,7 +2606,7 @@ Move_EARTHQUAKE: end Move_FISSURE: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_81152DC, 3, 5, 10, 50 createvisualtask sub_81152DC, 3, 1, 10, 50 playsewithpan SE_W089, SOUND_PAN_TARGET @@ -2653,8 +2653,8 @@ Move_DIG: DigEnd: end DigSetUp: - loadspritegfx ANIM_TAG_074 - loadspritegfx ANIM_TAG_281 + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_DIRT_MOUND createsprite gUnknown_08597214, 1, 0, 0, 180 createsprite gUnknown_08597214, 1, 0, 1, 180 monbg_22 ANIM_ATTACKER @@ -2672,8 +2672,8 @@ DigSetUp: createvisualtask sub_8114CBC, 2, 1 goto DigEnd DigUnleash: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_281 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_DIRT_MOUND createvisualtask sub_8114F14, 2, 0 waitforvisualfinish monbg ANIM_ATTACKER @@ -2728,7 +2728,7 @@ Move_AGILITY: end Move_QUICK_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 @@ -2745,7 +2745,7 @@ Move_QUICK_ATTACK: end Move_RAGE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_TARGET setalpha 12, 8 @@ -2810,8 +2810,8 @@ Move_MINIMIZE: end Move_METRONOME: - loadspritegfx ANIM_TAG_064 - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_FINGER + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gUnknown_08593114, 11, 0, 100 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 @@ -2840,7 +2840,7 @@ SkullBashSetUp1: waitforvisualfinish return SkullBashAttack: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_8101C94, 2, 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish @@ -2855,7 +2855,7 @@ SkullBashAttack: goto SkullBashEnd Move_AMNESIA: - loadspritegfx ANIM_TAG_093 + loadspritegfx ANIM_TAG_AMNESIA call SetPsychicBackground delay 8 createsprite gUnknown_08596744, 20 @@ -2867,7 +2867,7 @@ Move_AMNESIA: end Move_KINESIS: - loadspritegfx ANIM_TAG_075 + loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground @@ -2886,8 +2886,8 @@ Move_KINESIS: end Move_GLARE: - loadspritegfx ANIM_TAG_248 - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_SMALL_RED_EYE + loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask sub_815E114, 5, 0 playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish @@ -2904,7 +2904,7 @@ Move_GLARE: end Move_BARRAGE: - loadspritegfx ANIM_TAG_254 + loadspritegfx ANIM_TAG_RED_BALL createvisualtask sub_815E47C, 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 24 @@ -2958,8 +2958,8 @@ SkyAttackSetUpAgainstPartner: blendoff goto SkyAttackEnd SkyAttackUnleash: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_284 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_BIRD call SetFlyingBg monbg ANIM_ATTACKER createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE @@ -3005,13 +3005,13 @@ Move_ACID_ARMOR: end Move_SHARPEN: - loadspritegfx ANIM_TAG_185 + loadspritegfx ANIM_TAG_SPHERE_TO_CUBE createsprite gUnknown_08592DE4, 2 waitforvisualfinish end Move_SUPER_FANG: - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, SOUND_PAN_ATTACKER waitforvisualfinish @@ -3031,7 +3031,7 @@ Move_SUPER_FANG: end Move_SLASH: - loadspritegfx ANIM_TAG_183 + loadspritegfx ANIM_TAG_SLASH createsprite gUnknown_08592D2C, 130, 1, -8, 0 playsewithpan SE_W013, SOUND_PAN_TARGET delay 4 @@ -3042,8 +3042,8 @@ Move_SLASH: end Move_STRUGGLE: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_215 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MOVEMENT_WAVES monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 @@ -3093,7 +3093,7 @@ NightmareInContest: end Move_FLAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 createvisualtask sub_815C770, 2, 0 @@ -3122,8 +3122,8 @@ Move_SPITE: end Move_MACH_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_ATK_PARTNER createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue MachPunchAgainstPlayer @@ -3173,7 +3173,7 @@ Move_FORESIGHT: end Move_DESTINY_BOND: - loadspritegfx ANIM_TAG_188 + loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg BG_GHOST playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein @@ -3193,7 +3193,7 @@ Move_DESTINY_BOND: end Move_ENDURE: - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 @@ -3218,7 +3218,7 @@ EndureEffect: return Move_CHARM: - loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask sub_815C478, 5, 0, 2, 0 createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER @@ -3232,9 +3232,9 @@ Move_CHARM: end Move_ROLLOUT: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_074 - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -3249,8 +3249,8 @@ Move_ROLLOUT: end Move_FALSE_SWIPE: - loadspritegfx ANIM_TAG_286 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SLASH_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gUnknown_08592D44, 130 playsewithpan SE_W233, SOUND_PAN_TARGET delay 16 @@ -3276,7 +3276,7 @@ Move_FALSE_SWIPE: end Move_SWAGGER: - loadspritegfx ANIM_TAG_086 + loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER @@ -3295,7 +3295,7 @@ Move_SWAGGER: Move_MILK_DRINK: loadspritegfx ANIM_TAG_MILK_BOTTLE - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_TARGET createsprite gUnknown_08592B3C, 2 @@ -3337,8 +3337,8 @@ MagnitudeIntense: goto MagnitudeEnd Move_RAPID_SPIN: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_229 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_RAPID_SPIN monbg ANIM_ATTACKER createsprite gUnknown_085CE288, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_815ADB0, 2, 0, 2, 0 @@ -3383,8 +3383,8 @@ Move_MOONLIGHT: end Move_EXTREME_SPEED: - loadspritegfx ANIM_TAG_207 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SPEED_DUST + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue ExtremeSpeedAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT @@ -3431,8 +3431,8 @@ ExtremeSpeedAgainstPlayer: goto ExtremeSpeedContinue Move_UPROAR: - loadspritegfx ANIM_TAG_225 - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE + loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_DEF_PARTNER createvisualtask sub_8106D90, 2, 0 createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 @@ -3456,8 +3456,8 @@ Move_UPROAR: end Move_HEAT_WAVE: - loadspritegfx ANIM_TAG_261 - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_261, 0, 6, 6, RGB_RED + loadspritegfx ANIM_TAG_FLYING_DIRT + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FLYING_DIRT, 0, 6, 6, RGB_RED createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE createvisualtask AnimTask_BlendBackground, 6, 6, RGB_RED panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 @@ -3480,8 +3480,8 @@ Move_HEAT_WAVE: end Move_HAIL: - loadspritegfx ANIM_TAG_263 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask sub_8116620, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish createvisualtask sub_810C918, 5 @@ -3492,7 +3492,7 @@ Move_HAIL: Move_TORMENT: loadspritegfx ANIM_TAG_ANGER - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask sub_815AFF0, 2 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 @@ -3528,15 +3528,15 @@ Move_MEMENTO: end Move_FACADE: - loadspritegfx ANIM_TAG_243 + loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask sub_815DCA4, 2, 0, 3 createvisualtask sub_815DF0C, 2, 0, 72 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 end Move_SMELLING_SALT: - loadspritegfx ANIM_TAG_HAND - loadspritegfx ANIM_TAG_255 + loadspritegfx ANIM_TAG_TAG_HAND + loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT createsprite gUnknown_085CE864, 130, 1, 0, 2 createsprite gUnknown_085CE864, 130, 1, 1, 2 delay 32 @@ -3550,7 +3550,7 @@ Move_SMELLING_SALT: end Move_FOLLOW_ME: - loadspritegfx ANIM_TAG_064 + loadspritegfx ANIM_TAG_FINGER createsprite gUnknown_085931D4, 2, 0 playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 18 @@ -3560,9 +3560,9 @@ Move_FOLLOW_ME: end Move_CHARGE: - loadspritegfx ANIM_TAG_211 - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_213 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg ANIM_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK @@ -3595,8 +3595,8 @@ Move_CHARGE: end Move_TAUNT: - loadspritegfx ANIM_TAG_214 - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_FINGER_2 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER createsprite gUnknown_08593114, 11, 0, 45 playsewithpan SE_W118, SOUND_PAN_ATTACKER @@ -3615,7 +3615,7 @@ Move_TAUNT: end Move_HELPING_HAND: - loadspritegfx ANIM_TAG_HAND + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_815EC48, 5 createsprite gUnknown_085CE8AC, 40, 0 createsprite gUnknown_085CE8AC, 40, 1 @@ -3632,7 +3632,7 @@ Move_HELPING_HAND: end Move_ASSIST: - loadspritegfx ANIM_TAG_252 + loadspritegfx ANIM_TAG_PAW_PRINT createsprite gUnknown_085CE804, 50, 112, -16, 140, 128, 36 delay 2 createsprite gUnknown_085CE804, 50, 208, 128, -16, 48, 36 @@ -3649,9 +3649,9 @@ Move_ASSIST: end Move_SUPERPOWER: - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_256 - loadspritegfx ANIM_TAG_257 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_METEOR + loadspritegfx ANIM_TAG_FLAT_ROCK monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 12, 8 @@ -3699,10 +3699,10 @@ Move_RECYCLE: end Move_BRICK_BREAK: - loadspritegfx ANIM_TAG_167 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_208 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_TORN_METAL choosetwoturnanim BrickBreakNormal, BrickBreakShatteredWall BrickBreakNormal: monbg ANIM_TARGET @@ -3763,7 +3763,7 @@ BrickBreakShatteredWall: end Move_YAWN: - loadspritegfx ANIM_TAG_242 + loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask sub_815D64C, 2, 0 playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish @@ -3779,8 +3779,8 @@ Move_YAWN: end Move_ENDEAVOR: - loadspritegfx ANIM_TAG_243 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SWEAT_DROP + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_815DCA4, 2, 0, 2 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 @@ -3795,7 +3795,7 @@ Move_ENDEAVOR: end Move_ERUPTION: - loadspritegfx ANIM_TAG_201 + loadspritegfx ANIM_TAG_WARM_ROCK createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish createvisualtask sub_8109460, 2 @@ -3820,7 +3820,7 @@ Move_ERUPTION: end Move_SKILL_SWAP: - loadspritegfx ANIM_TAG_251 + loadspritegfx ANIM_TAG_BLUEGREEN_ORB call SetPsychicBackground createvisualtask sub_810FBF0, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1 @@ -3833,7 +3833,7 @@ Move_SKILL_SWAP: end Move_IMPRISON: - loadspritegfx ANIM_TAG_249 + loadspritegfx ANIM_TAG_HOLLOW_ORB loadspritegfx ANIM_TAG_X_SIGN call SetPsychicBackground monbg ANIM_DEF_PARTNER @@ -3850,7 +3850,7 @@ Move_IMPRISON: end Move_GRUDGE: - loadspritegfx ANIM_TAG_253 + loadspritegfx ANIM_TAG_PURPLE_FLAME monbg ANIM_ATTACKER monbgprio_29 fadetobg BG_GHOST @@ -3886,7 +3886,7 @@ Move_CAMOUFLAGE: end Move_TAIL_GLOW: - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK @@ -3902,8 +3902,8 @@ Move_TAIL_GLOW: end Move_LUSTER_PURGE: - loadspritegfx ANIM_TAG_267 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_IMPACT fadetobg BG_PSYCHIC waitbgfadeout createvisualtask sub_815A5C8, 5 @@ -3914,9 +3914,9 @@ Move_LUSTER_PURGE: createsprite gUnknown_08596898, 41, 0, 0, 0, 0 delay 20 createvisualtask sub_8116664, 5, 5, 2, 0, 16, RGB_WHITEALPHA - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_267, 2, 0, 16, RGB_WHITEALPHA + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, 2, 0, 16, RGB_WHITEALPHA waitforvisualfinish - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_135, 0, 12, 12, RGB(0, 0, 23) + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) waitforvisualfinish createsprite gUnknown_085973A0, 131, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET @@ -3945,8 +3945,8 @@ Move_LUSTER_PURGE: end Move_MIST_BALL: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_270 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 playsewithpan SE_W081, SOUND_PAN_ATTACKER createsprite gUnknown_08595C70, 128, 0, 0, 0, 0, 30, 0 @@ -3965,7 +3965,7 @@ Move_MIST_BALL: end Move_FEATHER_DANCE: - loadspritegfx ANIM_TAG_270 + loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_DEF_PARTNER monbgprio_29 playsewithpan SE_W080, SOUND_PAN_TARGET @@ -3987,7 +3987,7 @@ Move_FEATHER_DANCE: end Move_TEETER_DANCE: - loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_DUCK createvisualtask sub_8160164, 5 createsprite gUnknown_08593050, 2, 0, 16, -2 @@ -4007,7 +4007,7 @@ Move_TEETER_DANCE: end Move_MUD_SPORT: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_8104938, 2, 0, 6 delay 24 createsprite gUnknown_085971E4, 130, 0, -4, -16 @@ -4054,9 +4054,9 @@ Move_MUD_SPORT: end Move_NEEDLE_ARM: - loadspritegfx ANIM_TAG_266 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_GREEN_SPIKE + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16 createsprite gUnknown_08592888, 130, 1, 0, 0, -32, 16 delay 2 @@ -4106,9 +4106,9 @@ Move_SLACK_OFF: end Move_CRUSH_CLAW: - loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_CLAW_SLASH - loadspritegfx ANIM_TAG_208 + loadspritegfx ANIM_TAG_TORN_METAL monbg ANIM_TARGET setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 @@ -4128,9 +4128,9 @@ Move_CRUSH_CLAW: Move_AROMATHERAPY: playsewithpan SE_W080, 0 - loadspritegfx ANIM_TAG_159 - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, RGB(13, 31, 12) delay 1 monbg ANIM_ATTACKER @@ -4166,10 +4166,10 @@ Move_AROMATHERAPY: end Move_FAKE_TEARS: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_209 - loadspritegfx ANIM_TAG_MUSIC_NOTES2 - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_155, 0, 4, 4, RGB(12, 11, 31) + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + loadspritegfx ANIM_TAG_MUSIC_NOTES + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31) waitforvisualfinish createvisualtask sub_815C478, 5, 0, 2, 1 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 @@ -4190,8 +4190,8 @@ Move_FAKE_TEARS: Move_AIR_CUTTER: loadspritegfx ANIM_TAG_AIR_WAVE - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT delay 0 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -4226,7 +4226,7 @@ Move_ODOR_SLEUTH: end Move_GRASS_WHISTLE: - loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB(18, 31, 12) waitforvisualfinish createvisualtask sub_8102BE8, 2 @@ -4263,7 +4263,7 @@ Move_GRASS_WHISTLE: end Move_TICKLE: - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish createsprite gUnknown_08593A84, 0, -16, -8 @@ -4281,8 +4281,8 @@ Move_TICKLE: end Move_WATER_SPOUT: - loadspritegfx ANIM_TAG_268 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_81080E4, 5 @@ -4298,8 +4298,8 @@ Move_WATER_SPOUT: end Move_SHADOW_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET fadetobg BG_GHOST waitbgfadein monbg ANIM_ATK_PARTNER @@ -4340,7 +4340,7 @@ Move_EXTRASENSORY: end Move_AERIAL_ACE: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 @@ -4370,7 +4370,7 @@ Move_BLOCK: end Move_HOWL: - loadspritegfx ANIM_TAG_053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_815D64C, 2, 0 delay 12 call RoarEffect @@ -4380,7 +4380,7 @@ Move_HOWL: end Move_BULK_UP: - loadspritegfx ANIM_TAG_086 + loadspritegfx ANIM_TAG_BREATH createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish @@ -4390,7 +4390,7 @@ Move_BULK_UP: end Move_COVET: - loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_815C478, 5, 0, 2, 0 createsprite gUnknown_08593970, 3, 0, 20 @@ -4408,8 +4408,8 @@ Move_COVET: Move_VOLT_TACKLE: loadspritegfx ANIM_TAG_SPARK - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_213 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg ANIM_ATTACKER setalpha 12, 8 createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK @@ -4454,7 +4454,7 @@ Move_VOLT_TACKLE: end Move_WATER_SPORT: - loadspritegfx ANIM_TAG_268 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask sub_81088E4, 5 delay 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER @@ -4467,7 +4467,7 @@ Move_WATER_SPORT: end Move_CALM_MIND: - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_ATK_PARTNER createvisualtask sub_8116664, 5, 0, 0, 0, 16, RGB_BLACK waitforvisualfinish @@ -4490,8 +4490,8 @@ Move_CALM_MIND: end Move_LEAF_BLADE: - loadspritegfx ANIM_TAG_063 - loadspritegfx ANIM_TAG_285 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask sub_80FFFC0, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -4515,7 +4515,7 @@ Move_LEAF_BLADE: end Move_DRAGON_DANCE: - loadspritegfx ANIM_TAG_249 + loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER delay 1 @@ -4539,8 +4539,8 @@ Move_DRAGON_DANCE: end Move_SHOCK_WAVE: - loadspritegfx ANIM_TAG_211 - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_ATTACKER @@ -4575,8 +4575,8 @@ Move_HARDEN: end Move_BELLY_DRUM: - loadspritegfx ANIM_TAG_MUSIC_NOTES2 - loadspritegfx ANIM_TAG_193 + loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE createvisualtask sub_8102BE8, 2 waitforvisualfinish call BellyDrum1 @@ -4618,9 +4618,9 @@ BellyDrum1: return Move_MIND_READER: - loadspritegfx ANIM_TAG_189 + loadspritegfx ANIM_TAG_TEAL_ALERT loadspritegfx ANIM_TAG_OPENING_EYE - loadspritegfx ANIM_TAG_191 + loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg ANIM_DEF_PARTNER playsewithpan SE_W109, SOUND_PAN_TARGET createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0 @@ -4660,9 +4660,9 @@ MindReaderEffect: Move_ICE_PUNCH: monbg ANIM_DEF_PARTNER setalpha 12, 8 - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 @@ -4818,8 +4818,8 @@ Move_THUNDER: end Move_THUNDER_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_TARGET setalpha 12, 8 @@ -4852,7 +4852,7 @@ Move_THUNDER_PUNCH: Move_SACRED_FIRE: loadspritegfx ANIM_TAG_FIRE - loadspritegfx ANIM_TAG_035 + loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5 createsprite gUnknown_08595428, 2, -32, 0, 50, 5, -2, 0 delay 1 @@ -4908,7 +4908,7 @@ Move_SACRED_FIRE: end Move_SCRATCH: - loadspritegfx ANIM_TAG_137 + loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W010, SOUND_PAN_TARGET @@ -4955,7 +4955,7 @@ Move_DRAGON_BREATH: end Move_ROAR: - loadspritegfx ANIM_TAG_053 + loadspritegfx ANIM_TAG_NOISE_LINE monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER setalpha 8, 8 @@ -4983,7 +4983,7 @@ RoarEffect: return Move_GROWL: - loadspritegfx ANIM_TAG_053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_8158E9C, 2, 0, 255 call RoarEffect delay 10 @@ -4995,7 +4995,7 @@ Move_GROWL: end Move_SNORE: - loadspritegfx ANIM_TAG_197 + loadspritegfx ANIM_TAG_SNORE_Z monbg ANIM_ATK_PARTNER setalpha 8, 8 call Snore1 @@ -5016,8 +5016,8 @@ Snore1: return Move_LIGHT_SCREEN: - loadspritegfx ANIM_TAG_070 - loadspritegfx ANIM_TAG_166 + loadspritegfx ANIM_TAG_SPARKLE_3 + loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_08596560, 1, 40, 0, 10166 @@ -5043,8 +5043,8 @@ SpecialScreenEffect: return Move_MIRROR_COAT: - loadspritegfx ANIM_TAG_070 - loadspritegfx ANIM_TAG_168 + loadspritegfx ANIM_TAG_SPARKLE_3 + loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 createsprite gUnknown_08596590, 1, 40, 0, 10168 delay 10 @@ -5056,8 +5056,8 @@ Move_MIRROR_COAT: end Move_REFLECT: - loadspritegfx ANIM_TAG_071 - loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_SPARKLE_4 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_08596578, 1, 40, 0, 10167 @@ -5073,7 +5073,7 @@ Move_REFLECT: end Move_BARRIER: - loadspritegfx ANIM_TAG_169 + loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_085965A8, 3, 40, 0, 10169 @@ -5083,8 +5083,8 @@ Move_BARRIER: end Move_BUBBLE: - loadspritegfx ANIM_TAG_146 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_TARGET setalpha 12, 8 delay 1 @@ -5119,7 +5119,7 @@ Move_BUBBLE: end Move_SMOG: - loadspritegfx ANIM_TAG_172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 @@ -5146,7 +5146,7 @@ Smog1: return Move_FAINT_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATTACKER fadetobg BG_DARK waitbgfadein @@ -5182,7 +5182,7 @@ Move_FAINT_ATTACK: end Move_SAND_ATTACK: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 12, 8 @@ -5210,7 +5210,7 @@ SandAttack1: return Move_MUD_SLAP: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND playsewithpan SE_W028, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish @@ -5234,7 +5234,7 @@ MudSlap1: Move_DRAGON_RAGE: loadspritegfx ANIM_TAG_SMALL_EMBER - loadspritegfx ANIM_TAG_035 + loadspritegfx ANIM_TAG_FIRE_PLUME playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 waitforvisualfinish @@ -5265,7 +5265,7 @@ Move_DRAGON_RAGE: end Move_RAIN_DANCE: - loadspritegfx ANIM_TAG_115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish @@ -5279,8 +5279,8 @@ Move_RAIN_DANCE: end Move_BITE: - loadspritegfx ANIM_TAG_139 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W044, SOUND_PAN_TARGET @@ -5296,8 +5296,8 @@ Move_BITE: end Move_CRUNCH: - loadspritegfx ANIM_TAG_139 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein @@ -5324,8 +5324,8 @@ Move_CRUNCH: end Move_CLAMP: - loadspritegfx ANIM_TAG_145 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET @@ -5344,7 +5344,7 @@ Move_ICE_BEAM: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 @@ -5391,7 +5391,7 @@ Move_WITHDRAW: end Move_AURORA_BEAM: - loadspritegfx ANIM_TAG_140 + loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg BG_AURORABEAM waitbgfadein playsewithpan SE_W062, SOUND_PAN_ATTACKER @@ -5427,7 +5427,7 @@ AuroraBeam1: return Move_SOLAR_BEAM: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash SolarBeamEnd: waitforvisualfinish @@ -5516,7 +5516,7 @@ SolarBeamUnleash1: return Move_BLIZZARD: - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue BlizzardAgainstPlayer @@ -5568,7 +5568,7 @@ BlizzardAgainstPlayer: goto BlizzardContinue Move_POWDER_SNOW: - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish @@ -5602,8 +5602,8 @@ PowderSnow1: return Move_HYDRO_PUMP: - loadspritegfx ANIM_TAG_149 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -5649,8 +5649,8 @@ HydroPump2: return Move_SIGNAL_BEAM: - loadspritegfx ANIM_TAG_264 - loadspritegfx ANIM_TAG_265 + loadspritegfx ANIM_TAG_GLOWY_RED_ORB + loadspritegfx ANIM_TAG_GLOWY_GREEN_ORB loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1 delay 6 @@ -5690,9 +5690,9 @@ SignalBeam1: return Move_ABSORB: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -5743,9 +5743,9 @@ AbsorbEffect: return Move_MEGA_DRAIN: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -5804,9 +5804,9 @@ MegaDrainEffect: return Move_GIGA_DRAIN: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -5873,11 +5873,11 @@ GigaDrainEffect: return Move_LEECH_LIFE: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_ORBS delay 1 loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -5903,12 +5903,12 @@ Move_LEECH_LIFE: end Move_SYNTHESIS: - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18) playsewithpan SE_W025, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish - unloadspritegfx ANIM_TAG_SPARKLE + unloadspritegfx ANIM_TAG_SPARKLE_2 delay 1 loadspritegfx ANIM_TAG_BLUE_STAR call HealingEffect @@ -6029,7 +6029,7 @@ Move_ACID: Move_BONEMERANG: loadspritegfx ANIM_TAG_BONE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6049,7 +6049,7 @@ Move_BONEMERANG: Move_BONE_CLUB: loadspritegfx ANIM_TAG_BONE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6067,7 +6067,7 @@ Move_BONE_CLUB: Move_BONE_RUSH: loadspritegfx ANIM_TAG_BONE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_TARGET @@ -6082,7 +6082,7 @@ Move_BONE_RUSH: end Move_SPIKES: - loadspritegfx ANIM_TAG_152 + loadspritegfx ANIM_TAG_SPIKES monbg ANIM_DEF_PARTNER playsewithpan SE_W026, SOUND_PAN_ATTACKER waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 @@ -6099,8 +6099,8 @@ Move_SPIKES: end Move_MEGAHORN: - loadspritegfx ANIM_TAG_153 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HORN_HIT_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER playsewithpan SE_W082, SOUND_PAN_ATTACKER jumpifcontest MegahornInContest @@ -6143,7 +6143,7 @@ MegahornInContest: Move_GUST: loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6161,7 +6161,7 @@ Move_GUST: Move_WING_ATTACK: loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6184,7 +6184,7 @@ Move_WING_ATTACK: end Move_PECK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W030, SOUND_PAN_TARGET createvisualtask sub_80D622C, 2, 3, -768, 1, 2 createsprite gUnknown_085973E8, 131, -12, 0, 1, 3 @@ -6192,8 +6192,8 @@ Move_PECK: end Move_AEROBLAST: - loadspritegfx ANIM_TAG_154 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER call SetFlyingBg monbgprio_28 ANIM_TARGET @@ -6233,8 +6233,8 @@ Aeroblast1: return Move_WATER_GUN: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6257,8 +6257,8 @@ Move_WATER_GUN: end Move_CRABHAMMER: - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gUnknown_08597388, 4, 0, 0, 1, 0 @@ -6334,7 +6334,7 @@ Flamethrower1: return Move_SANDSTORM: - loadspritegfx ANIM_TAG_261 + loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_W201, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE delay 16 @@ -6354,7 +6354,7 @@ Move_SANDSTORM: end Move_WHIRLPOOL: - loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6387,8 +6387,8 @@ WhirlpoolEffect: return Move_FLY: - loadspritegfx ANIM_TAG_156 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim FlySetUp, FlyUnleash FlyEnd: waitforvisualfinish @@ -6414,8 +6414,8 @@ FlyUnleash: goto FlyEnd Move_BOUNCE: - loadspritegfx ANIM_TAG_156 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim BounceSetUp, BounceUnleash BounceEnd: end @@ -6440,8 +6440,8 @@ BounceUnleash: goto BounceEnd Move_KARATE_CHOP: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6457,8 +6457,8 @@ Move_KARATE_CHOP: end Move_CROSS_CHOP: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_285 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET @@ -6475,8 +6475,8 @@ Move_CROSS_CHOP: end Move_JUMP_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 @@ -6493,8 +6493,8 @@ Move_JUMP_KICK: end Move_HI_JUMP_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8 @@ -6519,8 +6519,8 @@ Move_HI_JUMP_KICK: end Move_DOUBLE_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gUnknown_08595EB0, 3, 1, 20, 1 @@ -6532,8 +6532,8 @@ Move_DOUBLE_KICK: end Move_TRIPLE_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET @@ -6565,10 +6565,10 @@ TripleKickCenter: goto TripleKickContinue Move_DYNAMIC_PUNCH: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_EXPLOSION - loadspritegfx ANIM_TAG_007 + loadspritegfx ANIM_TAG_UNUSED_EXPLOSION delay 1 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -6599,8 +6599,8 @@ Move_DYNAMIC_PUNCH: end Move_COUNTER: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 @@ -6631,7 +6631,7 @@ Move_COUNTER: end Move_VITAL_THROW: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233, SOUND_PAN_ATTACKER @@ -6654,9 +6654,9 @@ Move_VITAL_THROW: end Move_ROCK_SMASH: - loadspritegfx ANIM_TAG_058 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 @@ -6681,7 +6681,7 @@ Move_ROCK_SMASH: end Move_SUBMISSION: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER @@ -6714,7 +6714,7 @@ Submission1: return Move_SUNNY_DAY: - loadspritegfx ANIM_TAG_157 + loadspritegfx ANIM_TAG_SUNLIGHT monbg ANIM_ATK_PARTNER setalpha 13, 3 createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE @@ -6737,7 +6737,7 @@ SunnyDay1: return Move_COTTON_SPORE: - loadspritegfx ANIM_TAG_158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 @@ -6758,7 +6758,7 @@ CottonSpore1: return Move_SPORE: - loadspritegfx ANIM_TAG_158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80FEE1C, 2 @@ -6782,8 +6782,8 @@ Spore1: return Move_PETAL_DANCE: - loadspritegfx ANIM_TAG_159 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W080, SOUND_PAN_ATTACKER @@ -6820,9 +6820,9 @@ Move_PETAL_DANCE: end Move_RAZOR_LEAF: - loadspritegfx ANIM_TAG_063 - loadspritegfx ANIM_TAG_160 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 @@ -6861,8 +6861,8 @@ Move_RAZOR_LEAF: Move_NATURE_POWER: Move_ANCIENT_POWER: - loadspritegfx ANIM_TAG_058 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 10, 1 @@ -6911,7 +6911,7 @@ Move_OCTAZOOKA: end Move_MIST: - loadspritegfx ANIM_TAG_144 + loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 @@ -6945,9 +6945,9 @@ Move_HAZE: end Move_FIRE_PUNCH: - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB_RED @@ -6981,7 +6981,7 @@ FireMoveEffect: return Move_LEER: - loadspritegfx ANIM_TAG_GLARE + loadspritegfx ANIM_TAG_LEER monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER setalpha 8, 8 @@ -7000,7 +7000,7 @@ Move_LEER: end Move_DREAM_EATER: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET @@ -7067,7 +7067,7 @@ DreamEaterEffect: return Move_POISON_GAS: - loadspritegfx ANIM_TAG_172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 monbg ANIM_DEF_PARTNER @@ -7120,7 +7120,7 @@ Move_WRAP: goto BindWrap Move_PSYBEAM: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15 @@ -7147,7 +7147,7 @@ Psybeam1: return Move_HYPNOSIS: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING call SetPsychicBackground call Hypnosis1 call Hypnosis1 @@ -7165,7 +7165,7 @@ Hypnosis1: return Move_PSYWAVE: - loadspritegfx ANIM_TAG_165 + loadspritegfx ANIM_TAG_BLUE_RING playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground createvisualtask sub_81076C8, 5, 100 @@ -7189,7 +7189,7 @@ Psywave1: return Move_ZAP_CANNON: - loadspritegfx ANIM_TAG_171 + loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_W086, SOUND_PAN_ATTACKER createsprite gUnknown_08595764, 131, 10, 0, 0, 0, 30, 0 @@ -7211,7 +7211,7 @@ Move_ZAP_CANNON: Move_STEEL_WING: loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish @@ -7237,7 +7237,7 @@ Move_STEEL_WING: end Move_IRON_TAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 0, 0 waitforvisualfinish @@ -7256,7 +7256,7 @@ Move_IRON_TAIL: end Move_POISON_TAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) @@ -7318,7 +7318,7 @@ Move_NIGHT_SHADE: Move_EGG_BOMB: loadspritegfx ANIM_TAG_EXPLOSION - loadspritegfx ANIM_TAG_175 + loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_W039, SOUND_PAN_ATTACKER createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32 waitforvisualfinish @@ -7342,7 +7342,7 @@ Move_EGG_BOMB: end Move_SHADOW_BALL: - loadspritegfx ANIM_TAG_176 + loadspritegfx ANIM_TAG_SHADOW_BALL fadetobg BG_GHOST waitbgfadein delay 15 @@ -7357,7 +7357,7 @@ Move_SHADOW_BALL: end Move_LICK: - loadspritegfx ANIM_TAG_177 + loadspritegfx ANIM_TAG_LICK delay 15 playsewithpan SE_W122, SOUND_PAN_TARGET createsprite gUnknown_08596D8C, 130, 0, 0 @@ -7366,7 +7366,7 @@ Move_LICK: end Move_FOCUS_ENERGY: - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 @@ -7389,7 +7389,7 @@ BideSetUp: end BideUnleash: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 @@ -7419,7 +7419,7 @@ BideUnleash: end Move_STRING_SHOT: - loadspritegfx ANIM_TAG_179 + loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER delay 0 @@ -7517,8 +7517,8 @@ RazorWindSetUp: goto RazorWindContinue RazorWindUnleash: - loadspritegfx ANIM_TAG_154 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER @@ -7539,7 +7539,7 @@ RazorWindUnleash: goto RazorWindContinue Move_DISABLE: - loadspritegfx ANIM_TAG_071 + loadspritegfx ANIM_TAG_SPARKLE_4 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 8, 8 @@ -7555,7 +7555,7 @@ Move_DISABLE: end Move_RECOVER: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER setalpha 12, 8 @@ -7590,7 +7590,7 @@ Recover1: return Move_MIMIC: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS setalpha 11, 5 monbg_22 ANIM_DEF_PARTNER monbgprio_29 @@ -7609,7 +7609,7 @@ Move_MIMIC: end Move_CONSTRICT: - loadspritegfx ANIM_TAG_186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 createsprite gUnknown_08592494, 132, 0, 16, 0, 2 delay 7 @@ -7629,7 +7629,7 @@ Move_CURSE: choosetwoturnanim CurseGhost, CurseStats CurseGhost: loadspritegfx ANIM_TAG_NAIL - loadspritegfx ANIM_TAG_200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_ATK_PARTNER createvisualtask sub_8112758, 5 waitforvisualfinish @@ -7672,7 +7672,7 @@ CurseStats1: Move_SOFT_BOILED: loadspritegfx ANIM_TAG_BREAKING_EGG - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER playsewithpan SE_W039, SOUND_PAN_ATTACKER @@ -7695,8 +7695,8 @@ Move_SOFT_BOILED: Move_HEAL_BELL: loadspritegfx ANIM_TAG_BELL - loadspritegfx ANIM_TAG_MUSIC_NOTES - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 + loadspritegfx ANIM_TAG_THIN_RING createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish createvisualtask sub_8105CB4, 5 @@ -7723,16 +7723,16 @@ Move_HEAL_BELL: createvisualtask sub_8105D60, 5 waitforvisualfinish unloadspritegfx ANIM_TAG_BELL - unloadspritegfx ANIM_TAG_MUSIC_NOTES - unloadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE + unloadspritegfx ANIM_TAG_MUSIC_NOTES_2 + unloadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W234, SOUND_PAN_ATTACKER createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - unloadspritegfx ANIM_TAG_SPARKLE - loadspritegfx ANIM_TAG_203 + unloadspritegfx ANIM_TAG_SPARKLE_2 + loadspritegfx ANIM_TAG_THIN_RING playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8116664, 10, 4, 3, 10, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 10, 0, RGB_WHITE @@ -7757,7 +7757,7 @@ Move_FAKE_OUT: end Move_SCARY_FACE: - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK playsewithpan SE_W060, SOUND_PAN_ATTACKER waitforvisualfinish @@ -7775,7 +7775,7 @@ Move_SCARY_FACE: end Move_SWEET_KISS: - loadspritegfx ANIM_TAG_216 + loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gUnknown_08593AA8, 130, 16, -48 playsewithpan SE_W215, SOUND_PAN_TARGET @@ -7794,8 +7794,8 @@ Move_SWEET_KISS: end Move_LOVELY_KISS: - loadspritegfx ANIM_TAG_219 - loadspritegfx ANIM_TAG_EVIL_ANGEL + loadspritegfx ANIM_TAG_PINK_HEART + loadspritegfx ANIM_TAG_DEVIL createsprite gUnknown_08593AF0, 130, 0, -24 playsewithpan SE_W060B, SOUND_PAN_TARGET waitforvisualfinish @@ -7807,7 +7807,7 @@ Move_LOVELY_KISS: end Move_FURY_SWIPES: - loadspritegfx ANIM_TAG_222 + loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET @@ -7822,8 +7822,8 @@ Move_FURY_SWIPES: end Move_INGRAIN: - loadspritegfx ANIM_TAG_223 - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_ORBS createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 @@ -7912,14 +7912,14 @@ PresentHeal: end Move_BATON_PASS: - loadspritegfx ANIM_TAG_226 + loadspritegfx ANIM_TAG_POKEBALL playsewithpan SE_W226, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) createsprite gUnknown_085CE370, 2 end Move_PERISH_SONG: - loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 createsprite gUnknown_08593C0C, 4, 0, 0, 0 createsprite gUnknown_08593C0C, 4, 1, 1, 16 createsprite gUnknown_08593C0C, 4, 2, 1, 32 @@ -7982,7 +7982,7 @@ Move_SLEEP_TALK: end Move_HYPER_FANG: - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK playsewithpan SE_W044, SOUND_PAN_TARGET delay 1 delay 2 @@ -8055,15 +8055,15 @@ Move_TRI_ATTACK: delay 2 createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS call FreezeEffect1 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish end Move_WILL_O_WISP: - loadspritegfx ANIM_TAG_232 - loadspritegfx ANIM_TAG_231 + loadspritegfx ANIM_TAG_WISP_FIRE + loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W052, SOUND_PAN_ATTACKER @@ -8093,8 +8093,8 @@ Move_WILL_O_WISP: end Move_ENCORE: - loadspritegfx ANIM_TAG_227 - loadspritegfx ANIM_TAG_HAND + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish @@ -8114,7 +8114,7 @@ Move_ENCORE: Move_TRICK: loadspritegfx ANIM_TAG_ITEM_BAG - loadspritegfx ANIM_TAG_207 + loadspritegfx ANIM_TAG_SPEED_DUST createsprite gUnknown_085926E8, 2, -40, 80 createsprite gUnknown_085926E8, 2, -40, 208 delay 16 @@ -8141,8 +8141,8 @@ Move_TRICK: end Move_WISH: - loadspritegfx ANIM_TAG_233 - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 @@ -8157,7 +8157,7 @@ Move_WISH: end Move_STOCKPILE: - loadspritegfx ANIM_TAG_235 + loadspritegfx ANIM_TAG_GRAY_ORB playsewithpan SE_W025, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask sub_815B65C, 5 @@ -8186,8 +8186,8 @@ Stockpile1: return Move_SPIT_UP: - loadspritegfx ANIM_TAG_237 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_RED_ORB_2 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B6B4, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 @@ -8233,7 +8233,7 @@ SpitUpStrongest: goto SpitUpContinue Move_SWALLOW: - loadspritegfx ANIM_TAG_236 + loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B778, 5 @@ -8310,7 +8310,7 @@ MorningSun1: return Move_SWEET_SCENT: - loadspritegfx ANIM_TAG_238 + loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_W230, SOUND_PAN_ATTACKER createsprite gUnknown_085CE544, 2, 100, 0, 100 delay 25 @@ -8348,7 +8348,7 @@ SweetScentEffect: return Move_HYPER_BEAM: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish delay 10 @@ -8358,7 +8358,7 @@ Move_HYPER_BEAM: delay 30 createsoundtask sub_8158C58, 247, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 - createvisualtask sub_8115D94, 2, ANIM_TAG_147, 1, 12, 31, 16, 0, 0 + createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0 call HyperBeam1 call HyperBeam1 call HyperBeam1 @@ -8398,8 +8398,8 @@ HyperBeam1: return Move_FLATTER: - loadspritegfx ANIM_TAG_227 - loadspritegfx ANIM_TAG_240 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_CONFETTI createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 @@ -8458,8 +8458,8 @@ Move_ROLE_PLAY: end Move_REFRESH: - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_815DFCC, 2, 0 waitforvisualfinish @@ -8472,8 +8472,8 @@ Move_REFRESH: end Move_BLAZE_KICK: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_TARGET setalpha 12, 8 @@ -8493,7 +8493,7 @@ Move_BLAZE_KICK: end Move_HYPER_VOICE: - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING createvisualtask sub_81590B8, 5, 0 call HyperVoiceEffect waitforvisualfinish @@ -8513,7 +8513,7 @@ HyperVoiceEffect: return Move_SAND_TOMB: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1 playsewithpan SE_W328, SOUND_PAN_TARGET @@ -8559,8 +8559,8 @@ Move_SHEER_COLD: end Move_ARM_THRUST: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbgprio_28 ANIM_TARGET setalpha 12, 8 createvisualtask sub_80D6134, 5, 8, 5, 0, 0 @@ -8679,7 +8679,7 @@ End: end Move_MUD_SHOT: - loadspritegfx ANIM_TAG_259 + loadspritegfx ANIM_TAG_BROWN_ORB monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -8711,9 +8711,9 @@ MudShot1: return Move_METEOR_MASH: - loadspritegfx ANIM_TAG_233 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0 fadetobg BG_COSMIC waitbgfadein @@ -8736,7 +8736,7 @@ Move_METEOR_MASH: end Move_REVENGE: - loadspritegfx ANIM_TAG_245 + loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -8744,15 +8744,15 @@ Move_REVENGE: waitforvisualfinish createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED waitforvisualfinish - unloadspritegfx ANIM_TAG_245 - loadspritegfx ANIM_TAG_246 + unloadspritegfx ANIM_TAG_PURPLE_SCRATCH + loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gUnknown_085960D0, 130, 10, -10 waitforvisualfinish - unloadspritegfx ANIM_TAG_246 - loadspritegfx ANIM_TAG_135 + unloadspritegfx ANIM_TAG_PURPLE_SWIPE + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1 createsprite gUnknown_08597400, 131, -10, -8, 1, 1, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET @@ -8765,7 +8765,7 @@ Move_REVENGE: end Move_POISON_FANG: - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gUnknown_085CE1DC, 130 @@ -8783,8 +8783,8 @@ Move_SUBSTITUTE: end Move_FRENZY_PLANT: - loadspritegfx ANIM_TAG_223 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -8843,7 +8843,7 @@ Move_FRENZY_PLANT: end Move_METAL_SOUND: - loadspritegfx ANIM_TAG_260 + loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 @@ -8868,8 +8868,8 @@ FocusPunchEnd: waitforvisualfinish end FocusPunch: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET delay 1 createvisualtask AnimTask_IsContest, 2 jumprettrue FocusPunchInContest @@ -8911,7 +8911,7 @@ FocusPunchInContest: goto FocusPunchContinue Move_RETURN: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_GetReturnPowerLevel, 2 @@ -9048,7 +9048,7 @@ ReturnStrongest1: return Move_COSMIC_POWER: - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_8159244, 5, 243, 0 playsewithpan SE_W322, 0 createvisualtask sub_8117610, 2, 0, 0, 15, 0 @@ -9073,8 +9073,8 @@ Move_COSMIC_POWER: end Move_BLAST_BURN: - loadspritegfx ANIM_TAG_035 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_FIRE_PLUME + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W221, SOUND_PAN_ATTACKER @@ -9119,7 +9119,7 @@ Move_BLAST_BURN: Move_ROCK_TOMB: loadspritegfx ANIM_TAG_X_SIGN - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish createsprite gUnknown_08596C58, 130, 20, 12, 64, 114, 0 @@ -9150,7 +9150,7 @@ Move_ROCK_TOMB: end Move_SILVER_WIND: - loadspritegfx ANIM_TAG_271 + loadspritegfx ANIM_TAG_SPARKLE_6 panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 playsewithpan SE_W234, 0 delay 0 @@ -9212,11 +9212,11 @@ Move_SNATCH: end Move_DIVE: - loadspritegfx ANIM_TAG_272 - loadspritegfx ANIM_TAG_273 + loadspritegfx ANIM_TAG_SPLASH + loadspritegfx ANIM_TAG_SWEAT_BEAD choosetwoturnanim DiveSetUp, DiveAttack DiveSetUp: - loadspritegfx ANIM_TAG_156 + loadspritegfx ANIM_TAG_ROUND_SHADOW playsewithpan SE_W029, SOUND_PAN_ATTACKER createsprite gUnknown_08596490, 2, 0, 0, 13, 336 waitforvisualfinish @@ -9233,8 +9233,8 @@ DiveSetUp1: createsprite gUnknown_085964E4, 5, 1, 0 return DiveAttack: - loadspritegfx ANIM_TAG_148 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W153, SOUND_PAN_TARGET @@ -9257,8 +9257,8 @@ DiveAttack1: return Move_ROCK_BLAST: - loadspritegfx ANIM_TAG_058 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER @@ -9276,7 +9276,7 @@ Move_ROCK_BLAST: Move_OVERHEAT: loadspritegfx ANIM_TAG_SMALL_EMBER - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 18 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 5, RGB(28, 0, 0) @@ -9356,8 +9356,8 @@ Move_OVERHEAT: end Move_HYDRO_CANNON: - loadspritegfx ANIM_TAG_149 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER @@ -9398,7 +9398,7 @@ HydroCannon1: return Move_ASTONISH: - loadspritegfx ANIM_TAG_273 + loadspritegfx ANIM_TAG_SWEAT_BEAD playsewithpan SE_W227, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 25 @@ -9411,8 +9411,8 @@ Move_ASTONISH: end Move_SEISMIC_TOSS: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -9478,7 +9478,7 @@ SeismicToss2: return Move_MAGIC_COAT: - loadspritegfx ANIM_TAG_170 + loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_085965C0, 3, 40, 0, 10170 @@ -9488,8 +9488,8 @@ Move_MAGIC_COAT: end Move_WATER_PULSE: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_288 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_BLUE_RING_2 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET playsewithpan SE_W145C, SOUND_PAN_ATTACKER @@ -9519,7 +9519,7 @@ Move_WATER_PULSE: end Move_PSYCHO_BOOST: - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout @@ -9546,8 +9546,8 @@ Move_PSYCHO_BOOST: end Move_KNOCK_OFF: - loadspritegfx ANIM_TAG_277 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SLAM_HIT_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 4 playsewithpan SE_W233, SOUND_PAN_TARGET @@ -9586,7 +9586,7 @@ Move_DOOM_DESIRE: end Move_SKY_UPPERCUT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET fadetobg BG_SEISMICTOSS_SKUUPPERCUT @@ -9643,9 +9643,9 @@ Move_SECRET_POWER: goto Move_SLAM Move_TWISTER: - loadspritegfx ANIM_TAG_063 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET playsewithpan SE_W239, SOUND_PAN_TARGET @@ -9689,9 +9689,9 @@ Move_TWISTER: end Move_MAGICAL_LEAF: - loadspritegfx ANIM_TAG_063 - loadspritegfx ANIM_TAG_160 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 @@ -9734,7 +9734,7 @@ Move_MAGICAL_LEAF: Move_ICE_BALL: loadspritegfx ANIM_TAG_ICE_CHUNK - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, IceBallSetIceBg IceBallContinue: @@ -9823,7 +9823,7 @@ IceBall1: return Move_WEATHER_BALL: - loadspritegfx ANIM_TAG_283 + loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER delay 8 playsewithpan SE_W207, SOUND_PAN_ATTACKER @@ -9841,7 +9841,7 @@ Move_WEATHER_BALL: jumpreteq ANIM_WEATHER_SANDSTORM, WeatherBallSandstorm jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce WeatherBallNormal: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createsprite gUnknown_0853EE50, 130, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, SOUND_PAN_TARGET @@ -9865,7 +9865,7 @@ WeatherBallFire: waitforvisualfinish end WeatherBallWater: - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, SOUND_PAN_TARGET delay 8 @@ -9880,7 +9880,7 @@ WeatherBallWater: waitforvisualfinish end WeatherBallSandstorm: - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 5 @@ -9899,8 +9899,8 @@ WeatherBallSandstorm: waitforvisualfinish end WeatherBallIce: - loadspritegfx ANIM_TAG_263 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 @@ -9917,7 +9917,7 @@ WeatherBallIce: end Move_COUNT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET @@ -10235,7 +10235,7 @@ Burn1: return Status_Infatuation: - loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_MAGENTA_HEART playsewithpan SE_W204, SOUND_PAN_ATTACKER createsprite gUnknown_08593970, 3, 0, 20 delay 15 @@ -10272,7 +10272,7 @@ Status_Freeze: end Status_Curse: - loadspritegfx ANIM_TAG_200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8596DE8, 130 @@ -10282,7 +10282,7 @@ Status_Curse: end Status_Nightmare: - loadspritegfx ANIM_TAG_EVIL_ANGEL + loadspritegfx ANIM_TAG_DEVIL monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8596E00, 130 @@ -10355,7 +10355,7 @@ General_TurnTrap: jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb goto Status_BindWrap Status_BindWrap: - loadspritegfx ANIM_TAG_186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 createsprite gUnknown_08592494, 132, 0, 16, 0, 1 delay 7 @@ -10377,7 +10377,7 @@ Status_FireSpin: stopsound end Status_Whrilpool: - loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -10394,8 +10394,8 @@ Status_Whrilpool: clearmonbg ANIM_DEF_PARTNER end Status_Clamp: - loadspritegfx ANIM_TAG_145 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET @@ -10410,7 +10410,7 @@ Status_Clamp: waitforvisualfinish end Status_SandTomb: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 playsewithpan SE_W328, SOUND_PAN_TARGET @@ -10423,8 +10423,8 @@ Status_SandTomb: end General_ItemEffect: - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D622C, 2, 16, 128, 0, 2 @@ -10445,7 +10445,7 @@ General_ItemEffect: end General_SmokeballEscape: - loadspritegfx ANIM_TAG_242 + loadspritegfx ANIM_TAG_PINK_CLOUD monbg ANIM_ATTACKER setalpha 12, 4 delay 0 @@ -10494,7 +10494,7 @@ General_HangedOn: end General_Rain: - loadspritegfx ANIM_TAG_115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish @@ -10521,7 +10521,7 @@ General_LeechSeedDrain: goto Move_ABSORB General_MonHit: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET @@ -10618,7 +10618,7 @@ General_DoomDesireHit: end General_FocusPunchSetUp: - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 @@ -10631,7 +10631,7 @@ General_FocusPunchSetUp: end General_IngrainHeal: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -10650,13 +10650,13 @@ General_IngrainHeal: end General_WishHeal: - loadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W025, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish - unloadspritegfx ANIM_TAG_SPARKLE + unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_BLUE_STAR call HealingEffect waitforvisualfinish @@ -10718,7 +10718,7 @@ BallThrowEnd: createvisualtask sub_8170D24, 2 end BallThrowTrainerBlock: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT delay 25 monbg ANIM_DEF_PARTNER setalpha 12, 8 diff --git a/data/battle_anims.s b/data/battle_anims.s deleted file mode 100644 index 955da1a2e..000000000 --- a/data/battle_anims.s +++ /dev/null @@ -1,907 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_08524904:: @ 8524904 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_0852490C:: @ 852490C - .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524914:: @ 8524914 - .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_0852491C:: @ 852491C - .byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524924:: @ 8524924 - .byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_0852492C:: @ 852492C - .byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524934:: @ 8524934 - .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_0852493C:: @ 852493C - .byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524944:: @ 8524944 - .byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_0852494C:: @ 852494C - .byte 0x00, 0x80, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524954:: @ 8524954 - .byte 0x00, 0x80, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_0852495C:: @ 852495C - .byte 0x00, 0x80, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524964:: @ 8524964 - .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_0852496C:: @ 852496C - .byte 0x00, 0x01, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524974:: @ 8524974 - .byte 0x00, 0x01, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_0852497C:: @ 852497C - .byte 0x00, 0x01, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524984:: @ 8524984 - .byte 0x00, 0x41, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_0852498C:: @ 852498C - .byte 0x00, 0x41, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524994:: @ 8524994 - .byte 0x00, 0x41, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_0852499C:: @ 852499C - .byte 0x00, 0x41, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249A4:: @ 85249A4 - .byte 0x00, 0x81, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249AC:: @ 85249AC - .byte 0x00, 0x81, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249B4:: @ 85249B4 - .byte 0x00, 0x81, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249BC:: @ 85249BC - .byte 0x00, 0x81, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249C4:: @ 85249C4 - .byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249CC:: @ 85249CC - .byte 0x00, 0x03, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249D4:: @ 85249D4 - .byte 0x00, 0x03, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249DC:: @ 85249DC - .byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249E4:: @ 85249E4 - .byte 0x00, 0x43, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249EC:: @ 85249EC - .byte 0x00, 0x43, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249F4:: @ 85249F4 - .byte 0x00, 0x43, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_085249FC:: @ 85249FC - .byte 0x00, 0x43, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A04:: @ 8524A04 - .byte 0x00, 0x83, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A0C:: @ 8524A0C - .byte 0x00, 0x83, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A14:: @ 8524A14 - .byte 0x00, 0x83, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A1C:: @ 8524A1C - .byte 0x00, 0x83, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A24:: @ 8524A24 - .byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A2C:: @ 8524A2C - .byte 0x00, 0x04, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A34:: @ 8524A34 - .byte 0x00, 0x04, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A3C:: @ 8524A3C - .byte 0x00, 0x04, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A44:: @ 8524A44 - .byte 0x00, 0x44, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A4C:: @ 8524A4C - .byte 0x00, 0x44, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A54:: @ 8524A54 - .byte 0x00, 0x44, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A5C:: @ 8524A5C - .byte 0x00, 0x44, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A64:: @ 8524A64 - .byte 0x00, 0x84, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A6C:: @ 8524A6C - .byte 0x00, 0x84, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A74:: @ 8524A74 - .byte 0x00, 0x84, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A7C:: @ 8524A7C - .byte 0x00, 0x84, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A84:: @ 8524A84 - .byte 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A8C:: @ 8524A8C - .byte 0x00, 0x05, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A94:: @ 8524A94 - .byte 0x00, 0x05, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524A9C:: @ 8524A9C - .byte 0x00, 0x05, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524AA4:: @ 8524AA4 - .byte 0x00, 0x45, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524AAC:: @ 8524AAC - .byte 0x00, 0x45, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524AB4:: @ 8524AB4 - .byte 0x00, 0x45, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524ABC:: @ 8524ABC - .byte 0x00, 0x45, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524AC4:: @ 8524AC4 - .byte 0x00, 0x85, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524ACC:: @ 8524ACC - .byte 0x00, 0x85, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524AD4:: @ 8524AD4 - .byte 0x00, 0x85, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524ADC:: @ 8524ADC - .byte 0x00, 0x85, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524AE4:: @ 8524AE4 - .byte 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524AEC:: @ 8524AEC - .byte 0x00, 0x07, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524AF4:: @ 8524AF4 - .byte 0x00, 0x07, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524AFC:: @ 8524AFC - .byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524B04:: @ 8524B04 - .byte 0x00, 0x47, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524B0C:: @ 8524B0C - .byte 0x00, 0x47, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524B14:: @ 8524B14 - .byte 0x00, 0x47, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524B1C:: @ 8524B1C - .byte 0x00, 0x47, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524B24:: @ 8524B24 - .byte 0x00, 0x87, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524B2C:: @ 8524B2C - .byte 0x00, 0x87, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524B34:: @ 8524B34 - .byte 0x00, 0x87, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08524B3C:: @ 8524B3C - .byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gBattleAnimPicTable:: @ 8524B44 - obj_tiles gBattleAnimSpriteSheet_000, 0x0200, 0x2710 - obj_tiles gBattleAnimSpriteSheet_001, 0x0300, 0x2711 - obj_tiles gBattleAnimSpriteSheet_002, 0x0200, 0x2712 - obj_tiles gBattleAnimSpriteSheet_003, 0x0100, 0x2713 - obj_tiles gBattleAnimSpriteSheet_004, 0x0200, 0x2714 - obj_tiles gBattleAnimSpriteSheet_005, 0x0400, 0x2715 - obj_tiles gBattleAnimSpriteSheet_006, 0x0180, 0x2716 - obj_tiles gBattleAnimSpriteSheet_007, 0x0800, 0x2717 - obj_tiles gBattleAnimSpriteSheet_008, 0x0020, 0x2718 - obj_tiles gBattleAnimSpriteSheet_009, 0x0400, 0x2719 - obj_tiles gBattleAnimSpriteSheet_010, 0x1200, 0x271a - obj_tiles gBattleAnimSpriteSheet_011, 0x0180, 0x271b - obj_tiles gBattleAnimSpriteSheet_012, 0x0080, 0x271c - obj_tiles gBattleAnimSpriteSheet_013, 0x0080, 0x271d - obj_tiles gBattleAnimSpriteSheet_014, 0x0280, 0x271e - obj_tiles gBattleAnimSpriteSheet_015, 0x0080, 0x271f - obj_tiles gBattleAnimSpriteSheet_016, 0x0100, 0x2720 - obj_tiles gBattleAnimSpriteSheet_017, 0x0020, 0x2721 - obj_tiles gBattleAnimSpriteSheet_018, 0x0080, 0x2722 - obj_tiles gBattleAnimSpriteSheet_019, 0x0400, 0x2723 - obj_tiles gBattleAnimSpriteSheet_020, 0x0200, 0x2724 - obj_tiles gBattleAnimSpriteSheet_021, 0x0a00, 0x2725 - obj_tiles gBattleAnimSpriteSheet_021, 0x0a00, 0x2726 - obj_tiles gBattleAnimSpriteSheet_023, 0x0380, 0x2727 - obj_tiles gBattleAnimSpriteSheet_024, 0x0300, 0x2728 - obj_tiles gBattleAnimSpriteSheet_025, 0x0a00, 0x2729 - obj_tiles gBattleAnimSpriteSheet_026, 0x0a00, 0x272a - obj_tiles gBattleAnimSpriteSheet_027, 0x0a00, 0x272b - obj_tiles gBattleAnimSpriteSheet_028, 0x0a00, 0x272c - obj_tiles gBattleAnimSpriteSheet_029, 0x0a00, 0x272d - obj_tiles gBattleAnimSpriteSheet_030, 0x0a00, 0x272e - obj_tiles gBattleAnimSpriteSheet_031, 0x0e00, 0x272f - obj_tiles gBattleAnimSpriteSheet_032, 0x0380, 0x2730 - obj_tiles gBattleAnimSpriteSheet_033, 0x1000, 0x2731 - obj_tiles gBattleAnimSpriteSheet_034, 0x0800, 0x2732 - obj_tiles gBattleAnimSpriteSheet_035, 0x0a00, 0x2733 - obj_tiles gBattleAnimSpriteSheet_036, 0x0800, 0x2734 - obj_tiles gBattleAnimSpriteSheet_037, 0x0a00, 0x2735 - obj_tiles gBattleAnimSpriteSheet_038, 0x0a00, 0x2736 - obj_tiles gBattleAnimSpriteSheet_039, 0x0a00, 0x2737 - obj_tiles gBattleAnimSpriteSheet_040, 0x0a00, 0x2738 - obj_tiles gBattleAnimSpriteSheet_041, 0x0a00, 0x2739 - obj_tiles gBattleAnimSpriteSheet_042, 0x0a00, 0x273a - obj_tiles gBattleAnimSpriteSheet_043, 0x0a00, 0x273b - obj_tiles gBattleAnimSpriteSheet_044, 0x0a00, 0x273c - obj_tiles gBattleAnimSpriteSheet_045, 0x0a00, 0x273d - obj_tiles gBattleAnimSpriteSheet_046, 0x1000, 0x273e - obj_tiles gBattleAnimSpriteSheet_046, 0x1000, 0x273f - obj_tiles gBattleAnimSpriteSheet_048, 0x1000, 0x2740 - obj_tiles gBattleAnimSpriteSheet_048, 0x1000, 0x2741 - obj_tiles gBattleAnimSpriteSheet_050, 0x0200, 0x2742 - obj_tiles gBattleAnimSpriteSheet_051, 0x0200, 0x2743 - obj_tiles gBattleAnimSpriteSheet_052, 0x0200, 0x2744 - obj_tiles gBattleAnimSpriteSheet_053, 0x0800, 0x2745 - obj_tiles gBattleAnimSpriteSheet_054, 0x0080, 0x2746 - obj_tiles gBattleAnimSpriteSheet_055, 0x0200, 0x2747 - obj_tiles gBattleAnimSpriteSheet_056, 0x1000, 0x2748 - obj_tiles gBattleAnimSpriteSheet_057, 0x0180, 0x2749 - obj_tiles gBattleAnimSpriteSheet_058, 0x0c00, 0x274a - obj_tiles gBattleAnimSpriteSheet_059, 0x0100, 0x274b - obj_tiles gBattleAnimSpriteSheet_060, 0x0040, 0x274c - obj_tiles gBattleAnimSpriteSheet_061, 0x0180, 0x274d - obj_tiles gBattleAnimSpriteSheet_062, 0x0800, 0x274e - obj_tiles gBattleAnimSpriteSheet_063, 0x0480, 0x274f - obj_tiles gBattleAnimSpriteSheet_064, 0x0200, 0x2750 - obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2751 - obj_tiles gBattleAnimSpriteSheet_066, 0x0100, 0x2752 - obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2753 - obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2754 - obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2755 - obj_tiles gBattleAnimSpriteSheet_070, 0x0200, 0x2756 - obj_tiles gBattleAnimSpriteSheet_071, 0x0a00, 0x2757 - obj_tiles gBattleAnimSpriteSheet_072, 0x0300, 0x2758 - obj_tiles gBattleAnimSpriteSheet_073, 0x0180, 0x2759 - obj_tiles gBattleAnimSpriteSheet_074, 0x00a0, 0x275a - obj_tiles gBattleAnimSpriteSheet_075, 0x0700, 0x275b - obj_tiles gBattleAnimSpriteSheet_076, 0x0400, 0x275c - obj_tiles gBattleAnimSpriteSheet_077, 0x0200, 0x275d - obj_tiles gBattleAnimSpriteSheet_078, 0x0300, 0x275e - obj_tiles gBattleAnimSpriteSheet_079, 0x0c00, 0x275f - obj_tiles gBattleAnimSpriteSheet_080, 0x0a00, 0x2760 - obj_tiles gBattleAnimSpriteSheet_081, 0x0080, 0x2761 - obj_tiles gBattleAnimSpriteSheet_082, 0x0040, 0x2762 - obj_tiles gBattleAnimSpriteSheet_083, 0x0e00, 0x2763 - obj_tiles gBattleAnimSpriteSheet_084, 0x0e00, 0x2764 - obj_tiles gBattleAnimSpriteSheet_085, 0x0280, 0x2765 - obj_tiles gBattleAnimSpriteSheet_086, 0x0200, 0x2766 - obj_tiles gBattleAnimSpriteSheet_087, 0x0080, 0x2767 - obj_tiles gBattleAnimSpriteSheet_088, 0x00c0, 0x2768 - obj_tiles gBattleAnimSpriteSheet_089, 0x0a00, 0x2769 - obj_tiles gBattleAnimSpriteSheet_090, 0x0200, 0x276a - obj_tiles gBattleAnimSpriteSheet_091, 0x0180, 0x276b - obj_tiles gBattleAnimSpriteSheet_092, 0x0080, 0x276c - obj_tiles gBattleAnimSpriteSheet_093, 0x1000, 0x276d - obj_tiles gBattleAnimSpriteSheet_094, 0x0a00, 0x276e - obj_tiles gBattleAnimSpriteSheet_095, 0x0180, 0x276f - obj_tiles gBattleAnimSpriteSheet_096, 0x0380, 0x2770 - obj_tiles gBattleAnimSpriteSheet_097, 0x0c00, 0x2771 - obj_tiles gBattleAnimSpriteSheet_098, 0x0200, 0x2772 - obj_tiles gBattleAnimSpriteSheet_099, 0x0200, 0x2773 - obj_tiles gBattleAnimSpriteSheet_100, 0x0200, 0x2774 - obj_tiles gBattleAnimSpriteSheet_101, 0x0200, 0x2775 - obj_tiles gBattleAnimSpriteSheet_102, 0x0400, 0x2776 - obj_tiles gBattleAnimSpriteSheet_103, 0x0080, 0x2777 - obj_tiles gBattleAnimSpriteSheet_104, 0x0400, 0x2778 - obj_tiles gBattleAnimSpriteSheet_105, 0x0c00, 0x2779 - obj_tiles gBattleAnimSpriteSheet_106, 0x0200, 0x277a - obj_tiles gBattleAnimSpriteSheet_107, 0x1000, 0x277b - obj_tiles gBattleAnimSpriteSheet_108, 0x0a00, 0x277c - obj_tiles gBattleAnimSpriteSheet_109, 0x0020, 0x277d - obj_tiles gBattleAnimSpriteSheet_110, 0x0e00, 0x277e - obj_tiles gBattleAnimSpriteSheet_111, 0x0080, 0x277f - obj_tiles gBattleAnimSpriteSheet_112, 0x0a00, 0x2780 - obj_tiles gBattleAnimSpriteSheet_113, 0x0400, 0x2781 - obj_tiles gBattleAnimSpriteSheet_114, 0x0200, 0x2782 - obj_tiles gBattleAnimSpriteSheet_115, 0x0700, 0x2783 - obj_tiles gBattleAnimSpriteSheet_116, 0x0800, 0x2784 - obj_tiles gBattleAnimSpriteSheet_117, 0x0a00, 0x2785 - obj_tiles gBattleAnimSpriteSheet_118, 0x0600, 0x2786 - obj_tiles gBattleAnimSpriteSheet_119, 0x0800, 0x2787 - obj_tiles gBattleAnimSpriteSheet_120, 0x0200, 0x2788 - obj_tiles gBattleAnimSpriteSheet_121, 0x0040, 0x2789 - obj_tiles gBattleAnimSpriteSheet_122, 0x0180, 0x278a - obj_tiles gBattleAnimSpriteSheet_123, 0x0600, 0x278b - obj_tiles gBattleAnimSpriteSheet_124, 0x0600, 0x278c - obj_tiles gBattleAnimSpriteSheet_125, 0x0200, 0x278d - obj_tiles gBattleAnimSpriteSheet_126, 0x0080, 0x278e - obj_tiles gBattleAnimSpriteSheet_127, 0x0200, 0x278f - obj_tiles gBattleAnimSpriteSheet_128, 0x0800, 0x2790 - obj_tiles gBattleAnimSpriteSheet_129, 0x0080, 0x2791 - obj_tiles gBattleAnimSpriteSheet_130, 0x0a00, 0x2792 - obj_tiles gBattleAnimSpriteSheet_131, 0x0280, 0x2793 - obj_tiles gBattleAnimSpriteSheet_132, 0x0280, 0x2794 - obj_tiles gBattleAnimSpriteSheet_133, 0x0100, 0x2795 - obj_tiles gBattleAnimSpriteSheet_134, 0x0200, 0x2796 - obj_tiles gBattleAnimSpriteSheet_135, 0x0200, 0x2797 - obj_tiles gBattleAnimSpriteSheet_136, 0x0020, 0x2798 - obj_tiles gBattleAnimSpriteSheet_137, 0x0a00, 0x2799 - obj_tiles gBattleAnimSpriteSheet_138, 0x0800, 0x279a - obj_tiles gBattleAnimSpriteSheet_139, 0x0800, 0x279b - obj_tiles gBattleAnimSpriteSheet_140, 0x00c0, 0x279c - obj_tiles gBattleAnimSpriteSheet_141, 0x01c0, 0x279d - obj_tiles gBattleAnimSpriteSheet_142, 0x0100, 0x279e - obj_tiles gBattleAnimSpriteSheet_143, 0x0800, 0x279f - obj_tiles gBattleAnimSpriteSheet_144, 0x0200, 0x27a0 - obj_tiles gBattleAnimSpriteSheet_145, 0x0800, 0x27a1 - obj_tiles gBattleAnimSpriteSheet_146, 0x0180, 0x27a2 - obj_tiles gBattleAnimSpriteSheet_147, 0x0180, 0x27a3 - obj_tiles gBattleAnimSpriteSheet_148, 0x0200, 0x27a4 - obj_tiles gBattleAnimSpriteSheet_149, 0x0200, 0x27a5 - obj_tiles gBattleAnimSpriteSheet_150, 0x0180, 0x27a6 - obj_tiles gBattleAnimSpriteSheet_151, 0x0400, 0x27a7 - obj_tiles gBattleAnimSpriteSheet_152, 0x0080, 0x27a8 - obj_tiles gBattleAnimSpriteSheet_153, 0x0100, 0x27a9 - obj_tiles gBattleAnimSpriteSheet_154, 0x0100, 0x27aa - obj_tiles gBattleAnimSpriteSheet_155, 0x0140, 0x27ab - obj_tiles gBattleAnimSpriteSheet_156, 0x0800, 0x27ac - obj_tiles gBattleAnimSpriteSheet_157, 0x0200, 0x27ad - obj_tiles gBattleAnimSpriteSheet_158, 0x0100, 0x27ae - obj_tiles gBattleAnimSpriteSheet_159, 0x00a0, 0x27af - obj_tiles gBattleAnimSpriteSheet_160, 0x0100, 0x27b0 - obj_tiles gBattleAnimSpriteSheet_161, 0x0080, 0x27b1 - obj_tiles gBattleAnimSpriteSheet_162, 0x0300, 0x27b2 - obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x27b3 - obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x27b4 - obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x27b5 - obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b6 - obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b7 - obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b8 - obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b9 - obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27ba - obj_tiles gBattleAnimSpriteSheet_171, 0x0080, 0x27bb - obj_tiles gBattleAnimSpriteSheet_144, 0x0200, 0x27bc - obj_tiles gBattleAnimSpriteSheet_173, 0x0200, 0x27bd - obj_tiles gBattleAnimSpriteSheet_174, 0x0200, 0x27be - obj_tiles gBattleAnimSpriteSheet_175, 0x0080, 0x27bf - obj_tiles gBattleAnimSpriteSheet_176, 0x0200, 0x27c0 - obj_tiles gBattleAnimSpriteSheet_177, 0x0500, 0x27c1 - obj_tiles gBattleAnimSpriteSheet_178, 0x0800, 0x27c2 - obj_tiles gBattleAnimSpriteSheet_179, 0x0400, 0x27c3 - obj_tiles gBattleAnimSpriteSheet_180, 0x0020, 0x27c4 - obj_tiles gBattleAnimSpriteSheet_181, 0x0800, 0x27c5 - obj_tiles gBattleAnimSpriteSheet_182, 0x0100, 0x27c6 - obj_tiles gBattleAnimSpriteSheet_183, 0x0800, 0x27c7 - obj_tiles gBattleAnimSpriteSheet_184, 0x0400, 0x27c8 - obj_tiles gBattleAnimSpriteSheet_185, 0x0a00, 0x27c9 - obj_tiles gBattleAnimSpriteSheet_186, 0x1000, 0x27ca - obj_tiles gBattleAnimSpriteSheet_187, 0x0800, 0x27cb - obj_tiles gBattleAnimSpriteSheet_188, 0x0400, 0x27cc - obj_tiles gBattleAnimSpriteSheet_189, 0x0200, 0x27cd - obj_tiles gBattleAnimSpriteSheet_190, 0x0800, 0x27ce - obj_tiles gBattleAnimSpriteSheet_191, 0x0800, 0x27cf - obj_tiles gBattleAnimSpriteSheet_192, 0x0800, 0x27d0 - obj_tiles gBattleAnimSpriteSheet_193, 0x0200, 0x27d1 - obj_tiles gBattleAnimSpriteSheet_194, 0x0800, 0x27d2 - obj_tiles gBattleAnimSpriteSheet_195, 0x0200, 0x27d3 - obj_tiles gBattleAnimSpriteSheet_196, 0x0800, 0x27d4 - obj_tiles gBattleAnimSpriteSheet_197, 0x0200, 0x27d5 - obj_tiles gBattleAnimSpriteSheet_198, 0x0800, 0x27d6 - obj_tiles gBattleAnimSpriteSheet_199, 0x0400, 0x27d7 - obj_tiles gBattleAnimSpriteSheet_200, 0x0200, 0x27d8 - obj_tiles gBattleAnimSpriteSheet_201, 0x0a80, 0x27d9 - obj_tiles gBattleAnimSpriteSheet_202, 0x0600, 0x27da - obj_tiles gBattleAnimSpriteSheet_203, 0x0800, 0x27db - obj_tiles gBattleAnimSpriteSheet_204, 0x0200, 0x27dc - obj_tiles gBattleAnimSpriteSheet_205, 0x0600, 0x27dd - obj_tiles gBattleAnimSpriteSheet_206, 0x0800, 0x27de - obj_tiles gBattleAnimSpriteSheet_207, 0x0180, 0x27df - obj_tiles gBattleAnimSpriteSheet_208, 0x0800, 0x27e0 - obj_tiles gBattleAnimSpriteSheet_209, 0x0800, 0x27e1 - obj_tiles gBattleAnimSpriteSheet_210, 0x0080, 0x27e2 - obj_tiles gBattleAnimSpriteSheet_211, 0x0080, 0x27e3 - obj_tiles gBattleAnimSpriteSheet_212, 0x0800, 0x27e4 - obj_tiles gBattleAnimSpriteSheet_213, 0x0800, 0x27e5 - obj_tiles gBattleAnimSpriteSheet_214, 0x0600, 0x27e6 - obj_tiles gBattleAnimSpriteSheet_215, 0x0600, 0x27e7 - obj_tiles gBattleAnimSpriteSheet_210, 0x0080, 0x27e8 - obj_tiles gBattleAnimSpriteSheet_217, 0x0080, 0x27e9 - obj_tiles gBattleAnimSpriteSheet_218, 0x0180, 0x27ea - obj_tiles gBattleAnimSpriteSheet_210, 0x0080, 0x27eb - obj_tiles gBattleAnimSpriteSheet_220, 0x0200, 0x27ec - obj_tiles gBattleAnimSpriteSheet_221, 0x0400, 0x27ed - obj_tiles gBattleAnimSpriteSheet_222, 0x0a00, 0x27ee - obj_tiles gBattleAnimSpriteSheet_223, 0x0800, 0x27ef - obj_tiles gBattleAnimSpriteSheet_224, 0x0200, 0x27f0 - obj_tiles gBattleAnimSpriteSheet_225, 0x0400, 0x27f1 - obj_tiles gBattleAnimSpriteSheet_226, 0x0080, 0x27f2 - obj_tiles gBattleAnimSpriteSheet_227, 0x0800, 0x27f3 - obj_tiles gBattleAnimSpriteSheet_228, 0x0200, 0x27f4 - obj_tiles gBattleAnimSpriteSheet_229, 0x0300, 0x27f5 - obj_tiles gBattleAnimSpriteSheet_230, 0x0800, 0x27f6 - obj_tiles gBattleAnimSpriteSheet_231, 0x0380, 0x27f7 - obj_tiles gBattleAnimSpriteSheet_232, 0x0800, 0x27f8 - obj_tiles gBattleAnimSpriteSheet_233, 0x00c0, 0x27f9 - obj_tiles gBattleAnimSpriteSheet_234, 0x0800, 0x27fa - obj_tiles gBattleAnimSpriteSheet_235, 0x0060, 0x27fb - obj_tiles gBattleAnimSpriteSheet_235, 0x0060, 0x27fc - obj_tiles gBattleAnimSpriteSheet_235, 0x0060, 0x27fd - obj_tiles gBattleAnimSpriteSheet_238, 0x0080, 0x27fe - obj_tiles gBattleAnimSpriteSheet_239, 0x0180, 0x27ff - obj_tiles gBattleAnimSpriteSheet_240, 0x0180, 0x2800 - obj_tiles gBattleAnimSpriteSheet_241, 0x0200, 0x2801 - obj_tiles gBattleAnimSpriteSheet_242, 0x0200, 0x2802 - obj_tiles gBattleAnimSpriteSheet_243, 0x0020, 0x2803 - obj_tiles gBattleAnimSpriteSheet_244, 0x0400, 0x2804 - obj_tiles gBattleAnimSpriteSheet_245, 0x0600, 0x2805 - obj_tiles gBattleAnimSpriteSheet_246, 0x1000, 0x2806 - obj_tiles gBattleAnimSpriteSheet_247, 0x0400, 0x2807 - obj_tiles gBattleAnimSpriteSheet_248, 0x0020, 0x2808 - obj_tiles gBattleAnimSpriteSheet_249, 0x0080, 0x2809 - obj_tiles gBattleAnimSpriteSheet_250, 0x0800, 0x280a - obj_tiles gBattleAnimSpriteSheet_251, 0x0080, 0x280b - obj_tiles gBattleAnimSpriteSheet_252, 0x0200, 0x280c - obj_tiles gBattleAnimSpriteSheet_253, 0x0400, 0x280d - obj_tiles gBattleAnimSpriteSheet_254, 0x0200, 0x280e - obj_tiles gBattleAnimSpriteSheet_255, 0x0200, 0x280f - obj_tiles gBattleAnimSpriteSheet_256, 0x0800, 0x2810 - obj_tiles gBattleAnimSpriteSheet_257, 0x0280, 0x2811 - obj_tiles gBattleAnimSpriteSheet_258, 0x0200, 0x2812 - obj_tiles gBattleAnimSpriteSheet_149, 0x0200, 0x2813 - obj_tiles gBattleAnimSpriteSheet_260, 0x0400, 0x2814 - obj_tiles gBattleAnimSpriteSheet_261, 0x0200, 0x2815 - obj_tiles gBattleAnimSpriteSheet_262, 0x0200, 0x2816 - obj_tiles gBattleAnimSpriteSheet_263, 0x0080, 0x2817 - obj_tiles gBattleAnimSpriteSheet_264, 0x0020, 0x2818 - obj_tiles gBattleAnimSpriteSheet_264, 0x0020, 0x2819 - obj_tiles gBattleAnimSpriteSheet_266, 0x0080, 0x281a - obj_tiles gBattleAnimSpriteSheet_212, 0x0800, 0x281b - obj_tiles gBattleAnimSpriteSheet_264, 0x0020, 0x281c - obj_tiles gBattleAnimSpriteSheet_269, 0x0080, 0x281d - obj_tiles gBattleAnimSpriteSheet_270, 0x0400, 0x281e - obj_tiles gBattleAnimSpriteSheet_271, 0x0080, 0x281f - obj_tiles gBattleAnimSpriteSheet_272, 0x0800, 0x2820 - obj_tiles gBattleAnimSpriteSheet_273, 0x0020, 0x2821 - obj_tiles gBattleAnimSpriteSheet_274, 0x0800, 0x2822 - obj_tiles gBattleAnimSpriteSheet_275, 0x0800, 0x2823 - obj_tiles gBattleAnimSpriteSheet_276, 0x0800, 0x2824 - obj_tiles gBattleAnimSpriteSheet_277, 0x1000, 0x2825 - obj_tiles gBattleAnimSpriteSheet_278, 0x0800, 0x2826 - obj_tiles gBattleAnimSpriteSheet_279, 0x00a0, 0x2827 - obj_tiles gBattleAnimSpriteSheet_280, 0x0800, 0x2828 - obj_tiles gBattleAnimSpriteSheet_281, 0x0200, 0x2829 - obj_tiles gBattleAnimSpriteSheet_282, 0x0600, 0x282a - obj_tiles gBattleAnimSpriteSheet_283, 0x0200, 0x282b - obj_tiles gBattleAnimSpriteSheet_284, 0x0800, 0x282c - obj_tiles gBattleAnimSpriteSheet_285, 0x0200, 0x282d - obj_tiles gBattleAnimSpriteSheet_183, 0x0800, 0x282e - obj_tiles gBattleAnimSpriteSheet_056, 0x1000, 0x282f - obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x2830 - - .align 2 -gBattleAnimPaletteTable:: @ 852544C - obj_pal gBattleAnimSpritePalette_000, 0x2710 - obj_pal gBattleAnimSpritePalette_001, 0x2711 - obj_pal gBattleAnimSpritePalette_002, 0x2712 - obj_pal gBattleAnimSpritePalette_003, 0x2713 - obj_pal gBattleAnimSpritePalette_004, 0x2714 - obj_pal gBattleAnimSpritePalette_005, 0x2715 - obj_pal gBattleAnimSpritePalette_006, 0x2716 - obj_pal gBattleAnimSpritePalette_007, 0x2717 - obj_pal gBattleAnimSpritePalette_008, 0x2718 - obj_pal gBattleAnimSpritePalette_009, 0x2719 - obj_pal gBattleAnimSpritePalette_010, 0x271a - obj_pal gBattleAnimSpritePalette_011, 0x271b - obj_pal gBattleAnimSpritePalette_012, 0x271c - obj_pal gBattleAnimSpritePalette_013, 0x271d - obj_pal gBattleAnimSpritePalette_014, 0x271e - obj_pal gBattleAnimSpritePalette_015, 0x271f - obj_pal gBattleAnimSpritePalette_016, 0x2720 - obj_pal gBattleAnimSpritePalette_016, 0x2721 - obj_pal gBattleAnimSpritePalette_018, 0x2722 - obj_pal gBattleAnimSpritePalette_019, 0x2723 - obj_pal gBattleAnimSpritePalette_020, 0x2724 - obj_pal gBattleAnimSpritePalette_021, 0x2725 - obj_pal gBattleAnimSpritePalette_022, 0x2726 - obj_pal gBattleAnimSpritePalette_023, 0x2727 - obj_pal gBattleAnimSpritePalette_024, 0x2728 - obj_pal gBattleAnimSpritePalette_025, 0x2729 - obj_pal gBattleAnimSpritePalette_026, 0x272a - obj_pal gBattleAnimSpritePalette_027, 0x272b - obj_pal gBattleAnimSpritePalette_028, 0x272c - obj_pal gBattleAnimSpritePalette_029, 0x272d - obj_pal gBattleAnimSpritePalette_030, 0x272e - obj_pal gBattleAnimSpritePalette_031, 0x272f - obj_pal gBattleAnimSpritePalette_032, 0x2730 - obj_pal gBattleAnimSpritePalette_033, 0x2731 - obj_pal gBattleAnimSpritePalette_033, 0x2732 - obj_pal gBattleAnimSpritePalette_033, 0x2733 - obj_pal gBattleAnimSpritePalette_036, 0x2734 - obj_pal gBattleAnimSpritePalette_036, 0x2735 - obj_pal gBattleAnimSpritePalette_038, 0x2736 - obj_pal gBattleAnimSpritePalette_039, 0x2737 - obj_pal gBattleAnimSpritePalette_038, 0x2738 - obj_pal gBattleAnimSpritePalette_038, 0x2739 - obj_pal gBattleAnimSpritePalette_042, 0x273a - obj_pal gBattleAnimSpritePalette_043, 0x273b - obj_pal gBattleAnimSpritePalette_044, 0x273c - obj_pal gBattleAnimSpritePalette_045, 0x273d - obj_pal gBattleAnimSpritePalette_046, 0x273e - obj_pal gBattleAnimSpritePalette_047, 0x273e - obj_pal gBattleAnimSpritePalette_048, 0x2740 - obj_pal gBattleAnimSpritePalette_049, 0x2741 - obj_pal gBattleAnimSpritePalette_050, 0x2742 - obj_pal gBattleAnimSpritePalette_050, 0x2743 - obj_pal gBattleAnimSpritePalette_050, 0x2744 - obj_pal gBattleAnimSpritePalette_026, 0x2745 - obj_pal gBattleAnimSpritePalette_054, 0x2746 - obj_pal gBattleAnimSpritePalette_050, 0x2747 - obj_pal gBattleAnimSpritePalette_056, 0x2748 - obj_pal gBattleAnimSpritePalette_057, 0x2749 - obj_pal gBattleAnimSpritePalette_058, 0x274a - obj_pal gBattleAnimSpritePalette_059, 0x274b - obj_pal gBattleAnimSpritePalette_060, 0x274c - obj_pal gBattleAnimSpritePalette_061, 0x274d - obj_pal gBattleAnimSpritePalette_062, 0x274e - obj_pal gBattleAnimSpritePalette_063, 0x274f - obj_pal gBattleAnimSpritePalette_064, 0x2750 - obj_pal gBattleAnimSpritePalette_065, 0x2751 - obj_pal gBattleAnimSpritePalette_066, 0x2752 - obj_pal gBattleAnimSpritePalette_067, 0x2753 - obj_pal gBattleAnimSpritePalette_068, 0x2754 - obj_pal gBattleAnimSpritePalette_065, 0x2755 - obj_pal gBattleAnimSpritePalette_070, 0x2756 - obj_pal gBattleAnimSpritePalette_070, 0x2757 - obj_pal gBattleAnimSpritePalette_072, 0x2758 - obj_pal gBattleAnimSpritePalette_073, 0x2759 - obj_pal gBattleAnimSpritePalette_074, 0x275a - obj_pal gBattleAnimSpritePalette_075, 0x275b - obj_pal gBattleAnimSpritePalette_076, 0x275c - obj_pal gBattleAnimSpritePalette_076, 0x275d - obj_pal gBattleAnimSpritePalette_078, 0x275e - obj_pal gBattleAnimSpritePalette_078, 0x275f - obj_pal gBattleAnimSpritePalette_080, 0x2760 - obj_pal gBattleAnimSpritePalette_081, 0x2761 - obj_pal gBattleAnimSpritePalette_082, 0x2762 - obj_pal gBattleAnimSpritePalette_083, 0x2763 - obj_pal gBattleAnimSpritePalette_084, 0x2764 - obj_pal gBattleAnimSpritePalette_085, 0x2765 - obj_pal gBattleAnimSpritePalette_086, 0x2766 - obj_pal gBattleAnimSpritePalette_087, 0x2767 - obj_pal gBattleAnimSpritePalette_088, 0x2768 - obj_pal gBattleAnimSpritePalette_089, 0x2769 - obj_pal gBattleAnimSpritePalette_090, 0x276a - obj_pal gBattleAnimSpritePalette_091, 0x276b - obj_pal gBattleAnimSpritePalette_092, 0x276c - obj_pal gBattleAnimSpritePalette_093, 0x276d - obj_pal gBattleAnimSpritePalette_094, 0x276e - obj_pal gBattleAnimSpritePalette_095, 0x276f - obj_pal gBattleAnimSpritePalette_096, 0x2770 - obj_pal gBattleAnimSpritePalette_097, 0x2771 - obj_pal gBattleAnimSpritePalette_094, 0x2772 - obj_pal gBattleAnimSpritePalette_099, 0x2773 - obj_pal gBattleAnimSpritePalette_100, 0x2774 - obj_pal gBattleAnimSpritePalette_101, 0x2775 - obj_pal gBattleAnimSpritePalette_101, 0x2776 - obj_pal gBattleAnimSpritePalette_103, 0x2777 - obj_pal gBattleAnimSpritePalette_104, 0x2778 - obj_pal gBattleAnimSpritePalette_105, 0x2779 - obj_pal gBattleAnimSpritePalette_105, 0x277a - obj_pal gBattleAnimSpritePalette_107, 0x277b - obj_pal gBattleAnimSpritePalette_107, 0x277c - obj_pal gBattleAnimSpritePalette_109, 0x277d - obj_pal gBattleAnimSpritePalette_109, 0x277e - obj_pal gBattleAnimSpritePalette_111, 0x277f - obj_pal gBattleAnimSpritePalette_112, 0x2780 - obj_pal gBattleAnimSpritePalette_113, 0x2781 - obj_pal gBattleAnimSpritePalette_114, 0x2782 - obj_pal gBattleAnimSpritePalette_115, 0x2783 - obj_pal gBattleAnimSpritePalette_116, 0x2784 - obj_pal gBattleAnimSpritePalette_117, 0x2785 - obj_pal gBattleAnimSpritePalette_118, 0x2786 - obj_pal gBattleAnimSpritePalette_119, 0x2787 - obj_pal gBattleAnimSpritePalette_120, 0x2788 - obj_pal gBattleAnimSpritePalette_121, 0x2789 - obj_pal gBattleAnimSpritePalette_122, 0x278a - obj_pal gBattleAnimSpritePalette_122, 0x278b - obj_pal gBattleAnimSpritePalette_124, 0x278c - obj_pal gBattleAnimSpritePalette_125, 0x278d - obj_pal gBattleAnimSpritePalette_126, 0x278e - obj_pal gBattleAnimSpritePalette_127, 0x278f - obj_pal gBattleAnimSpritePalette_128, 0x2790 - obj_pal gBattleAnimSpritePalette_128, 0x2791 - obj_pal gBattleAnimSpritePalette_130, 0x2792 - obj_pal gBattleAnimSpritePalette_130, 0x2793 - obj_pal gBattleAnimSpritePalette_132, 0x2794 - obj_pal gBattleAnimSpritePalette_133, 0x2795 - obj_pal gBattleAnimSpritePalette_133, 0x2796 - obj_pal gBattleAnimSpritePalette_135, 0x2797 - obj_pal gBattleAnimSpritePalette_136, 0x2798 - obj_pal gBattleAnimSpritePalette_135, 0x2799 - obj_pal gBattleAnimSpritePalette_135, 0x279a - obj_pal gBattleAnimSpritePalette_139, 0x279b - obj_pal gBattleAnimSpritePalette_140, 0x279c - obj_pal gBattleAnimSpritePalette_141, 0x279d - obj_pal gBattleAnimSpritePalette_141, 0x279e - obj_pal gBattleAnimSpritePalette_143, 0x279f - obj_pal gBattleAnimSpritePalette_144, 0x27a0 - obj_pal gBattleAnimSpritePalette_139, 0x27a1 - obj_pal gBattleAnimSpritePalette_115, 0x27a2 - obj_pal gBattleAnimSpritePalette_147, 0x27a3 - obj_pal gBattleAnimSpritePalette_148, 0x27a4 - obj_pal gBattleAnimSpritePalette_148, 0x27a5 - obj_pal gBattleAnimSpritePalette_150, 0x27a6 - obj_pal gBattleAnimSpritePalette_150, 0x27a7 - obj_pal gBattleAnimSpritePalette_152, 0x27a8 - obj_pal gBattleAnimSpritePalette_153, 0x27a9 - obj_pal gBattleAnimSpritePalette_154, 0x27aa - obj_pal gBattleAnimSpritePalette_155, 0x27ab - obj_pal gBattleAnimSpritePalette_156, 0x27ac - obj_pal gBattleAnimSpritePalette_157, 0x27ad - obj_pal gBattleAnimSpritePalette_158, 0x27ae - obj_pal gBattleAnimSpritePalette_159, 0x27af - obj_pal gBattleAnimSpritePalette_160, 0x27b0 - obj_pal gBattleAnimSpritePalette_161, 0x27b1 - obj_pal gBattleAnimSpritePalette_162, 0x27b2 - obj_pal gBattleAnimSpritePalette_163, 0x27b3 - obj_pal gBattleAnimSpritePalette_164, 0x27b4 - obj_pal gBattleAnimSpritePalette_165, 0x27b5 - obj_pal gBattleAnimSpritePalette_166, 0x27b6 - obj_pal gBattleAnimSpritePalette_167, 0x27b7 - obj_pal gBattleAnimSpritePalette_168, 0x27b8 - obj_pal gBattleAnimSpritePalette_169, 0x27b9 - obj_pal gBattleAnimSpritePalette_170, 0x27ba - obj_pal gBattleAnimSpritePalette_171, 0x27bb - obj_pal gBattleAnimSpritePalette_172, 0x27bc - obj_pal gBattleAnimSpritePalette_001, 0x27bd - obj_pal gBattleAnimSpritePalette_174, 0x27be - obj_pal gBattleAnimSpritePalette_175, 0x27bf - obj_pal gBattleAnimSpritePalette_176, 0x27c0 - obj_pal gBattleAnimSpritePalette_177, 0x27c1 - obj_pal gBattleAnimSpritePalette_178, 0x27c2 - obj_pal gBattleAnimSpritePalette_179, 0x27c3 - obj_pal gBattleAnimSpritePalette_179, 0x27c4 - obj_pal gBattleAnimSpritePalette_179, 0x27c5 - obj_pal gBattleAnimSpritePalette_182, 0x27c6 - obj_pal gBattleAnimSpritePalette_183, 0x27c7 - obj_pal gBattleAnimSpritePalette_184, 0x27c8 - obj_pal gBattleAnimSpritePalette_185, 0x27c9 - obj_pal gBattleAnimSpritePalette_186, 0x27ca - obj_pal gBattleAnimSpritePalette_187, 0x27cb - obj_pal gBattleAnimSpritePalette_188, 0x27cc - obj_pal gBattleAnimSpritePalette_189, 0x27cd - obj_pal gBattleAnimSpritePalette_190, 0x27ce - obj_pal gBattleAnimSpritePalette_191, 0x27cf - obj_pal gBattleAnimSpritePalette_192, 0x27d0 - obj_pal gBattleAnimSpritePalette_193, 0x27d1 - obj_pal gBattleAnimSpritePalette_194, 0x27d2 - obj_pal gBattleAnimSpritePalette_195, 0x27d3 - obj_pal gBattleAnimSpritePalette_196, 0x27d4 - obj_pal gBattleAnimSpritePalette_197, 0x27d5 - obj_pal gBattleAnimSpritePalette_198, 0x27d6 - obj_pal gBattleAnimSpritePalette_199, 0x27d7 - obj_pal gBattleAnimSpritePalette_200, 0x27d8 - obj_pal gBattleAnimSpritePalette_201, 0x27d9 - obj_pal gBattleAnimSpritePalette_202, 0x27da - obj_pal gBattleAnimSpritePalette_203, 0x27db - obj_pal gBattleAnimSpritePalette_204, 0x27dc - obj_pal gBattleAnimSpritePalette_205, 0x27dd - obj_pal gBattleAnimSpritePalette_206, 0x27de - obj_pal gBattleAnimSpritePalette_207, 0x27df - obj_pal gBattleAnimSpritePalette_167, 0x27e0 - obj_pal gBattleAnimSpritePalette_209, 0x27e1 - obj_pal gBattleAnimSpritePalette_210, 0x27e2 - obj_pal gBattleAnimSpritePalette_211, 0x27e3 - obj_pal gBattleAnimSpritePalette_211, 0x27e4 - obj_pal gBattleAnimSpritePalette_211, 0x27e5 - obj_pal gBattleAnimSpritePalette_064, 0x27e6 - obj_pal gBattleAnimSpritePalette_215, 0x27e7 - obj_pal gBattleAnimSpritePalette_216, 0x27e8 - obj_pal gBattleAnimSpritePalette_217, 0x27e9 - obj_pal gBattleAnimSpritePalette_218, 0x27ea - obj_pal gBattleAnimSpritePalette_219, 0x27eb - obj_pal gBattleAnimSpritePalette_220, 0x27ec - obj_pal gBattleAnimSpritePalette_221, 0x27ed - obj_pal gBattleAnimSpritePalette_222, 0x27ee - obj_pal gBattleAnimSpritePalette_223, 0x27ef - obj_pal gBattleAnimSpritePalette_224, 0x27f0 - obj_pal gBattleAnimSpritePalette_225, 0x27f1 - obj_pal gBattleAnimSpritePalette_226, 0x27f2 - obj_pal gBattleAnimSpritePalette_226, 0x27f3 - obj_pal gBattleAnimSpritePalette_228, 0x27f4 - obj_pal gBattleAnimSpritePalette_229, 0x27f5 - obj_pal gBattleAnimSpritePalette_230, 0x27f6 - obj_pal gBattleAnimSpritePalette_231, 0x27f7 - obj_pal gBattleAnimSpritePalette_231, 0x27f8 - obj_pal gBattleAnimSpritePalette_233, 0x27f9 - obj_pal gBattleAnimSpritePalette_234, 0x27fa - obj_pal gBattleAnimSpritePalette_235, 0x27fb - obj_pal gBattleAnimSpritePalette_236, 0x27fc - obj_pal gBattleAnimSpritePalette_237, 0x27fd - obj_pal gBattleAnimSpritePalette_238, 0x27fe - obj_pal gBattleAnimSpritePalette_239, 0x27ff - obj_pal gBattleAnimSpritePalette_240, 0x2800 - obj_pal gBattleAnimSpritePalette_241, 0x2801 - obj_pal gBattleAnimSpritePalette_242, 0x2802 - obj_pal gBattleAnimSpritePalette_243, 0x2803 - obj_pal gBattleAnimSpritePalette_244, 0x2804 - obj_pal gBattleAnimSpritePalette_245, 0x2805 - obj_pal gBattleAnimSpritePalette_245, 0x2806 - obj_pal gBattleAnimSpritePalette_064, 0x2807 - obj_pal gBattleAnimSpritePalette_248, 0x2808 - obj_pal gBattleAnimSpritePalette_249, 0x2809 - obj_pal gBattleAnimSpritePalette_249, 0x280a - obj_pal gBattleAnimSpritePalette_251, 0x280b - obj_pal gBattleAnimSpritePalette_252, 0x280c - obj_pal gBattleAnimSpritePalette_253, 0x280d - obj_pal gBattleAnimSpritePalette_254, 0x280e - obj_pal gBattleAnimSpritePalette_255, 0x280f - obj_pal gBattleAnimSpritePalette_256, 0x2810 - obj_pal gBattleAnimSpritePalette_257, 0x2811 - obj_pal gBattleAnimSpritePalette_258, 0x2812 - obj_pal gBattleAnimSpritePalette_259, 0x2813 - obj_pal gBattleAnimSpritePalette_260, 0x2814 - obj_pal gBattleAnimSpritePalette_261, 0x2815 - obj_pal gBattleAnimSpritePalette_262, 0x2816 - obj_pal gBattleAnimSpritePalette_263, 0x2817 - obj_pal gBattleAnimSpritePalette_264, 0x2818 - obj_pal gBattleAnimSpritePalette_265, 0x2819 - obj_pal gBattleAnimSpritePalette_266, 0x281a - obj_pal gBattleAnimSpritePalette_267, 0x281b - obj_pal gBattleAnimSpritePalette_268, 0x281c - obj_pal gBattleAnimSpritePalette_269, 0x281d - obj_pal gBattleAnimSpritePalette_270, 0x281e - obj_pal gBattleAnimSpritePalette_271, 0x281f - obj_pal gBattleAnimSpritePalette_272, 0x2820 - obj_pal gBattleAnimSpritePalette_272, 0x2821 - obj_pal gBattleAnimSpritePalette_274, 0x2822 - obj_pal gBattleAnimSpritePalette_274, 0x2823 - obj_pal gBattleAnimSpritePalette_274, 0x2824 - obj_pal gBattleAnimSpritePalette_277, 0x2825 - obj_pal gBattleAnimSpritePalette_278, 0x2826 - obj_pal gBattleAnimSpritePalette_279, 0x2827 - obj_pal gBattleAnimSpritePalette_280, 0x2828 - obj_pal gBattleAnimSpritePalette_281, 0x2829 - obj_pal gBattleAnimSpritePalette_282, 0x282a - obj_pal gBattleAnimSpritePalette_283, 0x282b - obj_pal gBattleAnimSpritePalette_284, 0x282c - obj_pal gBattleAnimSpritePalette_285, 0x282d - obj_pal gBattleAnimSpritePalette_286, 0x282e - obj_pal gBattleAnimSpritePalette_287, 0x282f - obj_pal gBattleAnimSpritePalette_288, 0x2830 - - .align 2 -gBattleAnimBackgroundTable:: @ 8525D54 - .4byte gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00 - .4byte gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00 - .4byte gBattleAnimBackgroundImage_02, gBattleAnimBackgroundPalette_02, gBattleAnimBackgroundTilemap_02 - .4byte gBattleAnimBackgroundImage_03, gBattleAnimBackgroundPalette_03, gBattleAnimBackgroundTilemap_03 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_04 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_05 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_06 - .4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_07 - .4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_08 - .4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_09 - .4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_10 - .4byte gBattleAnimBackgroundImage_11, gBattleAnimBackgroundPalette_11, gBattleAnimBackgroundTilemap_11 - .4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_12 - .4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_13 - .4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_14 - .4byte gBattleAnimBackgroundImage_15, gBattleAnimBackgroundPalette_15, gBattleAnimBackgroundTilemap_15 - .4byte gBattleAnimBackgroundImage_16, gBattleAnimBackgroundPalette_16, gBattleAnimBackgroundTilemap_16 - .4byte gBattleAnimBackgroundImage_17, gBattleAnimBackgroundPalette_17, gBattleAnimBackgroundTilemap_17 - .4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_07 - .4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_08 - .4byte gBattleAnimBackgroundImage_20, gBattleAnimBackgroundPalette_20, gBattleAnimBackgroundTilemap_20 - .4byte gBattleAnimBackgroundImage_21, gBattleAnimBackgroundPalette_21, gBattleAnimBackgroundTilemap_21 - .4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_09 - .4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_10 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_04 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_05 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_06 - diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index 51b62461d..cbd38a119 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -7,120 +7,6 @@ .section .rodata .align 2 -gUnknown_08611550:: @ 8611550 - .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 - .byte 0x41, 0x00, 0xb3, 0x00, 0x18, 0x0f, 0x6a, 0x00, 0x98, 0x98, 0x64, 0x00 - - .align 2 -gUnknown_08611578:: @ 8611578 - .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 - .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 - .2byte 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080, 0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000 - - .align 2 -gUnknown_08611C18:: @ 8611C18 - .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 - window_template 0x00, 0x01, 0x01, 0x1c, 0x12, 0x0f, 0x0001 - - .align 2 -gUnknown_08611C7C:: @ 8611C7C - window_template 0x00, 0x02, 0x02, 0x1a, 0x0f, 0x0f, 0x0001 - - .align 2 -gUnknown_08611C84:: @ 8611C84 - window_template 0x00, 0x02, 0x01, 0x1a, 0x11, 0x0f, 0x0001 - -gUnknown_08611C8C:: @ 8611C8C - .byte 0x46, 0x01, 0x47, 0x00, 0x49, 0x00, 0x48, 0x01, 0x4a, 0x00, 0x4b, 0x01, 0xea, 0x00 - -gUnknown_08611C9A:: @ 8611C9A - .2byte 0x0097, 0x0096, 0x00fa, 0x00f9, 0x00fb, 0x0194, 0x0195, 0x0196, 0x0199, 0x019a, 0xffff - - .align 2 gUnknown_08611CB0:: @ 8611CB0 .4byte gText_BattleTower2 .4byte gUnknown_085ED164 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index d8f681686..edf49eda5 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1601,12 +1601,12 @@ BattleScript_EffectPerishSong:: waitanimation printstring STRINGID_FAINTINTHREE waitmessage 0x40 - setbyte sBANK, 0x0 + setbyte sBATTLER, 0x0 BattleScript_PerishSongLoop:: jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected BattleScript_PerishSongLoopIncrement:: - addbyte sBANK, 0x1 - jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop + addbyte sBATTLER, 0x1 + jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_PerishSongLoop goto BattleScript_MoveEnd BattleScript_PerishSongNotAffected:: @@ -2493,7 +2493,7 @@ BattleScript_EffectYawn:: waitmessage 0x40 goto BattleScript_MoveEnd BattleScript_PrintBankAbilityMadeIneffective:: - copybyte sBANK, sBANK_WITH_ABILITY + copybyte sBATTLER, sBATTLER_WITH_ABILITY BattleScript_PrintAbilityMadeIneffective:: pause 0x20 printstring STRINGID_PKMNSXMADEITINEFFECTIVE @@ -3523,7 +3523,7 @@ BattleScript_RapidSpinAway:: BattleScript_WrapFree:: printstring STRINGID_PKMNGOTFREE waitmessage 0x40 - copybyte gBattlerTarget, sBANK + copybyte gBattlerTarget, sBATTLER return BattleScript_LeechSeedFree:: @@ -4030,11 +4030,11 @@ BattleScript_ShedSkinActivates:: end3 BattleScript_WeatherFormChanges:: - setbyte sBANK, 0x0 + setbyte sBATTLER, 0x0 BattleScript_WeatherFormChangesLoop:: trycastformdatachange - addbyte sBANK, 0x1 - jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop + addbyte sBATTLER, 0x1 + jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop return BattleScript_CastformChange:: diff --git a/data/battle_tower.s b/data/battle_tower.s index 2cc0aa639..9f7e1ade4 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -21,19 +21,19 @@ @ 85D97BC .include "data/battle_frontier/battle_frontier_mons.inc" -gUnknown_085DCEDC:: @ 85DCEDC +gTowerMaleFacilityClasses:: @ 85DCEDC .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 +gTowerFemaleFacilityClasses:: @ 85DCEFA .byte 0x0d, 0x10, 0x12, 0x0c, 0x13, 0x14, 0x1f, 0x27, 0x2a, 0x16, 0x2f, 0x31, 0x33, 0x36, 0x37, 0x38, 0x1c, 0x02, 0x45, 0x47 -gUnknown_085DCF0E:: @ 85DCF0E +gTowerMaleTrainerGfxIds:: @ 85DCF0E .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 +gTowerFemaleTrainerGfxIds:: @ 85DCF2C .byte 0x14, 0x35, 0x22, 0x28, 0x14, 0x2d, 0x2f, 0x0e, 0x12, 0x16, 0x39, 0x34, 0x34, 0x0e, 0x22, 0x34, 0x20, 0x14, 0x20, 0x2f -gUnknown_085DCF40:: @ 85DCF40 +sRubyFacilityClassToEmerald:: @ 85DCF40 .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 @@ -640,7 +640,7 @@ gUnknown_085DD690:: @ 85DD690 .4byte gUnknown_085DD0F0 .4byte gUnknown_085DD104 -gUnknown_085DD6D0:: @ 85DD6D0 +sStevenMons:: @ 85DD6D0 .byte 0x8f, 0x01, 0x1f, 0x2a, 0x02 gUnknown_085DD6D5:: @ 85DD6D5 @@ -677,57 +677,3 @@ gUnknown_085DD6DC:: @ 85DD6DC @ 85DF69C .include "data/battle_frontier/fallarbor_battle_tent_mons.inc" - - .align 2 -gUnknown_085DF96C:: @ 85DF96C - .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 - .4byte 0x00000001, 0x00000002, 0x00004000, 0x00008000, 0x00010000, 0x00020000, 0x00040000, 0x00080000 - - .align 2 -gUnknown_085DF9CC:: @ 85DF9CC - .4byte 0xfffffffe, 0xfffffffd, 0xffffbfff, 0xffff7fff, 0xfffeffff, 0xfffdffff, 0xfffbffff, 0xfff7ffff - -gUnknown_085DF9EC:: @ 85DF9EC - .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c - -gUnknown_085DF9F6:: @ 85DF9F6 - .byte 0x03, 0x04, 0x02, 0x02 - - .align 1 -gUnknown_085DF9FA:: @ 85DF9FA - .2byte 0x0000, 0x0063, 0x0050, 0x0077, 0x0064, 0x008b, 0x0078, 0x009f, 0x008c, 0x00b3, 0x00a0, 0x00c7, 0x00b4, 0x00db, 0x00c8, 0x012b - - .align 1 -gUnknown_085DFA1A:: @ 85DFA1A - .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 - .byte 0x03, 0x04, 0x02, 0x02 - - .align 1 -gUnknown_085DFA46:: @ 85DFA46 - .2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01 - - .align 1 -gUnknown_085DFA52:: @ 85DFA52 - .2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04, 0x0000 - diff --git a/data/event_scripts.s b/data/event_scripts.s index 81ad1f268..c2926ce92 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -7,6 +7,7 @@ #include "constants/vars.h" #include "constants/heal_locations.h" #include "constants/trainers.h" +#include "constants/battle_frontier.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -1771,7 +1772,7 @@ EventScript_PC:: @ 8271D92 end EventScript_271DAC:: @ 8271DAC - message gUnknown_0827266F + message gText_WhichPCShouldBeAccessed waitmessage special ScrSpecial_CreatePCMenu waitstate @@ -3112,7 +3113,7 @@ Text_272640: @ 8272640 Text_27265A: @ 827265A .string "{PLAYER} booted up the PC.$" -gUnknown_0827266F:: @ 827266F +gText_WhichPCShouldBeAccessed:: @ 827266F .string "Which PC should be accessed?$" gUnknown_0827268C:: @ 827268C @@ -5126,9 +5127,9 @@ SecretBase_RedCave1_EventScript_27627C:: @ 827627C SecretBase_RedCave1_EventScript_276286:: @ 8276286 special sub_80EA2E4 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate compare VAR_RESULT, 3 call_if 1, SecretBase_RedCave1_EventScript_2762BD @@ -10301,12 +10302,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F special sub_81A703C setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81A703C setvar VAR_0x8004, 5 @@ -10382,12 +10383,12 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 special sub_81A703C setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 3 special sub_81A703C compare VAR_RESULT, 1 @@ -10446,12 +10447,12 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 special sub_81A703C setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 3 special sub_81A703C compare VAR_RESULT, 1 @@ -10478,7 +10479,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end @@ -10488,7 +10489,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E setorcopyvar VAR_0x8006, VAR_RESULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B compare VAR_RESULT, 1 @@ -10502,7 +10503,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 setvar VAR_0x8004, 21 - special sub_81A1780 + special CallFrontierUtilFunc return BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A @@ -11664,7 +11665,7 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 special sp194_trainer_tower setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq TrainerHill_1F_EventScript_2C83C9 compare VAR_RESULT, 3 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 076eeab6e..69df3aca2 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 setvar VAR_0x8004, 5 - special sub_81A1780 + special CallFrontierUtilFunc call BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE end @@ -42,7 +42,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 @@ -51,7 +51,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E @@ -89,7 +89,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E waitmovement 0 setvar VAR_0x8004, 5 special sub_8195960 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C switch VAR_RESULT @@ -112,7 +112,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate @@ -120,12 +120,12 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 7, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE7 @@ -140,20 +140,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870 compare VAR_RESULT, 2 @@ -227,7 +227,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257852:: @ 8257852 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 waitstate @@ -271,7 +271,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC @@ -332,14 +332,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 case 4, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4 closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, 4 @@ -358,7 +358,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 @@ -369,21 +369,21 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4 goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4 closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, 4 @@ -402,7 +402,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 @@ -413,7 +413,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4 goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 @@ -429,17 +429,17 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, 5 + setvar VAR_0x8004, SPECIAL_BATTLE_ARENA setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate setvar VAR_0x8004, 18 - special sub_81A1780 + special CallFrontierUtilFunc special HealPlayerParty setvar VAR_0x8004, 21 - special sub_81A1780 + special CallFrontierUtilFunc return BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 9ef9a2812..710dd1ece 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 @@ -40,7 +40,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 releaseall end @@ -48,7 +48,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF lockall setvar VAR_0x8004, 10 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4 @@ -60,7 +60,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0 BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8 msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4 setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9 message BattleFrontier_BattleArenaLobby_Text_256931 waitmessage @@ -88,7 +88,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 3 @@ -125,7 +125,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 goto BattleFrontier_BattleArenaLobby_EventScript_255F54 @@ -155,13 +155,13 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 case 2, BattleFrontier_BattleArenaLobby_EventScript_255FFB case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4 fadescreen 1 call BattleFrontier_BattleArenaLobby_EventScript_23F2B7 @@ -181,7 +181,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81A5238 setvar VAR_0x8004, 2 @@ -191,11 +191,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 @@ -208,12 +208,12 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4 closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 compare VAR_RESULT, 1 @@ -244,7 +244,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleArenaLobby_EventScript_255FFB BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8 @@ -346,7 +346,7 @@ BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 lockall setvar VAR_0x8004, 7 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 3d5704dba..9b1a77fae 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 special CallBattleDomeFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 @@ -81,7 +81,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 closemessage setvar VAR_0x8004, 5 special CallBattleDomeFunction @@ -137,14 +137,14 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24BE9A:: @ 824BE9A setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 @ goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1 setvar VAR_0x8004, 20 setvar VAR_0x8005, 1 - special sub_81A1780 + special CallFrontierUtilFunc message BattleFrontier_BattleDomeBattleRoom_Text_24C9E1 waitmessage return @@ -152,7 +152,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1:: @ 824BEB1 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5:: @ 824BEC5 setvar VAR_0x8004, 20 setvar VAR_0x8005, 0 - special sub_81A1780 + special CallFrontierUtilFunc message BattleFrontier_BattleDomeBattleRoom_Text_24CB34 waitmessage return @@ -179,12 +179,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 special CallBattleDomeFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 setvar VAR_0x8006, 1 @@ -196,7 +196,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62 waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, 4 @@ -213,7 +213,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3 @@ -379,7 +379,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1B6:: @ 824C1B6 BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD:: @ 824C1BD setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc return BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB @@ -428,13 +428,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4 @@ -448,7 +448,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 setvar VAR_0x8005, 1 special CallBattleDomeFunction setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 closemessage @@ -460,20 +460,20 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4 @@ -487,7 +487,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 setvar VAR_0x8005, 1 special CallBattleDomeFunction setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 closemessage @@ -499,7 +499,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4 goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 @@ -527,12 +527,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, 3 + setvar VAR_0x8004, SPECIAL_BATTLE_DOME setvar VAR_0x8005, 0 setvar VAR_TEMP_9, 1 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate setvar VAR_TEMP_9, 0 setvar VAR_0x8004, 17 @@ -554,11 +554,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc copyvar VAR_TEMP_E, VAR_RESULT compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index 989ebe2f3..a4c0dafc4 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 6a879df16..669deeeaa 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -29,7 +29,7 @@ BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839 setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 @@ -51,7 +51,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 releaseall end @@ -60,7 +60,7 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B call BattleFrontier_BattleDomeLobby_EventScript_241EBA lockall setvar VAR_0x8004, 10 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4 @@ -72,16 +72,16 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1 BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4 setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9 message BattleFrontier_BattleDomeLobby_Text_24A5D6 waitmessage special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 @@ -106,9 +106,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 @@ -160,7 +160,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 goto BattleFrontier_BattleDomeLobby_EventScript_249BC2 @@ -208,13 +208,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF case 2, BattleFrontier_BattleDomeLobby_EventScript_249C64 case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64 setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4 fadescreen 1 call BattleFrontier_BattleDomeLobby_EventScript_23F2B7 @@ -234,17 +234,17 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 0 special CallBattleDomeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 @@ -259,7 +259,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 15 special CallBattleDomeFunction msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4 @@ -295,7 +295,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleDomeLobby_EventScript_249C64 BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61 @@ -413,7 +413,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 setvar VAR_0x8004, 7 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall @@ -424,7 +424,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B setvar VAR_0x8004, 7 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 203de2813..d870ee8ea 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 1 applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 waitmovement 0 @@ -100,7 +100,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD @@ -122,7 +122,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449 case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452 @@ -157,7 +157,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D special sub_80F9490 waitstate setvar VAR_0x8004, 21 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F setvar VAR_0x8004, 2 @@ -187,7 +187,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D BattleFrontier_BattleDomePreBattleRoom_EventScript_24B4FB:: @ 824B4FB setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B53A case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B540 @@ -209,7 +209,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B546:: @ 824B546 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0 @@ -246,7 +246,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -260,7 +260,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634 case 2, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 2968e2c0f..6d2350b6f 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -6,14 +6,14 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB setvar VAR_0x8004, 5 - special sub_81A1780 + special CallFrontierUtilFunc checkplayergender compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 @@ -82,17 +82,17 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 setvar VAR_0x8004, 5 special sub_8195960 lockall - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, 6 + setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate switch VAR_RESULT case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F @@ -102,7 +102,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25AEF8:: @ 825AEF8 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 @ goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190 @@ -124,12 +124,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43:: @ 825AF43 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 setvar VAR_0x8006, 1 @@ -140,7 +140,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85:: @ 825AF85 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C @@ -150,13 +150,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C case 4, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4 @@ -167,7 +167,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4 @@ -179,20 +179,20 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4 @@ -203,7 +203,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4 @@ -215,7 +215,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 @@ -224,11 +224,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, 6 + setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate return @@ -255,7 +255,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 special sub_81A5E74 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF85 end diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 7846da874..1a535c893 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431 setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A @@ -46,7 +46,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 releaseall end @@ -54,7 +54,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B lockall setvar VAR_0x8004, 10 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4 @@ -68,12 +68,12 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6 msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4 setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9 message BattleFrontier_BattleFactoryLobby_Text_259323 waitmessage setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 @@ -88,7 +88,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506 message BattleFrontier_BattleFactoryLobby_Text_258CC7 waitmessage setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 @@ -134,7 +134,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 setvar VAR_0x8006, 2 goto BattleFrontier_BattleFactoryLobby_EventScript_25871A @@ -183,7 +183,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A @@ -197,7 +197,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 @@ -205,7 +205,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc closemessage delay 2 call BattleFrontier_BattleFactoryLobby_EventScript_27134F @@ -249,7 +249,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleFactoryLobby_EventScript_25879D BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A @@ -303,7 +303,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 setvar VAR_0x8004, 7 setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall @@ -314,7 +314,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA setvar VAR_0x8004, 7 setvar VAR_0x8005, 4 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index e05c49885..5764025e0 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -74,7 +74,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 waitfanfare special HealPlayerParty setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 playse 263 @@ -95,14 +95,14 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D compare VAR_RESULT, 2 @@ -232,7 +232,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47 waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 @@ -243,7 +243,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc special CalculatePlayerPartyCount goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 372b5da76..5cfc4c88b 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815 BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 setvar VAR_0x8004, 5 - special sub_81A1780 + special CallFrontierUtilFunc call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 end @@ -36,7 +36,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B showobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B @@ -46,7 +46,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5:: @ 824F8B5 @@ -61,7 +61,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF waitmovement 0 setvar VAR_0x8004, 5 special sub_8195960 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 switch VAR_RESULT @@ -71,19 +71,19 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA:: @ 824F8FA setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7 @@ -97,20 +97,20 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 compare VAR_RESULT, 2 @@ -181,7 +181,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28:: @ 824FB28 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F @@ -194,7 +194,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 @@ -246,13 +246,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 case 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4 @@ -265,7 +265,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 setvar VAR_0x8004, 6 special sub_8195960 setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4 @@ -277,7 +277,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 @@ -289,13 +289,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4 @@ -308,7 +308,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 setvar VAR_0x8004, 6 special sub_8195960 setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4 @@ -320,7 +320,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 @@ -336,17 +336,17 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, 4 + setvar VAR_0x8004, SPECIAL_BATTLE_PALACE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate setvar VAR_0x8004, 18 - special sub_81A1780 + special CallFrontierUtilFunc special HealPlayerParty setvar VAR_0x8004, 21 - special sub_81A1780 + special CallFrontierUtilFunc return BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34: @ 824FE34 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index c8142a207..bd916e931 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -27,7 +27,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index b86ffa2fb..804fd7bce 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7 setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 @@ -40,7 +40,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 releaseall end @@ -48,7 +48,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 lockall setvar VAR_0x8004, 10 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4 @@ -60,7 +60,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838 BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840 msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4 setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9 message BattleFrontier_BattlePalaceLobby_Text_24E4F7 waitmessage @@ -88,7 +88,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873 BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 7 @@ -126,7 +126,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 goto BattleFrontier_BattlePalaceLobby_EventScript_24DAF3 @@ -179,13 +179,13 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 case 2, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4 fadescreen 1 call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7 @@ -205,7 +205,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_8195960 setvar VAR_0x8004, 2 @@ -215,11 +215,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 @@ -232,7 +232,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4 closemessage call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC @@ -268,7 +268,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94 BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91 @@ -364,7 +364,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 setvar VAR_0x8004, 7 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall @@ -375,7 +375,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69 setvar VAR_0x8004, 7 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 23ad26692..4bdf3c80e 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -12,7 +12,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 20 special sub_81A703C setvar VAR_0x8004, 24 @@ -30,7 +30,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 99 - special sub_81A1780 + special CallFrontierUtilFunc call BattleFrontier_BattlePikeCorridor_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 waitstate diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 0b356792f..6bbb21bd1 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 @@ -42,7 +42,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 releaseall end @@ -50,7 +50,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 lockall setvar VAR_0x8004, 10 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4 @@ -64,10 +64,10 @@ BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784 BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4 setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9 setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 special sub_81A703C @@ -98,11 +98,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 message BattleFrontier_BattlePikeLobby_Text_25C146 waitmessage setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 @@ -148,13 +148,13 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB case 2, BattleFrontier_BattlePikeLobby_EventScript_25BA76 case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76 setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4 fadescreen 1 call BattleFrontier_BattlePikeLobby_EventScript_23F2B7 @@ -175,13 +175,13 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_TEMP_1, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 28 special sub_81A703C setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 setvar VAR_0x8006, 1 @@ -191,7 +191,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 @@ -204,11 +204,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4 closemessage setvar VAR_0x8004, 5 - special sub_81A1780 + special CallFrontierUtilFunc call BattleFrontier_BattlePikeLobby_EventScript_25BA94 special HealPlayerParty call BattleFrontier_BattlePikeLobby_EventScript_25BB49 @@ -238,7 +238,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattlePikeLobby_EventScript_25BA76 BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73 @@ -255,7 +255,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80 lockall setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 509806531..6f7140f30 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -30,13 +30,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special sub_81A703C - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage closemessage releaseall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate switch VAR_RESULT case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226 @@ -45,7 +45,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A:: @ 825D20A setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end @@ -66,13 +66,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special sub_81A703C - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage closemessage releaseall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate switch VAR_RESULT case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285 @@ -144,13 +144,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4 @@ -161,7 +161,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4 @@ -171,7 +171,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4 closemessage goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D @@ -179,13 +179,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4 @@ -196,7 +196,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4 @@ -206,7 +206,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4 closemessage goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D @@ -282,7 +282,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special sub_81A703C - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 closemessage delay 16 applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD @@ -290,11 +290,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E setvar VAR_0x8004, 21 setvar VAR_0x8005, 1 special sub_81A703C - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 closemessage - setvar VAR_0x8004, 9 + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate switch VAR_RESULT case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC @@ -433,9 +433,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B closemessage applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC waitmovement 0 - setvar VAR_0x8004, 7 + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate return @@ -590,7 +590,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B faceplayer setvar VAR_0x8004, 14 special sub_81A703C - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage closemessage release diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index 4f0d4632b..58031dd85 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -14,7 +14,7 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc lockall msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 closemessage diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index 9256764e8..d1d968054 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end @@ -37,7 +37,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271 setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 compare VAR_RESULT, 3 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index a4725036b..6f5e8db1c 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -23,7 +23,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C89A:: @ 825C89A @@ -43,27 +43,27 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4 closemessage releaseall setvar VAR_0x8004, 5 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 99 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968 case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978 @@ -133,7 +133,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD setvar VAR_0x8004, 6 - special sub_81A1780 + special CallFrontierUtilFunc message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08 waitmessage special LoadPlayerParty @@ -144,7 +144,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index eacee4cf3..6225ae0cc 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -41,14 +41,14 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8004, 15 special sub_81A8E7C setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_TEMP_0 case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 4 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 5 @@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_D, 1 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 @@ -76,7 +76,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 setvar VAR_0x8006, 255 @@ -103,12 +103,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 9 special sub_81A8E7C setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_F, 1 end @@ -128,12 +128,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 7 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 setvar VAR_0x8004, 6 @@ -141,7 +141,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_RESULT, 0 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 waitstate diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index ccc7b1032..4ae7b8e55 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 BattleFrontier_BattlePyramidLobby_EventScript_25075F:: @ 825075F setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 @@ -43,7 +43,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 releaseall end @@ -51,7 +51,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 lockall setvar VAR_0x8004, 10 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4 @@ -66,7 +66,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB clearflag FLAG_SPECIAL_FLAG_0x4004 setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty setvar VAR_0x8004, 14 special sub_81A8E7C @@ -77,7 +77,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA waitse msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4 setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 message BattleFrontier_BattlePyramidLobby_Text_251A77 waitmessage @@ -96,7 +96,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty setvar VAR_0x8004, 14 special sub_81A8E7C @@ -152,13 +152,13 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 case 2, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4 fadescreen 1 call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7 @@ -178,7 +178,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81A8E7C setvar VAR_0x8004, 2 @@ -188,11 +188,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 6 special sub_81A8E7C setvar VAR_0x8004, 9 @@ -209,14 +209,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4 closemessage call BattleFrontier_BattlePyramidLobby_EventScript_250D56 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_RESULT, 0 special HealPlayerParty warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 @@ -245,7 +245,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4 BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1 @@ -426,7 +426,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 lockall setvar VAR_0x8004, 7 setvar VAR_0x8005, 6 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 886b3fe01..46ecef737 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -29,7 +29,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3 BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C call BattleFrontier_BattlePyramidTop_EventScript_242170 @@ -37,14 +37,14 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C copyvar VAR_TEMP_C, VAR_RESULT setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_TEMP_0 case 0, BattleFrontier_BattlePyramidTop_EventScript_255193 case 1, BattleFrontier_BattlePyramidTop_EventScript_252B66 case 2, BattleFrontier_BattlePyramidTop_EventScript_255193 setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 3 @@ -76,12 +76,12 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 9 special sub_81A8E7C setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_F, 1 end @@ -110,7 +110,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end @@ -135,7 +135,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 case 4, BattleFrontier_BattlePyramidTop_EventScript_255388 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 special SpawnScriptEventObject @@ -145,7 +145,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_25573E, 4 @@ -166,7 +166,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4 @@ -175,14 +175,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4 goto BattleFrontier_BattlePyramidTop_EventScript_25521A BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 special SpawnScriptEventObject @@ -192,7 +192,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, 4 @@ -213,7 +213,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4 @@ -222,15 +222,15 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4 goto BattleFrontier_BattlePyramidTop_EventScript_25521A BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED closemessage - setvar VAR_0x8004, 10 + setvar VAR_0x8004, SPECIAL_BATTLE_PYRAMID setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate return diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index d687f83dd..196518e0b 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 @@ -45,7 +45,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E switch VAR_RESULT @@ -56,7 +56,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03:: @ 8241C03 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 special sub_8161F74 @@ -74,7 +74,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F waitmovement 0 removeobject 1 setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D @@ -88,13 +88,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 @@ -156,7 +156,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6:: @ 8241DF6 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 special sub_8161F74 @@ -174,7 +174,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22 waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleTowerBattleRoom_EventScript_241E44:: @ 8241E44 @@ -224,7 +224,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA:: @ 8241EBA BattleFrontier_BattleTowerBattleRoom2_EventScript_241EBA:: @ 8241EBA BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA setvar VAR_0x8004, 17 - special sub_81A1780 + special CallFrontierUtilFunc return BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 @@ -288,13 +288,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF case 4, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4 @@ -306,7 +306,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4 @@ -315,20 +315,20 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4 @@ -340,7 +340,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA setvar VAR_0x8004, 12 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4 @@ -349,7 +349,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 @@ -360,27 +360,27 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special HealPlayerParty - setvar VAR_0x8004, 0 + setvar VAR_0x8004, SPECIAL_BATTLE_TOWER setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE compare VAR_0x8004, 3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A setvar VAR_0x8004, 18 - special sub_81A1780 + special CallFrontierUtilFunc special HealPlayerParty setvar VAR_0x8004, 21 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleTowerBattleRoom_EventScript_24215A:: @ 824215A setvar VAR_0x8004, 15 special sub_8161F74 setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 - special sub_81A1780 + special CallFrontierUtilFunc return BattleFrontier_BattleArenaBattleRoom_EventScript_242170:: @ 8242170 @@ -390,7 +390,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_242170:: @ 8242170 BattleFrontier_BattlePyramidTop_EventScript_242170:: @ 8242170 BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170 setvar VAR_0x8004, 22 - special sub_81A1780 + special CallFrontierUtilFunc return BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index 2db7e5cdf..de242cbcc 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -47,7 +47,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E @@ -59,7 +59,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 @@ -78,14 +78,14 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 delay 15 applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 waitmovement 0 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage setvar VAR_0x8004, 7 setvar VAR_0x8005, 1 special sub_8161F74 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 waitmovement 0 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069 @@ -117,7 +117,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E:: @ 824907E setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 special sub_8161F74 @@ -156,7 +156,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_FRONTIER_BATTLE_MODE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 playfanfare MUS_ME_ASA @@ -166,7 +166,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 @@ -234,7 +234,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492AF:: @ 82492AF setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 special sub_8161F74 @@ -252,7 +252,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index b70bb8049..1afa9e120 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -49,7 +49,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707 setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 @@ -68,7 +68,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 release end @@ -77,7 +77,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 lock faceplayer setvar VAR_0x8004, 10 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 message BattleFrontier_BattleTowerLobby_Text_23F60D @@ -101,7 +101,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4 setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9 call BattleFrontier_BattleTowerLobby_EventScript_23E84D setvar VAR_0x8004, 1 @@ -151,7 +151,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D message BattleFrontier_BattleTowerLobby_Text_23F70F waitmessage setvar VAR_0x8004, 8 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 6 @@ -182,7 +182,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4:: @ 823E8B4 BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4 BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 setvar VAR_0x8004, 19 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 playse SE_SAVE @@ -208,7 +208,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 6 - special sub_81A1780 + special CallFrontierUtilFunc return BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE @@ -228,7 +228,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -262,13 +262,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4 fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 @@ -287,7 +287,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special sub_8161F74 @@ -298,7 +298,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 @@ -342,13 +342,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4 fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 @@ -367,7 +367,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special sub_8161F74 @@ -378,7 +378,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 @@ -423,13 +423,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4 fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 @@ -448,7 +448,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special sub_8161F74 @@ -459,7 +459,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 @@ -503,13 +503,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 case 2, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4 fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 @@ -528,7 +528,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 special sub_8161F74 @@ -539,7 +539,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 @@ -634,7 +634,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall @@ -645,7 +645,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall @@ -656,7 +656,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 setvar VAR_0x8006, 2 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall @@ -667,7 +667,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall @@ -717,7 +717,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2 BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6 end @@ -736,7 +736,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3 special SavePlayerParty setvar VAR_0x8004, 3 call BattleFrontier_BattleTowerLobby_EventScript_23F272 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_RESULT, 0 BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 @@ -924,7 +924,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_23F2B7:: @ 823F2B7 BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A1780 + special CallFrontierUtilFunc return BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 10cf3194d..de179850d 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -98,7 +98,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_241C03 end diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc index e469024e9..9015694eb 100644 --- a/data/maps/BattleFrontier_RankingHall/scripts.inc +++ b/data/maps/BattleFrontier_RankingHall/scripts.inc @@ -62,9 +62,9 @@ BattleFrontier_RankingHall_EventScript_25E516:: @ 825E516 end BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522 - special sub_81A4AA0 + special ShowRankingHallRecordsWindow waitbuttonpress - special sub_81A4AE8 + special ScrollRankingHallRecordsWindow waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index cf7f6a55e..ac7c5eb7a 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -114,7 +114,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 @@ -123,7 +123,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 @@ -157,7 +157,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 @@ -166,7 +166,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index e373ff5ad..6ec39dfd2 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -37,7 +37,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73 @@ -54,7 +54,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4 setvar VAR_0x8004, 4 special sub_81B99B4 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage call FallarborTown_BattleTentBattleRoom_EventScript_257B6C switch VAR_RESULT @@ -71,7 +71,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @@ -87,12 +87,12 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 3, FallarborTown_BattleTentBattleRoom_EventScript_200AF3 applymovement 3, FallarborTown_BattleTentBattleRoom_Movement_200B9E @@ -107,7 +107,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -115,7 +115,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43 compare VAR_RESULT, 2 @@ -156,7 +156,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @@ -191,7 +191,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B51:: @ 8200B51 waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73 diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index daf76cba2..7c75ae4f0 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -22,7 +22,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 @@ -32,12 +32,12 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc releaseall end @@ -51,7 +51,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_81B9B80 @@ -67,7 +67,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc message FallarborTown_BattleTentLobby_Text_2C4F69 waitmessage playfanfare MUS_FANFA4 @@ -99,7 +99,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_81B9B80 @@ -123,7 +123,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 goto FallarborTown_BattleTentLobby_EventScript_20013C @@ -152,13 +152,13 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_RESULT, 2 setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq FallarborTown_BattleTentLobby_EventScript_200176 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 - special sub_81A1780 + special CallFrontierUtilFunc msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4 fadescreen 1 setvar VAR_0x8004, 2 @@ -177,17 +177,17 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81B9B80 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 @@ -200,7 +200,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4 closemessage call FallarborTown_BattleTentLobby_EventScript_2001CF @@ -230,7 +230,7 @@ FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto FallarborTown_BattleTentLobby_EventScript_2001C5 FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 66775d417..1dfc72bcc 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -562,7 +562,7 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784 lockall setvar VAR_0x8004, 7 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index b09babbdd..242d1b8d8 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -263,13 +263,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 special ReducePlayerPartyToThree setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 - setvar VAR_0x8004, 8 + special CallFrontierUtilFunc + setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate setvar VAR_0x8004, 6 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty switch VAR_RESULT case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 150cc425b..833abdf99 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -51,13 +51,13 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE setvar VAR_0x8004, 4 special sub_81B99B4 lockall - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage closemessage special HealPlayerParty - setvar VAR_0x8004, 6 + setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate switch VAR_RESULT case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39 @@ -66,7 +66,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @@ -74,12 +74,12 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B SlateportCity_BattleTentBattleRoom_EventScript_209A39:: @ 8209A39 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 3, SlateportCity_BattleTentBattleRoom_EventScript_209A7B @ case 3, SlateportCity_BattleTentCorridor_EventScript_209A7B @@ -92,7 +92,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 0a9eb6cf5..c2ef5e3da 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -70,7 +70,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014 compare VAR_RESULT, 2 @@ -136,7 +136,7 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022 waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 76b12e31e..2e7886a2e 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -22,7 +22,7 @@ SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779 setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 @@ -32,12 +32,12 @@ SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc releaseall end @@ -50,7 +50,7 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_81B9D08 @@ -66,7 +66,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc message SlateportCity_BattleTentLobby_Text_23F68C waitmessage playfanfare MUS_FANFA4 @@ -84,7 +84,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_81B9D08 @@ -110,7 +110,7 @@ SlateportCity_BattleTentLobby_EventScript_208871:: @ 8208871 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 setvar VAR_0x8006, 2 goto SlateportCity_BattleTentLobby_EventScript_2089AC @@ -141,7 +141,7 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 - special sub_81A1780 + special CallFrontierUtilFunc msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5 switch VAR_RESULT case 0, SlateportCity_BattleTentLobby_EventScript_208A2B @@ -152,17 +152,17 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81B9D08 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc closemessage delay 2 call SlateportCity_BattleTentLobby_EventScript_27134F @@ -224,7 +224,7 @@ SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto SlateportCity_BattleTentLobby_EventScript_208A2E SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 36d0edd3a..4bd15c332 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -5,7 +5,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E setvar VAR_0x8004, 16 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D compare VAR_0x40C0, 0 @@ -75,7 +75,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 lock faceplayer setvar VAR_0x8004, 16 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E compare VAR_TEMP_1, 1 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index b29ef99a5..eb21ead54 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -4,7 +4,7 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F .byte 0 SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A - special sub_8162794 + special SetEReaderTrainerGfxId end SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E @@ -15,12 +15,12 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 lockall applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 waitmovement 0 - special sub_8165360 - msgbox 0x2021fc4, 4 + special CopyEReaderTrainerGreeting + msgbox gStringVar4, 4 closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, SPECIAL_BATTLE_EREADER setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate compare VAR_RESULT, 3 call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index b7f687cdf..41c8a9502 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -36,7 +36,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C @@ -48,7 +48,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F waitmovement 0 setvar VAR_0x8004, 4 special sub_81B99B4 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7 switch VAR_RESULT @@ -58,7 +58,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @@ -66,12 +66,12 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 + special CallFrontierUtilFunc switch VAR_RESULT case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_202501 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 @@ -85,7 +85,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -93,7 +93,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565 compare VAR_RESULT, 2 @@ -131,7 +131,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 3 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6 waitstate @@ -146,7 +146,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20251F:: @ 820251F waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end VerdanturfTown_BattleTentBattleRoom_MapScript2_202541: @ 8202541 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index a4cfc20c2..0368859c2 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -22,7 +22,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719 setvar VAR_0x8004, 0 - special sub_81A1780 + special CallFrontierUtilFunc end VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 @@ -32,12 +32,12 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc releaseall end @@ -51,7 +51,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 5 setvar VAR_0x8005, 0 special sub_81B99B4 @@ -67,7 +67,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc message VerdanturfTown_BattleTentLobby_Text_24A554 waitmessage playfanfare MUS_FANFA4 @@ -99,7 +99,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 5 setvar VAR_0x8005, 0 special sub_81B99B4 @@ -124,7 +124,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_0, 255 goto VerdanturfTown_BattleTentLobby_EventScript_2019AE @@ -153,13 +153,13 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_FRONTIER_BATTLE_MODE, 0 setvar VAR_RESULT, 2 setvar VAR_0x8004, 15 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_0x8004, 1 goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 - special sub_81A1780 + special CallFrontierUtilFunc msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4 fadescreen 1 setvar VAR_0x8004, 1 @@ -178,17 +178,17 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 0 special sub_81B99B4 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 @@ -201,7 +201,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4 closemessage call VerdanturfTown_BattleTentLobby_EventScript_201A41 @@ -231,7 +231,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto VerdanturfTown_BattleTentLobby_EventScript_201A37 VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34 diff --git a/data/script_menu.s b/data/script_menu.s deleted file mode 100644 index dbfb05621..000000000 --- a/data/script_menu.s +++ /dev/null @@ -1,780 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0858ABD8:: @ 858ABD8 - .4byte gUnknown_085EAD37, 0 - .4byte gUnknown_085EAD41, 0 - .4byte gText_Exit, 0 - -gUnknown_0858ABF0:: @ 58ABF0 - .4byte gUnknown_085EAD67, 0 - .4byte gUnknown_085EAD6D, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AC08:: @ 58AC08 - .4byte gUnknown_085EAD72, 0 - .4byte gUnknown_085EAD84, 0 - .4byte gUnknown_085EAD96, 0 - .4byte gText_Cancel2, 0 - -gUnknown_0858AC28:: @ 58AC28 - .4byte gUnknown_085EADA4, 0 - .4byte gUnknown_085EADB5, 0 - .4byte gUnknown_085EADC4, 0 - .4byte gUnknown_085EADD5, 0 - .4byte gUnknown_085EADE7, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AC58:: @ 58AC58 - .4byte gUnknown_085EADF9, 0 - .4byte gUnknown_085EAE04, 0 - .4byte gUnknown_085EAE12, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AC78:: @ 58AC78 - .4byte gUnknown_085EADF9, 0 - .4byte gUnknown_085EAE04, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AC90:: @ 58AC90 - .4byte gMenuText_Register, 0 - .4byte gUnknown_085EAE12, 0 - .4byte gUnknown_085EAE1B, 0 - .4byte gText_Cancel2, 0 - -gUnknown_0858ACB0:: @ 58ACB0 - .4byte gUnknown_085EAE27, 0 - .4byte gUnknown_085EAE2C, 0 - -gUnknown_0858ACC0:: @ 58ACC0 - .4byte gUnknown_085EAE31, 0 - .4byte gUnknown_085EAE35, 0 - .4byte gUnknown_085EAE39, 0 - .4byte gUnknown_085EAE3D, 0 - .4byte gUnknown_085EAE41, 0 - .4byte gText_Exit, 0 - -gUnknown_0858ACF0:: @ 58ACF0 - .4byte gUnknown_085EAD5F, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AD00:: @ 58AD00 - .4byte gUnknown_085EAE53, 0 - .4byte gUnknown_085EAE5A, 0 - -gUnknown_0858AD10:: @ 58AD10 - .4byte gText_Yes, 0 - .4byte gText_No, 0 - .4byte gUnknown_085EAD6D, 0 - -gUnknown_0858AD28:: @ 58AD28 - .4byte gUnknown_085EAEA2, 0 - .4byte gUnknown_085EAEAC, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AD40:: @ 58AD40 - .4byte gText_Lv50, 0 - .4byte gText_OpenLevel, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AD58:: @ 58AD58 - .4byte gUnknown_0827ECBC, 0 - .4byte gUnknown_0827ECC3, 0 - .4byte gUnknown_0827ECCD, 0 - -gUnknown_0858AD70:: @ 58AD70 - .4byte gUnknown_0827ECD5, 0 - .4byte gUnknown_0827ECDD, 0 - .4byte gUnknown_0827ECE3, 0 - -gUnknown_0858AD88:: @ 58AD88 - .4byte gUnknown_0827ECEB, 0 - .4byte gUnknown_0827ECF2, 0 - .4byte gUnknown_0827ECF8, 0 - -gUnknown_0858ADA0:: @ 58ADA0 - .4byte gUnknown_0827ED00, 0 - .4byte gUnknown_0827ED06, 0 - .4byte gUnknown_0827ED10, 0 - -gUnknown_0858ADB8:: @ 58ADB8 - .4byte gUnknown_0827ED18, 0 - .4byte gUnknown_0827ED22, 0 - .4byte gUnknown_0827ED2C, 0 - -gUnknown_0858ADD0:: @ 58ADD0 - .4byte gUnknown_0827ED36, 0 - .4byte gUnknown_0827ED40, 0 - .4byte gUnknown_0827ED46, 0 - -gUnknown_0858ADE8:: @ 58ADE8 - .4byte gUnknown_0827ED4F, 0 - .4byte gUnknown_0827ED59, 0 - .4byte gUnknown_0827ED65, 0 - -gUnknown_0858AE00:: @ 58AE00 - .4byte gUnknown_0827ED70, 0 - .4byte gUnknown_0827ED74, 0 - .4byte gUnknown_0827ED78, 0 - -gUnknown_0858AE18:: @ 58AE18 - .4byte gUnknown_0827ED80, 0 - .4byte gUnknown_0827ED95, 0 - .4byte gUnknown_0827EDAA, 0 - -gUnknown_0858AE30:: @ 58AE30 - .4byte gUnknown_0827EDB5, 0 - .4byte gUnknown_0827EDBA, 0 - .4byte gUnknown_0827EDC1, 0 - -gUnknown_0858AE48:: @ 58AE48 - .4byte gUnknown_0827EDC9, 0 - .4byte gUnknown_0827EDD5, 0 - .4byte gUnknown_0827EDE4, 0 - -gUnknown_0858AE60:: @ 58AE60 - .4byte gUnknown_0827EDF0, 0 - .4byte gUnknown_0827EDF5, 0 - .4byte gUnknown_0827EDF7, 0 - -gUnknown_0858AE78:: @ 58AE78 - .4byte gUnknown_0827EDF9, 0 - .4byte gUnknown_0827EDFB, 0 - .4byte gUnknown_0827EDFD, 0 - -gUnknown_0858AE90:: @ 58AE90 - .4byte gUnknown_0827EDFF, 0 - .4byte gUnknown_0827EE01, 0 - .4byte gUnknown_0827EE03, 0 - -gUnknown_0858AEA8:: @ 58AEA8 - .4byte gUnknown_0827EE05, 0 - .4byte gUnknown_0827EE07, 0 - .4byte gUnknown_0827EE09, 0 - -gUnknown_0858AEC0:: @ 58AEC0 - .4byte gUnknown_085EAEC3, 0 - .4byte gUnknown_085EAED6, 0 - .4byte gUnknown_085EAEE6, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AEE0:: @ 58AEE0 - .4byte gUnknown_085EAEF6, 0 - .4byte gUnknown_085EAF02, 0 - .4byte gUnknown_085EAF0E, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AF00:: @ 58AF00 - .4byte gUnknown_085EAF1B, 0 - .4byte gUnknown_085EAF24, 0 - .4byte gUnknown_085EAF2F, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AF20:: @ 58AF20 - .4byte gUnknown_085EAF34, 0 - .4byte gUnknown_085EAF3E, 0 - -gUnknown_0858AF30:: @ 58AF30 - .4byte gUnknown_085EAF4B, 0 - .4byte gUnknown_085EAF58, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AF48:: @ 58AF48 - .4byte gUnknown_085EAF65, 0 - .4byte gUnknown_085EAF70, 0 - .4byte gUnknown_085EAF7D, 0 - .4byte gUnknown_085EAF87, 0 - .4byte gUnknown_085EAF93, 0 - .4byte gUnknown_085EAF9F, 0 - .4byte gUnknown_085EAFAB, 0 - .4byte gText_Cancel2, 0 - -gUnknown_0858AF88:: @ 58AF88 - .4byte gUnknown_085EAFB6, 0 - .4byte gUnknown_085EAFCF, 0 - .4byte gUnknown_085EAFE8, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AFA8:: @ 58AFA8 - .4byte gUnknown_085EB089, 0 - .4byte gUnknown_085EB09C, 0 - .4byte gUnknown_085EB0AF, 0 - .4byte gUnknown_085EB0C2, 0 - .4byte gUnknown_085EB0D5, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AFD8:: @ 58AFD8 - .4byte gUnknown_085EB002, 0 - .4byte gUnknown_085EB017, 0 - .4byte gText_Exit, 0 - -gUnknown_0858AFF0:: @ 58AFF0 - .4byte gUnknown_085EB02A, 0 - .4byte gUnknown_085EB034, 0 - -gUnknown_0858B000:: @ 58B000 - .4byte gText_LilycoveCity, 0 - .4byte gText_BattleFrontier, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B018:: @ 58B018 - .4byte gText_SlateportCity, 0 - .4byte gText_LilycoveCity, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B030:: @ 58B030 - .4byte gUnknown_085EB07E, 0 - .4byte gUnknown_085EB084, 0 - -gUnknown_0858B040:: @ 58B040 - .4byte gText_LilycoveCity, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B050:: @ 58B050 - .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 - .4byte gUnknown_085EB040, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B090:: @ 58B090 - .4byte gUnknown_085EB04A, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B0A0:: @ 58B0A0 - .4byte gUnknown_085EB040, 0 - .4byte gUnknown_085EB04A, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B0B8:: @ 58B0B8 - .4byte gUnknown_085EB057, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B0C8:: @ 58B0C8 - .4byte gUnknown_085EB040, 0 - .4byte gUnknown_085EB057, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B0E0:: @ 58B0E0 - .4byte gUnknown_085EB04A, 0 - .4byte gUnknown_085EB057, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B0F8:: @ 58B0F8 - .4byte gUnknown_085EB040, 0 - .4byte gUnknown_085EB04A, 0 - .4byte gUnknown_085EB057, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B118:: @ 58B118 - .4byte gUnknown_085EB062, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B128:: @ 58B128 - .4byte gUnknown_085EB040, 0 - .4byte gUnknown_085EB062, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B140:: @ 58B140 - .4byte gUnknown_085EB04A, 0 - .4byte gUnknown_085EB062, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B158:: @ 58B158 - .4byte gUnknown_085EB040, 0 - .4byte gUnknown_085EB04A, 0 - .4byte gUnknown_085EB062, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B178:: @ 58B178 - .4byte gUnknown_085EB057, 0 - .4byte gUnknown_085EB062, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B190:: @ 58B190 - .4byte gUnknown_085EB040, 0 - .4byte gUnknown_085EB057, 0 - .4byte gUnknown_085EB062, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B1B0:: @ 58B1B0 - .4byte gUnknown_085EB04A, 0 - .4byte gUnknown_085EB057, 0 - .4byte gUnknown_085EB062, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B1D0:: @ 58B1D0 - .4byte gUnknown_085EB040, 0 - .4byte gUnknown_085EB04A, 0 - .4byte gUnknown_085EB057, 0 - .4byte gUnknown_085EB062, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B1F8:: @ 58B1F8 - .4byte gText_Opponent, 0 - .4byte gText_Tourney_Tree, 0 - .4byte gText_ReadyToStart, 0 - .4byte gUnknown_085EB5BC, 0 - .4byte gUnknown_085EB5C3, 0 - .4byte gUnknown_085EB5C8, 0 - -gUnknown_0858B228:: @ 58B228 - .4byte gText_Opponent, 0 - .4byte gText_Tourney_Tree, 0 - .4byte gText_ReadyToStart, 0 - .4byte gUnknown_085EB5C3, 0 - .4byte gUnknown_085EB5C8, 0 - -gUnknown_0858B250:: @ 58B250 - .4byte gUnknown_085EB29A, 0 - .4byte gUnknown_085EB2A3, 0 - -gUnknown_0858B260:: @ 58B260 - .4byte gUnknown_085EB372, 0 - .4byte gUnknown_085EB37F, 0 - .4byte gUnknown_085EB389, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B280:: @ 58B280 - .4byte gText_Yes, 0 - .4byte gText_No, 0 - .4byte gUnknown_085EAD6D, 0 - -gUnknown_0858B298:: @ 58B298 - .4byte gUnknown_085EAE6E, 0 - .4byte gUnknown_085EAE7C, 0 - .4byte gUnknown_085EAE8A, 0 - .4byte gUnknown_085EAD6D, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B2C0:: @ 58B2C0 - .4byte gUnknown_085EB372, 0 - .4byte gUnknown_085EB37F, 0 - .4byte gUnknown_085EB397, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B2E0:: @ 58B2E0 - .4byte gUnknown_085EB372, 0 - .4byte gUnknown_085EB37F, 0 - .4byte gUnknown_085EB389, 0 - .4byte gUnknown_085EB397, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B308:: @ 58B308 - .4byte gUnknown_085EB372, 0 - .4byte gUnknown_085EB37F, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B320:: @ 58B320 - .4byte gUnknown_085EB3A4, 0 - .4byte gUnknown_085EB3B1, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B338:: @ 58B338 - .4byte gUnknown_085EB3D4, 0 - .4byte gUnknown_085EB3C6, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B350:: @ 58B350 - .4byte gText_NormalRank, 0 - .4byte gText_SuperRank, 0 - .4byte gText_HyperRank, 0 - .4byte gText_MasterRank, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B378:: @ 58B378 - .4byte gText_BattleBag, 0 - .4byte gText_HeldItem, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B390:: @ 58B390 - .4byte gText_LinkContest, 0 - .4byte gText_AboutE_Mode, 0 - .4byte gText_AboutG_Mode, 0 - .4byte gText_Cancel2, 0 - -gUnknown_0858B3B0:: @ 58B3B0 - .4byte gText_E_Mode, 0 - .4byte gText_G_Mode, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B3C8:: @ 58B3C8 - .4byte gText_MenuOptionPokedex, 0 - .4byte gText_MenuOptionPokemon, 0 - .4byte gText_MenuOptionBag, 0 - .4byte gText_MenuOptionPokenav, 0 - .4byte gUnknown_085EB278, 0 - .4byte gText_MenuOptionSave, 0 - .4byte gText_MenuOptionOption, 0 - .4byte gText_MenuOptionExit, 0 - -gUnknown_0858B408:: @ 58B408 - .4byte gUnknown_085EB28A, 0 - .4byte gUnknown_085EB290, 0 - .4byte gUnknown_085EB295, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B428:: @ 58B428 - .4byte gText_SouthernIsland, 0 - .4byte gText_BirthIsland, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B440:: @ 58B440 - .4byte gText_SouthernIsland, 0 - .4byte gText_FarawayIsland, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B458:: @ 58B458 - .4byte gText_BirthIsland, 0 - .4byte gText_FarawayIsland, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B470:: @ 58B470 - .4byte gText_SouthernIsland, 0 - .4byte gText_BirthIsland, 0 - .4byte gText_FarawayIsland, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B490:: @ 58B490 - .4byte gUnknown_085EB2E4, 0 - .4byte gUnknown_085EB2F0, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B4A8:: @ 58B4A8 - .4byte gText_Yes, 0 - .4byte gUnknown_085EB2FC, 0 - -gUnknown_0858B4B8:: @ 58B4B8 - .4byte gUnknown_085EB3DF, 0 - .4byte gUnknown_085EB3EA, 0 - .4byte gUnknown_085EB3F1, 0 - .4byte gUnknown_085EB3FC, 0 - .4byte gUnknown_085EB40A, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B4E8:: @ 58B4E8 - .4byte gUnknown_085EB415, 0 - .4byte gUnknown_085EB41D, 0 - .4byte gUnknown_085EB424, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B508:: @ 58B508 - .4byte gUnknown_085EB45C, 0 - .4byte gUnknown_085EB469, 0 - .4byte gUnknown_085EB475, 0 - .4byte gUnknown_085EB482, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B530:: @ 58B530 - .4byte gUnknown_085EB42F, 0 - .4byte gUnknown_085EB43A, 0 - .4byte gUnknown_085EB444, 0 - .4byte gUnknown_085EB451, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B558:: @ 58B558 - .4byte gUnknown_085EB48E, 0 - .4byte gUnknown_085EB496, 0 - .4byte gUnknown_085EB4A3, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B578:: @ 58B578 - .4byte gUnknown_085EB4AD, 0 - .4byte gUnknown_085EB4B9, 0 - .4byte gUnknown_085EB4C7, 0 - .4byte gUnknown_085EB4D4, 0 - .4byte gUnknown_085EB4E0, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B5A8:: @ 58B5A8 - .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 - .4byte gUnknown_085EB532, 0 - .4byte gUnknown_085EB543, 0 - .4byte gUnknown_085EB555, 0 - .4byte gUnknown_085EB563, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B600:: @ 58B600 - .4byte gUnknown_085EB56E, 0 - .4byte gUnknown_085EB57E, 0 - .4byte gUnknown_085EB589, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B620:: @ 58B620 - .4byte gUnknown_085EB5B6, 0 - .4byte gUnknown_085EB5BC, 0 - .4byte gUnknown_085EB5C3, 0 - .4byte gUnknown_085EB5C8, 0 - -gUnknown_0858B640:: @ 58B640 - .4byte gUnknown_085EB5B6, 0 - .4byte gUnknown_085EB5C3, 0 - .4byte gUnknown_085EB5C8, 0 - -gUnknown_0858B658:: @ 58B658 - .4byte gUnknown_085EB5B6, 0 - .4byte gUnknown_085EB5BC, 0 - .4byte gUnknown_085EB5C8, 0 - -gUnknown_0858B670:: @ 58B670 - .4byte gUnknown_085EB5B6, 0 - .4byte gUnknown_085EB5C8, 0 - -gUnknown_0858B680:: @ 58B680 - .4byte gUnknown_085EE14B, 0 - .4byte gUnknown_085EE14F, 0 - -gUnknown_0858B690:: @ 58B690 - .4byte gUnknown_085EB2FF, 0 - .4byte gUnknown_085EB310, 0 - .4byte gUnknown_085EB317, 0 - .4byte gUnknown_085EB31F, 0 - -gUnknown_0858B6B0:: @ 58B6B0 - .4byte gText_CaveOfOrigin, 0 - .4byte gText_MtPyre, 0 - .4byte gText_SkyPillar, 0 - .4byte gText_DontRemember, 0 - -gUnknown_0858B6D0:: @ 58B6D0 - .4byte gUnknown_085EB4AD, 0 - .4byte gUnknown_085EB4B9, 0 - .4byte gUnknown_085EB4C7, 0 - .4byte gUnknown_085EB4D4, 0 - .4byte gUnknown_085EB597, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B700:: @ 58B700 - .4byte gText_BattleTrainers, 0 - .4byte gUnknown_085EB45C, 0 - .4byte gUnknown_085EB469, 0 - .4byte gUnknown_085EB475, 0 - .4byte gUnknown_085EB482, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B730:: @ 58B730 - .4byte gUnknown_085EB32D, 0 - .4byte gUnknown_085EB33E, 0 - .4byte gUnknown_085EB350, 0 - .4byte gUnknown_085EB361, 0 - .4byte gText_Exit, 0 - -gUnknown_0858B758:: @ 58B758 - .4byte gText_Exit, 0 - - -gUnknown_0858B760:: @ 858B760 - .4byte gUnknown_0858ABD8, 3 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858ABF0, 3 - .4byte gUnknown_0858AC08, 4 - .4byte gUnknown_0858AC28, 6 - .4byte gUnknown_0858AC78, 3 - .4byte gUnknown_0858AC58, 4 - .4byte gUnknown_0858AC90, 4 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858B4E8, 4 - .4byte gUnknown_0858ACB0, 2 - .4byte gUnknown_0858ACC0, 6 - .4byte gUnknown_0858ACF0, 2 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858AD00, 2 - .4byte gUnknown_0858B280, 3 - .4byte gUnknown_0858B298, 5 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858AD10, 3 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858AD28, 3 - .4byte gUnknown_0858AD40, 3 - .4byte gUnknown_0858AD58, 3 - .4byte gUnknown_0858AD70, 3 - .4byte gUnknown_0858AD88, 3 - .4byte gUnknown_0858ADA0, 3 - .4byte gUnknown_0858ADB8, 3 - .4byte gUnknown_0858ADD0, 3 - .4byte gUnknown_0858ADE8, 3 - .4byte gUnknown_0858AE00, 3 - .4byte gUnknown_0858AE18, 3 - .4byte gUnknown_0858AE30, 3 - .4byte gUnknown_0858AE48, 3 - .4byte gUnknown_0858AE60, 3 - .4byte gUnknown_0858AE78, 3 - .4byte gUnknown_0858AE90, 3 - .4byte gUnknown_0858AEA8, 3 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858AEC0, 4 - .4byte gUnknown_0858AEE0, 4 - .4byte gUnknown_0858AF00, 4 - .4byte gUnknown_0858AF20, 2 - .4byte gUnknown_0858AF30, 3 - .4byte gUnknown_0858AF48, 8 - .4byte gUnknown_0858AF88, 4 - .4byte gUnknown_0858AFD8, 3 - .4byte gUnknown_0858AFF0, 2 - .4byte gUnknown_0858B758, 1 - .4byte gUnknown_0858B000, 3 - .4byte gUnknown_0858B018, 3 - .4byte gUnknown_0858B030, 2 - .4byte gUnknown_0858AFA8, 6 - .4byte gUnknown_0858B040, 2 - .4byte gUnknown_0858B050, 6 - .4byte gUnknown_0858B080, 2 - .4byte gUnknown_0858B090, 2 - .4byte gUnknown_0858B0A0, 3 - .4byte gUnknown_0858B0B8, 2 - .4byte gUnknown_0858B0C8, 3 - .4byte gUnknown_0858B0E0, 3 - .4byte gUnknown_0858B0F8, 4 - .4byte gUnknown_0858B118, 2 - .4byte gUnknown_0858B128, 3 - .4byte gUnknown_0858B140, 3 - .4byte gUnknown_0858B158, 4 - .4byte gUnknown_0858B178, 3 - .4byte gUnknown_0858B190, 4 - .4byte gUnknown_0858B1B0, 4 - .4byte gUnknown_0858B1D0, 5 - .4byte gUnknown_0858B1F8, 6 - .4byte gUnknown_0858B308, 3 - .4byte gUnknown_0858B308, 3 - .4byte gUnknown_0858B260, 4 - .4byte gUnknown_0858B260, 4 - .4byte gUnknown_0858B2C0, 4 - .4byte gUnknown_0858B2E0, 5 - .4byte gUnknown_0858B320, 3 - .4byte gUnknown_0858B338, 3 - .4byte gUnknown_0858B350, 5 - .4byte gUnknown_0858B378, 3 - .4byte gUnknown_0858B390, 4 - .4byte gUnknown_0858B3B0, 3 - .4byte gUnknown_0858B3C8, 8 - .4byte gUnknown_0858B408, 4 - .4byte gUnknown_0858B250, 2 - .4byte gUnknown_0858B428, 3 - .4byte gUnknown_0858B440, 3 - .4byte gUnknown_0858B458, 3 - .4byte gUnknown_0858B470, 4 - .4byte gUnknown_0858B490, 3 - .4byte gUnknown_0858B4A8, 2 - .4byte gUnknown_0858B4B8, 6 - .4byte gUnknown_0858B508, 5 - .4byte gUnknown_0858B530, 5 - .4byte gUnknown_0858B558, 4 - .4byte gUnknown_0858B578, 6 - .4byte gUnknown_0858B5A8, 6 - .4byte gUnknown_0858B5D8, 5 - .4byte gUnknown_0858B600, 4 - .4byte gUnknown_0858B620, 4 - .4byte gUnknown_0858B640, 3 - .4byte gUnknown_0858B658, 3 - .4byte gUnknown_0858B670, 2 - .4byte gUnknown_0858B228, 5 - .4byte gUnknown_0858B680, 2 - .4byte gUnknown_0858B690, 4 - .4byte gUnknown_0858B6B0, 4 - .4byte gUnknown_0858B6D0, 6 - .4byte gUnknown_0858B700, 6 - .4byte gUnknown_0858B730, 5 - -gUnknown_0858BAF0:: @ 858BAF0 - .4byte gText_Cool - .4byte gText_Beauty - .4byte gText_Cute - .4byte gText_Smart - .4byte gText_Tough - .4byte gText_Normal - .4byte gText_Super - .4byte gText_Hyper - .4byte gText_Master - .4byte gText_Cool2 - .4byte gText_Beauty2 - .4byte gText_Cute2 - .4byte gText_Smart2 - .4byte gText_Tough2 - .4byte gText_Items - .4byte gText_Key_Items - .4byte gText_Poke_Balls - .4byte gText_TMs_Hms - .4byte gText_Berries2 - .4byte gText_Single2 - .4byte gText_Double2 - .4byte gText_Multi - .4byte gText_MultiLink - .4byte gText_BattleTower2 - .4byte gText_BattleDome - .4byte gText_BattleFactory - .4byte gText_BattlePalace - .4byte gText_BattleArena - .4byte gText_BattlePike - .4byte gText_BattlePyramid - -gUnknown_0858BB68:: @ 858BB68 - .byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F - - .align 2 -gUnknown_0858BB70:: @ 858BB70 - .4byte gText_SomeonesPC - .4byte gText_LanettesPC - .4byte gText_PlayersPC - .4byte gText_LogOff - -gUnknown_0858BB80:: @ 858BB80 - .4byte gText_SlateportCity - .4byte gText_BattleFrontier - .4byte gText_SouthernIsland - .4byte gText_NavelRock - .4byte gText_BirthIsland - .4byte gText_FarawayIsland - .4byte gText_Exit - -gUnknown_0858BB9C:: @ 858BB9C - .4byte OldaleTown_PokemonCenter_2F_Text_277F1B - .4byte OldaleTown_PokemonCenter_2F_Text_277F5A - .4byte OldaleTown_PokemonCenter_2F_Text_277F96 - .4byte OldaleTown_PokemonCenter_2F_Text_27889C - -gUnknown_0858BBAC:: @ 858BBAC - .4byte OldaleTown_PokemonCenter_2F_Text_27879F - .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 - .4byte OldaleTown_PokemonCenter_2F_Text_278831 - .4byte OldaleTown_PokemonCenter_2F_Text_27889C - -gUnknown_0858BBBC:: @ 858BBBC - .4byte OldaleTown_PokemonCenter_2F_Text_27879F - .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 - .4byte OldaleTown_PokemonCenter_2F_Text_2787FC - .4byte OldaleTown_PokemonCenter_2F_Text_27889C - -gUnknown_0858BBCC:: @ 858BBCC - .4byte OldaleTown_PokemonCenter_2F_Text_27879F - .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 - .4byte OldaleTown_PokemonCenter_2F_Text_278831 - .4byte OldaleTown_PokemonCenter_2F_Text_2787FC - .4byte OldaleTown_PokemonCenter_2F_Text_27889C - -gUnknown_0858BBE0:: @ 858BBE0 - .4byte OldaleTown_PokemonCenter_2F_Text_277F1B - .4byte OldaleTown_PokemonCenter_2F_Text_277F5A - .4byte OldaleTown_PokemonCenter_2F_Text_27889C - -gUnknown_0858BBEC:: @ 858BBEC - .4byte OldaleTown_PokemonCenter_2F_Text_27879F - .4byte OldaleTown_PokemonCenter_2F_Text_2787D5 - .4byte OldaleTown_PokemonCenter_2F_Text_27889C diff --git a/data/specials.inc b/data/specials.inc index fb654af21..a06b98b3d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -242,12 +242,12 @@ gSpecials:: @ 81DBA64 def_special FinishCyclingRoadChallenge def_special UpdateCyclingRoadState def_special GetLeadMonFriendshipScore - def_special sub_81A1780 + def_special CallFrontierUtilFunc def_special sub_8161F74 def_special CallBattleDomeFunction def_special sub_8195960 - def_special sub_8165360 - def_special sub_8163AC4 + def_special CopyEReaderTrainerGreeting + def_special DoSpecialTrainerBattle def_special sub_81A5238 def_special sub_81A5E74 def_special sub_81A703C @@ -332,7 +332,7 @@ gSpecials:: @ 81DBA64 def_special sp13F_fall_to_last_warp def_special sub_80F8D28 def_special sub_80F8EB8 - def_special sub_8162794 + def_special SetEReaderTrainerGfxId def_special BattleSetup_StartLatiBattle def_special SetRoute119Weather def_special SetRoute123Weather @@ -448,8 +448,8 @@ gSpecials:: @ 81DBA64 def_special sub_80F90DC def_special sub_80F910C def_special sub_80F9160 - def_special sub_81A4AA0 - def_special sub_81A4AE8 + def_special ShowRankingHallRecordsWindow + def_special ScrollRankingHallRecordsWindow def_special sub_8139F20 def_special sub_80F9134 def_special sub_80F9154 diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index 8497f59ad..c257961d3 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -2,6 +2,8 @@ .include "constants/constants.inc" .section .rodata + +.align 4 gUnknown_085DFA60:: @ 85DFA60 .incbin "graphics/interface/85DFA60.bin" |