diff options
Diffstat (limited to 'data')
619 files changed, 11542 insertions, 25083 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 9af3ed7a9..ca338ac9b 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -423,11 +423,11 @@ 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, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + playsewithpan SE_W003, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -435,118 +435,118 @@ Move_POUND: end Move_DOUBLE_SLAP: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim DoubleSlapLeft, DoubleSlapRight DoubleSlapContinue: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end DoubleSlapLeft: - createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 goto DoubleSlapContinue DoubleSlapRight: - createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, 0, 1, 2 goto DoubleSlapContinue Move_POISON_POWDER: - loadspritegfx ANIM_TAG_065 + loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W077, +63, 10, 6 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 + loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 - createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_STUN_SPORE: - loadspritegfx ANIM_TAG_068 - loopsewithpan SE_W077, +63, 10, 6 - createsprite gStunSporeParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 + loadspritegfx ANIM_TAG_STUN_SPORE + loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 - createsprite gStunSporeParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 - createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 - createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 - createsprite gStunSporeParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 - createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SLEEP_POWDER: - loadspritegfx ANIM_TAG_067 - loopsewithpan SE_W077, +63, 10, 6 - createsprite gSleepPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 + loadspritegfx ANIM_TAG_SLEEP_POWDER + loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 - createsprite gSleepPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 - createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 - createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 - createsprite gSleepPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 - createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish 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, -64 - createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 20, 1 + playsewithpan SE_W129, SOUND_PAN_ATTACKER + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 delay 5 - playsewithpan SE_W129, -64 - createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 5, 22, -18, 1 + playsewithpan SE_W129, SOUND_PAN_ATTACKER + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 delay 5 - playsewithpan SE_W129, -64 - createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, -10, 22, 15, 1 + playsewithpan SE_W129, SOUND_PAN_ATTACKER + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 18, 1 delay 5 - playsewithpan SE_W129, -64 - createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, -20, 1 + playsewithpan SE_W129, SOUND_PAN_ATTACKER + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 5 - playsewithpan SE_W129, -64 - createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 12, 1 + playsewithpan SE_W129, SOUND_PAN_ATTACKER + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -554,24 +554,24 @@ Move_SWIFT: end Move_STRENGTH: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4 delay 4 - playsewithpan SE_W025B, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 16, 12, 1, 1 + playsewithpan SE_W025B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 16, 12, 1, 1 delay 4 - playsewithpan SE_W025B, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, -16, -12, 1, 1 + playsewithpan SE_W025B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, -12, 1, 1 delay 4 - playsewithpan SE_W025B, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 3, 4, 1, 1 + playsewithpan SE_W025B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 3, 4, 1, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 waitforvisualfinish @@ -580,47 +580,47 @@ Move_STRENGTH: end Move_TACKLE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_BODY_SLAM: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, -64 - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + playsewithpan SE_W036, SOUND_PAN_ATTACKER + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER waitforvisualfinish delay 11 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 26, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 - loopsewithpan SE_W025B, +63, 10, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, 1, 0 + loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2 delay 1 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SUPERSONIC: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING monbg ANIM_ATK_PARTNER monbgprio_2A ANIM_ATTACKER setalpha 12, 8 @@ -636,13 +636,13 @@ Move_SUPERSONIC: blendoff end Supersonic1: - playsewithpan SE_W048, -64 - createsprite gSupersonicWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 + playsewithpan SE_W048, SOUND_PAN_ATTACKER + createsprite gSupersonicWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 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 @@ -651,8 +651,8 @@ Move_SCREECH: waitforvisualfinish end Screech1: - playsewithpan SE_W103, -64 - createsprite gScreechWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 + playsewithpan SE_W103, SOUND_PAN_ATTACKER + createsprite gScreechWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -660,67 +660,67 @@ Move_FLAME_WHEEL: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 0 - playsewithpan SE_W172, -64 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 0 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 4 - playsewithpan SE_W172, -64 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 4 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 8 - playsewithpan SE_W172, -64 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 8 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 12 - playsewithpan SE_W172, -64 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 12 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 16 - playsewithpan SE_W172, -64 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 16 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 20 - playsewithpan SE_W172, -64 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 20 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 24 - playsewithpan SE_W172, -64 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 56, 24 + playsewithpan SE_W172, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 6 delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 - playsewithpan SE_W172B, +63 + playsewithpan SE_W172B, SOUND_PAN_TARGET call FireMoveEffect delay 7 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 9 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end FlameWheel1: @ Unused - createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 50 + createsprite gBattleAnimSpriteTemplate_8595584, ANIM_ATTACKER, 3, 0, 0, 50 delay 4 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 - playsewithpan SE_W026, -64 - createsprite gPinMissileSpriteTemplate, 2, 20, -8, -8, -8, 20, -32 + playsewithpan SE_W026, SOUND_PAN_ATTACKER + createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 - createsprite gPinMissileSpriteTemplate, 2, 20, -8, 8, 8, 20, -40 + createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 + playsewithpan SE_W030, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 9 - createsprite gPinMissileSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 + createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 + playsewithpan SE_W030, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + playsewithpan SE_W030, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -728,28 +728,28 @@ 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 - playsewithpan SE_W196, -64 - createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, -8, -8, 20, -32 + playsewithpan SE_W196, SOUND_PAN_ATTACKER + createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 - createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 8, 8, 20, -40 + createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 + playsewithpan SE_W030, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 9 - createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 + createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 + playsewithpan SE_W030, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + playsewithpan SE_W030, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -757,74 +757,74 @@ 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 delay 35 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 - createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 - playsewithpan SE_W025B, +63 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, 1, 0 + playsewithpan SE_W025B, SOUND_PAN_TARGET delay 1 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 0, 0, 4 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 2 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_DOUBLE_EDGE: - loadspritegfx ANIM_TAG_135 - playsewithpan SE_W129, -64 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 + loadspritegfx ANIM_TAG_IMPACT + playsewithpan SE_W129, SOUND_PAN_ATTACKER + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish delay 10 - playsewithpan SE_W207, -64 - waitplaysewithpan SE_W207, -64, 8 + playsewithpan SE_W207, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 16, 16, RGB_WHITE - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 16, 16, RGB_WHITE + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish - playsewithpan SE_W025B, +63 - createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 0 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -32, 0, 0, 3 + playsewithpan SE_W025B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3 waitforvisualfinish createvisualtask sub_80D6134, 2, 8, -256, 0, 0 createvisualtask sub_80D6134, 2, 8, -256, 1, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_WHITE waitforvisualfinish createvisualtask sub_80D6134, 2, 8, -256, 0, 1 createvisualtask sub_80D6134, 2, 8, -256, 1, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 waitforvisualfinish 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 setalpha 12, 8 - playsewithpan SE_W013B, -64 - createsprite gLinearStingerSpriteTemplate, 130, 20, 0, -8, 0, 20 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER + createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish call PoisonBubblesEffect waitforvisualfinish @@ -833,20 +833,20 @@ 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 - loopsewithpan SE_W013B, -64, 6, 2 - createsprite gLinearStingerSpriteTemplate, 130, 10, -4, 0, -4, 20 - createsprite gLinearStingerSpriteTemplate, 130, 20, 12, 10, 12, 20 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 6, 2 + createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 10, -4, 0, -4, 20 + createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 12, 10, 12, 20 delay 20 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 - createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, -4, 1, 3 - loopsewithpan SE_W030, +63, 5, 2 + createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 0, -4, 1, 3 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2 delay 1 - createsprite gBattleAnimSpriteTemplate_8597370, 3, 10, 12, 1, 3 + createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 10, 12, 1, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -885,73 +885,73 @@ Move_FIRE_BLAST: waitforvisualfinish end FireBlast1: - createsprite gUnknown_0859551C, 130, 0, 0, 0 - createsprite gUnknown_0859551C, 130, 0, 0, 51 - createsprite gUnknown_0859551C, 130, 0, 0, 102 - createsprite gUnknown_0859551C, 130, 0, 0, 153 - createsprite gUnknown_0859551C, 130, 0, 0, 204 + createsprite gUnknown_0859551C, ANIM_TARGET, 2, 0, 0, 0 + createsprite gUnknown_0859551C, ANIM_TARGET, 2, 0, 0, 51 + createsprite gUnknown_0859551C, ANIM_TARGET, 2, 0, 0, 102 + createsprite gUnknown_0859551C, ANIM_TARGET, 2, 0, 0, 153 + createsprite gUnknown_0859551C, ANIM_TARGET, 2, 0, 0, 204 delay 5 return FireBlast2: - createsprite gUnknown_0859556C, 130, 0, 0, 10, 0, -2 - createsprite gUnknown_0859556C, 130, 0, 0, 13, -2, 0 - createsprite gUnknown_0859556C, 130, 0, 0, 13, 2, 0 - createsprite gUnknown_0859556C, 130, 0, 0, 15, -2, 2 - createsprite gUnknown_0859556C, 130, 0, 0, 15, 2, 2 + createsprite gUnknown_0859556C, ANIM_TARGET, 2, 0, 0, 10, 0, -2 + createsprite gUnknown_0859556C, ANIM_TARGET, 2, 0, 0, 13, -2, 0 + createsprite gUnknown_0859556C, ANIM_TARGET, 2, 0, 0, 13, 2, 0 + createsprite gUnknown_0859556C, ANIM_TARGET, 2, 0, 0, 15, -2, 2 + createsprite gUnknown_0859556C, ANIM_TARGET, 2, 0, 0, 15, 2, 2 return Move_LEECH_SEED: loadspritegfx ANIM_TAG_SEED - playsewithpan SE_W077, -64 - createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32 + playsewithpan SE_W077, SOUND_PAN_ATTACKER + createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 - playsewithpan SE_W077, -64 - createsprite gLeechSeedSpriteTemplate, 130, 15, 0, -16, 24, 35, -40 + playsewithpan SE_W077, SOUND_PAN_ATTACKER + createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40 delay 8 - playsewithpan SE_W077, -64 - createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 16, 24, 35, -37 + playsewithpan SE_W077, SOUND_PAN_ATTACKER + createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37 delay 12 - loopsewithpan SE_W039, +63, 10, 8 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8 waitforvisualfinish end Move_EMBER: loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W052, -64, 5, 2 - createsprite gEmberSpriteTemplate, 130, 20, 0, -16, 24, 20, 1 + loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2 + createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1 delay 4 - createsprite gEmberSpriteTemplate, 130, 20, 0, 0, 24, 20, 1 + createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 20, 1 delay 4 - createsprite gEmberSpriteTemplate, 130, 20, 0, 16, 24, 20, 1 + createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 16, 24, 20, 1 delay 16 - playsewithpan SE_W172, +63 + playsewithpan SE_W172, SOUND_PAN_TARGET call Ember1 call Ember1 call Ember1 end Ember1: - createsprite gEmberFlareSpriteTemplate, 130, -24, 24, 24, 24, 20, 1, 1 + createsprite gEmberFlareSpriteTemplate, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 delay 4 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 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK setalpha 12, 8 - playsewithpan SE_W025, +63 - createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 0, 50 + playsewithpan SE_W025, SOUND_PAN_TARGET + createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50 createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE delay 50 call SetImpactBackground - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 - playsewithpan SE_W233B, +63 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -979,22 +979,22 @@ 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 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK setalpha 12, 8 - playsewithpan SE_W025, +63 - createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 1, 50 + playsewithpan SE_W025, SOUND_PAN_TARGET + createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50 createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE delay 50 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET call SetImpactBackground - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1004,30 +1004,30 @@ 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 CometPunchContinue: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end CometPunchLeft: - createsprite gBasicHitSplatSpriteTemplate, 2, -8, -8, 1, 2 - createsprite gFistFootSpriteTemplate, 3, -8, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, -8, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -8, 0, 8, 1, 0 goto CometPunchContinue CometPunchRight: - createsprite gBasicHitSplatSpriteTemplate, 2, 8, -8, 1, 2 - createsprite gFistFootSpriteTemplate, 3, 8, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, -8, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 8, 0, 8, 1, 0 goto CometPunchContinue 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 @@ -1041,12 +1041,12 @@ Move_SONIC_BOOM: blendoff end SonicBoom1: - playsewithpan SE_W013B, -64 - createsprite gSonicBoomSpriteTemplate, 130, 16, 0, 0, 0, 15 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER + createsprite gSonicBoomSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return SonicBoom2: - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 delay 4 return @@ -1057,7 +1057,7 @@ Move_THUNDER_SHOCK: waitforvisualfinish delay 10 createvisualtask sub_810A7DC, 5, 0, -44, 0 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 9 createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish @@ -1073,35 +1073,35 @@ 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 delay 10 createvisualtask sub_810A7DC, 5, 24, -52, 0 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 7 createvisualtask sub_810A7DC, 5, -24, -52, 0 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 7 createvisualtask sub_810A7DC, 5, 0, -60, 1 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 9 createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish delay 20 - createsprite gBattleAnimSpriteTemplate_85957E0, 131, 44, 0, 0, 3 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 0, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 64, 40, 1, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 128, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 192, 40, 2, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 32, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 96, 40, 1, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 160, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 224, 40, 2, -32765 - playsewithpan SE_W063, +63 + createsprite gBattleAnimSpriteTemplate_85957E0, ANIM_TARGET, 3, 44, 0, 0, 3 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 0, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 64, 40, 1, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 128, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 192, 40, 2, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 32, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 + playsewithpan SE_W063, SOUND_PAN_TARGET delay 0 createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK delay 6 @@ -1112,7 +1112,7 @@ Move_THUNDERBOLT: createvisualtask sub_8116620, 10, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish delay 20 - waitplaysewithpan SE_W085B, +63, 19 + waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish delay 20 @@ -1123,27 +1123,27 @@ 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 createvisualtask sub_810A7DC, 5, 0, -48, 0 - playsewithpan SE_W086, +63 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 20 - loopsewithpan SE_W085B, +63, 10, 4 - createsprite gUnknown_08595840, 130, -16, -16 + loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4 + createsprite gUnknown_08595840, ANIM_TARGET, 2, -16, -16 delay 4 - createsprite gUnknown_08595840, 130, -16, 0 + createsprite gUnknown_08595840, ANIM_TARGET, 2, -16, 0 delay 4 - createsprite gUnknown_08595840, 130, -16, 16 + createsprite gUnknown_08595840, ANIM_TARGET, 2, -16, 16 waitforvisualfinish createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish 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 @@ -1153,56 +1153,56 @@ BeatUpContinue: blendoff end BeatUpLeft: - createsprite gBasicHitSplatSpriteTemplate, 130, -20, -20, 1, 2 - createsprite gFistFootSpriteTemplate, 131, -20, -12, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -20, -20, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -20, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2 - createsprite gFistFootSpriteTemplate, 131, 8, 8, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 8, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET goto BeatUpContinue BeatUpRight: - createsprite gBasicHitSplatSpriteTemplate, 130, 12, -20, 1, 2 - createsprite gFistFootSpriteTemplate, 131, 12, -12, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -20, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 12, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 130, -12, 0, 1, 2 - createsprite gFistFootSpriteTemplate, 131, -12, 8, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 0, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -12, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET 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, +63 - createsprite gUnknown_08595F60, 3, 0, -32, 15 + playsewithpan SE_W104, SOUND_PAN_TARGET + createsprite gUnknown_08595F60, ANIM_ATTACKER, 3, 0, -32, 15 delay 19 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, -8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, 1, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_TAIL_WHIP: - loopsewithpan SE_W039, -64, 24, 3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end Move_CUT: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W015, +63 - createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + playsewithpan SE_W015, SOUND_PAN_TARGET + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 waitforvisualfinish @@ -1212,65 +1212,65 @@ Move_CUT: end Move_HIDDEN_POWER: - loadspritegfx ANIM_TAG_217 - playsewithpan SE_W036, -64 + loadspritegfx ANIM_TAG_RED_ORB + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1 delay 4 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 - playsewithpan SE_W179, -64 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 0 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 42 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 84 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 126 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 168 - createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 210 + playsewithpan SE_W179, SOUND_PAN_ATTACKER + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 126 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 168 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210 delay 52 setarg 7, -1 - playsewithpan SE_W115, -64 + playsewithpan SE_W115, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 0 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 32 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 64 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 96 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 128 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 160 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 192 - createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 224 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 0 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 32 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 64 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 96 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 128 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 160 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 192 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 224 end Move_REVERSAL: - loadspritegfx ANIM_TAG_236 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 - playsewithpan SE_W197, -64 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 + loadspritegfx ANIM_TAG_BLUE_ORB + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT + playsewithpan SE_W197, SOUND_PAN_ATTACKER + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE delay 10 - playsewithpan SE_W179, -64 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 0 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 42 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 84 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 126 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 168 - createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 210 + playsewithpan SE_W179, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 0 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 42 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 84 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 126 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 168 + createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 210 waitforvisualfinish delay 20 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 8 - playsewithpan SE_W233B, +63 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 - createsprite gFistFootSpriteTemplate, 132, 0, 0, 10, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 end Move_PURSUIT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein @@ -1286,35 +1286,35 @@ PursuitContinue: waitbgfadein end PursuitNormal: - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 goto PursuitContinue PursuitOnSwitchout: - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 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 createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, -64, 5, 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 - createsprite gLinearStingerSpriteTemplate, 2, 10, -8, -8, -8, 20 - createsprite gLinearStingerSpriteTemplate, 2, 18, 0, 0, 0, 20 - createsprite gLinearStingerSpriteTemplate, 2, 26, 8, 8, 8, 20 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 5, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 + createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 10, -8, -8, -8, 20 + createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 0, 0, 20 + createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 8, 8, 20 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_8597370, 3, -8, -8, 1, 2 - createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, 0, 1, 2 - createsprite gBattleAnimSpriteTemplate_8597370, 3, 8, 8, 1, 2 + createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, -8, -8, 1, 2 + createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 0, 0, 1, 2 + createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 - loopsewithpan SE_W030, +63, 5, 3 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1324,9 +1324,9 @@ Move_SWORDS_DANCE: loadspritegfx ANIM_TAG_SWORD monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W014, -64 + playsewithpan SE_W014, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 - createsprite gBattleAnimSpriteTemplate_8593380, 2, 0, 0 + createsprite gBattleAnimSpriteTemplate_8593380, ANIM_ATTACKER, 2, 0, 0 delay 22 createvisualtask sub_8115D94, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0 waitforvisualfinish @@ -1336,16 +1336,16 @@ 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 - loopsewithpan SE_W060B, -64, 5, 10 - createsprite gUnknown_08596548, 2, 0, 0, 0, 0 + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 5, 10 + createsprite gUnknown_08596548, ANIM_ATTACKER, 2, 0, 0, 0, 0 createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_ATTACKER delay 127 delay 4 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 createvisualtask sub_8116620, 9, 2, 2, 10, 0, RGB_YELLOW delay 30 @@ -1356,44 +1356,44 @@ 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 - createsprite gFistFootSpriteTemplate, 133, 16, 8, 20, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 132, 16, 0, 1, 1 - playsewithpan SE_W004, +63 - createsprite gUnknown_08595F78, 131, 16, 8, 160, -32 - createsprite gUnknown_08595F78, 131, 16, 8, -256, -40 - createsprite gUnknown_08595F78, 131, 16, 8, 128, -16 - createsprite gUnknown_08595F78, 131, 16, 8, 416, -38 - createsprite gUnknown_08595F78, 131, 16, 8, -128, -22 - createsprite gUnknown_08595F78, 131, 16, 8, -384, -31 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, 16, 8, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 16, 0, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, 160, -32 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, -256, -40 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, 128, -16 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, 416, -38 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, -128, -22 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, 16, 8, -384, -31 delay 10 call DizzyPunch1 - createsprite gFistFootSpriteTemplate, 133, -16, -8, 20, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 132, -16, -16, 1, 1 - playsewithpan SE_W233B, +63 - createsprite gUnknown_08595F78, 131, -16, -8, 160, -32 - createsprite gUnknown_08595F78, 131, -16, -8, -256, -40 - createsprite gUnknown_08595F78, 131, -16, -8, 128, -16 - createsprite gUnknown_08595F78, 131, -16, -8, 416, -38 - createsprite gUnknown_08595F78, 131, -16, -8, -128, -22 - createsprite gUnknown_08595F78, 131, -16, -8, -384, -31 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, -16, -8, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -16, -16, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, 160, -32 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, -256, -40 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, 128, -16 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, 416, -38 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, -128, -22 + createsprite gUnknown_08595F78, ANIM_TARGET, 3, -16, -8, -384, -31 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end DizzyPunch1: - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 return Move_FIRE_SPIN: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, +63 + playsewithpan SE_W221B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 call FireSpinEffect call FireSpinEffect @@ -1402,25 +1402,25 @@ Move_FIRE_SPIN: end FireSpinEffect: - createsprite gUnknown_08596B88, 130, 0, 28, 528, 30, 13, 50, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 28, 528, 30, 13, 50, 1 delay 2 - createsprite gUnknown_08596B88, 130, 0, 32, 480, 20, 16, -46, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 32, 480, 20, 16, -46, 1 delay 2 - createsprite gUnknown_08596B88, 130, 0, 33, 576, 20, 8, 42, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 33, 576, 20, 8, 42, 1 delay 2 - createsprite gUnknown_08596B88, 130, 0, 31, 400, 25, 11, -42, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 31, 400, 25, 11, -42, 1 delay 2 - createsprite gUnknown_08596B88, 130, 0, 28, 512, 25, 16, 46, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 28, 512, 25, 16, 46, 1 delay 2 - createsprite gUnknown_08596B88, 130, 0, 33, 464, 30, 15, -50, 1 + createsprite gUnknown_08596B88, ANIM_TARGET, 2, 0, 33, 464, 30, 15, -50, 1 delay 2 return Move_FURY_CUTTER: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask AnimTask_IsFuryCutterHitRight, 2 jumpretfalse FuryCutterLeft goto FuryCutterRight @@ -1439,19 +1439,19 @@ FuryCutterContinue2: waitforvisualfinish end FuryCutterLeft: - createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 goto FuryCutterContinue FuryCutterRight: - createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 1 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 1 goto FuryCutterContinue FuryCutterMedium: - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB(9, 8, 10), 4, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 FuryCutterStrong: - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 FuryCutterStrongest: - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 Move_SELF_DESTRUCT: @@ -1468,111 +1468,111 @@ Move_SELF_DESTRUCT: createvisualtask sub_8116620, 10, 2, 1, 9, 0, RGB_RED end SelfDestruct1: - playsewithpan SE_W120, -64 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 + playsewithpan SE_W120, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W120, -64 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1 + playsewithpan SE_W120, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W120, -64 - createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1 + playsewithpan SE_W120, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W120, -64 - createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1 + playsewithpan SE_W120, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W120, -64 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1 + playsewithpan SE_W120, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 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, -64 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 3, 0, 4 + playsewithpan SE_W004, SOUND_PAN_ATTACKER + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 - createsprite gUnknown_085928D0, 2, 0, 0 + createsprite gUnknown_085928D0, ANIM_ATTACKER, 2, 0, 0 delay 3 - playsewithpan SE_W025B, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + playsewithpan SE_W025B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 waitforvisualfinish delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_VINE_WHIP: - loadspritegfx ANIM_TAG_287 - playsewithpan SE_W026, -64 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + loadspritegfx ANIM_TAG_WHIP_HIT + playsewithpan SE_W026, SOUND_PAN_ATTACKER + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 6 - playsewithpan SE_W010, +63 - createsprite gUnknown_085928E8, 130, 0, 0 + playsewithpan SE_W010, SOUND_PAN_TARGET + createsprite gUnknown_085928E8, ANIM_TARGET, 2, 0, 0 delay 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1 end Move_DRILL_PECK: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_162 - createsprite gUnknown_08592CD8, 2, 0 - playsewithpan SE_W029, -64 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_WHIRLWIND_LINES + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, 2, 1 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 delay 2 - loopsewithpan SE_W030, +63, 4, 8 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8 createvisualtask sub_810EB88, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 waitforvisualfinish - createsprite gUnknown_08592CD8, 2, 2 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 waitforvisualfinish 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 delay 5 - playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 2, 10, 10, 25, 0 + playsewithpan SE_W152, SOUND_PAN_ATTACKER + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 10, 10, 25, 0 delay 4 - playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 2, -15, 0, 25, 0 + playsewithpan SE_W152, SOUND_PAN_ATTACKER + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -15, 0, 25, 0 delay 4 - playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 2, 20, 10, 25, 0 + playsewithpan SE_W152, SOUND_PAN_ATTACKER + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 20, 10, 25, 0 delay 4 - playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 2, 0, -10, 25, 0 + playsewithpan SE_W152, SOUND_PAN_ATTACKER + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 0, -10, 25, 0 delay 4 - playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 2, -10, 15, 25, 0 + playsewithpan SE_W152, SOUND_PAN_ATTACKER + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -10, 15, 25, 0 delay 4 - playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 2, 25, 20, 25, 0 + playsewithpan SE_W152, SOUND_PAN_ATTACKER + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 25, 20, 25, 0 delay 4 - playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 2, -20, 20, 25, 0 + playsewithpan SE_W152, SOUND_PAN_ATTACKER + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -20, 20, 25, 0 delay 4 - playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 2, 12, 0, 25, 0 + playsewithpan SE_W152, SOUND_PAN_ATTACKER + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 12, 0, 25, 0 waitforvisualfinish delay 10 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 5 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 5 delay 6 call UnderWaterAttack1 waitforvisualfinish @@ -1581,48 +1581,48 @@ Move_WATERFALL: end UnderWaterAttack1: - playsewithpan SE_W127, +63 + playsewithpan SE_W127, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1 - createsprite gUnknown_08597388, 3, 0, 20, 1, 1 - createsprite gUnknown_08595250, 4, 0, 20 - createsprite gUnknown_08595250, 4, 0, 20 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, 20, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 20 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 20 delay 2 - createsprite gUnknown_08597388, 3, 0, 15, 1, 1 - createsprite gUnknown_08595250, 4, 0, 15 - createsprite gUnknown_08595250, 4, 0, 15 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, 15, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 15 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 15 delay 2 - createsprite gUnknown_08597388, 3, 0, 10, 1, 1 - createsprite gUnknown_08595250, 4, 0, 10 - createsprite gUnknown_08595250, 4, 0, 10 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, 10, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 10 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 10 delay 2 - createsprite gUnknown_08597388, 3, 0, 5, 1, 1 - createsprite gUnknown_08595250, 4, 0, 5 - createsprite gUnknown_08595250, 4, 0, 5 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, 5, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 5 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 5 delay 2 - createsprite gUnknown_08597388, 3, 0, 0, 1, 1 - createsprite gUnknown_08595250, 4, 0, 0 - createsprite gUnknown_08595250, 4, 0, 0 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 0 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, 0 delay 2 - createsprite gUnknown_08597388, 3, 0, -5, 1, 1 - createsprite gUnknown_08595250, 4, 0, -5 - createsprite gUnknown_08595250, 4, 0, -5 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, -5, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -5 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -5 delay 2 - createsprite gUnknown_08597388, 3, 0, -10, 1, 1 - createsprite gUnknown_08595250, 4, 0, -10 - createsprite gUnknown_08595250, 4, 0, -10 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, -10, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -10 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -10 delay 2 - createsprite gUnknown_08597388, 3, 0, -15, 1, 1 - createsprite gUnknown_08595250, 4, 0, -15 - createsprite gUnknown_08595250, 4, 0, -15 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, -15, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -15 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -15 delay 2 - createsprite gUnknown_08597388, 3, 0, -20, 1, 1 - createsprite gUnknown_08595250, 4, 0, -20 - createsprite gUnknown_08595250, 4, 0, -20 + createsprite gUnknown_08597388, ANIM_ATTACKER, 3, 0, -20, 1, 1 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -20 + createsprite gUnknown_08595250, ANIM_ATTACKER, 4, 0, -20 return Move_EXPLOSION: loadspritegfx ANIM_TAG_EXPLOSION - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 8, 9, RGB(26, 8, 8), 8, 0, 8 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 9, RGB(26, 8, 8), 8, 0, 8 createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 @@ -1636,30 +1636,30 @@ Move_EXPLOSION: createvisualtask sub_8116620, 10, 1, 3, 16, 0, RGB_WHITE end Explosion1: - playsewithpan SE_W153, -64 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 + playsewithpan SE_W153, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W153, -64 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1 + playsewithpan SE_W153, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W153, -64 - createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1 + playsewithpan SE_W153, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W153, -64 - createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1 + playsewithpan SE_W153, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W153, -64 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1 + playsewithpan SE_W153, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return Move_DEFENSE_CURL: - loadspritegfx ANIM_TAG_234 - loopsewithpan SE_W161, -64, 18, 3 + loadspritegfx ANIM_TAG_ECLIPSING_ORB + loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 createvisualtask sub_811489C, 5, 0, 0 createvisualtask sub_815B338, 5 waitforvisualfinish - createsprite gUnknown_085CE338, 2, 0, 6, 0, 1 + createsprite gUnknown_085CE338, ANIM_ATTACKER, 2, 0, 6, 0, 1 waitforvisualfinish createvisualtask sub_811489C, 5, 0, 1 waitforvisualfinish @@ -1669,29 +1669,29 @@ Move_PROTECT: loadspritegfx ANIM_TAG_PROTECT monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - waitplaysewithpan SE_W115, -64, 16 - createsprite gUnknown_08592ADC, 2, 24, 0, 90 + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16 + createsprite gUnknown_08592ADC, ANIM_ATTACKER, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end Move_DETECT: - loadspritegfx ANIM_TAG_071 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, RGB_BLACK + loadspritegfx ANIM_TAG_SPARKLE_4 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE delay 18 - playsewithpan SE_W197, -64 - createsprite gUnknown_0853EE84, 13, 20, -20 + playsewithpan SE_W197, SOUND_PAN_ATTACKER + createsprite gUnknown_0853EE84, ANIM_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 9, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 9, 0, RGB_BLACK createvisualtask sub_8116620, 10, 2, 2, 9, 0, RGB_WHITE waitforvisualfinish end Move_FRUSTRATION: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -1706,107 +1706,107 @@ Frustration_Continue: blendoff end Frustration_Strongest: - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 2, 0, 20, -28 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish - playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 2, 0, 20, -28 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, ANIM_ATTACKER delay 5 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, 24, 8, 1, 0 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 24, 8, 1, 0 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, -24, -16, 1, 0 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -24, -16, 1, 0 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, 8, 4, 1, 0 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 4, 1, 0 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, -16, 19, 1, 0 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, 19, 1, 0 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, 18, -18, 1, 0 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, 1, 0 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 goto Frustration_Continue Frustration_Strong: - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 2, 0, 20, -28 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask sub_815C3A8, 5 delay 7 - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 8, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 12, -6, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, -12, -6, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 goto Frustration_Continue Frustration_Medium: - playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 2, 0, 20, -28 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, 4, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 4, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -4, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 goto Frustration_Continue Frustration_Weak: - createsprite gUnknown_085CE4D0, 2, 20, -28 + createsprite gUnknown_085CE4D0, ANIM_ATTACKER, 2, 20, -28 waitforvisualfinish delay 10 - createsprite gHorizontalLungeSpriteTemplate, 2, 10, 2 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2 delay 12 - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 goto Frustration_Continue Move_SAFEGUARD: - loadspritegfx ANIM_TAG_244 + loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_ATK_PARTNER setalpha 8, 8 - playsewithpan SE_W208, -64 - createsprite gUnknown_08593C64, 2 + playsewithpan SE_W208, SOUND_PAN_ATTACKER + createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 delay 4 - createsprite gUnknown_08593C64, 2 + createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 delay 4 - createsprite gUnknown_08593C64, 2 + createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_REAPOKE, -64 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1814,23 +1814,23 @@ Move_SAFEGUARD: end Move_PAIN_SPLIT: - loadspritegfx ANIM_TAG_239 - createsprite gUnknown_085CE590, 2, -8, -42, 0 - createsprite gUnknown_085CE590, 130, -8, -42, 1 + loadspritegfx ANIM_TAG_PAIN_SPLIT + createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -8, -42, 0 + createsprite gUnknown_085CE590, ANIM_TARGET, 2, -8, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_815CA20, 2, 0, 0 createvisualtask sub_815CA20, 2, 1, 0 waitforvisualfinish - createsprite gUnknown_085CE590, 2, -24, -42, 0 - createsprite gUnknown_085CE590, 130, -24, -42, 1 + createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -24, -42, 0 + createsprite gUnknown_085CE590, ANIM_TARGET, 2, -24, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_815CA20, 2, 0, 1 createvisualtask sub_815CA20, 2, 1, 1 waitforvisualfinish - createsprite gUnknown_085CE590, 2, 8, -42, 0 - createsprite gUnknown_085CE590, 130, 8, -42, 1 + createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, 8, -42, 0 + createsprite gUnknown_085CE590, ANIM_TARGET, 2, 8, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_815CA20, 2, 0, 2 @@ -1838,15 +1838,15 @@ 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, +63 - createsprite gUnknown_08593590, 2, 0 - createsprite gUnknown_08593590, 2, 1 + playsewithpan SE_W011, SOUND_PAN_TARGET + createsprite gUnknown_08593590, ANIM_ATTACKER, 2, 0 + createsprite gUnknown_08593590, ANIM_ATTACKER, 2, 1 delay 9 - createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -1854,23 +1854,23 @@ 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 waitbgfadein - playsewithpan SE_W011, +63 - createsprite gUnknown_085935D0, 2, 0 - createsprite gUnknown_085935D0, 2, 1 + playsewithpan SE_W011, SOUND_PAN_TARGET + createsprite gUnknown_085935D0, ANIM_ATTACKER, 2, 0 + createsprite gUnknown_085935D0, ANIM_ATTACKER, 2, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_BLACK delay 9 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 23, 1 delay 0x2E createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 - playsewithpan SE_W013, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -1879,17 +1879,17 @@ 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 - playsewithpan SE_W013B, -64 - createsprite gUnknown_085934D8, 2, 20, 0, 0, 0, 1152 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER + createsprite gUnknown_085934D8, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish - playsewithpan SE_W006, +63 - createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 - createsprite gUnknown_085934F0, 2 + playsewithpan SE_W006, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 + createsprite gUnknown_085934F0, ANIM_ATTACKER, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -1898,88 +1898,88 @@ Move_PAY_DAY: Move_OUTRAGE: loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W082, -64, 8, 3 + loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 8, 3 createvisualtask sub_8115A04, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0) createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, 0, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, 0, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 0, 1280, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 0, -1280, 3 delay 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 40, 1 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, 768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, 768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, -768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, -768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, 0, 3 call Outrage1 call Outrage1 waitforvisualfinish end Outrage1: delay 3 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, 0, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 0, 1280, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 0, -1280, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, 768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, 768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, 1280, -768, 3 delay 0 - createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, ANIM_TARGET, 2, 0, 0, 30, -1280, -768, 3 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) - playsewithpan SE_W085B, -64 - createsprite gBattleAnimSpriteTemplate_859574C, 0, 32, 24, 190, 12, 0, 1, 0 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 delay 0 - createsprite gBattleAnimSpriteTemplate_859574C, 0, 80, 24, 22, 12, 0, 1, 0 - createsprite gBattleAnimSpriteTemplate_859574C, 0, 156, 24, 121, 13, 0, 1, 1 + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 156, 24, 121, 13, 0, 1, 1 delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 10 createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) - playsewithpan SE_W085B, -64 - createsprite gBattleAnimSpriteTemplate_859574C, 0, 100, 24, 60, 10, 0, 1, 0 - createsprite gBattleAnimSpriteTemplate_859574C, 0, 170, 24, 42, 11, 0, 1, 1 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 delay 0 - createsprite gBattleAnimSpriteTemplate_859574C, 0, 238, 24, 165, 10, 0, 1, 1 + createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 238, 24, 165, 10, 0, 1, 1 delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 20 createvisualtask sub_8115A04, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22) - playsewithpan SE_W085B, -64 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 0, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 64, 20, 1, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 128, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 192, 20, 2, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 32, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 96, 20, 1, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 160, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 224, 20, 2, 0 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 192, 20, 2, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 32, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 96, 20, 1, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 160, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0 delay 4 waitforvisualfinish createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 - playsewithpan SE_W063, +63 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + playsewithpan SE_W063, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish createvisualtask sub_8115A04, 2, 4, -31, 2, 0, 6, RGB(31, 31, 22) @@ -1988,30 +1988,30 @@ Move_SPARK: end Move_ATTRACT: - loadspritegfx ANIM_TAG_216 - loopsewithpan SE_W204, -64, 12, 3 + 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 - createsprite gUnknown_085939A0, 131, 20, -8 + createsprite gUnknown_085939A0, ANIM_TARGET, 3, 20, -8 waitforvisualfinish - playsewithpan SE_W213, +63 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -32 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -40 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -16 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -128, -22 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -384, -31 + playsewithpan SE_W213, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 160, -32 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -256, -40 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 128, -16 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 416, -38 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -128, -22 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31 waitforvisualfinish waitplaysewithpan SE_W213B, 0, 15 createvisualtask sub_81062E8, 5 - createsprite gUnknown_085939D0, 40, 16, 256, 0 - createsprite gUnknown_085939D0, 40, 224, 240, 15 - createsprite gUnknown_085939D0, 40, 126, 272, 30 - createsprite gUnknown_085939D0, 40, 80, 224, 45 - createsprite gUnknown_085939D0, 40, 170, 272, 60 - createsprite gUnknown_085939D0, 40, 40, 256, 75 - createsprite gUnknown_085939D0, 40, 112, 256, 90 - createsprite gUnknown_085939D0, 40, 200, 272, 90 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 16, 256, 0 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 224, 240, 15 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 126, 272, 30 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 80, 224, 45 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 170, 272, 60 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 40, 256, 75 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 112, 256, 90 + createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 200, 272, 90 delay 0x4B createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27) end @@ -2024,25 +2024,25 @@ Move_GROWTH: end Growth1: createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0 return Move_WHIRLWIND: - loadspritegfx ANIM_TAG_162 - 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 - createsprite gUnknown_085963D4, 2, 0, 16, 1, 60, 3 - createsprite gUnknown_085963D4, 2, 0, 24, 1, 60, 4 - createsprite gUnknown_085963D4, 2, 0, 32, 1, 60, 0 + loadspritegfx ANIM_TAG_WHIRLWIND_LINES + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, -8, 1, 60, 0 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 0, 1, 60, 1 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 8, 1, 60, 2 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 16, 1, 60, 3 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 24, 1, 60, 4 + createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 32, 1, 60, 0 delay 5 - loopsewithpan SE_W104, +63, 10, 4 + loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1 delay 0x1D createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5 delay 7 - playsewithpan SE_W081, +63 + playsewithpan SE_W081, SOUND_PAN_TARGET createvisualtask sub_80D5DB0, 5, 1, 8 waitforvisualfinish end @@ -2052,13 +2052,13 @@ Move_CONFUSE_RAY: monbg ANIM_DEF_PARTNER fadetobg BG_GHOST waitbgfadein - createvisualtask sub_8159278, 2, -64, 63, 2, 0 + createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask sub_8115C80, 2, 10013, 0, 6, 0, 14, 351 - createsprite gUnknown_08596D14, 130, 28, 0, 288 + createsprite gUnknown_08596D14, ANIM_TARGET, 2, 28, 0, 288 waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W081B, +63 - createsprite gUnknown_08596D2C, 130, 0, -16 + playsewithpan SE_W081B, SOUND_PAN_TARGET + createsprite gUnknown_08596D2C, ANIM_TARGET, 2, 0, -16 waitforvisualfinish delay 0 blendoff @@ -2069,11 +2069,11 @@ Move_CONFUSE_RAY: Move_LOCK_ON: loadspritegfx ANIM_TAG_LOCK_ON - createsprite gUnknown_08592CA0, 40 - createsprite gUnknown_08592CB8, 40, 1 - createsprite gUnknown_08592CB8, 40, 2 - createsprite gUnknown_08592CB8, 40, 3 - createsprite gUnknown_08592CB8, 40, 4 + createsprite gUnknown_08592CA0, ANIM_ATTACKER, 40 + createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 1 + createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 2 + createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 3 + createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 4 delay 120 setarg 7, -1 waitforvisualfinish @@ -2082,54 +2082,54 @@ Move_LOCK_ON: Move_MEAN_LOOK: loadspritegfx ANIM_TAG_EYE monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, -64 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK - loopsewithpan SE_W109, +63, 15, 4 - waitplaysewithpan SE_W043, +63, 0x55 - createsprite gUnknown_085CE104, 2 + playsewithpan SE_W060, SOUND_PAN_ATTACKER + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK + loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4 + waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 0x55 + createsprite gUnknown_085CE104, ANIM_ATTACKER, 2 delay 120 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK delay 30 clearmonbg ANIM_DEF_PARTNER waitforvisualfinish end Move_ROCK_THROW: - loadspritegfx ANIM_TAG_058 - createsprite gBattleAnimSpriteTemplate_85972D8, 130, 6, 1, 15, 1 - createsprite gUnknown_08596B04, 130, 0, 1, 0, 0 - playsewithpan SE_W088, +63 + loadspritegfx ANIM_TAG_ROCKS + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_TARGET, 2, 6, 1, 15, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 0, 1, 0, 0 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 - createsprite gUnknown_08596B04, 130, 19, 1, 10, 0 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 19, 1, 10, 0 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 - createsprite gUnknown_08596B04, 130, -23, 2, -10, 0 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -23, 2, -10, 0 + playsewithpan SE_W088, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1 delay 6 - createsprite gUnknown_08596B04, 130, -15, 1, -10, 0 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -15, 1, -10, 0 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 - createsprite gUnknown_08596B04, 130, 23, 2, 10, 0 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 23, 2, 10, 0 + playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish 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 - playsewithpan SE_W088, +63 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 7, 1, 11, 1 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -5, 1, -5, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 5, 0, 6, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 5, 0, 6, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 19, 1, 10, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 19, 1, 10, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, -23, 2, -10, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -23, 2, -10, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 5, 50, 1 delay 2 @@ -2140,43 +2140,43 @@ Move_ROCK_SLIDE: end RockSlide1: - createsprite gUnknown_08596B04, 130, -20, 0, -10, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -20, 0, -10, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 28, 1, 10, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 28, 1, 10, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, -10, 1, -5, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -10, 1, -5, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 10, 0, 6, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 10, 0, 6, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 24, 1, 10, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 24, 1, 10, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, -32, 2, -10, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -32, 2, -10, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, -20, 0, -10, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, -20, 0, -10, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08596B04, 130, 30, 2, 10, 1 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596B04, ANIM_TARGET, 2, 30, 2, 10, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 return Move_THIEF: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET delay 1 fadetobg BG_DARK waitbgfadein setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 6 - playsewithpan SE_W233, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + playsewithpan SE_W233, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1 waitforvisualfinish delay 20 @@ -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 @@ -2204,29 +2204,29 @@ Move_BUBBLE_BEAM: blendoff end Bulbblebeam1: - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 70, 0, 256, 50 - playsewithpan SE_W145, -64 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 40, -10, 256, 50 - playsewithpan SE_W145, -64 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -60, 0, 256, 50 - playsewithpan SE_W145, -64 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 256, 50 - playsewithpan SE_W145, -64 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, -10, 256, 50 - playsewithpan SE_W145, -64 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 256, 50 - playsewithpan SE_W145, -64 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 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 @@ -2234,11 +2234,11 @@ Move_ICY_WIND: playsewithpan SE_W196, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, -64, +63, +2, 0 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call IcyWind1 delay 5 call IcyWind1 - playsewithpan SE_W016B, +63 + playsewithpan SE_W016B, SOUND_PAN_TARGET delay 0x37 call IcyWindEffect2 waitforvisualfinish @@ -2249,38 +2249,38 @@ Move_ICY_WIND: waitbgfadein end IcyWind1: - createsprite gUnknown_08595B98, 0xA8, 0, 0, 0, 0, 72, 1 + createsprite gUnknown_08595B98, ANIM_TARGET, 40, 0, 0, 0, 0, 72, 1 delay 5 - createsprite gUnknown_08595B98, 0xA8, 0, 10, 0, 10, 72, 1 + createsprite gUnknown_08595B98, ANIM_TARGET, 40, 0, 10, 0, 10, 72, 1 delay 5 - createsprite gUnknown_08595B98, 0xA8, 0, -10, 0, -10, 72, 1 + createsprite gUnknown_08595B98, ANIM_TARGET, 40, 0, -10, 0, -10, 72, 1 delay 5 - createsprite gUnknown_08595B98, 0xA8, 0, 15, 0, 15, 72, 1 + createsprite gUnknown_08595B98, ANIM_TARGET, 40, 0, 15, 0, 15, 72, 1 delay 5 - createsprite gUnknown_08595B98, 0xA8, 0, -5, 0, -5, 72, 1 + createsprite gUnknown_08595B98, ANIM_TARGET, 40, 0, -5, 0, -5, 72, 1 return Move_SMOKESCREEN: loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W104, -64 - createsprite gUnknown_085CE050, 130, 20, 0, 0, 0, 35, -25 + playsewithpan SE_W104, SOUND_PAN_ATTACKER + createsprite gUnknown_085CE050, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask sub_815A160, 2 delay 2 - playsewithpan SE_W028, +63 - createsprite gUnknown_085CE038, 132, 0, -12, 104, 0, 75 - createsprite gUnknown_085CE038, 132, 0, -12, 72, 1, 75 - createsprite gUnknown_085CE038, 132, 0, -6, 56, 1, 75 - createsprite gUnknown_085CE038, 132, 0, -6, 88, 0, 75 - createsprite gUnknown_085CE038, 132, 0, 0, 56, 0, 75 - createsprite gUnknown_085CE038, 132, 0, 0, 88, 1, 75 - createsprite gUnknown_085CE038, 132, 0, 6, 72, 0, 75 - createsprite gUnknown_085CE038, 132, 0, 6, 104, 1, 75 - createsprite gUnknown_085CE038, 132, 0, 12, 72, 0, 75 - createsprite gUnknown_085CE038, 132, 0, 12, 56, 1, 75 - createsprite gUnknown_085CE038, 132, 0, 18, 80, 0, 75 - createsprite gUnknown_085CE038, 132, 0, 18, 72, 1, 75 + playsewithpan SE_W028, SOUND_PAN_TARGET + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -12, 104, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -12, 72, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -6, 56, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -6, 88, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 0, 56, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 0, 88, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 6, 72, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 6, 104, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 12, 72, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 12, 56, 1, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 18, 80, 0, 75 + createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 18, 72, 1, 75 waitforvisualfinish end @@ -2290,43 +2290,43 @@ Move_CONVERSION: monbgprio_28 ANIM_ATTACKER setalpha 16, 0 delay 0 - playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 2, -24, -24 + playsewithpan SE_W129, SOUND_PAN_ATTACKER + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, -24 delay 3 - createsprite gUnknown_08592E74, 2, -8, -24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, -24 delay 3 - createsprite gUnknown_08592E74, 2, 8, -24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, -24 delay 3 - createsprite gUnknown_08592E74, 2, 24, -24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, -24 delay 3 - playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 2, -24, -8 + playsewithpan SE_W129, SOUND_PAN_ATTACKER + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, -8 delay 3 - createsprite gUnknown_08592E74, 2, -8, -8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, -8 delay 3 - createsprite gUnknown_08592E74, 2, 8, -8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, -8 delay 3 - createsprite gUnknown_08592E74, 2, 24, -8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, -8 delay 3 - playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 2, -24, 8 + playsewithpan SE_W129, SOUND_PAN_ATTACKER + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, 8 delay 3 - createsprite gUnknown_08592E74, 2, -8, 8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, 8 delay 3 - createsprite gUnknown_08592E74, 2, 8, 8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, 8 delay 3 - createsprite gUnknown_08592E74, 2, 24, 8 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, 8 delay 3 - playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 2, -24, 24 + playsewithpan SE_W129, SOUND_PAN_ATTACKER + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, 24 delay 3 - createsprite gUnknown_08592E74, 2, -8, 24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, 24 delay 3 - createsprite gUnknown_08592E74, 2, 8, 24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, 24 delay 3 - createsprite gUnknown_08592E74, 2, 24, 24 + createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, 24 delay 20 - playsewithpan SE_W112, -64 + playsewithpan SE_W112, SOUND_PAN_ATTACKER createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0 delay 6 createvisualtask sub_81022D4, 5 @@ -2342,103 +2342,103 @@ Move_CONVERSION_2: monbgprio_2A ANIM_TARGET setalpha 0, 16 delay 0 - playsewithpan SE_W112, +63 - createsprite gUnknown_08592EA4, 2, -24, -24, 60 - createsprite gUnknown_08592EA4, 2, -8, -24, 65 - createsprite gUnknown_08592EA4, 2, 8, -24, 70 - createsprite gUnknown_08592EA4, 2, 24, -24, 75 - createsprite gUnknown_08592EA4, 2, -24, -8, 80 - createsprite gUnknown_08592EA4, 2, -8, -8, 85 - createsprite gUnknown_08592EA4, 2, 8, -8, 90 - createsprite gUnknown_08592EA4, 2, 24, -8, 95 - createsprite gUnknown_08592EA4, 2, -24, 8, 100 - createsprite gUnknown_08592EA4, 2, -8, 8, 105 - createsprite gUnknown_08592EA4, 2, 8, 8, 110 - createsprite gUnknown_08592EA4, 2, 24, 8, 115 - createsprite gUnknown_08592EA4, 2, -24, 24, 120 - createsprite gUnknown_08592EA4, 2, -8, 24, 125 - createsprite gUnknown_08592EA4, 2, 8, 24, 130 - createsprite gUnknown_08592EA4, 2, 24, 24, 135 + playsewithpan SE_W112, SOUND_PAN_TARGET + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, -24, 60 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, -24, 65 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, -24, 70 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, -24, 75 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, -8, 80 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, -8, 85 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, -8, 90 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, -8, 95 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, 8, 100 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, 8, 105 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, 8, 110 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, 8, 115 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, 24, 120 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, 24, 125 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, 24, 130 + createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, 24, 135 createvisualtask sub_81023E0, 5 delay 60 - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, +63 + playsewithpan SE_W129, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 6 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 - createsprite gUnknown_08595EE0, 2, -24, 0, 48, 10, 160, 0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 + createsprite gUnknown_08595EE0, ANIM_ATTACKER, 2, -24, 0, 48, 10, 160, 0 delay 5 - playsewithpan SE_W233B, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 8 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 8 clearmonbg ANIM_TARGET blendoff end Move_HEADBUTT: - loadspritegfx ANIM_TAG_135 - createsprite gUnknown_08592CD8, 2, 0 - playsewithpan SE_W029, -64 + loadspritegfx ANIM_TAG_IMPACT + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, 2, 1 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, 2, 2 - createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 - playsewithpan SE_W233B, +63 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish 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, -64 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, 2, 1 - createsprite gUnknown_08592F44, 132, 0, 0, 10 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 + createsprite gUnknown_08592F44, ANIM_TARGET, 4, 0, 0, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, 2, 2 - createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 - playsewithpan SE_W030, +63 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 + playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish 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 @@ -2448,21 +2448,21 @@ FuryAttackContinue: end FuryAttackRight: - createsprite gUnknown_08592F44, 132, 8, 8, 10 + createsprite gUnknown_08592F44, ANIM_TARGET, 4, 8, 8, 10 waitforvisualfinish - createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 + playsewithpan SE_W030, SOUND_PAN_TARGET goto FuryAttackContinue FuryAttackLeft: - createsprite gUnknown_08592F44, 132, -8, -8, 10 + createsprite gUnknown_08592F44, ANIM_TARGET, 4, -8, -8, 10 waitforvisualfinish - createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 + playsewithpan SE_W030, SOUND_PAN_TARGET goto FuryAttackContinue Move_HORN_DRILL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest HornDrillInContest fadetobg BG_DRILL @@ -2471,50 +2471,50 @@ Move_HORN_DRILL: HornDrillContinue: waitbgfadein setalpha 12, 8 - createsprite gUnknown_08592CD8, 2, 0 - playsewithpan SE_W029, -64 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, 2, 1 - createsprite gUnknown_08592F44, 132, 0, 0, 12 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 + createsprite gUnknown_08592F44, ANIM_TARGET, 4, 0, 0, 12 waitforvisualfinish playse SE_BAN createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 - createsprite gUnknown_085973E8, 131, 0, 0, 1, 3 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 3 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 0, 2, 1, 3 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 2, 1, 3 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, -4, 3, 1, 3 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -4, 3, 1, 3 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, -8, -5, 1, 3 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -8, -5, 1, 3 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 4, -12, 1, 3 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 4, -12, 1, 3 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 16, 0, 1, 3 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 16, 0, 1, 3 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 5, 18, 1, 3 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 5, 18, 1, 3 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, -17, 12, 1, 2 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -17, 12, 1, 2 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, -21, -15, 1, 2 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -21, -15, 1, 2 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 8, -27, 1, 2 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 8, -27, 1, 2 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973E8, 131, 32, 0, 1, 2 - playsewithpan SE_W030, +63 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 32, 0, 1, 2 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08592CD8, 2, 2 + createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 waitforvisualfinish restorebg waitbgfadeout @@ -2529,52 +2529,52 @@ 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 + createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 28 - createsprite gUnknown_08595EB0, 131, 1, 10, 1 + createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 28 - createsprite gUnknown_08595EB0, 131, 1, 10, 3 + createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET end Move_SING: - loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_MUSIC_NOTES monbg ANIM_DEF_PARTNER createvisualtask sub_8102BE8, 2 waitforvisualfinish - panse_1B SE_W047, -64, +63, +2, 0 - createsprite gUnknown_08593008, 130, 7, 0, 12 + panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 7, 0, 12 delay 5 - createsprite gUnknown_08593008, 130, 6, 1, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 1, 12 delay 5 - createsprite gUnknown_08593008, 130, 1, 2, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 2, 12 delay 5 - createsprite gUnknown_08593008, 130, 2, 3, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 3, 12 delay 5 - createsprite gUnknown_08593008, 130, 3, 0, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 3, 0, 12 delay 4 - createsprite gUnknown_08593008, 130, 2, 1, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 12 delay 4 - createsprite gUnknown_08593008, 130, 5, 2, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 2, 12 delay 4 - createsprite gUnknown_08593008, 130, 6, 3, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 3, 12 delay 4 - createsprite gUnknown_08593008, 130, 2, 0, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 0, 12 delay 4 - createsprite gUnknown_08593008, 130, 2, 1, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 12 delay 4 - createsprite gUnknown_08593008, 130, 1, 2, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 2, 12 delay 4 - createsprite gUnknown_08593008, 130, 5, 3, 12 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 3, 12 delay 4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -2583,16 +2583,16 @@ Move_SING: end Move_LOW_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 - createsprite gUnknown_08595EE0, 130, -24, 28, 40, 8, 160, 0 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 + createsprite gUnknown_08595EE0, ANIM_TARGET, 2, -24, 28, 40, 8, 160, 0 delay 4 - createsprite gBasicHitSplatSpriteTemplate, 130, -8, 8, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, 1, 2 createvisualtask sub_80D6134, 2, 6, 384, 1, 2 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 end Move_EARTHQUAKE: @@ -2600,24 +2600,24 @@ Move_EARTHQUAKE: createvisualtask sub_81152DC, 5, 4, 10, 50 playsewithpan SE_W089, 0 delay 10 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 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, +63 + playsewithpan SE_W089, SOUND_PAN_TARGET delay 8 call Fissure1 delay 15 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 15 call Fissure2 delay 15 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 15 call Fissure1 delay 50 @@ -2633,19 +2633,19 @@ Move_FISSURE: end Fissure1: - createsprite gUnknown_085971FC, 130, 1, 0, 12, -48, -16, 24 - createsprite gUnknown_085971FC, 130, 1, 0, 16, -16, -10, 24 - createsprite gUnknown_085971FC, 130, 1, 1, 14, -52, -18, 24 - createsprite gUnknown_085971FC, 130, 1, 1, 12, -32, -16, 24 - playsewithpan SE_W091, +63 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 0, 12, -48, -16, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 0, 16, -16, -10, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 1, 14, -52, -18, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 1, 12, -32, -16, 24 + playsewithpan SE_W091, SOUND_PAN_TARGET return Fissure2: - createsprite gUnknown_085971FC, 130, 1, 0, 12, -24, -16, 24 - createsprite gUnknown_085971FC, 130, 1, 0, 16, -38, -10, 24 - createsprite gUnknown_085971FC, 130, 1, 1, 14, -20, -18, 24 - createsprite gUnknown_085971FC, 130, 1, 1, 12, -36, -16, 24 - playsewithpan SE_W091, +63 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 0, 12, -24, -16, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 0, 16, -38, -10, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 1, 14, -20, -18, 24 + createsprite gUnknown_085971FC, ANIM_TARGET, 2, 1, 1, 12, -36, -16, 24 + playsewithpan SE_W091, SOUND_PAN_TARGET return Move_DIG: @@ -2653,10 +2653,10 @@ Move_DIG: DigEnd: end DigSetUp: - loadspritegfx ANIM_TAG_074 - loadspritegfx ANIM_TAG_281 - createsprite gUnknown_08597214, 1, 0, 0, 180 - createsprite gUnknown_08597214, 1, 0, 1, 180 + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_DIRT_MOUND + createsprite gUnknown_08597214, ANIM_ATTACKER, 1, 0, 0, 180 + createsprite gUnknown_08597214, ANIM_ATTACKER, 1, 0, 1, 180 monbg_22 ANIM_ATTACKER delay 1 createvisualtask sub_8114CBC, 2, 0 @@ -2672,36 +2672,36 @@ 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 - createsprite gUnknown_08597214, 1, 0, 0, 48 - createsprite gUnknown_08597214, 1, 0, 1, 48 + createsprite gUnknown_08597214, ANIM_ATTACKER, 1, 0, 0, 48 + createsprite gUnknown_08597214, ANIM_ATTACKER, 1, 0, 1, 48 delay 1 createvisualtask sub_8114F14, 2, 1 delay 16 - createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - playsewithpan SE_W025B, -64 + playsewithpan SE_W025B, SOUND_PAN_ATTACKER clearmonbg ANIM_ATTACKER goto DigEnd DigSetUp1: - createsprite gUnknown_085971FC, 2, 0, 0, 12, 4, -16, 18 - createsprite gUnknown_085971FC, 2, 0, 0, 16, 4, -10, 18 - createsprite gUnknown_085971FC, 2, 0, 1, 14, 4, -18, 18 - createsprite gUnknown_085971FC, 2, 0, 1, 12, 4, -16, 18 - playsewithpan SE_W091, -64 + createsprite gUnknown_085971FC, ANIM_ATTACKER, 2, 0, 0, 12, 4, -16, 18 + createsprite gUnknown_085971FC, ANIM_ATTACKER, 2, 0, 0, 16, 4, -10, 18 + createsprite gUnknown_085971FC, ANIM_ATTACKER, 2, 0, 1, 14, 4, -18, 18 + createsprite gUnknown_085971FC, ANIM_ATTACKER, 2, 0, 1, 12, 4, -16, 18 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 return Move_MEDITATE: call SetPsychicBackground createvisualtask sub_810F7D4, 2 - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish call UnsetPsychicBackground end @@ -2711,15 +2711,15 @@ Move_AGILITY: setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4 createvisualtask sub_81169C0, 2, 0, 4, 7, 10 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -2728,16 +2728,16 @@ 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 createvisualtask sub_81169C0, 2, 0, 4, 7, 3 - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 1 - playsewithpan SE_W233B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2745,22 +2745,22 @@ Move_QUICK_ATTACK: end Move_RAGE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 - createsprite gUnknown_0859368C, 2, 0, -20, -28 - playsewithpan SE_W207B, -64 + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, -20, -28 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER delay 20 - createsprite gUnknown_0859368C, 2, 0, 20, -28 - playsewithpan SE_W207B, -64 + createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask sub_80D6388, 2, 1, 1, 10, 1, 0 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET end @@ -2768,7 +2768,7 @@ Move_RAGE: Move_TELEPORT: call SetPsychicBackground createvisualtask sub_810F83C, 2 - playsewithpan SE_W100, -64 + playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 15 call UnsetPsychicBackground waitforvisualfinish @@ -2778,23 +2778,23 @@ Move_DOUBLE_TEAM: createvisualtask sub_81029B4, 2 setalpha 12, 8 monbg ANIM_ATK_PARTNER - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 32 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 24 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2804,20 +2804,20 @@ Move_DOUBLE_TEAM: Move_MINIMIZE: setalpha 10, 8 createvisualtask sub_8104674, 2 - loopsewithpan SE_W107, -64, 34, 3 + loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 34, 3 waitforvisualfinish blendoff end Move_METRONOME: - loadspritegfx ANIM_TAG_064 - loadspritegfx ANIM_TAG_209 - createsprite gUnknown_08593114, 11, 0, 100 - playsewithpan SE_W118, -64 + loadspritegfx ANIM_TAG_FINGER + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + createsprite gUnknown_08593114, ANIM_ATTACKER, 11, 0, 100 + playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_085931BC, 12, 0 + createsprite gUnknown_085931BC, ANIM_ATTACKER, 12, 0 delay 24 - loopsewithpan SE_W039, -64, 22, 3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 waitforvisualfinish end @@ -2831,72 +2831,72 @@ SkullBashSetUp: waitforvisualfinish goto SkullBashEnd SkullBashSetUp1: - createsprite gUnknown_0857FE88, 2, 0, -24, 0, 0, 10, 0 - playsewithpan SE_W036, -64 + createsprite gUnknown_0857FE88, ANIM_ATTACKER, 2, 0, -24, 0, 0, 10, 0 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D6134, 2, 16, 96, 0, 2 waitforvisualfinish - createsprite gUnknown_0857FE88, 2, 0, 24, 0, 0, 10, 1 + createsprite gUnknown_0857FE88, ANIM_ATTACKER, 2, 0, 24, 0, 0, 10, 1 waitforvisualfinish return SkullBashAttack: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_8101C94, 2, 0 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish playse SE_BAN - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 - createsprite gUnknown_085973E8, 132, 0, 0, 1, 0 - loopsewithpan SE_W025B, +63, 8, 3 + createsprite gUnknown_085973E8, ANIM_TARGET, 4, 0, 0, 1, 0 + loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3 waitforvisualfinish createvisualtask sub_8101C94, 2, 1 goto SkullBashEnd Move_AMNESIA: - loadspritegfx ANIM_TAG_093 + loadspritegfx ANIM_TAG_AMNESIA call SetPsychicBackground delay 8 - createsprite gUnknown_08596744, 20 - playsewithpan SE_W118, -64 + createsprite gUnknown_08596744, ANIM_ATTACKER, 20 + playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 54 - loopsewithpan SE_W118, -64, 16, 3 + loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3 waitforvisualfinish call UnsetPsychicBackground end Move_KINESIS: - loadspritegfx ANIM_TAG_075 + loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground - createsprite gUnknown_085966DC, 20 - createsprite gUnknown_08593344, 19, 32, -8, 0 - createsprite gUnknown_08593344, 19, 32, 16, 1 - loopsewithpan SE_W109, -64, 21, 2 + createsprite gUnknown_085966DC, ANIM_ATTACKER, 20 + createsprite gUnknown_08593344, ANIM_ATTACKER, 19, 32, -8, 0 + createsprite gUnknown_08593344, ANIM_ATTACKER, 19, 32, 16, 1 + loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2 delay 60 - playsewithpan SE_W146, -64 + playsewithpan SE_W146, SOUND_PAN_ATTACKER delay 30 - loopsewithpan SE_W146, -64, 20, 2 + loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 20, 2 delay 70 - playsewithpan SE_W207B, -64 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish call UnsetPsychicBackground 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, -64 + playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, 0, -16, -8 - createsprite gUnknown_08593A84, 0, 16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 createvisualtask sub_81064F8, 5 - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER delay 2 createvisualtask sub_810A094, 3, 20, 1, 0 waitforvisualfinish @@ -2904,14 +2904,14 @@ Move_GLARE: end Move_BARRAGE: - loadspritegfx ANIM_TAG_254 + loadspritegfx ANIM_TAG_RED_BALL createvisualtask sub_815E47C, 3 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 24 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, 8, 1, 40, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 8, 1, 40, 1 createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1 createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1 - loopsewithpan SE_W070, +63, 8, 2 + loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 2 end Move_SKY_ATTACK: @@ -2921,7 +2921,7 @@ SkyAttackEnd: SkyAttackSetUp: monbg ANIM_DEF_PARTNER setalpha 12, 11 - createvisualtask AnimTask_IsTargetPartner, 5, ARG_RET_ID + createvisualtask AnimTask_GetTargetIsAttackerPartner, 5, ARG_RET_ID jumpretfalse SkyAttackSetUpAgainstOpponent goto SkyAttackSetUpAgainstPartner SkyAttackSetUpAgainstOpponent: @@ -2930,7 +2930,7 @@ SkyAttackSetUpAgainstOpponent: delay 12 createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask sub_81152DC, 5, 0, 2, 16 - loopsewithpan SE_W287, -64, 4, 8 + loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 4, 8 createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE delay 20 createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE @@ -2946,7 +2946,7 @@ SkyAttackSetUpAgainstPartner: delay 12 createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask sub_81152DC, 5, 0, 2, 16 - playsewithpan SE_W287, -64 + playsewithpan SE_W287, SOUND_PAN_ATTACKER delay 8 createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE delay 20 @@ -2958,19 +2958,19 @@ 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 delay 4 createvisualtask sub_81136E8, 5, 0 waitforvisualfinish - createvisualtask sub_8159244, 5, 238, -64 - createsprite gUnknown_08596514, 130 + createvisualtask sub_8159244, 5, 238, SOUND_PAN_ATTACKER + createsprite gUnknown_08596514, ANIM_TARGET, 2 delay 14 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 - createvisualtask sub_8159210, 5, 141, 63 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET delay 20 createvisualtask sub_81137E4, 5, 1 delay 2 @@ -2981,7 +2981,7 @@ SkyAttackUnleash: goto SkyAttackEnd Move_FLASH: - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_8117494, 2 waitforvisualfinish end @@ -2989,7 +2989,7 @@ Move_FLASH: Move_SPLASH: createvisualtask sub_8104938, 2, 0, 3 delay 8 - loopsewithpan SE_W039, -64, 38, 3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3 waitforvisualfinish end @@ -2997,7 +2997,7 @@ Move_ACID_ARMOR: monbg ANIM_ATTACKER setalpha 15, 0 createvisualtask sub_815D240, 2, 0 - playsewithpan SE_W151, -64 + playsewithpan SE_W151, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3005,55 +3005,55 @@ Move_ACID_ARMOR: end Move_SHARPEN: - loadspritegfx ANIM_TAG_185 - createsprite gUnknown_08592DE4, 2 + loadspritegfx ANIM_TAG_SPHERE_TO_CUBE + createsprite gUnknown_08592DE4, ANIM_ATTACKER, 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, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1 waitforvisualfinish delay 20 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 - createsprite gUnknown_08592F74, 130 - playsewithpan SE_W044, +63 + createsprite gUnknown_08592F74, ANIM_TARGET, 2 + playsewithpan SE_W044, SOUND_PAN_TARGET delay 8 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1 waitforvisualfinish blendoff end Move_SLASH: - loadspritegfx ANIM_TAG_183 - createsprite gUnknown_08592D2C, 130, 1, -8, 0 - playsewithpan SE_W013, +63 + loadspritegfx ANIM_TAG_SLASH + createsprite gUnknown_08592D2C, ANIM_TARGET, 2, 1, -8, 0 + playsewithpan SE_W013, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08592D2C, 130, 1, 8, 0 + createsprite gUnknown_08592D2C, ANIM_TARGET, 2, 1, 8, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish 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 - createsprite gUnknown_08593B80, 2, 0, 0, 2 - createsprite gUnknown_08593B80, 2, 0, 1, 2 - loopsewithpan SE_W029, -64, 12, 4 + createsprite gUnknown_08593B80, ANIM_ATTACKER, 2, 0, 0, 2 + createsprite gUnknown_08593B80, ANIM_ATTACKER, 2, 0, 1, 2 + loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -3063,11 +3063,11 @@ Move_SKETCH: loadspritegfx ANIM_TAG_PENCIL monbg ANIM_TARGET createvisualtask sub_8104E74, 2 - createsprite gUnknown_085936D4, 130 + createsprite gUnknown_085936D4, ANIM_TARGET, 2 waitforvisualfinish clearmonbg ANIM_TARGET createvisualtask sub_8104938, 2, 0, 2 - loopsewithpan SE_W039, -64, 38, 2 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2 end Move_NIGHTMARE: @@ -3077,7 +3077,7 @@ Move_NIGHTMARE: monbg ANIM_DEF_PARTNER createvisualtask sub_8111C50, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1 - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg @@ -3086,22 +3086,22 @@ Move_NIGHTMARE: NightmareInContest: createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB_WHITE, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 32, 1 - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein end Move_FLAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 createvisualtask sub_815C770, 2, 0 - loopsewithpan SE_W029, -64, 8, 2 + loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 waitforvisualfinish - createsprite gUnknown_085973A0, 131, 1, 3 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3 createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -3109,12 +3109,12 @@ Move_FLAIL: Move_SPITE: fadetobg BG_GHOST - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein monbg ANIM_DEF_PARTNER createvisualtask sub_8115A04, 2, 2, 2, 6, 0, 8, RGB_WHITE createvisualtask sub_8111E50, 2 - loopsewithpan SE_W060, +63, 20, 3 + loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3 waitforvisualfinish restorebg waitbgfadein @@ -3122,10 +3122,10 @@ 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 + createvisualtask AnimTask_GetAttackerSide, 2 jumprettrue MachPunchAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT MachPunchContinue: @@ -3135,11 +3135,11 @@ MachPunchContinue: delay 0 setalpha 9, 8 createvisualtask sub_80A8BC4, 2, 28968, 10 - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 6 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 + playsewithpan SE_W004, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -3158,33 +3158,33 @@ Move_FORESIGHT: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 16, 0 - createsprite gUnknown_085CE8C4, 130, 1 + createsprite gUnknown_085CE8C4, ANIM_TARGET, 2, 1 delay 17 - loopsewithpan SE_W166, +63, 16, 4 + loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4 delay 48 delay 24 - playsewithpan SE_W166, +63 + playsewithpan SE_W166, SOUND_PAN_TARGET delay 10 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W197, +63 + playsewithpan SE_W197, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER end Move_DESTINY_BOND: - loadspritegfx ANIM_TAG_188 + loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg BG_GHOST - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein createvisualtask sub_81123C4, 5, 0, 48 - playsewithpan SE_W109, -64 + playsewithpan SE_W109, SOUND_PAN_ATTACKER delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 createvisualtask sub_8116664, 2, 6, 1, 0, 12, RGB(29, 29, 29) delay 24 createvisualtask sub_8116664, 2, 6, 1, 12, 0, RGB(29, 29, 29) - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3193,8 +3193,8 @@ Move_DESTINY_BOND: end Move_ENDURE: - loadspritegfx ANIM_TAG_184 - playsewithpan SE_W082, -64 + loadspritegfx ANIM_TAG_FOCUS_ENERGY + playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED @@ -3206,108 +3206,108 @@ Move_ENDURE: end EndureEffect: - createsprite gUnknown_08592D8C, 2, 0, -24, 26, 2 + createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, -24, 26, 2 delay 4 - createsprite gUnknown_08592D8C, 2, 0, 14, 28, 1 + createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, 14, 28, 1 delay 4 - createsprite gUnknown_08592D8C, 2, 0, -5, 10, 2 + createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, -5, 10, 2 delay 4 - createsprite gUnknown_08592D8C, 2, 0, 28, 26, 3 + createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, 28, 26, 3 delay 4 - createsprite gUnknown_08592D8C, 2, 0, -12, 0, 1 + createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, -12, 0, 1 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, -64 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite gUnknown_08593970, 3, -20, 20 - playsewithpan SE_W204, -64 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite gUnknown_08593970, 3, 20, 20 - playsewithpan SE_W204, -64 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20 + playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish 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 createvisualtask sub_8110F74, 2 waitforvisualfinish createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 4, 0, 0, 1, 2 - playsewithpan SE_W025B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 1, 2 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_FALSE_SWIPE: - loadspritegfx ANIM_TAG_286 - loadspritegfx ANIM_TAG_135 - createsprite gUnknown_08592D44, 130 - playsewithpan SE_W233, +63 + loadspritegfx ANIM_TAG_SLASH_2 + loadspritegfx ANIM_TAG_IMPACT + createsprite gUnknown_08592D44, ANIM_TARGET, 2 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 16 - createsprite gUnknown_08592D5C, 130, 0 - playsewithpan SE_W104, +63 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 0 + playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08592D5C, 130, 16 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 16 delay 2 - createsprite gUnknown_08592D5C, 130, 32 - playsewithpan SE_W104, +63 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 32 + playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08592D5C, 130, 48 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 48 delay 2 - createsprite gUnknown_08592D5C, 130, 64 - playsewithpan SE_W104, +63 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 64 + playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08592D5C, 130, 80 + createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 80 delay 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 3 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, 1, 3 + playsewithpan SE_W004, SOUND_PAN_TARGET end Move_SWAGGER: - loadspritegfx ANIM_TAG_086 + loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask sub_8104AB4, 2 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_08593658, 2 - loopsewithpan SE_W207, -64, 4, 2 + createsprite gUnknown_08593658, ANIM_ATTACKER, 2 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish delay 24 - createsprite gUnknown_0859368C, 130, 1, -20, -28 - playsewithpan SE_W207B, +63 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, -20, -28 + playsewithpan SE_W207B, SOUND_PAN_TARGET delay 12 - createsprite gUnknown_0859368C, 130, 1, 20, -28 - playsewithpan SE_W207B, +63 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, 20, -28 + playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish end 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 + createsprite gUnknown_08592B3C, ANIM_ATTACKER, 2 delay 40 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W152, -64 + playsewithpan SE_W152, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_0859381C, 3, 0, 0, 1, 0 - playsewithpan SE_W208, -64 + createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 0, 0, 1, 0 + playsewithpan SE_W208, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET call HealingEffect2 @@ -3324,33 +3324,33 @@ MagnitudeEnd: MagnitudeRegular: createvisualtask sub_81152DC, 5, 5, 0, 50 createvisualtask sub_81152DC, 5, 4, 0, 50 - loopsewithpan SE_W070, +63, 8, 10 + loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 goto MagnitudeEnd MagnitudeIntense: createvisualtask sub_81152DC, 5, 5, 0, 50 createvisualtask sub_81152DC, 5, 4, 0, 50 - loopsewithpan SE_W070, +63, 8, 10 + loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 delay 10 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 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 + createsprite gUnknown_085CE288, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_815ADB0, 2, 0, 2, 0 - loopsewithpan SE_W013B, -64, 8, 4 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish delay 8 createvisualtask sub_815ADB0, 2, 0, 2, 1 - loopsewithpan SE_W013B, -64, 8, 4 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish clearmonbg ANIM_ATTACKER end @@ -3360,21 +3360,21 @@ Move_MOONLIGHT: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR setalpha 0, 16 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592EBC, 2, 120, 56 + createsprite gUnknown_08592EBC, ANIM_ATTACKER, 2, 120, 56 createvisualtask sub_80A7A74, 3, 0, 16, 16, 0, 1 playsewithpan SE_W236, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 40, -12, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, -12, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 40, -24, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, -24, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 21, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, 21, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 0, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, 0, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 10, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, 10, 0 delay 20 createvisualtask sub_81025C0, 2 waitforvisualfinish @@ -3383,9 +3383,9 @@ Move_MOONLIGHT: end Move_EXTREME_SPEED: - loadspritegfx ANIM_TAG_207 - loadspritegfx ANIM_TAG_135 - createvisualtask AnimTask_IsAttackerOpponentSide, 2 + loadspritegfx ANIM_TAG_SPEED_DUST + loadspritegfx ANIM_TAG_IMPACT + createvisualtask AnimTask_GetAttackerSide, 2 jumprettrue ExtremeSpeedAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT ExtremeSpeedContinue: @@ -3393,7 +3393,7 @@ ExtremeSpeedContinue: createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein createvisualtask sub_810577C, 2 - loopsewithpan SE_W013B, -64, 8, 3 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3 waitforvisualfinish delay 1 createvisualtask sub_8117F60, 2 @@ -3402,19 +3402,19 @@ ExtremeSpeedContinue: delay 18 createvisualtask sub_8105810, 2 delay 2 - playsewithpan SE_W004, +63 - createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, -12, 3 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_85973B8, ANIM_TARGET, 2, 1, 0, -12, 3 delay 10 - playsewithpan SE_W004, +63 - createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 12, 3 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_85973B8, ANIM_TARGET, 2, 1, 0, 12, 3 delay 10 - playsewithpan SE_W233B, +63 - createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 0, 3 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_85973B8, ANIM_TARGET, 2, 1, 0, 0, 3 waitforvisualfinish createvisualtask sub_8105AAC, 2 delay 10 createvisualtask sub_810599C, 2 - loopsewithpan SE_W104, -64, 8, 4 + loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish restorebg waitbgfadeout @@ -3431,57 +3431,57 @@ 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 - playsewithpan SE_W253, -64 - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 29, -12, 0 - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -12, -29, 1 + createsprite gBattleAnimSpriteTemplate_8593898, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + playsewithpan SE_W253, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 29, -12, 0 + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -12, -29, 1 delay 16 createvisualtask sub_8106D90, 2, 0 - createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, -64 - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 12, -29, 1 - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -29, -12, 0 + createsprite gBattleAnimSpriteTemplate_8593898, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + playsewithpan SE_W253, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 12, -29, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -29, -12, 0 delay 16 createvisualtask sub_8106D90, 2, 0 - createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, -64 - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 24, -24, 1 - createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -24, -24, 0 + createsprite gBattleAnimSpriteTemplate_8593898, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + playsewithpan SE_W253, SOUND_PAN_ATTACKER + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 24, -24, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER 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, -64, +63, +2, 0 + panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 delay 4 createvisualtask sub_8109DBC, 5 delay 12 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 10, 2304, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 10, 2304, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 90, 2048, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 90, 2048, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 50, 2560, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 50, 2560, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 20, 2304, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 20, 2304, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 70, 1984, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 70, 1984, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 0, 2816, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 0, 2816, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 60, 2560, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 60, 2560, 96, 1 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,15 +3492,15 @@ 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 - createsprite gUnknown_0859368C, 130, 1, -20, -28 - playsewithpan SE_W207B, +63 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, -20, -28 + playsewithpan SE_W207B, SOUND_PAN_TARGET delay 20 - createsprite gUnknown_0859368C, 130, 1, 20, -28 - playsewithpan SE_W207B, +63 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, 20, -28 + playsewithpan SE_W207B, SOUND_PAN_TARGET end Move_MEMENTO: @@ -3509,9 +3509,9 @@ Move_MEMENTO: createvisualtask sub_81143C0, 2 delay 1 createvisualtask sub_8113BAC, 5 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER delay 48 - playsewithpan SE_W060B, -64 + playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_8114470, 2 delay 12 @@ -3519,7 +3519,7 @@ Move_MEMENTO: delay 1 monbg_22 ANIM_TARGET createvisualtask sub_8113E78, 5 - playsewithpan SE_W060, +63 + playsewithpan SE_W060, SOUND_PAN_TARGET waitforvisualfinish clearmonbg_23 ANIM_TARGET delay 1 @@ -3528,97 +3528,97 @@ 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, -64, 24, 3 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 end Move_SMELLING_SALT: - loadspritegfx ANIM_TAG_HAND - loadspritegfx ANIM_TAG_255 - createsprite gUnknown_085CE864, 130, 1, 0, 2 - createsprite gUnknown_085CE864, 130, 1, 1, 2 + loadspritegfx ANIM_TAG_TAG_HAND + loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT + createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 0, 2 + createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 1, 2 delay 32 createvisualtask sub_815E840, 3, 1, 2 - loopsewithpan SE_W003, +63, 12, 2 + loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 waitforvisualfinish delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2 - createsprite gUnknown_085CE894, 130, 1, 8, 3 - loopsewithpan SE_W207B, +63, 16, 3 + createsprite gUnknown_085CE894, ANIM_TARGET, 2, 1, 8, 3 + loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3 end Move_FOLLOW_ME: - loadspritegfx ANIM_TAG_064 - createsprite gUnknown_085931D4, 2, 0 - playsewithpan SE_W039, -64 + loadspritegfx ANIM_TAG_FINGER + createsprite gUnknown_085931D4, ANIM_ATTACKER, 2, 0 + playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 18 - playsewithpan SE_W213, -64 + playsewithpan SE_W213, SOUND_PAN_ATTACKER delay 71 - loopsewithpan SE_W039, -64, 22, 3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 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 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_810AAFC, 2, 0, 60, 2, 12 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, -64 - createsprite gUnknown_0859595C, 2, 0 + playsewithpan SE_W268, SOUND_PAN_ATTACKER + createsprite gUnknown_0859595C, ANIM_ATTACKER, 2, 0 delay 25 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 15 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 10 delay 6 - loopsewithpan SE_W268, -64, 6, 5 + loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5 waitforvisualfinish - createsprite gUnknown_0859598C, 2, 0, 16, 16 + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 - createsprite gUnknown_0859598C, 2, 0, -16, -16 - playsewithpan SE_W085B, -64 + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 0, -16, -16 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER blendoff 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, -64 + createsprite gUnknown_08593114, ANIM_ATTACKER, 11, 0, 45 + playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_0859324C, 12, 0 + createsprite gUnknown_0859324C, ANIM_ATTACKER, 12, 0 delay 4 - loopsewithpan SE_W039, -64, 16, 2 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish delay 8 - createsprite gUnknown_0859368C, 130, 1, -20, -28 - playsewithpan SE_W207B, +63 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, -20, -28 + playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish delay 12 - createsprite gUnknown_0859368C, 130, 1, 20, -28 - playsewithpan SE_W207B, +63 + createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, 20, -28 + playsewithpan SE_W207B, SOUND_PAN_TARGET 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 + createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 0 + createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 1 delay 19 playsewithpan SE_W227, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 @@ -3632,50 +3632,50 @@ Move_HELPING_HAND: end Move_ASSIST: - loadspritegfx ANIM_TAG_252 - createsprite gUnknown_085CE804, 50, 112, -16, 140, 128, 36 + loadspritegfx ANIM_TAG_PAW_PRINT + createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 - createsprite gUnknown_085CE804, 50, 208, 128, -16, 48, 36 + createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36 playsewithpan SE_W010, 0 delay 2 - createsprite gUnknown_085CE804, 50, -16, 112, 256, -16, 36 + createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36 playsewithpan SE_W010, 0 delay 2 - createsprite gUnknown_085CE804, 50, 108, 128, 84, -16, 36 + createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36 playsewithpan SE_W010, 0 delay 2 - createsprite gUnknown_085CE804, 50, -16, 56, 256, 56, 36 + createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36 playsewithpan SE_W010, 0 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 - createsprite gUnknown_08595FEC, 130, 0 - playsewithpan SE_W025, -64 + createsprite gUnknown_08595FEC, ANIM_TARGET, 2, 0 + playsewithpan SE_W025, SOUND_PAN_ATTACKER delay 20 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 180, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 4, 1, 180, 1 createvisualtask sub_8159244, 5, 234, 0 delay 40 - createsprite gUnknown_08596004, 41, 200, 96, 1, 120 + createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 200, 96, 1, 120 delay 8 - createsprite gUnknown_08596004, 41, 20, 248, 4, 112 + createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 20, 248, 4, 112 delay 8 - createsprite gUnknown_08596004, 41, 130, 160, 2, 104 + createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 130, 160, 2, 104 delay 8 - createsprite gUnknown_08596004, 41, 160, 192, 0, 96 + createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 160, 192, 0, 96 delay 8 - createsprite gUnknown_08596004, 41, 60, 288, 3, 88 + createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 60, 288, 3, 88 delay 74 - createsprite gUnknown_0859601C, 131, 0 - playsewithpan SE_W207, -64 + createsprite gUnknown_0859601C, ANIM_TARGET, 3, 0 + playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 16 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, +63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -3687,11 +3687,11 @@ Move_RECYCLE: monbg ANIM_ATTACKER setalpha 0, 16 delay 1 - createsprite gUnknown_085CE9B0, 2 - loopsewithpan SE_W036, -64, 24, 3 + createsprite gUnknown_085CE9B0, ANIM_ATTACKER, 2 + loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3699,132 +3699,132 @@ 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 setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 4 delay 1 - createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 - playsewithpan SE_W233, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 - playsewithpan SE_W233, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK delay 37 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 10, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET end BrickBreakShatteredWall: monbg ANIM_TARGET setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 4 - createsprite gUnknown_08595F90, 3, 1, 0, 0, 90, 10 + createsprite gUnknown_08595F90, ANIM_ATTACKER, 3, 1, 0, 0, 90, 10 delay 1 - createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 - playsewithpan SE_W233, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 - createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 - playsewithpan SE_W233, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK delay 37 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 10, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish - createsprite gUnknown_08595FA8, 2, 1, 0, -8, -12 - createsprite gUnknown_08595FA8, 2, 1, 1, 8, -12 - createsprite gUnknown_08595FA8, 2, 1, 2, -8, 12 - createsprite gUnknown_08595FA8, 2, 1, 3, 8, 12 - playsewithpan SE_W280, +63 + createsprite gUnknown_08595FA8, ANIM_ATTACKER, 2, 1, 0, -8, -12 + createsprite gUnknown_08595FA8, ANIM_ATTACKER, 2, 1, 1, 8, -12 + createsprite gUnknown_08595FA8, ANIM_ATTACKER, 2, 1, 2, -8, 12 + createsprite gUnknown_08595FA8, ANIM_ATTACKER, 2, 1, 3, 8, 12 + playsewithpan SE_W280, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET end Move_YAWN: - loadspritegfx ANIM_TAG_242 + loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask sub_815D64C, 2, 0 - playsewithpan SE_W281, -64 + playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_085CE68C, 133, 2 - playsewithpan SE_W255, -64 + createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 2 + playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 4 - createsprite gUnknown_085CE68C, 133, 1 + createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 1 delay 4 - createsprite gUnknown_085CE68C, 133, 0 + createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 0 waitforvisualfinish createvisualtask sub_815D64C, 2, 1 - playsewithpan SE_W281, +63 + playsewithpan SE_W281, SOUND_PAN_TARGET 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, -64, 24, 2 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 delay 6 createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 130, 12, -12, 1, 2 - playsewithpan SE_W003, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -12, 1, 2 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 24 createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 130, -12, 12, 1, 2 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 12, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET end Move_ERUPTION: - loadspritegfx ANIM_TAG_201 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED + loadspritegfx ANIM_TAG_WARM_ROCK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish createvisualtask sub_8109460, 2 - waitplaysewithpan SE_W153, -64, 60 + waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 waitforvisualfinish createvisualtask sub_8109460, 2 - waitplaysewithpan SE_W153, -64, 60 + waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 waitforvisualfinish delay 30 - createsprite gUnknown_085955E8, 40, 200, -32, 0, 100, 0 - createsprite gUnknown_085955E8, 40, 30, -32, 16, 90, 1 - createsprite gUnknown_085955E8, 40, 150, -32, 32, 60, 2 - createsprite gUnknown_085955E8, 40, 90, -32, 48, 80, 3 - createsprite gUnknown_085955E8, 40, 110, -32, 64, 50, 0 - createsprite gUnknown_085955E8, 40, 60, -32, 80, 70, 1 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 200, -32, 0, 100, 0 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 30, -32, 16, 90, 1 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 150, -32, 32, 60, 2 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 90, -32, 48, 80, 3 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 110, -32, 64, 50, 0 + createsprite gUnknown_085955E8, ANIM_ATTACKER, 40, 60, -32, 80, 70, 1 delay 22 createvisualtask sub_81152DC, 5, 5, 8, 60 createvisualtask sub_81152DC, 5, 4, 8, 60 - loopsewithpan SE_W088, +63, 16, 12 + loopsewithpan SE_W088, SOUND_PAN_TARGET, 16, 12 delay 80 - createsprite gSimplePaletteBlendSpriteTemplate, 40, 31, 4, 4, 0, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, RGB_RED 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 - loopsewithpan SE_W179, -64, 24, 3 + loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3 delay 16 createvisualtask sub_810FBF0, 3, 0 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 3, 1 @@ -3833,34 +3833,34 @@ 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 createvisualtask sub_810F940, 5 delay 8 - loopsewithpan SE_W030, -64, 8, 5 + loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5 waitforvisualfinish delay 4 - createsprite gUnknown_085967AC, 5, 0, 40 + createsprite gUnknown_085967AC, ANIM_ATTACKER, 5, 0, 40 createvisualtask sub_81152DC, 5, 4, 1, 10 - playsewithpan SE_W063, -64 + playsewithpan SE_W063, SOUND_PAN_ATTACKER clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBackground end Move_GRUDGE: - loadspritegfx ANIM_TAG_253 + loadspritegfx ANIM_TAG_PURPLE_FLAME monbg ANIM_ATTACKER monbgprio_29 fadetobg BG_GHOST - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein createvisualtask sub_8112C6C, 3 - loopsewithpan SE_W052, -64, 16, 4 + loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 16, 4 delay 10 delay 80 - playsewithpan SE_W171, +63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3871,13 +3871,13 @@ Move_CAMOUFLAGE: monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 16, 0 - createvisualtask sub_811675C, 5, 2, 3, 0, 14 + createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 3, 0, 14 delay 16 createvisualtask sub_81136E8, 2, 4 - playsewithpan SE_W185, -64 + playsewithpan SE_W185, SOUND_PAN_ATTACKER waitforvisualfinish delay 8 - createvisualtask sub_811675C, 5, 2, 0, 0, 0 + createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 0, 0, 0 waitforvisualfinish createvisualtask sub_81137E4, 2, 1 waitforvisualfinish @@ -3886,55 +3886,55 @@ 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 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08596AC8, 66, 0 + createsprite gUnknown_08596AC8, ANIM_ATTACKER, 66, 0 delay 18 - loopsewithpan SE_W234, -64, 16, 6 + loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER blendoff delay 1 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 waitbgfadein monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W076, -64 - createsprite gUnknown_08596898, 41, 0, 0, 0, 0 + playsewithpan SE_W076, SOUND_PAN_ATTACKER + createsprite gUnknown_08596898, ANIM_ATTACKER, 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, 63 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite gUnknown_085973A0, 131, 1, 2 - createvisualtask sub_8159210, 5, 215, 63 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite gUnknown_085973A0, 131, 1, 2 - createvisualtask sub_8159210, 5, 215, 63 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite gUnknown_085973A0, 131, 1, 2 - createvisualtask sub_8159210, 5, 215, 63 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite gUnknown_085973A0, 131, 1, 2 - createvisualtask sub_8159210, 5, 215, 63 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET delay 3 - createsprite gUnknown_085973A0, 131, 1, 2 - createvisualtask sub_8159210, 5, 215, 63 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 2 + createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116664, 5, 5, 2, 16, 0, RGB_WHITEALPHA createvisualtask sub_81152DC, 5, 1, 5, 14 @@ -3945,15 +3945,15 @@ 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, -64 - createsprite gUnknown_08595C70, 128, 0, 0, 0, 0, 30, 0 + playsewithpan SE_W081, SOUND_PAN_ATTACKER + createsprite gUnknown_08595C70, ANIM_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish - playsewithpan SE_W028, +63 + playsewithpan SE_W028, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0 - createsprite gComplexPaletteBlendSpriteTemplate, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 delay 0 playsewithpan SE_W114, 0 createvisualtask sub_810C324, 5 @@ -3965,162 +3965,162 @@ 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, +63 + playsewithpan SE_W080, SOUND_PAN_TARGET delay 0 - createsprite gUnknown_08596388, 128, 0, -16, 64, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 128, 0, -16, 32, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 128, 0, -16, 0, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 32, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 0, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 128, 0, -16, 224, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 128, 0, -16, 128, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 224, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 128, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 128, 0, -16, 192, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 128, 0, -16, 160, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 192, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 160, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 128, 0, -16, 96, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, ANIM_TARGET, 0, 0, -16, 96, 2, 104, 11304, 32, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER 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 - playsewithpan SE_W298, -64 + createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 16, -2 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, 2, 0, 0, -2 - playsewithpan SE_W298, -64 + createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 0, -2 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, 2, 0, -16, -2 - playsewithpan SE_W298, -64 + createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, -16, -2 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, 2, 1, -8, -2 - playsewithpan SE_W298, -64 + createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 1, -8, -2 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, 2, 2, 8, -2 - playsewithpan SE_W298, -64 + createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 2, 8, -2 + playsewithpan SE_W298, SOUND_PAN_ATTACKER 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 - createsprite gUnknown_085971E4, 130, 0, 4, -12 - playsewithpan SE_W091, -64 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, -4, -16 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, 4, -12 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 - createsprite gUnknown_085971E4, 130, 0, -3, -12 - createsprite gUnknown_085971E4, 130, 0, 5, -14 - playsewithpan SE_W091, -64 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, -3, -12 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, 5, -14 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 - createsprite gUnknown_085971E4, 130, 0, -5, -18 - createsprite gUnknown_085971E4, 130, 0, 3, -14 - playsewithpan SE_W091, -64 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, -5, -18 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, 3, -14 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 16 - createsprite gUnknown_085971E4, 130, 1, 220, 60 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 220, 60 waitplaysewithpan SE_W145B, 0, 15 delay 2 - createsprite gUnknown_085971E4, 130, 1, 60, 100 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 60, 100 waitplaysewithpan SE_W145B, 0, 25 delay 2 - createsprite gUnknown_085971E4, 130, 1, 140, 55 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 140, 55 waitplaysewithpan SE_W145B, 0, 14 delay 2 - createsprite gUnknown_085971E4, 130, 1, 180, 50 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 180, 50 waitplaysewithpan SE_W145B, 0, 10 delay 2 - createsprite gUnknown_085971E4, 130, 1, 20, 90 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 20, 90 waitplaysewithpan SE_W145B, 0, 22 delay 2 - createsprite gUnknown_085971E4, 130, 1, 90, 90 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 90, 90 waitplaysewithpan SE_W145B, 0, 22 delay 2 - createsprite gUnknown_085971E4, 130, 1, 160, 60 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 160, 60 waitplaysewithpan SE_W145B, 0, 15 delay 2 - createsprite gUnknown_085971E4, 130, 1, 30, 90 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 30, 90 waitplaysewithpan SE_W145B, 0, 22 delay 2 - createsprite gUnknown_085971E4, 130, 1, 120, 60 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 120, 60 waitplaysewithpan SE_W145B, 0, 15 delay 2 - createsprite gUnknown_085971E4, 130, 1, 200, 40 + createsprite gUnknown_085971E4, ANIM_TARGET, 2, 1, 200, 40 waitplaysewithpan SE_W145B, 0, 10 end Move_NEEDLE_ARM: - loadspritegfx ANIM_TAG_266 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 - loopsewithpan SE_W030, +63, 2, 16 - createsprite gUnknown_08592888, 130, 1, 0, 0, -32, 16 + 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, ANIM_TARGET, 2, 1, 0, 0, -32, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 22, -22, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 22, -22, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 30, 0, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 30, 0, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 20, 20, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 20, 20, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 0, 28, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 0, 28, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, -19, 19, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, -19, 19, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, -27, 0, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, -27, 0, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, -18, -18, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, -18, -18, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 0, -25, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 0, -25, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 17, -17, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 17, -17, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 23, 0, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 23, 0, 16 delay 2 - createsprite gUnknown_08592888, 130, 1, 0, 16, 16, 16 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 16, 16, 16 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, +63 - createsprite gUnknown_08592888, 130, 1, 1, 0, -24, 10 - createsprite gUnknown_08592888, 130, 1, 1, 17, -17, 10 - createsprite gUnknown_08592888, 130, 1, 1, 24, 0, 10 - createsprite gUnknown_08592888, 130, 1, 1, 17, 17, 10 - createsprite gUnknown_08592888, 130, 1, 1, 0, 24, 10 - createsprite gUnknown_08592888, 130, 1, 1, -17, 17, 10 - createsprite gUnknown_08592888, 130, 1, 1, -24, 0, 10 - createsprite gUnknown_08592888, 130, 1, 1, -17, -17, 10 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 0, -24, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 17, -17, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 24, 0, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 17, 17, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 0, 24, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, -17, 17, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, -24, 0, 10 + createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, -17, -17, 10 end Move_SLACK_OFF: loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask sub_8160544, 2, 0 - playsewithpan SE_W281, -64 + playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish call HealingEffect waitforvisualfinish 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 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 - playsewithpan SE_W013, +63 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, 10, 0 + playsewithpan SE_W013, SOUND_PAN_TARGET delay 12 - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 - playsewithpan SE_W013, +63 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, 10, 1 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_TARGET @@ -4128,78 +4128,78 @@ Move_CRUSH_CLAW: Move_AROMATHERAPY: playsewithpan SE_W080, 0 - loadspritegfx ANIM_TAG_159 - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE - createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, RGB(13, 31, 12) + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 0, 7, RGB(13, 31, 12) delay 1 monbg ANIM_ATTACKER delay 1 - createsprite gUnknown_085927AC, 0, 24, 16, 0, 2, 2, 0, 0 - createsprite gUnknown_085927AC, 66, 64, 24, 0, 3, 1, 1, 0 - createsprite gUnknown_085927C4, 0, 16, 24, 0, 2, 1, 0, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 24, 16, 0, 2, 2, 0, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 66, 64, 24, 0, 3, 1, 1, 0 + createsprite gUnknown_085927C4, ANIM_ATTACKER, 0, 16, 24, 0, 2, 1, 0, 0 delay 20 - createsprite gUnknown_085927AC, 66, 48, 12, 0, 4, 3, 1, 0 - createsprite gUnknown_085927AC, 0, 100, 16, 0, 3, 2, 0, 0 - createsprite gUnknown_085927AC, 0, 74, 24, 180, 3, 2, 0, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 66, 48, 12, 0, 4, 3, 1, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 100, 16, 0, 3, 2, 0, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 74, 24, 180, 3, 2, 0, 0 delay 10 - createsprite gUnknown_085927AC, 66, 80, 30, 0, 4, 1, 1, 0 - createsprite gUnknown_085927AC, 0, 128, 12, 0, 3, 3, 0, 0 - createsprite gUnknown_085927C4, 0, 90, 16, 0, 2, 1, 0, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 66, 80, 30, 0, 4, 1, 1, 0 + createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 128, 12, 0, 3, 3, 0, 0 + createsprite gUnknown_085927C4, ANIM_ATTACKER, 0, 90, 16, 0, 2, 1, 0, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 7, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 7, 0, RGB(13, 31, 12) delay 1 - playsewithpan SE_W287, -64 + playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_815DFCC, 2, 1 waitforvisualfinish - playsewithpan SE_W234, -64 - createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 + playsewithpan SE_W234, SOUND_PAN_ATTACKER + createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 - createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, -64 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 43, 3, 10, 0, RGB(13, 31, 12) - createsprite gUnknown_08593868, 16, 0, 0, 0, 1 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 43, 3, 10, 0, RGB(13, 31, 12) + createsprite gUnknown_08593868, ANIM_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish 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, -64, 12, 4 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 delay 8 - createsprite gUnknown_085970E8, 2, 0, 0 - createsprite gUnknown_085970E8, 2, 0, 1 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 1 delay 8 - createsprite gUnknown_085970E8, 2, 0, 2 - createsprite gUnknown_085970E8, 2, 0, 3 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 2 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 3 delay 8 - createsprite gUnknown_085970E8, 2, 0, 0 - createsprite gUnknown_085970E8, 2, 0, 1 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 1 delay 8 - createsprite gUnknown_085970E8, 2, 0, 2 - createsprite gUnknown_085970E8, 2, 0, 3 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 2 + createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 3 waitforvisualfinish end 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 delay 0 createvisualtask sub_8103CF0, 2, 32, -24, 1536, 2, 128 waitforvisualfinish - playsewithpan SE_W015, +63 - createsprite gUnknown_08592A34, 2, 40, -32, 0, 2 + playsewithpan SE_W015, SOUND_PAN_TARGET + createsprite gUnknown_08592A34, ANIM_ATTACKER, 2, 40, -32, 0, 2 delay 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 @@ -4213,103 +4213,103 @@ Move_ODOR_SLEUTH: monbg ANIM_TARGET createvisualtask sub_815F620, 5 delay 24 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 - playsewithpan SE_W207, -64 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 + playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 6 - createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 - playsewithpan SE_W207, -64 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 + playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET delay 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0 - playsewithpan SE_W043, -64 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0 + playsewithpan SE_W043, SOUND_PAN_ATTACKER end Move_GRASS_WHISTLE: - loadspritegfx ANIM_TAG_MUSIC_NOTES2 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB(18, 31, 12) + loadspritegfx ANIM_TAG_MUSIC_NOTES + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB(18, 31, 12) waitforvisualfinish createvisualtask sub_8102BE8, 2 waitforvisualfinish - panse_1B SE_W320, -64, +63, +2, 0 - createsprite gUnknown_08593008, 130, 7, 1, 0 + panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 7, 1, 0 delay 5 - createsprite gUnknown_08593008, 130, 6, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 1, 0 delay 5 - createsprite gUnknown_08593008, 130, 1, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 1, 0 delay 5 - createsprite gUnknown_08593008, 130, 2, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 delay 5 - createsprite gUnknown_08593008, 130, 3, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 3, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 2, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 5, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 6, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 2, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 2, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 1, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 1, 0 delay 4 - createsprite gUnknown_08593008, 130, 5, 1, 0 + createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 1, 0 delay 4 waitforvisualfinish createvisualtask sub_8102CA0, 2 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB(18, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB(18, 31, 12) waitforvisualfinish end Move_TICKLE: - loadspritegfx ANIM_TAG_218 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, RGB_BLACK + loadspritegfx ANIM_TAG_EYE_SPARKLE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, 0, -16, -8 - createsprite gUnknown_08593A84, 0, 16, -8 - playsewithpan SE_W197, -64 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 + playsewithpan SE_W197, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, RGB_BLACK waitforvisualfinish delay 20 createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER delay 12 createvisualtask sub_815C478, 3, 1, 6, 2 - loopsewithpan SE_W039, +63, 8, 8 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8 waitforvisualfinish 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 - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W291, -64 + playsewithpan SE_W291, SOUND_PAN_ATTACKER waitforvisualfinish delay 16 createvisualtask sub_81085C8, 5 - playsewithpan SE_W057, +63 + playsewithpan SE_W057, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER blendoff 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 setalpha 9, 8 createvisualtask sub_80A8BC4, 2, 0, 13 - playsewithpan SE_W026, -64 + playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 6 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 + playsewithpan SE_W004, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -4324,15 +4324,15 @@ Move_EXTRASENSORY: setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 createvisualtask sub_810FE14, 5, 0 - playsewithpan SE_W020, +63 + playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 createvisualtask sub_810FE14, 5, 1 - playsewithpan SE_W020, +63 + playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8110034, 5, 0 createvisualtask sub_810FE14, 5, 2 - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -4340,37 +4340,37 @@ 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 createvisualtask sub_81169C0, 2, 0, 4, 7, 3 - createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 - playsewithpan SE_W013B, -64 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 - playsewithpan SE_W013, +63 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_IRON_DEFENSE: - loopsewithpan SE_REAPOKE, -64, 28, 2 + loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0 waitforvisualfinish end Move_BLOCK: loadspritegfx ANIM_TAG_X_SIGN - createsprite gUnknown_085CE90C, 194 - playsewithpan SE_W207, +63 + createsprite gUnknown_085CE90C, ANIM_TARGET, 66 + playsewithpan SE_W207, SOUND_PAN_TARGET end Move_HOWL: - loadspritegfx ANIM_TAG_053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_815D64C, 2, 0 delay 12 call RoarEffect @@ -4380,107 +4380,107 @@ Move_HOWL: end Move_BULK_UP: - loadspritegfx ANIM_TAG_086 + loadspritegfx ANIM_TAG_BREATH createvisualtask sub_8104AB4, 2 - playsewithpan SE_W207, -64 + playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_08593658, 2 - loopsewithpan SE_W207, -64, 4, 2 + createsprite gUnknown_08593658, ANIM_ATTACKER, 2 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish 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 - playsewithpan SE_W204, -64 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite gUnknown_08593970, 3, -20, 20 - playsewithpan SE_W204, -64 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 - createsprite gUnknown_08593970, 3, 20, 20 - playsewithpan SE_W204, -64 + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20 + playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - loopsewithpan SE_W146, +63, 4, 3 + loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3 end 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 waitforvisualfinish - createsprite gUnknown_085959A4, 1 - playsewithpan SE_W268, -64 + createsprite gUnknown_085959A4, ANIM_ATTACKER, 1 + playsewithpan SE_W268, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff delay 8 createvisualtask sub_810AFCC, 5, 0 - playsewithpan SE_W085, -64 + playsewithpan SE_W085, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_810AFCC, 5, 1 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_810AFCC, 5, 2 - playsewithpan SE_W085, -64 + playsewithpan SE_W085, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_810AFCC, 5, 3 - playsewithpan SE_W085, +63 + playsewithpan SE_W085, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_810AFCC, 5, 4 - playsewithpan SE_W085, -64 + playsewithpan SE_W085, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 - playsewithpan SE_W120, +63 - createsprite gUnknown_0859598C, 2, 1, 16, 16 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 1, 16, 16 delay 2 - createsprite gUnknown_0859598C, 2, 1, -16, -16 + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 1, -16, -16 delay 8 createvisualtask sub_810AE5C, 5 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1 - playsewithpan SE_W085B, -64 - createsprite gUnknown_0859598C, 2, 0, 16, 16 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 - createsprite gUnknown_0859598C, 2, 0, -16, -16 + createsprite gUnknown_0859598C, ANIM_ATTACKER, 2, 0, -16, -16 waitforvisualfinish createvisualtask sub_8116620, 10, 1, 0, 8, 0, RGB_BLACK waitforvisualfinish end Move_WATER_SPORT: - loadspritegfx ANIM_TAG_268 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask sub_81088E4, 5 delay 8 - playsewithpan SE_W057, -64 + playsewithpan SE_W057, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, -64 + playsewithpan SE_W057, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, -64 + playsewithpan SE_W057, SOUND_PAN_ATTACKER delay 44 - panse_1B SE_W057, -64, +63, +2, 0 + panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 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 createvisualtask sub_81177E4, 5, 1 waitforvisualfinish - createsprite gUnknown_08593850, 40, 0, 0, 0, 0 - playsewithpan SE_W048, -64 + createsprite gUnknown_08593850, ANIM_ATTACKER, 40, 0, 0, 0, 0 + playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 14 - createsprite gUnknown_08593850, 40, 0, 0, 0, 0 - playsewithpan SE_W048, -64 + createsprite gUnknown_08593850, ANIM_ATTACKER, 40, 0, 0, 0, 0 + playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 14 - createsprite gUnknown_08593850, 40, 0, 0, 0, 0 - playsewithpan SE_W048, -64 + createsprite gUnknown_08593850, ANIM_ATTACKER, 40, 0, 0, 0, 0 + playsewithpan SE_W048, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_81177E4, 5, 0 waitforvisualfinish @@ -4490,73 +4490,73 @@ 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 - playsewithpan SE_W015, +63 + playsewithpan SE_W015, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, +63 + playsewithpan SE_W015, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, +63 + playsewithpan SE_W015, SOUND_PAN_TARGET waitforvisualfinish monbg ANIM_TARGET setalpha 12, 8 delay 12 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1 - createsprite gUnknown_085973D0, 130, 0, 0, 1, 36 - playsewithpan SE_W043, +63 + createsprite gUnknown_085973D0, ANIM_TARGET, 2, 0, 0, 1, 36 + playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_DRAGON_DANCE: - loadspritegfx ANIM_TAG_249 + loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER delay 1 createvisualtask sub_81133E8, 5 - playsewithpan SE_W100, -64 + playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 8 createvisualtask sub_80A7CB4, 5, 10249, 19456, 14, 0, 3 - createsprite gUnknown_08596F98, 2, 0 - createsprite gUnknown_08596F98, 2, 43 - createsprite gUnknown_08596F98, 2, 85 - createsprite gUnknown_08596F98, 2, 128 - createsprite gUnknown_08596F98, 2, 170 - createsprite gUnknown_08596F98, 2, 213 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 0 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 43 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 85 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 128 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 170 + createsprite gUnknown_08596F98, ANIM_ATTACKER, 2, 213 delay 30 - playsewithpan SE_W100, -64 + playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W100, -64 + playsewithpan SE_W100, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER delay 1 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 setalpha 12, 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_810AAFC, 2, 0, 20, 0, 2 - playsewithpan SE_W268, -64 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 12 - createsprite gUnknown_08595A18, 2 + createsprite gUnknown_08595A18, ANIM_ATTACKER, 2 delay 30 createvisualtask sub_810B29C, 5 delay 12 waitforvisualfinish createvisualtask sub_810B55C, 5 - playsewithpan SE_W161B, +63 + playsewithpan SE_W161B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1 createvisualtask sub_8116620, 5, 1, 3, 16, 0, RGB_WHITE @@ -4569,64 +4569,64 @@ Move_SHOCK_WAVE: end Move_HARDEN: - loopsewithpan SE_W231, -64, 28, 2 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish 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 - createsprite gUnknown_0859309C, 2, 0, 0, 0, 0 - playsewithpan SE_W187, -64 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 0, 0, 0, 0 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 15 call BellyDrum2 - createsprite gUnknown_0859309C, 2, 1, 1, 1, 0 - playsewithpan SE_W187, -64 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 1, 1, 1, 0 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 15 call BellyDrum1 - createsprite gUnknown_0859309C, 2, 0, 3, 3, 128 - playsewithpan SE_W187, -64 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 0, 3, 3, 128 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum2 - createsprite gUnknown_0859309C, 2, 1, 2, 0, 128 - playsewithpan SE_W187, -64 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 1, 2, 0, 128 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum1 - createsprite gUnknown_0859309C, 2, 0, 1, 1, 0 - playsewithpan SE_W187, -64 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 0, 1, 1, 0 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum2 - createsprite gUnknown_0859309C, 2, 1, 0, 3, 0 - playsewithpan SE_W187, -64 + createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 1, 0, 3, 0 + playsewithpan SE_W187, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_8102CA0, 2 waitforvisualfinish end BellyDrum2: - createsprite gUnknown_08593068, 3, 0 + createsprite gUnknown_08593068, ANIM_ATTACKER, 3, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return BellyDrum1: - createsprite gUnknown_08593068, 3, 1 + createsprite gUnknown_08593068, ANIM_ATTACKER, 3, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 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, +63 - createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0 - createsprite gUnknown_085CE094, 5 + playsewithpan SE_W109, SOUND_PAN_TARGET + createsprite gUnknown_085CE07C, ANIM_ATTACKER, 5, 0, 0, 1, 0 + createsprite gUnknown_085CE094, ANIM_ATTACKER, 5 delay 40 - playsewithpan SE_W043, +63 + playsewithpan SE_W043, SOUND_PAN_TARGET createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK call MindReaderEffect waitforvisualfinish @@ -4634,52 +4634,52 @@ Move_MIND_READER: end MindReaderEffect: - createsprite gUnknown_085CE0AC, 4, 70, 0, 6 - createsprite gUnknown_085CE0AC, 4, 40, 40, 6 - createsprite gUnknown_085CE0AC, 4, 10, -60, 6 - createsprite gUnknown_085CE0AC, 4, -50, -40, 6 - createsprite gUnknown_085CE0AC, 4, -40, 40, 6 - createsprite gUnknown_085CE0AC, 4, 50, -50, 6 - delay 2 - createsprite gUnknown_085CE0AC, 4, 50, -30, 6 - createsprite gUnknown_085CE0AC, 4, 60, 10, 6 - createsprite gUnknown_085CE0AC, 4, 0, 60, 6 - createsprite gUnknown_085CE0AC, 4, 0, -40, 6 - createsprite gUnknown_085CE0AC, 4, -60, 20, 6 - createsprite gUnknown_085CE0AC, 4, -60, -30, 6 - delay 2 - createsprite gUnknown_085CE0AC, 4, -50, 50, 6 - createsprite gUnknown_085CE0AC, 4, -60, 20, 6 - createsprite gUnknown_085CE0AC, 4, -40, -40, 6 - createsprite gUnknown_085CE0AC, 4, 20, -60, 6 - createsprite gUnknown_085CE0AC, 4, 50, -50, 6 - createsprite gUnknown_085CE0AC, 4, 35, 40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 70, 0, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 40, 40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 10, -60, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -50, -40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -40, 40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 50, -50, 6 + delay 2 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 50, -30, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 60, 10, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 0, 60, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 0, -40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -60, 20, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -60, -30, 6 + delay 2 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -50, 50, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -60, 20, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -40, -40, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 20, -60, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 50, -50, 6 + createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 35, 40, 6 delay 2 return Move_ICE_PUNCH: monbg ANIM_DEF_PARTNER setalpha 12, 8 - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 - playsewithpan SE_W081, +63 - createsprite gUnknown_08595AE8, 2, 0 - createsprite gUnknown_08595AE8, 2, 64 - createsprite gUnknown_08595AE8, 2, 128 - createsprite gUnknown_08595AE8, 2, 192 + playsewithpan SE_W081, SOUND_PAN_TARGET + createsprite gUnknown_08595AE8, ANIM_ATTACKER, 2, 0 + createsprite gUnknown_08595AE8, ANIM_ATTACKER, 2, 64 + createsprite gUnknown_08595AE8, ANIM_ATTACKER, 2, 128 + createsprite gUnknown_08595AE8, ANIM_ATTACKER, 2, 192 delay 5 - createsprite gUnknown_08595AD0, 2, 32 - createsprite gUnknown_08595AD0, 2, 96 - createsprite gUnknown_08595AD0, 2, 160 - createsprite gUnknown_08595AD0, 2, 224 + createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 32 + createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 96 + createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 160 + createsprite gUnknown_08595AD0, ANIM_ATTACKER, 2, 224 delay 17 - createsprite gFistFootSpriteTemplate, 4, 0, -10, 8, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, -10, 1, 1 - playsewithpan SE_W004, +63 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1 waitforvisualfinish @@ -4688,20 +4688,20 @@ Move_ICE_PUNCH: delay 5 createvisualtask sub_8116620, 10, 4, 2, 9, 0, RGB(12, 26, 31) waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_REST: - playsewithpan SE_W173, -64 + playsewithpan SE_W173, SOUND_PAN_ATTACKER loadspritegfx ANIM_TAG_LETTER_Z - createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 - createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 - createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 waitforvisualfinish end @@ -4712,7 +4712,7 @@ Move_CONFUSION: createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish - playsewithpan SE_W048, +63 + playsewithpan SE_W048, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -4729,7 +4729,7 @@ Move_PSYCHIC: createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB(31, 23, 0) waitforvisualfinish - loopsewithpan SE_W048, +63, 10, 3 + loopsewithpan SE_W048, SOUND_PAN_TARGET, 10, 3 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -4748,10 +4748,10 @@ FutureSightContinue: end FutureSight: monbg ANIM_ATK_PARTNER - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, -64 + playsewithpan SE_W048, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish @@ -4765,43 +4765,43 @@ Move_THUNDER: waitbgfadeout createvisualtask sub_8117660, 5, -256, 0, 1, -1 waitbgfadein - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK delay 16 createvisualtask sub_8115F10, 2, 257, 257, 257 - playsewithpan SE_W086, +63 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 1 - createsprite gUnknown_085956C0, 130, 16, -36 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 16, -36 delay 1 - createsprite gUnknown_085956C0, 130, 16, -20 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 16, -20 delay 1 - createsprite gUnknown_085956C0, 130, 16, 12 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 16, 12 delay 20 - createsprite gUnknown_085956C0, 0x86, -16, -32 - playsewithpan SE_W086, +63 + createsprite gUnknown_085956C0, ANIM_TARGET, 6, -16, -32 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 1 - createsprite gUnknown_085956C0, 0x86, -16, -16 + createsprite gUnknown_085956C0, ANIM_TARGET, 6, -16, -16 delay 1 - createsprite gUnknown_085956C0, 0x86, -16, 16 - playsewithpan SE_W086, +63 + createsprite gUnknown_085956C0, ANIM_TARGET, 6, -16, 16 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 5 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite gUnknown_085956C0, 130, 24, -32 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 24, -32 delay 1 - createsprite gUnknown_085956C0, 130, 24, -16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 24, -16 delay 1 - createsprite gUnknown_085956C0, 130, 24, 16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 24, 16 delay 30 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 5 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite gUnknown_085956C0, 130, 0, -32 - playsewithpan SE_W161B, +63 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -32 + playsewithpan SE_W161B, SOUND_PAN_TARGET delay 1 - createsprite gUnknown_085956C0, 130, 0, -16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -16 delay 1 - createsprite gUnknown_085956C0, 130, 0, 16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, 16 delay 10 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 @@ -4809,7 +4809,7 @@ Move_THUNDER: delay 2 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 130, 1, 2, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_TARGET, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish restorebg waitbgfadeout @@ -4818,32 +4818,32 @@ 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 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK waitforvisualfinish - playsewithpan SE_W004, +63 - createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite gUnknown_085956C0, 130, 0, -48 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -48 delay 1 - createsprite gUnknown_085956C0, 2, 0, -16 + createsprite gUnknown_085956C0, ANIM_ATTACKER, 2, 0, -16 delay 1 - createsprite gUnknown_085956C0, 2, 0, 16 + createsprite gUnknown_085956C0, ANIM_ATTACKER, 2, 0, 16 delay 1 - playsewithpan SE_W161B, +63 + playsewithpan SE_W161B, SOUND_PAN_TARGET createvisualtask sub_8115F10, 2, 257, 257, 257 delay 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK delay 20 waitforvisualfinish clearmonbg ANIM_TARGET @@ -4852,67 +4852,67 @@ Move_THUNDER_PUNCH: Move_SACRED_FIRE: loadspritegfx ANIM_TAG_FIRE - loadspritegfx ANIM_TAG_035 - loopsewithpan SE_W221, -64, 7, 5 - createsprite gUnknown_08595428, 2, -32, 0, 50, 5, -2, 0 + loadspritegfx ANIM_TAG_FIRE_PLUME + loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 - createsprite gUnknown_08595428, 66, -20, -10, 50, 5, -1, -1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, -20, -10, 50, 5, -1, -1 delay 1 - createsprite gUnknown_08595428, 66, 0, -16, 50, 5, 0, -1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 0, -16, 50, 5, 0, -1 delay 1 - createsprite gUnknown_08595428, 66, 20, -10, 50, 5, 1, -1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 20, -10, 50, 5, 1, -1 delay 1 - createsprite gUnknown_08595428, 2, 32, 0, 50, 5, 2, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 32, 0, 50, 5, 2, 0 delay 1 - createsprite gUnknown_08595428, 2, 20, 10, 50, 5, 1, 1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 20, 10, 50, 5, 1, 1 delay 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - createsprite gUnknown_08595428, 2, 0, 16, 50, 5, 0, 1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 0, 16, 50, 5, 0, 1 delay 1 - createsprite gUnknown_08595428, 2, -20, 10, 50, 5, -1, 1 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -20, 10, 50, 5, -1, 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 waitforvisualfinish - playsewithpan SE_W221B, +63 - createsprite gUnknown_085953F8, 130, -16, 0, 70, 16, 0, 1 + playsewithpan SE_W221B, SOUND_PAN_TARGET + createsprite gUnknown_085953F8, ANIM_TARGET, 2, -16, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, +63 - createsprite gUnknown_085953F8, 130, 0, 0, 70, 16, 0, 1 + playsewithpan SE_W221B, SOUND_PAN_TARGET + createsprite gUnknown_085953F8, ANIM_TARGET, 2, 0, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, +63 - createsprite gUnknown_085953F8, 130, 16, 0, 80, 16, 0, 1 + playsewithpan SE_W221B, SOUND_PAN_TARGET + createsprite gUnknown_085953F8, ANIM_TARGET, 2, 16, 0, 80, 16, 0, 1 delay 1 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 waitforvisualfinish createvisualtask sub_8115F10, 2, 257, 257, 257 delay 1 - playsewithpan SE_W172B, +63 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 + playsewithpan SE_W172B, SOUND_PAN_TARGET + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, -1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 2, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 1, -1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 1, -2 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 3, 1 waitforvisualfinish end Move_SCRATCH: - loadspritegfx ANIM_TAG_137 + loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W010, +63 - createsprite gUnknown_085CE020, 2, 0, 0, 1, 0 + playsewithpan SE_W010, SOUND_PAN_TARGET + createsprite gUnknown_085CE020, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -4924,30 +4924,30 @@ Move_DRAGON_BREATH: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W172, -64, 7, 7 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createvisualtask sub_8116620, 10, 4, 1, 0, 9, RGB_RED - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 21, 1 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + createsprite gUnknown_08596EF4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 waitforvisualfinish createvisualtask sub_8116620, 10, 4, 1, 9, 0, RGB_RED waitforvisualfinish @@ -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 @@ -4973,17 +4973,17 @@ Move_ROAR: end RoarEffect: - createsprite gUnknown_085CE7D4, 2, 24, -8, 0 - createsprite gUnknown_085CE7D4, 2, 24, 0, 2 - createsprite gUnknown_085CE7D4, 2, 24, 8, 1 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1 delay 15 - createsprite gUnknown_085CE7D4, 2, 24, -8, 0 - createsprite gUnknown_085CE7D4, 2, 24, 0, 2 - createsprite gUnknown_085CE7D4, 2, 24, 8, 1 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2 + createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1 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 @@ -5006,21 +5006,21 @@ Move_SNORE: blendoff end Snore1: - playsewithpan SE_W173, -64 + playsewithpan SE_W173, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, 6, 1, 14, 0, 0 - createsprite gUnknown_085936EC, 2, 0, 0, -42, -38, 24, 0, 0 - createsprite gUnknown_085936EC, 2, 0, 0, 0, -42, 24, 0, 0 - createsprite gUnknown_085936EC, 2, 0, 0, 42, -38, 24, 0, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0 + createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0 + createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0 + createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 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, -64, 15 - createsprite gUnknown_08596560, 1, 40, 0, 10166 + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + createsprite gUnknown_08596560, ANIM_ATTACKER, 1, 40, 0, 10166 delay 10 call SpecialScreenEffect waitforvisualfinish @@ -5029,26 +5029,26 @@ Move_LIGHT_SCREEN: end SpecialScreenEffect: - createsprite gUnknown_08596624, 2, 23, 0, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 23, 0, 0, 1 delay 6 - createsprite gUnknown_08596624, 2, 31, -8, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 31, -8, 0, 1 delay 5 - createsprite gUnknown_08596624, 2, 30, 20, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 30, 20, 0, 1 delay 7 - createsprite gUnknown_08596624, 2, 10, -15, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 10, -15, 0, 1 delay 6 - createsprite gUnknown_08596624, 2, 20, 10, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 20, 10, 0, 1 delay 6 - createsprite gUnknown_08596624, 2, 10, 18, 0, 1 + createsprite gUnknown_08596624, ANIM_ATTACKER, 2, 10, 18, 0, 1 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 + createsprite gUnknown_08596590, ANIM_ATTACKER, 1, 40, 0, 10168 delay 10 - playsewithpan SE_W115, -64 + playsewithpan SE_W115, SOUND_PAN_ATTACKER call SpecialScreenEffect waitforvisualfinish delay 1 @@ -5056,61 +5056,61 @@ 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, -64, 15 - createsprite gUnknown_08596578, 1, 40, 0, 10167 + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + createsprite gUnknown_08596578, ANIM_ATTACKER, 1, 40, 0, 10167 delay 20 - createsprite gUnknown_085965F4, 2, 30, 0, 0, 1 + createsprite gUnknown_085965F4, ANIM_ATTACKER, 2, 30, 0, 0, 1 delay 7 - createsprite gUnknown_085965F4, 2, 19, -12, 0, 1 + createsprite gUnknown_085965F4, ANIM_ATTACKER, 2, 19, -12, 0, 1 delay 7 - createsprite gUnknown_085965F4, 2, 10, 20, 0, 1 + createsprite gUnknown_085965F4, ANIM_ATTACKER, 2, 10, 20, 0, 1 waitforvisualfinish delay 1 blendoff end Move_BARRIER: - loadspritegfx ANIM_TAG_169 + loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, -64, 15 - createsprite gUnknown_085965A8, 3, 40, 0, 10169 + waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + createsprite gUnknown_085965A8, ANIM_ATTACKER, 3, 40, 0, 10169 waitforvisualfinish delay 1 blendoff 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 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 37, 40, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -37, 30, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, 15, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 33, 20, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 - createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 128, 100 - playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 100 + createsprite gBattleAnimSpriteTemplate_8595068, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 waitforvisualfinish call WaterBubbleEffect2 waitforvisualfinish @@ -5119,11 +5119,11 @@ Move_BUBBLE: end Move_SMOG: - loadspritegfx ANIM_TAG_172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 - loopsewithpan SE_W054, +63, 17, 10 + loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10 call Smog1 call Smog1 call Smog1 @@ -5132,7 +5132,7 @@ Move_SMOG: call Smog1 call Smog1 delay 120 - loopsewithpan SE_W092, +63, 18, 2 + loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2 createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26) delay 10 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1 @@ -5141,17 +5141,17 @@ Move_SMOG: blendoff end Smog1: - createsprite gUnknown_08595C44, 2, 0, -24, 48, 240, 1, 0 + createsprite gUnknown_08595C44, ANIM_ATTACKER, 2, 0, -24, 48, 240, 1, 0 delay 7 return Move_FAINT_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATTACKER fadetobg BG_DARK waitbgfadein delay 0 - playsewithpan SE_W185, -64 + playsewithpan SE_W185, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3 createvisualtask sub_81136E8, 2, 1 waitforvisualfinish @@ -5162,8 +5162,8 @@ Move_FAINT_ATTACK: setalpha 12, 8 monbg ANIM_TARGET delay 1 - playsewithpan SE_W233B, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -5182,14 +5182,14 @@ 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 - playsewithpan SE_W028, -64 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 + playsewithpan SE_W028, SOUND_PAN_ATTACKER + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 call SandAttack1 call SandAttack1 call SandAttack1 @@ -5201,20 +5201,20 @@ Move_SAND_ATTACK: blendoff end SandAttack1: - createsprite gUnknown_085971A8, 130, 15, 15, 20, 0, 0 - createsprite gUnknown_085971A8, 130, 15, 15, 20, 10, 10 - createsprite gUnknown_085971A8, 130, 15, 15, 20, -10, -10 - createsprite gUnknown_085971A8, 130, 15, 15, 20, 20, 5 - createsprite gUnknown_085971A8, 130, 15, 15, 20, -20, -5 + createsprite gUnknown_085971A8, ANIM_TARGET, 2, 15, 15, 20, 0, 0 + createsprite gUnknown_085971A8, ANIM_TARGET, 2, 15, 15, 20, 10, 10 + createsprite gUnknown_085971A8, ANIM_TARGET, 2, 15, 15, 20, -10, -10 + createsprite gUnknown_085971A8, ANIM_TARGET, 2, 15, 15, 20, 20, 5 + createsprite gUnknown_085971A8, ANIM_TARGET, 2, 15, 15, 20, -20, -5 delay 2 return Move_MUD_SLAP: - loadspritegfx ANIM_TAG_074 - playsewithpan SE_W028, -64 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 + loadspritegfx ANIM_TAG_MUD_SAND + playsewithpan SE_W028, SOUND_PAN_ATTACKER + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 call MudSlap1 call MudSlap1 call MudSlap1 @@ -5224,49 +5224,49 @@ Move_MUD_SLAP: waitforvisualfinish end MudSlap1: - createsprite gUnknown_085971CC, 130, 15, 15, 20, 0, 0 - createsprite gUnknown_085971CC, 130, 15, 15, 20, 10, 5 - createsprite gUnknown_085971CC, 130, 15, 15, 20, -10, -5 - createsprite gUnknown_085971CC, 130, 15, 15, 20, 20, 10 - createsprite gUnknown_085971CC, 130, 15, 15, 20, -20, -10 + createsprite gUnknown_085971CC, ANIM_TARGET, 2, 15, 15, 20, 0, 0 + createsprite gUnknown_085971CC, ANIM_TARGET, 2, 15, 15, 20, 10, 5 + createsprite gUnknown_085971CC, ANIM_TARGET, 2, 15, 15, 20, -10, -5 + createsprite gUnknown_085971CC, ANIM_TARGET, 2, 15, 15, 20, 20, 10 + createsprite gUnknown_085971CC, ANIM_TARGET, 2, 15, 15, 20, -20, -10 delay 2 return Move_DRAGON_RAGE: loadspritegfx ANIM_TAG_SMALL_EMBER - loadspritegfx ANIM_TAG_035 - playsewithpan SE_W082, -64 + loadspritegfx ANIM_TAG_FIRE_PLUME + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 130, 0, 15, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_TARGET, 2, 0, 15, 0, 0, 4 waitforvisualfinish - createsprite gUnknown_08596F80, 130, 30, 15, 0, 10, 10 + createsprite gUnknown_08596F80, ANIM_TARGET, 2, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, +63, 11, 3 + loopsewithpan SE_W172B, SOUND_PAN_TARGET, 11, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1 - createsprite gUnknown_08596F28, 194, 1, 5, 0 + createsprite gUnknown_08596F28, ANIM_TARGET, 66, 1, 5, 0 delay 1 - createsprite gUnknown_08596F28, 194, 1, -10, -15 + createsprite gUnknown_08596F28, ANIM_TARGET, 66, 1, -10, -15 delay 1 - createsprite gUnknown_08596F28, 130, 1, 0, 25 + createsprite gUnknown_08596F28, ANIM_TARGET, 2, 1, 0, 25 delay 1 - createsprite gUnknown_08596F28, 194, 1, 15, 5 + createsprite gUnknown_08596F28, ANIM_TARGET, 66, 1, 15, 5 delay 1 - createsprite gUnknown_08596F28, 194, 1, -25, 0 + createsprite gUnknown_08596F28, ANIM_TARGET, 66, 1, -25, 0 delay 1 - createsprite gUnknown_08596F28, 130, 1, 30, 30 + createsprite gUnknown_08596F28, ANIM_TARGET, 2, 1, 30, 30 delay 1 - createsprite gUnknown_08596F28, 130, 1, -27, 25 + createsprite gUnknown_08596F28, ANIM_TARGET, 2, 1, -27, 25 delay 1 - createsprite gUnknown_08596F28, 194, 1, 0, 8 + createsprite gUnknown_08596F28, ANIM_TARGET, 66, 1, 0, 8 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 194, 0, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 66, 0, 0, 4 waitforvisualfinish end Move_RAIN_DANCE: - loadspritegfx ANIM_TAG_115 - playsewithpan SE_W240, -64 + loadspritegfx ANIM_TAG_RAIN_DROPS + playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 @@ -5279,15 +5279,15 @@ 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, +63 - createsprite gUnknown_08597080, 2, 0, -32, 0, 0, 819, 10 - createsprite gUnknown_08597080, 2, 0, 32, 4, 0, -819, 10 + playsewithpan SE_W044, SOUND_PAN_TARGET + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10 + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -5296,24 +5296,24 @@ 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 setalpha 12, 8 - playsewithpan SE_W044, +63 - createsprite gUnknown_08597080, 2, -32, -32, 1, 819, 819, 10 - createsprite gUnknown_08597080, 2, 32, 32, 5, -819, -819, 10 + playsewithpan SE_W044, SOUND_PAN_TARGET + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, -32, -32, 1, 819, 819, 10 + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 32, 32, 5, -819, -819, 10 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2 waitforvisualfinish - playsewithpan SE_W044, +63 - createsprite gUnknown_08597080, 2, 32, -32, 7, -819, 819, 10 - createsprite gUnknown_08597080, 2, -32, 32, 3, 819, -819, 10 + playsewithpan SE_W044, SOUND_PAN_TARGET + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, 32, -32, 7, -819, 819, 10 + createsprite gUnknown_08597080, ANIM_ATTACKER, 2, -32, 32, 3, 819, -819, 10 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 8, 4, 2 waitforvisualfinish clearmonbg ANIM_TARGET @@ -5324,15 +5324,15 @@ 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, +63 - createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10 - createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10 + playsewithpan SE_W011, SOUND_PAN_TARGET + createsprite gUnknown_08597098, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 + createsprite gUnknown_08597098, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -5344,17 +5344,17 @@ Move_ICE_BEAM: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - loadspritegfx ANIM_TAG_141 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK + loadspritegfx ANIM_TAG_ICE_CRYSTALS + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish - createsoundtask sub_8158C58, 183, -64, 63, 4, 4, 0, 10 - createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20 - createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20 + createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20 delay 1 call IceBeam1 call IceBeam1 call IceBeam1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, -31, 0, 7, RGB(0, 20, 31) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 4, -31, 0, 7, RGB(0, 20, 31) createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 25, 1 call IceBeam1 call IceBeam1 @@ -5364,37 +5364,37 @@ Move_ICE_BEAM: call IceBeam1 call IceBeam1 call IceBeam1 - createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, 20, 0, 0, 0, 11 delay 1 - createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, 20, 0, 0, 0, 11 waitforvisualfinish delay 20 call FreezeEffect1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, 5, 7, 0, RGB(0, 20, 31) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 4, 5, 7, 0, RGB(0, 20, 31) waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET blendoff end IceBeam1: - createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20 - createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20 - createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20 + createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20 + createsprite gUnknown_08595B14, ANIM_ATTACKER, 2, 20, 0, 0, 0, 11 delay 1 return Move_WITHDRAW: - playsewithpan SE_W029, -64 + playsewithpan SE_W029, SOUND_PAN_ATTACKER createvisualtask sub_81036A0, 5 waitforvisualfinish end Move_AURORA_BEAM: - loadspritegfx ANIM_TAG_140 + loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg BG_AURORABEAM waitbgfadein - playsewithpan SE_W062, -64 + playsewithpan SE_W062, SOUND_PAN_ATTACKER setarg 7, 0 createvisualtask sub_8107528, 10, 130 call AuroraBeam1 @@ -5403,7 +5403,7 @@ Move_AURORA_BEAM: call AuroraBeam1 call AuroraBeam1 setarg 7, -1 - createsoundtask sub_8158C58, 183, -64, 63, 3, 6, 0, 10 + createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1 call AuroraBeam1 call AuroraBeam1 @@ -5416,18 +5416,18 @@ Move_AURORA_BEAM: waitbgfadein end AuroraBeam1: - createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + createsprite gUnknown_085950B4, ANIM_TARGET, 2, 20, 0, 0, 0, 17 delay 1 - createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + createsprite gUnknown_085950B4, ANIM_TARGET, 2, 20, 0, 0, 0, 17 delay 1 - createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + createsprite gUnknown_085950B4, ANIM_TARGET, 2, 20, 0, 0, 0, 17 delay 1 - createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + createsprite gUnknown_085950B4, ANIM_TARGET, 2, 20, 0, 0, 0, 17 delay 1 return Move_SOLAR_BEAM: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash SolarBeamEnd: waitforvisualfinish @@ -5436,61 +5436,61 @@ SolarBeamSetUp: monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) - playsewithpan SE_W025, -64 + playsewithpan SE_W025, SOUND_PAN_ATTACKER call SolarBeamSetUp1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff goto SolarBeamEnd SolarBeamSetUp1: - createsprite gUnknown_085921E0, 2, 40, 40, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 40, 16 delay 2 - createsprite gUnknown_085921E0, 2, -40, -40, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -40, 16 delay 2 - createsprite gUnknown_085921E0, 2, 0, 40, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 0, 40, 16 delay 2 - createsprite gUnknown_085921E0, 2, 0, -40, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 0, -40, 16 delay 2 - createsprite gUnknown_085921E0, 2, 40, -20, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, -20, 16 delay 2 - createsprite gUnknown_085921E0, 2, 40, 20, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 20, 16 delay 2 - createsprite gUnknown_085921E0, 2, -40, -20, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -20, 16 delay 2 - createsprite gUnknown_085921E0, 2, -40, 20, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, 20, 16 delay 2 - createsprite gUnknown_085921E0, 2, -20, 30, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -20, 30, 16 delay 2 - createsprite gUnknown_085921E0, 2, 20, -30, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 20, -30, 16 delay 2 - createsprite gUnknown_085921E0, 2, -20, -30, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -20, -30, 16 delay 2 - createsprite gUnknown_085921E0, 2, 20, 30, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 20, 30, 16 delay 2 - createsprite gUnknown_085921E0, 2, -40, 0, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, 0, 16 delay 2 - createsprite gUnknown_085921E0, 2, 40, 0, 16 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 0, 16 delay 2 return SolarBeamUnleash: call SetSolarbeamBg - panse_1B SE_W076, -64, +63, +2, 0 + panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask sub_80FEA58, 5 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 0 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 1 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 createvisualtask sub_8116620, 10, 4, 1, 0, 10, RGB(25, 31, 0) - createsprite gUnknown_085921F8, 131, 15, 0, 20, 2 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 3 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 4 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 5 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 6 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 call SolarBeamUnleash1 call SolarBeamUnleash1 @@ -5499,26 +5499,26 @@ SolarBeamUnleash: call UnsetSolarbeamBg goto SolarBeamEnd SolarBeamUnleash1: - createsprite gUnknown_085921F8, 131, 15, 0, 20, 0 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 1 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 2 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 3 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 4 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 5 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gUnknown_085921F8, 131, 15, 0, 20, 6 + createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 return Move_BLIZZARD: - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER - createvisualtask AnimTask_IsAttackerOpponentSide, 2 + createvisualtask AnimTask_GetAttackerSide, 2 jumprettrue BlizzardAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT BlizzardContinue: @@ -5526,10 +5526,10 @@ BlizzardContinue: createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, -64, +63, +2, 0 + panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call Blizzard1 call Blizzard1 - playsewithpan SE_W059B, +63 + playsewithpan SE_W059B, SOUND_PAN_TARGET waitforvisualfinish call FreezeEffect2 waitforvisualfinish @@ -5541,26 +5541,26 @@ BlizzardContinue: clearmonbg ANIM_DEF_PARTNER end Blizzard1: - createsprite gUnknown_08595B98, 40, 0, -10, 0, -10, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, 0, 0, 0, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -10, 0, -10, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, 0, 0, 0, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -15, 0, -15, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, -10, 0, -10, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -15, 0, -15, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, -10, 0, -10, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -5, 0, -5, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, 10, 0, 10, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -5, 0, -5, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, 10, 0, 10, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -10, 0, -10, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, -20, 0, -20, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -10, 0, -10, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, -20, 0, -20, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -20, 0, -20, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, 15, 0, 15, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -20, 0, -20, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, 15, 0, 15, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -15, 0, -15, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, -20, 0, -20, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -15, 0, -15, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, -20, 0, -20, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 40, 0, -25, 0, -25, 72, 1 - createsprite gUnknown_08595BB0, 40, 0, 20, 0, 20, 80, 0, 0, 1 + createsprite gUnknown_08595B98, ANIM_ATTACKER, 40, 0, -25, 0, -25, 72, 1 + createsprite gUnknown_08595BB0, ANIM_ATTACKER, 40, 0, 20, 0, 20, 80, 0, 0, 1 delay 3 return BlizzardAgainstPlayer: @@ -5568,48 +5568,48 @@ 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 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish - panse_1B SE_W016, -64, +63, +2, 0 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call PowderSnow1 call PowderSnow1 - playsewithpan SE_W016B, +63 + playsewithpan SE_W016B, SOUND_PAN_TARGET waitforvisualfinish waitsound call FreezeEffect2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER delay 20 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 3, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 3, 0, RGB_BLACK end PowderSnow1: - createsprite gUnknown_08595BC8, 40, 0, 0, 0, 0, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, 0, 0, 0, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, -10, 0, -10, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, -10, 0, -10, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, 10, 0, 10, 56, -4, 3, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, 10, 0, 10, 56, -4, 3, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, -20, 0, -20, 56, -4, 5, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, -20, 0, -20, 56, -4, 5, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, 15, 0, 15, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, 15, 0, 15, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, -20, 0, -20, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, -20, 0, -20, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 40, 0, 20, 0, 20, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, ANIM_ATTACKER, 40, 0, 20, 0, 20, 56, 4, 4, 1 delay 3 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 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 delay 6 - panse_1B SE_W056, -64, +63, +2, 0 + panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask sub_81076C8, 5, 100 call HydroPump1 call HydroPump1 @@ -5636,25 +5636,25 @@ Move_HYDRO_PUMP: blendoff end HydroPump1: - createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 - createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 + createsprite gUnknown_085950E4, ANIM_ATTACKER, 3, 10, 10, 0, 16 + createsprite gUnknown_085950E4, ANIM_ATTACKER, 3, 10, 10, 0, -16 delay 1 - createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 - createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 + createsprite gUnknown_085950E4, ANIM_ATTACKER, 3, 10, 10, 0, 16 + createsprite gUnknown_085950E4, ANIM_ATTACKER, 3, 10, 10, 0, -16 delay 1 return HydroPump2: - createsprite gUnknown_08597388, 4, 0, 15, 1, 1 - createsprite gUnknown_08597388, 4, 0, -15, 1, 1 + createsprite gUnknown_08597388, ANIM_ATTACKER, 4, 0, 15, 1, 1 + createsprite gUnknown_08597388, ANIM_ATTACKER, 4, 0, -15, 1, 1 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 - panse_1B SE_W062, -64, +63, +1, 0 + panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 createvisualtask sub_81076C8, 5, 100 call SignalBeam1 call SignalBeam1 @@ -5663,7 +5663,7 @@ Move_SIGNAL_BEAM: call SignalBeam1 call SignalBeam1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 25, 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 4, 8, 5, RGB_RED, 8, 961, 8 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 4, 8, 5, RGB_RED, 8, 961, 8 call SignalBeam1 call SignalBeam1 call SignalBeam1 @@ -5684,22 +5684,22 @@ Move_SIGNAL_BEAM: waitforvisualfinish end SignalBeam1: - createsprite gUnknown_08595114, 131, 10, 10, 0, 16 - createsprite gUnknown_0859512C, 131, 10, 10, 0, -16 + createsprite gUnknown_08595114, ANIM_TARGET, 3, 10, 10, 0, 16 + createsprite gUnknown_0859512C, ANIM_TARGET, 3, 10, 10, 0, -16 delay 1 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 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + playsewithpan SE_W071, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish @@ -5709,50 +5709,50 @@ Move_ABSORB: delay 15 call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end AbsorbEffect: - playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + playsewithpan SE_W152, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + playsewithpan SE_W152, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + playsewithpan SE_W152, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + playsewithpan SE_W152, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + playsewithpan SE_W152, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + playsewithpan SE_W152, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + playsewithpan SE_W152, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + playsewithpan SE_W152, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 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 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 8, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 8, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + playsewithpan SE_W071, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish @@ -5762,58 +5762,58 @@ Move_MEGA_DRAIN: delay 15 call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 8, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 8, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end MegaDrainEffect: - playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + playsewithpan SE_W145C, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 - playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + playsewithpan SE_W145C, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + playsewithpan SE_W145C, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + playsewithpan SE_W145C, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + playsewithpan SE_W145C, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + playsewithpan SE_W145C, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + playsewithpan SE_W145C, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + playsewithpan SE_W145C, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 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 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 12, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 12, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + playsewithpan SE_W071, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish @@ -5823,92 +5823,92 @@ Move_GIGA_DRAIN: delay 15 call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 12, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 12, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end GigaDrainEffect: - playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -40, 35 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 - delay 4 - playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 3, 0, 5, 28, 26 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -10, 20, 40, 39 - delay 4 - playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 10, -5, -32, 26 - delay 4 - playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - delay 4 - playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - delay 4 - playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 10, -5, -40, 26 - delay 4 - playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 3, -5, 15, 36, 33 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 - delay 4 - playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + playsewithpan SE_W202, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -40, 35 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + delay 4 + playsewithpan SE_W202, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 28, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 40, 39 + delay 4 + playsewithpan SE_W202, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -32, 26 + delay 4 + playsewithpan SE_W202, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + delay 4 + playsewithpan SE_W202, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + delay 4 + playsewithpan SE_W202, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -40, 26 + delay 4 + playsewithpan SE_W202, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 36, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + delay 4 + playsewithpan SE_W202, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 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 delay 1 - createsprite gUnknown_085969C8, 2, -20, 15, 12 + createsprite gUnknown_085969C8, ANIM_ATTACKER, 2, -20, 15, 12 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - playsewithpan SE_W071, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + playsewithpan SE_W071, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish call AbsorbEffect waitforvisualfinish delay 15 call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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, -64 + 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 @@ -5926,24 +5926,24 @@ Move_TOXIC: waitforvisualfinish end Toxic1: - createsprite gUnknown_08596134, 130, -24, 16, 1, 1 - playsewithpan SE_W092, +63 + createsprite gUnknown_08596134, ANIM_TARGET, 2, -24, 16, 1, 1 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite gUnknown_08596134, 130, 8, 16, 1, 1 - playsewithpan SE_W092, +63 + createsprite gUnknown_08596134, ANIM_TARGET, 2, 8, 16, 1, 1 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite gUnknown_08596134, 130, -8, 16, 1, 1 - playsewithpan SE_W092, +63 + createsprite gUnknown_08596134, ANIM_TARGET, 2, -8, 16, 1, 1 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite gUnknown_08596134, 130, 24, 16, 1, 1 - playsewithpan SE_W092, +63 + createsprite gUnknown_08596134, ANIM_TARGET, 2, 24, 16, 1, 1 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 return Move_SLUDGE: loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W145C, -64 - createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER + createsprite gUnknown_085961A8, ANIM_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) @@ -5965,23 +5965,23 @@ Move_SLUDGE_BOMB: call SludgeBomb1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1 createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) - createsprite gUnknown_085961D8, 130, 42, 27, 20 - createsprite gUnknown_085961D8, 130, -27, 44, 20 - createsprite gUnknown_085961D8, 130, 39, -28, 20 - createsprite gUnknown_085961D8, 130, -42, -42, 20 - playsewithpan SE_W091, +63 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 42, 27, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -27, 44, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 39, -28, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -42, -42, 20 + playsewithpan SE_W091, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_085961D8, 130, 0, 40, 20 - createsprite gUnknown_085961D8, 130, -8, -44, 20 - createsprite gUnknown_085961D8, 130, -46, -28, 20 - createsprite gUnknown_085961D8, 130, 46, 9, 20 - playsewithpan SE_W091, +63 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 0, 40, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -8, -44, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -46, -28, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 46, 9, 20 + playsewithpan SE_W091, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_085961D8, 130, 42, 0, 20 - createsprite gUnknown_085961D8, 130, -43, -12, 20 - createsprite gUnknown_085961D8, 130, 16, -46, 20 - createsprite gUnknown_085961D8, 130, -16, 44, 20 - playsewithpan SE_W091, +63 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 42, 0, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -43, -12, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, 16, -46, 20 + createsprite gUnknown_085961D8, ANIM_TARGET, 2, -16, 44, 20 + playsewithpan SE_W091, SOUND_PAN_TARGET delay 0 waitsound waitforvisualfinish @@ -5989,59 +5989,59 @@ Move_SLUDGE_BOMB: waitforvisualfinish end SludgeBomb1: - playsewithpan SE_W145C, -64 - createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER + createsprite gUnknown_085961A8, ANIM_TARGET, 2, 20, 0, 40, 0 delay 3 return Move_ACID: loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER - createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 0, 0 - playsewithpan SE_W145C, -64 + createsprite gUnknown_085961C0, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 24, 0 - playsewithpan SE_W145C, -64 + createsprite gUnknown_085961C0, ANIM_TARGET, 2, 20, 0, 40, 1, 24, 0 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, -24, 0 - playsewithpan SE_W145C, -64 + createsprite gUnknown_085961C0, ANIM_TARGET, 2, 20, 0, 40, 1, -24, 0 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 15 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1 createvisualtask sub_8115A04, 2, 20, 2, 2, 0, 12, RGB(30, 0, 31) - createsprite gUnknown_0859620C, 130, 0, -22, 0, 15, 55 - playsewithpan SE_W145, +63 + createsprite gUnknown_0859620C, ANIM_TARGET, 2, 0, -22, 0, 15, 55 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859620C, 130, -26, -24, 0, 15, 55 - playsewithpan SE_W145, +63 + createsprite gUnknown_0859620C, ANIM_TARGET, 2, -26, -24, 0, 15, 55 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859620C, 130, 15, -27, 0, 15, 50 - playsewithpan SE_W145, +63 + createsprite gUnknown_0859620C, ANIM_TARGET, 2, 15, -27, 0, 15, 50 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859620C, 130, -15, -17, 0, 10, 45 - playsewithpan SE_W145, +63 + createsprite gUnknown_0859620C, ANIM_TARGET, 2, -15, -17, 0, 10, 45 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859620C, 130, 27, -22, 0, 15, 50 - playsewithpan SE_W145, +63 + createsprite gUnknown_0859620C, ANIM_TARGET, 2, 27, -22, 0, 15, 50 + playsewithpan SE_W145, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end 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 - playsewithpan SE_W155, -64 - createsprite gUnknown_08597178, 2 + playsewithpan SE_W155, SOUND_PAN_ATTACKER + createsprite gUnknown_08597178, ANIM_ATTACKER, 2 delay 20 - playsewithpan SE_W030, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + playsewithpan SE_W030, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1 delay 17 - playsewithpan SE_W233, -64 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, -4 + playsewithpan SE_W233, SOUND_PAN_ATTACKER + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6049,17 +6049,17 @@ 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 - playsewithpan SE_W155, +63 - createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15 + playsewithpan SE_W155, SOUND_PAN_TARGET + createsprite gUnknown_08597190, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0 - playsewithpan SE_W233B, +63 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6067,42 +6067,42 @@ 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, +63 - createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15 + playsewithpan SE_W155, SOUND_PAN_TARGET + createsprite gUnknown_08597190, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 5, 1 - playsewithpan SE_W030, +63 + playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SPIKES: - loadspritegfx ANIM_TAG_152 + loadspritegfx ANIM_TAG_SPIKES monbg ANIM_DEF_PARTNER - playsewithpan SE_W026, -64 - waitplaysewithpan SE_W030, +63, 28 - createsprite gUnknown_085CE11C, 130, 20, 0, 0, 24, 30 + playsewithpan SE_W026, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + createsprite gUnknown_085CE11C, ANIM_TARGET, 2, 20, 0, 0, 24, 30 delay 10 - playsewithpan SE_W026, -64 - waitplaysewithpan SE_W030, +63, 28 - createsprite gUnknown_085CE11C, 130, 20, 0, -24, 24, 30 + playsewithpan SE_W026, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + createsprite gUnknown_085CE11C, ANIM_TARGET, 2, 20, 0, -24, 24, 30 delay 10 - waitplaysewithpan SE_W030, +63, 28 - createsprite gUnknown_085CE11C, 130, 20, 0, 24, 24, 30 + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + createsprite gUnknown_085CE11C, ANIM_TARGET, 2, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER 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, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER jumpifcontest MegahornInContest fadetobg BG_DRILL waitbgfadeout @@ -6113,20 +6113,20 @@ MegahornContinue: createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 waitforvisualfinish delay 10 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 6 delay 3 - createsprite gUnknown_08596974, 3, -42, 25, 0, 0, 6 + createsprite gUnknown_08596974, ANIM_ATTACKER, 3, -42, 25, 0, 0, 6 delay 4 - playsewithpan SE_W011, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 4, 1, 4 + playsewithpan SE_W011, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, -4, 1, 12, 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0 delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6143,17 +6143,17 @@ 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 - playsewithpan SE_W016, +63 - createsprite gUnknown_08596270, 2, 0, -16 + playsewithpan SE_W016, SOUND_PAN_TARGET + createsprite gUnknown_08596270, ANIM_ATTACKER, 2, 0, -16 createvisualtask sub_810DED8, 5, 1, 70 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - playsewithpan SE_W016B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + playsewithpan SE_W016B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6161,39 +6161,39 @@ 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 - loopsewithpan SE_W017, -64, 20, 2 + loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask sub_810DED8, 5, 1, 70 - createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 - createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, ANIM_ATTACKER, 2, 25, 0, 0, 0, 20 delay 24 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 9 delay 17 - createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 - createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 - loopsewithpan SE_W003, +63, 5, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 1, 1 + loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_PECK: - loadspritegfx ANIM_TAG_135 - playsewithpan SE_W030, +63 + 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 + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -12, 0, 1, 3 waitforvisualfinish 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 @@ -6205,8 +6205,8 @@ Move_AEROBLAST: call Aeroblast1 call Aeroblast1 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 - playsewithpan SE_W013, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6214,80 +6214,80 @@ Move_AEROBLAST: call UnsetFlyingBg end Aeroblast1: - playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 0, 0 - createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 0, 0 + playsewithpan SE_W026, SOUND_PAN_ATTACKER + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0 delay 3 - playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 1, 0 - createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 1, 0 + playsewithpan SE_W026, SOUND_PAN_ATTACKER + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 1, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 1, 0 delay 3 - playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 2, 0 - createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 2, 0 + playsewithpan SE_W026, SOUND_PAN_ATTACKER + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 2, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 2, 0 delay 3 - playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 3, 0 - createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 3, 0 + playsewithpan SE_W026, SOUND_PAN_ATTACKER + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 3, 0 + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 3, 0 delay 3 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 - createsprite gUnknown_08595208, 2, 20, 0, 0, 0, 40, -25 - playsewithpan SE_W145, -64 + createsprite gUnknown_08595208, ANIM_ATTACKER, 2, 20, 0, 0, 0, 40, -25 + playsewithpan SE_W145, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1 - createsprite gUnknown_08597388, 4, 0, 0, 1, 2 - createsprite gUnknown_08595220, 2, 0, -15, 0, 15, 55 - playsewithpan SE_W152, +63 + createsprite gUnknown_08597388, ANIM_ATTACKER, 4, 0, 0, 1, 2 + createsprite gUnknown_08595220, ANIM_ATTACKER, 2, 0, -15, 0, 15, 55 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595220, 2, 15, -20, 0, 15, 50 - playsewithpan SE_W152, +63 + createsprite gUnknown_08595220, ANIM_ATTACKER, 2, 15, -20, 0, 15, 50 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595220, 2, -15, -10, 0, 10, 45 - playsewithpan SE_W152, +63 + createsprite gUnknown_08595220, ANIM_ATTACKER, 2, -15, -10, 0, 10, 45 + playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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 - playsewithpan SE_W233B, +63 + createsprite gUnknown_08597388, ANIM_ATTACKER, 4, 0, 0, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish delay 8 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 4 waitforvisualfinish - loopsewithpan SE_W152, +63, 20, 3 + loopsewithpan SE_W152, SOUND_PAN_TARGET, 20, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1 - createsprite gUnknown_08595238, 2, 10, 10, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 10, 10, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, 20, -20, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 20, -20, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, -15, 15, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -15, 15, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, 0, 0, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 0, 0, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, -10, -20, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -10, -20, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, 16, -8, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 16, -8, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, 5, 8, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, 5, 8, 20, 1 delay 4 - createsprite gUnknown_08595238, 2, -16, 0, 20, 1 + createsprite gUnknown_08595238, ANIM_ATTACKER, 2, -16, 0, 20, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6296,7 +6296,7 @@ Move_CRABHAMMER: Move_SURF: createvisualtask AnimTask_CreateSurfWave, 2, FALSE delay 24 - panse_1B SE_W057, -64, +63, +2, 0 + panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 waitforvisualfinish end @@ -6308,7 +6308,7 @@ Move_FLAMETHROWER: createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 delay 6 createvisualtask sub_81076C8, 5, 100 - panse_1B SE_W053, -64, +63, +2, 0 + panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call Flamethrower1 call Flamethrower1 call Flamethrower1 @@ -6327,112 +6327,112 @@ Move_FLAMETHROWER: end Flamethrower1: - createsprite gUnknown_08595158, 3, 10, 10, 0, 16 + createsprite gUnknown_08595158, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 - createsprite gUnknown_08595158, 3, 10, 10, 0, 16 + createsprite gUnknown_08595158, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 return Move_SANDSTORM: - loadspritegfx ANIM_TAG_261 + loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_W201, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE delay 16 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 10, 2304, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 10, 2304, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 90, 2048, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 90, 2048, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 50, 2560, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 50, 2560, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 20, 2304, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 20, 2304, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 70, 1984, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 70, 1984, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 0, 2816, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 0, 2816, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 60, 2560, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, ANIM_ATTACKER, 40, 60, 2560, 96, 0 end Move_WHIRLPOOL: - loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 delay 0 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23) - playsewithpan SE_W250, +63 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) + playsewithpan SE_W250, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1 call WhirlpoolEffect call WhirlpoolEffect call WhirlpoolEffect delay 12 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end WhirlpoolEffect: - createsprite gUnknown_08596B70, 130, 0, 28, 384, 50, 8, 50, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 28, 384, 50, 8, 50, 1 delay 2 - createsprite gUnknown_08596B70, 130, 0, 32, 240, 40, 11, -46, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 32, 240, 40, 11, -46, 1 delay 2 - createsprite gUnknown_08596B70, 130, 0, 33, 416, 40, 4, 42, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 33, 416, 40, 4, 42, 1 delay 2 - createsprite gUnknown_08596B70, 130, 0, 31, 288, 45, 6, -42, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 31, 288, 45, 6, -42, 1 delay 2 - createsprite gUnknown_08596B70, 130, 0, 28, 448, 45, 11, 46, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 28, 448, 45, 11, 46, 1 delay 2 - createsprite gUnknown_08596B70, 130, 0, 33, 464, 50, 10, -50, 1 + createsprite gUnknown_08596B70, ANIM_TARGET, 2, 0, 33, 464, 50, 10, -50, 1 delay 2 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 end FlySetUp: - playsewithpan SE_W019, -64 - createsprite gUnknown_08596340, 2, 0, 0, 13, 336 + playsewithpan SE_W019, SOUND_PAN_ATTACKER + createsprite gUnknown_08596340, ANIM_ATTACKER, 2, 0, 0, 13, 336 goto FlyEnd FlyUnleash: monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, -64 - createsprite gUnknown_08596358, 2, 20 + playsewithpan SE_W104, SOUND_PAN_ATTACKER + createsprite gUnknown_08596358, ANIM_ATTACKER, 2, 20 delay 20 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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 BounceSetUp: - playsewithpan SE_W100, -64 - createsprite gUnknown_08596420, 2, 0, 0 + playsewithpan SE_W100, SOUND_PAN_ATTACKER + createsprite gUnknown_08596420, ANIM_ATTACKER, 2, 0, 0 goto BounceEnd BounceUnleash: monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, +63 - createsprite gUnknown_0859644C, 131 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_0859644C, ANIM_TARGET, 3 delay 7 - playsewithpan SE_W025B, +63 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + playsewithpan SE_W025B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6440,16 +6440,16 @@ 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 - playsewithpan SE_W104, +63 - createsprite gUnknown_08595E68, 2, -16, 0, 0, 0, 10, 1, 3, 0 + playsewithpan SE_W104, SOUND_PAN_TARGET + createsprite gUnknown_08595E68, ANIM_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6457,17 +6457,17 @@ 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, +63 - createsprite gUnknown_08595EC8, 2, 0, 0, 0 - createsprite gUnknown_08595EC8, 2, 0, 0, 1 + playsewithpan SE_W025, SOUND_PAN_TARGET + createsprite gUnknown_08595EC8, ANIM_ATTACKER, 2, 0, 0, 0 + createsprite gUnknown_08595EC8, ANIM_ATTACKER, 2, 0, 0, 1 delay 40 - playsewithpan SE_W013, +63 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 - createsprite gUnknown_085973D0, 3, 0, 0, 1, 20 + playsewithpan SE_W013, SOUND_PAN_TARGET + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 + createsprite gUnknown_085973D0, ANIM_ATTACKER, 3, 0, 0, 1, 20 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6475,68 +6475,68 @@ 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 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 3 - createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, +63 + createsprite gUnknown_08595E80, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 + playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 - playsewithpan SE_W004, +63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 0, 8 waitforvisualfinish delay 10 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 3 delay 2 - createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, +63 + createsprite gUnknown_08595E80, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 + playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 - playsewithpan SE_W233B, +63 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1 waitforvisualfinish delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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 + createsprite gUnknown_08595EB0, ANIM_ATTACKER, 3, 1, 20, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET jumpifmoveturn 0, TripleKickLeft jumpifmoveturn 1, TripleKickRight goto TripleKickCenter @@ -6547,133 +6547,133 @@ TripleKickContinue: end TripleKickLeft: - createsprite gFistFootSpriteTemplate, 132, -16, -8, 20, 1, 1 - createsprite gBasicHitSplatSpriteTemplate, 131, -16, -16, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, -16, -8, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -16, -16, 1, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 goto TripleKickContinue TripleKickRight: - createsprite gFistFootSpriteTemplate, 132, 8, 8, 20, 1, 1 - createsprite gBasicHitSplatSpriteTemplate, 131, 8, 0, 1, 2 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 8, 8, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 goto TripleKickContinue TripleKickCenter: - createsprite gFistFootSpriteTemplate, 132, 0, 0, 20, 1, 1 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, -8, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -8, 1, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 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 - playsewithpan SE_W233B, +63 - createsprite gFistFootSpriteTemplate, 131, 0, 0, 20, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 delay 1 waitsound - playsewithpan SE_W120, +63 + playsewithpan SE_W120, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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 - playsewithpan SE_W233, -64 + playsewithpan SE_W233, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 4 - createsprite gBasicHitSplatSpriteTemplate, 2, -15, 18, 1, 0 - playsewithpan SE_W233B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -15, 18, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1 - createsprite gFistFootSpriteTemplate, 3, -15, 18, 8, 1, 0 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0 delay 3 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, -4, 1, 0 - playsewithpan SE_W233B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -4, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite gFistFootSpriteTemplate, 3, 0, -4, 8, 1, 0 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0 delay 3 - createsprite gBasicHitSplatSpriteTemplate, 2, 15, 9, 1, 0 - playsewithpan SE_W233B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 15, 9, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite gFistFootSpriteTemplate, 3, 15, 9, 8, 1, 0 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_VITAL_THROW: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233, -64 + playsewithpan SE_W233, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 2 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - playsewithpan SE_W233B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish delay 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 delay 11 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 10 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createsprite gFistFootSpriteTemplate, 2, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish - playsewithpan SE_W088, +63 - createsprite gUnknown_08596B1C, 2, 0, 0, 20, 24, 14, 2 - createsprite gUnknown_08596B1C, 2, 5, 0, -20, 24, 14, 1 - createsprite gUnknown_08596B1C, 2, 0, 5, 20, -24, 14, 2 - createsprite gUnknown_08596B1C, 2, -5, 0, -20, -24, 14, 2 - createsprite gUnknown_08596B1C, 2, 0, -5, 30, 18, 8, 2 - createsprite gUnknown_08596B1C, 2, 0, 0, 30, -18, 8, 2 - createsprite gUnknown_08596B1C, 2, 0, 0, -30, 18, 8, 2 - createsprite gUnknown_08596B1C, 2, 0, 0, -30, -18, 8, 2 + playsewithpan SE_W088, SOUND_PAN_TARGET + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, 0, 20, 24, 14, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 5, 0, -20, 24, 14, 1 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, 5, 20, -24, 14, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, -5, 0, -20, -24, 14, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, -5, 30, 18, 8, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, 0, 30, -18, 8, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, 0, -30, 18, 8, 2 + createsprite gUnknown_08596B1C, ANIM_ATTACKER, 2, 0, 0, -30, -18, 8, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 7, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6681,19 +6681,19 @@ Move_ROCK_SMASH: end Move_SUBMISSION: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, -64 - waitplaysewithpan SE_W004, +63, 10 - waitplaysewithpan SE_W104, -64, 20 - waitplaysewithpan SE_W004, +63, 30 - waitplaysewithpan SE_W104, -64, 40 - waitplaysewithpan SE_W004, +63, 50 - waitplaysewithpan SE_W104, -64, 60 - waitplaysewithpan SE_W004, +63, 70 - waitplaysewithpan SE_W104, -64, 80 - waitplaysewithpan SE_W004, +63, 0x5A + playsewithpan SE_W104, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 20 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 30 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 40 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 50 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 70 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 80 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 0x5A createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4 call Submission1 @@ -6705,21 +6705,21 @@ Move_SUBMISSION: end Submission1: - createsprite gBasicHitSplatSpriteTemplate, 3, 0, -12, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -12, 1, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 3, -12, 8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, 8, 1, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 3, 12, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 12, 0, 1, 1 delay 8 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 waitforvisualfinish - panse_26 SE_W080, -64, +63, +1, 0 + panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call SunnyDay1 call SunnyDay1 call SunnyDay1 @@ -6732,15 +6732,15 @@ Move_SUNNY_DAY: end SunnyDay1: - createsprite gUnknown_085954A0, 40 + createsprite gUnknown_085954A0, ANIM_ATTACKER, 40 delay 6 return Move_COTTON_SPORE: - loadspritegfx ANIM_TAG_158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W077, +63, 18, 10 + loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 call CottonSpore1 call CottonSpore1 call CottonSpore1 @@ -6749,20 +6749,20 @@ Move_COTTON_SPORE: end CottonSpore1: - createsprite gUnknown_085922EC, 2, 0, -20, 85, 80, 0 + createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0 delay 12 - createsprite gUnknown_085922EC, 2, 0, -10, 170, 80, 0 + createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0 delay 12 - createsprite gUnknown_085922EC, 2, 0, -15, 0, 80, 0 + createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0 delay 12 return Move_SPORE: - loadspritegfx ANIM_TAG_158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80FEE1C, 2 - loopsewithpan SE_W077, +63, 16, 11 + loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 call Spore1 call Spore1 call Spore1 @@ -6773,85 +6773,85 @@ Move_SPORE: end Spore1: - createsprite gUnknown_085922EC, 130, 0, -20, 85, 80, 1 + createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -20, 85, 80, 1 delay 12 - createsprite gUnknown_085922EC, 130, 0, -10, 170, 80, 1 + createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -10, 170, 80, 1 delay 12 - createsprite gUnknown_085922EC, 130, 0, -15, 0, 80, 1 + createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -15, 0, 80, 1 delay 12 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, -64 + playsewithpan SE_W080, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3 - createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 2, 16, -24, 8, 100 - createsprite gUnknown_08592334, 2, -16, -24, 8, 100 + createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 16, -24, 8, 100 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -16, -24, 8, 100 delay 15 - createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 2, 32, -24, 8, 100 - createsprite gUnknown_08592334, 2, -32, -24, 8, 100 + createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 32, -24, 8, 100 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -32, -24, 8, 100 delay 15 - createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 2, 24, -24, 8, 100 - createsprite gUnknown_08592334, 2, -24, -24, 8, 100 + createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 24, -24, 8, 100 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -24, -24, 8, 100 delay 30 - createsprite gUnknown_08592334, 2, 16, -24, 0, 100 - createsprite gUnknown_08592334, 2, -16, -24, 0, 100 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 16, -24, 0, 100 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -16, -24, 0, 100 delay 30 - createsprite gUnknown_08592334, 2, 20, -16, 14, 80 - createsprite gUnknown_08592334, 2, -20, -14, 16, 80 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 20, -16, 14, 80 + createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -20, -14, 16, 80 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 - playsewithpan SE_W025B, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 + playsewithpan SE_W025B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 8 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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 - loopsewithpan SE_W077, -64, 10, 5 - createsprite gUnknown_08592390, 2, -3, -2, 10 + loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite gUnknown_08592390, 2, -1, -1, 15 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite gUnknown_08592390, 2, -4, -4, 7 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite gUnknown_08592390, 2, 3, -3, 11 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite gUnknown_08592390, 2, -1, -6, 8 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite gUnknown_08592390, 2, 2, -1, 12 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite gUnknown_08592390, 2, -3, -4, 13 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite gUnknown_08592390, 2, 4, -5, 7 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite gUnknown_08592390, 2, 2, -6, 11 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite gUnknown_08592390, 2, -3, -5, 8 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, -64 - createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, 20, 1 - createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, -20, 1 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER + createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 + createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish @@ -6861,33 +6861,33 @@ 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 - createsprite gUnknown_08596C10, 2, 20, 32, -48, 50, 2 - createsprite gUnknown_08596C10, 2, 0, 32, -38, 25, 5 - createsprite gUnknown_08596C10, 2, 32, 32, -28, 40, 3 - createsprite gUnknown_08596C10, 2, -20, 32, -48, 50, 2 - createsprite gUnknown_08596C10, 2, 20, 32, -28, 60, 1 - createsprite gUnknown_08596C10, 2, 0, 32, -28, 30, 4 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 4, 1, 10, 1 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 20, 32, -48, 50, 2 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 0, 32, -38, 25, 5 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 32, 32, -28, 40, 3 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, -20, 32, -48, 50, 2 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 20, 32, -28, 60, 1 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 0, 32, -28, 30, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 30, 1 - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_08596C10, 2, 15, 32, -48, 25, 5 - createsprite gUnknown_08596C10, 2, -10, 32, -42, 30, 4 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 15, 32, -48, 25, 5 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, -10, 32, -42, 30, 4 delay 10 - createsprite gUnknown_08596C10, 2, 0, 32, -42, 25, 5 - createsprite gUnknown_08596C10, 2, -25, 32, -48, 30, 4 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, 0, 32, -42, 25, 5 + createsprite gUnknown_08596C10, ANIM_ATTACKER, 2, -25, 32, -48, 30, 4 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 16, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 0, 0, 4 delay 3 - playsewithpan SE_W120, +63 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6896,25 +6896,25 @@ Move_ANCIENT_POWER: Move_OCTAZOOKA: loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W025B, -64 - createsprite gUnknown_08592DFC, 130, 20, 0, 0, 0, 20, 0 + playsewithpan SE_W025B, SOUND_PAN_ATTACKER + createsprite gUnknown_08592DFC, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish - playsewithpan SE_W120, +63 - createsprite gUnknown_08592E30, 130, 8, 8, 1, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gUnknown_08592E30, ANIM_TARGET, 2, 8, 8, 1, 0 delay 2 - createsprite gUnknown_08592E30, 130, -8, -8, 1, 0 + createsprite gUnknown_08592E30, ANIM_TARGET, 2, -8, -8, 1, 0 delay 2 - createsprite gUnknown_08592E30, 130, 8, -8, 1, 0 + createsprite gUnknown_08592E30, ANIM_TARGET, 2, 8, -8, 1, 0 delay 2 - createsprite gUnknown_08592E30, 130, -8, 8, 1, 0 + createsprite gUnknown_08592E30, ANIM_TARGET, 2, -8, 8, 1, 0 waitforvisualfinish end Move_MIST: - loadspritegfx ANIM_TAG_144 + loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W054, -64, 20, 15 + loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 call Mist1 call Mist1 call Mist1 @@ -6930,7 +6930,7 @@ Move_MIST: end Mist1: - createsprite gUnknown_08595C2C, 2, 0, -24, 48, 240, 0, 1 + createsprite gUnknown_08595C2C, ANIM_ATTACKER, 2, 0, -24, 48, 240, 0, 1 delay 7 return @@ -6945,24 +6945,24 @@ 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 - createsprite gUnknown_08595368, 0x81, 0 - createsprite gUnknown_08595368, 0x81, 64 - createsprite gUnknown_08595368, 0x81, 128 - createsprite gUnknown_08595368, 0x81, 196 - playsewithpan SE_W172, +63 - waitforvisualfinish - createsprite gFistFootSpriteTemplate, 131, 0, 0, 8, 1, 0 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 1 + createsprite gUnknown_08595368, ANIM_TARGET, 1, 0 + createsprite gUnknown_08595368, ANIM_TARGET, 1, 64 + createsprite gUnknown_08595368, ANIM_TARGET, 1, 128 + createsprite gUnknown_08595368, ANIM_TARGET, 1, 196 + playsewithpan SE_W172, SOUND_PAN_TARGET + waitforvisualfinish + createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 call FireMoveEffect delay 4 - playsewithpan SE_W007, +63 + playsewithpan SE_W007, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116620, 10, 4, 0, 9, 0, RGB_RED waitforvisualfinish @@ -6971,22 +6971,22 @@ Move_FIRE_PUNCH: end FireMoveEffect: - createsprite gUnknown_08595380, 0x81, 0, 10, 192, 176, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, -192, 240, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, 192, -160, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, -192, -112, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, 160, 48, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, -224, -32, 40 - createsprite gUnknown_08595380, 0x81, 0, 10, 112, -128, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, 192, 176, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, -192, 240, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, 192, -160, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, -192, -112, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, 160, 48, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, -224, -32, 40 + createsprite gUnknown_08595380, ANIM_TARGET, 1, 0, 10, 112, -128, 40 return Move_LEER: - loadspritegfx ANIM_TAG_GLARE + loadspritegfx ANIM_TAG_LEER monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER setalpha 8, 8 - playsewithpan SE_W043, -64 - createsprite gUnknown_085CE150, 2, 24, -12 + playsewithpan SE_W043, SOUND_PAN_ATTACKER + createsprite gUnknown_085CE150, ANIM_ATTACKER, 2, 24, -12 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 waitforvisualfinish delay 10 @@ -7000,14 +7000,14 @@ 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 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W107, +63 + playsewithpan SE_W107, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -7024,75 +7024,75 @@ Move_DREAM_EATER: call UnsetPsychicBackground end DreamEaterEffect: - playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -40, 35 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 - delay 4 - playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 3, 0, 5, 28, 26 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -10, 20, 40, 39 - delay 4 - playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 10, -5, -32, 26 - delay 4 - playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - delay 4 - playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - delay 4 - playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 3, 10, -5, -40, 26 - delay 4 - playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 3, -5, 15, 36, 33 - createsprite gUnknown_08592270, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 3, -10, 20, 20, 39 - delay 4 - playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -40, 35 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + delay 4 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 28, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 40, 39 + delay 4 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -32, 26 + delay 4 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + delay 4 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + delay 4 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -40, 26 + delay 4 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 36, 33 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + delay 4 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 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 monbgprio_29 setalpha 12, 8 delay 0 - playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + playsewithpan SE_W054, SOUND_PAN_ATTACKER + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + playsewithpan SE_W054, SOUND_PAN_ATTACKER + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + playsewithpan SE_W054, SOUND_PAN_ATTACKER + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + playsewithpan SE_W054, SOUND_PAN_ATTACKER + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + playsewithpan SE_W054, SOUND_PAN_ATTACKER + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + playsewithpan SE_W054, SOUND_PAN_ATTACKER + createsprite gUnknown_08595C9C, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 - loopsewithpan SE_W054, +63, 28, 6 + loopsewithpan SE_W054, SOUND_PAN_TARGET, 28, 6 createvisualtask sub_8115A04, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26) waitforvisualfinish blendoff @@ -7105,7 +7105,7 @@ Move_BIND: goto BindWrap BindWrap: - playsewithpan SE_W020, +63 + playsewithpan SE_W020, SOUND_PAN_TARGET call BindWrap1 call BindWrap1 waitforvisualfinish @@ -7120,10 +7120,10 @@ Move_WRAP: goto BindWrap Move_PSYBEAM: - loadspritegfx ANIM_TAG_163 - playsewithpan SE_W060, -64 + loadspritegfx ANIM_TAG_GOLD_RING + playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground - createsoundtask sub_8158C58, 200, -64, 63, 3, 4, 0, 15 + createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15 call Psybeam1 call Psybeam1 createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET @@ -7142,12 +7142,12 @@ Move_PSYBEAM: call UnsetPsychicBackground end Psybeam1: - createsprite gUnknown_0859663C, 130, 16, 0, 0, 0, 13, 0 + createsprite gUnknown_0859663C, ANIM_TARGET, 2, 16, 0, 0, 0, 13, 0 delay 4 return Move_HYPNOSIS: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING call SetPsychicBackground call Hypnosis1 call Hypnosis1 @@ -7158,18 +7158,18 @@ Move_HYPNOSIS: call UnsetPsychicBackground end Hypnosis1: - playsewithpan SE_W048, -64 - createsprite gUnknown_0859663C, 130, 0, 8, 0, 8, 27, 0 - createsprite gUnknown_0859663C, 130, 16, -8, 0, -8, 27, 0 + playsewithpan SE_W048, SOUND_PAN_ATTACKER + createsprite gUnknown_0859663C, ANIM_TARGET, 2, 0, 8, 0, 8, 27, 0 + createsprite gUnknown_0859663C, ANIM_TARGET, 2, 16, -8, 0, -8, 27, 0 delay 6 return Move_PSYWAVE: - loadspritegfx ANIM_TAG_165 - playsewithpan SE_W060, -64 + loadspritegfx ANIM_TAG_BLUE_RING + playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground createvisualtask sub_81076C8, 5, 100 - createsoundtask sub_8158C58, 203, -64, 63, 2, 9, 0, 10 + createsoundtask sub_8158C58, 203, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10 call Psywave1 call Psywave1 createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31) @@ -7182,72 +7182,72 @@ Move_PSYWAVE: call UnsetPsychicBackground end Psywave1: - createsprite gUnknown_08595170, 131, 10, 10, 0, 16 + createsprite gUnknown_08595170, ANIM_TARGET, 3, 10, 10, 0, 16 delay 4 - createsprite gUnknown_08595170, 131, 10, 10, 0, 16 + createsprite gUnknown_08595170, ANIM_TARGET, 3, 10, 10, 0, 16 delay 4 return Move_ZAP_CANNON: - loadspritegfx ANIM_TAG_171 + loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 - playsewithpan SE_W086, -64 - createsprite gUnknown_08595764, 131, 10, 0, 0, 0, 30, 0 - createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 0, 40, 0 - createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 64, 40, 1 - createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 128, 40, 0 - createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 192, 40, 2 - createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 32, 40, 0 - createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 96, 40, 1 - createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 160, 40, 0 - createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 224, 40, 2 + playsewithpan SE_W086, SOUND_PAN_ATTACKER + createsprite gUnknown_08595764, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 128, 40, 0 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 192, 40, 2 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 32, 40, 0 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 96, 40, 1 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 160, 40, 0 + createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 224, 40, 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 delay 15 - waitplaysewithpan SE_W085B, +63, 19 + waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish end Move_STEEL_WING: loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_135 - loopsewithpan SE_W231, -64, 28, 2 + loadspritegfx ANIM_TAG_IMPACT + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - loopsewithpan SE_W017, -64, 20, 2 + loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask sub_810DED8, 5, 1, 70 - createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 - createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, ANIM_ATTACKER, 2, 25, 0, 0, 0, 20 delay 24 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 9 delay 17 - createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 - createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 - playsewithpan SE_W013, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 1, 1 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_IRON_TAIL: - loadspritegfx ANIM_TAG_135 - loopsewithpan SE_W231, -64, 28, 2 + loadspritegfx ANIM_TAG_IMPACT + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 0, 0 waitforvisualfinish monbg ANIM_TARGET setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_811489C, 5, 0, 1 clearmonbg ANIM_TARGET @@ -7256,18 +7256,18 @@ Move_IRON_TAIL: end Move_POISON_TAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W231, -64, 28, 2 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) waitforvisualfinish monbg ANIM_TARGET setalpha 12, 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_811489C, 5, 0, 1 clearmonbg ANIM_TARGET @@ -7278,33 +7278,33 @@ Move_POISON_TAIL: Move_METAL_CLAW: loadspritegfx ANIM_TAG_CLAW_SLASH - loopsewithpan SE_W231, -64, 28, 2 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, +63 - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + playsewithpan SE_W013, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, 10, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 delay 8 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, +63 - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + playsewithpan SE_W013, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, 10, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 waitforvisualfinish end Move_NIGHT_SHADE: monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER fadetobg BG_GHOST waitbgfadein delay 10 - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_811188C, 5, 85 delay 70 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1 @@ -7318,38 +7318,38 @@ Move_NIGHT_SHADE: Move_EGG_BOMB: loadspritegfx ANIM_TAG_EXPLOSION - loadspritegfx ANIM_TAG_175 - playsewithpan SE_W039, -64 - createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32 + loadspritegfx ANIM_TAG_LARGE_FRESH_EGG + playsewithpan SE_W039, SOUND_PAN_ATTACKER + createsprite gUnknown_08593488, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1 - createsprite gBattleAnimSpriteTemplate_859371C, 132, 6, 5, 1, 0 - playsewithpan SE_W120, +63 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 6, 5, 1, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, 132, -16, -15, 1, 0 - playsewithpan SE_W120, +63 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -16, -15, 1, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, 132, 16, -5, 1, 0 - playsewithpan SE_W120, +63 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 16, -5, 1, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, 132, -12, 18, 1, 0 - playsewithpan SE_W120, +63 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -12, 18, 1, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, 132, 0, 5, 1, 0 - playsewithpan SE_W120, +63 + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 0, 5, 1, 0 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 waitforvisualfinish end Move_SHADOW_BALL: - loadspritegfx ANIM_TAG_176 + loadspritegfx ANIM_TAG_SHADOW_BALL fadetobg BG_GHOST waitbgfadein delay 15 - createsoundtask sub_8158C58, 168, -64, 63, 5, 5, 0, 5 - createsprite gUnknown_08596D58, 130, 16, 16, 8 + createsoundtask sub_8158C58, 168, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5 + createsprite gUnknown_08596D58, ANIM_TARGET, 2, 16, 16, 8 waitforvisualfinish - playsewithpan SE_W028, +63 + playsewithpan SE_W028, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg @@ -7357,17 +7357,17 @@ Move_SHADOW_BALL: end Move_LICK: - loadspritegfx ANIM_TAG_177 + loadspritegfx ANIM_TAG_LICK delay 15 - playsewithpan SE_W122, +63 - createsprite gUnknown_08596D8C, 130, 0, 0 + playsewithpan SE_W122, SOUND_PAN_TARGET + createsprite gUnknown_08596D8C, ANIM_TARGET, 2, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 waitforvisualfinish end Move_FOCUS_ENERGY: - loadspritegfx ANIM_TAG_184 - playsewithpan SE_W082, -64 + loadspritegfx ANIM_TAG_FOCUS_ENERGY + playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_WHITE @@ -7382,35 +7382,35 @@ Move_BIDE: choosetwoturnanim BideSetUp, BideUnleash end BideSetUp: - loopsewithpan SE_W036, -64, 9, 2 + loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish end BideUnleash: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - loopsewithpan SE_W036, -64, 9, 2 + loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_8116620, 10, 2, 2, 0, 11, RGB_RED createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 4 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 12, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 16, 1 - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 1, 18, -8, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 18, -8, 1, 1 delay 5 - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 1, -18, 8, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -18, 8, 1, 1 delay 5 - playsewithpan SE_W004, +63 - createsprite gBasicHitSplatSpriteTemplate, 1, -8, -5, 1, 1 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -8, -5, 1, 1 waitforvisualfinish delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 waitforvisualfinish createvisualtask sub_8116620, 10, 2, 2, 11, 0, RGB_RED waitforvisualfinish @@ -7419,13 +7419,13 @@ BideUnleash: end Move_STRING_SHOT: - loadspritegfx ANIM_TAG_179 + loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER delay 0 - createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - loopsewithpan SE_W081, -64, 9, 6 + loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 call StringShot1 call StringShot1 call StringShot1 @@ -7445,21 +7445,21 @@ Move_STRING_SHOT: call StringShot1 call StringShot1 waitforvisualfinish - playsewithpan SE_W081B, +63 - createsprite gUnknown_085969F8, 130, 0, 10 + playsewithpan SE_W081B, SOUND_PAN_TARGET + createsprite gUnknown_085969F8, ANIM_TARGET, 2, 0, 10 delay 4 - createsprite gUnknown_085969F8, 130, 0, -2 + createsprite gUnknown_085969F8, ANIM_TARGET, 2, 0, -2 delay 4 - createsprite gUnknown_085969F8, 130, 0, 22 + createsprite gUnknown_085969F8, ANIM_TARGET, 2, 0, 22 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER delay 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end StringShot1: - createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 1 + createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 1 delay 1 return @@ -7468,10 +7468,10 @@ Move_SPIDER_WEB: loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER delay 0 - createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish monbgprio_28 ANIM_TARGET - loopsewithpan SE_W081, -64, 9, 6 + loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 call SpiderWeb1 call SpiderWeb1 call SpiderWeb1 @@ -7487,16 +7487,16 @@ Move_SPIDER_WEB: call SpiderWeb1 call SpiderWeb1 waitforvisualfinish - playsewithpan SE_W081B, +63 - createsprite gUnknown_08596A2C, 2 + playsewithpan SE_W081B, SOUND_PAN_TARGET + createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end SpiderWeb1: - createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 0 + createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 0 delay 1 return @@ -7508,29 +7508,29 @@ RazorWindContinue: RazorWindSetUp: loadspritegfx ANIM_TAG_GUST - playsewithpan SE_W016, -64 - createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 0, 7, 40 - createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 85, 7, 40 - createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 170, 7, 40 + playsewithpan SE_W016, SOUND_PAN_ATTACKER + createsprite gUnknown_08593550, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 + createsprite gUnknown_08593550, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 + createsprite gUnknown_08593550, ANIM_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish - playsewithpan SE_W016B, -64 + playsewithpan SE_W016B, SOUND_PAN_ATTACKER 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, -64 - createsprite gUnknown_085962D4, 2, 14, 8, 0, 0, 22, 2, 1 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1 delay 2 - playsewithpan SE_W013B, -64 - createsprite gUnknown_085962D4, 2, 14, -8, 16, 14, 22, 1, 1 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1 delay 2 - playsewithpan SE_W013B, -64 - createsprite gUnknown_085962D4, 2, 14, 12, -16, -14, 22, 0, 1 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER + createsprite gUnknown_085962D4, ANIM_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 - playsewithpan SE_W013, +63 + playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish @@ -7539,15 +7539,15 @@ RazorWindUnleash: goto RazorWindContinue Move_DISABLE: - loadspritegfx ANIM_TAG_071 + loadspritegfx ANIM_TAG_SPARKLE_4 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 8, 8 - playsewithpan SE_W197, -64 - createsprite gUnknown_0853EE84, 13, 24, -16 + playsewithpan SE_W197, SOUND_PAN_ATTACKER + createsprite gUnknown_0853EE84, ANIM_ATTACKER, 13, 24, -16 waitforvisualfinish createvisualtask sub_81045B0, 5 - loopsewithpan SE_W020, +63, 15, 4 + loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4 waitforvisualfinish delay 1 clearmonbg ANIM_TARGET @@ -7555,11 +7555,11 @@ 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 - loopsewithpan SE_W025, -64, 13, 3 + loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3 createvisualtask sub_8115A04, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11) call Recover1 call Recover1 @@ -7573,35 +7573,35 @@ Move_RECOVER: end Recover1: - createsprite gUnknown_085921E0, 2, 40, -10, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, -10, 13 delay 3 - createsprite gUnknown_085921E0, 2, -35, -10, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -35, -10, 13 delay 3 - createsprite gUnknown_085921E0, 2, 15, -40, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 15, -40, 13 delay 3 - createsprite gUnknown_085921E0, 2, -10, -32, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -10, -32, 13 delay 3 - createsprite gUnknown_085921E0, 2, 25, -20, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 25, -20, 13 delay 3 - createsprite gUnknown_085921E0, 2, -40, -20, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -20, 13 delay 3 - createsprite gUnknown_085921E0, 2, 5, -40, 13 + createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 5, -40, 13 delay 3 return Move_MIMIC: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS setalpha 11, 5 monbg_22 ANIM_DEF_PARTNER monbgprio_29 - panse_1B SE_W107, +63, -64, -3, 0 + panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 createvisualtask sub_80FF458, 5, 128, 24 delay 15 - createsprite gUnknown_085924DC, 130, -12, 24 + createsprite gUnknown_085924DC, ANIM_TARGET, 2, -12, 24 delay 10 setarg 7, -1 waitforvisualfinish - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 ANIM_DEF_PARTNER @@ -7609,18 +7609,18 @@ Move_MIMIC: end Move_CONSTRICT: - loadspritegfx ANIM_TAG_186 - loopsewithpan SE_W010, +63, 6, 4 - createsprite gUnknown_08592494, 132, 0, 16, 0, 2 + loadspritegfx ANIM_TAG_TENDRILS + loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 + createsprite gUnknown_08592494, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 - createsprite gUnknown_08592494, 131, 0, 0, 0, 2 - createsprite gUnknown_08592494, 130, 0, 8, 1, 2 + createsprite gUnknown_08592494, ANIM_TARGET, 3, 0, 0, 0, 2 + createsprite gUnknown_08592494, ANIM_TARGET, 2, 0, 8, 1, 2 delay 7 - createsprite gUnknown_08592494, 131, 0, -8, 1, 2 + createsprite gUnknown_08592494, ANIM_TARGET, 3, 0, -8, 1, 2 delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 delay 20 - playsewithpan SE_W020, +63 + playsewithpan SE_W020, SOUND_PAN_TARGET setarg 7, -1 waitforvisualfinish end @@ -7629,12 +7629,12 @@ 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 delay 20 - createsprite gUnknown_08596DD0, 2 + createsprite gUnknown_08596DD0, ANIM_ATTACKER, 2 delay 60 call CurseGhost1 delay 41 @@ -7645,17 +7645,17 @@ CurseGhost: clearmonbg ANIM_ATK_PARTNER delay 1 monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, +63 - createsprite gBattleAnimSpriteTemplate_8596DE8, 130 + playsewithpan SE_W171, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_8596DE8, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 16, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end CurseGhost1: createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0 - playsewithpan SE_W020, -64 + playsewithpan SE_W020, SOUND_PAN_ATTACKER return CurseStats: createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER @@ -7665,27 +7665,27 @@ CurseStats: waitforvisualfinish end CurseStats1: - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_8116B14, 5 createvisualtask sub_8115A04, 5, 2, 4, 2, 0, 10, RGB_RED return 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, -64 + playsewithpan SE_W039, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1 - createsprite gUnknown_085937B0, 4, 0, 16, 0 - createsprite gUnknown_085937B0, 4, 0, 16, 1 + createsprite gUnknown_085937B0, ANIM_ATTACKER, 4, 0, 16, 0 + createsprite gUnknown_085937B0, ANIM_ATTACKER, 4, 0, 16, 1 delay 120 delay 7 - playsewithpan SE_W030, -64 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 + playsewithpan SE_W030, SOUND_PAN_ATTACKER + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 8 - createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 + createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 60 setarg 7, -1 waitforvisualfinish @@ -7695,158 +7695,158 @@ 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 - createsprite gUnknown_08593938, 2, 0, -24, 0, 1 + createsprite gUnknown_08593938, ANIM_ATTACKER, 2, 0, -24, 0, 1 delay 12 - createsprite gUnknown_08593958, 40, 0, -24, 48, -18, 35, 0, 0 - createsprite gUnknown_08593958, 40, 0, -24, -48, 20, 30, 1, 1 - createsprite gUnknown_08593958, 40, 0, -24, -38, -29, 30, 2, 2 - createsprite gUnknown_08593958, 40, 0, -24, 36, 18, 30, 3, 3 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 48, -18, 35, 0, 0 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -48, 20, 30, 1, 1 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -38, -29, 30, 2, 2 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 36, 18, 30, 3, 3 call HealBell1 delay 0x21 - createsprite gUnknown_08593958, 40, 0, -24, 19, 26, 35, 4, 4 - createsprite gUnknown_08593958, 40, 0, -24, -34, -12, 30, 5, 5 - createsprite gUnknown_08593958, 40, 0, -24, 41, -20, 34, 6, 2 - createsprite gUnknown_08593958, 40, 0, -24, -15, 26, 32, 7, 0 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 19, 26, 35, 4, 4 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -34, -12, 30, 5, 5 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 41, -20, 34, 6, 2 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -15, 26, 32, 7, 0 call HealBell1 delay 0x21 - createsprite gUnknown_08593958, 40, 0, -24, -48, 18, 31, 0, 2 - createsprite gUnknown_08593958, 40, 0, -24, 48, -20, 30, 2, 5 - createsprite gUnknown_08593958, 40, 0, -24, 38, 29, 33, 4, 3 - createsprite gUnknown_08593958, 40, 0, -24, -36, -18, 30, 6, 1 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -48, 18, 31, 0, 2 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 48, -20, 30, 2, 5 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 38, 29, 33, 4, 3 + createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -36, -18, 30, 6, 1 call HealBell1 waitforvisualfinish createvisualtask sub_8105D60, 5 waitforvisualfinish unloadspritegfx ANIM_TAG_BELL - unloadspritegfx ANIM_TAG_MUSIC_NOTES - unloadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE - playsewithpan SE_W234, -64 - createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 + 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, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 - createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - unloadspritegfx ANIM_TAG_SPARKLE - loadspritegfx ANIM_TAG_203 - playsewithpan SE_REAPOKE, -64 + 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 - createsprite gUnknown_08593868, 16, 0, 0, 0, 1 + createsprite gUnknown_08593868, ANIM_ATTACKER, 16, 0, 0, 0, 1 end HealBell1: createvisualtask sub_8116664, 10, 4, 3, 8, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 2, 10, RGB_WHITE - createsprite gUnknown_0859381C, 40, 0, -24, 0, 1 - playsewithpan SE_W215, -64 + createsprite gUnknown_0859381C, ANIM_ATTACKER, 40, 0, -24, 0, 1 + playsewithpan SE_W215, SOUND_PAN_ATTACKER return Move_FAKE_OUT: playsewithpan SE_W260, 0 createvisualtask sub_8105EB0, 5 waitforvisualfinish - playsewithpan SE_W166, +63 + playsewithpan SE_W166, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 createvisualtask sub_8106020, 3 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE end Move_SCARY_FACE: - loadspritegfx ANIM_TAG_218 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK - playsewithpan SE_W060, -64 + loadspritegfx ANIM_TAG_EYE_SPARKLE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 0, 16, RGB_BLACK + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitforvisualfinish delay 10 - playsewithpan SE_W043, -64 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_81064F8, 5 delay 13 - createsprite gUnknown_08593A84, 0, -16, -8 - createsprite gUnknown_08593A84, 0, 16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 + createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 waitforvisualfinish createvisualtask sub_810A094, 3, 20, 1, 0 - playsewithpan SE_W081B, +63 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 16, 0, RGB_BLACK + playsewithpan SE_W081B, SOUND_PAN_TARGET + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 16, 0, RGB_BLACK waitforvisualfinish 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, +63 + createsprite gUnknown_08593AA8, ANIM_TARGET, 2, 16, -48 + playsewithpan SE_W215, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, +63 + playsewithpan SE_W215, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, +63 + playsewithpan SE_W215, SOUND_PAN_TARGET waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -30 - playsewithpan SE_W213, +63 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -42 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -14 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -128, -22 - createsprite gBattleAnimSpriteTemplate_85939B8, 131, -384, -31 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 160, -30 + playsewithpan SE_W213, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -256, -42 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 128, -14 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 416, -38 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -128, -22 + createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31 end Move_LOVELY_KISS: - loadspritegfx ANIM_TAG_219 - loadspritegfx ANIM_TAG_EVIL_ANGEL - createsprite gUnknown_08593AF0, 130, 0, -24 - playsewithpan SE_W060B, +63 + loadspritegfx ANIM_TAG_PINK_HEART + loadspritegfx ANIM_TAG_DEVIL + createsprite gUnknown_08593AF0, ANIM_TARGET, 2, 0, -24 + playsewithpan SE_W060B, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W213, +63 - createsprite gUnknown_08593AC0, 131, -256, -42 - createsprite gUnknown_08593AC0, 131, 128, -14 - createsprite gUnknown_08593AC0, 131, 416, -38 - createsprite gUnknown_08593AC0, 131, -128, -22 + playsewithpan SE_W213, SOUND_PAN_TARGET + createsprite gUnknown_08593AC0, ANIM_TARGET, 3, -256, -42 + createsprite gUnknown_08593AC0, ANIM_TARGET, 3, 128, -14 + createsprite gUnknown_08593AC0, ANIM_TARGET, 3, 416, -38 + createsprite gUnknown_08593AC0, ANIM_TARGET, 3, -128, -22 end Move_FURY_SWIPES: - loadspritegfx ANIM_TAG_222 - createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 + loadspritegfx ANIM_TAG_SWIPE + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 - playsewithpan SE_W010, +63 - createsprite gUnknown_08593B38, 130, 16, 0, 1 + playsewithpan SE_W010, SOUND_PAN_TARGET + createsprite gUnknown_08593B38, ANIM_TARGET, 2, 16, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1 delay 10 - createsprite gHorizontalLungeSpriteTemplate, 130, 5, 5 + createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5 delay 4 - playsewithpan SE_W010, +63 - createsprite gUnknown_08593B38, 130, -16, 0, 0 + playsewithpan SE_W010, SOUND_PAN_TARGET + createsprite gUnknown_08593B38, ANIM_TARGET, 2, -16, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 end Move_INGRAIN: - loadspritegfx ANIM_TAG_223 - loadspritegfx ANIM_TAG_147 - createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150 - playsewithpan SE_W010, -64 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_ORBS + createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, 2, -32, 20, 1, 1, 140 - playsewithpan SE_W010, -64 + createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, 2, 32, 22, 1, 0, 130 - playsewithpan SE_W010, -64 + createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, 2, -16, 25, -1, 3, 120 - playsewithpan SE_W010, -64 + createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 40 - createsprite gUnknown_0859258C, 3, 32, 26, -1, 3, 30 + createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_0859258C, 3, -48, 20, 1, 2, 30 - playsewithpan SE_W145C, -64 + createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - playsewithpan SE_W145C, -64 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_0859258C, 3, 48, 26, -2, 3, 18 - playsewithpan SE_W145C, -64 + createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 10 waitforvisualfinish end @@ -7854,14 +7854,14 @@ Move_INGRAIN: Move_PRESENT: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2 - createsprite gUnknown_08592610, 130, 0, -5, 10, 2, -1 - playsewithpan SE_W039, -64 + createsprite gUnknown_08592610, ANIM_TARGET, 2, 0, -5, 10, 2, -1 + playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 14 - playsewithpan SE_W145B, -64 + playsewithpan SE_W145B, SOUND_PAN_ATTACKER delay 14 playsewithpan SE_W145B, 0 delay 20 - playsewithpan SE_W145B, +63 + playsewithpan SE_W145B, SOUND_PAN_TARGET waitforvisualfinish jumpretfalse PresentDamage jumprettrue PresentHeal @@ -7869,84 +7869,84 @@ Move_PRESENT: PresentDamage: loadspritegfx ANIM_TAG_EXPLOSION - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 131, 0, 0, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 131, 24, -24, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 131, -16, 16, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 131, -24, -12, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 131, 16, 16, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 16, 16, 1, 1 end PresentHeal: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W234, +63 - createsprite gUnknown_08592658, 132, -16, 32, -3, 1 + playsewithpan SE_W234, SOUND_PAN_TARGET + createsprite gUnknown_08592658, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, 16, 32, -3, -1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, 16, 32, -3, -1 delay 3 - createsprite gUnknown_08592658, 132, 32, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, 32, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, -32, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, -32, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, 0, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, 0, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, -8, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, -8, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, 24, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, 24, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, 132, -24, 32, -3, 1 + createsprite gUnknown_08592658, ANIM_TARGET, 4, -24, 32, -3, 1 waitforvisualfinish waitsound call HealingEffect2 end Move_BATON_PASS: - loadspritegfx ANIM_TAG_226 - playsewithpan SE_W226, -64 + 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 + createsprite gUnknown_085CE370, ANIM_ATTACKER, 2 end Move_PERISH_SONG: - loadspritegfx ANIM_TAG_MUSIC_NOTES - createsprite gUnknown_08593C0C, 4, 0, 0, 0 - createsprite gUnknown_08593C0C, 4, 1, 1, 16 - createsprite gUnknown_08593C0C, 4, 2, 1, 32 - createsprite gUnknown_08593C0C, 4, 3, 2, 48 - createsprite gUnknown_08593C0C, 4, 4, 2, 64 - createsprite gUnknown_08593C0C, 4, 5, 0, 80 - createsprite gUnknown_08593C0C, 4, 6, 0, 96 - createsprite gUnknown_08593C0C, 4, 7, 1, 112 - createsprite gUnknown_08593C0C, 4, 8, 2, 128 - createsprite gUnknown_08593C0C, 4, 9, 0, 144 - createsprite gUnknown_08593C0C, 4, 10, 2, 160 - createsprite gUnknown_08593C0C, 4, 11, 0, 176 - createsprite gUnknown_08593C0C, 4, 12, 1, 192 - createsprite gUnknown_08593C0C, 4, 13, 3, 208 - createsprite gUnknown_08593C0C, 4, 14, 3, 224 - createsprite gUnknown_08593C0C, 4, 15, 0, 240 - createsprite gUnknown_08593C24, 4, 15, 0, 0 + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 0, 0, 0 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 1, 1, 16 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 2, 1, 32 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 3, 2, 48 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 4, 2, 64 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 5, 0, 80 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 6, 0, 96 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 7, 1, 112 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 8, 2, 128 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 9, 0, 144 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 10, 2, 160 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 11, 0, 176 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 12, 1, 192 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 13, 3, 208 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 14, 3, 224 + createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 15, 0, 240 + createsprite gUnknown_08593C24, ANIM_ATTACKER, 4, 15, 0, 0 delay 20 - panse_1B SE_W195, -64, +63, +2, 0 + panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 delay 80 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK createvisualtask sub_811489C, 5, 4, 0 createvisualtask sub_811489C, 5, 5, 0 createvisualtask sub_811489C, 5, 6, 0 createvisualtask sub_811489C, 5, 7, 0 delay 100 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK createvisualtask sub_811489C, 5, 4, 1 createvisualtask sub_811489C, 5, 5, 1 createvisualtask sub_811489C, 5, 6, 1 @@ -7958,32 +7958,32 @@ Move_SLEEP_TALK: loadspritegfx ANIM_TAG_LETTER_Z createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER delay 20 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 - playsewithpan SE_W173, -64 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -1 + playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -1 delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -1 delay 20 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 - playsewithpan SE_W173, -64 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -5 + playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -5 delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -5 delay 20 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 - playsewithpan SE_W173, -64 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -3 + playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -3 delay 6 - createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 + createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -3 waitforvisualfinish end Move_HYPER_FANG: - loadspritegfx ANIM_TAG_192 - playsewithpan SE_W044, +63 + loadspritegfx ANIM_TAG_FANG_ATTACK + playsewithpan SE_W044, SOUND_PAN_TARGET delay 1 delay 2 createvisualtask AnimTask_IsContest, 2 @@ -7993,10 +7993,10 @@ Move_HYPER_FANG: goto HyperFangOnPlayer HyperFangContinue: waitbgfadeout - createsprite gUnknown_085CE1DC, 130 + createsprite gUnknown_085CE1DC, ANIM_TARGET, 2 waitbgfadein createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1 - playsewithpan SE_W043, +63 + playsewithpan SE_W043, SOUND_PAN_TARGET delay 20 restorebg waitbgfadein @@ -8014,97 +8014,97 @@ HyperFangInContest: Move_TRI_ATTACK: loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE - createsprite gUnknown_085CE2F8, 130, 16, 0 - playsewithpan SE_W161, -64 + createsprite gUnknown_085CE2F8, ANIM_TARGET, 2, 16, 0 + playsewithpan SE_W161, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W161, -64 + playsewithpan SE_W161, SOUND_PAN_ATTACKER delay 20 - createsoundtask sub_8158C58, 220, -64, 63, 5, 6, 0, 7 + createsoundtask sub_8158C58, 220, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK delay 16 loadspritegfx ANIM_TAG_FIRE - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 - playsewithpan SE_W172B, +63 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 + playsewithpan SE_W172B, SOUND_PAN_TARGET + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, -1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 2, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 1, -1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 1 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 1, -2 delay 1 - createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1 + createsprite gUnknown_08595410, ANIM_TARGET, 2, 0, 0, 30, 30, 3, 1 delay 2 createvisualtask sub_810A094, 2, 20, 3, 1, 1 waitforvisualfinish loadspritegfx ANIM_TAG_LIGHTNING createvisualtask sub_8115F10, 2, 257, 257, 257 - playsewithpan SE_W161B, +63 - createsprite gUnknown_085956C0, 130, 0, -48 + playsewithpan SE_W161B, SOUND_PAN_TARGET + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -48 delay 1 - createsprite gUnknown_085956C0, 130, 0, -16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, -16 delay 1 - createsprite gUnknown_085956C0, 130, 0, 16 + createsprite gUnknown_085956C0, ANIM_TARGET, 2, 0, 16 delay 20 createvisualtask sub_810A094, 2, 20, 3, 1, 0 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 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 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, -64 - waitplaysewithpan SE_W052, -64, 10 - createvisualtask sub_8159278, 2, -64, -64, 1, 0 - createsprite gUnknown_0859563C, 2, 0, 0, 0 + playsewithpan SE_W052, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10 + createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_ATTACKER, 1, 0 + createsprite gUnknown_0859563C, ANIM_ATTACKER, 2, 0, 0, 0 delay 3 - createsprite gUnknown_0859563C, 3, 0, 0, 1 + createsprite gUnknown_0859563C, ANIM_ATTACKER, 3, 0, 0, 1 delay 3 - createsprite gUnknown_0859563C, 4, 0, 0, 2 + createsprite gUnknown_0859563C, ANIM_ATTACKER, 4, 0, 0, 2 delay 3 - createsprite gUnknown_0859563C, 4, 0, 0, 3 + createsprite gUnknown_0859563C, ANIM_ATTACKER, 4, 0, 0, 3 delay 40 - createvisualtask sub_8159278, 2, -64, 63, 2, 0 + createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 waitforvisualfinish monbgprio_29 - playsewithpan SE_W172B, +63 + playsewithpan SE_W172B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1 - createsprite gUnknown_0859566C, 2, 0 - createsprite gUnknown_0859566C, 2, 42 - createsprite gUnknown_0859566C, 2, 84 - createsprite gUnknown_0859566C, 2, 126 - createsprite gUnknown_0859566C, 2, 168 - createsprite gUnknown_0859566C, 2, 210 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 0 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 42 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 84 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 126 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 168 + createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 210 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER 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 - createsprite gUnknown_085CE22C, 130, 0, -8 - createsprite gUnknown_085CE244, 2, -2, 0, 0, 0, 9 - createsprite gUnknown_085CE244, 2, 2, 0, 1, 0, 9 - createsprite gUnknown_085CE25C, 3, -2, 0, 0, 0, 9 - createsprite gUnknown_085CE25C, 3, 2, 0, 1, 0, 9 + createsprite gUnknown_085CE22C, ANIM_TARGET, 2, 0, -8 + createsprite gUnknown_085CE244, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9 + createsprite gUnknown_085CE244, ANIM_ATTACKER, 2, 2, 0, 1, 0, 9 + createsprite gUnknown_085CE25C, ANIM_ATTACKER, 3, -2, 0, 0, 0, 9 + createsprite gUnknown_085CE25C, ANIM_ATTACKER, 3, 2, 0, 1, 0, 9 delay 16 - createvisualtask sub_8159244, 5, 223, 63 + createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET waitforvisualfinish createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 @@ -8114,9 +8114,9 @@ Move_ENCORE: Move_TRICK: loadspritegfx ANIM_TAG_ITEM_BAG - loadspritegfx ANIM_TAG_207 - createsprite gUnknown_085926E8, 2, -40, 80 - createsprite gUnknown_085926E8, 2, -40, 208 + loadspritegfx ANIM_TAG_SPEED_DUST + createsprite gUnknown_085926E8, ANIM_ATTACKER, 2, -40, 80 + createsprite gUnknown_085926E8, ANIM_ATTACKER, 2, -40, 208 delay 16 playsewithpan SE_W166, 0 createvisualtask sub_8106020, 3 @@ -8141,105 +8141,105 @@ Move_TRICK: end Move_WISH: - loadspritegfx ANIM_TAG_233 - loadspritegfx ANIM_TAG_SPARKLE - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_SPARKLE_2 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish - panse_27 SE_W115, +63, -64, -3, 0 - createsprite gUnknown_085CE388, 40 + panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 + createsprite gUnknown_085CE388, ANIM_ATTACKER, 40 waitforvisualfinish delay 60 - loopsewithpan SE_W215, -64, 16, 3 + loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 call GrantingStarsEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK waitforvisualfinish end Move_STOCKPILE: - loadspritegfx ANIM_TAG_235 - playsewithpan SE_W025, -64 + 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 call Stockpile1 call Stockpile1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 12, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE end Stockpile1: - createsprite gUnknown_08592244, 2, 55, 55, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, 55, 13 delay 1 - createsprite gUnknown_08592244, 2, -55, -55, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, -55, 13 delay 1 - createsprite gUnknown_08592244, 2, 0, 55, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 0, 55, 13 delay 1 - createsprite gUnknown_08592244, 2, 0, -55, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 0, -55, 13 delay 1 - createsprite gUnknown_08592244, 2, 55, -34, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, -34, 13 delay 1 - createsprite gUnknown_08592244, 2, 55, 34, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, 34, 13 delay 1 - createsprite gUnknown_08592244, 2, -55, -34, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, -34, 13 delay 1 - createsprite gUnknown_08592244, 2, -55, 34, 13 + createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, 34, 13 delay 1 return Move_SPIT_UP: - loadspritegfx ANIM_TAG_237 - loadspritegfx ANIM_TAG_135 - playsewithpan SE_W036, -64 + 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 delay 45 - playsewithpan SE_W255, -64 + playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 3 - createsprite gUnknown_08593A50, 2, 0, 12 - createsprite gUnknown_08593A50, 2, 32, 12 - createsprite gUnknown_08593A50, 2, 64, 12 - createsprite gUnknown_08593A50, 2, 96, 12 - createsprite gUnknown_08593A50, 2, 128, 12 - createsprite gUnknown_08593A50, 2, 160, 12 - createsprite gUnknown_08593A50, 2, 192, 12 - createsprite gUnknown_08593A50, 2, 224, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 0, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 32, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 64, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 96, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 128, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 160, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 192, 12 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 224, 12 delay 5 jumpifmoveturn 2, SpitUpStrong jumpifmoveturn 3, SpitUpStrongest SpitUpContinue: delay 5 createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0 - playsewithpan SE_W003, +63 - createsprite gUnknown_085973E8, 131, -12, 10, 1, 1 + playsewithpan SE_W003, SOUND_PAN_TARGET + createsprite gUnknown_085973E8, ANIM_TARGET, 3, -12, 10, 1, 1 delay 5 - playsewithpan SE_W003, +63 - createsprite gUnknown_085973E8, 131, 12, -10, 1, 1 + playsewithpan SE_W003, SOUND_PAN_TARGET + createsprite gUnknown_085973E8, ANIM_TARGET, 3, 12, -10, 1, 1 waitforvisualfinish end SpitUpStrong: - createsprite gUnknown_08593A50, 2, 16 - createsprite gUnknown_08593A50, 2, 80 - createsprite gUnknown_08593A50, 2, 144 - createsprite gUnknown_08593A50, 2, 208 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 16 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 80 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 144 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 208 goto SpitUpContinue SpitUpStrongest: - createsprite gUnknown_08593A50, 2, 16 - createsprite gUnknown_08593A50, 2, 48 - createsprite gUnknown_08593A50, 2, 80 - createsprite gUnknown_08593A50, 2, 112 - createsprite gUnknown_08593A50, 2, 144 - createsprite gUnknown_08593A50, 2, 176 - createsprite gUnknown_08593A50, 2, 208 - createsprite gUnknown_08593A50, 2, 240 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 16 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 48 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 80 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 112 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 144 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 176 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 208 + createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 240 goto SpitUpContinue Move_SWALLOW: - loadspritegfx ANIM_TAG_236 + loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B778, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 38 - playsewithpan SE_W255, -64 + playsewithpan SE_W255, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1 call SwallowEffect jumpifmoveturn 2, SwallowGood @@ -8249,15 +8249,15 @@ SwallowContinue: call HealingEffect end SwallowEffect: - createsprite gUnknown_085CE418, 2, 0, -8 + createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 0, -8 delay 1 - createsprite gUnknown_085CE418, 2, -24, -8 + createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, -24, -8 delay 1 - createsprite gUnknown_085CE418, 2, 16, -8 + createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 16, -8 delay 1 - createsprite gUnknown_085CE418, 2, -16, -8 + createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, -16, -8 delay 1 - createsprite gUnknown_085CE418, 2, 24, -8 + createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 24, -8 delay 1 return SwallowGood: @@ -8270,8 +8270,8 @@ SwallowBest: Move_TRANSFORM: monbg ANIM_ATTACKER - playsewithpan SE_W100, -64 - waitplaysewithpan SE_W107, -64, 48 + playsewithpan SE_W100, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 createvisualtask sub_815B7D0, 2, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -8305,60 +8305,60 @@ Move_MORNING_SUN: call HealingEffect end MorningSun1: - createsprite gUnknown_085CE48C, 2, 30, 640 + createsprite gUnknown_085CE48C, ANIM_ATTACKER, 2, 30, 640 delay 5 return Move_SWEET_SCENT: - loadspritegfx ANIM_TAG_238 - playsewithpan SE_W230, -64 - createsprite gUnknown_085CE544, 2, 100, 0, 100 + loadspritegfx ANIM_TAG_PINK_PETAL + playsewithpan SE_W230, SOUND_PAN_ATTACKER + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 100 delay 25 setpan 0 call SweetScentEffect - createsprite gUnknown_085CE544, 2, 55, 0 - setpan +63 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 55, 0 + setpan SOUND_PAN_TARGET createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21) call SweetScentEffect waitforvisualfinish end SweetScentEffect: - createsprite gUnknown_085CE544, 2, 70, 1, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 70, 1, 64 delay 2 - createsprite gUnknown_085CE544, 2, 60, 0, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 60, 0, 64 delay 5 - createsprite gUnknown_085CE544, 2, 80, 1, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 80, 1, 64 delay 2 - createsprite gUnknown_085CE544, 2, 58, 0, 120 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 58, 0, 120 delay 2 - createsprite gUnknown_085CE544, 2, 100, 0, 120 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120 delay 2 - createsprite gUnknown_085CE544, 2, 90, 0, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 90, 0, 64 delay 2 - createsprite gUnknown_085CE544, 2, 48, 0, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 48, 0, 64 delay 2 - createsprite gUnknown_085CE544, 2, 95, 1, 80 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 95, 1, 80 delay 2 - createsprite gUnknown_085CE544, 2, 100, 0, 120 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120 delay 2 - createsprite gUnknown_085CE544, 2, 75, 1, 64 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 75, 1, 64 delay 2 - createsprite gUnknown_085CE544, 2, 85, 0, 120 + createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 85, 0, 120 delay 2 return Move_HYPER_BEAM: - loadspritegfx ANIM_TAG_147 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK + loadspritegfx ANIM_TAG_ORBS + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish delay 10 - playsewithpan SE_W063, -64 + playsewithpan SE_W063, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1 waitforvisualfinish delay 30 - createsoundtask sub_8158C58, 247, -64, 63, 1, 15, 0, 5 + 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 @@ -8389,28 +8389,28 @@ Move_HYPER_BEAM: call HyperBeam1 createvisualtask sub_8116620, 10, 4, 2, 11, 0, RGB(25, 25, 25) waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 16, 0, RGB_BLACK end HyperBeam1: - createsprite gUnknown_08592288, 130 - createsprite gUnknown_08592288, 130 + createsprite gUnknown_08592288, ANIM_TARGET, 2 + createsprite gUnknown_08592288, ANIM_TARGET, 2 delay 1 return Move_FLATTER: - loadspritegfx ANIM_TAG_227 - loadspritegfx ANIM_TAG_240 - createvisualtask sub_8159244, 5, 223, 63 + 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 waitforvisualfinish - createsprite gUnknown_085CE5C0, 130, 0, -8, 80 + createsprite gUnknown_085CE5C0, ANIM_TARGET, 2, 0, -8, 80 delay 0 - createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET delay 10 - createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET delay 0 - createvisualtask sub_8159210, 5, 229, -64 + createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER call Flatter1 call Flatter1 call Flatter1 @@ -8431,61 +8431,61 @@ Move_FLATTER: call Flatter1 call Flatter1 delay 5 - createvisualtask sub_8159210, 5, 229, 63 + createvisualtask sub_8159210, 5, 229, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 waitforvisualfinish createvisualtask sub_815AC8C, 2 end Flatter1: - createsprite gUnknown_085CE5A8, 40, 0 - createsprite gUnknown_085CE5A8, 40, 1 + createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 0 + createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 1 return Move_ROLE_PLAY: monbg ANIM_ATK_PARTNER createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_WHITE - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 10, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 10, RGB_BLACK waitforvisualfinish - playsewithpan SE_W161, -64 - waitplaysewithpan SE_W197, -64, 30 + playsewithpan SE_W161, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 createvisualtask sub_815CED8, 2 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE delay 8 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 10, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 10, 0, RGB_BLACK end Move_REFRESH: - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_SPARKLE - playsewithpan SE_W287, -64 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 + playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_815DFCC, 2, 0 waitforvisualfinish - playsewithpan SE_W234, -64 + playsewithpan SE_W234, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish - playsewithpan SE_REAPOKE, -64 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, 3, 0, 0, 0, 0 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 0, 0, 0, 0 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 - playsewithpan SE_W172, +63 - createsprite gUnknown_08595F14, 131, 0, 0, 1, 30 + playsewithpan SE_W172, SOUND_PAN_TARGET + createsprite gUnknown_08595F14, ANIM_TARGET, 3, 0, 0, 1, 30 createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE delay 30 - playsewithpan SE_W007, +63 - createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + playsewithpan SE_W007, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 call FireMoveEffect waitforvisualfinish clearmonbg ANIM_TARGET @@ -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 @@ -8503,9 +8503,9 @@ Move_HYPER_VOICE: waitforvisualfinish end HyperVoiceEffect: - createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 8, 0, RGB_YELLOW + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 8, 0, RGB_YELLOW createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_ATTACKER, 0 - createsprite gUnknown_08593880, 0, 45, 0, 0, 0, 0, 0, 1 + createsprite gUnknown_08593880, ANIM_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 6, 1 createvisualtask sub_81162A4, 2, 1, 0, 6, 1 @@ -8513,30 +8513,30 @@ HyperVoiceEffect: return Move_SAND_TOMB: - loadspritegfx ANIM_TAG_074 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0) + loadspritegfx ANIM_TAG_MUD_SAND + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1 - playsewithpan SE_W328, +63 + playsewithpan SE_W328, SOUND_PAN_TARGET call SandTombEffect call SandTombEffect call SandTombEffect delay 22 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish end SandTombEffect: - createsprite gUnknown_08596B34, 130, 0, 32, 528, 30, 10, 50, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 32, 528, 30, 10, 50, 1 delay 2 - createsprite gUnknown_08596B34, 130, 0, 36, 480, 20, 13, -46, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 36, 480, 20, 13, -46, 1 delay 2 - createsprite gUnknown_08596B34, 130, 0, 37, 576, 20, 5, 42, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 37, 576, 20, 5, 42, 1 delay 2 - createsprite gUnknown_08596B34, 130, 0, 35, 400, 25, 8, -42, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 35, 400, 25, 8, -42, 1 delay 2 - createsprite gUnknown_08596B34, 130, 0, 32, 512, 25, 13, 46, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 32, 512, 25, 13, 46, 1 delay 2 - createsprite gUnknown_08596B34, 130, 0, 37, 464, 30, 12, -50, 1 + createsprite gUnknown_08596B34, ANIM_TARGET, 2, 0, 37, 464, 30, 12, -50, 1 delay 2 return @@ -8550,7 +8550,7 @@ Move_SHEER_COLD: monbgprio_28 ANIM_TARGET setalpha 12, 8 createvisualtask sub_80A9EF4, 2 - waitplaysewithpan SE_W258, +63, 17 + waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -8559,19 +8559,19 @@ 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 delay 6 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 3 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3 delay 4 - playsewithpan SE_W207, +63 - createsprite gUnknown_08596034, 130, 10, -8, 14, 3 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_08596034, ANIM_TARGET, 2, 10, -8, 14, 3 waitforvisualfinish createvisualtask sub_80D6134, 5, 8, 5, 0, 1 - playsewithpan SE_W003, +63 + playsewithpan SE_W003, SOUND_PAN_TARGET choosetwoturnanim ArmThrustRight, ArmThrustLeft ArmThrustContinue: createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 @@ -8579,99 +8579,99 @@ ArmThrustContinue: blendoff end ArmThrustRight: - createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, 1, 2 goto ArmThrustContinue ArmThrustLeft: - createsprite gBasicHitSplatSpriteTemplate, 130, -8, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 0, 1, 2 goto ArmThrustContinue Move_MUDDY_WATER: - panse_1B SE_W250, -64, +63, +2, 0 + panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask AnimTask_CreateSurfWave, 2, TRUE waitforvisualfinish end Move_BULLET_SEED: loadspritegfx ANIM_TAG_SEED - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 30, 1 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, 130, 20, 0 + createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 waitforvisualfinish end Move_DRAGON_CLAW: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_CLAW_SLASH - playsewithpan SE_W221B, -64 + playsewithpan SE_W221B, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 2, 4, 0, 8, RGB(31, 19, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1 call DragonClawEffect call DragonClawEffect - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 - createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 - createvisualtask sub_8159210, 5, 136, 63 - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 - createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 - createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + createvisualtask sub_8159210, 5, 136, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, -10, 10, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 delay 2 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 - createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 - createvisualtask sub_8159210, 5, 136, 63 - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 - createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 - createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 - createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + createvisualtask sub_8159210, 5, 136, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, ANIM_TARGET, 2, 10, 10, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 createvisualtask sub_8116620, 10, 2, 4, 8, 0, RGB(31, 19, 0) waitforvisualfinish end DragonClawEffect: - createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 576, 20, 8, 42, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 31, 400, 25, 11, -42, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 - createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + createsprite gUnknown_08596B88, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 delay 2 return @@ -8679,14 +8679,14 @@ 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 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 delay 6 createvisualtask sub_81076C8, 5, 100 - panse_1B SE_W250, -64, +63, +1, 0 + panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call MudShot1 call MudShot1 call MudShot1 @@ -8704,29 +8704,29 @@ Move_MUD_SHOT: blendoff end MudShot1: - createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 + createsprite gUnknown_085950FC, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 - createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 + createsprite gUnknown_085950FC, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 return Move_METEOR_MASH: - loadspritegfx ANIM_TAG_233 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 - panse_1B SE_W112, -64, +63, +3, 0 + 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 waitforvisualfinish - createsprite gUnknown_085CE8DC, 131, -48, -64, 72, 32, 30 + createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -48, SOUND_PAN_ATTACKER, 72, 32, 30 delay 10 - createsprite gUnknown_085CE8DC, 131, -112, -64, 8, 32, 30 + createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -112, SOUND_PAN_ATTACKER, 8, 32, 30 delay 40 - createsprite gUnknown_08595F14, 131, 0, 0, 0, 30 - createsprite gUnknown_085CE8DC, 131, -80, -64, 40, 32, 30 + createsprite gUnknown_08595F14, ANIM_TARGET, 3, 0, 0, 0, 30 + createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -80, SOUND_PAN_ATTACKER, 40, 32, 30 delay 20 - playsewithpan SE_W233B, +63 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1 waitforvisualfinish delay 10 @@ -8736,39 +8736,39 @@ Move_METEOR_MASH: end Move_REVENGE: - loadspritegfx ANIM_TAG_245 + loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W036, -64 - createsprite gUnknown_08596088, 2, 10, -10 + playsewithpan SE_W036, SOUND_PAN_ATTACKER + createsprite gUnknown_08596088, ANIM_ATTACKER, 2, 10, -10 waitforvisualfinish createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED waitforvisualfinish - unloadspritegfx ANIM_TAG_245 - loadspritegfx ANIM_TAG_246 - createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + unloadspritegfx ANIM_TAG_PURPLE_SCRATCH + loadspritegfx ANIM_TAG_PURPLE_SWIPE + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 4 - playsewithpan SE_W207, +63 - createsprite gUnknown_085960D0, 130, 10, -10 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_085960D0, ANIM_TARGET, 2, 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, +63 + createsprite gUnknown_08597400, ANIM_TARGET, 3, -10, -8, 1, 1, 8 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08597400, 131, 10, 8, 1, 1, 8 - playsewithpan SE_W025B, +63 + createsprite gUnknown_08597400, ANIM_TARGET, 3, 10, 8, 1, 1, 8 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_POISON_FANG: - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W044, +63 - createsprite gUnknown_085CE1DC, 130 + playsewithpan SE_W044, SOUND_PAN_TARGET + createsprite gUnknown_085CE1DC, ANIM_TARGET, 2 delay 10 createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1 waitforvisualfinish @@ -8778,72 +8778,72 @@ Move_POISON_FANG: end Move_SUBSTITUTE: - playsewithpan SE_W213, -64 + playsewithpan SE_W213, SOUND_PAN_ATTACKER createvisualtask AnimTask_MonToSubstitute, 2 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 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 0, 5, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592564, 2, 10, 8, 2, 0, 0, 100 - playsewithpan SE_W010, -64 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_08592564, 2, 20, -8, -2, 0, 1, 95 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, -43 delay 5 - createsprite gUnknown_08592564, 2, 30, 8, -4, 0, 0, 90 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 playsewithpan SE_W010, -22 delay 5 - createsprite gUnknown_08592564, 2, 40, -8, 4, 0, 1, 85 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 playsewithpan SE_W010, 0 delay 5 - createsprite gUnknown_08592564, 2, 50, 8, 0, 0, 0, 85 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 playsewithpan SE_W010, +21 delay 5 - createsprite gUnknown_08592564, 2, 60, -8, -2, 0, 1, 85 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 playsewithpan SE_W010, +42 delay 5 - createsprite gUnknown_08592564, 2, 75, 8, 0, 0, 0, 85 - playsewithpan SE_W010, +63 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 + playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08592564, 2, 85, 16, 6, 0, 3, 80 - playsewithpan SE_W010, +63 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 + playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08592564, 2, 85, -16, -6, 0, 2, 75 - playsewithpan SE_W010, +63 + createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 + playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -10, 1, 3 - playsewithpan SE_W003, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, 1, 3 + playsewithpan SE_W003, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1 delay 3 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, 8, 1, 3 - playsewithpan SE_W003, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 1, 3 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 3 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, -3, 1, 2 - playsewithpan SE_W003, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -3, 1, 2 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 3 - createsprite gBasicHitSplatSpriteTemplate, 2, -3, 1, 1, 2 - playsewithpan SE_W003, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -3, 1, 1, 2 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 2 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, 1, 1, 1 - playsewithpan SE_W003, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 1, 1, 1 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 2 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 10, 1, 1 - playsewithpan SE_W003, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 10, 1, 1 + playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 5, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 5, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET blendoff 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 @@ -8857,8 +8857,8 @@ Move_METAL_SOUND: waitforvisualfinish end MetalSound1: - panse_1B SE_W103, -64, +63, +2, 0 - createsprite gUnknown_08593458, 130, 16, 0, 0, 0, 30, 0 + panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + createsprite gUnknown_08593458, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -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 @@ -8880,20 +8880,20 @@ FocusPunchContinue: waitbgfadein monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, +63 - createsprite gUnknown_08596104, 130 + playsewithpan SE_W207, SOUND_PAN_TARGET + createsprite gUnknown_08596104, ANIM_TARGET, 2 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, 2, 1, 0 - playsewithpan SE_W233B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 2, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, -6, 1, 0 - playsewithpan SE_W233B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -6, 1, 0 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 8, 1, 0 - playsewithpan SE_W025B, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 8, 1, 0 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -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 @@ -8926,95 +8926,95 @@ ReturnContinue: blendoff end ReturnWeak: - createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 - createvisualtask sub_8159210, 5, 139, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 139, SOUND_PAN_TARGET goto ReturnContinue ReturnMedium: - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish delay 11 - createsprite gHorizontalLungeSpriteTemplate, 2, 5, 4 + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 4 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 - createvisualtask sub_8159210, 5, 141, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET goto ReturnContinue ReturnStrong: - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 - createvisualtask sub_8159210, 5, 123, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 2 - createvisualtask sub_8159210, 5, 123, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 - createvisualtask sub_8159210, 5, 123, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 2 - createvisualtask sub_8159210, 5, 123, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -5, 3, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 goto ReturnContinue ReturnStrongest: - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 6, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 8 - createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 - createvisualtask sub_8159210, 5, 123, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 12, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 12, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 - createvisualtask sub_8159210, 5, 123, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 4 - createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 - createvisualtask sub_8159210, 5, 123, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 2 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 - createsprite gVerticalDipSpriteTemplate, 2, 4, 1, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 - createvisualtask sub_8159210, 5, 123, 63 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish - createsprite gVerticalDipSpriteTemplate, 2, 4, 2, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 2, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER delay 5 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 - createvisualtask sub_8159210, 5, 123, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish @@ -9022,33 +9022,33 @@ ReturnStrongest: call ReturnStrongest1 call ReturnStrongest1 call ReturnStrongest1 - createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 - createvisualtask sub_8159210, 5, 141, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 0 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 0 - createvisualtask sub_8159210, 5, 141, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1, 0 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET delay 6 - createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 0 - createvisualtask sub_8159210, 5, 141, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, 1, 0 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET delay 6 - createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 0 - createvisualtask sub_8159210, 5, 141, 63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -5, 3, 1, 0 + createvisualtask sub_8159210, 5, 141, SOUND_PAN_TARGET waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6, 0, RGB_BLACK goto ReturnContinue ReturnStrongest1: - createsprite gVerticalDipSpriteTemplate, 2, 4, 3, ANIM_ATTACKER - createvisualtask sub_8159244, 5, 167, -64 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask sub_8159210, 5, 123, 63 + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 3, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, SOUND_PAN_ATTACKER + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 + createvisualtask sub_8159210, 5, 123, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish 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 @@ -9058,10 +9058,10 @@ Move_COSMIC_POWER: createvisualtask sub_8117660, 2, 0, 128, 0, -1 waitbgfadein delay 70 - createvisualtask sub_8159210, 5, 228, -64 - createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 + createvisualtask sub_8159210, 5, 228, SOUND_PAN_ATTACKER + createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 - createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 + createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 40 createvisualtask sub_8117610, 2, 0, 15, 0, 0 waitforvisualfinish @@ -9073,44 +9073,44 @@ 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, -64 - createsprite gUnknown_08595428, 2, -32, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, -20, -10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 0, -16, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 20, -10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 32, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 20, 10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, 0, 16, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, -20, 10, 24, 0, 0, 0 + playsewithpan SE_W221, SOUND_PAN_ATTACKER + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -32, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -20, -10, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 0, -16, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 20, -10, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 32, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 20, 10, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 0, 16, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -20, 10, 24, 0, 0, 0 delay 25 - playsewithpan SE_W172B, -64 - createsprite gUnknown_08595428, 2, -64, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 6, -40, -20, 24, 0, 0, 0 - createsprite gUnknown_08595428, 70, 0, -32, 24, 0, 0, 0 - createsprite gUnknown_08595428, 70, 40, -20, 24, 0, 0, 0 + playsewithpan SE_W172B, SOUND_PAN_ATTACKER + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -64, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 6, -40, -20, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 70, 0, -32, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 70, 40, -20, 24, 0, 0, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 - createsprite gUnknown_08595428, 66, 64, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 40, 20, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, 0, 32, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, -40, 20, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 64, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 40, 20, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 0, 32, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -40, 20, 24, 0, 0, 0 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 25 - playsewithpan SE_W172B, -64 - createsprite gUnknown_08595428, 2, -96, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 6, -60, -30, 24, 0, 0, 0 - createsprite gUnknown_08595428, 70, 0, -48, 24, 0, 0, 0 - createsprite gUnknown_08595428, 70, 60, -30, 24, 0, 0, 0 - createsprite gBasicHitSplatSpriteTemplate, 130, -4, 3, 1, 0 + playsewithpan SE_W172B, SOUND_PAN_ATTACKER + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -96, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 6, -60, -30, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 70, 0, -48, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 70, 60, -30, 24, 0, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, 3, 1, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 12, 0, 20, 1 createvisualtask sub_81162A4, 2, 2, 0, 10, 1 - createsprite gUnknown_08595428, 66, 96, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 66, 60, 30, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, 0, 48, 24, 0, 0, 0 - createsprite gUnknown_08595428, 2, -60, 30, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 96, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 66, 60, 30, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, 0, 48, 24, 0, 0, 0 + createsprite gUnknown_08595428, ANIM_ATTACKER, 2, -60, 30, 24, 0, 0, 0 createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -9119,46 +9119,46 @@ 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 + createsprite gUnknown_08596C58, ANIM_TARGET, 2, 20, 12, 64, 114, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 - playsewithpan SE_W070, +63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08596C58, 130, -20, 12, 64, 98, 0 + createsprite gUnknown_08596C58, ANIM_TARGET, 2, -20, 12, 64, 98, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 - playsewithpan SE_W070, +63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08596C58, 194, 3, 6, 64, 82, 0 + createsprite gUnknown_08596C58, ANIM_TARGET, 66, 3, 6, 64, 82, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 - playsewithpan SE_W070, +63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08596C58, 130, -3, 13, 64, 66, 0 + createsprite gUnknown_08596C58, ANIM_TARGET, 2, -3, 13, 64, 66, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 - playsewithpan SE_W070, +63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 24 - playsewithpan SE_W063, +63 - createsprite gUnknown_085967AC, 133, 1, 50 + playsewithpan SE_W063, SOUND_PAN_TARGET + createsprite gUnknown_085967AC, ANIM_TARGET, 5, 1, 50 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1 createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish end Move_SILVER_WIND: - loadspritegfx ANIM_TAG_271 - panse_1B SE_W016, -64, +63, +2, 0 + loadspritegfx ANIM_TAG_SPARKLE_6 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 playsewithpan SE_W234, 0 delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 delay 0 createvisualtask sub_8116664, 10, 1, 0, 0, 4, RGB_BLACK - createvisualtask AnimTask_IsTargetOpponentSide, 2 + createvisualtask AnimTask_GetTargetSide, 2 jumprettrue SilverWindOnPlayer fadetobg BG_BUG_OPPONENT waitbgfadeout @@ -9167,31 +9167,31 @@ SilverWindContinue: delay 0 createvisualtask sub_8116620, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein - createsprite gUnknown_08592830, -62, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592830, -62, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592830, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592830, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gUnknown_08592830, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gUnknown_08592830, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gUnknown_08592830, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592830, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite gUnknown_08592848, -62, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592848, -62, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592848, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592848, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gUnknown_08592848, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gUnknown_08592848, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gUnknown_08592848, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592848, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite gUnknown_08592860, -62, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592860, -62, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592860, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592860, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gUnknown_08592860, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gUnknown_08592860, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gUnknown_08592860, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592860, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 6 - createsprite gUnknown_08592830, -62, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592830, -62, -16, 12, 192, 5, 2, 3, 1 + createsprite gUnknown_08592830, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592830, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite gUnknown_08592848, -62, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592848, -62, -16, 12, 192, 5, 2, 3, 1 + createsprite gUnknown_08592848, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592848, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite gUnknown_08592860, -62, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592860, -62, -16, 12, 192, 5, 2, 3, 1 + createsprite gUnknown_08592860, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592860, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish - playsewithpan SE_W016B, +63 + playsewithpan SE_W016B, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER delay 0 restorebg @@ -9207,21 +9207,21 @@ SilverWindOnPlayer: goto SilverWindContinue Move_SNATCH: - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6 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 - playsewithpan SE_W029, -64 - createsprite gUnknown_08596490, 2, 0, 0, 13, 336 + loadspritegfx ANIM_TAG_ROUND_SHADOW + playsewithpan SE_W029, SOUND_PAN_ATTACKER + createsprite gUnknown_08596490, ANIM_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish - playsewithpan SE_W291, -64 - createsprite gUnknown_085964CC, 3, 0 + playsewithpan SE_W291, SOUND_PAN_ATTACKER + createsprite gUnknown_085964CC, ANIM_ATTACKER, 3, 0 call DiveSetUp1 call DiveSetUp1 call DiveSetUp1 @@ -9229,16 +9229,16 @@ DiveSetUp: call DiveSetUp1 end DiveSetUp1: - createsprite gUnknown_085964E4, 5, 0, 0 - createsprite gUnknown_085964E4, 5, 1, 0 + createsprite gUnknown_085964E4, ANIM_ATTACKER, 5, 0, 0 + createsprite gUnknown_085964E4, ANIM_ATTACKER, 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, +63 - createsprite gUnknown_085964CC, 131, 1 + playsewithpan SE_W153, SOUND_PAN_TARGET + createsprite gUnknown_085964CC, ANIM_TARGET, 3, 1 call DiveAttack1 call DiveAttack1 call DiveAttack1 @@ -9252,34 +9252,34 @@ DiveAttack: blendoff end DiveAttack1: - createsprite gUnknown_085964E4, 133, 0, 1 - createsprite gUnknown_085964E4, 133, 1, 1 + createsprite gUnknown_085964E4, ANIM_TARGET, 5, 0, 1 + createsprite gUnknown_085964E4, ANIM_TARGET, 5, 1, 1 return Move_ROCK_BLAST: - loadspritegfx ANIM_TAG_058 - loadspritegfx ANIM_TAG_135 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 3 - playsewithpan SE_W207, -64 - createsprite gUnknown_08596C98, 130, 16, 0, 0, 0, 25, 257 + playsewithpan SE_W207, SOUND_PAN_ATTACKER + createsprite gUnknown_08596C98, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 - playsewithpan SE_W088, +63 - createsprite gUnknown_08596B1C, 130, 0, 0, 20, 24, 14, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET + createsprite gUnknown_08596B1C, ANIM_TARGET, 2, 0, 0, 20, 24, 14, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 - createsprite gUnknown_08596B1C, 130, 5, 0, -20, 24, 14, 1 - createsprite gUnknown_08596B1C, 130, 0, 5, 20, -24, 14, 2 - createsprite gUnknown_08596B1C, 130, -5, 0, -20, -24, 14, 2 + createsprite gUnknown_08596B1C, ANIM_TARGET, 2, 5, 0, -20, 24, 14, 1 + createsprite gUnknown_08596B1C, ANIM_TARGET, 2, 0, 5, 20, -24, 14, 2 + createsprite gUnknown_08596B1C, ANIM_TARGET, 2, -5, 0, -20, -24, 14, 2 waitforvisualfinish end 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) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 5, RGB(28, 0, 0) waitforvisualfinish createvisualtask sub_8117C44, 5 waitforvisualfinish @@ -9287,61 +9287,61 @@ Move_OVERHEAT: delay 1 createvisualtask sub_8117DD8, 5, 0 delay 1 - playsewithpan SE_W082, -64 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_8117CA0, 5, 1, 0 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 1, 0, 13, RGB(28, 0, 0) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 1, 0, 13, RGB(28, 0, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 waitforvisualfinish - playsewithpan SE_W172B, -64 - createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, -20 - createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, -20 - createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, -20 - createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, -20 - createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, -20 - createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, -20 - createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, -20 - createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, -20 + playsewithpan SE_W172B, SOUND_PAN_ATTACKER + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 0, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 32, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 64, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 96, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 128, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 160, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 192, 30, 25, -20 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 224, 30, 25, -20 delay 5 - createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, 0 - createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, 0 - createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, 0 - createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, 0 - createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, 0 - createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, 0 - createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, 0 - createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 0, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 32, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 64, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 96, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 128, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 160, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 192, 30, 25, 0 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 224, 30, 25, 0 delay 5 - createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, 10 - createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, 10 - createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, 10 - createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, 10 - createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, 10 - createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, 10 - createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, 10 - createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 0, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 32, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 64, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 96, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 2, 1, 128, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 160, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 192, 30, 25, 10 + createsprite gUnknown_08596FB0, ANIM_ATTACKER, 66, 1, 224, 30, 25, 10 delay 5 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 131, -5, 3, 1, 0 - playsewithpan SE_W007, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, 3, 1, 0 + playsewithpan SE_W007, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1 delay 6 - createsprite gBasicHitSplatSpriteTemplate, 131, 8, -5, 1, 0 - playsewithpan SE_W007, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -5, 1, 0 + playsewithpan SE_W007, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 131, 10, 10, 1, 0 - playsewithpan SE_W007, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 10, 1, 0 + playsewithpan SE_W007, SOUND_PAN_TARGET delay 8 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 0 - playsewithpan SE_W007, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 0 + playsewithpan SE_W007, SOUND_PAN_TARGET createvisualtask sub_8117DD8, 5, 1 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, -1, 0, 13, RGB(18, 18, 18) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 0, 13, RGB(18, 18, 18) createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 3, 0, 15, 1 waitforvisualfinish createvisualtask sub_8117D3C, 5, 0, 1 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 5, 0, RGB(28, 0, 0) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 5, 0, RGB(28, 0, 0) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -9349,36 +9349,36 @@ Move_OVERHEAT: delay 15 createvisualtask sub_8117D3C, 5, 1, 0 delay 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 13, 0, RGB(18, 18, 18) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 13, 0, RGB(18, 18, 18) waitforvisualfinish createvisualtask sub_8117C70, 5 waitforvisualfinish 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, -64 - createsprite gUnknown_085951C0, 130 + playsewithpan SE_W057, SOUND_PAN_ATTACKER + createsprite gUnknown_085951C0, ANIM_TARGET, 2 delay 10 createvisualtask sub_8115F10, 2, 257, 257, 257 delay 30 - panse_1B SE_W056, -64, +63, +2, 0 + panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call HydroCannon1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 10, 0, 40, 1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 call HydroCannon1 - createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + createsprite gUnknown_08597388, ANIM_TARGET, 2, 0, 0, 1, 0 waitforvisualfinish createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish @@ -9386,33 +9386,33 @@ Move_HYDRO_CANNON: blendoff end HydroCannon1: - createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + createsprite gUnknown_085951D8, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + createsprite gUnknown_085951D8, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + createsprite gUnknown_085951D8, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + createsprite gUnknown_085951D8, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 - createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + createsprite gUnknown_085951D8, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 return Move_ASTONISH: - loadspritegfx ANIM_TAG_273 - playsewithpan SE_W227, -64 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + loadspritegfx ANIM_TAG_SWEAT_BEAD + playsewithpan SE_W227, SOUND_PAN_ATTACKER + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 25 - createsprite gUnknown_085964E4, -123, 0, 1 - playsewithpan SE_W166, +63 - createsprite gUnknown_085964E4, -123, 1, 1 + createsprite gUnknown_085964E4, ANIM_TARGET, 5, 0, 1 + playsewithpan SE_W166, SOUND_PAN_TARGET + createsprite gUnknown_085964E4, ANIM_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 createvisualtask sub_8106020, 3 waitforvisualfinish 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 @@ -9459,67 +9459,67 @@ SeismicTossStrong: call SeismicToss1 goto SeismicTossContinue SeismicToss1: - createsprite gBasicHitSplatSpriteTemplate, 131, -10, -8, 1, 1 - playsewithpan SE_W070, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, 1, 1 + playsewithpan SE_W070, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 - createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3 - createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4 - createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3 - createsprite gUnknown_08596CB0, 130, 12, 25, 4, 4 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -12, 27, 2, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 8, 28, 3, 4 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -4, 30, 2, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 12, 25, 4, 4 return SeismicToss2: - createsprite gBasicHitSplatSpriteTemplate, 131, 10, -8, 1, 1 - playsewithpan SE_W088, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, -8, 1, 1 + playsewithpan SE_W088, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 - createsprite gUnknown_08596CB0, 130, -12, 32, 3, 4 - createsprite gUnknown_08596CB0, 130, 8, 31, 2, 2 - createsprite gUnknown_08596CB0, 130, -4, 28, 2, 3 - createsprite gUnknown_08596CB0, 130, 12, 30, 4, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -12, 32, 3, 4 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 8, 31, 2, 2 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -4, 28, 2, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 12, 30, 4, 3 return Move_MAGIC_COAT: - loadspritegfx ANIM_TAG_170 + loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, -64, 15 - createsprite gUnknown_085965C0, 3, 40, 0, 10170 + waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + createsprite gUnknown_085965C0, ANIM_ATTACKER, 3, 40, 0, 10170 waitforvisualfinish delay 1 blendoff 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, -64 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 7, RGB(0, 25, 28) + playsewithpan SE_W145C, SOUND_PAN_ATTACKER + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 7, RGB(0, 25, 28) delay 10 - createsprite gUnknown_085952F8, 66, 100, 100, 8, 1, 20, 40, 0 - createsprite gUnknown_085952F8, 66, 20, 100, 16, 2, 10, 35, 1 - createsprite gUnknown_085952F8, 66, 200, 80, 8, 1, 40, 20, 0 - createsprite gUnknown_085952F8, 66, 80, 60, 10, 3, 20, 50, 0 - createsprite gUnknown_085952F8, 66, 140, 100, 16, 1, 20, 30, 1 - playsewithpan SE_W145C, +63 - waitforvisualfinish - playsewithpan SE_W202, -64 - createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 + createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 20, 100, 16, 2, 10, 35, 1 + createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 + createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 + createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 + playsewithpan SE_W145C, SOUND_PAN_TARGET + waitforvisualfinish + playsewithpan SE_W202, SOUND_PAN_ATTACKER + createsprite gUnknown_08593470, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, -64 - createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + playsewithpan SE_W202, SOUND_PAN_ATTACKER + createsprite gUnknown_08593470, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, -64 - createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + playsewithpan SE_W202, SOUND_PAN_ATTACKER + createsprite gUnknown_08593470, ANIM_TARGET, 2, 0, 0, 40, 15 delay 13 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB(0, 25, 28) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 7, 0, RGB(0, 25, 28) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_PSYCHO_BOOST: - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout @@ -9532,13 +9532,13 @@ Move_PSYCHO_BOOST: setalpha 8, 8 delay 10 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0 - loopsewithpan SE_W060B, -64, 14, 10 - createsprite gUnknown_08596920, 2 + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10 + createsprite gUnknown_08596920, ANIM_ATTACKER, 2 delay 110 - loopsewithpan SE_W060B, -64, 7, 10 + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1 - playsewithpan SE_W043, +63 + playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -9546,22 +9546,22 @@ Move_PSYCHO_BOOST: end Move_KNOCK_OFF: - loadspritegfx ANIM_TAG_277 - loadspritegfx ANIM_TAG_135 - createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + loadspritegfx ANIM_TAG_SLAM_HIT_2 + loadspritegfx ANIM_TAG_IMPACT + createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 - playsewithpan SE_W233, +63 - createsprite gUnknown_085CE984, 130, -16, -16 + playsewithpan SE_W233, SOUND_PAN_TARGET + createsprite gUnknown_085CE984, ANIM_TARGET, 2, -16, -16 delay 8 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 - playsewithpan SE_W004, +63 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 + playsewithpan SE_W004, SOUND_PAN_TARGET + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 delay 5 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 delay 10 waitforvisualfinish end @@ -9571,56 +9571,56 @@ Move_DOOM_DESIRE: delay 1 monbg ANIM_ATK_PARTNER createvisualtask sub_811489C, 5, 1, 0 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish delay 20 createvisualtask sub_811489C, 5, 1, 1 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end Move_SKY_UPPERCUT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout - playsewithpan SE_W327, -64 + playsewithpan SE_W327, SOUND_PAN_ATTACKER createvisualtask sub_810DABC, 5, 55 waitbgfadein setalpha 12, 8 delay 38 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 28, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 0, 0, 5 delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1 - playsewithpan SE_W233B, +63 - createsprite gBasicHitSplatSpriteTemplate, 131, -28, 28, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -28, 28, 1, 1 delay 1 - playsewithpan SE_W233B, +63 - createsprite gBasicHitSplatSpriteTemplate, 131, -15, 8, 1, 1 - playsewithpan SE_W233B, +63 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -15, 8, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - playsewithpan SE_W233B, +63 - createsprite gBasicHitSplatSpriteTemplate, 131, -5, -12, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, -12, 1, 1 delay 1 - playsewithpan SE_W233B, +63 - createsprite gBasicHitSplatSpriteTemplate, 131, 0, -32, 1, 1 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -32, 1, 1 delay 1 - playsewithpan SE_W233B, +63 - createsprite gBasicHitSplatSpriteTemplate, 131, 5, -52, 1, 1 - createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -26, 16, 1, 4 + playsewithpan SE_W233B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, -52, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -26, 16, 1, 4 delay 4 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 delay 30 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 delay 4 - createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6 clearmonbg ANIM_DEF_PARTNER blendoff restorebg @@ -9643,87 +9643,87 @@ 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, +63 - createsprite gUnknown_085923A8, 130, 120, 70, 5, 70, 30 + playsewithpan SE_W239, SOUND_PAN_TARGET + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 120, 70, 5, 70, 30 delay 1 - createsprite gUnknown_085923A8, 130, 115, 55, 6, 60, 25 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 55, 6, 60, 25 delay 1 - createsprite gUnknown_085923A8, 130, 115, 60, 7, 60, 30 - createsprite gUnknown_085923A8, 130, 115, 55, 10, 60, 30 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 60, 7, 60, 30 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 55, 10, 60, 30 delay 3 - createsprite gUnknown_08596CC8, 130, 100, 50, 4, 50, 26 + createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 100, 50, 4, 50, 26 delay 1 - createsprite gUnknown_085923A8, 130, 105, 25, 8, 60, 20 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 105, 25, 8, 60, 20 delay 1 - createsprite gUnknown_085923A8, 130, 115, 40, 10, 48, 30 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 40, 10, 48, 30 delay 3 - createsprite gUnknown_08596CC8, 130, 120, 30, 6, 45, 25 - createsprite gUnknown_085923A8, 130, 115, 35, 10, 60, 30 + createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 120, 30, 6, 45, 25 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 35, 10, 60, 30 delay 3 - createsprite gUnknown_08596CC8, 130, 105, 20, 8, 40, 0 + createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 105, 20, 8, 40, 0 delay 3 - createsprite gUnknown_085923A8, 130, 20, 255, 15, 32, 0 - createsprite gUnknown_085923A8, 130, 110, 10, 8, 32, 20 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 20, 255, 15, 32, 0 + createsprite gUnknown_085923A8, ANIM_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish - createsprite gBasicHitSplatSpriteTemplate, 131, -32, -16, 1, 3 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, 1, 3 + playsewithpan SE_W004, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1 delay 4 - createsprite gUnknown_085973A0, 131, 1, 3 - playsewithpan SE_W004, +63 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_085973A0, 131, 1, 3 - playsewithpan SE_W004, +63 + createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 4 - createsprite gBasicHitSplatSpriteTemplate, 131, 32, 20, 1, 3 - playsewithpan SE_W004, +63 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, 1, 3 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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 - loopsewithpan SE_W077, -64, 10, 5 + loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 createvisualtask sub_81007C4, 5 - createsprite gUnknown_08592390, 2, -3, -2, 10 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite gUnknown_08592390, 2, -1, -1, 15 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite gUnknown_08592390, 2, -4, -4, 7 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite gUnknown_08592390, 2, 3, -3, 11 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite gUnknown_08592390, 2, -1, -6, 8 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite gUnknown_08592390, 2, 2, -1, 12 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite gUnknown_08592390, 2, -3, -4, 13 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite gUnknown_08592390, 2, 4, -5, 7 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite gUnknown_08592390, 2, 2, -6, 11 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite gUnknown_08592390, 2, -3, -5, 8 + createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, -64 - createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, 20, 0 - createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, -20, 0 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER + createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 + createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 - playsewithpan SE_W013, +63 - createsprite gBasicHitSplatSpriteTemplate, 132, -10, -4, 1, 2 - createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2 + playsewithpan SE_W013, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 10, 4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 delay 20 setarg 7, -1 @@ -9734,14 +9734,14 @@ 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: - playsewithpan SE_W196, -64 - createsprite gUnknown_08595DE4, 130, 15, 0, -12, -16, 30, -40 + playsewithpan SE_W196, SOUND_PAN_ATTACKER + createsprite gUnknown_08595DE4, ANIM_TARGET, 2, 15, 0, -12, -16, 30, -40 delay 28 - playsewithpan SE_W280, +63 + playsewithpan SE_W280, SOUND_PAN_TARGET createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 0, IceBallWeakest jumpargeq 0, 1, IceBallWeak @@ -9819,19 +9819,19 @@ IceBallStrongest: call IceBall1 goto IceBallContinue2 IceBall1: - createsprite gUnknown_08595DFC, 132, -12, -16 + createsprite gUnknown_08595DFC, ANIM_TARGET, 4, -12, -16 return Move_WEATHER_BALL: - loadspritegfx ANIM_TAG_283 - createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER + loadspritegfx ANIM_TAG_WEATHER_BALL + createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER delay 8 - playsewithpan SE_W207, -64 - createsprite gUnknown_0853EE38, 2 + playsewithpan SE_W207, SOUND_PAN_ATTACKER + createsprite gUnknown_0853EE38, ANIM_ATTACKER, 2 waitforvisualfinish delay 15 playsewithpan SE_W197, 0 - createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2 delay 1 @@ -9841,87 +9841,87 @@ Move_WEATHER_BALL: jumpreteq ANIM_WEATHER_SANDSTORM, WeatherBallSandstorm jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce WeatherBallNormal: - loadspritegfx ANIM_TAG_135 - createsprite gUnknown_0853EE50, 130, -30, -100, 25, 1, 0, 0 + loadspritegfx ANIM_TAG_IMPACT + createsprite gUnknown_0853EE50, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish - playsewithpan SE_W025B, +63 - createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 2 + playsewithpan SE_W025B, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end WeatherBallFire: loadspritegfx ANIM_TAG_SMALL_EMBER - createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 40, 10 - playsewithpan SE_W172, +63 + createsprite gUnknown_0859559C, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 + playsewithpan SE_W172, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W172, +63 + createsprite gUnknown_0859559C, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 + playsewithpan SE_W172, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W172, +63 + createsprite gUnknown_0859559C, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 + playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W172B, +63 + playsewithpan SE_W172B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end WeatherBallWater: - loadspritegfx ANIM_TAG_155 - createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 50, 10 - playsewithpan SE_W152, +63 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + createsprite gUnknown_08595328, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08595328, 130, -30, -100, 25, 1, -20, 20 - playsewithpan SE_W152, +63 + createsprite gUnknown_08595328, ANIM_TARGET, 2, -30, -100, 25, 1, -20, 20 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 13 - createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W152, +63 + createsprite gUnknown_08595328, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 + playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 - playsewithpan SE_W202, +63 + playsewithpan SE_W202, SOUND_PAN_TARGET waitforvisualfinish end WeatherBallSandstorm: - loadspritegfx ANIM_TAG_058 - createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 30, 0 - playsewithpan SE_W088, +63 + loadspritegfx ANIM_TAG_ROCKS + createsprite gUnknown_08596CE0, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W088, +63 + createsprite gUnknown_08596CE0, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 14 - createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W088, +63 - waitforvisualfinish - playsewithpan SE_W070, +63 - createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3 - createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4 - createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3 - createsprite gUnknown_08596CB0, 130, 12, 25, 4, 4 + createsprite gUnknown_08596CE0, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 + playsewithpan SE_W088, SOUND_PAN_TARGET + waitforvisualfinish + playsewithpan SE_W070, SOUND_PAN_TARGET + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -12, 27, 2, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 8, 28, 3, 4 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, -4, 30, 2, 3 + createsprite gUnknown_08596CB0, ANIM_TARGET, 2, 12, 25, 4, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 waitforvisualfinish end WeatherBallIce: - loadspritegfx ANIM_TAG_263 - loadspritegfx ANIM_TAG_141 - createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, -40, 20 - playsewithpan SE_W258, +63 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS + createsprite gUnknown_08595D44, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 + playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 40, 0 - playsewithpan SE_W258, +63 + createsprite gUnknown_08595D44, ANIM_TARGET, 2, -30, -100, 25, 25, 40, 0 + playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 0, 0 - playsewithpan SE_W258, +63 + createsprite gUnknown_08595D44, ANIM_TARGET, 2, -30, -100, 25, 25, 0, 0 + playsewithpan SE_W258, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W196, +63 + playsewithpan SE_W196, SOUND_PAN_TARGET call FreezeEffect1 waitforvisualfinish end Move_COUNT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W003, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + playsewithpan SE_W003, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -9929,226 +9929,226 @@ Move_COUNT: end FreezeEffect1: - createsprite gUnknown_08595B68, 130, -10, -10, 0 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -10, -10, 0 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 10, 20, 0 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 10, 20, 0 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, -5, 10, 0 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -5, 10, 0 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 17, -12, 0 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 17, -12, 0 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, -15, 15, 0 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, -15, 15, 0 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 0, 0, 0 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 0, 0, 0 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, 20, 2, 0 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, 20, 2, 0 + playsewithpan SE_W196, SOUND_PAN_TARGET return FreezeEffect2: - createsprite gUnknown_08595B68, 130, -10, -10, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -10, -10, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 10, 20, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 10, 20, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, -29, 0, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -29, 0, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 29, -20, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 29, -20, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, -5, 10, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -5, 10, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 17, -12, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 17, -12, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, -20, 0, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, -20, 0, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, -15, 15, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, -15, 15, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 26, -5, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 26, -5, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B80, 130, 0, 0, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B80, ANIM_TARGET, 2, 0, 0, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08595B68, 130, 20, 2, 1 - playsewithpan SE_W196, +63 + createsprite gUnknown_08595B68, ANIM_TARGET, 2, 20, 2, 1 + playsewithpan SE_W196, SOUND_PAN_TARGET return IcyWindEffect1: @ Unused - loopsewithpan SE_W196, +63, 6, 4 - createsprite gUnknown_08595C04, 130, 0, 24, 0 + loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 0, 24, 0 delay 4 - createsprite gUnknown_08595C04, 130, 8, 24, 0 - createsprite gUnknown_08595C04, 130, -8, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 8, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -8, 24, 0 delay 4 - createsprite gUnknown_08595C04, 130, 16, 24, 0 - createsprite gUnknown_08595C04, 130, -16, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 16, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -16, 24, 0 delay 4 - createsprite gUnknown_08595C04, 130, 24, 24, 0 - createsprite gUnknown_08595C04, 130, -24, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 24, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -24, 24, 0 delay 4 - createsprite gUnknown_08595C04, 130, 32, 24, 0 - createsprite gUnknown_08595C04, 130, -32, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 32, 24, 0 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -32, 24, 0 return IcyWindEffect2: - loopsewithpan SE_W196, +63, 6, 4 - createsprite gUnknown_08595C04, 130, 0, 24, 1 + loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 0, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 8, 24, 1 - createsprite gUnknown_08595C04, 130, -8, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 8, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -8, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 16, 24, 1 - createsprite gUnknown_08595C04, 130, -16, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 16, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -16, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 24, 24, 1 - createsprite gUnknown_08595C04, 130, -24, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 24, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -24, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 32, 24, 1 - createsprite gUnknown_08595C04, 130, -32, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 32, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -32, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 40, 24, 1 - createsprite gUnknown_08595C04, 130, -40, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 40, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -40, 24, 1 delay 4 - createsprite gUnknown_08595C04, 130, 48, 24, 1 - createsprite gUnknown_08595C04, 130, -48, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, 48, 24, 1 + createsprite gUnknown_08595C04, ANIM_TARGET, 2, -48, 24, 1 return GrantingStarsEffect: - createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 + createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 - createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 + createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 8 return HealingEffect: - playsewithpan SE_W071B, -64 - createsprite gUnknown_08592F2C, 2, 0, -5, 0, 0 + playsewithpan SE_W071B, SOUND_PAN_ATTACKER + createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, 0, -5, 0, 0 delay 7 - createsprite gUnknown_08592F2C, 2, -15, 10, 0, 0 + createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, -15, 10, 0, 0 delay 7 - createsprite gUnknown_08592F2C, 2, -15, -15, 0, 0 + createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, -15, -15, 0, 0 delay 7 - createsprite gUnknown_08592F2C, 2, 10, -5, 0, 0 + createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, 10, -5, 0, 0 delay 7 return HealingEffect2: - playsewithpan SE_W071B, +63 - createsprite gUnknown_08592F2C, 130, 0, -5, 1, 0 + playsewithpan SE_W071B, SOUND_PAN_TARGET + createsprite gUnknown_08592F2C, ANIM_TARGET, 2, 0, -5, 1, 0 delay 7 - createsprite gUnknown_08592F2C, 130, -15, 10, 1, 0 + createsprite gUnknown_08592F2C, ANIM_TARGET, 2, -15, 10, 1, 0 delay 7 - createsprite gUnknown_08592F2C, 130, -15, -15, 1, 0 + createsprite gUnknown_08592F2C, ANIM_TARGET, 2, -15, -15, 1, 0 delay 7 - createsprite gUnknown_08592F2C, 130, 10, -5, 1, 0 + createsprite gUnknown_08592F2C, ANIM_TARGET, 2, 10, -5, 1, 0 delay 7 return PoisonBubblesEffect: - createsprite gPoisonBubbleSpriteTemplate, 130, 10, 10, 0 - playsewithpan SE_W092, +63 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 10, 10, 0 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite gPoisonBubbleSpriteTemplate, 130, 20, -20, 0 - playsewithpan SE_W092, +63 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, -20, 0 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite gPoisonBubbleSpriteTemplate, 130, -20, 15, 0 - playsewithpan SE_W092, +63 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, 15, 0 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite gPoisonBubbleSpriteTemplate, 130, 0, 0, 0 - playsewithpan SE_W092, +63 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite gPoisonBubbleSpriteTemplate, 130, -20, -20, 0 - playsewithpan SE_W092, +63 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, -20, 0 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 - createsprite gPoisonBubbleSpriteTemplate, 130, 16, -8, 0 - playsewithpan SE_W092, +63 + createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0 + playsewithpan SE_W092, SOUND_PAN_TARGET return WaterBubbleEffect: - createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 0 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 0 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 0 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 0 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 0 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 0 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 0 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 0 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 0 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 0 + playsewithpan SE_W145C, SOUND_PAN_TARGET return WaterBubbleEffect2: - createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 1 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, -28, -10, 1 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -28, -10, 1 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 1 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 1 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 1 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 1 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 1 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 27, 8, 1 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 27, 8, 1 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 1 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 1 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 - createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 1 - playsewithpan SE_W145C, +63 + createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 1 + playsewithpan SE_W145C, SOUND_PAN_TARGET return ElectricityEffect: - playsewithpan SE_W085B, +63 - createsprite gElectricitySpriteTemplate, 130, 5, 0, 5, 0 + playsewithpan SE_W085B, SOUND_PAN_TARGET + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0 delay 2 - createsprite gElectricitySpriteTemplate, 130, -5, 10, 5, 1 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1 delay 2 - createsprite gElectricitySpriteTemplate, 130, 15, 20, 5, 2 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 15, 20, 5, 2 delay 2 - createsprite gElectricitySpriteTemplate, 130, -15, -10, 5, 0 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -15, -10, 5, 0 delay 2 - createsprite gElectricitySpriteTemplate, 130, 25, 0, 5, 1 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 25, 0, 5, 1 delay 2 - createsprite gElectricitySpriteTemplate, 130, -8, 8, 5, 2 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -8, 8, 5, 2 delay 2 - createsprite gElectricitySpriteTemplate, 130, 2, -8, 5, 0 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 2, -8, 5, 0 delay 2 - createsprite gElectricitySpriteTemplate, 130, -20, 15, 5, 1 + createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1 return ConfusionEffect: - loopsewithpan SE_W146, +63, 13, 6 - createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 0, 3, 90 - createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 51, 3, 90 - createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 102, 3, 90 - createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 153, 3, 90 - createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 204, 3, 90 + loopsewithpan SE_W146, SOUND_PAN_TARGET, 13, 6 + createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 3, 90 + createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 51, 3, 90 + createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 102, 3, 90 + createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 153, 3, 90 + createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 204, 3, 90 return SetPsychicBackground: @@ -10211,7 +10211,7 @@ UnsetSolarbeamBg: return Status_Poison: - loopsewithpan SE_W092, +63, 13, 6 + loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31) end @@ -10223,35 +10223,35 @@ Status_Confusion: Status_Burn: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W172, +63 + playsewithpan SE_W172, SOUND_PAN_TARGET call Burn1 call Burn1 call Burn1 waitforvisualfinish end Burn1: - createsprite gUnknown_08595504, 130, -24, 24, 24, 24, 20, 1, 1 + createsprite gUnknown_08595504, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 delay 4 return Status_Infatuation: - loadspritegfx ANIM_TAG_PURPLE_HEART - playsewithpan SE_W204, -64 - createsprite gUnknown_08593970, 3, 0, 20 + loadspritegfx ANIM_TAG_MAGENTA_HEART + playsewithpan SE_W204, SOUND_PAN_ATTACKER + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20 delay 15 - playsewithpan SE_W204, -64 - createsprite gUnknown_08593970, 3, -20, 20 + playsewithpan SE_W204, SOUND_PAN_ATTACKER + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20 delay 15 - playsewithpan SE_W204, -64 - createsprite gUnknown_08593970, 3, 20, 20 + playsewithpan SE_W204, SOUND_PAN_ATTACKER + createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20 end Status_Sleep: loadspritegfx ANIM_TAG_LETTER_Z - playsewithpan SE_W173, -64 - createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + playsewithpan SE_W173, SOUND_PAN_ATTACKER + createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 - createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 end Status_Paralysis: @@ -10265,27 +10265,27 @@ Status_Freeze: loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - waitplaysewithpan SE_W258, +63, 17 + waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 createvisualtask sub_80A9EF4, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Status_Curse: - loadspritegfx ANIM_TAG_200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, +63 - createsprite gBattleAnimSpriteTemplate_8596DE8, 130 + playsewithpan SE_W171, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_8596DE8, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Status_Nightmare: - loadspritegfx ANIM_TAG_EVIL_ANGEL + loadspritegfx ANIM_TAG_DEVIL monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, +63 - createsprite gBattleAnimSpriteTemplate_8596E00, 130 + playsewithpan SE_W171, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_8596E00, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -10297,8 +10297,8 @@ General_CastformChange: goto AnimScript_82D7EB2 AnimScript_82D7EB2: monbg ANIM_ATTACKER - playsewithpan SE_W100, -64 - waitplaysewithpan SE_W107, -64, 48 + playsewithpan SE_W100, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 createvisualtask sub_815B7D0, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -10333,10 +10333,10 @@ General_PokeblockThrow: createvisualtask sub_817345C, 2, 0 createvisualtask sub_81732B0, 2 delay 0 - waitplaysewithpan SE_W026, -64, 22 - createsprite gBattleAnimSpriteTemplate_85E5338, 131, -18, 12, 0, 32 + waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 + createsprite gBattleAnimSpriteTemplate_85E5338, ANIM_TARGET, 3, -18, 12, 0, 32 delay 50 - loopsewithpan SE_W039, +63, 19, 2 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET waitforvisualfinish createvisualtask sub_81732E4, 2 @@ -10344,7 +10344,7 @@ General_PokeblockThrow: General_ItemKnockoff: loadspritegfx ANIM_TAG_ITEM_BAG - createsprite gBattleAnimSpriteTemplate_8592628, 130 + createsprite gBattleAnimSpriteTemplate_8592628, ANIM_TARGET, 2 end General_TurnTrap: @@ -10355,21 +10355,21 @@ General_TurnTrap: jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb goto Status_BindWrap Status_BindWrap: - loadspritegfx ANIM_TAG_186 - loopsewithpan SE_W010, +63, 6, 2 - createsprite gUnknown_08592494, 132, 0, 16, 0, 1 + loadspritegfx ANIM_TAG_TENDRILS + loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 + createsprite gUnknown_08592494, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 - createsprite gUnknown_08592494, 130, 0, 8, 1, 1 + createsprite gUnknown_08592494, ANIM_TARGET, 2, 0, 8, 1, 1 delay 3 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 delay 20 setarg 7, -1 - playsewithpan SE_W020, +63 + playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish end Status_FireSpin: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, +63 + playsewithpan SE_W221B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 call FireSpinEffect call FireSpinEffect @@ -10377,32 +10377,32 @@ 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 delay 0 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23) - playsewithpan SE_W250, +63 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) + playsewithpan SE_W250, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 call WhirlpoolEffect call WhirlpoolEffect delay 12 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish stopsound 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, +63 - createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10 - createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10 + playsewithpan SE_W011, SOUND_PAN_TARGET + createsprite gUnknown_08597098, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 + createsprite gUnknown_08597098, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -10410,71 +10410,71 @@ Status_Clamp: waitforvisualfinish end Status_SandTomb: - loadspritegfx ANIM_TAG_074 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0) + loadspritegfx ANIM_TAG_MUD_SAND + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 - playsewithpan SE_W328, +63 + playsewithpan SE_W328, SOUND_PAN_TARGET call SandTombEffect call SandTombEffect delay 22 - createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish stopsound 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, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, -64 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W234, -64 + playsewithpan SE_W234, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish - playsewithpan SE_REAPOKE, -64 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 3, 7, 0, RGB(17, 31, 25) - createsprite gUnknown_0859381C, 3, 0, 0, 0, 0 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 3, 7, 0, RGB(17, 31, 25) + createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish end General_SmokeballEscape: - loadspritegfx ANIM_TAG_242 + loadspritegfx ANIM_TAG_PINK_CLOUD monbg ANIM_ATTACKER setalpha 12, 4 delay 0 - playsewithpan SE_BOWA2, +63 - createsprite gUnknown_085CE734, 128, 0, 32, 28, 30 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET + createsprite gUnknown_085CE734, ANIM_TARGET, 0, 0, 32, 28, 30 delay 4 - playsewithpan SE_BOWA2, +63 - createsprite gUnknown_085CE734, 127, 2, 12, 20, 30 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET + createsprite gUnknown_085CE734, ANIM_ATTACKER, 127, 2, 12, 20, 30 delay 12 - playsewithpan SE_BOWA2, +63 - createsprite gUnknown_085CE734, 0x7E, 2, -28, 4, 30 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET + createsprite gUnknown_085CE734, ANIM_ATTACKER, 126, 2, -28, 4, 30 delay 12 - playsewithpan SE_BOWA2, +63 - createsprite gUnknown_085CE734, 0x7C, 2, 14, -20, 30 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET + createsprite gUnknown_085CE734, ANIM_ATTACKER, 124, 2, 14, -20, 30 delay 4 - playsewithpan SE_BOWA2, +63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createvisualtask sub_81136E8, 2, 2 - createsprite gUnknown_085CE734, 0x7B, 3, 4, 4, 30 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 123, 3, 4, 4, 30 delay 14 - playsewithpan SE_BOWA2, +63 - createsprite gUnknown_085CE734, 0x7A, 3, -14, 18, 46 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET + createsprite gUnknown_085CE734, ANIM_ATTACKER, 122, 3, -14, 18, 46 delay 0 - createsprite gUnknown_085CE734, 0x79, 3, 14, -14, 46 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 121, 3, 14, -14, 46 delay 0 - createsprite gUnknown_085CE734, 120, 3, -12, -10, 46 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 120, 3, -12, -10, 46 delay 0 - createsprite gUnknown_085CE734, 0x77, 3, 14, 14, 46 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 119, 3, 14, 14, 46 delay 0 - createsprite gUnknown_085CE734, 0x76, 3, 0, 0, 46 + createsprite gUnknown_085CE734, ANIM_ATTACKER, 118, 3, 0, 0, 46 waitforvisualfinish clearmonbg ANIM_ATTACKER invisible ANIM_ATTACKER @@ -10483,19 +10483,19 @@ General_SmokeballEscape: end General_HangedOn: - createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 7, 0, 9, RGB_RED - playsewithpan SE_W082, -64 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, RGB_RED + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_815DB90, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 4, 9, 0, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 4, 9, 0, RGB_RED waitforvisualfinish delay 6 - createsprite gSlideMonToOriginalPosSpriteTemplate, 0, 0, 0, 15 + createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 0, 0, 0, 15 end General_Rain: - loadspritegfx ANIM_TAG_115 - playsewithpan SE_W240, -64 + loadspritegfx ANIM_TAG_RAIN_DROPS + playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 @@ -10521,11 +10521,11 @@ General_LeechSeedDrain: goto Move_ABSORB General_MonHit: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W003, +63 - createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + playsewithpan SE_W003, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -10537,7 +10537,7 @@ General_ItemSteal: createvisualtask sub_8117F30, 2 createvisualtask sub_8172ED0, 2 delay 1 - createsprite gUnknown_08592670, 2, 0, -5, 10, 2, -1 + createsprite gUnknown_08592670, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 end General_SnatchMove: @@ -10555,22 +10555,22 @@ SnatchMoveContinue: call AnimScript_82D85C3 end SnatchOpposingMonMove: - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER createvisualtask sub_815F8F4, 2 goto SnatchMoveContinue SnatchPartnerMonMove: - playsewithpan SE_W104, -64 + playsewithpan SE_W104, SOUND_PAN_ATTACKER createvisualtask sub_815FFC4, 2 goto SnatchMoveContinue General_FutureSightHit: createvisualtask sub_8117F10, 2 monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, -64 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, +63 - waitplaysewithpan SE_W048, +63, 8 + playsewithpan SE_W048, SOUND_PAN_TARGET + waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -10586,40 +10586,40 @@ General_FutureSightHit: General_DoomDesireHit: createvisualtask sub_8117F10, 2 loadspritegfx ANIM_TAG_EXPLOSION - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 createvisualtask sub_815C0A4, 5 delay 9 - playsewithpan SE_W109, -64 + playsewithpan SE_W109, SOUND_PAN_ATTACKER delay 9 playsewithpan SE_W109, 0 delay 9 - playsewithpan SE_W109, +63 + playsewithpan SE_W109, SOUND_PAN_TARGET delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, +63 - createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1 + playsewithpan SE_W120, SOUND_PAN_TARGET + createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish end General_FocusPunchSetUp: - loadspritegfx ANIM_TAG_184 - playsewithpan SE_W082, -64 + loadspritegfx ANIM_TAG_FOCUS_ENERGY + playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED @@ -10631,11 +10631,11 @@ 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 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish delay 3 call AbsorbEffect @@ -10643,24 +10643,24 @@ General_IngrainHeal: delay 15 call HealingEffect waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end General_WishHeal: - loadspritegfx ANIM_TAG_SPARKLE - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK + loadspritegfx ANIM_TAG_SPARKLE_2 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish - playsewithpan SE_W025, -64 + 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 - createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK end AnimScript_82D85A3: @@ -10718,13 +10718,13 @@ BallThrowEnd: createvisualtask sub_8170D24, 2 end BallThrowTrainerBlock: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT delay 25 monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 0 - playsewithpan SE_W003, +63 - createsprite gBasicHitSplatSpriteTemplate, 130, -4, -20, 1, 2 + playsewithpan SE_W003, SOUND_PAN_TARGET + createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff 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/battle_arena_move_mind_ratings.inc b/data/battle_frontier/battle_arena_move_mind_ratings.inc deleted file mode 100644 index e1d0b26a9..000000000 --- a/data/battle_frontier/battle_arena_move_mind_ratings.inc +++ /dev/null @@ -1,357 +0,0 @@ - .align 2 -gBattleArenaMoveMindRatings:: @ 8611DC0 - .byte 0 @ - - .byte 1 @ Pound - .byte 1 @ Karate Chop - .byte 1 @ Double Slap - .byte 1 @ Comet Punch - .byte 1 @ Mega Punch - .byte 1 @ Pay Day - .byte 1 @ Fire Punch - .byte 1 @ Ice Punch - .byte 1 @ Thunder Punch - .byte 1 @ Scratch - .byte 1 @ Vice Grip - .byte 1 @ Guillotine - .byte 1 @ Razor Wind - .byte 0 @ Swords Dance - .byte 1 @ Cut - .byte 1 @ Gust - .byte 1 @ Wing Attack - .byte 0 @ Whirlwind - .byte 1 @ Fly - .byte 1 @ Bind - .byte 1 @ Slam - .byte 1 @ Vine Whip - .byte 1 @ Stomp - .byte 1 @ Double Kick - .byte 1 @ Mega Kick - .byte 1 @ Jump Kick - .byte 1 @ Rolling Kick - .byte 0 @ Sand-Attack - .byte 1 @ Headbutt - .byte 1 @ Horn Attack - .byte 1 @ Fury Attack - .byte 1 @ Horn Drill - .byte 1 @ Tackle - .byte 1 @ Body Slam - .byte 1 @ Wrap - .byte 1 @ Take Down - .byte 1 @ Thrash - .byte 1 @ Double-Edge - .byte 0 @ Tail Whip - .byte 1 @ Poison Sting - .byte 1 @ Twineedle - .byte 1 @ Pin Missile - .byte 0 @ Leer - .byte 1 @ Bite - .byte 0 @ Growl - .byte 0 @ Roar - .byte 0 @ Sing - .byte 0 @ Supersonic - .byte 1 @ Sonic Boom - .byte 0 @ Disable - .byte 1 @ Acid - .byte 1 @ Ember - .byte 1 @ Flamethrower - .byte 0 @ Mist - .byte 1 @ Water Gun - .byte 1 @ Hydro Pump - .byte 1 @ Surf - .byte 1 @ Ice Beam - .byte 1 @ Blizzard - .byte 1 @ Psybeam - .byte 1 @ Bubble Beam - .byte 1 @ Aurora Beam - .byte 1 @ Hyper Beam - .byte 1 @ Peck - .byte 1 @ Drill Peck - .byte 1 @ Submission - .byte 1 @ Low Kick - .byte 0 @ Counter - .byte 1 @ Seismic Toss - .byte 1 @ Strength - .byte 1 @ Absorb - .byte 1 @ Mega Drain - .byte 0 @ Leech Seed - .byte 0 @ Growth - .byte 1 @ Razor Leaf - .byte 1 @ Solar Beam - .byte 0 @ Poison Powder - .byte 0 @ Stun Spore - .byte 0 @ Sleep Powder - .byte 1 @ Petal Dance - .byte 0 @ String Shot - .byte 1 @ Dragon Rage - .byte 1 @ Fire Spin - .byte 1 @ Thunder Shock - .byte 1 @ Thunderbolt - .byte 0 @ Thunder Wave - .byte 1 @ Thunder - .byte 1 @ Rock Throw - .byte 1 @ Earthquake - .byte 1 @ Fissure - .byte 1 @ Dig - .byte 0 @ Toxic - .byte 1 @ Confusion - .byte 1 @ Psychic - .byte 0 @ Hypnosis - .byte 0 @ Meditate - .byte 0 @ Agility - .byte 1 @ Quick Attack - .byte 1 @ Rage - .byte 0 @ Teleport - .byte 1 @ Night Shade - .byte 0 @ Mimic - .byte 0 @ Screech - .byte 0 @ Double Team - .byte 0 @ Recover - .byte 0 @ Harden - .byte 0 @ Minimize - .byte 0 @ Smokescreen - .byte 0 @ Confuse Ray - .byte 0 @ Withdraw - .byte 0 @ Defense Curl - .byte 0 @ Barrier - .byte 0 @ Light Screen - .byte 0 @ Haze - .byte 0 @ Reflect - .byte 0 @ Focus Energy - .byte 0 @ Bide - .byte 0 @ Metronome - .byte 0 @ Mirror Move - .byte 1 @ Self-Destruct - .byte 1 @ Egg Bomb - .byte 1 @ Lick - .byte 1 @ Smog - .byte 1 @ Sludge - .byte 1 @ Bone Club - .byte 1 @ Fire Blast - .byte 1 @ Waterfall - .byte 1 @ Clamp - .byte 1 @ Swift - .byte 1 @ Skull Bash - .byte 1 @ Spike Cannon - .byte 1 @ Constrict - .byte 0 @ Amnesia - .byte 0 @ Kinesis - .byte 0 @ Soft-Boiled - .byte 1 @ Hi Jump Kick - .byte 0 @ Glare - .byte 1 @ Dream Eater - .byte 0 @ Poison Gas - .byte 1 @ Barrage - .byte 1 @ Leech Life - .byte 0 @ Lovely Kiss - .byte 1 @ Sky Attack - .byte 0 @ Transform - .byte 1 @ Bubble - .byte 1 @ Dizzy Punch - .byte 0 @ Spore - .byte 0 @ Flash - .byte 1 @ Psywave - .byte 0 @ Splash - .byte 0 @ Acid Armor - .byte 1 @ Crabhammer - .byte 1 @ Explosion - .byte 1 @ Fury Swipes - .byte 1 @ Bonemerang - .byte 0 @ Rest - .byte 1 @ Rock Slide - .byte 1 @ Hyper Fang - .byte 0 @ Sharpen - .byte 0 @ Conversion - .byte 1 @ Tri Attack - .byte 1 @ Super Fang - .byte 1 @ Slash - .byte 0 @ Substitute - .byte 1 @ Struggle - .byte 0 @ Sketch - .byte 1 @ Triple Kick - .byte 1 @ Thief - .byte 0 @ Spider Web - .byte 0 @ Mind Reader - .byte 0 @ Nightmare - .byte 1 @ Flame Wheel - .byte 1 @ Snore - .byte 0 @ Curse - .byte 1 @ Flail - .byte 0 @ Conversion 2 - .byte 1 @ Aeroblast - .byte 0 @ Cotton Spore - .byte 1 @ Reversal - .byte 0 @ Spite - .byte 1 @ Powder Snow - .byte -1 @ Protect - .byte 1 @ Mach Punch - .byte 0 @ Scary Face - .byte 1 @ Faint Attack - .byte 0 @ Sweet Kiss - .byte 0 @ Belly Drum - .byte 1 @ Sludge Bomb - .byte 1 @ Mud-Slap - .byte 1 @ Octazooka - .byte 0 @ Spikes - .byte 1 @ Zap Cannon - .byte 0 @ Foresight - .byte 0 @ Destiny Bond - .byte 0 @ Perish Song - .byte 1 @ Icy Wind - .byte -1 @ Detect - .byte 1 @ Bone Rush - .byte 0 @ Lock-On - .byte 1 @ Outrage - .byte 0 @ Sandstorm - .byte 1 @ Giga Drain - .byte -1 @ Endure - .byte 0 @ Charm - .byte 1 @ Rollout - .byte 1 @ False Swipe - .byte 0 @ Swagger - .byte 0 @ Milk Drink - .byte 1 @ Spark - .byte 1 @ Fury Cutter - .byte 1 @ Steel Wing - .byte 0 @ Mean Look - .byte 0 @ Attract - .byte 0 @ Sleep Talk - .byte 0 @ Heal Bell - .byte 1 @ Return - .byte 1 @ Present - .byte 1 @ Frustration - .byte 0 @ Safeguard - .byte 0 @ Pain Split - .byte 1 @ Sacred Fire - .byte 1 @ Magnitude - .byte 1 @ Dynamic Punch - .byte 1 @ Megahorn - .byte 1 @ Dragon Breath - .byte 0 @ Baton Pass - .byte 0 @ Encore - .byte 1 @ Pursuit - .byte 1 @ Rapid Spin - .byte 0 @ Sweet Scent - .byte 1 @ Iron Tail - .byte 1 @ Metal Claw - .byte 1 @ Vital Throw - .byte 0 @ Morning Sun - .byte 0 @ Synthesis - .byte 0 @ Moonlight - .byte 1 @ Hidden Power - .byte 1 @ Cross Chop - .byte 1 @ Twister - .byte 0 @ Rain Dance - .byte 0 @ Sunny Day - .byte 1 @ Crunch - .byte 0 @ Mirror Coat - .byte 0 @ Psych Up - .byte 1 @ Extreme Speed - .byte 1 @ Ancient Power - .byte 1 @ Shadow Ball - .byte 1 @ Future Sight - .byte 1 @ Rock Smash - .byte 1 @ Whirlpool - .byte 1 @ Beat Up - .byte -1 @ Fake Out - .byte 1 @ Uproar - .byte 0 @ Stockpile - .byte 1 @ Spit Up - .byte 0 @ Swallow - .byte 1 @ Heat Wave - .byte 0 @ Hail - .byte 0 @ Torment - .byte 0 @ Flatter - .byte 0 @ Will-O-Wisp - .byte 0 @ Memento - .byte 1 @ Facade - .byte 1 @ Focus Punch - .byte 1 @ Smelling Salt - .byte 0 @ Follow Me - .byte 0 @ Nature Power - .byte 0 @ Charge - .byte 0 @ Taunt - .byte 0 @ Helping Hand - .byte 0 @ Trick - .byte 0 @ Role Play - .byte 0 @ Wish - .byte 0 @ Assist - .byte 0 @ Ingrain - .byte 1 @ Superpower - .byte 0 @ Magic Coat - .byte 0 @ Recycle - .byte 1 @ Revenge - .byte 1 @ Brick Break - .byte 0 @ Yawn - .byte 1 @ Knock Off - .byte 1 @ Endeavor - .byte 1 @ Eruption - .byte 0 @ Skill Swap - .byte 0 @ Imprison - .byte 0 @ Refresh - .byte 0 @ Grudge - .byte 0 @ Snatch - .byte 1 @ Secret Power - .byte 1 @ Dive - .byte 1 @ Arm Thrust - .byte 0 @ Camouflage - .byte 0 @ Tail Glow - .byte 1 @ Luster Purge - .byte 1 @ Mist Ball - .byte 0 @ Feather Dance - .byte 0 @ Teeter Dance - .byte 1 @ Blaze Kick - .byte 0 @ Mud Sport - .byte 1 @ Ice Ball - .byte 1 @ Needle Arm - .byte 0 @ Slack Off - .byte 1 @ Hyper Voice - .byte 1 @ Poison Fang - .byte 1 @ Crush Claw - .byte 1 @ Blast Burn - .byte 1 @ Hydro Cannon - .byte 1 @ Meteor Mash - .byte 1 @ Astonish - .byte 1 @ Weather Ball - .byte 0 @ Aromatherapy - .byte 0 @ Fake Tears - .byte 1 @ Air Cutter - .byte 1 @ Overheat - .byte 0 @ Odor Sleuth - .byte 1 @ Rock Tomb - .byte 1 @ Silver Wind - .byte 0 @ Metal Sound - .byte 0 @ Grass Whistle - .byte 0 @ Tickle - .byte 0 @ Cosmic Power - .byte 1 @ Water Spout - .byte 1 @ Signal Beam - .byte 1 @ Shadow Punch - .byte 1 @ Extrasensory - .byte 1 @ Sky Uppercut - .byte 1 @ Sand Tomb - .byte 1 @ Sheer Cold - .byte 1 @ Muddy Water - .byte 1 @ Bullet Seed - .byte 1 @ Aerial Ace - .byte 1 @ Icicle Spear - .byte 0 @ Iron Defense - .byte 0 @ Block - .byte 0 @ Howl - .byte 1 @ Dragon Claw - .byte 1 @ Frenzy Plant - .byte 0 @ Bulk Up - .byte 1 @ Bounce - .byte 1 @ Mud Shot - .byte 1 @ Poison Tail - .byte 1 @ Covet - .byte 1 @ Volt Tackle - .byte 1 @ Magical Leaf - .byte 0 @ Water Sport - .byte 0 @ Calm Mind - .byte 1 @ Leaf Blade - .byte 0 @ Dragon Dance - .byte 1 @ Rock Blast - .byte 1 @ Shock Wave - .byte 1 @ Water Pulse - .byte 1 @ Doom Desire - .byte 1 @ Psycho Boost diff --git a/data/battle_frontier/battle_factory_style_move_lists.inc b/data/battle_frontier/battle_factory_style_move_lists.inc deleted file mode 100644 index 3ec428525..000000000 --- a/data/battle_frontier/battle_factory_style_move_lists.inc +++ /dev/null @@ -1,191 +0,0 @@ - .align 2 -gBattleFactoryStyleRequiredMoveCounts:: @ 8611FC0 - .byte 3 - .byte 3 - .byte 3 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - - .align 2 -gBattleFactoryStyleMoveList_TotalPreparation:: @ 8611FC8 - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_GROWTH - .2byte MOVE_MEDITATE - .2byte MOVE_AGILITY - .2byte MOVE_DOUBLE_TEAM - .2byte MOVE_HARDEN - .2byte MOVE_MINIMIZE - .2byte MOVE_WITHDRAW - .2byte MOVE_DEFENSE_CURL - .2byte MOVE_BARRIER - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_AMNESIA - .2byte MOVE_ACID_ARMOR - .2byte MOVE_SHARPEN - .2byte MOVE_CONVERSION - .2byte MOVE_CONVERSION_2 - .2byte MOVE_BELLY_DRUM - .2byte MOVE_PSYCH_UP - .2byte MOVE_CHARGE - .2byte MOVE_SNATCH - .2byte MOVE_TAIL_GLOW - .2byte MOVE_COSMIC_POWER - .2byte MOVE_IRON_DEFENSE - .2byte MOVE_HOWL - .2byte MOVE_BULK_UP - .2byte MOVE_CALM_MIND - .2byte MOVE_DRAGON_DANCE - .2byte 0 - -gBattleFactoryStyleMoveList_ImpossibleToPredict:: @ 8612000 - .2byte MOVE_MIMIC - .2byte MOVE_METRONOME - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_TRANSFORM - .2byte MOVE_SUBSTITUTE - .2byte MOVE_SKETCH - .2byte MOVE_CURSE - .2byte MOVE_PRESENT - .2byte MOVE_FOLLOW_ME - .2byte MOVE_TRICK - .2byte MOVE_ROLE_PLAY - .2byte MOVE_ASSIST - .2byte MOVE_SKILL_SWAP - .2byte MOVE_CAMOUFLAGE - .2byte 0 - -gBattleFactoryStyleMoveList_WeakeningTheFoe:: @ 861201E - .2byte MOVE_SAND_ATTACK - .2byte MOVE_TAIL_WHIP - .2byte MOVE_LEER - .2byte MOVE_GROWL - .2byte MOVE_STRING_SHOT - .2byte MOVE_SCREECH - .2byte MOVE_SMOKESCREEN - .2byte MOVE_KINESIS - .2byte MOVE_FLASH - .2byte MOVE_COTTON_SPORE - .2byte MOVE_SPITE - .2byte MOVE_SCARY_FACE - .2byte MOVE_CHARM - .2byte MOVE_KNOCK_OFF - .2byte MOVE_SWEET_SCENT - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_FAKE_TEARS - .2byte MOVE_METAL_SOUND - .2byte MOVE_TICKLE - .2byte 0 - -gBattleFactoryStyleMoveList_HighRiskHighReturn:: @ 8612046 - .2byte MOVE_GUILLOTINE - .2byte MOVE_HORN_DRILL - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_HYPER_BEAM - .2byte MOVE_COUNTER - .2byte MOVE_FISSURE - .2byte MOVE_BIDE - .2byte MOVE_SELF_DESTRUCT - .2byte MOVE_SKY_ATTACK - .2byte MOVE_EXPLOSION - .2byte MOVE_FLAIL - .2byte MOVE_REVERSAL - .2byte MOVE_DESTINY_BOND - .2byte MOVE_PERISH_SONG - .2byte MOVE_PAIN_SPLIT - .2byte MOVE_MIRROR_COAT - .2byte MOVE_MEMENTO - .2byte MOVE_GRUDGE - .2byte MOVE_FACADE - .2byte MOVE_FOCUS_PUNCH - .2byte MOVE_BLAST_BURN - .2byte MOVE_HYDRO_CANNON - .2byte MOVE_OVERHEAT - .2byte MOVE_FRENZY_PLANT - .2byte MOVE_PSYCHO_BOOST - .2byte MOVE_VOLT_TACKLE - .2byte 0 - -gBattleFactoryStyleMoveList_Endurance:: @ 861207C - .2byte MOVE_MIST - .2byte MOVE_RECOVER - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_HAZE - .2byte MOVE_REFLECT - .2byte MOVE_SOFT_BOILED - .2byte MOVE_REST - .2byte MOVE_PROTECT - .2byte MOVE_DETECT - .2byte MOVE_ENDURE - .2byte MOVE_MILK_DRINK - .2byte MOVE_HEAL_BELL - .2byte MOVE_SAFEGUARD - .2byte MOVE_BATON_PASS - .2byte MOVE_MORNING_SUN - .2byte MOVE_SYNTHESIS - .2byte MOVE_MOONLIGHT - .2byte MOVE_SWALLOW - .2byte MOVE_WISH - .2byte MOVE_INGRAIN - .2byte MOVE_MAGIC_COAT - .2byte MOVE_RECYCLE - .2byte MOVE_REFRESH - .2byte MOVE_MUD_SPORT - .2byte MOVE_SLACK_OFF - .2byte MOVE_AROMATHERAPY - .2byte MOVE_WATER_SPORT - .2byte 0 - -gBattleFactoryStyleMoveList_SlowAndSteady:: @ 86120B4 - .2byte MOVE_SING - .2byte MOVE_SUPERSONIC - .2byte MOVE_DISABLE - .2byte MOVE_LEECH_SEED - .2byte MOVE_POISON_POWDER - .2byte MOVE_STUN_SPORE - .2byte MOVE_SLEEP_POWDER - .2byte MOVE_THUNDER_WAVE - .2byte MOVE_TOXIC - .2byte MOVE_HYPNOSIS - .2byte MOVE_CONFUSE_RAY - .2byte MOVE_GLARE - .2byte MOVE_POISON_GAS - .2byte MOVE_LOVELY_KISS - .2byte MOVE_SPORE - .2byte MOVE_SPIDER_WEB - .2byte MOVE_SWEET_KISS - .2byte MOVE_SPIKES - .2byte MOVE_SWAGGER - .2byte MOVE_MEAN_LOOK - .2byte MOVE_ATTRACT - .2byte MOVE_ENCORE - .2byte MOVE_TORMENT - .2byte MOVE_FLATTER - .2byte MOVE_WILL_O_WISP - .2byte MOVE_TAUNT - .2byte MOVE_YAWN - .2byte MOVE_IMPRISON - .2byte MOVE_SNATCH - .2byte MOVE_TEETER_DANCE - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_BLOCK - .2byte 0 - -gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow:: @ 86120F6 - .2byte MOVE_SANDSTORM - .2byte MOVE_RAIN_DANCE - .2byte MOVE_SUNNY_DAY - .2byte MOVE_HAIL - .2byte MOVE_WEATHER_BALL - .2byte 0 - - .align 2 -gBattleFactoryStyleMoveListPointers:: @ 8612104 - .4byte gBattleFactoryStyleMoveList_TotalPreparation - .4byte gBattleFactoryStyleMoveList_SlowAndSteady - .4byte gBattleFactoryStyleMoveList_Endurance - .4byte gBattleFactoryStyleMoveList_HighRiskHighReturn - .4byte gBattleFactoryStyleMoveList_WeakeningTheFoe - .4byte gBattleFactoryStyleMoveList_ImpossibleToPredict - .4byte gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow diff --git a/data/battle_frontier/battle_frontier_trainers.inc b/data/battle_frontier/battle_frontier_trainers.inc index 034c1b62c..8b05d88eb 100644 --- a/data/battle_frontier/battle_frontier_trainers.inc +++ b/data/battle_frontier/battle_frontier_trainers.inc @@ -625,7 +625,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Lauren @ 24 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "KIPP$", 8 @ pre-battle speech .2byte EC_WORD_IF_I_WIN @@ -651,7 +651,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kipp @ 25 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "JASON$", 8 @ pre-battle speech .2byte EC_WORD_TEACH @@ -677,7 +677,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jason @ 26 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "JOHN$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -703,7 +703,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_John @ 27 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "ANN$", 8 @ pre-battle speech .2byte EC_WORD_IT_S @@ -729,7 +729,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Ann @ 28 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "EILEEN$", 8 @ pre-battle speech .2byte EC_WORD_LET_S @@ -755,7 +755,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Eileen @ 29 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "CARLIE$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -937,7 +937,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kathy @ 36 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "PEYTON$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -963,7 +963,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Peyton @ 37 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "JULIAN$", 8 @ pre-battle speech .2byte EC_WORD_YOU @@ -989,7 +989,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Julian @ 38 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "QUINN$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -1015,7 +1015,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Quinn @ 39 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "HAYLEE$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -1041,7 +1041,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Haylee @ 40 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "AMANDA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -1067,7 +1067,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Amanda @ 41 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "STACY$", 8 @ pre-battle speech .2byte EC_WORD_ALL @@ -1093,7 +1093,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Stacy @ 42 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "RAFAEL$", 8 @ pre-battle speech .2byte EC_WORD_COME_ON @@ -1119,7 +1119,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Rafael @ 43 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "OLIVER$", 8 @ pre-battle speech .2byte EC_WORD_A @@ -1145,7 +1145,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Oliver @ 44 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "PAYTON$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -1171,7 +1171,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Payton @ 45 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "PAMELA$", 8 @ pre-battle speech .2byte EC_WORD_ALL @@ -1197,7 +1197,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Pamela @ 46 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "ELIZA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -1223,7 +1223,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Eliza @ 47 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "MARISA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -2341,7 +2341,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Nash @ 90 - .4byte FACILITY_CLASS_TRIATHLETE_3 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M .string "ROBBY$", 8 @ pre-battle speech .2byte EC_WORD_HAHAHA @@ -2367,7 +2367,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Robby @ 91 - .4byte FACILITY_CLASS_TRIATHLETE_3 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M .string "REECE$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -2393,7 +2393,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Reece @ 92 - .4byte FACILITY_CLASS_TRIATHLETE_4 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F .string "KATHRYN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -2419,7 +2419,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kathryn @ 93 - .4byte FACILITY_CLASS_TRIATHLETE_4 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F .string "ELLEN$", 8 @ pre-battle speech .2byte EC_WORD_CRUSH @@ -2445,7 +2445,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Ellen @ 94 - .4byte FACILITY_CLASS_TRIATHLETE_5 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M .string "RAMON$", 8 @ pre-battle speech .2byte EC_WORD_OKAY @@ -2471,7 +2471,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Ramon @ 95 - .4byte FACILITY_CLASS_TRIATHLETE_5 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M .string "ARTHUR$", 8 @ pre-battle speech .2byte EC_WORD_HERE_I_COME @@ -2497,7 +2497,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Arthur @ 96 - .4byte FACILITY_CLASS_TRIATHLETE_6 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F .string "ALONDRA$", 8 @ pre-battle speech .2byte EC_WORD_EVERY @@ -2523,7 +2523,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Alondra @ 97 - .4byte FACILITY_CLASS_TRIATHLETE_6 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F .string "ADRIANA$", 8 @ pre-battle speech .2byte EC_WORD_COME @@ -2549,7 +2549,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Adriana @ 98 - .4byte FACILITY_CLASS_TRIATHLETE_1 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M .string "MALIK$", 8 @ pre-battle speech .2byte EC_WORD_OH @@ -2575,7 +2575,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Malik @ 99 - .4byte FACILITY_CLASS_TRIATHLETE_2 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F .string "JILL$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -2601,7 +2601,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jill @ 100 - .4byte FACILITY_CLASS_TRIATHLETE_3 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M .string "ERIK$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -2627,7 +2627,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Erik @ 101 - .4byte FACILITY_CLASS_TRIATHLETE_4 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F .string "YAZMIN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -2653,7 +2653,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Yazmin @ 102 - .4byte FACILITY_CLASS_TRIATHLETE_5 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M .string "JAMAL$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -2679,7 +2679,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jamal @ 103 - .4byte FACILITY_CLASS_TRIATHLETE_6 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F .string "LESLIE$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -2705,7 +2705,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Leslie @ 104 - .4byte FACILITY_CLASS_TRIATHLETE_1 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M .string "DAVE$", 8 @ pre-battle speech .2byte EC_WORD_WHAT @@ -2731,7 +2731,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Dave @ 105 - .4byte FACILITY_CLASS_TRIATHLETE_1 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M .string "CARLO$", 8 @ pre-battle speech .2byte EC_WORD_HAH @@ -2757,7 +2757,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Carlo @ 106 - .4byte FACILITY_CLASS_TRIATHLETE_2 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F .string "EMILIA$", 8 @ pre-battle speech .2byte EC_WORD_ME @@ -2783,7 +2783,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Emilia @ 107 - .4byte FACILITY_CLASS_TRIATHLETE_2 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F .string "DALIA$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -3043,7 +3043,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Joel @ 117 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "KRISTEN$", 8 @ pre-battle speech .2byte EC_WORD_HAHAHA @@ -3069,7 +3069,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kristen @ 118 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "SELPHY$", 8 @ pre-battle speech .2byte EC_WORD_HUH_QUES @@ -3095,7 +3095,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Selphy @ 119 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "CHLOE$", 8 @ pre-battle speech .2byte EC_WORD_COME @@ -4057,7 +4057,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Graham @ 156 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "TYLOR$", 8 @ pre-battle speech .2byte EC_WORD_ARE @@ -4083,7 +4083,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Tylor @ 157 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "JAREN$", 8 @ pre-battle speech .2byte EC_WORD_FIGHTING @@ -4109,7 +4109,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jaren @ 158 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "CORDELL$", 8 @ pre-battle speech .2byte EC_WORD_A @@ -4135,7 +4135,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Cordell @ 159 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "JAZLYN$", 8 @ pre-battle speech .2byte EC_WORD_IS @@ -4577,7 +4577,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Gunnar @ 176 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "CRAIG$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -4603,7 +4603,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Craig @ 177 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "PIERCE$", 8 @ pre-battle speech .2byte EC_WORD_THERE @@ -4629,7 +4629,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Pierce @ 178 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "REGINA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -4655,7 +4655,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Regina @ 179 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "ALISON$", 8 @ pre-battle speech .2byte EC_WORD_THIS @@ -5513,7 +5513,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Joyce @ 212 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "TODD$", 8 @ pre-battle speech .2byte EC_WORD_YOU_RE @@ -5539,7 +5539,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Todd @ 213 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "GAVIN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -5565,7 +5565,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Gavin @ 214 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "MALORY$", 8 @ pre-battle speech .2byte EC_WORD_PROMISE @@ -5591,7 +5591,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Malory @ 215 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "ESTHER$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -5617,7 +5617,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Esther @ 216 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "OSCAR$", 8 @ pre-battle speech .2byte EC_WORD_LET_S @@ -5643,7 +5643,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Oscar @ 217 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "WILSON$", 8 @ pre-battle speech .2byte EC_WORD_WORK @@ -5669,7 +5669,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Wilson @ 218 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "CLARE$", 8 @ pre-battle speech .2byte EC_WORD_YAY @@ -5695,7 +5695,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Clare @ 219 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "TESS$", 8 @ pre-battle speech .2byte EC_WORD_WANT @@ -6397,7 +6397,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jasper @ 246 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "NADIA$", 8 @ pre-battle speech .2byte EC_WORD_YOU @@ -6423,7 +6423,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Nadia @ 247 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "MIRANDA$", 8 @ pre-battle speech .2byte EC_WORD_WELL @@ -6449,7 +6449,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Miranda @ 248 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "EMMA$", 8 @ pre-battle speech .2byte EC_WORD_I_VE @@ -6865,7 +6865,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Reese @ 264 - .4byte FACILITY_CLASS_TRIATHLETE_3 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M .string "MASON$", 8 @ pre-battle speech .2byte EC_WORD_PLEASE @@ -6891,7 +6891,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Mason @ 265 - .4byte FACILITY_CLASS_TRIATHLETE_3 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M .string "TOBY$", 8 @ pre-battle speech .2byte EC_WORD_LISTEN @@ -6917,7 +6917,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Toby @ 266 - .4byte FACILITY_CLASS_TRIATHLETE_4 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F .string "DOROTHY$", 8 @ pre-battle speech .2byte EC_WORD_THE @@ -6943,7 +6943,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Dorothy @ 267 - .4byte FACILITY_CLASS_TRIATHLETE_4 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F .string "PIPER$", 8 @ pre-battle speech .2byte EC_WORD_COME_ON @@ -6969,7 +6969,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Piper @ 268 - .4byte FACILITY_CLASS_TRIATHLETE_5 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M .string "FINN$", 8 @ pre-battle speech .2byte EC_WORD_NOT @@ -6995,7 +6995,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Finn @ 269 - .4byte FACILITY_CLASS_TRIATHLETE_5 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M .string "SAMIR$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -7021,7 +7021,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Samir @ 270 - .4byte FACILITY_CLASS_TRIATHLETE_6 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F .string "FIONA$", 8 @ pre-battle speech .2byte EC_WORD_DID @@ -7047,7 +7047,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Fiona @ 271 - .4byte FACILITY_CLASS_TRIATHLETE_6 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F .string "GLORIA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -7073,7 +7073,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Gloria @ 272 - .4byte FACILITY_CLASS_TRIATHLETE_1 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M .string "NICO$", 8 @ pre-battle speech .2byte EC_WORD_LIKE @@ -7099,7 +7099,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Nico @ 273 - .4byte FACILITY_CLASS_TRIATHLETE_1 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M .string "JEREMY$", 8 @ pre-battle speech .2byte EC_WORD_A @@ -7125,7 +7125,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jeremy @ 274 - .4byte FACILITY_CLASS_TRIATHLETE_2 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F .string "CAITLIN$", 8 @ pre-battle speech .2byte EC_WORD_DON_T @@ -7151,7 +7151,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Caitlin @ 275 - .4byte FACILITY_CLASS_TRIATHLETE_2 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F .string "REENA$", 8 @ pre-battle speech .2byte EC_WORD_I_AM diff --git a/data/battle_frontier/battle_pyramid_level_50_wild_mons.inc b/data/battle_frontier/battle_pyramid_level_50_wild_mons.inc deleted file mode 100644 index 251a1aeae..000000000 --- a/data/battle_frontier/battle_pyramid_level_50_wild_mons.inc +++ /dev/null @@ -1,1003 +0,0 @@ - .align 2 -gBattlePyramidLevel50WildMons_Round1:: @ 86126B0 -@ 0 - .2byte SPECIES_PLUSLE - .byte 35 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE - -@ 1 - .2byte SPECIES_MINUN - .byte 35 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE - -@ 2 - .2byte SPECIES_PIKACHU - .byte 37 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE - -@ 3 - .2byte SPECIES_ELECTABUZZ - .byte 37 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE - -@ 4 - .2byte SPECIES_VILEPLUME - .byte 39 @ base level - .byte 2 @ unknown - .2byte MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE - -@ 5 - .2byte SPECIES_MANECTRIC - .byte 39 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE - -@ 6 - .2byte SPECIES_BRELOOM - .byte 40 @ base level - .byte 2 @ unknown - .2byte MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH - -@ 7 - .2byte SPECIES_JOLTEON - .byte 40 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK - -gBattlePyramidLevel50WildMons_Round2:: @ 8612710 -@ 0 - .2byte SPECIES_GULPIN - .byte 36 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_ROSELIA - .byte 36 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE - -@ 2 - .2byte SPECIES_BUTTERFREE - .byte 38 @ base level - .byte 2 @ unknown - .2byte MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE - -@ 3 - .2byte SPECIES_SEVIPER - .byte 38 @ base level - .byte 2 @ unknown - .2byte MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL - -@ 4 - .2byte SPECIES_SKARMORY - .byte 40 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE - -@ 5 - .2byte SPECIES_LUDICOLO - .byte 40 @ base level - .byte 1 @ unknown - .2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_DIVE, MOVE_RAIN_DANCE - -@ 6 - .2byte SPECIES_CROBAT - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE - -@ 7 - .2byte SPECIES_GENGAR - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round3:: @ 8612770 -@ 0 - .2byte SPECIES_GROWLITHE - .byte 37 @ base level - .byte 2 @ unknown - .2byte MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_VULPIX - .byte 37 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_MAGCARGO - .byte 39 @ base level - .byte 1 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_PROTECT, MOVE_NONE - -@ 3 - .2byte SPECIES_NINETALES - .byte 39 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE - -@ 4 - .2byte SPECIES_MEDICHAM - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_WEEZING - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_DUSCLOPS - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH - -@ 7 - .2byte SPECIES_HOUNDOOM - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT - -gBattlePyramidLevel50WildMons_Round4:: @ 86127D0 -@ 0 - .2byte SPECIES_DUNSPARCE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_BANETTE - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE - -@ 2 - .2byte SPECIES_MISDREAVUS - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE - -@ 3 - .2byte SPECIES_NINETALES - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE - -@ 4 - .2byte SPECIES_ABSOL - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 5 - .2byte SPECIES_DUSCLOPS - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL - -@ 6 - .2byte SPECIES_SHEDINJA - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE - -@ 7 - .2byte SPECIES_GENGAR - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round5:: @ 8612830 -@ 0 - .2byte SPECIES_HAUNTER - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE - -@ 1 - .2byte SPECIES_CHIMECHO - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT - -@ 2 - .2byte SPECIES_SOLROCK - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC - -@ 3 - .2byte SPECIES_MISDREAVUS - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT - -@ 4 - .2byte SPECIES_CLAYDOL - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC - -@ 5 - .2byte SPECIES_WEEZING - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_FLYGON - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH - -@ 7 - .2byte SPECIES_GENGAR - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE - -gBattlePyramidLevel50WildMons_Round6:: @ 8612890 -@ 0 - .2byte SPECIES_DIGLETT - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE - -@ 1 - .2byte SPECIES_TRAPINCH - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE - -@ 2 - .2byte SPECIES_WYNAUT - .byte 42 @ base level - .byte 0 @ unknown - .2byte MOVE_DESTINY_BOND, MOVE_SPLASH, MOVE_COUNTER, MOVE_MIRROR_COAT - -@ 3 - .2byte SPECIES_DIGLETT - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC - -@ 4 - .2byte SPECIES_TRAPINCH - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT - -@ 5 - .2byte SPECIES_WYNAUT - .byte 44 @ base level - .byte 0 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE - -@ 6 - .2byte SPECIES_WOBBUFFET - .byte 45 @ base level - .byte 0 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE - -@ 7 - .2byte SPECIES_DUGTRIO - .byte 45 @ base level - .byte 1 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT - -gBattlePyramidLevel50WildMons_Round7:: @ 86128F0 -@ 0 - .2byte SPECIES_GLALIE - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_SNEASEL - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE - -@ 2 - .2byte SPECIES_DEWGONG - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_PILOSWINE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE - -@ 4 - .2byte SPECIES_JYNX - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE - -@ 5 - .2byte SPECIES_CLOYSTER - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_WALREIN - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE - -@ 7 - .2byte SPECIES_LAPRAS - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC - -gBattlePyramidLevel50WildMons_Round8:: @ 8612950 -@ 0 - .2byte SPECIES_WEEZING - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE - -@ 1 - .2byte SPECIES_ELECTRODE - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE - -@ 2 - .2byte SPECIES_GENGAR - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE - -@ 3 - .2byte SPECIES_GOLEM - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE - -@ 4 - .2byte SPECIES_PINECO - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE - -@ 5 - .2byte SPECIES_SOLROCK - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE - -@ 6 - .2byte SPECIES_FORRETRESS - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 7 - .2byte SPECIES_SHIFTRY - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT - -gBattlePyramidLevel50WildMons_Round9:: @ 86129B0 -@ 0 - .2byte SPECIES_WOBBUFFET - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND - -@ 1 - .2byte SPECIES_METANG - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC - -@ 2 - .2byte SPECIES_EXEGGUTOR - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE - -@ 3 - .2byte SPECIES_SLOWKING - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER - -@ 4 - .2byte SPECIES_XATU - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING - -@ 5 - .2byte SPECIES_ALAKAZAM - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC - -@ 6 - .2byte SPECIES_STARMIE - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM - -@ 7 - .2byte SPECIES_ESPEON - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round10:: @ 8612A10 -@ 0 - .2byte SPECIES_GOLEM - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_STEELIX - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE - -@ 2 - .2byte SPECIES_OMASTAR - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE - -@ 3 - .2byte SPECIES_LUNATONE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE - -@ 4 - .2byte SPECIES_SHUCKLE - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE - -@ 5 - .2byte SPECIES_ARMALDO - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE - -@ 6 - .2byte SPECIES_CRADILY - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE - -@ 7 - .2byte SPECIES_AERODACTYL - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round11:: @ 8612A70 -@ 0 - .2byte SPECIES_POLIWRATH - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE - -@ 1 - .2byte SPECIES_HARIYAMA - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE - -@ 2 - .2byte SPECIES_BRELOOM - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE - -@ 3 - .2byte SPECIES_MEDICHAM - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH - -@ 4 - .2byte SPECIES_HITMONCHAN - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH - -@ 5 - .2byte SPECIES_HITMONLEE - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE - -@ 6 - .2byte SPECIES_HERACROSS - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE - -@ 7 - .2byte SPECIES_MACHAMP - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS - -gBattlePyramidLevel50WildMons_Round12:: @ 8612AD0 -@ 0 - .2byte SPECIES_QUAGSIRE - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_TROPIUS - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_PUPITAR - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 3 - .2byte SPECIES_LAPRAS - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_CACTURNE - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE - -@ 5 - .2byte SPECIES_FLAREON - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_WALREIN - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 7 - .2byte SPECIES_GYARADOS - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round13:: @ 8612B30 -@ 0 - .2byte SPECIES_PINECO - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_SHUCKLE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 2 - .2byte SPECIES_VENOMOTH - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC - -@ 3 - .2byte SPECIES_SCIZOR - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT - -@ 4 - .2byte SPECIES_HERACROSS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - -@ 5 - .2byte SPECIES_FORRETRESS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_ARMALDO - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 7 - .2byte SPECIES_SHEDINJA - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE - -gBattlePyramidLevel50WildMons_Round14:: @ 8612B90 -@ 0 - .2byte SPECIES_SABLEYE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE - -@ 1 - .2byte SPECIES_SNEASEL - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK - -@ 2 - .2byte SPECIES_CRAWDAUNT - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_SHIFTRY - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN - -@ 4 - .2byte SPECIES_CACTURNE - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE - -@ 5 - .2byte SPECIES_ABSOL - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE - -@ 6 - .2byte SPECIES_HOUNDOOM - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 7 - .2byte SPECIES_UMBREON - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK - -gBattlePyramidLevel50WildMons_Round15:: @ 8612BF0 -@ 0 - .2byte SPECIES_OCTILLERY - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE - -@ 1 - .2byte SPECIES_DEWGONG - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE - -@ 2 - .2byte SPECIES_PELIPPER - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_QUAGSIRE - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE - -@ 4 - .2byte SPECIES_LUDICOLO - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM - -@ 5 - .2byte SPECIES_SLOWKING - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE - -@ 6 - .2byte SPECIES_STARMIE - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD - -@ 7 - .2byte SPECIES_BLASTOISE - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round16:: @ 8612C50 -@ 0 - .2byte SPECIES_DUSKULL - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 1 - .2byte SPECIES_HAUNTER - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL - -@ 2 - .2byte SPECIES_BANETTE - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE - -@ 3 - .2byte SPECIES_MISDREAVUS - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE - -@ 4 - .2byte SPECIES_SABLEYE - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE - -@ 5 - .2byte SPECIES_DUSCLOPS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE - -@ 6 - .2byte SPECIES_SHEDINJA - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT - -@ 7 - .2byte SPECIES_GENGAR - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE - -gBattlePyramidLevel50WildMons_Round17:: @ 8612CB0 -@ 0 - .2byte SPECIES_MAWILE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE - -@ 1 - .2byte SPECIES_MAGNETON - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_STEELIX - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE - -@ 3 - .2byte SPECIES_SCIZOR - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_FORRETRESS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_SKARMORY - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT - -@ 6 - .2byte SPECIES_AGGRON - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM - -@ 7 - .2byte SPECIES_METAGROSS - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK - -gBattlePyramidLevel50WildMons_Round18:: @ 8612D10 -@ 0 - .2byte SPECIES_DRAGONAIR - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE - -@ 1 - .2byte SPECIES_VIBRAVA - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING - -@ 2 - .2byte SPECIES_ALTARIA - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT - -@ 3 - .2byte SPECIES_FLYGON - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE - -@ 4 - .2byte SPECIES_AERODACTYL - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE - -@ 5 - .2byte SPECIES_GYARADOS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE - -@ 6 - .2byte SPECIES_KINGDRA - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE - -@ 7 - .2byte SPECIES_CHARIZARD - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL - -gBattlePyramidLevel50WildMons_Round19:: @ 8612D70 -@ 0 - .2byte SPECIES_ARCANINE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_POLIWRATH - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_RAICHU - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE - -@ 3 - .2byte SPECIES_VAPOREON - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_JOLTEON - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_FLAREON - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE - -@ 6 - .2byte SPECIES_NINETALES - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE - -@ 7 - .2byte SPECIES_STARMIE - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC - -gBattlePyramidLevel50WildMons_Round20:: @ 8612DD0 -@ 0 - .2byte SPECIES_KANGASKHAN - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH - -@ 1 - .2byte SPECIES_SWELLOW - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE - -@ 2 - .2byte SPECIES_URSARING - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT - -@ 3 - .2byte SPECIES_PORYGON2 - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM - -@ 4 - .2byte SPECIES_TAUROS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT - -@ 5 - .2byte SPECIES_FEAROW - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT - -@ 6 - .2byte SPECIES_SNORLAX - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE - -@ 7 - .2byte SPECIES_SLAKING - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM - - .align 2 -gBattlePyramidLevel50WildMonPointers:: @ 8612E30 - .4byte gBattlePyramidLevel50WildMons_Round1 - .4byte gBattlePyramidLevel50WildMons_Round2 - .4byte gBattlePyramidLevel50WildMons_Round3 - .4byte gBattlePyramidLevel50WildMons_Round4 - .4byte gBattlePyramidLevel50WildMons_Round5 - .4byte gBattlePyramidLevel50WildMons_Round6 - .4byte gBattlePyramidLevel50WildMons_Round7 - .4byte gBattlePyramidLevel50WildMons_Round8 - .4byte gBattlePyramidLevel50WildMons_Round9 - .4byte gBattlePyramidLevel50WildMons_Round10 - .4byte gBattlePyramidLevel50WildMons_Round11 - .4byte gBattlePyramidLevel50WildMons_Round12 - .4byte gBattlePyramidLevel50WildMons_Round13 - .4byte gBattlePyramidLevel50WildMons_Round14 - .4byte gBattlePyramidLevel50WildMons_Round15 - .4byte gBattlePyramidLevel50WildMons_Round16 - .4byte gBattlePyramidLevel50WildMons_Round17 - .4byte gBattlePyramidLevel50WildMons_Round18 - .4byte gBattlePyramidLevel50WildMons_Round19 - .4byte gBattlePyramidLevel50WildMons_Round20 diff --git a/data/battle_frontier/battle_pyramid_open_level_wild_mons.inc b/data/battle_frontier/battle_pyramid_open_level_wild_mons.inc deleted file mode 100644 index 0ae67a44b..000000000 --- a/data/battle_frontier/battle_pyramid_open_level_wild_mons.inc +++ /dev/null @@ -1,1003 +0,0 @@ - .align 2 -gBattlePyramidOpenLevelWildMons_Round1:: @ 8612E80 -@ 0 - .2byte SPECIES_PLUSLE - .byte 15 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE - -@ 1 - .2byte SPECIES_MINUN - .byte 15 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE - -@ 2 - .2byte SPECIES_PIKACHU - .byte 13 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE - -@ 3 - .2byte SPECIES_ELECTABUZZ - .byte 13 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE - -@ 4 - .2byte SPECIES_VILEPLUME - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE - -@ 5 - .2byte SPECIES_MANECTRIC - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE - -@ 6 - .2byte SPECIES_BRELOOM - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH - -@ 7 - .2byte SPECIES_JOLTEON - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK - -gBattlePyramidOpenLevelWildMons_Round2:: @ 8612EE0 -@ 0 - .2byte SPECIES_GULPIN - .byte 14 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_ROSELIA - .byte 14 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE - -@ 2 - .2byte SPECIES_BUTTERFREE - .byte 12 @ base level difference - .byte 2 @ unknown - .2byte MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE - -@ 3 - .2byte SPECIES_SEVIPER - .byte 12 @ base level difference - .byte 2 @ unknown - .2byte MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL - -@ 4 - .2byte SPECIES_SKARMORY - .byte 7 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE - -@ 5 - .2byte SPECIES_LUDICOLO - .byte 7 @ base level difference - .byte 1 @ unknown - .2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_DIVE, MOVE_RAIN_DANCE - -@ 6 - .2byte SPECIES_CROBAT - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE - -@ 7 - .2byte SPECIES_GENGAR - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round3:: @ 8612F40 -@ 0 - .2byte SPECIES_GROWLITHE - .byte 13 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_VULPIX - .byte 13 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_MAGCARGO - .byte 11 @ base level difference - .byte 1 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_PROTECT, MOVE_NONE - -@ 3 - .2byte SPECIES_NINETALES - .byte 11 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE - -@ 4 - .2byte SPECIES_MEDICHAM - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_WEEZING - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_DUSCLOPS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH - -@ 7 - .2byte SPECIES_HOUNDOOM - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT - -gBattlePyramidOpenLevelWildMons_Round4:: @ 8612FA0 -@ 0 - .2byte SPECIES_DUNSPARCE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_BANETTE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE - -@ 2 - .2byte SPECIES_MISDREAVUS - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE - -@ 3 - .2byte SPECIES_NINETALES - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE - -@ 4 - .2byte SPECIES_ABSOL - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 5 - .2byte SPECIES_DUSCLOPS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL - -@ 6 - .2byte SPECIES_SHEDINJA - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE - -@ 7 - .2byte SPECIES_GENGAR - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round5:: @ 8613000 -@ 0 - .2byte SPECIES_HAUNTER - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE - -@ 1 - .2byte SPECIES_CHIMECHO - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT - -@ 2 - .2byte SPECIES_SOLROCK - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC - -@ 3 - .2byte SPECIES_MISDREAVUS - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT - -@ 4 - .2byte SPECIES_CLAYDOL - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC - -@ 5 - .2byte SPECIES_WEEZING - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_FLYGON - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH - -@ 7 - .2byte SPECIES_GENGAR - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE - -gBattlePyramidOpenLevelWildMons_Round6:: @ 8613060 -@ 0 - .2byte SPECIES_DIGLETT - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE - -@ 1 - .2byte SPECIES_TRAPINCH - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE - -@ 2 - .2byte SPECIES_WYNAUT - .byte 8 @ base level difference - .byte 0 @ unknown - .2byte MOVE_DESTINY_BOND, MOVE_SPLASH, MOVE_COUNTER, MOVE_MIRROR_COAT - -@ 3 - .2byte SPECIES_DIGLETT - .byte 8 @ base level difference - .byte 1 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC - -@ 4 - .2byte SPECIES_TRAPINCH - .byte 6 @ base level difference - .byte 1 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT - -@ 5 - .2byte SPECIES_WYNAUT - .byte 6 @ base level difference - .byte 0 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE - -@ 6 - .2byte SPECIES_WOBBUFFET - .byte 5 @ base level difference - .byte 0 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE - -@ 7 - .2byte SPECIES_DUGTRIO - .byte 5 @ base level difference - .byte 1 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT - -gBattlePyramidOpenLevelWildMons_Round7:: @ 86130C0 -@ 0 - .2byte SPECIES_GLALIE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_SNEASEL - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE - -@ 2 - .2byte SPECIES_DEWGONG - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_PILOSWINE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE - -@ 4 - .2byte SPECIES_JYNX - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE - -@ 5 - .2byte SPECIES_CLOYSTER - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_WALREIN - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE - -@ 7 - .2byte SPECIES_LAPRAS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC - -gBattlePyramidOpenLevelWildMons_Round8:: @ 8613120 -@ 0 - .2byte SPECIES_WEEZING - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE - -@ 1 - .2byte SPECIES_ELECTRODE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE - -@ 2 - .2byte SPECIES_GENGAR - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE - -@ 3 - .2byte SPECIES_GOLEM - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE - -@ 4 - .2byte SPECIES_PINECO - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE - -@ 5 - .2byte SPECIES_SOLROCK - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE - -@ 6 - .2byte SPECIES_FORRETRESS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 7 - .2byte SPECIES_SHIFTRY - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT - -gBattlePyramidOpenLevelWildMons_Round9:: @ 8613180 -@ 0 - .2byte SPECIES_WOBBUFFET - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND - -@ 1 - .2byte SPECIES_METANG - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC - -@ 2 - .2byte SPECIES_EXEGGUTOR - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE - -@ 3 - .2byte SPECIES_SLOWKING - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER - -@ 4 - .2byte SPECIES_XATU - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING - -@ 5 - .2byte SPECIES_ALAKAZAM - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC - -@ 6 - .2byte SPECIES_STARMIE - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM - -@ 7 - .2byte SPECIES_ESPEON - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round10:: @ 86131E0 -@ 0 - .2byte SPECIES_GOLEM - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_STEELIX - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE - -@ 2 - .2byte SPECIES_OMASTAR - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE - -@ 3 - .2byte SPECIES_LUNATONE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE - -@ 4 - .2byte SPECIES_SHUCKLE - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE - -@ 5 - .2byte SPECIES_ARMALDO - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE - -@ 6 - .2byte SPECIES_CRADILY - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE - -@ 7 - .2byte SPECIES_AERODACTYL - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round11:: @ 8613240 -@ 0 - .2byte SPECIES_POLIWRATH - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE - -@ 1 - .2byte SPECIES_HARIYAMA - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE - -@ 2 - .2byte SPECIES_BRELOOM - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE - -@ 3 - .2byte SPECIES_MEDICHAM - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH - -@ 4 - .2byte SPECIES_HITMONCHAN - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH - -@ 5 - .2byte SPECIES_HITMONLEE - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE - -@ 6 - .2byte SPECIES_HERACROSS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE - -@ 7 - .2byte SPECIES_MACHAMP - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS - -gBattlePyramidOpenLevelWildMons_Round12:: @ 86132A0 -@ 0 - .2byte SPECIES_QUAGSIRE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_TROPIUS - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_PUPITAR - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 3 - .2byte SPECIES_LAPRAS - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_CACTURNE - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE - -@ 5 - .2byte SPECIES_FLAREON - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_WALREIN - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 7 - .2byte SPECIES_GYARADOS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round13:: @ 8613300 -@ 0 - .2byte SPECIES_PINECO - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_SHUCKLE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 2 - .2byte SPECIES_VENOMOTH - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC - -@ 3 - .2byte SPECIES_SCIZOR - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT - -@ 4 - .2byte SPECIES_HERACROSS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - -@ 5 - .2byte SPECIES_FORRETRESS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_ARMALDO - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 7 - .2byte SPECIES_SHEDINJA - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE - -gBattlePyramidOpenLevelWildMons_Round14:: @ 8613360 -@ 0 - .2byte SPECIES_SABLEYE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE - -@ 1 - .2byte SPECIES_SNEASEL - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK - -@ 2 - .2byte SPECIES_CRAWDAUNT - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_SHIFTRY - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN - -@ 4 - .2byte SPECIES_CACTURNE - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE - -@ 5 - .2byte SPECIES_ABSOL - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE - -@ 6 - .2byte SPECIES_HOUNDOOM - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 7 - .2byte SPECIES_UMBREON - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK - -gBattlePyramidOpenLevelWildMons_Round15:: @ 86133C0 -@ 0 - .2byte SPECIES_OCTILLERY - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE - -@ 1 - .2byte SPECIES_DEWGONG - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE - -@ 2 - .2byte SPECIES_PELIPPER - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_QUAGSIRE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE - -@ 4 - .2byte SPECIES_LUDICOLO - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM - -@ 5 - .2byte SPECIES_SLOWKING - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE - -@ 6 - .2byte SPECIES_STARMIE - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD - -@ 7 - .2byte SPECIES_BLASTOISE - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round16:: @ 8613420 -@ 0 - .2byte SPECIES_DUSKULL - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 1 - .2byte SPECIES_HAUNTER - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL - -@ 2 - .2byte SPECIES_BANETTE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE - -@ 3 - .2byte SPECIES_MISDREAVUS - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE - -@ 4 - .2byte SPECIES_SABLEYE - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE - -@ 5 - .2byte SPECIES_DUSCLOPS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE - -@ 6 - .2byte SPECIES_SHEDINJA - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT - -@ 7 - .2byte SPECIES_GENGAR - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE - -gBattlePyramidOpenLevelWildMons_Round17:: @ 8613480 -@ 0 - .2byte SPECIES_MAWILE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE - -@ 1 - .2byte SPECIES_MAGNETON - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_STEELIX - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE - -@ 3 - .2byte SPECIES_SCIZOR - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_FORRETRESS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_SKARMORY - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT - -@ 6 - .2byte SPECIES_AGGRON - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM - -@ 7 - .2byte SPECIES_METAGROSS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK - -gBattlePyramidOpenLevelWildMons_Round18:: @ 86134E0 -@ 0 - .2byte SPECIES_DRAGONAIR - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE - -@ 1 - .2byte SPECIES_VIBRAVA - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING - -@ 2 - .2byte SPECIES_ALTARIA - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT - -@ 3 - .2byte SPECIES_FLYGON - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE - -@ 4 - .2byte SPECIES_AERODACTYL - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE - -@ 5 - .2byte SPECIES_GYARADOS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE - -@ 6 - .2byte SPECIES_KINGDRA - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE - -@ 7 - .2byte SPECIES_CHARIZARD - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL - -gBattlePyramidOpenLevelWildMons_Round19:: @ 8613540 -@ 0 - .2byte SPECIES_ARCANINE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_POLIWRATH - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_RAICHU - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE - -@ 3 - .2byte SPECIES_VAPOREON - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_JOLTEON - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_FLAREON - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE - -@ 6 - .2byte SPECIES_NINETALES - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE - -@ 7 - .2byte SPECIES_STARMIE - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC - -gBattlePyramidOpenLevelWildMons_Round20:: @ 86135A0 -@ 0 - .2byte SPECIES_KANGASKHAN - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH - -@ 1 - .2byte SPECIES_SWELLOW - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE - -@ 2 - .2byte SPECIES_URSARING - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT - -@ 3 - .2byte SPECIES_PORYGON2 - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM - -@ 4 - .2byte SPECIES_TAUROS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT - -@ 5 - .2byte SPECIES_FEAROW - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT - -@ 6 - .2byte SPECIES_SNORLAX - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE - -@ 7 - .2byte SPECIES_SLAKING - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM - - .align 2 -gBattlePyramidOpenLevelWildMonPointers:: @ 8613600 - .4byte gBattlePyramidOpenLevelWildMons_Round1 - .4byte gBattlePyramidOpenLevelWildMons_Round2 - .4byte gBattlePyramidOpenLevelWildMons_Round3 - .4byte gBattlePyramidOpenLevelWildMons_Round4 - .4byte gBattlePyramidOpenLevelWildMons_Round5 - .4byte gBattlePyramidOpenLevelWildMons_Round6 - .4byte gBattlePyramidOpenLevelWildMons_Round7 - .4byte gBattlePyramidOpenLevelWildMons_Round8 - .4byte gBattlePyramidOpenLevelWildMons_Round9 - .4byte gBattlePyramidOpenLevelWildMons_Round10 - .4byte gBattlePyramidOpenLevelWildMons_Round11 - .4byte gBattlePyramidOpenLevelWildMons_Round12 - .4byte gBattlePyramidOpenLevelWildMons_Round13 - .4byte gBattlePyramidOpenLevelWildMons_Round14 - .4byte gBattlePyramidOpenLevelWildMons_Round15 - .4byte gBattlePyramidOpenLevelWildMons_Round16 - .4byte gBattlePyramidOpenLevelWildMons_Round17 - .4byte gBattlePyramidOpenLevelWildMons_Round18 - .4byte gBattlePyramidOpenLevelWildMons_Round19 - .4byte gBattlePyramidOpenLevelWildMons_Round20 diff --git a/data/battle_frontier/fallarbor_battle_tent_trainers.inc b/data/battle_frontier/fallarbor_battle_tent_trainers.inc index 675314eb3..f1e2f8c4c 100644 --- a/data/battle_frontier/fallarbor_battle_tent_trainers.inc +++ b/data/battle_frontier/fallarbor_battle_tent_trainers.inc @@ -53,7 +53,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Javier @ 2 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "NATALIE$", 8 @ pre-battle speech .2byte EC_WORD_THE @@ -79,7 +79,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Natalie @ 3 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "TREVE$", 8 @ pre-battle speech .2byte EC_WORD_LOOK @@ -417,7 +417,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Mariana @ 16 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "SHELDON$", 8 @ pre-battle speech .2byte EC_WORD_A @@ -443,7 +443,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Sheldon @ 17 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "GIANNA$", 8 @ pre-battle speech .2byte EC_WORD_AHAHA @@ -495,7 +495,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Yahir @ 19 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "BRITNEY$", 8 @ pre-battle speech .2byte EC_WORD_IT diff --git a/data/battle_frontier/slateport_battle_tent_trainers.inc b/data/battle_frontier/slateport_battle_tent_trainers.inc index 051514b94..92a2f2518 100644 --- a/data/battle_frontier/slateport_battle_tent_trainers.inc +++ b/data/battle_frontier/slateport_battle_tent_trainers.inc @@ -53,7 +53,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Malachi @ 2 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "KELSIE$", 8 @ pre-battle speech .2byte EC_WORD_GO @@ -79,7 +79,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Kelsie @ 3 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "DAVON$", 8 @ pre-battle speech .2byte EC_WORD_YEAH_YEAH @@ -417,7 +417,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Rebecca @ 16 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "REGGIE$", 8 @ pre-battle speech .2byte EC_WORD_POKEMON @@ -443,7 +443,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Reggie @ 17 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "JANAE$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -495,7 +495,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Caiden @ 19 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "KIRSTEN$", 8 @ pre-battle speech .2byte EC_WORD_HUH_QUES diff --git a/data/battle_frontier/verdanturf_battle_tent_trainers.inc b/data/battle_frontier/verdanturf_battle_tent_trainers.inc index b375ce811..5f4dad133 100644 --- a/data/battle_frontier/verdanturf_battle_tent_trainers.inc +++ b/data/battle_frontier/verdanturf_battle_tent_trainers.inc @@ -53,7 +53,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Dilan @ 2 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "ELIANA$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -79,7 +79,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Eliana @ 3 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "MARKUS$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -417,7 +417,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Ashlyn @ 16 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "ADDISON$", 8 @ pre-battle speech .2byte EC_WORD_YES @@ -443,7 +443,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Addison @ 17 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "JUSTINE$", 8 @ pre-battle speech .2byte EC_WORD_YES @@ -495,7 +495,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Tyson @ 19 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "LAILA$", 8 @ pre-battle speech .2byte EC_WORD_A diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s index 4074c360c..b1375e05f 100644 --- a/data/battle_frontier_1.s +++ b/data/battle_frontier_1.s @@ -6,31 +6,6 @@ .section .rodata .align 2 -gUnknown_0860DE50:: @ 860DE50 - .4byte sub_8195980 - .4byte sub_8195A38 - .4byte sub_8195AE4 - .4byte sub_8195BB0 - .4byte sub_8195C20 - .4byte sub_8195C50 - .4byte sub_8195C7C - .4byte sub_8195CE4 - .4byte sub_8195D28 - .4byte sub_8195DB8 - -gUnknown_0860DE78:: @ 860DE78 - .2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 - -gUnknown_0860DE84:: @ 860DE84 - .2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba, 0x0000 - -gUnknown_0860DE98:: @ 860DE98 - .4byte 0x00000010, 0x00000020, 0x00400000, 0x00800000 - -gUnknown_0860DEA8:: @ 860DEA8 - .4byte 0xffffffef, 0xffffffdf, 0xffbfffff, 0xff7fffff - - .align 2 gUnknown_0860DEB8:: @ 860DEB8 //struct .2byte 0x0025, 0x0000, 0x0108, 0x0208, 0x0308, 0x0103, 0x0008, 0x0108, 0x0208, 0x0000 .2byte 0x02e1, 0x0000, 0x010c, 0x020c, 0x030c, 0x013e, 0x000c, 0x010c, 0x020c, 0x0000 diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s deleted file mode 100644 index 51b62461d..000000000 --- a/data/battle_frontier_2.s +++ /dev/null @@ -1,1110 +0,0 @@ -#include "constants/moves.h" -#include "constants/species.h" -#include "constants/trainers.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .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 - .4byte gText_BattleTower2 - .4byte gUnknown_085ED170 - .4byte gText_BattleTower2 - .4byte gUnknown_085ED17C - .4byte gText_BattleDome - .4byte gUnknown_085ED164 - .4byte gText_BattlePalace - .4byte gUnknown_085ED164 - .4byte gText_BattleArena - .4byte gUnknown_085ED190 - .4byte gText_BattleFactory - .4byte gUnknown_085ED164 - .4byte gText_BattlePike - .4byte gUnknown_085ED190 - .4byte gText_BattlePyramid - .4byte gUnknown_085ED190 - .4byte gText_BattleTower2 - .4byte gUnknown_085ED188 - - .align 2 -gUnknown_08611D00:: @ 8611D00 - .4byte gUnknown_085EE3B0 - .4byte gUnknown_085EE3B8 - - .align 2 -gUnknown_08611D08:: @ 8611D08 - .4byte gUnknown_085EE3C4 - .4byte gUnknown_085EE3C4 - .4byte gUnknown_085EE3C4 - .4byte gUnknown_085EE3D4 - .4byte gUnknown_085EE3C4 - .4byte gUnknown_085EE3FC - .4byte gUnknown_085EE3C4 - .4byte gUnknown_085EE3E8 - .4byte gUnknown_085EE410 - .4byte gUnknown_085EE3C4 - - .align 1 -gFacilityToBrainTrainerId:: @ 8611D30 - .2byte TRAINER_ANABEL, TRAINER_TUCKER, TRAINER_SPENSER - .2byte TRAINER_GRETA, TRAINER_NOLAND, TRAINER_LUCY - .2byte TRAINER_BRANDON - - .align 2 -gUnknown_08611D40:: @ 8611D40 - .4byte gText_082C843F - .4byte gText_082C848B - .4byte gText_082C8628 - .4byte gText_082C85B4 - .4byte gText_082C8512 - .4byte gText_082C859D - .4byte gText_082C86C3 - - .align 2 -gUnknown_08611D5C:: @ 8611D5C - .4byte gText_082C8458 - .4byte gText_082C84C1 - .4byte gText_082C8662 - .4byte gText_082C85E3 - .4byte gText_082C853B - .4byte gText_082C85A4 - .4byte gText_082C86FE - - .align 2 -gUnknown_08611D78:: @ 8611D78 - .4byte gText_082C846C - .4byte gText_082C84D0 - .4byte gText_082C8682 - .4byte gText_082C85F5 - .4byte gText_082C8561 - .4byte gText_082C85A9 - .4byte gText_082C8739 - - .align 2 -gUnknown_08611D94:: @ 8611D94 - .4byte gText_082C8480 - .4byte gText_082C84F7 - .4byte gText_082C86B3 - .4byte gText_082C8611 - .4byte gText_082C8589 - .4byte gText_082C85AE - .4byte gText_082C877B - - .align 2 -gUnknown_08611DB0:: @ 8611DB0 - .4byte gUnknown_08611D40 - .4byte gUnknown_08611D78 - - .align 2 -gUnknown_08611DB8:: @ 8611DB8 - .4byte gUnknown_08611D5C - .4byte gUnknown_08611D94 - -@ 8611DC0 - .include "data/battle_frontier/battle_arena_move_mind_ratings.inc" - - .align 2 -gUnknown_08611F24:: @ 8611F24 - .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0xf0, 0x00, 0x00 - - .align 2 -gUnknown_08611F2C:: @ 8611F2C - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08611F34:: @ 8611F34 - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08611F3C:: @ 8611F3C - .2byte 0x0008, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08611F44:: @ 8611F44 - .2byte 0x000c, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08611F4C:: @ 8611F4C - .4byte gUnknown_08611F2C - .4byte gUnknown_08611F34 - .4byte gUnknown_08611F3C - .4byte gUnknown_08611F44 - - .align 2 -gUnknown_08611F5C:: @ 8611F5C - spr_template 0x03e8, 0xffff, gUnknown_08611F24, gUnknown_08611F4C, NULL, gDummySpriteAffineAnimTable, sub_81A5698 - - .align 2 -gUnknown_08611F74:: @ 8611F74 - obj_tiles gUnknown_08D854E8, 0x0200, 0x03e8 - null_obj_tiles - - .align 2 -gUnknown_08611F84:: @ 8611F84 - .4byte sub_81A58B4 - .4byte sub_81A5964 - .4byte sub_81A59FC - .4byte sub_81A5AC4 - .4byte sub_81A5B08 - .4byte sub_81A5B88 - .4byte sub_81A5BE0 - - .align 1 -gUnknown_08611FA0:: @ 8611FA0 - .2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 - - .align 1 -gUnknown_08611FAC:: @ 8611FAC - .2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba, 0x0000 - -@ 8611FC0 - .include "data/battle_frontier/battle_factory_style_move_lists.inc" - - .align 2 -gUnknown_08612120:: @ 8612120 - .4byte sub_81A5E94 - .4byte sub_81A5FA8 - .4byte sub_81A6054 - .4byte sub_81A613C - .4byte nullsub_75 - .4byte nullsub_123 - .4byte sub_81A6188 - .4byte sub_81A6198 - .4byte sub_81A61A4 - .4byte sub_81A63CC - .4byte sub_81A64C4 - .4byte sub_81A63B8 - .4byte sub_81A61B0 - .4byte sub_81A67EC - .4byte sub_81A6A08 - .4byte sub_81A6AEC - .4byte sub_81A6C1C - - .align 2 -gUnknown_08612164:: @ 8612164 - .4byte 0x00000100, 0x00000200, 0x01000000, 0x02000000 - - .align 2 -gUnknown_08612174:: @ 8612174 - .4byte 0xfffffeff, 0xfffffdff, 0xfeffffff, 0xfdffffff - -gUnknown_08612184:: @ 8612184 - .byte 0x03, 0x06, 0x06, 0x09, 0x09, 0x0c, 0x0c, 0x0f, 0x0f, 0x12, 0x15, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f - - .align 1 -gUnknown_08612194:: @ 8612194 - .2byte 0x006e, 0x00c7, 0x00a2, 0x010a, 0x010b, 0x0173, 0x0174, 0x01d3, 0x01d4, 0x0233, 0x0234, 0x0293, 0x0294, 0x02f3, 0x0174, 0x0351 - .2byte 0x0174, 0x01d3, 0x01d4, 0x0233, 0x0234, 0x0293, 0x0294, 0x02f3, 0x0174, 0x0371, 0x0174, 0x0371, 0x0174, 0x0371, 0x0174, 0x0371 - - .align 1 -gUnknown_086121D4:: @ 86121D4 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x016a, 0x0005, 0x0105, 0x00d4 - .2byte 0x005c, 0x0145 - - .align 1 -gUnknown_086121F8:: @ 86121F8 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x0065, 0x0005, 0x0099, 0x0078 - .2byte 0x0057, 0x005c - - .align 1 -gUnknown_0861221C:: @ 861221C - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x0133, 0x0005, 0x0093, 0x004e - .2byte 0x004d, 0x00ed - - .align 1 -gUnknown_08612240:: @ 8612240 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x00ca, 0x0005, 0x0044, 0x00f3 - .2byte 0x00db, 0x00c2 - - .align 2 -gUnknown_08612264:: @ 8612264 - .4byte gUnknown_086121D4 - .4byte gUnknown_086121F8 - .4byte gUnknown_0861221C - .4byte gUnknown_08612240 - - .align 1 -gUnknown_08612274:: @ 8612274 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x016a, 0x0005, 0x0105, 0x00d4 - .2byte 0x005c, 0x003a - - .align 1 -gUnknown_08612298:: @ 8612298 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x0065, 0x0005, 0x0099, 0x0078 - .2byte 0x0057, 0x005c - - .align 1 -gUnknown_086122BC:: @ 86122BC - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x0133, 0x0005, 0x0093, 0x004e - .2byte 0x004d, 0x00ed - - .align 1 -gUnknown_086122E0:: @ 86122E0 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x00ca, 0x0005, 0x0044, 0x00f3 - .2byte 0x00db, 0x00e3 - - .align 2 -gUnknown_08612304:: @ 8612304 - .4byte gUnknown_08612274 - .4byte gUnknown_08612298 - .4byte gUnknown_086122BC - .4byte gUnknown_086122E0 - - .align 2 -gUnknown_08612314:: @ 8612314 - .4byte gUnknown_08612264 - .4byte gUnknown_08612304 - - .align 2 -gUnknown_0861231C:: @ 861231C - .2byte 0x0012 - .byte 0x03, 0x05, 0x06 - - .align 2 - .2byte 0x0005 - .byte 0x0d, 0x20, 0x25 - - .align 2 - .2byte 0x0011 - .byte 0x08, 0x0b, 0x0c - - .align 2 - .2byte 0x0024 - .byte 0x22, 0x1e, 0x21 - - .align 2 - .2byte 0x0015 - .byte 0x00, 0x00, 0x00 - - .align 2 - .2byte 0x001e - .byte 0x01, 0x01, 0x01 - - .align 2 - .2byte 0x002c - .byte 0x16, 0x17, 0x1b - - .align 2 - .2byte 0x0037 - .byte 0x08, 0x16, 0x1f - - .align 2 - .2byte 0x000e - .byte 0x0d, 0x27, 0x15 - - .align 2 - .2byte 0x0014 - .byte 0x02, 0x04, 0x11 - - .align 2 - .2byte 0x0038 - .byte 0x1e, 0x14, 0x24 - - .align 2 - .2byte 0x0042 - .byte 0x1c, 0x22, 0x19 - - .align 2 - .2byte 0x0026 - .byte 0x17, 0x26, 0x1a - - .align 2 - .2byte 0x0032 - .byte 0x17, 0x1e, 0x0b - - .align 2 - .2byte 0x002f - .byte 0x0f, 0x13, 0x0e - - .align 2 - .2byte 0x0027 - .byte 0x02, 0x1d, 0x1a - - .align 2 - .2byte 0x0033 - .byte 0x25, 0x0c, 0x20 - - .align 2 - .2byte 0x0021 - .byte 0x18, 0x17, 0x26 - - .align 2 - .2byte 0x0018 - .byte 0x05, 0x16, 0x04 - - .align 2 - .2byte 0x000b - .byte 0x29, 0x25, 0x23 - - .align 2 - .2byte 0x0035 - .byte 0x27, 0x0e, 0x0d - - .align 2 - .2byte 0x0030 - .byte 0x0a, 0x07, 0x09 - - .align 2 - .2byte 0x000c - .byte 0x28, 0x14, 0x10 - - .align 2 - .2byte 0x0034 - .byte 0x12, 0x0d, 0x15 - - .align 2 - .2byte 0x0013 - .byte 0x16, 0x1f, 0x1b - - .align 2 -gUnknown_086123E4:: @ 86123E4 - .byte 0x29, 0x0a, 0x30, 0x06, 0x01, 0x0a, 0x0f, 0x14, 0x20, 0x10, 0x0e, 0x27 - .byte 0x2a, 0x0a, 0x1d, 0x08, 0x1b, 0x06, 0x34, 0x10, 0x20, 0x1e, 0x29, 0x0a - .byte 0x22, 0x1e, 0x31, 0x12, 0x01, 0x0a, 0x18, 0x10, 0x1a, 0x1c, 0x03, 0x0c - .byte 0x0f, 0x1e, 0x0b, 0x10, 0x39, 0x10, 0x0f, 0x20, 0x2b, 0x10, 0x14, 0x0a - .byte 0x3b, 0x10, 0x02, 0x0a, 0x1e, 0x16, 0x20, 0x10, 0x3e, 0x14, 0x03, 0x0c - .byte 0x31, 0x0a, 0x02, 0x0e, 0x15, 0x0e, 0x36, 0x14, 0x37, 0x10, 0x0a, 0x1e - .byte 0x29, 0x0a, 0x25, 0x10, 0x2a, 0x14, 0x34, 0x10, 0x0f, 0x1e, 0x1b, 0x0a - .byte 0x01, 0x0a, 0x07, 0x0e, 0x2a, 0x12, 0x0f, 0x1e, 0x1f, 0x06, 0xff, 0xff - .byte 0x35, 0x1a, 0x36, 0x10, 0x0f, 0x0e, 0x01, 0x0a, 0x21, 0x26, 0x0f, 0x1e - .byte 0x25, 0x0e, 0x2f, 0x10, 0x2d, 0x06, 0x1e, 0x20, 0x03, 0x0c, 0xff, 0xff - .byte 0x1d, 0x0c, 0x1d, 0x08, 0x2b, 0x0a, 0x0f, 0x10, 0x02, 0x0a, 0x03, 0x0c - .byte 0x2a, 0x0a, 0x3e, 0x0a, 0x00, 0x20, 0x27, 0x10, 0x08, 0x1c, 0x04, 0x0c - .byte 0x01, 0x0a, 0x12, 0x12, 0x01, 0x0a, 0x00, 0x10, 0x2d, 0x06, 0xff, 0xff - .byte 0x22, 0x1e, 0x31, 0x12, 0x01, 0x0a, 0x18, 0x10, 0x1c, 0x1c, 0x03, 0x0c - .byte 0x01, 0x0a, 0x0b, 0x06, 0x30, 0x10, 0x28, 0x0a, 0x49, 0x25, 0x24, 0x06 - .byte 0x14, 0x10, 0x2c, 0x0a, 0x15, 0x04, 0x42, 0x16, 0x1b, 0x1e, 0x03, 0x0c - .byte 0x28, 0x06, 0x0f, 0x1a, 0x0b, 0x10, 0x17, 0x20, 0x00, 0x0c, 0xff, 0xff - .byte 0x01, 0x0a, 0x15, 0x10, 0x47, 0x16, 0x0f, 0x1e, 0x39, 0x0e, 0x36, 0x0e - .byte 0x01, 0x0a, 0x17, 0x10, 0x20, 0x16, 0x19, 0x0e, 0x31, 0x0a, 0x38, 0x0c - .byte 0x1d, 0x0c, 0x1d, 0x08, 0x00, 0x0c, 0x22, 0x10, 0x12, 0x1c, 0x0b, 0x02 - .byte 0x29, 0x10, 0x04, 0x14, 0x2f, 0x10, 0x06, 0x10, 0x28, 0x1e, 0x1c, 0x1c - .byte 0x29, 0x10, 0x20, 0x0e, 0x28, 0x10, 0x16, 0x1c, 0x29, 0x1e, 0x03, 0x0c - .byte 0x0f, 0x1e, 0x0b, 0x10, 0x2f, 0x0e, 0x38, 0x06, 0x0c, 0x10, 0xff, 0xff - .byte 0x29, 0x0a, 0x08, 0x14, 0x2f, 0x10, 0x1e, 0x06, 0x2c, 0x10, 0xff, 0xff - .byte 0x23, 0x10, 0x0b, 0x10, 0x1d, 0x08, 0x2d, 0x06, 0x37, 0x10, 0x14, 0x0a - .byte 0x29, 0x0a, 0x22, 0x10, 0x08, 0x14, 0x2f, 0x10, 0x1e, 0x16, 0x29, 0x10 - .byte 0x01, 0x06, 0x2c, 0x10, 0x01, 0x0a, 0x15, 0x10, 0x39, 0x0e, 0x36, 0x0e - .byte 0x20, 0x10, 0x0b, 0x02, 0x3f, 0x10, 0x12, 0x1c, 0x04, 0x0c, 0xff, 0xff - .byte 0x18, 0x10, 0x02, 0x0a, 0x3a, 0x10, 0x46, 0x04, 0x0e, 0x02, 0x03, 0x0c - .byte 0x10, 0x1e, 0x0b, 0x02, 0x0a, 0x1e, 0x0b, 0x10, 0x3a, 0x06, 0xff, 0xff - .byte 0x02, 0x0a, 0x12, 0x12, 0x0f, 0x1e, 0x0b, 0x10, 0x38, 0x06, 0x03, 0x0c - .byte 0x22, 0x1e, 0x00, 0x10, 0x1b, 0x16, 0x3f, 0x10, 0x0f, 0x1e, 0x03, 0x0c - .byte 0x29, 0x0a, 0x1e, 0x0e, 0x25, 0x10, 0x26, 0x1e, 0x00, 0x0c, 0xff, 0xff - .byte 0x01, 0x0a, 0x1e, 0x0e, 0x36, 0x12, 0x2f, 0x10, 0x0b, 0x12, 0x04, 0x0c - .byte 0x05, 0x28, 0x0f, 0x1e, 0x1b, 0x0a, 0x0b, 0x10, 0x20, 0x10, 0x3b, 0x06 - .byte 0x01, 0x0a, 0x1f, 0x10, 0x3e, 0x0a, 0x37, 0x10, 0x20, 0x10, 0x28, 0x06 - .byte 0x26, 0x10, 0x31, 0x0a, 0x29, 0x1e, 0x1c, 0x1c, 0x01, 0x0a, 0x12, 0x12 - .byte 0x0a, 0x0c, 0x00, 0x0c, 0x29, 0x10, 0x1c, 0x10, 0x0f, 0x1e, 0x23, 0x0c - .byte 0x28, 0x0a, 0x0e, 0x02, 0x0f, 0x10, 0x39, 0x10, 0x2a, 0x14, 0x04, 0x0c - .byte 0x28, 0x0a, 0x0e, 0x02, 0x0f, 0x10, 0x20, 0x06, 0x2f, 0x10, 0x3c, 0x04 - .byte 0x39, 0x0c, 0x39, 0x0c, 0x00, 0x0c, 0x29, 0x0a, 0x17, 0x20, 0x39, 0x0c - .byte 0x5c, 0x26, 0x0b, 0x10, 0x20, 0x10, 0x30, 0x12, 0x05, 0x1e, 0x0c, 0x10 - -gUnknown_086125DC:: @ 86125DC - .byte 0x23, 0x46, 0x23, 0x01, 0x04, 0x09, 0x05, 0x00, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x38, 0x1c, 0x01, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x8c, 0x38, 0x01, 0x15, 0x46, 0x23, 0x00 - - .align 2 -gUnknown_086125F8:: @ 86125F8 - .4byte sub_81A705C - .4byte sub_81A7140 - .4byte sub_81A7248 - .4byte sub_81A73B8 - .4byte sub_81A7070 - .4byte sub_81A73EC - .4byte sub_81A7400 - .4byte sub_81A740C - .4byte sub_81A7418 - .4byte nullsub_76 - .4byte nullsub_124 - .4byte sub_81A7468 - .4byte sub_81A74CC - .4byte sub_81A74E0 - .4byte sub_81A7508 - .4byte sub_81A7580 - .4byte sub_81A8090 - .4byte sub_81A80DC - .4byte sub_81A825C - .4byte sub_81A827C - .4byte sub_81A84B4 - .4byte sub_81A84EC - .4byte sub_81A863C - .4byte sub_81A8658 - .4byte sub_81A869C - .4byte sub_81A86C0 - .4byte sub_81A8794 - .4byte sub_81A87E8 - .4byte sub_81A8830 - -gUnknown_0861266C:: @ 861266C - .byte 0x03, 0x03, 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x04 - -gUnknown_08612675:: @ 8612675 - .byte 0x02, 0x01, 0x00, 0x02, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x01, 0x02, 0x00 - - .align 2 -gUnknown_08612688:: @ 8612688 - .4byte sub_81A7D8C - .4byte sub_81A7DE8 - - .align 2 -gUnknown_08612690:: @ 8612690 - .4byte 0x00000400, 0x00000800 - -gUnknown_08612698:: @ 8612698 - store_lock_anim - walk_right - free_unlock_anim - step_end - -gUnknown_0861269C:: @ 861269C - store_lock_anim - walk_down - free_unlock_anim - step_end - -gUnknown_086126A0:: @ 86126A0 - store_lock_anim - walk_left - free_unlock_anim - step_end - -gUnknown_086126A4:: @ 86126A4 - store_lock_anim - walk_up - free_unlock_anim - step_end - -gUnknown_086126A8:: @ 86126A8 - face_right - step_end - -gUnknown_086126AA:: @ 86126AA - face_down - step_end - -gUnknown_086126AC:: @ 86126AC - face_left - step_end - -gUnknown_086126AE:: @ 86126AE - face_up - step_end - -@ 86126B0 - .include "data/battle_frontier/battle_pyramid_level_50_wild_mons.inc" - -@ 8612E80 - .include "data/battle_frontier/battle_pyramid_open_level_wild_mons.inc" - - .align 2 -gUnknown_08613650:: @ 8613650 - .byte 0x07, 0x03, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x00, 0x00, 0x00, 0x06, 0x03, 0x00, 0x00, 0x80, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x00 - .byte 0x05, 0x03, 0x00, 0x00, 0x78, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x78, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x00, 0x00, 0x00 - .byte 0x04, 0x04, 0x00, 0x01, 0x70, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x00, 0x00, 0x00, 0x03, 0x05, 0x00, 0x02, 0x70, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x00, 0x00 - .byte 0x03, 0x05, 0x00, 0x00, 0x68, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x00, 0x00, 0x02, 0x04, 0x00, 0x01, 0x68, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x00, 0x00, 0x00 - .byte 0x04, 0x05, 0x00, 0x02, 0x60, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x00, 0x00, 0x03, 0x06, 0x00, 0x04, 0x60, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x00, 0x00 - .byte 0x02, 0x03, 0x00, 0x00, 0x58, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x58, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x00, 0x00, 0x00 - .byte 0x03, 0x07, 0x00, 0x00, 0x50, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, 0x50, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x00, 0x00, 0x00 - .byte 0x03, 0x06, 0x00, 0x00, 0x50, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x03, 0x08, 0x00, 0x00, 0x50, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00 - -gUnknown_08613750:: @ 8613750 - .byte 0x28, 0x00, 0x46, 0x01, 0x5a, 0x02, 0x64, 0x03, 0x23, 0x01, 0x37, 0x02, 0x4b, 0x03, 0x5a, 0x04, 0x64, 0x0a, 0x23, 0x02, 0x37, 0x03, 0x4b, 0x04, 0x5a, 0x05, 0x64, 0x0b, 0x23, 0x03, 0x37, 0x04 - .byte 0x4b, 0x05, 0x5a, 0x06, 0x64, 0x0c, 0x23, 0x04, 0x37, 0x05, 0x4b, 0x06, 0x5a, 0x07, 0x64, 0x0d, 0x23, 0x05, 0x37, 0x06, 0x4b, 0x07, 0x5a, 0x08, 0x64, 0x0e, 0x23, 0x06, 0x37, 0x07, 0x4b, 0x08 - .byte 0x5a, 0x09, 0x64, 0x0f - -gUnknown_08613794:: @ 8613794 - .byte 0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00 - - .align 1 -gUnknown_0861379C:: @ 861379C - .2byte 0x0015, 0x0051, 0x0085, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x0087, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x0088, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x0086, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db - .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 - .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db - .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 - .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - - .align 1 -gUnknown_0861392C:: @ 861392C - .2byte 0x0015, 0x0051, 0x0085, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x0087, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x0088, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x0086, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db - .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 - .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db - .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 - .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - -gUnknown_08613ABC:: @ 8613ABC - .byte 0x1f, 0x00, 0x2e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06, 0x61, 0x07, 0x64, 0x08, 0x0f, 0x00, 0x2e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06 - .byte 0x61, 0x08, 0x64, 0x09, 0x0f, 0x00, 0x1e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06, 0x61, 0x07, 0x64, 0x08, 0x1c, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04 - .byte 0x58, 0x05, 0x5c, 0x07, 0x60, 0x08, 0x64, 0x09, 0x0f, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x07, 0x64, 0x09, 0x0f, 0x00, 0x1e, 0x01, 0x3a, 0x02 - .byte 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x07, 0x64, 0x08, 0x1c, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x08, 0x64, 0x09 - -gUnknown_08613B3A:: @ 8613B3A - .byte 0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_08613B44:: @ 8613B44 - .byte 0x03, 0x06 - - .align 2 - .byte 0x0b, 0x06 - - .align 2 - .byte 0x0d, 0x06 - - .align 2 - .byte 0x0f, 0x01 - - .align 2 - .byte 0x2b, 0x04 - - .align 2 - .byte 0x2d, 0x01 - - .align 2 - .byte 0x24, 0x09 - - .align 2 - .byte 0x29, 0x04 - - .align 2 - .byte 0x05, 0x05 - - .align 2 - .byte 0x18, 0x04 - - .align 2 - .byte 0x2f, 0x00 - - .align 2 - .byte 0x2e, 0x09 - - .align 2 - .byte 0x11, 0x0c - - .align 2 - .byte 0x10, 0x0b - - .align 2 - .byte 0x1e, 0x0d - - .align 2 - .byte 0x08, 0x01 - - .align 2 - .byte 0x17, 0x03 - - .align 2 - .byte 0x0c, 0x04 - - .align 2 - .byte 0x38, 0x04 - - .align 2 - .byte 0x1c, 0x03 - - .align 2 - .byte 0x1a, 0x00 - - .align 2 - .byte 0x19, 0x0b - - .align 2 - .byte 0x09, 0x07 - - .align 2 - .byte 0x31, 0x07 - - .align 2 - .byte 0x35, 0x07 - - .align 2 - .byte 0x36, 0x01 - - .align 2 - .byte 0x33, 0x00 - - .align 2 - .byte 0x2a, 0x03 - - .align 2 - .byte 0x16, 0x0d - - .align 2 - .byte 0x0e, 0x03 - - .align 2 - .byte 0x15, 0x01 - - .align 2 - .byte 0x14, 0x01 - - .align 2 - .byte 0x2c, 0x01 - - .align 2 - .byte 0x1b, 0x02 - - .align 2 - .byte 0x04, 0x01 - - .align 2 - .byte 0x07, 0x03 - - .align 2 - .byte 0x34, 0x05 - - .align 2 - .byte 0x32, 0x00 - - .align 2 - .byte 0x37, 0x02 - - .align 2 - .byte 0x1d, 0x04 - - .align 2 - .byte 0x22, 0x09 - - .align 2 - .byte 0x1f, 0x01 - - .align 2 - .byte 0x25, 0x00 - - .align 2 - .byte 0x0a, 0x04 - - .align 2 - .byte 0x28, 0x00 - - .align 2 - .byte 0x06, 0x05 - - .align 2 - .byte 0x27, 0x0b - - .align 2 - .byte 0x26, 0x00 - - .align 2 - .byte 0x13, 0x00 - - .align 2 - .byte 0x12, 0x02 - - .align 2 - .byte 0x39, 0x08 - - .align 2 - .byte 0x02, 0x0b - - .align 2 - .byte 0x20, 0x01 - - .align 2 - .byte 0x21, 0x00 - - .align 2 -gUnknown_08613C1C:: @ 8613C1C - .byte 0x0d, 0x03, 0x0e, 0x04, 0x10, 0x01, 0x11, 0x00, 0x03, 0x02, 0x12, 0x03, 0x0c, 0x03, 0x13, 0x03, 0x14, 0x03, 0x15, 0x02, 0x17, 0x02, 0x07, 0x02, 0x0a, 0x04, 0x19, 0x02, 0x1a, 0x02, 0x1b, 0x00 - .byte 0x1d, 0x02, 0x1e, 0x02, 0x1f, 0x03, 0x20, 0x04, 0x26, 0x00, 0x27, 0x01, 0x29, 0x04, 0x2a, 0x05, 0x09, 0x04, 0x16, 0x05, 0x2b, 0x00, 0x2d, 0x04, 0x2e, 0x02, 0x30, 0x02, 0x32, 0x02, 0x31, 0x03 - .byte 0x2f, 0x03, 0x33, 0x03, 0x34, 0x02, 0x04, 0x02, 0x35, 0x00, 0x36, 0x03, 0x37, 0x03, 0x38, 0x03, 0x1c, 0x01, 0x3a, 0x02, 0x05, 0x02, 0x42, 0x02, 0x02, 0x03, 0x44, 0x02, 0x45, 0x03, 0x47, 0x03 - .byte 0x43, 0x00, 0x00, 0x04 - - .align 2 -gUnknown_08613C80:: @ 8613C80 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D2D - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D57 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D81 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252DAB - - .align 2 -gUnknown_08613C90:: @ 8613C90 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25330B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2532CC - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25328B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253248 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253206 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2531C4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253183 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253140 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530FD - - .align 2 -gUnknown_08613CB4:: @ 8613CB4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2544A6 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25445A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25440B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2543BA - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25436A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25431A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2542CB - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25427A - - .align 2 -gUnknown_08613CD4:: @ 8613CD4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252DD5 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E03 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E31 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E5F - - .align 2 -gUnknown_08613CE4:: @ 8613CE4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25362E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2535D4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253578 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25351A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2534BD - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253460 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253404 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2533A6 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25334D - - .align 2 -gUnknown_08613D08:: @ 8613D08 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25471E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2546CC - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25467C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25462A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2545D9 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254588 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254538 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2544E6 - - .align 2 -gUnknown_08613D28:: @ 8613D28 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E8D - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EAA - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EC7 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EE4 - - .align 2 -gUnknown_08613D38:: @ 8613D38 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2539EC - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253980 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253915 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2538A8 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25383C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2537D0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253765 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2536F8 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25368B - - .align 2 -gUnknown_08613D5C:: @ 8613D5C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A0B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2549AE - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25494D - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2548EB - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25488A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254829 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2547C9 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254767 - - .align 2 -gUnknown_08613D7C:: @ 8613D7C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F01 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F3A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F73 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252FAC - - .align 2 -gUnknown_08613D8C:: @ 8613D8C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253D3E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253CE0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253C87 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253C2C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253BD2 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253B78 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253B1F - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253AC4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253A69 - - .align 2 -gUnknown_08613DB0:: @ 8613DB0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254C3E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254BF1 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254BAE - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254B69 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254B25 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254AE1 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A9E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A59 - - .align 2 -gUnknown_08613DD0:: @ 8613DD0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252FE5 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253000 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25301B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253036 - - .align 2 -gUnknown_08613DE0:: @ 8613DE0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253F6C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253F34 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253EFA - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253EBE - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E83 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E48 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E0E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253DD2 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253D96 - - .align 2 -gUnknown_08613E04:: @ 8613E04 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254E6E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254E27 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254DE0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D97 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D4F - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D07 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254CC0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254C77 - - .align 2 -gUnknown_08613E24:: @ 8613E24 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253051 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25307C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530A7 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530D2 - - .align 2 -gUnknown_08613E34:: @ 8613E34 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25422B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2541DD - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25418D - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25413B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2540EA - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254099 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254049 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253FF7 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253FA5 - - .align 2 -gUnknown_08613E58:: @ 8613E58 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_255068 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25502F - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254FF6 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254FBB - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F81 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F47 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F0E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254ED3 - - .align 2 -gUnknown_08613E78:: @ 8613E78 - .4byte gUnknown_08613C80 - .4byte gUnknown_08613C90 - .4byte gUnknown_08613CB4 - - .align 2 -gUnknown_08613E84:: @ 8613E84 - .4byte gUnknown_08613CD4 - .4byte gUnknown_08613CE4 - .4byte gUnknown_08613D08 - - .align 2 -gUnknown_08613E90:: @ 8613E90 - .4byte gUnknown_08613D28 - .4byte gUnknown_08613D38 - .4byte gUnknown_08613D5C - - .align 2 -gUnknown_08613E9C:: @ 8613E9C - .4byte gUnknown_08613D7C - .4byte gUnknown_08613D8C - .4byte gUnknown_08613DB0 - - .align 2 -gUnknown_08613EA8:: @ 8613EA8 - .4byte gUnknown_08613DD0 - .4byte gUnknown_08613DE0 - .4byte gUnknown_08613E04 - - .align 2 -gUnknown_08613EB4:: @ 8613EB4 - .4byte gUnknown_08613E24 - .4byte gUnknown_08613E34 - .4byte gUnknown_08613E58 - - .align 2 -gUnknown_08613EC0:: @ 8613EC0 - .4byte gUnknown_08613E78 - .4byte gUnknown_08613E84 - .4byte gUnknown_08613E90 - .4byte gUnknown_08613E9C - .4byte gUnknown_08613EA8 - .4byte gUnknown_08613EB4 - -gUnknown_08613ED8:: @ 8613ED8 - .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x03, 0x04 - - .align 2 -gUnknown_08613EE0:: @ 8613EE0 - .4byte sub_81A8E9C - .4byte sub_81A8F38 - .4byte sub_81A9048 - .4byte sub_81A9134 - .4byte sub_81A917C - .4byte sub_81A91FC - .4byte sub_81A9254 - .4byte CalculateBattlePyramidItemBallItemId - .4byte sub_81A93C8 - .4byte sub_81A9414 - .4byte sub_81A9424 - .4byte sub_81A9618 - .4byte sub_81A966C - .4byte sub_81A9684 - .4byte sub_81A975C - .4byte sub_81A97C8 - .4byte sub_81A9828 - .4byte sub_81A9834 - - .align 1 -gUnknown_08613F28:: @ 8613F28 - .2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 - - .align 2 -gUnknown_08613F34:: @ 8613F34 - .2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba - -gUnknown_08613F46:: @ 8613F46 - .byte 0x01, 0x04, 0xff, 0xff, 0x00, 0x02, 0x05, 0xff, 0x01, 0x03, 0x06, 0xff, 0x02, 0x07, 0xff, 0xff, 0x00, 0x05, 0x08, 0xff, 0x01, 0x04, 0x06, 0x09, 0x02, 0x05, 0x07, 0x0a, 0x03, 0x06, 0x0b, 0xff - .byte 0x04, 0x09, 0x0c, 0xff, 0x05, 0x08, 0x0a, 0x0d, 0x06, 0x09, 0x0b, 0x0e, 0x07, 0x0a, 0x0f, 0xff, 0x08, 0x0d, 0xff, 0xff, 0x09, 0x0c, 0x0e, 0xff, 0x0a, 0x0d, 0x0f, 0xff, 0x0b, 0x0e, 0xff, 0xff - -gUnknown_08613F86:: @ 8613F86 - .byte 0x1e, 0x28, 0x32, 0x3c, 0x46, 0x50, 0x55, 0x5a, 0x5f, 0x64 - diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index d8f681686..be91c7c7e 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -318,7 +318,7 @@ BattleScript_EffectSleep:: goto BattleScript_MoveEnd BattleScript_AlreadyAsleep:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNALREADYASLEEP waitmessage 0x40 @@ -731,7 +731,7 @@ BattleScript_EffectToxic:: goto BattleScript_MoveEnd BattleScript_AlreadyPoisoned:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x40 printstring STRINGID_PKMNALREADYPOISONED waitmessage 0x40 @@ -779,7 +779,7 @@ BattleScript_RestCantSleep:: goto BattleScript_MoveEnd BattleScript_RestIsAlreadyAsleep:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNALREADYASLEEP2 waitmessage 0x40 @@ -944,7 +944,7 @@ BattleScript_EffectConfuse:: goto BattleScript_MoveEnd BattleScript_AlreadyConfused:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNALREADYCONFUSED waitmessage 0x40 @@ -1051,7 +1051,7 @@ BattleScript_EffectParalyze:: goto BattleScript_MoveEnd BattleScript_AlreadyParalyzed:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNISALREADYPARALYZED waitmessage 0x40 @@ -1128,7 +1128,7 @@ BattleScript_SubstituteString:: waitmessage 0x40 goto BattleScript_MoveEnd BattleScript_AlreadyHasSubstitute:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNHASSUBSTITUTE waitmessage 0x40 @@ -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:: @@ -2226,7 +2226,7 @@ BattleScript_WaterVeilPrevents:: goto BattleScript_MoveEnd BattleScript_AlreadyBurned:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNALREADYHASBURN waitmessage 0x40 @@ -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 @@ -2643,7 +2643,7 @@ BattleScript_TeeterDanceSubstitutePrevents:: goto BattleScript_TeeterDanceDoMoveEndIncrement BattleScript_TeeterDanceAlreadyConfused:: - various23 BS_ATTACKER + setalreadystatusedmoveattempt BS_ATTACKER pause 0x20 printstring STRINGID_PKMNALREADYCONFUSED waitmessage 0x40 @@ -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:: @@ -4487,54 +4487,54 @@ BattleScript_ArenaTurnBeginning:: pause 0x8 playse SE_HANTEI1 various14 BS_ATTACKER - various16 8 - various17 8 + arenajudmengtstring 8 + arenawaitmessage 8 pause 0x40 various15 BS_ATTACKER volumeup end2 -BattleScript_82DB8E0:: +BattleScript_82DB8E0:: @ Unused battlescript playse SE_PINPON various14 BS_ATTACKER - various16 BS_TARGET - various17 BS_TARGET + arenajudmengtstring BS_TARGET + arenawaitmessage BS_TARGET pause 0x40 various15 BS_ATTACKER end2 -BattleScript_82DB8F3:: - makevisible 11 +BattleScript_ArenaDoJudgment:: + makevisible BS_PLAYER1 waitstate makevisible BS_OPPONENT1 waitstate volumedown - playse 0x109 + playse SE_HANTEI1 pause 0x8 - playse 0x109 + playse SE_HANTEI1 pause 0x40 various14 BS_ATTACKER - various16 BS_ATTACKER - various17 BS_ATTACKER + arenajudmengtstring 1 + arenawaitmessage 1 pause 0x40 setbyte gBattleCommunication, 0x0 - various9 BS_ATTACKER + arenajudgmentwindow pause 0x40 - various9 BS_ATTACKER - various16 BS_EFFECT_BATTLER - various17 BS_EFFECT_BATTLER - various9 BS_ATTACKER - various16 BS_FAINTED - various17 BS_FAINTED - various9 BS_ATTACKER - various16 0x4 - various17 0x4 - various9 BS_ATTACKER - jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x3, BattleScript_82DB973 - jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x4, BattleScript_82DB992 - various16 0x5 - various17 0x5 - various9 BS_ATTACKER + arenajudgmentwindow + arenajudmengtstring 2 + arenawaitmessage 2 + arenajudgmentwindow + arenajudmengtstring 3 + arenawaitmessage 3 + arenajudgmentwindow + arenajudmengtstring 4 + arenawaitmessage 4 + arenajudgmentwindow + jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x3, BattleScript_ArenaJudgmentPlayerLoses + jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x4, BattleScript_ArenaJudgmentDraw + arenajudmengtstring 5 + arenawaitmessage 5 + arenajudgmentwindow various15 BS_ATTACKER printstring STRINGID_DEFEATEDOPPONENTBYREFEREE waitmessage 0x40 @@ -4542,39 +4542,39 @@ BattleScript_82DB8F3:: waitcry BS_ATTACKER dofaintanimation BS_OPPONENT1 cleareffectsonfaint BS_OPPONENT1 - various10 BS_ATTACKER + arenaopponentmonlost end2 -BattleScript_82DB973:: - various16 0x6 - various17 0x6 - various9 BS_ATTACKER +BattleScript_ArenaJudgmentPlayerLoses: + arenajudmengtstring 6 + arenawaitmessage 6 + arenajudgmentwindow various15 BS_ATTACKER printstring STRINGID_LOSTTOOPPONENTBYREFEREE waitmessage 0x40 - playfaintcry 11 + playfaintcry BS_PLAYER1 waitcry BS_ATTACKER - dofaintanimation 11 - cleareffectsonfaint 11 - various11 BS_ATTACKER + dofaintanimation BS_PLAYER1 + cleareffectsonfaint BS_PLAYER1 + arenaplayermonlost end2 -BattleScript_82DB992:: - various16 BS_BATTLER_0 - various17 BS_BATTLER_0 - various9 BS_ATTACKER +BattleScript_ArenaJudgmentDraw: + arenajudmengtstring 7 + arenawaitmessage 7 + arenajudgmentwindow various15 BS_ATTACKER printstring STRINGID_TIEDOPPONENTBYREFEREE waitmessage 0x40 - playfaintcry 11 + playfaintcry BS_PLAYER1 waitcry BS_ATTACKER - dofaintanimation 11 - cleareffectsonfaint 11 + dofaintanimation BS_PLAYER1 + cleareffectsonfaint BS_PLAYER1 playfaintcry BS_OPPONENT1 waitcry BS_ATTACKER dofaintanimation BS_OPPONENT1 cleareffectsonfaint BS_OPPONENT1 - various12 BS_ATTACKER + arenabothmonlost end2 BattleScript_AskIfWantsToForfeitMatch:: 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 77c0f44cc..e4fb20cd6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,12 +1,15 @@ +#include "constants/battle_frontier.h" +#include "constants/battle_setup.h" +#include "constants/field_effects.h" #include "constants/flags.h" #include "constants/items.h" +#include "constants/heal_locations.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" -#include "constants/vars.h" -#include "constants/heal_locations.h" #include "constants/trainers.h" +#include "constants/vars.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -45,11 +48,11 @@ gSpecialVars:: @ 81DBA0C gStdScripts:: @ 81DC2A0 .4byte Std_ObtainItem .4byte Std_FindItem - .4byte Std_2 - .4byte Std_3 - .4byte Std_4 - .4byte Std_5 - .4byte Std_6 + .4byte Std_MsgboxNPC + .4byte Std_MsgboxSign + .4byte Std_MsgboxDefault + .4byte Std_MsgboxYesNo + .4byte Std_MsgboxAutoclose .4byte Std_ObtainDecoration .4byte Std_RegisteredInMatchCall .4byte Std_9 @@ -433,13 +436,13 @@ gStdScripts_End:: @ 81DC2CC EventScript_SecretBasePC:: @ 823B4BB lockall - playse 2 + playse SE_PC_LOGIN message Text_276805 - dofieldeffect 61 + dofieldeffect FLDEFF_PCTURN_ON waitstate waitmessage waitbuttonpress - playse 5 + playse SE_SELECT goto EventScript_23B4D3 end @@ -476,7 +479,7 @@ EventScript_23B531:: @ 823B531 end EventScript_23B568:: @ 823B568 - msgbox Text_2766AA, 5 + msgbox Text_2766AA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_23B4D3 closemessage @@ -495,12 +498,12 @@ EventScript_23B585:: @ 823B585 EventScript_RecordMixingSecretBasePC:: @ 823B589 lockall message Text_276805 - playse 2 - dofieldeffect 61 + playse SE_PC_LOGIN + dofieldeffect FLDEFF_PCTURN_ON waitstate waitmessage waitbuttonpress - playse 5 + playse SE_SELECT goto EventScript_23B5A1 end @@ -528,34 +531,34 @@ EventScript_23B5F0:: @ 823B5F0 compare VAR_RESULT, 2 goto_eq EventScript_23B652 special sub_80E980C - msgbox Text_276707, 5 + msgbox Text_276707, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_23B5A1 - msgbox Text_2767D1, 3 + msgbox Text_2767D1, MSGBOX_SIGN special sub_80E9C2C special sub_80FA57C releaseall end EventScript_23B62F:: @ 823B62F - msgbox Text_276731, 5 + msgbox Text_276731, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_23B5A1 - msgbox Text_2767E9, 3 + msgbox Text_2767E9, MSGBOX_SIGN special sub_80E9C2C special sub_80FA57C releaseall end EventScript_23B652:: @ 823B652 - msgbox Text_27676F, 3 + msgbox Text_27676F, MSGBOX_SIGN special sub_80FA57C closemessage releaseall end EventScript_23B660:: @ 823B660 - msgbox Text_276835, 4 + msgbox Text_276835, MSGBOX_DEFAULT goto EventScript_23B5A1 end @@ -583,7 +586,7 @@ EventScript_23B680:: @ 823B680 EventScript_SecretBaseSandOrnament:: @ 823B684 special sub_80EBE7C - dofieldeffect 52 + dofieldeffect FLDEFF_SAND_PILLAR waitstate end @@ -600,19 +603,19 @@ EventScript_SecretBaseShieldOrToyTV:: @ 823B68C end EventScript_23B6BC:: @ 823B6BC - msgbox Text_27692B, 3 + msgbox Text_27692B, MSGBOX_SIGN end EventScript_23B6C5:: @ 823B6C5 - msgbox Text_276974, 3 + msgbox Text_276974, MSGBOX_SIGN end EventScript_23B6CE:: @ 823B6CE - msgbox Text_2769B8, 3 + msgbox Text_2769B8, MSGBOX_SIGN end EventScript_23B6D7:: @ 823B6D7 - msgbox Text_2769FF, 3 + msgbox Text_2769FF, MSGBOX_SIGN end gText_23B6E0:: @ 823B6E0 @@ -777,7 +780,7 @@ SecretBase_RedCave1_Text_23B759: @ 823B759 .include "data/maps/Route119_House/scripts.inc" .include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc" -Std_2: @ 8271315 +Std_MsgboxNPC: @ 8271315 lock faceplayer message 0x0 @@ -786,7 +789,7 @@ Std_2: @ 8271315 release return -Std_3: @ 8271320 +Std_MsgboxSign: @ 8271320 lockall message 0x0 waitmessage @@ -794,13 +797,13 @@ Std_3: @ 8271320 releaseall return -Std_4: @ 827132A +Std_MsgboxDefault: @ 827132A message 0x0 waitmessage waitbuttonpress return -Std_5: @ 8271332 +Std_MsgboxYesNo: @ 8271332 message 0x0 waitmessage yesnobox 20, 8 @@ -979,7 +982,7 @@ EventScript_271491:: @ 8271491 releaseall end -Std_6:: @ 8271494 +Std_MsgboxAutoclose:: @ 8271494 message 0x0 waitmessage waitbuttonpress @@ -1070,165 +1073,165 @@ EventScript_27149D:: @ 827149D return EventScript_2715DE:: @ 82715DE - setflag FLAG_0x056 - setflag FLAG_0x301 - setflag FLAG_0x302 - setflag FLAG_0x303 - setflag FLAG_0x2D1 - setflag FLAG_0x379 - setflag FLAG_0x32B - setflag FLAG_0x32C - setflag FLAG_0x346 - setflag FLAG_0x2D6 - setflag FLAG_0x363 - setflag FLAG_0x2DB - setflag FLAG_0x2DC - setflag FLAG_0x32E - setflag FLAG_0x34C - setflag FLAG_0x364 - setflag FLAG_0x2E3 - setflag FLAG_0x371 - setflag FLAG_0x2E2 - setflag FLAG_0x2E4 - setflag FLAG_0x2E5 - setflag FLAG_0x2E7 - setflag FLAG_0x2E8 - setflag FLAG_0x38A - setflag FLAG_0x345 - setflag FLAG_0x306 - setflag FLAG_0x37F - setflag FLAG_0x308 - setflag FLAG_0x309 - setflag FLAG_0x30A - setflag FLAG_0x30B - setflag FLAG_0x30C - setflag FLAG_0x30D - setflag FLAG_0x338 - setflag FLAG_0x2E9 - setflag FLAG_0x2EA - setflag FLAG_0x2F8 - setflag FLAG_0x2D2 - setflag FLAG_0x2DE - setflag FLAG_0x351 - setflag FLAG_0x32F + setflag FLAG_LINK_CONTEST_POKE_BALL + setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA + setflag FLAG_HIDE_PETALBURG_CITY_WALLY + setflag FLAG_UNKNOWN_0x363 + setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT + setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 + setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST + setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST + setflag FLAG_HIDE_ROUTE_110_BIRCH + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS + setflag FLAG_HIDE_PETALBURG_GYM_GREETER + setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_PLAYERS_HOUSE_DAD + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL setflag FLAG_HIDE_FANCLUB_OLD_LADY setflag FLAG_HIDE_FANCLUB_BOY setflag FLAG_HIDE_FANCLUB_LITTLE_BOY setflag FLAG_HIDE_FANCLUB_LADY - setflag FLAG_0x2DA - setflag FLAG_0x31D - setflag FLAG_0x31E - setflag FLAG_0x31F - setflag FLAG_0x385 - setflag FLAG_0x386 - setflag FLAG_0x387 - setflag FLAG_0x388 - setflag FLAG_0x323 - setflag FLAG_0x322 - setflag FLAG_0x326 - setflag FLAG_0x328 - setflag FLAG_0x329 - setflag FLAG_0x3D8 - setflag FLAG_0x2FE - setflag FLAG_0x33E - setflag FLAG_0x362 - setflag FLAG_0x365 - setflag FLAG_0x33C - setflag FLAG_0x33D - setflag FLAG_0x33F - setflag FLAG_0x35B - setflag FLAG_0x355 - setflag FLAG_0x349 - setflag FLAG_0x34D - setflag FLAG_0x34E - setflag FLAG_0x35C - setflag FLAG_0x35D - setflag FLAG_0x343 - setflag FLAG_0x348 - setflag FLAG_0x350 - setflag FLAG_0x353 - setflag FLAG_0x312 - setflag FLAG_0x3CD - setflag FLAG_0x330 - setflag FLAG_0x366 - setflag FLAG_0x368 - setflag FLAG_0x36D - setflag FLAG_0x3E2 - setflag FLAG_0x36F - setflag FLAG_0x37B - setflag FLAG_0x370 - setflag FLAG_0x36E - setflag FLAG_0x327 - setflag FLAG_0x3D7 - setflag FLAG_0x376 - setflag FLAG_0x374 - setflag FLAG_0x375 - setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION - setflag FLAG_0x378 - setflag FLAG_0x2F0 - setflag FLAG_0x2F5 - setflag FLAG_0x31A - setflag FLAG_0x31B - setflag FLAG_0x37C - setflag FLAG_0x380 - setflag FLAG_0x381 - setflag FLAG_0x382 - setflag FLAG_0x38D - setflag FLAG_0x2EC - setflag FLAG_0x38E - setflag FLAG_0x38F + setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 + setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN + setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT + setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE + setflag FLAG_HIDE_PETALBURG_GYM_WALLY + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 + setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL + setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY + setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW + setflag FLAG_HIDE_ROUTE_119_RIVAL + setflag FLAG_HIDE_ROUTE_119_SCOTT + setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN + setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE + setflag FLAG_HIDE_LANETTES_HOUSE_LANETTE + setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN + setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS + setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY + setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN + setflag FLAG_HIDE_ROUTE_116_MR_BRINEY + setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO + setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT + setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN + setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 + setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION + setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT + setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE + setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH + setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_ROUTE_103_BIRCH + setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR + setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER + setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE + setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON setflag FLAG_0x393 - setflag FLAG_0x358 - setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON - setflag FLAG_0x2FD - setflag FLAG_0x398 - setflag FLAG_0x399 - setflag FLAG_0x39A - setflag FLAG_0x39B - setflag FLAG_0x2CF - setflag FLAG_0x39D - setflag FLAG_0x3A1 - setflag FLAG_0x3A2 - setflag FLAG_0x3A6 - setflag FLAG_0x3AA - setflag FLAG_0x3AC - setflag FLAG_0x3A0 - setflag FLAG_0x3E0 - setflag FLAG_0x342 - setflag FLAG_0x3B0 - setflag FLAG_0x3B1 - setflag FLAG_0x3B3 - setflag FLAG_0x3B4 - setflag FLAG_0x2ED - setflag FLAG_0x35A - setflag FLAG_0x2EF - setflag FLAG_0x3B6 - setflag FLAG_0x3C7 - setflag FLAG_0x3C8 - setflag FLAG_0x2D7 - setflag FLAG_0x3D3 - setflag FLAG_0x3DF - setflag FLAG_0x3E3 - setflag FLAG_0x3E4 - setflag FLAG_0x3E5 - setflag FLAG_0x3E6 - setflag FLAG_0x356 - setflag FLAG_0x33A - setflag FLAG_0x33B - setflag FLAG_0x36C - setflag FLAG_0x36B - setflag FLAG_0x36A - setflag FLAG_0x337 - setflag FLAG_0x2F4 - setflag FLAG_0x35E - setflag FLAG_0x35F - setflag FLAG_0x340 - setflag FLAG_0x2FB - setflag FLAG_0x2EB - setflag FLAG_0x2FF - setflag FLAG_0x319 - setflag FLAG_0x357 - setflag FLAG_0x050 + setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE + setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON + setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT + setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL + setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH + setflag FLAG_HIDE_ROUTE_110_RIVAL_2 + setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE + setflag FLAG_HIDE_ROUTE_104_RIVAL + setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 + setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL + setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA + setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN + setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO + setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M + setflag FLAG_HIDE_ROUTE_128_STEVEN + setflag FLAG_HIDE_ROUTE_128_ARCHIE + setflag FLAG_HIDE_ROUTE_128_MAXIE + setflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE + setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN + setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + setflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + setflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY + setflag FLAG_HIDE_OLDALE_TOWN_RIVAL + setflag FLAG_HIDE_ROUTE_101_BOY + setflag FLAG_HIDE_PETALBURG_CITY_SCOTT + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA + setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE + setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL + setflag FLAG_HIDE_ROUTE_111_DESERT_RIVAL + setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL + setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + setflag FLAG_HIDE_DEOXYS + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION + setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT + setflag FLAG_HIDE_SKY_PILLAR_WALLACE + setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT call EventScript_27149D end @@ -1238,26 +1241,26 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 call EverGrandeCity_HallOfFame_EventScript_271829 compare VAR_0x40CC, 0 call_if 1, EverGrandeCity_HallOfFame_EventScript_271839 - clearflag FLAG_0x39D + clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS call EverGrandeCity_HallOfFame_EventScript_2718CC - setflag FLAG_0x365 - clearflag FLAG_0x3B6 - clearflag FLAG_0x2D7 + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY setvar VAR_0x40C6, 2 - setflag FLAG_0x35A - clearflag FLAG_0x2EF - clearflag FLAG_0x35C - clearflag FLAG_0x35D - setflag FLAG_0x2CD - clearflag FLAG_0x2EB - setflag FLAG_0x3CB + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS + clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION + setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL special sub_813BA60 checkflag FLAG_0x123 call_if 0, EverGrandeCity_HallOfFame_EventScript_271843 checkflag FLAG_0x12A call_if 0, EverGrandeCity_HallOfFame_EventScript_27183F - setflag FLAG_0x2F8 - setflag FLAG_0x2D2 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM compare VAR_0x40D3, 0 call_if 1, EverGrandeCity_HallOfFame_EventScript_271851 return @@ -1275,13 +1278,13 @@ EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839 return EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F - clearflag FLAG_0x3C8 + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL return EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 setvar VAR_0x4082, 3 setvar VAR_0x408C, 3 - clearflag FLAG_0x2DE + clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD return EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851 @@ -1303,35 +1306,35 @@ EventScript_271862:: @ 8271862 end EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884 - setflag FLAG_0x2E4 - setflag FLAG_0x2E7 - setflag FLAG_0x2E5 - setflag FLAG_0x2E8 - clearflag FLAG_0x2E6 - clearflag FLAG_0x2E3 - clearflag FLAG_0x371 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT + clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO end EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A - setflag FLAG_0x2E5 - setflag FLAG_0x2E8 - setflag FLAG_0x2E2 - setflag FLAG_0x2E6 - setflag FLAG_0x2E3 - setflag FLAG_0x371 - clearflag FLAG_0x2E4 - clearflag FLAG_0x2E7 + setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN end EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3 - setflag FLAG_0x2E2 - setflag FLAG_0x2E6 - setflag FLAG_0x2E3 - setflag FLAG_0x371 - setflag FLAG_0x2E4 - setflag FLAG_0x2E7 - clearflag FLAG_0x2E5 - clearflag FLAG_0x2E8 + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN + clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY + clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT end EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC @@ -1355,11 +1358,11 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27374E checkflag FLAG_0x4F4 goto_eq OldaleTown_PokemonCenter_1F_EventScript_27374E - checkflag FLAG_0x2E6 + checkflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27190C - checkflag FLAG_0x2E4 + checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271912 - checkflag FLAG_0x2E5 + checkflag FLAG_HIDE_ROUTE_108_MR_BRINEY goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271918 return @@ -1399,7 +1402,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E specialvar VAR_RESULT, sub_80C2E40 compare VAR_RESULT, 4 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A68 - msgbox gUnknown_082726EB, 5 + msgbox gUnknown_082726EB, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_27195A compare VAR_RESULT, 0 @@ -1434,8 +1437,8 @@ OldaleTown_PokemonCenter_1F_EventScript_27198D:: @ 827198D OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725A4 waitmovement 0 - dofieldeffect 25 - waitfieldeffect 25 + dofieldeffect FLDEFF_POKECENTER_HEAL + waitfieldeffect FLDEFF_POKECENTER_HEAL applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725AA waitmovement 0 special HealPlayerParty @@ -1474,7 +1477,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271A03:: @ 8271A03 OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 checkflag FLAG_0x880 goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 - msgbox gUnknown_08272798, 4 + msgbox gUnknown_08272798, MSGBOX_DEFAULT setflag FLAG_0x880 message OldaleTown_PokemonCenter_1F_Text_278A48 waitmessage @@ -1500,20 +1503,20 @@ OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 checkflag FLAG_0x159 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AAC setflag FLAG_0x159 - msgbox gUnknown_082727F5, 4 + msgbox gUnknown_082727F5, MSGBOX_DEFAULT playse SE_PIN applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_272598 waitmovement 0 applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_27259A waitmovement 0 - msgbox gUnknown_08272860, 5 + msgbox gUnknown_08272860, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 message gUnknown_08272A07 return OldaleTown_PokemonCenter_1F_EventScript_271AAC:: @ 8271AAC - msgbox gUnknown_08272982, 5 + msgbox gUnknown_08272982, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 message gUnknown_08272A07 @@ -1587,7 +1590,7 @@ EventScript_271B85:: @ 8271B85 EventScript_271B95:: @ 8271B95 message gUnknown_08272A78 waitfanfare - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -1621,7 +1624,7 @@ EventScript_271BE0:: @ 8271BE0 playfanfare MUS_FANFA4 message gUnknown_08272B09 waitfanfare - msgbox gUnknown_08272B48, 4 + msgbox gUnknown_08272B48, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -1660,14 +1663,14 @@ EventScript_271C3A:: @ 8271C3A waitmessage bufferitemnameplural 1, VAR_0x8004, 32773 setvar VAR_0x8004, 12 - special sub_81A8E7C + special CallBattlePyramidFunction compare VAR_RESULT, 1 goto_eq EventScript_271C86 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT return EventScript_271C86:: @ 8271C86 - msgbox gUnknown_08272AEA, 4 + msgbox gUnknown_08272AEA, MSGBOX_DEFAULT return EventScript_271C8F:: @ 8271C8F @@ -1680,8 +1683,8 @@ EventScript_271C9B:: @ 8271C9B return EventScript_271CA1:: @ 8271CA1 - msgbox gUnknown_08272A78, 4 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272A78, MSGBOX_DEFAULT + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return @@ -1725,15 +1728,15 @@ EventScript_271D2A:: @ 8271D2A waitfanfare bufferitemnameplural 1, VAR_0x8004, 1 copyvar VAR_0x8004, VAR_0x8008 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT special sub_80EDCE8 special SetFlagInVar releaseall end EventScript_271D47:: @ 8271D47 - msgbox gUnknown_08272ABF, 4 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272ABF, MSGBOX_DEFAULT + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT setvar VAR_RESULT, 0 releaseall end @@ -1741,7 +1744,7 @@ EventScript_271D47:: @ 8271D47 EventScript_271D5E:: @ 8271D5E lock faceplayer - msgbox Text_27260D, 5 + msgbox Text_27260D, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_271D83 compare VAR_RESULT, 0 @@ -1766,12 +1769,12 @@ EventScript_PC:: @ 8271D92 setvar VAR_0x8004, 0 special DoPCTurnOnEffect playse SE_PC_ON - msgbox Text_27265A, 4 + msgbox Text_27265A, MSGBOX_DEFAULT goto EventScript_271DAC end EventScript_271DAC:: @ 8271DAC - message gUnknown_0827266F + message gText_WhichPCShouldBeAccessed waitmessage special ScrSpecial_CreatePCMenu waitstate @@ -1789,7 +1792,7 @@ EventScript_271DBC:: @ 8271DBC EventScript_271DF9:: @ 8271DF9 playse SE_PC_LOGIN - msgbox gUnknown_082726C2, 4 + msgbox gUnknown_082726C2, MSGBOX_DEFAULT special PlayerPC waitstate goto EventScript_271DAC @@ -1801,18 +1804,18 @@ EventScript_271E0E:: @ 8271E0E call_if 0, EventScript_271E35 checkflag FLAG_SYS_PC_LANETTE call_if 1, EventScript_271E3E - msgbox gUnknown_082726A3, 4 + msgbox gUnknown_082726A3, MSGBOX_DEFAULT special ShowPokemonStorageSystem waitstate goto EventScript_271DAC end EventScript_271E35:: @ 8271E35 - msgbox gUnknown_0827268C, 4 + msgbox gUnknown_0827268C, MSGBOX_DEFAULT return EventScript_271E3E:: @ 8271E3E - msgbox gUnknown_082726D4, 4 + msgbox gUnknown_082726D4, MSGBOX_DEFAULT return EventScript_271E47:: @ 8271E47 @@ -1843,7 +1846,7 @@ RustboroCity_EventScript_271E6A:: @ 8271E6A SlateportCity_EventScript_271E6A:: @ 8271E6A SootopolisCity_EventScript_271E6A:: @ 8271E6A VerdanturfTown_EventScript_271E6A:: @ 8271E6A - msgbox gUnknown_08272B6A, 3 + msgbox gUnknown_08272B6A, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_271E73:: @ 8271E73 @@ -1862,7 +1865,7 @@ RustboroCity_EventScript_271E73:: @ 8271E73 SlateportCity_EventScript_271E73:: @ 8271E73 SootopolisCity_EventScript_271E73:: @ 8271E73 VerdanturfTown_EventScript_271E73:: @ 8271E73 - msgbox gUnknown_08272B9E, 3 + msgbox gUnknown_08272B9E, MSGBOX_SIGN end BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C @@ -1884,7 +1887,7 @@ DewfordTown_Gym_EventScript_271E84:: @ 8271E84 LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84 MauvilleCity_Gym_EventScript_271E84:: @ 8271E84 RustboroCity_Gym_EventScript_271E84:: @ 8271E84 - clearflag FLAG_0x30D + clearflag FLAG_HIDE_PETALBURG_GYM_GREETER setflag FLAG_0x128 return @@ -1909,11 +1912,11 @@ EventScript_UseSurf:: @ 8271EA0 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT lockall - msgbox gUnknown_08272FD6, 5 + msgbox gUnknown_08272FD6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_271ED5 - msgbox gUnknown_0827300D, 4 - dofieldeffect 9 + msgbox gUnknown_0827300D, MSGBOX_DEFAULT + dofieldeffect FLDEFF_USE_SURF EventScript_271ED5:: @ 8271ED5 releaseall @@ -2127,7 +2130,7 @@ SootopolisCity_EventScript_272054:: @ 8272054 SootopolisCity_Gym_1F_EventScript_272054:: @ 8272054 SootopolisCity_House1_EventScript_272054:: @ 8272054 VerdanturfTown_BattleTentLobby_EventScript_272054:: @ 8272054 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT release end @@ -2144,11 +2147,11 @@ Route110_TrickHouseEnd_EventScript_27205E:: @ 827205E Route110_TrickHouseEntrance_EventScript_27205E:: @ 827205E Route113_GlassWorkshop_EventScript_27205E:: @ 827205E SootopolisCity_Gym_1F_EventScript_27205E:: @ 827205E - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT return Route114_LanettesHouse_EventScript_272067:: @ 8272067 - msgbox gUnknown_08272B1A, 4 + msgbox gUnknown_08272B1A, MSGBOX_DEFAULT release end @@ -2157,7 +2160,7 @@ MauvilleCity_GameCorner_EventScript_272071:: @ 8272071 Route110_TrickHouseEnd_EventScript_272071:: @ 8272071 Route110_TrickHouseEntrance_EventScript_272071:: @ 8272071 Route113_GlassWorkshop_EventScript_272071:: @ 8272071 - msgbox gUnknown_08272B1A, 4 + msgbox gUnknown_08272B1A, MSGBOX_DEFAULT return EverGrandeCity_EventScript_27207A:: @ 827207A @@ -2203,7 +2206,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083 EventScript_RegionMap:: @ 827208F lockall - msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, MSGBOX_DEFAULT fadescreen 1 special FieldShowRegionMap waitstate @@ -2250,24 +2253,24 @@ Route103_EventScript_2720AD:: @ 82720AD return Route101_EventScript_27211A:: @ 827211A - clearflag FLAG_0x2D1 - clearflag FLAG_0x380 - setflag FLAG_0x381 - setflag FLAG_0x382 + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_ROUTE_103_BIRCH return Route101_EventScript_272127:: @ 8272127 - clearflag FLAG_0x381 - setflag FLAG_0x2D1 - setflag FLAG_0x380 - setflag FLAG_0x382 + clearflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_103_BIRCH return Route101_EventScript_272134:: @ 8272134 - clearflag FLAG_0x382 - setflag FLAG_0x381 - setflag FLAG_0x2D1 - setflag FLAG_0x380 + clearflag FLAG_HIDE_ROUTE_103_BIRCH + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 return LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141 @@ -2281,7 +2284,7 @@ Route103_EventScript_272141:: @ 8272141 goto_if 0, Route101_EventScript_1FA2D2 Route101_EventScript_272155:: @ 8272155 - msgbox gUnknown_082A5C9C, 5 + msgbox gUnknown_082A5C9C, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route101_EventScript_27216F call Route101_EventScript_272184 @@ -2289,7 +2292,7 @@ Route101_EventScript_272155:: @ 8272155 end Route101_EventScript_27216F:: @ 827216F - msgbox Route101_Text_2A5CEB, 4 + msgbox Route101_Text_2A5CEB, MSGBOX_DEFAULT release end @@ -2309,7 +2312,7 @@ Route101_EventScript_272184:: @ 8272184 copyvar VAR_0x800A, VAR_RESULT buffernumberstring 0, VAR_0x8008 buffernumberstring 1, VAR_0x8009 - msgbox gUnknown_082A5D2C, 4 + msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT call Route101_EventScript_272179 compare VAR_0x800A, 0 goto_eq Route101_EventScript_27374E @@ -2319,7 +2322,7 @@ Route101_EventScript_272184:: @ 8272184 copyvar VAR_0x8009, VAR_0x8006 buffernumberstring 0, VAR_0x8008 buffernumberstring 1, VAR_0x8009 - msgbox gUnknown_082A633D, 4 + msgbox gUnknown_082A633D, MSGBOX_DEFAULT return BattleFrontier_OutsideWest_EventScript_2721E2:: @ 82721E2 @@ -2341,22 +2344,22 @@ SlateportCity_Harbor_Movement_2721F0: @ 82721F0 step_end PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 - setflag FLAG_0x2E4 - setflag FLAG_0x2E7 - setflag FLAG_0x2E5 - setflag FLAG_0x2E8 - setflag FLAG_0x2E2 - setflag FLAG_0x2E6 - setflag FLAG_0x2E3 - setflag FLAG_0x371 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setvar VAR_0x4096, 0 return RusturfTunnel_EventScript_272216:: @ 8272216 removeobject 1 removeobject 10 - clearflag FLAG_0x328 - clearflag FLAG_0x3D8 + clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN + clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN setvar VAR_RUSTURF_TUNNEL_STATE, 6 setflag FLAG_RUSTURF_TUNNEL_OPENED return @@ -2492,19 +2495,19 @@ Route120_EventScript_272336:: @ 8272336 checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 goto_eq Route119_EventScript_272350 - msgbox Route119_Text_1F5D00, 4 + msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT release end Route119_EventScript_272350:: @ 8272350 - msgbox Route119_Text_1F5D23, 5 + msgbox Route119_Text_1F5D23, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route119_EventScript_272365 release end Route119_EventScript_272365:: @ 8272365 - msgbox Route119_Text_1F5D63, 4 + msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route119_Movement_27259E waitmovement 0 @@ -3075,31 +3078,31 @@ Movement_2725CB:: @ 82725CB step_end EventScript_PictureBookShelf:: @ 82725CE - msgbox Text_2A81E5, 3 + msgbox Text_2A81E5, MSGBOX_SIGN end EventScript_BookShelf:: @ 82725D7 - msgbox Text_2A820D, 3 + msgbox Text_2A820D, MSGBOX_SIGN end EventScript_PokemonCenterBookshelf:: @ 82725E0 - msgbox Text_2A8232, 3 + msgbox Text_2A8232, MSGBOX_SIGN end EventScript_Vase:: @ 82725E9 - msgbox Text_2A8276, 3 + msgbox Text_2A8276, MSGBOX_SIGN end EventScript_TrashCan:: @ 82725F2 - msgbox Text_2A82B3, 3 + msgbox Text_2A82B3, MSGBOX_SIGN end EventScript_ShopShelf:: @ 82725FB - msgbox Text_2A82BF, 3 + msgbox Text_2A82BF, MSGBOX_SIGN end EventScript_Blueprint:: @ 8272604 - msgbox Text_2A82F7, 3 + msgbox Text_2A82F7, MSGBOX_SIGN end Text_27260D: @ 827260D @@ -3112,7 +3115,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 @@ -3319,12 +3322,12 @@ gUnknown_08273684:: @ 8273684 .string "The intense sunshine appears to\nhave subsided…$" EventScript_2736B3:: @ 82736B3 - msgbox gUnknown_08272C98, 3 + msgbox gUnknown_08272C98, MSGBOX_SIGN end EventScript_Poison:: @ 82736BC lockall - special sub_80F972C + special ExecuteWhiteOut waitstate compare VAR_RESULT, 1 goto_eq EventScript_2736D9 @@ -3355,11 +3358,11 @@ EventScript_2736F8:: @ 82736F8 waitmessage waitbuttonpress setvar VAR_0x8004, 16 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 setvar VAR_0x8004, 12 - special sub_81A8E7C + special CallBattlePyramidFunction compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 @@ -3495,7 +3498,7 @@ TerraCave_End_EventScript_273776:: @ 8273776 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 bufferspeciesname 0, VAR_0x8004 - msgbox gUnknown_08273204, 4 + msgbox gUnknown_08273204, MSGBOX_DEFAULT release end @@ -3535,39 +3538,39 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB specialvar VAR_RESULT, sub_813B21C compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 - msgbox gText_PkmnTransferredSomeonesPC, 4 + msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4 specialvar VAR_RESULT, get_unknown_box_id bufferboxname 2, 32781 - msgbox gText_PkmnBoxSomeonesPCFull, 4 + msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6 specialvar VAR_RESULT, sub_813B21C compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF - msgbox gText_PkmnTransferredLanettesPC, 4 + msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF specialvar VAR_RESULT, get_unknown_box_id bufferboxname 2, 32781 - msgbox gText_PkmnBoxLanettesPCFull, 4 + msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_273811:: @ 8273811 MossdeepCity_StevensHouse_EventScript_273811:: @ 8273811 Route119_WeatherInstitute_2F_EventScript_273811:: @ 8273811 RustboroCity_DevonCorp_2F_EventScript_273811:: @ 8273811 - msgbox gUnknown_0827331C, 4 + msgbox gUnknown_0827331C, MSGBOX_DEFAULT release end EventScript_Questionnaire:: @ 827381B lockall - msgbox gUnknown_0827339F, 5 + msgbox gUnknown_0827339F, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_2738FD setvar VAR_0x8004, 20 @@ -3597,9 +3600,9 @@ EventScript_27386D:: @ 827386D waitmovement 0 applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A waitmovement 0 - msgbox gUnknown_08273506, 4 + msgbox gUnknown_08273506, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_EVENT_ENABLE - msgbox gUnknown_08273559, 4 + msgbox gUnknown_08273559, MSGBOX_DEFAULT releaseall end @@ -3615,9 +3618,9 @@ EventScript_2738B5:: @ 82738B5 waitmovement 0 applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A waitmovement 0 - msgbox gUnknown_08273446, 4 + msgbox gUnknown_08273446, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_GIFT_ENABLE - msgbox gUnknown_082734CC, 4 + msgbox gUnknown_082734CC, MSGBOX_DEFAULT releaseall end @@ -3628,7 +3631,7 @@ EventScript_2738FD:: @ 82738FD EventScript_2738FF:: @ 82738FF applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 waitmovement 0 - msgbox gUnknown_082733D8, 4 + msgbox gUnknown_082733D8, MSGBOX_DEFAULT releaseall end @@ -3841,12 +3844,12 @@ Route105_EventScript_273D31:: @ 8273D31 end Route105_EventScript_273D51:: @ 8273D51 - msgbox gUnknown_08273656, 4 + msgbox gUnknown_08273656, MSGBOX_DEFAULT goto Route105_EventScript_273D31 end Route105_EventScript_273D5F:: @ 8273D5F - msgbox gUnknown_08273684, 4 + msgbox gUnknown_08273684, MSGBOX_DEFAULT goto Route105_EventScript_273D31 end @@ -4083,7 +4086,7 @@ Std_RegisteredInMatchCall:: @ 82742C9 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox gUnknown_08272E0F, 4 + msgbox gUnknown_08272E0F, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -4441,30 +4444,30 @@ EventScript_275A50:: @ 8275A50 compare VAR_RESULT, 6 goto_eq EventScript_275A91 bufferpartymonnick 0, VAR_RESULT - msgbox gText_23B704, 5 + msgbox gText_23B704, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE - msgbox Route103_Text_290771, 4 + msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage - dofieldeffect 11 + dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE waitstate goto EventScript_275A9B end EventScript_275A86:: @ 8275A86 lockall - dofieldeffect 11 + dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE waitstate goto EventScript_275A9B end EventScript_275A91:: @ 8275A91 - msgbox gText_23B6E0, 4 + msgbox gText_23B6E0, MSGBOX_DEFAULT releaseall end EventScript_275A9B:: @ 8275A9B - msgbox gText_23B73E, 4 + msgbox gText_23B73E, MSGBOX_DEFAULT goto EventScript_275B5B end @@ -4473,30 +4476,30 @@ EventScript_275AA9:: @ 8275AA9 compare VAR_RESULT, 6 goto_eq EventScript_275AEA bufferpartymonnick 0, VAR_RESULT - msgbox Text_274779, 5 + msgbox Text_274779, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE - msgbox Route103_Text_290771, 4 + msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage - dofieldeffect 26 + dofieldeffect FLDEFF_USE_SECRET_POWER_TREE waitstate goto EventScript_275AF4 end EventScript_275ADF:: @ 8275ADF lockall - dofieldeffect 26 + dofieldeffect FLDEFF_USE_SECRET_POWER_TREE waitstate goto EventScript_275AF4 end EventScript_275AEA:: @ 8275AEA - msgbox Text_274746, 4 + msgbox Text_274746, MSGBOX_DEFAULT releaseall end EventScript_275AF4:: @ 8275AF4 - msgbox Text_2747C2, 4 + msgbox Text_2747C2, MSGBOX_DEFAULT goto EventScript_275B5B end @@ -4505,30 +4508,30 @@ EventScript_275B02:: @ 8275B02 compare VAR_RESULT, 6 goto_eq EventScript_275B43 bufferpartymonnick 0, VAR_RESULT - msgbox Text_274825, 5 + msgbox Text_274825, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE - msgbox Route103_Text_290771, 4 + msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage - dofieldeffect 27 + dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB waitstate goto EventScript_275B4D end EventScript_275B38:: @ 8275B38 lockall - dofieldeffect 27 + dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB waitstate goto EventScript_275B4D end EventScript_275B43:: @ 8275B43 - msgbox Text_2747DD, 4 + msgbox Text_2747DD, MSGBOX_DEFAULT releaseall end EventScript_275B4D:: @ 8275B4D - msgbox Text_274883, 4 + msgbox Text_274883, MSGBOX_DEFAULT goto EventScript_275B5B end @@ -4536,7 +4539,7 @@ EventScript_275B5B:: @ 8275B5B closemessage playse SE_KAIDAN setvar VAR_0x4097, 0 - setflag FLAG_0x0AD + setflag FLAG_DECORATION_0 special sub_80E8E18 special sub_80E9068 setvar VAR_0x8004, 0 @@ -4550,7 +4553,7 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 applymovement 255, SecretBase_RedCave1_Movement_275BB4 waitmovement 0 setvar VAR_0x4097, 1 - msgbox SecretBase_RedCave1_Text_23B759, 5 + msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275BAB closemessage @@ -4577,14 +4580,14 @@ EventScript_275BB7:: @ 8275BB7 special sub_80E9744 compare VAR_RESULT, 0 goto_eq EventScript_275BDB - clearflag FLAG_0x0AD + clearflag FLAG_DECORATION_0 special sub_80E9068 setvar VAR_0x4089, 0 waitstate end EventScript_275BDB:: @ 8275BDB - setflag FLAG_0x0AD + setflag FLAG_DECORATION_0 special sub_80E9068 setvar VAR_0x4089, 0 waitstate @@ -4598,22 +4601,22 @@ EventScript_275BE8:: @ 8275BE8 setorcopyvar VAR_0x8004, VAR_RESULT lockall special GetSecretBaseNearbyMapName - msgbox Text_276A3D, 5 + msgbox Text_276A3D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE - msgbox Text_2766AA, 5 + msgbox Text_2766AA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE fadescreenswapbuffers 1 special sub_80E9B70 closemessage fadescreenswapbuffers 0 - msgbox Text_276A95, 5 + msgbox Text_276A95, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE bufferpartymonnick 0, VAR_0x8004 buffermovename 1, MOVE_SECRET_POWER - msgbox Route103_Text_290771, 4 + msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage closemessage compare VAR_0x8007, 1 @@ -4655,20 +4658,20 @@ EventScript_275CDE:: @ 8275CDE LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1 LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1 SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 - setflag FLAG_0x0AE - setflag FLAG_0x0AF - setflag FLAG_0x0B0 - setflag FLAG_0x0B1 - setflag FLAG_0x0B2 - setflag FLAG_0x0B3 - setflag FLAG_0x0B4 - setflag FLAG_0x0B5 - setflag FLAG_0x0B6 - setflag FLAG_0x0B7 - setflag FLAG_0x0B8 - setflag FLAG_0x0B9 - setflag FLAG_0x0BA - setflag FLAG_0x0BB + setflag FLAG_DECORATION_1 + setflag FLAG_DECORATION_2 + setflag FLAG_DECORATION_3 + setflag FLAG_DECORATION_4 + setflag FLAG_DECORATION_5 + setflag FLAG_DECORATION_6 + setflag FLAG_DECORATION_7 + setflag FLAG_DECORATION_8 + setflag FLAG_DECORATION_9 + setflag FLAG_DECORATION_10 + setflag FLAG_DECORATION_11 + setflag FLAG_DECORATION_12 + setflag FLAG_DECORATION_13 + setflag FLAG_DECORATION_14 return EventScript_275D0C:: @ 8275D0C @@ -4761,7 +4764,7 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 goto_if 0, SecretBase_RedCave1_EventScript_275E25 compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275E44 - msgbox SecretBase_RedCave1_Text_2748A0, 5 + msgbox SecretBase_RedCave1_Text_2748A0, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275E2F setvar VAR_RESULT, 1 @@ -4769,12 +4772,12 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275E2F - msgbox SecretBase_RedCave1_Text_274939, 4 + msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_275E25:: @ 8275E25 - msgbox SecretBase_RedCave1_Text_2749ED, 4 + msgbox SecretBase_RedCave1_Text_2749ED, MSGBOX_DEFAULT release end @@ -4782,12 +4785,12 @@ SecretBase_RedCave1_EventScript_275E2F:: @ 8275E2F special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27494D, 4 + msgbox SecretBase_RedCave1_Text_27494D, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_275E44:: @ 8275E44 - msgbox SecretBase_RedCave1_Text_2749AA, 4 + msgbox SecretBase_RedCave1_Text_2749AA, MSGBOX_DEFAULT release end @@ -4798,7 +4801,7 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E goto_if 0, SecretBase_RedCave1_EventScript_275E9D compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275EBC - msgbox SecretBase_RedCave1_Text_274C13, 5 + msgbox SecretBase_RedCave1_Text_274C13, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275EA7 setvar VAR_RESULT, 1 @@ -4806,12 +4809,12 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275EA7 - msgbox SecretBase_RedCave1_Text_274CB0, 4 + msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_275E9D:: @ 8275E9D - msgbox SecretBase_RedCave1_Text_274D69, 4 + msgbox SecretBase_RedCave1_Text_274D69, MSGBOX_DEFAULT release end @@ -4819,12 +4822,12 @@ SecretBase_RedCave1_EventScript_275EA7:: @ 8275EA7 special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274CDA, 4 + msgbox SecretBase_RedCave1_Text_274CDA, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_275EBC:: @ 8275EBC - msgbox SecretBase_RedCave1_Text_274D34, 4 + msgbox SecretBase_RedCave1_Text_274D34, MSGBOX_DEFAULT release end @@ -4835,7 +4838,7 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 goto_if 0, SecretBase_RedCave1_EventScript_275F15 compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275F34 - msgbox SecretBase_RedCave1_Text_274F39, 5 + msgbox SecretBase_RedCave1_Text_274F39, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F1F setvar VAR_RESULT, 1 @@ -4843,12 +4846,12 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F1F - msgbox SecretBase_RedCave1_Text_274FCA, 4 + msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_275F15:: @ 8275F15 - msgbox SecretBase_RedCave1_Text_2750A4, 4 + msgbox SecretBase_RedCave1_Text_2750A4, MSGBOX_DEFAULT release end @@ -4856,12 +4859,12 @@ SecretBase_RedCave1_EventScript_275F1F:: @ 8275F1F special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274FDA, 4 + msgbox SecretBase_RedCave1_Text_274FDA, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_275F34:: @ 8275F34 - msgbox SecretBase_RedCave1_Text_27502A, 4 + msgbox SecretBase_RedCave1_Text_27502A, MSGBOX_DEFAULT release end @@ -4872,7 +4875,7 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E goto_if 0, SecretBase_RedCave1_EventScript_275F8D compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275FAC - msgbox SecretBase_RedCave1_Text_275287, 5 + msgbox SecretBase_RedCave1_Text_275287, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F97 setvar VAR_RESULT, 1 @@ -4880,12 +4883,12 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F97 - msgbox SecretBase_RedCave1_Text_275315, 4 + msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_275F8D:: @ 8275F8D - msgbox SecretBase_RedCave1_Text_2753AB, 4 + msgbox SecretBase_RedCave1_Text_2753AB, MSGBOX_DEFAULT release end @@ -4893,12 +4896,12 @@ SecretBase_RedCave1_EventScript_275F97:: @ 8275F97 special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275330, 4 + msgbox SecretBase_RedCave1_Text_275330, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_275FAC:: @ 8275FAC - msgbox SecretBase_RedCave1_Text_275374, 4 + msgbox SecretBase_RedCave1_Text_275374, MSGBOX_DEFAULT release end @@ -4909,7 +4912,7 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 goto_if 0, SecretBase_RedCave1_EventScript_276005 compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_276024 - msgbox SecretBase_RedCave1_Text_2755D2, 5 + msgbox SecretBase_RedCave1_Text_2755D2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_27600F setvar VAR_RESULT, 1 @@ -4917,12 +4920,12 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_27600F - msgbox SecretBase_RedCave1_Text_275679, 4 + msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_276005:: @ 8276005 - msgbox SecretBase_RedCave1_Text_27571E, 4 + msgbox SecretBase_RedCave1_Text_27571E, MSGBOX_DEFAULT release end @@ -4930,12 +4933,12 @@ SecretBase_RedCave1_EventScript_27600F:: @ 827600F special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275696, 4 + msgbox SecretBase_RedCave1_Text_275696, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_276024:: @ 8276024 - msgbox SecretBase_RedCave1_Text_2756EF, 4 + msgbox SecretBase_RedCave1_Text_2756EF, MSGBOX_DEFAULT release end @@ -4946,7 +4949,7 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E goto_if 0, SecretBase_RedCave1_EventScript_27607D compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_27609C - msgbox SecretBase_RedCave1_Text_274A64, 5 + msgbox SecretBase_RedCave1_Text_274A64, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276087 setvar VAR_RESULT, 1 @@ -4954,12 +4957,12 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276087 - msgbox SecretBase_RedCave1_Text_274AFA, 4 + msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_27607D:: @ 827607D - msgbox SecretBase_RedCave1_Text_274BA2, 4 + msgbox SecretBase_RedCave1_Text_274BA2, MSGBOX_DEFAULT release end @@ -4967,12 +4970,12 @@ SecretBase_RedCave1_EventScript_276087:: @ 8276087 special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274B0B, 4 + msgbox SecretBase_RedCave1_Text_274B0B, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_27609C:: @ 827609C - msgbox SecretBase_RedCave1_Text_274B6C, 4 + msgbox SecretBase_RedCave1_Text_274B6C, MSGBOX_DEFAULT release end @@ -4983,7 +4986,7 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 goto_if 0, SecretBase_RedCave1_EventScript_2760F5 compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_276114 - msgbox SecretBase_RedCave1_Text_274DD2, 5 + msgbox SecretBase_RedCave1_Text_274DD2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2760FF setvar VAR_RESULT, 1 @@ -4991,12 +4994,12 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2760FF - msgbox SecretBase_RedCave1_Text_274E41, 4 + msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_2760F5:: @ 82760F5 - msgbox SecretBase_RedCave1_Text_274EF1, 4 + msgbox SecretBase_RedCave1_Text_274EF1, MSGBOX_DEFAULT release end @@ -5004,12 +5007,12 @@ SecretBase_RedCave1_EventScript_2760FF:: @ 82760FF special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274E5A, 4 + msgbox SecretBase_RedCave1_Text_274E5A, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_276114:: @ 8276114 - msgbox SecretBase_RedCave1_Text_274EB3, 4 + msgbox SecretBase_RedCave1_Text_274EB3, MSGBOX_DEFAULT release end @@ -5020,7 +5023,7 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E goto_if 0, SecretBase_RedCave1_EventScript_27616D compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_27618C - msgbox SecretBase_RedCave1_Text_275114, 5 + msgbox SecretBase_RedCave1_Text_275114, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276177 setvar VAR_RESULT, 1 @@ -5028,12 +5031,12 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276177 - msgbox SecretBase_RedCave1_Text_2751AF, 4 + msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_27616D:: @ 827616D - msgbox SecretBase_RedCave1_Text_275226, 4 + msgbox SecretBase_RedCave1_Text_275226, MSGBOX_DEFAULT release end @@ -5041,12 +5044,12 @@ SecretBase_RedCave1_EventScript_276177:: @ 8276177 special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2751CA, 4 + msgbox SecretBase_RedCave1_Text_2751CA, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_27618C:: @ 827618C - msgbox SecretBase_RedCave1_Text_2751EC, 4 + msgbox SecretBase_RedCave1_Text_2751EC, MSGBOX_DEFAULT release end @@ -5057,7 +5060,7 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196 goto_if 0, SecretBase_RedCave1_EventScript_2761E5 compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_276204 - msgbox SecretBase_RedCave1_Text_275405, 5 + msgbox SecretBase_RedCave1_Text_275405, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2761EF setvar VAR_RESULT, 1 @@ -5065,12 +5068,12 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196 call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2761EF - msgbox SecretBase_RedCave1_Text_2754B2, 4 + msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_2761E5:: @ 82761E5 - msgbox SecretBase_RedCave1_Text_275546, 4 + msgbox SecretBase_RedCave1_Text_275546, MSGBOX_DEFAULT release end @@ -5078,12 +5081,12 @@ SecretBase_RedCave1_EventScript_2761EF:: @ 82761EF special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2754D8, 4 + msgbox SecretBase_RedCave1_Text_2754D8, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_276204:: @ 8276204 - msgbox SecretBase_RedCave1_Text_27550C, 4 + msgbox SecretBase_RedCave1_Text_27550C, MSGBOX_DEFAULT release end @@ -5094,7 +5097,7 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E goto_if 0, SecretBase_RedCave1_EventScript_27625D compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_27627C - msgbox SecretBase_RedCave1_Text_2757B5, 5 + msgbox SecretBase_RedCave1_Text_2757B5, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276267 setvar VAR_RESULT, 1 @@ -5102,12 +5105,12 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276267 - msgbox SecretBase_RedCave1_Text_275884, 4 + msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_27625D:: @ 827625D - msgbox SecretBase_RedCave1_Text_275944, 4 + msgbox SecretBase_RedCave1_Text_275944, MSGBOX_DEFAULT release end @@ -5115,20 +5118,20 @@ SecretBase_RedCave1_EventScript_276267:: @ 8276267 special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27589D, 4 + msgbox SecretBase_RedCave1_Text_27589D, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_27627C:: @ 827627C - msgbox SecretBase_RedCave1_Text_275909, 4 + msgbox SecretBase_RedCave1_Text_275909, MSGBOX_DEFAULT release end 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 @@ -5509,7 +5512,7 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28C879 copyvar VAR_0x8009, VAR_0x8006 - msgbox SlateportCity_PokemonFanClub_Text_280674, 5 + msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28C827 compare VAR_RESULT, 0 @@ -5517,7 +5520,7 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 end SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 - msgbox SlateportCity_PokemonFanClub_Text_28073B, 4 + msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT setvar VAR_0x8004, 5 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 @@ -5531,18 +5534,18 @@ SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 end SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C - msgbox SlateportCity_PokemonFanClub_Text_2805E2, 4 + msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_28C866:: @ 828C866 - msgbox SlateportCity_PokemonFanClub_Text_280789, 4 + msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT setvar VAR_0x8005, 1 goto SlateportCity_PokemonFanClub_EventScript_28C7E9 end SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879 - msgbox SlateportCity_PokemonFanClub_Text_28062E, 4 + msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT release end @@ -5557,7 +5560,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 checkflag FLAG_0x069 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 setflag FLAG_0x069 - msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, 5 + msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 compare VAR_RESULT, 0 @@ -5565,7 +5568,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 end SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 - msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, 5 + msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 compare VAR_RESULT, 0 @@ -5573,7 +5576,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 end SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 - msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT setvar VAR_0x8004, 5 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 @@ -5587,18 +5590,18 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 end SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C - msgbox SlateportCity_OceanicMuseum_1F_Text_281367, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT release end SlateportCity_OceanicMuseum_1F_EventScript_28C926:: @ 828C926 - msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT setvar VAR_0x8005, 2 goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9 end SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939 - msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT release end @@ -5613,7 +5616,7 @@ SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28CA4F copyvar VAR_0x8009, VAR_0x8006 - msgbox SlateportCity_PokemonFanClub_Text_280270, 5 + msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28C98C compare VAR_RESULT, 0 @@ -5621,7 +5624,7 @@ SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 end SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C - msgbox SlateportCity_PokemonFanClub_Text_28034F, 4 + msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT random 3 copyvar VAR_0x800A, VAR_RESULT switch VAR_RESULT @@ -5631,17 +5634,17 @@ SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C end SlateportCity_PokemonFanClub_EventScript_28C9C3:: @ 828C9C3 - msgbox SlateportCity_PokemonFanClub_Text_280393, 4 + msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_28C9ED end SlateportCity_PokemonFanClub_EventScript_28C9D1:: @ 828C9D1 - msgbox SlateportCity_PokemonFanClub_Text_2803EF, 4 + msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_28C9ED end SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF - msgbox SlateportCity_PokemonFanClub_Text_280454, 4 + msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_28C9ED end @@ -5654,40 +5657,40 @@ SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED faceplayer compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - msgbox SlateportCity_PokemonFanClub_Text_2804AC, 4 + msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT setvar VAR_0x8006, 1 call SlateportCity_PokemonFanClub_EventScript_271E7C lock faceplayer compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - msgbox SlateportCity_PokemonFanClub_Text_280523, 4 + msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT copyvar VAR_0x8007, VAR_0x800A setvar VAR_0x8005, 3 goto SlateportCity_PokemonFanClub_EventScript_28C7E9 end SlateportCity_PokemonFanClub_EventScript_28CA45:: @ 828CA45 - msgbox SlateportCity_PokemonFanClub_Text_2805E2, 4 + msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F - msgbox SlateportCity_PokemonFanClub_Text_28062E, 4 + msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 lock faceplayer - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 setvar VAR_0x8005, 6 special InterviewBefore compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 copyvar VAR_0x8009, VAR_0x8006 - msgbox LilycoveCity_ContestLobby_Text_27EF15, 5 + msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_28CA9B compare VAR_RESULT, 0 @@ -5695,7 +5698,7 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 end LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B - msgbox LilycoveCity_ContestLobby_Text_27EFE7, 4 + msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT setvar VAR_0x8004, 11 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 @@ -5709,14 +5712,14 @@ LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B end LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0 - msgbox LilycoveCity_ContestLobby_Text_27F1EF, 4 + msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA setvar VAR_0x8004, 24 special SetContestCategoryStringVarForInterview - msgbox LilycoveCity_ContestLobby_Text_27F03E, 4 + msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT setvar VAR_0x8004, 11 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 @@ -5725,14 +5728,14 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA faceplayer compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 - msgbox LilycoveCity_ContestLobby_Text_27F0EC, 4 - setflag FLAG_0x002 + msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT + setflag FLAG_TEMP_2 setvar VAR_0x8005, 6 goto LilycoveCity_ContestLobby_EventScript_28C7E9 end LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 - msgbox LilycoveCity_ContestLobby_Text_27F23F, 4 + msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT release end @@ -5753,7 +5756,7 @@ LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B end LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91 - clearflag FLAG_0x322 + clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER return LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 @@ -5762,14 +5765,14 @@ LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 lock faceplayer - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A setvar VAR_0x8005, 7 special InterviewBefore compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A copyvar VAR_0x8009, VAR_0x8006 - msgbox BattleFrontier_BattleTowerLobby_Text_27F704, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 compare VAR_RESULT, 0 @@ -5785,7 +5788,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC38 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC41 - msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT setvar VAR_0x8004, 12 copyvar VAR_0x8005, VAR_0x8009 call BattleFrontier_BattleTowerLobby_EventScript_271E7C @@ -5798,35 +5801,35 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 end BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E - msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38 - msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 - msgbox BattleFrontier_BattleTowerLobby_Text_27F921, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 - msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, 4 - setflag FLAG_0x002 + msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT + setflag FLAG_TEMP_2 copyvar VAR_0x8004, VAR_0x8008 setvar VAR_0x8005, 7 goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9 end BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70 - msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A - msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT release end @@ -5837,11 +5840,11 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 special InterviewBefore compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 - clearflag FLAG_0x396 + clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER return BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6 - setflag FLAG_0x396 + setflag FLAG_HIDE_BATTLE_TOWER_REPORTER return .include "data/scripts/gabby_and_ty.inc" @@ -5860,7 +5863,7 @@ EventScript_2926F8:: @ 82926F8 .include "data/scripts/players_house.inc" EventScript_RunningShoesManual:: @ 8292DE5 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, 3 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, MSGBOX_SIGN end .include "data/scripts/pokeblocks.inc" @@ -5931,7 +5934,7 @@ gUnknown_082944D5:: @ 82944D5 .include "data/text/trainers.inc" EventScript_RepelWoreOff:: @ 82A4B2A - msgbox Text_RepelWoreOff, 3 + msgbox Text_RepelWoreOff, MSGBOX_SIGN end Text_RepelWoreOff: @ 82A4B33 @@ -6057,7 +6060,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395 lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818DBE8 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0 @@ -6068,13 +6071,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395 end LilycoveCity_PokemonCenter_1F_EventScript_2A83C6:: @ 82A83C6 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8AB1, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8AB1, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0 special sub_818DC2C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818DC60 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435 @@ -6093,17 +6096,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7 end LilycoveCity_PokemonCenter_1F_EventScript_2A8419:: @ 82A8419 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8ACE, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8ACE, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 end LilycoveCity_PokemonCenter_1F_EventScript_2A8427:: @ 82A8427 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B36, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B36, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 end LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 compare VAR_RESULT, 1 @@ -6111,12 +6114,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435 end LilycoveCity_PokemonCenter_1F_EventScript_2A8454:: @ 82A8454 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BCD, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BCD, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A845E:: @ 82A845E - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BAD, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BAD, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A846C end @@ -6132,7 +6135,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A846C:: @ 82A846C end LilycoveCity_PokemonCenter_1F_EventScript_2A848E:: @ 82A848E - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 compare VAR_RESULT, 0 @@ -6149,7 +6152,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9 special sub_818DC2C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C0F, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C0F, MSGBOX_DEFAULT release end @@ -6163,20 +6166,20 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6 LilycoveCity_PokemonCenter_1F_EventScript_2A84F2:: @ 82A84F2 special sub_818DC2C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C6F, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C6F, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A84FF:: @ 82A84FF special sub_818DC2C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8CC8, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8CC8, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8510 end LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 setvar VAR_0x8004, 0 specialvar VAR_0x8004, sub_818DEA0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, MSGBOX_DEFAULT giveitem_std VAR_0x8004 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 @@ -6185,7 +6188,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 end LilycoveCity_PokemonCenter_1F_EventScript_2A8545:: @ 82A8545 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8DBD, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8DBD, MSGBOX_DEFAULT release end @@ -6197,7 +6200,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A854F:: @ 82A854F LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554 lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E038 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585 @@ -6226,23 +6229,23 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC end LilycoveCity_PokemonCenter_1F_EventScript_2A85C8:: @ 82A85C8 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E4E, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E4E, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A85D2:: @ 82A85D2 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE end LilycoveCity_PokemonCenter_1F_EventScript_2A85E0:: @ 82A85E0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE end LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE setvar VAR_0x8004, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C compare VAR_RESULT, 0 @@ -6250,7 +6253,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE end LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F65, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F65, MSGBOX_DEFAULT release end @@ -6281,7 +6284,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656 end LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F compare VAR_RESULT, 0 @@ -6289,13 +6292,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 end LilycoveCity_PokemonCenter_1F_EventScript_2A867F:: @ 82A867F - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F9A, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F9A, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689 special sub_818E37C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E308 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7 @@ -6307,7 +6310,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A86B0:: @ 82A86B0 playse SE_SEIKAI delay 10 playse SE_SEIKAI - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8FC7, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8FC7, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A86EC end @@ -6317,8 +6320,8 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A86C7:: @ 82A86C7 playse SE_HAZURE delay 10 playse SE_HAZURE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90A5, 4 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90CD, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A90A5, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_2A90CD, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 end @@ -6331,12 +6334,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A86EC:: @ 82A86EC end LilycoveCity_PokemonCenter_1F_EventScript_2A8708:: @ 82A8708 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 end LilycoveCity_PokemonCenter_1F_EventScript_2A8716:: @ 82A8716 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 end @@ -6351,13 +6354,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724 end LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A906A, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A906A, MSGBOX_DEFAULT special sub_818E39C release end LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 compare VAR_RESULT, 0 @@ -6366,12 +6369,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 LilycoveCity_PokemonCenter_1F_EventScript_2A8778:: @ 82A8778 special sub_818E3EC - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9131, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9131, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A8785:: @ 82A8785 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9153, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9153, MSGBOX_DEFAULT LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D fadescreen 1 @@ -6385,7 +6388,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D end LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 compare VAR_RESULT, 0 @@ -6393,7 +6396,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF end LilycoveCity_PokemonCenter_1F_EventScript_2A87CE:: @ 82A87CE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9270, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9270, MSGBOX_DEFAULT special sub_818E430 special sub_818E3BC setvar VAR_0x8004, 16 @@ -6408,7 +6411,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A87E1:: @ 82A87E1 end LilycoveCity_PokemonCenter_1F_EventScript_2A87F8:: @ 82A87F8 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 compare VAR_RESULT, 0 @@ -6419,14 +6422,14 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8817:: @ 82A8817 special sub_818E490 special sub_818E4A4 special sub_818E510 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9336, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9336, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A882A:: @ 82A882A lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E8B4 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850 @@ -6443,17 +6446,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8850:: @ 82A8850 end LilycoveCity_PokemonCenter_1F_EventScript_2A886C:: @ 82A886C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93D6, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A93D6, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 special sub_818E914 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, MSGBOX_DEFAULT checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 compare VAR_RESULT, 1 @@ -6461,7 +6464,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 end LilycoveCity_PokemonCenter_1F_EventScript_2A88B0:: @ 82A88B0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9556, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9556, MSGBOX_DEFAULT release end @@ -6476,7 +6479,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA end LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 compare VAR_RESULT, 0 @@ -6484,7 +6487,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 end LilycoveCity_PokemonCenter_1F_EventScript_2A88F6:: @ 82A88F6 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9571, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9571, MSGBOX_DEFAULT special sub_818E940 special sub_818E960 goto LilycoveCity_PokemonCenter_1F_EventScript_2A890A @@ -6522,13 +6525,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A894C:: @ 82A894C end LilycoveCity_PokemonCenter_1F_EventScript_2A8970:: @ 82A8970 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A95AD, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A95AD, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F end LilycoveCity_PokemonCenter_1F_EventScript_2A897E:: @ 82A897E special sub_818E914 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9605, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9605, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F end @@ -6540,13 +6543,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A898F:: @ 82A898F end LilycoveCity_PokemonCenter_1F_EventScript_2A89A1:: @ 82A89A1 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9669, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9669, MSGBOX_DEFAULT special PutLilycoveContestLadyShowOnTheAir release end LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9451, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9451, MSGBOX_DEFAULT release end @@ -6596,7 +6599,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A:: @ 82A8A0A faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96DA, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A96DA, MSGBOX_DEFAULT waitmoncry release end @@ -6606,7 +6609,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D:: @ 82A8A1D faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A970E, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A970E, MSGBOX_DEFAULT waitmoncry release end @@ -6616,7 +6619,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A30:: @ 82A8A30 faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96F6, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A96F6, MSGBOX_DEFAULT waitmoncry release end @@ -6626,7 +6629,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A43:: @ 82A8A43 faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96E6, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A96E6, MSGBOX_DEFAULT waitmoncry release end @@ -6636,7 +6639,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A56:: @ 82A8A56 faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9703, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9703, MSGBOX_DEFAULT waitmoncry release end @@ -9854,7 +9857,7 @@ gText_MrStone_Pokenav_2B67ED:: @ 82B67ED .string "sometime!$" .include "data/scripts/apprentice.inc" - + gBattleDomeOpponentPotential1:: .string "The best candidate to be a champ!$" @@ -9863,7 +9866,7 @@ gBattleDomeOpponentPotential2:: gBattleDomeOpponentPotential3:: .string "A likely top-three finisher.$" - + gBattleDomeOpponentPotential4:: .string "A candidate to finish first.$" @@ -9906,7 +9909,7 @@ gBattleDomeOpponentPotential16:: gBattleDomeOpponentPotential17:: .string "The perfect, invincible superstar!$" -gBattleDomeOpponentStyle1:: +gBattleDomeOpponentStyle1:: .string "Willing to risk total disaster at times.$" gBattleDomeOpponentStyle2:: @@ -10203,9 +10206,9 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 setvar VAR_0x8004, 4 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 5 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 @@ -10250,7 +10253,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 setvar VAR_OBJ_GFX_ID_1, 28 setvar VAR_OBJ_GFX_ID_0, 28 setvar VAR_0x8004, 5 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 3 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 compare VAR_RESULT, 6 @@ -10293,24 +10296,24 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A703C + special CallBattlePikeFunction 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 + special CallBattlePikeFunction setvar VAR_0x8004, 5 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 @@ -10348,7 +10351,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, MSGBOX_DEFAULT closemessage end @@ -10361,35 +10364,35 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, MSGBOX_DEFAULT closemessage end BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 setvar VAR_0x8004, 25 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 compare VAR_RESULT, 1 call_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A703C + special CallBattlePikeFunction 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 + special CallBattlePikeFunction compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 compare VAR_RESULT, 0 @@ -10401,14 +10404,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128 setvar VAR_0x8004, 24 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction return BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 setvar VAR_0x8004, 24 setvar VAR_0x8005, 0 - special sub_81A703C + special CallBattlePikeFunction return BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144 @@ -10429,31 +10432,31 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 setvar VAR_0x8004, 7 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 25 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 compare VAR_RESULT, 1 call_if 5, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A703C + special CallBattlePikeFunction 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 + special CallBattlePikeFunction compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 compare VAR_RESULT, 0 @@ -10470,7 +10473,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, 4 + msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, MSGBOX_DEFAULT closemessage end @@ -10478,7 +10481,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 +10491,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 +10505,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 @@ -11330,13 +11333,13 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 faceplayer checkflag FLAG_0x1B1 goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6E37, 5 + msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A call SlateportCity_PokemonFanClub_EventScript_2C832D compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F66, 4 + msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT setvar VAR_0x8005, 23 call SlateportCity_PokemonFanClub_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11346,12 +11349,12 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 end SlateportCity_PokemonFanClub_EventScript_2C7F6A:: @ 82C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F33, 4 + msgbox SlateportCity_PokemonFanClub_Text_2C6F33, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, 4 + msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, MSGBOX_DEFAULT release end @@ -11360,13 +11363,13 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E faceplayer checkflag FLAG_0x1B2 goto_eq MauvilleCity_EventScript_2C7FDC - msgbox MauvilleCity_Text_2C6FDB, 5 + msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_2C7FD2 call MauvilleCity_EventScript_2C832D compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_2C7FD2 - msgbox MauvilleCity_Text_2C70F3, 4 + msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT setvar VAR_0x8005, 16 call MauvilleCity_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11376,12 +11379,12 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E end MauvilleCity_EventScript_2C7FD2:: @ 82C7FD2 - msgbox MauvilleCity_Text_2C70C4, 4 + msgbox MauvilleCity_Text_2C70C4, MSGBOX_DEFAULT release end MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC - msgbox MauvilleCity_Text_2C7133, 4 + msgbox MauvilleCity_Text_2C7133, MSGBOX_DEFAULT release end @@ -11390,13 +11393,13 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 faceplayer checkflag FLAG_0x1B3 goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, 5 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, 4 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT setvar VAR_0x8005, 29 call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11406,12 +11409,12 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 end VerdanturfTown_PokemonCenter_1F_EventScript_2C803A:: @ 82C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, 4 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, MSGBOX_DEFAULT release end VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, 4 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, MSGBOX_DEFAULT release end @@ -11420,13 +11423,13 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E faceplayer checkflag FLAG_0x1B4 goto_eq LavaridgeTown_House_EventScript_2C80AC - msgbox LavaridgeTown_House_Text_2C72B6, 5 + msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LavaridgeTown_House_EventScript_2C80A2 call LavaridgeTown_House_EventScript_2C832D compare VAR_RESULT, 0 goto_eq LavaridgeTown_House_EventScript_2C80A2 - msgbox LavaridgeTown_House_Text_2C73B1, 4 + msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT setvar VAR_0x8005, 7 call LavaridgeTown_House_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11436,12 +11439,12 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E end LavaridgeTown_House_EventScript_2C80A2:: @ 82C80A2 - msgbox LavaridgeTown_House_Text_2C737F, 4 + msgbox LavaridgeTown_House_Text_2C737F, MSGBOX_DEFAULT release end LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC - msgbox LavaridgeTown_House_Text_2C73F6, 4 + msgbox LavaridgeTown_House_Text_2C73F6, MSGBOX_DEFAULT release end @@ -11450,13 +11453,13 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 faceplayer checkflag FLAG_0x1B5 goto_eq FallarborTown_Mart_EventScript_2C8114 - msgbox FallarborTown_Mart_Text_2C7449, 5 + msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FallarborTown_Mart_EventScript_2C810A call FallarborTown_Mart_EventScript_2C832D compare VAR_RESULT, 0 goto_eq FallarborTown_Mart_EventScript_2C810A - msgbox FallarborTown_Mart_Text_2C7582, 4 + msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT setvar VAR_0x8005, 8 call FallarborTown_Mart_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11466,12 +11469,12 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 end FallarborTown_Mart_EventScript_2C810A:: @ 82C810A - msgbox FallarborTown_Mart_Text_2C7556, 4 + msgbox FallarborTown_Mart_Text_2C7556, MSGBOX_DEFAULT release end FallarborTown_Mart_EventScript_2C8114:: @ 82C8114 - msgbox FallarborTown_Mart_Text_2C75B5, 4 + msgbox FallarborTown_Mart_Text_2C75B5, MSGBOX_DEFAULT release end @@ -11480,13 +11483,13 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E faceplayer checkflag FLAG_0x1B6 goto_eq FortreeCity_House2_EventScript_2C817C - msgbox FortreeCity_House2_Text_2C7637, 5 + msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_2C8172 call FortreeCity_House2_EventScript_2C832D compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_2C8172 - msgbox FortreeCity_House2_Text_2C7721, 4 + msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT setvar VAR_0x8005, 24 call FortreeCity_House2_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11496,12 +11499,12 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E end FortreeCity_House2_EventScript_2C8172:: @ 82C8172 - msgbox FortreeCity_House2_Text_2C76E2, 4 + msgbox FortreeCity_House2_Text_2C76E2, MSGBOX_DEFAULT release end FortreeCity_House2_EventScript_2C817C:: @ 82C817C - msgbox FortreeCity_House2_Text_2C775A, 4 + msgbox FortreeCity_House2_Text_2C775A, MSGBOX_DEFAULT release end @@ -11510,13 +11513,13 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 faceplayer checkflag FLAG_0x1B7 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, 5 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT setvar VAR_0x8005, 14 call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11526,12 +11529,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 end LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA:: @ 82C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, MSGBOX_DEFAULT release end @@ -11540,13 +11543,13 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE faceplayer checkflag FLAG_0x1B8 goto_eq MossdeepCity_EventScript_2C824C - msgbox MossdeepCity_Text_2C79A6, 5 + msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_2C8242 call MossdeepCity_EventScript_2C832D compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_2C8242 - msgbox MossdeepCity_Text_2C7B0D, 4 + msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT setvar VAR_0x8005, 15 call MossdeepCity_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11556,12 +11559,12 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE end MossdeepCity_EventScript_2C8242:: @ 82C8242 - msgbox MossdeepCity_Text_2C7AD4, 4 + msgbox MossdeepCity_Text_2C7AD4, MSGBOX_DEFAULT release end MossdeepCity_EventScript_2C824C:: @ 82C824C - msgbox MossdeepCity_Text_2C7B4F, 4 + msgbox MossdeepCity_Text_2C7B4F, MSGBOX_DEFAULT release end @@ -11570,13 +11573,13 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 faceplayer checkflag FLAG_0x1B9 goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, 5 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA call SootopolisCity_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT setvar VAR_0x8005, 4 call SootopolisCity_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11586,12 +11589,12 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 end SootopolisCity_PokemonCenter_1F_EventScript_2C82AA:: @ 82C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, MSGBOX_DEFAULT release end SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, MSGBOX_DEFAULT release end @@ -11600,13 +11603,13 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE faceplayer checkflag FLAG_0x1BA goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, 5 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, 4 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT setvar VAR_0x8005, 12 call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11616,12 +11619,12 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE end PacifidlogTown_PokemonCenter_1F_EventScript_2C8312:: @ 82C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, 4 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, MSGBOX_DEFAULT release end PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, 4 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, MSGBOX_DEFAULT release end @@ -11651,7 +11654,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D SlateportCity_PokemonFanClub_EventScript_2C832D:: @ 82C832D SootopolisCity_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D VerdanturfTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D - msgbox MauvilleCity_Text_2C6E05, 5 + msgbox MauvilleCity_Text_2C6E05, MSGBOX_YESNO return TrainerHill_1F_MapScript1_2C8336: @ 82C8336 @@ -11664,7 +11667,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 @@ -11695,7 +11698,7 @@ EventScript_TrainerHillTimer:: @ 82C8393 lockall setvar VAR_0x8004, 7 special sp194_trainer_tower - msgbox TrainerHill_Entrance_Text_268D47, 4 + msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT releaseall end @@ -11732,7 +11735,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE step_end EventScript_2C83F0:: @ 82C83F0 - trainerbattle 12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D + trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D setvar VAR_0x8004, 11 special sp194_trainer_tower waitmessage @@ -11745,7 +11748,7 @@ Text_ThisIsATestSignpostMsg:: @ 82C840A .string "This is a signpost.$" EventScript_TestSignpostMsg:: @ 82C8436 - msgbox Text_ThisIsATestSignpostMsg, 3 + msgbox Text_ThisIsATestSignpostMsg, MSGBOX_SIGN end gText_082C843F:: @ 82C843F diff --git a/data/graphics/pokemon/footprint_table.inc b/data/graphics/pokemon/footprint_table.inc deleted file mode 100644 index b5de0e11d..000000000 --- a/data/graphics/pokemon/footprint_table.inc +++ /dev/null @@ -1,415 +0,0 @@ - .align 2 -gMonFootprintTable:: @ 856E694 - .4byte gMonFootprint_Bulbasaur - .4byte gMonFootprint_Bulbasaur - .4byte gMonFootprint_Ivysaur - .4byte gMonFootprint_Venusaur - .4byte gMonFootprint_Charmander - .4byte gMonFootprint_Charmeleon - .4byte gMonFootprint_Charizard - .4byte gMonFootprint_Squirtle - .4byte gMonFootprint_Wartortle - .4byte gMonFootprint_Blastoise - .4byte gMonFootprint_Caterpie - .4byte gMonFootprint_Metapod - .4byte gMonFootprint_Butterfree - .4byte gMonFootprint_Weedle - .4byte gMonFootprint_Kakuna - .4byte gMonFootprint_Beedrill - .4byte gMonFootprint_Pidgey - .4byte gMonFootprint_Pidgeotto - .4byte gMonFootprint_Pidgeot - .4byte gMonFootprint_Rattata - .4byte gMonFootprint_Raticate - .4byte gMonFootprint_Spearow - .4byte gMonFootprint_Fearow - .4byte gMonFootprint_Ekans - .4byte gMonFootprint_Arbok - .4byte gMonFootprint_Pikachu - .4byte gMonFootprint_Raichu - .4byte gMonFootprint_Sandshrew - .4byte gMonFootprint_Sandslash - .4byte gMonFootprint_NidoranF - .4byte gMonFootprint_Nidorina - .4byte gMonFootprint_Nidoqueen - .4byte gMonFootprint_NidoranM - .4byte gMonFootprint_Nidorino - .4byte gMonFootprint_Nidoking - .4byte gMonFootprint_Clefairy - .4byte gMonFootprint_Clefable - .4byte gMonFootprint_Vulpix - .4byte gMonFootprint_Ninetales - .4byte gMonFootprint_Jigglypuff - .4byte gMonFootprint_Wigglytuff - .4byte gMonFootprint_Zubat - .4byte gMonFootprint_Golbat - .4byte gMonFootprint_Oddish - .4byte gMonFootprint_Gloom - .4byte gMonFootprint_Vileplume - .4byte gMonFootprint_Paras - .4byte gMonFootprint_Parasect - .4byte gMonFootprint_Venonat - .4byte gMonFootprint_Venomoth - .4byte gMonFootprint_Diglett - .4byte gMonFootprint_Dugtrio - .4byte gMonFootprint_Meowth - .4byte gMonFootprint_Persian - .4byte gMonFootprint_Psyduck - .4byte gMonFootprint_Golduck - .4byte gMonFootprint_Mankey - .4byte gMonFootprint_Primeape - .4byte gMonFootprint_Growlithe - .4byte gMonFootprint_Arcanine - .4byte gMonFootprint_Poliwag - .4byte gMonFootprint_Poliwhirl - .4byte gMonFootprint_Poliwrath - .4byte gMonFootprint_Abra - .4byte gMonFootprint_Kadabra - .4byte gMonFootprint_Alakazam - .4byte gMonFootprint_Machop - .4byte gMonFootprint_Machoke - .4byte gMonFootprint_Machamp - .4byte gMonFootprint_Bellsprout - .4byte gMonFootprint_Weepinbell - .4byte gMonFootprint_Victreebel - .4byte gMonFootprint_Tentacool - .4byte gMonFootprint_Tentacruel - .4byte gMonFootprint_Geodude - .4byte gMonFootprint_Graveler - .4byte gMonFootprint_Golem - .4byte gMonFootprint_Ponyta - .4byte gMonFootprint_Rapidash - .4byte gMonFootprint_Slowpoke - .4byte gMonFootprint_Slowbro - .4byte gMonFootprint_Magnemite - .4byte gMonFootprint_Magneton - .4byte gMonFootprint_Farfetchd - .4byte gMonFootprint_Doduo - .4byte gMonFootprint_Dodrio - .4byte gMonFootprint_Seel - .4byte gMonFootprint_Dewgong - .4byte gMonFootprint_Grimer - .4byte gMonFootprint_Muk - .4byte gMonFootprint_Shellder - .4byte gMonFootprint_Cloyster - .4byte gMonFootprint_Gastly - .4byte gMonFootprint_Haunter - .4byte gMonFootprint_Gengar - .4byte gMonFootprint_Onix - .4byte gMonFootprint_Drowzee - .4byte gMonFootprint_Hypno - .4byte gMonFootprint_Krabby - .4byte gMonFootprint_Kingler - .4byte gMonFootprint_Voltorb - .4byte gMonFootprint_Electrode - .4byte gMonFootprint_Exeggcute - .4byte gMonFootprint_Exeggutor - .4byte gMonFootprint_Cubone - .4byte gMonFootprint_Marowak - .4byte gMonFootprint_Hitmonlee - .4byte gMonFootprint_Hitmonchan - .4byte gMonFootprint_Lickitung - .4byte gMonFootprint_Koffing - .4byte gMonFootprint_Weezing - .4byte gMonFootprint_Rhyhorn - .4byte gMonFootprint_Rhydon - .4byte gMonFootprint_Chansey - .4byte gMonFootprint_Tangela - .4byte gMonFootprint_Kangaskhan - .4byte gMonFootprint_Horsea - .4byte gMonFootprint_Seadra - .4byte gMonFootprint_Goldeen - .4byte gMonFootprint_Seaking - .4byte gMonFootprint_Staryu - .4byte gMonFootprint_Starmie - .4byte gMonFootprint_Mrmime - .4byte gMonFootprint_Scyther - .4byte gMonFootprint_Jynx - .4byte gMonFootprint_Electabuzz - .4byte gMonFootprint_Magmar - .4byte gMonFootprint_Pinsir - .4byte gMonFootprint_Tauros - .4byte gMonFootprint_Magikarp - .4byte gMonFootprint_Gyarados - .4byte gMonFootprint_Lapras - .4byte gMonFootprint_Ditto - .4byte gMonFootprint_Eevee - .4byte gMonFootprint_Vaporeon - .4byte gMonFootprint_Jolteon - .4byte gMonFootprint_Flareon - .4byte gMonFootprint_Porygon - .4byte gMonFootprint_Omanyte - .4byte gMonFootprint_Omastar - .4byte gMonFootprint_Kabuto - .4byte gMonFootprint_Kabutops - .4byte gMonFootprint_Aerodactyl - .4byte gMonFootprint_Snorlax - .4byte gMonFootprint_Articuno - .4byte gMonFootprint_Zapdos - .4byte gMonFootprint_Moltres - .4byte gMonFootprint_Dratini - .4byte gMonFootprint_Dragonair - .4byte gMonFootprint_Dragonite - .4byte gMonFootprint_Mewtwo - .4byte gMonFootprint_Mew - .4byte gMonFootprint_Chikorita - .4byte gMonFootprint_Bayleef - .4byte gMonFootprint_Meganium - .4byte gMonFootprint_Cyndaquil - .4byte gMonFootprint_Quilava - .4byte gMonFootprint_Typhlosion - .4byte gMonFootprint_Totodile - .4byte gMonFootprint_Croconaw - .4byte gMonFootprint_Feraligatr - .4byte gMonFootprint_Sentret - .4byte gMonFootprint_Furret - .4byte gMonFootprint_Hoothoot - .4byte gMonFootprint_Noctowl - .4byte gMonFootprint_Ledyba - .4byte gMonFootprint_Ledian - .4byte gMonFootprint_Spinarak - .4byte gMonFootprint_Ariados - .4byte gMonFootprint_Crobat - .4byte gMonFootprint_Chinchou - .4byte gMonFootprint_Lanturn - .4byte gMonFootprint_Pichu - .4byte gMonFootprint_Cleffa - .4byte gMonFootprint_Igglybuff - .4byte gMonFootprint_Togepi - .4byte gMonFootprint_Togetic - .4byte gMonFootprint_Natu - .4byte gMonFootprint_Xatu - .4byte gMonFootprint_Mareep - .4byte gMonFootprint_Flaaffy - .4byte gMonFootprint_Ampharos - .4byte gMonFootprint_Bellossom - .4byte gMonFootprint_Marill - .4byte gMonFootprint_Azumarill - .4byte gMonFootprint_Sudowoodo - .4byte gMonFootprint_Politoed - .4byte gMonFootprint_Hoppip - .4byte gMonFootprint_Skiploom - .4byte gMonFootprint_Jumpluff - .4byte gMonFootprint_Aipom - .4byte gMonFootprint_Sunkern - .4byte gMonFootprint_Sunflora - .4byte gMonFootprint_Yanma - .4byte gMonFootprint_Wooper - .4byte gMonFootprint_Quagsire - .4byte gMonFootprint_Espeon - .4byte gMonFootprint_Umbreon - .4byte gMonFootprint_Murkrow - .4byte gMonFootprint_Slowking - .4byte gMonFootprint_Misdreavus - .4byte gMonFootprint_Unown - .4byte gMonFootprint_Wobbuffet - .4byte gMonFootprint_Girafarig - .4byte gMonFootprint_Pineco - .4byte gMonFootprint_Forretress - .4byte gMonFootprint_Dunsparce - .4byte gMonFootprint_Gligar - .4byte gMonFootprint_Steelix - .4byte gMonFootprint_Snubbull - .4byte gMonFootprint_Granbull - .4byte gMonFootprint_Qwilfish - .4byte gMonFootprint_Scizor - .4byte gMonFootprint_Shuckle - .4byte gMonFootprint_Heracross - .4byte gMonFootprint_Sneasel - .4byte gMonFootprint_Teddiursa - .4byte gMonFootprint_Ursaring - .4byte gMonFootprint_Slugma - .4byte gMonFootprint_Magcargo - .4byte gMonFootprint_Swinub - .4byte gMonFootprint_Piloswine - .4byte gMonFootprint_Corsola - .4byte gMonFootprint_Remoraid - .4byte gMonFootprint_Octillery - .4byte gMonFootprint_Delibird - .4byte gMonFootprint_Mantine - .4byte gMonFootprint_Skarmory - .4byte gMonFootprint_Houndour - .4byte gMonFootprint_Houndoom - .4byte gMonFootprint_Kingdra - .4byte gMonFootprint_Phanpy - .4byte gMonFootprint_Donphan - .4byte gMonFootprint_Porygon2 - .4byte gMonFootprint_Stantler - .4byte gMonFootprint_Smeargle - .4byte gMonFootprint_Tyrogue - .4byte gMonFootprint_Hitmontop - .4byte gMonFootprint_Smoochum - .4byte gMonFootprint_Elekid - .4byte gMonFootprint_Magby - .4byte gMonFootprint_Miltank - .4byte gMonFootprint_Blissey - .4byte gMonFootprint_Raikou - .4byte gMonFootprint_Entei - .4byte gMonFootprint_Suicune - .4byte gMonFootprint_Larvitar - .4byte gMonFootprint_Pupitar - .4byte gMonFootprint_Tyranitar - .4byte gMonFootprint_Lugia - .4byte gMonFootprint_HoOh - .4byte gMonFootprint_Celebi - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_QuestionMark - .4byte gMonFootprint_Treecko - .4byte gMonFootprint_Grovyle - .4byte gMonFootprint_Sceptile - .4byte gMonFootprint_Torchic - .4byte gMonFootprint_Combusken - .4byte gMonFootprint_Blaziken - .4byte gMonFootprint_Mudkip - .4byte gMonFootprint_Marshtomp - .4byte gMonFootprint_Swampert - .4byte gMonFootprint_Poochyena - .4byte gMonFootprint_Mightyena - .4byte gMonFootprint_Zigzagoon - .4byte gMonFootprint_Linoone - .4byte gMonFootprint_Wurmple - .4byte gMonFootprint_Silcoon - .4byte gMonFootprint_Beautifly - .4byte gMonFootprint_Cascoon - .4byte gMonFootprint_Dustox - .4byte gMonFootprint_Lotad - .4byte gMonFootprint_Lombre - .4byte gMonFootprint_Ludicolo - .4byte gMonFootprint_Seedot - .4byte gMonFootprint_Nuzleaf - .4byte gMonFootprint_Shiftry - .4byte gMonFootprint_Nincada - .4byte gMonFootprint_Ninjask - .4byte gMonFootprint_Shedinja - .4byte gMonFootprint_Taillow - .4byte gMonFootprint_Swellow - .4byte gMonFootprint_Shroomish - .4byte gMonFootprint_Breloom - .4byte gMonFootprint_Spinda - .4byte gMonFootprint_Wingull - .4byte gMonFootprint_Pelipper - .4byte gMonFootprint_Surskit - .4byte gMonFootprint_Masquerain - .4byte gMonFootprint_Wailmer - .4byte gMonFootprint_Wailord - .4byte gMonFootprint_Skitty - .4byte gMonFootprint_Delcatty - .4byte gMonFootprint_Kecleon - .4byte gMonFootprint_Baltoy - .4byte gMonFootprint_Claydol - .4byte gMonFootprint_Nosepass - .4byte gMonFootprint_Torkoal - .4byte gMonFootprint_Sableye - .4byte gMonFootprint_Barboach - .4byte gMonFootprint_Whiscash - .4byte gMonFootprint_Luvdisc - .4byte gMonFootprint_Corphish - .4byte gMonFootprint_Crawdaunt - .4byte gMonFootprint_Feebas - .4byte gMonFootprint_Milotic - .4byte gMonFootprint_Carvanha - .4byte gMonFootprint_Sharpedo - .4byte gMonFootprint_Trapinch - .4byte gMonFootprint_Vibrava - .4byte gMonFootprint_Flygon - .4byte gMonFootprint_Makuhita - .4byte gMonFootprint_Hariyama - .4byte gMonFootprint_Electrike - .4byte gMonFootprint_Manectric - .4byte gMonFootprint_Numel - .4byte gMonFootprint_Camerupt - .4byte gMonFootprint_Spheal - .4byte gMonFootprint_Sealeo - .4byte gMonFootprint_Walrein - .4byte gMonFootprint_Cacnea - .4byte gMonFootprint_Cacturne - .4byte gMonFootprint_Snorunt - .4byte gMonFootprint_Glalie - .4byte gMonFootprint_Lunatone - .4byte gMonFootprint_Solrock - .4byte gMonFootprint_Azurill - .4byte gMonFootprint_Spoink - .4byte gMonFootprint_Grumpig - .4byte gMonFootprint_Plusle - .4byte gMonFootprint_Minun - .4byte gMonFootprint_Mawile - .4byte gMonFootprint_Meditite - .4byte gMonFootprint_Medicham - .4byte gMonFootprint_Swablu - .4byte gMonFootprint_Altaria - .4byte gMonFootprint_Wynaut - .4byte gMonFootprint_Duskull - .4byte gMonFootprint_Dusclops - .4byte gMonFootprint_Roselia - .4byte gMonFootprint_Slakoth - .4byte gMonFootprint_Vigoroth - .4byte gMonFootprint_Slaking - .4byte gMonFootprint_Gulpin - .4byte gMonFootprint_Swalot - .4byte gMonFootprint_Tropius - .4byte gMonFootprint_Whismur - .4byte gMonFootprint_Loudred - .4byte gMonFootprint_Exploud - .4byte gMonFootprint_Clamperl - .4byte gMonFootprint_Huntail - .4byte gMonFootprint_Gorebyss - .4byte gMonFootprint_Absol - .4byte gMonFootprint_Shuppet - .4byte gMonFootprint_Banette - .4byte gMonFootprint_Seviper - .4byte gMonFootprint_Zangoose - .4byte gMonFootprint_Relicanth - .4byte gMonFootprint_Aron - .4byte gMonFootprint_Lairon - .4byte gMonFootprint_Aggron - .4byte gMonFootprint_Castform - .4byte gMonFootprint_Volbeat - .4byte gMonFootprint_Illumise - .4byte gMonFootprint_Lileep - .4byte gMonFootprint_Cradily - .4byte gMonFootprint_Anorith - .4byte gMonFootprint_Armaldo - .4byte gMonFootprint_Ralts - .4byte gMonFootprint_Kirlia - .4byte gMonFootprint_Gardevoir - .4byte gMonFootprint_Bagon - .4byte gMonFootprint_Shelgon - .4byte gMonFootprint_Salamence - .4byte gMonFootprint_Beldum - .4byte gMonFootprint_Metang - .4byte gMonFootprint_Metagross - .4byte gMonFootprint_Regirock - .4byte gMonFootprint_Regice - .4byte gMonFootprint_Registeel - .4byte gMonFootprint_Kyogre - .4byte gMonFootprint_Groudon - .4byte gMonFootprint_Rayquaza - .4byte gMonFootprint_Latias - .4byte gMonFootprint_Latios - .4byte gMonFootprint_Jirachi - .4byte gMonFootprint_Deoxys - .4byte gMonFootprint_Chimecho - .4byte gMonFootprint_Bulbasaur diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc index dfe6d84e0..b59eb456a 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc @@ -1,6 +1,6 @@ AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index 5b3941dd2..0cec9f04e 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -4,24 +4,24 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1 AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 lock faceplayer - checkflag FLAG_0x126 + checkflag FLAG_TRADED_SCANNER_TO_STERN goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 goto_eq AbandonedShip_CaptainsOffice_EventScript_238810 - checkflag FLAG_0x436 + checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A - msgbox AbandonedShip_CaptainsOffice_Text_238824, 4 + msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT release end AbandonedShip_CaptainsOffice_EventScript_238810:: @ 8238810 - msgbox AbandonedShip_CaptainsOffice_Text_23889D, 4 + msgbox AbandonedShip_CaptainsOffice_Text_23889D, MSGBOX_DEFAULT release end AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A - msgbox AbandonedShip_CaptainsOffice_Text_238918, 4 + msgbox AbandonedShip_CaptainsOffice_Text_238918, MSGBOX_DEFAULT release end diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 39c7861a1..348e3f6fd 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -2,12 +2,12 @@ AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4 .byte 0 AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5 - msgbox AbandonedShip_Corridors_1F_Text_237A60, 2 + msgbox AbandonedShip_Corridors_1F_Text_237A60, MSGBOX_NPC end AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE - trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 - msgbox AbandonedShip_Corridors_1F_Text_237A1B, 6 + trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 + msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE end AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5 @@ -24,4 +24,3 @@ AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60 .string "Isn’t it fun here?\n" .string "I get excited just being here!$" - diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index f19dfe322..9cf3ca04a 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -23,7 +23,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5 return AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF - msgbox AbandonedShip_Corridors_B1F_Text_237F03, 2 + msgbox AbandonedShip_Corridors_B1F_Text_237F03, MSGBOX_NPC end AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 @@ -33,7 +33,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 checkitem ITEM_STORAGE_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4 + msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_0x0EF @@ -43,18 +43,18 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 end AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F15, 4 + msgbox AbandonedShip_Corridors_B1F_Text_237F15, MSGBOX_DEFAULT releaseall end AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09 - msgbox AbandonedShip_Corridors_B1F_Text_237FA5, 4 + msgbox AbandonedShip_Corridors_B1F_Text_237FA5, MSGBOX_DEFAULT releaseall end AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13 - trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 - msgbox AbandonedShip_Corridors_B1F_Text_237E92, 6 + trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 + msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE end AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index 2cd278f91..e3c3ced5c 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -65,7 +65,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 checkitem ITEM_ROOM_1_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_0x0F0 @@ -81,7 +81,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 checkitem ITEM_ROOM_2_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_0x0F1 @@ -97,7 +97,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 checkitem ITEM_ROOM_4_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_0x0F2 @@ -113,7 +113,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE checkitem ITEM_ROOM_6_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_0x0F3 @@ -123,27 +123,27 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE end AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D - msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index 07dd3558b..b2cf9b11b 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -1,8 +1,8 @@ AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @@ -16,10 +16,10 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 - bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, 31 - bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, 32 - bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, 33 - bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, 34 + bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY + bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY + bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY + bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 628c9cece..2cc0806ec 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -138,7 +138,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3 AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3 lockall - msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, 4 + msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc index f3a1d3327..bd882d6d8 100644 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ b/data/maps/AbandonedShip_Room_B1F/events.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F_EventObjects: @ 853697C - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 AbandonedShip_Room_B1F_MapWarps: @ 8536994 warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc index 34fdb9fd7..6e4b9b280 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc @@ -1,7 +1,7 @@ AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index 2ffe3afc7..981b62c36 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -2,59 +2,53 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 .byte 0 AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 - trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 + trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 - msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4 + msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT release end AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 - setvar VAR_0x8004, 642 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 642 - callstd 8 + msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT + register_matchcall TRAINER_KIRA_AND_DAN_1 release end AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 - trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 - msgbox AbandonedShip_Rooms2_1F_Text_238491, 6 + trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 + msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B - trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B + trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 - msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4 + msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT release end AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 - setvar VAR_0x8004, 642 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 642 - callstd 8 + msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT + register_matchcall TRAINER_KIRA_AND_DAN_1 release end AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154 - trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 - msgbox AbandonedShip_Rooms2_1F_Text_23860B, 6 + trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 + msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F - trainerbattle 0, TRAINER_JANI, 0, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 - msgbox AbandonedShip_Rooms2_1F_Text_238708, 6 + trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 + msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186 - trainerbattle 0, TRAINER_GARRISON, 0, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 - msgbox AbandonedShip_Rooms2_1F_Text_2387A9, 6 + trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 + msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D @@ -155,4 +149,3 @@ AbandonedShip_Rooms2_1F_Text_238779: @ 8238779 AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9 .string "In a cabin somewhere on board,\n" .string "I saw something sparkle.$" - diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc index 05d48a618..3bb29619a 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc index 00b3d0fb9..0a3671f04 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc @@ -2,7 +2,7 @@ AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024 .byte 0 AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025 - msgbox AbandonedShip_Rooms2_B1F_Text_23802E, 2 + msgbox AbandonedShip_Rooms2_B1F_Text_23802E, MSGBOX_NPC end AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc index 3b6fc136e..f0322558b 100644 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_1F_EventObjects: @ 8536764 object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index 2a6bc36b6..055cf140b 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -2,37 +2,34 @@ AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92 .byte 0 AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93 - msgbox AbandonedShip_Rooms_1F_Text_237B15, 2 + msgbox AbandonedShip_Rooms_1F_Text_237B15, MSGBOX_NPC end AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C - trainerbattle 0, TRAINER_DEMETRIUS, 0, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A - msgbox AbandonedShip_Rooms_1F_Text_237D41, 6 + trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A + msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 - trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF + trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE - msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4 + msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT release end AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF special sub_80B4808 waitmovement 0 - msgbox AbandonedShip_Rooms_1F_Text_237C2A, 4 - setvar VAR_0x8004, 144 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 144 - callstd 8 + msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT + register_matchcall TRAINER_THALIA_1 release end AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE - trainerbattle 5, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 - msgbox AbandonedShip_Rooms_1F_Text_237CC9, 6 + trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 + msgbox AbandonedShip_Rooms_1F_Text_237CC9, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms_1F_Text_237B15: @ 8237B15 diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc index 97a8aa246..4af246e5c 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index d4a5c9233..d2937cd2d 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD end AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 - msgbox AbandonedShip_Rooms_B1F_Text_237FCF, 2 + msgbox AbandonedShip_Rooms_B1F_Text_237FCF, MSGBOX_NPC end AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index 207744c30..3e784dea2 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -1,5 +1,5 @@ AncientTomb_EventObjects: @ 8536CDC - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937 + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL AncientTomb_MapWarps: @ 8536CF4 warp_def 8, 29, 3, 0, MAP_ROUTE120 diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 9dbacfe8e..f3c42b690 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -23,7 +23,7 @@ AncientTomb_MapScript1_238FE1: @ 8238FE1 end AncientTomb_EventScript_238FEE:: @ 8238FEE - clearflag FLAG_0x3A9 + clearflag FLAG_HIDE_REGISTEEL return AncientTomb_MapScript1_238FF2: @ 8238FF2 @@ -51,7 +51,7 @@ AncientTomb_EventScript_239033:: @ 8239033 end AncientTomb_EventScript_239046:: @ 8239046 - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc index ab7c49b30..6a4f0972f 100644 --- a/data/maps/AquaHideout_1F/events.inc +++ b/data/maps/AquaHideout_1F/events.inc @@ -1,7 +1,7 @@ AquaHideout_1F_EventObjects: @ 8535304 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS AquaHideout_1F_MapWarps: @ 853534C warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index 9172c3927..c23b511b4 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -8,17 +8,17 @@ AquaHideout_1F_EventScript_233494:: @ 8233494 goto_eq AquaHideout_1F_EventScript_2334BC checkflag FLAG_0x0D4 goto_eq AquaHideout_1F_EventScript_2334B2 - msgbox AquaHideout_1F_Text_23351D, 4 + msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334B2:: @ 82334B2 - msgbox AquaHideout_1F_Text_2335E3, 4 + msgbox AquaHideout_1F_Text_2335E3, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334BC:: @ 82334BC - msgbox AquaHideout_1F_Text_23367D, 4 + msgbox AquaHideout_1F_Text_23367D, MSGBOX_DEFAULT release end @@ -29,27 +29,27 @@ AquaHideout_1F_EventScript_2334C6:: @ 82334C6 goto_eq AquaHideout_1F_EventScript_2334EE checkflag FLAG_0x0D4 goto_eq AquaHideout_1F_EventScript_2334E4 - msgbox AquaHideout_1F_Text_233739, 4 + msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334E4:: @ 82334E4 - msgbox AquaHideout_1F_Text_2337FA, 4 + msgbox AquaHideout_1F_Text_2337FA, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334EE:: @ 82334EE - msgbox AquaHideout_1F_Text_233884, 4 + msgbox AquaHideout_1F_Text_233884, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334F8:: @ 82334F8 - trainerbattle 2, TRAINER_GRUNT_1, 0, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 - msgbox AquaHideout_1F_Text_233977, 6 + trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 + msgbox AquaHideout_1F_Text_233977, MSGBOX_AUTOCLOSE end AquaHideout_1F_EventScript_233513:: @ 8233513 - msgbox AquaHideout_1F_Text_233977, 4 + msgbox AquaHideout_1F_Text_233977, MSGBOX_DEFAULT release end diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc index bbada49f8..6dd83aebf 100644 --- a/data/maps/AquaHideout_B1F/events.inc +++ b/data/maps/AquaHideout_B1F/events.inc @@ -1,13 +1,13 @@ AquaHideout_B1F_EventObjects: @ 8535378 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS AquaHideout_B1F_MapWarps: @ 8535450 warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 12c25faac..2073dea29 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -23,11 +23,11 @@ AquaHideout_B1F_MapScript1_2339D0: @ 82339D0 end AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 - clearflag FLAG_0x3D1 + clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 return AquaHideout_B1F_EventScript_2339E7:: @ 82339E7 - clearflag FLAG_0x3D2 + clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 return AquaHideout_B1F_EventScript_2339EB:: @ 82339EB @@ -85,35 +85,35 @@ AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C end AquaHideout_B1F_EventScript_233A85:: @ 8233A85 - trainerbattle 2, TRAINER_GRUNT_2, 0, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 - msgbox AquaHideout_B1F_Text_233B5E, 6 + trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 + msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0 special sub_80B4808 waitmovement 0 - msgbox AquaHideout_B1F_Text_233B5E, 4 + msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_DEFAULT release end AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0 - trainerbattle 2, TRAINER_GRUNT_3, 0, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB - msgbox AquaHideout_B1F_Text_233C41, 6 + trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB + msgbox AquaHideout_B1F_Text_233C41, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB - msgbox AquaHideout_B1F_Text_233C41, 4 + msgbox AquaHideout_B1F_Text_233C41, MSGBOX_DEFAULT release end AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5 - trainerbattle 0, TRAINER_GRUNT_21, 0, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA - msgbox AquaHideout_B1F_Text_233CDC, 6 + trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA + msgbox AquaHideout_B1F_Text_233CDC, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC - trainerbattle 0, TRAINER_GRUNT_25, 0, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E - msgbox AquaHideout_B1F_Text_233D84, 6 + trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E + msgbox AquaHideout_B1F_Text_233D84, MSGBOX_AUTOCLOSE end AquaHideout_B1F_Text_233B03: @ 8233B03 diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index 09846d401..552a95ad4 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -1,10 +1,10 @@ AquaHideout_B2F_EventObjects: @ 853552C - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072 - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 943 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS AquaHideout_B2F_MapWarps: @ 85355BC warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index fd3868512..a2bd702e6 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -24,8 +24,8 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 end AquaHideout_B2F_EventScript_233E09:: @ 8233E09 - trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 - msgbox AquaHideout_B2F_Text_233FF2, 4 + trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 + msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT release end @@ -37,7 +37,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25 delay 20 applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E waitmovement 0 - msgbox AquaHideout_B2F_Text_233FA6, 4 + msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 @@ -46,9 +46,9 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25 delay 20 applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E waitmovement 0 - msgbox AquaHideout_B2F_Text_233FF2, 4 + msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT setflag FLAG_0x070 - setflag FLAG_0x354 + setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS release end @@ -67,23 +67,23 @@ AquaHideout_B2F_Movement_233E85: @ 8233E85 step_end AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A - trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 - msgbox AquaHideout_B2F_Text_234112, 6 + trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 + msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE end AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5 - msgbox AquaHideout_B2F_Text_234112, 4 + msgbox AquaHideout_B2F_Text_234112, MSGBOX_DEFAULT release end AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF - trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE - msgbox AquaHideout_B2F_Text_2341FE, 6 + trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE + msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE end AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6 - trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC - msgbox AquaHideout_B2F_Text_2342FF, 6 + trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC + msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE end AquaHideout_B2F_Text_233EDD: @ 8233EDD diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc index 7f7405a55..30f920220 100644 --- a/data/maps/ArtisanCave_1F/events.inc +++ b/data/maps/ArtisanCave_1F/events.inc @@ -1,5 +1,5 @@ ArtisanCave_1F_EventObjects: @ 8537774 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS ArtisanCave_1F_MapWarps: @ 853778C warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc index 5b47d72a5..9df844aa3 100644 --- a/data/maps/ArtisanCave_B1F/events.inc +++ b/data/maps/ArtisanCave_B1F/events.inc @@ -1,15 +1,15 @@ ArtisanCave_B1F_EventObjects: @ 8537708 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP ArtisanCave_B1F_MapWarps: @ 8537720 warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F ArtisanCave_B1F_MapBGEvents: @ 8537730 - bg_hidden_item_event 32, 29, 0, ITEM_ZINC, 102 - bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, 101 - bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, 103 - bg_hidden_item_event 19, 43, 0, ITEM_IRON, 104 + bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC + bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM + bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN + bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON ArtisanCave_B1F_MapEvents:: @ 8537760 map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 076eeab6e..60329d24f 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 @@ -64,7 +64,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 waitmovement 0 @@ -73,8 +73,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E waitse waitmovement 0 setvar VAR_0x8004, 6 - special sub_81A5238 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, 4 + special CallBattleArenaFunction + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, MSGBOX_DEFAULT closemessage applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 waitmovement 0 @@ -82,14 +82,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 waitmovement 0 setvar VAR_0x8004, 5 - special sub_8195960 - msgbox 0x2021fc4, 4 + special CallBattlePalaceFunction + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C switch VAR_RESULT @@ -105,14 +105,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB waitse waitmovement 0 setvar VAR_0x8004, 6 - special sub_81A5238 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, 4 + special CallBattleArenaFunction + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, MSGBOX_DEFAULT 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 @@ -135,25 +135,25 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, MSGBOX_DEFAULT special LoadPlayerParty 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 @@ -199,7 +199,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0 goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, 5 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A @@ -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 @@ -266,18 +266,18 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A waitmessage setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 - special sub_81A5238 + special CallBattleArenaFunction playse SE_SAVE waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 @@ -311,7 +311,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE4 waitmovement 0 @@ -319,7 +319,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, MSGBOX_DEFAULT closemessage addobject 7 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF4 @@ -332,24 +332,24 @@ 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 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT 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 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, MSGBOX_DEFAULT closemessage applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C @@ -358,42 +358,42 @@ 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 waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleArenaBattleRoom_Text_25819C waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, MSGBOX_DEFAULT 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 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT 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 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, MSGBOX_DEFAULT closemessage applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 @@ -402,23 +402,23 @@ 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 waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleArenaBattleRoom_Text_25835B waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E:: @ 8257B5E - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C return @@ -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 @@ -451,7 +451,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 playse SE_BAN waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, MSGBOX_DEFAULT closemessage call BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA return diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index a353379c2..5ffb5de3d 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -14,7 +14,7 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 waitmovement 0 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444 waitmovement 0 - msgbox BattleFrontier_BattleArenaCorridor_Text_257449, 3 + msgbox BattleFrontier_BattleArenaCorridor_Text_257449, MSGBOX_SIGN applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446 waitmovement 0 applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 9ef9a2812..406d9f37d 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -22,25 +22,25 @@ 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 lockall - msgbox BattleFrontier_BattleArenaLobby_Text_256811, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256811, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A5238 + special CallBattleArenaFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A5238 + special CallBattleArenaFunction 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,24 +48,24 @@ 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 + msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0 - msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, MSGBOX_DEFAULT BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8 - msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_257353, MSGBOX_DEFAULT setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9 message BattleFrontier_BattleArenaLobby_Text_256931 waitmessage call BattleFrontier_BattleArenaLobby_EventScript_255D59 - msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256A74, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -78,9 +78,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A5238 + special CallBattleArenaFunction call BattleFrontier_BattleArenaLobby_EventScript_255D59 - msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256A74, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -88,12 +88,12 @@ 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 setvar VAR_0x8005, 0 - special sub_81A5238 + special CallBattleArenaFunction playse SE_SAVE waitse call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 @@ -119,13 +119,13 @@ BattleFrontier_BattleArenaLobby_EventScript_255DC0:: @ 8255DC0 waitmessage setvar VAR_0x8004, 3 setvar VAR_0x8005, 1 - special sub_81A5238 + special CallBattleArenaFunction playse SE_SAVE waitse 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 @@ -135,7 +135,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 setvar VAR_FRONTIER_FACILITY, 3 setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty - msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256166, MSGBOX_DEFAULT BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B message BattleFrontier_BattleArenaLobby_Text_2561EA @@ -155,14 +155,14 @@ 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 - msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleArenaLobby_Text_256573, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleArenaLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -171,7 +171,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 - msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, 5 + msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8 case 1, BattleFrontier_BattleArenaLobby_EventScript_255EE8 @@ -181,21 +181,21 @@ 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 + special CallBattleArenaFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 - special sub_81A5238 + special CallBattleArenaFunction 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 - msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, MSGBOX_DEFAULT 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 @@ -224,7 +224,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 end BattleFrontier_BattleArenaLobby_EventScript_255F9F:: @ 8255F9F - msgbox BattleFrontier_BattleArenaLobby_Text_25624C, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_25624C, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_255E0B BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC @@ -233,25 +233,25 @@ BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC case 1, BattleFrontier_BattleArenaLobby_EventScript_255FD4 BattleFrontier_BattleArenaLobby_EventScript_255FC7:: @ 8255FC7 - msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_256003 BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4 - msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_256003 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 special LoadPlayerParty BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB - msgbox BattleFrontier_BattleArenaLobby_Text_25621F, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_25621F, MSGBOX_DEFAULT BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003 release @@ -346,31 +346,31 @@ BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 lockall setvar VAR_0x8004, 7 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall end BattleFrontier_BattleArenaLobby_EventScript_2560A6:: @ 82560A6 - msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560AF:: @ 82560AF - msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560B8:: @ 82560B8 - msgbox BattleFrontier_BattleArenaLobby_Text_256C19, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256C19, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560C1:: @ 82560C1 - msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560CA:: @ 82560CA lockall - msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end @@ -388,22 +388,22 @@ BattleFrontier_BattleArenaLobby_EventScript_2560D9:: @ 82560D9 end BattleFrontier_BattleArenaLobby_EventScript_25612C:: @ 825612C - msgbox BattleFrontier_BattleArenaLobby_Text_256E02, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256E02, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end BattleFrontier_BattleArenaLobby_EventScript_25613A:: @ 825613A - msgbox BattleFrontier_BattleArenaLobby_Text_256F43, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256F43, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end BattleFrontier_BattleArenaLobby_EventScript_256148:: @ 8256148 - msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end BattleFrontier_BattleArenaLobby_EventScript_256156:: @ 8256156 - msgbox BattleFrontier_BattleArenaLobby_Text_257202, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_257202, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 3d5704dba..c8338d110 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 @@ -46,7 +46,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, MSGBOX_DEFAULT closemessage showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM compare VAR_TEMP_F, 3 @@ -73,7 +73,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 4 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, MSGBOX_DEFAULT closemessage applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789 @@ -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, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 5 special CallBattleDomeFunction @@ -94,7 +94,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_TEMP_2, 1 BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, MSGBOX_DEFAULT closemessage playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E @@ -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,14 +196,14 @@ 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 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96:: @ 824BF96 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, MSGBOX_DEFAULT BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E special sub_8175280 @@ -213,15 +213,15 @@ 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 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 @@ -340,11 +340,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C151:: @ 824C151 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C158:: @ 824C158 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C161:: @ 824C161 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A:: @ 824C16A @@ -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 @@ -390,11 +390,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC:: @ 824C1FC - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C211 BattleFrontier_BattleDomeBattleRoom_EventScript_24C209:: @ 824C209 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, MSGBOX_DEFAULT BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 closemessage @@ -428,83 +428,83 @@ 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 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, MSGBOX_DEFAULT call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400 switch VAR_RESULT case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT setvar VAR_0x8004, 12 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 applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, MSGBOX_DEFAULT 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 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, MSGBOX_DEFAULT call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400 switch VAR_RESULT case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT setvar VAR_0x8004, 12 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 applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleDomeBattleRoom_Text_24D522 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, MSGBOX_DEFAULT closemessage applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C787 applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C829 @@ -513,7 +513,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C420:: @ 824C420 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, MSGBOX_DEFAULT playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E waitse @@ -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..f66674444 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -29,12 +29,12 @@ 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 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -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,28 +60,28 @@ 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 + msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1 - msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, MSGBOX_DEFAULT BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 - msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, MSGBOX_DEFAULT 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 @@ -100,15 +100,15 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, MSGBOX_DEFAULT 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, 1 setvar VAR_0x8006, 0 @@ -141,7 +141,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4 call BattleFrontier_BattleDomeLobby_EventScript_23E8B4 BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9 - msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -149,7 +149,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9 BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT message BattleFrontier_BattleDomeLobby_Text_24A61A waitmessage setvar VAR_0x8004, 13 @@ -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,14 +208,14 @@ 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 - msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleDomeLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -224,7 +224,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 - msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, 5 + msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61 case 1, BattleFrontier_BattleDomeLobby_EventScript_249B60 @@ -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,10 +259,10 @@ 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 + msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT closemessage call BattleFrontier_BattleDomeLobby_EventScript_249C6E special HealPlayerParty @@ -284,25 +284,25 @@ BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15 case 1, BattleFrontier_BattleDomeLobby_EventScript_249C3D BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30 - msgbox BattleFrontier_BattleDomeLobby_Text_24A353, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A353, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249C6C BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D - msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249C6C 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 special LoadPlayerParty BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64 - msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C release @@ -350,11 +350,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249CF5:: @ 8249CF5 return BattleFrontier_BattleDomeLobby_EventScript_249CFD:: @ 8249CFD - msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D06:: @ 8249D06 - msgbox BattleFrontier_BattleDomeLobby_Text_24A664, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A664, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D0F:: @ 8249D0F @@ -366,11 +366,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249D15:: @ 8249D15 return BattleFrontier_BattleDomeLobby_EventScript_249D1B:: @ 8249D1B - msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D24:: @ 8249D24 - msgbox BattleFrontier_BattleDomeLobby_Text_24A721, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A721, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D2D:: @ 8249D2D @@ -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 @@ -449,56 +449,54 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 end BattleFrontier_BattleDomeLobby_EventScript_249DC9:: @ 8249DC9 - msgbox BattleFrontier_BattleDomeLobby_Text_24A966, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24A966, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DD2:: @ 8249DD2 - msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DDB:: @ 8249DDB - msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4 - msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED setvar VAR_0x8004, 20 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249DFE:: @ 8249DFE - msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249E07:: @ 8249E07 - msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10 - msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_249E19:: @ 8249E19 - msgbox BattleFrontier_OutsideWest_Text_24AB06, 2 + msgbox BattleFrontier_OutsideWest_Text_24AB06, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_249E22:: @ 8249E22 - loadword 0, BattleFrontier_OutsideWest_Text_24AB44 - callstd 2 + msgbox BattleFrontier_OutsideWest_Text_24AB44, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_249E2B:: @ 8249E2B - loadword 0, BattleFrontier_OutsideWest_Text_24AB75 - callstd 2 + msgbox BattleFrontier_OutsideWest_Text_24AB75, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end @@ -515,17 +513,17 @@ BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43 end BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B - msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end BattleFrontier_BattleDomeLobby_EventScript_249E99:: @ 8249E99 - msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end BattleFrontier_BattleDomeLobby_EventScript_249EA7:: @ 8249EA7 - msgbox BattleFrontier_BattleDomeLobby_Text_24B073, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24B073, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index e004eafac..ee23f919e 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 @@ -69,7 +69,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, 5 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB @@ -100,11 +100,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 6 special CallBattleDomeFunction @@ -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 @@ -131,19 +131,19 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449:: @ 824B449 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452:: @ 824B452 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B:: @ 824B45B - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464:: @ 824B464 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D @@ -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 @@ -167,7 +167,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D special CallBattleDomeFunction setvar VAR_0x8004, 9 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F waitmovement 0 @@ -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 @@ -219,34 +219,34 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, 4 - setflag FLAG_0x001 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, MSGBOX_DEFAULT + setflag FLAG_TEMP_1 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0 - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, 4 - setflag FLAG_0x001 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, MSGBOX_DEFAULT + setflag FLAG_TEMP_1 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 setvar VAR_TEMP_0, 1 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, MSGBOX_DEFAULT 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 @@ -268,15 +268,15 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634:: @ 824B634 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D:: @ 824B63D - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 2968e2c0f..8e08404cd 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 @@ -51,7 +51,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 .2byte 0 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, MSGBOX_DEFAULT closemessage applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B @@ -69,7 +69,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 waitmovement 0 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 setvar VAR_0x8004, 11 - special sub_81A5E74 + special CallBattleFactoryFunction removeobject 2 setobjectxyperm 2, 7, 1 addobject 2 @@ -80,19 +80,19 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 compare VAR_TEMP_F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C setvar VAR_0x8004, 5 - special sub_8195960 + special CallBattlePalaceFunction lockall - msgbox 0x2021fc4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT 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,21 +102,21 @@ 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 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 - special sub_81A5E74 + special CallBattleFactoryFunction compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 - special sub_81A5E74 + special CallBattleFactoryFunction BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E:: @ 825AF3E call BattleFrontier_BattleFactoryBattleRoom_EventScript_241EBA @@ -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,16 +150,16 @@ 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 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C @@ -167,10 +167,10 @@ 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 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 @@ -179,23 +179,23 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, MSGBOX_DEFAULT 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 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B @@ -203,10 +203,10 @@ 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 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, MSGBOX_DEFAULT waitmessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 @@ -215,8 +215,8 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 @@ -224,38 +224,38 @@ 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 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 - special sub_81A5E74 + special CallBattleFactoryFunction compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A5E74 + special CallBattleFactoryFunction compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A5E74 + special CallBattleFactoryFunction 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..0c6c35071 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -22,31 +22,31 @@ 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 lockall - msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 8 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A5E74 + special CallBattleFactoryFunction 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,30 +54,30 @@ 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 + msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6 BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD - msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, MSGBOX_DEFAULT waitmessage BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6 - msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, MSGBOX_DEFAULT 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 - special sub_81A5E74 + special CallBattleFactoryFunction playse SE_SAVE waitse goto BattleFrontier_BattleFactoryLobby_EventScript_25853B @@ -88,15 +88,15 @@ 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 setvar VAR_0x8006, 0 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 - special sub_81A5E74 + special CallBattleFactoryFunction playse SE_SAVE waitse @@ -116,7 +116,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D call BattleFrontier_BattleFactoryLobby_EventScript_23E8B4 BattleFrontier_BattleFactoryLobby_EventScript_258582:: @ 8258582 - msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -128,13 +128,13 @@ BattleFrontier_BattleFactoryLobby_EventScript_258592:: @ 8258592 waitmessage setvar VAR_0x8004, 3 setvar VAR_0x8005, 1 - special sub_81A5E74 + special CallBattleFactoryFunction playse SE_SAVE waitse 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,8 +183,8 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A1780 - msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A case 1, BattleFrontier_BattleFactoryLobby_EventScript_2586B9 @@ -193,19 +193,19 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 0 - special sub_81A5E74 + special CallBattleFactoryFunction 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 - special sub_81A5E74 + special CallBattleFactoryFunction 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 @@ -216,7 +216,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A special SavePlayerParty - msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT closemessage compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C @@ -249,14 +249,14 @@ 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 special LoadPlayerParty BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D - msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, MSGBOX_DEFAULT release end @@ -275,11 +275,11 @@ BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC step_end BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1 - msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587BA:: @ 82587BA - msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587C3:: @ 82587C3 @@ -291,11 +291,11 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587C9:: @ 82587C9 return BattleFrontier_BattleFactoryLobby_EventScript_2587CF:: @ 82587CF - msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8 - msgbox BattleFrontier_BattleFactoryLobby_Text_259058, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259058, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 @@ -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,33 +314,33 @@ 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 end BattleFrontier_BattleFactoryLobby_EventScript_258813:: @ 8258813 - msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, 2 + msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, MSGBOX_NPC end BattleFrontier_BattleFactoryLobby_EventScript_25881C:: @ 825881C - msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, 2 + msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, MSGBOX_NPC end BattleFrontier_BattleFactoryLobby_EventScript_258825:: @ 8258825 lock - msgbox BattleFrontier_BattleFactoryLobby_Text_259547, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259547, MSGBOX_DEFAULT release end BattleFrontier_BattleFactoryLobby_EventScript_258830:: @ 8258830 - msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, 2 + msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, MSGBOX_NPC end BattleFrontier_BattleFactoryLobby_EventScript_258839:: @ 8258839 lockall - msgbox BattleFrontier_BattleFactoryLobby_Text_259721, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259721, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end @@ -359,27 +359,27 @@ BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588A6:: @ 82588A6 - msgbox BattleFrontier_BattleFactoryLobby_Text_259766, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259766, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588B4:: @ 82588B4 - msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588C2:: @ 82588C2 - msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588D0:: @ 82588D0 - msgbox BattleFrontier_BattleFactoryLobby_Text_259920, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259920, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588DE:: @ 82588DE - msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index e05c49885..e41efdc85 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -32,27 +32,27 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 compare VAR_0x8006, 2 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 setvar VAR_0x8004, 13 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 12 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 14 - special sub_81A5E74 + special CallBattleFactoryFunction setorcopyvar VAR_0x8005, VAR_RESULT setvar VAR_0x8004, 15 - special sub_81A5E74 + special CallBattleFactoryFunction setorcopyvar VAR_0x8006, VAR_RESULT call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 8 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 6 - special sub_81A5E74 + special CallBattleFactoryFunction waitstate BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, MSGBOX_DEFAULT closemessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7 compare VAR_RESULT, 0 @@ -66,28 +66,28 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 setvar VAR_0x8004, 9 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 16 - special sub_81A5E74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4 + special CallBattleFactoryFunction + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 playse 263 waitse - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF waitmovement 0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3 waitmovement 0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, MSGBOX_DEFAULT closemessage delay 16 goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 @@ -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 @@ -148,7 +148,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, 5 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47 @@ -165,16 +165,16 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98 setvar VAR_0x8004, 12 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 14 - special sub_81A5E74 + special CallBattleFactoryFunction setorcopyvar VAR_0x8005, VAR_RESULT setvar VAR_0x8004, 15 - special sub_81A5E74 + special CallBattleFactoryFunction setorcopyvar VAR_0x8006, VAR_RESULT call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 @@ -183,13 +183,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 fadescreen 1 setvar VAR_0x8004, 7 - special sub_81A5E74 + special CallBattleFactoryFunction waitstate compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 setvar VAR_0x8004, 8 - special sub_81A5E74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, 4 + special CallBattleFactoryFunction + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D:: @ 8259E1D @@ -227,28 +227,28 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47 waitmessage setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 - special sub_81A5E74 + special CallBattleFactoryFunction playse SE_SAVE waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 special SavePlayerParty setvar VAR_0x8004, 10 setvar VAR_0x8005, 0 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc special CalculatePlayerPartyCount goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT compare VAR_0x8005, 0 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 compare VAR_0x8005, 1 @@ -288,75 +288,75 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B:: @ 8259F6B - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74:: @ 8259F74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D:: @ 8259F7D - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86:: @ 8259F86 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F:: @ 8259F8F - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98:: @ 8259F98 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1:: @ 8259FA1 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA:: @ 8259FAA - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3:: @ 8259FB3 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC:: @ 8259FBC - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5:: @ 8259FC5 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE:: @ 8259FCE - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7:: @ 8259FD7 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0:: @ 8259FE0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9:: @ 8259FE9 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2:: @ 8259FF2 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 @@ -381,39 +381,39 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6, 4 + msgbox Text_StyleUnrestrained, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071:: @ 825A071 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE, 4 + msgbox Text_StyleTotalPreparation, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A:: @ 825A07A - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9, 4 + msgbox Text_StyleSlowAndSteady, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083:: @ 825A083 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912, 4 + msgbox Text_StyleEndurance, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C:: @ 825A08C - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C, 4 + msgbox Text_StyleHighRisk, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095:: @ 825A095 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16, 4 + msgbox Text_StyleWeakenFoe, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E:: @ 825A09E - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7, 4 + msgbox Text_StyleImpossibleToPredict, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7:: @ 825A0A7 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C, 4 + msgbox Text_StyleDependsOnFlow, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0:: @ 825A0B0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A, 4 + msgbox Text_StyleFlexible, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 @@ -439,8 +439,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110:: @ 825A110 case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, 4 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 @@ -642,39 +642,39 @@ BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893: @ 825A893 .string "The TRAINER appears to have no clear\n" .string "favorites when it comes to type.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A8D9: @ 825A8D9 +Text_StyleSlowAndSteady: @ 825A8D9 .string "The favorite battle style appears to\n" .string "be slow and steady.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A912: @ 825A912 +Text_StyleEndurance: @ 825A912 .string "The favorite battle style appears to\n" .string "be one of endurance.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A94C: @ 825A94C +Text_StyleHighRisk: @ 825A94C .string "The favorite battle style appears to\n" .string "be high risk, high return.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A98C: @ 825A98C +Text_StyleDependsOnFlow: @ 825A98C .string "The favorite battle style appears to\n" .string "depend on the battle’s flow.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25A9CE: @ 825A9CE +Text_StyleTotalPreparation: @ 825A9CE .string "The favorite battle style appears to\n" .string "be one based on total preparation.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA16: @ 825AA16 +Text_StyleWeakenFoe: @ 825AA16 .string "The favorite battle style appears\n" .string "to be weakening the foe to start.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AA5A: @ 825AA5A +Text_StyleFlexible: @ 825AA5A .string "The favorite battle style appears to\n" .string "be flexibly adaptable to the situation.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAA7: @ 825AAA7 +Text_StyleImpossibleToPredict: @ 825AAA7 .string "The favorite battle style appears to\n" .string "be impossible to predict.$" -BattleFrontier_BattleFactoryPreBattleRoom_Text_25AAE6: @ 825AAE6 +Text_StyleUnrestrained: @ 825AAE6 .string "The favorite battle style appears to\n" .string "be free-spirited and unrestrained.$" diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 372b5da76..2b8f8d763 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 @@ -60,8 +60,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1 waitmovement 0 setvar VAR_0x8004, 5 - special sub_8195960 - msgbox 0x2021fc4, 4 + special CallBattlePalaceFunction + msgbox gStringVar4, MSGBOX_DEFAULT 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 @@ -92,25 +92,25 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty 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 @@ -156,7 +156,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, 5 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F @@ -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 @@ -189,18 +189,18 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F waitmessage setvar VAR_0x8004, 7 setvar VAR_0x8005, 2 - special sub_8195960 + special CallBattlePalaceFunction playse SE_SAVE waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 @@ -227,7 +227,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 call BattleFrontier_BattlePalaceBattleRoom_EventScript_242170 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 @@ -246,16 +246,16 @@ 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 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, MSGBOX_DEFAULT call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 @@ -263,42 +263,42 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 setvar VAR_0x8004, 6 - special sub_8195960 + special CallBattlePalaceFunction 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 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC 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 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 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 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, MSGBOX_DEFAULT call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 @@ -306,27 +306,27 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 setvar VAR_0x8004, 6 - special sub_8195960 + special CallBattlePalaceFunction 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 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePalaceBattleRoom_Text_250699 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 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7 @@ -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..2af0d954f 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -13,7 +13,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 waitmovement 0 lockall setvar VAR_0x8004, 3 - special sub_8195960 + special CallBattlePalaceFunction compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B compare VAR_RESULT, 1 @@ -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 @@ -60,23 +60,23 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581 end BattleFrontier_BattlePalaceCorridor_EventScript_24F58B:: @ 824F58B - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F594:: @ 824F594 - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F59D:: @ 824F59D - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6:: @ 824F5A6 - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index b86ffa2fb..cf3ecfb14 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -22,25 +22,25 @@ 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 lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_8195960 + special CallBattlePalaceFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_8195960 + special CallBattlePalaceFunction 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,24 +48,24 @@ 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 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D840 BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, MSGBOX_DEFAULT BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9 message BattleFrontier_BattlePalaceLobby_Text_24E4F7 waitmessage call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -78,9 +78,9 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_8195960 + special CallBattlePalaceFunction call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -88,12 +88,12 @@ 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 setvar VAR_0x8005, 0 - special sub_8195960 + special CallBattlePalaceFunction playse SE_SAVE waitse call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 @@ -115,18 +115,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D907:: @ 824D907 BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908 lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, MSGBOX_DEFAULT message BattleFrontier_BattlePalaceLobby_Text_24E5F6 waitmessage setvar VAR_0x8004, 7 setvar VAR_0x8005, 1 - special sub_8195960 + special CallBattlePalaceFunction playse SE_SAVE waitse 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 @@ -149,7 +149,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D956:: @ 824D956 BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - special sub_8195960 + special CallBattlePalaceFunction compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 special SavePlayerParty @@ -179,14 +179,14 @@ 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 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -195,7 +195,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, 5 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DA87 @@ -205,21 +205,21 @@ 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 + special CallBattlePalaceFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 - special sub_8195960 + special CallBattlePalaceFunction 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,8 +232,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, MSGBOX_DEFAULT closemessage call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 @@ -244,11 +244,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 compare VAR_FRONTIER_BATTLE_MODE, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 - msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 BattleFrontier_BattlePalaceLobby_EventScript_24DB38:: @ 824DB38 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45 @@ -257,36 +257,36 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45 case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB6D BattleFrontier_BattlePalaceLobby_EventScript_24DB60:: @ 824DB60 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D - msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C 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 special LoadPlayerParty BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C release end BattleFrontier_BattlePalaceLobby_EventScript_24DB9E:: @ 824DB9E - msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceLobby_EventScript_24DBA7:: @ 824DBA7 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceLobby_EventScript_24DBB0:: @ 824DBB0 @@ -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,31 +375,31 @@ 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 end BattleFrontier_BattlePalaceLobby_EventScript_24DC82:: @ 824DC82 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DC8B:: @ 824DC8B - msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DC94:: @ 824DC94 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DC9D:: @ 824DC9D - msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DCA6:: @ 824DCA6 lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end @@ -418,27 +418,27 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD13:: @ 824DD13 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD21:: @ 824DD21 - msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD2F:: @ 824DD2F - msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD3D:: @ 824DD3D - msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD4B:: @ 824DD4B - msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 23ad26692..0a0df3636 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -12,17 +12,17 @@ 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 + special CallBattlePikeFunction setvar VAR_0x8004, 24 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80B applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 waitmovement 0 lockall - msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, 4 + msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, MSGBOX_DEFAULT closemessage releaseall applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80E @@ -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..278bd0407 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -21,28 +21,28 @@ 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 special HealPlayerParty setvar VAR_0x8004, 27 - special sub_81A703C + special CallBattlePikeFunction lockall - msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 - special sub_81A703C + special CallBattlePikeFunction 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,44 +50,44 @@ 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 + msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattlePikeLobby_EventScript_25B78D BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784 - msgbox BattleFrontier_BattlePikeLobby_Text_25C383, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C383, MSGBOX_DEFAULT waitmessage BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D - msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, MSGBOX_DEFAULT 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 + special CallBattlePikeFunction addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 copyvar VAR_0x8006, VAR_RESULT - special sub_81A703C + special CallBattlePikeFunction special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 27 - special sub_81A703C + special CallBattlePikeFunction message BattleFrontier_BattlePikeLobby_Text_25C1DF waitmessage setvar VAR_0x8004, 8 setvar VAR_0x8005, 0 - special sub_81A703C + special CallBattlePikeFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -98,25 +98,25 @@ 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 - special sub_81A703C + special CallBattlePikeFunction special LoadPlayerParty special HealPlayerParty setvar VAR_0x8004, 27 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 8 setvar VAR_0x8005, 0 - special sub_81A703C + special CallBattlePikeFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -128,7 +128,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868 setvar VAR_FRONTIER_FACILITY, 5 setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty - msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, MSGBOX_DEFAULT BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F message BattleFrontier_BattlePikeLobby_Text_25BBC1 @@ -148,14 +148,14 @@ 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 - msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePikeLobby_Text_25C094, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattlePikeLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -164,7 +164,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 - msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, 5 + msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73 case 1, BattleFrontier_BattlePikeLobby_EventScript_25B95C @@ -175,40 +175,40 @@ 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 + special CallBattlePikeFunction 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 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 26 - special sub_81A703C + special CallBattlePikeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc special LoadPlayerParty closemessage delay 2 call BattleFrontier_BattlePikeLobby_EventScript_27134F setvar VAR_TEMP_0, 255 setvar VAR_0x8004, 26 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePikeLobby_Text_25C130, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 5 - special sub_81A1780 + special CallFrontierUtilFunc call BattleFrontier_BattlePikeLobby_EventScript_25BA94 special HealPlayerParty call BattleFrontier_BattlePikeLobby_EventScript_25BB49 @@ -218,7 +218,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C end BattleFrontier_BattlePikeLobby_EventScript_25BA1A:: @ 825BA1A - msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25B87F BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27 @@ -227,25 +227,25 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27 case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA4F BattleFrontier_BattlePikeLobby_EventScript_25BA42:: @ 825BA42 - msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F - msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E 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 special LoadPlayerParty BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76 - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E release @@ -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 @@ -277,20 +277,20 @@ BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7 step_end BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB - msgbox BattleFrontier_BattlePikeLobby_Text_25C422, 2 + msgbox BattleFrontier_BattlePikeLobby_Text_25C422, MSGBOX_NPC end BattleFrontier_BattlePikeLobby_EventScript_25BAB4:: @ 825BAB4 - msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, 2 + msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, MSGBOX_NPC end BattleFrontier_BattlePikeLobby_EventScript_25BABD:: @ 825BABD - msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, 2 + msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, MSGBOX_NPC end BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6 lockall - msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end @@ -307,17 +307,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5 end BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D - msgbox BattleFrontier_BattlePikeLobby_Text_25C644, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C644, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end BattleFrontier_BattlePikeLobby_EventScript_25BB2B:: @ 825BB2B - msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end BattleFrontier_BattlePikeLobby_EventScript_25BB39:: @ 825BB39 - msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 509806531..3778d4af6 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -12,7 +12,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171 setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 5 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6 case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E @@ -29,14 +29,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 - special sub_81A703C - msgbox 0x2021fc4, 4 + special CallBattlePikeFunction + msgbox gStringVar4, MSGBOX_DEFAULT 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 @@ -58,21 +58,21 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226:: @ 825D226 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 lockall delay 16 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, MSGBOX_DEFAULT waitmessage closemessage applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 - special sub_81A703C - msgbox 0x2021fc4, 4 + special CallBattlePikeFunction + msgbox gStringVar4, MSGBOX_DEFAULT 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 @@ -86,11 +86,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285 waitmovement 0 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, MSGBOX_DEFAULT closemessage release applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 @@ -103,14 +103,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF waitmovement 0 setvar VAR_0x8004, 23 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, MSGBOX_DEFAULT closemessage special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 @@ -137,23 +137,23 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7 waitmovement 0 setvar VAR_0x8004, 22 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416 case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD 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 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA @@ -161,34 +161,34 @@ 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 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, MSGBOX_DEFAULT closemessage goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D 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 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 @@ -196,18 +196,18 @@ 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 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePikeRandomRoom1_Text_25E118 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, MSGBOX_DEFAULT closemessage goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D end @@ -219,30 +219,30 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A703C + special CallBattlePikeFunction call BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 waitstate end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB @@ -258,7 +258,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 waitmovement 0 @@ -281,20 +281,20 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 - special sub_81A703C - msgbox 0x2021fc4, 4 + special CallBattlePikeFunction + msgbox gStringVar4, MSGBOX_DEFAULT closemessage delay 16 applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 1 - special sub_81A703C - msgbox 0x2021fc4, 4 + special CallBattlePikeFunction + msgbox gStringVar4, MSGBOX_DEFAULT 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 @@ -318,25 +318,25 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA waitmovement 0 setvar VAR_0x8004, 12 - special sub_81A703C + special CallBattlePikeFunction copyvar VAR_0x8004, VAR_RESULT compare VAR_0x8004, 0 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 compare VAR_0x8004, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT closemessage releaseall end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, MSGBOX_DEFAULT closemessage waitse playmoncry SPECIES_KIRLIA, 0 waitmoncry setvar VAR_0x8004, 11 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 compare VAR_RESULT, 1 @@ -346,7 +346,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 setvar VAR_0x8004, 15 - special sub_81A703C + special CallBattlePikeFunction waitstate applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 waitmovement 0 @@ -355,7 +355,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 waitse playmoncry SPECIES_KIRLIA, 0 waitmoncry - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT waitse playmoncry SPECIES_KIRLIA, 0 waitmoncry @@ -363,23 +363,23 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 waitmovement 0 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, MSGBOX_DEFAULT return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, MSGBOX_DEFAULT closemessage waitse playmoncry SPECIES_DUSCLOPS, 0 waitmoncry setvar VAR_0x8004, 11 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 setvar VAR_0x8004, 15 - special sub_81A703C + special CallBattlePikeFunction waitstate applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 waitmovement 0 @@ -388,7 +388,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 waitse playmoncry SPECIES_DUSCLOPS, 0 waitmoncry - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT waitse playmoncry SPECIES_DUSCLOPS, 0 waitmoncry @@ -396,7 +396,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 waitmovement 0 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, MSGBOX_DEFAULT return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751:: @ 825D751 @@ -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 @@ -579,7 +579,7 @@ BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED setvar VAR_0x8004, 5 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831 @@ -589,8 +589,8 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B lock faceplayer setvar VAR_0x8004, 14 - special sub_81A703C - msgbox 0x2021fc4, 4 + special CallBattlePikeFunction + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage release @@ -599,21 +599,21 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, MSGBOX_DEFAULT closemessage release end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E setvar VAR_0x8004, 13 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 playfanfare MUS_ME_ASA waitfanfare - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT closemessage release applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E @@ -623,21 +623,21 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875:: @ 825D875 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, MSGBOX_DEFAULT closemessage return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881:: @ 825D881 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, MSGBOX_DEFAULT closemessage return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, MSGBOX_DEFAULT closemessage release applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index 4f0d4632b..83031af95 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -14,9 +14,9 @@ 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 + msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, MSGBOX_DEFAULT closemessage releaseall warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index 9256764e8..b00b41fd7 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -12,14 +12,14 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 6 - special sub_81A703C + special CallBattlePikeFunction end 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..3d42b2e36 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 @@ -37,33 +37,33 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 waitmessage setvar VAR_0x8004, 8 setvar VAR_0x8005, 1 - special sub_81A703C + special CallBattlePikeFunction playse SE_SAVE waitse 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 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, MSGBOX_DEFAULT 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 @@ -77,54 +77,54 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, 5 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A @@ -133,22 +133,22 @@ 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 setvar VAR_0x8004, 8 setvar VAR_0x8005, 2 - special sub_81A703C + special CallBattlePikeFunction playse SE_SAVE waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, 5 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, MSGBOX_YESNO switch VAR_RESULT case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A @@ -167,7 +167,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 setvar VAR_0x8004, 17 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 setvar VAR_TEMP_5, 255 @@ -181,7 +181,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE waitmovement 0 lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, MSGBOX_DEFAULT releaseall applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5 waitmovement 0 @@ -190,12 +190,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB setvar VAR_0x8004, 19 - special sub_81A703C + special CallBattlePikeFunction compare VAR_RESULT, 4 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, 5 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, MSGBOX_YESNO switch VAR_RESULT case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 @@ -204,13 +204,13 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A setvar VAR_0x8004, 18 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39 case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46 @@ -218,20 +218,20 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39:: @ 825CB39 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46:: @ 825CB46 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 setvar VAR_0x8004, 19 - special sub_81A703C + special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4 @@ -240,29 +240,29 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A:: @ 825CB9A - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4:: @ 825CBA4 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE:: @ 825CBAE - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8:: @ 825CBB8 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc index 5bb6a87e0..6e85b849a 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc @@ -2,12 +2,12 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapScripts:: @ 825F070 .byte 0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, MSGBOX_DEFAULT special sub_813A958 return BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, MSGBOX_DEFAULT special sub_813A988 release end @@ -16,7 +16,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT compare VAR_TEMP_2, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 compare VAR_TEMP_2, 1 @@ -43,14 +43,14 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 givedecoration VAR_0x8009 special sub_813A8FC playse SE_REGI - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT compare VAR_TEMP_2, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, MSGBOX_DEFAULT special sub_813A988 release end @@ -64,14 +64,14 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A giveitem VAR_0x8009, 1 special sub_813A8FC playse SE_REGI - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT compare VAR_TEMP_2, 2 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, MSGBOX_DEFAULT special sub_813A988 release end @@ -106,7 +106,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 16 @@ -115,7 +115,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 @@ -124,7 +124,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 @@ -133,7 +133,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -142,7 +142,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -151,7 +151,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -160,7 +160,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -169,7 +169,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 @@ -178,7 +178,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 @@ -187,7 +187,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 @@ -220,7 +220,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 @@ -229,7 +229,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 @@ -238,7 +238,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 @@ -247,7 +247,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 @@ -256,7 +256,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 @@ -290,7 +290,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -299,7 +299,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -308,7 +308,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -317,7 +317,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -326,7 +326,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -335,7 +335,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -372,7 +372,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -381,7 +381,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -390,7 +390,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -399,7 +399,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -408,7 +408,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -417,7 +417,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -426,7 +426,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -435,7 +435,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -444,7 +444,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -453,25 +453,25 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB:: @ 825F7CB - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_260099, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_260099, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4:: @ 825F7D4 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD:: @ 825F7DD lock - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0, MSGBOX_DEFAULT release end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8:: @ 825F7E8 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1:: @ 825F7F1 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA: @ 825F7FA diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index eacee4cf3..3aa041fb4 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D setvar VAR_RESULT, 0 BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 - special sub_81A8E7C + special CallBattlePyramidFunction delay 2 compare VAR_RESULT, 2 goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 @@ -39,16 +39,16 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8004, 15 - special sub_81A8E7C + special CallBattlePyramidFunction 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,12 +63,12 @@ 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 setvar VAR_0x8004, 17 - special sub_81A8E7C + special CallBattlePyramidFunction end BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42 @@ -76,20 +76,20 @@ 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 - special sub_81A8E7C + special CallBattlePyramidFunction BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66 BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 setvar VAR_0x8004, 13 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A8E7C + special CallBattlePyramidFunction setvar VAR_0x8004, 14 - special sub_81A8E7C + special CallBattlePyramidFunction special HealPlayerParty warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate @@ -98,17 +98,17 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D setvar VAR_0x8004, 3 setvar VAR_0x8005, 1 - special sub_81A8E7C + special CallBattlePyramidFunction special SavePlayerParty setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 9 - special sub_81A8E7C + special CallBattlePyramidFunction setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_F, 1 end @@ -121,27 +121,27 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 setvar VAR_0x8004, 13 setvar VAR_0x8005, 32 setvar VAR_0x8006, 0 - special sub_81A8E7C + special CallBattlePyramidFunction return 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 - special sub_81A8E7C + special CallBattlePyramidFunction 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 @@ -153,9 +153,9 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F - trainerbattle 9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D + trainerbattle TRAINER_BATTLE_9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D setvar VAR_0x8004, 10 - special sub_81A8E7C + special CallBattlePyramidFunction waitmessage waitbuttonpress closemessage @@ -164,12 +164,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A setvar VAR_0x8004, 7 - special sub_81A8E7C - callstd 1 + special CallBattlePyramidFunction + callstd STD_FIND_ITEM compare VAR_0x8007, 0 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 setvar VAR_0x8004, 8 - special sub_81A8E7C + special CallBattlePyramidFunction BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87 end @@ -781,4 +781,3 @@ BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068 .string "There aren’t any TRAINERS left that\n" .string "can take you on now…$" - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index ccc7b1032..9b5ea145e 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 @@ -35,15 +35,15 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 - special sub_81A8E7C + special CallBattlePyramidFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A8E7C + special CallBattlePyramidFunction 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,14 +51,14 @@ 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 + msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 - msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special sub_81B95E0 @@ -66,29 +66,29 @@ 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 + special CallBattlePyramidFunction special HealPlayerParty message BattleFrontier_BattlePyramidLobby_Text_2519F8 waitmessage playse SE_EXPMAX waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252662, MSGBOX_DEFAULT setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 message BattleFrontier_BattlePyramidLobby_Text_251A77 waitmessage setvar VAR_0x8004, 4 - special sub_81A8E7C + special CallBattlePyramidFunction setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 - special sub_81A8E7C + special CallBattlePyramidFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -96,10 +96,10 @@ 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 + special CallBattlePyramidFunction special HealPlayerParty lockall message BattleFrontier_BattlePyramidLobby_Text_251B5A @@ -111,13 +111,13 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - special sub_81A8E7C + special CallBattlePyramidFunction setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 - special sub_81A8E7C + special CallBattlePyramidFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -132,7 +132,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1 setvar VAR_FRONTIER_FACILITY, 6 setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty - msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8 message BattleFrontier_BattlePyramidLobby_Text_250FA7 @@ -152,14 +152,14 @@ 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 - msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePyramidLobby_Text_251297, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -168,7 +168,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 - msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, 5 + msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 case 1, BattleFrontier_BattlePyramidLobby_EventScript_2509A5 @@ -178,25 +178,25 @@ 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 + special CallBattlePyramidFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 - special sub_81A8E7C + special CallBattlePyramidFunction 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 + special CallBattlePyramidFunction setvar VAR_0x8004, 9 - special sub_81A8E7C + special CallBattlePyramidFunction special LoadPlayerParty closemessage delay 2 @@ -209,14 +209,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePyramidLobby_Text_251531, MSGBOX_DEFAULT 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 @@ -225,7 +225,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 end BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68 - msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_2508C8 BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75 @@ -234,25 +234,25 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75 case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A9D BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90 - msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D - msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC 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 special LoadPlayerParty BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4 - msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC release @@ -262,9 +262,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE lockall applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E waitmovement 0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 - msgbox BattleFrontier_BattlePyramidLobby_Text_252461, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252461, MSGBOX_DEFAULT releaseall end @@ -281,10 +281,10 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27 return BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 - special sub_81A8E7C + special CallBattlePyramidFunction compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53 setvar VAR_RESULT, 0 @@ -294,15 +294,15 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 - special sub_81A8E7C + special CallBattlePyramidFunction goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 return BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 6 - special sub_81A8E7C + special CallBattlePyramidFunction compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91 setvar VAR_RESULT, 0 @@ -312,7 +312,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91 setvar VAR_0x8004, 1 setvar VAR_0x8005, 4 - special sub_81A8E7C + special CallBattlePyramidFunction goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 return @@ -343,90 +343,90 @@ BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4 return BattleFrontier_BattlePyramidLobby_EventScript_250C8E:: @ 8250C8E - msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250C97:: @ 8250C97 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CA0:: @ 8250CA0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CA9:: @ 8250CA9 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CB2:: @ 8250CB2 - msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CBB:: @ 8250CBB - msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CC4:: @ 8250CC4 - msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CCD:: @ 8250CCD - msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CD6:: @ 8250CD6 - msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CDF:: @ 8250CDF - msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CE8:: @ 8250CE8 - msgbox BattleFrontier_BattlePyramidLobby_Text_252068, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252068, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CF1:: @ 8250CF1 - msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CFA:: @ 8250CFA - msgbox BattleFrontier_BattlePyramidLobby_Text_252158, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252158, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D03:: @ 8250D03 - msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D0C:: @ 8250D0C - msgbox BattleFrontier_BattlePyramidLobby_Text_252206, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252206, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D15:: @ 8250D15 - msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D1E:: @ 8250D1E - msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D27:: @ 8250D27 - msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D30:: @ 8250D30 - msgbox BattleFrontier_BattlePyramidLobby_Text_252364, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252364, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39 - msgbox BattleFrontier_BattlePyramidLobby_Text_252403, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252403, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 lockall setvar VAR_0x8004, 7 setvar VAR_0x8005, 6 - special sub_81A1780 + special CallFrontierUtilFunc waitbuttonpress special RemoveRecordsWindow releaseall @@ -436,24 +436,24 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4 applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD waitmovement 0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251569, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A8E7C + special CallBattlePyramidFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 - msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94 - msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C message BattleFrontier_BattlePyramidLobby_Text_25161E waitmessage playse SE_EXPMAX waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251647, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251647, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5 waitmovement 0 @@ -493,7 +493,7 @@ BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 step_end BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB - msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, MSGBOX_DEFAULT setflag FLAG_SPECIAL_FLAG_0x4004 special sub_81C6A94 compare VAR_RESULT, 0 @@ -504,7 +504,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB end BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00 - msgbox BattleFrontier_BattlePyramidLobby_Text_251881, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251881, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09 @@ -539,23 +539,23 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 return BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F - msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, MSGBOX_DEFAULT message BattleFrontier_BattlePyramidLobby_Text_25197E waitmessage goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 end BattleFrontier_BattlePyramidLobby_EventScript_250E83:: @ 8250E83 - msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, 2 + msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, MSGBOX_NPC end BattleFrontier_BattlePyramidLobby_EventScript_250E8C:: @ 8250E8C - msgbox BattleFrontier_BattlePyramidLobby_Text_252595, 2 + msgbox BattleFrontier_BattlePyramidLobby_Text_252595, MSGBOX_NPC end BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95 lockall - msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end @@ -573,22 +573,22 @@ BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7 - msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250F05:: @ 8250F05 - msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250F13:: @ 8250F13 - msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250F21:: @ 8250F21 - msgbox BattleFrontier_BattlePyramidLobby_Text_252924, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252924, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 886b3fe01..7454dd10a 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 setvar VAR_0x8004, 13 setvar VAR_0x8005, 200 setvar VAR_0x8006, 0 - special sub_81A8E7C + special CallBattlePyramidFunction setvar VAR_TEMP_F, 1 end @@ -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 @@ -71,17 +71,17 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 setvar VAR_0x8004, 3 setvar VAR_0x8005, 1 - special sub_81A8E7C + special CallBattlePyramidFunction special SavePlayerParty setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_0x8004, 9 - special sub_81A8E7C + special CallBattlePyramidFunction setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 + special CallFrontierUtilFunc setvar VAR_TEMP_F, 1 end @@ -92,7 +92,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236 compare VAR_TEMP_C, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240 - msgbox BattleFrontier_BattlePyramidTop_Text_255410, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD waitmovement 0 @@ -110,18 +110,18 @@ 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 BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236 - msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, MSGBOX_DEFAULT closemessage end BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240 - msgbox BattleFrontier_BattlePyramidTop_Text_25551F, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_25551F, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD setvar VAR_TEMP_D, 1 closemessage @@ -135,20 +135,20 @@ 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 applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT 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 + msgbox BattleFrontier_BattlePyramidTop_Text_25573E, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_2552DA end @@ -157,7 +157,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0 waitmovement 0 BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA - msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255846, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 @@ -166,36 +166,36 @@ 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 + msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_2558E9 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePyramidTop_Text_25591D, MSGBOX_DEFAULT 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 applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT 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 + msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_255392 end @@ -204,7 +204,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388 waitmovement 0 BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 - msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 @@ -213,24 +213,24 @@ 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 + msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_255B59 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattlePyramidTop_Text_255B82, MSGBOX_DEFAULT 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/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc index 55aed13a4..0fd75debb 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index d687f83dd..2a0a2ce48 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, MSGBOX_DEFAULT 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,27 +74,27 @@ 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 waitmovement 0 applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty 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 @@ -129,7 +129,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, 5 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22 @@ -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 @@ -247,7 +247,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 @@ -288,16 +288,16 @@ 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 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, MSGBOX_DEFAULT call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 @@ -306,32 +306,32 @@ 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 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_24270E waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, MSGBOX_DEFAULT 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 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 - special sub_81A1780 + special CallFrontierUtilFunc BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, MSGBOX_DEFAULT call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF @@ -340,17 +340,17 @@ 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 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_242932 waitmessage waitfanfare setvar VAR_0x8004, 13 - special sub_81A1780 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E @@ -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/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc index 505a903da..90232cf5b 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index 556d4499a..fa17ef5af 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, MSGBOX_DEFAULT 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, MSGBOX_DEFAULT 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 @@ -144,7 +144,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 - msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4 + msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118 @@ -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 @@ -203,7 +203,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223 - msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, 5 + msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB @@ -220,7 +220,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251 BattleFrontier_BattleTowerBattleRoom2_EventScript_249283:: @ 8249283 closemessage - clearflag FLAG_0x002 + clearflag FLAG_TEMP_2 applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249526 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249526 waitmovement 0 @@ -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 @@ -349,7 +349,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412 return BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 multichoice 19, 6, 105, 1 switch VAR_RESULT @@ -387,7 +387,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494A8:: @ 82494A8 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 case 127, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8B4 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 end diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc index 0961aa403..d100dec0b 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc @@ -3,8 +3,8 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918 - object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, 701 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER + object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 73c56351f..018dbfb31 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1 BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5 - clearflag FLAG_0x2BD + clearflag FLAG_HIDE_APPRENTICE setvar VAR_0x8004, 23 special CallApprenticeFunction @@ -27,7 +27,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0 end BattleFrontier_BattleTowerLobby_EventScript_23E6C1:: @ 823E6C1 - setflag FLAG_0x2BD + setflag FLAG_HIDE_APPRENTICE goto BattleFrontier_BattleTowerLobby_EventScript_23E6C0 BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9 @@ -49,13 +49,13 @@ 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 lock faceplayer - msgbox BattleFrontier_BattleTowerLobby_Text_23F583, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -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 @@ -85,7 +85,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 goto BattleFrontier_BattleTowerLobby_EventScript_23E780 BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778 - msgbox BattleFrontier_BattleTowerLobby_Text_241486, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241486, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 setvar VAR_0x8004, 5 @@ -96,12 +96,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 - msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, MSGBOX_DEFAULT setvar VAR_0x8004, 11 - special sub_81A1780 + special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9 call BattleFrontier_BattleTowerLobby_EventScript_23E84D setvar VAR_0x8004, 1 @@ -109,10 +109,10 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 special sub_8161F74 compare VAR_RESULT, 49 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2 - msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 release @@ -141,7 +141,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830 message BattleFrontier_BattleTowerLobby_Text_23F6F7 waitmessage call BattleFrontier_BattleTowerLobby_EventScript_23E84D - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 release @@ -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,15 +182,15 @@ 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 - msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF BattleFrontier_BattleTowerLobby_EventScript_23E8D7:: @ 823E8D7 - msgbox gText_BattleRecordCouldntBeSaved, 4 + msgbox gText_BattleRecordCouldntBeSaved, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E8DF:: @ 823E8DF return @@ -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 @@ -241,7 +241,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 faceplayer setvar VAR_FRONTIER_FACILITY, 0 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240537, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240537, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948 message BattleFrontier_BattleTowerLobby_Text_2405B3 @@ -262,14 +262,14 @@ 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 - msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -278,7 +278,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA2A @@ -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 @@ -312,7 +312,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A end BattleFrontier_BattleTowerLobby_EventScript_23EA91:: @ 823EA91 - msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23E948 end @@ -321,7 +321,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F faceplayer setvar VAR_FRONTIER_FACILITY, 0 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1 message BattleFrontier_BattleTowerLobby_Text_24085E @@ -342,14 +342,14 @@ 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 - msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleTowerLobby_Text_240A50, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -358,7 +358,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EB93 @@ -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 @@ -392,7 +392,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 end BattleFrontier_BattleTowerLobby_EventScript_23EBFA:: @ 823EBFA - msgbox BattleFrontier_BattleTowerLobby_Text_240897, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240897, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23EAB1 end @@ -402,7 +402,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08 setvar VAR_FRONTIER_FACILITY, 0 clearflag FLAG_0x152 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D message BattleFrontier_BattleTowerLobby_Text_240B06 @@ -423,14 +423,14 @@ 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 - msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -439,7 +439,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23ECFF @@ -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 @@ -473,7 +473,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF end BattleFrontier_BattleTowerLobby_EventScript_23ED66:: @ 823ED66 - msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23EC1D end @@ -482,7 +482,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74 faceplayer setvar VAR_FRONTIER_FACILITY, 0 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240E15, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240E15, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86 message BattleFrontier_BattleTowerLobby_Text_240E95 @@ -503,14 +503,14 @@ 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 - msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4 + special CallFrontierUtilFunc + msgbox BattleFrontier_BattleTowerLobby_Text_24115E, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -519,7 +519,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EE68 @@ -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 @@ -573,7 +573,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7 end BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 - msgbox BattleFrontier_BattleTowerLobby_Text_23F969, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT setvar VAR_0x8004, 1 call BattleFrontier_BattleTowerLobby_EventScript_271E7C lock @@ -582,7 +582,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 end BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C - msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT setvar VAR_0x8004, 2 call BattleFrontier_BattleTowerLobby_EventScript_271E7C lock @@ -591,7 +591,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C end BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 - msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT setvar VAR_0x8004, 3 call BattleFrontier_BattleTowerLobby_EventScript_271E7C lock @@ -600,7 +600,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 end BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80 - msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, MSGBOX_DEFAULT release end @@ -612,21 +612,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A end BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1 - msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23EFAB:: @ 823EFAB - msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23EFB5:: @ 823EFB5 - msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, 2 + msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, MSGBOX_NPC end BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE - msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, 2 + msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, MSGBOX_NPC end BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 @@ -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 @@ -682,17 +682,17 @@ BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046 switch VAR_FRONTIER_BATTLE_MODE case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D - msgbox BattleFrontier_BattleTowerLobby_Text_24038B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24038B, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F06F:: @ 823F06F - msgbox BattleFrontier_BattleTowerLobby_Text_240027, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240027, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D - msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end @@ -700,24 +700,24 @@ BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B switch VAR_FRONTIER_BATTLE_MODE case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4 case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2 - msgbox BattleFrontier_BattleTowerLobby_Text_24046B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24046B, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F0B4:: @ 823F0B4 - msgbox BattleFrontier_BattleTowerLobby_Text_24010B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24010B, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2 - msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 - special sub_81A1780 + special CallFrontierUtilFunc goto BattleFrontier_BattleTowerLobby_EventScript_23F0E6 end @@ -726,7 +726,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3 BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6 special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1 release @@ -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 @@ -756,7 +756,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 - msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F15B BattleFrontier_BattleTowerLobby_EventScript_23F152:: @ 823F152 @@ -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 @@ -954,20 +954,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 special CloseLink compare VAR_0x8005, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F - msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F - msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4 - msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 - msgbox BattleFrontier_BattleTowerLobby_Text_241240, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241240, MSGBOX_DEFAULT special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, MSGBOX_DEFAULT release end @@ -979,20 +979,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D compare VAR_0x8005, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6 - msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23F394:: @ 823F394 - msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_23F39D:: @ 823F39D - msgbox BattleFrontier_BattleTowerLobby_Text_241285, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241285, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6 - msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF @@ -1012,7 +1012,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF end BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA - msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23ED86 end @@ -1075,7 +1075,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496 BattleFrontier_BattleTowerLobby_EventScript_23F4BE:: @ 823F4BE lockall - msgbox BattleFrontier_BattleTowerLobby_Text_241540, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241540, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end @@ -1093,22 +1093,22 @@ BattleFrontier_BattleTowerLobby_EventScript_23F4CD:: @ 823F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F520:: @ 823F520 - msgbox BattleFrontier_BattleTowerLobby_Text_241586, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241586, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F52E:: @ 823F52E - msgbox BattleFrontier_BattleTowerLobby_Text_241693, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241693, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F53C:: @ 823F53C - msgbox BattleFrontier_BattleTowerLobby_Text_241777, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241777, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F54A:: @ 823F54A - msgbox BattleFrontier_BattleTowerLobby_Text_24187E, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24187E, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc index 533e6af8b..9212f2fd2 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716 - object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864 - object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 + object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 + object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index a2f003b85..b2b05a054 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -7,20 +7,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 setvar VAR_0x8004, 17 - special sub_81A8E7C + special CallBattlePyramidFunction end BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 checkflag FLAG_0x152 goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA - clearflag FLAG_0x2C7 - clearflag FLAG_0x2C8 - clearflag FLAG_0x2C9 - clearflag FLAG_0x2CA - clearflag FLAG_0x2CB - clearflag FLAG_0x2CC - setflag FLAG_0x360 - setflag FLAG_0x361 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 + clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 + setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 + setflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 setvar VAR_0x8004, 10 special sub_8161F74 end @@ -67,7 +67,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 moveobjectoffscreen 1 applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 waitmovement 0 - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty setvar VAR_TEMP_1, 1 releaseall @@ -90,7 +90,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A multichoicedefault 20, 8, 94, 1, 0 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, 4 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, MSGBOX_DEFAULT release end @@ -98,12 +98,12 @@ 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 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, 4 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 waitmovement 0 diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc index ba8ca0cb6..b8b199ee2 100644 --- a/data/maps/BattleFrontier_Lounge1/scripts.inc +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -22,11 +22,11 @@ BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 end BattleFrontier_Lounge1_EventScript_25E7AD:: @ 825E7AD - msgbox BattleFrontier_Lounge1_Text_25E95F, 4 + msgbox BattleFrontier_Lounge1_Text_25E95F, MSGBOX_DEFAULT return BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 - msgbox BattleFrontier_Lounge1_Text_25EEF6, 4 + msgbox BattleFrontier_Lounge1_Text_25EEF6, MSGBOX_DEFAULT return BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF @@ -45,7 +45,7 @@ BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF end BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF - msgbox BattleFrontier_Lounge1_Text_25EF5E, 4 + msgbox BattleFrontier_Lounge1_Text_25EF5E, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E792 end @@ -80,86 +80,86 @@ BattleFrontier_Lounge1_EventScript_25E87D:: @ 825E87D end BattleFrontier_Lounge1_EventScript_25E87F:: @ 825E87F - msgbox BattleFrontier_Lounge1_Text_25EA92, 4 + msgbox BattleFrontier_Lounge1_Text_25EA92, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E88D:: @ 825E88D - msgbox BattleFrontier_Lounge1_Text_25EAD9, 4 + msgbox BattleFrontier_Lounge1_Text_25EAD9, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E89B:: @ 825E89B - msgbox BattleFrontier_Lounge1_Text_25EB2A, 4 + msgbox BattleFrontier_Lounge1_Text_25EB2A, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E8A9:: @ 825E8A9 - msgbox BattleFrontier_Lounge1_Text_25EB6F, 4 + msgbox BattleFrontier_Lounge1_Text_25EB6F, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E8B7:: @ 825E8B7 - msgbox BattleFrontier_Lounge1_Text_25EBBB, 4 + msgbox BattleFrontier_Lounge1_Text_25EBBB, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8C5:: @ 825E8C5 - msgbox BattleFrontier_Lounge1_Text_25EBF8, 4 + msgbox BattleFrontier_Lounge1_Text_25EBF8, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8D3:: @ 825E8D3 - msgbox BattleFrontier_Lounge1_Text_25EC39, 4 + msgbox BattleFrontier_Lounge1_Text_25EC39, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8E1:: @ 825E8E1 - msgbox BattleFrontier_Lounge1_Text_25ED0E, 4 + msgbox BattleFrontier_Lounge1_Text_25ED0E, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8EF:: @ 825E8EF - msgbox BattleFrontier_Lounge1_Text_25EC7B, 4 + msgbox BattleFrontier_Lounge1_Text_25EC7B, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8FD:: @ 825E8FD - msgbox BattleFrontier_Lounge1_Text_25ECC4, 4 + msgbox BattleFrontier_Lounge1_Text_25ECC4, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E90B:: @ 825E90B - msgbox BattleFrontier_Lounge1_Text_25ED4E, 4 + msgbox BattleFrontier_Lounge1_Text_25ED4E, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E919:: @ 825E919 - msgbox BattleFrontier_Lounge1_Text_25ED87, 4 + msgbox BattleFrontier_Lounge1_Text_25ED87, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E927:: @ 825E927 - msgbox BattleFrontier_Lounge1_Text_25EDC1, 4 + msgbox BattleFrontier_Lounge1_Text_25EDC1, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E935:: @ 825E935 - msgbox BattleFrontier_Lounge1_Text_25EDF6, 4 + msgbox BattleFrontier_Lounge1_Text_25EDF6, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E943:: @ 825E943 - msgbox BattleFrontier_Lounge1_Text_25EE37, 4 + msgbox BattleFrontier_Lounge1_Text_25EE37, MSGBOX_DEFAULT release end BattleFrontier_Lounge1_EventScript_25E94D:: @ 825E94D - msgbox BattleFrontier_Lounge1_Text_25EFDD, 2 + msgbox BattleFrontier_Lounge1_Text_25EFDD, MSGBOX_NPC end BattleFrontier_Lounge1_EventScript_25E956:: @ 825E956 - msgbox BattleFrontier_Lounge1_Text_25F020, 2 + msgbox BattleFrontier_Lounge1_Text_25F020, MSGBOX_NPC end BattleFrontier_Lounge1_Text_25E95F: @ 825E95F diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc index bbb298b5b..fed3672be 100644 --- a/data/maps/BattleFrontier_Lounge2/scripts.inc +++ b/data/maps/BattleFrontier_Lounge2/scripts.inc @@ -7,12 +7,12 @@ BattleFrontier_Lounge2_EventScript_260643:: @ 8260643 checkflag FLAG_0x154 goto_eq BattleFrontier_Lounge2_EventScript_26065F setflag FLAG_0x154 - msgbox BattleFrontier_Lounge2_Text_260766, 4 + msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT goto BattleFrontier_Lounge2_EventScript_26066D end BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F - msgbox BattleFrontier_Lounge2_Text_260857, 4 + msgbox BattleFrontier_Lounge2_Text_260857, MSGBOX_DEFAULT goto BattleFrontier_Lounge2_EventScript_26066D end @@ -48,11 +48,11 @@ BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D end BattleFrontier_Lounge2_EventScript_2606F8:: @ 82606F8 - msgbox BattleFrontier_Lounge2_Text_260933, 4 + msgbox BattleFrontier_Lounge2_Text_260933, MSGBOX_DEFAULT return BattleFrontier_Lounge2_EventScript_260701:: @ 8260701 - msgbox BattleFrontier_Lounge2_Text_2608F2, 4 + msgbox BattleFrontier_Lounge2_Text_2608F2, MSGBOX_DEFAULT return BattleFrontier_Lounge2_EventScript_26070A:: @ 826070A @@ -97,24 +97,24 @@ BattleFrontier_Lounge2_EventScript_260737:: @ 8260737 BattleFrontier_Lounge2_EventScript_26073C:: @ 826073C lock - msgbox BattleFrontier_Lounge2_Text_261C9C, 4 + msgbox BattleFrontier_Lounge2_Text_261C9C, MSGBOX_DEFAULT release end BattleFrontier_Lounge2_EventScript_260747:: @ 8260747 lock - msgbox BattleFrontier_Lounge2_Text_261CDC, 4 + msgbox BattleFrontier_Lounge2_Text_261CDC, MSGBOX_DEFAULT release end BattleFrontier_Lounge2_EventScript_260752:: @ 8260752 lock - msgbox BattleFrontier_Lounge2_Text_261D1D, 4 + msgbox BattleFrontier_Lounge2_Text_261D1D, MSGBOX_DEFAULT release end BattleFrontier_Lounge2_EventScript_26075D:: @ 826075D - msgbox BattleFrontier_Lounge2_Text_261D5C, 2 + msgbox BattleFrontier_Lounge2_Text_261D5C, MSGBOX_NPC end BattleFrontier_Lounge2_Text_260766:: @ 8260766 diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 2638541b2..e1e6c68a5 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83 compare VAR_0x8004, 2 goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB setflag FLAG_0x157 - msgbox BattleFrontier_Lounge3_Text_262061, 4 + msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261DAF end @@ -18,10 +18,10 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF special sub_813A820 waitmessage waitbuttonpress - msgbox BattleFrontier_Lounge3_Text_262A60, 5 + msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge3_EventScript_261FA5 - msgbox BattleFrontier_Lounge3_Text_262ABD, 5 + msgbox BattleFrontier_Lounge3_Text_262ABD, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge3_EventScript_261FA5 message BattleFrontier_Lounge3_Text_262B42 @@ -60,7 +60,7 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_Lounge3_EventScript_261E75 - msgbox BattleFrontier_Lounge3_Text_262B6E, 4 + msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT message BattleFrontier_Lounge3_Text_262B42 waitmessage goto BattleFrontier_Lounge3_EventScript_261DE9 @@ -72,7 +72,7 @@ BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75 setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 special sub_813A8FC playse SE_REGI - msgbox BattleFrontier_Lounge3_Text_262BE0, 4 + msgbox BattleFrontier_Lounge3_Text_262BE0, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261E96 end @@ -107,12 +107,12 @@ BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5 return BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB - msgbox BattleFrontier_Lounge3_Text_261FFE, 4 + msgbox BattleFrontier_Lounge3_Text_261FFE, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 - msgbox BattleFrontier_Lounge3_Text_26346B, 4 + msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 goto BattleFrontier_Lounge3_EventScript_261DAF @@ -127,7 +127,7 @@ BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 end BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E - msgbox BattleFrontier_Lounge3_Text_263334, 4 + msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 call_if 1, BattleFrontier_Lounge3_EventScript_261F80 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 @@ -136,13 +136,13 @@ BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E call_if 1, BattleFrontier_Lounge3_EventScript_261F94 msgbox BattleFrontier_Lounge3_Text_2633D4, 9 special sub_813A9D0 - msgbox BattleFrontier_Lounge3_Text_2633F2, 4 + msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71 - msgbox BattleFrontier_Lounge3_Text_263298, 4 + msgbox BattleFrontier_Lounge3_Text_263298, MSGBOX_DEFAULT setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end @@ -170,7 +170,7 @@ BattleFrontier_Lounge3_EventScript_261F9E:: @ 8261F9E end BattleFrontier_Lounge3_EventScript_261FA5:: @ 8261FA5 - msgbox BattleFrontier_Lounge3_Text_26342D, 4 + msgbox BattleFrontier_Lounge3_Text_26342D, MSGBOX_DEFAULT release end @@ -180,27 +180,27 @@ BattleFrontier_Lounge3_EventScript_261FAF:: @ 8261FAF end BattleFrontier_Lounge3_EventScript_261FB8:: @ 8261FB8 - msgbox BattleFrontier_Lounge3_Text_263545, 2 + msgbox BattleFrontier_Lounge3_Text_263545, MSGBOX_NPC end BattleFrontier_Lounge3_EventScript_261FC1:: @ 8261FC1 lock faceplayer - msgbox BattleFrontier_Lounge3_Text_26346F, 4 + msgbox BattleFrontier_Lounge3_Text_26346F, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end BattleFrontier_Lounge3_EventScript_261FD1:: @ 8261FD1 lock faceplayer - msgbox BattleFrontier_Lounge3_Text_26351D, 4 + msgbox BattleFrontier_Lounge3_Text_26351D, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1 lock faceplayer - msgbox BattleFrontier_Lounge3_Text_2634C9, 4 + msgbox BattleFrontier_Lounge3_Text_2634C9, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end diff --git a/data/maps/BattleFrontier_Lounge4/scripts.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc index 1108ceee7..5e666c9ef 100644 --- a/data/maps/BattleFrontier_Lounge4/scripts.inc +++ b/data/maps/BattleFrontier_Lounge4/scripts.inc @@ -2,15 +2,15 @@ BattleFrontier_Lounge4_MapScripts:: @ 826358C .byte 0 BattleFrontier_Lounge4_EventScript_26358D:: @ 826358D - msgbox BattleFrontier_Lounge4_Text_2635A8, 2 + msgbox BattleFrontier_Lounge4_Text_2635A8, MSGBOX_NPC end BattleFrontier_Lounge4_EventScript_263596:: @ 8263596 - msgbox BattleFrontier_Lounge4_Text_2635EC, 2 + msgbox BattleFrontier_Lounge4_Text_2635EC, MSGBOX_NPC end BattleFrontier_Lounge4_EventScript_26359F:: @ 826359F - msgbox BattleFrontier_Lounge4_Text_263625, 2 + msgbox BattleFrontier_Lounge4_Text_263625, MSGBOX_NPC end BattleFrontier_Lounge4_Text_2635A8: @ 82635A8 diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc index bb1feceec..6c3ca56fd 100644 --- a/data/maps/BattleFrontier_Lounge5/scripts.inc +++ b/data/maps/BattleFrontier_Lounge5/scripts.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge5_MapScripts:: @ 82645C5 BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 lock faceplayer - msgbox BattleFrontier_Lounge5_Text_264632, 5 + msgbox BattleFrontier_Lounge5_Text_264632, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge5_EventScript_26460D special sub_81B94B0 @@ -23,25 +23,25 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 end BattleFrontier_Lounge5_EventScript_264603:: @ 8264603 - msgbox BattleFrontier_Lounge5_Text_264EEE, 4 + msgbox BattleFrontier_Lounge5_Text_264EEE, MSGBOX_DEFAULT release end BattleFrontier_Lounge5_EventScript_26460D:: @ 826460D - msgbox BattleFrontier_Lounge5_Text_26467F, 4 + msgbox BattleFrontier_Lounge5_Text_26467F, MSGBOX_DEFAULT release end BattleFrontier_Lounge5_EventScript_264617:: @ 8264617 - msgbox BattleFrontier_Lounge5_Text_264F22, 2 + msgbox BattleFrontier_Lounge5_Text_264F22, MSGBOX_NPC end BattleFrontier_Lounge5_EventScript_264620:: @ 8264620 - msgbox BattleFrontier_Lounge5_Text_264F64, 2 + msgbox BattleFrontier_Lounge5_Text_264F64, MSGBOX_NPC end BattleFrontier_Lounge5_EventScript_264629:: @ 8264629 - msgbox BattleFrontier_Lounge5_Text_264FAB, 2 + msgbox BattleFrontier_Lounge5_Text_264FAB, MSGBOX_NPC end BattleFrontier_Lounge5_Text_264632:: @ 8264632 diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc index c779e7c76..2f929f082 100644 --- a/data/maps/BattleFrontier_Lounge6/scripts.inc +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox BattleFrontier_Lounge6_Text_26508D, 5 + msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge6_EventScript_26506B special sub_81B94B0 @@ -28,24 +28,24 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED special sub_807EA10 special sub_807F0E4 waitstate - msgbox BattleFrontier_Lounge6_Text_265128, 4 + msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT setflag FLAG_0x09C release end BattleFrontier_Lounge6_EventScript_26506B:: @ 826506B - msgbox BattleFrontier_Lounge6_Text_2651CB, 4 + msgbox BattleFrontier_Lounge6_Text_2651CB, MSGBOX_DEFAULT release end BattleFrontier_Lounge6_EventScript_265075:: @ 8265075 bufferspeciesname 0, VAR_0x8009 - msgbox BattleFrontier_Lounge6_Text_26518D, 4 + msgbox BattleFrontier_Lounge6_Text_26518D, MSGBOX_DEFAULT release end BattleFrontier_Lounge6_EventScript_265083:: @ 8265083 - msgbox BattleFrontier_Lounge6_Text_26520E, 4 + msgbox BattleFrontier_Lounge6_Text_26520E, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 0b810d4f7..882f7a7eb 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -7,13 +7,13 @@ BattleFrontier_Lounge7_EventScript_265255:: @ 8265255 setvar VAR_TEMP_C, 9 checkflag FLAG_0x15A goto_eq BattleFrontier_Lounge7_EventScript_265276 - msgbox BattleFrontier_Lounge7_Text_2656ED, 4 + msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT setflag FLAG_0x15A goto BattleFrontier_Lounge7_EventScript_265284 end BattleFrontier_Lounge7_EventScript_265276:: @ 8265276 - msgbox BattleFrontier_Lounge7_Text_2658AB, 4 + msgbox BattleFrontier_Lounge7_Text_2658AB, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_265284 end @@ -122,13 +122,13 @@ BattleFrontier_Lounge7_EventScript_265445:: @ 8265445 setvar VAR_TEMP_C, 10 checkflag FLAG_0x15B goto_eq BattleFrontier_Lounge7_EventScript_265466 - msgbox BattleFrontier_Lounge7_Text_265A6C, 4 + msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT setflag FLAG_0x15B goto BattleFrontier_Lounge7_EventScript_265474 end BattleFrontier_Lounge7_EventScript_265466:: @ 8265466 - msgbox BattleFrontier_Lounge7_Text_265C2C, 4 + msgbox BattleFrontier_Lounge7_Text_265C2C, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_265474 end @@ -234,12 +234,12 @@ BattleFrontier_Lounge7_EventScript_26562A:: @ 826562A BattleFrontier_Lounge7_EventScript_265635:: @ 8265635 special sub_813ADB8 special sub_813A988 - msgbox BattleFrontier_Lounge7_Text_265A0E, 4 + msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT release end BattleFrontier_Lounge7_EventScript_265645:: @ 8265645 - msgbox BattleFrontier_Lounge7_Text_265A0E, 4 + msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT release end @@ -249,18 +249,18 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F special sub_813AC7C buffernumberstring 1, VAR_0x8008 copyvar VAR_0x8004, VAR_TEMP_C - msgbox BattleFrontier_Lounge7_Text_265921, 5 + msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_2656CA specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_Lounge7_EventScript_265696 - msgbox BattleFrontier_Lounge7_Text_265997, 4 + msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_2656CA end BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 - msgbox BattleFrontier_Lounge7_Text_26595A, 4 + msgbox BattleFrontier_Lounge7_Text_26595A, MSGBOX_DEFAULT special sub_813AEB4 fadescreen 1 special sub_813A988 @@ -269,7 +269,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_265645 - msgbox BattleFrontier_Lounge7_Text_2659C7, 4 + msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 release @@ -282,11 +282,11 @@ BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA end BattleFrontier_Lounge7_EventScript_2656DB:: @ 82656DB - msgbox BattleFrontier_Lounge7_Text_265C6F, 2 + msgbox BattleFrontier_Lounge7_Text_265C6F, MSGBOX_NPC end BattleFrontier_Lounge7_EventScript_2656E4:: @ 82656E4 - msgbox BattleFrontier_Lounge7_Text_265D17, 2 + msgbox BattleFrontier_Lounge7_Text_265D17, MSGBOX_NPC end BattleFrontier_Lounge7_Text_2656ED: @ 82656ED diff --git a/data/maps/BattleFrontier_Lounge8/scripts.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc index 35f83baff..e6399433e 100644 --- a/data/maps/BattleFrontier_Lounge8/scripts.inc +++ b/data/maps/BattleFrontier_Lounge8/scripts.inc @@ -2,15 +2,15 @@ BattleFrontier_Lounge8_MapScripts:: @ 82676C9 .byte 0 BattleFrontier_Lounge8_EventScript_2676CA:: @ 82676CA - msgbox BattleFrontier_Lounge8_Text_2676E5, 2 + msgbox BattleFrontier_Lounge8_Text_2676E5, MSGBOX_NPC end BattleFrontier_Lounge8_EventScript_2676D3:: @ 82676D3 - msgbox BattleFrontier_Lounge8_Text_26779C, 2 + msgbox BattleFrontier_Lounge8_Text_26779C, MSGBOX_NPC end BattleFrontier_Lounge8_EventScript_2676DC:: @ 82676DC - msgbox BattleFrontier_Lounge8_Text_26782C, 2 + msgbox BattleFrontier_Lounge8_Text_26782C, MSGBOX_NPC end BattleFrontier_Lounge8_Text_2676E5: @ 82676E5 diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 0b7f5b767..f3708b565 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -7,7 +7,7 @@ BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC message gUnknown_08272A21 waitmessage pokemart BattleFrontier_Mart_Pokemart_267AE4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -31,19 +31,19 @@ BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4 end BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 - msgbox BattleFrontier_Mart_Text_267B29, 2 + msgbox BattleFrontier_Mart_Text_267B29, MSGBOX_NPC end BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B lock applymovement 2, BattleFrontier_Mart_Movement_2725B0 waitmovement 0 - msgbox BattleFrontier_Mart_Text_267B8F, 4 + msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT release end BattleFrontier_Mart_EventScript_267B20:: @ 8267B20 - msgbox BattleFrontier_Mart_Text_267C01, 2 + msgbox BattleFrontier_Mart_Text_267C01, MSGBOX_NPC end BattleFrontier_Mart_Text_267B29: @ 8267B29 diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc index dab98712a..a16bca779 100644 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ b/data/maps/BattleFrontier_OutsideEast/events.inc @@ -12,7 +12,7 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 object_event 11, EVENT_OBJ_GFX_TWIN, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 - object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842 + object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 0a3723acc..be0bdc809 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -17,54 +17,54 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D setvar VAR_0x40BC, 0 - setflag FLAG_0x396 + setflag FLAG_HIDE_BATTLE_TOWER_REPORTER checkflag FLAG_0x1C6 call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F end BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F - clearflag FLAG_0x34A + clearflag FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO return BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43 - msgbox BattleFrontier_OutsideEast_Text_242E11, 3 + msgbox BattleFrontier_OutsideEast_Text_242E11, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C4C:: @ 8242C4C - msgbox BattleFrontier_OutsideEast_Text_242E58, 3 + msgbox BattleFrontier_OutsideEast_Text_242E58, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C55:: @ 8242C55 - msgbox BattleFrontier_OutsideEast_Text_242E96, 3 + msgbox BattleFrontier_OutsideEast_Text_242E96, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C5E:: @ 8242C5E - msgbox BattleFrontier_OutsideEast_Text_242ECF, 3 + msgbox BattleFrontier_OutsideEast_Text_242ECF, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C67:: @ 8242C67 - msgbox BattleFrontier_OutsideEast_Text_242F8C, 2 + msgbox BattleFrontier_OutsideEast_Text_242F8C, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C70:: @ 8242C70 - msgbox BattleFrontier_OutsideEast_Text_242FDC, 2 + msgbox BattleFrontier_OutsideEast_Text_242FDC, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C79:: @ 8242C79 - msgbox BattleFrontier_OutsideEast_Text_24308C, 2 + msgbox BattleFrontier_OutsideEast_Text_24308C, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C82:: @ 8242C82 - msgbox BattleFrontier_OutsideEast_Text_243106, 2 + msgbox BattleFrontier_OutsideEast_Text_243106, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C8B:: @ 8242C8B - msgbox BattleFrontier_OutsideEast_Text_2431A5, 2 + msgbox BattleFrontier_OutsideEast_Text_2431A5, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C94:: @ 8242C94 lock - msgbox BattleFrontier_OutsideEast_Text_2432DD, 4 + msgbox BattleFrontier_OutsideEast_Text_2432DD, MSGBOX_DEFAULT release end @@ -73,35 +73,35 @@ BattleFrontier_OutsideEast_EventScript_242C9F:: @ 8242C9F faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox BattleFrontier_OutsideEast_Text_24334B, 4 + msgbox BattleFrontier_OutsideEast_Text_24334B, MSGBOX_DEFAULT waitmoncry release end BattleFrontier_OutsideEast_EventScript_242CB2:: @ 8242CB2 - msgbox BattleFrontier_OutsideEast_Text_243363, 2 + msgbox BattleFrontier_OutsideEast_Text_243363, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CBB:: @ 8242CBB - msgbox BattleFrontier_OutsideEast_Text_243425, 2 + msgbox BattleFrontier_OutsideEast_Text_243425, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CC4:: @ 8242CC4 - msgbox BattleFrontier_OutsideEast_Text_2434A0, 2 + msgbox BattleFrontier_OutsideEast_Text_2434A0, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CCD:: @ 8242CCD - msgbox BattleFrontier_OutsideEast_Text_243504, 2 + msgbox BattleFrontier_OutsideEast_Text_243504, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CD6:: @ 8242CD6 lock - msgbox BattleFrontier_OutsideEast_Text_243529, 4 + msgbox BattleFrontier_OutsideEast_Text_243529, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1 - msgbox BattleFrontier_OutsideEast_Text_243230, 2 + msgbox BattleFrontier_OutsideEast_Text_243230, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA @@ -123,7 +123,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC playse 269 applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 waitmovement 0 - msgbox gUnknown_082731BD, 4 + msgbox gUnknown_082731BD, MSGBOX_DEFAULT closemessage waitse playmoncry SPECIES_SUDOWOODO, 2 @@ -169,55 +169,55 @@ BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 step_end BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79 - msgbox BattleFrontier_OutsideEast_Text_243598, 2 + msgbox BattleFrontier_OutsideEast_Text_243598, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D82:: @ 8242D82 - msgbox BattleFrontier_OutsideEast_Text_243668, 2 + msgbox BattleFrontier_OutsideEast_Text_243668, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D8B:: @ 8242D8B - msgbox BattleFrontier_OutsideEast_Text_2436F2, 2 + msgbox BattleFrontier_OutsideEast_Text_2436F2, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D94:: @ 8242D94 - msgbox BattleFrontier_OutsideEast_Text_243809, 2 + msgbox BattleFrontier_OutsideEast_Text_243809, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D9D:: @ 8242D9D - msgbox BattleFrontier_OutsideEast_Text_243895, 2 + msgbox BattleFrontier_OutsideEast_Text_243895, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DA6:: @ 8242DA6 - msgbox BattleFrontier_OutsideEast_Text_243943, 2 + msgbox BattleFrontier_OutsideEast_Text_243943, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DAF:: @ 8242DAF - msgbox BattleFrontier_OutsideEast_Text_2439A0, 2 + msgbox BattleFrontier_OutsideEast_Text_2439A0, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DB8:: @ 8242DB8 lock - msgbox BattleFrontier_OutsideEast_Text_243A2B, 4 + msgbox BattleFrontier_OutsideEast_Text_243A2B, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242DC3:: @ 8242DC3 lock - msgbox BattleFrontier_OutsideEast_Text_243A53, 4 + msgbox BattleFrontier_OutsideEast_Text_243A53, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242DCE:: @ 8242DCE - msgbox BattleFrontier_OutsideEast_Text_242F0D, 3 + msgbox BattleFrontier_OutsideEast_Text_242F0D, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242DD7:: @ 8242DD7 - msgbox BattleFrontier_OutsideEast_Text_242F4A, 3 + msgbox BattleFrontier_OutsideEast_Text_242F4A, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0 - msgbox BattleFrontier_OutsideEast_Text_243B68, 2 + msgbox BattleFrontier_OutsideEast_Text_243B68, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 @@ -225,17 +225,17 @@ BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 faceplayer checkflag FLAG_0x1C6 goto_eq BattleFrontier_OutsideEast_EventScript_242DFE - msgbox BattleFrontier_OutsideEast_Text_243C2C, 4 + msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242DFE:: @ 8242DFE - msgbox BattleFrontier_OutsideEast_Text_243CA3, 4 + msgbox BattleFrontier_OutsideEast_Text_243CA3, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242E08:: @ 8242E08 - msgbox BattleFrontier_OutsideEast_Text_243D0B, 2 + msgbox BattleFrontier_OutsideEast_Text_243D0B, MSGBOX_NPC end BattleFrontier_OutsideEast_Text_242E11: @ 8242E11 diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index bd9d508dd..a735e7ffd 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -4,13 +4,13 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 setvar VAR_0x40BC, 0 - setflag FLAG_0x396 + setflag FLAG_HIDE_BATTLE_TOWER_REPORTER end BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 lock faceplayer - msgbox BattleFrontier_OutsideWest_Text_23D808, 4 + msgbox BattleFrontier_OutsideWest_Text_23D808, MSGBOX_DEFAULT checkitem ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D44E @@ -29,15 +29,15 @@ BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416 end BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E - msgbox BattleFrontier_OutsideWest_Text_23D842, 4 + msgbox BattleFrontier_OutsideWest_Text_23D842, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 - msgbox BattleFrontier_OutsideWest_Text_23D8F2, 5 + msgbox BattleFrontier_OutsideWest_Text_23D8F2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE - msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 + msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate @@ -45,10 +45,10 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 end BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 - msgbox BattleFrontier_OutsideWest_Text_23D90E, 5 + msgbox BattleFrontier_OutsideWest_Text_23D90E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE - msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 + msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate @@ -72,32 +72,32 @@ BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA return BattleFrontier_OutsideWest_EventScript_23D4D8:: @ 823D4D8 - msgbox BattleFrontier_OutsideWest_Text_23D929, 4 + msgbox BattleFrontier_OutsideWest_Text_23D929, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D4E2:: @ 823D4E2 - msgbox BattleFrontier_OutsideWest_Text_23D6F7, 3 + msgbox BattleFrontier_OutsideWest_Text_23D6F7, MSGBOX_SIGN end BattleFrontier_OutsideWest_EventScript_23D4EB:: @ 823D4EB - msgbox BattleFrontier_OutsideWest_Text_23D737, 3 + msgbox BattleFrontier_OutsideWest_Text_23D737, MSGBOX_SIGN end BattleFrontier_OutsideWest_EventScript_23D4F4:: @ 823D4F4 - msgbox BattleFrontier_OutsideWest_Text_23D772, 3 + msgbox BattleFrontier_OutsideWest_Text_23D772, MSGBOX_SIGN end BattleFrontier_OutsideWest_EventScript_23D4FD:: @ 823D4FD - msgbox BattleFrontier_OutsideWest_Text_23D7A6, 2 + msgbox BattleFrontier_OutsideWest_Text_23D7A6, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D506:: @ 823D4FD - msgbox BattleFrontier_OutsideWest_Text_23D9DD, 2 + msgbox BattleFrontier_OutsideWest_Text_23D9DD, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D50F:: @ 823D50F - msgbox BattleFrontier_OutsideWest_Text_23D99C, 2 + msgbox BattleFrontier_OutsideWest_Text_23D99C, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 @@ -112,7 +112,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 end BattleFrontier_OutsideWest_EventScript_23D52D:: @ 823D52D - msgbox BattleFrontier_OutsideWest_Text_23DABF, 2 + msgbox BattleFrontier_OutsideWest_Text_23DABF, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D536:: @ 823D536 @@ -128,10 +128,10 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8 waitmovement 0 - msgbox BattleFrontier_OutsideWest_Text_23DB7D, 4 + msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4 waitmovement 0 - msgbox BattleFrontier_OutsideWest_Text_23DBCE, 4 + msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT closemessage delay 25 applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6 @@ -152,7 +152,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA compare VAR_FACING, 4 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA - msgbox BattleFrontier_OutsideWest_Text_23DC36, 4 + msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT release end @@ -224,7 +224,7 @@ BattleFrontier_OutsideWest_Movement_23D632: @ 823D632 BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 lock faceplayer - msgbox BattleFrontier_OutsideWest_Text_23DD3B, 4 + msgbox BattleFrontier_OutsideWest_Text_23DD3B, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 1 goto_eq BattleFrontier_OutsideWest_EventScript_23D653 @@ -232,71 +232,71 @@ BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 end BattleFrontier_OutsideWest_EventScript_23D653:: @ 823D653 - msgbox BattleFrontier_OutsideWest_Text_23DD7A, 4 + msgbox BattleFrontier_OutsideWest_Text_23DD7A, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D65D:: @ 823D65D - msgbox BattleFrontier_OutsideWest_Text_23DDAD, 4 + msgbox BattleFrontier_OutsideWest_Text_23DDAD, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D667:: @ 823D667 - msgbox BattleFrontier_OutsideWest_Text_23DE15, 2 + msgbox BattleFrontier_OutsideWest_Text_23DE15, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D670:: @ 823D670 - msgbox BattleFrontier_OutsideWest_Text_23DF7D, 2 + msgbox BattleFrontier_OutsideWest_Text_23DF7D, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D679:: @ 823D679 - msgbox BattleFrontier_OutsideWest_Text_23DEFD, 2 + msgbox BattleFrontier_OutsideWest_Text_23DEFD, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D682:: @ 823D682 - msgbox BattleFrontier_OutsideWest_Text_23DEB4, 2 + msgbox BattleFrontier_OutsideWest_Text_23DEB4, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D68B:: @ 823D68B - msgbox BattleFrontier_OutsideWest_Text_23DFBF, 2 + msgbox BattleFrontier_OutsideWest_Text_23DFBF, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D694:: @ 823D694 - msgbox BattleFrontier_OutsideWest_Text_23E01E, 2 + msgbox BattleFrontier_OutsideWest_Text_23E01E, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D69D:: @ 823D69D - msgbox BattleFrontier_OutsideWest_Text_23E09F, 2 + msgbox BattleFrontier_OutsideWest_Text_23E09F, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6A6:: @ 823D6A6 - msgbox BattleFrontier_OutsideWest_Text_23E102, 2 + msgbox BattleFrontier_OutsideWest_Text_23E102, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6AF:: @ 823D6AF - msgbox BattleFrontier_OutsideWest_Text_23E154, 2 + msgbox BattleFrontier_OutsideWest_Text_23E154, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6B8:: @ 823D6B8 lock - msgbox BattleFrontier_OutsideWest_Text_23E273, 4 + msgbox BattleFrontier_OutsideWest_Text_23E273, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D6C3:: @ 823D6C3 lock - msgbox BattleFrontier_OutsideWest_Text_23E2E9, 4 + msgbox BattleFrontier_OutsideWest_Text_23E2E9, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D6CE:: @ 823D6CE - msgbox BattleFrontier_OutsideWest_Text_23E37E, 2 + msgbox BattleFrontier_OutsideWest_Text_23E37E, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 lock faceplayer - msgbox BattleFrontier_OutsideWest_Text_23E410, 4 + msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT closemessage applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2 waitmovement 0 @@ -304,7 +304,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 end BattleFrontier_OutsideWest_EventScript_23D6EE:: @ 823D6EE - msgbox BattleFrontier_OutsideWest_Text_23E5A5, 2 + msgbox BattleFrontier_OutsideWest_Text_23E5A5, MSGBOX_NPC end BattleFrontier_OutsideWest_Text_23D6F7: @ 823D6F7 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 3dff67a93..e37842cf5 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -16,15 +16,15 @@ BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908 end BattleFrontier_PokemonCenter_1F_EventScript_267916:: @ 8267916 - msgbox BattleFrontier_PokemonCenter_1F_Text_267944, 2 + msgbox BattleFrontier_PokemonCenter_1F_Text_267944, MSGBOX_NPC end BattleFrontier_PokemonCenter_1F_EventScript_26791F:: @ 826791F - msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, 2 + msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, MSGBOX_NPC end BattleFrontier_PokemonCenter_1F_EventScript_267928:: @ 8267928 - msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, 2 + msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, MSGBOX_NPC end BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 @@ -32,7 +32,7 @@ BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, 4 + msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc index 4d0b88090..75bd2ebbb 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc index e469024e9..65b093b32 100644 --- a/data/maps/BattleFrontier_RankingHall/scripts.inc +++ b/data/maps/BattleFrontier_RankingHall/scripts.inc @@ -62,43 +62,43 @@ 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 end BattleFrontier_RankingHall_EventScript_25E52F:: @ 825E52F - msgbox BattleFrontier_RankingHall_Text_25E57C, 2 + msgbox BattleFrontier_RankingHall_Text_25E57C, MSGBOX_NPC end BattleFrontier_RankingHall_EventScript_25E538:: @ 825E538 - msgbox BattleFrontier_RankingHall_Text_25E5F9, 3 + msgbox BattleFrontier_RankingHall_Text_25E5F9, MSGBOX_SIGN end BattleFrontier_RankingHall_EventScript_25E541:: @ 825E541 - msgbox BattleFrontier_RankingHall_Text_25E62E, 3 + msgbox BattleFrontier_RankingHall_Text_25E62E, MSGBOX_SIGN end BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A lock faceplayer - msgbox BattleFrontier_RankingHall_Text_25E666, 5 + msgbox BattleFrontier_RankingHall_Text_25E666, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq BattleFrontier_RankingHall_EventScript_25E569 - msgbox BattleFrontier_RankingHall_Text_25E6B6, 4 + msgbox BattleFrontier_RankingHall_Text_25E6B6, MSGBOX_DEFAULT release end BattleFrontier_RankingHall_EventScript_25E569:: @ 825E569 - msgbox BattleFrontier_RankingHall_Text_25E685, 4 + msgbox BattleFrontier_RankingHall_Text_25E685, MSGBOX_DEFAULT release end BattleFrontier_RankingHall_EventScript_25E573:: @ 825E573 - msgbox BattleFrontier_RankingHall_Text_25E715, 2 + msgbox BattleFrontier_RankingHall_Text_25E715, MSGBOX_NPC end BattleFrontier_RankingHall_Text_25E57C: @ 825E57C diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc index c29718501..551cb802f 100644 --- a/data/maps/BattleFrontier_ReceptionGate/events.inc +++ b/data/maps/BattleFrontier_ReceptionGate/events.inc @@ -2,7 +2,7 @@ BattleFrontier_ReceptionGate_EventObjects: @ 853D420 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 836 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 BattleFrontier_ReceptionGate_MapWarps: @ 853D498 diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index ec38c3e9d..d5364a2af 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 waitmovement 0 applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266580, 4 + msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT closemessage applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D2 waitmovement 0 @@ -27,16 +27,16 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 end BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 - msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 - msgbox BattleFrontier_ReceptionGate_Text_2665F7, 4 + msgbox BattleFrontier_ReceptionGate_Text_2665B2, MSGBOX_DEFAULT + msgbox BattleFrontier_ReceptionGate_Text_2665F7, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message BattleFrontier_ReceptionGate_Text_266676 waitfanfare waitmessage - msgbox BattleFrontier_ReceptionGate_Text_266695, 4 + msgbox BattleFrontier_ReceptionGate_Text_266695, MSGBOX_DEFAULT setflag FLAG_SYS_FRONTIER_PASS - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 - msgbox BattleFrontier_ReceptionGate_Text_266703, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT + msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 @@ -47,14 +47,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 applymovement 255, BattleFrontier_ReceptionGate_Movement_272598 waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266733, 4 + msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0 applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6 applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D7 applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0 waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266764, 4 + msgbox BattleFrontier_ReceptionGate_Text_266764, MSGBOX_DEFAULT closemessage applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E8 waitmovement 0 @@ -121,15 +121,15 @@ BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6 BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2665B2, MSGBOX_DEFAULT + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310 lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_266857, 4 + msgbox BattleFrontier_ReceptionGate_Text_266857, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end @@ -154,59 +154,59 @@ BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320 end BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE - msgbox BattleFrontier_ReceptionGate_Text_2668C2, 4 + msgbox BattleFrontier_ReceptionGate_Text_2668C2, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663BC:: @ 82663BC - msgbox BattleFrontier_ReceptionGate_Text_26696F, 4 + msgbox BattleFrontier_ReceptionGate_Text_26696F, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663CA:: @ 82663CA - msgbox BattleFrontier_ReceptionGate_Text_266A34, 4 + msgbox BattleFrontier_ReceptionGate_Text_266A34, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663D8:: @ 82663D8 - msgbox BattleFrontier_ReceptionGate_Text_266AC2, 4 + msgbox BattleFrontier_ReceptionGate_Text_266AC2, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663E6:: @ 82663E6 - msgbox BattleFrontier_ReceptionGate_Text_266B5D, 4 + msgbox BattleFrontier_ReceptionGate_Text_266B5D, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663F4:: @ 82663F4 - msgbox BattleFrontier_ReceptionGate_Text_266C24, 4 + msgbox BattleFrontier_ReceptionGate_Text_266C24, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_266402:: @ 8266402 - msgbox BattleFrontier_ReceptionGate_Text_266CBB, 4 + msgbox BattleFrontier_ReceptionGate_Text_266CBB, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_266410:: @ 8266410 - msgbox BattleFrontier_ReceptionGate_Text_266D1C, 4 + msgbox BattleFrontier_ReceptionGate_Text_266D1C, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_26641E:: @ 826641E - msgbox BattleFrontier_ReceptionGate_Text_266DCB, 4 + msgbox BattleFrontier_ReceptionGate_Text_266DCB, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_26642C:: @ 826642C - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436 lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_266E66, 4 + msgbox BattleFrontier_ReceptionGate_Text_266E66, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end @@ -225,39 +225,39 @@ BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446 end BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4 - msgbox BattleFrontier_ReceptionGate_Text_266F04, 4 + msgbox BattleFrontier_ReceptionGate_Text_266F04, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664B2:: @ 82664B2 - msgbox BattleFrontier_ReceptionGate_Text_266F69, 4 + msgbox BattleFrontier_ReceptionGate_Text_266F69, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664C0:: @ 82664C0 - msgbox BattleFrontier_ReceptionGate_Text_267080, 4 + msgbox BattleFrontier_ReceptionGate_Text_267080, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664CE:: @ 82664CE - msgbox BattleFrontier_ReceptionGate_Text_26716A, 4 + msgbox BattleFrontier_ReceptionGate_Text_26716A, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664DC:: @ 82664DC - msgbox BattleFrontier_ReceptionGate_Text_267298, 4 + msgbox BattleFrontier_ReceptionGate_Text_267298, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664EA:: @ 82664EA - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4 lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_267357, 4 + msgbox BattleFrontier_ReceptionGate_Text_267357, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end @@ -274,22 +274,22 @@ BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504 end BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C - msgbox BattleFrontier_ReceptionGate_Text_2673A1, 4 + msgbox BattleFrontier_ReceptionGate_Text_2673A1, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end BattleFrontier_ReceptionGate_EventScript_26655A:: @ 826655A - msgbox BattleFrontier_ReceptionGate_Text_2674F3, 4 + msgbox BattleFrontier_ReceptionGate_Text_2674F3, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end BattleFrontier_ReceptionGate_EventScript_266568:: @ 8266568 - msgbox BattleFrontier_ReceptionGate_Text_26761C, 4 + msgbox BattleFrontier_ReceptionGate_Text_26761C, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end BattleFrontier_ReceptionGate_EventScript_266576:: @ 8266576 - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index da73da354..818fb92b0 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -4,11 +4,11 @@ BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7 BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8 lock faceplayer - checkflag FLAG_0x004 + checkflag FLAG_TEMP_4 goto_eq BattleFrontier_ScottsHouse_EventScript_2637DA - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 goto_eq BattleFrontier_ScottsHouse_EventScript_2638AA - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_eq BattleFrontier_ScottsHouse_EventScript_263939 goto BattleFrontier_ScottsHouse_EventScript_2636CB end @@ -46,12 +46,12 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704 goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC checkflag FLAG_SYS_PYRAMID_SILVER goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - msgbox BattleFrontier_ScottsHouse_Text_2640BC, 4 + msgbox BattleFrontier_ScottsHouse_Text_2640BC, MSGBOX_DEFAULT giveitem_std ITEM_LANSAT_BERRY compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 setflag FLAG_0x05C - setflag FLAG_0x004 + setflag FLAG_TEMP_4 release end @@ -70,22 +70,22 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC checkflag FLAG_SYS_PYRAMID_GOLD goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - msgbox BattleFrontier_ScottsHouse_Text_264216, 4 + msgbox BattleFrontier_ScottsHouse_Text_264216, MSGBOX_DEFAULT giveitem_std ITEM_STARF_BERRY compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 setflag FLAG_0x1D2 - setflag FLAG_0x004 + setflag FLAG_TEMP_4 release end BattleFrontier_ScottsHouse_EventScript_2637D0:: @ 82637D0 - msgbox BattleFrontier_ScottsHouse_Text_2643EB, 4 + msgbox BattleFrontier_ScottsHouse_Text_2643EB, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA - msgbox BattleFrontier_ScottsHouse_Text_264373, 4 + msgbox BattleFrontier_ScottsHouse_Text_264373, MSGBOX_DEFAULT release end @@ -95,17 +95,17 @@ BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4 goto_eq BattleFrontier_ScottsHouse_EventScript_263807 compare VAR_RESULT, 2 goto_eq BattleFrontier_ScottsHouse_EventScript_263811 - msgbox BattleFrontier_ScottsHouse_Text_263DDD, 4 + msgbox BattleFrontier_ScottsHouse_Text_263DDD, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_263807:: @ 8263807 - msgbox BattleFrontier_ScottsHouse_Text_263F12, 4 + msgbox BattleFrontier_ScottsHouse_Text_263F12, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811 - msgbox BattleFrontier_ScottsHouse_Text_263FFE, 4 + msgbox BattleFrontier_ScottsHouse_Text_263FFE, MSGBOX_DEFAULT release end @@ -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 @@ -133,22 +133,22 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B end BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A - msgbox BattleFrontier_ScottsHouse_Text_264412, 4 + msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT givedecoration_std 42 compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 setflag FLAG_0x0ED - setflag FLAG_0x003 + setflag FLAG_TEMP_3 goto BattleFrontier_ScottsHouse_EventScript_2638AA end BattleFrontier_ScottsHouse_EventScript_2638A0:: @ 82638A0 - msgbox BattleFrontier_ScottsHouse_Text_264583, 4 + msgbox BattleFrontier_ScottsHouse_Text_264583, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA - msgbox BattleFrontier_ScottsHouse_Text_264546, 4 + msgbox BattleFrontier_ScottsHouse_Text_264546, MSGBOX_DEFAULT release end @@ -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 @@ -176,22 +176,22 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 end BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 - msgbox BattleFrontier_ScottsHouse_Text_26449F, 4 + msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT givedecoration_std 43 compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 setflag FLAG_0x0EE - setflag FLAG_0x003 + setflag FLAG_TEMP_3 goto BattleFrontier_ScottsHouse_EventScript_2638AA end BattleFrontier_ScottsHouse_EventScript_263939:: @ 8263939 - msgbox BattleFrontier_ScottsHouse_Text_263DB8, 4 + msgbox BattleFrontier_ScottsHouse_Text_263DB8, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 - msgbox BattleFrontier_ScottsHouse_Text_263A3F, 4 + msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT closemessage delay 30 compare VAR_FACING, 2 @@ -202,10 +202,10 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29 compare VAR_FACING, 3 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34 - msgbox BattleFrontier_ScottsHouse_Text_263B29, 4 + msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E waitmovement 0 - msgbox BattleFrontier_ScottsHouse_Text_263BD4, 4 + msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT compare VAR_0x40D1, 13 goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC compare VAR_0x40D1, 9 @@ -242,9 +242,9 @@ BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9 BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 special sub_813A9D0 msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9 - msgbox BattleFrontier_ScottsHouse_Text_263CD0, 4 + msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT setflag FLAG_0x1D1 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc index 4093e4086..c5a485f9a 100644 --- a/data/maps/BirthIsland_Exterior/events.inc +++ b/data/maps/BirthIsland_Exterior/events.inc @@ -1,6 +1,6 @@ BirthIsland_Exterior_EventObjects: @ 853D7DC - object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764 - object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 763 + object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE + object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_DEOXYS BirthIsland_Exterior_MapWarps: @ 853D80C warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 787230c60..7bd9c1e60 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -20,14 +20,14 @@ BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 end BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E - setflag FLAG_0x2FB - setflag FLAG_0x2FC + setflag FLAG_HIDE_DEOXYS + setflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE return BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 checkflag FLAG_0x1AC goto_eq BirthIsland_Exterior_EventScript_27374E - clearflag FLAG_0x2FC + clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE clearflag FLAG_0x8D4 return diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index fe939172d..dc3407e33 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -4,10 +4,10 @@ BirthIsland_Harbor_MapScripts:: @ 826805C BirthIsland_Harbor_EventScript_26805D:: @ 826805D lock faceplayer - msgbox BirthIsland_Harbor_Text_2C6B90, 5 + msgbox BirthIsland_Harbor_Text_2C6B90, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BirthIsland_Harbor_EventScript_2680A2 - msgbox BirthIsland_Harbor_Text_2A6A5D, 4 + msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA waitmovement 0 @@ -21,7 +21,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D end BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2 - msgbox BirthIsland_Harbor_Text_2A6A82, 4 + msgbox BirthIsland_Harbor_Text_2A6A82, MSGBOX_DEFAULT release end diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc index bd1b79bc0..94f30d262 100644 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ b/data/maps/CaveOfOrigin_B1F/events.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B1F_EventObjects: @ 8535DD0 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE CaveOfOrigin_B1F_MapWarps: @ 8535DE8 warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 5ac3ec64a..21ff3537b 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -4,7 +4,7 @@ CaveOfOrigin_B1F_MapScripts:: @ 82357A8 CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 lock faceplayer - msgbox CaveOfOrigin_B1F_Text_23586E, 4 + msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT closemessage applymovement 1, CaveOfOrigin_B1F_Movement_2725A6 waitmovement 0 @@ -47,14 +47,14 @@ CaveOfOrigin_B1F_EventScript_235842:: @ 8235842 goto CaveOfOrigin_B1F_EventScript_2357F0 CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D - msgbox CaveOfOrigin_B1F_Text_235CEE, 4 + msgbox CaveOfOrigin_B1F_Text_235CEE, MSGBOX_DEFAULT closemessage playse SE_KAIDAN fadescreenspeed 1, 4 setflag FLAG_0x137 setvar VAR_0x405E, 3 removeobject 1 - clearflag FLAG_0x357 + clearflag FLAG_HIDE_SKY_PILLAR_WALLACE fadescreen 0 release end diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index 036127ca8..e7a815ce0 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -1,5 +1,5 @@ DesertRuins_EventObjects: @ 8534354 - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935 + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, FLAG_HIDE_REGIROCK DesertRuins_MapWarps: @ 853436C warp_def 8, 29, 3, 1, MAP_ROUTE111 diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 45d192c80..760336d91 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -37,7 +37,7 @@ DesertRuins_MapScript1_22D9CA: @ 822D9CA end DesertRuins_EventScript_22D9D7:: @ 822D9D7 - clearflag FLAG_0x3A7 + clearflag FLAG_HIDE_REGIROCK return DesertRuins_EventScript_22D9DB:: @ 822D9DB @@ -51,7 +51,7 @@ DesertRuins_EventScript_22D9DB:: @ 822D9DB end DesertRuins_EventScript_22D9EE:: @ 822D9EE - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc index 76215c65a..aec461c34 100644 --- a/data/maps/DesertUnderpass/events.inc +++ b/data/maps/DesertUnderpass/events.inc @@ -1,5 +1,5 @@ DesertUnderpass_EventObjects: @ 85376D4 - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, 874 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL DesertUnderpass_MapWarps: @ 85376EC warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index aa637587c..3d2d0af4a 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -1,8 +1,8 @@ DewfordTown_EventObjects: @ 8527964 object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740 + object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 743 + object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 DewfordTown_MapWarps: @ 85279DC diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 157c1f4d5..07f7d9ac8 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -22,53 +22,53 @@ DewfordTown_EventScript_1E9511:: @ 81E9511 end DewfordTown_EventScript_1E955A:: @ 81E955A - msgbox DewfordTown_Text_1E9CE5, 4 + msgbox DewfordTown_Text_1E9CE5, MSGBOX_DEFAULT closemessage goto DewfordTown_EventScript_1E9660 release end DewfordTown_EventScript_1E956A:: @ 81E956A - msgbox DewfordTown_Text_1E9D3A, 4 + msgbox DewfordTown_Text_1E9D3A, MSGBOX_DEFAULT closemessage goto DewfordTown_EventScript_1E96E7 release end DewfordTown_EventScript_1E957A:: @ 81E957A - msgbox DewfordTown_Text_1E9D8F, 4 + msgbox DewfordTown_Text_1E9D8F, MSGBOX_DEFAULT closemessage release end DewfordTown_EventScript_1E9585:: @ 81E9585 - msgbox DewfordTown_Text_1E9B24, 5 + msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E95A2 - msgbox DewfordTown_Text_1E9BD9, 4 + msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E95A2:: @ 81E95A2 - msgbox DewfordTown_Text_1E9B7F, 4 + msgbox DewfordTown_Text_1E9B7F, MSGBOX_DEFAULT closemessage goto DewfordTown_EventScript_1E9660 end DewfordTown_EventScript_1E95B1:: @ 81E95B1 - msgbox DewfordTown_Text_1E99A8, 2 + msgbox DewfordTown_Text_1E99A8, MSGBOX_NPC end DewfordTown_EventScript_1E95BA:: @ 81E95BA - msgbox DewfordTown_Text_1E9A0F, 3 + msgbox DewfordTown_Text_1E9A0F, MSGBOX_SIGN end DewfordTown_EventScript_1E95C3:: @ 81E95C3 - msgbox DewfordTown_Text_1E9A3D, 3 + msgbox DewfordTown_Text_1E9A3D, MSGBOX_SIGN end DewfordTown_EventScript_1E95CC:: @ 81E95CC - msgbox DewfordTown_Text_1E9A7F, 3 + msgbox DewfordTown_Text_1E9A7F, MSGBOX_SIGN end DewfordTown_EventScript_1E95D5:: @ 81E95D5 @@ -76,7 +76,7 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5 faceplayer checkflag FLAG_0x101 goto_eq DewfordTown_EventScript_1E962A - msgbox DewfordTown_Text_1E9DD1, 5 + msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E95FF compare VAR_RESULT, 0 @@ -84,15 +84,15 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5 end DewfordTown_EventScript_1E95FF:: @ 81E95FF - msgbox DewfordTown_Text_1E9E14, 4 + msgbox DewfordTown_Text_1E9E14, MSGBOX_DEFAULT giveitem_std ITEM_OLD_ROD setflag FLAG_0x101 - msgbox DewfordTown_Text_1E9E65, 4 + msgbox DewfordTown_Text_1E9E65, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9620:: @ 81E9620 - msgbox DewfordTown_Text_1E9F92, 4 + msgbox DewfordTown_Text_1E9F92, MSGBOX_DEFAULT release end @@ -107,12 +107,12 @@ DewfordTown_EventScript_1E962A:: @ 81E962A end DewfordTown_EventScript_1E964C:: @ 81E964C - msgbox DewfordTown_Text_1E9FD0, 4 + msgbox DewfordTown_Text_1E9FD0, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9656:: @ 81E9656 - msgbox DewfordTown_Text_1EA004, 4 + msgbox DewfordTown_Text_1EA004, MSGBOX_DEFAULT release end @@ -135,10 +135,10 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 applymovement 255, DewfordTown_Movement_1E9914 waitmovement 0 showobjectat 255, MAP_ROUTE104 - clearflag FLAG_0x2E3 - clearflag FLAG_0x371 - clearflag FLAG_0x2E6 - setflag FLAG_0x2E7 + clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO + clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN setvar VAR_0x408E, 2 resetobjectpriority 255, MAP_DEWFORD_TOWN @@ -171,10 +171,10 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 setobjectpriority 2, MAP_ROUTE109, 0 applymovement 2, DewfordTown_Movement_1E991F waitmovement 0 - clearflag FLAG_0x2E5 + clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY addobject 1 - clearflag FLAG_0x2E8 - setflag FLAG_0x2E7 + clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN checkflag FLAG_0x095 call_if 0, DewfordTown_EventScript_1E9790 @@ -189,11 +189,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 end DewfordTown_EventScript_1E9790:: @ 81E9790 - msgbox DewfordTown_Text_1EEC1D, 4 + msgbox DewfordTown_Text_1EEC1D, MSGBOX_DEFAULT return DewfordTown_EventScript_1E9799:: @ 81E9799 - msgbox DewfordTown_Text_1EEDA7, 4 + msgbox DewfordTown_Text_1EEDA7, MSGBOX_DEFAULT return DewfordTown_Movement_1E97A2: @ 81E97A2 @@ -598,7 +598,7 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 lock faceplayer call DewfordTown_EventScript_271E8B - msgbox DewfordTown_Text_1EA136, 5 + msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E9948 compare VAR_RESULT, 0 @@ -606,12 +606,12 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 end DewfordTown_EventScript_1E9948:: @ 81E9948 - msgbox DewfordTown_Text_1EA491, 4 + msgbox DewfordTown_Text_1EA491, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9952:: @ 81E9952 - msgbox DewfordTown_Text_1EA242, 4 + msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT setvar VAR_0x8004, 9 call DewfordTown_EventScript_271E7C lock @@ -626,17 +626,17 @@ DewfordTown_EventScript_1E997D:: @ 81E997D incrementgamestat 2 compare VAR_0x8004, 0 goto_eq DewfordTown_EventScript_1E999E - msgbox DewfordTown_Text_1EA2AA, 4 + msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9994:: @ 81E9994 - msgbox DewfordTown_Text_1EA443, 4 + msgbox DewfordTown_Text_1EA443, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E999E:: @ 81E999E - msgbox DewfordTown_Text_1EA3FE, 4 + msgbox DewfordTown_Text_1EA3FE, MSGBOX_DEFAULT release end diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 6acd67792..ade729c96 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -156,13 +156,13 @@ DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 return DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 - trainerbattle 1, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7 + trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq DewfordTown_Gym_EventScript_1FC89C checkflag FLAG_0x0A6 goto_if 0, DewfordTown_Gym_EventScript_1FC878 - msgbox DewfordTown_Gym_Text_1FD20D, 4 + msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT release end @@ -171,7 +171,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 message DewfordTown_Gym_Text_1FD07D waitmessage call DewfordTown_Gym_EventScript_27207E - msgbox DewfordTown_Gym_Text_1FD0A8, 4 + msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT setflag FLAG_0x4F1 setflag FLAG_BADGE02_GET addvar VAR_0x4085, 1 @@ -183,7 +183,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox DewfordTown_Gym_Text_1FD1E0, 4 + msgbox DewfordTown_Gym_Text_1FD1E0, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -197,7 +197,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 goto_eq DewfordTown_Gym_EventScript_27205E - msgbox DewfordTown_Gym_Text_1FD181, 4 + msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_0x0A6 return @@ -205,19 +205,19 @@ DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 goto_eq DewfordTown_Gym_EventScript_272054 - msgbox DewfordTown_Gym_Text_1FD181, 4 + msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_0x0A6 release end DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C - trainerbattle 7, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE - msgbox DewfordTown_Gym_Text_1FD37B, 6 + trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE + msgbox DewfordTown_Gym_Text_1FD37B, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7 - trainerbattle 2, TRAINER_TAKAO, 0, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 - msgbox DewfordTown_Gym_Text_1FCBCA, 6 + trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 + msgbox DewfordTown_Gym_Text_1FCBCA, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 @@ -226,8 +226,8 @@ DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 end DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9 - trainerbattle 2, TRAINER_JOCELYN, 0, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 - msgbox DewfordTown_Gym_Text_1FCC6B, 6 + trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 + msgbox DewfordTown_Gym_Text_1FCC6B, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 @@ -236,8 +236,8 @@ DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 end DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB - trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 - msgbox DewfordTown_Gym_Text_1FCD4F, 6 + trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 + msgbox DewfordTown_Gym_Text_1FCD4F, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 @@ -246,8 +246,8 @@ DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 end DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D - trainerbattle 2, TRAINER_BRENDEN, 0, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 - msgbox DewfordTown_Gym_Text_1FCEAB, 6 + trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 + msgbox DewfordTown_Gym_Text_1FCEAB, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 @@ -256,8 +256,8 @@ DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 end DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F - trainerbattle 2, TRAINER_CRISTIAN, 0, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A - msgbox DewfordTown_Gym_Text_1FCF26, 6 + trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A + msgbox DewfordTown_Gym_Text_1FCF26, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A @@ -266,8 +266,8 @@ DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A end DewfordTown_Gym_EventScript_1FC961:: @ 81FC961 - trainerbattle 2, TRAINER_LILITH, 0, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C - msgbox DewfordTown_Gym_Text_1FCE08, 6 + trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C + msgbox DewfordTown_Gym_Text_1FCE08, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C @@ -280,12 +280,12 @@ DewfordTown_Gym_EventScript_1FC983:: @ 81FC983 faceplayer checkflag FLAG_0x4F1 goto_eq DewfordTown_Gym_EventScript_1FC998 - msgbox DewfordTown_Gym_Text_1FC9D6, 4 + msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT release end DewfordTown_Gym_EventScript_1FC998:: @ 81FC998 - msgbox DewfordTown_Gym_Text_1FCB5C, 4 + msgbox DewfordTown_Gym_Text_1FCB5C, MSGBOX_DEFAULT release end @@ -304,12 +304,12 @@ DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2 end DewfordTown_Gym_EventScript_1FC9C2:: @ 81FC9C2 - msgbox DewfordTown_Gym_Text_1FD28B, 4 + msgbox DewfordTown_Gym_Text_1FD28B, MSGBOX_DEFAULT releaseall end DewfordTown_Gym_EventScript_1FC9CC:: @ 81FC9CC - msgbox DewfordTown_Gym_Text_1FD272, 4 + msgbox DewfordTown_Gym_Text_1FD272, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index 3f150c6f6..4f1881f92 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -7,7 +7,7 @@ DewfordTown_Hall_EventObjects: @ 852DC48 object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN DewfordTown_Hall_MapWarps: @ 852DD20 warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 37122a640..fa142696c 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -8,12 +8,12 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 special TrendyPhraseIsOld compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD4EF - msgbox DewfordTown_Hall_Text_1FD818, 4 + msgbox DewfordTown_Hall_Text_1FD818, MSGBOX_DEFAULT release end DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF - msgbox DewfordTown_Hall_Text_1FD877, 4 + msgbox DewfordTown_Hall_Text_1FD877, MSGBOX_DEFAULT release end @@ -21,7 +21,7 @@ DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FD8ED, 4 + msgbox DewfordTown_Hall_Text_1FD8ED, MSGBOX_DEFAULT release end @@ -30,7 +30,7 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A faceplayer call DewfordTown_Hall_EventScript_271E8B special sub_811EF6C - msgbox DewfordTown_Hall_Text_1FD948, 5 + msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD533 compare VAR_RESULT, 0 @@ -38,12 +38,12 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A end DewfordTown_Hall_EventScript_1FD533:: @ 81FD533 - msgbox DewfordTown_Hall_Text_1FD9B3, 4 + msgbox DewfordTown_Hall_Text_1FD9B3, MSGBOX_DEFAULT release end DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D - msgbox DewfordTown_Hall_Text_1FDA06, 4 + msgbox DewfordTown_Hall_Text_1FDA06, MSGBOX_DEFAULT release end @@ -51,7 +51,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA5C, 4 + msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT closemessage applymovement 4, DewfordTown_Hall_Movement_2725A6 waitmovement 0 @@ -62,7 +62,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA99, 4 + msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT closemessage applymovement 5, DewfordTown_Hall_Movement_2725A6 waitmovement 0 @@ -73,14 +73,14 @@ DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDAC4, 4 + msgbox DewfordTown_Hall_Text_1FDAC4, MSGBOX_DEFAULT release end DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 lockall call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDB89, 4 + msgbox DewfordTown_Hall_Text_1FDB89, MSGBOX_DEFAULT releaseall end @@ -100,22 +100,22 @@ DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 end DewfordTown_Hall_EventScript_1FD607:: @ 81FD607 - msgbox DewfordTown_Hall_Text_1FDC05, 4 + msgbox DewfordTown_Hall_Text_1FDC05, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD611:: @ 81FD611 - msgbox DewfordTown_Hall_Text_1FDC21, 4 + msgbox DewfordTown_Hall_Text_1FDC21, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B - msgbox DewfordTown_Hall_Text_1FDC3C, 4 + msgbox DewfordTown_Hall_Text_1FDC3C, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD625:: @ 81FD625 - msgbox DewfordTown_Hall_Text_1FDC57, 4 + msgbox DewfordTown_Hall_Text_1FDC57, MSGBOX_DEFAULT releaseall end @@ -147,41 +147,41 @@ DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDC76, 4 + msgbox DewfordTown_Hall_Text_1FDC76, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDCE2, 4 + msgbox DewfordTown_Hall_Text_1FDCE2, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9 call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDD95, 4 + msgbox DewfordTown_Hall_Text_1FDD95, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDE0E, 4 + msgbox DewfordTown_Hall_Text_1FDE0E, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5 call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDE77, 4 + msgbox DewfordTown_Hall_Text_1FDE77, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDED8, 4 + msgbox DewfordTown_Hall_Text_1FDED8, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD701:: @ 81FD701 call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDF72, 4 + msgbox DewfordTown_Hall_Text_1FDF72, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDFF1, 4 + msgbox DewfordTown_Hall_Text_1FDFF1, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FE09A, 4 + msgbox DewfordTown_Hall_Text_1FE09A, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FE0F2, 4 + msgbox DewfordTown_Hall_Text_1FE0F2, MSGBOX_DEFAULT releaseall end @@ -252,18 +252,18 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA lock faceplayer call DewfordTown_Hall_EventScript_271E8B - checkflag FLAG_0x0E6 + checkflag FLAG_RECEIVED_TM_36 goto_eq DewfordTown_Hall_EventScript_1FD80E - msgbox DewfordTown_Hall_Text_1FE142, 4 + msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT giveitem_std ITEM_TM36 compare VAR_RESULT, 0 goto_eq DewfordTown_Hall_EventScript_272054 - setflag FLAG_0x0E6 + setflag FLAG_RECEIVED_TM_36 release end DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E - msgbox DewfordTown_Hall_Text_1FE1ED, 4 + msgbox DewfordTown_Hall_Text_1FE1ED, MSGBOX_DEFAULT release end diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc index 59c490d81..d051cfc19 100644 --- a/data/maps/DewfordTown_House1/scripts.inc +++ b/data/maps/DewfordTown_House1/scripts.inc @@ -2,11 +2,11 @@ DewfordTown_House1_MapScripts:: @ 81FC3CD .byte 0 DewfordTown_House1_EventScript_1FC3CE:: @ 81FC3CE - msgbox DewfordTown_House1_Text_1FC3F3, 2 + msgbox DewfordTown_House1_Text_1FC3F3, MSGBOX_NPC end DewfordTown_House1_EventScript_1FC3D7:: @ 81FC3D7 - msgbox DewfordTown_House1_Text_1FC45B, 2 + msgbox DewfordTown_House1_Text_1FC45B, MSGBOX_NPC end DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 @@ -14,7 +14,7 @@ DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox DewfordTown_House1_Text_1FC510, 4 + msgbox DewfordTown_House1_Text_1FC510, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index 1805164af..2385b8328 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -6,7 +6,7 @@ DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E faceplayer checkflag FLAG_0x121 goto_eq DewfordTown_House2_EventScript_1FE267 - msgbox DewfordTown_House2_Text_1FE27A, 4 + msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT giveitem_std ITEM_SILK_SCARF compare VAR_RESULT, 0 goto_eq DewfordTown_House2_EventScript_1FE25D @@ -15,17 +15,17 @@ DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E end DewfordTown_House2_EventScript_1FE25D:: @ 81FE25D - msgbox DewfordTown_House2_Text_1FE356, 4 + msgbox DewfordTown_House2_Text_1FE356, MSGBOX_DEFAULT release end DewfordTown_House2_EventScript_1FE267:: @ 81FE267 - msgbox DewfordTown_House2_Text_1FE3D1, 4 + msgbox DewfordTown_House2_Text_1FE3D1, MSGBOX_DEFAULT release end DewfordTown_House2_EventScript_1FE271:: @ 81FE271 - msgbox DewfordTown_House2_Text_1FE444, 2 + msgbox DewfordTown_House2_Text_1FE444, MSGBOX_NPC end DewfordTown_House2_Text_1FE27A: @ 81FE27A diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index a9ce59bc1..e01e37f7b 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -17,11 +17,11 @@ DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537 end DewfordTown_PokemonCenter_1F_EventScript_1FC545:: @ 81FC545 - msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, 2 + msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, MSGBOX_NPC end DewfordTown_PokemonCenter_1F_EventScript_1FC54E:: @ 81FC54E - msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, 2 + msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, MSGBOX_NPC end DewfordTown_PokemonCenter_1F_Text_1FC557: @ 81FC557 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc index f9d67ecbf..4f37111a5 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 178621217..5bb85a3c1 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -8,15 +8,15 @@ EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 end EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B - msgbox EverGrandeCity_Text_1E7D4F, 3 + msgbox EverGrandeCity_Text_1E7D4F, MSGBOX_SIGN end EverGrandeCity_EventScript_1E7D34:: @ 81E7D34 - msgbox EverGrandeCity_Text_1E7D89, 3 + msgbox EverGrandeCity_Text_1E7D89, MSGBOX_SIGN end EverGrandeCity_EventScript_1E7D3D:: @ 81E7D3D - msgbox EverGrandeCity_Text_1E7D65, 3 + msgbox EverGrandeCity_Text_1E7D65, MSGBOX_SIGN end EverGrandeCity_EventScript_1E7D46:: @ 81E7D46 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index b09221dca..bd4cc71e3 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 920 - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 921 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 3e68f4fed..2bba37d4d 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -39,8 +39,8 @@ EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 playbgm MUS_DAIGO, 0 - msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, 4 - trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC + msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_228EAC goto EverGrandeCity_ChampionsRoom_EventScript_228A61 end @@ -49,7 +49,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 setmetatile 6, 1, 838, 0 setmetatile 6, 2, 839, 0 special DrawWholeMapView - msgbox EverGrandeCity_ChampionsRoom_Text_228F66, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_228F66, MSGBOX_DEFAULT closemessage playse SE_DOOR checkplayergender @@ -75,7 +75,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1 return EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 - msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 @@ -83,12 +83,12 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_22910B, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT goto EverGrandeCity_ChampionsRoom_EventScript_228B30 end EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB - msgbox EverGrandeCity_ChampionsRoom_Text_229152, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 @@ -96,7 +96,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT goto EverGrandeCity_ChampionsRoom_EventScript_228B30 end @@ -107,15 +107,15 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 waitmovement 0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A8 waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 - msgbox EverGrandeCity_ChampionsRoom_Text_22934D, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6 waitmovement 0 delay 20 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_229399, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B @@ -126,7 +126,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 delay 20 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725AA waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender compare VAR_RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB @@ -136,18 +136,18 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20 waitmovement 0 - setflag FLAG_0x30D + setflag FLAG_HIDE_PETALBURG_GYM_GREETER warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall end EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB - msgbox EverGrandeCity_ChampionsRoom_Text_229479, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_229479, MSGBOX_DEFAULT return EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 - msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, MSGBOX_DEFAULT return EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 4c90417af..519bb535f 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -44,13 +44,13 @@ EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 checkflag FLAG_0x4FE goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_DrakesRoom_Text_22873E, 4 - trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_228895 + msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895 goto EverGrandeCity_DrakesRoom_EventScript_228724 end EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, 4 + msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT release end @@ -59,7 +59,7 @@ EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724 special sub_813BF7C setflag FLAG_0x4FE call EverGrandeCity_DrakesRoom_EventScript_2723F8 - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, 4 + msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index f1d846f03..0f7d2248d 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -44,20 +44,20 @@ EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 checkflag FLAG_0x4FD goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490 playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, 4 - trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_2285B4 + msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4 goto EverGrandeCity_GlaciasRoom_EventScript_22849A end EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, 4 + msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT release end EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A setflag FLAG_0x4FD call EverGrandeCity_GlaciasRoom_EventScript_2723F8 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, 4 + msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 763d2ebb1..8f510c13e 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -23,7 +23,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_22990E, 4 + msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_229908 applymovement 255, EverGrandeCity_HallOfFame_Movement_229908 @@ -32,7 +32,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_2299A3, 4 + msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A6 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 679e4f663..a1062bab5 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -44,20 +44,20 @@ EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB checkflag FLAG_0x4FC goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2 playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_PhoebesRoom_Text_22820E, 4 - trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_228325 + msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325 goto EverGrandeCity_PhoebesRoom_EventScript_2281FC end EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, 4 + msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT release end EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC setflag FLAG_0x4FC call EverGrandeCity_PhoebesRoom_EventScript_2723F8 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, 4 + msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc index f6fa3987f..23e555622 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc @@ -2,7 +2,7 @@ EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 16b82a592..e1ec4c671 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -12,7 +12,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C checkflag FLAG_BADGE06_GET goto_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_27374E - clearflag FLAG_0x319 + clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT return EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 @@ -24,17 +24,17 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 end EverGrandeCity_PokemonCenter_1F_EventScript_229A67:: @ 8229A67 - msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, 2 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, MSGBOX_NPC end EverGrandeCity_PokemonCenter_1F_EventScript_229A70:: @ 8229A70 - msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, 2 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, MSGBOX_NPC end EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 lock faceplayer - msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, 4 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc index 08dbeb5c6..855336146 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index b4046d022..7477cf5d5 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -29,7 +29,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A message gUnknown_08272A21 waitmessage pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -88,14 +88,14 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3 EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE playse SE_HAZURE - msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, 4 + msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, MSGBOX_DEFAULT releaseall end EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E waitmovement 0 - msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, 4 + msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2 waitmovement 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc index 18d45eef9..b6497d824 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc @@ -2,7 +2,7 @@ EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index b2db55e36..f8182bbf3 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 setflag FLAG_0x1CF - setflag FLAG_0x319 + setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT end EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D @@ -51,20 +51,20 @@ EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 checkflag FLAG_0x4FB goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_SidneysRoom_Text_227FA7, 4 - trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_2280A2 + msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2 goto EverGrandeCity_SidneysRoom_EventScript_227F95 end EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, 4 + msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT release end EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 setflag FLAG_0x4FB call EverGrandeCity_SidneysRoom_EventScript_2723F8 - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, 4 + msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index b2246ad5a..9b2f0a2de 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -2,7 +2,7 @@ FallarborTown_EventObjects: @ 8527BE0 object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907 + object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL FallarborTown_MapWarps: @ 8527C40 warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART @@ -19,7 +19,7 @@ FallarborTown_MapBGEvents: @ 8527C68 bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259 bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 - bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, 28 + bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET FallarborTown_MapEvents:: @ 8527CC8 map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 21cea72e1..80dc91f9e 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -13,21 +13,21 @@ FallarborTown_EventScript_1EB20C:: @ 81EB20C faceplayer checkflag FLAG_0x08B goto_eq FallarborTown_EventScript_1EB221 - msgbox FallarborTown_Text_1EB26B, 4 + msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT release end FallarborTown_EventScript_1EB221:: @ 81EB221 - msgbox FallarborTown_Text_1EB2DE, 4 + msgbox FallarborTown_Text_1EB2DE, MSGBOX_DEFAULT release end FallarborTown_EventScript_1EB22B:: @ 81EB22B - msgbox FallarborTown_Text_1EB35F, 2 + msgbox FallarborTown_Text_1EB35F, MSGBOX_NPC end FallarborTown_EventScript_1EB234:: @ 81EB234 - msgbox FallarborTown_Text_1EB3CA, 2 + msgbox FallarborTown_Text_1EB3CA, MSGBOX_NPC end FallarborTown_EventScript_1EB23D:: @ 81EB23D @@ -35,21 +35,21 @@ FallarborTown_EventScript_1EB23D:: @ 81EB23D faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox FallarborTown_Text_1EB3B5, 4 + msgbox FallarborTown_Text_1EB3B5, MSGBOX_DEFAULT waitmoncry release end FallarborTown_EventScript_1EB250:: @ 81EB250 - msgbox FallarborTown_Text_1EB4C2, 3 + msgbox FallarborTown_Text_1EB4C2, MSGBOX_SIGN end FallarborTown_EventScript_1EB259:: @ 81EB259 - msgbox FallarborTown_Text_1EB4FE, 3 + msgbox FallarborTown_Text_1EB4FE, MSGBOX_SIGN end FallarborTown_EventScript_1EB262:: @ 81EB262 - msgbox FallarborTown_Text_1EB534, 3 + msgbox FallarborTown_Text_1EB534, MSGBOX_SIGN end FallarborTown_Text_1EB26B: @ 81EB26B diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index e373ff5ad..f3e1edbbf 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 @@ -51,10 +51,10 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F playse SE_W187 waitse waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, MSGBOX_DEFAULT setvar VAR_0x8004, 4 special sub_81B99B4 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call FallarborTown_BattleTentBattleRoom_EventScript_257B6C switch VAR_RESULT @@ -65,13 +65,13 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F waitmovement 0 setvar VAR_0x8004, 6 special sub_81B9B80 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, MSGBOX_DEFAULT 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 @@ -81,18 +81,18 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C playse SE_BAN waitse waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, MSGBOX_DEFAULT closemessage 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 @@ -102,12 +102,12 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 waitmovement 0 applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, MSGBOX_DEFAULT special LoadPlayerParty 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 @@ -127,7 +127,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A case 2, FallarborTown_BattleTentBattleRoom_EventScript_200AA6 FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78 - msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, 5 + msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_BattleTentBattleRoom_EventScript_200A2A case 1, FallarborTown_BattleTentBattleRoom_EventScript_200B51 @@ -156,20 +156,20 @@ 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 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - special sub_81A5238 + special CallBattleArenaFunction compare VAR_RESULT, 9999 goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT - special sub_81A5238 + special CallBattleArenaFunction FallarborTown_BattleTentBattleRoom_EventScript_200B43:: @ 8200B43 message FallarborTown_BattleTentBattleRoom_Text_257D17 @@ -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/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc index 937a15f27..6a9741c50 100644 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ b/data/maps/FallarborTown_BattleTentLobby/events.inc @@ -3,7 +3,7 @@ FallarborTown_BattleTentLobby_EventObjects: @ 852E370 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index daf76cba2..34906cfd3 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -22,28 +22,28 @@ 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 lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4DED, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4DED, MSGBOX_DEFAULT closemessage 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 FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT message FallarborTown_BattleTentLobby_Text_2C4EFF waitmessage setvar VAR_0x8004, 4 @@ -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 @@ -59,7 +59,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED waitse FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 - msgbox FallarborTown_BattleTentLobby_Text_2C4F22, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT setvar VAR_0x8004, 5 special sub_81B9B80 switch VAR_RESULT @@ -67,19 +67,19 @@ 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 waitfanfare - msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall end FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73 - msgbox FallarborTown_BattleTentLobby_Text_2C4F83, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4F83, MSGBOX_DEFAULT waitmessage closemessage setvar VAR_TEMP_0, 255 @@ -88,7 +88,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73 FallarborTown_BattleTentLobby_EventScript_1FFF84:: @ 81FFF84 lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_1FFF27 end @@ -99,13 +99,13 @@ 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 playse SE_SAVE waitse - msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -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 @@ -135,7 +135,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 compare VAR_RESULT, 0 goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84 special SavePlayerParty - msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C47EB, MSGBOX_DEFAULT FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021 message FallarborTown_BattleTentLobby_Text_2C4843 @@ -152,14 +152,14 @@ 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 - msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4 + special CallFrontierUtilFunc + msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 @@ -167,7 +167,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D waitstate compare VAR_RESULT, 0 goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2 - msgbox FallarborTown_BattleTentLobby_Text_2C4B35, 5 + msgbox FallarborTown_BattleTentLobby_Text_2C4B35, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_BattleTentLobby_EventScript_2001C2 case 1, FallarborTown_BattleTentLobby_EventScript_2000E2 @@ -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,8 +200,8 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4 + special CallFrontierUtilFunc + msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, MSGBOX_DEFAULT closemessage call FallarborTown_BattleTentLobby_EventScript_2001CF warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 @@ -210,7 +210,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C end FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169 - msgbox FallarborTown_BattleTentLobby_Text_2C48AC, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C48AC, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_200021 FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176 @@ -219,25 +219,25 @@ FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176 case 1, FallarborTown_BattleTentLobby_EventScript_20019E FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191 - msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_2001CD FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E - msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_2001CD 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 special LoadPlayerParty FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5 - msgbox FallarborTown_BattleTentLobby_Text_2C487F, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C487F, MSGBOX_DEFAULT FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD release @@ -280,15 +280,15 @@ FallarborTown_BattleTentLobby_Movement_200209: @ 8200209 step_end FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D - msgbox FallarborTown_BattleTentLobby_Text_20045A, 2 + msgbox FallarborTown_BattleTentLobby_Text_20045A, MSGBOX_NPC end FallarborTown_BattleTentLobby_EventScript_200216:: @ 8200216 - msgbox FallarborTown_BattleTentLobby_Text_200304, 2 + msgbox FallarborTown_BattleTentLobby_Text_200304, MSGBOX_NPC end FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F - msgbox FallarborTown_BattleTentLobby_Text_200382, 2 + msgbox FallarborTown_BattleTentLobby_Text_200382, MSGBOX_NPC end FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 @@ -296,20 +296,20 @@ FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 faceplayer checkflag FLAG_0x1CD goto_eq FallarborTown_BattleTentLobby_EventScript_200245 - msgbox FallarborTown_BattleTentLobby_Text_200501, 4 + msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CD release end FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245 - msgbox FallarborTown_BattleTentLobby_Text_200653, 4 + msgbox FallarborTown_BattleTentLobby_Text_200653, MSGBOX_DEFAULT release end FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F lockall - msgbox FallarborTown_BattleTentLobby_Text_256DB8, 4 + msgbox FallarborTown_BattleTentLobby_Text_256DB8, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end @@ -328,27 +328,27 @@ FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E end FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC - msgbox FallarborTown_BattleTentLobby_Text_2C67CD, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA - msgbox FallarborTown_BattleTentLobby_Text_256E02, 4 + msgbox FallarborTown_BattleTentLobby_Text_256E02, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8 - msgbox FallarborTown_BattleTentLobby_Text_256F43, 4 + msgbox FallarborTown_BattleTentLobby_Text_256F43, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6 - msgbox FallarborTown_BattleTentLobby_Text_256FF2, 4 + msgbox FallarborTown_BattleTentLobby_Text_256FF2, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4 - msgbox FallarborTown_BattleTentLobby_Text_257202, 4 + msgbox FallarborTown_BattleTentLobby_Text_257202, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc index 972ba61b6..da261afb4 100644 --- a/data/maps/FallarborTown_House1/events.inc +++ b/data/maps/FallarborTown_House1/events.inc @@ -1,5 +1,5 @@ FallarborTown_House1_EventObjects: @ 852E5B8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 FallarborTown_House1_MapWarps: @ 852E5E8 diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 47459f8d5..e759b43b3 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -9,45 +9,45 @@ FallarborTown_House1_EventScript_200F13:: @ 8200F13 checkitem ITEM_METEORITE, 1 compare VAR_RESULT, 1 goto_eq FallarborTown_House1_EventScript_200F38 - msgbox FallarborTown_House1_Text_200FEE, 4 + msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200F38:: @ 8200F38 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, FallarborTown_House1_EventScript_200F8B - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 1, FallarborTown_House1_EventScript_200F9C compare VAR_RESULT, 0 goto_eq FallarborTown_House1_EventScript_200FA5 - msgbox FallarborTown_House1_Text_201159, 4 + msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 goto_eq FallarborTown_House1_EventScript_272054 setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 setflag FLAG_0x0E5 - msgbox FallarborTown_House1_Text_2011A5, 4 + msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200F8B:: @ 8200F8B - msgbox FallarborTown_House1_Text_200FEE, 4 - msgbox FallarborTown_House1_Text_2010A2, 5 + msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT + msgbox FallarborTown_House1_Text_2010A2, MSGBOX_YESNO return FallarborTown_House1_EventScript_200F9C:: @ 8200F9C - msgbox FallarborTown_House1_Text_201249, 5 + msgbox FallarborTown_House1_Text_201249, MSGBOX_YESNO return FallarborTown_House1_EventScript_200FA5:: @ 8200FA5 - setflag FLAG_0x002 - msgbox FallarborTown_House1_Text_201212, 4 + setflag FLAG_TEMP_2 + msgbox FallarborTown_House1_Text_201212, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 - msgbox FallarborTown_House1_Text_2011A5, 4 + msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT release end @@ -58,17 +58,17 @@ FallarborTown_House1_EventScript_200FBC:: @ 8200FBC goto_eq FallarborTown_House1_EventScript_200FE4 checkflag FLAG_0x08B goto_eq FallarborTown_House1_EventScript_200FDA - msgbox FallarborTown_House1_Text_2012BC, 4 + msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200FDA:: @ 8200FDA - msgbox FallarborTown_House1_Text_201310, 4 + msgbox FallarborTown_House1_Text_201310, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200FE4:: @ 8200FE4 - msgbox FallarborTown_House1_Text_20134B, 4 + msgbox FallarborTown_House1_Text_20134B, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 7ab0666e8..e1d072e49 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -5,10 +5,10 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 lockall applymovement 1, FallarborTown_House2_Movement_27259E waitmovement 0 - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_eq FallarborTown_House2_EventScript_2013A8 - msgbox FallarborTown_House2_Text_20145C, 4 - setflag FLAG_0x001 + msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT + setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_2013A8 end @@ -16,14 +16,14 @@ FallarborTown_House2_EventScript_2013A8:: @ 82013A8 checkitem ITEM_HEART_SCALE, 1 compare VAR_RESULT, 0 goto_eq FallarborTown_House2_EventScript_201452 - msgbox FallarborTown_House2_Text_201541, 5 + msgbox FallarborTown_House2_Text_201541, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_House2_EventScript_201452 goto FallarborTown_House2_EventScript_2013D6 end FallarborTown_House2_EventScript_2013D6:: @ 82013D6 - msgbox FallarborTown_House2_Text_2015A5, 4 + msgbox FallarborTown_House2_Text_2015A5, MSGBOX_DEFAULT special sub_81B951C waitstate compare VAR_0x8004, 255 @@ -37,28 +37,28 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 end FallarborTown_House2_EventScript_20140C:: @ 820140C - msgbox FallarborTown_House2_Text_2015C3, 4 + msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT special TeachMoveTutorMove waitstate compare VAR_0x8004, 0 goto_eq FallarborTown_House2_EventScript_2013D6 - msgbox FallarborTown_House2_Text_201627, 4 + msgbox FallarborTown_House2_Text_201627, MSGBOX_DEFAULT takeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_201452 end FallarborTown_House2_EventScript_201436:: @ 8201436 - msgbox FallarborTown_House2_Text_2015DE, 4 + msgbox FallarborTown_House2_Text_2015DE, MSGBOX_DEFAULT goto FallarborTown_House2_EventScript_2013D6 end FallarborTown_House2_EventScript_201444:: @ 8201444 - msgbox FallarborTown_House2_Text_201697, 4 + msgbox FallarborTown_House2_Text_201697, MSGBOX_DEFAULT goto FallarborTown_House2_EventScript_2013D6 end FallarborTown_House2_EventScript_201452:: @ 8201452 - msgbox FallarborTown_House2_Text_201653, 4 + msgbox FallarborTown_House2_Text_201653, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index dbaf33f4e..4b7e0253c 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -7,7 +7,7 @@ FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF message gUnknown_08272A21 waitmessage pokemart FallarborTown_Mart_Pokemart_1FFCD8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -30,11 +30,11 @@ FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8 end FallarborTown_Mart_EventScript_1FFCF4:: @ 81FFCF4 - msgbox FallarborTown_Mart_Text_1FFD19, 2 + msgbox FallarborTown_Mart_Text_1FFD19, MSGBOX_NPC end FallarborTown_Mart_EventScript_1FFCFD:: @ 81FFCFD - msgbox FallarborTown_Mart_Text_1FFE09, 2 + msgbox FallarborTown_Mart_Text_1FFE09, MSGBOX_NPC end FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06 @@ -42,7 +42,7 @@ FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06 faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox FallarborTown_Mart_Text_1FFDFA, 4 + msgbox FallarborTown_Mart_Text_1FFDFA, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc index 12b7f850e..cb6243c6f 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index d11caa86f..6138c615c 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -17,17 +17,17 @@ FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1 end FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF - msgbox FallarborTown_PokemonCenter_1F_Text_200E22, 2 + msgbox FallarborTown_PokemonCenter_1F_Text_200E22, MSGBOX_NPC end FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8 - msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, 2 + msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, MSGBOX_NPC end FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01 lock faceplayer - msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, 4 + msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT closemessage switch VAR_FACING case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28 @@ -49,7 +49,7 @@ FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38 FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48 playse SE_JIDO_DOA removeobject 4 - clearflag FLAG_0x366 + clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE release end diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc index 563b6bc50..233eab8d9 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 08331b33b..1fd5fdd35 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -19,10 +19,10 @@ FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 lock faceplayer - msgbox FarawayIsland_Entrance_Text_2C6B42, 5 + msgbox FarawayIsland_Entrance_Text_2C6B42, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FarawayIsland_Entrance_EventScript_267CE7 - msgbox FarawayIsland_Entrance_Text_2A6A5D, 4 + msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA waitmovement 0 @@ -36,11 +36,11 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 end FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7 - msgbox FarawayIsland_Entrance_Text_2A6A82, 4 + msgbox FarawayIsland_Entrance_Text_2A6A82, MSGBOX_DEFAULT release end FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1 - msgbox FarawayIsland_Entrance_Text_2C6D5A, 3 + msgbox FarawayIsland_Entrance_Text_2C6D5A, MSGBOX_SIGN end diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc index b9242b5be..fc8d99166 100644 --- a/data/maps/FarawayIsland_Interior/events.inc +++ b/data/maps/FarawayIsland_Interior/events.inc @@ -1,5 +1,5 @@ FarawayIsland_Interior_EventObjects: @ 853D7A0 - object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718 + object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, FLAG_HIDE_MEW FarawayIsland_Interior_MapWarps: @ 853D7B8 warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index 70e41b42d..7b62ab578 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -49,7 +49,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 checkflag FLAG_0x1C7 goto_eq FarawayIsland_Interior_EventScript_27374E - clearflag FLAG_0x2CE + clearflag FLAG_HIDE_MEW setvar VAR_TEMP_1, 0 return @@ -195,10 +195,10 @@ FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0 FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB lockall fadescreenswapbuffers 1 - setflag FLAG_0x2CE + setflag FLAG_HIDE_MEW removeobject 1 fadescreenswapbuffers 0 - msgbox FarawayIsland_Interior_Text_267EF1, 4 + msgbox FarawayIsland_Interior_Text_267EF1, MSGBOX_DEFAULT closemessage releaseall end diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc index 3b3985325..0ea132989 100644 --- a/data/maps/FieryPath/events.inc +++ b/data/maps/FieryPath/events.inc @@ -1,12 +1,12 @@ FieryPath_EventObjects: @ 8534C80 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, 1111 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_13 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_14 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_15 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE FieryPath_MapWarps: @ 8534D40 warp_def 26, 36, 3, 4, MAP_ROUTE112 diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index a040a5327..f0a28345c 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -9,7 +9,7 @@ FieryPath_MapScript1_230F2A: @ 8230F2A end FieryPath_EventScript_230F37:: @ 8230F37 - setflag FLAG_0x2FE - clearflag FLAG_0x2FF + setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT + clearflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT return diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index d0cede5fc..4dc9f3e83 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -5,7 +5,7 @@ FortreeCity_EventObjects: @ 8526B9C object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, 969 + object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, FLAG_HIDE_FORTREE_CITY_KECLEON FortreeCity_MapWarps: @ 8526C44 warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 4a28a180b..ad126f3bf 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -12,7 +12,7 @@ FortreeCity_MapScript1_1E25B3: @ 81E25B3 end FortreeCity_EventScript_1E25B6:: @ 81E25B6 - msgbox FortreeCity_Text_1E2676, 2 + msgbox FortreeCity_Text_1E2676, MSGBOX_NPC end FortreeCity_EventScript_1E25BF:: @ 81E25BF @@ -20,37 +20,37 @@ FortreeCity_EventScript_1E25BF:: @ 81E25BF faceplayer checkflag FLAG_0x127 goto_eq FortreeCity_EventScript_1E25D4 - msgbox FortreeCity_Text_1E2738, 4 + msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT release end FortreeCity_EventScript_1E25D4:: @ 81E25D4 - msgbox FortreeCity_Text_1E27B6, 4 + msgbox FortreeCity_Text_1E27B6, MSGBOX_DEFAULT release end FortreeCity_EventScript_1E25DE:: @ 81E25DE - msgbox FortreeCity_Text_1E27FE, 2 + msgbox FortreeCity_Text_1E27FE, MSGBOX_NPC end FortreeCity_EventScript_1E25E7:: @ 81E25E7 - msgbox FortreeCity_Text_1E2880, 2 + msgbox FortreeCity_Text_1E2880, MSGBOX_NPC end FortreeCity_EventScript_1E25F0:: @ 81E25F0 - msgbox FortreeCity_Text_1E292E, 2 + msgbox FortreeCity_Text_1E292E, MSGBOX_NPC end FortreeCity_EventScript_1E25F9:: @ 81E25F9 - msgbox FortreeCity_Text_1E299D, 2 + msgbox FortreeCity_Text_1E299D, MSGBOX_NPC end FortreeCity_EventScript_1E2602:: @ 81E2602 - msgbox FortreeCity_Text_1E2AAC, 3 + msgbox FortreeCity_Text_1E2AAC, MSGBOX_SIGN end FortreeCity_EventScript_1E260B:: @ 81E260B - msgbox FortreeCity_Text_1E2AE6, 3 + msgbox FortreeCity_Text_1E2AE6, MSGBOX_SIGN end FortreeCity_EventScript_1E2614:: @ 81E2614 @@ -59,19 +59,19 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 goto_eq FortreeCity_EventScript_1E2630 - msgbox FortreeCity_Text_1E29E5, 4 + msgbox FortreeCity_Text_1E29E5, MSGBOX_DEFAULT release end FortreeCity_EventScript_1E2630:: @ 81E2630 - msgbox FortreeCity_Text_1E2A08, 5 + msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq FortreeCity_EventScript_1E2645 release end FortreeCity_EventScript_1E2645:: @ 81E2645 - msgbox FortreeCity_Text_1E2A48, 4 + msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7 waitmovement 0 diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index 2229ab702..a94fe04d4 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -2,11 +2,11 @@ FortreeCity_DecorationShop_MapScripts:: @ 821800D .byte 0 FortreeCity_DecorationShop_EventScript_21800E:: @ 821800E - msgbox FortreeCity_DecorationShop_Text_218078, 2 + msgbox FortreeCity_DecorationShop_Text_218078, MSGBOX_NPC end FortreeCity_DecorationShop_EventScript_218017:: @ 8218017 - msgbox FortreeCity_DecorationShop_Text_2180ED, 2 + msgbox FortreeCity_DecorationShop_Text_2180ED, MSGBOX_NPC end FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 @@ -15,7 +15,7 @@ FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 message gUnknown_08272A21 waitmessage pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218038 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C message gUnknown_08272A21 waitmessage pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218064 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 1b1100cf3..fb91c5c1a 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -16,13 +16,13 @@ FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 end FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 - trainerbattle 1, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD + trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq FortreeCity_Gym_EventScript_21668D checkflag FLAG_0x0AA goto_if 0, FortreeCity_Gym_EventScript_216646 - msgbox FortreeCity_Gym_Text_217071, 4 + msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT release end @@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD message FortreeCity_Gym_Text_216EEC waitmessage call FortreeCity_Gym_EventScript_27207E - msgbox FortreeCity_Gym_Text_216F17, 4 + msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT setflag FLAG_0x4F5 setflag FLAG_BADGE06_GET setvar VAR_0x8008, 6 @@ -39,7 +39,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox FortreeCity_Gym_Text_217044, 4 + msgbox FortreeCity_Gym_Text_217044, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -53,7 +53,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 goto_eq FortreeCity_Gym_EventScript_272054 - msgbox FortreeCity_Gym_Text_216FEC, 4 + msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_0x0AA release end @@ -62,43 +62,43 @@ FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 goto_eq FortreeCity_Gym_EventScript_27205E - msgbox FortreeCity_Gym_Text_216FEC, 4 + msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_0x0AA return FortreeCity_Gym_EventScript_21668D:: @ 821668D - trainerbattle 7, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 - msgbox FortreeCity_Gym_Text_21720B, 6 + trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 + msgbox FortreeCity_Gym_Text_21720B, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166A8:: @ 82166A8 - trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 - msgbox FortreeCity_Gym_Text_2168E7, 6 + trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 + msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166BF:: @ 82166BF - trainerbattle 0, TRAINER_EDWARDO, 0, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 - msgbox FortreeCity_Gym_Text_2169F1, 6 + trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 + msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166D6:: @ 82166D6 - trainerbattle 0, TRAINER_FLINT, 0, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 - msgbox FortreeCity_Gym_Text_216AD7, 6 + trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 + msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166ED:: @ 82166ED - trainerbattle 0, TRAINER_ASHLEY, 0, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 - msgbox FortreeCity_Gym_Text_216B5F, 6 + trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 + msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_216704:: @ 8216704 - trainerbattle 0, TRAINER_HUMBERTO, 0, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 - msgbox FortreeCity_Gym_Text_216C32, 6 + trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 + msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_21671B:: @ 821671B - trainerbattle 0, TRAINER_DARIUS, 0, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 - msgbox FortreeCity_Gym_Text_216D0F, 6 + trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 + msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_216732:: @ 8216732 @@ -106,12 +106,12 @@ FortreeCity_Gym_EventScript_216732:: @ 8216732 faceplayer checkflag FLAG_0x4F5 goto_eq FortreeCity_Gym_EventScript_216747 - msgbox FortreeCity_Gym_Text_216785, 4 + msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT release end FortreeCity_Gym_EventScript_216747:: @ 8216747 - msgbox FortreeCity_Gym_Text_21687D, 4 + msgbox FortreeCity_Gym_Text_21687D, MSGBOX_DEFAULT release end @@ -130,12 +130,12 @@ FortreeCity_Gym_EventScript_216761:: @ 8216761 end FortreeCity_Gym_EventScript_216771:: @ 8216771 - msgbox FortreeCity_Gym_Text_2170C7, 4 + msgbox FortreeCity_Gym_Text_2170C7, MSGBOX_DEFAULT releaseall end FortreeCity_Gym_EventScript_21677B:: @ 821677B - msgbox FortreeCity_Gym_Text_2170AE, 4 + msgbox FortreeCity_Gym_Text_2170AE, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 7e45bf87a..274057110 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -10,7 +10,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox FortreeCity_House1_Text_21637B, 5 + msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FortreeCity_House1_EventScript_21633D special sub_81B94B0 @@ -29,29 +29,29 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB special sub_807F0E4 waitstate bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216440, 4 + msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT setflag FLAG_0x09B release end FortreeCity_House1_EventScript_21633D:: @ 821633D - msgbox FortreeCity_House1_Text_21649F, 4 + msgbox FortreeCity_House1_Text_21649F, MSGBOX_DEFAULT release end FortreeCity_House1_EventScript_216347:: @ 8216347 bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216474, 4 + msgbox FortreeCity_House1_Text_216474, MSGBOX_DEFAULT release end FortreeCity_House1_EventScript_216355:: @ 8216355 - msgbox FortreeCity_House1_Text_2164DB, 4 + msgbox FortreeCity_House1_Text_2164DB, MSGBOX_DEFAULT release end FortreeCity_House1_EventScript_21635F:: @ 821635F - msgbox FortreeCity_House1_Text_21653B, 2 + msgbox FortreeCity_House1_Text_21653B, MSGBOX_NPC end FortreeCity_House1_EventScript_216368:: @ 8216368 @@ -59,7 +59,7 @@ FortreeCity_House1_EventScript_216368:: @ 8216368 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House1_Text_216597, 4 + msgbox FortreeCity_House1_Text_216597, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 8f75b20d9..0a5042c09 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -8,39 +8,39 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB goto_eq FortreeCity_House2_EventScript_21786E checkflag FLAG_0x076 call_if 0, FortreeCity_House2_EventScript_217862 - msgbox FortreeCity_House2_Text_2178D6, 4 + msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_21796A, 4 + msgbox FortreeCity_House2_Text_21796A, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_2179C9, 4 + msgbox FortreeCity_House2_Text_2179C9, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT case 0, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_217A28, 4 + msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_272054 setflag FLAG_0x108 - msgbox FortreeCity_House2_Text_217A91, 4 + msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release end FortreeCity_House2_EventScript_217862:: @ 8217862 - msgbox FortreeCity_House2_Text_217882, 4 + msgbox FortreeCity_House2_Text_217882, MSGBOX_DEFAULT setflag FLAG_0x076 return FortreeCity_House2_EventScript_21786E:: @ 821786E - msgbox FortreeCity_House2_Text_217A91, 4 + msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release end FortreeCity_House2_EventScript_217878:: @ 8217878 - msgbox FortreeCity_House2_Text_217AC7, 4 + msgbox FortreeCity_House2_Text_217AC7, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc index 92b963811..742a16411 100644 --- a/data/maps/FortreeCity_House3/scripts.inc +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -2,11 +2,11 @@ FortreeCity_House3_MapScripts:: @ 8217AE7 .byte 0 FortreeCity_House3_EventScript_217AE8:: @ 8217AE8 - msgbox FortreeCity_House3_Text_217AFA, 2 + msgbox FortreeCity_House3_Text_217AFA, MSGBOX_NPC end FortreeCity_House3_EventScript_217AF1:: @ 8217AF1 - msgbox FortreeCity_House3_Text_217C22, 2 + msgbox FortreeCity_House3_Text_217C22, MSGBOX_NPC end FortreeCity_House3_Text_217AFA: @ 8217AFA diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc index 2a7842d5e..8c7e03f76 100644 --- a/data/maps/FortreeCity_House4/events.inc +++ b/data/maps/FortreeCity_House4/events.inc @@ -1,7 +1,7 @@ FortreeCity_House4_EventObjects: @ 8530FD8 object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL FortreeCity_House4_MapWarps: @ 8531020 warp_def 3, 5, 0, 6, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 27ead9ec2..24d50afa3 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -2,7 +2,7 @@ FortreeCity_House4_MapScripts:: @ 8217C80 .byte 0 FortreeCity_House4_EventScript_217C81:: @ 8217C81 - msgbox FortreeCity_House4_Text_217D33, 2 + msgbox FortreeCity_House4_Text_217D33, MSGBOX_NPC end FortreeCity_House4_EventScript_217C8A:: @ 8217C8A @@ -13,10 +13,10 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A goto_eq FortreeCity_House4_EventScript_217CD8 checkflag FLAG_0x0DE goto_eq FortreeCity_House4_EventScript_217CC4 - msgbox FortreeCity_House4_Text_217DB9, 4 + msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT closemessage setflag FLAG_0x0DE - clearflag FLAG_0x3A6 + clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL applymovement 3, FortreeCity_House4_Movement_217D1A waitmovement 0 removeobject 3 @@ -26,14 +26,14 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E waitmovement 0 - msgbox FortreeCity_House4_Text_217DD2, 4 + msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT releaseall end FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E waitmovement 0 - msgbox FortreeCity_House4_Text_217E05, 4 + msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB compare VAR_RESULT, 0 goto_eq FortreeCity_House4_EventScript_272054 @@ -44,7 +44,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 FortreeCity_House4_EventScript_217D06:: @ 8217D06 applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E waitmovement 0 - msgbox FortreeCity_House4_Text_217EA8, 4 + msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT releaseall end @@ -61,7 +61,7 @@ FortreeCity_House4_EventScript_217D20:: @ 8217D20 faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox FortreeCity_House4_Text_217EE0, 4 + msgbox FortreeCity_House4_Text_217EE0, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc index d4f1f2b02..cb0bc72fc 100644 --- a/data/maps/FortreeCity_House5/scripts.inc +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -2,11 +2,11 @@ FortreeCity_House5_MapScripts:: @ 8217EF1 .byte 0 FortreeCity_House5_EventScript_217EF2:: @ 8217EF2 - msgbox FortreeCity_House5_Text_217F17, 2 + msgbox FortreeCity_House5_Text_217F17, MSGBOX_NPC end FortreeCity_House5_EventScript_217EFB:: @ 8217EFB - msgbox FortreeCity_House5_Text_217F80, 2 + msgbox FortreeCity_House5_Text_217F80, MSGBOX_NPC end FortreeCity_House5_EventScript_217F04:: @ 8217F04 @@ -14,7 +14,7 @@ FortreeCity_House5_EventScript_217F04:: @ 8217F04 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House5_Text_217FFB, 4 + msgbox FortreeCity_House5_Text_217FFB, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc index 050fc8f4c..25d7646b7 100644 --- a/data/maps/FortreeCity_Mart/scripts.inc +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -7,7 +7,7 @@ FortreeCity_Mart_EventScript_217666:: @ 8217666 message gUnknown_08272A21 waitmessage pokemart FortreeCity_Mart_Pokemart_217680 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -28,15 +28,15 @@ FortreeCity_Mart_Pokemart_217680: @ 8217680 end FortreeCity_Mart_EventScript_217698:: @ 8217698 - msgbox FortreeCity_Mart_Text_2176B3, 2 + msgbox FortreeCity_Mart_Text_2176B3, MSGBOX_NPC end FortreeCity_Mart_EventScript_2176A1:: @ 82176A1 - msgbox FortreeCity_Mart_Text_217715, 2 + msgbox FortreeCity_Mart_Text_217715, MSGBOX_NPC end FortreeCity_Mart_EventScript_2176AA:: @ 82176AA - msgbox FortreeCity_Mart_Text_21778E, 2 + msgbox FortreeCity_Mart_Text_21778E, MSGBOX_NPC end FortreeCity_Mart_Text_2176B3: @ 82176B3 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 4885c7f15..24449ed2b 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -16,15 +16,15 @@ FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7 end FortreeCity_PokemonCenter_1F_EventScript_2173F5:: @ 82173F5 - msgbox FortreeCity_PokemonCenter_1F_Text_217410, 2 + msgbox FortreeCity_PokemonCenter_1F_Text_217410, MSGBOX_NPC end FortreeCity_PokemonCenter_1F_EventScript_2173FE:: @ 82173FE - msgbox FortreeCity_PokemonCenter_1F_Text_21746D, 2 + msgbox FortreeCity_PokemonCenter_1F_Text_21746D, MSGBOX_NPC end FortreeCity_PokemonCenter_1F_EventScript_217407:: @ 8217407 - msgbox FortreeCity_PokemonCenter_1F_Text_21751F, 2 + msgbox FortreeCity_PokemonCenter_1F_Text_21751F, MSGBOX_NPC end FortreeCity_PokemonCenter_1F_Text_217410: @ 8217410 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc index 43e74e0d7..028b5cada 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc index bba8bbe40..8228e1678 100644 --- a/data/maps/GraniteCave_1F/events.inc +++ b/data/maps/GraniteCave_1F/events.inc @@ -1,6 +1,6 @@ GraniteCave_1F_EventObjects: @ 85343BC object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE GraniteCave_1F_MapWarps: @ 85343EC warp_def 37, 12, 3, 0, MAP_ROUTE106 diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index f3d303c0f..0bbb708bd 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -6,15 +6,15 @@ GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E faceplayer checkflag FLAG_0x06D goto_eq GraniteCave_1F_EventScript_22DA8A - msgbox GraniteCave_1F_Text_22DA94, 4 + msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT giveitem_std ITEM_HM05 setflag FLAG_0x06D - msgbox GraniteCave_1F_Text_22DBB7, 4 + msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT release end GraniteCave_1F_EventScript_22DA8A:: @ 822DA8A - msgbox GraniteCave_1F_Text_22DBB7, 4 + msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT release end diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc index 4b4a08870..b27a68f17 100644 --- a/data/maps/GraniteCave_B1F/events.inc +++ b/data/maps/GraniteCave_B1F/events.inc @@ -1,5 +1,5 @@ GraniteCave_B1F_EventObjects: @ 8534420 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL GraniteCave_B1F_MapWarps: @ 8534438 warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index e128b40b2..08ac73a5a 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -1,13 +1,13 @@ GraniteCave_B2F_EventObjects: @ 8534484 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, FLAG_ITEM_GRANITE_CAVE_B2F_REPEL + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_13 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_14 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_15 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_16 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_17 GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F @@ -17,8 +17,8 @@ GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F GraniteCave_B2F_MapBGEvents: @ 8534584 - bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, 48 - bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, 49 + bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 + bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 GraniteCave_B2F_MapEvents:: @ 853459C map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc index 43cc6e444..387770626 100644 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ b/data/maps/GraniteCave_StevensRoom/events.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom_EventObjects: @ 85345B0 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, FLAG_HIDE_GRANITE_CAVE_STEVEN GraniteCave_StevensRoom_MapWarps: @ 85345C8 warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index b057a0548..473837fab 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -4,24 +4,24 @@ GraniteCave_StevensRoom_MapScripts:: @ 822DC7A GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B lock faceplayer - msgbox GraniteCave_StevensRoom_Text_22DD5A, 4 + msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT setvar VAR_0x8004, 274 call GraniteCave_StevensRoom_EventScript_2723E4 setflag FLAG_0x0BD - msgbox GraniteCave_StevensRoom_Text_22DDBD, 4 + msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT giveitem_std ITEM_TM47 compare VAR_RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C - msgbox GraniteCave_StevensRoom_Text_22DE6B, 4 + msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox GraniteCave_StevensRoom_Text_22DF6A, 4 + msgbox GraniteCave_StevensRoom_Text_22DF6A, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x131 - msgbox GraniteCave_StevensRoom_Text_22DF8C, 4 + msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D @@ -54,7 +54,7 @@ GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A return GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C - msgbox GraniteCave_StevensRoom_Text_22DFAA, 4 + msgbox GraniteCave_StevensRoom_Text_22DFAA, MSGBOX_DEFAULT return GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 24fe954a8..c995db5e4 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -26,11 +26,11 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04 InsideOfTruck_EventScript_23BF20:: @ 823BF20 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F setvar VAR_0x4092, 1 - setflag FLAG_0x2F7 - setflag FLAG_0x2FA - setflag FLAG_0x310 - setflag FLAG_0x2DF - setflag FLAG_0x331 + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL setvar VAR_0x408C, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall @@ -39,18 +39,18 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20 InsideOfTruck_EventScript_23BF46:: @ 823BF46 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F setvar VAR_0x4092, 2 - setflag FLAG_0x2F6 - setflag FLAG_0x2F9 - setflag FLAG_0x311 - setflag FLAG_0x2E0 - setflag FLAG_0x332 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL setvar VAR_0x4082, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end InsideOfTruck_EventScript_23BF6C:: @ 823BF6C - msgbox InsideOfTruck_Text_23BF75, 3 + msgbox InsideOfTruck_Text_23BF75, MSGBOX_SIGN end InsideOfTruck_Text_23BF75: @ 823BF75 diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index 01283e146..f6abd57a7 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -1,5 +1,5 @@ IslandCave_EventObjects: @ 8536C74 - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936 + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, FLAG_HIDE_REGICE IslandCave_MapWarps: @ 8536C8C warp_def 8, 29, 3, 0, MAP_ROUTE105 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index b00b41d40..e18b73a7a 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -38,7 +38,7 @@ IslandCave_MapScript1_238E99: @ 8238E99 end IslandCave_EventScript_238EAB:: @ 8238EAB - clearflag FLAG_0x3A8 + clearflag FLAG_HIDE_REGICE return IslandCave_EventScript_238EAF:: @ 8238EAF @@ -55,29 +55,29 @@ IslandCave_EventScript_238EAF:: @ 8238EAF IslandCave_EventScript_238EEF:: @ 8238EEF lockall - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 call_if 1, IslandCave_EventScript_238F45 checkflag FLAG_SYS_BRAILLE_WAIT goto_eq IslandCave_EventScript_238F13 braillemessage IslandCave_Braille_2A6CD4 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle goto IslandCave_EventScript_238F41 end IslandCave_EventScript_238F13:: @ 8238F13 - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end IslandCave_EventScript_238F1D:: @ 8238F1D lockall - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 call_if 1, IslandCave_EventScript_238F45 braillemessage IslandCave_Braille_2A6CD4 checkflag FLAG_SYS_BRAILLE_WAIT goto_eq IslandCave_EventScript_238F41 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle goto IslandCave_EventScript_238F41 end @@ -92,7 +92,7 @@ IslandCave_EventScript_238F45:: @ 8238F45 setvar VAR_0x403B, 0 setvar VAR_0x403C, 0 setvar VAR_0x403D, 0 - clearflag FLAG_0x003 + clearflag FLAG_TEMP_3 return IslandCave_EventScript_238F58:: @ 8238F58 diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index b1028c978..f9a82c89b 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -1,9 +1,9 @@ JaggedPass_EventObjects: @ 8534AE4 object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, 847 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 @@ -27,8 +27,8 @@ JaggedPass_MapCoordEvents: @ 8534BB4 coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB JaggedPass_MapBGEvents: @ 8534C54 - bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, 77 - bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, 76 + bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL + bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL JaggedPass_MapEvents:: @ 8534C6C map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 15ac1bae6..8a8832dec 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -48,7 +48,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB setvar VAR_0x8007, 5 special sub_8139560 waitstate - msgbox JaggedPass_Text_230DBA, 4 + msgbox JaggedPass_Text_230DBA, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -78,9 +78,9 @@ JaggedPass_EventScript_230718:: @ 8230718 waitmovement 0 applymovement 5, JaggedPass_Movement_27259E waitmovement 0 - msgbox JaggedPass_Text_230CCB, 4 + msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage - trainerbattle 3, TRAINER_GRUNT_30, 0, JaggedPass_Text_230D2D + trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D setflag FLAG_0x139 applymovement 5, JaggedPass_Movement_2725A2 waitmovement 0 @@ -90,7 +90,7 @@ JaggedPass_EventScript_230718:: @ 8230718 JaggedPass_EventScript_230766:: @ 8230766 applymovement 5, JaggedPass_Movement_27259E waitmovement 0 - msgbox JaggedPass_Text_230D65, 4 + msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT closemessage applymovement 5, JaggedPass_Movement_2725A2 waitmovement 0 @@ -98,66 +98,60 @@ JaggedPass_EventScript_230766:: @ 8230766 end JaggedPass_EventScript_230785:: @ 8230785 - trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_230888, JaggedPass_Text_2308FF - msgbox JaggedPass_Text_230916, 6 + trainerbattle_single TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF + msgbox JaggedPass_Text_230916, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_23079C:: @ 823079C - trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 + trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_2307E4 - msgbox JaggedPass_Text_2309D8, 4 + msgbox JaggedPass_Text_2309D8, MSGBOX_DEFAULT release end JaggedPass_EventScript_2307C8:: @ 82307C8 special sub_80B4808 - msgbox JaggedPass_Text_230A2C, 4 - setvar VAR_0x8004, 474 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 474 - callstd 8 + msgbox JaggedPass_Text_230A2C, MSGBOX_DEFAULT + register_matchcall TRAINER_DIANA_1 release end JaggedPass_EventScript_2307E4:: @ 82307E4 - trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_230A76, JaggedPass_Text_230AAA - msgbox JaggedPass_Text_230AD7, 6 + trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_230A76, JaggedPass_Text_230AAA + msgbox JaggedPass_Text_230AD7, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_2307FB:: @ 82307FB - trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 + trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230843 - msgbox JaggedPass_Text_230B93, 4 + msgbox JaggedPass_Text_230B93, MSGBOX_DEFAULT release end JaggedPass_EventScript_230827:: @ 8230827 special sub_80B4808 - msgbox JaggedPass_Text_230BC6, 4 - setvar VAR_0x8004, 216 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 216 - callstd 8 + msgbox JaggedPass_Text_230BC6, MSGBOX_DEFAULT + register_matchcall TRAINER_ETHAN_1 release end JaggedPass_EventScript_230843:: @ 8230843 - trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_230C28, JaggedPass_Text_230C60 - msgbox JaggedPass_Text_230C94, 6 + trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_230C28, JaggedPass_Text_230C60 + msgbox JaggedPass_Text_230C94, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_23085A:: @ 823085A - trainerbattle 0, TRAINER_JULIO, 0, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 - msgbox JaggedPass_Text_230E57, 6 + trainerbattle_single TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 + msgbox JaggedPass_Text_230E57, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_230871:: @ 8230871 - trainerbattle 0, TRAINER_AUTUMN, 0, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD - msgbox JaggedPass_Text_230EE3, 6 + trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD + msgbox JaggedPass_Text_230EE3, MSGBOX_AUTOCLOSE end JaggedPass_Text_230888: @ 8230888 diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 1d4b1239a..4822762ea 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -5,8 +5,8 @@ LavaridgeTown_EventObjects: @ 8527A54 object_event 4, EVENT_OBJ_GFX_TWIN, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0 object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 - object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 930 - object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 929 + object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 + object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 LavaridgeTown_MapWarps: @ 8527B2C @@ -28,7 +28,7 @@ LavaridgeTown_MapBGEvents: @ 8527B6C bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 - bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, 0 + bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL LavaridgeTown_MapEvents:: @ 8527BCC map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 5670d9b6e..7eb9336f3 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -31,11 +31,11 @@ LavaridgeTown_EventScript_1EA529:: @ 81EA529 setobjectxyperm 8, 11, 9 setobjectxyperm 7, 9, 8 setobjectmovementtype 7, 7 - clearflag FLAG_0x3A1 + clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 return LavaridgeTown_EventScript_1EA53F:: @ 81EA53F - clearflag FLAG_0x36D + clearflag FLAG_HIDE_MT_CHIMNEY_TRAINERS return LavaridgeTown_EventScript_1EA543:: @ 81EA543 @@ -71,18 +71,18 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551 end LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 - msgbox LavaridgeTown_Text_1EA7C0, 4 + msgbox LavaridgeTown_Text_1EA7C0, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES setflag FLAG_0x0DD - msgbox LavaridgeTown_Text_1EA897, 4 + msgbox LavaridgeTown_Text_1EA897, MSGBOX_DEFAULT goto LavaridgeTown_EventScript_1EA5FF end LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA - msgbox LavaridgeTown_Text_1EA9A2, 4 + msgbox LavaridgeTown_Text_1EA9A2, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES setflag FLAG_0x0DD - msgbox LavaridgeTown_Text_1EAA2E, 4 + msgbox LavaridgeTown_Text_1EAA2E, MSGBOX_DEFAULT goto LavaridgeTown_EventScript_1EA5FF end @@ -222,27 +222,27 @@ LavaridgeTown_EventScript_1EA70B:: @ 81EA70B end LavaridgeTown_EventScript_1EA70E:: @ 81EA70E - msgbox LavaridgeTown_Text_1EAE03, 2 + msgbox LavaridgeTown_Text_1EAE03, MSGBOX_NPC end LavaridgeTown_EventScript_1EA717:: @ 81EA717 - msgbox LavaridgeTown_Text_1EAEE1, 3 + msgbox LavaridgeTown_Text_1EAEE1, MSGBOX_SIGN end LavaridgeTown_EventScript_1EA720:: @ 81EA720 - msgbox LavaridgeTown_Text_1EAF9B, 2 + msgbox LavaridgeTown_Text_1EAF9B, MSGBOX_NPC end LavaridgeTown_EventScript_1EA729:: @ 81EA729 - msgbox LavaridgeTown_Text_1EB003, 2 + msgbox LavaridgeTown_Text_1EB003, MSGBOX_NPC end LavaridgeTown_EventScript_1EA732:: @ 81EA732 - msgbox LavaridgeTown_Text_1EB092, 2 + msgbox LavaridgeTown_Text_1EB092, MSGBOX_NPC end LavaridgeTown_EventScript_1EA73B:: @ 81EA73B - msgbox LavaridgeTown_Text_1EAF4E, 2 + msgbox LavaridgeTown_Text_1EAF4E, MSGBOX_NPC end LavaridgeTown_EventScript_1EA744:: @ 81EA744 @@ -250,13 +250,13 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 faceplayer checkflag FLAG_0x10A goto_eq LavaridgeTown_EventScript_1EA787 - msgbox LavaridgeTown_Text_1EAB80, 5 + msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LavaridgeTown_EventScript_1EA79B getpartysize compare VAR_RESULT, 6 goto_eq LavaridgeTown_EventScript_1EA791 - msgbox LavaridgeTown_Text_1EACC0, 4 + msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT setflag FLAG_0x10A playfanfare MUS_FANFA4 message LavaridgeTown_Text_1EACF4 @@ -266,30 +266,30 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 end LavaridgeTown_EventScript_1EA787:: @ 81EA787 - msgbox LavaridgeTown_Text_1EAD9E, 4 + msgbox LavaridgeTown_Text_1EAD9E, MSGBOX_DEFAULT release end LavaridgeTown_EventScript_1EA791:: @ 81EA791 - msgbox LavaridgeTown_Text_1EAD09, 4 + msgbox LavaridgeTown_Text_1EAD09, MSGBOX_DEFAULT release end LavaridgeTown_EventScript_1EA79B:: @ 81EA79B - msgbox LavaridgeTown_Text_1EAD44, 4 + msgbox LavaridgeTown_Text_1EAD44, MSGBOX_DEFAULT release end LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5 - msgbox LavaridgeTown_Text_1EB12B, 3 + msgbox LavaridgeTown_Text_1EB12B, MSGBOX_SIGN end LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE - msgbox LavaridgeTown_Text_1EB178, 3 + msgbox LavaridgeTown_Text_1EB178, MSGBOX_SIGN end LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7 - msgbox LavaridgeTown_Text_1EB1CB, 3 + msgbox LavaridgeTown_Text_1EB1CB, MSGBOX_SIGN end LavaridgeTown_Text_1EA7C0: @ 81EA7C0 diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 1d317d43b..77c4a7b5d 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -59,13 +59,13 @@ LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B return LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C - trainerbattle 1, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1 + trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 checkflag FLAG_0x0A8 goto_if 0, LavaridgeTown_Gym_1F_EventScript_1FE81D - msgbox LavaridgeTown_Gym_1F_Text_1FF546, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT release end @@ -73,7 +73,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 message LavaridgeTown_Gym_1F_Text_1FF32F waitmessage call LavaridgeTown_Gym_1F_EventScript_27207E - msgbox LavaridgeTown_Gym_1F_Text_1FF359, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT setflag FLAG_0x06C setflag FLAG_0x4F3 setflag FLAG_BADGE04_GET @@ -82,13 +82,13 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84 setvar VAR_0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_271F43 - setflag FLAG_0x326 + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY setvar VAR_0x4053, 1 call LavaridgeTown_Gym_1F_EventScript_1FE841 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox LavaridgeTown_Gym_1F_Text_1FF517, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF517, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -100,7 +100,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 compare VAR_RESULT, 0 goto_eq LavaridgeTown_Gym_1F_EventScript_272054 - msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_0x0A8 release end @@ -109,18 +109,18 @@ LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 compare VAR_RESULT, 0 goto_eq LavaridgeTown_Gym_1F_EventScript_27205E - msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_0x0A8 return LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864 - trainerbattle 7, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E - msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, 6 + trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E + msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F - trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A @@ -133,38 +133,38 @@ LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A end LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF - trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA - trainerbattle 2, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FED02, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FED02, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5 - trainerbattle 2, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900 - trainerbattle 2, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B - trainerbattle 2, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936 - trainerbattle 2, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951 - trainerbattle 2, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C @@ -172,12 +172,12 @@ LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C faceplayer checkflag FLAG_0x4F3 goto_eq LavaridgeTown_Gym_1F_EventScript_1FE981 - msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT release end LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981 - msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, MSGBOX_DEFAULT release end @@ -196,12 +196,12 @@ LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B end LavaridgeTown_Gym_1F_EventScript_1FE9AB:: @ 81FE9AB - msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, MSGBOX_DEFAULT releaseall end LavaridgeTown_Gym_1F_EventScript_1FE9B5:: @ 81FE9B5 - msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index 6af8132e4..14e08bed2 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -7,7 +7,7 @@ LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7 message LavaridgeTown_HerbShop_Text_1FE53E waitmessage pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -22,7 +22,7 @@ LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0 end LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC - msgbox LavaridgeTown_HerbShop_Text_1FE685, 2 + msgbox LavaridgeTown_HerbShop_Text_1FE685, MSGBOX_NPC end LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 @@ -30,7 +30,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 faceplayer checkflag FLAG_0x0FE goto_eq LavaridgeTown_HerbShop_EventScript_1FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE584, 4 + msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 goto_eq LavaridgeTown_HerbShop_EventScript_272054 @@ -39,7 +39,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 end LavaridgeTown_HerbShop_EventScript_1FE534:: @ 81FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE5EB, 4 + msgbox LavaridgeTown_HerbShop_Text_1FE5EB, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc index 14d112de9..19424af1a 100644 --- a/data/maps/LavaridgeTown_House/scripts.inc +++ b/data/maps/LavaridgeTown_House/scripts.inc @@ -2,7 +2,7 @@ LavaridgeTown_House_MapScripts:: @ 81FF911 .byte 0 LavaridgeTown_House_EventScript_1FF912:: @ 81FF912 - msgbox LavaridgeTown_House_Text_1FF92E, 2 + msgbox LavaridgeTown_House_Text_1FF92E, MSGBOX_NPC end LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B @@ -10,7 +10,7 @@ LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox LavaridgeTown_House_Text_1FF9BB, 4 + msgbox LavaridgeTown_House_Text_1FF9BB, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc index 2c5681983..c3bb550cb 100644 --- a/data/maps/LavaridgeTown_Mart/scripts.inc +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -7,7 +7,7 @@ LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE message gUnknown_08272A21 waitmessage pokemart LavaridgeTown_Mart_Pokemart_1FF9E8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -27,11 +27,11 @@ LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8 end LavaridgeTown_Mart_EventScript_1FF9FE:: @ 81FF9FE - msgbox LavaridgeTown_Mart_Text_1FFA10, 2 + msgbox LavaridgeTown_Mart_Text_1FFA10, MSGBOX_NPC end LavaridgeTown_Mart_EventScript_1FFA07:: @ 81FFA07 - msgbox LavaridgeTown_Mart_Text_1FFA83, 2 + msgbox LavaridgeTown_Mart_Text_1FFA83, MSGBOX_NPC end LavaridgeTown_Mart_Text_1FFA10: @ 81FFA10 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index c7db56a0d..ee60c7d62 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -17,15 +17,15 @@ LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C:: @ 81FFB1C - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, 2 + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, MSGBOX_NPC end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25:: @ 81FFB25 - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, 2 + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, MSGBOX_NPC end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E:: @ 81FFB2E - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, 2 + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, MSGBOX_NPC end LavaridgeTown_PokemonCenter_1F_Text_1FFB37: @ 81FFB37 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc index e55b08e7b..6e1011dd8 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 427f49201..2c7f71d5c 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -8,14 +8,14 @@ LilycoveCity_EventObjects: @ 8526CE8 object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852 - object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS + object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 - object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971 + object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0 object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 @@ -49,9 +49,9 @@ LilycoveCity_MapBGEvents: @ 8526F68 bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44 bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62 bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74 - bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, 27 - bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, 43 - bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, 75 + bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE + bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP + bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL LilycoveCity_MapEvents:: @ 8527004 map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 70018b229..6b325d549 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -6,7 +6,7 @@ LilycoveCity_MapScripts:: @ 81E2B3C LilycoveCity_MapScript1_1E2B47: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_0x4086, 0 - setflag FLAG_0x322 + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER checkflag FLAG_SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_27207A call LilycoveCity_EventScript_271ED7 @@ -38,24 +38,24 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 dodailyevents checkflag FLAG_0x92F goto_eq LilycoveCity_EventScript_1E2C18 - msgbox LilycoveCity_Text_2A7244, 4 + msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_272054 setflag FLAG_0x92F - msgbox LilycoveCity_Text_2A72E3, 4 + msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C18:: @ 81E2C18 - msgbox LilycoveCity_Text_2A7321, 4 + msgbox LilycoveCity_Text_2A7321, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C22:: @ 81E2C22 - msgbox LilycoveCity_Text_1E3D9E, 2 + msgbox LilycoveCity_Text_1E3D9E, MSGBOX_NPC end LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B @@ -63,17 +63,17 @@ LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B faceplayer checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_EventScript_1E2C40 - msgbox LilycoveCity_Text_1E3E3C, 4 + msgbox LilycoveCity_Text_1E3E3C, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C40:: @ 81E2C40 - msgbox LilycoveCity_Text_1E3E7D, 4 + msgbox LilycoveCity_Text_1E3E7D, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A - msgbox LilycoveCity_Text_1E3F05, 2 + msgbox LilycoveCity_Text_1E3F05, MSGBOX_NPC end LilycoveCity_EventScript_1E2C53:: @ 81E2C53 @@ -81,12 +81,12 @@ LilycoveCity_EventScript_1E2C53:: @ 81E2C53 faceplayer checkflag FLAG_0x070 goto_eq LilycoveCity_EventScript_1E2C68 - msgbox LilycoveCity_Text_1E3FAB, 4 + msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C68:: @ 81E2C68 - msgbox LilycoveCity_Text_1E4020, 4 + msgbox LilycoveCity_Text_1E4020, MSGBOX_DEFAULT release end @@ -95,25 +95,25 @@ LilycoveCity_EventScript_1E2C72:: @ 81E2C72 faceplayer checkflag FLAG_0x070 goto_eq LilycoveCity_EventScript_1E2C87 - msgbox LilycoveCity_Text_1E40AD, 4 + msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C87:: @ 81E2C87 - msgbox LilycoveCity_Text_1E4145, 4 + msgbox LilycoveCity_Text_1E4145, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C91:: @ 81E2C91 - msgbox LilycoveCity_Text_1E417B, 2 + msgbox LilycoveCity_Text_1E417B, MSGBOX_NPC end LilycoveCity_EventScript_1E2C9A:: @ 81E2C9A - msgbox LilycoveCity_Text_1E420B, 3 + msgbox LilycoveCity_Text_1E420B, MSGBOX_SIGN end LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3 - msgbox LilycoveCity_Text_1E4283, 3 + msgbox LilycoveCity_Text_1E4283, MSGBOX_SIGN end LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC @@ -121,45 +121,45 @@ LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC faceplayer checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_EventScript_1E2CC1 - msgbox LilycoveCity_Text_1E42FC, 4 + msgbox LilycoveCity_Text_1E42FC, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2CC1:: @ 81E2CC1 - msgbox LilycoveCity_Text_1E43FF, 4 + msgbox LilycoveCity_Text_1E43FF, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2CCB:: @ 81E2CCB - msgbox LilycoveCity_Text_1E48A5, 2 + msgbox LilycoveCity_Text_1E48A5, MSGBOX_NPC end LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 - msgbox LilycoveCity_Text_1E4902, 2 + msgbox LilycoveCity_Text_1E4902, MSGBOX_NPC end LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD lockall - msgbox LilycoveCity_Text_1E494D, 2 + msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC applymovement 20, LilycoveCity_Movement_2725A2 end LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE lockall - msgbox LilycoveCity_Text_1E49F4, 2 + msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC applymovement 19, LilycoveCity_Movement_2725A2 end LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF - msgbox LilycoveCity_Text_1E448B, 3 + msgbox LilycoveCity_Text_1E448B, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D08:: @ 81E2D08 - msgbox LilycoveCity_Text_1E44C3, 3 + msgbox LilycoveCity_Text_1E44C3, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D11:: @ 81E2D11 - msgbox LilycoveCity_Text_1E44FC, 3 + msgbox LilycoveCity_Text_1E44FC, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A @@ -167,12 +167,12 @@ LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A specialvar VAR_0x8004, sub_80F8940 switch VAR_0x8004 case 0, LilycoveCity_EventScript_1E2D3A - msgbox LilycoveCity_Text_1E4571, 4 + msgbox LilycoveCity_Text_1E4571, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A - msgbox LilycoveCity_Text_1E4534, 4 + msgbox LilycoveCity_Text_1E4534, MSGBOX_DEFAULT releaseall end @@ -180,35 +180,35 @@ LilycoveCity_EventScript_1E2D44:: @ 81E2D44 lockall checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_EventScript_1E2D58 - msgbox LilycoveCity_Text_1E45A7, 4 + msgbox LilycoveCity_Text_1E45A7, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2D58:: @ 81E2D58 - msgbox LilycoveCity_Text_1E4624, 4 + msgbox LilycoveCity_Text_1E4624, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2D62:: @ 81E2D62 - msgbox LilycoveCity_Text_1E466E, 3 + msgbox LilycoveCity_Text_1E466E, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D6B:: @ 81E2D6B - msgbox LilycoveCity_Text_1E46BE, 3 + msgbox LilycoveCity_Text_1E46BE, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D74:: @ 81E2D74 - msgbox LilycoveCity_Text_1E473D, 3 + msgbox LilycoveCity_Text_1E473D, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall checkflag FLAG_0x0DA goto_eq LilycoveCity_EventScript_1E2DB0 - msgbox LilycoveCity_Text_1E3D1F, 4 + msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E waitmovement 0 - msgbox LilycoveCity_Text_1E3D4A, 4 + msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 waitmovement 0 setflag FLAG_0x0DA @@ -216,24 +216,24 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D end LilycoveCity_EventScript_1E2DB0:: @ 81E2DB0 - msgbox LilycoveCity_Text_1E3D1F, 4 + msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2DBA:: @ 81E2DBA - msgbox LilycoveCity_Text_1E3B2C, 2 + msgbox LilycoveCity_Text_1E3B2C, MSGBOX_NPC end LilycoveCity_EventScript_1E2DC3:: @ 81E2DC3 - msgbox LilycoveCity_Text_1E3B95, 2 + msgbox LilycoveCity_Text_1E3B95, MSGBOX_NPC end LilycoveCity_EventScript_1E2DCC:: @ 81E2DCC - msgbox LilycoveCity_Text_1E3C46, 2 + msgbox LilycoveCity_Text_1E3C46, MSGBOX_NPC end LilycoveCity_EventScript_1E2DD5:: @ 81E2DD5 - msgbox LilycoveCity_Text_1E3CBE, 2 + msgbox LilycoveCity_Text_1E3CBE, MSGBOX_NPC end LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE @@ -254,7 +254,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 call_if 0, LilycoveCity_EventScript_1E2E51 compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2E5A - msgbox LilycoveCity_Text_1E3234, 4 + msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2EDE case 1, LilycoveCity_EventScript_1E2EEE @@ -262,16 +262,16 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 end LilycoveCity_EventScript_1E2E48:: @ 81E2E48 - msgbox LilycoveCity_Text_1E31F5, 5 + msgbox LilycoveCity_Text_1E31F5, MSGBOX_YESNO return LilycoveCity_EventScript_1E2E51:: @ 81E2E51 - msgbox LilycoveCity_Text_1E3061, 5 + msgbox LilycoveCity_Text_1E3061, MSGBOX_YESNO return LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A setflag FLAG_0x11E - msgbox LilycoveCity_Text_1E318D, 4 + msgbox LilycoveCity_Text_1E318D, MSGBOX_DEFAULT savebgm MUS_DUMMY fadedefaultbgm release @@ -285,7 +285,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B call_if 0, LilycoveCity_EventScript_1E2EC4 compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2ECD - msgbox LilycoveCity_Text_1E373C, 4 + msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2F0E case 1, LilycoveCity_EventScript_1E2F1E @@ -293,53 +293,53 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B end LilycoveCity_EventScript_1E2EBB:: @ 81E2EBB - msgbox LilycoveCity_Text_1E36FA, 5 + msgbox LilycoveCity_Text_1E36FA, MSGBOX_YESNO return LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4 - msgbox LilycoveCity_Text_1E3608, 5 + msgbox LilycoveCity_Text_1E3608, MSGBOX_YESNO return LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD setflag FLAG_0x11E - msgbox LilycoveCity_Text_1E36BF, 4 + msgbox LilycoveCity_Text_1E36BF, MSGBOX_DEFAULT savebgm MUS_DUMMY fadedefaultbgm release end LilycoveCity_EventScript_1E2EDE:: @ 81E2EDE - trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_1E3275 + trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_1E3275 goto LilycoveCity_EventScript_1E2F3E end LilycoveCity_EventScript_1E2EEE:: @ 81E2EEE - trainerbattle 3, TRAINER_MAY_13, 0, LilycoveCity_Text_1E3275 + trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_1E3275 goto LilycoveCity_EventScript_1E2F3E end LilycoveCity_EventScript_1E2EFE:: @ 81E2EFE - trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_1E3275 + trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_1E3275 goto LilycoveCity_EventScript_1E2F3E end LilycoveCity_EventScript_1E2F0E:: @ 81E2F0E - trainerbattle 3, TRAINER_BRENDAN_14, 0, LilycoveCity_Text_1E3777 + trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_1E3777 goto LilycoveCity_EventScript_1E2FAA end LilycoveCity_EventScript_1E2F1E:: @ 81E2F1E - trainerbattle 3, TRAINER_BRENDAN_15, 0, LilycoveCity_Text_1E3777 + trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_1E3777 goto LilycoveCity_EventScript_1E2FAA end LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E - trainerbattle 3, TRAINER_BRENDAN_13, 0, LilycoveCity_Text_1E3777 + trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_1E3777 goto LilycoveCity_EventScript_1E2FAA end LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E - msgbox LilycoveCity_Text_1E32FB, 4 + msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT setvar VAR_RESULT, 0 checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_1E2F76 @@ -347,8 +347,8 @@ LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E call_if 1, LilycoveCity_EventScript_1E2F86 compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E2F8F - clearflag FLAG_0x2D2 - clearflag FLAG_0x351 + clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL goto LilycoveCity_EventScript_1E3006 end @@ -362,21 +362,21 @@ LilycoveCity_EventScript_1E2F80:: @ 81E2F80 return LilycoveCity_EventScript_1E2F86:: @ 81E2F86 - msgbox LilycoveCity_Text_1E3398, 4 + msgbox LilycoveCity_Text_1E3398, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_EventScript_1E2FA1 - msgbox LilycoveCity_Text_1E346D, 4 + msgbox LilycoveCity_Text_1E346D, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1 - msgbox LilycoveCity_Text_1E353A, 4 + msgbox LilycoveCity_Text_1E353A, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA - msgbox LilycoveCity_Text_1E37D7, 4 + msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT setvar VAR_RESULT, 0 checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_1E2F76 @@ -384,23 +384,23 @@ LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA call_if 1, LilycoveCity_EventScript_1E2FE2 compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E2FEB - clearflag FLAG_0x2F8 - clearflag FLAG_0x32F + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL goto LilycoveCity_EventScript_1E3006 end LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2 - msgbox LilycoveCity_Text_1E3876, 4 + msgbox LilycoveCity_Text_1E3876, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_EventScript_1E2FFD - msgbox LilycoveCity_Text_1E390C, 4 + msgbox LilycoveCity_Text_1E390C, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD - msgbox LilycoveCity_Text_1E39E3, 4 + msgbox LilycoveCity_Text_1E39E3, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E3006:: @ 81E3006 @@ -422,7 +422,7 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006 LilycoveCity_EventScript_1E302D:: @ 81E302D lock faceplayer - msgbox LilycoveCity_Text_1E4774, 5 + msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E304F compare VAR_RESULT, 0 @@ -431,11 +431,11 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D end LilycoveCity_EventScript_1E304F:: @ 81E304F - msgbox LilycoveCity_Text_1E47A1, 4 + msgbox LilycoveCity_Text_1E47A1, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E3058:: @ 81E3058 - msgbox LilycoveCity_Text_1E4824, 4 + msgbox LilycoveCity_Text_1E4824, MSGBOX_DEFAULT return LilycoveCity_Text_1E3061: @ 81E3061 diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index 3f02a404c..945f01fb0 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -2,25 +2,25 @@ LilycoveCity_ContestHall_MapScripts:: @ 821B484 .byte 0 LilycoveCity_ContestHall_EventScript_21B485:: @ 821B485 - msgbox LilycoveCity_ContestHall_Text_21B74E, 2 + msgbox LilycoveCity_ContestHall_Text_21B74E, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B48E:: @ 821B48E - msgbox LilycoveCity_ContestHall_Text_21B7D7, 2 + msgbox LilycoveCity_ContestHall_Text_21B7D7, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B497:: @ 821B497 - msgbox LilycoveCity_ContestHall_Text_21B899, 2 + msgbox LilycoveCity_ContestHall_Text_21B899, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B4A0:: @ 821B4A0 - msgbox LilycoveCity_ContestHall_Text_21B911, 2 + msgbox LilycoveCity_ContestHall_Text_21B911, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21B977, 4 + msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -30,7 +30,7 @@ LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21B9DC, 4 + msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT closemessage applymovement 5, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -40,7 +40,7 @@ LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BA44, 4 + msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT closemessage applymovement 6, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -50,7 +50,7 @@ LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BAD5, 4 + msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT closemessage applymovement 7, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -60,7 +60,7 @@ LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BB84, 4 + msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT closemessage applymovement 8, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -70,7 +70,7 @@ LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BBDD, 4 + msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT closemessage applymovement 9, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -78,13 +78,13 @@ LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C end LilycoveCity_ContestHall_EventScript_21B533:: @ 821B533 - msgbox LilycoveCity_ContestHall_Text_21BC65, 3 + msgbox LilycoveCity_ContestHall_Text_21BC65, MSGBOX_SIGN end LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BC89, 4 + msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT closemessage applymovement 12, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -94,7 +94,7 @@ LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BD30, 4 + msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT closemessage applymovement 22, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -104,7 +104,7 @@ LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BD70, 4 + msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT closemessage applymovement 11, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -114,7 +114,7 @@ LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BDDD, 4 + msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT closemessage applymovement 13, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -124,7 +124,7 @@ LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BE16, 4 + msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT closemessage applymovement 14, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -134,7 +134,7 @@ LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BE77, 4 + msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT closemessage applymovement 15, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -144,7 +144,7 @@ LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BEDE, 4 + msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT closemessage applymovement 16, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -154,7 +154,7 @@ LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BF6E, 4 + msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT closemessage applymovement 17, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -164,7 +164,7 @@ LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BFE3, 4 + msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT closemessage applymovement 18, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -174,7 +174,7 @@ LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C07F, 4 + msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT closemessage applymovement 19, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -184,7 +184,7 @@ LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C0D8, 4 + msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT closemessage applymovement 21, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -194,7 +194,7 @@ LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C137, 4 + msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT closemessage applymovement 20, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -204,7 +204,7 @@ LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C1A4, 4 + msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT closemessage applymovement 23, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -214,7 +214,7 @@ LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C215, 4 + msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT closemessage applymovement 24, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -224,7 +224,7 @@ LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C27F, 4 + msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT closemessage applymovement 25, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -234,7 +234,7 @@ LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C2BB, 4 + msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT closemessage applymovement 26, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -244,7 +244,7 @@ LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C307, 4 + msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT closemessage applymovement 27, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -254,7 +254,7 @@ LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C365, 4 + msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT closemessage applymovement 28, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -265,19 +265,19 @@ LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA lockall applymovement 29, LilycoveCity_ContestHall_Movement_27259E waitmovement 0 - msgbox LilycoveCity_ContestHall_Text_21C3F4, 4 + msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT closemessage applymovement 29, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 delay 25 - msgbox LilycoveCity_ContestHall_Text_21C411, 4 + msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C4B1, 4 + msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT closemessage applymovement 31, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -287,7 +287,7 @@ LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C445, 4 + msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT closemessage applymovement 30, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -295,15 +295,15 @@ LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C end LilycoveCity_ContestHall_EventScript_21B733:: @ 821B733 - msgbox LilycoveCity_ContestHall_Text_21C512, 3 + msgbox LilycoveCity_ContestHall_Text_21C512, MSGBOX_SIGN end LilycoveCity_ContestHall_EventScript_21B73C:: @ 821B73C - msgbox LilycoveCity_ContestHall_Text_21C548, 3 + msgbox LilycoveCity_ContestHall_Text_21C548, MSGBOX_SIGN end LilycoveCity_ContestHall_EventScript_21B745:: @ 821B745 - msgbox LilycoveCity_ContestHall_Text_21C57B, 3 + msgbox LilycoveCity_ContestHall_Text_21C57B, MSGBOX_SIGN end LilycoveCity_ContestHall_Text_21B74E: @ 821B74E diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index 636e0db5a..fa04b72e7 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -2,27 +2,27 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 774 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802 + object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 object_event 10, EVENT_OBJ_GFX_TWIN, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 895 + object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 object_event 14, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 object_event 15, EVENT_OBJ_GFX_POKEFAN_F, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 - object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873 + object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832 - object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832 - object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832 - object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832 - object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832 - object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832 - object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832 + object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 LilycoveCity_ContestLobby_MapWarps: @ 853178C diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 956766395..16c4dd915 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -12,13 +12,13 @@ LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 getpricereduction 4 compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A23C - clearflag FLAG_0x369 - setflag FLAG_0x340 + clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS return LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C - setflag FLAG_0x369 - clearflag FLAG_0x340 + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT + clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS return LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 @@ -27,7 +27,7 @@ LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 .2byte 0 LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255 - checkflag FLAG_0x307 + checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_eq LilycoveCity_ContestLobby_EventScript_21A264 setvar VAR_0x4099, 0 end @@ -39,12 +39,12 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 waitmovement 4 applymovement 255, LilycoveCity_ContestLobby_Movement_21A418 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4 + msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall fadescreen 1 drawcontestwinner 0 lockall - msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 + msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA compare VAR_RESULT, 0 @@ -53,11 +53,11 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 end LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA - msgbox LilycoveCity_ContestLobby_Text_21AF63, 4 + msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC setvar VAR_0x4099, 0 - specialvar VAR_RESULT, sub_80F8C7C + specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F @@ -69,10 +69,10 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA end LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 - msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 + msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA - msgbox LilycoveCity_ContestLobby_Text_21B132, 4 + msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F waitmovement 0 @@ -91,12 +91,12 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21B030, 4 + msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 + msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT waitfanfare - msgbox LilycoveCity_ContestLobby_Text_21B094, 4 - msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4 + msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT closemessage return @@ -111,23 +111,23 @@ LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360 return LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2 - clearflag FLAG_0x308 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 return LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6 - clearflag FLAG_0x309 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 return LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA - clearflag FLAG_0x30A + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 return LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE - clearflag FLAG_0x30B + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 return LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2 - clearflag FLAG_0x30C + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS return LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6 @@ -202,7 +202,7 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E step_end LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 - checkflag FLAG_0x307 + checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_eq LilycoveCity_ContestLobby_EventScript_21A436 setvar VAR_0x4099, 0 end @@ -214,11 +214,11 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 waitmovement 11 applymovement 255, LilycoveCity_ContestLobby_Movement_21A545 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4 + msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall fadescreen 1 drawcontestwinner 0 - msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 + msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A47A compare VAR_RESULT, 0 @@ -226,11 +226,11 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 end LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A - msgbox LilycoveCity_ContestLobby_Text_21AF63, 4 + msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC setvar VAR_0x4099, 0 - specialvar VAR_RESULT, sub_80F8C7C + specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C @@ -242,10 +242,10 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A end LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 - msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 + msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A47A - msgbox LilycoveCity_ContestLobby_Text_21B132, 4 + msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C waitmovement 0 @@ -265,12 +265,12 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21B030, 4 + msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 + msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT waitfanfare - msgbox LilycoveCity_ContestLobby_Text_21B094, 4 - msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4 + msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT closemessage return @@ -324,7 +324,7 @@ LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554 goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF call LilycoveCity_ContestLobby_EventScript_279CC5 call LilycoveCity_ContestLobby_EventScript_21A670 - special sub_80F87D8 + special SetContestTrainerGfxIds call LilycoveCity_ContestLobby_EventScript_23BEB6 call LilycoveCity_ContestLobby_EventScript_21A585 call LilycoveCity_ContestLobby_EventScript_21A5EF @@ -356,7 +356,7 @@ LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9 return LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF - setflag FLAG_0x307 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_0x4094, 0x1 giveitem ITEM_CONTEST_PASS, 1 setvar VAR_0x800B, 8 @@ -424,7 +424,7 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 waitmovement 0 applymovement 255, LilycoveCity_ContestLobby_Movement_21A6F2 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_27B653, 4 + msgbox LilycoveCity_ContestLobby_Text_27B653, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD applymovement 255, LilycoveCity_ContestLobby_Movement_21A6E8 @@ -477,27 +477,27 @@ LilycoveCity_ContestLobby_Movement_21A706: @ 821A706 step_end LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708 - msgbox LilycoveCity_ContestLobby_Text_21B1B1, 2 + msgbox LilycoveCity_ContestLobby_Text_21B1B1, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711 - msgbox LilycoveCity_ContestLobby_Text_21B24D, 2 + msgbox LilycoveCity_ContestLobby_Text_21B24D, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A - msgbox LilycoveCity_ContestLobby_Text_21B2BA, 2 + msgbox LilycoveCity_ContestLobby_Text_21B2BA, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723 - msgbox LilycoveCity_ContestLobby_Text_21B334, 2 + msgbox LilycoveCity_ContestLobby_Text_21B334, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C - msgbox LilycoveCity_ContestLobby_Text_21B392, 2 + msgbox LilycoveCity_ContestLobby_Text_21B392, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735 - msgbox LilycoveCity_ContestLobby_Text_21B3FC, 2 + msgbox LilycoveCity_ContestLobby_Text_21B3FC, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E @@ -543,11 +543,11 @@ LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761 end LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768 - msgbox LilycoveCity_ContestLobby_Text_2931AA, 2 + msgbox LilycoveCity_ContestLobby_Text_2931AA, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771 - msgbox LilycoveCity_ContestLobby_Text_2931C6, 2 + msgbox LilycoveCity_ContestLobby_Text_2931C6, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A @@ -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 @@ -571,46 +571,46 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784 LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C427C, 4 + msgbox LilycoveCity_ContestLobby_Text_2C427C, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8 lock - msgbox LilycoveCity_ContestLobby_Text_2C464B, 4 + msgbox LilycoveCity_ContestLobby_Text_2C464B, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3 lock - msgbox LilycoveCity_ContestLobby_Text_2C465A, 4 + msgbox LilycoveCity_ContestLobby_Text_2C465A, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE lock - msgbox LilycoveCity_ContestLobby_Text_2C4669, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4669, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C4679, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4679, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C46B1, 4 + msgbox LilycoveCity_ContestLobby_Text_2C46B1, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C4763, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4763, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end @@ -625,7 +625,7 @@ LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806 special sub_80F9154 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_27C063, 4 + msgbox LilycoveCity_ContestLobby_Text_27C063, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A819 end @@ -641,7 +641,7 @@ LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 end LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 - msgbox LilycoveCity_ContestLobby_Text_27BD17, 5 + msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F call LilycoveCity_ContestLobby_EventScript_27134F @@ -694,28 +694,28 @@ LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D end LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955 - msgbox LilycoveCity_ContestLobby_Text_27C340, 4 + msgbox LilycoveCity_ContestLobby_Text_27C340, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A90D end LilycoveCity_ContestLobby_EventScript_21A963:: @ 821A963 - msgbox LilycoveCity_ContestLobby_Text_27C5B1, 4 + msgbox LilycoveCity_ContestLobby_Text_27C5B1, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A90D end LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971 - msgbox LilycoveCity_ContestLobby_Text_27C742, 4 + msgbox LilycoveCity_ContestLobby_Text_27C742, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A90D end LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4 + msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C - msgbox LilycoveCity_ContestLobby_Text_27C1C3, 4 + msgbox LilycoveCity_ContestLobby_Text_27C1C3, MSGBOX_DEFAULT setvar VAR_CONTEST_RANK, 0 choosecontestmon compare VAR_0x8004, 255 @@ -734,17 +734,17 @@ LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C end LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0 - msgbox LilycoveCity_ContestLobby_Text_27B471, 4 + msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A98C end LilycoveCity_ContestLobby_EventScript_21A9EE:: @ 821A9EE - msgbox LilycoveCity_ContestLobby_Text_27C186, 4 + msgbox LilycoveCity_ContestLobby_Text_27C186, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A98C end LilycoveCity_ContestLobby_EventScript_21A9FC:: @ 821A9FC - msgbox LilycoveCity_ContestLobby_Text_27C140, 4 + msgbox LilycoveCity_ContestLobby_Text_27C140, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A98C end @@ -796,34 +796,34 @@ LilycoveCity_ContestLobby_EventScript_21AAC0:: @ 821AAC0 return LilycoveCity_ContestLobby_EventScript_21AAC5:: @ 821AAC5 - msgbox LilycoveCity_ContestLobby_Text_27BF0E, 4 + msgbox LilycoveCity_ContestLobby_Text_27BF0E, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21AAD3:: @ 821AAD3 - msgbox LilycoveCity_ContestLobby_Text_27BF4B, 4 + msgbox LilycoveCity_ContestLobby_Text_27BF4B, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1 - msgbox LilycoveCity_ContestLobby_Text_27C254, 4 + msgbox LilycoveCity_ContestLobby_Text_27C254, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27821C, 4 + msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27C879, 4 + msgbox LilycoveCity_ContestLobby_Text_27C879, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21AB09:: @ 821AB09 - msgbox LilycoveCity_ContestLobby_Text_27BEFA, 4 + msgbox LilycoveCity_ContestLobby_Text_27BEFA, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end @@ -1008,12 +1008,12 @@ LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 faceplayer checkflag FLAG_0x05F goto_eq LilycoveCity_ContestLobby_EventScript_21AD06 - msgbox LilycoveCity_ContestLobby_Text_21AD10, 4 + msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21AD06:: @ 821AD06 - msgbox LilycoveCity_ContestLobby_Text_21AD55, 4 + msgbox LilycoveCity_ContestLobby_Text_21AD55, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 3468299a9..9b434a0c2 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -7,10 +7,10 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 waitmovement 0 @@ -18,10 +18,10 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 end LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 waitmovement 0 @@ -29,10 +29,10 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 end LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 waitmovement 0 @@ -48,7 +48,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 waitmovement 0 applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_218259 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc index 810fe5af9..d7e508ec6 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc @@ -1,11 +1,11 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925 - object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, FLAG_HIDE_LILCOVE_MOTEL_SCOTT LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 90769b550..f92df5b42 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2 LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 lock faceplayer - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F specialvar VAR_RESULT, sub_80C08E4 compare VAR_RESULT, 1 @@ -15,11 +15,11 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 end LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, 4 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, MSGBOX_DEFAULT return LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 playfanfare MUS_FANFA4 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F @@ -35,23 +35,23 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F end LilycoveCity_CoveLilyMotel_2F_EventScript_218720:: @ 8218720 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_218729:: @ 8218729 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_218732:: @ 8218732 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_21873B:: @ 821873B - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D @@ -59,14 +59,14 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D faceplayer checkflag FLAG_0x1CE goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_21876A - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, 4 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CE release end LilycoveCity_CoveLilyMotel_2F_EventScript_21876A:: @ 821876A - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, 4 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 372d16dae..bcc3649e2 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624 lock faceplayer setvar VAR_0x8004, 0 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR special sub_8139B60 @@ -120,7 +120,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 waitse special ShakeScreenInElevator waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index 5d0b88445..594a439ce 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -1,7 +1,7 @@ LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962 + object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index da97bbf81..e683b8d07 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -11,11 +11,11 @@ LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D end LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227 - clearflag FLAG_0x3C2 + clearflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN return LilycoveCity_DepartmentStoreRooftop_EventScript_22022B:: @ 822022B - setflag FLAG_0x3C2 + setflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN return LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F @@ -24,7 +24,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F message gUnknown_08272A21 waitmessage pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -54,17 +54,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 getpricereduction 3 compare VAR_RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220282 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStoreRooftop_EventScript_220282:: @ 8220282 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStoreRooftop_EventScript_22028C:: @ 822028C - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, 2 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, MSGBOX_NPC end LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295 @@ -82,7 +82,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6 case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4 case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end @@ -147,11 +147,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F nop bufferitemname 0, VAR_TEMP_0 playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 @@ -159,11 +159,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 @@ -171,11 +171,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436 end @@ -186,12 +186,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220436:: @ 8220436 end LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450 - msgbox gUnknown_08272A89, 4 + msgbox gUnknown_08272A89, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 4a375cf5e..942adedc8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_DepartmentStore_1F_MapScripts:: @ 821F692 .byte 0 LilycoveCity_DepartmentStore_1F_EventScript_21F693:: @ 821F693 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C @@ -13,7 +13,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 checkflag FLAG_0x92A goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F78D - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, 5 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 setflag FLAG_0x92A @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C special RetrieveLotteryNumber copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber - msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 waitmovement 0 playse SE_PC_ON @@ -57,47 +57,47 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C end LilycoveCity_DepartmentStore_1F_EventScript_21F77B:: @ 821F77B - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F784:: @ 821F784 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F78D:: @ 821F78D - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F797:: @ 821F797 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F7A1:: @ 821F7A1 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF end LilycoveCity_DepartmentStore_1F_EventScript_21F7AF:: @ 821F7AF - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F7B9:: @ 821F7B9 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7C2:: @ 821F7C2 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7CB:: @ 821F7CB - msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD @@ -107,12 +107,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD end LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED - msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT giveitem_std VAR_POKELOT_PRIZE compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED @@ -125,15 +125,15 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 end LilycoveCity_DepartmentStore_1F_EventScript_21F82F:: @ 821F82F - msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F838:: @ 821F838 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F841:: @ 821F841 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A @@ -141,13 +141,13 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, MSGBOX_DEFAULT waitmoncry release end LilycoveCity_DepartmentStore_1F_EventScript_21F85D:: @ 821F85D - msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, 3 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, MSGBOX_SIGN end LilycoveCity_DepartmentStore_1F_Text_21F866: @ 821F866 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc index 8bc6d8b29..ca163acdd 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -2,15 +2,15 @@ LilycoveCity_DepartmentStore_2F_MapScripts:: @ 821FB2C .byte 0 LilycoveCity_DepartmentStore_2F_EventScript_21FB2D:: @ 821FB2D - msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, 2 + msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_21FB36:: @ 821FB36 - msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, 2 + msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F - msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, 2 + msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 @@ -19,7 +19,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -46,7 +46,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index 1d980f83e..8ecf415cd 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65 message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -28,7 +28,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -46,15 +46,15 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4 end LilycoveCity_DepartmentStore_3F_EventScript_21FCB6:: @ 821FCB6 - msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, 2 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, MSGBOX_NPC end LilycoveCity_DepartmentStore_3F_EventScript_21FCBF:: @ 821FCBF - msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, 2 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, MSGBOX_NPC end LilycoveCity_DepartmentStore_3F_EventScript_21FCC8:: @ 821FCC8 - msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, 2 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, MSGBOX_NPC end LilycoveCity_DepartmentStore_3F_Text_21FCD1: @ 821FCD1 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc index b162c4740..cee1cb0b7 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -2,15 +2,15 @@ LilycoveCity_DepartmentStore_4F_MapScripts:: @ 821FDEA .byte 0 LilycoveCity_DepartmentStore_4F_EventScript_21FDEB:: @ 821FDEB - msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, 2 + msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, MSGBOX_NPC end LilycoveCity_DepartmentStore_4F_EventScript_21FDF4:: @ 821FDF4 - msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, 2 + msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, MSGBOX_NPC end LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD - msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, 2 + msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, MSGBOX_NPC end LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 @@ -19,7 +19,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index d5f5e49ad..b7155e9e4 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -19,7 +19,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6 message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -47,7 +47,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -72,7 +72,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220024 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -97,7 +97,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220054 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -118,7 +118,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_220054: @ 8220054 end LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C - msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, 2 + msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, MSGBOX_NPC end LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 @@ -133,13 +133,13 @@ LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 end LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C - msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, 4 + msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, MSGBOX_DEFAULT closemessage releaseall end LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 - msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, 4 + msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT closemessage applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6 waitmovement 0 @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 end LilycoveCity_DepartmentStore_5F_EventScript_2200BC:: @ 82200BC - msgbox LilycoveCity_DepartmentStore_5F_Text_220122, 2 + msgbox LilycoveCity_DepartmentStore_5F_Text_220122, MSGBOX_NPC end LilycoveCity_DepartmentStore_5F_Text_2200C5: @ 82200C5 diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc index 7828d58a4..4f69e4fc6 100644 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ b/data/maps/LilycoveCity_Harbor/events.inc @@ -1,9 +1,9 @@ LilycoveCity_Harbor_EventObjects: @ 8531E1C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 861 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 909 - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 748 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR + object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER LilycoveCity_Harbor_MapWarps: @ 8531E94 warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 99ad20280..e537acb92 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -35,7 +35,7 @@ LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 compare VAR_TEMP_A, 0 goto_eq LilycoveCity_Harbor_EventScript_21E557 - msgbox LilycoveCity_Harbor_Text_21E758, 4 + msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT message LilycoveCity_Harbor_Text_21E7ED waitmessage goto LilycoveCity_Harbor_EventScript_21E09F @@ -86,7 +86,7 @@ LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 end LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 - msgbox LilycoveCity_Harbor_Text_21E864, 5 + msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 @@ -97,7 +97,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 end LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 - msgbox LilycoveCity_Harbor_Text_21E880, 5 + msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC @@ -216,10 +216,10 @@ LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 setflag FLAG_0x1AE - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2A68FC, 4 + msgbox LilycoveCity_Harbor_Text_2A68FC, MSGBOX_DEFAULT goto LilycoveCity_Harbor_EventScript_21E30F end @@ -233,10 +233,10 @@ LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F LilycoveCity_Harbor_EventScript_21E320:: @ 821E320 setflag FLAG_0x1AF - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C6A71, 4 + msgbox LilycoveCity_Harbor_Text_2C6A71, MSGBOX_DEFAULT goto LilycoveCity_Harbor_EventScript_21E33F end @@ -250,10 +250,10 @@ LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 setflag FLAG_0x1B0 - msgbox LilycoveCity_Harbor_Text_2A6848, 4 + msgbox LilycoveCity_Harbor_Text_2A6848, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C68A5, 4 + msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 @@ -271,12 +271,12 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call_if 1, LilycoveCity_Harbor_EventScript_21E675 compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E680 - msgbox LilycoveCity_Harbor_Text_2C6951, 4 + msgbox LilycoveCity_Harbor_Text_2C6951, MSGBOX_DEFAULT compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E68B compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E696 - msgbox LilycoveCity_Harbor_Text_2C69AA, 4 + msgbox LilycoveCity_Harbor_Text_2C69AA, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 @@ -299,10 +299,10 @@ LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D setflag FLAG_0x1DB - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C6A71, 4 + msgbox LilycoveCity_Harbor_Text_2C6A71, MSGBOX_DEFAULT goto LilycoveCity_Harbor_EventScript_21E43C end @@ -315,7 +315,7 @@ LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C end LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE message LilycoveCity_Harbor_Text_2C6BD4 @@ -335,7 +335,7 @@ LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D end LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 - msgbox LilycoveCity_Harbor_Text_2A6A82, 4 + msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 @@ -346,7 +346,7 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 - msgbox LilycoveCity_Harbor_Text_21E842, 4 + msgbox LilycoveCity_Harbor_Text_21E842, MSGBOX_DEFAULT release end @@ -378,24 +378,24 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 return LilycoveCity_Harbor_EventScript_21E54D:: @ 821E54D - msgbox LilycoveCity_Harbor_Text_21E6F1, 4 + msgbox LilycoveCity_Harbor_Text_21E6F1, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_21E557:: @ 821E557 - msgbox LilycoveCity_Harbor_Text_21E758, 4 + msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT message LilycoveCity_Harbor_Text_21E7ED waitmessage goto LilycoveCity_Harbor_EventScript_21E09F end LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B - msgbox LilycoveCity_Harbor_Text_21E792, 4 + msgbox LilycoveCity_Harbor_Text_21E792, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 - msgbox LilycoveCity_Harbor_Text_21E864, 5 + msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 @@ -406,7 +406,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 end LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D - msgbox LilycoveCity_Harbor_Text_21E880, 5 + msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC @@ -422,7 +422,7 @@ LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 end LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC - msgbox LilycoveCity_Harbor_Text_21E89D, 4 + msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 @@ -449,7 +449,7 @@ LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B return LilycoveCity_Harbor_EventScript_21E626:: @ 821E626 - msgbox LilycoveCity_Harbor_Text_21E842, 4 + msgbox LilycoveCity_Harbor_Text_21E842, MSGBOX_DEFAULT release end @@ -471,12 +471,12 @@ LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_Harbor_EventScript_21E64C - msgbox LilycoveCity_Harbor_Text_21E8EE, 4 + msgbox LilycoveCity_Harbor_Text_21E8EE, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_21E64C:: @ 821E64C - msgbox LilycoveCity_Harbor_Text_21E976, 4 + msgbox LilycoveCity_Harbor_Text_21E976, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc index 59418e667..1484a6a1f 100644 --- a/data/maps/LilycoveCity_House1/scripts.inc +++ b/data/maps/LilycoveCity_House1/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_House1_MapScripts:: @ 821ECCD .byte 0 LilycoveCity_House1_EventScript_21ECCE:: @ 821ECCE - msgbox LilycoveCity_House1_Text_21ECEA, 2 + msgbox LilycoveCity_House1_Text_21ECEA, MSGBOX_NPC end LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7 @@ -10,7 +10,7 @@ LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7 faceplayer waitse playmoncry SPECIES_KECLEON, 0 - msgbox LilycoveCity_House1_Text_21ED63, 4 + msgbox LilycoveCity_House1_Text_21ED63, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 486df9be0..2a78e6df5 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -6,17 +6,17 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 faceplayer checkflag FLAG_0x0EA goto_eq LilycoveCity_House2_EventScript_21EDAC - msgbox LilycoveCity_House2_Text_21EDB6, 4 + msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT giveitem_std ITEM_TM44 compare VAR_RESULT, 0 goto_eq LilycoveCity_House2_EventScript_272054 setflag FLAG_0x0EA - msgbox LilycoveCity_House2_Text_21EDF9, 4 + msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release end LilycoveCity_House2_EventScript_21EDAC:: @ 821EDAC - msgbox LilycoveCity_House2_Text_21EDF9, 4 + msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 38210196e..a05403de3 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -10,10 +10,10 @@ LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B lock faceplayer - msgbox LilycoveCity_House3_Text_21EF99, 5 + msgbox LilycoveCity_House3_Text_21EF99, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_House3_EventScript_21EE75 - msgbox LilycoveCity_House3_Text_21F0F8, 4 + msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 waitmovement 0 @@ -21,7 +21,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B end LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 - msgbox LilycoveCity_House3_Text_21F0A9, 4 + msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 waitmovement 0 @@ -31,7 +31,7 @@ LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A lock faceplayer - msgbox LilycoveCity_House3_Text_21F430, 4 + msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 waitmovement 0 @@ -79,22 +79,22 @@ LilycoveCity_House3_EventScript_21EF3D:: @ 821EF3D end LilycoveCity_House3_EventScript_21EF71:: @ 821EF71 - msgbox LilycoveCity_House3_Text_21F4A7, 4 + msgbox LilycoveCity_House3_Text_21F4A7, MSGBOX_DEFAULT release end LilycoveCity_House3_EventScript_21EF7B:: @ 821EF7B - msgbox LilycoveCity_House3_Text_21F4E0, 4 + msgbox LilycoveCity_House3_Text_21F4E0, MSGBOX_DEFAULT release end LilycoveCity_House3_EventScript_21EF85:: @ 821EF85 - msgbox LilycoveCity_House3_Text_21F523, 4 + msgbox LilycoveCity_House3_Text_21F523, MSGBOX_DEFAULT release end LilycoveCity_House3_EventScript_21EF8F:: @ 821EF8F - msgbox LilycoveCity_House3_Text_21F55A, 4 + msgbox LilycoveCity_House3_Text_21F55A, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc index 8bfdb2d48..e3feb8e25 100644 --- a/data/maps/LilycoveCity_House4/scripts.inc +++ b/data/maps/LilycoveCity_House4/scripts.inc @@ -2,11 +2,11 @@ LilycoveCity_House4_MapScripts:: @ 821F5B4 .byte 0 LilycoveCity_House4_EventScript_21F5B5:: @ 821F5B5 - msgbox LilycoveCity_House4_Text_21F5C7, 2 + msgbox LilycoveCity_House4_Text_21F5C7, MSGBOX_NPC end LilycoveCity_House4_EventScript_21F5BE:: @ 821F5BE - msgbox LilycoveCity_House4_Text_21F62B, 2 + msgbox LilycoveCity_House4_Text_21F62B, MSGBOX_NPC end LilycoveCity_House4_Text_21F5C7: @ 821F5C7 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index ea9606936..52f7a2f9e 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -1,14 +1,14 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0 object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0 object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776 - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779 - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780 - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778 + object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 + object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS + object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index c2f3be7d6..9a7e466f0 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8 .byte 0 LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 @@ -18,11 +18,11 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 end LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, 5 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 compare VAR_RESULT, 1 @@ -30,12 +30,12 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 end LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, MSGBOX_SIGN releaseall end LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, MSGBOX_SIGN applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_218D99 waitmovement 0 removeobject 2 @@ -89,70 +89,70 @@ LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1 step_end LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD:: @ 8218DAD - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6:: @ 8218DB6 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF:: @ 8218DBF - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8:: @ 8218DC8 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1:: @ 8218DD1 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA:: @ 8218DDA LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA:: @ 8218DDA - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3:: @ 8218DE3 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC:: @ 8218DEC - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5:: @ 8218DF5 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE:: @ 8218DFE - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218E07:: @ 8218E07 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218E10:: @ 8218E10 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218E19:: @ 8218E19 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218E22:: @ 8218E22 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B lock faceplayer - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, 4 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT closemessage applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2 waitmovement 0 @@ -160,7 +160,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B end LilycoveCity_LilycoveMuseum_1F_EventScript_218E42:: @ 8218E42 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index ce4a6e169..ecae340c0 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -1,8 +1,8 @@ LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780 - object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 + object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS + object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 6b4f0f3da..a09d304b4 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -70,17 +70,17 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E waitmovement 0 applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN copyvar VAR_0x4094, 0x1 releaseall end @@ -105,25 +105,25 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, MSGBOX_DEFAULT goto LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA end LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT givedecoration_std 44 compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 @@ -134,13 +134,13 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 call LilycoveCity_LilycoveMuseum_2F_EventScript_272071 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT closemessage releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, MSGBOX_NPC releaseall end @@ -148,79 +148,79 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B lockall checkflag FLAG_0x0A2 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E lockall checkflag FLAG_0x0A4 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951 lockall checkflag FLAG_0x0A0 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964 lockall checkflag FLAG_0x0A1 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977 lockall checkflag FLAG_0x0A3 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_21998A:: @ 821998A - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_219993:: @ 8219993 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_21999C:: @ 821999C - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5:: @ 82199A5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 9 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3:: @ 82199B3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 10 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1:: @ 82199C1 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 11 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF:: @ 82199CF - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 12 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD:: @ 82199DD - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 13 releaseall diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 19471d2e1..aa69aa7ec 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -5,7 +5,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B lockall applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E waitmovement 0 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO switch VAR_RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EA3B case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 @@ -13,7 +13,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B end LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, MSGBOX_DEFAULT special sub_81B94B0 waitstate compare VAR_0x8004, 255 @@ -24,14 +24,14 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B special sub_81B96D0 compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, MSGBOX_DEFAULT fadescreen 1 special sub_81B968C fadescreen 0 compare VAR_0x8005, 4 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, MSGBOX_YESNO switch VAR_RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EAB0 case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 @@ -45,29 +45,29 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 special sub_81B9770 playfanfare MUS_ME_WASURE waitfanfare - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EACF:: @ 821EACF special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EADC:: @ 821EADC - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EAE6:: @ 821EAE6 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EAF0:: @ 821EAF0 special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc index 42b4949a2..3ab130771 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc @@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 - object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993 + object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 934f666ad..0f643ad3e 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -17,11 +17,11 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6 end LilycoveCity_PokemonCenter_1F_EventScript_21C5E0:: @ 821C5E0 - setflag FLAG_0x3E1 + setflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY end LilycoveCity_PokemonCenter_1F_EventScript_21C5E4:: @ 821C5E4 - clearflag FLAG_0x3E1 + clearflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY end LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8 @@ -33,7 +33,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8 end LilycoveCity_PokemonCenter_1F_EventScript_21C5F6:: @ 821C5F6 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, 2 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, MSGBOX_NPC end LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF @@ -41,12 +41,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF faceplayer checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C614 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_21C614:: @ 821C614 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc index 910dd36ab..1a7e9a6a2 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc index 7ba16fbb9..3d08ce647 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc @@ -3,11 +3,11 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792 - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789 - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730 + object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, FLAG_HIDE_FANCLUB_LITTLE_BOY + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, FLAG_HIDE_FANCLUB_BOY + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, FLAG_HIDE_FANCLUB_LADY + object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, FLAG_HIDE_FANCLUB_OLD_LADY + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 9587bcae3..e8fc1886c 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -11,13 +11,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 @@ -109,12 +109,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA specialvar VAR_RESULT, sub_80EE7C0 compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1 - clearflag FLAG_0x2DA + clearflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER clearflag FLAG_0x0D2 return LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1 - setflag FLAG_0x2DA + setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER return LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 @@ -217,7 +217,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, MSGBOX_DEFAULT release end @@ -225,22 +225,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70:: @ 821CA70 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A:: @ 821CA7A - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84:: @ 821CA84 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, MSGBOX_DEFAULT release end @@ -257,7 +257,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, MSGBOX_DEFAULT release end @@ -265,22 +265,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7:: @ 821CAE7 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1:: @ 821CAF1 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB:: @ 821CAFB - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, MSGBOX_DEFAULT release end @@ -297,7 +297,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, MSGBOX_DEFAULT release end @@ -305,22 +305,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E:: @ 821CB5E - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68:: @ 821CB68 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72:: @ 821CB72 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, MSGBOX_DEFAULT release end @@ -337,7 +337,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, MSGBOX_DEFAULT release end @@ -345,22 +345,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5:: @ 821CBD5 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF:: @ 821CBDF - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9:: @ 821CBE9 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, MSGBOX_DEFAULT release end @@ -375,7 +375,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, MSGBOX_DEFAULT release end @@ -383,17 +383,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41:: @ 821CC41 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B:: @ 821CC4B - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, MSGBOX_DEFAULT release end @@ -408,7 +408,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, MSGBOX_DEFAULT release end @@ -416,17 +416,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3:: @ 821CCA3 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD:: @ 821CCAD - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, MSGBOX_DEFAULT release end @@ -441,7 +441,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, MSGBOX_DEFAULT release end @@ -449,17 +449,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05:: @ 821CD05 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F:: @ 821CD0F - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, MSGBOX_DEFAULT release end @@ -474,7 +474,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, MSGBOX_DEFAULT release end @@ -482,17 +482,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, MSGBOX_DEFAULT release end @@ -513,7 +513,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 copyvar VAR_0x800A, VAR_0x8006 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT setvar VAR_0x8004, 14 copyvar VAR_0x8005, VAR_0x800A call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C @@ -526,14 +526,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, MSGBOX_DEFAULT goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D end LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 compare VAR_RESULT, 0 @@ -543,7 +543,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT setvar VAR_0x8004, 14 copyvar VAR_0x8005, VAR_0x800A call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C @@ -578,7 +578,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 compare VAR_RESULT, 0 @@ -588,14 +588,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, MSGBOX_DEFAULT setflag FLAG_0x0D2 release end @@ -603,7 +603,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, MSGBOX_DEFAULT release end diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc index 72fe038ff..99eeef56f 100644 --- a/data/maps/LinkContestRoom1/events.inc +++ b/data/maps/LinkContestRoom1/events.inc @@ -11,7 +11,7 @@ LinkContestRoom1_EventObjects: @ 8539EFC object_event 10, 249, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 11, 250, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 86 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_POKE_BALL object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index 89057d387..71bf9a643 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -1,12 +1,12 @@ LittlerootTown_EventObjects: @ 85276A8 object_event 1, EVENT_OBJ_GFX_TWIN, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, 868 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752 - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 761 - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 762 - object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 794 - object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 795 + object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL + object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH LittlerootTown_MapWarps: @ 8527768 warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index eb78368af..1f4e2593c 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -41,7 +41,7 @@ LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F LittlerootTown_EventScript_1E7E53:: @ 81E7E53 setvar VAR_0x40C7, 2 - setflag FLAG_0x3D3 + setflag FLAG_HIDE_OLDALE_TOWN_RIVAL return LittlerootTown_EventScript_1E7E5C:: @ 81E7E5C @@ -66,7 +66,7 @@ LittlerootTown_EventScript_1E7E86:: @ 81E7E86 return LittlerootTown_EventScript_1E7E92:: @ 81E7E92 - clearflag FLAG_0x2F0 + clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setobjectmovementtype 4, 8 checkplayergender compare VAR_RESULT, 0 @@ -94,7 +94,7 @@ LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB setvar VAR_0x8004, 5 setvar VAR_0x8005, 8 call LittlerootTown_EventScript_1E7F17 - setflag FLAG_0x2F9 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall @@ -105,7 +105,7 @@ LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 call LittlerootTown_EventScript_1E7F17 - setflag FLAG_0x2FA + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall @@ -126,7 +126,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 delay 10 applymovement 4, LittlerootTown_Movement_1E7F9A waitmovement 0 - msgbox LittlerootTown_Text_1E86BC, 4 + msgbox LittlerootTown_Text_1E86BC, MSGBOX_DEFAULT closemessage applymovement 4, LittlerootTown_Movement_1E7F9D applymovement 255, LittlerootTown_Movement_1E7FA4 @@ -136,12 +136,12 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 applymovement 4, LittlerootTown_Movement_1E7FA1 applymovement 255, LittlerootTown_Movement_1E7FA9 waitmovement 0 - setflag FLAG_0x2F0 + setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setvar VAR_0x4092, 3 hideobjectat 255, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim - clearflag FLAG_0x364 + clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN clearflag FLAG_SPECIAL_FLAG_0x4000 return @@ -190,10 +190,10 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 applymovement 8, LittlerootTown_Movement_272598 waitmovement 0 delay 80 - msgbox LittlerootTown_Text_1E8DA2, 4 + msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT closemessage - clearflag FLAG_0x31A - clearflag FLAG_0x31B + clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH delay 20 clearflag FLAG_SPECIAL_FLAG_0x4000 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 @@ -225,11 +225,11 @@ LittlerootTown_EventScript_1E8013:: @ 81E8013 end LittlerootTown_EventScript_1E8022:: @ 81E8022 - msgbox LittlerootTown_Text_1E8ACF, 2 + msgbox LittlerootTown_Text_1E8ACF, MSGBOX_NPC end LittlerootTown_EventScript_1E802B:: @ 81E802B - msgbox LittlerootTown_Text_1E8B25, 2 + msgbox LittlerootTown_Text_1E8B25, MSGBOX_NPC end LittlerootTown_EventScript_1E8034:: @ 81E8034 @@ -241,13 +241,13 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034 goto_eq LittlerootTown_EventScript_1E807A compare VAR_0x4050, 0 goto_if 5, LittlerootTown_EventScript_1E805D - msgbox LittlerootTown_Text_1E8BB8, 4 + msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT release end LittlerootTown_EventScript_1E805D:: @ 81E805D special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, 4 + msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_2725A2 waitmovement 0 @@ -257,12 +257,12 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D LittlerootTown_EventScript_1E807A:: @ 81E807A special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8CE3, 4 + msgbox LittlerootTown_Text_1E8CE3, MSGBOX_DEFAULT release end LittlerootTown_EventScript_1E8087:: @ 81E8087 - msgbox LittlerootTown_Text_1E8D07, 4 + msgbox LittlerootTown_Text_1E8D07, MSGBOX_DEFAULT release end @@ -277,12 +277,12 @@ LittlerootTown_EventScript_1E8091:: @ 81E8091 end LittlerootTown_EventScript_1E80AD:: @ 81E80AD - msgbox LittlerootTown_Text_1E8BB8, 4 + msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_1E80DF applymovement 255, LittlerootTown_Movement_1E80EB waitmovement 0 - msgbox LittlerootTown_Text_1E8C07, 4 + msgbox LittlerootTown_Text_1E8C07, MSGBOX_DEFAULT closemessage return @@ -365,7 +365,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F applymovement 255, LittlerootTown_Movement_2725A4 waitmovement 0 special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, 4 + msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_2725A2 waitmovement 0 @@ -374,11 +374,11 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F end LittlerootTown_EventScript_1E8151:: @ 81E8151 - msgbox LittlerootTown_Text_1E8D32, 3 + msgbox LittlerootTown_Text_1E8D32, MSGBOX_SIGN end LittlerootTown_EventScript_1E815A:: @ 81E815A - msgbox LittlerootTown_Text_1E8D69, 3 + msgbox LittlerootTown_Text_1E8D69, MSGBOX_SIGN end LittlerootTown_EventScript_1E8163:: @ 81E8163 @@ -392,11 +392,11 @@ LittlerootTown_EventScript_1E8163:: @ 81E8163 end LittlerootTown_EventScript_1E817D:: @ 81E817D - msgbox LittlerootTown_Text_1E8D83, 4 + msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E8186:: @ 81E8186 - msgbox LittlerootTown_Text_1E8D8E, 4 + msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E818F:: @ 81E818F @@ -410,11 +410,11 @@ LittlerootTown_EventScript_1E818F:: @ 81E818F end LittlerootTown_EventScript_1E81A9:: @ 81E81A9 - msgbox LittlerootTown_Text_1E8D8E, 4 + msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E81B2:: @ 81E81B2 - msgbox LittlerootTown_Text_1E8D83, 4 + msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E81BB:: @ 81E81BB @@ -466,7 +466,7 @@ LittlerootTown_EventScript_1E8211:: @ 81E8211 call_if 1, LittlerootTown_EventScript_1E8281 compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E828C - msgbox LittlerootTown_Text_1E87E1, 4 + msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT closemessage checkplayergender compare VAR_RESULT, 0 @@ -917,13 +917,13 @@ LittlerootTown_EventScript_1E8686:: @ 81E8686 end LittlerootTown_EventScript_1E8693:: @ 81E8693 - msgbox LittlerootTown_Text_1E87F0, 4 + msgbox LittlerootTown_Text_1E87F0, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message LittlerootTown_Text_1E8925 waitfanfare setflag FLAG_0x112 - msgbox LittlerootTown_Text_1E894F, 4 - msgbox LittlerootTown_Text_1E8A03, 4 + msgbox LittlerootTown_Text_1E894F, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_1E8A03, MSGBOX_DEFAULT closemessage delay 30 return diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index abe7a5bc8..6f327d330 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -1,11 +1,11 @@ LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C - object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758 - object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755 - object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784 - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 734 - object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 745 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM + object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 + object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD + object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 4c904b001..4a0c9f082 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -60,7 +60,7 @@ LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 lockall - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A @@ -99,7 +99,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_0x057 setvar VAR_0x4082, 2 releaseall @@ -160,7 +160,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997 compare VAR_0x8008, 2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 @@ -170,9 +170,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 playse SE_KAIDAN removeobject 7 - setflag FLAG_0x2E9 - setflag FLAG_0x331 - clearflag FLAG_0x2F8 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM delay 30 setvar VAR_0x408D, 3 setvar VAR_0x4050, 1 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index 8ea295cdf..07ce48998 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -1,20 +1,20 @@ LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 185 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 757 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817 - object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 815 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL + object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 2382305bb..cdd8b83b0 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -58,7 +58,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 lockall compare VAR_0x408D, 2 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall end @@ -83,8 +83,8 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 compare VAR_FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594 setvar VAR_0x408D, 3 - setflag FLAG_0x331 - clearflag FLAG_0x2F8 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setvar VAR_0x4050, 1 savebgm MUS_DUMMY fadedefaultbgm @@ -96,7 +96,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85CF applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6 @@ -108,7 +108,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB @@ -120,7 +120,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED @@ -132,7 +132,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F8604 waitmovement 0 @@ -258,7 +258,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 setvar VAR_0x8004, 1 special DoPCTurnOnEffect playse SE_PC_ON - msgbox gUnknown_08272D87, 4 + msgbox gUnknown_08272D87, MSGBOX_DEFAULT special BedroomPC waitstate releaseall @@ -272,18 +272,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F end LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C - msgbox gUnknown_08272CD5, 4 + msgbox gUnknown_08272CD5, MSGBOX_DEFAULT releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656 LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, 3 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, MSGBOX_SIGN end LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, 3 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, MSGBOX_SIGN end LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 69fb6af63..3075945f1 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -1,11 +1,11 @@ LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C - object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759 - object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754 - object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785 - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 734 - object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736 - object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 746 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM + object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 + object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD + object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING + object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 99d47f938..ef5ff3df1 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -60,7 +60,7 @@ LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 lockall - msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A @@ -99,7 +99,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_0x057 setvar VAR_0x408C, 2 releaseall @@ -125,22 +125,22 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 compare VAR_0x408D, 3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F:: @ 81F8A1F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1F8A29:: @ 81F8A29 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1F8A33:: @ 81F8A33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, MSGBOX_DEFAULT release end @@ -149,7 +149,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D lock faceplayer special GetPlayerBigGuyGirlString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, MSGBOX_DEFAULT release end @@ -199,7 +199,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40 compare VAR_0x8008, 2 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B - msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A @@ -209,9 +209,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E playse SE_KAIDAN removeobject 7 - setflag FLAG_0x2EA - setflag FLAG_0x332 - clearflag FLAG_0x2D2 + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL + clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM delay 30 setvar VAR_0x408D, 3 setvar VAR_0x4050, 1 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index a9d7001b7..8c93a570a 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -1,20 +1,20 @@ LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 185 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 757 - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 849 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818 + object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 14e269445..3d7e47d19 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -59,7 +59,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 lockall compare VAR_0x408D, 2 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A - msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall end @@ -84,8 +84,8 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A compare VAR_FACING, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440 setvar VAR_0x408D, 3 - setflag FLAG_0x332 - clearflag FLAG_0x2D2 + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL + clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM setvar VAR_0x4050, 1 savebgm MUS_DUMMY fadedefaultbgm @@ -97,7 +97,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9483 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479 @@ -109,7 +109,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9497 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F @@ -121,7 +121,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94A4 waitmovement 0 @@ -132,7 +132,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F94BB applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2 @@ -260,12 +260,12 @@ LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 end LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, MSGBOX_DEFAULT releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, MSGBOX_DEFAULT releaseall end @@ -284,21 +284,21 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D checkflag FLAG_0x125 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F checkflag FLAG_0x125 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F9541:: @ 81F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, MSGBOX_DEFAULT return EventScript_PlayerPCFemale:: @ 81F9553 @@ -311,7 +311,7 @@ EventScript_PlayerPCFemale:: @ 81F9553 end LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C - msgbox gUnknown_08272CD5, 4 + msgbox gUnknown_08272CD5, MSGBOX_DEFAULT releaseall end @@ -319,7 +319,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 setvar VAR_0x8004, 2 special DoPCTurnOnEffect playse SE_PC_ON - msgbox gUnknown_08272D87, 4 + msgbox gUnknown_08272D87, MSGBOX_DEFAULT special BedroomPC waitstate releaseall diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index df992a2e3..4eb310f74 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -1,10 +1,10 @@ LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 75b83b6a1..22d5bc99b 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -98,7 +98,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 compare VAR_RESULT, 0 @@ -112,7 +112,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 compare VAR_RESULT, 0 @@ -120,14 +120,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, 4 - clearflag FLAG_0x3DF + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT + clearflag FLAG_HIDE_ROUTE_101_BOY setvar VAR_0x4084, 3 releaseall end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 compare VAR_RESULT, 0 @@ -154,7 +154,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 lockall delay 30 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, MSGBOX_DEFAULT closemessage applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F46 waitmovement 0 @@ -183,17 +183,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_1FB436 waitmessage waitfanfare setflag FLAG_SYS_NATIONAL_DEX special EnableNationalPokedex - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT closemessage - setflag FLAG_0x31B - setflag FLAG_0x31A + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL setvar VAR_0x40D3, 2 setvar VAR_0x40F5, 0 setflag FLAG_0x072 @@ -201,12 +201,12 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32:: @ 81F9F32 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, MSGBOX_DEFAULT closemessage return LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, MSGBOX_DEFAULT closemessage return @@ -246,7 +246,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 lockall applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, MSGBOX_DEFAULT setvar VAR_0x40D3, 5 releaseall end @@ -268,18 +268,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 checkflag FLAG_0x058 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT setflag FLAG_0x058 release end LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7:: @ 81F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, MSGBOX_DEFAULT release end @@ -290,7 +290,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C @@ -303,7 +303,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D @@ -316,20 +316,20 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE end LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, MSGBOX_DEFAULT releaseall end LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT releaseall end @@ -348,7 +348,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B @@ -359,7 +359,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 @@ -373,7 +373,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_0x40D3, 6 releaseall end @@ -393,7 +393,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B @@ -404,7 +404,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 @@ -418,7 +418,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_0x40D3, 6 releaseall end @@ -438,7 +438,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B @@ -449,7 +449,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 @@ -463,7 +463,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_0x40D3, 6 releaseall end @@ -490,17 +490,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A end LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A:: @ 81FA28A - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E - checkflag FLAG_0x380 + checkflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x40D3, 3 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 @@ -508,17 +508,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x4084, 5 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2 Route101_EventScript_1FA2D2:: @ 81FA2D2 - msgbox Route101_Text_2B5F52, 4 + msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route101_Text_2B603A, 4 + msgbox Route101_Text_2B603A, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -528,9 +528,9 @@ Route101_EventScript_1FA2D2:: @ 81FA2D2 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, MSGBOX_DEFAULT call LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, MSGBOX_DEFAULT closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 @@ -550,20 +550,20 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -578,16 +578,16 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC return LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE:: @ 81FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 @@ -596,7 +596,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 step_end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC @@ -617,11 +617,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC end LittlerootTown_ProfessorBirchsLab_EventScript_1FA428:: @ 81FA428 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A @@ -634,11 +634,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A end LittlerootTown_ProfessorBirchsLab_EventScript_1FA453:: @ 81FA453 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 @@ -651,11 +651,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E:: @ 81FA47E - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 @@ -668,23 +668,23 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9:: @ 81FA4A9 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2:: @ 81FA4B2 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB:: @ 81FA4BB - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4:: @ 81FA4C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc index 2fa18eade..fd82f78e0 100644 --- a/data/maps/MagmaHideout_1F/events.inc +++ b/data/maps/MagmaHideout_1F/events.inc @@ -1,10 +1,10 @@ MagmaHideout_1F_EventObjects: @ 85371CC - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, 857 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_11 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_12 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_13 MagmaHideout_1F_MapWarps: @ 853725C warp_def 10, 34, 3, 4, MAP_JAGGED_PASS diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 0e133a890..deb805bb5 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -7,13 +7,13 @@ MagmaHideout_1F_MapScript1_239886: @ 8239886 end MagmaHideout_1F_EventScript_23988C:: @ 823988C - trainerbattle 0, TRAINER_GRUNT_38, 0, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 - msgbox MagmaHideout_1F_Text_2399B1, 6 + trainerbattle_single TRAINER_GRUNT_38, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 + msgbox MagmaHideout_1F_Text_2399B1, MSGBOX_AUTOCLOSE end MagmaHideout_1F_EventScript_2398A3:: @ 82398A3 - trainerbattle 0, TRAINER_GRUNT_39, 0, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA - msgbox MagmaHideout_1F_Text_239ACD, 6 + trainerbattle_single TRAINER_GRUNT_39, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA + msgbox MagmaHideout_1F_Text_239ACD, MSGBOX_AUTOCLOSE end MagmaHideout_1F_Text_2398BA: @ 82398BA diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc index 723c9e914..d80849231 100644 --- a/data/maps/MagmaHideout_2F_1R/events.inc +++ b/data/maps/MagmaHideout_2F_1R/events.inc @@ -1,8 +1,8 @@ MagmaHideout_2F_1R_EventObjects: @ 8537290 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS MagmaHideout_2F_1R_MapWarps: @ 85372F0 warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc index 33252bb57..9536ad433 100644 --- a/data/maps/MagmaHideout_2F_1R/scripts.inc +++ b/data/maps/MagmaHideout_2F_1R/scripts.inc @@ -2,23 +2,23 @@ MagmaHideout_2F_1R_MapScripts:: @ 8239B50 .byte 0 MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51 - trainerbattle 0, TRAINER_GRUNT_51, 0, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B - msgbox MagmaHideout_2F_1R_Text_239C74, 6 + trainerbattle_single TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B + msgbox MagmaHideout_2F_1R_Text_239C74, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68 - trainerbattle 0, TRAINER_GRUNT_40, 0, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 - msgbox MagmaHideout_2F_1R_Text_239D1D, 6 + trainerbattle_single TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 + msgbox MagmaHideout_2F_1R_Text_239D1D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F - trainerbattle 0, TRAINER_GRUNT_41, 0, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 - msgbox MagmaHideout_2F_1R_Text_239D7D, 6 + trainerbattle_single TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 + msgbox MagmaHideout_2F_1R_Text_239D7D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96 - trainerbattle 0, TRAINER_GRUNT_42, 0, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA - msgbox MagmaHideout_2F_1R_Text_239DE2, 6 + trainerbattle_single TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA + msgbox MagmaHideout_2F_1R_Text_239DE2, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc index 277dcf530..8bc61def7 100644 --- a/data/maps/MagmaHideout_2F_2R/events.inc +++ b/data/maps/MagmaHideout_2F_2R/events.inc @@ -1,10 +1,10 @@ MagmaHideout_2F_2R_EventObjects: @ 853731C - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE MagmaHideout_2F_2R_MapWarps: @ 85373AC warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc index 8b1e51f16..4fc06770c 100644 --- a/data/maps/MagmaHideout_2F_2R/scripts.inc +++ b/data/maps/MagmaHideout_2F_2R/scripts.inc @@ -2,23 +2,23 @@ MagmaHideout_2F_2R_MapScripts:: @ 8239E07 .byte 0 MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08 - trainerbattle 0, TRAINER_GRUNT_52, 0, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 - msgbox MagmaHideout_2F_2R_Text_239EBB, 6 + trainerbattle_single TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 + msgbox MagmaHideout_2F_2R_Text_239EBB, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F - trainerbattle 0, TRAINER_GRUNT_43, 0, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 - msgbox MagmaHideout_2F_2R_Text_239FA1, 6 + trainerbattle_single TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 + msgbox MagmaHideout_2F_2R_Text_239FA1, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36 - trainerbattle 0, TRAINER_GRUNT_44, 0, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 - msgbox MagmaHideout_2F_2R_Text_23A07D, 6 + trainerbattle_single TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 + msgbox MagmaHideout_2F_2R_Text_23A07D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D - trainerbattle 0, TRAINER_GRUNT_45, 0, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C - msgbox MagmaHideout_2F_2R_Text_23A16F, 6 + trainerbattle_single TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C + msgbox MagmaHideout_2F_2R_Text_23A16F, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_Text_239E64: @ 8239E64 diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc index 0f3ff3529..1fbad5042 100644 --- a/data/maps/MagmaHideout_3F_1R/events.inc +++ b/data/maps/MagmaHideout_3F_1R/events.inc @@ -1,7 +1,7 @@ MagmaHideout_3F_1R_EventObjects: @ 85373D0 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET MagmaHideout_3F_1R_MapWarps: @ 8537418 warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc index 068e71492..69fd661b2 100644 --- a/data/maps/MagmaHideout_3F_1R/scripts.inc +++ b/data/maps/MagmaHideout_3F_1R/scripts.inc @@ -2,13 +2,13 @@ MagmaHideout_3F_1R_MapScripts:: @ 823A1B2 .byte 0 MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3 - trainerbattle 0, TRAINER_GRUNT_46, 0, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 - msgbox MagmaHideout_3F_1R_Text_23A246, 6 + trainerbattle_single TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 + msgbox MagmaHideout_3F_1R_Text_23A246, MSGBOX_AUTOCLOSE end MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA - trainerbattle 0, TRAINER_GRUNT_53, 0, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 - msgbox MagmaHideout_3F_1R_Text_23A37C, 6 + trainerbattle_single TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 + msgbox MagmaHideout_3F_1R_Text_23A37C, MSGBOX_AUTOCLOSE end MagmaHideout_3F_1R_Text_23A1E1: @ 823A1E1 diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc index d2bd79078..d00cbf423 100644 --- a/data/maps/MagmaHideout_3F_2R/events.inc +++ b/data/maps/MagmaHideout_3F_2R/events.inc @@ -1,6 +1,6 @@ MagmaHideout_3F_2R_EventObjects: @ 8537444 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX MagmaHideout_3F_2R_MapWarps: @ 8537474 warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc index 15d0c26ea..e4c232d32 100644 --- a/data/maps/MagmaHideout_3F_2R/scripts.inc +++ b/data/maps/MagmaHideout_3F_2R/scripts.inc @@ -2,8 +2,8 @@ MagmaHideout_3F_2R_MapScripts:: @ 823A3D4 .byte 0 MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5 - trainerbattle 0, TRAINER_GRUNT_47, 0, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB - msgbox MagmaHideout_3F_2R_Text_23A4EF, 6 + trainerbattle_single TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB + msgbox MagmaHideout_3F_2R_Text_23A4EF, MSGBOX_AUTOCLOSE end MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc index 2ced1f4fd..26ffa3dff 100644 --- a/data/maps/MagmaHideout_3F_3R/events.inc +++ b/data/maps/MagmaHideout_3F_3R/events.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_3R_EventObjects: @ 8537574 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE MagmaHideout_3F_3R_MapWarps: @ 853758C warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc index 435099c47..09e054109 100644 --- a/data/maps/MagmaHideout_4F/events.inc +++ b/data/maps/MagmaHideout_4F/events.inc @@ -1,12 +1,12 @@ MagmaHideout_4F_EventObjects: @ 8537490 - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 853 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857 - object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857 - object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 850 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS + object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE MagmaHideout_4F_MapWarps: @ 8537550 warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 0cc0fea56..1eae21a57 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -4,7 +4,7 @@ MagmaHideout_4F_MapScripts:: @ 823A55F MagmaHideout_4F_EventScript_23A560:: @ 823A560 lockall playbgm MUS_MGM0, 0 - msgbox MagmaHideout_4F_Text_23A9F4, 4 + msgbox MagmaHideout_4F_Text_23A9F4, MSGBOX_DEFAULT closemessage delay 20 setvar VAR_RESULT, 1 @@ -48,20 +48,20 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 delay 30 applymovement 6, MagmaHideout_4F_Movement_23A680 waitmovement 0 - msgbox MagmaHideout_4F_Text_23AADA, 4 + msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage applymovement 255, MagmaHideout_4F_Movement_2725A8 waitmovement 0 delay 30 applymovement 6, MagmaHideout_4F_Movement_27259E waitmovement 0 - msgbox MagmaHideout_4F_Text_23AB33, 4 + msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT closemessage - trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5 - msgbox MagmaHideout_4F_Text_23ABE2, 4 + trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_23ABB5 + msgbox MagmaHideout_4F_Text_23ABE2, MSGBOX_DEFAULT closemessage - clearflag FLAG_0x348 - clearflag FLAG_0x343 + clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN + clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY setvar VAR_0x4058, 1 setflag FLAG_0x06F setvar VAR_0x40A0, 1 @@ -71,7 +71,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 removeobject 3 removeobject 4 removeobject 5 - setflag FLAG_0x359 + setflag FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS fadescreen 0 releaseall end @@ -109,23 +109,23 @@ MagmaHideout_4F_Movement_23A680: @ 823A680 step_end MagmaHideout_4F_EventScript_23A68C:: @ 823A68C - trainerbattle 0, TRAINER_GRUNT_48, 0, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 - msgbox MagmaHideout_4F_Text_23A7B5, 6 + trainerbattle_single TRAINER_GRUNT_48, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 + msgbox MagmaHideout_4F_Text_23A7B5, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3 - trainerbattle 0, TRAINER_GRUNT_49, 0, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B - msgbox MagmaHideout_4F_Text_23A841, 6 + trainerbattle_single TRAINER_GRUNT_49, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B + msgbox MagmaHideout_4F_Text_23A841, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA - trainerbattle 0, TRAINER_GRUNT_50, 0, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 - msgbox MagmaHideout_4F_Text_23A8C6, 6 + trainerbattle_single TRAINER_GRUNT_50, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 + msgbox MagmaHideout_4F_Text_23A8C6, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1 - trainerbattle 0, TRAINER_TABITHA_3, 0, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 - msgbox MagmaHideout_4F_Text_23A9AC, 6 + trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 + msgbox MagmaHideout_4F_Text_23A9AC, MSGBOX_AUTOCLOSE end MagmaHideout_4F_Text_23A6E8: @ 823A6E8 diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc index 8569e33ec..62d1cd37e 100644 --- a/data/maps/MarineCave_End/events.inc +++ b/data/maps/MarineCave_End/events.inc @@ -1,5 +1,5 @@ MarineCave_End_EventObjects: @ 85377E8 - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 782 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MARINE_CAVE_KYOGRE MarineCave_End_MapWarps: @ 8537800 warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index d6b4bbd8d..f61620c29 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -21,7 +21,7 @@ MarineCave_End_MapScript1_23B008: @ 823B008 end MarineCave_End_EventScript_23B012:: @ 823B012 - clearflag FLAG_0x30E + clearflag FLAG_HIDE_MARINE_CAVE_KYOGRE setvar VAR_TEMP_1, 1 return diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index 17ae4a327..ebdc866f5 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -4,12 +4,12 @@ MauvilleCity_EventObjects: @ 852662C object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0 object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804 - object_event 7, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805 - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, 1116 + object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, FLAG_HIDE_MAUVILLE_CITY_WALLY + object_event 7, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, FLAG_HIDE_MAUVILLE_CITY_WATTSON + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, FLAG_ITEM_MAUVILLE_CITY_X_SPEED object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 - object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 765 + object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAUVILLE_CITY_SCOTT MauvilleCity_MapWarps: @ 8526734 warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index abb527d7f..cc15974a2 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -5,7 +5,7 @@ MauvilleCity_MapScripts:: @ 81DF385 MauvilleCity_MapScript1_1DF38B: @ 81DF38B setflag FLAG_VISITED_MAUVILLE_CITY clearflag FLAG_0x09D - clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION + clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION setflag FLAG_SYS_TV_START clearflag FLAG_0x063 setvar VAR_0x4093, 0 @@ -14,41 +14,41 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B end MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 - clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON - setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON + clearflag FLAG_HIDE_MAUVILLE_GYM_WATTSON + setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON setflag FLAG_WATTSON_REMATCH_AVAILABLE return MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3 - msgbox MauvilleCity_Text_1E0301, 2 + msgbox MauvilleCity_Text_1E0301, MSGBOX_NPC end MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC - msgbox MauvilleCity_Text_1E037C, 2 + msgbox MauvilleCity_Text_1E037C, MSGBOX_NPC end MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5 - msgbox MauvilleCity_Text_1E03FB, 2 + msgbox MauvilleCity_Text_1E03FB, MSGBOX_NPC end MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE - msgbox MauvilleCity_Text_1E044A, 2 + msgbox MauvilleCity_Text_1E044A, MSGBOX_NPC end MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7 - msgbox MauvilleCity_Text_1E0485, 3 + msgbox MauvilleCity_Text_1E0485, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0 - msgbox MauvilleCity_Text_1E04B7, 3 + msgbox MauvilleCity_Text_1E04B7, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9 - msgbox MauvilleCity_Text_1E0504, 3 + msgbox MauvilleCity_Text_1E0504, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2 - msgbox MauvilleCity_Text_1E053C, 3 + msgbox MauvilleCity_Text_1E053C, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB @@ -56,13 +56,13 @@ MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB faceplayer checkflag FLAG_0x062 goto_eq MauvilleCity_EventScript_1DF413 - msgbox MauvilleCity_Text_1E056A, 4 + msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT setflag FLAG_0x062 release end MauvilleCity_EventScript_1DF413:: @ 81DF413 - msgbox MauvilleCity_Text_1E0699, 4 + msgbox MauvilleCity_Text_1E0699, MSGBOX_DEFAULT release end @@ -71,7 +71,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D faceplayer checkflag FLAG_0x11C goto_eq MauvilleCity_EventScript_1DF43D - msgbox MauvilleCity_Text_1DF7DC, 4 + msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage applymovement 7, MauvilleCity_Movement_2725A2 waitmovement 0 @@ -79,7 +79,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D end MauvilleCity_EventScript_1DF43D:: @ 81DF43D - msgbox MauvilleCity_Text_1DFAA5, 4 + msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT closemessage applymovement 7, MauvilleCity_Movement_2725A2 waitmovement 0 @@ -92,9 +92,9 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 goto_eq MauvilleCity_EventScript_1DF690 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 - msgbox MauvilleCity_Text_1DF845, 4 - msgbox MauvilleCity_Text_1DF8B9, 4 - msgbox MauvilleCity_Text_1DF963, 4 + msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT applymovement 6, MauvilleCity_Movement_27259E waitmovement 0 playse SE_PIN @@ -102,7 +102,7 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 waitmovement 0 applymovement 6, MauvilleCity_Movement_27259A waitmovement 0 - msgbox MauvilleCity_Text_1DF9B2, 5 + msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD end @@ -128,7 +128,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 applymovement 255, MauvilleCity_Movement_1DF6EE applymovement 7, MauvilleCity_Movement_1DF6F3 waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, 4 + msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT closemessage applymovement 255, MauvilleCity_Movement_1DF6CC applymovement 7, MauvilleCity_Movement_1DF6FA @@ -147,7 +147,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D delay 30 applymovement 7, MauvilleCity_Movement_1DF6F7 waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, 4 + msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT closemessage applymovement 255, MauvilleCity_Movement_1DF6D0 applymovement 7, MauvilleCity_Movement_1DF703 @@ -159,8 +159,8 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D MauvilleCity_EventScript_1DF593:: @ 81DF593 removeobject 6 removeobject 7 - clearflag FLAG_0x326 - clearflag FLAG_0x329 + clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY + clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE setflag FLAG_0x0BE setvar VAR_0x40F2, 0 setflag FLAG_0x088 @@ -170,7 +170,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 call_if 1, MauvilleCity_EventScript_1DF601 applymovement 255, MauvilleCity_Movement_2725AA waitmovement 0 - msgbox MauvilleCity_Text_1DFED5, 4 + msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage addvar VAR_0x40D1, 1 compare VAR_FACING, 2 @@ -207,29 +207,29 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628 return MauvilleCity_EventScript_1DF63A:: @ 81DF63A - msgbox MauvilleCity_Text_1DFB6D, 4 - trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_1DFB96 + msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 - msgbox MauvilleCity_Text_1DFBC3, 4 + msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT applymovement 6, MauvilleCity_Movement_27259E waitmovement 0 - msgbox MauvilleCity_Text_1DFBED, 4 + msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 - msgbox MauvilleCity_Text_1DFC8A, 4 + msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT return MauvilleCity_EventScript_1DF683:: @ 81DF683 setflag FLAG_0x11C - msgbox MauvilleCity_Text_1DFA4A, 4 + msgbox MauvilleCity_Text_1DFA4A, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF690:: @ 81DF690 applymovement 6, MauvilleCity_Movement_27259E waitmovement 0 - msgbox MauvilleCity_Text_1DFB42, 5 + msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD end @@ -430,30 +430,30 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A goto_eq MauvilleCity_EventScript_1DF784 checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON goto_eq MauvilleCity_EventScript_1DF77A - msgbox MauvilleCity_Text_1DFFE4, 4 + msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT giveitem_std ITEM_BASEMENT_KEY setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON - msgbox MauvilleCity_Text_1E0154, 4 + msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF77A:: @ 81DF77A - msgbox MauvilleCity_Text_1E0154, 4 + msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF784:: @ 81DF784 - msgbox MauvilleCity_Text_1E020E, 4 + msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT giveitem_std ITEM_TM24 compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_272054 setflag FLAG_GOT_TM24_FROM_WATTSON - msgbox MauvilleCity_Text_1E02AA, 4 + msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0 - msgbox MauvilleCity_Text_1E02AA, 4 + msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release end @@ -463,7 +463,7 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Text_1DFEB4, 4 + msgbox MauvilleCity_Text_1DFEB4, MSGBOX_DEFAULT waitfanfare closemessage delay 30 diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 0231e5bde..2e0fac7c2 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -8,8 +8,8 @@ MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC goto_eq MauvilleCity_BikeShop_EventScript_20EC94 checkflag FLAG_0x059 goto_eq MauvilleCity_BikeShop_EventScript_20EBF7 - msgbox MauvilleCity_BikeShop_Text_20EE22, 4 - msgbox MauvilleCity_BikeShop_Text_20EE99, 5 + msgbox MauvilleCity_BikeShop_Text_20EE22, MSGBOX_DEFAULT + msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20EC4A compare VAR_RESULT, 0 @@ -17,7 +17,7 @@ MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC end MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 - msgbox MauvilleCity_BikeShop_Text_20EE99, 5 + msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20EC4A compare VAR_RESULT, 0 @@ -35,7 +35,7 @@ MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16 MauvilleCity_BikeShop_EventScript_20EC3D:: @ 820EC3D setflag FLAG_0x059 - msgbox MauvilleCity_BikeShop_Text_20EEE8, 4 + msgbox MauvilleCity_BikeShop_Text_20EEE8, MSGBOX_DEFAULT release end @@ -45,25 +45,25 @@ MauvilleCity_BikeShop_EventScript_20EC4A:: @ 820EC4A end MauvilleCity_BikeShop_EventScript_20EC53:: @ 820EC53 - msgbox MauvilleCity_BikeShop_Text_20F18D, 4 + msgbox MauvilleCity_BikeShop_Text_20F18D, MSGBOX_DEFAULT giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 end MauvilleCity_BikeShop_EventScript_20EC6D:: @ 820EC6D - msgbox MauvilleCity_BikeShop_Text_20F1A5, 4 + msgbox MauvilleCity_BikeShop_Text_20F1A5, MSGBOX_DEFAULT giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 end MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 - msgbox MauvilleCity_BikeShop_Text_20F1BD, 4 + msgbox MauvilleCity_BikeShop_Text_20F1BD, MSGBOX_DEFAULT special SwapRegisteredBike release end MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 - msgbox MauvilleCity_BikeShop_Text_20F1FB, 5 + msgbox MauvilleCity_BikeShop_Text_20F1FB, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ECB3 compare VAR_RESULT, 0 @@ -71,25 +71,25 @@ MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 end MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3 - msgbox MauvilleCity_BikeShop_Text_20F22F, 4 + msgbox MauvilleCity_BikeShop_Text_20F22F, MSGBOX_DEFAULT checkitem ITEM_ACRO_BIKE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ECEF checkitem ITEM_MACH_BIKE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ED10 - msgbox MauvilleCity_BikeShop_Text_20F2F3, 4 + msgbox MauvilleCity_BikeShop_Text_20F2F3, MSGBOX_DEFAULT release end MauvilleCity_BikeShop_EventScript_20ECE5:: @ 820ECE5 - msgbox MauvilleCity_BikeShop_Text_20F2C4, 4 + msgbox MauvilleCity_BikeShop_Text_20F2C4, MSGBOX_DEFAULT release end MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF incrementgamestat 4 - msgbox MauvilleCity_BikeShop_Text_20F294, 4 + msgbox MauvilleCity_BikeShop_Text_20F294, MSGBOX_DEFAULT takeitem ITEM_ACRO_BIKE, 1 giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 @@ -97,14 +97,14 @@ MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF MauvilleCity_BikeShop_EventScript_20ED10:: @ 820ED10 incrementgamestat 4 - msgbox MauvilleCity_BikeShop_Text_20F263, 4 + msgbox MauvilleCity_BikeShop_Text_20F263, MSGBOX_DEFAULT takeitem ITEM_MACH_BIKE, 1 giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 end MauvilleCity_BikeShop_EventScript_20ED31:: @ 820ED31 - msgbox MauvilleCity_BikeShop_Text_20F3C3, 2 + msgbox MauvilleCity_BikeShop_Text_20F3C3, MSGBOX_NPC end MauvilleCity_BikeShop_EventScript_20ED3A:: @ 820ED3A diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 733581b74..404cd62e7 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -4,7 +4,7 @@ MauvilleCity_GameCorner_MapScripts:: @ 820FBB8 MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210460, 4 + msgbox MauvilleCity_GameCorner_Text_210460, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FCB7 @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 nop updatecoinsbox 1, 6 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, 4 + msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT hidemoneybox nop nop @@ -64,7 +64,7 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 nop updatecoinsbox 1, 6 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, 4 + msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT hidemoneybox nop nop @@ -73,12 +73,12 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 end MauvilleCity_GameCorner_EventScript_20FCB7:: @ 820FCB7 - msgbox MauvilleCity_GameCorner_Text_21047E, 4 + msgbox MauvilleCity_GameCorner_Text_21047E, MSGBOX_DEFAULT release end MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 - msgbox MauvilleCity_GameCorner_Text_210553, 4 + msgbox MauvilleCity_GameCorner_Text_210553, MSGBOX_DEFAULT hidemoneybox nop nop @@ -87,7 +87,7 @@ MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 end MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 - msgbox MauvilleCity_GameCorner_Text_21059A, 4 + msgbox MauvilleCity_GameCorner_Text_21059A, MSGBOX_DEFAULT hidemoneybox nop nop @@ -96,7 +96,7 @@ MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 end MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 - msgbox MauvilleCity_GameCorner_Text_21057E, 4 + msgbox MauvilleCity_GameCorner_Text_21057E, MSGBOX_DEFAULT hidemoneybox nop nop @@ -107,7 +107,7 @@ MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, 4 + msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_20FD0D @@ -152,7 +152,7 @@ MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 goto MauvilleCity_GameCorner_EventScript_20FD91 MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 - msgbox MauvilleCity_GameCorner_Text_210705, 5 + msgbox MauvilleCity_GameCorner_Text_210705, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE92 switch VAR_TEMP_1 @@ -173,7 +173,7 @@ MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB givedecoration 88 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 + msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -189,7 +189,7 @@ MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 givedecoration 89 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 + msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -205,12 +205,12 @@ MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F givedecoration 90 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 + msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 - msgbox MauvilleCity_GameCorner_Text_210673, 4 + msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -220,7 +220,7 @@ MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 end MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92 - msgbox MauvilleCity_GameCorner_Text_2106BF, 4 + msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end @@ -228,7 +228,7 @@ MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92 MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F lock faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, 4 + msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_20FEBB @@ -291,7 +291,7 @@ MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A special sub_81398C0 - msgbox MauvilleCity_GameCorner_Text_210629, 5 + msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210118 switch VAR_TEMP_1 @@ -313,7 +313,7 @@ MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD giveitem ITEM_TM32, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -328,7 +328,7 @@ MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 giveitem ITEM_TM29, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -343,7 +343,7 @@ MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 giveitem ITEM_TM35, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -358,7 +358,7 @@ MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B giveitem ITEM_TM24, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -373,12 +373,12 @@ MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 giveitem ITEM_TM13, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF - msgbox MauvilleCity_GameCorner_Text_210673, 4 + msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -388,17 +388,17 @@ MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D end MauvilleCity_GameCorner_EventScript_210118:: @ 8210118 - msgbox MauvilleCity_GameCorner_Text_2106BF, 4 + msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end MauvilleCity_GameCorner_EventScript_210125:: @ 8210125 - msgbox MauvilleCity_GameCorner_Text_2109D3, 2 + msgbox MauvilleCity_GameCorner_Text_2109D3, MSGBOX_NPC end MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E - msgbox MauvilleCity_GameCorner_Text_210A05, 2 + msgbox MauvilleCity_GameCorner_Text_210A05, MSGBOX_NPC end MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 @@ -406,7 +406,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 faceplayer checkflag FLAG_0x0E2 goto_eq MauvilleCity_GameCorner_EventScript_210213 - msgbox MauvilleCity_GameCorner_Text_210750, 5 + msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210209 switch VAR_STARTER_MON @@ -420,7 +420,7 @@ MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C checkdecorspace 88 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 + msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 88 setflag FLAG_0x0E2 goto MauvilleCity_GameCorner_EventScript_210213 @@ -431,7 +431,7 @@ MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 checkdecorspace 89 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 + msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 89 setflag FLAG_0x0E2 goto MauvilleCity_GameCorner_EventScript_210213 @@ -442,7 +442,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 checkdecorspace 90 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 + msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 90 setflag FLAG_0x0E2 goto MauvilleCity_GameCorner_EventScript_210213 @@ -450,17 +450,17 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA call MauvilleCity_GameCorner_EventScript_272071 - msgbox MauvilleCity_GameCorner_Text_2107A9, 4 + msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT release end MauvilleCity_GameCorner_EventScript_210209:: @ 8210209 - msgbox MauvilleCity_GameCorner_Text_2107CE, 4 + msgbox MauvilleCity_GameCorner_Text_2107CE, MSGBOX_DEFAULT release end MauvilleCity_GameCorner_EventScript_210213:: @ 8210213 - msgbox MauvilleCity_GameCorner_Text_2107FB, 4 + msgbox MauvilleCity_GameCorner_Text_2107FB, MSGBOX_DEFAULT release end @@ -470,7 +470,7 @@ MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_21023D - msgbox MauvilleCity_GameCorner_Text_210830, 4 + msgbox MauvilleCity_GameCorner_Text_210830, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end @@ -482,34 +482,34 @@ MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D goto_if 4, MauvilleCity_GameCorner_EventScript_21026B setflag FLAG_0x0E1 givecoins 20 - msgbox MauvilleCity_GameCorner_Text_2108A0, 4 + msgbox MauvilleCity_GameCorner_Text_2108A0, MSGBOX_DEFAULT playse SE_REGI goto MauvilleCity_GameCorner_EventScript_21026B end MauvilleCity_GameCorner_EventScript_21026B:: @ 821026B - msgbox MauvilleCity_GameCorner_Text_2108EF, 4 + msgbox MauvilleCity_GameCorner_Text_2108EF, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_210279:: @ 8210279 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210932, 4 + msgbox MauvilleCity_GameCorner_Text_210932, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_210289:: @ 8210289 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_21098E, 4 + msgbox MauvilleCity_GameCorner_Text_21098E, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210A51, 4 + msgbox MauvilleCity_GameCorner_Text_210A51, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end @@ -523,14 +523,14 @@ MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 MauvilleCity_GameCorner_EventScript_2102B6:: @ 82102B6 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210A82, 4 + msgbox MauvilleCity_GameCorner_Text_210A82, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_2102C6:: @ 82102C6 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210B04, 4 + msgbox MauvilleCity_GameCorner_Text_210B04, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end @@ -667,7 +667,7 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 end MauvilleCity_GameCorner_EventScript_210456:: @ 8210456 - msgbox MauvilleCity_GameCorner_Text_210C2E, 4 + msgbox MauvilleCity_GameCorner_Text_210C2E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index 84e6f7eff..4a05acafb 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym_EventObjects: @ 852FD5C - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913 + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, FLAG_HIDE_MAUVILLE_GYM_WATTSON object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0 diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 049833db0..5996fda47 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -76,7 +76,7 @@ MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 end MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB - trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B + trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MauvilleCity_Gym_EventScript_20DFDE @@ -84,7 +84,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB goto_if 0, MauvilleCity_Gym_EventScript_20DF8D compare VAR_0x40BA, 2 goto_eq MauvilleCity_Gym_EventScript_20DFD4 - msgbox MauvilleCity_Gym_Text_20E8E3, 4 + msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT release end @@ -92,9 +92,9 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B message MauvilleCity_Gym_Text_20E77F waitmessage call MauvilleCity_Gym_EventScript_27207E - msgbox MauvilleCity_Gym_Text_20E7AA, 4 + msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT setvar VAR_0x40D2, 3 - clearflag FLAG_0x2FE + clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_0x4F2 setflag FLAG_BADGE03_GET addvar VAR_0x4085, 1 @@ -109,7 +109,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Gym_Text_20E8B5, 4 + msgbox MauvilleCity_Gym_Text_20E8B5, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -121,7 +121,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 compare VAR_RESULT, 0 goto_eq MauvilleCity_Gym_EventScript_272054 - msgbox MauvilleCity_Gym_Text_20E844, 4 + msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_0x0A7 release end @@ -130,18 +130,18 @@ MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 compare VAR_RESULT, 0 goto_eq MauvilleCity_Gym_EventScript_27205E - msgbox MauvilleCity_Gym_Text_20E844, 4 + msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_0x0A7 return MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4 - msgbox MauvilleCity_Gym_Text_20E925, 4 + msgbox MauvilleCity_Gym_Text_20E925, MSGBOX_DEFAULT release end MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE - trainerbattle 7, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD - msgbox MauvilleCity_Gym_Text_20EA5E, 6 + trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD + msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 @@ -215,28 +215,28 @@ MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4 end MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9 - trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC - msgbox MauvilleCity_Gym_Text_20E336, 6 + trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC + msgbox MauvilleCity_Gym_Text_20E336, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0 - trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 - msgbox MauvilleCity_Gym_Text_20E3C1, 6 + trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 + msgbox MauvilleCity_Gym_Text_20E3C1, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7 - trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 - msgbox MauvilleCity_Gym_Text_20E47E, 6 + trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 + msgbox MauvilleCity_Gym_Text_20E47E, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE - trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 - msgbox MauvilleCity_Gym_Text_20E50F, 6 + trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 + msgbox MauvilleCity_Gym_Text_20E50F, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E115:: @ 820E115 - trainerbattle 0, TRAINER_ANGELO, 0, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 - msgbox MauvilleCity_Gym_Text_20E5C2, 6 + trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 + msgbox MauvilleCity_Gym_Text_20E5C2, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C @@ -244,12 +244,12 @@ MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C faceplayer checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E141 - msgbox MauvilleCity_Gym_Text_20E17F, 4 + msgbox MauvilleCity_Gym_Text_20E17F, MSGBOX_DEFAULT release end MauvilleCity_Gym_EventScript_20E141:: @ 820E141 - msgbox MauvilleCity_Gym_Text_20E283, 4 + msgbox MauvilleCity_Gym_Text_20E283, MSGBOX_DEFAULT release end @@ -268,12 +268,12 @@ MauvilleCity_Gym_EventScript_20E15B:: @ 820E15B end MauvilleCity_Gym_EventScript_20E16B:: @ 820E16B - msgbox MauvilleCity_Gym_Text_20E96C, 4 + msgbox MauvilleCity_Gym_Text_20E96C, MSGBOX_DEFAULT releaseall end MauvilleCity_Gym_EventScript_20E175:: @ 820E175 - msgbox MauvilleCity_Gym_Text_20E952, 4 + msgbox MauvilleCity_Gym_Text_20E952, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index b36e116db..d5605e5d7 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -6,16 +6,16 @@ MauvilleCity_House1_EventScript_20F976:: @ 820F976 faceplayer checkflag FLAG_0x06B goto_eq MauvilleCity_House1_EventScript_20F9A5 - msgbox MauvilleCity_House1_Text_20F9AF, 4 + msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT giveitem_std ITEM_HM06 setflag FLAG_0x06B - setflag FLAG_0x34B - msgbox MauvilleCity_House1_Text_20FAA9, 4 + setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY + msgbox MauvilleCity_House1_Text_20FAA9, MSGBOX_DEFAULT release end MauvilleCity_House1_EventScript_20F9A5:: @ 820F9A5 - msgbox MauvilleCity_House1_Text_20FB67, 4 + msgbox MauvilleCity_House1_Text_20FB67, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index 7a1a1cad1..dcee418c4 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -6,7 +6,7 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D faceplayer checkflag FLAG_0x102 goto_eq MauvilleCity_House2_EventScript_210CDA - msgbox MauvilleCity_House2_Text_210CEE, 4 + msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT checkitem ITEM_HARBOR_MAIL, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_House2_EventScript_210C82 @@ -19,7 +19,7 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 waitmovement 0 applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A waitmovement 0 - msgbox MauvilleCity_House2_Text_210D76, 5 + msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_House2_EventScript_210CB8 compare VAR_RESULT, 0 @@ -27,7 +27,7 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 end MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 - msgbox MauvilleCity_House2_Text_210DB3, 4 + msgbox MauvilleCity_House2_Text_210DB3, MSGBOX_DEFAULT takeitem ITEM_HARBOR_MAIL, 1 giveitem_std ITEM_COIN_CASE setflag FLAG_0x102 @@ -35,12 +35,12 @@ MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 end MauvilleCity_House2_EventScript_210CDA:: @ 8210CDA - msgbox MauvilleCity_House2_Text_210DE7, 4 + msgbox MauvilleCity_House2_Text_210DE7, MSGBOX_DEFAULT release end MauvilleCity_House2_EventScript_210CE4:: @ 8210CE4 - msgbox MauvilleCity_House2_Text_210E16, 4 + msgbox MauvilleCity_House2_Text_210E16, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index 56ee9497f..d6c2c2fd4 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -7,7 +7,7 @@ MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6 message gUnknown_08272A21 waitmessage pokemart MauvilleCity_Mart_Pokemart_211100 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -30,11 +30,11 @@ MauvilleCity_Mart_Pokemart_211100: @ 8211100 end MauvilleCity_Mart_EventScript_21111C:: @ 821111C - msgbox MauvilleCity_Mart_Text_21112E, 2 + msgbox MauvilleCity_Mart_Text_21112E, MSGBOX_NPC end MauvilleCity_Mart_EventScript_211125:: @ 8211125 - msgbox MauvilleCity_Mart_Text_2111D8, 2 + msgbox MauvilleCity_Mart_Text_2111D8, MSGBOX_NPC end MauvilleCity_Mart_Text_21112E: @ 821112E diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index b2267122b..40914c740 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -22,15 +22,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 end MauvilleCity_PokemonCenter_1F_EventScript_210E86:: @ 8210E86 - msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, 2 + msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, MSGBOX_NPC end MauvilleCity_PokemonCenter_1F_EventScript_210E8F:: @ 8210E8F - msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, 2 + msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, MSGBOX_NPC end MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98 - msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, 2 + msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, MSGBOX_NPC end MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc index d445b3cca..031dac213 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index c430b4440..10b0eca4b 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -18,7 +18,7 @@ MauvilleCity_PokemonCenter_2F_EventScript_211029:: @ 8211029 end MauvilleCity_PokemonCenter_2F_EventScript_21102F:: @ 821102F - msgbox MauvilleCity_PokemonCenter_2F_Text_211038, 2 + msgbox MauvilleCity_PokemonCenter_2F_Text_211038, MSGBOX_NPC end MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038 diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 068f9a356..8f84327d2 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -1,14 +1,14 @@ MeteorFalls_1F_1R_EventObjects: @ 8533F74 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 939 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 939 - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 938 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 938 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 938 - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA + object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 27, 18, 4, 0, MAP_ROUTE114 diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index b786dc961..4bfaa7ad9 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -22,7 +22,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF47, 4 + msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT closemessage applymovement 5, MeteorFalls_1F_1R_Movement_2725A6 applymovement 6, MeteorFalls_1F_1R_Movement_2725A6 @@ -32,11 +32,11 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 applymovement 5, MeteorFalls_1F_1R_Movement_27259A waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF84, 4 + msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT closemessage applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BFE4, 4 + msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage applymovement 255, MeteorFalls_1F_1R_Movement_2725A4 applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 @@ -53,7 +53,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C04E, 4 + msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage applymovement 255, MeteorFalls_1F_1R_Movement_22BF1D applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4 @@ -63,18 +63,18 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F removeobject 6 applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C11C, 4 + msgbox MeteorFalls_1F_1R_Text_22C11C, MSGBOX_DEFAULT closemessage applymovement 8, MeteorFalls_1F_1R_Movement_22BF08 applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C268, 4 + msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT applymovement 7, MeteorFalls_1F_1R_Movement_2725AA waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C292, 4 + msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT applymovement 7, MeteorFalls_1F_1R_Movement_2725A4 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C2FC, 4 + msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT closemessage applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0 applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE @@ -84,9 +84,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F removeobject 7 removeobject 8 removeobject 9 - setflag FLAG_0x333 + setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA setflag FLAG_0x0CF - setflag FLAG_0x2FF + setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT setvar VAR_0x40BF, 1 releaseall end @@ -224,12 +224,12 @@ MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 checkflag FLAG_0x0F4 goto_eq MeteorFalls_1F_1R_EventScript_22BF3D setflag FLAG_0x0F4 - msgbox MeteorFalls_1F_1R_Text_22C342, 4 + msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT release end MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D - msgbox MeteorFalls_1F_1R_Text_22C47D, 4 + msgbox MeteorFalls_1F_1R_Text_22C47D, MSGBOX_DEFAULT release end diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 4f4ab7c6b..2deefd65d 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -2,74 +2,65 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD .byte 0 MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE - trainerbattle 2, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A + trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C529 - msgbox MeteorFalls_1F_2R_Text_22C6A3, 4 + msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A special sub_80B4808 waitmovement 0 - msgbox MeteorFalls_1F_2R_Text_22C6F6, 4 - setvar VAR_0x8004, 392 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 392 - callstd 8 + msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT + register_matchcall TRAINER_NICOLAS_1 release end MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 - trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD - msgbox MeteorFalls_1F_2R_Text_22C7D8, 6 + trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD + msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 - trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C589 - msgbox MeteorFalls_1F_2R_Text_22C8C1, 4 + msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 - msgbox MeteorFalls_1F_2R_Text_22C99C, 4 - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd 8 + msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT + register_matchcall TRAINER_JOHN_AND_JAY_1 release end MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 - trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 - msgbox MeteorFalls_1F_2R_Text_22CBC5, 6 + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 + msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 - trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C5ED - msgbox MeteorFalls_1F_2R_Text_22CA70, 4 + msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 - msgbox MeteorFalls_1F_2R_Text_22C99C, 4 - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd 8 + msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT + register_matchcall TRAINER_JOHN_AND_JAY_1 release end MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED - trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB - msgbox MeteorFalls_1F_2R_Text_22CD34, 6 + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB + msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_Text_22C608: @ 822C608 diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc index 85dafb869..44b283d1e 100644 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ b/data/maps/MeteorFalls_B1F_2R/events.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R_EventObjects: @ 8534190 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02 MeteorFalls_B1F_2R_MapWarps: @ 85341A8 warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 5226ddb4a..3d7722487 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -13,9 +13,9 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 waitmovement 0 applymovement 1, MeteorFalls_StevensCave_Movement_27259E waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B1E1, 4 - trainerbattle 3, TRAINER_STEVEN, 0, MeteorFalls_StevensCave_Text_23B32D - msgbox MeteorFalls_StevensCave_Text_23B358, 4 + msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D + msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT setflag FLAG_0x4F8 release end @@ -23,7 +23,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD applymovement 1, MeteorFalls_StevensCave_Movement_27259E waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B358, 4 + msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT release end diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc index d62e54f92..4f55d7485 100644 --- a/data/maps/MirageTower_3F/events.inc +++ b/data/maps/MirageTower_3F/events.inc @@ -1,6 +1,6 @@ MirageTower_3F_EventObjects: @ 853761C - object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 17 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 18 + object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_12 MirageTower_3F_MapWarps: @ 853764C warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc index b9574637a..61c536c61 100644 --- a/data/maps/MirageTower_4F/events.inc +++ b/data/maps/MirageTower_4F/events.inc @@ -1,7 +1,7 @@ MirageTower_4F_EventObjects: @ 8537670 - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, 963 - object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, 964 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, 17 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL + object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, FLAG_TEMP_11 MirageTower_4F_MapWarps: @ 85376B8 warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 1e079c5d7..e60180559 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -4,13 +4,13 @@ MirageTower_4F_MapScripts:: @ 823AD47 MirageTower_4F_EventScript_23AD48:: @ 823AD48 lock faceplayer - msgbox MirageTower_4F_Text_23ADF9, 5 + msgbox MirageTower_4F_Text_23ADF9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MirageTower_4F_EventScript_23AD7F giveitem_std ITEM_ROOT_FOSSIL closemessage - setflag FLAG_0x3C3 - setflag FLAG_0x3C4 + setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL + setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL removeobject 1 delay 30 setflag FLAG_0x14F @@ -18,20 +18,20 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 end MirageTower_4F_EventScript_23AD7F:: @ 823AD7F - msgbox MirageTower_4F_Text_23AE79, 4 + msgbox MirageTower_4F_Text_23AE79, MSGBOX_DEFAULT release end MirageTower_4F_EventScript_23AD89:: @ 823AD89 lock faceplayer - msgbox MirageTower_4F_Text_23AE98, 5 + msgbox MirageTower_4F_Text_23AE98, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MirageTower_4F_EventScript_23ADC0 giveitem_std ITEM_CLAW_FOSSIL closemessage - setflag FLAG_0x3C4 - setflag FLAG_0x3C3 + setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL + setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL removeobject 2 delay 30 setflag FLAG_0x150 @@ -39,7 +39,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 end MirageTower_4F_EventScript_23ADC0:: @ 823ADC0 - msgbox MirageTower_4F_Text_23AF18, 4 + msgbox MirageTower_4F_Text_23AF18, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index fead88f9b..5a653bc22 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -4,17 +4,17 @@ MossdeepCity_EventObjects: @ 8527018 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0 object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, FLAG_ITEM_MOSSDEEP_CITY_NET_BALL object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0 object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0 object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823 - object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823 - object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823 - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823 - object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 823 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA + object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA + object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA + object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0 - object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788 + object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, FLAG_HIDE_MOSSDEEP_CITY_SCOTT object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 MossdeepCity_MapWarps: @ 85271B0 diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 8cce8efeb..e031501d4 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -16,12 +16,12 @@ MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 faceplayer checkflag FLAG_0x07B goto_eq MossdeepCity_EventScript_1E4AC7 - msgbox MossdeepCity_Text_1E4E90, 4 + msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 - msgbox MossdeepCity_Text_1E4F15, 4 + msgbox MossdeepCity_Text_1E4F15, MSGBOX_DEFAULT release end @@ -30,45 +30,45 @@ MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 faceplayer checkflag FLAG_0x07B goto_eq MossdeepCity_EventScript_1E4AE6 - msgbox MossdeepCity_Text_1E4F50, 4 + msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6 - msgbox MossdeepCity_Text_1E5051, 4 + msgbox MossdeepCity_Text_1E5051, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0 - msgbox MossdeepCity_Text_1E4E22, 2 + msgbox MossdeepCity_Text_1E4E22, MSGBOX_NPC end MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9 - msgbox MossdeepCity_Text_1E5135, 2 + msgbox MossdeepCity_Text_1E5135, MSGBOX_NPC end MossdeepCity_EventScript_1E4B02:: @ 81E4B02 - msgbox MossdeepCity_Text_1E50D9, 2 + msgbox MossdeepCity_Text_1E50D9, MSGBOX_NPC end MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B - msgbox MossdeepCity_Text_1E529D, 2 + msgbox MossdeepCity_Text_1E529D, MSGBOX_NPC end MossdeepCity_EventScript_1E4B14:: @ 81E4B14 - msgbox MossdeepCity_Text_1E5396, 3 + msgbox MossdeepCity_Text_1E5396, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D - msgbox MossdeepCity_Text_1E53A9, 3 + msgbox MossdeepCity_Text_1E53A9, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B26:: @ 81E4B26 - msgbox MossdeepCity_Text_1E53F2, 3 + msgbox MossdeepCity_Text_1E53F2, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F - msgbox MossdeepCity_Text_1E541F, 3 + msgbox MossdeepCity_Text_1E541F, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B38:: @ 81E4B38 @@ -98,7 +98,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41 removeobject 13 delay 30 setvar VAR_0x405D, 2 - setflag FLAG_0x337 + setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA releaseall end @@ -218,7 +218,7 @@ MossdeepCity_Movement_1E4C00: @ 81E4C00 MossdeepCity_EventScript_1E4C10:: @ 81E4C10 lock faceplayer - msgbox MossdeepCity_Text_1E5213, 4 + msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 waitmovement 0 release @@ -229,10 +229,10 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 faceplayer checkflag FLAG_0x114 goto_eq MossdeepCity_EventScript_1E4C68 - msgbox MossdeepCity_Text_1E4CED, 5 + msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_1E4C72 - msgbox MossdeepCity_Text_1E4D5B, 4 + msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_272054 @@ -241,23 +241,23 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 end MossdeepCity_EventScript_1E4C68:: @ 81E4C68 - msgbox MossdeepCity_Text_1E4DB3, 4 + msgbox MossdeepCity_Text_1E4DB3, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4C72:: @ 81E4C72 - msgbox MossdeepCity_Text_1E4DD7, 4 + msgbox MossdeepCity_Text_1E4DD7, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C - msgbox MossdeepCity_Text_1E5581, 2 + msgbox MossdeepCity_Text_1E5581, MSGBOX_NPC end MossdeepCity_EventScript_1E4C85:: @ 81E4C85 lock faceplayer - msgbox MossdeepCity_Text_1E5453, 4 + msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, MossdeepCity_EventScript_1E4CB0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index ff5c14206..e45e9eb66 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -27,7 +27,7 @@ MossdeepCity_GameCorner_1F_EventScript_224B54:: @ 8224B54 end MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D - msgbox MossdeepCity_GameCorner_1F_Text_224BFD, 3 + msgbox MossdeepCity_GameCorner_1F_Text_224BFD, MSGBOX_SIGN end MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66 diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index f38fd606d..66c484365 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -49,13 +49,13 @@ MossdeepCity_Gym_EventScript_220885:: @ 8220885 end MossdeepCity_Gym_EventScript_220898:: @ 8220898 - trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1 + trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MossdeepCity_Gym_EventScript_22097E checkflag FLAG_0x0AB goto_if 0, MossdeepCity_Gym_EventScript_220937 - msgbox MossdeepCity_Gym_Text_221B1D, 4 + msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT release end @@ -63,27 +63,27 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 message MossdeepCity_Gym_Text_22196A waitmessage call MossdeepCity_Gym_EventScript_27207E - msgbox MossdeepCity_Gym_Text_221999, 4 + msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT setflag FLAG_0x4F6 setflag FLAG_BADGE07_GET - setflag FLAG_0x39C - clearflag FLAG_0x365 + setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS + clearflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY clearflag FLAG_0x393 setvar VAR_0x8008, 7 call MossdeepCity_Gym_EventScript_271F43 - clearflag FLAG_0x389 - clearflag FLAG_0x337 - clearflag FLAG_0x2F4 - clearflag FLAG_0x35E - clearflag FLAG_0x35F + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS + clearflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA + clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN setvar VAR_0x405D, 1 - setflag FLAG_0x2F1 + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN setvar VAR_0x409F, 1 call MossdeepCity_Gym_EventScript_22095B closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MossdeepCity_Gym_Text_221AEA, 4 + msgbox MossdeepCity_Gym_Text_221AEA, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -95,7 +95,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 goto_eq MossdeepCity_Gym_EventScript_272054 - msgbox MossdeepCity_Gym_Text_221A40, 4 + msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_0x0AB release end @@ -104,13 +104,13 @@ MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 goto_eq MossdeepCity_Gym_EventScript_27205E - msgbox MossdeepCity_Gym_Text_221A40, 4 + msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_0x0AB return MossdeepCity_Gym_EventScript_22097E:: @ 822097E - trainerbattle 7, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 - msgbox MossdeepCity_Gym_Text_221E45, 6 + trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 + msgbox MossdeepCity_Gym_Text_221E45, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220999:: @ 8220999 @@ -211,63 +211,63 @@ MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 end MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD - trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC - msgbox MossdeepCity_Gym_Text_220ED3, 6 + trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC + msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B14:: @ 8220B14 - trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A - msgbox MossdeepCity_Gym_Text_220F3A, 6 + trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A + msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B - trainerbattle 0, TRAINER_BLAKE, 0, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 - msgbox MossdeepCity_Gym_Text_221055, 6 + trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 + msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B42:: @ 8220B42 - trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 - msgbox MossdeepCity_Gym_Text_22116A, 6 + trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 + msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B59:: @ 8220B59 - trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 - msgbox MossdeepCity_Gym_Text_22123D, 6 + trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 + msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B70:: @ 8220B70 - trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 - msgbox MossdeepCity_Gym_Text_22132E, 6 + trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 + msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B87:: @ 8220B87 - trainerbattle 0, TRAINER_SYLVIA, 0, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 - msgbox MossdeepCity_Gym_Text_221412, 6 + trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 + msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E - trainerbattle 0, TRAINER_NATE, 0, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 - msgbox MossdeepCity_Gym_Text_2214D3, 6 + trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 + msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5 - trainerbattle 0, TRAINER_MACEY, 0, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 - msgbox MossdeepCity_Gym_Text_221680, 6 + trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 + msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC - trainerbattle 0, TRAINER_CLIFFORD, 0, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 - msgbox MossdeepCity_Gym_Text_2215E2, 6 + trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 + msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3 - trainerbattle 0, TRAINER_NICHOLAS, 0, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D - msgbox MossdeepCity_Gym_Text_22173A, 6 + trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D + msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA - trainerbattle 0, TRAINER_KATHLEEN, 0, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B - msgbox MossdeepCity_Gym_Text_221545, 6 + trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B + msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 @@ -275,12 +275,12 @@ MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 faceplayer checkflag FLAG_0x4F6 goto_eq MossdeepCity_Gym_EventScript_220C26 - msgbox MossdeepCity_Gym_Text_220CD5, 4 + msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT release end MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 - msgbox MossdeepCity_Gym_Text_220E2A, 4 + msgbox MossdeepCity_Gym_Text_220E2A, MSGBOX_DEFAULT release end @@ -304,12 +304,12 @@ MossdeepCity_Gym_EventScript_220C43:: @ 8220C43 end MossdeepCity_Gym_EventScript_220C53:: @ 8220C53 - msgbox MossdeepCity_Gym_Text_221CCA, 4 + msgbox MossdeepCity_Gym_Text_221CCA, MSGBOX_DEFAULT releaseall end MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D - msgbox MossdeepCity_Gym_Text_221CB0, 4 + msgbox MossdeepCity_Gym_Text_221CB0, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc index b08d296c7..056e2b057 100644 --- a/data/maps/MossdeepCity_House1/scripts.inc +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -5,21 +5,21 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 lock faceplayer bufferleadmonspeciesname 0 - msgbox MossdeepCity_House1_Text_22200F, 4 + msgbox MossdeepCity_House1_Text_22200F, MSGBOX_DEFAULT specialvar VAR_RESULT, GetPokeblockNameByMonNature compare VAR_RESULT, 0 goto_eq MossdeepCity_House1_EventScript_221FFC - msgbox MossdeepCity_House1_Text_22201D, 4 + msgbox MossdeepCity_House1_Text_22201D, MSGBOX_DEFAULT release end MossdeepCity_House1_EventScript_221FFC:: @ 8221FFC - msgbox MossdeepCity_House1_Text_222068, 4 + msgbox MossdeepCity_House1_Text_222068, MSGBOX_DEFAULT release end MossdeepCity_House1_EventScript_222006:: @ 8222006 - msgbox MossdeepCity_House1_Text_222099, 2 + msgbox MossdeepCity_House1_Text_222099, MSGBOX_NPC end MossdeepCity_House1_Text_22200F: @ 822200F diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc index 001039dfc..8e169c3b0 100644 --- a/data/maps/MossdeepCity_House2/events.inc +++ b/data/maps/MossdeepCity_House2/events.inc @@ -1,7 +1,7 @@ MossdeepCity_House2_EventObjects: @ 85329CC object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL MossdeepCity_House2_MapWarps: @ 8532A14 warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index c61f74d99..84dcc8244 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -2,11 +2,11 @@ MossdeepCity_House2_MapScripts:: @ 82220DE .byte 0 MossdeepCity_House2_EventScript_2220DF:: @ 82220DF - msgbox MossdeepCity_House2_Text_222146, 2 + msgbox MossdeepCity_House2_Text_222146, MSGBOX_NPC end MossdeepCity_House2_EventScript_2220E8:: @ 82220E8 - msgbox MossdeepCity_House2_Text_2221A6, 2 + msgbox MossdeepCity_House2_Text_2221A6, MSGBOX_NPC end MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 @@ -14,11 +14,11 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox MossdeepCity_House2_Text_22222E, 4 + msgbox MossdeepCity_House2_Text_22222E, MSGBOX_DEFAULT waitmoncry closemessage setflag FLAG_0x0E0 - clearflag FLAG_0x3A5 + clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL compare VAR_FACING, 2 call_if 1, MossdeepCity_House2_EventScript_222124 compare VAR_FACING, 3 diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index dfdbfa956..be294f292 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -6,23 +6,23 @@ MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 faceplayer checkflag FLAG_0x098 goto_eq MossdeepCity_House3_EventScript_222602 - msgbox MossdeepCity_House3_Text_222616, 5 + msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_House3_EventScript_22260C - msgbox MossdeepCity_House3_Text_2226B6, 4 + msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT giveitem_std ITEM_SUPER_ROD setflag FLAG_0x098 - msgbox MossdeepCity_House3_Text_2226F0, 4 + msgbox MossdeepCity_House3_Text_2226F0, MSGBOX_DEFAULT release end MossdeepCity_House3_EventScript_222602:: @ 8222602 - msgbox MossdeepCity_House3_Text_222751, 4 + msgbox MossdeepCity_House3_Text_222751, MSGBOX_DEFAULT release end MossdeepCity_House3_EventScript_22260C:: @ 822260C - msgbox MossdeepCity_House3_Text_222733, 4 + msgbox MossdeepCity_House3_Text_222733, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc index cb3cc0d16..66d76aa41 100644 --- a/data/maps/MossdeepCity_House4/scripts.inc +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -6,12 +6,12 @@ MossdeepCity_House4_EventScript_222DD8:: @ 8222DD8 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_House4_EventScript_222DED - msgbox MossdeepCity_House4_Text_222E31, 4 + msgbox MossdeepCity_House4_Text_222E31, MSGBOX_DEFAULT release end MossdeepCity_House4_EventScript_222DED:: @ 8222DED - msgbox MossdeepCity_House4_Text_222E73, 4 + msgbox MossdeepCity_House4_Text_222E73, MSGBOX_DEFAULT release end @@ -22,12 +22,12 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 compare VAR_RESULT, 0 goto_eq MossdeepCity_House4_EventScript_222E14 special GetSecretBaseNearbyMapName - msgbox MossdeepCity_House4_Text_222ECC, 4 + msgbox MossdeepCity_House4_Text_222ECC, MSGBOX_DEFAULT release end MossdeepCity_House4_EventScript_222E14:: @ 8222E14 - msgbox MossdeepCity_House4_Text_222EF7, 4 + msgbox MossdeepCity_House4_Text_222EF7, MSGBOX_DEFAULT release end @@ -36,7 +36,7 @@ MossdeepCity_House4_EventScript_222E1E:: @ 8222E1E faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox MossdeepCity_House4_Text_222F31, 4 + msgbox MossdeepCity_House4_Text_222F31, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc index ed7ecd035..b995b396e 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -7,7 +7,7 @@ MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8 message gUnknown_08272A21 waitmessage pokemart MossdeepCity_Mart_Pokemart_2223E0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -27,15 +27,15 @@ MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0 end MossdeepCity_Mart_EventScript_2223F6:: @ 82223F6 - msgbox MossdeepCity_Mart_Text_222411, 2 + msgbox MossdeepCity_Mart_Text_222411, MSGBOX_NPC end MossdeepCity_Mart_EventScript_2223FF:: @ 82223FF - msgbox MossdeepCity_Mart_Text_2224A0, 2 + msgbox MossdeepCity_Mart_Text_2224A0, MSGBOX_NPC end MossdeepCity_Mart_EventScript_222408:: @ 8222408 - msgbox MossdeepCity_Mart_Text_2224FA, 2 + msgbox MossdeepCity_Mart_Text_2224FA, MSGBOX_NPC end MossdeepCity_Mart_Text_222411: @ 8222411 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 2ff03b7f3..28573a3c1 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -16,11 +16,11 @@ MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E end MossdeepCity_PokemonCenter_1F_EventScript_22225C:: @ 822225C - msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, 2 + msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, MSGBOX_NPC end MossdeepCity_PokemonCenter_1F_EventScript_222265:: @ 8222265 - msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, 2 + msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, MSGBOX_NPC end MossdeepCity_PokemonCenter_1F_Text_22226E: @ 822226E diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc index 1641be959..c2158f4f4 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index 142bce560..e8fbb6e02 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -18,7 +18,7 @@ MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355 end MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B - msgbox MossdeepCity_PokemonCenter_2F_Text_222364, 2 + msgbox MossdeepCity_PokemonCenter_2F_Text_222364, MSGBOX_NPC end MossdeepCity_PokemonCenter_2F_Text_222364: @ 8222364 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc index c45f433f2..dbb5a47eb 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc @@ -4,12 +4,12 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 object_event 4, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756 - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756 - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756 - object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756 - object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737 - object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY + object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 2edf6d251..6027591ee 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -66,11 +66,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 end MossdeepCity_SpaceCenter_1F_EventScript_223012:: @ 8223012 - msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B - msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 @@ -88,11 +88,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 end MossdeepCity_SpaceCenter_1F_EventScript_223051:: @ 8223051 - msgbox MossdeepCity_SpaceCenter_1F_Text_223305, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223305, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A - msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 @@ -100,12 +100,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 faceplayer compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 release @@ -118,36 +118,36 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA checkflag FLAG_0x0C0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_223540, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA checkflag FLAG_0x0C0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 release end MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 release @@ -166,12 +166,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D end MossdeepCity_SpaceCenter_1F_EventScript_223154:: @ 8223154 - msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E - msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, MSGBOX_DEFAULT release end @@ -188,7 +188,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 end MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F - msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 @@ -196,7 +196,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F end MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 - msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 @@ -206,7 +206,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 lock faceplayer - msgbox MossdeepCity_SpaceCenter_1F_Text_223849, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 release @@ -214,23 +214,23 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF lockall - msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, MSGBOX_DEFAULT releaseall end MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA - trainerbattle 0, TRAINER_GRUNT_32, 0, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 - msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, 6 + trainerbattle_single TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 + msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1 - trainerbattle 0, TRAINER_GRUNT_16, 0, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 - msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, 6 + trainerbattle_single TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 + msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 - trainerbattle 0, TRAINER_GRUNT_33, 0, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA - msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, 6 + trainerbattle_single TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA + msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F @@ -238,8 +238,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F faceplayer checkflag FLAG_0x0BF goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, 4 - trainerbattle 3, TRAINER_GRUNT_23, 0, MossdeepCity_SpaceCenter_1F_Text_223BC2 + msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2 setflag FLAG_0x0BF moveobjectoffscreen 9 switch VAR_FACING @@ -252,7 +252,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F end MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc index 02b771bf6..6c271b5de 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc @@ -2,12 +2,12 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 - object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862 - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862 - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862 - object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862 + object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 36bfc422a..22fcc1476 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -36,10 +36,10 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, 5 + msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, MSGBOX_DEFAULT closemessage applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07 waitmovement 0 @@ -53,20 +53,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 step_end MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, 4 - trainerbattle 3, TRAINER_GRUNT_34, 0, MossdeepCity_SpaceCenter_2F_Text_224461 + msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A4 waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, 4 - trainerbattle 3, TRAINER_GRUNT_35, 0, MossdeepCity_SpaceCenter_2F_Text_224499 + msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A8 waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, 4 - trainerbattle 3, TRAINER_GRUNT_36, 0, MossdeepCity_SpaceCenter_2F_Text_2244F1 + msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89 waitmovement 0 setvar VAR_0x409F, 2 @@ -107,12 +107,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D end MossdeepCity_SpaceCenter_2F_EventScript_223EB4:: @ 8223EB4 - msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE - msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, MSGBOX_DEFAULT release end @@ -129,12 +129,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 end MossdeepCity_SpaceCenter_2F_EventScript_223EEF:: @ 8223EEF - msgbox MossdeepCity_SpaceCenter_2F_Text_224253, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224253, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9 - msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, MSGBOX_DEFAULT release end @@ -151,31 +151,31 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 end MossdeepCity_SpaceCenter_2F_EventScript_223F2A:: @ 8223F2A - msgbox MossdeepCity_SpaceCenter_2F_Text_224342, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224342, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223F34:: @ 8223F34 - msgbox MossdeepCity_SpaceCenter_2F_Text_224376, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224376, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223F3E:: @ 8223F3E - msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, 2 + msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, MSGBOX_NPC end MossdeepCity_SpaceCenter_2F_EventScript_223F47:: @ 8223F47 - msgbox MossdeepCity_SpaceCenter_2F_Text_224570, 2 + msgbox MossdeepCity_SpaceCenter_2F_Text_224570, MSGBOX_NPC end MossdeepCity_SpaceCenter_2F_EventScript_223F50:: @ 8223F50 - msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, 2 + msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, MSGBOX_NPC end MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 lock faceplayer - msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 waitmovement 0 release @@ -183,7 +183,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F lockall - msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, MSGBOX_DEFAULT releaseall end @@ -192,8 +192,8 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A checkflag FLAG_0x0CD goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223FDA setflag FLAG_0x0CD - msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, 4 - msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, MSGBOX_DEFAULT closemessage delay 30 playse SE_KOUKA_L @@ -237,10 +237,10 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, 5 + msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C - msgbox MossdeepCity_SpaceCenter_2F_Text_224854, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA waitmovement 0 @@ -260,16 +260,16 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 - special ReducePlayerPartyToThree + special ReducePlayerPartyToSelectedMons 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 @@ -278,7 +278,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 waitstate MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 - msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT closemessage delay 20 applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 @@ -289,15 +289,15 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 waitmovement 0 delay 20 - msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT closemessage setvar VAR_0x405D, 3 fadedefaultbgm fadescreen 1 setvar VAR_0x409F, 3 - setflag FLAG_0x2F4 - setflag FLAG_0x35E - setflag FLAG_0x337 + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA removeobject 5 removeobject 7 removeobject 6 @@ -311,16 +311,16 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 turnobject 1, 2 call MossdeepCity_SpaceCenter_2F_EventScript_224131 fadescreen 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, MSGBOX_DEFAULT closemessage fadescreen 1 setflag FLAG_0x075 - setflag FLAG_0x3C7 + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN removeobject 4 - setflag FLAG_0x2E1 - clearflag FLAG_0x3C7 + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY + clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN setvar VAR_0x40C6, 1 - setflag FLAG_0x314 + setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT removeobject 3 setobjectxyperm 3, 5, 6 setobjectmovementtype 3, 2 @@ -343,11 +343,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152 return MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157 - trainerbattle 10, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C + trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C end MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166 - trainerbattle 11, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD + trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD end MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index 208ec7db0..dd8b3d1b4 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_EventObjects: @ 8532C10 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968 - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY MossdeepCity_StevensHouse_MapWarps: @ 8532C58 warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 14d0cd5c7..2c8aef889 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -38,17 +38,17 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_222833 waitmovement 0 - msgbox MossdeepCity_StevensHouse_Text_222936, 4 + msgbox MossdeepCity_StevensHouse_Text_222936, MSGBOX_DEFAULT giveitem_std ITEM_HM08 setflag FLAG_0x07B setflag FLAG_0x12E - msgbox MossdeepCity_StevensHouse_Text_222A0E, 4 + msgbox MossdeepCity_StevensHouse_Text_222A0E, MSGBOX_DEFAULT closemessage delay 20 applymovement 1, MossdeepCity_StevensHouse_Movement_22283B waitmovement 0 - setflag FLAG_0x314 - setflag FLAG_0x3AD + setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT setvar VAR_0x40C6, 2 releaseall end @@ -73,14 +73,14 @@ MossdeepCity_StevensHouse_Movement_22283B: @ 822283B MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 lockall - msgbox MossdeepCity_StevensHouse_Text_222B9E, 5 + msgbox MossdeepCity_StevensHouse_Text_222B9E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_22285B goto MossdeepCity_StevensHouse_EventScript_222865 end MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B - msgbox MossdeepCity_StevensHouse_Text_222C2A, 4 + msgbox MossdeepCity_StevensHouse_Text_222C2A, MSGBOX_DEFAULT releaseall end @@ -96,7 +96,7 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 call MossdeepCity_StevensHouse_EventScript_2228EB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B @@ -106,7 +106,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD call MossdeepCity_StevensHouse_EventScript_2228EB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_2228E0 call MossdeepCity_StevensHouse_EventScript_273797 @@ -129,22 +129,22 @@ MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB return MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901 - setflag FLAG_0x3C8 + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL setflag FLAG_0x12A releaseall end MossdeepCity_StevensHouse_EventScript_222909:: @ 8222909 - msgbox MossdeepCity_StevensHouse_Text_222D97, 3 + msgbox MossdeepCity_StevensHouse_Text_222D97, MSGBOX_SIGN end MossdeepCity_StevensHouse_EventScript_222912:: @ 8222912 - msgbox MossdeepCity_StevensHouse_Text_222B11, 2 + msgbox MossdeepCity_StevensHouse_Text_222B11, MSGBOX_NPC end MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B lockall - msgbox MossdeepCity_StevensHouse_Text_222C4E, 4 + msgbox MossdeepCity_StevensHouse_Text_222C4E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index 343f6a203..d11ba584e 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -1,34 +1,34 @@ MtChimney_EventObjects: @ 85347C8 - object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926 - object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927 - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927 - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927 - object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927 - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927 - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 25, EVENT_OBJ_GFX_EXPERT_F, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877 - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877 - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, 877 - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, 877 - object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, 927 - object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, 877 + object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA + object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 25, EVENT_OBJ_GFX_EXPERT_F, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, FLAG_HIDE_MT_CHIMNEY_TRAINERS + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, FLAG_HIDE_MT_CHIMNEY_TRAINERS + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, FLAG_HIDE_MT_CHIMNEY_TRAINERS + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, FLAG_HIDE_MT_CHIMNEY_TRAINERS + object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA + object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, FLAG_HIDE_MT_CHIMNEY_TRAINERS MtChimney_MapWarps: @ 8534A98 warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 5abd7c176..ddd8b8d42 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -26,17 +26,17 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5 end MtChimney_EventScript_22EDF9:: @ 822EDF9 - msgbox MtChimney_Text_22FAD2, 4 + msgbox MtChimney_Text_22FAD2, MSGBOX_DEFAULT return MtChimney_EventScript_22EE02:: @ 822EE02 - msgbox MtChimney_Text_22FBC7, 4 + msgbox MtChimney_Text_22FBC7, MSGBOX_DEFAULT return MtChimney_EventScript_22EE0B:: @ 822EE0B lockall playbgm MUS_MGM0, 0 - msgbox MtChimney_Text_22F26A, 4 + msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT applymovement 2, MtChimney_Movement_27259E waitmovement 0 playse SE_PIN @@ -44,9 +44,9 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B waitmovement 0 applymovement 2, MtChimney_Movement_27259A waitmovement 0 - msgbox MtChimney_Text_22F32E, 4 - trainerbattle 3, TRAINER_MAXIE_2, 0, MtChimney_Text_22F5CF - msgbox MtChimney_Text_22F5F7, 4 + msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF + msgbox MtChimney_Text_22F5F7, MSGBOX_DEFAULT closemessage delay 30 fadescreen 1 @@ -54,7 +54,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B removeobject 29 removeobject 3 removeobject 22 - setflag FLAG_0x39F + setflag FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA fadescreen 0 setobjectxyperm 1, 10, 12 addobject 1 @@ -64,18 +64,18 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if 1, MtChimney_EventScript_22EED2 applymovement 255, MtChimney_Movement_2725A4 waitmovement 0 - msgbox MtChimney_Text_22FC3D, 4 + msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage compare VAR_FACING, 4 call_if 1, MtChimney_EventScript_22EEDD compare VAR_FACING, 2 call_if 1, MtChimney_EventScript_22EEE8 removeobject 1 - setflag FLAG_0x39E + setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA setflag FLAG_0x08B - clearflag FLAG_0x3A0 - setflag FLAG_0x3AE - clearflag FLAG_0x3E2 + clearflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO + setflag FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO + clearflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY releaseall end @@ -103,13 +103,13 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 lock faceplayer showmoneybox 0, 0, 0 - msgbox MtChimney_Text_22FE04, 5 + msgbox MtChimney_Text_22FE04, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF69 checkmoney 0xc8, 0 compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF76 - msgbox MtChimney_Text_22FE4D, 4 + msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT checkitemspace ITEM_LAVA_COOKIE, 1 compare VAR_RESULT, 1 call_if 1, MtChimney_EventScript_22EF5E @@ -123,7 +123,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 end MtChimney_EventScript_22EF51:: @ 822EF51 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT hidemoneybox nop nop @@ -137,7 +137,7 @@ MtChimney_EventScript_22EF5E:: @ 822EF5E return MtChimney_EventScript_22EF69:: @ 822EF69 - msgbox MtChimney_Text_22FE9B, 4 + msgbox MtChimney_Text_22FE9B, MSGBOX_DEFAULT hidemoneybox nop nop @@ -145,7 +145,7 @@ MtChimney_EventScript_22EF69:: @ 822EF69 end MtChimney_EventScript_22EF76:: @ 822EF76 - msgbox MtChimney_Text_22FE5E, 4 + msgbox MtChimney_Text_22FE5E, MSGBOX_DEFAULT hidemoneybox nop nop @@ -399,57 +399,57 @@ MtChimney_Movement_22F04F: @ 822F04F step_end MtChimney_EventScript_22F053:: @ 822F053 - msgbox MtChimney_Text_22FD1F, 3 + msgbox MtChimney_Text_22FD1F, MSGBOX_SIGN end MtChimney_EventScript_22F05C:: @ 822F05C - msgbox MtChimney_Text_22FD5B, 3 + msgbox MtChimney_Text_22FD5B, MSGBOX_SIGN end MtChimney_EventScript_22F065:: @ 822F065 - msgbox MtChimney_Text_22FDA1, 3 + msgbox MtChimney_Text_22FDA1, MSGBOX_SIGN end MtChimney_EventScript_22F06E:: @ 822F06E - trainerbattle 0, TRAINER_TABITHA_2, 0, MtChimney_Text_22F6AA, MtChimney_Text_22F72C - msgbox MtChimney_Text_22F76D, 6 + trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_22F6AA, MtChimney_Text_22F72C + msgbox MtChimney_Text_22F76D, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F085:: @ 822F085 - trainerbattle 0, TRAINER_GRUNT_31, 0, MtChimney_Text_22F7A2, MtChimney_Text_22F83A - msgbox MtChimney_Text_22F859, 6 + trainerbattle_single TRAINER_GRUNT_31, MtChimney_Text_22F7A2, MtChimney_Text_22F83A + msgbox MtChimney_Text_22F859, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F09C:: @ 822F09C - msgbox MtChimney_Text_22F978, 3 + msgbox MtChimney_Text_22F978, MSGBOX_SIGN end MtChimney_EventScript_22F0A5:: @ 822F0A5 - msgbox MtChimney_Text_22F9B2, 3 + msgbox MtChimney_Text_22F9B2, MSGBOX_SIGN end MtChimney_EventScript_22F0AE:: @ 822F0AE - msgbox MtChimney_Text_22F9D1, 3 + msgbox MtChimney_Text_22F9D1, MSGBOX_SIGN end MtChimney_EventScript_22F0B7:: @ 822F0B7 - msgbox MtChimney_Text_22FA2F, 3 + msgbox MtChimney_Text_22FA2F, MSGBOX_SIGN end MtChimney_EventScript_22F0C0:: @ 822F0C0 - msgbox MtChimney_Text_22FA8B, 3 + msgbox MtChimney_Text_22FA8B, MSGBOX_SIGN end MtChimney_EventScript_22F0C9:: @ 822F0C9 - msgbox MtChimney_Text_22FAA5, 3 + msgbox MtChimney_Text_22FAA5, MSGBOX_SIGN end MtChimney_EventScript_22F0D2:: @ 822F0D2 - msgbox MtChimney_Text_22FACB, 3 + msgbox MtChimney_Text_22FACB, MSGBOX_SIGN end MtChimney_EventScript_22F0DB:: @ 822F0DB - msgbox MtChimney_Text_22FDFC, 3 + msgbox MtChimney_Text_22FDFC, MSGBOX_SIGN end MtChimney_EventScript_22F0E4:: @ 822F0E4 @@ -458,102 +458,96 @@ MtChimney_EventScript_22F0E4:: @ 822F0E4 goto_if 0, MtChimney_EventScript_22F137 checkflag FLAG_0x073 goto_eq MtChimney_EventScript_22F12D - msgbox MtChimney_Text_22FF12, 5 + msgbox MtChimney_Text_22FF12, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22F123 - msgbox MtChimney_Text_22FF66, 4 + msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT giveitem_std ITEM_METEORITE setflag FLAG_0x073 releaseall end MtChimney_EventScript_22F123:: @ 822F123 - msgbox MtChimney_Text_22FF9C, 4 + msgbox MtChimney_Text_22FF9C, MSGBOX_DEFAULT releaseall end MtChimney_EventScript_22F12D:: @ 822F12D - msgbox MtChimney_Text_22FFC0, 4 + msgbox MtChimney_Text_22FFC0, MSGBOX_DEFAULT releaseall end MtChimney_EventScript_22F137:: @ 822F137 - msgbox MtChimney_Text_22FEAA, 4 + msgbox MtChimney_Text_22FEAA, MSGBOX_DEFAULT releaseall end MtChimney_EventScript_22F141:: @ 822F141 - msgbox MtChimney_Text_22FFFA, 3 + msgbox MtChimney_Text_22FFFA, MSGBOX_SIGN end MtChimney_EventScript_22F14A:: @ 822F14A - trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 + trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F195 - msgbox MtChimney_Text_2300A2, 4 + msgbox MtChimney_Text_2300A2, MSGBOX_DEFAULT release end MtChimney_EventScript_22F176:: @ 822F176 special sub_80B4808 waitmovement 0 - msgbox MtChimney_Text_2300E3, 4 - setvar VAR_0x8004, 313 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 313 - callstd 8 + msgbox MtChimney_Text_2300E3, MSGBOX_DEFAULT + register_matchcall TRAINER_SHELBY_1 release end MtChimney_EventScript_22F195:: @ 822F195 - trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_230153, MtChimney_Text_2301BB - msgbox MtChimney_Text_2301E7, 6 + trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_230153, MtChimney_Text_2301BB + msgbox MtChimney_Text_2301E7, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1AC:: @ 822F1AC - trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_23022A, MtChimney_Text_23026D - msgbox MtChimney_Text_230292, 6 + trainerbattle_single TRAINER_MELISSA, MtChimney_Text_23022A, MtChimney_Text_23026D + msgbox MtChimney_Text_230292, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1C3:: @ 822F1C3 - trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_2302BD, MtChimney_Text_230304 - msgbox MtChimney_Text_23033A, 6 + trainerbattle_single TRAINER_SHEILA, MtChimney_Text_2302BD, MtChimney_Text_230304 + msgbox MtChimney_Text_23033A, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1DA:: @ 822F1DA - trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_2303DF, MtChimney_Text_230436 - msgbox MtChimney_Text_230463, 6 + trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_2303DF, MtChimney_Text_230436 + msgbox MtChimney_Text_230463, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1F1:: @ 822F1F1 - trainerbattle 0, TRAINER_GRUNT_24, 0, MtChimney_Text_22F8B6, MtChimney_Text_22F921 - msgbox MtChimney_Text_22F93A, 6 + trainerbattle_single TRAINER_GRUNT_24, MtChimney_Text_22F8B6, MtChimney_Text_22F921 + msgbox MtChimney_Text_22F93A, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F208:: @ 822F208 - trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 + trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F253 - msgbox MtChimney_Text_230519, 4 + msgbox MtChimney_Text_230519, MSGBOX_DEFAULT release end MtChimney_EventScript_22F234:: @ 822F234 special sub_80B4808 waitmovement 0 - msgbox MtChimney_Text_230557, 4 - setvar VAR_0x8004, 1 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 1 - callstd 8 + msgbox MtChimney_Text_230557, MSGBOX_DEFAULT + register_matchcall TRAINER_SAWYER_1 release end MtChimney_EventScript_22F253:: @ 822F253 - trainerbattle 5, TRAINER_SAWYER_1, 0, MtChimney_Text_23059C, MtChimney_Text_2305E3 - msgbox MtChimney_Text_230614, 6 + trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_23059C, MtChimney_Text_2305E3 + msgbox MtChimney_Text_230614, MSGBOX_AUTOCLOSE end MtChimney_Text_22F26A: @ 822F26A diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index b6c2118db..2544e6729 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -31,7 +31,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B lock faceplayer - msgbox MtChimney_CableCarStation_Text_22ACB9, 5 + msgbox MtChimney_CableCarStation_Text_22ACB9, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MtChimney_CableCarStation_EventScript_22AC6C compare VAR_RESULT, 0 @@ -39,7 +39,7 @@ MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B end MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C - msgbox MtChimney_CableCarStation_Text_22ACF8, 4 + msgbox MtChimney_CableCarStation_Text_22ACF8, MSGBOX_DEFAULT closemessage applymovement 1, MtChimney_CableCarStation_Movement_22ACA5 applymovement 255, MtChimney_CableCarStation_Movement_22ACAF @@ -54,7 +54,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C end MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B - msgbox MtChimney_CableCarStation_Text_22AD0E, 4 + msgbox MtChimney_CableCarStation_Text_22AD0E, MSGBOX_DEFAULT release end diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index 51c8a88fb..755536d8d 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -6,7 +6,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F faceplayer checkflag FLAG_0x11A goto_eq MtPyre_1F_EventScript_230F6E - msgbox MtPyre_1F_Text_230F8A, 4 + msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG compare VAR_RESULT, 0 goto_eq MtPyre_1F_EventScript_272054 @@ -15,16 +15,16 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F end MtPyre_1F_EventScript_230F6E:: @ 8230F6E - msgbox MtPyre_1F_Text_231005, 4 + msgbox MtPyre_1F_Text_231005, MSGBOX_DEFAULT release end MtPyre_1F_EventScript_230F78:: @ 8230F78 - msgbox MtPyre_1F_Text_23104F, 2 + msgbox MtPyre_1F_Text_23104F, MSGBOX_NPC end MtPyre_1F_EventScript_230F81:: @ 8230F81 - msgbox MtPyre_1F_Text_2310BA, 2 + msgbox MtPyre_1F_Text_2310BA, MSGBOX_NPC end MtPyre_1F_Text_230F8A: @ 8230F8A diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc index c025089e3..f9fad9f46 100644 --- a/data/maps/MtPyre_2F/events.inc +++ b/data/maps/MtPyre_2F/events.inc @@ -1,6 +1,6 @@ MtPyre_2F_EventObjects: @ 8534DF0 object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 object_event 4, EVENT_OBJ_GFX_POKEFAN_M, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0 diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index de8520954..830ed5cf7 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -10,36 +10,36 @@ MtPyre_2F_MapScript1_23110B: @ 823110B end MtPyre_2F_EventScript_231116:: @ 8231116 - msgbox MtPyre_2F_Text_2311A3, 2 + msgbox MtPyre_2F_Text_2311A3, MSGBOX_NPC end MtPyre_2F_EventScript_23111F:: @ 823111F - msgbox MtPyre_2F_Text_2311E6, 2 + msgbox MtPyre_2F_Text_2311E6, MSGBOX_NPC end MtPyre_2F_EventScript_231128:: @ 8231128 - trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 - msgbox MtPyre_2F_Text_2312CB, 6 + trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 + msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23113F:: @ 823113F - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 - msgbox MtPyre_2F_Text_2313B1, 6 + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 + msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23115A:: @ 823115A - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 - msgbox MtPyre_2F_Text_23154D, 6 + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 + msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_231175:: @ 8231175 - trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 - msgbox MtPyre_2F_Text_23165A, 6 + trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 + msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23118C:: @ 823118C - trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 - msgbox MtPyre_2F_Text_2316FB, 6 + trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 + msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE end MtPyre_2F_Text_2311A3: @ 82311A3 diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc index 8d841d828..f78373aca 100644 --- a/data/maps/MtPyre_3F/events.inc +++ b/data/maps/MtPyre_3F/events.inc @@ -1,7 +1,7 @@ MtPyre_3F_EventObjects: @ 8534EEC object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 MtPyre_3F_MapWarps: @ 8534F4C diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index ec5373509..890fc4d22 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -2,38 +2,35 @@ MtPyre_3F_MapScripts:: @ 8231752 .byte 0 MtPyre_3F_EventScript_231753:: @ 8231753 - trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 - msgbox MtPyre_3F_Text_231869, 6 + trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 + msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_23176A:: @ 823176A - trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD - msgbox MtPyre_3F_Text_2318F2, 6 + trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD + msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_231781:: @ 8231781 - trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD + trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_3F_EventScript_2317CC - msgbox MtPyre_3F_Text_23199B, 4 + msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT release end MtPyre_3F_EventScript_2317AD:: @ 82317AD special sub_80B4808 waitmovement 0 - msgbox MtPyre_3F_Text_231A49, 4 - setvar VAR_0x8004, 9 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 9 - callstd 8 + msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT + register_matchcall TRAINER_GABRIELLE_1 release end MtPyre_3F_EventScript_2317CC:: @ 82317CC - trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 - msgbox MtPyre_3F_Text_231B0D, 6 + trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 + msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE end MtPyre_3F_Text_2317E3: @ 82317E3 diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc index 73c0a59cf..ffe568880 100644 --- a/data/maps/MtPyre_4F/events.inc +++ b/data/maps/MtPyre_4F/events.inc @@ -1,6 +1,6 @@ MtPyre_4F_EventObjects: @ 8534F90 object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, 1130 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE MtPyre_4F_MapWarps: @ 8534FC0 warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index 0573e0f11..27883c8ed 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -2,8 +2,8 @@ MtPyre_4F_MapScripts:: @ 8231BC8 .byte 0 MtPyre_5F_EventScript_231BC9:: @ 8231BC9 - trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 - msgbox MtPyre_5F_Text_231C24, 6 + trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 + msgbox MtPyre_5F_Text_231C24, MSGBOX_AUTOCLOSE end MtPyre_5F_Text_231BE0: @ 8231BE0 diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc index e1fffe025..afd3801e3 100644 --- a/data/maps/MtPyre_5F/events.inc +++ b/data/maps/MtPyre_5F/events.inc @@ -1,6 +1,6 @@ MtPyre_5F_EventObjects: @ 8535004 object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, 1052 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE MtPyre_5F_MapWarps: @ 8535034 warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 4678ac7e0..5a5365baf 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -2,8 +2,8 @@ MtPyre_5F_MapScripts:: @ 8231C6D .byte 0 MtPyre_4F_EventScript_231C6E:: @ 8231C6E - trainerbattle 0, TRAINER_TASHA, 0, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB - msgbox MtPyre_4F_Text_231CEE, 6 + trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB + msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE end MtPyre_4F_Text_231C85: @ 8231C85 diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc index 607c0902a..3ab5dcf70 100644 --- a/data/maps/MtPyre_6F/events.inc +++ b/data/maps/MtPyre_6F/events.inc @@ -1,6 +1,6 @@ MtPyre_6F_EventObjects: @ 8535070 object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30 object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 MtPyre_6F_MapWarps: @ 85350B8 diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 8d5d912c2..62b4e87b7 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -2,33 +2,30 @@ MtPyre_6F_MapScripts:: @ 8231D3A .byte 0 MtPyre_6F_EventScript_231D3B:: @ 8231D3B - trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 + trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_6F_EventScript_231D86 - msgbox MtPyre_6F_Text_231DFC, 4 + msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT release end MtPyre_6F_EventScript_231D67:: @ 8231D67 special sub_80B4808 waitmovement 0 - msgbox MtPyre_6F_Text_231E43, 4 - setvar VAR_0x8004, 108 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 108 - callstd 8 + msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT + register_matchcall TRAINER_VALERIE_1 release end MtPyre_6F_EventScript_231D86:: @ 8231D86 - trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB - msgbox MtPyre_6F_Text_231EE1, 6 + trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB + msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE end MtPyre_6F_EventScript_231D9D:: @ 8231D9D - trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A - msgbox MtPyre_6F_Text_231F5C, 6 + trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A + msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE end MtPyre_6F_Text_231DB4: @ 8231DB4 diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index 16fd3530f..75c9489e4 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -1,6 +1,6 @@ MtPyre_Exterior_EventObjects: @ 85350DC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48 MtPyre_Exterior_MapWarps: @ 853510C warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F @@ -15,8 +15,8 @@ MtPyre_Exterior_MapCoordEvents: @ 8535124 coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED MtPyre_Exterior_MapBGEvents: @ 8535174 - bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, 29 - bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, 78 + bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL + bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER MtPyre_Exterior_MapEvents:: @ 853518C map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index 554eaa75e..b112fbcfe 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,12 +1,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 916 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, 917 - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 856 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA + object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE MtPyre_Summit_MapWarps: @ 8535260 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR @@ -22,8 +22,8 @@ MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 MtPyre_Summit_MapBGEvents: @ 85352D8 - bg_hidden_item_event 9, 25, 0, ITEM_ZINC, 79 - bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, 80 + bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC + bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY MtPyre_Summit_MapEvents:: @ 85352F0 map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index fe39e9d48..ee03362ed 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -43,7 +43,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C call_if 1, MtPyre_Summit_EventScript_2320EB compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_2320EC - msgbox MtPyre_Summit_Text_23281A, 4 + msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT closemessage fadescreen 1 removeobject 2 @@ -51,8 +51,8 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C removeobject 5 removeobject 6 removeobject 7 - setflag FLAG_0x394 - setflag FLAG_0x395 + setflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE + setflag FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA fadedefaultbgm fadescreen 0 delay 20 @@ -63,10 +63,10 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C call_if 1, MtPyre_Summit_EventScript_23210C compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232117 - msgbox MtPyre_Summit_Text_23290E, 4 + msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT giveitem_std ITEM_MAGMA_EMBLEM setflag FLAG_0x0D4 - setflag FLAG_0x34F + setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD releaseall end @@ -133,7 +133,7 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C faceplayer checkflag FLAG_0x09E goto_eq MtPyre_Summit_EventScript_232167 - msgbox MtPyre_Summit_Text_232E0C, 5 + msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232187 compare VAR_RESULT, 0 @@ -142,7 +142,7 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C end MtPyre_Summit_EventScript_232167:: @ 8232167 - msgbox MtPyre_Summit_Text_2331A6, 5 + msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232199 compare VAR_RESULT, 0 @@ -151,15 +151,15 @@ MtPyre_Summit_EventScript_232167:: @ 8232167 end MtPyre_Summit_EventScript_232187:: @ 8232187 - msgbox MtPyre_Summit_Text_232F27, 4 + msgbox MtPyre_Summit_Text_232F27, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_232190:: @ 8232190 - msgbox MtPyre_Summit_Text_233162, 4 + msgbox MtPyre_Summit_Text_233162, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_232199:: @ 8232199 - msgbox MtPyre_Summit_Text_23325D, 4 + msgbox MtPyre_Summit_Text_23325D, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_2321A2:: @ 82321A2 @@ -171,23 +171,23 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 call_if 4, MtPyre_Summit_EventScript_2321CB checkflag FLAG_0x081 goto_eq MtPyre_Summit_EventScript_2321D8 - msgbox MtPyre_Summit_Text_232AD8, 4 + msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT release end MtPyre_Summit_EventScript_2321CB:: @ 82321CB - msgbox MtPyre_Summit_Text_232CA6, 4 + msgbox MtPyre_Summit_Text_232CA6, MSGBOX_DEFAULT setflag FLAG_0x103 release end MtPyre_Summit_EventScript_2321D8:: @ 82321D8 - msgbox MtPyre_Summit_Text_232B4F, 4 + msgbox MtPyre_Summit_Text_232B4F, MSGBOX_DEFAULT release end MtPyre_Summit_EventScript_2321E2:: @ 82321E2 - msgbox MtPyre_Summit_Text_232D1E, 4 + msgbox MtPyre_Summit_Text_232D1E, MSGBOX_DEFAULT release end @@ -231,7 +231,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 call_if 1, MtPyre_Summit_EventScript_232328 compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232341 - msgbox MtPyre_Summit_Text_233183, 4 + msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_23235A @@ -425,23 +425,23 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8 step_end MtPyre_Summit_EventScript_2323FD:: @ 82323FD - trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 - msgbox MtPyre_Summit_Text_2324E0, 6 + trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 + msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232414:: @ 8232414 - trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 - msgbox MtPyre_Summit_Text_2325E4, 6 + trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 + msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_23242B:: @ 823242B - trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 - msgbox MtPyre_Summit_Text_2326B3, 6 + trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 + msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232442:: @ 8232442 - trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A - msgbox MtPyre_Summit_Text_2327D8, 6 + trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A + msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE end MtPyre_Summit_Text_232459: @ 8232459 diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc index 49a39c162..d18565161 100644 --- a/data/maps/NavelRock_Bottom/events.inc +++ b/data/maps/NavelRock_Bottom/events.inc @@ -1,5 +1,5 @@ NavelRock_Bottom_EventObjects: @ 853DD50 - object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800 + object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, FLAG_HIDE_LUGIA NavelRock_Bottom_MapWarps: @ 853DD68 warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index febe106bf..3abd0c84a 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -11,13 +11,13 @@ NavelRock_Bottom_MapScript1_269260: @ 8269260 end NavelRock_Bottom_EventScript_269273:: @ 8269273 - setflag FLAG_0x320 + setflag FLAG_HIDE_LUGIA return NavelRock_Bottom_EventScript_269277:: @ 8269277 checkflag FLAG_0x1DD goto_eq NavelRock_Bottom_EventScript_27374E - clearflag FLAG_0x320 + clearflag FLAG_HIDE_LUGIA return NavelRock_Bottom_MapScript1_269284: @ 8269284 diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 7f5a9e4c7..910dc8eed 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -4,10 +4,10 @@ NavelRock_Harbor_MapScripts:: @ 82690BC NavelRock_Harbor_EventScript_2690BD:: @ 82690BD lock faceplayer - msgbox NavelRock_Harbor_Text_2C6CE6, 5 + msgbox NavelRock_Harbor_Text_2C6CE6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq NavelRock_Harbor_EventScript_269102 - msgbox NavelRock_Harbor_Text_2A6A5D, 4 + msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA waitmovement 0 @@ -21,7 +21,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD end NavelRock_Harbor_EventScript_269102:: @ 8269102 - msgbox NavelRock_Harbor_Text_2A6A82, 4 + msgbox NavelRock_Harbor_Text_2A6A82, MSGBOX_DEFAULT release end diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc index ef781a838..abd337cb2 100644 --- a/data/maps/NavelRock_Top/events.inc +++ b/data/maps/NavelRock_Top/events.inc @@ -1,5 +1,5 @@ NavelRock_Top_EventObjects: @ 853DB74 - object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 801 + object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HOOH NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 @@ -8,7 +8,7 @@ NavelRock_Top_MapCoordEvents: @ 853DB94 coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F NavelRock_Top_MapBGEvents: @ 853DBA4 - bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, 109 + bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH NavelRock_Top_MapEvents:: @ 853DBB0 map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 4310529dd..8ae17cb37 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -12,7 +12,7 @@ NavelRock_Top_MapScript1_26911E: @ 826911E NavelRock_Top_EventScript_269131:: @ 8269131 setvar VAR_TEMP_1, 1 - setflag FLAG_0x321 + setflag FLAG_HIDE_HOOH return NavelRock_Top_EventScript_26913A:: @ 826913A @@ -20,7 +20,7 @@ NavelRock_Top_EventScript_26913A:: @ 826913A checkflag FLAG_0x1DC goto_eq NavelRock_Top_EventScript_27374E setvar VAR_TEMP_1, 0 - clearflag FLAG_0x321 + clearflag FLAG_HIDE_HOOH return NavelRock_Top_MapScript1_269151: @ 8269151 diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 727b77985..714a20b6b 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -25,14 +25,14 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall applymovement 255, NewMauville_Entrance_Movement_2725A6 waitmovement 0 - msgbox NewMauville_Entrance_Text_237382, 4 + msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 compare VAR_RESULT, 0 goto_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_237396, 5 + msgbox NewMauville_Entrance_Text_237396, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_2373AC, 4 + msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT setmetatile 3, 0, 707, 0 setmetatile 4, 0, 708, 0 setmetatile 5, 0, 709, 0 diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index af8f10f99..568f4b22e 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -1,12 +1,12 @@ NewMauville_Inside_EventObjects: @ 85364A8 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, 1110 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, 1122 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, 1123 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, 974 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, 975 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, 976 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 NewMauville_Inside_MapWarps: @ 8536568 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index e6d80c33d..b0f0a18c7 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -32,15 +32,15 @@ NewMauville_Inside_MapScript1_23741B: @ 823741B end NewMauville_Inside_EventScript_237441:: @ 8237441 - clearflag FLAG_0x3CE + clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 return NewMauville_Inside_EventScript_237445:: @ 8237445 - clearflag FLAG_0x3CF + clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 return NewMauville_Inside_EventScript_237449:: @ 8237449 - clearflag FLAG_0x3D0 + clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 return NewMauville_Inside_MapScript1_23744D: @ 823744D @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_2375D7:: @ 82375D7 NewMauville_Inside_EventScript_237725:: @ 8237725 lockall - msgbox NewMauville_Inside_Text_237932, 4 + msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT call NewMauville_Inside_EventScript_23773A setvar VAR_0x40BA, 2 releaseall @@ -173,12 +173,12 @@ NewMauville_Inside_EventScript_23778F:: @ 823778F lockall compare VAR_0x40BA, 2 goto_eq NewMauville_Inside_EventScript_2377A5 - msgbox NewMauville_Inside_Text_237896, 4 + msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT releaseall end NewMauville_Inside_EventScript_2377A5:: @ 82377A5 - msgbox NewMauville_Inside_Text_237916, 4 + msgbox NewMauville_Inside_Text_237916, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index 8c637b2bf..bbf84390c 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -2,7 +2,7 @@ OldaleTown_EventObjects: @ 8527854 object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 - object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, 979 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL OldaleTown_MapWarps: @ 85278B4 warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 32bca3703..faf2821f5 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -28,11 +28,11 @@ OldaleTown_EventScript_1E8EDE:: @ 81E8EDE return OldaleTown_EventScript_1E8EEA:: @ 81E8EEA - msgbox OldaleTown_Text_1E94DA, 3 + msgbox OldaleTown_Text_1E94DA, MSGBOX_SIGN end OldaleTown_EventScript_1E8EF3:: @ 81E8EF3 - msgbox OldaleTown_Text_1E918E, 2 + msgbox OldaleTown_Text_1E918E, MSGBOX_NPC end OldaleTown_EventScript_1E8EFC:: @ 81E8EFC @@ -40,11 +40,11 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC faceplayer checkflag FLAG_0x084 goto_eq OldaleTown_EventScript_1E8FB9 - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_eq OldaleTown_EventScript_1E8FB9 - setflag FLAG_0x001 + setflag FLAG_TEMP_1 playbgm MUS_TSURETEK, 0 - msgbox OldaleTown_Text_1E91C0, 4 + msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT closemessage switch VAR_FACING case 1, OldaleTown_EventScript_1E8F47 @@ -74,23 +74,23 @@ OldaleTown_EventScript_1E8F75:: @ 81E8F75 end OldaleTown_EventScript_1E8F8C:: @ 81E8F8C - msgbox OldaleTown_Text_1E91FD, 4 + msgbox OldaleTown_Text_1E91FD, MSGBOX_DEFAULT giveitem_std ITEM_POTION compare VAR_RESULT, 0 goto_eq OldaleTown_EventScript_1E8FC3 - msgbox OldaleTown_Text_1E92AF, 4 + msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT setflag FLAG_0x084 fadedefaultbgm release end OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 - msgbox OldaleTown_Text_1E92AF, 4 + msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT release end OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT fadedefaultbgm release end @@ -197,7 +197,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F faceplayer checkflag FLAG_0x074 goto_eq OldaleTown_EventScript_1E9066 - msgbox OldaleTown_Text_1E939A, 4 + msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage applymovement 3, OldaleTown_Movement_2725A2 waitmovement 0 @@ -209,7 +209,7 @@ OldaleTown_EventScript_1E903F:: @ 81E903F applymovement 255, OldaleTown_Movement_1E9182 applymovement 3, OldaleTown_Movement_1E9185 waitmovement 0 - msgbox OldaleTown_Text_1E9313, 4 + msgbox OldaleTown_Text_1E9313, MSGBOX_DEFAULT closemessage applymovement 3, OldaleTown_Movement_1E918B waitmovement 0 @@ -217,7 +217,7 @@ OldaleTown_EventScript_1E903F:: @ 81E903F end OldaleTown_EventScript_1E9066:: @ 81E9066 - msgbox OldaleTown_Text_1E93F8, 4 + msgbox OldaleTown_Text_1E93F8, MSGBOX_DEFAULT release end @@ -268,12 +268,12 @@ OldaleTown_EventScript_1E90E6:: @ 81E90E6 end OldaleTown_EventScript_1E90FE:: @ 81E90FE - msgbox OldaleTown_Text_1E9462, 4 + msgbox OldaleTown_Text_1E9462, MSGBOX_DEFAULT goto OldaleTown_EventScript_1E911A end OldaleTown_EventScript_1E910C:: @ 81E910C - msgbox OldaleTown_Text_1E948A, 4 + msgbox OldaleTown_Text_1E948A, MSGBOX_DEFAULT goto OldaleTown_EventScript_1E911A end @@ -287,7 +287,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A waitmovement 0 removeobject 4 setvar VAR_0x40C7, 2 - setflag FLAG_0x3D3 + setflag FLAG_HIDE_OLDALE_TOWN_RIVAL releaseall end diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc index 6a36ff57e..71010116e 100644 --- a/data/maps/OldaleTown_House1/scripts.inc +++ b/data/maps/OldaleTown_House1/scripts.inc @@ -2,7 +2,7 @@ OldaleTown_House1_MapScripts:: @ 81FBE85 .byte 0 OldaleTown_House1_EventScript_1FBE86:: @ 81FBE86 - msgbox OldaleTown_House1_Text_1FBE8F, 2 + msgbox OldaleTown_House1_Text_1FBE8F, MSGBOX_NPC end OldaleTown_House1_Text_1FBE8F: @ 81FBE8F diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc index 55941705c..3f2adc9fa 100644 --- a/data/maps/OldaleTown_House2/scripts.inc +++ b/data/maps/OldaleTown_House2/scripts.inc @@ -2,11 +2,11 @@ OldaleTown_House2_MapScripts:: @ 81FBF5A .byte 0 OldaleTown_House2_EventScript_1FBF5B:: @ 81FBF5B - msgbox OldaleTown_House2_Text_1FBF6D, 2 + msgbox OldaleTown_House2_Text_1FBF6D, MSGBOX_NPC end OldaleTown_House2_EventScript_1FBF64:: @ 81FBF64 - msgbox OldaleTown_House2_Text_1FBFB0, 2 + msgbox OldaleTown_House2_Text_1FBFB0, MSGBOX_NPC end OldaleTown_House2_Text_1FBF6D: @ 81FBF6D diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index de8893712..f73e2d9ff 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -9,7 +9,7 @@ OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 checkflag FLAG_0x074 goto_eq OldaleTown_Mart_EventScript_1FC26C pokemart OldaleTown_Mart_Pokemart_1FC260 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -24,7 +24,7 @@ OldaleTown_Mart_Pokemart_1FC260: @ 81FC260 OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C pokemart OldaleTown_Mart_Pokemart_1FC27C - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -44,17 +44,17 @@ OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A faceplayer checkflag FLAG_0x074 goto_eq OldaleTown_Mart_EventScript_1FC29F - msgbox OldaleTown_Mart_Text_1FC2B2, 4 + msgbox OldaleTown_Mart_Text_1FC2B2, MSGBOX_DEFAULT release end OldaleTown_Mart_EventScript_1FC29F:: @ 81FC29F - msgbox OldaleTown_Mart_Text_1FC2F3, 4 + msgbox OldaleTown_Mart_Text_1FC2F3, MSGBOX_DEFAULT release end OldaleTown_Mart_EventScript_1FC2A9:: @ 81FC2A9 - msgbox OldaleTown_Mart_Text_1FC338, 2 + msgbox OldaleTown_Mart_Text_1FC338, MSGBOX_NPC end OldaleTown_Mart_Text_1FC2B2: @ 81FC2B2 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index e99e628a6..28d309662 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -17,11 +17,11 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A end OldaleTown_PokemonCenter_1F_EventScript_1FC028:: @ 81FC028 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, 2 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, MSGBOX_NPC end OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, 2 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, MSGBOX_NPC end OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A @@ -29,12 +29,12 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A faceplayer checkflag FLAG_SYS_POKEDEX_GET goto_eq OldaleTown_PokemonCenter_1F_EventScript_1FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, 4 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_1F_EventScript_1FC04F:: @ 81FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, 4 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, MSGBOX_DEFAULT release end diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc index fe8490c9c..34f343eb4 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 1f4f0e872..ef64a7e2e 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -12,19 +12,19 @@ PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 end PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 - msgbox PacifidlogTown_Text_1EBB6C, 2 + msgbox PacifidlogTown_Text_1EBB6C, MSGBOX_NPC end PacifidlogTown_EventScript_1EBACC:: @ 81EBACC - msgbox PacifidlogTown_Text_1EBAE7, 2 + msgbox PacifidlogTown_Text_1EBAE7, MSGBOX_NPC end PacifidlogTown_EventScript_1EBAD5:: @ 81EBAD5 - msgbox PacifidlogTown_Text_1EBBAC, 2 + msgbox PacifidlogTown_Text_1EBBAC, MSGBOX_NPC end PacifidlogTown_EventScript_1EBADE:: @ 81EBADE - msgbox PacifidlogTown_Text_1EBC7A, 3 + msgbox PacifidlogTown_Text_1EBC7A, MSGBOX_SIGN end PacifidlogTown_Text_1EBAE7: @ 81EBAE7 diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc index b4fe4c979..159575eec 100644 --- a/data/maps/PacifidlogTown_House1/scripts.inc +++ b/data/maps/PacifidlogTown_House1/scripts.inc @@ -2,11 +2,11 @@ PacifidlogTown_House1_MapScripts:: @ 820365C .byte 0 PacifidlogTown_House1_EventScript_20365D:: @ 820365D - msgbox PacifidlogTown_House1_Text_20366F, 2 + msgbox PacifidlogTown_House1_Text_20366F, MSGBOX_NPC end PacifidlogTown_House1_EventScript_203666:: @ 8203666 - msgbox PacifidlogTown_House1_Text_20373A, 2 + msgbox PacifidlogTown_House1_Text_20373A, MSGBOX_NPC end PacifidlogTown_House1_Text_20366F: @ 820366F diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 21345242d..d603cbd2d 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -31,12 +31,12 @@ PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE return PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 - msgbox PacifidlogTown_House2_Text_20395B, 4 + msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT return PacifidlogTown_House2_EventScript_203801:: @ 8203801 - msgbox PacifidlogTown_House2_Text_2038C7, 4 - msgbox PacifidlogTown_House2_Text_20395B, 4 + msgbox PacifidlogTown_House2_Text_2038C7, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT return PacifidlogTown_House2_EventScript_203812:: @ 8203812 @@ -44,36 +44,36 @@ PacifidlogTown_House2_EventScript_203812:: @ 8203812 return PacifidlogTown_House2_EventScript_203816:: @ 8203816 - msgbox PacifidlogTown_House2_Text_20396D, 4 + msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, 4 + msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT release end PacifidlogTown_House2_EventScript_203845:: @ 8203845 - msgbox PacifidlogTown_House2_Text_2039CE, 4 + msgbox PacifidlogTown_House2_Text_2039CE, MSGBOX_DEFAULT release end PacifidlogTown_House2_EventScript_20384F:: @ 820384F - msgbox PacifidlogTown_House2_Text_203A2F, 4 + msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, 4 + msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT release end PacifidlogTown_House2_EventScript_20387E:: @ 820387E specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, VAR_RESULT - msgbox PacifidlogTown_House2_Text_203AF4, 4 + msgbox PacifidlogTown_House2_Text_203AF4, MSGBOX_DEFAULT release end @@ -82,9 +82,9 @@ PacifidlogTown_House2_EventScript_203891:: @ 8203891 faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox PacifidlogTown_House2_Text_203B8D, 4 + msgbox PacifidlogTown_House2_Text_203B8D, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203B9D, 4 + msgbox PacifidlogTown_House2_Text_203B9D, MSGBOX_DEFAULT release end @@ -93,9 +93,9 @@ PacifidlogTown_House2_EventScript_2038AC:: @ 82038AC faceplayer waitse playmoncry SPECIES_AZURILL, 2 - msgbox PacifidlogTown_House2_Text_203BCE, 4 + msgbox PacifidlogTown_House2_Text_203BCE, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203BDF, 4 + msgbox PacifidlogTown_House2_Text_203BDF, MSGBOX_DEFAULT release end diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 98977b766..3fb023148 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -10,7 +10,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox PacifidlogTown_House3_Text_203CBE, 5 + msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq PacifidlogTown_House3_EventScript_203C93 special sub_81B94B0 @@ -29,29 +29,29 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 special sub_807F0E4 waitstate bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203D87, 4 + msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT setflag FLAG_0x09A release end PacifidlogTown_House3_EventScript_203C93:: @ 8203C93 - msgbox PacifidlogTown_House3_Text_203E12, 4 + msgbox PacifidlogTown_House3_Text_203E12, MSGBOX_DEFAULT release end PacifidlogTown_House3_EventScript_203C9D:: @ 8203C9D bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203DDE, 4 + msgbox PacifidlogTown_House3_Text_203DDE, MSGBOX_DEFAULT release end PacifidlogTown_House3_EventScript_203CAB:: @ 8203CAB - msgbox PacifidlogTown_House3_Text_203E7F, 4 + msgbox PacifidlogTown_House3_Text_203E7F, MSGBOX_DEFAULT release end PacifidlogTown_House3_EventScript_203CB5:: @ 8203CB5 - msgbox PacifidlogTown_House3_Text_203EF1, 2 + msgbox PacifidlogTown_House3_Text_203EF1, MSGBOX_NPC end PacifidlogTown_House3_Text_203CBE: @ 8203CBE diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index a3e9cf0a4..d6fb43334 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -2,17 +2,17 @@ PacifidlogTown_House4_MapScripts:: @ 8203F4B .byte 0 PacifidlogTown_House4_EventScript_203F4C:: @ 8203F4C - msgbox PacifidlogTown_House4_Text_204017, 2 + msgbox PacifidlogTown_House4_Text_204017, MSGBOX_NPC end PacifidlogTown_House4_EventScript_203F55:: @ 8203F55 - msgbox PacifidlogTown_House4_Text_203F93, 2 + msgbox PacifidlogTown_House4_Text_203F93, MSGBOX_NPC end PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E lock faceplayer - msgbox PacifidlogTown_House4_Text_204035, 5 + msgbox PacifidlogTown_House4_Text_204035, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PacifidlogTown_House4_EventScript_203F7F compare VAR_RESULT, 0 @@ -20,12 +20,12 @@ PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E end PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F - msgbox PacifidlogTown_House4_Text_20404E, 4 + msgbox PacifidlogTown_House4_Text_20404E, MSGBOX_DEFAULT release end PacifidlogTown_House4_EventScript_203F89:: @ 8203F89 - msgbox PacifidlogTown_House4_Text_204084, 4 + msgbox PacifidlogTown_House4_Text_204084, MSGBOX_DEFAULT release end diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index ec97a639e..0e9af702f 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -7,17 +7,17 @@ PacifidlogTown_House5_EventScript_204111:: @ 8204111 specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq PacifidlogTown_House5_EventScript_20412D - msgbox PacifidlogTown_House5_Text_204140, 4 + msgbox PacifidlogTown_House5_Text_204140, MSGBOX_DEFAULT release end PacifidlogTown_House5_EventScript_20412D:: @ 820412D - msgbox PacifidlogTown_House5_Text_204161, 4 + msgbox PacifidlogTown_House5_Text_204161, MSGBOX_DEFAULT release end PacifidlogTown_House5_EventScript_204137:: @ 8204137 - msgbox PacifidlogTown_House5_Text_20418B, 2 + msgbox PacifidlogTown_House5_Text_20418B, MSGBOX_NPC end PacifidlogTown_House5_Text_204140: @ 8204140 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 65af1cdc7..a4dc90bd6 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -16,15 +16,15 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6 end PacifidlogTown_PokemonCenter_1F_EventScript_2034C4:: @ 82034C4 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, 2 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, MSGBOX_NPC end PacifidlogTown_PokemonCenter_1F_EventScript_2034CD:: @ 82034CD - msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, 2 + msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, MSGBOX_NPC end PacifidlogTown_PokemonCenter_1F_EventScript_2034D6:: @ 82034D6 - msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, 2 + msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, MSGBOX_NPC end PacifidlogTown_PokemonCenter_1F_Text_2034DF: @ 82034DF diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc index 1b961ee74..d41f1fa71 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 3e85ad434..10d85c939 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -1,13 +1,13 @@ PetalburgCity_EventObjects: @ 8525FD0 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728 - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 726 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLY object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0 - object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 830 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040 + object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, FLAG_ITEM_PETALBURG_CITY_ETHER object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 - object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 995 + object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_SCOTT PetalburgCity_MapWarps: @ 85260A8 warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 @@ -35,7 +35,7 @@ PetalburgCity_MapBGEvents: @ 8526158 bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491 - bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, 95 + bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY PetalburgCity_MapEvents:: @ 85261B8 map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 67a9f83f3..4905c83d9 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -35,13 +35,13 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E applymovement 2, PetalburgCity_Movement_1DC451 applymovement 255, PetalburgCity_Movement_1DC430 waitmovement 0 - msgbox PetalburgCity_Text_1EC1F8, 4 + msgbox PetalburgCity_Text_1EC1F8, MSGBOX_DEFAULT special StartWallyTutorialBattle waitstate - msgbox PetalburgCity_Text_1EC271, 4 + msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY - msgbox PetalburgCity_Text_1EC297, 4 + msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 setvar VAR_0x4057, 3 @@ -67,7 +67,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 applymovement 5, PetalburgCity_Movement_1DC42D applymovement 255, PetalburgCity_Movement_1DC418 waitmovement 0 - setflag FLAG_0x33E + setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE hideobjectat 255, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim @@ -82,7 +82,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 lock faceplayer - msgbox PetalburgCity_Text_1DC985, 4 + msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgCity_Movement_2725A2 waitmovement 0 @@ -90,7 +90,7 @@ PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 end PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD - msgbox PetalburgCity_Text_1DC837, 2 + msgbox PetalburgCity_Text_1DC837, MSGBOX_NPC end PetalburgCity_Movement_1DC406: @ 81DC406 @@ -218,19 +218,19 @@ PetalburgCity_Movement_1DC451: @ 81DC451 step_end PetalburgCity_EventScript_1DC476:: @ 81DC476 - msgbox PetalburgCity_Text_1DCAAA, 3 + msgbox PetalburgCity_Text_1DCAAA, MSGBOX_SIGN end PetalburgCity_EventScript_1DC47F:: @ 81DC47F - msgbox PetalburgCity_Text_1DCAF1, 3 + msgbox PetalburgCity_Text_1DCAF1, MSGBOX_SIGN end PetalburgCity_EventScript_1DC488:: @ 81DC488 - msgbox PetalburgCity_Text_1DCA30, 2 + msgbox PetalburgCity_Text_1DCA30, MSGBOX_NPC end PetalburgCity_EventScript_1DC491:: @ 81DC491 - msgbox PetalburgCity_Text_1DCB23, 3 + msgbox PetalburgCity_Text_1DCB23, MSGBOX_SIGN end PetalburgCity_EventScript_1DC49A:: @ 81DC49A @@ -274,7 +274,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA call_if 1, PetalburgCity_EventScript_1DC59F compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC5B4 - msgbox PetalburgCity_Text_1DC881, 4 + msgbox PetalburgCity_Text_1DC881, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC5C9 @@ -284,11 +284,11 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA call_if 1, PetalburgCity_EventScript_1DC5ED compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC5FF - msgbox PetalburgCity_Text_1DC91B, 4 + msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT applymovement 8, PetalburgCity_Movement_2725A8 applymovement 255, PetalburgCity_Movement_2725A8 waitmovement 0 - msgbox PetalburgCity_Text_1DC93E, 4 + msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT closemessage applymovement 8, PetalburgCity_Movement_1DC658 waitmovement 0 @@ -547,17 +547,17 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 applymovement 255, PetalburgCity_Movement_2725A8 waitmovement 0 setvar VAR_0x40D1, 1 - msgbox PetalburgCity_Text_1DCB31, 4 + msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage applymovement 9, PetalburgCity_Movement_2725A8 waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCB82, 4 + msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT closemessage applymovement 9, PetalburgCity_Movement_2725A4 waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCC09, 4 + msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC78E @@ -705,7 +705,7 @@ PetalburgCity_Movement_1DC828: @ 81DC828 step_end PetalburgCity_EventScript_1DC82E:: @ 81DC82E - msgbox PetalburgCity_Text_1DC881, 2 + msgbox PetalburgCity_Text_1DC881, MSGBOX_NPC end PetalburgCity_Text_1DC837: @ 81DC837 diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index 42a0a8fc7..4c75dc7f6 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -1,5 +1,5 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772 + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, FLAG_HIDE_PETALYBURG_GYM_NORMAN object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 @@ -7,9 +7,9 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781 - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 866 - object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 824 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, FLAG_HIDE_PETALBURG_GYM_GREETER + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLY + object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index e95e434b5..29459f5e5 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -88,19 +88,19 @@ PetalburgCity_Gym_MapScript2_20499A: @ 820499A PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 lockall - msgbox PetalburgCity_Gym_Text_205B32, 4 - msgbox PetalburgCity_Gym_Text_205B4C, 4 + msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT closemessage applymovement 255, PetalburgCity_Gym_Movement_2725AA applymovement 10, PetalburgCity_Gym_Movement_2049EC waitmovement 0 playse SE_KAIDAN removeobject 10 - setflag FLAG_0x2D6 + setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 applymovement 255, PetalburgCity_Gym_Movement_2725A6 waitmovement 0 - msgbox PetalburgCity_Gym_Text_205C40, 4 + msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT setvar VAR_0x4085, 2 releaseall end @@ -123,7 +123,7 @@ PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 case 6, PetalburgCity_Gym_EventScript_204E3B case 7, PetalburgCity_Gym_EventScript_204D80 case 8, PetalburgCity_Gym_EventScript_204DB3 - msgbox PetalburgCity_Gym_Text_2057A2, 4 + msgbox PetalburgCity_Gym_Text_2057A2, MSGBOX_DEFAULT closemessage switch VAR_FACING case 1, PetalburgCity_Gym_EventScript_204A80 @@ -163,10 +163,10 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204C5F compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204C5F - msgbox PetalburgCity_Gym_Text_2058B1, 4 - msgbox PetalburgCity_Gym_Text_2058DB, 4 - msgbox PetalburgCity_Gym_Text_205910, 4 - msgbox PetalburgCity_Gym_Text_2059D8, 4 + msgbox PetalburgCity_Gym_Text_2058B1, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_2058DB, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205910, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_2059D8, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204CC7 compare VAR_0x8008, 1 @@ -175,7 +175,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204CE4 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204CF6 - msgbox PetalburgCity_Gym_Text_2059E8, 4 + msgbox PetalburgCity_Gym_Text_2059E8, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D08 compare VAR_0x8008, 1 @@ -184,9 +184,9 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204D1E compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D29 - msgbox PetalburgCity_Gym_Text_205A46, 4 - msgbox PetalburgCity_Gym_Text_205A89, 4 - msgbox PetalburgCity_Gym_Text_205AF4, 4 + msgbox PetalburgCity_Gym_Text_205A46, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205A89, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205AF4, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D72 compare VAR_0x8008, 1 @@ -203,7 +203,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204D34 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D34 - msgbox PetalburgCity_Gym_Text_205B0F, 4 + msgbox PetalburgCity_Gym_Text_205B0F, MSGBOX_DEFAULT closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_TSURETEK, 0 @@ -216,12 +216,12 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204CB5 removeobject 10 - setflag FLAG_0x2D8 + setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT setvar VAR_0x4085, 1 setvar VAR_0x4057, 2 - clearflag FLAG_0x2D6 - clearflag FLAG_0x362 - setflag FLAG_0x379 + clearflag FLAG_HIDE_PETALBURG_CITY_WALLY + clearflag FLAG_HIDE_PETALBURG_GYM_WALLY + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL special InitBirchState warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate @@ -328,22 +328,22 @@ PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F return PetalburgCity_Gym_EventScript_204D4A:: @ 8204D4A - msgbox PetalburgCity_Gym_Text_205DB4, 4 + msgbox PetalburgCity_Gym_Text_205DB4, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_204D54:: @ 8204D54 - msgbox PetalburgCity_Gym_Text_205EAE, 4 + msgbox PetalburgCity_Gym_Text_205EAE, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_204D5E:: @ 8204D5E - msgbox PetalburgCity_Gym_Text_205F87, 4 + msgbox PetalburgCity_Gym_Text_205F87, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_204D68:: @ 8204D68 - msgbox PetalburgCity_Gym_Text_205F87, 4 + msgbox PetalburgCity_Gym_Text_205F87, MSGBOX_DEFAULT release end @@ -369,7 +369,7 @@ PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 goto_if 0, PetalburgCity_Gym_EventScript_204DAC checkflag FLAG_SYS_GAME_CLEAR goto_eq PetalburgCity_Gym_EventScript_20512D - msgbox PetalburgCity_Gym_Text_206417, 4 + msgbox PetalburgCity_Gym_Text_206417, MSGBOX_DEFAULT release end @@ -379,8 +379,8 @@ PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC end PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 - trainerbattle 7, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A - msgbox PetalburgCity_Gym_Text_2075F7, 6 + trainerbattle_rematch_double TRAINER_NORMAN_1, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A + msgbox PetalburgCity_Gym_Text_2075F7, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE @@ -395,7 +395,7 @@ PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE goto_eq PetalburgCity_Gym_EventScript_204E17 compare VAR_ENIGMA_BERRY_AVAILABLE, 0 goto_eq PetalburgCity_Gym_EventScript_204E17 - msgbox PetalburgCity_Gym_Text_2A6D3D, 4 + msgbox PetalburgCity_Gym_Text_2A6D3D, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -412,27 +412,27 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D end PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B - msgbox PetalburgCity_Gym_Text_205FE5, 4 - trainerbattle 3, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_206107 + msgbox PetalburgCity_Gym_Text_205FE5, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107 message PetalburgCity_Gym_Text_206162 waitmessage call PetalburgCity_Gym_EventScript_27207E - msgbox PetalburgCity_Gym_Text_20618A, 4 + msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT setflag FLAG_0x4F4 setvar VAR_0x4085, 7 setflag FLAG_BADGE05_GET special sub_813B9A0 call PetalburgCity_Gym_EventScript_2721F8 - setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON - clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON + setflag FLAG_HIDE_MAUVILLE_GYM_WATTSON + clearflag FLAG_HIDE_MAUVILLE_CITY_WATTSON setvar VAR_0x8008, 5 call PetalburgCity_Gym_EventScript_271F43 - clearflag FLAG_0x3AC + clearflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN call PetalburgCity_Gym_EventScript_2048FF special DrawWholeMapView call PetalburgCity_Gym_EventScript_204ED2 delay 30 - msgbox PetalburgCity_Gym_Text_2062FB, 4 + msgbox PetalburgCity_Gym_Text_2062FB, MSGBOX_DEFAULT closemessage delay 40 playse SE_DOOR @@ -449,7 +449,7 @@ PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_27205E setflag FLAG_0x0A9 - msgbox PetalburgCity_Gym_Text_206254, 4 + msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT return PetalburgCity_Gym_EventScript_204EF5:: @ 8204EF5 @@ -479,7 +479,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 call_if 1, PetalburgCity_Gym_EventScript_205009 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_205025 - msgbox PetalburgCity_Gym_Text_206377, 4 + msgbox PetalburgCity_Gym_Text_206377, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 1 @@ -488,7 +488,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 call_if 1, PetalburgCity_Gym_EventScript_204FD7 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204FE2 - msgbox PetalburgCity_Gym_Text_2063CA, 4 + msgbox PetalburgCity_Gym_Text_2063CA, MSGBOX_DEFAULT closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_TSURETEK, 0 @@ -500,7 +500,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 call_if 1, PetalburgCity_Gym_EventScript_20506C removeobject 11 setvar VAR_0x4057, 4 - clearflag FLAG_0x33E + clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release @@ -780,7 +780,7 @@ PetalburgCity_Gym_Movement_205123: @ 8205123 step_end PetalburgCity_Gym_EventScript_20512D:: @ 820512D - msgbox PetalburgCity_Gym_Text_2064C3, 4 + msgbox PetalburgCity_Gym_Text_2064C3, MSGBOX_DEFAULT release end @@ -790,7 +790,7 @@ PetalburgCity_Gym_EventScript_205137:: @ 8205137 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 - msgbox PetalburgCity_Gym_Text_20721E, 5 + msgbox PetalburgCity_Gym_Text_20721E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -810,7 +810,7 @@ PetalburgCity_Gym_EventScript_20517B:: @ 820517B end PetalburgCity_Gym_EventScript_20517D:: @ 820517D - msgbox PetalburgCity_Gym_Text_2071F4, 4 + msgbox PetalburgCity_Gym_Text_2071F4, MSGBOX_DEFAULT releaseall end @@ -820,7 +820,7 @@ PetalburgCity_Gym_EventScript_205187:: @ 8205187 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 - msgbox PetalburgCity_Gym_Text_207280, 5 + msgbox PetalburgCity_Gym_Text_207280, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -833,7 +833,7 @@ PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 - msgbox PetalburgCity_Gym_Text_2072BB, 5 + msgbox PetalburgCity_Gym_Text_2072BB, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -846,7 +846,7 @@ PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, 5 + msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -859,7 +859,7 @@ PetalburgCity_Gym_EventScript_205222:: @ 8205222 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, 5 + msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -872,7 +872,7 @@ PetalburgCity_Gym_EventScript_205255:: @ 8205255 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 - msgbox PetalburgCity_Gym_Text_207331, 5 + msgbox PetalburgCity_Gym_Text_207331, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -885,7 +885,7 @@ PetalburgCity_Gym_EventScript_205288:: @ 8205288 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, 5 + msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -898,7 +898,7 @@ PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, 5 + msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -911,7 +911,7 @@ PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, 5 + msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -924,7 +924,7 @@ PetalburgCity_Gym_EventScript_205321:: @ 8205321 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, 5 + msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -937,7 +937,7 @@ PetalburgCity_Gym_EventScript_205354:: @ 8205354 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, 5 + msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -950,7 +950,7 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, 5 + msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -958,10 +958,10 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387 end PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA - trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE + trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2053ED - msgbox PetalburgCity_Gym_Text_2067D8, 6 + msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE @@ -972,14 +972,14 @@ PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE end PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED - msgbox PetalburgCity_Gym_Text_20685E, 2 + msgbox PetalburgCity_Gym_Text_20685E, MSGBOX_NPC end PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 - trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A + trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205429 - msgbox PetalburgCity_Gym_Text_206996, 6 + msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_20541A:: @ 820541A @@ -990,14 +990,14 @@ PetalburgCity_Gym_EventScript_20541A:: @ 820541A end PetalburgCity_Gym_EventScript_205429:: @ 8205429 - msgbox PetalburgCity_Gym_Text_2069D9, 2 + msgbox PetalburgCity_Gym_Text_2069D9, MSGBOX_NPC end PetalburgCity_Gym_EventScript_205432:: @ 8205432 - trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 + trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205465 - msgbox PetalburgCity_Gym_Text_206AE9, 6 + msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_205456:: @ 8205456 @@ -1008,14 +1008,14 @@ PetalburgCity_Gym_EventScript_205456:: @ 8205456 end PetalburgCity_Gym_EventScript_205465:: @ 8205465 - msgbox PetalburgCity_Gym_Text_206BB1, 2 + msgbox PetalburgCity_Gym_Text_206BB1, MSGBOX_NPC end PetalburgCity_Gym_EventScript_20546E:: @ 820546E - trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 + trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2054A1 - msgbox PetalburgCity_Gym_Text_206C9F, 6 + msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_205492:: @ 8205492 @@ -1026,14 +1026,14 @@ PetalburgCity_Gym_EventScript_205492:: @ 8205492 end PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 - msgbox PetalburgCity_Gym_Text_206D56, 2 + msgbox PetalburgCity_Gym_Text_206D56, MSGBOX_NPC end PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA - trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE + trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2054DD - msgbox PetalburgCity_Gym_Text_206E26, 6 + msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE @@ -1044,14 +1044,14 @@ PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE end PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD - msgbox PetalburgCity_Gym_Text_206ED8, 2 + msgbox PetalburgCity_Gym_Text_206ED8, MSGBOX_NPC end PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 - trainerbattle 2, TRAINER_ALEXIA, 0, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A + trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205519 - msgbox PetalburgCity_Gym_Text_206F9F, 6 + msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_20550A:: @ 820550A @@ -1062,14 +1062,14 @@ PetalburgCity_Gym_EventScript_20550A:: @ 820550A end PetalburgCity_Gym_EventScript_205519:: @ 8205519 - msgbox PetalburgCity_Gym_Text_207069, 2 + msgbox PetalburgCity_Gym_Text_207069, MSGBOX_NPC end PetalburgCity_Gym_EventScript_205522:: @ 8205522 - trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 + trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205555 - msgbox PetalburgCity_Gym_Text_2070FB, 6 + msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_205546:: @ 8205546 @@ -1080,7 +1080,7 @@ PetalburgCity_Gym_EventScript_205546:: @ 8205546 end PetalburgCity_Gym_EventScript_205555:: @ 8205555 - msgbox PetalburgCity_Gym_Text_207170, 2 + msgbox PetalburgCity_Gym_Text_207170, MSGBOX_NPC end PetalburgCity_Gym_EventScript_20555E:: @ 820555E @@ -1217,12 +1217,12 @@ PetalburgCity_Gym_EventScript_20574F:: @ 820574F faceplayer checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205764 - msgbox PetalburgCity_Gym_Text_206542, 4 + msgbox PetalburgCity_Gym_Text_206542, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_205764:: @ 8205764 - msgbox PetalburgCity_Gym_Text_2066F3, 4 + msgbox PetalburgCity_Gym_Text_2066F3, MSGBOX_DEFAULT release end @@ -1241,12 +1241,12 @@ PetalburgCity_Gym_EventScript_20577E:: @ 820577E end PetalburgCity_Gym_EventScript_20578E:: @ 820578E - msgbox PetalburgCity_Gym_Text_207467, 4 + msgbox PetalburgCity_Gym_Text_207467, MSGBOX_DEFAULT releaseall end PetalburgCity_Gym_EventScript_205798:: @ 8205798 - msgbox PetalburgCity_Gym_Text_20744C, 4 + msgbox PetalburgCity_Gym_Text_20744C, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/PetalburgCity_House1/scripts.inc b/data/maps/PetalburgCity_House1/scripts.inc index f727ec8a1..cb511bbed 100644 --- a/data/maps/PetalburgCity_House1/scripts.inc +++ b/data/maps/PetalburgCity_House1/scripts.inc @@ -2,11 +2,11 @@ PetalburgCity_House1_MapScripts:: @ 8207799 .byte 0 PetalburgCity_House1_EventScript_20779A:: @ 820779A - msgbox PetalburgCity_House1_Text_2077AC, 2 + msgbox PetalburgCity_House1_Text_2077AC, MSGBOX_NPC end PetalburgCity_House1_EventScript_2077A3:: @ 82077A3 - msgbox PetalburgCity_House1_Text_2077FB, 2 + msgbox PetalburgCity_House1_Text_2077FB, MSGBOX_NPC end PetalburgCity_House1_Text_2077AC: @ 82077AC diff --git a/data/maps/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc index 44987b3d6..4fe971339 100644 --- a/data/maps/PetalburgCity_House2/scripts.inc +++ b/data/maps/PetalburgCity_House2/scripts.inc @@ -2,11 +2,11 @@ PetalburgCity_House2_MapScripts:: @ 82078F2 .byte 0 PetalburgCity_House2_EventScript_2078F3:: @ 82078F3 - msgbox PetalburgCity_House2_Text_207905, 2 + msgbox PetalburgCity_House2_Text_207905, MSGBOX_NPC end PetalburgCity_House2_EventScript_2078FC:: @ 82078FC - msgbox PetalburgCity_House2_Text_207969, 2 + msgbox PetalburgCity_House2_Text_207969, MSGBOX_NPC end PetalburgCity_House2_Text_207905: @ 8207905 diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 665ad3bae..9ee996374 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -9,7 +9,7 @@ PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 checkflag FLAG_0x128 goto_eq PetalburgCity_Mart_EventScript_207DA6 pokemart PetalburgCity_Mart_Pokemart_207D8C - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -32,7 +32,7 @@ PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C PetalburgCity_Mart_EventScript_207DA6:: @ 8207DA6 pokemart PetalburgCity_Mart_Pokemart_207DB8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -56,15 +56,15 @@ PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8 end PetalburgCity_Mart_EventScript_207DD6:: @ 8207DD6 - msgbox PetalburgCity_Mart_Text_207DF1, 2 + msgbox PetalburgCity_Mart_Text_207DF1, MSGBOX_NPC end PetalburgCity_Mart_EventScript_207DDF:: @ 8207DDF - msgbox PetalburgCity_Mart_Text_207E60, 2 + msgbox PetalburgCity_Mart_Text_207E60, MSGBOX_NPC end PetalburgCity_Mart_EventScript_207DE8:: @ 8207DE8 - msgbox PetalburgCity_Mart_Text_207EB0, 2 + msgbox PetalburgCity_Mart_Text_207EB0, MSGBOX_NPC end PetalburgCity_Mart_Text_207DF1: @ 8207DF1 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 130a43de9..d0a279cf2 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -17,17 +17,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC end PetalburgCity_PokemonCenter_1F_EventScript_207A0A:: @ 8207A0A - msgbox PetalburgCity_PokemonCenter_1F_Text_207A76, 2 + msgbox PetalburgCity_PokemonCenter_1F_Text_207A76, MSGBOX_NPC end PetalburgCity_PokemonCenter_1F_EventScript_207A13:: @ 8207A13 - msgbox PetalburgCity_PokemonCenter_1F_Text_207AD6, 2 + msgbox PetalburgCity_PokemonCenter_1F_Text_207AD6, MSGBOX_NPC end PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C lock faceplayer - msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, MSGBOX_DEFAULT specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 @@ -45,15 +45,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 end PetalburgCity_PokemonCenter_1F_EventScript_207A5B:: @ 8207A5B - msgbox PetalburgCity_PokemonCenter_1F_Text_207BB0, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207BB0, MSGBOX_DEFAULT return PetalburgCity_PokemonCenter_1F_EventScript_207A64:: @ 8207A64 - msgbox PetalburgCity_PokemonCenter_1F_Text_207C35, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207C35, MSGBOX_DEFAULT return PetalburgCity_PokemonCenter_1F_EventScript_207A6D:: @ 8207A6D - msgbox PetalburgCity_PokemonCenter_1F_Text_207CB7, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207CB7, MSGBOX_DEFAULT return PetalburgCity_PokemonCenter_1F_Text_207A76: @ 8207A76 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc index d83875c10..08bd8f524 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index e64bd57b1..babfb6229 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -18,10 +18,10 @@ PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 lockall - msgbox PetalburgCity_WallysHouse_Text_20446E, 4 + msgbox PetalburgCity_WallysHouse_Text_20446E, MSGBOX_DEFAULT giveitem_std ITEM_HM03 setflag FLAG_0x07A - msgbox PetalburgCity_WallysHouse_Text_20461A, 4 + msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT setvar VAR_0x4057, 5 releaseall end @@ -35,23 +35,23 @@ PetalburgCity_WallysHouse_EventScript_204278:: @ 8204278 goto_eq PetalburgCity_WallysHouse_EventScript_2042A2 checkflag FLAG_0x087 goto_eq PetalburgCity_WallysHouse_EventScript_2042B6 - msgbox PetalburgCity_WallysHouse_Text_2042DF, 4 + msgbox PetalburgCity_WallysHouse_Text_2042DF, MSGBOX_DEFAULT setflag FLAG_0x087 release end PetalburgCity_WallysHouse_EventScript_2042A2:: @ 82042A2 - msgbox PetalburgCity_WallysHouse_Text_204661, 4 + msgbox PetalburgCity_WallysHouse_Text_204661, MSGBOX_DEFAULT release end PetalburgCity_WallysHouse_EventScript_2042AC:: @ 82042AC - msgbox PetalburgCity_WallysHouse_Text_204698, 4 + msgbox PetalburgCity_WallysHouse_Text_204698, MSGBOX_DEFAULT release end PetalburgCity_WallysHouse_EventScript_2042B6:: @ 82042B6 - msgbox PetalburgCity_WallysHouse_Text_20444D, 4 + msgbox PetalburgCity_WallysHouse_Text_20444D, MSGBOX_DEFAULT release end @@ -60,12 +60,12 @@ PetalburgCity_WallysHouse_EventScript_2042C0:: @ 82042C0 faceplayer checkflag FLAG_0x07A goto_eq PetalburgCity_WallysHouse_EventScript_2042D5 - msgbox PetalburgCity_WallysHouse_Text_204732, 4 + msgbox PetalburgCity_WallysHouse_Text_204732, MSGBOX_DEFAULT release end PetalburgCity_WallysHouse_EventScript_2042D5:: @ 82042D5 - msgbox PetalburgCity_WallysHouse_Text_2047A7, 4 + msgbox PetalburgCity_WallysHouse_Text_2047A7, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index e0bfbc630..b64e38885 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -1,16 +1,16 @@ PetalburgWoods_EventObjects: @ 85345E4 - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 725 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 724 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058 + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, FLAG_ITEM_PETALBURG_WOODS_X_ATTACK + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, FLAG_ITEM_PETALBURG_WOODS_ETHER object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0 object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0 object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0 object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, 1117 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 PetalburgWoods_MapWarps: @ 853471C @@ -27,10 +27,10 @@ PetalburgWoods_MapCoordEvents: @ 853474C PetalburgWoods_MapBGEvents: @ 853476C bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B - bg_hidden_item_event 39, 35, 3, ITEM_POTION, 58 - bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, 59 - bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, 60 - bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, 61 + bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION + bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 + bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 + bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264 PetalburgWoods_MapEvents:: @ 85347B4 diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 7c9a1ae49..82e49abb2 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -6,27 +6,27 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 call PetalburgWoods_EventScript_22E124 applymovement 4, PetalburgWoods_Movement_22E1CB waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, 4 + msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 applymovement 3, PetalburgWoods_Movement_22E209 waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, 4 + msgbox PetalburgWoods_Text_22E3AA, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E1F6 waitmovement 0 applymovement 4, PetalburgWoods_Movement_2725A6 waitmovement 0 - msgbox PetalburgWoods_Text_22E428, 4 + msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1E4 waitmovement 0 - msgbox PetalburgWoods_Text_22E457, 4 + msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E20E waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, 4 - trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 + msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 call PetalburgWoods_EventScript_22E138 @@ -43,26 +43,26 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 waitmovement 0 applymovement 255, PetalburgWoods_Movement_2725A4 waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, 4 + msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 applymovement 3, PetalburgWoods_Movement_22E209 waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, 4 + msgbox PetalburgWoods_Text_22E3AA, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E205 waitmovement 0 applymovement 4, PetalburgWoods_Movement_2725A6 waitmovement 0 - msgbox PetalburgWoods_Text_22E428, 4 + msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1EA waitmovement 0 - msgbox PetalburgWoods_Text_22E457, 4 + msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT applymovement 255, PetalburgWoods_Movement_2725A6 waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, 4 - trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 + msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 call PetalburgWoods_EventScript_22E138 @@ -75,19 +75,19 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 PetalburgWoods_EventScript_22E124:: @ 822E124 applymovement 4, PetalburgWoods_Movement_22E1B1 waitmovement 0 - msgbox PetalburgWoods_Text_22E332, 4 + msgbox PetalburgWoods_Text_22E332, MSGBOX_DEFAULT closemessage return PetalburgWoods_EventScript_22E138:: @ 822E138 - msgbox PetalburgWoods_Text_22E563, 4 + msgbox PetalburgWoods_Text_22E563, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E1FD waitmovement 0 removeobject 3 applymovement 255, PetalburgWoods_Movement_2725AA waitmovement 0 - msgbox PetalburgWoods_Text_22E63D, 4 + msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_22E17D @@ -95,15 +95,15 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 end PetalburgWoods_EventScript_22E17D:: @ 822E17D - msgbox PetalburgWoods_Text_22E741, 4 + msgbox PetalburgWoods_Text_22E741, MSGBOX_DEFAULT goto PetalburgWoods_EventScript_22E18B end PetalburgWoods_EventScript_22E18B:: @ 822E18B - msgbox PetalburgWoods_Text_22E6C7, 4 + msgbox PetalburgWoods_Text_22E6C7, MSGBOX_DEFAULT applymovement 4, PetalburgWoods_Movement_22E1EE waitmovement 0 - msgbox PetalburgWoods_Text_22E712, 4 + msgbox PetalburgWoods_Text_22E712, MSGBOX_DEFAULT closemessage return @@ -239,11 +239,11 @@ PetalburgWoods_Movement_22E20E: @ 822E20E step_end PetalburgWoods_EventScript_22E210:: @ 822E210 - msgbox PetalburgWoods_Text_22EA0C, 2 + msgbox PetalburgWoods_Text_22EA0C, MSGBOX_NPC end PetalburgWoods_EventScript_22E219:: @ 822E219 - msgbox PetalburgWoods_Text_22EA8B, 2 + msgbox PetalburgWoods_Text_22EA8B, MSGBOX_NPC end PetalburgWoods_EventScript_22E222:: @ 822E222 @@ -251,7 +251,7 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 faceplayer checkflag FLAG_0x129 goto_eq PetalburgWoods_EventScript_22E251 - msgbox PetalburgWoods_Text_22EAFE, 4 + msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_272054 @@ -260,25 +260,25 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 end PetalburgWoods_EventScript_22E251:: @ 822E251 - msgbox PetalburgWoods_Text_22EB63, 4 + msgbox PetalburgWoods_Text_22EB63, MSGBOX_DEFAULT release end PetalburgWoods_EventScript_22E25B:: @ 822E25B - msgbox PetalburgWoods_Text_22EC10, 3 + msgbox PetalburgWoods_Text_22EC10, MSGBOX_SIGN end PetalburgWoods_EventScript_22E264:: @ 822E264 - msgbox PetalburgWoods_Text_22ED07, 3 + msgbox PetalburgWoods_Text_22ED07, MSGBOX_SIGN end PetalburgWoods_EventScript_22E26D:: @ 822E26D - trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 - msgbox PetalburgWoods_Text_22E7EF, 6 + trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 + msgbox PetalburgWoods_Text_22E7EF, MSGBOX_AUTOCLOSE end PetalburgWoods_EventScript_22E284:: @ 822E284 - trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 + trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq PetalburgWoods_EventScript_22E31B @@ -286,7 +286,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_22E2EF - msgbox PetalburgWoods_Text_22E889, 4 + msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT release end @@ -299,33 +299,27 @@ PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 end PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 - msgbox PetalburgWoods_Text_22E8C3, 4 - setvar VAR_0x8004, 621 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 621 - callstd 8 + msgbox PetalburgWoods_Text_22E8C3, MSGBOX_DEFAULT + register_matchcall TRAINER_JAMES_1 release end PetalburgWoods_EventScript_22E2EF:: @ 822E2EF checkflag FLAG_HAS_MATCH_CALL goto_eq PetalburgWoods_EventScript_22E302 - msgbox PetalburgWoods_Text_22E889, 4 + msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT release end PetalburgWoods_EventScript_22E302:: @ 822E302 - msgbox PetalburgWoods_Text_22E914, 4 - setvar VAR_0x8004, 621 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 621 - callstd 8 + msgbox PetalburgWoods_Text_22E914, MSGBOX_DEFAULT + register_matchcall TRAINER_JAMES_1 release end PetalburgWoods_EventScript_22E31B:: @ 822E31B - trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 - msgbox PetalburgWoods_Text_22E9B6, 6 + trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 + msgbox PetalburgWoods_Text_22E9B6, MSGBOX_AUTOCLOSE end PetalburgWoods_Text_22E332: @ 822E332 diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index d43253baa..77ee2848f 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -1,10 +1,10 @@ Route101_EventObjects: @ 8527E98 object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, 720 - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, 750 - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, 897 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, 991 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_ZIGZAGOON + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY Route101_MapCoordEvents: @ 8527F28 coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 97e832761..341f7a572 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -19,7 +19,7 @@ Route101_EventScript_1EBCD5:: @ 81EBCD5 Route101_EventScript_1EBCDE:: @ 81EBCDE lockall playbgm MUS_EVENT0, 1 - msgbox Route101_Text_1EBE8F, 4 + msgbox Route101_Text_1EBE8F, MSGBOX_DEFAULT closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 @@ -35,7 +35,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE applymovement 4, Route101_Movement_1EBDBD applymovement 2, Route101_Movement_1EBDEF waitmovement 0 - msgbox Route101_Text_1EBE9A, 4 + msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT closemessage setvar VAR_0x4060, 2 releaseall @@ -43,7 +43,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE Route101_EventScript_1EBD4E:: @ 81EBD4E lockall - msgbox Route101_Text_1EBEDF, 4 + msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage applymovement 255, Route101_Movement_1EBD90 waitmovement 0 @@ -52,7 +52,7 @@ Route101_EventScript_1EBD4E:: @ 81EBD4E Route101_EventScript_1EBD64:: @ 81EBD64 lockall - msgbox Route101_Text_1EBEDF, 4 + msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage applymovement 255, Route101_Movement_1EBD92 waitmovement 0 @@ -61,7 +61,7 @@ Route101_EventScript_1EBD64:: @ 81EBD64 Route101_EventScript_1EBD7A:: @ 81EBD7A lockall - msgbox Route101_Text_1EBEDF, 4 + msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage applymovement 255, Route101_Movement_1EBD94 waitmovement 0 @@ -204,15 +204,15 @@ Route101_Movement_1EBDF7: @ 81EBDF7 step_end Route101_EventScript_1EBDFB:: @ 81EBDFB - msgbox Route101_Text_1EBFDD, 2 + msgbox Route101_Text_1EBFDD, MSGBOX_NPC end Route101_EventScript_1EBE04:: @ 81EBE04 - msgbox Route101_Text_1EC04A, 2 + msgbox Route101_Text_1EC04A, MSGBOX_NPC end Route101_EventScript_1EBE0D:: @ 81EBE0D - msgbox Route101_Text_1EC0C8, 3 + msgbox Route101_Text_1EC0C8, MSGBOX_SIGN end Route101_EventScript_1EBE16:: @ 81EBE16 @@ -229,11 +229,11 @@ Route101_EventScript_1EBE16:: @ 81EBE16 waitstate applymovement 2, Route101_Movement_1EBE8D waitmovement 0 - msgbox Route101_Text_1EBF12, 4 + msgbox Route101_Text_1EBF12, MSGBOX_DEFAULT special HealPlayerParty - setflag FLAG_0x2D0 - clearflag FLAG_0x2D1 - setflag FLAG_0x2BC + setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG setvar VAR_0x4084, 2 setvar VAR_0x4060, 3 clearflag FLAG_SPECIAL_FLAG_0x4000 @@ -248,11 +248,11 @@ Route101_EventScript_1EBE16:: @ 81EBE16 end Route101_EventScript_1EBE85:: @ 81EBE85 - setflag FLAG_0x2D2 + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM return Route101_EventScript_1EBE89:: @ 81EBE89 - setflag FLAG_0x2F8 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM return Route101_Movement_1EBE8D: @ 81EBE8D diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index 1c660cda4..b2299feea 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -4,7 +4,7 @@ Route102_EventObjects: @ 8527FD8 object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, FLAG_ITEM_ROUTE_102_POTION object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index d25794242..6eb35c32f 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -2,23 +2,23 @@ Route102_MapScripts:: @ 81EC0E0 .byte 0 Route102_EventScript_1EC0E1:: @ 81EC0E1 - msgbox Route102_Text_1EC2C0, 2 + msgbox Route102_Text_1EC2C0, MSGBOX_NPC end Route102_EventScript_1EC0EA:: @ 81EC0EA - msgbox Route102_Text_1EC35B, 3 + msgbox Route102_Text_1EC35B, MSGBOX_SIGN end Route102_EventScript_1EC0F3:: @ 81EC0F3 - msgbox Route102_Text_1EC373, 3 + msgbox Route102_Text_1EC373, MSGBOX_SIGN end Route102_EventScript_1EC0FC:: @ 81EC0FC - msgbox Route102_Text_1EC32E, 2 + msgbox Route102_Text_1EC32E, MSGBOX_NPC end Route102_EventScript_1EC105:: @ 81EC105 - trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 + trainerbattle_single TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C @@ -26,7 +26,7 @@ Route102_EventScript_1EC105:: @ 81EC105 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route102_EventScript_1EC170 - msgbox Route102_Text_2945AC, 4 + msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end @@ -39,48 +39,42 @@ Route102_EventScript_1EC146:: @ 81EC146 end Route102_EventScript_1EC157:: @ 81EC157 - msgbox Route102_Text_294668, 4 - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd 8 + msgbox Route102_Text_294668, MSGBOX_DEFAULT + register_matchcall TRAINER_CALVIN_1 release end Route102_EventScript_1EC170:: @ 81EC170 checkflag FLAG_HAS_MATCH_CALL goto_eq Route102_EventScript_1EC183 - msgbox Route102_Text_2945AC, 4 + msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end Route102_EventScript_1EC183:: @ 81EC183 - msgbox Route102_Text_2945EB, 4 - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd 8 + msgbox Route102_Text_2945EB, MSGBOX_DEFAULT + register_matchcall TRAINER_CALVIN_1 release end Route102_EventScript_1EC19C:: @ 81EC19C - trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C - msgbox Route102_Text_29473C, 6 + trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_2946AE, Route102_Text_29470C + msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1B3:: @ 81EC1B3 - trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847 - msgbox Route102_Text_294859, 6 + trainerbattle_single TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 + msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1CA:: @ 81EC1CA - trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3 - msgbox Route102_Text_294916, 6 + trainerbattle_single TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 + msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1E1:: @ 81EC1E1 - trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA - msgbox Route102_Text_2947DB, 6 + trainerbattle_single TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA + msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE end PetalburgCity_Text_1EC1F8: @ 81EC1F8 diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index f11191970..30a7292a0 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -1,6 +1,6 @@ Route103_EventObjects: @ 85280DC object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 object_event 4, EVENT_OBJ_GFX_TWIN, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0 object_event 5, EVENT_OBJ_GFX_TWIN, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0 @@ -9,16 +9,16 @@ Route103_EventObjects: @ 85280DC object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0 object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, 898 + object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, FLAG_HIDE_ROUTE_103_BIRCH object_event 12, EVENT_OBJ_GFX_POKEFAN_M, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 18 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 19 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, FLAG_ITEM_ROUTE_103_GUARD_SPEC + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_12 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_13 object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0 object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0 object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0 object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP Route103_MapWarps: @ 85282BC warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 6674662f7..063beaca7 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -28,7 +28,7 @@ Route103_EventScript_1EC3C1:: @ 81EC3C1 end Route103_EventScript_1EC3DA:: @ 81EC3DA - msgbox Route103_Text_1EC7A6, 4 + msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 applymovement 2, Route103_Movement_27259E @@ -37,7 +37,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA waitmovement 0 applymovement 2, Route103_Movement_27259A waitmovement 0 - msgbox Route103_Text_1EC7DE, 4 + msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route103_EventScript_1EC48E case 1, Route103_EventScript_1EC49E @@ -45,7 +45,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA end Route103_EventScript_1EC434:: @ 81EC434 - msgbox Route103_Text_1EC989, 4 + msgbox Route103_Text_1EC989, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 applymovement 2, Route103_Movement_27259E @@ -54,7 +54,7 @@ Route103_EventScript_1EC434:: @ 81EC434 waitmovement 0 applymovement 2, Route103_Movement_27259A waitmovement 0 - msgbox Route103_Text_1EC9CE, 4 + msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route103_EventScript_1EC4BE case 1, Route103_EventScript_1EC4CE @@ -62,42 +62,42 @@ Route103_EventScript_1EC434:: @ 81EC434 end Route103_EventScript_1EC48E:: @ 81EC48E - trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_1EC881 + trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_1EC881 goto Route103_EventScript_1EC4EE end Route103_EventScript_1EC49E:: @ 81EC49E - trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_1EC881 + trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_1EC881 goto Route103_EventScript_1EC4EE end Route103_EventScript_1EC4AE:: @ 81EC4AE - trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_1EC881 + trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_1EC881 goto Route103_EventScript_1EC4EE end Route103_EventScript_1EC4BE:: @ 81EC4BE - trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_1ECA59 + trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_1ECA59 goto Route103_EventScript_1EC4FC end Route103_EventScript_1EC4CE:: @ 81EC4CE - trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_1ECA59 + trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_1ECA59 goto Route103_EventScript_1EC4FC end Route103_EventScript_1EC4DE:: @ 81EC4DE - trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_1ECA59 + trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_1ECA59 goto Route103_EventScript_1EC4FC end Route103_EventScript_1EC4EE:: @ 81EC4EE - msgbox Route103_Text_1EC8AE, 4 + msgbox Route103_Text_1EC8AE, MSGBOX_DEFAULT goto Route103_EventScript_1EC50A end Route103_EventScript_1EC4FC:: @ 81EC4FC - msgbox Route103_Text_1ECA79, 4 + msgbox Route103_Text_1ECA79, MSGBOX_DEFAULT goto Route103_EventScript_1EC50A end @@ -142,10 +142,10 @@ Route103_EventScript_1EC585:: @ 81EC585 Route103_EventScript_1EC5A2:: @ 81EC5A2 removeobject 2 setvar VAR_0x4084, 4 - clearflag FLAG_0x379 + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL setflag FLAG_0x082 setvar VAR_0x40C7, 1 - clearflag FLAG_0x3D3 + clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL savebgm MUS_DUMMY fadedefaultbgm releaseall @@ -191,114 +191,105 @@ Route103_Movement_1EC5D6: @ 81EC5D6 step_end Route103_EventScript_1EC5D9:: @ 81EC5D9 - msgbox Route103_Text_1ECB73, 2 + msgbox Route103_Text_1ECB73, MSGBOX_NPC end Route103_EventScript_1EC5E2:: @ 81EC5E2 - msgbox Route103_Text_1ECBB5, 2 + msgbox Route103_Text_1ECBB5, MSGBOX_NPC end Route103_EventScript_1EC5EB:: @ 81EC5EB - msgbox Route103_Text_1ECC1A, 3 + msgbox Route103_Text_1ECC1A, MSGBOX_SIGN end Route103_EventScript_1EC5F4:: @ 81EC5F4 - trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_29495A, Route103_Text_29498F - msgbox Route103_Text_2949B4, 6 + trainerbattle_single TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F + msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC60B:: @ 81EC60B - trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC653 - msgbox Route103_Text_294A52, 6 + msgbox Route103_Text_294A52, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC63A:: @ 81EC63A - msgbox Route103_Text_294B8A, 4 - setvar VAR_0x8004, 481 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 481 - callstd 8 + msgbox Route103_Text_294B8A, MSGBOX_DEFAULT + register_matchcall TRAINER_AMY_AND_LIV_1 release end Route103_EventScript_1EC653:: @ 81EC653 - trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF - msgbox Route103_Text_294C93, 6 + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF + msgbox Route103_Text_294C93, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC66E:: @ 81EC66E - trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC6B6 - msgbox Route103_Text_294B40, 6 + msgbox Route103_Text_294B40, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC69D:: @ 81EC69D - msgbox Route103_Text_294B8A, 4 - setvar VAR_0x8004, 481 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 481 - callstd 8 + msgbox Route103_Text_294B8A, MSGBOX_DEFAULT + register_matchcall TRAINER_AMY_AND_LIV_1 release end Route103_EventScript_1EC6B6:: @ 81EC6B6 - trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB - msgbox Route103_Text_294D89, 6 + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB + msgbox Route103_Text_294D89, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC6D1:: @ 81EC6D1 - trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_294E34, Route103_Text_294E92 - msgbox Route103_Text_294EBB, 6 + trainerbattle_single TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92 + msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC6E8:: @ 81EC6E8 - trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 + trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC733 - msgbox Route103_Text_294F42, 4 + msgbox Route103_Text_294F42, MSGBOX_DEFAULT release end Route103_EventScript_1EC714:: @ 81EC714 special sub_80B4808 waitmovement 0 - msgbox Route103_Text_294F7E, 4 - setvar VAR_0x8004, 293 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 293 - callstd 8 + msgbox Route103_Text_294F7E, MSGBOX_DEFAULT + register_matchcall TRAINER_MIGUEL_1 release end Route103_EventScript_1EC733:: @ 81EC733 - trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_294FC3, Route103_Text_295006 - msgbox Route103_Text_29501E, 6 + trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_294FC3, Route103_Text_295006 + msgbox Route103_Text_29501E, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC74A:: @ 81EC74A - trainerbattle 0, TRAINER_MARCOS, 0, Route103_Text_295206, Route103_Text_29522B - msgbox Route103_Text_295246, 6 + trainerbattle_single TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B + msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC761:: @ 81EC761 - trainerbattle 0, TRAINER_RHETT, 0, Route103_Text_295199, Route103_Text_2951C6 - msgbox Route103_Text_2951DE, 6 + trainerbattle_single TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6 + msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC778:: @ 81EC778 - trainerbattle 0, TRAINER_PETE, 0, Route103_Text_295063, Route103_Text_295093 - msgbox Route103_Text_2950AA, 6 + trainerbattle_single TRAINER_PETE, Route103_Text_295063, Route103_Text_295093 + msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC78F:: @ 81EC78F - trainerbattle 0, TRAINER_ISABELLE, 0, Route103_Text_295116, Route103_Text_295146 - msgbox Route103_Text_29514D, 6 + trainerbattle_single TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146 + msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE end Route103_Text_1EC7A6: @ 81EC7A6 diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 94642fbba..889ef3595 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -5,8 +5,8 @@ Route104_EventObjects: @ 85282E4 object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_1ED045, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0 object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_1ED090, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 742 - object_event 8, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 738 + object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT + object_event 8, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0 object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, BerryTreeScript, 0 object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, BerryTreeScript, 0 @@ -19,20 +19,20 @@ Route104_EventObjects: @ 85282E4 object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, BerryTreeScript, 0 object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, BerryTreeScript, 0 object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002 - object_event 22, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, FLAG_ITEM_ROUTE_104_PP_UP + object_event 22, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST object_event 23, EVENT_OBJ_GFX_TWIN, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0 object_event 24, EVENT_OBJ_GFX_TWIN, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0 object_event 25, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0 object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, 1057 + object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, FLAG_ITEM_ROUTE_104_POKE_BALL object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_1ED376, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, 1115 - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, 17 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, 1135 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, FLAG_ITEM_ROUTE_104_X_ACCURACY + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, FLAG_TEMP_11 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, FLAG_ITEM_ROUTE_104_POTION object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED057, 0 object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 - object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, 719 + object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL Route104_MapWarps: @ 8528614 warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE @@ -53,11 +53,11 @@ Route104_MapBGEvents: @ 8528664 bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033 bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C - bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, 44 - bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, 62 - bg_hidden_item_event 14, 55, 3, ITEM_POTION, 37 - bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, 85 - bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, 88 + bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION + bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL + bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_POTION + bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE + bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE Route104_MapEvents:: @ 85286DC map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 9b45844f0..fcef181eb 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -23,11 +23,11 @@ Route104_EventScript_1ECC5E:: @ 81ECC5E goto_if 0, Route104_EventScript_1ECC74 checkflag FLAG_BADGE03_GET goto_if 0, Route104_EventScript_1ECC74 - clearflag FLAG_0x38A + clearflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST return Route104_EventScript_1ECC74:: @ 81ECC74 - setflag FLAG_0x38A + setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST return Route104_EventScript_1ECC78:: @ 81ECC78 @@ -52,14 +52,14 @@ Route104_EventScript_1ECC9E:: @ 81ECC9E Route104_EventScript_1ECCB3:: @ 81ECCB3 lockall - setflag FLAG_0x32E + setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 applymovement 255, Route104_Movement_2725A6 waitmovement 0 delay 10 addobject 34 - clearflag FLAG_0x2CF + clearflag FLAG_HIDE_ROUTE_104_RIVAL applymovement 255, Route104_Movement_1ECF86 waitmovement 0 applymovement 34, Route104_Movement_1ECF8A @@ -104,27 +104,27 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B checkflag FLAG_0x07C goto_eq Route104_EventScript_1ECDD0 setflag FLAG_0x07C - msgbox Route104_Text_1EDBFF, 4 + msgbox Route104_Text_1EDBFF, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EDC8F, 4 + msgbox Route104_Text_1EDC8F, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0FD applymovement 255, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 - msgbox Route104_Text_1EDCB1, 4 + msgbox Route104_Text_1EDCB1, MSGBOX_DEFAULT closemessage waitmovement 0 applymovement 34, Route104_Movement_1ECDCA waitmovement 0 moveobjectoffscreen 34 - msgbox Route104_Text_1EDCED, 5 + msgbox Route104_Text_1EDCED, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECDED - msgbox Route104_Text_1EDD2A, 4 + msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 releaseall end @@ -144,15 +144,15 @@ Route104_Movement_1ECDCD: @ 81ECDCD step_end Route104_EventScript_1ECDD0:: @ 81ECDD0 - msgbox Route104_Text_1EDD9F, 5 + msgbox Route104_Text_1EDD9F, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECDED - msgbox Route104_Text_1EDD2A, 4 + msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT releaseall end Route104_EventScript_1ECDED:: @ 81ECDED - msgbox Route104_Text_1EDDDB, 4 + msgbox Route104_Text_1EDDDB, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route104_EventScript_1ECE36 case 1, Route104_EventScript_1ECE49 @@ -160,7 +160,7 @@ Route104_EventScript_1ECDED:: @ 81ECDED end Route104_EventScript_1ECE1C:: @ 81ECE1C - msgbox Route104_Text_1EDE3E, 4 + msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, Route104_EventScript_1ECE31 releaseall @@ -172,19 +172,19 @@ Route104_EventScript_1ECE31:: @ 81ECE31 return Route104_EventScript_1ECE36:: @ 81ECE36 - trainerbattle 3, TRAINER_MAY_14, 0, Route104_Text_1EDE18 + trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_1EDE18 setflag FLAG_0x07D goto Route104_EventScript_1ECE1C end Route104_EventScript_1ECE49:: @ 81ECE49 - trainerbattle 3, TRAINER_MAY_15, 0, Route104_Text_1EDE18 + trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_1EDE18 setflag FLAG_0x07D goto Route104_EventScript_1ECE1C end Route104_EventScript_1ECE5C:: @ 81ECE5C - trainerbattle 3, TRAINER_MAY_10, 0, Route104_Text_1EDE18 + trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_1EDE18 setflag FLAG_0x07D goto Route104_EventScript_1ECE1C end @@ -195,41 +195,41 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F checkflag FLAG_0x07C goto_eq Route104_EventScript_1ECEEC setflag FLAG_0x07C - msgbox Route104_Text_1EDF04, 4 + msgbox Route104_Text_1EDF04, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EDFA0, 4 + msgbox Route104_Text_1EDFA0, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0FD applymovement 255, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 - msgbox Route104_Text_1EDFC6, 4 + msgbox Route104_Text_1EDFC6, MSGBOX_DEFAULT closemessage waitmovement 0 applymovement 34, Route104_Movement_1ECDCA waitmovement 0 moveobjectoffscreen 34 - msgbox Route104_Text_1EE009, 5 + msgbox Route104_Text_1EE009, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECF09 - msgbox Route104_Text_1EE04D, 4 + msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 releaseall end Route104_EventScript_1ECEEC:: @ 81ECEEC - msgbox Route104_Text_1EE094, 5 + msgbox Route104_Text_1EE094, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECF09 - msgbox Route104_Text_1EE04D, 4 + msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT releaseall end Route104_EventScript_1ECF09:: @ 81ECF09 - msgbox Route104_Text_1EE0C7, 4 + msgbox Route104_Text_1EE0C7, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route104_EventScript_1ECF4D case 1, Route104_EventScript_1ECF60 @@ -237,26 +237,26 @@ Route104_EventScript_1ECF09:: @ 81ECF09 end Route104_EventScript_1ECF38:: @ 81ECF38 - msgbox Route104_Text_1EE120, 4 + msgbox Route104_Text_1EE120, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, Route104_EventScript_1ECE31 releaseall end Route104_EventScript_1ECF4D:: @ 81ECF4D - trainerbattle 3, TRAINER_BRENDAN_10, 0, Route104_Text_1EE107 + trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_1EE107 setflag FLAG_0x07D goto Route104_EventScript_1ECF38 end Route104_EventScript_1ECF60:: @ 81ECF60 - trainerbattle 3, TRAINER_BRENDAN_12, 0, Route104_Text_1EE107 + trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_1EE107 setflag FLAG_0x07D goto Route104_EventScript_1ECF38 end Route104_EventScript_1ECF73:: @ 81ECF73 - trainerbattle 3, TRAINER_BRENDAN_11, 0, Route104_Text_1EE107 + trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_1EE107 setflag FLAG_0x07D goto Route104_EventScript_1ECF38 end @@ -276,17 +276,17 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C faceplayer checkflag FLAG_0x0F6 goto_eq Route104_EventScript_1ECFC3 - msgbox Route104_Text_2A6D86, 4 + msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 setflag FLAG_0x0F6 - msgbox Route104_Text_2A6E32, 4 + msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release end Route104_EventScript_1ECFC3:: @ 81ECFC3 - msgbox Route104_Text_2A6E32, 4 + msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release end @@ -295,7 +295,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD faceplayer checkflag FLAG_0x117 goto_eq Route104_EventScript_1ECFFC - msgbox Route104_Text_1ED96A, 4 + msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 @@ -304,44 +304,44 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD end Route104_EventScript_1ECFFC:: @ 81ECFFC - msgbox Route104_Text_1EDA0F, 4 + msgbox Route104_Text_1EDA0F, MSGBOX_DEFAULT release end Route104_EventScript_1ED006:: @ 81ED006 - msgbox Route104_Text_1ED5EC, 2 + msgbox Route104_Text_1ED5EC, MSGBOX_NPC end Route104_EventScript_1ED00F:: @ 81ED00F - msgbox Route104_Text_1ED662, 3 + msgbox Route104_Text_1ED662, MSGBOX_SIGN end Route104_EventScript_1ED018:: @ 81ED018 - msgbox Route104_Text_1EDA8C, 3 + msgbox Route104_Text_1EDA8C, MSGBOX_SIGN end Route104_EventScript_1ED021:: @ 81ED021 - msgbox Route104_Text_1EDAA1, 3 + msgbox Route104_Text_1EDAA1, MSGBOX_SIGN end Route104_EventScript_1ED02A:: @ 81ED02A - msgbox Route104_Text_1EDABC, 3 + msgbox Route104_Text_1EDABC, MSGBOX_SIGN end Route104_EventScript_1ED033:: @ 81ED033 - msgbox Route104_Text_1EDAD6, 3 + msgbox Route104_Text_1EDAD6, MSGBOX_SIGN end Route104_EventScript_1ED03C:: @ 81ED03C - msgbox Route104_Text_1EDAEF, 3 + msgbox Route104_Text_1EDAEF, MSGBOX_SIGN end Route104_EventScript_1ED045:: @ 81ED045 - msgbox Route104_Text_1ED6A2, 2 + msgbox Route104_Text_1ED6A2, MSGBOX_NPC end Route104_EventScript_1ED04E:: @ 81ED04E - msgbox Route104_Text_1ED735, 2 + msgbox Route104_Text_1ED735, MSGBOX_NPC end Route104_EventScript_1ED057:: @ 81ED057 @@ -349,7 +349,7 @@ Route104_EventScript_1ED057:: @ 81ED057 faceplayer checkflag FLAG_0x106 goto_eq Route104_EventScript_1ED086 - msgbox Route104_Text_1ED838, 4 + msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 @@ -358,12 +358,12 @@ Route104_EventScript_1ED057:: @ 81ED057 end Route104_EventScript_1ED086:: @ 81ED086 - msgbox Route104_Text_1ED8E7, 4 + msgbox Route104_Text_1ED8E7, MSGBOX_DEFAULT release end Route104_EventScript_1ED090:: @ 81ED090 - msgbox Route104_Text_1ED7A2, 2 + msgbox Route104_Text_1ED7A2, MSGBOX_NPC end Route104_EventScript_1ED099:: @ 81ED099 @@ -396,7 +396,7 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EE463, 4 + msgbox Route104_Text_1EE463, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -418,13 +418,13 @@ Route104_EventScript_1ED139:: @ 81ED139 setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - clearflag FLAG_0x2E4 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN applymovement 2, Route104_Movement_1ED35C waitmovement 0 addobject 4 - clearflag FLAG_0x2E7 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN call Route104_EventScript_2720A8 - setflag FLAG_0x2E6 + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 copyvar VAR_0x4096, VAR_0x8008 resetobjectpriority 255, MAP_ROUTE104 @@ -438,12 +438,12 @@ Route104_EventScript_1ED139:: @ 81ED139 end Route104_EventScript_1ED1B4:: @ 81ED1B4 - msgbox Route104_Text_1E9AAF, 4 + msgbox Route104_Text_1E9AAF, MSGBOX_DEFAULT releaseall end Route104_EventScript_1ED1BE:: @ 81ED1BE - msgbox Route104_Text_1E9C1D, 4 + msgbox Route104_Text_1E9C1D, MSGBOX_DEFAULT releaseall end @@ -871,17 +871,17 @@ Route104_Movement_1ED35C: @ 81ED35C step_end Route104_EventScript_1ED35F:: @ 81ED35F - trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_2954BD, Route104_Text_295509 - msgbox Route104_Text_29554E, 6 + trainerbattle_single TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509 + msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED376:: @ 81ED376 - trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_29558A, Route104_Text_2955B4 - msgbox Route104_Text_2955E8, 6 + trainerbattle_single TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4 + msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED38D:: @ 81ED38D - trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE + trainerbattle_single TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED424 @@ -889,7 +889,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED3F8 - msgbox Route104_Text_295689, 4 + msgbox Route104_Text_295689, MSGBOX_DEFAULT release end @@ -902,37 +902,31 @@ Route104_EventScript_1ED3CE:: @ 81ED3CE end Route104_EventScript_1ED3DF:: @ 81ED3DF - msgbox Route104_Text_29576B, 4 - setvar VAR_0x8004, 604 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 604 - callstd 8 + msgbox Route104_Text_29576B, MSGBOX_DEFAULT + register_matchcall TRAINER_HALEY_1 release end Route104_EventScript_1ED3F8:: @ 81ED3F8 checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED40B - msgbox Route104_Text_295689, 4 + msgbox Route104_Text_295689, MSGBOX_DEFAULT release end Route104_EventScript_1ED40B:: @ 81ED40B - msgbox Route104_Text_2956FF, 4 - setvar VAR_0x8004, 604 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 604 - callstd 8 + msgbox Route104_Text_2956FF, MSGBOX_DEFAULT + register_matchcall TRAINER_HALEY_1 release end Route104_EventScript_1ED424:: @ 81ED424 - trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_2957D7, Route104_Text_2957F0 - msgbox Route104_Text_29580C, 6 + trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_2957D7, Route104_Text_2957F0 + msgbox Route104_Text_29580C, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED43B:: @ 81ED43B - trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C + trainerbattle_single TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED4D2 @@ -940,7 +934,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED4A6 - msgbox Route104_Text_2958C1, 4 + msgbox Route104_Text_2958C1, MSGBOX_DEFAULT release end @@ -953,37 +947,31 @@ Route104_EventScript_1ED47C:: @ 81ED47C end Route104_EventScript_1ED48D:: @ 81ED48D - msgbox Route104_Text_29595A, 4 - setvar VAR_0x8004, 136 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 136 - callstd 8 + msgbox Route104_Text_29595A, MSGBOX_DEFAULT + register_matchcall TRAINER_WINSTON_1 release end Route104_EventScript_1ED4A6:: @ 81ED4A6 checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED4B9 - msgbox Route104_Text_2958C1, 4 + msgbox Route104_Text_2958C1, MSGBOX_DEFAULT release end Route104_EventScript_1ED4B9:: @ 81ED4B9 - msgbox Route104_Text_2958F8, 4 - setvar VAR_0x8004, 136 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 136 - callstd 8 + msgbox Route104_Text_2958F8, MSGBOX_DEFAULT + register_matchcall TRAINER_WINSTON_1 release end Route104_EventScript_1ED4D2:: @ 81ED4D2 - trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_2959BC, Route104_Text_2959FC - msgbox Route104_Text_295A1E, 6 + trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_2959BC, Route104_Text_2959FC + msgbox Route104_Text_295A1E, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED4E9:: @ 81ED4E9 - trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A + trainerbattle_single TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED580 @@ -991,7 +979,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED554 - msgbox Route104_Text_295AC3, 4 + msgbox Route104_Text_295AC3, MSGBOX_DEFAULT release end @@ -1004,52 +992,46 @@ Route104_EventScript_1ED52A:: @ 81ED52A end Route104_EventScript_1ED53B:: @ 81ED53B - msgbox Route104_Text_295B60, 4 - setvar VAR_0x8004, 114 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 114 - callstd 8 + msgbox Route104_Text_295B60, MSGBOX_DEFAULT + register_matchcall TRAINER_CINDY_1 release end Route104_EventScript_1ED554:: @ 81ED554 checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED567 - msgbox Route104_Text_295AC3, 4 + msgbox Route104_Text_295AC3, MSGBOX_DEFAULT release end Route104_EventScript_1ED567:: @ 81ED567 - msgbox Route104_Text_295B01, 4 - setvar VAR_0x8004, 114 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 114 - callstd 8 + msgbox Route104_Text_295B01, MSGBOX_DEFAULT + register_matchcall TRAINER_CINDY_1 release end Route104_EventScript_1ED580:: @ 81ED580 - trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_295BC8, Route104_Text_295BFA - msgbox Route104_Text_295C1F, 6 + trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_295BC8, Route104_Text_295BFA + msgbox Route104_Text_295C1F, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED597:: @ 81ED597 - trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 + trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 special GetPlayerBigGuyGirlString - msgbox Route104_Text_2952FE, 4 + msgbox Route104_Text_2952FE, MSGBOX_DEFAULT release end Route104_EventScript_1ED5B6:: @ 81ED5B6 - trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 + trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 special GetPlayerBigGuyGirlString - msgbox Route104_Text_29540D, 4 + msgbox Route104_Text_29540D, MSGBOX_DEFAULT release end Route104_EventScript_1ED5D5:: @ 81ED5D5 - trainerbattle 0, TRAINER_DARIAN, 0, Route104_Text_295C5D, Route104_Text_295CC9 - msgbox Route104_Text_295CD3, 6 + trainerbattle_single TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9 + msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE end Route104_Text_1ED5EC: @ 81ED5EC diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc index d6422508c..daee7759a 100644 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ b/data/maps/Route104_MrBrineysHouse/events.inc @@ -1,6 +1,6 @@ Route104_MrBrineysHouse_EventObjects: @ 8533AD4 - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881 + object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, FLAG_HIDE_BRINEYS_HOUSE_PEEKO Route104_MrBrineysHouse_MapWarps: @ 8533B04 warp_def 5, 8, 0, 0, MAP_ROUTE104 diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 1721fa4a0..077f9fab4 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -11,7 +11,7 @@ Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 end Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C - setflag FLAG_0x32E + setflag FLAG_HIDE_RUSBORO_CITY_RIVAL return Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 @@ -35,8 +35,8 @@ Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A setflag FLAG_0x093 - msgbox Route104_MrBrineysHouse_Text_229E70, 4 - msgbox Route104_MrBrineysHouse_Text_229E9B, 5 + msgbox Route104_MrBrineysHouse_Text_229E70, MSGBOX_DEFAULT + msgbox Route104_MrBrineysHouse_Text_229E9B, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 @@ -53,40 +53,40 @@ Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE end Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 - msgbox Route104_MrBrineysHouse_Text_22A0AD, 5 + msgbox Route104_MrBrineysHouse_Text_22A0AD, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA - msgbox Route104_MrBrineysHouse_Text_22A18F, 5 + msgbox Route104_MrBrineysHouse_Text_22A18F, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end Route104_MrBrineysHouse_EventScript_229E13:: @ 8229E13 - msgbox Route104_MrBrineysHouse_Text_22A041, 4 + msgbox Route104_MrBrineysHouse_Text_22A041, MSGBOX_DEFAULT release end Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D - msgbox Route104_MrBrineysHouse_Text_22A2C3, 4 + msgbox Route104_MrBrineysHouse_Text_22A2C3, MSGBOX_DEFAULT release end Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 - msgbox Route104_MrBrineysHouse_Text_229FE9, 4 + msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT call Route104_MrBrineysHouse_EventScript_271E95 setvar VAR_0x408E, 1 - clearflag FLAG_0x2E2 - setflag FLAG_0x2E3 - setflag FLAG_0x371 + clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 - setflag FLAG_0x32E - setflag FLAG_0x2CF + setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_ROUTE_104_RIVAL warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall @@ -97,7 +97,7 @@ Route104_MrBrineysHouse_EventScript_229E5D:: @ 8229E5D faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox Route104_MrBrineysHouse_Text_22A337, 4 + msgbox Route104_MrBrineysHouse_Text_22A337, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 5142a1282..08b5b7389 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -8,7 +8,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B checkflag FLAG_BADGE03_GET goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B - setflag FLAG_0x001 + setflag FLAG_TEMP_1 end Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B @@ -18,13 +18,13 @@ Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 lock faceplayer - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3E4 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, MSGBOX_DEFAULT checkflag FLAG_0x07F goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3B2 setflag FLAG_0x07F - msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, 5 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 compare VAR_RESULT, 0 @@ -33,7 +33,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 end Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, 5 + msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 compare VAR_RESULT, 0 @@ -42,18 +42,18 @@ Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 end Route104_PrettyPetalFlowerShop_EventScript_22A3D2:: @ 822A3D2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, MSGBOX_DEFAULT return Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB - msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, MSGBOX_DEFAULT return Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4 message gUnknown_08272A52 waitmessage pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_22A3FC - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -74,14 +74,14 @@ Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C faceplayer checkflag FLAG_0x05E goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT release end Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, MSGBOX_DEFAULT giveitem_std ITEM_WAILMER_PAIL - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT setflag FLAG_0x05E release end @@ -92,19 +92,19 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 dodailyevents checkflag FLAG_0x930 goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT random 8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_eq Route104_PrettyPetalFlowerShop_EventScript_272054 setflag FLAG_0x930 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release end Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release end diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index d11bb8cab..e22aa668c 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -3,7 +3,7 @@ Route105_EventObjects: @ 85286F0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, 1003 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, FLAG_ITEM_ROUTE_105_IRON object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0 object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 @@ -12,8 +12,8 @@ Route105_MapWarps: @ 85287B0 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE Route105_MapBGEvents: @ 85287B8 - bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, 89 - bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, 111 + bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE + bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL Route105_MapEvents:: @ 85287D0 map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 3cb6d9ae6..18fe07cbe 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -32,58 +32,55 @@ Route105_MapScript2_1EE240: @ 81EE240 .2byte 0 Route105_EventScript_1EE24A:: @ 81EE24A - trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62 - msgbox Route105_Text_295DAB, 6 + trainerbattle_single TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62 + msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE261:: @ 81EE261 - trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66 - msgbox Route105_Text_295E72, 6 + trainerbattle_single TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66 + msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE278:: @ 81EE278 - trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA - msgbox Route105_Text_295F08, 6 + trainerbattle_single TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA + msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE28F:: @ 81EE28F - trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0 - msgbox Route105_Text_295FAE, 6 + trainerbattle_single TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0 + msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2A6:: @ 81EE2A6 - trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059 - msgbox Route105_Text_296076, 6 + trainerbattle_single TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059 + msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2BD:: @ 81EE2BD - trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB - msgbox Route105_Text_2962EC, 6 + trainerbattle_single TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB + msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2D4:: @ 81EE2D4 - trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 + trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F - msgbox Route105_Text_2960FA, 4 + msgbox Route105_Text_2960FA, MSGBOX_DEFAULT release end Route105_EventScript_1EE300:: @ 81EE300 special sub_80B4808 waitmovement 0 - msgbox Route105_Text_296159, 4 - setvar VAR_0x8004, 737 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 737 - callstd 8 + msgbox Route105_Text_296159, MSGBOX_DEFAULT + register_matchcall TRAINER_ANDRES_1 release end Route105_EventScript_1EE31F:: @ 81EE31F - trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD - msgbox Route105_Text_2961FE, 6 + trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD + msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE end Route104_Text_1EE336: @ 81EE336 diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 11541f2bf..9ff0f41dd 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -3,15 +3,15 @@ Route106_EventObjects: @ 85287E4 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, 1004 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, FLAG_ITEM_ROUTE_106_PROTEIN Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents: @ 8528864 - bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, 63 - bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, 46 - bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, 47 + bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL + bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST + bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A Route106_MapEvents:: @ 8528894 diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index fdfff0587..533f65254 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -2,47 +2,44 @@ Route106_MapScripts:: @ 81EE489 .byte 0 Route106_EventScript_1EE48A:: @ 81EE48A - msgbox Route106_Text_1EE53A, 3 + msgbox Route106_Text_1EE53A, MSGBOX_SIGN end Route106_EventScript_1EE493:: @ 81EE493 - trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_2965BB, Route106_Text_2965FD - msgbox Route106_Text_296608, 6 + trainerbattle_single TRAINER_DOUGLAS, Route106_Text_2965BB, Route106_Text_2965FD + msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE4AA:: @ 81EE4AA - trainerbattle 0, TRAINER_KYLA, 0, Route106_Text_296628, Route106_Text_296674 - msgbox Route106_Text_29669E, 6 + trainerbattle_single TRAINER_KYLA, Route106_Text_296628, Route106_Text_296674 + msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE4C1:: @ 81EE4C1 - trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED + trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route106_EventScript_1EE50C - msgbox Route106_Text_29638C, 4 + msgbox Route106_Text_29638C, MSGBOX_DEFAULT release end Route106_EventScript_1EE4ED:: @ 81EE4ED special sub_80B4808 waitmovement 0 - msgbox Route106_Text_2963E3, 4 - setvar VAR_0x8004, 339 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 339 - callstd 8 + msgbox Route106_Text_2963E3, MSGBOX_DEFAULT + register_matchcall TRAINER_ELLIOT_1 release end Route106_EventScript_1EE50C:: @ 81EE50C - trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_29642E, Route106_Text_296477 - msgbox Route106_Text_296493, 6 + trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_29642E, Route106_Text_296477 + msgbox Route106_Text_296493, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE523:: @ 81EE523 - trainerbattle 0, TRAINER_NED, 0, Route106_Text_2964D4, Route106_Text_296553 - msgbox Route106_Text_296588, 6 + trainerbattle_single TRAINER_NED, Route106_Text_2964D4, Route106_Text_296553 + msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE end Route106_Text_1EE53A: @ 81EE53A diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 2c8364592..5f840b3fb 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -2,57 +2,54 @@ Route107_MapScripts:: @ 81EE594 .byte 0 Route107_EventScript_1EE595:: @ 81EE595 - trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_2966E5, Route107_Text_29672F - msgbox Route107_Text_29675B, 6 + trainerbattle_single TRAINER_DARRIN, Route107_Text_2966E5, Route107_Text_29672F + msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE5AC:: @ 81EE5AC - trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 + trainerbattle_single TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route107_EventScript_1EE5F7 - msgbox Route107_Text_2967FF, 4 + msgbox Route107_Text_2967FF, MSGBOX_DEFAULT release end Route107_EventScript_1EE5D8:: @ 81EE5D8 special sub_80B4808 waitmovement 0 - msgbox Route107_Text_29685A, 4 - setvar VAR_0x8004, 155 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 155 - callstd 8 + msgbox Route107_Text_29685A, MSGBOX_DEFAULT + register_matchcall TRAINER_TONY_1 release end Route107_EventScript_1EE5F7:: @ 81EE5F7 - trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_296897, Route107_Text_2968D5 - msgbox Route107_Text_296923, 6 + trainerbattle_rematch TRAINER_TONY_1, Route107_Text_296897, Route107_Text_2968D5 + msgbox Route107_Text_296923, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE60E:: @ 81EE60E - trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_296974, Route107_Text_29699E - msgbox Route107_Text_2969AB, 6 + trainerbattle_single TRAINER_DENISE, Route107_Text_296974, Route107_Text_29699E + msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE625:: @ 81EE625 - trainerbattle 0, TRAINER_BETH, 0, Route107_Text_2969E4, Route107_Text_296A17 - msgbox Route107_Text_296A35, 6 + trainerbattle_single TRAINER_BETH, Route107_Text_2969E4, Route107_Text_296A17 + msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE63C:: @ 81EE63C - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E - msgbox Route107_Text_296ADC, 6 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E + msgbox Route107_Text_296ADC, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE657:: @ 81EE657 - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 - msgbox Route107_Text_296BE1, 6 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 + msgbox Route107_Text_296BE1, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE672:: @ 81EE672 - trainerbattle 0, TRAINER_CAMRON, 0, Route107_Text_296C6F, Route107_Text_296CAD - msgbox Route107_Text_296CC0, 6 + trainerbattle_single TRAINER_CAMRON, Route107_Text_296C6F, Route107_Text_296CAD + msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index a92fe680d..094eb0bc7 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -5,13 +5,13 @@ Route108_EventObjects: @ 8528964 object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, FLAG_ITEM_ROUTE_108_STAR_PIECE Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents: @ 8528A14 - bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, 86 + bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY Route108_MapEvents:: @ 8528A20 map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 25657c5a4..73ddb031d 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -2,52 +2,49 @@ Route108_MapScripts:: @ 81EE689 .byte 0 Route108_EventScript_1EE68A:: @ 81EE68A - trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_296D10, Route108_Text_296D3C - msgbox Route108_Text_296D6E, 6 + trainerbattle_single TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C + msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6A1:: @ 81EE6A1 - trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_296DAF, Route108_Text_296DEA - msgbox Route108_Text_296E03, 6 + trainerbattle_single TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA + msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6B8:: @ 81EE6B8 - trainerbattle 0, TRAINER_TARA, 0, Route108_Text_296E33, Route108_Text_296E71 - msgbox Route108_Text_296E7A, 6 + trainerbattle_single TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71 + msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6CF:: @ 81EE6CF - trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_296EC7, Route108_Text_296EFC - msgbox Route108_Text_296F2A, 6 + trainerbattle_single TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC + msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6E6:: @ 81EE6E6 - trainerbattle 0, TRAINER_CAROLINA, 0, Route108_Text_297094, Route108_Text_2970D7 - msgbox Route108_Text_2970F0, 6 + trainerbattle_single TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7 + msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6FD:: @ 81EE6FD - trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 + trainerbattle_single TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route108_EventScript_1EE748 - msgbox Route108_Text_296FB0, 4 + msgbox Route108_Text_296FB0, MSGBOX_DEFAULT release end Route108_EventScript_1EE729:: @ 81EE729 special sub_80B4808 waitmovement 0 - msgbox Route108_Text_296FD8, 4 - setvar VAR_0x8004, 740 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 740 - callstd 8 + msgbox Route108_Text_296FD8, MSGBOX_DEFAULT + register_matchcall TRAINER_CORY_1 release end Route108_EventScript_1EE748:: @ 81EE748 - trainerbattle 5, TRAINER_CORY_1, 0, Route108_Text_297011, Route108_Text_297036 - msgbox Route108_Text_297059, 6 + trainerbattle_rematch TRAINER_CORY_1, Route108_Text_297011, Route108_Text_297036 + msgbox Route108_Text_297059, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index e74aa5dfa..322055874 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -1,6 +1,6 @@ Route109_EventObjects: @ 8528A34 - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 744 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, 741 + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, FLAG_HIDE_ROUTE_108_MR_BRINEY object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0 object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0 @@ -8,7 +8,7 @@ Route109_EventObjects: @ 8528A34 object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0 object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0 object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, FLAG_ITEM_ROUTE_109_PP_UP object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0 object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0 object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0 @@ -21,7 +21,7 @@ Route109_EventObjects: @ 8528A34 object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0 object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0 object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, 1140 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_0x474 object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 Route109_MapWarps: @ 8528C74 @@ -30,12 +30,12 @@ Route109_MapWarps: @ 8528C74 Route109_MapBGEvents: @ 8528C7C bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34 - bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, 50 - bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, 52 - bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, 51 - bg_hidden_item_event 28, 20, 3, ITEM_ETHER, 64 - bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, 90 - bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, 91 + bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE + bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1 + bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL + bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_109_ETHER + bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 + bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 Route109_MapEvents:: @ 8528CDC map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 84f7b7c34..050dad358 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -44,16 +44,16 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 applymovement 255, Route109_Movement_1EE900 waitmovement 0 addobject 4 - clearflag FLAG_0x2E7 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, MAP_DEWFORD_TOWN, 0 applymovement 2, Route109_Movement_1EE90D waitmovement 0 - clearflag FLAG_0x2E4 - setflag FLAG_0x2E8 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT hideobjectat 1, MAP_ROUTE109 - msgbox Route109_Text_1E9C1D, 4 + msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT closemessage copyvar VAR_0x4096, VAR_0x8008 resetobjectpriority 255, MAP_ROUTE109 @@ -279,7 +279,7 @@ Route109_EventScript_1EE910:: @ 81EE910 Route109_EventScript_1EE921:: @ 81EE921 message Route109_Text_1EEC96 - msgbox Route109_Text_1EEC96, 5 + msgbox Route109_Text_1EEC96, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route109_EventScript_1EE981 goto Route109_EventScript_1EE972 @@ -296,29 +296,29 @@ Route109_EventScript_1EE93F:: @ 81EE93F end Route109_EventScript_1EE972:: @ 81EE972 - msgbox Route109_Text_1EED06, 4 + msgbox Route109_Text_1EED06, MSGBOX_DEFAULT closemessage goto Route109_EventScript_1EE760 end Route109_EventScript_1EE981:: @ 81EE981 - msgbox Route109_Text_1EED5E, 4 + msgbox Route109_Text_1EED5E, MSGBOX_DEFAULT release end Route109_EventScript_1EE98B:: @ 81EE98B - msgbox Route109_Text_1EEE72, 4 + msgbox Route109_Text_1EEE72, MSGBOX_DEFAULT release end Route109_EventScript_1EE995:: @ 81EE995 - msgbox Route109_Text_1EEEB4, 2 + msgbox Route109_Text_1EEEB4, MSGBOX_NPC end Route109_EventScript_1EE99E:: @ 81EE99E lock faceplayer - msgbox Route109_Text_1EEFB0, 4 + msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 @@ -331,7 +331,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 special GetPlayerBigGuyGirlString checkflag FLAG_0x118 goto_eq Route109_EventScript_1EE9F2 - msgbox Route109_Text_1EEFDE, 4 + msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 goto_eq Route109_EventScript_272054 @@ -343,18 +343,18 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 end Route109_EventScript_1EE9F2:: @ 81EE9F2 - msgbox Route109_Text_1EEFF1, 4 + msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 release end Route109_EventScript_1EEA06:: @ 81EEA06 - msgbox Route109_Text_1EEF08, 2 + msgbox Route109_Text_1EEF08, MSGBOX_NPC end Route109_EventScript_1EEA0F:: @ 81EEA0F - msgbox Route109_Text_1EF080, 2 + msgbox Route109_Text_1EF080, MSGBOX_NPC end Route109_EventScript_1EEA18:: @ 81EEA18 @@ -362,127 +362,121 @@ Route109_EventScript_1EEA18:: @ 81EEA18 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox Route109_Text_1EF173, 4 + msgbox Route109_Text_1EF173, MSGBOX_DEFAULT waitmoncry release end Route109_EventScript_1EEA2B:: @ 81EEA2B - msgbox Route109_Text_1EF185, 3 + msgbox Route109_Text_1EF185, MSGBOX_SIGN end Route109_EventScript_1EEA34:: @ 81EEA34 - msgbox Route109_Text_1EF1D5, 3 + msgbox Route109_Text_1EF1D5, MSGBOX_SIGN end Route109_EventScript_1EEA3D:: @ 81EEA3D - trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_297140, Route109_Text_29717D - msgbox Route109_Text_297191, 6 + trainerbattle_single TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D + msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA54:: @ 81EEA54 - trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_2971D1, Route109_Text_2971FD - msgbox Route109_Text_29720F, 6 + trainerbattle_single TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD + msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA6B:: @ 81EEA6B - trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_297235, Route109_Text_29727B - msgbox Route109_Text_29728C, 6 + trainerbattle_single TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B + msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA82:: @ 81EEA82 - trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_2972B3, Route109_Text_2972CE - msgbox Route109_Text_2972ED, 6 + trainerbattle_single TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE + msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA99:: @ 81EEA99 - trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 + trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEAE4 - msgbox Route109_Text_297380, 4 + msgbox Route109_Text_297380, MSGBOX_DEFAULT release end Route109_EventScript_1EEAC5:: @ 81EEAC5 special sub_80B4808 waitmovement 0 - msgbox Route109_Text_2973C1, 4 - setvar VAR_0x8004, 64 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 64 - callstd 8 + msgbox Route109_Text_2973C1, MSGBOX_DEFAULT + register_matchcall TRAINER_RICKY_1 release end Route109_EventScript_1EEAE4:: @ 81EEAE4 - trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_2973FF, Route109_Text_297437 - msgbox Route109_Text_297458, 6 + trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_2973FF, Route109_Text_297437 + msgbox Route109_Text_297458, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEAFB:: @ 81EEAFB - trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 + trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEB46 - msgbox Route109_Text_2974D6, 4 + msgbox Route109_Text_2974D6, MSGBOX_DEFAULT release end Route109_EventScript_1EEB27:: @ 81EEB27 special sub_80B4808 waitmovement 0 - msgbox Route109_Text_297520, 4 - setvar VAR_0x8004, 57 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 57 - callstd 8 + msgbox Route109_Text_297520, MSGBOX_DEFAULT + register_matchcall TRAINER_LOLA_1 release end Route109_EventScript_1EEB46:: @ 81EEB46 - trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_297538, Route109_Text_297576 - msgbox Route109_Text_29757D, 6 + trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_297538, Route109_Text_297576 + msgbox Route109_Text_29757D, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB5D:: @ 81EEB5D - trainerbattle 0, TRAINER_AUSTINA, 0, Route109_Text_2975C0, Route109_Text_297601 - msgbox Route109_Text_29762A, 6 + trainerbattle_single TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601 + msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB74:: @ 81EEB74 - trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_297667, Route109_Text_297691 - msgbox Route109_Text_2976A4, 6 + trainerbattle_single TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691 + msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB8B:: @ 81EEB8B - trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_2976C5, Route109_Text_2976FC - msgbox Route109_Text_297715, 6 + trainerbattle_single TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC + msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBA2:: @ 81EEBA2 - trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D - msgbox Route109_Text_2977C7, 6 + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D + msgbox Route109_Text_2977C7, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBBD:: @ 81EEBBD - trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E - msgbox Route109_Text_2978F1, 6 + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E + msgbox Route109_Text_2978F1, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBD8:: @ 81EEBD8 - trainerbattle 0, TRAINER_CHANDLER, 0, Route109_Text_29798A, Route109_Text_2979AE - msgbox Route109_Text_2979BF, 6 + trainerbattle_single TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE + msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBEF:: @ 81EEBEF - trainerbattle 0, TRAINER_HAILEY, 0, Route109_Text_2979EC, Route109_Text_297A15 - msgbox Route109_Text_297A40, 6 + trainerbattle_single TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15 + msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEC06:: @ 81EEC06 - trainerbattle 0, TRAINER_ELIJAH, 0, Route109_Text_297A82, Route109_Text_297AC7 - msgbox Route109_Text_297AE5, 6 + trainerbattle_single TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7 + msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE end DewfordTown_Text_1EEC1D: @ 81EEC1D diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index e70f91ca8..323dc2bf8 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -13,20 +13,20 @@ Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE goto_eq Route109_SeashoreHouse_EventScript_269460 checkflag FLAG_0x08D goto_eq Route109_SeashoreHouse_EventScript_269432 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_eq Route109_SeashoreHouse_EventScript_269428 - msgbox Route109_SeashoreHouse_Text_269555, 4 - setflag FLAG_0x002 + msgbox Route109_SeashoreHouse_Text_269555, MSGBOX_DEFAULT + setflag FLAG_TEMP_2 release end Route109_SeashoreHouse_EventScript_269428:: @ 8269428 - msgbox Route109_SeashoreHouse_Text_269635, 4 + msgbox Route109_SeashoreHouse_Text_269635, MSGBOX_DEFAULT release end Route109_SeashoreHouse_EventScript_269432:: @ 8269432 - msgbox Route109_SeashoreHouse_Text_269685, 4 + msgbox Route109_SeashoreHouse_Text_269685, MSGBOX_DEFAULT giveitem_std ITEM_SODA_POP, 6 compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_269456 @@ -35,16 +35,16 @@ Route109_SeashoreHouse_EventScript_269432:: @ 8269432 end Route109_SeashoreHouse_EventScript_269456:: @ 8269456 - msgbox Route109_SeashoreHouse_Text_26973A, 4 + msgbox Route109_SeashoreHouse_Text_26973A, MSGBOX_DEFAULT release end Route109_SeashoreHouse_EventScript_269460:: @ 8269460 showmoneybox 0, 0, 0 - msgbox Route109_SeashoreHouse_Text_26977E, 5 + msgbox Route109_SeashoreHouse_Text_26977E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route109_SeashoreHouse_EventScript_269484 - msgbox Route109_SeashoreHouse_Text_2697EF, 4 + msgbox Route109_SeashoreHouse_Text_2697EF, MSGBOX_DEFAULT hidemoneybox nop nop @@ -58,7 +58,7 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484 checkitemspace ITEM_SODA_POP, 1 compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_2694D5 - msgbox Route109_SeashoreHouse_Text_2697C8, 4 + msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT takemoney 0x12c, 0 updatemoneybox 0, 0 nop @@ -70,7 +70,7 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484 end Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 - msgbox Route109_SeashoreHouse_Text_2697D5, 4 + msgbox Route109_SeashoreHouse_Text_2697D5, MSGBOX_DEFAULT hidemoneybox nop nop @@ -78,7 +78,7 @@ Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 end Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT hidemoneybox nop nop @@ -86,18 +86,18 @@ Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 end Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2 - trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_26989D, 6 + trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 + msgbox Route109_SeashoreHouse_Text_26989D, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD - trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_269953, 6 + trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 + msgbox Route109_SeashoreHouse_Text_269953, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_269518:: @ 8269518 - trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_2699DF, 6 + trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 + msgbox Route109_SeashoreHouse_Text_2699DF, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_269533:: @ 8269533 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index c767f91d3..221dd6f6c 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -17,24 +17,24 @@ Route110_EventObjects: @ 8528CF0 object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 16, BerryTreeScript, 0 object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 17, BerryTreeScript, 0 object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 18, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D81, 1007 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, 1006 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D81, FLAG_ITEM_ROUTE_110_DIRE_HIT + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, FLAG_ITEM_ROUTE_109_RARE_CANDY object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0 - object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900 - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900 - object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 900 + object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2AA, FLAG_HIDE_ROUTE_110_TEAM_AQUA + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, FLAG_HIDE_ROUTE_110_TEAM_AQUA + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, FLAG_HIDE_ROUTE_110_TEAM_AQUA + object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, FLAG_HIDE_ROUTE_110_TEAM_AQUA + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_TEAM_AQUA object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 1, 1, 2, Route110_EventScript_1EF499, 0 - object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, 919 - object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 922 + object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_1 + object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_2 object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_1EF604, 0 object_event 31, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0 object_event 32, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 76, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0 object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0 object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 36, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 3, Route110_EventScript_1EF633, 0 - object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, 1141 - object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 837 + object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, FLAG_ITEM_ROUTE_110_ELIXIR + object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_BIRCH Route110_MapWarps: @ 8529050 warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE @@ -68,10 +68,10 @@ Route110_MapBGEvents: @ 8529110 bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF380 bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF389 bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF392 - bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, 54 - bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, 53 - bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, 65 - bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, 55 + bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE + bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL + bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL + bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A Route110_MapEvents:: @ 85291DC diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index fe07de8dc..9ff7667c5 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -31,7 +31,7 @@ Route110_EventScript_1EF2A1:: @ 81EF2A1 Route110_EventScript_1EF2AA:: @ 81EF2AA lock faceplayer - msgbox Route110_Text_1EFB5D, 4 + msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release @@ -40,7 +40,7 @@ Route110_EventScript_1EF2AA:: @ 81EF2AA Route110_EventScript_1EF2C0:: @ 81EF2C0 lock faceplayer - msgbox Route110_Text_1EFB93, 4 + msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release @@ -49,7 +49,7 @@ Route110_EventScript_1EF2C0:: @ 81EF2C0 Route110_EventScript_1EF2D6:: @ 81EF2D6 lock faceplayer - msgbox Route110_Text_1EFBCA, 4 + msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release @@ -58,74 +58,74 @@ Route110_EventScript_1EF2D6:: @ 81EF2D6 Route110_EventScript_1EF2EC:: @ 81EF2EC lock faceplayer - msgbox Route110_Text_1EFC0D, 4 + msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release end Route110_EventScript_1EF302:: @ 81EF302 - msgbox Route110_Text_1EFFC3, 2 + msgbox Route110_Text_1EFFC3, MSGBOX_NPC end Route110_EventScript_1EF30B:: @ 81EF30B - msgbox Route110_Text_1F0006, 2 + msgbox Route110_Text_1F0006, MSGBOX_NPC end Route110_EventScript_1EF314:: @ 81EF314 - msgbox Route110_Text_1F006A, 2 + msgbox Route110_Text_1F006A, MSGBOX_NPC end Route110_EventScript_1EF31D:: @ 81EF31D - msgbox Route110_Text_1F0261, 2 + msgbox Route110_Text_1F0261, MSGBOX_NPC end Route110_EventScript_1EF326:: @ 81EF326 - msgbox Route110_Text_1F02CA, 2 + msgbox Route110_Text_1F02CA, MSGBOX_NPC end Route110_EventScript_1EF32F:: @ 81EF32F - msgbox Route110_Text_1F030E, 2 + msgbox Route110_Text_1F030E, MSGBOX_NPC end Route110_EventScript_1EF338:: @ 81EF338 - msgbox Route110_Text_1F0390, 2 + msgbox Route110_Text_1F0390, MSGBOX_NPC end Route110_EventScript_1EF341:: @ 81EF341 - msgbox Route110_Text_1F0812, 3 + msgbox Route110_Text_1F0812, MSGBOX_SIGN end Route110_EventScript_1EF34A:: @ 81EF34A - msgbox Route110_Text_1F082D, 3 + msgbox Route110_Text_1F082D, MSGBOX_SIGN end Route110_EventScript_1EF353:: @ 81EF353 - msgbox Route110_Text_1F0842, 3 + msgbox Route110_Text_1F0842, MSGBOX_SIGN end Route110_EventScript_1EF35C:: @ 81EF35C - msgbox Route110_Text_1F08CD, 3 + msgbox Route110_Text_1F08CD, MSGBOX_SIGN end Route110_EventScript_1EF365:: @ 81EF365 - msgbox Route110_Text_1F08E3, 3 + msgbox Route110_Text_1F08E3, MSGBOX_SIGN end Route110_EventScript_1EF36E:: @ 81EF36E - msgbox Route110_Text_1F08F3, 3 + msgbox Route110_Text_1F08F3, MSGBOX_SIGN end Route110_EventScript_1EF377:: @ 81EF377 - msgbox Route110_Text_1F090D, 3 + msgbox Route110_Text_1F090D, MSGBOX_SIGN end Route110_EventScript_1EF380:: @ 81EF380 - msgbox Route110_Text_1F0992, 3 + msgbox Route110_Text_1F0992, MSGBOX_SIGN end Route110_EventScript_1EF389:: @ 81EF389 - msgbox Route110_Text_1F09DB, 3 + msgbox Route110_Text_1F09DB, MSGBOX_SIGN end Route110_EventScript_1EF392:: @ 81EF392 @@ -133,12 +133,12 @@ Route110_EventScript_1EF392:: @ 81EF392 specialvar VAR_RESULT, GetRecordedCyclingRoadResults compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF3AD - msgbox Route110_Text_1F0A1E, 4 + msgbox Route110_Text_1F0A1E, MSGBOX_DEFAULT releaseall end Route110_EventScript_1EF3AD:: @ 81EF3AD - msgbox Route110_Text_1F0A5E, 4 + msgbox Route110_Text_1F0A5E, MSGBOX_DEFAULT releaseall end @@ -150,171 +150,159 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7 goto_eq Route110_EventScript_1EF3E8 compare VAR_CYCLING_CHALLENGE_STATE, 0 goto_eq Route110_EventScript_1EF3DE - msgbox Route110_Text_1F06FB, 4 + msgbox Route110_Text_1F06FB, MSGBOX_DEFAULT release end Route110_EventScript_1EF3DE:: @ 81EF3DE - msgbox Route110_Text_1F0661, 4 + msgbox Route110_Text_1F0661, MSGBOX_DEFAULT release end Route110_EventScript_1EF3E8:: @ 81EF3E8 - msgbox Route110_Text_1F0755, 4 + msgbox Route110_Text_1F0755, MSGBOX_DEFAULT release end Route110_EventScript_1EF3F2:: @ 81EF3F2 - trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064 - msgbox Route110_Text_29808A, 6 + trainerbattle_single TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064 + msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF409:: @ 81EF409 - trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5 - msgbox Route110_Text_2980F8, 6 + trainerbattle_single TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5 + msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF420:: @ 81EF420 - trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C + trainerbattle_single TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF46B - msgbox Route110_Text_2981B3, 4 + msgbox Route110_Text_2981B3, MSGBOX_DEFAULT release end Route110_EventScript_1EF44C:: @ 81EF44C special sub_80B4808 waitmovement 0 - msgbox Route110_Text_298201, 4 - setvar VAR_0x8004, 512 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 512 - callstd 8 + msgbox Route110_Text_298201, MSGBOX_DEFAULT + register_matchcall TRAINER_EDWIN_1 release end Route110_EventScript_1EF46B:: @ 81EF46B - trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288 - msgbox Route110_Text_2982A2, 6 + trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_298232, Route110_Text_298288 + msgbox Route110_Text_2982A2, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF482:: @ 81EF482 - trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5 - msgbox Route110_Text_298303, 6 + trainerbattle_single TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5 + msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF499:: @ 81EF499 - trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77 - msgbox Route110_Text_297B8F, 6 + trainerbattle_single TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77 + msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF4B0:: @ 81EF4B0 - trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F - msgbox Route110_Text_297C1F, 6 + trainerbattle_single TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F + msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF4C7:: @ 81EF4C7 - trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 + trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF512 - msgbox Route110_Text_297CB4, 4 + msgbox Route110_Text_297CB4, MSGBOX_DEFAULT release end Route110_EventScript_1EF4F3:: @ 81EF4F3 special sub_80B4808 waitmovement 0 - msgbox Route110_Text_297CFE, 4 - setvar VAR_0x8004, 353 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 353 - callstd 8 + msgbox Route110_Text_297CFE, MSGBOX_DEFAULT + register_matchcall TRAINER_BENJAMIN_1 release end Route110_EventScript_1EF512:: @ 81EF512 - trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E - msgbox Route110_Text_297DB0, 6 + trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_297D4B, Route110_Text_297D8E + msgbox Route110_Text_297DB0, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF529:: @ 81EF529 - trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0 - msgbox Route110_Text_297FF1, 6 + trainerbattle_single TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0 + msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF540:: @ 81EF540 - trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C + trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF58B - msgbox Route110_Text_297E88, 4 + msgbox Route110_Text_297E88, MSGBOX_DEFAULT release end Route110_EventScript_1EF56C:: @ 81EF56C special sub_80B4808 waitmovement 0 - msgbox Route110_Text_297ECD, 4 - setvar VAR_0x8004, 358 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 358 - callstd 8 + msgbox Route110_Text_297ECD, MSGBOX_DEFAULT + register_matchcall TRAINER_ABIGAIL_1 release end Route110_EventScript_1EF58B:: @ 81EF58B - trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37 - msgbox Route110_Text_297F58, 6 + trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_297F09, Route110_Text_297F37 + msgbox Route110_Text_297F58, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF5A2:: @ 81EF5A2 - trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE + trainerbattle_single TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF5ED - msgbox Route110_Text_2983A2, 4 + msgbox Route110_Text_2983A2, MSGBOX_DEFAULT release end Route110_EventScript_1EF5CE:: @ 81EF5CE special sub_80B4808 waitmovement 0 - msgbox Route110_Text_2983EE, 4 - setvar VAR_0x8004, 302 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 302 - callstd 8 + msgbox Route110_Text_2983EE, MSGBOX_DEFAULT + register_matchcall TRAINER_ISABEL_1 release end Route110_EventScript_1EF5ED:: @ 81EF5ED - trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF - msgbox Route110_Text_2984C8, 6 + trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_298466, Route110_Text_2984AF + msgbox Route110_Text_2984C8, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF604:: @ 81EF604 - trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559 - msgbox Route110_Text_298579, 6 + trainerbattle_single TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559 + msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF61B:: @ 81EF61B end Route110_EventScript_1EF61C:: @ 81EF61C - trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735 - msgbox Route110_Text_298755, 6 + trainerbattle_single TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735 + msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF633:: @ 81EF633 - trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686 - msgbox Route110_Text_2986A9, 6 + trainerbattle_single TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686 + msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF64A:: @ 81EF64A - trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9 - msgbox Route110_Text_298612, 6 + trainerbattle_single TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9 + msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF661:: @ 81EF661 @@ -327,7 +315,7 @@ Route110_EventScript_1EF661:: @ 81EF661 Route110_EventScript_1EF673:: @ 81EF673 special FinishCyclingRoadChallenge - msgbox Route110_Text_1F03FF, 4 + msgbox Route110_Text_1F03FF, MSGBOX_DEFAULT switch VAR_RESULT case 10, Route110_EventScript_1EF6FD case 9, Route110_EventScript_1EF70B @@ -343,27 +331,27 @@ Route110_EventScript_1EF673:: @ 81EF673 end Route110_EventScript_1EF6FD:: @ 81EF6FD - msgbox Route110_Text_1F0431, 4 + msgbox Route110_Text_1F0431, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF70B:: @ 81EF70B - msgbox Route110_Text_1F04A4, 4 + msgbox Route110_Text_1F04A4, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF719:: @ 81EF719 - msgbox Route110_Text_1F0500, 4 + msgbox Route110_Text_1F0500, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF727:: @ 81EF727 - msgbox Route110_Text_1F0567, 4 + msgbox Route110_Text_1F0567, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF735:: @ 81EF735 - msgbox Route110_Text_1F05CE, 4 + msgbox Route110_Text_1F05CE, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end @@ -425,7 +413,7 @@ Route110_EventScript_1EF7E6:: @ 81EF7E6 return Route110_EventScript_1EF7EB:: @ 81EF7EB - msgbox Route110_Text_1EFC48, 4 + msgbox Route110_Text_1EFC48, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route110_EventScript_1EF81A case 1, Route110_EventScript_1EF82A @@ -433,29 +421,29 @@ Route110_EventScript_1EF7EB:: @ 81EF7EB end Route110_EventScript_1EF81A:: @ 81EF81A - trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_1EFCCB + trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_1EFCCB goto Route110_EventScript_1EF84A end Route110_EventScript_1EF82A:: @ 81EF82A - trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_1EFCCB + trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_1EFCCB goto Route110_EventScript_1EF84A end Route110_EventScript_1EF83A:: @ 81EF83A - trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_1EFCCB + trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_1EFCCB goto Route110_EventScript_1EF84A end Route110_EventScript_1EF84A:: @ 81EF84A - msgbox Route110_Text_1EFCF1, 4 + msgbox Route110_Text_1EFCF1, MSGBOX_DEFAULT call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFD58, 4 + msgbox Route110_Text_1EFD58, MSGBOX_DEFAULT goto Route110_EventScript_1EF8EC end Route110_EventScript_1EF865:: @ 81EF865 - msgbox Route110_Text_1EFE3F, 4 + msgbox Route110_Text_1EFE3F, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route110_EventScript_1EF894 case 1, Route110_EventScript_1EF8A4 @@ -463,24 +451,24 @@ Route110_EventScript_1EF865:: @ 81EF865 end Route110_EventScript_1EF894:: @ 81EF894 - trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_1EFEB4 + trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_1EFEB4 goto Route110_EventScript_1EF8C4 end Route110_EventScript_1EF8A4:: @ 81EF8A4 - trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_1EFEB4 + trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_1EFEB4 goto Route110_EventScript_1EF8C4 end Route110_EventScript_1EF8B4:: @ 81EF8B4 - trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_1EFEB4 + trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_1EFEB4 goto Route110_EventScript_1EF8C4 end Route110_EventScript_1EF8C4:: @ 81EF8C4 - msgbox Route110_Text_1EFECD, 4 + msgbox Route110_Text_1EFECD, MSGBOX_DEFAULT call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFF1C, 4 + msgbox Route110_Text_1EFF1C, MSGBOX_DEFAULT goto Route110_EventScript_1EF8EC end @@ -640,7 +628,7 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 call_if 1, Route110_EventScript_1EFAEE compare VAR_0x8008, 4 call_if 1, Route110_EventScript_1EFAF9 - msgbox Route110_Text_1F0AB5, 4 + msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 applymovement 36, Route110_Movement_2725A4 @@ -652,16 +640,16 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Route110_Movement_2725AA waitmovement 0 delay 30 - msgbox Route110_Text_1F0AFF, 4 + msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route110_Text_1F0C0C, 4 + msgbox Route110_Text_1F0C0C, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x119 - msgbox Route110_Text_1F0C33, 4 + msgbox Route110_Text_1F0C33, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EFB04 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index cbb5070a2..571cda664 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -4,7 +4,7 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77 Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78:: @ 826EA78 lock faceplayer - msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, 4 + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, MSGBOX_DEFAULT release end @@ -19,7 +19,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F - msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, 4 + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, MSGBOX_DEFAULT closemessage applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 waitmovement 0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index b38bbf896..7bec38fa6 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -16,7 +16,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4 lock faceplayer - msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, 4 + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, MSGBOX_DEFAULT release end @@ -37,7 +37,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 return Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC - msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, 4 + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, MSGBOX_DEFAULT closemessage applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 waitmovement 0 diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 44539d4cc..1e371bbbe 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd_EventObjects: @ 853DEFC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, FLAG_HIDE_TRICK_HOUSE_END_MAN Route110_TrickHouseEnd_MapWarps: @ 853DF14 warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 @@ -9,7 +9,7 @@ Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24 coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041 Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 - bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, 1 + bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET Route110_TrickHouseEnd_MapEvents:: @ 853DF40 map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 4e15ddbe7..8d6da9a8c 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -43,7 +43,7 @@ Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 lock faceplayer - msgbox Route110_TrickHouseEnd_Text_26B08D, 4 + msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 switch VAR_0x4044 case 0, Route110_TrickHouseEnd_EventScript_26AD84 @@ -57,98 +57,98 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 end Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 - msgbox Route110_TrickHouseEnd_Text_26B0BC, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 - msgbox Route110_TrickHouseEnd_Text_26B13B, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC - msgbox Route110_TrickHouseEnd_Text_26B1AD, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 - msgbox Route110_TrickHouseEnd_Text_26B223, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 - msgbox Route110_TrickHouseEnd_Text_26B293, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_TM12 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 - msgbox Route110_TrickHouseEnd_Text_26B315, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_MAGNET compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC - msgbox Route110_TrickHouseEnd_Text_26B365, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 - msgbox Route110_TrickHouseEnd_Text_26B3AB, 4 + msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT closemessage compare VAR_FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_26B015 @@ -159,17 +159,17 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 compare VAR_FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_26B036 delay 30 - msgbox Route110_TrickHouseEnd_Text_26B3FA, 4 + msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT closemessage applymovement 1, Route110_TrickHouseEnd_Movement_27259E waitmovement 0 delay 30 - msgbox Route110_TrickHouseEnd_Text_26B485, 4 + msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 call Route110_TrickHouseEnd_EventScript_26AFA5 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26B002 - msgbox Route110_TrickHouseEnd_Text_26B69A, 4 + msgbox Route110_TrickHouseEnd_Text_26B69A, MSGBOX_DEFAULT call Route110_TrickHouseEnd_EventScript_26AFCF special ResetTrickHouseEndRoomFlag release @@ -201,13 +201,13 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF call Route110_TrickHouseEnd_EventScript_27205E - msgbox Route110_TrickHouseEnd_Text_26B760, 4 + msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT setvar VAR_0x40C1, 1 return Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 call Route110_TrickHouseEnd_EventScript_272071 - msgbox Route110_TrickHouseEnd_Text_26B615, 4 + msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT setvar VAR_0x40C1, 1 return @@ -243,7 +243,7 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 playse SE_W153 applymovement 255, Route110_TrickHouseEnd_Movement_2725AA waitmovement 0 - msgbox Route110_TrickHouseEnd_Text_26B8BD, 4 + msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage applymovement 255, Route110_TrickHouseEnd_Movement_26B089 waitmovement 0 diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index 5255e5acf..ff83f0bdb 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance_EventObjects: @ 853DE6C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN Route110_TrickHouseEntrance_MapWarps: @ 853DE84 warp_def 5, 7, 3, 1, MAP_ROUTE110 diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 859a28d6a..e82c052fc 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -214,7 +214,7 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 delay 20 compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_269E48 - msgbox Route110_TrickHouseEntrance_Text_26A78C, 4 + msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT closemessage delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_269E36 @@ -271,35 +271,35 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E end Route110_TrickHouseEntrance_EventScript_269DEE:: @ 8269DEE - msgbox Route110_TrickHouseEntrance_Text_26A48A, 4 + msgbox Route110_TrickHouseEntrance_Text_26A48A, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269DF7:: @ 8269DF7 - msgbox Route110_TrickHouseEntrance_Text_26A4DA, 4 + msgbox Route110_TrickHouseEntrance_Text_26A4DA, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E00:: @ 8269E00 - msgbox Route110_TrickHouseEntrance_Text_26A529, 4 + msgbox Route110_TrickHouseEntrance_Text_26A529, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E09:: @ 8269E09 - msgbox Route110_TrickHouseEntrance_Text_26A577, 4 + msgbox Route110_TrickHouseEntrance_Text_26A577, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E12:: @ 8269E12 - msgbox Route110_TrickHouseEntrance_Text_26A5C8, 4 + msgbox Route110_TrickHouseEntrance_Text_26A5C8, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E1B:: @ 8269E1B - msgbox Route110_TrickHouseEntrance_Text_26A616, 4 + msgbox Route110_TrickHouseEntrance_Text_26A616, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E24:: @ 8269E24 - msgbox Route110_TrickHouseEntrance_Text_26A665, 4 + msgbox Route110_TrickHouseEntrance_Text_26A665, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D - msgbox Route110_TrickHouseEntrance_Text_26A6B6, 4 + msgbox Route110_TrickHouseEntrance_Text_26A6B6, MSGBOX_DEFAULT return Route110_TrickHouseEnd_Movement_269E36: @ 8269E36 @@ -327,11 +327,11 @@ Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F step_end Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 - msgbox Route110_TrickHouseEntrance_Text_26A709, 4 + msgbox Route110_TrickHouseEntrance_Text_26A709, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 - msgbox Route110_TrickHouseEntrance_Text_26A921, 4 + msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 @@ -340,7 +340,7 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_27259A waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26A9AF, 4 + msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 waitmovement 0 releaseall @@ -349,7 +349,7 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26AA82, 4 + msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269EEF compare VAR_0x4044, 2 @@ -372,7 +372,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -382,7 +382,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -392,7 +392,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -402,7 +402,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -412,7 +412,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -422,7 +422,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -432,7 +432,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -447,13 +447,13 @@ Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26AB2C, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_272071 - msgbox Route110_TrickHouseEntrance_Text_26ABBD, 4 + msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end @@ -472,7 +472,7 @@ Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092 return Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A - msgbox Route110_TrickHouseEntrance_Text_26ABAE, 4 + msgbox Route110_TrickHouseEntrance_Text_26ABAE, MSGBOX_DEFAULT closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_26D632 waitmovement 0 @@ -497,12 +497,12 @@ Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3 end Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106 - msgbox Route110_TrickHouseEntrance_Text_26A878, 4 + msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 - msgbox Route110_TrickHouseEntrance_Text_26A887, 5 + msgbox Route110_TrickHouseEntrance_Text_26A887, MSGBOX_YESNO closemessage compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A126 @@ -581,19 +581,19 @@ Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6 end Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 - msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4 + msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B compare VAR_0x4044, 8 goto_eq Route110_TrickHouseEntrance_EventScript_26A220 - msgbox Route110_TrickHouseEntrance_Text_26A878, 4 + msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220 - msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4 + msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT releaseall end @@ -613,7 +613,7 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 compare VAR_0x40AB, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle1_Text_26B98D, 4 + msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AB, 2 setmetatile 13, 1, 523, 0 @@ -624,7 +624,7 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 compare VAR_0x40AC, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle2_Text_26BCBA, 4 + msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AC, 2 setmetatile 13, 1, 523, 0 @@ -635,7 +635,7 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB compare VAR_0x40AD, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle3_Text_26C609, 4 + msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AD, 2 setmetatile 13, 1, 523, 0 @@ -646,7 +646,7 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 compare VAR_0x40AE, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle4_Text_26C8C3, 4 + msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AE, 2 setmetatile 13, 1, 523, 0 @@ -657,7 +657,7 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D compare VAR_0x40AF, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle5_Text_26D660, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AF, 2 setmetatile 13, 1, 523, 0 @@ -668,7 +668,7 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 compare VAR_0x40B0, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle6_Text_26DE26, 4 + msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B0, 2 setmetatile 13, 1, 523, 0 @@ -679,7 +679,7 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F compare VAR_0x40B1, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle7_EventScript_26E413, 4 + msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B1, 2 setmetatile 13, 1, 523, 0 @@ -690,7 +690,7 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 compare VAR_0x40B2, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle8_EventScript_26E864, 4 + msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B2, 2 setmetatile 13, 1, 523, 0 @@ -699,7 +699,7 @@ Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 end Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1 - msgbox Route110_TrickHouseEntrance_Text_26AC4F, 4 + msgbox Route110_TrickHouseEntrance_Text_26AC4F, MSGBOX_DEFAULT releaseall end @@ -711,7 +711,7 @@ Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB - msgbox Route110_TrickHousePuzzle1_Text_26AC2F, 4 + msgbox Route110_TrickHousePuzzle1_Text_26AC2F, MSGBOX_DEFAULT releaseall end @@ -726,13 +726,13 @@ Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5 playfanfare MUS_FANFA4 message Route110_TrickHousePuzzle1_Text_26ABE8 waitfanfare - msgbox Route110_TrickHousePuzzle1_Text_26ABFB, 4 + msgbox Route110_TrickHousePuzzle1_Text_26ABFB, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 lockall - msgbox Route110_TrickHouseEntrance_Text_26A474, 4 + msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT releaseall compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_26A429 diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index ae6de093d..02dfa58bc 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -2,18 +2,18 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_13 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_12 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_14 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_17 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_16 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_15 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_19 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_18 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1B + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1C + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1E Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index 340a7e03c..aeeec549d 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -24,18 +24,18 @@ Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D end Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948 - trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F - msgbox Route110_TrickHousePuzzle1_Text_26BA57, 6 + trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F + msgbox Route110_TrickHousePuzzle1_Text_26BA57, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F - trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 - msgbox Route110_TrickHousePuzzle1_Text_26BAC3, 6 + trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 + msgbox Route110_TrickHousePuzzle1_Text_26BAC3, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976 - trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E - msgbox Route110_TrickHousePuzzle1_Text_26BB52, 6 + trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E + msgbox Route110_TrickHousePuzzle1_Text_26BB52, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index 0e8d3607b..e49d391e6 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -2,8 +2,8 @@ Route110_TrickHousePuzzle2_EventObjects: @ 853E128 object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index b724b986d..80d09866b 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -90,18 +90,18 @@ Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62 return Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75 - trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 - msgbox Route110_TrickHousePuzzle2_Text_26BD70, 6 + trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 + msgbox Route110_TrickHousePuzzle2_Text_26BD70, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C - trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF - msgbox Route110_TrickHousePuzzle2_Text_26BDEC, 6 + trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF + msgbox Route110_TrickHousePuzzle2_Text_26BDEC, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3 - trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 - msgbox Route110_TrickHousePuzzle2_Text_26BE97, 6 + trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 + msgbox Route110_TrickHousePuzzle2_Text_26BE97, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_Text_26BCBA: @ 826BCBA diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 38063f98d..118667076 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -2,10 +2,10 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218 object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_15 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_16 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 9956f9889..2c94012fb 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -302,18 +302,18 @@ Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 end Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4 - trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D - msgbox Route110_TrickHousePuzzle3_Text_26C6E6, 6 + trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D + msgbox Route110_TrickHousePuzzle3_Text_26C6E6, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB - trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 - msgbox Route110_TrickHousePuzzle3_Text_26C776, 6 + trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 + msgbox Route110_TrickHousePuzzle3_Text_26C776, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2 - trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC - msgbox Route110_TrickHousePuzzle3_Text_26C80C, 6 + trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC + msgbox Route110_TrickHousePuzzle3_Text_26C80C, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_Text_26C609: @ 826C609 diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index f5406539f..4bad58814 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -2,17 +2,17 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338 object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_11 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_12 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_13 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_14 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_15 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_16 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_17 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_18 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_19 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_1A Route110_TrickHousePuzzle4_MapWarps: @ 853E488 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 56b4b02fb..2cc97127b 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -14,18 +14,18 @@ Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 end Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E - trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E - msgbox Route110_TrickHousePuzzle4_Text_26C9A2, 6 + trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E + msgbox Route110_TrickHousePuzzle4_Text_26C9A2, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895 - trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 - msgbox Route110_TrickHousePuzzle4_Text_26CA53, 6 + trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 + msgbox Route110_TrickHousePuzzle4_Text_26CA53, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC - trainerbattle 0, TRAINER_PAULA, 0, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB - msgbox Route110_TrickHousePuzzle4_Text_26CAD1, 6 + trainerbattle_single TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB + msgbox Route110_TrickHousePuzzle4_Text_26CAD1, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 5afce1c88..96c727dc0 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -227,7 +227,7 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26D6CE, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D6CE, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26CF45 @@ -253,7 +253,7 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374 compare VAR_TEMP_9, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC - msgbox Route110_TrickHousePuzzle5_Text_26D8EA, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D8EA, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26CFAE @@ -277,7 +277,7 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26DA1E, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DA1E, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D017 @@ -301,7 +301,7 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26DB4C, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DB4C, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D080 @@ -317,7 +317,7 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - msgbox Route110_TrickHousePuzzle5_Text_26DC78, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D0E9 @@ -326,7 +326,7 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 end Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 - msgbox Route110_TrickHousePuzzle5_Text_26D757, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D757, MSGBOX_DEFAULT multichoice 0, 0, 25, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -334,7 +334,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 end Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 - msgbox Route110_TrickHousePuzzle5_Text_26D7AA, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D7AA, MSGBOX_DEFAULT multichoice 0, 0, 26, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -342,7 +342,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 end Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B - msgbox Route110_TrickHousePuzzle5_Text_26D7FC, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D7FC, MSGBOX_DEFAULT multichoice 0, 0, 27, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -350,7 +350,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B end Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE - msgbox Route110_TrickHousePuzzle5_Text_26D940, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D940, MSGBOX_DEFAULT multichoice 0, 0, 28, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -358,7 +358,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE end Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 - msgbox Route110_TrickHousePuzzle5_Text_26D98C, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D98C, MSGBOX_DEFAULT multichoice 0, 0, 29, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -366,7 +366,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 end Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 - msgbox Route110_TrickHousePuzzle5_Text_26D9CE, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D9CE, MSGBOX_DEFAULT multichoice 0, 0, 30, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -374,7 +374,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 end Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 - msgbox Route110_TrickHousePuzzle5_Text_26DA64, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DA64, MSGBOX_DEFAULT multichoice 0, 0, 31, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -382,7 +382,7 @@ Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 end Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A - msgbox Route110_TrickHousePuzzle5_Text_26DAAD, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DAAD, MSGBOX_DEFAULT multichoice 0, 0, 32, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -390,7 +390,7 @@ Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A end Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D - msgbox Route110_TrickHousePuzzle5_Text_26DAFF, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DAFF, MSGBOX_DEFAULT multichoice 0, 0, 33, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -398,7 +398,7 @@ Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D end Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 - msgbox Route110_TrickHousePuzzle5_Text_26DB94, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DB94, MSGBOX_DEFAULT multichoice 0, 0, 34, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -406,7 +406,7 @@ Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 end Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 - msgbox Route110_TrickHousePuzzle5_Text_26DBD7, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DBD7, MSGBOX_DEFAULT multichoice 0, 0, 35, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -414,7 +414,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 end Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 - msgbox Route110_TrickHousePuzzle5_Text_26DC2A, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DC2A, MSGBOX_DEFAULT multichoice 0, 0, 36, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -422,7 +422,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 end Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 - msgbox Route110_TrickHousePuzzle5_Text_26DCCB, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DCCB, MSGBOX_DEFAULT multichoice 0, 0, 37, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -430,7 +430,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 end Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C - msgbox Route110_TrickHousePuzzle5_Text_26DD1B, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DD1B, MSGBOX_DEFAULT multichoice 0, 0, 38, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -438,7 +438,7 @@ Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C end Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F - msgbox Route110_TrickHousePuzzle5_Text_26DD5F, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DD5F, MSGBOX_DEFAULT multichoice 0, 0, 39, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -448,15 +448,15 @@ Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152 waitse playse SE_HAZURE - msgbox Route110_TrickHousePuzzle5_Text_26D883, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D883, MSGBOX_DEFAULT applymovement 1, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 2, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 3, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 4, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 5, Route110_TrickHousePuzzle5_Movement_26D632 - msgbox Route110_TrickHousePuzzle5_Text_26D8A1, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D8A1, MSGBOX_DEFAULT waitmovement 0 - msgbox Route110_TrickHousePuzzle5_Text_26D8C9, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D8C9, MSGBOX_DEFAULT closemessage warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate @@ -470,7 +470,7 @@ Route110_TrickHousePuzzle5_EventScript_26D1A0:: @ 826D1A0 end Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA - msgbox Route110_TrickHousePuzzle5_Text_26D84D, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D84D, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index 72fc4fbc6..f172622ea 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -2,7 +2,7 @@ Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL Route110_TrickHousePuzzle6_MapWarps: @ 853E730 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 0f20aac1f..4881ac87a 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -28,18 +28,18 @@ Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 end Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1 - trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 - msgbox Route110_TrickHousePuzzle6_Text_26DEF3, 6 + trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 + msgbox Route110_TrickHousePuzzle6_Text_26DEF3, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8 - trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D - msgbox Route110_TrickHousePuzzle6_Text_26DFA0, 6 + trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D + msgbox Route110_TrickHousePuzzle6_Text_26DFA0, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F - trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 - msgbox Route110_TrickHousePuzzle6_Text_26E048, 6 + trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 + msgbox Route110_TrickHousePuzzle6_Text_26E048, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_Text_26DE26: @ 826DE26 diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index 62a52420b..d29c76263 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -2,7 +2,7 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768 object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0 object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0 object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index fdf734423..3df92dc99 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -304,33 +304,33 @@ Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 end Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 - trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 - msgbox Route110_TrickHousePuzzle7_Text_26E4F4, 6 + trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 + msgbox Route110_TrickHousePuzzle7_Text_26E4F4, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0 - trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 - msgbox Route110_TrickHousePuzzle7_Text_26E57F, 6 + trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 + msgbox Route110_TrickHousePuzzle7_Text_26E57F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7 - trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 - msgbox Route110_TrickHousePuzzle7_Text_26E61E, 6 + trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 + msgbox Route110_TrickHousePuzzle7_Text_26E61E, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE - trainerbattle 0, TRAINER_MARIELA, 0, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C - msgbox Route110_TrickHousePuzzle7_Text_26E6BC, 6 + trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C + msgbox Route110_TrickHousePuzzle7_Text_26E6BC, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5 - trainerbattle 0, TRAINER_ALVARO, 0, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 - msgbox Route110_TrickHousePuzzle7_Text_26E722, 6 + trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 + msgbox Route110_TrickHousePuzzle7_Text_26E722, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC - trainerbattle 0, TRAINER_EVERETT, 0, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB - msgbox Route110_TrickHousePuzzle7_Text_26E7C4, 6 + trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB + msgbox Route110_TrickHousePuzzle7_Text_26E7C4, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413 diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index 8dff961ac..909c8cbfd 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -2,7 +2,7 @@ Route110_TrickHousePuzzle8_EventObjects: @ 853E908 object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL Route110_TrickHousePuzzle8_MapWarps: @ 853E968 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 369bc59a7..0f9155faf 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -14,18 +14,18 @@ Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 end Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F - trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 - msgbox Route110_TrickHousePuzzle8_Text_26E918, 6 + trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 + msgbox Route110_TrickHousePuzzle8_Text_26E918, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836 - trainerbattle 0, TRAINER_KEIRA, 0, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F - msgbox Route110_TrickHousePuzzle8_Text_26E99F, 6 + trainerbattle_single TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F + msgbox Route110_TrickHousePuzzle8_Text_26E99F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D - trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 - msgbox Route110_TrickHousePuzzle8_Text_26EA3F, 6 + trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 + msgbox Route110_TrickHousePuzzle8_Text_26EA3F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E864:: @ 826E864 diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index 93767ff41..46e3b067b 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -1,8 +1,8 @@ Route111_EventObjects: @ 85291F0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 769 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 770 - object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 771 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE + object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE + object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE + object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F121B, 0 object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, BerryTreeScript, 0 object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, BerryTreeScript, 0 @@ -11,27 +11,27 @@ Route111_EventObjects: @ 85291F0 object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_1F1260, 0 object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1F1232, 0 object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route111_EventScript_1F1249, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, 17 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, 18 + object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDF6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_12 object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290D9B, FLAG_ITEM_ROUTE_111_TM_37 object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 80, BerryTreeScript, 0 object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 81, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CE96, 799 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, 903 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, 903 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010 - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, 19 + object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CE96, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, FLAG_ITEM_ROUTE_111_STARDUST + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, FLAG_ITEM_ROUTE_111_HP_UP + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, FLAG_TEMP_13 object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0 object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0 object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0 object_event 31, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0 object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1307, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, 960 + object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN object_event 34, EVENT_OBJ_GFX_MAN_4, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1192, 0 object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0 object_event 36, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 132, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, Route111_EventScript_1F1410, 0 @@ -40,11 +40,11 @@ Route111_EventObjects: @ 85291F0 object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 7, Route111_EventScript_1F143E, 0 object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, Route111_EventScript_1F1427, 0 object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, Route111_EventScript_1F1455, 0 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, 1142 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, FLAG_ITEM_ROUTE_111_ELIXIR object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0 - object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 876 - object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 875 - object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, 843 + object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_FOSSIL + object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_RIVAL + object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY Route111_MapWarps: @ 8529640 warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE @@ -100,13 +100,13 @@ Route111_MapBGEvents: @ 8529888 bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1177 bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3 bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3 - bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, 2 + bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1180 bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4 bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1 - bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, 56 - bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, 57 + bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN + bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C Route111_MapEvents:: @ 8529960 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 6be0eba1d..f03dc38ac 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -89,10 +89,10 @@ Route111_EventScript_1F0E25:: @ 81F0E25 return Route111_EventScript_1F0E26:: @ 81F0E26 - clearflag FLAG_0x300 - setflag FLAG_0x301 - setflag FLAG_0x302 - setflag FLAG_0x303 + clearflag FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE cleartrainerflag TRAINER_VICTOR cleartrainerflag TRAINER_VICTORIA cleartrainerflag TRAINER_VIVI @@ -137,15 +137,15 @@ Route111_EventScript_1F0E60:: @ 81F0E60 special sub_81BEB7C waitstate setvar VAR_0x40CB, 2 - clearflag FLAG_0x36A + clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL checkflag FLAG_0x150 goto_eq Route111_EventScript_1F0EA7 - msgbox Route111_Text_1F1C74, 4 + msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT releaseall end Route111_EventScript_1F0EA7:: @ 81F0EA7 - msgbox Route111_Text_1F1C9F, 4 + msgbox Route111_Text_1F1C9F, MSGBOX_DEFAULT releaseall end @@ -165,18 +165,18 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 dodailyevents checkflag FLAG_0x92C goto_eq Route111_EventScript_1F0EF4 - msgbox Route111_Text_2A6EBD, 4 + msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY compare VAR_RESULT, 0 goto_eq Route111_EventScript_272054 setflag FLAG_0x92C special GetPlayerBigGuyGirlString - msgbox Route111_Text_2A6F3D, 4 + msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT release end Route111_EventScript_1F0EF4:: @ 81F0EF4 - msgbox Route111_Text_2A6F9A, 4 + msgbox Route111_Text_2A6F9A, MSGBOX_DEFAULT release end @@ -213,7 +213,7 @@ Route111_EventScript_1F0F2E:: @ 81F0F2E end Route111_EventScript_1F0F45:: @ 81F0F45 - msgbox gUnknown_08272C5F, 4 + msgbox gUnknown_08272C5F, MSGBOX_DEFAULT closemessage compare VAR_0x8004, 0 call_if 1, Route111_EventScript_1F0F7C @@ -279,20 +279,20 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 lock faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY - msgbox Route111_Text_1F1475, 5 + msgbox Route111_Text_1F1475, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F0FE7 - msgbox Route111_Text_1F14F5, 4 + msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT release end Route111_EventScript_1F0FE7:: @ 81F0FE7 - msgbox Route111_Text_1F1523, 4 - trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_1F1542 + msgbox Route111_Text_1F1523, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 applymovement 1, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C - msgbox Route111_Text_1F156F, 4 + msgbox Route111_Text_1F156F, MSGBOX_DEFAULT closemessage applymovement 1, Route111_Movement_1F114A waitmovement 0 @@ -305,12 +305,12 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 applymovement 2, Route111_Movement_1F114D waitmovement 0 call Route111_EventScript_1F1143 - msgbox Route111_Text_1F159D, 4 - trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_1F1616 + msgbox Route111_Text_1F159D, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 applymovement 2, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C - msgbox Route111_Text_1F1645, 4 + msgbox Route111_Text_1F1645, MSGBOX_DEFAULT closemessage applymovement 2, Route111_Movement_1F114A waitmovement 0 @@ -323,12 +323,12 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 applymovement 3, Route111_Movement_1F114D waitmovement 0 call Route111_EventScript_1F1143 - msgbox Route111_Text_1F167E, 4 - trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_1F16C6 + msgbox Route111_Text_1F167E, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 applymovement 3, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C - msgbox Route111_Text_1F16DC, 4 + msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT closemessage applymovement 3, Route111_Movement_1F114A waitmovement 0 @@ -341,9 +341,9 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 applymovement 4, Route111_Movement_1F114D waitmovement 0 call Route111_EventScript_1F1143 - msgbox Route111_Text_1F16FB, 4 - trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_1F1756 - msgbox Route111_Text_1F1788, 4 + msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 + msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage applymovement 4, Route111_Movement_2725A6 waitmovement 0 @@ -381,35 +381,35 @@ Route111_Movement_1F114F: @ 81F114F step_end Route111_EventScript_1F1153:: @ 81F1153 - msgbox Route111_Text_1F18CE, 3 + msgbox Route111_Text_1F18CE, MSGBOX_SIGN end Route111_EventScript_1F115C:: @ 81F115C - msgbox Route111_Text_1F18E8, 3 + msgbox Route111_Text_1F18E8, MSGBOX_SIGN end Route111_EventScript_1F1165:: @ 81F1165 - msgbox Route111_Text_1F1921, 3 + msgbox Route111_Text_1F1921, MSGBOX_SIGN end Route111_EventScript_1F116E:: @ 81F116E - msgbox Route111_Text_1F1937, 3 + msgbox Route111_Text_1F1937, MSGBOX_SIGN end Route111_EventScript_1F1177:: @ 81F1177 - msgbox Route111_Text_1F194D, 3 + msgbox Route111_Text_1F194D, MSGBOX_SIGN end Route111_EventScript_1F1180:: @ 81F1180 - msgbox Route111_Text_1F1987, 3 + msgbox Route111_Text_1F1987, MSGBOX_SIGN end Route111_EventScript_1F1189:: @ 81F1189 - msgbox Route111_Text_1F17BA, 2 + msgbox Route111_Text_1F17BA, MSGBOX_NPC end Route111_EventScript_1F1192:: @ 81F1192 - msgbox Route111_Text_1F186E, 2 + msgbox Route111_Text_1F186E, MSGBOX_NPC end Route111_EventScript_1F119B:: @ 81F119B @@ -421,22 +421,22 @@ Route111_EventScript_1F119B:: @ 81F119B goto_eq Route111_EventScript_1F11D0 checkflag FLAG_0x14E goto_eq Route111_EventScript_1F11DA - msgbox Route111_Text_1F1A22, 4 + msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT release end Route111_EventScript_1F11C6:: @ 81F11C6 - msgbox Route111_Text_1F1C12, 4 + msgbox Route111_Text_1F1C12, MSGBOX_DEFAULT release end Route111_EventScript_1F11D0:: @ 81F11D0 - msgbox Route111_Text_1F1B92, 4 + msgbox Route111_Text_1F1B92, MSGBOX_DEFAULT release end Route111_EventScript_1F11DA:: @ 81F11DA - msgbox Route111_Text_1F1AC7, 4 + msgbox Route111_Text_1F1AC7, MSGBOX_DEFAULT release end @@ -444,7 +444,7 @@ Route111_EventScript_1F11E4:: @ 81F11E4 lockall applymovement 46, Route111_Movement_27259E waitmovement 0 - msgbox Route111_Text_1F1CCA, 4 + msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT closemessage applymovement 46, Route111_Movement_2725A2 waitmovement 0 @@ -452,152 +452,143 @@ Route111_EventScript_1F11E4:: @ 81F11E4 end Route111_EventScript_1F1204:: @ 81F1204 - trainerbattle 0, TRAINER_DREW, 0, Route111_Text_29878E, Route111_Text_29880A - msgbox Route111_Text_298853, 6 + trainerbattle_single TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A + msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE end Route111_EventScript_1F121B:: @ 81F121B - trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_2988A3, Route111_Text_298908 - msgbox Route111_Text_29891B, 6 + trainerbattle_single TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908 + msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1232:: @ 81F1232 - trainerbattle 0, TRAINER_BEAU, 0, Route111_Text_29898E, Route111_Text_2989E6 - msgbox Route111_Text_298A03, 6 + trainerbattle_single TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6 + msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1249:: @ 81F1249 - trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_298A65, Route111_Text_298AAF - msgbox Route111_Text_298AC0, 6 + trainerbattle_single TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF + msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1260:: @ 81F1260 - trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C + trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F12AB - msgbox Route111_Text_298B9A, 4 + msgbox Route111_Text_298B9A, MSGBOX_DEFAULT release end Route111_EventScript_1F128C:: @ 81F128C special sub_80B4808 waitmovement 0 - msgbox Route111_Text_298C00, 4 - setvar VAR_0x8004, 44 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 44 - callstd 8 + msgbox Route111_Text_298C00, MSGBOX_DEFAULT + register_matchcall TRAINER_DUSTY_1 release end Route111_EventScript_1F12AB:: @ 81F12AB - trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_298C5F, Route111_Text_298CD2 - msgbox Route111_Text_298D0C, 6 + trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_298C5F, Route111_Text_298CD2 + msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12C2:: @ 81F12C2 - trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_298DA9, Route111_Text_298DD8 - msgbox Route111_Text_298DF1, 6 + trainerbattle_single TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8 + msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12D9:: @ 81F12D9 - trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_298E2F, Route111_Text_298E6E - msgbox Route111_Text_298E8C, 6 + trainerbattle_single TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E + msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12F0:: @ 81F12F0 - trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_298EE6, Route111_Text_298F14 - msgbox Route111_Text_298F26, 6 + trainerbattle_single TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14 + msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1307:: @ 81F1307 - trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 + trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F1352 - msgbox Route111_Text_298FD4, 4 + msgbox Route111_Text_298FD4, MSGBOX_DEFAULT release end Route111_EventScript_1F1333:: @ 81F1333 special sub_80B4808 waitmovement 0 - msgbox Route111_Text_29903D, 4 - setvar VAR_0x8004, 78 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 78 - callstd 8 + msgbox Route111_Text_29903D, MSGBOX_DEFAULT + register_matchcall TRAINER_WILTON_1 release end Route111_EventScript_1F1352:: @ 81F1352 - trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_29909B, Route111_Text_2990EE - msgbox Route111_Text_299102, 6 + trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_29909B, Route111_Text_2990EE + msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1369:: @ 81F1369 - trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 + trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F13B4 - msgbox Route111_Text_2991C2, 4 + msgbox Route111_Text_2991C2, MSGBOX_DEFAULT release end Route111_EventScript_1F1395:: @ 81F1395 special sub_80B4808 waitmovement 0 - msgbox Route111_Text_29921D, 4 - setvar VAR_0x8004, 94 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 94 - callstd 8 + msgbox Route111_Text_29921D, MSGBOX_DEFAULT + register_matchcall TRAINER_BROOKE_1 release end Route111_EventScript_1F13B4:: @ 81F13B4 - trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_29925D, Route111_Text_2992D6 - msgbox Route111_Text_2992F5, 6 + trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_29925D, Route111_Text_2992D6 + msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13CB:: @ 81F13CB - trainerbattle 0, TRAINER_HAYDEN, 0, Route111_Text_299682, Route111_Text_2996BE - msgbox Route111_Text_2996C5, 6 + trainerbattle_single TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE + msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13E2:: @ 81F13E2 - trainerbattle 0, TRAINER_BIANCA, 0, Route111_Text_2996FE, Route111_Text_29973D - msgbox Route111_Text_29975D, 6 + trainerbattle_single TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D + msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13F9:: @ 81F13F9 - trainerbattle 0, TRAINER_TYRON, 0, Route111_Text_299524, Route111_Text_299549 - msgbox Route111_Text_299576, 6 + trainerbattle_single TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549 + msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1410:: @ 81F1410 - trainerbattle 0, TRAINER_CELINA, 0, Route111_Text_2995F0, Route111_Text_299625 - msgbox Route111_Text_29964B, 6 + trainerbattle_single TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625 + msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1427:: @ 81F1427 - trainerbattle 0, TRAINER_CELIA, 0, Route111_Text_29934B, Route111_Text_299384 - msgbox Route111_Text_2993A7, 6 + trainerbattle_single TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384 + msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE end Route111_EventScript_1F143E:: @ 81F143E - trainerbattle 0, TRAINER_BRYAN, 0, Route111_Text_299401, Route111_Text_299431 - msgbox Route111_Text_29945F, 6 + trainerbattle_single TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431 + msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1455:: @ 81F1455 - trainerbattle 0, TRAINER_BRANDEN, 0, Route111_Text_299493, Route111_Text_2994C5 - msgbox Route111_Text_2994FB, 6 + trainerbattle_single TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5 + msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE end Route111_EventScript_1F146C:: @ 81F146C - msgbox Route111_Text_1F1D61, 3 + msgbox Route111_Text_1F1D61, MSGBOX_SIGN end Route111_Text_1F1475: @ 81F1475 diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 015a584f4..d1dea14d3 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -9,7 +9,7 @@ Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 lock faceplayer - msgbox Route111_OldLadysRestStop_Text_22A978, 5 + msgbox Route111_OldLadysRestStop_Text_22A978, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_OldLadysRestStop_EventScript_22A941 compare VAR_RESULT, 0 @@ -17,10 +17,10 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 end Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 - msgbox Route111_OldLadysRestStop_Text_22A9EC, 4 + msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT closemessage call Route111_OldLadysRestStop_EventScript_272083 - msgbox Route111_OldLadysRestStop_Text_22AA16, 5 + msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_OldLadysRestStop_EventScript_22A941 compare VAR_RESULT, 0 @@ -28,7 +28,7 @@ Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 end Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E - msgbox Route111_OldLadysRestStop_Text_22AA8F, 4 + msgbox Route111_OldLadysRestStop_Text_22AA8F, MSGBOX_DEFAULT release end diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 847119d2e..c1aca9b8f 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -5,7 +5,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A48D:: @ 822A48D lock faceplayer setvar VAR_0x8008, 2 - msgbox Route111_WinstrateFamilysHouse_Text_22A539, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A539, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -15,7 +15,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 setvar VAR_0x8008, 3 checkflag FLAG_0x115 goto_eq Route111_WinstrateFamilysHouse_EventScript_22A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE compare VAR_RESULT, 0 goto_eq Route111_WinstrateFamilysHouse_EventScript_272054 @@ -24,7 +24,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 end Route111_WinstrateFamilysHouse_EventScript_22A4DA:: @ 822A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -32,7 +32,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4E8:: @ 822A4E8 lock faceplayer setvar VAR_0x8008, 1 - msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -40,15 +40,15 @@ Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD lock faceplayer setvar VAR_0x8008, 4 - checkflag FLAG_0x004 + checkflag FLAG_TEMP_4 goto_eq Route111_WinstrateFamilysHouse_EventScript_22A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A780, 4 - setflag FLAG_0x004 + msgbox Route111_WinstrateFamilysHouse_Text_22A780, MSGBOX_DEFAULT + setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_22A52C end Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A89B, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A89B, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index 123385208..cfa145e97 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,16 +1,16 @@ Route112_EventObjects: @ 8529974 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0 object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0 object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, FLAG_ITEM_ROUTE_112_NUGGET object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 4f7e20b94..cb6a48dce 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -13,7 +13,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Route112_Movement_2725A8 waitmovement 0 delay 20 - msgbox Route112_Text_1F1F3F, 4 + msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT closemessage applymovement 1, Route112_Movement_2725A2 waitmovement 0 @@ -21,7 +21,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Route112_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route112_Text_1F1F7A, 4 + msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT closemessage applymovement 6, Route112_Movement_2725A2 waitmovement 0 @@ -29,7 +29,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Route112_Movement_2725A8 waitmovement 0 delay 20 - msgbox Route112_Text_1F1FBA, 4 + msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT closemessage applymovement 1, Route112_Movement_2725A2 waitmovement 0 @@ -37,7 +37,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Route112_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route112_Text_1F2003, 4 + msgbox Route112_Text_1F2003, MSGBOX_DEFAULT closemessage applymovement 6, Route112_Movement_2725A2 waitmovement 0 @@ -45,69 +45,66 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 end Route112_EventScript_1F1E46:: @ 81F1E46 - msgbox Route112_Text_1F20C1, 3 + msgbox Route112_Text_1F20C1, MSGBOX_SIGN end Route112_EventScript_1F1E4F:: @ 81F1E4F - msgbox Route112_Text_1F20ED, 3 + msgbox Route112_Text_1F20ED, MSGBOX_SIGN end Route112_EventScript_1F1E58:: @ 81F1E58 - msgbox Route112_Text_1F2138, 3 + msgbox Route112_Text_1F2138, MSGBOX_SIGN end Route112_EventScript_1F1E61:: @ 81F1E61 - msgbox Route112_Text_1F204E, 2 + msgbox Route112_Text_1F204E, MSGBOX_NPC end Route112_EventScript_1F1E6A:: @ 81F1E6A - trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA - msgbox Route112_Text_2997DC, 6 + trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA + msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1E81:: @ 81F1E81 - trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD + trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC - msgbox Route112_Text_299896, 4 + msgbox Route112_Text_299896, MSGBOX_DEFAULT release end Route112_EventScript_1F1EAD:: @ 81F1EAD special sub_80B4808 waitmovement 0 - msgbox Route112_Text_29993C, 4 - setvar VAR_0x8004, 627 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 627 - callstd 8 + msgbox Route112_Text_29993C, MSGBOX_DEFAULT + register_matchcall TRAINER_TRENT_1 release end Route112_EventScript_1F1ECC:: @ 81F1ECC - trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7 - msgbox Route112_Text_299A0F, 6 + trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7 + msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EE3:: @ 81F1EE3 - trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC - msgbox Route112_Text_299AB4, 6 + trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC + msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EFA:: @ 81F1EFA - trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36 - msgbox Route112_Text_299B4C, 6 + trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 + msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F11:: @ 81F1F11 - trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF - msgbox Route112_Text_299BFB, 6 + trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF + msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F28:: @ 81F1F28 - trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F - msgbox Route112_Text_299CC6, 6 + trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F + msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE end Route112_Text_1F1F3F: @ 81F1F3F diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 93e8ea759..905e9e9ea 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -32,7 +32,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 lock faceplayer - msgbox Route112_CableCarStation_Text_22AB85, 5 + msgbox Route112_CableCarStation_Text_22AB85, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route112_CableCarStation_EventScript_22AB38 compare VAR_RESULT, 0 @@ -40,7 +40,7 @@ Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 end Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 - msgbox Route112_CableCarStation_Text_22ABC2, 4 + msgbox Route112_CableCarStation_Text_22ABC2, MSGBOX_DEFAULT closemessage applymovement 1, Route112_CableCarStation_Movement_22AB71 applymovement 255, Route112_CableCarStation_Movement_22AB7B @@ -55,7 +55,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 end Route112_CableCarStation_EventScript_22AB67:: @ 822AB67 - msgbox Route112_CableCarStation_Text_22ABD8, 4 + msgbox Route112_CableCarStation_Text_22ABD8, MSGBOX_DEFAULT release end diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 21bae5dc6..b2481d6ed 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -4,13 +4,13 @@ Route113_EventObjects: @ 8529B2C object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, FLAG_ITEM_ROUTE_113_MAX_ETHER + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, FLAG_ITEM_ROUTE_113_SUPER_REPEL object_event 8, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 object_event 9, EVENT_OBJ_GFX_NINJA_BOY, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 object_event 10, EVENT_OBJ_GFX_TWIN, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 object_event 11, EVENT_OBJ_GFX_TWIN, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, FLAG_ITEM_ROUTE_113_HYPER_POTION object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0 object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0 object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 @@ -48,9 +48,9 @@ Route113_MapBGEvents: @ 8529DF4 bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3 - bg_hidden_item_event 66, 3, 3, ITEM_ETHER, 3 - bg_hidden_item_event 22, 5, 3, ITEM_TM32, 30 - bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, 98 + bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER + bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 + bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET Route113_MapEvents:: @ 8529E54 map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index ce2c4b47d..550029289 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -25,122 +25,116 @@ Route113_EventScript_1F2189:: @ 81F2189 return Route113_EventScript_1F218A:: @ 81F218A - msgbox Route113_Text_1F235B, 2 + msgbox Route113_Text_1F235B, MSGBOX_NPC end Route113_EventScript_1F2193:: @ 81F2193 - msgbox Route113_Text_1F23CA, 2 + msgbox Route113_Text_1F23CA, MSGBOX_NPC end Route113_EventScript_1F219C:: @ 81F219C - msgbox Route113_Text_1F2440, 3 + msgbox Route113_Text_1F2440, MSGBOX_SIGN end Route113_EventScript_1F21A5:: @ 81F21A5 - msgbox Route113_Text_1F2456, 3 + msgbox Route113_Text_1F2456, MSGBOX_SIGN end Route113_EventScript_1F21AE:: @ 81F21AE - msgbox Route113_Text_1F24F8, 3 + msgbox Route113_Text_1F24F8, MSGBOX_SIGN end Route113_EventScript_1F21B7:: @ 81F21B7 - msgbox Route113_Text_1F2471, 3 + msgbox Route113_Text_1F2471, MSGBOX_SIGN end Route113_EventScript_1F21C0:: @ 81F21C0 - trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68 - msgbox Route113_Text_299D7D, 6 + trainerbattle_single TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68 + msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21D7:: @ 81F21D7 - trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C - msgbox Route113_Text_299E38, 6 + trainerbattle_single TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C + msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21EE:: @ 81F21EE - trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A + trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 - msgbox Route113_Text_299F15, 4 + msgbox Route113_Text_299F15, MSGBOX_DEFAULT release end Route113_EventScript_1F221A:: @ 81F221A special sub_80B4808 waitmovement 0 - msgbox Route113_Text_299F49, 4 - setvar VAR_0x8004, 434 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 434 - callstd 8 + msgbox Route113_Text_299F49, MSGBOX_DEFAULT + register_matchcall TRAINER_MADELINE_1 release end Route113_EventScript_1F2239:: @ 81F2239 - trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9 - msgbox Route113_Text_299FD8, 6 + trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9 + msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2250:: @ 81F2250 - trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C + trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B - msgbox Route113_Text_29A067, 4 + msgbox Route113_Text_29A067, MSGBOX_DEFAULT release end Route113_EventScript_1F227C:: @ 81F227C special sub_80B4808 waitmovement 0 - msgbox Route113_Text_29A0A2, 4 - setvar VAR_0x8004, 419 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 419 - callstd 8 + msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT + register_matchcall TRAINER_LAO_1 release end Route113_EventScript_1F229B:: @ 81F229B - trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F - msgbox Route113_Text_29A13A, 6 + trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F + msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22B2:: @ 81F22B2 - trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6 - msgbox Route113_Text_29A219, 6 + trainerbattle_single TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6 + msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22C9:: @ 81F22C9 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F - msgbox Route113_Text_29A2DE, 6 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F + msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22E4:: @ 81F22E4 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 - msgbox Route113_Text_29A3DA, 6 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 + msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22FF:: @ 81F22FF - trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508 - msgbox Route113_Text_29A529, 6 + trainerbattle_single TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508 + msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2316:: @ 81F2316 - trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480 - msgbox Route113_Text_29A489, 6 + trainerbattle_single TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480 + msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE end Route113_EventScript_1F232D:: @ 81F232D - trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0 - msgbox Route113_Text_29A5BE, 6 + trainerbattle_single TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0 + msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2344:: @ 81F2344 - trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628 - msgbox Route113_Text_29A65D, 6 + trainerbattle_single TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628 + msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE end Route113_Text_1F235B: @ 81F235B diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 5ea100567..7784cc79c 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -21,15 +21,15 @@ Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E goto_eq Route113_GlassWorkshop_EventScript_26ED6E compare VAR_0x40BE, 1 goto_eq Route113_GlassWorkshop_EventScript_26ED64 - msgbox Route113_GlassWorkshop_Text_26F19D, 4 + msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT giveitem_std ITEM_SOOT_SACK setvar VAR_0x40BE, 1 - msgbox Route113_GlassWorkshop_Text_26F252, 4 + msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 - msgbox Route113_GlassWorkshop_Text_26F252, 4 + msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT release end @@ -37,7 +37,7 @@ Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E checkitem ITEM_SOOT_SACK, 1 compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26ED9D - msgbox Route113_GlassWorkshop_Text_26F312, 4 + msgbox Route113_GlassWorkshop_Text_26F312, MSGBOX_DEFAULT compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_26EFD6 message Route113_GlassWorkshop_Text_26F40A @@ -46,7 +46,7 @@ Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E end Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D - msgbox Route113_GlassWorkshop_Text_26F772, 4 + msgbox Route113_GlassWorkshop_Text_26F772, MSGBOX_DEFAULT release end @@ -73,7 +73,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E setvar VAR_0x800A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 10 @@ -87,7 +87,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 11 @@ -101,7 +101,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 12 @@ -115,7 +115,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 13 @@ -129,7 +129,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 14 @@ -144,7 +144,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A setvar VAR_0x800A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 15 @@ -159,7 +159,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B setvar VAR_0x800A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 16 @@ -168,7 +168,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B end Route113_GlassWorkshop_EventScript_26EFCC:: @ 826EFCC - msgbox Route113_GlassWorkshop_Text_26F641, 4 + msgbox Route113_GlassWorkshop_Text_26F641, MSGBOX_DEFAULT release end @@ -176,7 +176,7 @@ Route113_GlassWorkshop_EventScript_26EFD6:: @ 826EFD6 setvar VAR_0x800A, 250 subvar VAR_0x800A, 16456 buffernumberstring 0, VAR_0x800A - msgbox Route113_GlassWorkshop_Text_26F34E, 4 + msgbox Route113_GlassWorkshop_Text_26F34E, MSGBOX_DEFAULT release end @@ -195,13 +195,13 @@ Route113_GlassWorkshop_EventScript_26F003:: @ 826F003 end Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F - msgbox Route113_GlassWorkshop_Text_26F4DA, 4 + msgbox Route113_GlassWorkshop_Text_26F4DA, MSGBOX_DEFAULT closemessage fadescreen 1 playse SE_SELECT delay 30 fadescreen 0 - msgbox Route113_GlassWorkshop_Text_26F688, 4 + msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT compare VAR_0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 @@ -224,13 +224,13 @@ Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 call Route113_GlassWorkshop_EventScript_27205E - msgbox Route113_GlassWorkshop_Text_26F6B7, 4 + msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 call Route113_GlassWorkshop_EventScript_272071 - msgbox Route113_GlassWorkshop_Text_26F715, 4 + msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT release end @@ -295,7 +295,7 @@ Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B end Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F - msgbox Route113_GlassWorkshop_Text_26F688, 4 + msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT compare VAR_0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 @@ -305,7 +305,7 @@ Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F end Route113_GlassWorkshop_EventScript_26F194:: @ 826F194 - msgbox Route113_GlassWorkshop_Text_26F7EC, 2 + msgbox Route113_GlassWorkshop_Text_26F7EC, MSGBOX_NPC end Route113_GlassWorkshop_Text_26F19D: @ 826F19D diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 910d5e004..55ea12195 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -7,24 +7,24 @@ Route114_EventObjects: @ 8529E68 object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_1F2685, 0 object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_1F269C, 0 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, 1014 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, 1015 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, 17 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, FLAG_ITEM_ROUTE_114_RARE_CANDY + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, FLAG_ITEM_ROUTE_114_PROTEIN + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_11 object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0 object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F2612, 0 object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0 object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1F2777, 0 object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1F2760, 0 object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 18 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 19 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 20 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 21 + object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_12 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_13 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_14 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_15 object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0 object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F278E, 0 object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0 object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, 1160 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, FLAG_ITEM_ROUTE_114_ENERGY_POWDER object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 Route114_MapWarps: @ 852A0F0 @@ -44,9 +44,9 @@ Route114_MapBGEvents: @ 852A118 bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2637 - bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, 4 + bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 - bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, 42 + bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE Route114_MapEvents:: @ 852A1A8 map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 9443d35bc..e47a3660f 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -30,7 +30,7 @@ Route114_EventScript_1F2582:: @ 81F2582 dodailyevents checkflag FLAG_0x92B goto_eq Route114_EventScript_1F25C7 - msgbox Route114_Text_2A6FCB, 4 + msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT random 5 addvar VAR_RESULT, 15 addvar VAR_RESULT, 133 @@ -38,12 +38,12 @@ Route114_EventScript_1F2582:: @ 81F2582 compare VAR_RESULT, 0 goto_eq Route114_EventScript_272054 setflag FLAG_0x92B - msgbox Route114_Text_2A7034, 4 + msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release end Route114_EventScript_1F25C7:: @ 81F25C7 - msgbox Route114_Text_2A706E, 4 + msgbox Route114_Text_2A706E, MSGBOX_DEFAULT release end @@ -52,17 +52,17 @@ Route114_EventScript_1F25D1:: @ 81F25D1 faceplayer checkflag FLAG_0x0E7 goto_eq Route114_EventScript_1F2608 - msgbox Route114_Text_1F2809, 4 + msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 goto_eq Route114_EventScript_272054 setflag FLAG_0x0E7 - msgbox Route114_Text_1F2872, 4 + msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release end Route114_EventScript_1F2608:: @ 81F2608 - msgbox Route114_Text_1F2872, 4 + msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release end @@ -71,126 +71,120 @@ Route114_EventScript_1F2612:: @ 81F2612 faceplayer waitse playmoncry SPECIES_POOCHYENA, 2 - msgbox Route114_Text_1F28A6, 4 + msgbox Route114_Text_1F28A6, MSGBOX_DEFAULT waitmoncry release end Route114_EventScript_1F2625:: @ 81F2625 - msgbox Route114_Text_1F28B3, 3 + msgbox Route114_Text_1F28B3, MSGBOX_SIGN end Route114_EventScript_1F262E:: @ 81F262E - msgbox Route114_Text_1F28DB, 3 + msgbox Route114_Text_1F28DB, MSGBOX_SIGN end Route114_EventScript_1F2637:: @ 81F2637 - msgbox Route114_Text_1F2910, 3 + msgbox Route114_Text_1F2910, MSGBOX_SIGN end Route114_EventScript_1F2640:: @ 81F2640 - trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_29A6B1, Route114_Text_29A707 - msgbox Route114_Text_29A715, 6 + trainerbattle_single TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707 + msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2657:: @ 81F2657 - trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_29A777, Route114_Text_29A7B5 - msgbox Route114_Text_29A7D4, 6 + trainerbattle_single TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5 + msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE end Route114_EventScript_1F266E:: @ 81F266E - trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_29A818, Route114_Text_29A88F - msgbox Route114_Text_29A89F, 6 + trainerbattle_single TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F + msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2685:: @ 81F2685 - trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_29A8D9, Route114_Text_29A90E - msgbox Route114_Text_29A916, 6 + trainerbattle_single TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E + msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE end Route114_EventScript_1F269C:: @ 81F269C - trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 + trainerbattle_single TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F26E7 - msgbox Route114_Text_29A981, 4 + msgbox Route114_Text_29A981, MSGBOX_DEFAULT release end Route114_EventScript_1F26C8:: @ 81F26C8 special sub_80B4808 waitmovement 0 - msgbox Route114_Text_29A9F7, 4 - setvar VAR_0x8004, 143 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 143 - callstd 8 + msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT + register_matchcall TRAINER_STEVE_1 release end Route114_EventScript_1F26E7:: @ 81F26E7 - trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_29AA3E, Route114_Text_29AA67 - msgbox Route114_Text_29AA94, 6 + trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_29AA3E, Route114_Text_29AA67 + msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE end Route114_EventScript_1F26FE:: @ 81F26FE - trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A + trainerbattle_single TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F2749 - msgbox Route114_Text_29AB36, 4 + msgbox Route114_Text_29AB36, MSGBOX_DEFAULT release end Route114_EventScript_1F272A:: @ 81F272A special sub_80B4808 waitmovement 0 - msgbox Route114_Text_29ABA6, 4 - setvar VAR_0x8004, 206 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 206 - callstd 8 + msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT + register_matchcall TRAINER_BERNIE_1 release end Route114_EventScript_1F2749:: @ 81F2749 - trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_29ABDC, Route114_Text_29AC10 - msgbox Route114_Text_29AC43, 6 + trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_29ABDC, Route114_Text_29AC10 + msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2760:: @ 81F2760 - trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_29ACB3, Route114_Text_29AD0A - msgbox Route114_Text_29AD2E, 6 + trainerbattle_single TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A + msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2777:: @ 81F2777 - trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_29ADA1, Route114_Text_29AE05 - msgbox Route114_Text_29AE3D, 6 + trainerbattle_single TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05 + msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE end Route114_EventScript_1F278E:: @ 81F278E - trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D - msgbox Route114_Text_29AF0B, 6 + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D + msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27A9:: @ 81F27A9 - trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B - msgbox Route114_Text_29AFCF, 6 + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B + msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27C4:: @ 81F27C4 - trainerbattle 0, TRAINER_ANGELINA, 0, Route114_Text_29B16F, Route114_Text_29B19C - msgbox Route114_Text_29B1BC, 6 + trainerbattle_single TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C + msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27DB:: @ 81F27DB - trainerbattle 0, TRAINER_CHARLOTTE, 0, Route114_Text_29B0DB, Route114_Text_29B0FB - msgbox Route114_Text_29B11A, 6 + trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB + msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27F2:: @ 81F27F2 - trainerbattle 0, TRAINER_KAI, 0, Route114_Text_29B05D, Route114_Text_29B089 - msgbox Route114_Text_29B0B5, 6 + trainerbattle_single TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089 + msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE end Route114_Text_1F2809: @ 81F2809 diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index f14c15f9e..eecb4fd0d 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -11,7 +11,7 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A faceplayer checkflag FLAG_0x105 goto_eq Route114_FossilManiacsHouse_EventScript_22AD69 - msgbox Route114_FossilManiacsHouse_Text_22AD85, 4 + msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT giveitem_std ITEM_TM28 compare VAR_RESULT, 0 goto_eq Route114_FossilManiacsHouse_EventScript_272054 @@ -20,16 +20,16 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A end Route114_FossilManiacsHouse_EventScript_22AD69:: @ 822AD69 - msgbox Route114_FossilManiacsHouse_Text_22AE48, 4 + msgbox Route114_FossilManiacsHouse_Text_22AE48, MSGBOX_DEFAULT release end Route114_FossilManiacsHouse_EventScript_22AD73:: @ 822AD73 - msgbox Route114_FossilManiacsHouse_Text_22AE92, 3 + msgbox Route114_FossilManiacsHouse_Text_22AE92, MSGBOX_SIGN end Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C - msgbox Route114_FossilManiacsHouse_Text_22AEC2, 3 + msgbox Route114_FossilManiacsHouse_Text_22AEC2, MSGBOX_SIGN end Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index bc5a6d977..fae011f32 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -28,7 +28,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 applymovement 255, Route114_FossilManiacsTunnel_Movement_2725AA waitmovement 0 - msgbox Route114_FossilManiacsTunnel_Text_22B1F7, 4 + msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_0x40CC, 2 releaseall end @@ -44,17 +44,17 @@ Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC - msgbox Route114_FossilManiacsTunnel_Text_22AFD0, 4 + msgbox Route114_FossilManiacsTunnel_Text_22AFD0, MSGBOX_DEFAULT release end Route114_FossilManiacsTunnel_EventScript_22AFBC:: @ 822AFBC - msgbox Route114_FossilManiacsTunnel_Text_22B0D6, 4 + msgbox Route114_FossilManiacsTunnel_Text_22B0D6, MSGBOX_DEFAULT release end Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6 - msgbox Route114_FossilManiacsTunnel_Text_22B1CC, 4 + msgbox Route114_FossilManiacsTunnel_Text_22B1CC, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index 15b016bba..17030ddc1 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_EventObjects: @ 8533DD4 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, FLAG_HIDE_LANETTES_HOUSE_LANETTE Route114_LanettesHouse_MapWarps: @ 8533DEC warp_def 5, 7, 0, 2, MAP_ROUTE114 diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 00bb4f226..f90462c60 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -12,7 +12,7 @@ Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 checkflag FLAG_0x083 goto_eq Route114_LanettesHouse_EventScript_22B2FF setflag FLAG_SYS_PC_LANETTE - msgbox Route114_LanettesHouse_Text_22B34E, 4 + msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT givedecoration_std 99 compare VAR_RESULT, 0 goto_eq Route114_LanettesHouse_EventScript_272067 @@ -21,32 +21,32 @@ Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 end Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF - msgbox Route114_LanettesHouse_Text_22B407, 4 + msgbox Route114_LanettesHouse_Text_22B407, MSGBOX_DEFAULT release end Route114_LanettesHouse_EventScript_22B309:: @ 822B309 lockall - msgbox Route114_LanettesHouse_Text_22B485, 5 + msgbox Route114_LanettesHouse_Text_22B485, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route114_LanettesHouse_EventScript_22B327 - msgbox Route114_LanettesHouse_Text_22B6E4, 4 + msgbox Route114_LanettesHouse_Text_22B6E4, MSGBOX_DEFAULT releaseall end Route114_LanettesHouse_EventScript_22B327:: @ 822B327 - msgbox Route114_LanettesHouse_Text_22B53C, 5 + msgbox Route114_LanettesHouse_Text_22B53C, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route114_LanettesHouse_EventScript_22B33C releaseall end Route114_LanettesHouse_EventScript_22B33C:: @ 822B33C - msgbox Route114_LanettesHouse_Text_22B5EF, 4 + msgbox Route114_LanettesHouse_Text_22B5EF, MSGBOX_DEFAULT return Route114_LanettesHouse_EventScript_22B345:: @ 822B345 - msgbox Route114_LanettesHouse_Text_22B6FC, 3 + msgbox Route114_LanettesHouse_Text_22B6FC, MSGBOX_SIGN end Route114_LanettesHouse_Text_22B34E: @ 822B34E diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index c79c836ea..18179deb1 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -8,20 +8,20 @@ Route115_EventObjects: @ 852A1BC object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0 object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0 object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, 1017 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, 1018 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, FLAG_ITEM_ROUTE_115_SUPER_POTION + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, FLAG_ITEM_ROUTE_115_TM_01 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, FLAG_ITEM_ROUTE_115_IRON object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, BerryTreeScript, 0 object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, 17 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, 1118 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, FLAG_ITEM_ROUTE_115_GREAT_BALL object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0 object_event 18, EVENT_OBJ_GFX_NINJA_BOY, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0 object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0 object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0 object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, 1161 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, 1144 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, FLAG_ITEM_ROUTE_115_PP_UP + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, FLAG_ITEM_ROUTE_115_HEAL_POWDER Route115_MapWarps: @ 852A3E4 warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R @@ -42,7 +42,7 @@ Route115_MapBGEvents: @ 852A3FC bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3 bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3 bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1 - bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, 97 + bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE Route115_MapEvents:: @ 852A4A4 map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 967f2f9ce..3dcf7adee 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -25,125 +25,116 @@ Route115_MapScript2_1F2969: @ 81F2969 .2byte 0 Route115_EventScript_1F2973:: @ 81F2973 - msgbox Route115_Text_1F2B55, 2 + msgbox Route115_Text_1F2B55, MSGBOX_NPC end Route115_EventScript_1F297C:: @ 81F297C - msgbox Route115_Text_1F2BC9, 3 + msgbox Route115_Text_1F2BC9, MSGBOX_SIGN end Route115_EventScript_1F2985:: @ 81F2985 - msgbox Route115_Text_1F2BE3, 3 + msgbox Route115_Text_1F2BE3, MSGBOX_SIGN end Route115_EventScript_1F298E:: @ 81F298E - trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA + trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 - msgbox Route115_Text_29B258, 4 + msgbox Route115_Text_29B258, MSGBOX_DEFAULT release end Route115_EventScript_1F29BA:: @ 81F29BA special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B2B3, 4 - setvar VAR_0x8004, 307 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 307 - callstd 8 + msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT + register_matchcall TRAINER_TIMOTHY_1 release end Route115_EventScript_1F29D9:: @ 81F29D9 - trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372 - msgbox Route115_Text_29B385, 6 + trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372 + msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE end Route115_EventScript_1F29F0:: @ 81F29F0 - trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED - msgbox Route115_Text_29B3FF, 6 + trainerbattle_single TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED + msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A07:: @ 81F2A07 - trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 + trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 - msgbox Route115_Text_29B49D, 4 + msgbox Route115_Text_29B49D, MSGBOX_DEFAULT release end Route115_EventScript_1F2A33:: @ 81F2A33 special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B50B, 4 - setvar VAR_0x8004, 183 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 183 - callstd 8 + msgbox Route115_Text_29B50B, MSGBOX_DEFAULT + register_matchcall TRAINER_NOB_1 release end Route115_EventScript_1F2A52:: @ 81F2A52 - trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D - msgbox Route115_Text_29B5B5, 6 + trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D + msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A69:: @ 81F2A69 - trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 + trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 - msgbox Route115_Text_29B647, 4 + msgbox Route115_Text_29B647, MSGBOX_DEFAULT release end Route115_EventScript_1F2A95:: @ 81F2A95 special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B6AB, 4 - setvar VAR_0x8004, 427 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 427 - callstd 8 + msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT + register_matchcall TRAINER_CYNDY_1 release end Route115_EventScript_1F2AB4:: @ 81F2AB4 - trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A - msgbox Route115_Text_29B737, 6 + trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A + msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2ACB:: @ 81F2ACB - trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5 - msgbox Route115_Text_29B7EA, 6 + trainerbattle_single TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5 + msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AE2:: @ 81F2AE2 - trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D - msgbox Route115_Text_29B869, 6 + trainerbattle_single TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D + msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AF9:: @ 81F2AF9 - trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8 - msgbox Route115_Text_29B904, 6 + trainerbattle_single TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8 + msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B10:: @ 81F2B10 - trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6 - msgbox Route115_Text_29BA04, 6 + trainerbattle_single TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6 + msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B27:: @ 81F2B27 - trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958 - msgbox Route115_Text_29B971, 6 + trainerbattle_single TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958 + msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B3E:: @ 81F2B3E - trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67 - msgbox Route115_Text_29BA87, 6 + trainerbattle_single TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67 + msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE end Route115_Text_1F2B55: @ 81F2B55 diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index f967ebbba..37c54eb7e 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -2,29 +2,29 @@ Route116_EventObjects: @ 852A4B8 object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 17 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 18 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_11 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_12 object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, 1019 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, 1020 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, FLAG_ITEM_ROUTE_116_ETHER + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, FLAG_ITEM_ROUTE_116_REPEL object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, BerryTreeScript, 0 object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 19 + object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, FLAG_HIDE_ROUTE_116_MR_BRINEY + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_13 object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 20 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_14 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, FLAG_ITEM_ROUTE_116_HP_UP object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0 object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0 object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, 947 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, 1001 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813 + object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, FLAG_ITEM_ROUTE_116_X_SPECIAL + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, FLAG_HIDE_ROUTE_116_TUNNELER + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN object_event 23, EVENT_OBJ_GFX_WOMAN_2, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0 object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_1F3058, 0 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, 1146 - object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, 21 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, FLAG_ITEM_ROUTE_116_POTION + object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_15 object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 @@ -48,8 +48,8 @@ Route116_MapBGEvents: @ 852A790 bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D7B bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 - bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, 45 - bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, 96 + bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION + bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES Route116_MapEvents:: @ 852A814 map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 769d254a5..af9210a36 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -37,17 +37,17 @@ Route116_EventScript_1F2C70:: @ 81F2C70 goto_eq Route116_EventScript_1F2C8E checkflag FLAG_0x08E goto_eq Route116_EventScript_1F2C98 - msgbox Route116_Text_1F3140, 4 + msgbox Route116_Text_1F3140, MSGBOX_DEFAULT release end Route116_EventScript_1F2C8E:: @ 81F2C8E - msgbox Route116_Text_1F32C1, 4 + msgbox Route116_Text_1F32C1, MSGBOX_DEFAULT release end Route116_EventScript_1F2C98:: @ 81F2C98 - msgbox Route116_Text_1F3166, 4 + msgbox Route116_Text_1F3166, MSGBOX_DEFAULT release end @@ -56,7 +56,7 @@ Route116_EventScript_1F2CA2:: @ 81F2CA2 faceplayer checkflag FLAG_0x11F goto_eq Route116_EventScript_1F2D2B - msgbox Route116_Text_1F3317, 4 + msgbox Route116_Text_1F3317, MSGBOX_DEFAULT goto Route116_EventScript_1F2CBB end @@ -65,7 +65,7 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB giveitem_std ITEM_REPEAT_BALL compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2D39 - msgbox Route116_Text_1F3521, 4 + msgbox Route116_Text_1F3521, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, Route116_EventScript_1F2D15 @@ -76,7 +76,7 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB compare VAR_FACING, 4 call_if 1, Route116_EventScript_1F2D20 removeobject VAR_LAST_TALKED - clearflag FLAG_0x3B5 + clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE setflag FLAG_0x100 release end @@ -92,12 +92,12 @@ Route116_EventScript_1F2D20:: @ 81F2D20 return Route116_EventScript_1F2D2B:: @ 81F2D2B - msgbox Route116_Text_1F35CE, 4 + msgbox Route116_Text_1F35CE, MSGBOX_DEFAULT goto Route116_EventScript_1F2CBB end Route116_EventScript_1F2D39:: @ 81F2D39 - msgbox Route116_Text_1F3593, 4 + msgbox Route116_Text_1F3593, MSGBOX_DEFAULT release end @@ -126,29 +126,29 @@ Route116_Movement_1F2D4C: @ 81F2D4C step_end Route116_EventScript_1F2D57:: @ 81F2D57 - msgbox Route116_Text_1F379D, 3 + msgbox Route116_Text_1F379D, MSGBOX_SIGN end Route116_EventScript_1F2D60:: @ 81F2D60 - msgbox Route116_Text_1F37B7, 3 + msgbox Route116_Text_1F37B7, MSGBOX_SIGN end Route116_EventScript_1F2D69:: @ 81F2D69 - msgbox Route116_Text_1F380F, 3 + msgbox Route116_Text_1F380F, MSGBOX_SIGN end Route116_EventScript_1F2D72:: @ 81F2D72 - msgbox Route116_Text_1F3825, 3 + msgbox Route116_Text_1F3825, MSGBOX_SIGN end Route116_EventScript_1F2D7B:: @ 81F2D7B - msgbox Route116_Text_1F38D4, 3 + msgbox Route116_Text_1F38D4, MSGBOX_SIGN end Route116_EventScript_1F2D84:: @ 81F2D84 lock faceplayer - msgbox Route116_Text_1F309D, 4 + msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 release end @@ -158,7 +158,7 @@ Route116_EventScript_1F2D95:: @ 81F2D95 applymovement 11, Route116_Movement_2725A8 applymovement 255, Route116_Movement_2725A4 waitmovement 0 - msgbox Route116_Text_1F309D, 4 + msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 releaseall end @@ -172,28 +172,28 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6 specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2DE2 - msgbox Route116_Text_1F3657, 4 + msgbox Route116_Text_1F3657, MSGBOX_DEFAULT release end Route116_EventScript_1F2DE2:: @ 81F2DE2 - msgbox Route116_Text_1F3718, 4 + msgbox Route116_Text_1F3718, MSGBOX_DEFAULT closemessage goto Route116_EventScript_1F2E2A end Route116_EventScript_1F2DF1:: @ 81F2DF1 - msgbox Route116_Text_1F3657, 4 - msgbox Route116_Text_1F3688, 4 + msgbox Route116_Text_1F3657, MSGBOX_DEFAULT + msgbox Route116_Text_1F3688, MSGBOX_DEFAULT specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2E1B - msgbox Route116_Text_1F375E, 4 + msgbox Route116_Text_1F375E, MSGBOX_DEFAULT release end Route116_EventScript_1F2E1B:: @ 81F2E1B - msgbox Route116_Text_1F36B4, 4 + msgbox Route116_Text_1F36B4, MSGBOX_DEFAULT closemessage goto Route116_EventScript_1F2E2A end @@ -248,17 +248,17 @@ Route116_Movement_1F2E7E: @ 81F2E7E step_end Route116_EventScript_1F2E89:: @ 81F2E89 - trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A - msgbox Route116_Text_29BBC6, 6 + trainerbattle_single TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A + msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2EA0:: @ 81F2EA0 - trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25 - msgbox Route116_Text_29BC42, 6 + trainerbattle_single TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25 + msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2EB7:: @ 81F2EB7 - trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 + trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2F4E @@ -266,7 +266,7 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2F22 - msgbox Route116_Text_29BD92, 4 + msgbox Route116_Text_29BD92, MSGBOX_DEFAULT release end @@ -279,47 +279,41 @@ Route116_EventScript_1F2EF8:: @ 81F2EF8 Route116_EventScript_1F2F03:: @ 81F2F03 special sub_80B4808 waitmovement 0 - msgbox Route116_Text_29BE71, 4 - setvar VAR_0x8004, 273 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 273 - callstd 8 + msgbox Route116_Text_29BE71, MSGBOX_DEFAULT + register_matchcall TRAINER_JERRY_1 release end Route116_EventScript_1F2F22:: @ 81F2F22 checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2F35 - msgbox Route116_Text_29BD92, 4 + msgbox Route116_Text_29BD92, MSGBOX_DEFAULT release end Route116_EventScript_1F2F35:: @ 81F2F35 - msgbox Route116_Text_29BDEF, 4 - setvar VAR_0x8004, 273 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 273 - callstd 8 + msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT + register_matchcall TRAINER_JERRY_1 release end Route116_EventScript_1F2F4E:: @ 81F2F4E - trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C - msgbox Route116_Text_29BF68, 6 + trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C + msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F65:: @ 81F2F65 - trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F - msgbox Route116_Text_29BB31, 6 + trainerbattle_single TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F + msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F7C:: @ 81F2F7C - trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3 - msgbox Route116_Text_29BCCC, 6 + trainerbattle_single TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3 + msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F93:: @ 81F2F93 - trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 + trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F302A @@ -327,7 +321,7 @@ Route116_EventScript_1F2F93:: @ 81F2F93 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2FFE - msgbox Route116_Text_29C010, 4 + msgbox Route116_Text_29C010, MSGBOX_DEFAULT release end @@ -340,53 +334,47 @@ Route116_EventScript_1F2FD4:: @ 81F2FD4 Route116_EventScript_1F2FDF:: @ 81F2FDF special sub_80B4808 waitmovement 0 - msgbox Route116_Text_29C096, 4 - setvar VAR_0x8004, 280 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 280 - callstd 8 + msgbox Route116_Text_29C096, MSGBOX_DEFAULT + register_matchcall TRAINER_KAREN_1 release end Route116_EventScript_1F2FFE:: @ 81F2FFE checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F3011 - msgbox Route116_Text_29C010, 4 + msgbox Route116_Text_29C010, MSGBOX_DEFAULT release end Route116_EventScript_1F3011:: @ 81F3011 - msgbox Route116_Text_29C052, 4 - setvar VAR_0x8004, 280 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 280 - callstd 8 + msgbox Route116_Text_29C052, MSGBOX_DEFAULT + register_matchcall TRAINER_KAREN_1 release end Route116_EventScript_1F302A:: @ 81F302A - trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F - msgbox Route116_Text_29C13B, 6 + trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F + msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3041:: @ 81F3041 - trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8 - msgbox Route116_Text_29C1EA, 6 + trainerbattle_single TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8 + msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3058:: @ 81F3058 - trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2 - msgbox Route116_Text_29C2DD, 6 + trainerbattle_single TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2 + msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE end Route116_EventScript_1F306F:: @ 81F306F - trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365 - msgbox Route116_Text_29C380, 6 + trainerbattle_single TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365 + msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3086:: @ 81F3086 - trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7 - msgbox Route116_Text_29C418, 6 + trainerbattle_single TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7 + msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE end Route116_Text_1F309D: @ 81F309D diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index b2c009337..3e7204e75 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -7,11 +7,11 @@ Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 end Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A - msgbox Route116_TunnelersRestHouse_Text_22B88B, 2 + msgbox Route116_TunnelersRestHouse_Text_22B88B, MSGBOX_NPC end Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863 - msgbox Route116_TunnelersRestHouse_Text_22B99F, 2 + msgbox Route116_TunnelersRestHouse_Text_22B99F, MSGBOX_NPC end Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C @@ -19,12 +19,12 @@ Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C faceplayer checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq Route116_TunnelersRestHouse_EventScript_22B881 - msgbox Route116_TunnelersRestHouse_Text_22BAAF, 4 + msgbox Route116_TunnelersRestHouse_Text_22BAAF, MSGBOX_DEFAULT release end Route116_TunnelersRestHouse_EventScript_22B881:: @ 822B881 - msgbox Route116_TunnelersRestHouse_Text_22BB3B, 4 + msgbox Route116_TunnelersRestHouse_Text_22BB3B, MSGBOX_DEFAULT release end diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index 0a1e6bead..4cede4040 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -12,9 +12,9 @@ Route117_EventObjects: @ 852A828 object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, BerryTreeScript, 0 object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, BerryTreeScript, 0 object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, 17 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023 + object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EB9, FLAG_ITEM_ROUTE_117_GREAT_BALL + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, FLAG_ITEM_ROUTE_117_REVIVE object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0 object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0 object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0 @@ -31,7 +31,7 @@ Route117_MapBGEvents: @ 852AA70 bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5 bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7 - bg_hidden_item_event 3, 18, 3, ITEM_REPEL, 72 + bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL Route117_MapEvents:: @ 852AAA0 map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index eb04664bd..e80148cd7 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -15,193 +15,175 @@ Route117_EventScript_1F3999:: @ 81F3999 return Route117_EventScript_1F399A:: @ 81F399A - msgbox Route117_Text_1F3CFD, 2 + msgbox Route117_Text_1F3CFD, MSGBOX_NPC end Route117_EventScript_1F39A3:: @ 81F39A3 - msgbox Route117_Text_1F3D41, 2 + msgbox Route117_Text_1F3D41, MSGBOX_NPC end Route117_EventScript_1F39AC:: @ 81F39AC - msgbox Route117_Text_1F3C7C, 2 + msgbox Route117_Text_1F3C7C, MSGBOX_NPC end Route117_EventScript_1F39B5:: @ 81F39B5 - msgbox Route117_Text_1F3D58, 3 + msgbox Route117_Text_1F3D58, MSGBOX_SIGN end Route117_EventScript_1F39BE:: @ 81F39BE - msgbox Route117_Text_1F3D74, 3 + msgbox Route117_Text_1F3D74, MSGBOX_SIGN end Route117_EventScript_1F39C7:: @ 81F39C7 - msgbox Route117_Text_1F3D8E, 3 + msgbox Route117_Text_1F3D8E, MSGBOX_SIGN end Route117_EventScript_1F39D0:: @ 81F39D0 - trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC + trainerbattle_single TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A1B - msgbox Route117_Text_29C498, 4 + msgbox Route117_Text_29C498, MSGBOX_DEFAULT release end Route117_EventScript_1F39FC:: @ 81F39FC special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29C508, 4 - setvar VAR_0x8004, 538 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 538 - callstd 8 + msgbox Route117_Text_29C508, MSGBOX_DEFAULT + register_matchcall TRAINER_ISAAC_1 release end Route117_EventScript_1F3A1B:: @ 81F3A1B - trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_29C549, Route117_Text_29C58B - msgbox Route117_Text_29C5D0, 6 + trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_29C549, Route117_Text_29C58B + msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3A32:: @ 81F3A32 - trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E + trainerbattle_single TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A7D - msgbox Route117_Text_29C679, 4 + msgbox Route117_Text_29C679, MSGBOX_DEFAULT release end Route117_EventScript_1F3A5E:: @ 81F3A5E special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29C6BC, 4 - setvar VAR_0x8004, 545 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 545 - callstd 8 + msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT + register_matchcall TRAINER_LYDIA_1 release end Route117_EventScript_1F3A7D:: @ 81F3A7D - trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_29C6FD, Route117_Text_29C73E - msgbox Route117_Text_29C75A, 6 + trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_29C6FD, Route117_Text_29C73E + msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3A94:: @ 81F3A94 - trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 + trainerbattle_single TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3ADF - msgbox Route117_Text_29C800, 4 + msgbox Route117_Text_29C800, MSGBOX_DEFAULT release end Route117_EventScript_1F3AC0:: @ 81F3AC0 special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29C846, 4 - setvar VAR_0x8004, 364 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 364 - callstd 8 + msgbox Route117_Text_29C846, MSGBOX_DEFAULT + register_matchcall TRAINER_DYLAN_1 release end Route117_EventScript_1F3ADF:: @ 81F3ADF - trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_29C880, Route117_Text_29C8E3 - msgbox Route117_Text_29C8FE, 6 + trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_29C880, Route117_Text_29C8E3 + msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3AF6:: @ 81F3AF6 - trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 + trainerbattle_single TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3B41 - msgbox Route117_Text_29C9D0, 4 + msgbox Route117_Text_29C9D0, MSGBOX_DEFAULT release end Route117_EventScript_1F3B22:: @ 81F3B22 special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29CA32, 4 - setvar VAR_0x8004, 369 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 369 - callstd 8 + msgbox Route117_Text_29CA32, MSGBOX_DEFAULT + register_matchcall TRAINER_MARIA_1 release end Route117_EventScript_1F3B41:: @ 81F3B41 - trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_29CA7C, Route117_Text_29CACC - msgbox Route117_Text_29CAF6, 6 + trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_29CA7C, Route117_Text_29CACC + msgbox Route117_Text_29CAF6, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3B58:: @ 81F3B58 - trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_29CB32, Route117_Text_29CB87 - msgbox Route117_Text_29CBAD, 6 + trainerbattle_single TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87 + msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3B6F:: @ 81F3B6F - trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3BB8 - msgbox Route117_Text_29CCCB, 4 + msgbox Route117_Text_29CCCB, MSGBOX_DEFAULT release end Route117_EventScript_1F3B9F:: @ 81F3B9F - msgbox Route117_Text_29CD1D, 4 - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd 8 + msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT + register_matchcall TRAINER_ANNA_AND_MEG_1 release end Route117_EventScript_1F3BB8:: @ 81F3BB8 - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E - msgbox Route117_Text_29CF1C, 6 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E + msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3BD3:: @ 81F3BD3 - trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3C1C - msgbox Route117_Text_29CE17, 4 + msgbox Route117_Text_29CE17, MSGBOX_DEFAULT release end Route117_EventScript_1F3C03:: @ 81F3C03 - msgbox Route117_Text_29CD1D, 4 - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd 8 + msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT + register_matchcall TRAINER_ANNA_AND_MEG_1 release end Route117_EventScript_1F3C1C:: @ 81F3C1C - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 - msgbox Route117_Text_29CFFE, 6 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 + msgbox Route117_Text_29CFFE, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C37:: @ 81F3C37 - trainerbattle 0, TRAINER_MELINA, 0, Route117_Text_29D0B7, Route117_Text_29D0F1 - msgbox Route117_Text_29D10E, 6 + trainerbattle_single TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1 + msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C4E:: @ 81F3C4E - trainerbattle 0, TRAINER_BRANDI, 0, Route117_Text_29D14B, Route117_Text_29D189 - msgbox Route117_Text_29D196, 6 + trainerbattle_single TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189 + msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C65:: @ 81F3C65 - trainerbattle 0, TRAINER_AISHA, 0, Route117_Text_29D1D1, Route117_Text_29D206 - msgbox Route117_Text_29D24C, 6 + trainerbattle_single TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206 + msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE end Route117_Text_1F3C7C: @ 81F3C7C diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index 19d36d602..fe131549f 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -3,22 +3,22 @@ Route118_EventObjects: @ 852AAB4 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0 object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, 797 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, 797 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, 901 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, 904 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, 904 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, 17 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_TEMP_11 object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0 object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0 object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0 object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 966 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_118_STEVEN + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 Route118_MapWarps: @ 852ACAC @@ -38,8 +38,8 @@ Route118_MapBGEvents: @ 852ACEC bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1 - bg_hidden_item_event 31, 13, 3, ITEM_IRON, 67 - bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, 66 + bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON + bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE Route118_MapEvents:: @ 852AD58 map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 09fad07e7..f88e0e9c3 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -30,7 +30,7 @@ Route118_EventScript_1F3E14:: @ 81F3E14 faceplayer checkflag FLAG_0x0E3 goto_eq Route118_EventScript_1F3E69 - msgbox Route118_Text_1F427B, 5 + msgbox Route118_Text_1F427B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3E3E compare VAR_RESULT, 0 @@ -38,33 +38,33 @@ Route118_EventScript_1F3E14:: @ 81F3E14 end Route118_EventScript_1F3E3E:: @ 81F3E3E - msgbox Route118_Text_1F42AF, 4 + msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT giveitem_std ITEM_GOOD_ROD setflag FLAG_0x0E3 - msgbox Route118_Text_1F42E7, 4 + msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT release end Route118_EventScript_1F3E5F:: @ 81F3E5F - msgbox Route118_Text_1F4319, 4 + msgbox Route118_Text_1F4319, MSGBOX_DEFAULT release end Route118_EventScript_1F3E69:: @ 81F3E69 - msgbox Route118_Text_1F4331, 4 + msgbox Route118_Text_1F4331, MSGBOX_DEFAULT release end Route118_EventScript_1F3E73:: @ 81F3E73 - msgbox Route118_Text_1F4367, 2 + msgbox Route118_Text_1F4367, MSGBOX_NPC end Route118_EventScript_1F3E7C:: @ 81F3E7C - msgbox Route118_Text_1F43F4, 3 + msgbox Route118_Text_1F43F4, MSGBOX_SIGN end Route118_EventScript_1F3E85:: @ 81F3E85 - msgbox Route118_Text_1F440E, 3 + msgbox Route118_Text_1F440E, MSGBOX_SIGN end Route118_EventScript_1F3E8E:: @ 81F3E8E @@ -100,7 +100,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 applymovement 19, Route118_Movement_1F3F65 waitmovement 0 delay 30 - msgbox Route118_Text_1F40BE, 4 + msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, Route118_EventScript_1F3F28 @@ -187,78 +187,72 @@ Route118_Movement_1F3F7E: @ 81F3F7E step_end Route118_EventScript_1F3F87:: @ 81F3F87 - trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 + trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 - msgbox Route118_Text_29D2FA, 4 + msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT release end Route118_EventScript_1F3FB3:: @ 81F3FB3 special sub_80B4808 waitmovement 0 - msgbox Route118_Text_29D343, 4 - setvar VAR_0x8004, 37 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 37 - callstd 8 + msgbox Route118_Text_29D343, MSGBOX_DEFAULT + register_matchcall TRAINER_ROSE_1 release end Route118_EventScript_1F3FD2:: @ 81F3FD2 - trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA - msgbox Route118_Text_29D3D9, 6 + trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA + msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE end Route118_EventScript_1F3FE9:: @ 81F3FE9 - trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C - msgbox Route118_Text_29D587, 6 + trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C + msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4000:: @ 81F4000 - trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C - msgbox Route118_Text_29D663, 6 + trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C + msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4017:: @ 81F4017 - trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 + trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 - msgbox Route118_Text_29D6D8, 4 + msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT release end Route118_EventScript_1F4043:: @ 81F4043 special sub_80B4808 waitmovement 0 - msgbox Route118_Text_29D74A, 4 - setvar VAR_0x8004, 196 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 196 - callstd 8 + msgbox Route118_Text_29D74A, MSGBOX_DEFAULT + register_matchcall TRAINER_DALTON_1 release end Route118_EventScript_1F4062:: @ 81F4062 - trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA - msgbox Route118_Text_29D7D5, 6 + trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA + msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4079:: @ 81F4079 - trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B - msgbox Route118_Text_29D46C, 6 + trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B + msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4090:: @ 81F4090 - trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4 - msgbox Route118_Text_29D4DA, 6 + trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4 + msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE end Route118_EventScript_1F40A7:: @ 81F40A7 - trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C - msgbox Route118_Text_29D872, 6 + trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C + msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE end Route118_Text_1F40BE: @ 81F40BE diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 1abed81eb..3a7d1422b 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -14,34 +14,34 @@ Route119_EventObjects: @ 852AD6C object_event 13, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0 object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0 object_event 15, EVENT_OBJ_GFX_MAN_5, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0 - object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 851 - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, 1025 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, 1027 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, 1028 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, 1029 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890 - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890 - object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 923 + object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, FLAG_ITEM_ROUTE_119_SUPER_REPEL + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, FLAG_ITEM_ROUTE_119_ZINC + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, FLAG_ITEM_ROUTE_119_ELIXIR_1 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, FLAG_ITEM_ROUTE_119_LEAF_STONE + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, FLAG_ITEM_ROUTE_119_RARE_CANDY + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, FLAG_ITEM_ROUTE_119_HYPER_POTION_1 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, FLAG_HIDE_ROUTE_119_TEAM_AQUA + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, FLAG_HIDE_ROUTE_119_TEAM_AQUA + object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0 object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, BerryTreeScript, 0 object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, BerryTreeScript, 0 object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, BerryTreeScript, 0 object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, BerryTreeScript, 0 object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_1F476B, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, 1106 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, FLAG_ITEM_ROUTE_119_HYPER_POTION_2 object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0 object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, 989 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, 990 + object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, FLAG_HIDE_ROUTE_119_KECLEON_1 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, FLAG_HIDE_ROUTE_119_KECLEON_2 object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1F4947, 0 object_event 38, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0 object_event 39, EVENT_OBJ_GFX_MAN_5, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0 object_event 40, EVENT_OBJ_GFX_MAN_5, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0 - object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, 1134 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147 - object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 786 + object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, FLAG_ITEM_ROUTE_119_NUGGET + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, FLAG_ITEM_ROUTE_119_ELIXIR_2 + object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_SCOTT Route119_MapWarps: @ 852B174 warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F @@ -83,15 +83,15 @@ Route119_MapBGEvents: @ 852B2F4 bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1 bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3 bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3 - bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, 5 - bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, 6 + bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM + bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3 bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3 bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3 bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3 bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3 - bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, 68 - bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, 87 + bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL + bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3 Route119_MapEvents:: @ 852B3E4 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index f2e52d50c..87acdeb84 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -24,8 +24,8 @@ Route119_MapScript1_1F444D: @ 81F444D end Route119_EventScript_1F4466:: @ 81F4466 - setflag FLAG_0x37D - clearflag FLAG_0x37C + setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS + clearflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS setvar VAR_WEATHER_INSTITUTE_STATE, 2 return @@ -79,7 +79,7 @@ Route119_EventScript_1F4506:: @ 81F4506 return Route119_EventScript_1F450B:: @ 81F450B - msgbox Route119_Text_1F49FD, 4 + msgbox Route119_Text_1F49FD, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route119_EventScript_1F453A case 1, Route119_EventScript_1F454A @@ -87,29 +87,29 @@ Route119_EventScript_1F450B:: @ 81F450B end Route119_EventScript_1F453A:: @ 81F453A - trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_1F4A98 + trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_1F4A98 goto Route119_EventScript_1F456A end Route119_EventScript_1F454A:: @ 81F454A - trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_1F4A98 + trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_1F4A98 goto Route119_EventScript_1F456A end Route119_EventScript_1F455A:: @ 81F455A - trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_1F4A98 + trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_1F4A98 goto Route119_EventScript_1F456A end Route119_EventScript_1F456A:: @ 81F456A - msgbox Route119_Text_1F4AF3, 4 + msgbox Route119_Text_1F4AF3, MSGBOX_DEFAULT call Route119_EventScript_1F45FF - msgbox Route119_Text_1F4B56, 4 + msgbox Route119_Text_1F4B56, MSGBOX_DEFAULT goto Route119_EventScript_1F460F end Route119_EventScript_1F4585:: @ 81F4585 - msgbox Route119_Text_1F4C9A, 4 + msgbox Route119_Text_1F4C9A, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route119_EventScript_1F45B4 case 1, Route119_EventScript_1F45C4 @@ -117,24 +117,24 @@ Route119_EventScript_1F4585:: @ 81F4585 end Route119_EventScript_1F45B4:: @ 81F45B4 - trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1F4D24 + trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1F4D24 goto Route119_EventScript_1F45E4 end Route119_EventScript_1F45C4:: @ 81F45C4 - trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1F4D24 + trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1F4D24 goto Route119_EventScript_1F45E4 end Route119_EventScript_1F45D4:: @ 81F45D4 - trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1F4D24 + trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1F4D24 goto Route119_EventScript_1F45E4 end Route119_EventScript_1F45E4:: @ 81F45E4 - msgbox Route119_Text_1F4D4B, 4 + msgbox Route119_Text_1F4D4B, MSGBOX_DEFAULT call Route119_EventScript_1F45FF - msgbox Route119_Text_1F4DB5, 4 + msgbox Route119_Text_1F4DB5, MSGBOX_DEFAULT goto Route119_EventScript_1F460F end @@ -169,7 +169,7 @@ Route119_EventScript_1F460F:: @ 81F460F applymovement 43, Route119_Movement_1F4752 waitmovement 0 addvar VAR_0x40D1, 1 - msgbox Route119_Text_1F4E60, 4 + msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1F46B0 @@ -325,146 +325,140 @@ Route119_Movement_1F4763: @ 81F4763 step_end Route119_EventScript_1F476B:: @ 81F476B - msgbox Route119_Text_1F5261, 2 + msgbox Route119_Text_1F5261, MSGBOX_NPC end Route119_EventScript_1F4774:: @ 81F4774 - msgbox Route119_Text_1F530E, 3 + msgbox Route119_Text_1F530E, MSGBOX_SIGN end Route119_EventScript_1F477D:: @ 81F477D - msgbox Route119_Text_1F5327, 3 + msgbox Route119_Text_1F5327, MSGBOX_SIGN end Route119_EventScript_1F4786:: @ 81F4786 - trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0 - msgbox Route119_Text_29D902, 6 + trainerbattle_single TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0 + msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE end Route119_EventScript_1F479D:: @ 81F479D - trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C - msgbox Route119_Text_29D993, 6 + trainerbattle_single TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C + msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47B4:: @ 81F47B4 - trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14 - msgbox Route119_Text_29DA2C, 6 + trainerbattle_single TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14 + msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47CB:: @ 81F47CB - trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC - msgbox Route119_Text_29DADB, 6 + trainerbattle_single TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC + msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47E2:: @ 81F47E2 - trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66 - msgbox Route119_Text_29DB7C, 6 + trainerbattle_single TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66 + msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47F9:: @ 81F47F9 - trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20 - msgbox Route119_Text_29DC2B, 6 + trainerbattle_single TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20 + msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4810:: @ 81F4810 - trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C + trainerbattle_single TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F485B - msgbox Route119_Text_29DCC6, 4 + msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT release end Route119_EventScript_1F483C:: @ 81F483C special sub_80B4808 waitmovement 0 - msgbox Route119_Text_29DD1C, 4 - setvar VAR_0x8004, 552 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 552 - callstd 8 + msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT + register_matchcall TRAINER_JACKSON_1 release end Route119_EventScript_1F485B:: @ 81F485B - trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5 - msgbox Route119_Text_29DDBD, 6 + trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_29DD62, Route119_Text_29DDA5 + msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4872:: @ 81F4872 - trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E + trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F48BD - msgbox Route119_Text_29DE88, 4 + msgbox Route119_Text_29DE88, MSGBOX_DEFAULT release end Route119_EventScript_1F489E:: @ 81F489E special sub_80B4808 waitmovement 0 - msgbox Route119_Text_29DEF7, 4 - setvar VAR_0x8004, 559 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 559 - callstd 8 + msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT + register_matchcall TRAINER_CATHERINE_1 release end Route119_EventScript_1F48BD:: @ 81F48BD - trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92 - msgbox Route119_Text_29DFAF, 6 + trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_29DF6B, Route119_Text_29DF92 + msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE end Route119_EventScript_1F48D4:: @ 81F48D4 - trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063 - msgbox Route119_Text_29E071, 6 + trainerbattle_single TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063 + msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE end Route119_EventScript_1F48EB:: @ 81F48EB - trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1 - msgbox Route119_Text_29E0F6, 6 + trainerbattle_single TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1 + msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4902:: @ 81F4902 - trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D - msgbox Route119_Text_29E19D, 6 + trainerbattle_single TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D + msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4919:: @ 81F4919 - trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B - msgbox Route119_Text_29E245, 6 + trainerbattle_single TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B + msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4930:: @ 81F4930 - trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288 - msgbox Route119_Text_29E2A3, 6 + trainerbattle_single TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288 + msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4947:: @ 81F4947 - trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372 - msgbox Route119_Text_29E3A2, 6 + trainerbattle_single TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372 + msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE end Route119_EventScript_1F495E:: @ 81F495E - trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F - msgbox Route119_Text_29E492, 6 + trainerbattle_single TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F + msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4975:: @ 81F4975 - trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513 - msgbox Route119_Text_29E532, 6 + trainerbattle_single TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513 + msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE end Route119_EventScript_1F498C:: @ 81F498C - trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1 - msgbox Route119_Text_29E5CB, 6 + trainerbattle_single TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1 + msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE end Route119_EventScript_1F49A3:: @ 81F49A3 lock faceplayer - msgbox Route119_Text_1F50EB, 4 + msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 waitmovement 0 @@ -474,7 +468,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3 Route119_EventScript_1F49BA:: @ 81F49BA lock faceplayer - msgbox Route119_Text_1F5147, 4 + msgbox Route119_Text_1F5147, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 waitmovement 0 @@ -482,15 +476,15 @@ Route119_EventScript_1F49BA:: @ 81F49BA end Route119_EventScript_1F49D1:: @ 81F49D1 - msgbox Route119_Text_1F51A2, 2 + msgbox Route119_Text_1F51A2, MSGBOX_NPC end Route119_EventScript_1F49DA:: @ 81F49DA - msgbox Route119_Text_1F52B9, 2 + msgbox Route119_Text_1F52B9, MSGBOX_NPC end Route119_EventScript_1F49E3:: @ 81F49E3 - msgbox Route119_Text_1F5339, 3 + msgbox Route119_Text_1F5339, MSGBOX_SIGN end Route119_EventScript_1F49EC:: @ 81F49EC diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc index 5e633437d..4d4826bdf 100644 --- a/data/maps/Route119_House/scripts.inc +++ b/data/maps/Route119_House/scripts.inc @@ -2,7 +2,7 @@ Route119_House_MapScripts:: @ 8270965 .byte 0 Route119_House_EventScript_270966:: @ 8270966 - msgbox Route119_House_Text_270982, 2 + msgbox Route119_House_Text_270982, MSGBOX_NPC end Route119_House_EventScript_27096F:: @ 827096F @@ -10,7 +10,7 @@ Route119_House_EventScript_27096F:: @ 827096F faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox Route119_House_Text_270A17, 4 + msgbox Route119_House_Text_270A17, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index a46081332..6d72fea9c 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -1,8 +1,8 @@ Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, FLAG_HIDE_ROUTE_119_TEAM_AQUA + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, FLAG_HIDE_ROUTE_119_TEAM_AQUA + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index b008f52c0..f5b97bffa 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -18,12 +18,12 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 special GetPlayerBigGuyGirlString compare VAR_WEATHER_INSTITUTE_STATE, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FCE5, MSGBOX_DEFAULT release end Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCB7, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FCB7, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF compare VAR_0x8004, 2 goto_eq Route119_WeatherInstitute_1F_EventScript_26FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FDE8, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT release end @@ -48,30 +48,30 @@ Route119_WeatherInstitute_1F_EventScript_26FAFF:: @ 826FAFF return Route119_WeatherInstitute_1F_EventScript_26FB05:: @ 826FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FD2E, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FD2E, MSGBOX_DEFAULT release end Route119_WeatherInstitute_1F_EventScript_26FB0F:: @ 826FB0F - msgbox Route119_WeatherInstitute_1F_Text_26FE94, 2 + msgbox Route119_WeatherInstitute_1F_Text_26FE94, MSGBOX_NPC end Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 lockall - msgbox Route119_WeatherInstitute_1F_Text_26FEFC, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT closemessage call Route119_WeatherInstitute_1F_EventScript_272083 releaseall end Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29 - trainerbattle 0, TRAINER_GRUNT_11, 0, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB - msgbox Route119_WeatherInstitute_1F_Text_26FBD7, 6 + trainerbattle_single TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB + msgbox Route119_WeatherInstitute_1F_Text_26FBD7, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40 - trainerbattle 0, TRAINER_GRUNT_20, 0, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 - msgbox Route119_WeatherInstitute_1F_Text_26FC60, 6 + trainerbattle_single TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 + msgbox Route119_WeatherInstitute_1F_Text_26FC60, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_1F_Text_26FB57: @ 826FB57 diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc index ae7f8b9fc..d2cc64d40 100644 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc @@ -1,12 +1,12 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, FLAG_HIDE_ROUTE_119_TEAM_AQUA + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, FLAG_HIDE_ROUTE_119_TEAM_AQUA + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, FLAG_HIDE_ROUTE_119_TEAM_AQUA + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 992 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, FLAG_HIDE_ROUTE_119_TEAM_AQUA Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index b2341bf3d..1b7ba28de 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -27,47 +27,47 @@ Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C return Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 - trainerbattle 0, TRAINER_GRUNT_37, 0, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F - msgbox Route119_WeatherInstitute_2F_Text_2703C0, 6 + trainerbattle_single TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F + msgbox Route119_WeatherInstitute_2F_Text_2703C0, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F - trainerbattle 0, TRAINER_GRUNT_12, 0, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 - msgbox Route119_WeatherInstitute_2F_Text_27022B, 6 + trainerbattle_single TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 + msgbox Route119_WeatherInstitute_2F_Text_27022B, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96 - trainerbattle 0, TRAINER_GRUNT_13, 0, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE - msgbox Route119_WeatherInstitute_2F_Text_2702DA, 6 + trainerbattle_single TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE + msgbox Route119_WeatherInstitute_2F_Text_2702DA, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD - trainerbattle 2, TRAINER_SHELLY_1, 0, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, 6 + trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 + msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, 4 + msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_DEFAULT closemessage addobject 7 applymovement 7, Route119_WeatherInstitute_2F_Movement_270170 applymovement 255, Route119_WeatherInstitute_2F_Movement_27017C waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_270568, 4 + msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT closemessage playse SE_PIN applymovement 3, Route119_WeatherInstitute_2F_Movement_272598 waitmovement 0 applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4 + msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT closemessage setvar VAR_WEATHER_INSTITUTE_STATE, 1 - clearflag FLAG_0x37D + clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS fadedefaultbgm fadescreen 1 - setflag FLAG_0x37A - setflag FLAG_0x3E0 + setflag FLAG_HIDE_ROUTE_119_TEAM_AQUA + setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M removeobject 1 removeobject 2 removeobject 3 @@ -83,7 +83,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 end Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D - msgbox Route119_WeatherInstitute_2F_Text_270650, 4 + msgbox Route119_WeatherInstitute_2F_Text_270650, MSGBOX_DEFAULT setvar VAR_TEMP_1, 385 givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 compare VAR_RESULT, 0 @@ -95,7 +95,7 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 call Route119_WeatherInstitute_2F_EventScript_2700DB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B @@ -105,7 +105,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD call Route119_WeatherInstitute_2F_EventScript_2700DB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0 call Route119_WeatherInstitute_2F_EventScript_273797 @@ -126,7 +126,7 @@ Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB return Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA - msgbox Route119_WeatherInstitute_2F_Text_2706FE, 4 + msgbox Route119_WeatherInstitute_2F_Text_2706FE, MSGBOX_DEFAULT setflag FLAG_0x097 release end @@ -134,7 +134,7 @@ Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 checkflag FLAG_SYS_GAME_CLEAR goto_eq Route119_WeatherInstitute_2F_EventScript_27010A - msgbox Route119_WeatherInstitute_2F_Text_27077E, 4 + msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT release end @@ -146,23 +146,23 @@ Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 compare VAR_0x8004, 2 goto_eq Route119_WeatherInstitute_2F_EventScript_270166 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, Route119_WeatherInstitute_2F_EventScript_270159 specialvar VAR_RESULT, sub_813B374 compare VAR_RESULT, 1 goto_eq Route119_WeatherInstitute_2F_EventScript_27014F - msgbox Route119_WeatherInstitute_2F_Text_2707F1, 4 + msgbox Route119_WeatherInstitute_2F_Text_2707F1, MSGBOX_DEFAULT release end Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F - msgbox Route119_WeatherInstitute_2F_Text_270873, 4 + msgbox Route119_WeatherInstitute_2F_Text_270873, MSGBOX_DEFAULT release end Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159 special sub_813B2E4 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160 @@ -170,7 +170,7 @@ Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160 return Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166 - msgbox Route119_WeatherInstitute_2F_Text_2708FC, 4 + msgbox Route119_WeatherInstitute_2F_Text_2708FC, MSGBOX_DEFAULT release end diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index 717e75055..4400081f7 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -14,35 +14,35 @@ Route120_EventObjects: @ 852B3F8 object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0 object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0 object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, 1030 - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, 798 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, 798 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, 902 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, 902 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, 17 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, 1031 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, FLAG_ITEM_ROUTE_120_NUGGET + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_11 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, FLAG_ITEM_ROUTE_120_FULL_HEAL object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0 object_event 24, EVENT_OBJ_GFX_WOMAN_5, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0 object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0 object_event 26, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0 object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, 1107 - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, 972 - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 20 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 18 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, FLAG_ITEM_ROUTE_120_NEST_BALL + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, FLAG_ITEM_ROUTE_120_HYPER_POTION + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, FLAG_HIDE_ROUTE_120_KECLEON_1 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, FLAG_0x3CC + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_14 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_12 object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0 object_event 35, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 981 - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, 982 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, 985 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, 986 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, 988 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, 987 + object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, FLAG_HIDE_ROUTE_120_KECLEON_2 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, FLAG_HIDE_ROUTE_120_KECLEON_3 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, FLAG_HIDE_ROUTE_120_KECLEON_4 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, FLAG_HIDE_ROUTE_120_KECLEON_6 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, FLAG_HIDE_ROUTE_120_KECLEON_5 object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0 object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 - object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148 + object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, FLAG_ITEM_ROUTE_120_REVIVE Route120_MapWarps: @ 852B818 warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB @@ -79,10 +79,10 @@ Route120_MapBGEvents: @ 852B958 bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3 bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3 bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3 - bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, 71 - bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, 84 - bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, 69 - bg_hidden_item_event 24, 42, 3, ITEM_ZINC, 70 + bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 + bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE + bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 + bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 Route120_MapEvents:: @ 852BA00 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 0bcff1a93..86bf1b10e 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -105,7 +105,7 @@ Route120_EventScript_1F5527:: @ 81F5527 dodailyevents checkflag FLAG_0x92E goto_eq Route120_EventScript_1F5625 - msgbox Route120_Text_2A70C7, 5 + msgbox Route120_Text_2A70C7, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route120_EventScript_1F562F compare VAR_RESULT, 0 @@ -154,21 +154,21 @@ Route120_EventScript_1F5601:: @ 81F5601 compare VAR_RESULT, 0 goto_eq Route120_EventScript_272054 setflag FLAG_0x92E - msgbox Route120_Text_2A71D5, 4 + msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT release end Route120_EventScript_1F5625:: @ 81F5625 - msgbox Route120_Text_2A7217, 4 + msgbox Route120_Text_2A7217, MSGBOX_DEFAULT release end Route120_EventScript_1F562F:: @ 81F562F - msgbox Route120_Text_2A7147, 4 + msgbox Route120_Text_2A7147, MSGBOX_DEFAULT return Route120_EventScript_1F5638:: @ 81F5638 - msgbox Route120_Text_2A7183, 4 + msgbox Route120_Text_2A7183, MSGBOX_DEFAULT return Route120_EventScript_1F5641:: @ 81F5641 @@ -176,27 +176,27 @@ Route120_EventScript_1F5641:: @ 81F5641 faceplayer checkflag FLAG_0x122 goto_eq Route120_EventScript_1F5672 - msgbox Route120_Text_1F5998, 5 + msgbox Route120_Text_1F5998, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end Route120_EventScript_1F5665:: @ 81F5665 - msgbox Route120_Text_1F5AAC, 4 + msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT setflag FLAG_0x122 release end Route120_EventScript_1F5672:: @ 81F5672 - msgbox Route120_Text_1F5ADE, 5 + msgbox Route120_Text_1F5ADE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end Route120_EventScript_1F568B:: @ 81F568B - msgbox Route120_Text_1F5B0F, 4 + msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, Route120_EventScript_1F57A3 @@ -205,7 +205,7 @@ Route120_EventScript_1F568B:: @ 81F568B applymovement 31, Route120_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route120_Text_1F5B43, 4 + msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT closemessage applymovement 30, Route120_Movement_2725A8 waitmovement 0 @@ -242,10 +242,10 @@ Route120_EventScript_1F572C:: @ 81F572C applymovement 31, Route120_Movement_2725AA applymovement 255, Route120_Movement_2725A6 waitmovement 0 - msgbox Route120_Text_1F5BAF, 4 + msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE setflag FLAG_0x11D - msgbox Route120_Text_1F5C7B, 4 + msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT closemessage applymovement 31, Route120_Movement_2725AA waitmovement 0 @@ -279,120 +279,114 @@ Route120_Movement_1F57B9: @ 81F57B9 step_end Route120_EventScript_1F57BC:: @ 81F57BC - msgbox Route120_Text_1F5D00, 2 + msgbox Route120_Text_1F5D00, MSGBOX_NPC end Route120_EventScript_1F57C5:: @ 81F57C5 - msgbox Route120_Text_1F5DCB, 3 + msgbox Route120_Text_1F5DCB, MSGBOX_SIGN end Route120_EventScript_1F57CE:: @ 81F57CE - msgbox Route120_Text_1F5DE4, 3 + msgbox Route120_Text_1F5DE4, MSGBOX_SIGN end Route120_EventScript_1F57D7:: @ 81F57D7 - trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665 - msgbox Route120_Text_29E67A, 6 + trainerbattle_single TRAINER_COLIN, Route120_Text_29E62D, Route120_Text_29E665 + msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE end Route120_EventScript_1F57EE:: @ 81F57EE - trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A + trainerbattle_single TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F5839 - msgbox Route120_Text_29E726, 4 + msgbox Route120_Text_29E726, MSGBOX_DEFAULT release end Route120_EventScript_1F581A:: @ 81F581A special sub_80B4808 waitmovement 0 - msgbox Route120_Text_29E75D, 4 - setvar VAR_0x8004, 406 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 406 - callstd 8 + msgbox Route120_Text_29E75D, MSGBOX_DEFAULT + register_matchcall TRAINER_ROBERT_1 release end Route120_EventScript_1F5839:: @ 81F5839 - trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1 - msgbox Route120_Text_29E804, 6 + trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_29E7AA, Route120_Text_29E7E1 + msgbox Route120_Text_29E804, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5850:: @ 81F5850 - trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884 - msgbox Route120_Text_29E8C5, 6 + trainerbattle_single TRAINER_LORENZO, Route120_Text_29E843, Route120_Text_29E884 + msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5867:: @ 81F5867 - trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980 - msgbox Route120_Text_29E996, 6 + trainerbattle_single TRAINER_JENNA, Route120_Text_29E91C, Route120_Text_29E980 + msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE end Route120_EventScript_1F587E:: @ 81F587E - trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA + trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F58C9 - msgbox Route120_Text_29EA08, 4 + msgbox Route120_Text_29EA08, MSGBOX_DEFAULT release end Route120_EventScript_1F58AA:: @ 81F58AA special sub_80B4808 waitmovement 0 - msgbox Route120_Text_29EA31, 4 - setvar VAR_0x8004, 226 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 226 - callstd 8 + msgbox Route120_Text_29EA31, MSGBOX_DEFAULT + register_matchcall TRAINER_JEFFREY_1 release end Route120_EventScript_1F58C9:: @ 81F58C9 - trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F - msgbox Route120_Text_29EAA9, 6 + trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_29EA61, Route120_Text_29EA8F + msgbox Route120_Text_29EAA9, MSGBOX_AUTOCLOSE end Route120_EventScript_1F58E0:: @ 81F58E0 - trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53 - msgbox Route120_Text_29EB6E, 6 + trainerbattle_single TRAINER_JENNIFER, Route120_Text_29EAEF, Route120_Text_29EB53 + msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE end Route120_EventScript_1F58F7:: @ 81F58F7 - trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25 - msgbox Route120_Text_29EC41, 6 + trainerbattle_single TRAINER_CHIP, Route120_Text_29EBAF, Route120_Text_29EC25 + msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE end Route120_EventScript_1F590E:: @ 81F590E - trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF - msgbox Route120_Text_29ED19, 6 + trainerbattle_single TRAINER_CLARISSA, Route120_Text_29ECA6, Route120_Text_29ECEF + msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5925:: @ 81F5925 - trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3 - msgbox Route120_Text_29EDF7, 6 + trainerbattle_single TRAINER_ANGELICA, Route120_Text_29ED71, Route120_Text_29EDD3 + msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE end Route120_EventScript_1F593C:: @ 81F593C - trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97 - msgbox Route120_Text_29EED4, 6 + trainerbattle_single TRAINER_KEIGO, Route120_Text_29EE50, Route120_Text_29EE97 + msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5953:: @ 81F5953 - trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63 - msgbox Route120_Text_29EF89, 6 + trainerbattle_single TRAINER_RILEY, Route120_Text_29EF08, Route120_Text_29EF63 + msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE end Route120_EventScript_1F596A:: @ 81F596A - trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080 - msgbox Route120_Text_29F0A1, 6 + trainerbattle_single TRAINER_LEONEL, Route120_Text_29F04F, Route120_Text_29F080 + msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5981:: @ 81F5981 - trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1 - msgbox Route120_Text_29F002, 6 + trainerbattle_single TRAINER_CALLIE, Route120_Text_29EFB1, Route120_Text_29EFE1 + msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE end Route120_Text_1F5998: @ 81F5998 diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index b252be7a0..4f27079a6 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -10,24 +10,24 @@ Route121_EventObjects: @ 852BA14 object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0 object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0 object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 914 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 914 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 914 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 17 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 18 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_0x392 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_0x392 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_0x392 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_12 object_event 17, EVENT_OBJ_GFX_POKEFAN_F, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, 1103 - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, 19 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, FLAG_ITEM_ROUTE_121_CARBOS + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_13 object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 object_event 24, EVENT_OBJ_GFX_MAN_4, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 object_event 25, EVENT_OBJ_GFX_WOMAN_2, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0 object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, 1149 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE @@ -45,10 +45,10 @@ Route121_MapBGEvents: @ 852BD14 bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F - bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, 39 - bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, 40 - bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, 73 - bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, 100 + bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP + bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET + bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL + bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE Route121_MapEvents:: @ 852BD8C map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index f133ffe56..84c7473e9 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -2,15 +2,15 @@ Route121_MapScripts:: @ 81F5DFC .byte 0 Route121_EventScript_1F5DFD:: @ 81F5DFD - msgbox Route121_Text_1F607F, 2 + msgbox Route121_Text_1F607F, MSGBOX_NPC end Route121_EventScript_1F5E06:: @ 81F5E06 - msgbox Route121_Text_1F60D3, 3 + msgbox Route121_Text_1F60D3, MSGBOX_SIGN end Route121_EventScript_1F5E0F:: @ 81F5E0F - msgbox Route121_Text_1F611E, 3 + msgbox Route121_Text_1F611E, MSGBOX_SIGN end Route121_EventScript_1F5E18:: @ 81F5E18 @@ -18,7 +18,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18 playbgm MUS_AQA_0, 0 applymovement 13, Route121_Movement_2725B8 waitmovement 0 - msgbox Route121_Text_1F605A, 4 + msgbox Route121_Text_1F605A, MSGBOX_DEFAULT closemessage applymovement 12, Route121_Movement_1F5E59 applymovement 13, Route121_Movement_1F5E62 @@ -66,118 +66,109 @@ Route121_Movement_1F5E6B: @ 81F5E6B step_end Route121_EventScript_1F5E74:: @ 81F5E74 - trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F - msgbox Route121_Text_29F138, 6 + trainerbattle_single TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F + msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5E8B:: @ 81F5E8B - trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 + trainerbattle_single TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 - msgbox Route121_Text_29F21E, 4 + msgbox Route121_Text_29F21E, MSGBOX_DEFAULT release end Route121_EventScript_1F5EB7:: @ 81F5EB7 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F25B, 4 - setvar VAR_0x8004, 254 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 254 - callstd 8 + msgbox Route121_Text_29F25B, MSGBOX_DEFAULT + register_matchcall TRAINER_WALTER_1 release end Route121_EventScript_1F5ED6:: @ 81F5ED6 - trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A - msgbox Route121_Text_29F32B, 6 + trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_29F2A6, Route121_Text_29F31A + msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5EED:: @ 81F5EED - trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9 - msgbox Route121_Text_29F3C6, 6 + trainerbattle_single TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9 + msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F04:: @ 81F5F04 - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 - msgbox Route121_Text_29F476, 6 + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 + msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F1F:: @ 81F5F1F - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE - msgbox Route121_Text_29F582, 6 + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE + msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F3A:: @ 81F5F3A - trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 + trainerbattle_single TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 - msgbox Route121_Text_29F66F, 4 + msgbox Route121_Text_29F66F, MSGBOX_DEFAULT release end Route121_EventScript_1F5F66:: @ 81F5F66 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F69F, 4 - setvar VAR_0x8004, 127 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 127 - callstd 8 + msgbox Route121_Text_29F69F, MSGBOX_DEFAULT + register_matchcall TRAINER_JESSICA_1 release end Route121_EventScript_1F5F85:: @ 81F5F85 - trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710 - msgbox Route121_Text_29F740, 6 + trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_29F6E4, Route121_Text_29F710 + msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F9C:: @ 81F5F9C - trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B - msgbox Route121_Text_29F9AE, 6 + trainerbattle_single TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B + msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FB3:: @ 81F5FB3 - trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64 - msgbox Route121_Text_29FA73, 6 + trainerbattle_single TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64 + msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FCA:: @ 81F5FCA - trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8 - msgbox Route121_Text_29FAEA, 6 + trainerbattle_single TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8 + msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FE1:: @ 81F5FE1 - trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C - msgbox Route121_Text_29FBA8, 6 + trainerbattle_single TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C + msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FF8:: @ 81F5FF8 - trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 + trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 - msgbox Route121_Text_29F7D4, 4 + msgbox Route121_Text_29F7D4, MSGBOX_DEFAULT release end Route121_EventScript_1F6024:: @ 81F6024 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F80D, 4 - setvar VAR_0x8004, 767 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 767 - callstd 8 + msgbox Route121_Text_29F80D, MSGBOX_DEFAULT + register_matchcall TRAINER_CRISTIN_1 release end Route121_EventScript_1F6043:: @ 81F6043 - trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8 - msgbox Route121_Text_29F8D0, 6 + trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_29F855, Route121_Text_29F8A8 + msgbox Route121_Text_29F8D0, MSGBOX_AUTOCLOSE end Route121_Text_1F605A: @ 81F605A diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 1973b0e9e..12fa8112e 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -26,21 +26,21 @@ Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD step_end Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6 - msgbox Route121_SafariZoneEntrance_Text_2A4D12, 2 + msgbox Route121_SafariZoneEntrance_Text_2A4D12, MSGBOX_NPC end Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF lock faceplayer - msgbox Route121_SafariZoneEntrance_Text_2A4E46, 5 + msgbox Route121_SafariZoneEntrance_Text_2A4E46, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4E7E, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT release end Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4EA1, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4EA1, MSGBOX_DEFAULT release end @@ -49,10 +49,10 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 applymovement 255, Route121_SafariZoneEntrance_Movement_2725A6 waitmovement 0 showmoneybox 0, 0, 0 - msgbox Route121_SafariZoneEntrance_Text_2A4F74, 5 + msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BC48 - msgbox Route121_SafariZoneEntrance_Text_2A4FD7, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4FD7, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -65,15 +65,15 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 compare VAR_RESULT, 0 goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8 playse SE_REGI - msgbox Route121_SafariZoneEntrance_Text_2A501B, 4 + msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT takemoney 0x1f4, 0 updatemoneybox 0, 0 nop - msgbox Route121_SafariZoneEntrance_Text_2A5036, 4 + msgbox Route121_SafariZoneEntrance_Text_2A5036, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message Route121_SafariZoneEntrance_Text_2A5052 waitfanfare - msgbox Route121_SafariZoneEntrance_Text_2A506F, 4 + msgbox Route121_SafariZoneEntrance_Text_2A506F, MSGBOX_DEFAULT closemessage hidemoneybox nop @@ -94,7 +94,7 @@ Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 - msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 + msgbox Route121_SafariZoneEntrance_Text_2A50E5, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -102,12 +102,12 @@ Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9 return Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA - msgbox Route121_SafariZoneEntrance_Text_2A5105, 4 + msgbox Route121_SafariZoneEntrance_Text_2A5105, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8 - msgbox Route121_SafariZoneEntrance_Text_2A4FF7, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4FF7, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -137,6 +137,6 @@ Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 step_end Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21 - msgbox Route121_SafariZoneEntrance_Text_2A55BB, 3 + msgbox Route121_SafariZoneEntrance_Text_2A55BB, MSGBOX_SIGN end diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index c1a7e57f8..d45ac0222 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -16,10 +16,10 @@ Route123_EventObjects: @ 852BDBC object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, BerryTreeScript, 0 object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, BerryTreeScript, 0 object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 17 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 18 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 19 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032 + object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_11 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_12 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_13 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, FLAG_ITEM_ROUTE_123_CALCIUM object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_1F6151, 0 object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, BerryTreeScript, 0 object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, BerryTreeScript, 0 @@ -30,18 +30,18 @@ Route123_EventObjects: @ 852BDBC object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route123_EventScript_1F620A, 0 object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F626C, 0 object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route123_EventScript_1F6304, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104 - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, FLAG_ITEM_ROUTE_123_ULTRA_BALL + object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, FLAG_ITEM_ROUTE_123_ELIXIR object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0 object_event 35, EVENT_OBJ_GFX_WOMAN_2, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0 object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route123_EventScript_1F6349, 0 object_event 37, EVENT_OBJ_GFX_MAN_5, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0 object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0 object_event 39, EVENT_OBJ_GFX_EXPERT_M, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0 - object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152 + object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, FLAG_ITEM_ROUTE_123_PP_UP object_event 41, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0 object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 - object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, 1153 + object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, FLAG_ITEM_ROUTE_123_REVIVAL_HERB Route123_MapWarps: @ 852C1C4 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE @@ -75,13 +75,13 @@ Route123_MapBGEvents: @ 852C32C bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61AA - bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, 7 + bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61BC bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 - bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, 41 - bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, 74 - bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, 99 - bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, 110 + bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE + bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION + bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP + bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY Route123_MapEvents:: @ 852C3B0 map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 43e48b627..ab5b5abb9 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -11,16 +11,16 @@ Route123_EventScript_1F6151:: @ 81F6151 faceplayer checkflag FLAG_0x0E8 goto_eq Route123_EventScript_1F61A0 - msgbox Route123_Text_1F641E, 4 + msgbox Route123_Text_1F641E, MSGBOX_DEFAULT special IsGrassTypeInParty compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E - msgbox Route123_Text_1F645D, 4 + msgbox Route123_Text_1F645D, MSGBOX_DEFAULT giveitem_std ITEM_TM19 compare VAR_RESULT, 0 goto_eq Route123_EventScript_272054 setflag FLAG_0x0E8 - msgbox Route123_Text_1F64CF, 4 + msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release end @@ -29,160 +29,151 @@ Route123_EventScript_1F619E:: @ 81F619E end Route123_EventScript_1F61A0:: @ 81F61A0 - msgbox Route123_Text_1F64CF, 4 + msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release end Route123_EventScript_1F61AA:: @ 81F61AA - msgbox Route123_Text_1F6511, 3 + msgbox Route123_Text_1F6511, MSGBOX_SIGN end Route123_EventScript_1F61B3:: @ 81F61B3 - msgbox Route123_Text_1F6529, 3 + msgbox Route123_Text_1F6529, MSGBOX_SIGN end Route123_EventScript_1F61BC:: @ 81F61BC - msgbox Route123_Text_1F6557, 3 + msgbox Route123_Text_1F6557, MSGBOX_SIGN end Route123_EventScript_1F61C5:: @ 81F61C5 - trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_29FBEB, Route123_Text_29FC23 - msgbox Route123_Text_29FC42, 6 + trainerbattle_single TRAINER_WENDY, Route123_Text_29FBEB, Route123_Text_29FC23 + msgbox Route123_Text_29FC42, MSGBOX_AUTOCLOSE end Route123_EventScript_1F61DC:: @ 81F61DC - trainerbattle 0, TRAINER_BRAXTON, 0, Route123_Text_29FC6F, Route123_Text_29FCD6 - msgbox Route123_Text_29FCF4, 6 + trainerbattle_single TRAINER_BRAXTON, Route123_Text_29FC6F, Route123_Text_29FCD6 + msgbox Route123_Text_29FCF4, MSGBOX_AUTOCLOSE end Route123_EventScript_1F61F3:: @ 81F61F3 - trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_29FD1D, Route123_Text_29FD53 - msgbox Route123_Text_29FD7B, 6 + trainerbattle_single TRAINER_VIOLET, Route123_Text_29FD1D, Route123_Text_29FD53 + msgbox Route123_Text_29FD7B, MSGBOX_AUTOCLOSE end Route123_EventScript_1F620A:: @ 81F620A - trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 + trainerbattle_single TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6255 - msgbox Route123_Text_29FE2A, 4 + msgbox Route123_Text_29FE2A, MSGBOX_DEFAULT release end Route123_EventScript_1F6236:: @ 81F6236 special sub_80B4808 waitmovement 0 - msgbox Route123_Text_29FE70, 4 - setvar VAR_0x8004, 238 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 238 - callstd 8 + msgbox Route123_Text_29FE70, MSGBOX_DEFAULT + register_matchcall TRAINER_CAMERON_1 release end Route123_EventScript_1F6255:: @ 81F6255 - trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_29FED4, Route123_Text_29FF1B - msgbox Route123_Text_29FF27, 6 + trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_29FED4, Route123_Text_29FF1B + msgbox Route123_Text_29FF27, MSGBOX_AUTOCLOSE end Route123_EventScript_1F626C:: @ 81F626C - trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 + trainerbattle_single TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F62B7 - msgbox Route123_Text_29FFE5, 4 + msgbox Route123_Text_29FFE5, MSGBOX_DEFAULT release end Route123_EventScript_1F6298:: @ 81F6298 special sub_80B4808 waitmovement 0 - msgbox Route123_Text_2A0027, 4 - setvar VAR_0x8004, 249 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 249 - callstd 8 + msgbox Route123_Text_2A0027, MSGBOX_DEFAULT + register_matchcall TRAINER_JACKI_1 release end Route123_EventScript_1F62B7:: @ 81F62B7 - trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_2A005E, Route123_Text_2A008D - msgbox Route123_Text_2A0099, 6 + trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_2A005E, Route123_Text_2A008D + msgbox Route123_Text_2A0099, MSGBOX_AUTOCLOSE end Route123_EventScript_1F62CE:: @ 81F62CE - trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D - msgbox Route123_Text_2A012E, 6 + trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D + msgbox Route123_Text_2A012E, MSGBOX_AUTOCLOSE end Route123_EventScript_1F62E9:: @ 81F62E9 - trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224 - msgbox Route123_Text_2A01EE, 6 + trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224 + msgbox Route123_Text_2A01EE, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6304:: @ 81F6304 - trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_2A025F, Route123_Text_2A02A6 - msgbox Route123_Text_2A02C1, 6 + trainerbattle_single TRAINER_KINDRA, Route123_Text_2A025F, Route123_Text_2A02A6 + msgbox Route123_Text_2A02C1, MSGBOX_AUTOCLOSE end Route123_EventScript_1F631B:: @ 81F631B - trainerbattle 0, TRAINER_FREDRICK, 0, Route123_Text_2A060A, Route123_Text_2A0631 - msgbox Route123_Text_2A0672, 6 + trainerbattle_single TRAINER_FREDRICK, Route123_Text_2A060A, Route123_Text_2A0631 + msgbox Route123_Text_2A0672, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6332:: @ 81F6332 - trainerbattle 0, TRAINER_ALBERTO, 0, Route123_Text_2A06AF, Route123_Text_2A0704 - msgbox Route123_Text_2A072B, 6 + trainerbattle_single TRAINER_ALBERTO, Route123_Text_2A06AF, Route123_Text_2A0704 + msgbox Route123_Text_2A072B, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6349:: @ 81F6349 - trainerbattle 0, TRAINER_ED, 0, Route123_Text_2A079B, Route123_Text_2A07F0 - msgbox Route123_Text_2A080D, 6 + trainerbattle_single TRAINER_ED, Route123_Text_2A079B, Route123_Text_2A07F0 + msgbox Route123_Text_2A080D, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6360:: @ 81F6360 - trainerbattle 0, TRAINER_KAYLEY, 0, Route123_Text_2A0902, Route123_Text_2A0943 - msgbox Route123_Text_2A096E, 6 + trainerbattle_single TRAINER_KAYLEY, Route123_Text_2A0902, Route123_Text_2A0943 + msgbox Route123_Text_2A096E, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6377:: @ 81F6377 - trainerbattle 0, TRAINER_JONAS, 0, Route123_Text_2A0854, Route123_Text_2A088A - msgbox Route123_Text_2A08CA, 6 + trainerbattle_single TRAINER_JONAS, Route123_Text_2A0854, Route123_Text_2A088A + msgbox Route123_Text_2A08CA, MSGBOX_AUTOCLOSE end Route123_EventScript_1F638E:: @ 81F638E - trainerbattle 0, TRAINER_JAZMYN, 0, Route123_Text_2A054E, Route123_Text_2A0592 - msgbox Route123_Text_2A05AC, 6 + trainerbattle_single TRAINER_JAZMYN, Route123_Text_2A054E, Route123_Text_2A0592 + msgbox Route123_Text_2A05AC, MSGBOX_AUTOCLOSE end Route123_EventScript_1F63A5:: @ 81F63A5 - trainerbattle 0, TRAINER_DAVIS, 0, Route123_Text_2A04C0, Route123_Text_2A04FE - msgbox Route123_Text_2A0512, 6 + trainerbattle_single TRAINER_DAVIS, Route123_Text_2A04C0, Route123_Text_2A04FE + msgbox Route123_Text_2A0512, MSGBOX_AUTOCLOSE end Route123_EventScript_1F63BC:: @ 81F63BC - trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 + trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6407 - msgbox Route123_Text_2A0389, 4 + msgbox Route123_Text_2A0389, MSGBOX_DEFAULT release end Route123_EventScript_1F63E8:: @ 81F63E8 special sub_80B4808 waitmovement 0 - msgbox Route123_Text_2A03C1, 4 - setvar VAR_0x8004, 195 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 195 - callstd 8 + msgbox Route123_Text_2A03C1, MSGBOX_DEFAULT + register_matchcall TRAINER_FERNANDO_1 release end Route123_EventScript_1F6407:: @ 81F6407 - trainerbattle 5, TRAINER_FERNANDO_1, 0, Route123_Text_2A03FB, Route123_Text_2A045A - msgbox Route123_Text_2A0487, 6 + trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_2A03FB, Route123_Text_2A045A + msgbox Route123_Text_2A0487, MSGBOX_AUTOCLOSE end Route123_Text_1F641E: @ 81F641E diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 9e865ad6a..3ab35b195 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -12,7 +12,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 dodailyevents checkflag FLAG_0x92D goto_eq Route123_BerryMastersHouse_EventScript_26F8B6 - msgbox Route123_BerryMastersHouse_Text_2A7386, 4 + msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 @@ -20,19 +20,19 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x92D - msgbox Route123_BerryMastersHouse_Text_2A7428, 4 + msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 - msgbox Route123_BerryMastersHouse_Text_2A7445, 4 + msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT release end Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6 - msgbox Route123_BerryMastersHouse_Text_2A749E, 4 + msgbox Route123_BerryMastersHouse_Text_2A749E, MSGBOX_DEFAULT release end @@ -42,7 +42,7 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 dodailyevents checkflag FLAG_0x931 goto_eq Route123_BerryMastersHouse_EventScript_26FA6F - msgbox Route123_BerryMastersHouse_Text_2A74E6, 4 + msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 call Route123_BerryMastersHouse_EventScript_271E7C lock @@ -54,8 +54,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 end Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 - msgbox Route123_BerryMastersHouse_Text_2A7682, 4 - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + msgbox Route123_BerryMastersHouse_Text_2A7682, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT release end @@ -75,7 +75,7 @@ Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 end Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C - msgbox Route123_BerryMastersHouse_Text_2A75D0, 4 + msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT @@ -88,7 +88,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A checkflag FLAG_0x0F8 goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -99,7 +99,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB checkflag FLAG_0x0F9 goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -110,7 +110,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC checkflag FLAG_0x0FA goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -121,7 +121,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D checkflag FLAG_0x0FB goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -132,7 +132,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E checkflag FLAG_0x0FC goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -141,13 +141,13 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E end Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT release end Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79 setflag FLAG_0x931 - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT release end diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 30ff07ee9..4b52615fc 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -4,9 +4,9 @@ Route124_EventObjects: @ 852C3C4 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, 1066 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, FLAG_ITEM_ROUTE_124_RED_SHARD + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, FLAG_ITEM_ROUTE_124_BLUE_SHARD + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, FLAG_ITEM_ROUTE_124_YELLOW_SHARD object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index b21e55417..d9d43b531 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -8,108 +8,99 @@ Route124_MapScript1_1F6572: @ 81F6572 end Route124_EventScript_1F657C:: @ 81F657C - msgbox Route124_Text_1F6739, 3 + msgbox Route124_Text_1F6739, MSGBOX_SIGN end Route124_EventScript_1F6585:: @ 81F6585 - trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02 - msgbox Route124_Text_2A0A20, 6 + trainerbattle_single TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02 + msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE end Route124_EventScript_1F659C:: @ 81F659C - trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC - msgbox Route124_Text_2A0AD9, 6 + trainerbattle_single TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC + msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE end Route124_EventScript_1F65B3:: @ 81F65B3 - trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF + trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE - msgbox Route124_Text_2A0B9A, 4 + msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT release end Route124_EventScript_1F65DF:: @ 81F65DF special sub_80B4808 waitmovement 0 - msgbox Route124_Text_2A0C14, 4 - setvar VAR_0x8004, 449 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 449 - callstd 8 + msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT + register_matchcall TRAINER_JENNY_1 release end Route124_EventScript_1F65FE:: @ 81F65FE - trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0 - msgbox Route124_Text_2A0CBE, 6 + trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0 + msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6615:: @ 81F6615 - trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D - msgbox Route124_Text_2A0D66, 6 + trainerbattle_single TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D + msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE end Route124_EventScript_1F662C:: @ 81F662C - trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF - msgbox Route124_Text_2A0E1E, 6 + trainerbattle_single TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF + msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6643:: @ 81F6643 - trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 + trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F668C - msgbox Route124_Text_2A0F3A, 4 + msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT release end Route124_EventScript_1F6673:: @ 81F6673 - msgbox Route124_Text_2A109F, 4 - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd 8 + msgbox Route124_Text_2A109F, MSGBOX_DEFAULT + register_matchcall TRAINER_LILA_AND_ROY_1 release end Route124_EventScript_1F668C:: @ 81F668C - trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 - msgbox Route124_Text_2A1203, 6 + trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 + msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE end Route124_EventScript_1F66A7:: @ 81F66A7 - trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 + trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F66F0 - msgbox Route124_Text_2A103E, 4 + msgbox Route124_Text_2A103E, MSGBOX_DEFAULT release end Route124_EventScript_1F66D7:: @ 81F66D7 - msgbox Route124_Text_2A109F, 4 - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd 8 + msgbox Route124_Text_2A109F, MSGBOX_DEFAULT + register_matchcall TRAINER_LILA_AND_ROY_1 release end Route124_EventScript_1F66F0:: @ 81F66F0 - trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 - msgbox Route124_Text_2A130F, 6 + trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 + msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F670B:: @ 81F670B - trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C - msgbox Route124_Text_2A144F, 6 + trainerbattle_single TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C + msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6722:: @ 81F6722 - trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC - msgbox Route124_Text_2A14ED, 6 + trainerbattle_single TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC + msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE end Route124_Text_1F6739: @ 81F6739 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 7e64ecaff..57b64eae8 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -11,13 +11,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 faceplayer checkflag FLAG_0x0D9 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270A4E - msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, MSGBOX_DEFAULT setflag FLAG_0x0D9 goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C end Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E - msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, MSGBOX_DEFAULT goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C end @@ -61,7 +61,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270ACA:: @ 8270ACA return Route124_DivingTreasureHuntersHouse_EventScript_270AD0:: @ 8270AD0 - msgbox Route124_DivingTreasureHuntersHouse_Text_271098, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_271098, MSGBOX_DEFAULT goto Route124_DivingTreasureHuntersHouse_EventScript_270ADE end @@ -246,7 +246,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270EB1:: @ 8270EB1 Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 bufferitemname 0, VAR_0x8008 bufferitemname 1, VAR_0x8009 - msgbox Route124_DivingTreasureHuntersHouse_Text_271132, 5 + msgbox Route124_DivingTreasureHuntersHouse_Text_271132, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D checkitemspace VAR_0x8009, 1 @@ -261,28 +261,28 @@ Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 takeitem VAR_0x8008, 1 giveitem_std VAR_0x8009 - msgbox Route124_DivingTreasureHuntersHouse_Text_271158, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_271158, MSGBOX_DEFAULT call Route124_DivingTreasureHuntersHouse_EventScript_270A72 compare VAR_TEMP_1, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 - msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, 5 + msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D end Route124_DivingTreasureHuntersHouse_EventScript_270F43:: @ 8270F43 - msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, MSGBOX_DEFAULT release end Route124_DivingTreasureHuntersHouse_EventScript_270F4D:: @ 8270F4D - msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, MSGBOX_DEFAULT release end Route124_DivingTreasureHuntersHouse_EventScript_270F57:: @ 8270F57 - msgbox Route124_DivingTreasureHuntersHouse_Text_271027, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_271027, MSGBOX_DEFAULT release end @@ -291,7 +291,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270F61:: @ 8270F61 end Route124_DivingTreasureHuntersHouse_EventScript_270F63:: @ 8270F63 - msgbox Route124_DivingTreasureHuntersHouse_Text_271217, 3 + msgbox Route124_DivingTreasureHuntersHouse_Text_271217, MSGBOX_SIGN end Route124_DivingTreasureHuntersHouse_Text_270F6C: @ 8270F6C diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index 2a408aec6..256802406 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -8,7 +8,7 @@ Route125_EventObjects: @ 852C50C object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F687D, 0 object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0 object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, 1154 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL Route125_MapWarps: @ 852C5FC warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 2dda3fb2d..528eda704 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -27,67 +27,64 @@ Route125_MapScript2_1F679A: @ 81F679A .2byte 0 Route125_EventScript_1F67A4:: @ 81F67A4 - trainerbattle 0, TRAINER_NOLEN, 0, Route125_Text_2A1527, Route125_Text_2A155A - msgbox Route125_Text_2A1567, 6 + trainerbattle_single TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A + msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67BB:: @ 81F67BB - trainerbattle 0, TRAINER_STAN, 0, Route125_Text_2A159F, Route125_Text_2A15C7 - msgbox Route125_Text_2A15D5, 6 + trainerbattle_single TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7 + msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67D2:: @ 81F67D2 - trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_2A1615, Route125_Text_2A164D - msgbox Route125_Text_2A165E, 6 + trainerbattle_single TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D + msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67E9:: @ 81F67E9 - trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_2A1686, Route125_Text_2A16C5 - msgbox Route125_Text_2A16CE, 6 + trainerbattle_single TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5 + msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6800:: @ 81F6800 - trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C + trainerbattle_single TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B - msgbox Route125_Text_2A1755, 4 + msgbox Route125_Text_2A1755, MSGBOX_DEFAULT release end Route125_EventScript_1F682C:: @ 81F682C special sub_80B4808 waitmovement 0 - msgbox Route125_Text_2A17CF, 4 - setvar VAR_0x8004, 492 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 492 - callstd 8 + msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT + register_matchcall TRAINER_ERNEST_1 release end Route125_EventScript_1F684B:: @ 81F684B - trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_2A180E, Route125_Text_2A1851 - msgbox Route125_Text_2A187A, 6 + trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_2A180E, Route125_Text_2A1851 + msgbox Route125_Text_2A187A, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6862:: @ 81F6862 - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 - msgbox Route125_Text_2A19A6, 6 + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 + msgbox Route125_Text_2A19A6, MSGBOX_AUTOCLOSE end Route125_EventScript_1F687D:: @ 81F687D - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 - msgbox Route125_Text_2A1A92, 6 + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 + msgbox Route125_Text_2A1A92, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6898:: @ 81F6898 - trainerbattle 0, TRAINER_PRESLEY, 0, Route125_Text_2A1B1A, Route125_Text_2A1B4E - msgbox Route125_Text_2A1B70, 6 + trainerbattle_single TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E + msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE end Route125_EventScript_1F68AF:: @ 81F68AF - trainerbattle 0, TRAINER_AURON, 0, Route125_Text_2A1BCE, Route125_Text_2A1BFD - msgbox Route125_Text_2A1C2A, 6 + trainerbattle_single TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD + msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc index 0c3180a79..8754a0006 100644 --- a/data/maps/Route126/events.inc +++ b/data/maps/Route126/events.inc @@ -3,7 +3,7 @@ Route126_EventObjects: @ 852C648 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, 1105 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, FLAG_ITEM_ROUTE_126_GREEN_SHARD object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0 object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0 object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 3ea9ba786..0be11144a 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -8,62 +8,59 @@ Route126_MapScript1_1F68CC: @ 81F68CC end Route126_EventScript_1F68D6:: @ 81F68D6 - trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8 - msgbox Route126_Text_2A1CDD, 6 + trainerbattle_single TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8 + msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE end Route126_EventScript_1F68ED:: @ 81F68ED - trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63 - msgbox Route126_Text_2A1D72, 6 + trainerbattle_single TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63 + msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6904:: @ 81F6904 - trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8 - msgbox Route126_Text_2A1E03, 6 + trainerbattle_single TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8 + msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE end Route126_EventScript_1F691B:: @ 81F691B - trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63 - msgbox Route126_Text_2A1E70, 6 + trainerbattle_single TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63 + msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6932:: @ 81F6932 - trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6 - msgbox Route126_Text_2A20F7, 6 + trainerbattle_single TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6 + msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6949:: @ 81F6949 - trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3 - msgbox Route126_Text_2A21B8, 6 + trainerbattle_single TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3 + msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6960:: @ 81F6960 - trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216 - msgbox Route126_Text_2A222A, 6 + trainerbattle_single TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216 + msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6977:: @ 81F6977 - trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 + trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route126_EventScript_1F69C2 - msgbox Route126_Text_2A1F10, 4 + msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT release end Route126_EventScript_1F69A3:: @ 81F69A3 special sub_80B4808 waitmovement 0 - msgbox Route126_Text_2A1F5A, 4 - setvar VAR_0x8004, 377 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 377 - callstd 8 + msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT + register_matchcall TRAINER_PABLO_1 release end Route126_EventScript_1F69C2:: @ 81F69C2 - trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8 - msgbox Route126_Text_2A200C, 6 + trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8 + msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index bb434202b..78dc26899 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -1,15 +1,15 @@ Route127_EventObjects: @ 852C734 object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, 1034 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, 1035 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, FLAG_ITEM_ROUTE_127_CARBOS object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0 object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0 object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0 object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0 object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0 object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, 1155 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY Route127_MapBGEvents: @ 852C83C bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 12e5bf127..f9c3290b9 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -27,62 +27,59 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B .2byte 0 Route127_EventScript_1F6A35:: @ 81F6A35 - trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294 - msgbox Route127_Text_2A22A1, 6 + trainerbattle_single TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294 + msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A4C:: @ 81F6A4C - trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315 - msgbox Route127_Text_2A232C, 6 + trainerbattle_single TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315 + msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A63:: @ 81F6A63 - trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1 - msgbox Route127_Text_2A240C, 6 + trainerbattle_single TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1 + msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A7A:: @ 81F6A7A - trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483 - msgbox Route127_Text_2A2494, 6 + trainerbattle_single TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483 + msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A91:: @ 81F6A91 - trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B - msgbox Route127_Text_2A2538, 6 + trainerbattle_single TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B + msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AA8:: @ 81F6AA8 - trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1 - msgbox Route127_Text_2A25D2, 6 + trainerbattle_single TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1 + msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6ABF:: @ 81F6ABF - trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC - msgbox Route127_Text_2A2832, 6 + trainerbattle_single TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC + msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AD6:: @ 81F6AD6 - trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 + trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 - msgbox Route127_Text_2A26AC, 4 + msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT release end Route127_EventScript_1F6B02:: @ 81F6B02 special sub_80B4808 waitmovement 0 - msgbox Route127_Text_2A26EE, 4 - setvar VAR_0x8004, 672 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 672 - callstd 8 + msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT + register_matchcall TRAINER_KOJI_1 release end Route127_EventScript_1F6B21:: @ 81F6B21 - trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B - msgbox Route127_Text_2A278E, 6 + trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B + msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index 5c0b82cee..792ff5ca3 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -1,9 +1,9 @@ Route128_EventObjects: @ 852C88C object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 834 - object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 944 - object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 945 + object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_STEVEN + object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_ARCHIE + object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_MAXIE object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 @@ -11,9 +11,9 @@ Route128_EventObjects: @ 852C88C object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 Route128_MapBGEvents: @ 852C97C - bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, 92 - bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, 93 - bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, 94 + bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 + bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 + bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 Route128_MapEvents:: @ 852C9A0 map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 8e2742ff5..ec47bf39c 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -17,29 +17,29 @@ Route128_EventScript_1F6B57:: @ 81F6B57 delay 20 applymovement 4, Route128_Movement_1F6C89 waitmovement 0 - msgbox Route128_Text_1F6DF5, 4 + msgbox Route128_Text_1F6DF5, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C91 waitmovement 0 - msgbox Route128_Text_1F6E48, 4 + msgbox Route128_Text_1F6E48, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 applymovement 4, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F6E5A, 4 + msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 applymovement 255, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F6F1E, 4 + msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 applymovement 255, Route128_Movement_2725A4 applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 - msgbox Route128_Text_1F704F, 4 + msgbox Route128_Text_1F704F, MSGBOX_DEFAULT closemessage delay 40 applymovement 5, Route128_Movement_1F6CB0 @@ -56,15 +56,15 @@ Route128_EventScript_1F6B57:: @ 81F6B57 waitmovement 0 applymovement 255, Route128_Movement_2725A8 waitmovement 0 - msgbox Route128_Text_1F70C9, 4 + msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 applymovement 255, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F70EA, 4 + msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT applymovement 3, Route128_Movement_2725AA waitmovement 0 - msgbox Route128_Text_1F721B, 4 + msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_2725AA waitmovement 0 @@ -176,78 +176,72 @@ Route128_Movement_1F6CBB: @ 81F6CBB step_end Route128_EventScript_1F6CBE:: @ 81F6CBE - trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA + trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 - msgbox Route128_Text_2A28D7, 4 + msgbox Route128_Text_2A28D7, MSGBOX_DEFAULT release end Route128_EventScript_1F6CEA:: @ 81F6CEA special sub_80B4808 waitmovement 0 - msgbox Route128_Text_2A2916, 4 - setvar VAR_0x8004, 376 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 376 - callstd 8 + msgbox Route128_Text_2A2916, MSGBOX_DEFAULT + register_matchcall TRAINER_ISAIAH_1 release end Route128_EventScript_1F6D09:: @ 81F6D09 - trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8 - msgbox Route128_Text_2A29DC, 6 + trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_2A2975, Route128_Text_2A29B8 + msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D20:: @ 81F6D20 - trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C + trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B - msgbox Route128_Text_2A2AB7, 4 + msgbox Route128_Text_2A2AB7, MSGBOX_DEFAULT release end Route128_EventScript_1F6D4C:: @ 81F6D4C special sub_80B4808 waitmovement 0 - msgbox Route128_Text_2A2AF9, 4 - setvar VAR_0x8004, 386 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 386 - callstd 8 + msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT + register_matchcall TRAINER_KATELYN_1 release end Route128_EventScript_1F6D6B:: @ 81F6D6B - trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB - msgbox Route128_Text_2A2BDD, 6 + trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_2A2B41, Route128_Text_2A2BAB + msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D82:: @ 81F6D82 - trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79 - msgbox Route128_Text_2A2C95, 6 + trainerbattle_single TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79 + msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D99:: @ 81F6D99 - trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE - msgbox Route128_Text_2A2D0D, 6 + trainerbattle_single TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE + msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DB0:: @ 81F6DB0 - trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9 - msgbox Route128_Text_2A2DBA, 6 + trainerbattle_single TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9 + msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DC7:: @ 81F6DC7 - trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44 - msgbox Route128_Text_2A2E6C, 6 + trainerbattle_single TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44 + msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DDE:: @ 81F6DDE - trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA - msgbox Route128_Text_2A2F2F, 6 + trainerbattle_single TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA + msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE end Route128_Text_1F6DF5: @ 81F6DF5 diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 170d87e56..b58e9ddd4 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -32,27 +32,27 @@ Route129_MapScript2_1F72E2: @ 81F72E2 .2byte 0 Route129_EventScript_1F72EC:: @ 81F72EC - trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_2A2F66, Route129_Text_2A2F9D - msgbox Route129_Text_2A2FB9, 6 + trainerbattle_single TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D + msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7303:: @ 81F7303 - trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_2A2FF2, Route129_Text_2A3034 - msgbox Route129_Text_2A3048, 6 + trainerbattle_single TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034 + msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE end Route129_EventScript_1F731A:: @ 81F731A - trainerbattle 0, TRAINER_REED, 0, Route129_Text_2A30CD, Route129_Text_2A30F1 - msgbox Route129_Text_2A3114, 6 + trainerbattle_single TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1 + msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7331:: @ 81F7331 - trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_2A314E, Route129_Text_2A317D - msgbox Route129_Text_2A31A6, 6 + trainerbattle_single TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D + msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7348:: @ 81F7348 - trainerbattle 0, TRAINER_CLARENCE, 0, Route129_Text_2A3204, Route129_Text_2A3239 - msgbox Route129_Text_2A3252, 6 + trainerbattle_single TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239 + msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc index 227e359b6..97532e576 100644 --- a/data/maps/Route130/events.inc +++ b/data/maps/Route130/events.inc @@ -1,7 +1,7 @@ Route130_EventObjects: @ 852CA40 object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, 17 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11 object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 Route130_MapEvents:: @ 852CAA0 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 26278cf50..6698837d2 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -8,21 +8,21 @@ Route130_MapScript1_1F7365: @ 81F7365 specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq Route130_EventScript_1F73B1 - setflag FLAG_0x011 - setflag FLAG_0x012 - setflag FLAG_0x013 - setflag FLAG_0x014 - setflag FLAG_0x015 - setflag FLAG_0x016 - setflag FLAG_0x017 - setflag FLAG_0x018 - setflag FLAG_0x019 - setflag FLAG_0x01A - setflag FLAG_0x01B - setflag FLAG_0x01C - setflag FLAG_0x01D - setflag FLAG_0x01E - setflag FLAG_0x01F + setflag FLAG_TEMP_11 + setflag FLAG_TEMP_12 + setflag FLAG_TEMP_13 + setflag FLAG_TEMP_14 + setflag FLAG_TEMP_15 + setflag FLAG_TEMP_16 + setflag FLAG_TEMP_17 + setflag FLAG_TEMP_18 + setflag FLAG_TEMP_19 + setflag FLAG_TEMP_1A + setflag FLAG_TEMP_1B + setflag FLAG_TEMP_1C + setflag FLAG_TEMP_1D + setflag FLAG_TEMP_1E + setflag FLAG_TEMP_1F setmaplayoutindex 263 end @@ -36,17 +36,17 @@ Route130_EventScript_1F73B5:: @ 81F73B5 return Route130_EventScript_1F73BF:: @ 81F73BF - trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6 - msgbox Route130_Text_2A3300, 6 + trainerbattle_single TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6 + msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73D6:: @ 81F73D6 - trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC - msgbox Route130_Text_2A33F5, 6 + trainerbattle_single TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC + msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73ED:: @ 81F73ED - trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D - msgbox Route130_Text_2A3494, 6 + trainerbattle_single TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D + msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 566cbef66..618d17fdb 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -18,42 +18,42 @@ Route131_EventScript_1F741F:: @ 81F741F return Route131_EventScript_1F7429:: @ 81F7429 - trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_2A34C8, Route131_Text_2A350D - msgbox Route131_Text_2A353D, 6 + trainerbattle_single TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D + msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7440:: @ 81F7440 - trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_2A35C6, Route131_Text_2A3626 - msgbox Route131_Text_2A362D, 6 + trainerbattle_single TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626 + msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7457:: @ 81F7457 - trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_2A367B, Route131_Text_2A36AB - msgbox Route131_Text_2A36D6, 6 + trainerbattle_single TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB + msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE end Route131_EventScript_1F746E:: @ 81F746E - trainerbattle 0, TRAINER_KARA, 0, Route131_Text_2A3751, Route131_Text_2A378A - msgbox Route131_Text_2A379F, 6 + trainerbattle_single TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A + msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7485:: @ 81F7485 - trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7 - msgbox Route131_Text_2A3855, 6 + trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7 + msgbox Route131_Text_2A3855, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74A0:: @ 81F74A0 - trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD - msgbox Route131_Text_2A3960, 6 + trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD + msgbox Route131_Text_2A3960, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74BB:: @ 81F74BB - trainerbattle 0, TRAINER_TALIA, 0, Route131_Text_2A39FE, Route131_Text_2A3A38 - msgbox Route131_Text_2A3A48, 6 + trainerbattle_single TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38 + msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74D2:: @ 81F74D2 - trainerbattle 0, TRAINER_KEVIN, 0, Route131_Text_2A3AA0, Route131_Text_2A3AFC - msgbox Route131_Text_2A3B02, 6 + trainerbattle_single TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC + msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc index 817d7b038..da648b925 100644 --- a/data/maps/Route132/events.inc +++ b/data/maps/Route132/events.inc @@ -1,14 +1,14 @@ Route132_EventObjects: @ 852CB90 object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, 1036 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, FLAG_ITEM_ROUTE_132_RARE_CANDY object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0 object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0 object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, 1156 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, FLAG_ITEM_ROUTE_132_PROTEIN Route132_MapEvents:: @ 852CC80 map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index a4ae6f716..aed4d0673 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -2,42 +2,42 @@ Route132_MapScripts:: @ 81F74E9 .byte 0 Route132_EventScript_1F74EA:: @ 81F74EA - trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC - msgbox Route132_Text_2A3BC0, 6 + trainerbattle_single TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC + msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7501:: @ 81F7501 - trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39 - msgbox Route132_Text_2A3C49, 6 + trainerbattle_single TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39 + msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7518:: @ 81F7518 - trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD - msgbox Route132_Text_2A3CC5, 6 + trainerbattle_single TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD + msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE end Route132_EventScript_1F752F:: @ 81F752F - trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C - msgbox Route132_Text_2A3D8B, 6 + trainerbattle_single TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C + msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7546:: @ 81F7546 - trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8 - msgbox Route132_Text_2A3FE5, 6 + trainerbattle_single TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8 + msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE end Route132_EventScript_1F755D:: @ 81F755D - trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E - msgbox Route132_Text_2A40A4, 6 + trainerbattle_single TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E + msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7574:: @ 81F7574 - trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD - msgbox Route132_Text_2A3F03, 6 + trainerbattle_single TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD + msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE end Route132_EventScript_1F758B:: @ 81F758B - trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C - msgbox Route132_Text_2A3E4E, 6 + trainerbattle_single TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C + msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index b1cbb4bb1..36f8b747d 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -2,13 +2,13 @@ Route133_EventObjects: @ 852CC94 object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, 1037 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, 1038 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, FLAG_ITEM_ROUTE_133_BIG_PEARL + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, FLAG_ITEM_ROUTE_133_STAR_PIECE object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, 1157 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_ITEM_ROUTE_133_MAX_REVIVE Route133_MapEvents:: @ 852CD84 map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index dc15a5d40..a91eeead3 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,37 +2,37 @@ Route133_MapScripts:: @ 81F75A2 .byte 0 Route133_EventScript_1F75A3:: @ 81F75A3 - trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_2A40F0, Route133_Text_2A413F - msgbox Route133_Text_2A4154, 6 + trainerbattle_single TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F + msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75BA:: @ 81F75BA - trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_2A41A8, Route133_Text_2A4200 - msgbox Route133_Text_2A420E, 6 + trainerbattle_single TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200 + msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75D1:: @ 81F75D1 - trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_2A4236, Route133_Text_2A4258 - msgbox Route133_Text_2A4264, 6 + trainerbattle_single TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258 + msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75E8:: @ 81F75E8 - trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_2A4290, Route133_Text_2A42E0 - msgbox Route133_Text_2A4304, 6 + trainerbattle_single TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0 + msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75FF:: @ 81F75FF - trainerbattle 0, TRAINER_BECK, 0, Route133_Text_2A436A, Route133_Text_2A439C - msgbox Route133_Text_2A43B9, 6 + trainerbattle_single TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C + msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE end Route133_EventScript_1F7616:: @ 81F7616 - trainerbattle 0, TRAINER_MOLLIE, 0, Route133_Text_2A4401, Route133_Text_2A443A - msgbox Route133_Text_2A4477, 6 + trainerbattle_single TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A + msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE end Route133_EventScript_1F762D:: @ 81F762D - trainerbattle 0, TRAINER_CONOR, 0, Route133_Text_2A44BA, Route133_Text_2A4505 - msgbox Route133_Text_2A4527, 6 + trainerbattle_single TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505 + msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 4201b8068..8caf4da1e 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -8,8 +8,8 @@ Route134_EventObjects: @ 852CD98 object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE Route134_MapEvents:: @ 852CEA0 map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index bdec88c42..f6f4feee3 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,47 +7,47 @@ Route134_MapScript1_1F764A: @ 81F764A end Route134_EventScript_1F7653:: @ 81F7653 - trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB - msgbox Route134_Text_2A45C5, 6 + trainerbattle_single TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB + msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE end Route134_EventScript_1F766A:: @ 81F766A - trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643 - msgbox Route134_Text_2A464B, 6 + trainerbattle_single TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643 + msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7681:: @ 81F7681 - trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE - msgbox Route134_Text_2A46D2, 6 + trainerbattle_single TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE + msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7698:: @ 81F7698 - trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1 - msgbox Route134_Text_2A47FD, 6 + trainerbattle_single TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1 + msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76AF:: @ 81F76AF - trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745 - msgbox Route134_Text_2A475D, 6 + trainerbattle_single TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745 + msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76C6:: @ 81F76C6 - trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1 - msgbox Route134_Text_2A4AD8, 6 + trainerbattle_single TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1 + msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76DD:: @ 81F76DD - trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10 - msgbox Route134_Text_2A4A34, 6 + trainerbattle_single TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10 + msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76F4:: @ 81F76F4 - trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B - msgbox Route134_Text_2A49B1, 6 + trainerbattle_single TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B + msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE end Route134_EventScript_1F770B:: @ 81F770B - trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B - msgbox Route134_Text_2A48BD, 6 + trainerbattle_single TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B + msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index 2f14304ba..48d125d0f 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -7,13 +7,13 @@ RustboroCity_EventObjects: @ 85267E0 object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0 object_event 7, EVENT_OBJ_GFX_LITTLE_BOY, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 731 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT object_event 11, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, FLAG_ITEM_RUSTBORO_CITY_X_DEFEND object_event 13, EVENT_OBJ_GFX_MAN_4, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0 - object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814 - object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 844 + object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, FLAG_HIDE_RUSBORO_CITY_RIVAL + object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 RustboroCity_MapWarps: @ 8526960 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index f4c8d5434..a524e3969 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -50,7 +50,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 - msgbox RustboroCity_Text_1E22A5, 4 + msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL applymovement 15, RustboroCity_Movement_2725A4 @@ -65,13 +65,13 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 20 applymovement 15, RustboroCity_Movement_2725AA waitmovement 0 - msgbox RustboroCity_Text_1E2331, 4 + msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT closemessage delay 20 goto RustboroCity_EventScript_1E07BD RustboroCity_EventScript_1E07AC:: @ 81E07AC - msgbox RustboroCity_Text_1E2449, 4 + msgbox RustboroCity_Text_1E2449, MSGBOX_DEFAULT closemessage delay 10 goto RustboroCity_EventScript_1E07BD @@ -92,13 +92,13 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD special sub_81C72A4 waitstate delay 20 - msgbox RustboroCity_Text_1E2464, 4 + msgbox RustboroCity_Text_1E2464, MSGBOX_DEFAULT closemessage applymovement 15, RustboroCity_Movement_1E085D waitmovement 0 playse SE_KAIDAN removeobject 15 - setflag FLAG_0x34C + setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setvar VAR_0x405A, 7 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall @@ -136,24 +136,24 @@ RustboroCity_EventScript_1E085F:: @ 81E085F faceplayer checkflag FLAG_0x08E goto_eq RustboroCity_EventScript_1E0874 - msgbox RustboroCity_Text_1E123F, 4 + msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E0874:: @ 81E0874 - msgbox RustboroCity_Text_1E12AC, 4 + msgbox RustboroCity_Text_1E12AC, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E087E:: @ 81E087E lock faceplayer - msgbox RustboroCity_Text_1E1407, 4 + msgbox RustboroCity_Text_1E1407, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E088A:: @ 81E088A - msgbox RustboroCity_Text_1E1480, 2 + msgbox RustboroCity_Text_1E1480, MSGBOX_NPC end RustboroCity_EventScript_1E0893:: @ 81E0893 @@ -161,12 +161,12 @@ RustboroCity_EventScript_1E0893:: @ 81E0893 faceplayer checkflag FLAG_BADGE01_GET goto_eq RustboroCity_EventScript_1E08A8 - msgbox RustboroCity_Text_1E130D, 4 + msgbox RustboroCity_Text_1E130D, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E08A8:: @ 81E08A8 - msgbox RustboroCity_Text_1E139E, 4 + msgbox RustboroCity_Text_1E139E, MSGBOX_DEFAULT release end @@ -175,55 +175,55 @@ RustboroCity_EventScript_1E08B2:: @ 81E08B2 faceplayer checkflag FLAG_0x0BC goto_eq RustboroCity_EventScript_1E08C7 - msgbox RustboroCity_Text_1E1520, 4 + msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E08C7:: @ 81E08C7 - msgbox RustboroCity_Text_1E1589, 4 + msgbox RustboroCity_Text_1E1589, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E08D1:: @ 81E08D1 - msgbox RustboroCity_Text_1E1633, 2 + msgbox RustboroCity_Text_1E1633, MSGBOX_NPC end RustboroCity_EventScript_1E08DA:: @ 81E08DA - msgbox RustboroCity_Text_1E1695, 3 + msgbox RustboroCity_Text_1E1695, MSGBOX_SIGN end RustboroCity_EventScript_1E08E3:: @ 81E08E3 - msgbox RustboroCity_Text_1E20A6, 3 + msgbox RustboroCity_Text_1E20A6, MSGBOX_SIGN end RustboroCity_EventScript_1E08EC:: @ 81E08EC - msgbox RustboroCity_Text_1E2128, 3 + msgbox RustboroCity_Text_1E2128, MSGBOX_SIGN end RustboroCity_EventScript_1E08F5:: @ 81E08F5 - msgbox RustboroCity_Text_1E2167, 3 + msgbox RustboroCity_Text_1E2167, MSGBOX_SIGN end RustboroCity_EventScript_1E08FE:: @ 81E08FE - msgbox RustboroCity_Text_1E21B3, 3 + msgbox RustboroCity_Text_1E21B3, MSGBOX_SIGN end RustboroCity_EventScript_1E0907:: @ 81E0907 - msgbox RustboroCity_Text_1E220B, 3 + msgbox RustboroCity_Text_1E220B, MSGBOX_SIGN end RustboroCity_EventScript_1E0910:: @ 81E0910 - msgbox RustboroCity_Text_1E2253, 3 + msgbox RustboroCity_Text_1E2253, MSGBOX_SIGN end RustboroCity_EventScript_1E0919:: @ 81E0919 - msgbox RustboroCity_Text_1E2296, 3 + msgbox RustboroCity_Text_1E2296, MSGBOX_SIGN end RustboroCity_EventScript_1E0922:: @ 81E0922 lock faceplayer - msgbox RustboroCity_Text_1E16F4, 4 + msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT applymovement 7, RustboroCity_Movement_2725A2 waitmovement 0 release @@ -232,7 +232,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922 RustboroCity_EventScript_1E0938:: @ 81E0938 lock faceplayer - msgbox RustboroCity_Text_1E174B, 4 + msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT applymovement 8, RustboroCity_Movement_2725A2 waitmovement 0 release @@ -241,7 +241,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938 RustboroCity_EventScript_1E094E:: @ 81E094E lock faceplayer - msgbox RustboroCity_Text_1E1789, 4 + msgbox RustboroCity_Text_1E1789, MSGBOX_DEFAULT release end @@ -286,7 +286,7 @@ RustboroCity_EventScript_1E09B6:: @ 81E09B6 end RustboroCity_EventScript_1E09CD:: @ 81E09CD - msgbox RustboroCity_Text_1E17FE, 4 + msgbox RustboroCity_Text_1E17FE, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 addobject 10 @@ -296,32 +296,32 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD removeobject 10 applymovement 9, RustboroCity_Movement_1E0AB1 waitmovement 0 - msgbox RustboroCity_Text_1E1817, 4 + msgbox RustboroCity_Text_1E1817, MSGBOX_DEFAULT closemessage applymovement 9, RustboroCity_Movement_1E0AB9 waitmovement 0 fadedefaultbgm removeobject 9 setobjectxyperm 9, 30, 10 - clearflag FLAG_0x2DC + clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setflag FLAG_0x08E setvar VAR_0x405A, 2 setvar VAR_RUSTURF_TUNNEL_STATE, 2 setvar VAR_0x406F, 1 - clearflag FLAG_0x37B - clearflag FLAG_0x370 - clearflag FLAG_0x36E - setflag FLAG_0x2E3 - setflag FLAG_0x371 + clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY + clearflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO + clearflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO releaseall end RustboroCity_EventScript_1E0A3B:: @ 81E0A3B - msgbox RustboroCity_Text_1E1904, 4 + msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT return RustboroCity_EventScript_1E0A44:: @ 81E0A44 - msgbox RustboroCity_Text_1E194D, 4 + msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT return RustboroCity_EventScript_1E0A4D:: @ 81E0A4D @@ -453,7 +453,7 @@ RustboroCity_EventScript_1E0ADD:: @ 81E0ADD faceplayer checkflag FLAG_0x08F goto_eq RustboroCity_EventScript_1E0AF2 - msgbox RustboroCity_Text_1E1904, 4 + msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT release end @@ -499,7 +499,7 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E setflag FLAG_0x09F setvar VAR_0x405A, 3 moveobjectoffscreen 9 - msgbox RustboroCity_Text_1E183E, 4 + msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT releaseall end @@ -592,14 +592,14 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B call_if 1, RustboroCity_EventScript_1E0D60 compare VAR_TEMP_1, 4 call_if 1, RustboroCity_EventScript_1E0D96 - msgbox RustboroCity_Text_1E194D, 4 + msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 call_if 1, RustboroCity_EventScript_1E0CD3 - msgbox RustboroCity_Text_1E1A21, 4 + msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT closemessage setflag FLAG_0x090 - setflag FLAG_0x2DC + setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setvar VAR_0x405A, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 @@ -608,7 +608,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B end RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 - msgbox RustboroCity_Text_1E19E5, 4 + msgbox RustboroCity_Text_1E19E5, MSGBOX_DEFAULT return RustboroCity_EventScript_1E0CDC:: @ 81E0CDC @@ -838,11 +838,11 @@ RustboroCity_EventScript_1E100B:: @ 81E100B checkflag FLAG_0x120 goto_eq RustboroCity_EventScript_1E1070 setflag FLAG_0x120 - msgbox RustboroCity_Text_1E1A49, 4 + msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1ADB, 4 + msgbox RustboroCity_Text_1E1ADB, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -850,25 +850,25 @@ RustboroCity_EventScript_1E100B:: @ 81E100B setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 setvar VAR_0x8008, 0 - msgbox RustboroCity_Text_1E1AFA, 5 + msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, 4 + msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 releaseall end RustboroCity_EventScript_1E1070:: @ 81E1070 setvar VAR_0x8008, 1 - msgbox RustboroCity_Text_1E1C48, 5 + msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, 4 + msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT releaseall end RustboroCity_EventScript_1E1092:: @ 81E1092 - msgbox RustboroCity_Text_1E1C84, 4 + msgbox RustboroCity_Text_1E1C84, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, RustboroCity_EventScript_1E10DB case 1, RustboroCity_EventScript_1E10EE @@ -876,7 +876,7 @@ RustboroCity_EventScript_1E1092:: @ 81E1092 end RustboroCity_EventScript_1E10C1:: @ 81E10C1 - msgbox RustboroCity_Text_1E1CE7, 4 + msgbox RustboroCity_Text_1E1CE7, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, RustboroCity_EventScript_1E10D6 releaseall @@ -888,19 +888,19 @@ RustboroCity_EventScript_1E10D6:: @ 81E10D6 return RustboroCity_EventScript_1E10DB:: @ 81E10DB - trainerbattle 3, TRAINER_MAY_14, 0, RustboroCity_Text_1E1CC1 + trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_1E1CC1 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E10C1 end RustboroCity_EventScript_1E10EE:: @ 81E10EE - trainerbattle 3, TRAINER_MAY_15, 0, RustboroCity_Text_1E1CC1 + trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_1E1CC1 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E10C1 end RustboroCity_EventScript_1E1101:: @ 81E1101 - trainerbattle 3, TRAINER_MAY_10, 0, RustboroCity_Text_1E1CC1 + trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_1E1CC1 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E10C1 end @@ -911,35 +911,35 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 checkflag FLAG_0x120 goto_eq RustboroCity_EventScript_1E1174 setflag FLAG_0x120 - msgbox RustboroCity_Text_1E1D7D, 4 + msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1E11, 4 + msgbox RustboroCity_Text_1E1E11, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0FD setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 - msgbox RustboroCity_Text_1E1E34, 5 + msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, 4 + msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 releaseall end RustboroCity_EventScript_1E1174:: @ 81E1174 - msgbox RustboroCity_Text_1E1F76, 5 + msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, 4 + msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT releaseall end RustboroCity_EventScript_1E1191:: @ 81E1191 - msgbox RustboroCity_Text_1E1FA9, 4 + msgbox RustboroCity_Text_1E1FA9, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, RustboroCity_EventScript_1E11D5 case 1, RustboroCity_EventScript_1E11E8 @@ -947,26 +947,26 @@ RustboroCity_EventScript_1E1191:: @ 81E1191 end RustboroCity_EventScript_1E11C0:: @ 81E11C0 - msgbox RustboroCity_Text_1E2002, 4 + msgbox RustboroCity_Text_1E2002, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, RustboroCity_EventScript_1E10D6 releaseall end RustboroCity_EventScript_1E11D5:: @ 81E11D5 - trainerbattle 3, TRAINER_BRENDAN_10, 0, RustboroCity_Text_1E1FE9 + trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_1E1FE9 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E11C0 end RustboroCity_EventScript_1E11E8:: @ 81E11E8 - trainerbattle 3, TRAINER_BRENDAN_12, 0, RustboroCity_Text_1E1FE9 + trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_1E1FE9 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E11C0 end RustboroCity_EventScript_1E11FB:: @ 81E11FB - trainerbattle 3, TRAINER_BRENDAN_11, 0, RustboroCity_Text_1E1FE9 + trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_1E1FE9 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E11C0 end @@ -1028,7 +1028,7 @@ RustboroCity_Movement_1E1230: @ 81E1230 step_end RustboroCity_EventScript_1E1236:: @ 81E1236 - msgbox RustboroCity_Text_1E249D, 2 + msgbox RustboroCity_Text_1E249D, MSGBOX_NPC end RustboroCity_Text_1E123F: @ 81E123F diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index e5c7527f7..6736af297 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -6,20 +6,20 @@ RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4 faceplayer checkflag FLAG_0x089 goto_eq RustboroCity_CuttersHouse_EventScript_215C00 - msgbox RustboroCity_CuttersHouse_Text_215C13, 4 + msgbox RustboroCity_CuttersHouse_Text_215C13, MSGBOX_DEFAULT giveitem_std ITEM_HM01 setflag FLAG_0x089 - msgbox RustboroCity_CuttersHouse_Text_215D33, 4 + msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT release end RustboroCity_CuttersHouse_EventScript_215C00:: @ 8215C00 - msgbox RustboroCity_CuttersHouse_Text_215D33, 4 + msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT release end RustboroCity_CuttersHouse_EventScript_215C0A:: @ 8215C0A - msgbox RustboroCity_CuttersHouse_Text_215E39, 2 + msgbox RustboroCity_CuttersHouse_Text_215E39, MSGBOX_NPC end RustboroCity_CuttersHouse_Text_215C13: @ 8215C13 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 97d7dcf78..b5af318e8 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -19,17 +19,17 @@ RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 goto_eq RustboroCity_DevonCorp_1F_EventScript_211289 checkflag FLAG_0x08E goto_eq RustboroCity_DevonCorp_1F_EventScript_21127F - msgbox RustboroCity_DevonCorp_1F_Text_2113D1, 4 + msgbox RustboroCity_DevonCorp_1F_Text_2113D1, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_21127F:: @ 821127F - msgbox RustboroCity_DevonCorp_1F_Text_211446, 4 + msgbox RustboroCity_DevonCorp_1F_Text_211446, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289 - msgbox RustboroCity_DevonCorp_1F_Text_2114DE, 4 + msgbox RustboroCity_DevonCorp_1F_Text_2114DE, MSGBOX_DEFAULT release end @@ -42,17 +42,17 @@ RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293 goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 checkflag FLAG_0x08E goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 - msgbox RustboroCity_DevonCorp_1F_Text_21151B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21151B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112BA:: @ 82112BA - msgbox RustboroCity_DevonCorp_1F_Text_211585, 4 + msgbox RustboroCity_DevonCorp_1F_Text_211585, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4 - msgbox RustboroCity_DevonCorp_1F_Text_211558, 4 + msgbox RustboroCity_DevonCorp_1F_Text_211558, MSGBOX_DEFAULT release end @@ -65,26 +65,26 @@ RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF checkflag FLAG_0x08E goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF - msgbox RustboroCity_DevonCorp_1F_Text_21131B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112F5:: @ 82112F5 - msgbox RustboroCity_DevonCorp_1F_Text_21131B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112FF:: @ 82112FF - msgbox RustboroCity_DevonCorp_1F_Text_21138B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21138B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_211309:: @ 8211309 - msgbox RustboroCity_DevonCorp_1F_Text_2115AC, 3 + msgbox RustboroCity_DevonCorp_1F_Text_2115AC, MSGBOX_SIGN end RustboroCity_DevonCorp_1F_EventScript_211312:: @ 8211312 - msgbox RustboroCity_DevonCorp_1F_Text_211722, 3 + msgbox RustboroCity_DevonCorp_1F_Text_211722, MSGBOX_SIGN end RustboroCity_DevonCorp_1F_Text_21131B: @ 821131B diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 88f0c2e73..c656fcac4 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -16,7 +16,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F faceplayer compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - msgbox RustboroCity_DevonCorp_2F_Text_211BFB, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT release end @@ -27,12 +27,12 @@ RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 checkflag FLAG_0x11F goto_eq RustboroCity_DevonCorp_2F_EventScript_2118A6 - msgbox RustboroCity_DevonCorp_2F_Text_211C50, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 - msgbox RustboroCity_DevonCorp_2F_Text_211C99, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211C99, MSGBOX_DEFAULT release end @@ -43,12 +43,12 @@ RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 checkflag FLAG_0x0BC goto_eq RustboroCity_DevonCorp_2F_EventScript_2118D0 - msgbox RustboroCity_DevonCorp_2F_Text_211D9F, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 - msgbox RustboroCity_DevonCorp_2F_Text_211DF3, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211DF3, MSGBOX_DEFAULT release end @@ -57,7 +57,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA faceplayer compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - msgbox RustboroCity_DevonCorp_2F_Text_211EE0, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT release end @@ -68,7 +68,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A03 compare VAR_0x40C4, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 - msgbox RustboroCity_DevonCorp_2F_Text_211F48, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211933 @@ -85,7 +85,7 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 + msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_CLAW_FOSSIL, 1 @@ -96,7 +96,7 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 bufferitemname 0, ITEM_ROOT_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_212153, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_ROOT_FOSSIL, 1 setvar VAR_0x40C4, 1 setvar VAR_0x40C5, 1 @@ -110,7 +110,7 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 + msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_ROOT_FOSSIL, 1 @@ -121,7 +121,7 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 bufferitemname 0, ITEM_CLAW_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_212153, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_CLAW_FOSSIL, 1 setvar VAR_0x40C4, 1 setvar VAR_0x40C5, 2 @@ -129,12 +129,12 @@ RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 end RustboroCity_DevonCorp_2F_EventScript_2119EF:: @ 82119EF - msgbox RustboroCity_DevonCorp_2F_Text_212046, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212046, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 - msgbox RustboroCity_DevonCorp_2F_Text_2121A2, 4 + msgbox RustboroCity_DevonCorp_2F_Text_2121A2, MSGBOX_DEFAULT release end @@ -147,13 +147,13 @@ RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A bufferspeciesname 1, SPECIES_LILEEP - msgbox RustboroCity_DevonCorp_2F_Text_212251, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT goto RustboroCity_DevonCorp_2F_EventScript_211A3E end RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C bufferspeciesname 1, SPECIES_ANORITH - msgbox RustboroCity_DevonCorp_2F_Text_212251, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT goto RustboroCity_DevonCorp_2F_EventScript_211AE1 end @@ -169,7 +169,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E call RustboroCity_DevonCorp_2F_EventScript_211AC4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B @@ -179,7 +179,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 call RustboroCity_DevonCorp_2F_EventScript_211AC4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 call RustboroCity_DevonCorp_2F_EventScript_273797 @@ -218,7 +218,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 call RustboroCity_DevonCorp_2F_EventScript_211B67 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B @@ -228,7 +228,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 call RustboroCity_DevonCorp_2F_EventScript_211B67 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B5C call RustboroCity_DevonCorp_2F_EventScript_273797 @@ -285,12 +285,12 @@ RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 compare VAR_0x405A, 6 goto_if 4, RustboroCity_DevonCorp_2F_EventScript_211BF1 - msgbox RustboroCity_DevonCorp_2F_Text_212338, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_211BF1:: @ 8211BF1 - msgbox RustboroCity_DevonCorp_2F_Text_212386, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212386, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index 164391cf6..df8ba0293 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -1,6 +1,6 @@ RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index ffc2614cb..f7681a6f6 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -28,45 +28,45 @@ RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E lockall - msgbox RustboroCity_DevonCorp_3F_Text_212C37, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212C37, MSGBOX_DEFAULT closemessage applymovement 2, RustboroCity_DevonCorp_3F_Movement_212546 waitmovement 0 delay 80 applymovement 2, RustboroCity_DevonCorp_3F_Movement_21254F waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212DE8, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212DE8, MSGBOX_DEFAULT closemessage playbgm MUS_TSURETEK, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534 applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558 waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212E2F, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212E2F, MSGBOX_DEFAULT closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543 applymovement 255, RustboroCity_DevonCorp_3F_Movement_212566 waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212609, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212609, MSGBOX_DEFAULT giveitem_std ITEM_LETTER - msgbox RustboroCity_DevonCorp_3F_Text_21277C, 4 + msgbox RustboroCity_DevonCorp_3F_Text_21277C, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_3F_Text_212820 waitfanfare setflag FLAG_SYS_POKENAV_GET setflag FLAG_0x0BC - setflag FLAG_0x3E7 - msgbox RustboroCity_DevonCorp_3F_Text_212837, 4 + setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT + msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT closemessage call RustboroCity_DevonCorp_3F_EventScript_272083 - msgbox RustboroCity_DevonCorp_3F_Text_2129D2, 4 - setflag FLAG_0x37E - clearflag FLAG_0x327 - clearflag FLAG_0x3D7 - clearflag FLAG_0x2E3 - clearflag FLAG_0x371 + msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT + setflag FLAG_HIDE_ROUTE_116_TUNNELER + clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN + clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN + clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setvar VAR_0x4096, 1 - clearflag FLAG_0x32E + clearflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_0x408F, 1 setvar VAR_0x405A, 6 releaseall @@ -154,7 +154,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C goto_eq RustboroCity_DevonCorp_3F_EventScript_2125CC checkflag FLAG_0x0BD goto_eq RustboroCity_DevonCorp_3F_EventScript_212595 - msgbox RustboroCity_DevonCorp_3F_Text_212A09, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 waitmovement 0 @@ -162,12 +162,12 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C end RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 - msgbox RustboroCity_DevonCorp_3F_Text_212A29, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_3F_EventScript_272054 setflag FLAG_0x110 - msgbox RustboroCity_DevonCorp_3F_Text_212A9E, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 waitmovement 0 @@ -175,7 +175,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 end RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC - msgbox RustboroCity_DevonCorp_3F_Text_212B78, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 waitmovement 0 @@ -187,17 +187,17 @@ RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1 faceplayer checkflag FLAG_0x100 goto_eq RustboroCity_DevonCorp_3F_EventScript_2125F6 - msgbox RustboroCity_DevonCorp_3F_Text_212E41, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212E41, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_3F_EventScript_2125F6:: @ 82125F6 - msgbox RustboroCity_DevonCorp_3F_Text_212E88, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212E88, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600 - msgbox RustboroCity_DevonCorp_3F_Text_212EE9, 3 + msgbox RustboroCity_DevonCorp_3F_Text_212EE9, MSGBOX_SIGN end RustboroCity_DevonCorp_3F_Text_212609: @ 8212609 diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc index 947ea14d3..9cff0b010 100644 --- a/data/maps/RustboroCity_Flat1_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc @@ -2,11 +2,11 @@ RustboroCity_Flat1_1F_MapScripts:: @ 82150CD .byte 0 RustboroCity_Flat1_1F_EventScript_2150CE:: @ 82150CE - msgbox RustboroCity_Flat1_1F_Text_2150E0, 2 + msgbox RustboroCity_Flat1_1F_Text_2150E0, MSGBOX_NPC end RustboroCity_Flat1_1F_EventScript_2150D7:: @ 82150D7 - msgbox RustboroCity_Flat1_1F_Text_215115, 2 + msgbox RustboroCity_Flat1_1F_Text_215115, MSGBOX_NPC end RustboroCity_Flat1_1F_Text_2150E0: @ 82150E0 diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 425d61f52..2113da526 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -25,50 +25,50 @@ RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 end RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D - msgbox RustboroCity_Flat1_2F_Text_2152FA, 5 + msgbox RustboroCity_Flat1_2F_Text_2152FA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 + msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD - msgbox RustboroCity_Flat1_2F_Text_215448, 5 + msgbox RustboroCity_Flat1_2F_Text_215448, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 + msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151CD:: @ 82151CD - msgbox RustboroCity_Flat1_2F_Text_2154E7, 4 + msgbox RustboroCity_Flat1_2F_Text_2154E7, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_2151D7:: @ 82151D7 - msgbox RustboroCity_Flat1_2F_Text_2156E3, 4 + msgbox RustboroCity_Flat1_2F_Text_2156E3, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_2151E1:: @ 82151E1 - msgbox RustboroCity_Flat1_2F_Text_21561E, 4 + msgbox RustboroCity_Flat1_2F_Text_21561E, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215699, 4 + msgbox RustboroCity_Flat1_2F_Text_215699, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 - msgbox RustboroCity_Flat1_2F_Text_215535, 4 + msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215565, 4 + msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT applymovement 6, RustboroCity_Flat1_2F_Movement_27259E waitmovement 0 - msgbox RustboroCity_Flat1_2F_Text_215792, 4 + msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_215221:: @ 8215221 - msgbox RustboroCity_Flat1_2F_Text_2155A4, 4 + msgbox RustboroCity_Flat1_2F_Text_2155A4, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_2155D4, 4 + msgbox RustboroCity_Flat1_2F_Text_2155D4, MSGBOX_DEFAULT release end @@ -77,11 +77,11 @@ RustboroCity_Flat1_2F_EventScript_215238:: @ 8215238 return RustboroCity_Flat1_2F_EventScript_21523D:: @ 821523D - msgbox RustboroCity_Flat1_2F_Text_21524F, 2 + msgbox RustboroCity_Flat1_2F_Text_21524F, MSGBOX_NPC end RustboroCity_Flat1_2F_EventScript_215246:: @ 8215246 - msgbox RustboroCity_Flat1_2F_Text_215923, 3 + msgbox RustboroCity_Flat1_2F_Text_215923, MSGBOX_SIGN end RustboroCity_Flat1_2F_Text_21524F: @ 821524F diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc index fbb174a29..184ccdb72 100644 --- a/data/maps/RustboroCity_Flat2_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Flat2_1F_MapScripts:: @ 8215F76 .byte 0 RustboroCity_Flat2_1F_EventScript_215F77:: @ 8215F77 - msgbox RustboroCity_Flat2_1F_Text_215F93, 2 + msgbox RustboroCity_Flat2_1F_Text_215F93, MSGBOX_NPC end RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 @@ -10,7 +10,7 @@ RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox RustboroCity_Flat2_1F_Text_215FC6, 4 + msgbox RustboroCity_Flat2_1F_Text_215FC6, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index e623aa485..9835f3622 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Flat2_2F_MapScripts:: @ 8215FD7 .byte 0 RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8 - msgbox RustboroCity_Flat2_2F_Text_21601A, 2 + msgbox RustboroCity_Flat2_2F_Text_21601A, MSGBOX_NPC end RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 @@ -10,7 +10,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 faceplayer checkflag FLAG_0x0D5 goto_eq RustboroCity_Flat2_2F_EventScript_216010 - msgbox RustboroCity_Flat2_2F_Text_21605A, 4 + msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 goto_eq RustboroCity_Flat2_2F_EventScript_272054 @@ -19,7 +19,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 end RustboroCity_Flat2_2F_EventScript_216010:: @ 8216010 - msgbox RustboroCity_Flat2_2F_Text_2160BD, 4 + msgbox RustboroCity_Flat2_2F_Text_2160BD, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc index 6a267c336..c38e46cbf 100644 --- a/data/maps/RustboroCity_Flat2_3F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc @@ -2,11 +2,11 @@ RustboroCity_Flat2_3F_MapScripts:: @ 8216116 .byte 0 RustboroCity_Flat2_3F_EventScript_216117:: @ 8216117 - msgbox RustboroCity_Flat2_3F_Text_216129, 2 + msgbox RustboroCity_Flat2_3F_Text_216129, MSGBOX_NPC end RustboroCity_Flat2_3F_EventScript_216120:: @ 8216120 - msgbox RustboroCity_Flat2_3F_Text_216159, 2 + msgbox RustboroCity_Flat2_3F_Text_216159, MSGBOX_NPC end RustboroCity_Flat2_3F_Text_216129: @ 8216129 diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 1d722b7de..f39374c64 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -2,13 +2,13 @@ RustboroCity_Gym_MapScripts:: @ 8212F30 .byte 0 RustboroCity_Gym_EventScript_212F31:: @ 8212F31 - trainerbattle 1, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66 + trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq RustboroCity_Gym_EventScript_212FC8 checkflag FLAG_0x0A5 goto_if 0, RustboroCity_Gym_EventScript_212FA4 - msgbox RustboroCity_Gym_Text_2139A7, 4 + msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT release end @@ -16,7 +16,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 message RustboroCity_Gym_Text_2137EC waitmessage call RustboroCity_Gym_EventScript_27207E - msgbox RustboroCity_Gym_Text_213816, 4 + msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT setflag FLAG_0x4F0 setflag FLAG_BADGE01_GET setvar VAR_0x405A, 1 @@ -33,28 +33,28 @@ RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 compare VAR_RESULT, 0 goto_eq RustboroCity_Gym_EventScript_272054 setflag FLAG_0x0A5 - msgbox RustboroCity_Gym_Text_2138B1, 4 + msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release end RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8 - trainerbattle 7, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93 - msgbox RustboroCity_Gym_Text_213D12, 6 + trainerbattle_rematch_double TRAINER_ROXANNE_1, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93 + msgbox RustboroCity_Gym_Text_213D12, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3 - trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D - msgbox RustboroCity_Gym_Text_213447, 6 + trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D + msgbox RustboroCity_Gym_Text_213447, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA - trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 - msgbox RustboroCity_Gym_Text_2134E6, 6 + trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 + msgbox RustboroCity_Gym_Text_2134E6, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_213011:: @ 8213011 - trainerbattle 0, TRAINER_MARC, 0, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 - msgbox RustboroCity_Gym_Text_2135C0, 6 + trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 + msgbox RustboroCity_Gym_Text_2135C0, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_213028:: @ 8213028 @@ -62,12 +62,12 @@ RustboroCity_Gym_EventScript_213028:: @ 8213028 faceplayer checkflag FLAG_0x4F0 goto_eq RustboroCity_Gym_EventScript_21303D - msgbox RustboroCity_Gym_Text_21309D, 4 + msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT release end RustboroCity_Gym_EventScript_21303D:: @ 821303D - msgbox RustboroCity_Gym_Text_2132E2, 4 + msgbox RustboroCity_Gym_Text_2132E2, MSGBOX_DEFAULT release end @@ -86,12 +86,12 @@ RustboroCity_Gym_EventScript_213057:: @ 8213057 end RustboroCity_Gym_EventScript_213067:: @ 8213067 - msgbox RustboroCity_Gym_Text_213A3B, 4 + msgbox RustboroCity_Gym_Text_213A3B, MSGBOX_DEFAULT releaseall end RustboroCity_Gym_EventScript_213071:: @ 8213071 - msgbox RustboroCity_Gym_Text_213A21, 4 + msgbox RustboroCity_Gym_Text_213A21, MSGBOX_DEFAULT releaseall end @@ -101,7 +101,7 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Gym_Text_213C01, 4 + msgbox RustboroCity_Gym_Text_213C01, MSGBOX_DEFAULT waitfanfare closemessage delay 30 diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index d63536c55..ccf7ef046 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -10,7 +10,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox RustboroCity_House1_Text_2159E8, 5 + msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_House1_EventScript_2159BD special sub_81B94B0 @@ -28,29 +28,29 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F special sub_807EA10 special sub_807F0E4 waitstate - msgbox RustboroCity_House1_Text_215A77, 4 + msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT setflag FLAG_0x099 release end RustboroCity_House1_EventScript_2159BD:: @ 82159BD - msgbox RustboroCity_House1_Text_215ACE, 4 + msgbox RustboroCity_House1_Text_215ACE, MSGBOX_DEFAULT release end RustboroCity_House1_EventScript_2159C7:: @ 82159C7 bufferspeciesname 0, VAR_0x8009 - msgbox RustboroCity_House1_Text_215A9D, 4 + msgbox RustboroCity_House1_Text_215A9D, MSGBOX_DEFAULT release end RustboroCity_House1_EventScript_2159D5:: @ 82159D5 - msgbox RustboroCity_House1_Text_215B17, 4 + msgbox RustboroCity_House1_Text_215B17, MSGBOX_DEFAULT release end RustboroCity_House1_EventScript_2159DF:: @ 82159DF - msgbox RustboroCity_House1_Text_215B57, 2 + msgbox RustboroCity_House1_Text_215B57, MSGBOX_NPC end RustboroCity_House1_Text_2159E8: @ 82159E8 diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc index fd71dc016..37f3b4c43 100644 --- a/data/maps/RustboroCity_House2/scripts.inc +++ b/data/maps/RustboroCity_House2/scripts.inc @@ -2,11 +2,11 @@ RustboroCity_House2_MapScripts:: @ 8215EB3 .byte 0 RustboroCity_House2_EventScript_215EB4:: @ 8215EB4 - msgbox RustboroCity_House2_Text_215EC6, 2 + msgbox RustboroCity_House2_Text_215EC6, MSGBOX_NPC end RustboroCity_House2_EventScript_215EBD:: @ 8215EBD - msgbox RustboroCity_House2_Text_215F21, 2 + msgbox RustboroCity_House2_Text_215F21, MSGBOX_NPC end RustboroCity_House2_Text_215EC6: @ 8215EC6 diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc index 87d278099..2d927086e 100644 --- a/data/maps/RustboroCity_House3/scripts.inc +++ b/data/maps/RustboroCity_House3/scripts.inc @@ -2,11 +2,11 @@ RustboroCity_House3_MapScripts:: @ 8216190 .byte 0 RustboroCity_House3_EventScript_216191:: @ 8216191 - msgbox RustboroCity_House3_Text_2161B6, 2 + msgbox RustboroCity_House3_Text_2161B6, MSGBOX_NPC end RustboroCity_House3_EventScript_21619A:: @ 821619A - msgbox RustboroCity_House3_Text_21622A, 2 + msgbox RustboroCity_House3_Text_21622A, MSGBOX_NPC end RustboroCity_House3_EventScript_2161A3:: @ 82161A3 @@ -14,7 +14,7 @@ RustboroCity_House3_EventScript_2161A3:: @ 82161A3 faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox RustboroCity_House3_Text_2162AB, 4 + msgbox RustboroCity_House3_Text_2162AB, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index daa445a0e..ed91cf68e 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -14,7 +14,7 @@ RustboroCity_Mart_EventScript_214F06:: @ 8214F06 RustboroCity_Mart_EventScript_214F21:: @ 8214F21 pokemart RustboroCity_Mart_Pokemart_214F30 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -35,7 +35,7 @@ RustboroCity_Mart_Pokemart_214F30: @ 8214F30 RustboroCity_Mart_EventScript_214F48:: @ 8214F48 pokemart RustboroCity_Mart_Pokemart_214F58 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -58,15 +58,15 @@ RustboroCity_Mart_Pokemart_214F58: @ 8214F58 end RustboroCity_Mart_EventScript_214F74:: @ 8214F74 - msgbox RustboroCity_Mart_Text_214F8F, 2 + msgbox RustboroCity_Mart_Text_214F8F, MSGBOX_NPC end RustboroCity_Mart_EventScript_214F7D:: @ 8214F7D - msgbox RustboroCity_Mart_Text_214FF1, 2 + msgbox RustboroCity_Mart_Text_214FF1, MSGBOX_NPC end RustboroCity_Mart_EventScript_214F86:: @ 8214F86 - msgbox RustboroCity_Mart_Text_21505C, 2 + msgbox RustboroCity_Mart_Text_21505C, MSGBOX_NPC end RustboroCity_Mart_Text_214F8F: @ 8214F8F diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index acf33e647..0a5a6ed92 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -17,15 +17,15 @@ RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76 end RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84 - msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D - msgbox RustboroCity_PokemonCenter_1F_Text_214E13, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214E13, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96 - msgbox RustboroCity_PokemonCenter_1F_Text_214E81, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214E81, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc index f1f9fe356..346a4de16 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index d32f8ad46..0c6ca19dc 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0 object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0 object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT RustboroCity_PokemonSchool_MapWarps: @ 8530694 warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index f5030facd..6ec120258 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8 RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9 lockall - msgbox RustboroCity_PokemonSchool_Text_2140B2, 4 + msgbox RustboroCity_PokemonSchool_Text_2140B2, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end @@ -22,27 +22,27 @@ RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8 end RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17 - msgbox RustboroCity_PokemonSchool_Text_21411A, 4 + msgbox RustboroCity_PokemonSchool_Text_21411A, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25 - msgbox RustboroCity_PokemonSchool_Text_2141D8, 4 + msgbox RustboroCity_PokemonSchool_Text_2141D8, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33 - msgbox RustboroCity_PokemonSchool_Text_21427D, 4 + msgbox RustboroCity_PokemonSchool_Text_21427D, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41 - msgbox RustboroCity_PokemonSchool_Text_214336, 4 + msgbox RustboroCity_PokemonSchool_Text_214336, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F - msgbox RustboroCity_PokemonSchool_Text_2143B8, 4 + msgbox RustboroCity_PokemonSchool_Text_2143B8, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end @@ -51,27 +51,27 @@ RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D end RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F - msgbox RustboroCity_PokemonSchool_Text_21459F, 2 + msgbox RustboroCity_PokemonSchool_Text_21459F, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68 - msgbox RustboroCity_PokemonSchool_Text_2145CD, 2 + msgbox RustboroCity_PokemonSchool_Text_2145CD, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71 - msgbox RustboroCity_PokemonSchool_Text_214604, 2 + msgbox RustboroCity_PokemonSchool_Text_214604, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A - msgbox RustboroCity_PokemonSchool_Text_214669, 2 + msgbox RustboroCity_PokemonSchool_Text_214669, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83 - msgbox RustboroCity_PokemonSchool_Text_214719, 2 + msgbox RustboroCity_PokemonSchool_Text_214719, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C - msgbox RustboroCity_PokemonSchool_Text_2147A2, 3 + msgbox RustboroCity_PokemonSchool_Text_2147A2, MSGBOX_SIGN end RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 @@ -83,7 +83,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5 compare VAR_FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0 - msgbox RustboroCity_PokemonSchool_Text_214433, 4 + msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 goto_eq RustboroCity_PokemonSchool_EventScript_272054 @@ -105,7 +105,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 return RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB - msgbox RustboroCity_PokemonSchool_Text_2144C8, 4 + msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA waitmovement 0 @@ -173,7 +173,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 goto_eq RustboroCity_PokemonSchool_EventScript_21406F checkflag FLAG_BADGE01_GET goto_eq RustboroCity_PokemonSchool_EventScript_214082 - msgbox RustboroCity_PokemonSchool_Text_2148C0, 4 + msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x136 release @@ -182,17 +182,17 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F checkflag FLAG_BADGE01_GET goto_eq RustboroCity_PokemonSchool_EventScript_214090 - msgbox RustboroCity_PokemonSchool_Text_214A5F, 4 + msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT release end RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082 - msgbox RustboroCity_PokemonSchool_Text_214B8A, 4 + msgbox RustboroCity_PokemonSchool_Text_214B8A, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_21409E end RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090 - msgbox RustboroCity_PokemonSchool_Text_214AB6, 4 + msgbox RustboroCity_PokemonSchool_Text_214AB6, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_21409E end @@ -203,7 +203,7 @@ RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E end RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8 - msgbox RustboroCity_PokemonSchool_Text_214A5F, 4 + msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT release end diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index 5d3f3c8be..292bda57d 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -1,14 +1,14 @@ RusturfTunnel_EventObjects: @ 85341C4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049 - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 879 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER + object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, FLAG_HIDE_RUSTURF_TUNNEL_PEEKO + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983 + object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN RusturfTunnel_MapWarps: @ 85342B4 warp_def 4, 10, 3, 0, MAP_ROUTE116 diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 33e87bda5..c93f7d5c4 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -21,7 +21,7 @@ RusturfTunnel_EventScript_22CE50:: @ 822CE50 RusturfTunnel_EventScript_22CE5F:: @ 822CE5F lock faceplayer - msgbox RusturfTunnel_Text_22D7A3, 4 + msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 waitmovement 0 @@ -31,10 +31,10 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F RusturfTunnel_EventScript_22CE76:: @ 822CE76 lock faceplayer - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_eq RusturfTunnel_EventScript_22CE99 - setflag FLAG_0x001 - msgbox RusturfTunnel_Text_22D510, 4 + setflag FLAG_TEMP_1 + msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 waitmovement 0 @@ -42,7 +42,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 end RusturfTunnel_EventScript_22CE99:: @ 822CE99 - msgbox RusturfTunnel_Text_22D5F3, 4 + msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 waitmovement 0 @@ -58,14 +58,14 @@ RusturfTunnel_EventScript_22CEAE:: @ 822CEAE compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CFC7 call RusturfTunnel_EventScript_22CFFF - msgbox RusturfTunnel_Text_22D65C, 4 + msgbox RusturfTunnel_Text_22D65C, MSGBOX_DEFAULT compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_22CFC8 compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CFC8 giveitem_std ITEM_HM04 setflag FLAG_0x06A - msgbox RusturfTunnel_Text_22D6D2, 4 + msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_22CF5D @@ -73,7 +73,7 @@ RusturfTunnel_EventScript_22CEAE:: @ 822CEAE call_if 1, RusturfTunnel_EventScript_22CF6F compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CF8B - msgbox RusturfTunnel_Text_22D745, 4 + msgbox RusturfTunnel_Text_22D745, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_22CFD4 @@ -281,7 +281,7 @@ RusturfTunnel_EventScript_22D07D:: @ 822D07D RusturfTunnel_EventScript_22D083:: @ 822D083 lockall - msgbox RusturfTunnel_Text_22D1C8, 4 + msgbox RusturfTunnel_Text_22D1C8, MSGBOX_DEFAULT closemessage applymovement 6, RusturfTunnel_Movement_22D0AB applymovement 7, RusturfTunnel_Movement_22D0AB @@ -303,7 +303,7 @@ RusturfTunnel_EventScript_22D0AF:: @ 822D0AF faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox RusturfTunnel_Text_22D1F7, 4 + msgbox RusturfTunnel_Text_22D1F7, MSGBOX_DEFAULT waitmoncry release end @@ -312,9 +312,9 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 lock faceplayer playbgm MUS_AQA_0, 0 - msgbox RusturfTunnel_Text_22D20A, 4 - trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 - msgbox RusturfTunnel_Text_22D2E1, 4 + msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_10, RusturfTunnel_Text_22D2B0 + msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage applymovement 255, RusturfTunnel_Movement_22D178 @@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 applymovement 255, RusturfTunnel_Movement_22D17E applymovement 5, RusturfTunnel_Movement_22D1A4 waitmovement 0 - msgbox RusturfTunnel_Text_22D395, 4 + msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT applymovement 5, RusturfTunnel_Movement_27259E waitmovement 0 message RusturfTunnel_Text_22D3BA @@ -348,7 +348,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 setflag FLAG_0x08F setvar VAR_0x405A, 4 setvar VAR_0x4090, 1 - setflag FLAG_0x37B + setflag FLAG_HIDE_ROUTE_116_MR_BRINEY release end @@ -426,8 +426,8 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 step_end RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 - trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB - msgbox RusturfTunnel_Text_22D8F9, 6 + trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB + msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE end RusturfTunnel_Text_22D1C8: @ 822D1C8 diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index 6ed455cad..c36e38fda 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -1,9 +1,9 @@ SSTidalCorridor_EventObjects: @ 853A158 object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 810 + object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 8fcd6e59b..91780d608 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -15,7 +15,7 @@ SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF setvar VAR_PORTHOLE_STATE, 2 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C462, 4 + msgbox SSTidalCorridor_Text_23C462, MSGBOX_DEFAULT releaseall end @@ -23,7 +23,7 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015 setvar VAR_PORTHOLE_STATE, 6 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C4E3, 4 + msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT releaseall end @@ -31,14 +31,14 @@ SSTidalRooms_EventScript_23C028:: @ 823C028 special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 7 playse SE_PINPON - msgbox SSTidalRooms_Text_23C462, 4 + msgbox SSTidalRooms_Text_23C462, MSGBOX_DEFAULT return SSTidalRooms_EventScript_23C03C:: @ 823C03C special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 4 playse SE_PINPON - msgbox SSTidalRooms_Text_23C553, 4 + msgbox SSTidalRooms_Text_23C553, MSGBOX_DEFAULT return SSTidalCorridor_EventScript_23C050:: @ 823C050 @@ -53,7 +53,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067 setvar VAR_PORTHOLE_STATE, 3 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C4E3, 4 + msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT releaseall end @@ -62,7 +62,7 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D setvar VAR_PORTHOLE_STATE, 8 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C50F, 4 + msgbox SSTidalCorridor_Text_23C50F, MSGBOX_DEFAULT releaseall end @@ -70,7 +70,7 @@ SSTidalRooms_EventScript_23C093:: @ 823C093 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 playse SE_PINPON - msgbox SSTidalRooms_Text_23C50F, 4 + msgbox SSTidalRooms_Text_23C50F, MSGBOX_DEFAULT return SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 @@ -82,7 +82,7 @@ SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 return SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9 - msgbox SSTidalCorridor_Text_23C6EC, 2 + msgbox SSTidalCorridor_Text_23C6EC, MSGBOX_NPC end SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2 @@ -90,25 +90,25 @@ SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2 faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox SSTidalCorridor_Text_23C7E1, 4 + msgbox SSTidalCorridor_Text_23C7E1, MSGBOX_DEFAULT waitmoncry release end SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5 - msgbox SSTidalCorridor_Text_23C7F8, 3 + msgbox SSTidalCorridor_Text_23C7F8, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE - msgbox SSTidalCorridor_Text_23C800, 3 + msgbox SSTidalCorridor_Text_23C800, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C107:: @ 823C107 - msgbox SSTidalCorridor_Text_23C808, 3 + msgbox SSTidalCorridor_Text_23C808, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C110:: @ 823C110 - msgbox SSTidalCorridor_Text_23C810, 3 + msgbox SSTidalCorridor_Text_23C810, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C119:: @ 823C119 @@ -118,13 +118,13 @@ SSTidalCorridor_EventScript_23C119:: @ 823C119 goto_eq SSTidalCorridor_EventScript_23C13B compare VAR_PORTHOLE_STATE, 8 goto_eq SSTidalCorridor_EventScript_23C15A - msgbox SSTidalCorridor_Text_23C596, 4 + msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT release end SSTidalCorridor_EventScript_23C13B:: @ 823C13B setrespawn HEAL_LOCATION_LILYCOVE_CITY - msgbox SSTidalCorridor_Text_23C64F, 4 + msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 @@ -134,7 +134,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B SSTidalCorridor_EventScript_23C15A:: @ 823C15A setrespawn HEAL_LOCATION_SLATEPORT_CITY - msgbox SSTidalCorridor_Text_23C64F, 4 + msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 @@ -143,7 +143,7 @@ SSTidalCorridor_EventScript_23C15A:: @ 823C15A end SSTidalCorridor_EventScript_23C179:: @ 823C179 - setflag FLAG_0x3B7 + setflag FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER return SSTidalCorridor_EventScript_23C17D:: @ 823C17D @@ -152,7 +152,7 @@ SSTidalCorridor_EventScript_23C17D:: @ 823C17D goto_eq SSTidalCorridor_EventScript_23C19E compare VAR_PORTHOLE_STATE, 7 goto_eq SSTidalCorridor_EventScript_23C19E - msgbox SSTidalCorridor_Text_23C6C3, 4 + msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT releaseall end @@ -167,12 +167,12 @@ SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3 checkflag FLAG_0x0F7 goto_eq SSTidalCorridor_EventScript_23C1BD call SSTidalCorridor_EventScript_23C1C7 - msgbox SSTidalCorridor_Text_23C65E, 4 + msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT release end SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD - msgbox SSTidalCorridor_Text_23C6B0, 4 + msgbox SSTidalCorridor_Text_23C6B0, MSGBOX_DEFAULT release end @@ -206,7 +206,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 waitmovement 0 applymovement 255, SSTidalCorridor_Movement_2725A8 waitmovement 0 - msgbox SSTidalCorridor_Text_23C28F, 4 + msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage applymovement 255, SSTidalCorridor_Movement_23C27D applymovement 1, SSTidalCorridor_Movement_23C284 diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index be32d9ad4..65ced7c13 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -6,7 +6,7 @@ SSTidalLowerDeck_MapWarps: @ 853A2EC warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR SSTidalLowerDeck_MapBGEvents: @ 853A2F4 - bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, 35 + bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS SSTidalLowerDeck_MapEvents:: @ 853A300 map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index 2ad1ed580..b7e15a82d 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -2,13 +2,13 @@ SSTidalLowerDeck_MapScripts:: @ 823C818 .byte 0 SSTidalLowerDeck_EventScript_23C819:: @ 823C819 - trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 - msgbox SSTidalLowerDeck_Text_23C8B4, 6 + trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 + msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE end SSTidalLowerDeck_EventScript_23C830:: @ 823C830 - trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D - msgbox SSTidalLowerDeck_Text_23C98E, 6 + trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D + msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE end SSTidalLowerDeck_Text_23C847: @ 823C847 diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index cca2bc821..99937ef75 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -6,7 +6,7 @@ SSTidalRooms_EventObjects: @ 853A314 object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 object_event 6, EVENT_OBJ_GFX_RICH_BOY, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, 951 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER SSTidalRooms_MapWarps: @ 853A3D4 warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 39c453e98..055973787 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -6,23 +6,23 @@ SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 faceplayer checkflag FLAG_0x104 goto_eq SSTidalRooms_EventScript_23CA29 - msgbox SSTidalRooms_Text_23D098, 4 + msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT giveitem_std ITEM_TM49 compare VAR_RESULT, 0 goto_eq SSTidalRooms_EventScript_272054 setflag FLAG_0x104 - msgbox SSTidalRooms_Text_23D145, 4 + msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release end SSTidalRooms_EventScript_23CA29:: @ 823CA29 - msgbox SSTidalRooms_Text_23D145, 4 + msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release end SSTidalRooms_EventScript_23CA33:: @ 823CA33 lockall - msgbox SSTidalRooms_Text_23CAF2, 4 + msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT closemessage call SSTidalRooms_EventScript_272083 call SSTidalRooms_EventScript_23C0A7 @@ -30,38 +30,38 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33 end SSTidalRooms_EventScript_23CA49:: @ 823CA49 - trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 - msgbox SSTidalRooms_Text_23CB75, 6 + trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 + msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA60:: @ 823CA60 - trainerbattle 0, TRAINER_MICAH, 0, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 - msgbox SSTidalRooms_Text_23CC26, 6 + trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 + msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA77:: @ 823CA77 - trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A - msgbox SSTidalRooms_Text_23CCBB, 6 + trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A + msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA8E:: @ 823CA8E - trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 - msgbox SSTidalRooms_Text_23CD5F, 6 + trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 + msgbox SSTidalRooms_Text_23CD5F, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CAA9:: @ 823CAA9 - trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 - msgbox SSTidalRooms_Text_23CE59, 6 + trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 + msgbox SSTidalRooms_Text_23CE59, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CAC4:: @ 823CAC4 - trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 - msgbox SSTidalRooms_Text_23CF45, 6 + trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 + msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CADB:: @ 823CADB - trainerbattle 0, TRAINER_NAOMI, 0, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 - msgbox SSTidalRooms_Text_23D013, 6 + trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 + msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE end SSTidalRooms_Text_23CAF2: @ 823CAF2 diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc index 11e4b2e28..152fa54c5 100644 --- a/data/maps/SafariZone_North/events.inc +++ b/data/maps/SafariZone_North/events.inc @@ -1,13 +1,13 @@ SafariZone_North_EventObjects: @ 853B160 object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 17 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 18 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 20 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 21 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 22 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, 1119 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_13 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_14 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_15 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_16 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM SafariZone_North_MapEvents:: @ 853B238 map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index a96b6b95d..d98fdca88 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -2,10 +2,10 @@ SafariZone_North_MapScripts:: @ 823D253 .byte 0 SafariZone_North_EventScript_23D254:: @ 823D254 - msgbox SafariZone_North_Text_2A5489, 2 + msgbox SafariZone_North_Text_2A5489, MSGBOX_NPC end SafariZone_North_EventScript_23D25D:: @ 823D25D - msgbox SafariZone_North_Text_2A54F0, 2 + msgbox SafariZone_North_Text_2A54F0, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index a3d1ad0a3..dc0393b4d 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -1,17 +1,17 @@ SafariZone_Northeast_EventObjects: @ 853B968 object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_15 object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_13 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_11 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_14 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_12 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET SafariZone_Northeast_MapBGEvents: @ 853BA40 - bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, 106 - bg_hidden_item_event 21, 5, 3, ITEM_ZINC, 107 + bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY + bg_hidden_item_event 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC SafariZone_Northeast_MapEvents:: @ 853BA58 map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc index c43db4125..95b6623ac 100644 --- a/data/maps/SafariZone_Northwest/events.inc +++ b/data/maps/SafariZone_Northwest/events.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_EventObjects: @ 853B11C object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 SafariZone_Northwest_MapEvents:: @ 853B14C map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_Northwest/scripts.inc b/data/maps/SafariZone_Northwest/scripts.inc index 34e510237..a64c142fe 100644 --- a/data/maps/SafariZone_Northwest/scripts.inc +++ b/data/maps/SafariZone_Northwest/scripts.inc @@ -2,6 +2,6 @@ SafariZone_Northwest_MapScripts:: @ 823D249 .byte 0 SafariZone_Northwest_EventScript_23D24A:: @ 823D24A - msgbox SafariZone_Northwest_Text_2A542C, 2 + msgbox SafariZone_Northwest_Text_2A542C, MSGBOX_NPC end diff --git a/data/maps/SafariZone_RestHouse/scripts.inc b/data/maps/SafariZone_RestHouse/scripts.inc index 22657eeb1..e08cfe3da 100644 --- a/data/maps/SafariZone_RestHouse/scripts.inc +++ b/data/maps/SafariZone_RestHouse/scripts.inc @@ -2,14 +2,14 @@ SafariZone_RestHouse_MapScripts:: @ 8242BE6 .byte 0 SafariZone_RestHouse_EventScript_242BE7:: @ 8242BE7 - msgbox SafariZone_RestHouse_Text_2A5639, 2 + msgbox SafariZone_RestHouse_Text_2A5639, MSGBOX_NPC end SafariZone_RestHouse_EventScript_242BF0:: @ 8242BF0 - msgbox SafariZone_RestHouse_Text_2A56E1, 2 + msgbox SafariZone_RestHouse_Text_2A56E1, MSGBOX_NPC end SafariZone_RestHouse_EventScript_242BF9:: @ 8242BF9 - msgbox SafariZone_RestHouse_Text_2A5764, 2 + msgbox SafariZone_RestHouse_Text_2A5764, MSGBOX_NPC end diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc index 21626d410..6d8d84877 100644 --- a/data/maps/SafariZone_South/events.inc +++ b/data/maps/SafariZone_South/events.inc @@ -3,8 +3,8 @@ SafariZone_South_EventObjects: @ 853B2A4 object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, 717 - object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, 717 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS + object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS SafariZone_South_MapWarps: @ 853B334 warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 19f51b873..6579b6571 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -37,15 +37,15 @@ SafariZone_South_Movement_23D2C7: @ 823D2C7 step_end SafariZone_South_EventScript_23D2CA:: @ 823D2CA - msgbox SafariZone_South_Text_2A52EF, 2 + msgbox SafariZone_South_Text_2A52EF, MSGBOX_NPC end SafariZone_South_EventScript_23D2D3:: @ 823D2D3 - msgbox SafariZone_South_Text_2A533B, 2 + msgbox SafariZone_South_Text_2A533B, MSGBOX_NPC end SafariZone_South_EventScript_23D2DC:: @ 823D2DC - msgbox SafariZone_South_Text_2A553E, 2 + msgbox SafariZone_South_Text_2A553E, MSGBOX_NPC end SafariZone_South_EventScript_23D2E5:: @ 823D2E5 @@ -53,21 +53,21 @@ SafariZone_South_EventScript_23D2E5:: @ 823D2E5 faceplayer checkflag FLAG_0x05D goto_if 0, SafariZone_South_EventScript_23D30D - msgbox SafariZone_South_Text_2A51D4, 5 + msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SafariZone_South_EventScript_23D31A - msgbox SafariZone_South_Text_2A521A, 4 + msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT release end SafariZone_South_EventScript_23D30D:: @ 823D30D setflag FLAG_0x05D - msgbox SafariZone_South_Text_2A52AB, 4 + msgbox SafariZone_South_Text_2A52AB, MSGBOX_DEFAULT release end SafariZone_South_EventScript_23D31A:: @ 823D31A - msgbox SafariZone_South_Text_2A5248, 4 + msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT closemessage switch VAR_FACING case 2, SafariZone_South_EventScript_23D33F @@ -117,38 +117,38 @@ SafariZone_South_Movement_23D38D: @ 823D38D step_end SafariZone_South_EventScript_23D390:: @ 823D390 - msgbox SafariZone_South_Text_2A57EE, 2 + msgbox SafariZone_South_Text_2A57EE, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D399:: @ 823D399 - msgbox SafariZone_Southeast_Text_2A582D, 2 + msgbox SafariZone_Southeast_Text_2A582D, MSGBOX_NPC end SafariZone_South_EventScript_23D3A2:: @ 823D3A2 - msgbox SafariZone_South_Text_2A5887, 2 + msgbox SafariZone_South_Text_2A5887, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB - msgbox SafariZone_Southeast_Text_2A58C6, 2 + msgbox SafariZone_Southeast_Text_2A58C6, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4 - msgbox SafariZone_Southeast_Text_2A58FD, 2 + msgbox SafariZone_Southeast_Text_2A58FD, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD - msgbox SafariZone_Southeast_Text_2A5960, 2 + msgbox SafariZone_Southeast_Text_2A5960, MSGBOX_NPC end SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6 - msgbox SafariZone_Northeast_Text_2A59A4, 2 + msgbox SafariZone_Northeast_Text_2A59A4, MSGBOX_NPC end SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF - msgbox SafariZone_Northeast_Text_2A5A09, 2 + msgbox SafariZone_Northeast_Text_2A5A09, MSGBOX_NPC end SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8 - msgbox SafariZone_Northeast_Text_2A5A44, 2 + msgbox SafariZone_Northeast_Text_2A5A44, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index d1be808cc..badaaefd4 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -2,12 +2,12 @@ SafariZone_Southeast_EventObjects: @ 853BA6C object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION SafariZone_Southeast_MapBGEvents: @ 853BAE4 - bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, 108 - bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, 105 + bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP + bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE SafariZone_Southeast_MapEvents:: @ 853BAFC map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index f4750621d..930d3c8ed 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_EventObjects: @ 853B24C object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE SafariZone_Southwest_MapWarps: @ 853B27C warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE diff --git a/data/maps/SafariZone_Southwest/scripts.inc b/data/maps/SafariZone_Southwest/scripts.inc index d2e75eb1b..069f22b49 100644 --- a/data/maps/SafariZone_Southwest/scripts.inc +++ b/data/maps/SafariZone_Southwest/scripts.inc @@ -2,10 +2,10 @@ SafariZone_Southwest_MapScripts:: @ 823D266 .byte 0 SafariZone_Southwest_EventScript_23D267:: @ 823D267 - msgbox SafariZone_Southwest_Text_2A53B7, 2 + msgbox SafariZone_Southwest_Text_2A53B7, MSGBOX_NPC end SafariZone_Southwest_EventScript_23D270:: @ 823D270 - msgbox SafariZone_Southwest_Text_2A5613, 3 + msgbox SafariZone_Southwest_Text_2A5613, MSGBOX_SIGN end diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc index 5bbe88c20..20a5fc145 100644 --- a/data/maps/ScorchedSlab/events.inc +++ b/data/maps/ScorchedSlab/events.inc @@ -1,5 +1,5 @@ ScorchedSlab_EventObjects: @ 8536F88 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11 ScorchedSlab_MapWarps: @ 8536FA0 warp_def 7, 16, 1, 1, MAP_ROUTE120 diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc index 11a8211de..b0574d14e 100644 --- a/data/maps/SeafloorCavern_Entrance/events.inc +++ b/data/maps/SeafloorCavern_Entrance/events.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance_EventObjects: @ 85356BC - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT SeafloorCavern_Entrance_MapWarps: @ 85356D4 warp_def 10, 18, 3, 0, MAP_UNDERWATER4 diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 9eb71d5e3..db5dd7f02 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -27,7 +27,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 delay 30 setvar VAR_0x40D9, 1 moveobjectoffscreen 1 - msgbox SeafloorCavern_Entrance_Text_234544, 4 + msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 waitmovement 0 @@ -41,7 +41,7 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED call_if 1, SeafloorCavern_Entrance_EventScript_234523 compare VAR_FACING, 2 call_if 1, SeafloorCavern_Entrance_EventScript_234539 - msgbox SeafloorCavern_Entrance_Text_2346C8, 4 + msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 waitmovement 0 diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc index 2c8e51e30..2c507151b 100644 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ b/data/maps/SeafloorCavern_Room1/events.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room1_EventObjects: @ 85356F8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS SeafloorCavern_Room1_MapWarps: @ 8535770 warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index d3308fca2..96ef36d38 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -2,13 +2,13 @@ SeafloorCavern_Room1_MapScripts:: @ 82347EB .byte 0 SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC - trainerbattle 0, TRAINER_GRUNT_5, 0, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A - msgbox SeafloorCavern_Room1_Text_23485D, 6 + trainerbattle_single TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A + msgbox SeafloorCavern_Room1_Text_23485D, MSGBOX_AUTOCLOSE end SeafloorCavern_Room1_EventScript_234803:: @ 8234803 - trainerbattle 0, TRAINER_GRUNT_6, 0, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD - msgbox SeafloorCavern_Room1_Text_2348E3, 6 + trainerbattle_single TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD + msgbox SeafloorCavern_Room1_Text_2348E3, MSGBOX_AUTOCLOSE end SeafloorCavern_Room1_Text_23481A: @ 823481A diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc index 82f924121..1cc30957a 100644 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ b/data/maps/SeafloorCavern_Room2/events.inc @@ -1,12 +1,12 @@ SeafloorCavern_Room2_EventObjects: @ 853579C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_12 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_13 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_15 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_16 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_18 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_19 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_17 SeafloorCavern_Room2_MapWarps: @ 853585C warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc index 9a1399705..e48782693 100644 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ b/data/maps/SeafloorCavern_Room3/events.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room3_EventObjects: @ 8535890 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_12 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_14 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_15 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_16 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_17 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_18 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_19 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS SeafloorCavern_Room3_MapWarps: @ 8535968 warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index f57d58e22..29bfcc89a 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -2,13 +2,13 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937 .byte 0 SeafloorCavern_Room3_EventScript_234938:: @ 8234938 - trainerbattle 0, TRAINER_SHELLY_2, 0, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 - msgbox SeafloorCavern_Room3_Text_234A8A, 6 + trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 + msgbox SeafloorCavern_Room3_Text_234A8A, MSGBOX_AUTOCLOSE end SeafloorCavern_Room3_EventScript_23494F:: @ 823494F - trainerbattle 0, TRAINER_GRUNT_27, 0, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE - msgbox SeafloorCavern_Room3_Text_234C04, 6 + trainerbattle_single TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE + msgbox SeafloorCavern_Room3_Text_234C04, MSGBOX_AUTOCLOSE end SeafloorCavern_Room3_Text_234966: @ 8234966 diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc index e67cb0d5b..c4e96aee0 100644 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ b/data/maps/SeafloorCavern_Room4/events.inc @@ -1,6 +1,6 @@ SeafloorCavern_Room4_EventObjects: @ 8535994 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS SeafloorCavern_Room4_MapWarps: @ 85359C4 warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index e509013d6..92e165c7b 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -2,13 +2,13 @@ SeafloorCavern_Room4_MapScripts:: @ 8234C9B .byte 0 SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C - trainerbattle 0, TRAINER_GRUNT_7, 0, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 - msgbox SeafloorCavern_Room4_Text_234CFC, 6 + trainerbattle_single TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 + msgbox SeafloorCavern_Room4_Text_234CFC, MSGBOX_AUTOCLOSE end SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3 - trainerbattle 0, TRAINER_GRUNT_9, 0, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 - msgbox SeafloorCavern_Room4_Text_234D79, 6 + trainerbattle_single TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 + msgbox SeafloorCavern_Room4_Text_234D79, MSGBOX_AUTOCLOSE end SeafloorCavern_Room4_Text_234CCA: @ 8234CCA diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc index f0c69175b..e4780db22 100644 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ b/data/maps/SeafloorCavern_Room5/events.inc @@ -1,10 +1,10 @@ SeafloorCavern_Room5_EventObjects: @ 85359F8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_15 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_16 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_14 SeafloorCavern_Room5_MapWarps: @ 8535A88 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc index d69b12f7e..c34ec76d3 100644 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ b/data/maps/SeafloorCavern_Room8/events.inc @@ -1,16 +1,16 @@ SeafloorCavern_Room8_EventObjects: @ 8535B04 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_14 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_15 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_17 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_18 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_19 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1A + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1B + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1C SeafloorCavern_Room8_MapWarps: @ 8535C24 warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index 2fb2d069b..6ca415e12 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -1,11 +1,11 @@ SeafloorCavern_Room9_EventObjects: @ 8535C48 - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 859 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 828 - object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 829 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 831 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 831 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090 - object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 733 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE + object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 + object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2 SeafloorCavern_Room9_MapWarps: @ 8535CF0 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index cbfbccfe4..70e37ac5e 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -12,27 +12,27 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement 255, SeafloorCavern_Room9_Movement_23505C waitmovement 0 playbgm MUS_AQA_0, 0 - msgbox SeafloorCavern_Room9_Text_23505F, 4 + msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 applymovement 255, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23507C, 4 + msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2350A6, 4 + msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23512C, 4 - trainerbattle 3, TRAINER_ARCHIE, 0, SeafloorCavern_Room9_Text_2351BC - msgbox SeafloorCavern_Room9_Text_2351E5, 4 + msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC + msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT setweather 0 doweather special sub_80B05B4 waitstate - msgbox SeafloorCavern_Room9_Text_235279, 4 + msgbox SeafloorCavern_Room9_Text_235279, MSGBOX_DEFAULT special WaitWeather waitstate setvar VAR_RESULT, 1 @@ -80,21 +80,21 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - msgbox SeafloorCavern_Room9_Text_2352A7, 4 + msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT playse SE_PC_LOGIN applymovement 255, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2352F6, 4 + msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_235035 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23532B, 4 + msgbox SeafloorCavern_Room9_Text_23532B, MSGBOX_DEFAULT closemessage playse SE_PC_OFF delay 20 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23546F, 4 + msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT closemessage addobject VAR_0x8005 addobject VAR_0x8006 @@ -105,41 +105,41 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2354F0, 4 + msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT playse SE_PIN applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2355C2, 4 - msgbox SeafloorCavern_Room9_Text_235692, 4 + msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_235054 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A waitmovement 0 - msgbox SeafloorCavern_Room9_Text_235723, 4 + msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT setvar VAR_0x407B, 1 setvar VAR_0x405E, 1 - clearflag FLAG_0x3CD - clearflag FLAG_0x33A - clearflag FLAG_0x33B - clearflag FLAG_0x356 - clearflag FLAG_0x3E6 - clearflag FLAG_0x3E5 - setflag FLAG_0x347 + clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN + clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE + clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE + clearflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + clearflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON + clearflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 setflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - clearflag FLAG_0x3B0 - clearflag FLAG_0x3B1 + clearflag FLAG_HIDE_ROUTE_128_ARCHIE + clearflag FLAG_HIDE_ROUTE_128_MAXIE setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_0x081 - setflag FLAG_0x3C7 + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN setvar VAR_0x40C6, 2 setvar VAR_0x40A2, 1 - setflag FLAG_0x33C - setflag FLAG_0x33D - setflag FLAG_0x33F - setflag FLAG_0x35B - setflag FLAG_0x3B2 + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 + setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS setflag FLAG_SPECIAL_FLAG_0x4000 warp MAP_ROUTE128, 255, 38, 22 waitstate diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 9cd3727bb..a906d338e 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -28,7 +28,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 waitstate playse SE_DOOR delay 40 - msgbox gUnknown_0827301B, 4 + msgbox gUnknown_0827301B, MSGBOX_DEFAULT closemessage fadeinbgm 0 setflag FLAG_0x0E4 diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index e9e79d1e9..7d3e32479 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -118,7 +118,7 @@ SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 end SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3 - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc index 606999612..87361e082 100644 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ b/data/maps/SecretBase_BlueCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave1_EventObjects: @ 8537BEC - object_event 1, 255, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_BlueCave1_MapWarps: @ 8537D54 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc index 0991d03e2..ad584e2bb 100644 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ b/data/maps/SecretBase_BlueCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave2_EventObjects: @ 8538504 - object_event 1, 255, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_BlueCave2_MapWarps: @ 853866C warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc index e0bd13a3b..af85949d3 100644 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ b/data/maps/SecretBase_BlueCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave3_EventObjects: @ 8538E1C - object_event 1, 255, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_BlueCave3_MapWarps: @ 8538F84 warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc index 15266e18b..6ff0d4e67 100644 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ b/data/maps/SecretBase_BlueCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave4_EventObjects: @ 8539734 - object_event 1, 255, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_BlueCave4_MapWarps: @ 853989C warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc index 8c2771f4e..5a49bb704 100644 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ b/data/maps/SecretBase_BrownCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave1_EventObjects: @ 8537A68 - object_event 1, 255, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_BrownCave1_MapWarps: @ 8537BD0 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc index f5e168e36..569b808bd 100644 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ b/data/maps/SecretBase_BrownCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave2_EventObjects: @ 8538380 - object_event 1, 255, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_BrownCave2_MapWarps: @ 85384E8 warp_def 1, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc index c41147bc6..4dd9655b8 100644 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ b/data/maps/SecretBase_BrownCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave3_EventObjects: @ 8538C98 - object_event 1, 255, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_BrownCave3_MapWarps: @ 8538E00 warp_def 11, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc index 40d00597e..506c3cafc 100644 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ b/data/maps/SecretBase_BrownCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave4_EventObjects: @ 85395B0 - object_event 1, 255, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_BrownCave4_MapWarps: @ 8539718 warp_def 2, 8, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc index 1b5f202cf..edc9b8e78 100644 --- a/data/maps/SecretBase_RedCave1/events.inc +++ b/data/maps/SecretBase_RedCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave1_EventObjects: @ 85378E4 - object_event 1, 255, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_RedCave1_MapWarps: @ 8537A4C warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc index d84f297a2..c5817721e 100644 --- a/data/maps/SecretBase_RedCave2/events.inc +++ b/data/maps/SecretBase_RedCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave2_EventObjects: @ 85381FC - object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_RedCave2_MapWarps: @ 8538364 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc index f288371e8..af7854d9e 100644 --- a/data/maps/SecretBase_RedCave3/events.inc +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave3_EventObjects: @ 8538B14 - object_event 1, 255, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_RedCave3_MapWarps: @ 8538C7C warp_def 3, 6, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc index 9090f940e..181e8d7c6 100644 --- a/data/maps/SecretBase_RedCave4/events.inc +++ b/data/maps/SecretBase_RedCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave4_EventObjects: @ 853942C - object_event 1, 255, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_RedCave4_MapWarps: @ 8539594 warp_def 2, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc index aa886a0aa..aa8054a80 100644 --- a/data/maps/SecretBase_Shrub1/events.inc +++ b/data/maps/SecretBase_Shrub1/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub1_EventObjects: @ 8538078 - object_event 1, 255, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_Shrub1_MapWarps: @ 85381E0 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc index 1acb5d0a1..ecbbdfcb4 100644 --- a/data/maps/SecretBase_Shrub2/events.inc +++ b/data/maps/SecretBase_Shrub2/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub2_EventObjects: @ 8538990 - object_event 1, 255, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_Shrub2_MapWarps: @ 8538AF8 warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc index 7902f3fc7..2a280d6c5 100644 --- a/data/maps/SecretBase_Shrub3/events.inc +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub3_EventObjects: @ 85392A8 - object_event 1, 255, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_Shrub3_MapWarps: @ 8539410 warp_def 6, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc index c6d5f32f5..bef5f0ca2 100644 --- a/data/maps/SecretBase_Shrub4/events.inc +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 - object_event 1, 255, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_Shrub4_MapWarps: @ 8539D28 warp_def 11, 8, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc index 593fb5dbb..a2863ced7 100644 --- a/data/maps/SecretBase_Tree1/events.inc +++ b/data/maps/SecretBase_Tree1/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree1_EventObjects: @ 8537EF4 - object_event 1, 255, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_Tree1_MapWarps: @ 853805C warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc index 189911755..d930de64f 100644 --- a/data/maps/SecretBase_Tree2/events.inc +++ b/data/maps/SecretBase_Tree2/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree2_EventObjects: @ 853880C - object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_Tree2_MapWarps: @ 8538974 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc index b2d950a40..6dda3e303 100644 --- a/data/maps/SecretBase_Tree3/events.inc +++ b/data/maps/SecretBase_Tree3/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree3_EventObjects: @ 8539124 - object_event 1, 255, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_Tree3_MapWarps: @ 853928C warp_def 8, 6, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc index a1d7f7b50..493bc93db 100644 --- a/data/maps/SecretBase_Tree4/events.inc +++ b/data/maps/SecretBase_Tree4/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree4_EventObjects: @ 8539A3C - object_event 1, 255, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_Tree4_MapWarps: @ 8539BA4 warp_def 7, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc index 9b394350c..04045999a 100644 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ b/data/maps/SecretBase_YellowCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave1_EventObjects: @ 8537D70 - object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_YellowCave1_MapWarps: @ 8537ED8 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc index a958fcb53..d26d337ae 100644 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ b/data/maps/SecretBase_YellowCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave2_EventObjects: @ 8538688 - object_event 1, 255, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_YellowCave2_MapWarps: @ 85387F0 warp_def 12, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc index 2decabcee..e888677b4 100644 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ b/data/maps/SecretBase_YellowCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave3_EventObjects: @ 8538FA0 - object_event 1, 255, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_YellowCave3_MapWarps: @ 8539108 warp_def 5, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc index 535ca8e4c..577693af9 100644 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ b/data/maps/SecretBase_YellowCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave4_EventObjects: @ 85398B8 - object_event 1, 255, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, FLAG_DECORATION_0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 SecretBase_YellowCave4_MapWarps: @ 8539A20 warp_def 6, 12, 0, 126, MAP_NONE diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc index 875bed2fb..899ad3eb8 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index f57a27c1d..7d63928ab 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -28,7 +28,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 checkitem ITEM_SHOAL_SHELL, 4 compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, 5 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF checkitemspace ITEM_SHELL_BELL, 1 @@ -36,14 +36,14 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69 compare VAR_RESULT, 2 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT takeitem ITEM_SHOAL_SALT, 4 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, 4 - setflag FLAG_0x002 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT + setflag FLAG_TEMP_2 release end @@ -64,7 +64,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B return ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, MSGBOX_DEFAULT release end @@ -75,17 +75,17 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B checkitem ITEM_SHOAL_SHELL, 1 compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, MSGBOX_DEFAULT release end ShoalCave_LowTideEntranceRoom_EventScript_236EC5:: @ 8236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, MSGBOX_DEFAULT release end ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, MSGBOX_DEFAULT release end diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc index 5f4fe1dac..99ab13475 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 543a7d02b..4f446148e 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 94505a96d..a92e84e3a 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -82,7 +82,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA end ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC - msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, 4 + msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, MSGBOX_DEFAULT releaseall end @@ -139,7 +139,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C end ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE - msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, 4 + msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index dabb85971..b487edcd7 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 9883bf3da..fc0fb32a7 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -29,7 +29,7 @@ ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 end ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 - msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, 4 + msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, MSGBOX_DEFAULT releaseall end @@ -38,7 +38,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 faceplayer checkflag FLAG_0x11B goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, 4 + msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 @@ -47,7 +47,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 end ShoalCave_LowTideLowerRoom_EventScript_2371E1:: @ 82371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_23728D, 4 + msgbox ShoalCave_LowTideLowerRoom_Text_23728D, MSGBOX_DEFAULT release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index b6af468c5..6dbf50eb5 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index e8c87bd98..de2faf65b 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -29,7 +29,7 @@ ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A end ShoalCave_LowTideStairsRoom_EventScript_23714C:: @ 823714C - msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, 4 + msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc index 386ea0b35..9519d1248 100644 --- a/data/maps/SkyPillar_Outside/events.inc +++ b/data/maps/SkyPillar_Outside/events.inc @@ -1,5 +1,5 @@ SkyPillar_Outside_EventObjects: @ 853701C - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, FLAG_HIDE_SKY_PILLAR_WALLACE SkyPillar_Outside_MapWarps: @ 8537034 warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index e9fbf4ad6..c809130b7 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -40,7 +40,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 waitmovement 0 applymovement 255, SkyPillar_Outside_Movement_2725A4 waitmovement 0 - msgbox SkyPillar_Outside_Text_239416, 4 + msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage delay 30 setvar VAR_0x8004, 1 @@ -50,7 +50,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special sub_8139560 waitstate delay 40 - msgbox SkyPillar_Outside_Text_2394BC, 4 + msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT closemessage applymovement 255, SkyPillar_Outside_Movement_2393EB applymovement 1, SkyPillar_Outside_Movement_2393DE @@ -71,7 +71,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 applymovement 1, SkyPillar_Outside_Movement_2725AA waitmovement 0 delay 30 - msgbox SkyPillar_Outside_Text_23950C, 4 + msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_WEATHER_CTRL setweather 15 @@ -79,14 +79,14 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special WaitWeather waitstate delay 30 - msgbox SkyPillar_Outside_Text_23953A, 4 + msgbox SkyPillar_Outside_Text_23953A, MSGBOX_DEFAULT closemessage playse SE_KAIDAN fadescreenswapbuffers 1 clearflag FLAG_SPECIAL_FLAG_0x4000 setvar VAR_0x405E, 4 removeobject 1 - clearflag FLAG_0x330 + clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE fadescreenswapbuffers 0 releaseall end @@ -138,7 +138,7 @@ SkyPillar_Outside_EventScript_2393F8:: @ 82393F8 end SkyPillar_Outside_EventScript_2393F9:: @ 82393F9 - msgbox SkyPillar_Outside_Text_239402, 3 + msgbox SkyPillar_Outside_Text_239402, MSGBOX_SIGN end SkyPillar_Outside_Text_239402: @ 8239402 diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc index 9271dd4d3..a47e5e77f 100644 --- a/data/maps/SkyPillar_Top/events.inc +++ b/data/maps/SkyPillar_Top/events.inc @@ -1,6 +1,6 @@ SkyPillar_Top_EventObjects: @ 8537170 - object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 773 - object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, 80 + object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 + object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT SkyPillar_Top_MapWarps: @ 85371A0 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 690464698..ef0419cdb 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -34,7 +34,7 @@ SkyPillar_Top_EventScript_239705:: @ 8239705 return SkyPillar_Top_EventScript_23970F:: @ 823970F - clearflag FLAG_0x050 + clearflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT return SkyPillar_Top_MapScript2_239713: @ 8239713 @@ -89,7 +89,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 bufferspeciesname 0, VAR_0x8004 - msgbox gUnknown_08273204, 4 + msgbox gUnknown_08273204, MSGBOX_DEFAULT releaseall end @@ -124,7 +124,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A applymovement 1, SkyPillar_Top_Movement_23984B waitmovement 0 removeobject 1 - msgbox SkyPillar_Top_Text_239860, 4 + msgbox SkyPillar_Top_Text_239860, MSGBOX_DEFAULT closemessage delay 20 fadeinbgm 1 diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index 841de657e..2987c2020 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -3,37 +3,37 @@ SlateportCity_EventObjects: @ 85261CC object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0 object_event 7, EVENT_OBJ_GFX_OLD_WOMAN, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0 object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835 - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0 object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0 object_event 14, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0 object_event 15, EVENT_OBJ_GFX_MAN_3, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0 object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0 object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0 - object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882 - object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882 + object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA + object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0 object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0 object_event 22, EVENT_OBJ_GFX_MAN_5, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0 - object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, 948 + object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN object_event 25, EVENT_OBJ_GFX_POKEFAN_M, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, 882 - object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, 882 - object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, 882 - object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, 882 - object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, 882 - object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, 882 - object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, 882 - object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, 882 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA + object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA + object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA + object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA + object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA + object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA + object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA + object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA object_event 34, EVENT_OBJ_GFX_POKEFAN_F, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 - object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, 749 + object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_SCOTT SlateportCity_MapWarps: @ 8526514 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 9a5e41b15..d13953d0d 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -15,7 +15,7 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C SlateportCity_EventScript_1DCC8D:: @ 81DCC8D setflag FLAG_VISITED_SLATEPORT_CITY setvar VAR_0x4086, 0 - setflag FLAG_0x323 + setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER return SlateportCity_EventScript_1DCC99:: @ 81DCC99 @@ -59,24 +59,24 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C applymovement 255, SlateportCity_Movement_1DCDA8 applymovement 35, SlateportCity_Movement_1DCDAC waitmovement 0 - msgbox SlateportCity_Text_1DF032, 4 + msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT closemessage applymovement 35, SlateportCity_Movement_2725A4 waitmovement 0 delay 60 - msgbox SlateportCity_Text_1DF0FE, 4 + msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT applymovement 35, SlateportCity_Movement_2725A8 waitmovement 0 - msgbox SlateportCity_Text_1DF12B, 4 + msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox SlateportCity_Text_1DF1A6, 4 + msgbox SlateportCity_Text_1DF1A6, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0D7 - msgbox SlateportCity_Text_1DF1D3, 4 + msgbox SlateportCity_Text_1DF1D3, MSGBOX_DEFAULT closemessage applymovement 35, SlateportCity_Movement_1DCDB4 waitmovement 0 @@ -122,7 +122,7 @@ SlateportCity_EventScript_1DCDBD:: @ 81DCDBD message SlateportCity_Text_1DD64A waitmessage pokemart SlateportCity_Pokemart_1DCDD4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -141,29 +141,29 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 lock faceplayer bufferleadmonspeciesname 0 - msgbox SlateportCity_Text_1DD68A, 4 + msgbox SlateportCity_Text_1DD68A, MSGBOX_DEFAULT specialvar VAR_RESULT, LeadMonHasEffortRibbon compare VAR_RESULT, 1 call_if 1, SlateportCity_EventScript_1DCE38 specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E - msgbox SlateportCity_Text_1DD697, 4 + msgbox SlateportCity_Text_1DD697, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message SlateportCity_Text_1DD6E3 waitfanfare - msgbox SlateportCity_Text_1DD702, 4 + msgbox SlateportCity_Text_1DD702, MSGBOX_DEFAULT special GiveLeadMonEffortRibbon release end SlateportCity_EventScript_1DCE2E:: @ 81DCE2E - msgbox SlateportCity_Text_1DD722, 4 + msgbox SlateportCity_Text_1DD722, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCE38:: @ 81DCE38 - msgbox SlateportCity_Text_1DD77B, 4 + msgbox SlateportCity_Text_1DD77B, MSGBOX_DEFAULT release end @@ -172,12 +172,12 @@ SlateportCity_EventScript_1DCE42:: @ 81DCE42 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCE59 - msgbox SlateportCity_Text_1DD81A, 4 + msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCE59:: @ 81DCE59 - msgbox SlateportCity_Text_1DE3E2, 4 + msgbox SlateportCity_Text_1DE3E2, MSGBOX_DEFAULT release end @@ -186,12 +186,12 @@ SlateportCity_EventScript_1DCE63:: @ 81DCE63 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCE7A - msgbox SlateportCity_Text_1DD8A6, 4 + msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCE7A:: @ 81DCE7A - msgbox SlateportCity_Text_1DE28E, 4 + msgbox SlateportCity_Text_1DE28E, MSGBOX_DEFAULT release end @@ -202,17 +202,17 @@ SlateportCity_EventScript_1DCE84:: @ 81DCE84 call_if 1, SlateportCity_EventScript_1DCEA4 checkflag FLAG_0x060 goto_eq SlateportCity_EventScript_1DCEAE - msgbox SlateportCity_Text_1DD93D, 4 + msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCEA4:: @ 81DCEA4 - msgbox SlateportCity_Text_1DE30C, 4 + msgbox SlateportCity_Text_1DE30C, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCEAE:: @ 81DCEAE - msgbox SlateportCity_Text_1DD999, 4 + msgbox SlateportCity_Text_1DD999, MSGBOX_DEFAULT release end @@ -221,23 +221,23 @@ SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCECF - msgbox SlateportCity_Text_1DDA34, 4 + msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCECF:: @ 81DCECF - msgbox SlateportCity_Text_1DE376, 4 + msgbox SlateportCity_Text_1DE376, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCED9:: @ 81DCED9 compare VAR_0x4058, 1 goto_eq SlateportCity_EventScript_1DCEED - msgbox SlateportCity_Text_1DDA9A, 2 + msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC end SlateportCity_EventScript_1DCEED:: @ 81DCEED - msgbox SlateportCity_Text_1DE43D, 3 + msgbox SlateportCity_Text_1DE43D, MSGBOX_SIGN end SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 @@ -245,12 +245,12 @@ SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCF0D - msgbox SlateportCity_Text_1DDB21, 4 + msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCF0D:: @ 81DCF0D - msgbox SlateportCity_Text_1DE460, 4 + msgbox SlateportCity_Text_1DE460, MSGBOX_DEFAULT release end @@ -259,17 +259,17 @@ SlateportCity_EventScript_1DCF17:: @ 81DCF17 faceplayer checkflag FLAG_0x094 goto_eq SlateportCity_EventScript_1DCF2C - msgbox SlateportCity_Text_1DDBAC, 4 + msgbox SlateportCity_Text_1DDBAC, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCF2C:: @ 81DCF2C - msgbox SlateportCity_Text_1DDBD5, 4 + msgbox SlateportCity_Text_1DDBD5, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCF36:: @ 81DCF36 - msgbox SlateportCity_Text_1DE8BC, 3 + msgbox SlateportCity_Text_1DE8BC, MSGBOX_SIGN end SlateportCity_EventScript_1DCF3F:: @ 81DCF3F @@ -278,51 +278,51 @@ SlateportCity_EventScript_1DCF3F:: @ 81DCF3F goto_eq SlateportCity_EventScript_1DCF66 checkflag FLAG_BADGE07_GET goto_eq SlateportCity_EventScript_1DCF5C - msgbox SlateportCity_Text_1DE8F8, 4 + msgbox SlateportCity_Text_1DE8F8, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCF5C:: @ 81DCF5C - msgbox SlateportCity_Text_1DE940, 4 + msgbox SlateportCity_Text_1DE940, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCF66:: @ 81DCF66 - msgbox SlateportCity_Text_1DE9AA, 4 + msgbox SlateportCity_Text_1DE9AA, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCF70:: @ 81DCF70 - msgbox SlateportCity_Text_1DEA0B, 3 + msgbox SlateportCity_Text_1DEA0B, MSGBOX_SIGN end SlateportCity_EventScript_1DCF79:: @ 81DCF79 - msgbox SlateportCity_Text_1DEA3B, 3 + msgbox SlateportCity_Text_1DEA3B, MSGBOX_SIGN end SlateportCity_EventScript_1DCF82:: @ 81DCF82 - msgbox SlateportCity_Text_1DEA6F, 3 + msgbox SlateportCity_Text_1DEA6F, MSGBOX_SIGN end SlateportCity_EventScript_1DCF8B:: @ 81DCF8B - msgbox SlateportCity_Text_1DEAAF, 3 + msgbox SlateportCity_Text_1DEAAF, MSGBOX_SIGN end SlateportCity_EventScript_1DCF94:: @ 81DCF94 lockall checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_EventScript_1DCFA8 - msgbox SlateportCity_Text_1DEAE3, 4 + msgbox SlateportCity_Text_1DEAE3, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCFA8:: @ 81DCFA8 - msgbox SlateportCity_Text_1DEB5A, 4 + msgbox SlateportCity_Text_1DEB5A, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 - msgbox SlateportCity_Text_1DEBA0, 3 + msgbox SlateportCity_Text_1DEBA0, MSGBOX_SIGN end SlateportCity_EventScript_1DCFBB:: @ 81DCFBB @@ -330,39 +330,39 @@ SlateportCity_EventScript_1DCFBB:: @ 81DCFBB faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCFD2 - msgbox SlateportCity_Text_1DE10E, 4 + msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCFD2:: @ 81DCFD2 - msgbox SlateportCity_Text_1DE10E, 4 + msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCFDC:: @ 81DCFDC - msgbox SlateportCity_Text_1DE16C, 2 + msgbox SlateportCity_Text_1DE16C, MSGBOX_NPC end SlateportCity_EventScript_1DCFE5:: @ 81DCFE5 - msgbox SlateportCity_Text_1DDFF7, 2 + msgbox SlateportCity_Text_1DDFF7, MSGBOX_NPC end SlateportCity_EventScript_1DCFEE:: @ 81DCFEE - msgbox SlateportCity_Text_1DE04B, 2 + msgbox SlateportCity_Text_1DE04B, MSGBOX_NPC end SlateportCity_EventScript_1DCFF7:: @ 81DCFF7 - msgbox SlateportCity_Text_1DE0D2, 2 + msgbox SlateportCity_Text_1DE0D2, MSGBOX_NPC end SlateportCity_EventScript_1DD000:: @ 81DD000 - msgbox SlateportCity_Text_1DE1EC, 2 + msgbox SlateportCity_Text_1DE1EC, MSGBOX_NPC end SlateportCity_EventScript_1DD009:: @ 81DD009 lock faceplayer - msgbox SlateportCity_Text_1DDC4F, 4 + msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT closemessage applymovement 5, SlateportCity_Movement_2725A2 waitmovement 0 @@ -372,7 +372,7 @@ SlateportCity_EventScript_1DD009:: @ 81DD009 SlateportCity_EventScript_1DD020:: @ 81DD020 lock faceplayer - msgbox SlateportCity_Text_1DDC8A, 4 + msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT closemessage applymovement 18, SlateportCity_Movement_2725A2 waitmovement 0 @@ -382,7 +382,7 @@ SlateportCity_EventScript_1DD020:: @ 81DD020 SlateportCity_EventScript_1DD037:: @ 81DD037 lock faceplayer - msgbox SlateportCity_Text_1DDCD5, 4 + msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT closemessage applymovement 19, SlateportCity_Movement_2725A2 waitmovement 0 @@ -392,7 +392,7 @@ SlateportCity_EventScript_1DD037:: @ 81DD037 SlateportCity_EventScript_1DD04E:: @ 81DD04E lock faceplayer - msgbox SlateportCity_Text_1DDD18, 4 + msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT closemessage applymovement 26, SlateportCity_Movement_2725A2 waitmovement 0 @@ -402,7 +402,7 @@ SlateportCity_EventScript_1DD04E:: @ 81DD04E SlateportCity_EventScript_1DD065:: @ 81DD065 lock faceplayer - msgbox SlateportCity_Text_1DDD7D, 4 + msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT closemessage applymovement 27, SlateportCity_Movement_2725A2 waitmovement 0 @@ -412,7 +412,7 @@ SlateportCity_EventScript_1DD065:: @ 81DD065 SlateportCity_EventScript_1DD07C:: @ 81DD07C lock faceplayer - msgbox SlateportCity_Text_1DDDC0, 4 + msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT closemessage applymovement 28, SlateportCity_Movement_2725A2 waitmovement 0 @@ -422,7 +422,7 @@ SlateportCity_EventScript_1DD07C:: @ 81DD07C SlateportCity_EventScript_1DD093:: @ 81DD093 lock faceplayer - msgbox SlateportCity_Text_1DDDDF, 4 + msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT closemessage applymovement 29, SlateportCity_Movement_2725A2 waitmovement 0 @@ -432,7 +432,7 @@ SlateportCity_EventScript_1DD093:: @ 81DD093 SlateportCity_EventScript_1DD0AA:: @ 81DD0AA lock faceplayer - msgbox SlateportCity_Text_1DDE2F, 4 + msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT closemessage applymovement 30, SlateportCity_Movement_2725A2 waitmovement 0 @@ -447,7 +447,7 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 waitmovement 0 applymovement 31, SlateportCity_Movement_27259A waitmovement 0 - msgbox SlateportCity_Text_1DDE6E, 4 + msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT closemessage applymovement 31, SlateportCity_Movement_2725A2 waitmovement 0 @@ -455,13 +455,13 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 waitmovement 0 applymovement 31, SlateportCity_Movement_27259E waitmovement 0 - msgbox SlateportCity_Text_1DDE86, 4 + msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT closemessage applymovement 31, SlateportCity_Movement_2725A2 waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - msgbox SlateportCity_Text_1DDEB8, 4 + msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT closemessage applymovement 31, SlateportCity_Movement_27259E waitmovement 0 @@ -478,13 +478,13 @@ SlateportCity_Movement_1DD147: @ 81DD147 step_end SlateportCity_EventScript_1DD14A:: @ 81DD14A - msgbox SlateportCity_Text_1DDF32, 3 + msgbox SlateportCity_Text_1DDF32, MSGBOX_SIGN end SlateportCity_EventScript_1DD153:: @ 81DD153 lock faceplayer - msgbox SlateportCity_Text_1DDF8D, 4 + msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT closemessage applymovement 33, SlateportCity_Movement_2725A2 waitmovement 0 @@ -497,7 +497,7 @@ SlateportCity_EventScript_1DD16A:: @ 81DD16A message gUnknown_08272A21 waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD184 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -511,7 +511,7 @@ SlateportCity_PokemartDecor_1DD184: @ 81DD184 end SlateportCity_EventScript_1DD18E:: @ 81DD18E - msgbox gUnknown_08272E30, 4 + msgbox gUnknown_08272E30, MSGBOX_DEFAULT release end @@ -523,7 +523,7 @@ SlateportCity_EventScript_1DD198:: @ 81DD198 message gUnknown_08272A21 waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -552,7 +552,7 @@ SlateportCity_EventScript_1DD1D8:: @ 81DD1D8 message gUnknown_08272A21 waitmessage pokemart SlateportCity_Pokemart_1DD1F0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -566,8 +566,8 @@ SlateportCity_Pokemart_1DD1F0: @ 81DD1F0 SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 lockall - msgbox SlateportCity_Text_1DE502, 4 - msgbox SlateportCity_Text_1DE54A, 4 + msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT + msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT closemessage applymovement 10, SlateportCity_Movement_2725A8 waitmovement 0 @@ -582,12 +582,12 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 removeobject 10 removeobject 9 - msgbox SlateportCity_Text_1DE5F7, 4 + msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT applymovement 11, SlateportCity_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_Text_1DE64F, 4 + msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 - msgbox SlateportCity_Text_1DE724, 4 + msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT applymovement 6, SlateportCity_Movement_2725A4 applymovement 1, SlateportCity_Movement_2725A4 applymovement 7, SlateportCity_Movement_1DD309 @@ -596,7 +596,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 applymovement 11, SlateportCity_Movement_2725AA waitmovement 0 - msgbox SlateportCity_Text_1DE7F7, 4 + msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT playse SE_PIN applymovement 11, SlateportCity_Movement_272598 waitmovement 0 @@ -604,17 +604,17 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 applymovement 11, SlateportCity_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_Text_1DE860, 4 - msgbox SlateportCity_Text_1DE8A0, 4 + msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT + msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT closemessage applymovement 11, SlateportCity_Movement_1DD337 applymovement 255, SlateportCity_Movement_1DD344 waitmovement 0 removeobject 11 - clearflag FLAG_0x349 - clearflag FLAG_0x350 - clearflag FLAG_0x34D - clearflag FLAG_0x34E + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE setvar VAR_0x4058, 2 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate @@ -714,15 +714,15 @@ SlateportCity_Movement_1DD34A: @ 81DD34A step_end SlateportCity_EventScript_1DD353:: @ 81DD353 - msgbox SlateportCity_Text_1DE491, 3 + msgbox SlateportCity_Text_1DE491, MSGBOX_SIGN end SlateportCity_EventScript_1DD35C:: @ 81DD35C - msgbox SlateportCity_Text_1DE4C4, 3 + msgbox SlateportCity_Text_1DE4C4, MSGBOX_SIGN end SlateportCity_EventScript_1DD365:: @ 81DD365 - msgbox SlateportCity_Text_1DD7AD, 2 + msgbox SlateportCity_Text_1DD7AD, MSGBOX_NPC end SlateportCity_EventScript_1DD36E:: @ 81DD36E @@ -730,10 +730,10 @@ SlateportCity_EventScript_1DD36E:: @ 81DD36E faceplayer checkflag FLAG_0x151 goto_eq SlateportCity_EventScript_1DD39A - msgbox SlateportCity_Text_1DEBCE, 4 + msgbox SlateportCity_Text_1DEBCE, MSGBOX_DEFAULT giveitem_std ITEM_POWDER_JAR setflag FLAG_0x151 - msgbox SlateportCity_Text_1DED27, 4 + msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT release end @@ -742,13 +742,13 @@ SlateportCity_EventScript_1DD39A:: @ 81DD39A specialvar VAR_RESULT, sub_80246D4 compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD3C0 - msgbox SlateportCity_Text_1DEE40, 4 + msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT special sub_80248B0 goto SlateportCity_EventScript_1DD3CA end SlateportCity_EventScript_1DD3C0:: @ 81DD3C0 - msgbox SlateportCity_Text_1DED27, 4 + msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT release end @@ -852,13 +852,13 @@ SlateportCity_EventScript_1DD536:: @ 81DD536 end SlateportCity_EventScript_1DD54A:: @ 81DD54A - msgbox SlateportCity_Text_1DEFBC, 4 + msgbox SlateportCity_Text_1DEFBC, MSGBOX_DEFAULT special sub_8024918 release end SlateportCity_EventScript_1DD557:: @ 81DD557 - msgbox SlateportCity_Text_1DEE90, 5 + msgbox SlateportCity_Text_1DEE90, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD3CA copyvar VAR_0x8004, VAR_0x8009 @@ -871,22 +871,22 @@ SlateportCity_EventScript_1DD557:: @ 81DD557 copyvar VAR_0x8004, VAR_0x8009 special sub_802477C special sub_802488C - msgbox SlateportCity_Text_1DEEF7, 5 + msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_EventScript_1DD3CA - msgbox SlateportCity_Text_1DEF79, 4 + msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT special sub_8024918 release end SlateportCity_EventScript_1DD5C1:: @ 81DD5C1 - msgbox gUnknown_08272A89, 4 + msgbox gUnknown_08272A89, MSGBOX_DEFAULT special sub_8024918 release end SlateportCity_EventScript_1DD5CE:: @ 81DD5CE - msgbox SlateportCity_Text_1DEEC9, 4 + msgbox SlateportCity_Text_1DEEC9, MSGBOX_DEFAULT goto SlateportCity_EventScript_1DD3CA end @@ -902,7 +902,7 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC waitmovement 0 closedoor 10, 12 waitdooranim - msgbox SlateportCity_Text_1DF28C, 4 + msgbox SlateportCity_Text_1DF28C, MSGBOX_DEFAULT closemessage applymovement 255, SlateportCity_Movement_1DD634 applymovement 35, SlateportCity_Movement_1DD63A diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 150cc425b..3cff83bd8 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -42,7 +42,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE applymovement 3, SlateportCity_BattleTentBattleRoom_Movement_209A99 waitmovement 0 setvar VAR_0x8004, 11 - special sub_81A5E74 + special CallBattleFactoryFunction setobjectxyperm 2, 5, 1 removeobject 2 addobject 2 @@ -51,13 +51,13 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE setvar VAR_0x8004, 4 special sub_81B99B4 lockall - msgbox 0x2021fc4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT 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..4e676460c 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -35,14 +35,14 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 special sub_81B9D08 setvar VAR_0x8004, 8 special sub_81B9D08 - msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 6 special sub_81B9D08 waitstate SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 - msgbox SlateportCity_BattleTentCorridor_Text_25AB96, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT closemessage applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6 waitmovement 0 @@ -59,10 +59,10 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE setvar VAR_0x8004, 9 - special sub_81A5E74 + special CallBattleFactoryFunction setvar VAR_0x8004, 16 - special sub_81A5E74 - msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4 + special CallBattleFactoryFunction + msgbox SlateportCity_BattleTentCorridor_Text_25A22D, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -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 @@ -82,7 +82,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D case 2, SlateportCity_BattleTentCorridor_EventScript_208F89 SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B - msgbox SlateportCity_BattleTentCorridor_Text_25A350, 5 + msgbox SlateportCity_BattleTentCorridor_Text_25A350, MSGBOX_YESNO switch VAR_RESULT case 0, SlateportCity_BattleTentCorridor_EventScript_208F0D case 1, SlateportCity_BattleTentCorridor_EventScript_209022 @@ -100,7 +100,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89 SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB setvar VAR_0x8004, 8 special sub_81B9D08 - msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, 5 + msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT case 0, SlateportCity_BattleTentCorridor_EventScript_208EB4 case 1, SlateportCity_BattleTentCorridor_EventScript_208FF1 @@ -113,7 +113,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 waitstate compare VAR_RESULT, 1 goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 - msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, MSGBOX_DEFAULT goto SlateportCity_BattleTentCorridor_EventScript_208EB4 SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014 @@ -136,14 +136,14 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022 waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 special SavePlayerParty setvar VAR_0x8004, 10 setvar VAR_0x8005, 0 - special sub_81A5E74 + special CallBattleFactoryFunction goto SlateportCity_BattleTentCorridor_EventScript_208F0D SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 76b12e31e..8cf551943 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -22,22 +22,22 @@ 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 lockall - msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, MSGBOX_DEFAULT closemessage 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 @@ -58,7 +58,7 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7 waitse SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 - msgbox SlateportCity_BattleTentLobby_Text_2C5D14, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5D14, MSGBOX_DEFAULT setvar VAR_0x8004, 5 special sub_81B9D08 switch VAR_RESULT @@ -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 @@ -74,7 +74,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 goto SlateportCity_BattleTentLobby_EventScript_208861 SlateportCity_BattleTentLobby_EventScript_20882A:: @ 820882A - msgbox SlateportCity_BattleTentLobby_Text_2C5D52, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5D52, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208861 SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 @@ -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 @@ -92,7 +92,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 waitse SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861 - msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -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 @@ -123,7 +123,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA compare VAR_RESULT, 0 goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9 special SavePlayerParty - msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5810, MSGBOX_DEFAULT SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA message SlateportCity_BattleTentLobby_Text_2C586A @@ -141,8 +141,8 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 - special sub_81A1780 - msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5 + special CallFrontierUtilFunc + msgbox SlateportCity_BattleTentLobby_Text_2C5B06, MSGBOX_YESNO switch VAR_RESULT case 0, SlateportCity_BattleTentLobby_EventScript_208A2B case 1, SlateportCity_BattleTentLobby_EventScript_208950 @@ -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 @@ -172,7 +172,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 setvar VAR_0x8006, 0 SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC - msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, MSGBOX_DEFAULT closemessage call SlateportCity_BattleTentLobby_EventScript_2089C9 warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 @@ -217,21 +217,21 @@ SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03 step_end SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 - msgbox SlateportCity_BattleTentLobby_Text_2C589C, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C589C, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_2088CA 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 special LoadPlayerParty SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E - msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT release end @@ -247,35 +247,35 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D faceplayer checkflag FLAG_0x109 goto_eq SlateportCity_BattleTentLobby_EventScript_208A74 - msgbox SlateportCity_BattleTentLobby_Text_208B4E, 4 + msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT giveitem_std ITEM_TM41 compare VAR_RESULT, 0 goto_eq SlateportCity_BattleTentLobby_EventScript_272054 setflag FLAG_0x109 - msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 + msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release end SlateportCity_BattleTentLobby_EventScript_208A74:: @ 8208A74 - msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 + msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release end SlateportCity_BattleTentLobby_EventScript_208A7E:: @ 8208A7E - msgbox SlateportCity_BattleTentLobby_Text_208D27, 2 + msgbox SlateportCity_BattleTentLobby_Text_208D27, MSGBOX_NPC end SlateportCity_BattleTentLobby_EventScript_208A87:: @ 8208A87 - msgbox SlateportCity_BattleTentLobby_Text_208DA6, 2 + msgbox SlateportCity_BattleTentLobby_Text_208DA6, MSGBOX_NPC end SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90 - msgbox SlateportCity_BattleTentLobby_Text_208DF1, 2 + msgbox SlateportCity_BattleTentLobby_Text_208DF1, MSGBOX_NPC end SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99 lockall - msgbox SlateportCity_BattleTentLobby_Text_259721, 4 + msgbox SlateportCity_BattleTentLobby_Text_259721, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end @@ -294,27 +294,27 @@ SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8 end SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06 - msgbox SlateportCity_BattleTentLobby_Text_2C5F08, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5F08, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B14:: @ 8208B14 - msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B22:: @ 8208B22 - msgbox SlateportCity_BattleTentLobby_Text_2C6020, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C6020, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B30:: @ 8208B30 - msgbox SlateportCity_BattleTentLobby_Text_2C60C0, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C60C0, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B3E:: @ 8208B3E - msgbox SlateportCity_BattleTentLobby_Text_2C61FE, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C61FE, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index ba5f25d98..e0781c2cb 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -1,12 +1,12 @@ SlateportCity_Harbor_EventObjects: @ 852FA68 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841 - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 860 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 845 - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 846 - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 848 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW SlateportCity_Harbor_MapWarps: @ 852FB28 warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 58c318d37..bad96e2b0 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -12,14 +12,14 @@ SlateportCity_Harbor_MapScript1_20C983: @ 820C983 end SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 - clearflag FLAG_0x35C + clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL return SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9 savebgm MUS_AQA_0 setobjectxyperm 4, 12, 13 setobjectmovementtype 4, 9 - setflag FLAG_0x389 + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS return SlateportCity_Harbor_EventScript_20C9BB:: @ 820C9BB @@ -54,7 +54,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 applymovement 6, SlateportCity_Harbor_Movement_2725AA applymovement 255, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_Harbor_Text_20D291, 4 + msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage applymovement 6, SlateportCity_Harbor_Movement_20CAC8 applymovement 7, SlateportCity_Harbor_Movement_20CAC8 @@ -65,7 +65,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 removeobject 8 setvar VAR_0x40A0, 2 setflag FLAG_0x061 - setflag FLAG_0x313 + setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT compare VAR_0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_20CA89 compare VAR_0x8008, 1 @@ -74,10 +74,10 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 call_if 1, SlateportCity_Harbor_EventScript_20CAB3 compare VAR_0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_20CAB3 - msgbox SlateportCity_Harbor_Text_20D35A, 4 + msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT closemessage - setflag FLAG_0x335 - setflag FLAG_0x336 + setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE + setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE moveobjectoffscreen 4 setobjectmovementtype 4, 10 releaseall @@ -164,12 +164,12 @@ SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_Harbor_EventScript_20CB06 - msgbox SlateportCity_Harbor_Text_20CE20, 4 + msgbox SlateportCity_Harbor_Text_20CE20, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06 - msgbox SlateportCity_Harbor_Text_20CE87, 4 + msgbox SlateportCity_Harbor_Text_20CE87, MSGBOX_DEFAULT message SlateportCity_Harbor_Text_20CF1C waitmessage goto SlateportCity_Harbor_EventScript_20CB1A @@ -195,12 +195,12 @@ SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50 end SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 - msgbox SlateportCity_Harbor_Text_20CEC1, 4 + msgbox SlateportCity_Harbor_Text_20CEC1, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 - msgbox SlateportCity_Harbor_Text_20CF93, 5 + msgbox SlateportCity_Harbor_Text_20CF93, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE_STATE, 1 @@ -211,7 +211,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 end SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA - msgbox SlateportCity_Harbor_Text_20CFAE, 5 + msgbox SlateportCity_Harbor_Text_20CFAE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 @@ -227,7 +227,7 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD end SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 - msgbox SlateportCity_Harbor_Text_20CFCB, 4 + msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 @@ -244,7 +244,7 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 return SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D - msgbox SlateportCity_Harbor_Text_20CF71, 4 + msgbox SlateportCity_Harbor_Text_20CF71, MSGBOX_DEFAULT release end @@ -279,12 +279,12 @@ SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 call_if 1, SlateportCity_Harbor_EventScript_20CC93 compare VAR_0x8004, 2 goto_eq SlateportCity_Harbor_EventScript_20CC89 - msgbox SlateportCity_Harbor_Text_20D08E, 4 + msgbox SlateportCity_Harbor_Text_20D08E, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CC89:: @ 820CC89 - msgbox SlateportCity_Harbor_Text_20D01C, 4 + msgbox SlateportCity_Harbor_Text_20D01C, MSGBOX_DEFAULT release end @@ -293,7 +293,7 @@ SlateportCity_Harbor_EventScript_20CC93:: @ 820CC93 return SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99 - msgbox SlateportCity_Harbor_Text_20D194, 2 + msgbox SlateportCity_Harbor_Text_20D194, MSGBOX_NPC end SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 @@ -307,7 +307,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_eq SlateportCity_Harbor_EventScript_20CCE9 compare VAR_0x40A0, 2 goto_eq SlateportCity_Harbor_EventScript_20CCDF - msgbox SlateportCity_Harbor_Text_20D232, 4 + msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 waitmovement 0 @@ -315,18 +315,18 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 end SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF - msgbox SlateportCity_Harbor_Text_20D35A, 4 + msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9 setflag FLAG_0x10F - msgbox SlateportCity_Harbor_Text_20D42B, 4 + msgbox SlateportCity_Harbor_Text_20D42B, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 - msgbox SlateportCity_Harbor_Text_20D58A, 4 + msgbox SlateportCity_Harbor_Text_20D58A, MSGBOX_DEFAULT release end @@ -338,12 +338,12 @@ SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 goto_eq SlateportCity_Harbor_EventScript_20CD38 checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_Harbor_EventScript_20CD2E - msgbox SlateportCity_Harbor_Text_20D65C, 4 + msgbox SlateportCity_Harbor_Text_20D65C, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CD2E:: @ 820CD2E - msgbox SlateportCity_Harbor_Text_20D6CB, 4 + msgbox SlateportCity_Harbor_Text_20D6CB, MSGBOX_DEFAULT release end @@ -363,33 +363,33 @@ SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 end SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B - msgbox SlateportCity_Harbor_Text_20D8BC, 5 + msgbox SlateportCity_Harbor_Text_20D8BC, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_20D94A, 4 - setflag FLAG_0x126 + msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT + setflag FLAG_TRADED_SCANNER_TO_STERN goto SlateportCity_Harbor_EventScript_20CE11 end SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB - msgbox SlateportCity_Harbor_Text_20D8F1, 5 + msgbox SlateportCity_Harbor_Text_20D8F1, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_20D94A, 4 - setflag FLAG_0x126 + msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT + setflag FLAG_TRADED_SCANNER_TO_STERN goto SlateportCity_Harbor_EventScript_20CE11 end SlateportCity_Harbor_EventScript_20CDFB:: @ 820CDFB - msgbox SlateportCity_Harbor_Text_20D841, 4 + msgbox SlateportCity_Harbor_Text_20D841, MSGBOX_DEFAULT release end @@ -401,7 +401,7 @@ SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05 SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11 setvar VAR_TEMP_1, 1 - msgbox SlateportCity_Harbor_Text_20D970, 4 + msgbox SlateportCity_Harbor_Text_20D970, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 745cc6627..6b0fff3b3 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -4,7 +4,7 @@ SlateportCity_House1_MapScripts:: @ 8209AA4 SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 lock faceplayer - msgbox SlateportCity_House1_Text_209B8E, 5 + msgbox SlateportCity_House1_Text_209B8E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209AC6 compare VAR_RESULT, 0 @@ -12,7 +12,7 @@ SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 end SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 - msgbox SlateportCity_House1_Text_209BFF, 4 + msgbox SlateportCity_House1_Text_209BFF, MSGBOX_DEFAULT special sub_81B94B0 waitstate compare VAR_0x8004, 255 @@ -22,7 +22,7 @@ SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 end SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 - msgbox SlateportCity_House1_Text_209D42, 4 + msgbox SlateportCity_House1_Text_209D42, MSGBOX_DEFAULT release end @@ -38,7 +38,7 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B50 - msgbox SlateportCity_House1_Text_209C2B, 5 + msgbox SlateportCity_House1_Text_209C2B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B5A compare VAR_RESULT, 0 @@ -46,28 +46,28 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 end SlateportCity_House1_EventScript_209B46:: @ 8209B46 - msgbox SlateportCity_House1_Text_209E74, 4 + msgbox SlateportCity_House1_Text_209E74, MSGBOX_DEFAULT release end SlateportCity_House1_EventScript_209B50:: @ 8209B50 - msgbox SlateportCity_House1_Text_209DF0, 4 + msgbox SlateportCity_House1_Text_209DF0, MSGBOX_DEFAULT release end SlateportCity_House1_EventScript_209B5A:: @ 8209B5A - msgbox SlateportCity_House1_Text_209CA4, 4 + msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT call SlateportCity_House1_EventScript_2723DD specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B84 - msgbox SlateportCity_House1_Text_209D5E, 4 + msgbox SlateportCity_House1_Text_209D5E, MSGBOX_DEFAULT release end SlateportCity_House1_EventScript_209B84:: @ 8209B84 - msgbox SlateportCity_House1_Text_209CD4, 4 + msgbox SlateportCity_House1_Text_209CD4, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc index 28a05ed38..5946b6f43 100644 --- a/data/maps/SlateportCity_House2/scripts.inc +++ b/data/maps/SlateportCity_House2/scripts.inc @@ -2,11 +2,11 @@ SlateportCity_House2_MapScripts:: @ 820D9AE .byte 0 SlateportCity_House2_EventScript_20D9AF:: @ 820D9AF - msgbox SlateportCity_House2_Text_20D9C1, 2 + msgbox SlateportCity_House2_Text_20D9C1, MSGBOX_NPC end SlateportCity_House2_EventScript_20D9B8:: @ 820D9B8 - msgbox SlateportCity_House2_Text_20DA59, 2 + msgbox SlateportCity_House2_Text_20DA59, MSGBOX_NPC end SlateportCity_House2_Text_20D9C1: @ 820D9C1 diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc index da217f809..cc1eff7f6 100644 --- a/data/maps/SlateportCity_Mart/scripts.inc +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -7,7 +7,7 @@ SlateportCity_Mart_EventScript_20DC49:: @ 820DC49 message gUnknown_08272A21 waitmessage pokemart SlateportCity_Mart_Pokemart_20DC60 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -26,11 +26,11 @@ SlateportCity_Mart_Pokemart_20DC60: @ 820DC60 end SlateportCity_Mart_EventScript_20DC76:: @ 820DC76 - msgbox SlateportCity_Mart_Text_20DC88, 2 + msgbox SlateportCity_Mart_Text_20DC88, MSGBOX_NPC end SlateportCity_Mart_EventScript_20DC7F:: @ 820DC7F - msgbox SlateportCity_Mart_Text_20DCF8, 2 + msgbox SlateportCity_Mart_Text_20DCF8, MSGBOX_NPC end SlateportCity_Mart_Text_20DC88: @ 820DC88 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index 8e3a7879f..8d727f483 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -1,18 +1,18 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883 - object_event 9, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961 - object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961 - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965 - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS + object_event 9, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION + object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT + object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 4464ee582..33bcafc6f 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -2,7 +2,7 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95 .byte 0 SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F @@ -21,7 +21,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 showmoneybox 0, 0, 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, 5 + msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 closemessage @@ -41,7 +41,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 takemoney 0x32, 0 updatemoneybox 0, 0 nop - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT setvar VAR_0x40AA, 1 hidemoneybox nop @@ -52,7 +52,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 checkflag FLAG_0x095 goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, MSGBOX_DEFAULT closemessage hidemoneybox nop @@ -63,7 +63,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 end SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT setvar VAR_0x40AA, 1 hidemoneybox nop @@ -76,79 +76,79 @@ SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B step_end SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D - msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE56:: @ 820AE56 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE5F:: @ 820AE5F - msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE68:: @ 820AE68 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE71:: @ 820AE71 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE7A:: @ 820AE7A - msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE83:: @ 820AE83 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE8C:: @ 820AE8C - msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE95:: @ 820AE95 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE9E:: @ 820AE9E - msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEA7:: @ 820AEA7 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEB0:: @ 820AEB0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEB9:: @ 820AEB9 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEC2:: @ 820AEC2 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AECB:: @ 820AECB - msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AED4:: @ 820AED4 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEDD:: @ 820AEDD - msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEE6:: @ 820AEE6 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEEF:: @ 820AEEF - msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 @@ -160,12 +160,12 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 waitmovement 0 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A waitmovement 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT giveitem_std ITEM_TM46 compare VAR_RESULT, 0 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 setflag FLAG_0x10D - msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C @@ -198,14 +198,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93 end SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA - setflag FLAG_0x3C5 + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT playse SE_KAIDAN removeobject 13 release end SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index 3ca657bb6..14499f35b 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -1,11 +1,11 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 886 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 884 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 885 - object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961 - object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961 - object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 + object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION + object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION + object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 4172c47ef..b2a7ed510 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -4,7 +4,7 @@ SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 1 addobject 3 @@ -20,11 +20,11 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 compare VAR_FACING, 4 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT compare VAR_FACING, 4 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, 4 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 @@ -32,32 +32,32 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 compare VAR_FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 - trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, 4 + trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, 4 - trainerbattle 3, TRAINER_GRUNT_15, 0, SlateportCity_OceanicMuseum_2F_Text_20BF66 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT closemessage delay 35 addobject 2 applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCFE waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, MSGBOX_DEFAULT closemessage applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD6 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, MSGBOX_DEFAULT closemessage savebgm MUS_DUMMY fadedefaultbgm @@ -67,25 +67,25 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 removeobject 4 fadescreen 0 delay 30 - setflag FLAG_0x373 + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A8 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, 269 call SlateportCity_OceanicMuseum_2F_EventScript_2723E4 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, MSGBOX_DEFAULT closemessage fadescreen 1 playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty removeobject 1 - setflag FLAG_0x384 + setflag FLAG_HIDE_ROUTE_110_TEAM_AQUA compare VAR_0x40DA, 0 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC8C setflag FLAG_0x095 - clearflag FLAG_0x3B3 - setflag FLAG_0x3B5 + clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE + setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE setvar VAR_0x40D2, 1 fadescreen 0 release @@ -216,57 +216,57 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE step_end SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD13:: @ 820BD13 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD1C:: @ 820BD1C - msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD25:: @ 820BD25 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD2E:: @ 820BD2E - msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD37:: @ 820BD37 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD40:: @ 820BD40 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD49:: @ 820BD49 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD52:: @ 820BD52 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD5B:: @ 820BD5B - msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD64:: @ 820BD64 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, 2 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, MSGBOX_NPC end SlateportCity_OceanicMuseum_2F_EventScript_20BD6D:: @ 820BD6D - msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, 2 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, MSGBOX_NPC end SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2 waitmovement 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index dd62280bb..bbc91609c 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -17,11 +17,11 @@ SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3 end SlateportCity_PokemonCenter_1F_EventScript_20DAE1:: @ 820DAE1 - msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, 2 + msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, MSGBOX_NPC end SlateportCity_PokemonCenter_1F_EventScript_20DAEA:: @ 820DAEA - msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, 2 + msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, MSGBOX_NPC end SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc index e20e593cb..c28c3111a 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 307f42af5..0f97b0d86 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -17,7 +17,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 setvar VAR_0x40B7, 1 - msgbox SlateportCity_PokemonFanClub_Text_20A445, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end @@ -37,17 +37,17 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA compare VAR_0x40B7, 2 goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B - msgbox SlateportCity_PokemonFanClub_Text_20A62A, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B - msgbox SlateportCity_PokemonFanClub_Text_20A9E1, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A9E1, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 - msgbox SlateportCity_PokemonFanClub_Text_20A65F, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT setvar VAR_TEMP_1, 0 checkflag FLAG_0x0CC call_if 0, SlateportCity_PokemonFanClub_EventScript_20A13B @@ -79,7 +79,7 @@ SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0 return SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 - msgbox SlateportCity_PokemonFanClub_Text_20A66E, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A66E, MSGBOX_DEFAULT release end @@ -87,10 +87,10 @@ SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 checkitemspace ITEM_RED_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C8 giveitem_std ITEM_RED_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A827, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A827, MSGBOX_DEFAULT release end @@ -98,10 +98,10 @@ SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 checkitemspace ITEM_BLUE_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C9 giveitem_std ITEM_BLUE_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A880, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A880, MSGBOX_DEFAULT release end @@ -109,10 +109,10 @@ SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 checkitemspace ITEM_PINK_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CA giveitem_std ITEM_PINK_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A8D7, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A8D7, MSGBOX_DEFAULT release end @@ -120,10 +120,10 @@ SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 checkitemspace ITEM_GREEN_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CB giveitem_std ITEM_GREEN_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A933, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A933, MSGBOX_DEFAULT release end @@ -131,15 +131,15 @@ SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 checkitemspace ITEM_YELLOW_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CC giveitem_std ITEM_YELLOW_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A984, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A984, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A719, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A719, MSGBOX_DEFAULT release end @@ -196,18 +196,18 @@ SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 checkflag FLAG_0x156 goto_eq SlateportCity_PokemonFanClub_EventScript_20A168 - msgbox SlateportCity_PokemonFanClub_Text_20A233, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT setflag FLAG_0x156 release end SlateportCity_PokemonFanClub_EventScript_20A168:: @ 820A168 - msgbox SlateportCity_PokemonFanClub_Text_20A3EE, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A3EE, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172 - msgbox SlateportCity_PokemonFanClub_Text_20A233, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT setflag FLAG_0x156 return @@ -216,7 +216,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E faceplayer checkflag FLAG_0x116 goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE - msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 @@ -229,7 +229,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 waitmovement 0 applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A waitmovement 0 - msgbox SlateportCity_PokemonFanClub_Text_20AB63, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_272054 @@ -238,16 +238,16 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 end SlateportCity_PokemonFanClub_EventScript_20A1DE:: @ 820A1DE - msgbox SlateportCity_PokemonFanClub_Text_20ABC4, 4 + msgbox SlateportCity_PokemonFanClub_Text_20ABC4, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_20A1E8:: @ 820A1E8 - msgbox SlateportCity_PokemonFanClub_Text_20AC47, 2 + msgbox SlateportCity_PokemonFanClub_Text_20AC47, MSGBOX_NPC end SlateportCity_PokemonFanClub_EventScript_20A1F1:: @ 820A1F1 - msgbox SlateportCity_PokemonFanClub_Text_20ACF9, 2 + msgbox SlateportCity_PokemonFanClub_Text_20ACF9, MSGBOX_NPC end SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA @@ -255,7 +255,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD5A, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AD5A, MSGBOX_DEFAULT waitmoncry release end @@ -265,7 +265,7 @@ SlateportCity_PokemonFanClub_EventScript_20A20D:: @ 820A20D faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD6E, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AD6E, MSGBOX_DEFAULT waitmoncry release end @@ -275,7 +275,7 @@ SlateportCity_PokemonFanClub_EventScript_20A220:: @ 820A220 faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD80, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AD80, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc index 107a00ee0..5bad8c5e2 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc @@ -2,7 +2,7 @@ SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869 + object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index 8197eb873..05e378c7e 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -11,36 +11,36 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FD9 checkflag FLAG_0x094 goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FBA - msgbox SlateportCity_SternsShipyard_1F_Text_208008, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 waitmovement 0 setflag FLAG_0x094 - setflag FLAG_0x372 + setflag FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA releaseall end SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_208323, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 waitmovement 0 @@ -50,20 +50,20 @@ SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_208213, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FED:: @ 8207FED - msgbox SlateportCity_SternsShipyard_1F_Text_208558, 2 + msgbox SlateportCity_SternsShipyard_1F_Text_208558, MSGBOX_NPC end SlateportCity_SternsShipyard_1F_EventScript_207FF6:: @ 8207FF6 - msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, 2 + msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, MSGBOX_NPC end SlateportCity_SternsShipyard_1F_EventScript_207FFF:: @ 8207FFF - msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, 2 + msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, MSGBOX_NPC end SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc index a599ac9b8..eed3804f8 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc @@ -2,11 +2,11 @@ SlateportCity_SternsShipyard_2F_MapScripts:: @ 820863D .byte 0 SlateportCity_SternsShipyard_2F_EventScript_20863E:: @ 820863E - msgbox SlateportCity_SternsShipyard_2F_Text_208650, 2 + msgbox SlateportCity_SternsShipyard_2F_Text_208650, MSGBOX_NPC end SlateportCity_SternsShipyard_2F_EventScript_208647:: @ 8208647 - msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, 2 + msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, MSGBOX_NPC end SlateportCity_SternsShipyard_2F_Text_208650: @ 8208650 diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index 52dcb8f53..9ca0bb20d 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -1,22 +1,22 @@ SootopolisCity_EventObjects: @ 8527314 object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854 + object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0 object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839 - object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, 973 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 + object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0 - object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, 998 - object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, 997 - object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 996 - object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, 854 - object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, 854 - object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, 854 - object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, 854 - object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, 827 - object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, 826 - object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, 816 + object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON + object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE + object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA + object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE + object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE + object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE SootopolisCity_MapWarps: @ 85274C4 warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 06ceba8c0..b3411a9c2 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -704,22 +704,22 @@ SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D goto_eq SootopolisCity_EventScript_1E5ECE compare VAR_0x405E, 2 goto_if 4, SootopolisCity_EventScript_1E5EBA - msgbox SootopolisCity_Text_1E6D77, 4 + msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5EBA:: @ 81E5EBA - msgbox SootopolisCity_Text_1E6DFE, 4 + msgbox SootopolisCity_Text_1E6DFE, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5EC4:: @ 81E5EC4 - msgbox SootopolisCity_Text_1E6F38, 4 + msgbox SootopolisCity_Text_1E6F38, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE - msgbox SootopolisCity_Text_1E6ED4, 4 + msgbox SootopolisCity_Text_1E6ED4, MSGBOX_DEFAULT release end @@ -732,7 +732,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 goto_if 4, SootopolisCity_EventScript_1E5F1B compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E5F10 - msgbox SootopolisCity_Text_1E6BFF, 4 + msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage applymovement 3, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -740,7 +740,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 end SootopolisCity_EventScript_1E5F10:: @ 81E5F10 - msgbox SootopolisCity_Text_1E6C53, 4 + msgbox SootopolisCity_Text_1E6C53, MSGBOX_DEFAULT closemessage release end @@ -750,7 +750,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B special GetPlayerBigGuyGirlString checkflag FLAG_0x932 goto_eq SootopolisCity_EventScript_1E5FBB - msgbox SootopolisCity_Text_2A7BB0, 4 + msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 @@ -758,7 +758,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 setflag FLAG_0x932 - msgbox SootopolisCity_Text_2A7C7C, 4 + msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_1E5F79 @@ -770,7 +770,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 - msgbox SootopolisCity_Text_2A7CB7, 4 + msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -778,20 +778,20 @@ SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 - msgbox SootopolisCity_Text_2A7CB7, 4 + msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB - msgbox SootopolisCity_Text_2A7CEC, 5 + msgbox SootopolisCity_Text_2A7CEC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SootopolisCity_EventScript_1E5FD8 - msgbox SootopolisCity_Text_2A7DD2, 4 + msgbox SootopolisCity_Text_2A7DD2, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8 - msgbox SootopolisCity_Text_2A7D80, 4 + msgbox SootopolisCity_Text_2A7D80, MSGBOX_DEFAULT release end @@ -801,7 +801,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E600D - msgbox SootopolisCity_Text_1E71A1, 4 + msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage applymovement 2, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -809,7 +809,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 end SootopolisCity_EventScript_1E600D:: @ 81E600D - msgbox SootopolisCity_Text_1E728C, 4 + msgbox SootopolisCity_Text_1E728C, MSGBOX_DEFAULT releaseall end @@ -818,12 +818,12 @@ SootopolisCity_EventScript_1E6017:: @ 81E6017 faceplayer compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E602E - msgbox SootopolisCity_Text_1E6CCA, 4 + msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E602E:: @ 81E602E - msgbox SootopolisCity_Text_1E6D57, 4 + msgbox SootopolisCity_Text_1E6D57, MSGBOX_DEFAULT release end @@ -836,12 +836,12 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038 goto_eq SootopolisCity_EventScript_1E6084 compare VAR_0x405E, 2 goto_if 4, SootopolisCity_EventScript_1E6065 - msgbox SootopolisCity_Text_1E6F90, 4 + msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6065:: @ 81E6065 - msgbox SootopolisCity_Text_1E7078, 4 + msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT closemessage applymovement 8, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -849,12 +849,12 @@ SootopolisCity_EventScript_1E6065:: @ 81E6065 end SootopolisCity_EventScript_1E607A:: @ 81E607A - msgbox SootopolisCity_Text_1E710B, 4 + msgbox SootopolisCity_Text_1E710B, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6084:: @ 81E6084 - msgbox SootopolisCity_Text_1E70D4, 4 + msgbox SootopolisCity_Text_1E70D4, MSGBOX_DEFAULT release end @@ -868,7 +868,7 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E goto_if 4, SootopolisCity_EventScript_1E60CF compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E60CF - msgbox SootopolisCity_Text_1E690B, 4 + msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage applymovement 4, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -876,12 +876,12 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E end SootopolisCity_EventScript_1E60CF:: @ 81E60CF - msgbox SootopolisCity_Text_1E68A1, 4 + msgbox SootopolisCity_Text_1E68A1, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E60D9:: @ 81E60D9 - msgbox SootopolisCity_Text_1E6920, 4 + msgbox SootopolisCity_Text_1E6920, MSGBOX_DEFAULT release end @@ -897,7 +897,7 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 goto_if 4, SootopolisCity_EventScript_1E6141 compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E6141 - msgbox SootopolisCity_Text_1E6692, 4 + msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage applymovement 5, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -905,30 +905,30 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 end SootopolisCity_EventScript_1E612D:: @ 81E612D - msgbox SootopolisCity_Text_1E6750, 4 + msgbox SootopolisCity_Text_1E6750, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6137:: @ 81E6137 - msgbox SootopolisCity_Text_1E677F, 4 + msgbox SootopolisCity_Text_1E677F, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6141:: @ 81E6141 - msgbox SootopolisCity_Text_1E6618, 4 + msgbox SootopolisCity_Text_1E6618, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E614B:: @ 81E614B - msgbox SootopolisCity_Text_1E656F, 3 + msgbox SootopolisCity_Text_1E656F, MSGBOX_SIGN end SootopolisCity_EventScript_1E6154:: @ 81E6154 - msgbox SootopolisCity_Text_1E65C8, 3 + msgbox SootopolisCity_Text_1E65C8, MSGBOX_SIGN end EventScript_ClosedSootopolisDoor:: @ 81E615D - msgbox SootopolisCity_Text_1E6604, 3 + msgbox SootopolisCity_Text_1E6604, MSGBOX_SIGN end SootopolisCity_EventScript_1E6166:: @ 81E6166 @@ -945,33 +945,33 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 goto_eq SootopolisCity_EventScript_1E61C2 checkflag FLAG_0x09E goto_eq SootopolisCity_EventScript_1E61B8 - msgbox SootopolisCity_Text_1E78E5, 4 + msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61AE:: @ 81E61AE - msgbox SootopolisCity_Text_1E7866, 4 + msgbox SootopolisCity_Text_1E7866, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61B8:: @ 81E61B8 - msgbox SootopolisCity_Text_1E794B, 4 + msgbox SootopolisCity_Text_1E794B, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61C2:: @ 81E61C2 - msgbox SootopolisCity_Text_1E789A, 4 + msgbox SootopolisCity_Text_1E789A, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61CC:: @ 81E61CC - msgbox SootopolisCity_Text_1E75CB, 4 + msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT closemessage compare VAR_FACING, 3 call_if 1, SootopolisCity_EventScript_1E6243 compare VAR_FACING, 2 call_if 1, SootopolisCity_EventScript_1E6255 - msgbox SootopolisCity_Text_1E7737, 4 + msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT closemessage applymovement 7, SootopolisCity_Movement_1E62D4 applymovement 255, SootopolisCity_Movement_1E630E @@ -982,7 +982,7 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC applymovement 7, SootopolisCity_Movement_1E6344 applymovement 255, SootopolisCity_Movement_1E634F waitmovement 0 - msgbox SootopolisCity_Text_1E77F0, 4 + msgbox SootopolisCity_Text_1E77F0, MSGBOX_DEFAULT closemessage setflag FLAG_0x133 applymovement 255, SootopolisCity_Movement_1E635A @@ -1273,7 +1273,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6388 - msgbox SootopolisCity_Text_1E67DC, 4 + msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage applymovement 15, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1281,7 +1281,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D end SootopolisCity_EventScript_1E6388:: @ 81E6388 - msgbox SootopolisCity_Text_1E6853, 4 + msgbox SootopolisCity_Text_1E6853, MSGBOX_DEFAULT closemessage releaseall end @@ -1290,11 +1290,11 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 lockall compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E63C7 - msgbox SootopolisCity_Text_1E6936, 4 + msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage applymovement 14, SootopolisCity_Movement_27259E waitmovement 0 - msgbox SootopolisCity_Text_1E696C, 4 + msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT closemessage applymovement 14, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1304,7 +1304,7 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 SootopolisCity_EventScript_1E63C7:: @ 81E63C7 applymovement 14, SootopolisCity_Movement_27259E waitmovement 0 - msgbox SootopolisCity_Text_1E69B8, 4 + msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT releaseall end @@ -1314,7 +1314,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6406 - msgbox SootopolisCity_Text_1E6C7C, 4 + msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage applymovement 13, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1322,7 +1322,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB end SootopolisCity_EventScript_1E6406:: @ 81E6406 - msgbox SootopolisCity_Text_1E6CA6, 4 + msgbox SootopolisCity_Text_1E6CA6, MSGBOX_DEFAULT closemessage releaseall end @@ -1333,7 +1333,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E643C - msgbox SootopolisCity_Text_1E6A50, 4 + msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage applymovement 12, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1341,7 +1341,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 end SootopolisCity_EventScript_1E643C:: @ 81E643C - msgbox SootopolisCity_Text_1E6B2A, 4 + msgbox SootopolisCity_Text_1E6B2A, MSGBOX_DEFAULT releaseall end @@ -1354,15 +1354,15 @@ SootopolisCity_EventScript_1E6446:: @ 81E6446 goto_eq SootopolisCity_EventScript_1E64E2 checkflag FLAG_0x09E goto_eq SootopolisCity_EventScript_1E646F - msgbox SootopolisCity_Text_1E7A3E, 4 + msgbox SootopolisCity_Text_1E7A3E, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E646F:: @ 81E646F - msgbox SootopolisCity_Text_1E7ACF, 4 + msgbox SootopolisCity_Text_1E7ACF, MSGBOX_DEFAULT giveitem_std ITEM_HM07 setflag FLAG_0x138 - msgbox SootopolisCity_Text_1E7B86, 4 + msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, SootopolisCity_EventScript_1E64B2 @@ -1388,12 +1388,12 @@ SootopolisCity_EventScript_1E64C5:: @ 81E64C5 return SootopolisCity_EventScript_1E64D8:: @ 81E64D8 - msgbox SootopolisCity_Text_1E79C8, 4 + msgbox SootopolisCity_Text_1E79C8, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E64E2:: @ 81E64E2 - msgbox SootopolisCity_Text_1E7CBC, 4 + msgbox SootopolisCity_Text_1E7CBC, MSGBOX_DEFAULT release end @@ -1411,13 +1411,13 @@ SootopolisCity_EventScript_1E64F2:: @ 81E64F2 lockall compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6509 - msgbox SootopolisCity_Text_1E72DB, 4 + msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT closemessage releaseall end SootopolisCity_EventScript_1E6509:: @ 81E6509 - msgbox SootopolisCity_Text_1E737E, 4 + msgbox SootopolisCity_Text_1E737E, MSGBOX_DEFAULT setflag FLAG_0x135 checkflag FLAG_0x134 goto_eq SootopolisCity_EventScript_1E654C @@ -1428,13 +1428,13 @@ SootopolisCity_EventScript_1E651F:: @ 81E651F lockall compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6536 - msgbox SootopolisCity_Text_1E7460, 4 + msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT closemessage releaseall end SootopolisCity_EventScript_1E6536:: @ 81E6536 - msgbox SootopolisCity_Text_1E74F6, 4 + msgbox SootopolisCity_Text_1E74F6, MSGBOX_DEFAULT setflag FLAG_0x134 checkflag FLAG_0x135 goto_eq SootopolisCity_EventScript_1E654C @@ -1442,11 +1442,11 @@ SootopolisCity_EventScript_1E6536:: @ 81E6536 end SootopolisCity_EventScript_1E654C:: @ 81E654C - setflag FLAG_0x33B - setflag FLAG_0x33A + setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE setflag FLAG_0x09E - clearflag FLAG_0x358 - clearflag FLAG_0x394 + clearflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE + clearflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE setvar VAR_0x40B9, 2 warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34 waitstate diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index af661890f..b04243b90 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 step_end SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 - trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82 + trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq SootopolisCity_Gym_1F_EventScript_225025 @@ -94,7 +94,7 @@ SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7 checkflag FLAG_BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_22501B - msgbox SootopolisCity_Gym_1F_Text_225778, 4 + msgbox SootopolisCity_Gym_1F_Text_225778, MSGBOX_DEFAULT release end @@ -102,21 +102,21 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 message SootopolisCity_Gym_1F_Text_225598 waitmessage call SootopolisCity_Gym_1F_EventScript_27207E - msgbox SootopolisCity_Gym_1F_Text_2255BE, 4 + msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT setflag FLAG_0x4F7 setflag FLAG_BADGE08_GET - setflag FLAG_0x356 - setflag FLAG_0x3CD - setflag FLAG_0x330 + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN + setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE setvar VAR_0x405E, 6 - clearflag FLAG_0x347 + clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 setvar VAR_0x8008, 8 call SootopolisCity_Gym_1F_EventScript_271F43 call SootopolisCity_Gym_1F_EventScript_224FD4 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox SootopolisCity_Gym_1F_Text_22574D, 4 + msgbox SootopolisCity_Gym_1F_Text_22574D, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -128,7 +128,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 goto_eq SootopolisCity_Gym_1F_EventScript_27205E - msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 + msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_0x0AC return @@ -136,19 +136,19 @@ SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 goto_eq SootopolisCity_Gym_1F_EventScript_272054 - msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 + msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_0x0AC release end SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B - msgbox SootopolisCity_Gym_1F_Text_225865, 4 + msgbox SootopolisCity_Gym_1F_Text_225865, MSGBOX_DEFAULT release end SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 - trainerbattle 7, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 - msgbox SootopolisCity_Gym_1F_Text_225A67, 6 + trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 + msgbox SootopolisCity_Gym_1F_Text_225A67, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 @@ -156,12 +156,12 @@ SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 faceplayer checkflag FLAG_0x4F7 goto_eq SootopolisCity_Gym_1F_EventScript_225055 - msgbox SootopolisCity_Gym_1F_Text_225093, 4 + msgbox SootopolisCity_Gym_1F_Text_225093, MSGBOX_DEFAULT release end SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055 - msgbox SootopolisCity_Gym_1F_Text_2251AF, 4 + msgbox SootopolisCity_Gym_1F_Text_2251AF, MSGBOX_DEFAULT release end @@ -180,12 +180,12 @@ SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F end SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F - msgbox SootopolisCity_Gym_1F_Text_225916, 4 + msgbox SootopolisCity_Gym_1F_Text_225916, MSGBOX_DEFAULT releaseall end SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089 - msgbox SootopolisCity_Gym_1F_Text_2258FA, 4 + msgbox SootopolisCity_Gym_1F_Text_2258FA, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index 8aaa604e2..33840b427 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -2,53 +2,53 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A .byte 0 SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B - trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 - msgbox SootopolisCity_Gym_B1F_Text_225DCF, 6 + trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 + msgbox SootopolisCity_Gym_B1F_Text_225DCF, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2 - trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 - msgbox SootopolisCity_Gym_B1F_Text_225E90, 6 + trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 + msgbox SootopolisCity_Gym_B1F_Text_225E90, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9 - trainerbattle 0, TRAINER_BRIANNA, 0, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 - msgbox SootopolisCity_Gym_B1F_Text_2264BC, 6 + trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 + msgbox SootopolisCity_Gym_B1F_Text_2264BC, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0 - trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB - msgbox SootopolisCity_Gym_B1F_Text_225FFE, 6 + trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB + msgbox SootopolisCity_Gym_B1F_Text_225FFE, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7 - trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 - msgbox SootopolisCity_Gym_B1F_Text_2260D1, 6 + trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 + msgbox SootopolisCity_Gym_B1F_Text_2260D1, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE - trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 - msgbox SootopolisCity_Gym_B1F_Text_2261B5, 6 + trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 + msgbox SootopolisCity_Gym_B1F_Text_2261B5, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15 - trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 - msgbox SootopolisCity_Gym_B1F_Text_226286, 6 + trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 + msgbox SootopolisCity_Gym_B1F_Text_226286, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C - trainerbattle 0, TRAINER_BETHANY, 0, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B - msgbox SootopolisCity_Gym_B1F_Text_226341, 6 + trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B + msgbox SootopolisCity_Gym_B1F_Text_226341, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43 - trainerbattle 0, TRAINER_ANNIKA, 0, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD - msgbox SootopolisCity_Gym_B1F_Text_2263F4, 6 + trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD + msgbox SootopolisCity_Gym_B1F_Text_2263F4, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A - trainerbattle 0, TRAINER_DAPHNE, 0, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 - msgbox SootopolisCity_Gym_B1F_Text_225F67, 6 + trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 + msgbox SootopolisCity_Gym_B1F_Text_225F67, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_Text_225D71: @ 8225D71 diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index 7c898a0b2..c23b90bb3 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -6,17 +6,17 @@ SootopolisCity_House1_EventScript_22694D:: @ 822694D faceplayer checkflag FLAG_0x079 goto_eq SootopolisCity_House1_EventScript_226984 - msgbox SootopolisCity_House1_Text_2269A1, 4 + msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT giveitem_std ITEM_TM31 compare VAR_RESULT, 0 goto_eq SootopolisCity_House1_EventScript_272054 setflag FLAG_0x079 - msgbox SootopolisCity_House1_Text_226A13, 4 + msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release end SootopolisCity_House1_EventScript_226984:: @ 8226984 - msgbox SootopolisCity_House1_Text_226A13, 4 + msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release end @@ -25,7 +25,7 @@ SootopolisCity_House1_EventScript_22698E:: @ 822698E faceplayer waitse playmoncry SPECIES_KECLEON, 0 - msgbox SootopolisCity_House1_Text_226A60, 4 + msgbox SootopolisCity_House1_Text_226A60, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc index 82270ca56..676ec4ed2 100644 --- a/data/maps/SootopolisCity_House2/scripts.inc +++ b/data/maps/SootopolisCity_House2/scripts.inc @@ -4,7 +4,7 @@ SootopolisCity_House2_MapScripts:: @ 8226A76 SootopolisCity_House2_EventScript_226A77:: @ 8226A77 lock faceplayer - msgbox SootopolisCity_House2_Text_226AAB, 5 + msgbox SootopolisCity_House2_Text_226AAB, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, SootopolisCity_House2_EventScript_226A99 compare VAR_RESULT, 0 @@ -13,11 +13,11 @@ SootopolisCity_House2_EventScript_226A77:: @ 8226A77 end SootopolisCity_House2_EventScript_226A99:: @ 8226A99 - msgbox SootopolisCity_House2_Text_226AF1, 4 + msgbox SootopolisCity_House2_Text_226AF1, MSGBOX_DEFAULT return SootopolisCity_House2_EventScript_226AA2:: @ 8226AA2 - msgbox SootopolisCity_House2_Text_226B41, 4 + msgbox SootopolisCity_House2_Text_226B41, MSGBOX_DEFAULT return SootopolisCity_House2_Text_226AAB: @ 8226AAB diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc index 415f90642..90c9ab155 100644 --- a/data/maps/SootopolisCity_House3/scripts.inc +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -4,20 +4,20 @@ SootopolisCity_House3_MapScripts:: @ 8226B71 SootopolisCity_House3_EventScript_226B72:: @ 8226B72 lock faceplayer - msgbox SootopolisCity_House3_Text_226BA4, 5 + msgbox SootopolisCity_House3_Text_226BA4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SootopolisCity_House3_EventScript_226B91 - msgbox SootopolisCity_House3_Text_226C44, 4 + msgbox SootopolisCity_House3_Text_226C44, MSGBOX_DEFAULT release end SootopolisCity_House3_EventScript_226B91:: @ 8226B91 - msgbox SootopolisCity_House3_Text_226C20, 4 + msgbox SootopolisCity_House3_Text_226C20, MSGBOX_DEFAULT release end SootopolisCity_House3_EventScript_226B9B:: @ 8226B9B - msgbox SootopolisCity_House3_Text_226C9C, 2 + msgbox SootopolisCity_House3_Text_226C9C, MSGBOX_NPC end SootopolisCity_House3_Text_226BA4: @ 8226BA4 diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc index e34e6991d..d92df9be2 100644 --- a/data/maps/SootopolisCity_House4/scripts.inc +++ b/data/maps/SootopolisCity_House4/scripts.inc @@ -2,11 +2,11 @@ SootopolisCity_House4_MapScripts:: @ 8226D15 .byte 0 SootopolisCity_House4_EventScript_226D16:: @ 8226D16 - msgbox SootopolisCity_House4_Text_226D3B, 2 + msgbox SootopolisCity_House4_Text_226D3B, MSGBOX_NPC end SootopolisCity_House4_EventScript_226D1F:: @ 8226D1F - msgbox SootopolisCity_House4_Text_226DEA, 2 + msgbox SootopolisCity_House4_Text_226DEA, MSGBOX_NPC end SootopolisCity_House4_EventScript_226D28:: @ 8226D28 @@ -14,7 +14,7 @@ SootopolisCity_House4_EventScript_226D28:: @ 8226D28 faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox SootopolisCity_House4_Text_226E7F, 4 + msgbox SootopolisCity_House4_Text_226E7F, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/SootopolisCity_House5/scripts.inc b/data/maps/SootopolisCity_House5/scripts.inc index 51da02de1..04b9feca2 100644 --- a/data/maps/SootopolisCity_House5/scripts.inc +++ b/data/maps/SootopolisCity_House5/scripts.inc @@ -2,11 +2,11 @@ SootopolisCity_House5_MapScripts:: @ 8226E93 .byte 0 SootopolisCity_House5_EventScript_226E94:: @ 8226E94 - msgbox SootopolisCity_House5_Text_226EA6, 2 + msgbox SootopolisCity_House5_Text_226EA6, MSGBOX_NPC end SootopolisCity_House5_EventScript_226E9D:: @ 8226E9D - msgbox SootopolisCity_House5_Text_226F35, 2 + msgbox SootopolisCity_House5_Text_226F35, MSGBOX_NPC end SootopolisCity_House5_Text_226EA6: @ 8226EA6 diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index 38c8456a3..3341ad1c1 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -6,10 +6,10 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C faceplayer checkflag FLAG_0x0F5 goto_eq SootopolisCity_House6_EventScript_226FA3 - msgbox SootopolisCity_House6_Text_226FC3, 5 + msgbox SootopolisCity_House6_Text_226FC3, MSGBOX_YESNO compare VAR_RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_226F99 - msgbox SootopolisCity_House6_Text_227034, 4 + msgbox SootopolisCity_House6_Text_227034, MSGBOX_DEFAULT givedecoration_std 117 compare VAR_RESULT, 0 goto_eq SootopolisCity_House6_EventScript_226FAD @@ -18,19 +18,19 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C end SootopolisCity_House6_EventScript_226F99:: @ 8226F99 - msgbox SootopolisCity_House6_Text_22708F, 4 + msgbox SootopolisCity_House6_Text_22708F, MSGBOX_DEFAULT release end SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3 - msgbox SootopolisCity_House6_Text_2270B7, 4 + msgbox SootopolisCity_House6_Text_2270B7, MSGBOX_DEFAULT release end SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD bufferdecorationname 1, 117 - msgbox gUnknown_08272B1A, 4 - msgbox SootopolisCity_House6_Text_22704A, 4 + msgbox gUnknown_08272B1A, MSGBOX_DEFAULT + msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc index 9df9cde0b..e679e5cd5 100644 --- a/data/maps/SootopolisCity_House7/scripts.inc +++ b/data/maps/SootopolisCity_House7/scripts.inc @@ -2,11 +2,11 @@ SootopolisCity_House7_MapScripts:: @ 82270CB .byte 0 SootopolisCity_House7_EventScript_2270CC:: @ 82270CC - msgbox SootopolisCity_House7_Text_2270DE, 2 + msgbox SootopolisCity_House7_Text_2270DE, MSGBOX_NPC end SootopolisCity_House7_EventScript_2270D5:: @ 82270D5 - msgbox SootopolisCity_House7_Text_227190, 2 + msgbox SootopolisCity_House7_Text_227190, MSGBOX_NPC end SootopolisCity_House7_Text_2270DE: @ 82270DE diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc index 26a322b89..3acf88c12 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc @@ -5,7 +5,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B special GetSeedotSizeRecordInfo lock faceplayer - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, MSGBOX_DEFAULT special sub_81B94B0 waitstate copyvar VAR_RESULT, VAR_0x8004 @@ -22,22 +22,22 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B end SootopolisCity_LotadAndSeedotHouse_EventScript_227272:: @ 8227272 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_2275BC, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_2275BC, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_22727C:: @ 822727C - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227584, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227584, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227286:: @ 8227286 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227544, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227544, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, MSGBOX_DEFAULT giveitem_std ITEM_ELIXIR compare VAR_RESULT, 0 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 @@ -46,7 +46,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 end SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2:: @ 82272B2 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227524, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227524, MSGBOX_DEFAULT release end @@ -54,7 +54,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC special GetLotadSizeRecordInfo lock faceplayer - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, MSGBOX_DEFAULT special sub_81B94B0 waitstate copyvar VAR_RESULT, VAR_0x8004 @@ -71,22 +71,22 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC end SootopolisCity_LotadAndSeedotHouse_EventScript_227303:: @ 8227303 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227896, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227896, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_22730D:: @ 822730D - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227867, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227867, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227317:: @ 8227317 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22782A, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22782A, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, MSGBOX_DEFAULT giveitem_std ITEM_ELIXIR compare VAR_RESULT, 0 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 @@ -95,21 +95,21 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 end SootopolisCity_LotadAndSeedotHouse_EventScript_227343:: @ 8227343 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22780A, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22780A, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_22734D:: @ 822734D special GetSeedotSizeRecordInfo lockall - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227617, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227617, MSGBOX_DEFAULT releaseall end SootopolisCity_LotadAndSeedotHouse_EventScript_22735B:: @ 822735B special GetLotadSizeRecordInfo lockall - msgbox SootopolisCity_LotadAndSeedotHouse_Text_2278F2, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_2278F2, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 26ab5497c..b6d713930 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -7,7 +7,7 @@ SootopolisCity_Mart_EventScript_226795:: @ 8226795 message gUnknown_08272A21 waitmessage pokemart SootopolisCity_Mart_Pokemart_2267AC - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -32,12 +32,12 @@ SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 goto_if 4, SootopolisCity_Mart_EventScript_2267E2 checkflag FLAG_0x081 goto_if 0, SootopolisCity_Mart_EventScript_2267E2 - msgbox SootopolisCity_Mart_Text_22685D, 4 + msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT release end SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2 - msgbox SootopolisCity_Mart_Text_226816, 4 + msgbox SootopolisCity_Mart_Text_226816, MSGBOX_DEFAULT release end @@ -48,12 +48,12 @@ SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC goto_if 4, SootopolisCity_Mart_EventScript_22680C checkflag FLAG_0x081 goto_if 0, SootopolisCity_Mart_EventScript_22680C - msgbox SootopolisCity_Mart_Text_226928, 4 + msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT release end SootopolisCity_Mart_EventScript_22680C:: @ 822680C - msgbox SootopolisCity_Mart_Text_2268AF, 4 + msgbox SootopolisCity_Mart_Text_2268AF, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 36d0edd3a..f24af7785 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 @@ -51,15 +51,15 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04:: @ 8227A04 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D:: @ 8227A0D - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F @@ -75,30 +75,30 @@ 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 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT release end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT release end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 special SavePlayerParty special BufferEReaderTrainerName - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special LoadPlayerParty @@ -106,8 +106,8 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special SavePlayerParty - special ReducePlayerPartyToThree - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4 + special ReducePlayerPartyToSelectedMons + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE @@ -122,12 +122,12 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2 special LoadPlayerParty - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, MSGBOX_DEFAULT release end SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT fadescreen 1 special sub_80F9438 waitstate diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index b29ef99a5..9a6b4b1b3 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, MSGBOX_DEFAULT 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 @@ -41,7 +41,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF setvar VAR_0x40C0, 3 - msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, 4 + msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 46dccd97e..5c5f63dd3 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -22,12 +22,12 @@ SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_22652E checkflag FLAG_0x081 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_22652E - msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT release end SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E - msgbox SootopolisCity_PokemonCenter_1F_Text_226562, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_226562, MSGBOX_DEFAULT release end @@ -38,12 +38,12 @@ SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_226558 checkflag FLAG_0x081 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_226558 - msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT release end SootopolisCity_PokemonCenter_1F_EventScript_226558:: @ 8226558 - msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc index f9e4626ea..0062c87e1 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index d303e0614..12d27a61f 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -9,10 +9,10 @@ SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 lock faceplayer - msgbox SouthernIsland_Exterior_Text_2A69F1, 5 + msgbox SouthernIsland_Exterior_Text_2A69F1, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SouthernIsland_Exterior_EventScript_242A17 - msgbox SouthernIsland_Exterior_Text_2A6A5D, 4 + msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA waitmovement 0 @@ -26,7 +26,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 end SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17 - msgbox SouthernIsland_Exterior_Text_2A6A82, 4 + msgbox SouthernIsland_Exterior_Text_2A6A82, MSGBOX_DEFAULT release end @@ -50,6 +50,6 @@ BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39 step_end SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C - msgbox SouthernIsland_Exterior_Text_2A6AD5, 3 + msgbox SouthernIsland_Exterior_Text_2A6AD5, MSGBOX_SIGN end diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index b65134679..cc8256e8c 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_EventObjects: @ 853B89C - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 910 - object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 911 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON SouthernIsland_Interior_MapWarps: @ 853B8CC warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 3005e32d7..b21fdecab 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -56,7 +56,7 @@ SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 end SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_eq SouthernIsland_Interior_EventScript_242B9A checkflag FLAG_0x1C8 goto_eq SouthernIsland_Interior_EventScript_242B9A @@ -65,7 +65,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, SouthernIsland_Interior_EventScript_242B9A setflag FLAG_0x0CE - setflag FLAG_0x002 + setflag FLAG_TEMP_2 special SpawnScriptEventObject applymovement 127, SouthernIsland_Interior_Movement_242BCA waitmovement 0 @@ -113,7 +113,7 @@ SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F end SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A - msgbox SouthernIsland_Interior_Text_2A6AA1, 4 + msgbox SouthernIsland_Interior_Text_2A6AA1, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc index aa23659eb..553b4151a 100644 --- a/data/maps/TerraCave_End/events.inc +++ b/data/maps/TerraCave_End/events.inc @@ -1,5 +1,5 @@ TerraCave_End_EventObjects: @ 8537850 - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 783 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_TERRA_CAVE_GROUDON TerraCave_End_MapWarps: @ 8537868 warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index d603f2274..b23cc23f1 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -21,7 +21,7 @@ TerraCave_End_MapScript1_23B0D9: @ 823B0D9 end TerraCave_End_EventScript_23B0E3:: @ 823B0E3 - clearflag FLAG_0x30F + clearflag FLAG_HIDE_TERRA_CAVE_GROUDON setvar VAR_TEMP_1, 1 return diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index ff731393b..e9117efe2 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -23,7 +23,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 applymovement 1, TrainerHill_Elevator_Movement_2693EE waitmovement 0 lockall - msgbox TrainerHill_Elevator_Text_268F3E, 5 + msgbox TrainerHill_Elevator_Text_268F3E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq TrainerHill_Elevator_EventScript_269360 releaseall diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 84543ff2b..e85d50a04 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -84,13 +84,13 @@ TrainerHill_Entrance_EventScript_268182:: @ 8268182 TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5 lockall applymovement 255, TrainerHill_Entrance_Movement_26837F - msgbox TrainerHill_Entrance_Text_268689, 4 + msgbox TrainerHill_Entrance_Text_268689, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_2681DA TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA lockall applymovement 255, TrainerHill_Entrance_Movement_26837F - msgbox TrainerHill_Entrance_Text_268712, 4 + msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA closemessage @@ -118,11 +118,11 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD special sp194_trainer_tower compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_26821F - msgbox TrainerHill_Entrance_Text_2686F4, 4 + msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_268227 TrainerHill_Entrance_EventScript_26821F:: @ 826821F - msgbox TrainerHill_Entrance_Text_2687AC, 4 + msgbox TrainerHill_Entrance_Text_2687AC, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_268227:: @ 8268227 release @@ -133,7 +133,7 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 applymovement 255, TrainerHill_Entrance_Movement_26837F checkflag FLAG_SYS_GAME_CLEAR goto_if 0, TrainerHill_Entrance_EventScript_26836A - msgbox TrainerHill_Entrance_Text_2684C6, 4 + msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 special sp194_trainer_tower compare VAR_RESULT, 0 @@ -142,11 +142,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 special sp194_trainer_tower compare VAR_RESULT, 1 goto_eq TrainerHill_Entrance_EventScript_268275 - msgbox TrainerHill_Entrance_Text_268564, 4 + msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_26827D TrainerHill_Entrance_EventScript_268275:: @ 8268275 - msgbox TrainerHill_Entrance_Text_26859E, 4 + msgbox TrainerHill_Entrance_Text_26859E, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_26827D:: @ 826827D message TrainerHill_Entrance_Text_2685F8 @@ -160,7 +160,7 @@ TrainerHill_Entrance_EventScript_26827D:: @ 826827D end TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA - msgbox TrainerHill_Entrance_Text_2687C3, 4 + msgbox TrainerHill_Entrance_Text_2687C3, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_26827D end @@ -175,7 +175,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 setvar VAR_0x40D6, 1 setvar VAR_TEMP_5, 0 special HealPlayerParty - msgbox TrainerHill_Entrance_Text_26862A, 4 + msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT setvar VAR_0x8004, 0 special sp194_trainer_tower releaseall @@ -183,7 +183,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 TrainerHill_Entrance_EventScript_268314:: @ 8268314 setvar VAR_TEMP_5, 0 - msgbox TrainerHill_Entrance_Text_26866F, 4 + msgbox TrainerHill_Entrance_Text_26866F, MSGBOX_DEFAULT closemessage applymovement 255, TrainerHill_Entrance_Movement_268381 waitmovement 0 @@ -191,7 +191,7 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314 end TrainerHill_Entrance_EventScript_26832E:: @ 826832E - msgbox TrainerHill_Entrance_Text_26851C, 4 + msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT setvar VAR_0x8004, 14 special sp194_trainer_tower setvar VAR_TEMP_5, 1 @@ -209,7 +209,7 @@ TrainerHill_Entrance_EventScript_26835C:: @ 826835C end TrainerHill_Entrance_EventScript_26836A:: @ 826836A - msgbox TrainerHill_Entrance_Text_268430, 4 + msgbox TrainerHill_Entrance_Text_268430, MSGBOX_DEFAULT closemessage applymovement 255, TrainerHill_Entrance_Movement_268381 waitmovement 0 @@ -244,21 +244,21 @@ TrainerHill_Entrance_EventScript_268388:: @ 8268388 TrainerHill_Entrance_EventScript_268391:: @ 8268391 checkflag FLAG_SYS_GAME_CLEAR goto_if 0, TrainerHill_Entrance_EventScript_2683A3 - msgbox TrainerHill_Entrance_Text_268D5A, 2 + msgbox TrainerHill_Entrance_Text_268D5A, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3 - msgbox TrainerHill_Entrance_Text_268DDA, 2 + msgbox TrainerHill_Entrance_Text_268DDA, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC checkflag FLAG_SYS_GAME_CLEAR goto_if 0, TrainerHill_Entrance_EventScript_2683BE - msgbox TrainerHill_Entrance_Text_268E6A, 2 + msgbox TrainerHill_Entrance_Text_268E6A, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE - msgbox TrainerHill_Entrance_Text_268EDC, 2 + msgbox TrainerHill_Entrance_Text_268EDC, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 @@ -269,7 +269,7 @@ TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 checkflag FLAG_SYS_GAME_CLEAR goto_eq TrainerHill_Entrance_EventScript_268402 pokemart TrainerHill_Entrance_Pokemart_2683E8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -292,7 +292,7 @@ TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8 TrainerHill_Entrance_EventScript_268402:: @ 8268402 pokemart TrainerHill_Entrance_Pokemart_268414 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index bdec2f7aa..19e8ef567 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -16,7 +16,7 @@ TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 case 2, TrainerHill_Roof_EventScript_2690A8 TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA - msgbox TrainerHill_Roof_Text_268986, 4 + msgbox TrainerHill_Roof_Text_268986, MSGBOX_DEFAULT TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 setvar VAR_0x8004, 2 @@ -27,7 +27,7 @@ TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 case 2, TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269020:: @ 8269020 - msgbox TrainerHill_Roof_Text_268AC5, 4 + msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT playfanfare MUS_FANFA1 message gUnknown_08272A78 waitfanfare @@ -35,9 +35,9 @@ TrainerHill_Roof_EventScript_269020:: @ 8269020 goto TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269037:: @ 8269037 - msgbox TrainerHill_Roof_Text_268AC5, 4 - msgbox gUnknown_08272A89, 4 - msgbox TrainerHill_Roof_Text_268B07, 4 + msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT + msgbox gUnknown_08272A89, MSGBOX_DEFAULT + msgbox TrainerHill_Roof_Text_268B07, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269054:: @ 8269054 @@ -49,22 +49,22 @@ TrainerHill_Roof_EventScript_269054:: @ 8269054 case 2, TrainerHill_Roof_EventScript_26909E TrainerHill_Roof_EventScript_269082:: @ 8269082 - msgbox TrainerHill_Roof_Text_268B43, 4 + msgbox TrainerHill_Roof_Text_268B43, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_26909E end TrainerHill_Roof_EventScript_269090:: @ 8269090 - msgbox TrainerHill_Roof_Text_268C03, 4 + msgbox TrainerHill_Roof_Text_268C03, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_26909E end TrainerHill_Roof_EventScript_26909E:: @ 826909E - msgbox TrainerHill_Roof_Text_268C31, 4 + msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT release end TrainerHill_Roof_EventScript_2690A8:: @ 82690A8 - msgbox TrainerHill_Roof_Text_268C31, 4 + msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT release end diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc index 102a5f6e7..7d3866eb0 100644 --- a/data/maps/Underwater1/events.inc +++ b/data/maps/Underwater1/events.inc @@ -1,11 +1,11 @@ Underwater1_MapBGEvents: @ 852CEB4 - bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, 8 - bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, 9 - bg_hidden_item_event 66, 34, 3, ITEM_PEARL, 10 - bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, 11 - bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, 13 - bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, 36 - bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, 38 + bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS + bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD + bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL + bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL + bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 + bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM + bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 Underwater1_MapEvents:: @ 852CF08 map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc index ca98f25ac..dd2421506 100644 --- a/data/maps/Underwater2/events.inc +++ b/data/maps/Underwater2/events.inc @@ -2,14 +2,14 @@ Underwater2_MapWarps: @ 852CF1C warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY Underwater2_MapBGEvents: @ 852CF24 - bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, 14 - bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, 15 - bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, 16 - bg_hidden_item_event 10, 36, 3, ITEM_PEARL, 17 - bg_hidden_item_event 11, 39, 3, ITEM_IRON, 19 - bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, 18 - bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, 20 - bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, 12 + bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE + bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL + bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST + bg_hidden_item_event 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL + bg_hidden_item_event 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON + bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD + bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL + bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD Underwater2_MapEvents:: @ 852CF84 map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc index 0a5dc773d..02ac86aa1 100644 --- a/data/maps/Underwater3/events.inc +++ b/data/maps/Underwater3/events.inc @@ -3,10 +3,10 @@ Underwater3_MapWarps: @ 852CF98 warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater3_MapBGEvents: @ 852CFA8 - bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, 21 - bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, 22 - bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, 23 - bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, 24 + bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE + bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP + bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE + bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD Underwater3_MapEvents:: @ 852CFD8 map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc index 7799e0ad6..5a08e82f9 100644 --- a/data/maps/Underwater4/events.inc +++ b/data/maps/Underwater4/events.inc @@ -2,8 +2,8 @@ Underwater4_MapWarps: @ 852CFEC warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN Underwater4_MapBGEvents: @ 852CFF4 - bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, 25 - bg_hidden_item_event 69, 18, 3, ITEM_PEARL, 26 + bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN + bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL Underwater4_MapEvents:: @ 852D00C map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc index fbad57bc8..468dedcd6 100644 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ b/data/maps/Underwater_SeafloorCavern/events.inc @@ -1,8 +1,8 @@ Underwater_SeafloorCavern_EventObjects: @ 8535640 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE Underwater_SeafloorCavern_MapWarps: @ 85356A0 warp_def 6, 7, 0, 0, MAP_UNDERWATER4 diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index 128cb31c0..7cdd3402d 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -11,7 +11,7 @@ Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B end Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 - setflag FLAG_0x3D4 + setflag FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE end Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C @@ -39,7 +39,7 @@ Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3 end Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC - msgbox Underwater_SeafloorCavern_Text_2343E5, 3 + msgbox Underwater_SeafloorCavern_Text_2343E5, MSGBOX_SIGN end Underwater_SeafloorCavern_Text_2343E5: @ 82343E5 diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc index 3396b5b8b..0cebf1502 100644 --- a/data/maps/UnionRoom/events.inc +++ b/data/maps/UnionRoom/events.inc @@ -1,13 +1,13 @@ UnionRoom_EventObjects: @ 853B020 object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 - object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, 706 - object_event 3, 247, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, 710 - object_event 4, 246, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, 709 - object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, 708 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, 707 - object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, 705 - object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, 704 - object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, 703 + object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4 + object_event 3, 247, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8 + object_event 4, 246, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, FLAG_HIDE_UNION_ROOM_PLAYER_7 + object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, FLAG_HIDE_UNION_ROOM_PLAYER_6 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, FLAG_HIDE_UNION_ROOM_PLAYER_5 + object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, FLAG_HIDE_UNION_ROOM_PLAYER_3 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2 + object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1 UnionRoom_MapWarps: @ 853B0F8 warp_def 7, 11, 3, 127, MAP_NONE diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index 250b4b402..f71c40e3d 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -4,14 +4,14 @@ UnionRoom_MapScripts:: @ 823D1A6 .byte 0 UnionRoom_MapScript1_23D1B1: @ 823D1B1 - setflag FLAG_0x2BF - setflag FLAG_0x2C0 - setflag FLAG_0x2C1 - setflag FLAG_0x2C2 - setflag FLAG_0x2C3 - setflag FLAG_0x2C4 - setflag FLAG_0x2C5 - setflag FLAG_0x2C6 + setflag FLAG_HIDE_UNION_ROOM_PLAYER_1 + setflag FLAG_HIDE_UNION_ROOM_PLAYER_2 + setflag FLAG_HIDE_UNION_ROOM_PLAYER_3 + setflag FLAG_HIDE_UNION_ROOM_PLAYER_4 + setflag FLAG_HIDE_UNION_ROOM_PLAYER_5 + setflag FLAG_HIDE_UNION_ROOM_PLAYER_6 + setflag FLAG_HIDE_UNION_ROOM_PLAYER_7 + setflag FLAG_HIDE_UNION_ROOM_PLAYER_8 removeobject 9 removeobject 8 removeobject 7 diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc index eb6bf8da4..2e13983fa 100644 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -18,7 +18,7 @@ LinkContestRoom1_MapScript1_23B79F: @ 823B79F LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF call LinkContestRoom1_EventScript_27A133 - special sub_80F8FA0 + special ScriptGetMultiplayerId compare VAR_RESULT, 0 call_if 1, LinkContestRoom1_EventScript_23B7EF compare VAR_RESULT, 1 @@ -134,7 +134,7 @@ LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8 setvar VAR_RESULT, 32 - special sub_80F8FE8 + special ScriptRandom addvar VAR_RESULT, 1 switch VAR_RESULT case 1, LinkContestRoom1_EventScript_23BA6B diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 8cc8f6f4d..922fcaa77 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -12,25 +12,25 @@ VerdanturfTown_EventScript_1EB575:: @ 81EB575 faceplayer checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_EventScript_1EB594 - msgbox VerdanturfTown_Text_1EB5FD, 4 + msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT applymovement 2, VerdanturfTown_Movement_2725A2 waitmovement 0 release end VerdanturfTown_EventScript_1EB594:: @ 81EB594 - msgbox VerdanturfTown_Text_1EB6E0, 4 + msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT applymovement 2, VerdanturfTown_Movement_2725A2 waitmovement 0 release end VerdanturfTown_EventScript_1EB5A8:: @ 81EB5A8 - msgbox VerdanturfTown_Text_1EB736, 2 + msgbox VerdanturfTown_Text_1EB736, MSGBOX_NPC end VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1 - msgbox VerdanturfTown_Text_1EB7E2, 2 + msgbox VerdanturfTown_Text_1EB7E2, MSGBOX_NPC end VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA @@ -38,29 +38,29 @@ VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA faceplayer checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_EventScript_1EB5CF - msgbox VerdanturfTown_Text_1EB854, 4 + msgbox VerdanturfTown_Text_1EB854, MSGBOX_DEFAULT release end VerdanturfTown_EventScript_1EB5CF:: @ 81EB5CF - msgbox VerdanturfTown_Text_1EB935, 4 + msgbox VerdanturfTown_Text_1EB935, MSGBOX_DEFAULT release end VerdanturfTown_EventScript_1EB5D9:: @ 81EB5D9 - msgbox VerdanturfTown_Text_1EB9C4, 3 + msgbox VerdanturfTown_Text_1EB9C4, MSGBOX_SIGN end VerdanturfTown_EventScript_1EB5E2:: @ 81EB5E2 - msgbox VerdanturfTown_Text_1EBA11, 3 + msgbox VerdanturfTown_Text_1EBA11, MSGBOX_SIGN end VerdanturfTown_EventScript_1EB5EB:: @ 81EB5EB - msgbox VerdanturfTown_Text_1EBA1F, 3 + msgbox VerdanturfTown_Text_1EBA1F, MSGBOX_SIGN end VerdanturfTown_EventScript_1EB5F4:: @ 81EB5F4 - msgbox VerdanturfTown_Text_1EBA59, 3 + msgbox VerdanturfTown_Text_1EBA59, MSGBOX_SIGN end VerdanturfTown_Text_1EB5FD: @ 81EB5FD diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index b7f687cdf..93b7802be 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, MSGBOX_DEFAULT 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 @@ -80,12 +80,12 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 waitmovement 0 - msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, 4 + msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty 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 @@ -105,7 +105,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8 VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A - msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, 5 + msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, MSGBOX_YESNO switch VAR_RESULT case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F @@ -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/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc index 1da591d59..1dfb49dd9 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc @@ -3,7 +3,7 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, FLAG_HIDE_VERDANTURF_TOWN_SCOTT object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index a4cfc20c2..bde086dce 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -22,28 +22,28 @@ 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 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_24E636, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24E636, MSGBOX_DEFAULT closemessage 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 VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT message VerdanturfTown_BattleTentLobby_Text_2C5791 waitmessage setvar VAR_0x8004, 6 @@ -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 @@ -59,7 +59,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 waitse VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 - msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, MSGBOX_DEFAULT setvar VAR_0x8004, 7 special sub_81B99B4 switch VAR_RESULT @@ -67,19 +67,19 @@ 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 waitfanfare - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall end VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD - msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, MSGBOX_DEFAULT waitmessage closemessage setvar VAR_TEMP_0, 255 @@ -88,7 +88,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD VerdanturfTown_BattleTentLobby_EventScript_2017EE:: @ 82017EE lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201791 end @@ -99,13 +99,13 @@ 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 playse SE_SAVE waitse - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -113,7 +113,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, MSGBOX_DEFAULT message VerdanturfTown_BattleTentLobby_Text_24E5F6 waitmessage setvar VAR_0x8004, 5 @@ -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 @@ -136,7 +136,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 compare VAR_RESULT, 0 goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE special SavePlayerParty - msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, MSGBOX_DEFAULT VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893 message VerdanturfTown_BattleTentLobby_Text_2C5129 @@ -153,14 +153,14 @@ 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 - msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4 + special CallFrontierUtilFunc + msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 @@ -168,7 +168,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF waitstate compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 - msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, 5 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, MSGBOX_YESNO switch VAR_RESULT case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34 case 1, VerdanturfTown_BattleTentLobby_EventScript_201954 @@ -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,8 +201,8 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 - special sub_81A1780 - msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4 + special CallFrontierUtilFunc + msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, MSGBOX_DEFAULT closemessage call VerdanturfTown_BattleTentLobby_EventScript_201A41 warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 @@ -211,7 +211,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE end VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB - msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201893 VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8 @@ -220,25 +220,25 @@ VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8 case 1, VerdanturfTown_BattleTentLobby_EventScript_201A10 VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03 - msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201A3F VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10 - msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201A3F 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 special LoadPlayerParty VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37 - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F release @@ -279,27 +279,27 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B faceplayer checkflag FLAG_0x0EB goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2 - msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT giveitem_std ITEM_TM45 compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054 setflag FLAG_0x0EB - msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201AB2:: @ 8201AB2 - msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201ABC:: @ 8201ABC - msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, 2 + msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, MSGBOX_NPC end VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5 lock - msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, MSGBOX_DEFAULT release end @@ -308,26 +308,26 @@ VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 faceplayer checkflag FLAG_0x1CC goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AED - msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CC release end VerdanturfTown_BattleTentLobby_EventScript_201AED:: @ 8201AED - msgbox VerdanturfTown_BattleTentLobby_Text_202025, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_202025, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201AF7:: @ 8201AF7 lock - msgbox VerdanturfTown_BattleTentLobby_Text_201D11, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201D11, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end @@ -349,32 +349,32 @@ VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11 end VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E - msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201B8C:: @ 8201B8C - msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201B9A:: @ 8201B9A - msgbox VerdanturfTown_BattleTentLobby_Text_24F049, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F049, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201BA8:: @ 8201BA8 - msgbox VerdanturfTown_BattleTentLobby_Text_24F190, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F190, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201BB6:: @ 8201BB6 - msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201BC4:: @ 8201BC4 - msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc index 28030d869..f677b3aab 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc @@ -4,7 +4,7 @@ VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 8203030 VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 lock faceplayer - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore switch VAR_RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094 @@ -18,37 +18,37 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 end VerdanturfTown_FriendshipRatersHouse_EventScript_203094:: @ 8203094 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_20309E:: @ 820309E - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8:: @ 82030A8 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2:: @ 82030B2 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC:: @ 82030BC - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6:: @ 82030C6 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0:: @ 82030D0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, MSGBOX_DEFAULT release end @@ -57,7 +57,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA:: @ 82030DA faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc index ce48fd662..c6028c784 100644 --- a/data/maps/VerdanturfTown_House/scripts.inc +++ b/data/maps/VerdanturfTown_House/scripts.inc @@ -2,11 +2,11 @@ VerdanturfTown_House_MapScripts:: @ 820335E .byte 0 VerdanturfTown_House_EventScript_20335F:: @ 820335F - msgbox VerdanturfTown_House_Text_203371, 2 + msgbox VerdanturfTown_House_Text_203371, MSGBOX_NPC end VerdanturfTown_House_EventScript_203368:: @ 8203368 - msgbox VerdanturfTown_House_Text_2033EE, 2 + msgbox VerdanturfTown_House_Text_2033EE, MSGBOX_NPC end VerdanturfTown_House_Text_203371: @ 8203371 diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc index 96daf2c84..cfaf2e021 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -7,7 +7,7 @@ VerdanturfTown_Mart_EventScript_202587:: @ 8202587 message gUnknown_08272A21 waitmessage pokemart VerdanturfTown_Mart_Pokemart_2025A0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -29,15 +29,15 @@ VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0 end VerdanturfTown_Mart_EventScript_2025BA:: @ 82025BA - msgbox VerdanturfTown_Mart_Text_2025D5, 2 + msgbox VerdanturfTown_Mart_Text_2025D5, MSGBOX_NPC end VerdanturfTown_Mart_EventScript_2025C3:: @ 82025C3 - msgbox VerdanturfTown_Mart_Text_20264C, 2 + msgbox VerdanturfTown_Mart_Text_20264C, MSGBOX_NPC end VerdanturfTown_Mart_EventScript_2025CC:: @ 82025CC - msgbox VerdanturfTown_Mart_Text_2026C9, 2 + msgbox VerdanturfTown_Mart_Text_2026C9, MSGBOX_NPC end VerdanturfTown_Mart_Text_2025D5: @ 82025D5 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 131df00f7..10a8b6479 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -17,11 +17,11 @@ VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A end VerdanturfTown_PokemonCenter_1F_EventScript_202748:: @ 8202748 - msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, 2 + msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, MSGBOX_NPC end VerdanturfTown_PokemonCenter_1F_EventScript_202751:: @ 8202751 - msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, 2 + msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, MSGBOX_NPC end VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc index 6aa0d681a..e3e959838 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc @@ -2,7 +2,7 @@ VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc index 5f0fd0b3c..f8d6f4db5 100644 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc @@ -1,9 +1,9 @@ VerdanturfTown_WandasHouse_EventObjects: @ 852E92C - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808 - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809 + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN + object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984 + object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc index 8184f4c21..6c3b90fc3 100644 --- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -6,13 +6,13 @@ VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF faceplayer checkflag FLAG_0x0C1 goto_eq VerdanturfTown_WandasHouse_EventScript_2028D7 - msgbox VerdanturfTown_WandasHouse_Text_202993, 4 + msgbox VerdanturfTown_WandasHouse_Text_202993, MSGBOX_DEFAULT setflag FLAG_0x0C1 release end VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7 - msgbox VerdanturfTown_WandasHouse_Text_202ABE, 4 + msgbox VerdanturfTown_WandasHouse_Text_202ABE, MSGBOX_DEFAULT release end @@ -23,22 +23,22 @@ VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1 goto_eq VerdanturfTown_WandasHouse_EventScript_202909 checkflag FLAG_0x4F3 goto_eq VerdanturfTown_WandasHouse_EventScript_2028FF - msgbox VerdanturfTown_WandasHouse_Text_202B37, 4 + msgbox VerdanturfTown_WandasHouse_Text_202B37, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_2028FF:: @ 82028FF - msgbox VerdanturfTown_WandasHouse_Text_202C20, 4 + msgbox VerdanturfTown_WandasHouse_Text_202C20, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202909:: @ 8202909 - msgbox VerdanturfTown_WandasHouse_Text_202C4E, 4 + msgbox VerdanturfTown_WandasHouse_Text_202C4E, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913 - msgbox VerdanturfTown_WandasHouse_Text_202E00, 2 + msgbox VerdanturfTown_WandasHouse_Text_202E00, MSGBOX_NPC end VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C @@ -48,17 +48,17 @@ VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C goto_eq VerdanturfTown_WandasHouse_EventScript_202944 checkflag FLAG_0x0BE goto_eq VerdanturfTown_WandasHouse_EventScript_20293A - msgbox VerdanturfTown_WandasHouse_Text_202D91, 4 + msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_20293A:: @ 820293A - msgbox VerdanturfTown_WandasHouse_Text_202CCF, 4 + msgbox VerdanturfTown_WandasHouse_Text_202CCF, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944 - msgbox VerdanturfTown_WandasHouse_Text_202D91, 4 + msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT release end @@ -71,22 +71,22 @@ VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E goto_eq VerdanturfTown_WandasHouse_EventScript_20297F checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_WandasHouse_EventScript_202975 - msgbox VerdanturfTown_WandasHouse_Text_202E47, 4 + msgbox VerdanturfTown_WandasHouse_Text_202E47, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202975:: @ 8202975 - msgbox VerdanturfTown_WandasHouse_Text_202F19, 4 + msgbox VerdanturfTown_WandasHouse_Text_202F19, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_20297F:: @ 820297F - msgbox VerdanturfTown_WandasHouse_Text_202F73, 4 + msgbox VerdanturfTown_WandasHouse_Text_202F73, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202989:: @ 8202989 - msgbox VerdanturfTown_WandasHouse_Text_202FDB, 4 + msgbox VerdanturfTown_WandasHouse_Text_202FDB, MSGBOX_DEFAULT release end diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index f162a9d80..05cafcc48 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -2,10 +2,10 @@ VictoryRoad_1F_EventObjects: @ 8535E04 object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, 1084 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, 1085 - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, 751 + object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, FLAG_ITEM_VICTORY_ROAD_1F_PP_UP + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 @@ -21,7 +21,7 @@ VictoryRoad_1F_MapCoordEvents: @ 8535F04 coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8 VictoryRoad_1F_MapBGEvents: @ 8535F24 - bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, 81 + bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL VictoryRoad_1F_MapEvents:: @ 8535F30 map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 2ed1c6baf..abe42e6d6 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -40,10 +40,10 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 applymovement 255, VictoryRoad_1F_Movement_2725AA waitmovement 0 - msgbox VictoryRoad_1F_Text_235EE6, 4 - trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC - msgbox VictoryRoad_1F_Text_236020, 4 - clearflag FLAG_0x35A + msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC + msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT + clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY moveobjectoffscreen 4 setflag FLAG_0x07E copyvar VAR_0x40C3, VAR_0x8008 @@ -78,45 +78,45 @@ VictoryRoad_1F_Movement_235E21: @ 8235E21 step_end VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C - msgbox VictoryRoad_1F_Text_236020, 2 + msgbox VictoryRoad_1F_Text_236020, MSGBOX_NPC end VictoryRoad_1F_EventScript_235E35:: @ 8235E35 - trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA + trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq VictoryRoad_1F_EventScript_235E5C - msgbox VictoryRoad_1F_Text_2360FE, 6 + msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C - trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA - msgbox VictoryRoad_1F_Text_2360FE, 6 + trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA + msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E73:: @ 8235E73 - trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB - msgbox VictoryRoad_1F_Text_2361E5, 6 + trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB + msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A - trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 - msgbox VictoryRoad_1F_Text_2362A4, 6 + trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 + msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1 - trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 - msgbox VictoryRoad_1F_Text_236356, 6 + trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 + msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8 - trainerbattle 0, TRAINER_QUINCY, 0, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 - msgbox VictoryRoad_1F_Text_2363D5, 6 + trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 + msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF - trainerbattle 0, TRAINER_KATELYNN, 0, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 - msgbox VictoryRoad_1F_Text_2364BB, 6 + trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 + msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE end VictoryRoad_1F_Text_235EE6: @ 8235EE6 @@ -217,4 +217,3 @@ VictoryRoad_1F_Text_2364A7: @ 82364A7 VictoryRoad_1F_Text_2364BB: @ 82364BB .string "Humph, go right on ahead.\n" .string "See if I care.$" - diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc index 14d400fec..814d8a73d 100644 --- a/data/maps/VictoryRoad_B1F/events.inc +++ b/data/maps/VictoryRoad_B1F/events.inc @@ -1,23 +1,23 @@ VictoryRoad_B1F_EventObjects: @ 8535F44 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26 - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28 - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_13 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_14 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_17 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1E + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_19 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1A + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1B + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1C + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1D + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1F object_event 14, EVENT_OBJ_GFX_MAN_3, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 object_event 16, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087 + object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_15 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, FLAG_ITEM_VICTORY_ROAD_B1F_TM_29 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE object_event 20, EVENT_OBJ_GFX_MAN_3, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 object_event 21, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index 376fda7d5..d6d2d6861 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -2,28 +2,28 @@ VictoryRoad_B1F_MapScripts:: @ 82364E4 .byte 0 VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5 - trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD - msgbox VictoryRoad_B1F_Text_2365C4, 6 + trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD + msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC - trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D - msgbox VictoryRoad_B1F_Text_236678, 6 + trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D + msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_236513:: @ 8236513 - trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B - msgbox VictoryRoad_B1F_Text_23671B, 6 + trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B + msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_23652A:: @ 823652A - trainerbattle 0, TRAINER_MITCHELL, 0, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 - msgbox VictoryRoad_B1F_Text_2367A7, 6 + trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 + msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_236541:: @ 8236541 - trainerbattle 0, TRAINER_HALLE, 0, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B - msgbox VictoryRoad_B1F_Text_23684C, 6 + trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B + msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_Text_236558: @ 8236558 diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index 17d878215..1ad4f3e50 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -3,7 +3,7 @@ VictoryRoad_B2F_EventObjects: @ 8536188 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 @@ -14,8 +14,8 @@ VictoryRoad_B2F_MapWarps: @ 8536230 warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F VictoryRoad_B2F_MapBGEvents: @ 8536250 - bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, 82 - bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, 83 + bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR + bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL VictoryRoad_B2F_MapEvents:: @ 8536268 map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 15deea104..245440135 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -2,33 +2,33 @@ VictoryRoad_B2F_MapScripts:: @ 82368D4 .byte 0 VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5 - trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 - msgbox VictoryRoad_B2F_Text_2369DE, 6 + trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 + msgbox VictoryRoad_B2F_Text_2369DE, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC - trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 - msgbox VictoryRoad_B2F_Text_236AAE, 6 + trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 + msgbox VictoryRoad_B2F_Text_236AAE, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236903:: @ 8236903 - trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 - msgbox VictoryRoad_B2F_Text_236B2F, 6 + trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 + msgbox VictoryRoad_B2F_Text_236B2F, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_23691A:: @ 823691A - trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A - msgbox VictoryRoad_B2F_Text_236C21, 6 + trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A + msgbox VictoryRoad_B2F_Text_236C21, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236931:: @ 8236931 - trainerbattle 0, TRAINER_FELIX, 0, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB - msgbox VictoryRoad_B2F_Text_236CBA, 6 + trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB + msgbox VictoryRoad_B2F_Text_236CBA, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236948:: @ 8236948 - trainerbattle 0, TRAINER_DIANNE, 0, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E - msgbox VictoryRoad_B2F_Text_236D8C, 6 + trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E + msgbox VictoryRoad_B2F_Text_236D8C, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_Text_23695F: @ 823695F diff --git a/data/mossdeep_gym.s b/data/mossdeep_gym.s new file mode 100644 index 000000000..01eb792b7 --- /dev/null +++ b/data/mossdeep_gym.s @@ -0,0 +1,43 @@ + .include "asm/macros.inc" + + .section .rodata + +gUnknown_08612698:: @ 8612698 + store_lock_anim + walk_right + free_unlock_anim + step_end + +gUnknown_0861269C:: @ 861269C + store_lock_anim + walk_down + free_unlock_anim + step_end + +gUnknown_086126A0:: @ 86126A0 + store_lock_anim + walk_left + free_unlock_anim + step_end + +gUnknown_086126A4:: @ 86126A4 + store_lock_anim + walk_up + free_unlock_anim + step_end + +gUnknown_086126A8:: @ 86126A8 + face_right + step_end + +gUnknown_086126AA:: @ 86126AA + face_down + step_end + +gUnknown_086126AC:: @ 86126AC + face_left + step_end + +gUnknown_086126AE:: @ 86126AE + face_up + step_end diff --git a/data/pokedex.s b/data/pokedex.s deleted file mode 100644 index fde603020..000000000 --- a/data/pokedex.s +++ /dev/null @@ -1,244 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -.macro unk_dex_struct texts, a2, a3, a4 - .4byte \texts - .byte \a2, \a3, \a4 - .byte 0 @padding -.endm - -.macro unk_dex_struct_2 text, a2, a3, a4, a5, a6, a7 - .4byte \text - .byte \a2, \a3, \a4, \a5, \a6, \a7 - .2byte 0 @padding -.endm - -.macro unk_dex_struct_3 text, a2, a3, a4 - .4byte \text - .byte \a2, \a3, \a4 - .byte 0 @padding -.endm - - .align 2 -gUnknown_0855D30C:: @ 855D30C - .string "$" - -@ 855D30D - .include "data/text/pokedex_text.inc" - -@ 856B5B0 - .include "data/pokedex_entries.inc" - - .align 2 -gUnknown_0856E610:: @ 856E610 - .incbin "graphics/pokedex/black.gbapal" - - .align 2 -gUnknown_0856E630:: @ 856E630 - .4byte 0x000030c8, 0x000000d1, 0x000010ea, 0x000020f3 - - .align 2 -gUnknown_0856E640:: @ 856E640 - window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001 - window_template 0x02, 0x19, 0x08, 0x02, 0x02, 0x0f, 0x0281 - window_template 0x00, 0x00, 0x0c, 0x20, 0x07, 0x08, 0x0285 - window_template 0x02, 0x12, 0x03, 0x0a, 0x08, 0x09, 0x0365 - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 - - .align 2 -gUnknown_0856E668:: @ 856E668 - .4byte 0x000020ea, 0x000030f7 - - .align 2 -gUnknown_0856E670:: @ 856E670 - window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001 - window_template 0x02, 0x19, 0x08, 0x02, 0x02, 0x0f, 0x0281 - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 - -sText_TenDashes2:: @ 856E688 - .string "----------$" - -@ 856E694 - .include "data/graphics/pokemon/footprint_table.inc" - -gUnknown_0856ED08:: @ 856ED08 - .byte 0x00, 0x00, 0x00, 0x00, 0xbb, 0x03, 0xd5, 0x03, 0xbe, 0x03, 0xd8, 0x03, 0xc1, 0x03, 0xdb, 0x03, 0xc4, 0x03, 0xde, 0x03, 0xc7, 0x03, 0xe1, 0x03, 0xca, 0x03, 0xe4, 0x03, 0xcd, 0x03, 0xe7, 0x03 - .byte 0xd0, 0x03, 0xea, 0x03, 0xd3, 0x02, 0xed, 0x02 - -gUnknown_0856ED30:: @ 856ED30 - unk_dex_struct_3 gUnknown_085E87A5, 0, 0, 5 - unk_dex_struct_3 gUnknown_085E87D6, 6, 0, 5 - unk_dex_struct_3 gUnknown_085E87EF, 12, 0, 5 - -gUnknown_0856ED48:: @ 856ED48 - unk_dex_struct_2 gUnknown_085E8840, 0, 2, 5, 5, 2, 12 - unk_dex_struct_2 gUnknown_085E887C, 0, 4, 5, 5, 4, 12 - unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 5, 6, 6 - unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 11, 6, 6 - unk_dex_struct_2 gUnknown_085E881F, 0, 8, 5, 5, 8, 12 - unk_dex_struct_2 gUnknown_085E8806, 0, 10, 5, 5, 10, 12 - unk_dex_struct_2 gUnknown_085E88C8, 0, 12, 5, 0, 0, 0 - - .align 1 -gUnknown_0856ED9C:: @ 856ED9C - .2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0502, 0xffff, 0x0604, 0xffff, 0xff05 - - .align 1 -gUnknown_0856EDB8:: @ 856EDB8 - .2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x05ff, 0xffff, 0x0604, 0xffff, 0xff05 - - .align 1 -gUnknown_0856EDD4:: @ 856EDD4 - .2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0602, 0xffff, 0xffff, 0xffff, 0xff04 - - .align 1 -gUnknown_0856EDF0:: @ 856EDF0 - .2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x06ff, 0xffff, 0xffff, 0xffff, 0xff04 - - .align 2 -gUnknown_0856EE0C:: @ 856EE0C - .4byte gUnknown_085E89A4 - .4byte gUnknown_085E88DF - .4byte gUnknown_085E89BB - .4byte gUnknown_085E88E9 - .4byte NULL - .4byte NULL - - .align 2 -gUnknown_0856EE24:: @ 856EE24 - .4byte gUnknown_085E89D4 - .4byte gUnknown_085E88F6 - .4byte gUnknown_085E8A02 - .4byte gUnknown_085E8905 - .4byte gUnknown_085E8A37 - .4byte gUnknown_085E8911 - .4byte gUnknown_085E8A73 - .4byte gUnknown_085E891F - .4byte gUnknown_085E8AAF - .4byte gUnknown_085E892D - .4byte gUnknown_085E8AEA - .4byte gUnknown_085E893A - .4byte 0 - .4byte 0 - -gUnknown_0856EE5C:: @ 856EE5C - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8B26 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8948 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E894C - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8950 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8954 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8958 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E895C - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8960 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8964 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8968 - .4byte 0 - .4byte 0 - -gUnknown_0856EEB4:: @ 856EEB4 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8B26 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E896B - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E896F - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8974 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E897B - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8981 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8987 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E898D - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8994 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8999 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E899F - .4byte 0 - .4byte 0 - -@ read from type table for each type except ???, entry is 7 byte of length -gUnknown_0856EF14:: @ 856EF14 - .4byte gUnknown_085E8B25 - .4byte gUnknown_085E8B35 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 0 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 7 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 14 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 21 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 28 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 35 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 42 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 49 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 56 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 70 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 77 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 84 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 91 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 98 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 105 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 112 - .4byte gUnknown_085E8B25 - .4byte gTypeNames + 119 - .4byte 0 - .4byte 0 - -gUnknown_0856EFAC:: @ 856EFAC - .byte 0x00, 0x01 - -gUnknown_0856EFAE:: @ 856EFAE - .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 - -gUnknown_0856EFB4:: @ 856EFB4 - .byte 0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x00, 0x00 - - .align 2 -gUnknown_0856EFC8:: @ 856EFC8 - unk_dex_struct gUnknown_0856EE5C, 6, 7, 10 - unk_dex_struct gUnknown_0856EEB4, 8, 9, 11 - unk_dex_struct gUnknown_0856EF14, 10,11, 18 - unk_dex_struct gUnknown_0856EF14, 12, 13, 18 - unk_dex_struct gUnknown_0856EE24, 4, 5, 6 - unk_dex_struct gUnknown_0856EE0C, 2, 3, 2 - - .align 2 -gUnknown_0856EFF8:: @ 856EFF8 - .4byte 0x000000c8, 0x000010d1, 0x000020ea, 0x000030f3 - - .align 2 -gUnknown_0856F008:: @ 856F008 - window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001 - null_window_template - diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s deleted file mode 100644 index 77d17a047..000000000 --- a/data/pokedex_area_screen.s +++ /dev/null @@ -1,92 +0,0 @@ -#include "constants/flags.h" -#include "constants/region_map_sections.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085B3D94:: @ 85B3D94 - .incbin "graphics/pokedex/area_glow.gbapal" - - .align 2 -gUnknown_085B3DB4:: @ 85B3DB4 - .incbin "graphics/pokedex/area_glow.4bpp.lz" - - .align 1 -gUnknown_085B3EE8:: @ 85B3EE8 - .2byte 0x0168 - - .align 1 -gUnknown_085B3EEA:: @ 85B3EEA - .2byte MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_TERRA_CAVE - - .align 1 -gUnknown_085B3EF0:: @ 85B3EF0 - .2byte SPECIES_FEEBAS, 0x0000, 0x0022 - .2byte SPECIES_EGG, 0x0000, 0x0000 - - .align 1 -gUnknown_085B3EFC:: @ 85B3EFC - .2byte MAPSEC_SKY_PILLAR, FLAG_LANDMARK_SKY_PILLAR - .2byte MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN - .2byte MAPSEC_ALTERING_CAVE_2, FLAG_LANDMARK_ALTERING_CAVE - .2byte MAPSEC_MIRAGE_TOWER, FLAG_LANDMARK_MIRAGE_TOWER - .2byte MAPSEC_DESERT_UNDERPASS, FLAG_LANDMARK_DESERT_UNDERPASS - .2byte MAPSEC_ARTISAN_CAVE, FLAG_0x8DF - .2byte MAPSEC_NONE, 0x0000 - -gUnknown_085B3F18:: @ 85B3F18 - .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x11, 0x20, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x12, 0x21, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x13, 0x22, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x14, 0x01, 0x23, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x15, 0x20, 0x23, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x16, 0x21, 0x23, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x17, 0x22, 0x23, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x18, 0x01, 0x24, 0x03, 0x04, 0x05, 0x06, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x19, 0x20, 0x24, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x1a, 0x21, 0x24, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1b, 0x22, 0x24, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x1c, 0x01, 0x25, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1d, 0x20, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x1e, 0x21, 0x25, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1f, 0x22, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - - .align 2 -gUnknown_085B4018:: @ 85B4018 - .4byte 0x00002003 - - .align 2 -gUnknown_085B401C:: @ 85B401C - obj_tiles AreaMarkerTiles, 0x0080, 0x0002 - - .align 2 -gUnknown_085B4024:: @ 85B4024 - obj_pal AreaMarkerPalette, 0x0002 - - .align 2 -gUnknown_085B402C:: @ 85B402C - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gUnknown_085B4034:: @ 85B4034 - spr_template 0x0002, 0x0002, gUnknown_085B402C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -AreaMarkerPalette:: @ 85B404C - .incbin "graphics/pokedex/area_marker.gbapal" - - .align 2 -AreaMarkerTiles:: @ 85B406C - .incbin "graphics/pokedex/area_marker.4bpp" - - .align 2 -gUnknown_085B40EC:: @ 85B40EC - obj_pal gPokedexAreaScreenAreaUnknown_Pal, 0x0003 - - .align 2 -gOamData_85B40F4:: @ 85B40F4 - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteTemplate_85B40FC:: @ 85B40FC - spr_template 0x0003, 0x0003, gOamData_85B40F4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s deleted file mode 100644 index 4b84c3ece..000000000 --- a/data/pokedex_cry_screen.s +++ /dev/null @@ -1,110 +0,0 @@ - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -CryMeterNeedlePalette: @ 85B7B58 - .incbin "graphics/pokedex/cry_meter_needle.gbapal" - - .align 2 -CryMeterNeedleTiles: @ 85B7B78 - .incbin "graphics/pokedex/cry_meter_needle.4bpp" - - .align 1 -gUnknown_085B8378:: @ 85B8378 - .incbin "graphics/pokedex/cry_meter_map.bin" - - .align 1 -gUnknown_085B8418:: @ 85B8418 - .incbin "graphics/pokedex/cry_meter.gbapal" - - .align 2 -gUnknown_085B8438:: @ 85B8438 - .incbin "graphics/pokedex/cry_meter.4bpp.lz" - - .align 1 -gUnknown_085B8770:: @ 85B8770 - .2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C - .2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C - .2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D - .2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D - .2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E - .2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E - .2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F - .2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F - - .align 1 -gUnknown_085B8BF0:: @ 85B8BF0 - .incbin "graphics/pokedex/85B8BF0.gbapal" - -gUnknown_085B8C10:: @ 85B8C10 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x22 - -gUnknown_085B8C30:: @ 85B8C30 - .byte 0xF0, 0x0F - -gUnknown_085B8C32:: @ 85B8C32 - .byte 0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F - .byte 0xF0,0xE0,0xD0,0xC0,0xB0,0xA0,0x90,0x80,0x80,0x90,0xA0,0xB0,0xC0,0xD0,0xE0,0xF0 - - .align 2 -gSpriteAnim_85B8C54:: @ 85B8C54 - obj_image_anim_frame 0, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_85B8C5C:: @ 85B8C5C - .4byte gSpriteAnim_85B8C54 - - .align 2 -gOamData_85B8C60:: @ 85B8C60 - .2byte 0x01A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gUnknown_085B8C68:: @ 85B8C68 - spr_template 8192, 8192, gOamData_85B8C60, gSpriteAnimTable_85B8C5C, NULL, gDummySpriteAffineAnimTable, sub_814596C - - .align 2 -gCryMeterNeedleSpriteSheets:: @ 85B8C80 - obj_tiles CryMeterNeedleTiles, 0x800, 8192 - null_obj_tiles - - .align 2 -gCryMeterNeedleSpritePalettes:: @ 85B8C90 - obj_pal CryMeterNeedlePalette, 8192 - null_obj_pal diff --git a/data/pokedex_entries.inc b/data/pokedex_entries.inc deleted file mode 100644 index ce98a7b26..000000000 --- a/data/pokedex_entries.inc +++ /dev/null @@ -1,776 +0,0 @@ - .align 2 -gPokedexEntries:: @ 856B5B0 - .string "UNKNOWN$", 12 - pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0 - .string "SEED$", 12 - pokedex_entry 7, 69, gBulbasaurPokedexText, 356, 17, 256, 0 - .string "SEED$", 12 - pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0 - .string "SEED$", 12 - pokedex_entry 20, 1000, gVenusaurPokedexText, 256, 0, 388, 6 - .string "LIZARD$", 12 - pokedex_entry 6, 85, gCharmanderPokedexText, 444, 18, 256, 0 - .string "FLAME$", 12 - pokedex_entry 11, 190, gCharmeleonPokedexText, 302, 9, 256, 0 - .string "FLAME$", 12 - pokedex_entry 17, 905, gCharizardPokedexText, 256, 1, 302, 3 - .string "TINY TURTLE$", 12 - pokedex_entry 5, 90, gSquirtlePokedexText, 412, 18, 256, 0 - .string "TURTLE$", 12 - pokedex_entry 10, 225, gWartortlePokedexText, 332, 10, 256, 0 - .string "SHELLFISH$", 12 - pokedex_entry 16, 855, gBlastoisePokedexText, 256, -1, 293, 2 - .string "WORM$", 12 - pokedex_entry 3, 29, gCaterpiePokedexText, 549, 22, 256, 0 - .string "COCOON$", 12 - pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0 - .string "BUTTERFLY$", 12 - pokedex_entry 11, 320, gButterfreePokedexText, 312, 2, 256, 0 - .string "HAIRY BUG$", 12 - pokedex_entry 3, 32, gWeedlePokedexText, 455, 22, 256, 0 - .string "COCOON$", 12 - pokedex_entry 6, 100, gKakunaPokedexText, 424, 17, 256, 0 - .string "POISON BEE$", 12 - pokedex_entry 10, 295, gBeedrillPokedexText, 366, 2, 256, 0 - .string "TINY BIRD$", 12 - pokedex_entry 3, 18, gPidgeyPokedexText, 508, -3, 256, 0 - .string "BIRD$", 12 - pokedex_entry 11, 300, gPidgeottoPokedexText, 331, 10, 256, 0 - .string "BIRD$", 12 - pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0 - .string "MOUSE$", 12 - pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0 - .string "MOUSE$", 12 - pokedex_entry 7, 185, gRaticatePokedexText, 459, 18, 256, 0 - .string "TINY BIRD$", 12 - pokedex_entry 3, 20, gSpearowPokedexText, 571, 22, 256, 0 - .string "BEAK$", 12 - pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0 - .string "SNAKE$", 12 - pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0 - .string "COBRA$", 12 - pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2 - .string "MOUSE$", 12 - pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0 - .string "MOUSE$", 12 - pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0 - .string "MOUSE$", 12 - pokedex_entry 6, 120, gSandshrewPokedexText, 365, 18, 256, 0 - .string "MOUSE$", 12 - pokedex_entry 10, 295, gSandslashPokedexText, 341, 11, 256, 0 - .string "POISON PIN$", 12 - pokedex_entry 4, 70, gNidoranFPokedexText, 488, 21, 256, 0 - .string "POISON PIN$", 12 - pokedex_entry 8, 200, gNidorinaPokedexText, 381, 15, 256, 0 - .string "DRILL$", 12 - pokedex_entry 13, 600, gNidoqueenPokedexText, 293, 4, 256, 0 - .string "POISON PIN$", 12 - pokedex_entry 5, 90, gNidoranMPokedexText, 511, 20, 256, 0 - .string "POISON PIN$", 12 - pokedex_entry 9, 195, gNidorinoPokedexText, 408, 15, 256, 0 - .string "DRILL$", 12 - pokedex_entry 14, 620, gNidokingPokedexText, 256, 0, 256, 0 - .string "FAIRY$", 12 - pokedex_entry 6, 75, gClefairyPokedexText, 441, 20, 256, 0 - .string "FAIRY$", 12 - pokedex_entry 13, 400, gClefablePokedexText, 256, 5, 256, 0 - .string "FOX$", 12 - pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0 - .string "FOX$", 12 - pokedex_entry 11, 199, gNinetalesPokedexText, 339, 10, 256, 0 - .string "BALLOON$", 12 - pokedex_entry 5, 55, gJigglypuffPokedexText, 433, 2, 256, 0 - .string "BALLOON$", 12 - pokedex_entry 10, 120, gWigglytuffPokedexText, 328, 11, 256, 0 - .string "BAT$", 12 - pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0 - .string "BAT$", 12 - pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0 - .string "WEED$", 12 - pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0 - .string "WEED$", 12 - pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0 - .string "FLOWER$", 12 - pokedex_entry 12, 186, gVileplumePokedexText, 256, 4, 256, 0 - .string "MUSHROOM$", 12 - pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0 - .string "MUSHROOM$", 12 - pokedex_entry 10, 295, gParasectPokedexText, 307, 8, 256, 0 - .string "INSECT$", 12 - pokedex_entry 10, 300, gVenonatPokedexText, 360, 0, 256, -1 - .string "POISON MOTH$", 12 - pokedex_entry 15, 125, gVenomothPokedexText, 285, 2, 256, 1 - .string "MOLE$", 12 - pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0 - .string "MOLE$", 12 - pokedex_entry 7, 333, gDugtrioPokedexText, 406, 18, 256, 0 - .string "SCRATCH CAT$", 12 - pokedex_entry 4, 42, gMeowthPokedexText, 480, 19, 256, 0 - .string "CLASSY CAT$", 12 - pokedex_entry 10, 320, gPersianPokedexText, 320, 10, 256, 0 - .string "DUCK$", 12 - pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0 - .string "DUCK$", 12 - pokedex_entry 17, 766, gGolduckPokedexText, 256, 1, 273, 1 - .string "PIG MONKEY$", 12 - pokedex_entry 5, 280, gMankeyPokedexText, 404, 19, 256, 0 - .string "PIG MONKEY$", 12 - pokedex_entry 10, 320, gPrimeapePokedexText, 326, 10, 256, 0 - .string "PUPPY$", 12 - pokedex_entry 7, 190, gGrowlithePokedexText, 346, 14, 256, 0 - .string "LEGENDARY$", 12 - pokedex_entry 19, 1550, gArcaninePokedexText, 256, 1, 312, 4 - .string "TADPOLE$", 12 - pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0 - .string "TADPOLE$", 12 - pokedex_entry 10, 200, gPoliwhirlPokedexText, 288, 11, 256, 0 - .string "TADPOLE$", 12 - pokedex_entry 13, 540, gPoliwrathPokedexText, 256, 6, 256, 0 - .string "PSI$", 12 - pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0 - .string "PSI$", 12 - pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0 - .string "PSI$", 12 - pokedex_entry 15, 480, gAlakazamPokedexText, 256, 3, 256, 0 - .string "SUPERPOWER$", 12 - pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0 - .string "SUPERPOWER$", 12 - pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0 - .string "SUPERPOWER$", 12 - pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1 - .string "FLOWER$", 12 - pokedex_entry 7, 40, gBellsproutPokedexText, 354, 16, 256, 0 - .string "FLYCATCHER$", 12 - pokedex_entry 10, 64, gWeepinbellPokedexText, 256, 0, 256, 0 - .string "FLYCATCHER$", 12 - pokedex_entry 17, 155, gVictreebelPokedexText, 256, 1, 312, 3 - .string "JELLYFISH$", 12 - pokedex_entry 9, 455, gTentacoolPokedexText, 256, 0, 256, 0 - .string "JELLYFISH$", 12 - pokedex_entry 16, 550, gTentacruelPokedexText, 256, 0, 312, 1 - .string "ROCK$", 12 - pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0 - .string "ROCK$", 12 - pokedex_entry 10, 1050, gGravelerPokedexText, 256, 2, 256, 0 - .string "MEGATON$", 12 - pokedex_entry 14, 3000, gGolemPokedexText, 256, 3, 296, 2 - .string "FIRE HORSE$", 12 - pokedex_entry 10, 300, gPonytaPokedexText, 283, 8, 256, 0 - .string "FIRE HORSE$", 12 - pokedex_entry 17, 950, gRapidashPokedexText, 256, 0, 289, 1 - .string "DOPEY$", 12 - pokedex_entry 12, 360, gSlowpokePokedexText, 256, 10, 256, 0 - .string "HERMIT CRAB$", 12 - pokedex_entry 16, 785, gSlowbroPokedexText, 256, 6, 296, 2 - .string "MAGNET$", 12 - pokedex_entry 3, 60, gMagnemitePokedexText, 288, -9, 256, 0 - .string "MAGNET$", 12 - pokedex_entry 10, 600, gMagnetonPokedexText, 292, 1, 256, 0 - .string "WILD DUCK$", 12 - pokedex_entry 8, 150, gFarfetchdPokedexText, 330, 2, 293, 2 - .string "TWIN BIRD$", 12 - pokedex_entry 14, 392, gDoduoPokedexText, 256, 3, 257, -1 - .string "TRIPLE BIRD$", 12 - pokedex_entry 18, 852, gDodrioPokedexText, 256, 0, 268, 0 - .string "SEA LION$", 12 - pokedex_entry 11, 900, gSeelPokedexText, 297, 8, 256, 0 - .string "SEA LION$", 12 - pokedex_entry 17, 1200, gDewgongPokedexText, 256, 0, 275, 0 - .string "SLUDGE$", 12 - pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0 - .string "SLUDGE$", 12 - pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0 - .string "BIVALVE$", 12 - pokedex_entry 3, 40, gShellderPokedexText, 675, 24, 256, 0 - .string "BIVALVE$", 12 - pokedex_entry 15, 1325, gCloysterPokedexText, 256, 0, 269, 1 - .string "GAS$", 12 - pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0 - .string "GAS$", 12 - pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2 - .string "SHADOW$", 12 - pokedex_entry 15, 405, gGengarPokedexText, 256, 2, 302, 2 - .string "ROCK SNAKE$", 12 - pokedex_entry 88, 2100, gOnixPokedexText, 256, 1, 515, 14 - .string "HYPNOSIS$", 12 - pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0 - .string "HYPNOSIS$", 12 - pokedex_entry 16, 756, gHypnoPokedexText, 256, 3, 257, 0 - .string "RIVER CRAB$", 12 - pokedex_entry 4, 65, gKrabbyPokedexText, 469, 20, 256, 0 - .string "PINCER$", 12 - pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0 - .string "BALL$", 12 - pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0 - .string "BALL$", 12 - pokedex_entry 12, 666, gElectrodePokedexText, 256, 0, 256, 0 - .string "EGG$", 12 - pokedex_entry 4, 25, gExeggcutePokedexText, 489, -4, 256, 0 - .string "COCONUT$", 12 - pokedex_entry 20, 1200, gExeggutorPokedexText, 256, 0, 309, 5 - .string "LONELY$", 12 - pokedex_entry 4, 65, gCubonePokedexText, 545, 21, 256, 0 - .string "BONE KEEPER$", 12 - pokedex_entry 10, 450, gMarowakPokedexText, 293, 12, 256, 0 - .string "KICKING$", 12 - pokedex_entry 15, 498, gHitmonleePokedexText, 256, 3, 259, 1 - .string "PUNCHING$", 12 - pokedex_entry 14, 502, gHitmonchanPokedexText, 256, 2, 277, 2 - .string "LICKING$", 12 - pokedex_entry 12, 655, gLickitungPokedexText, 256, 4, 256, 0 - .string "POISON GAS$", 12 - pokedex_entry 6, 10, gKoffingPokedexText, 369, -1, 256, 0 - .string "POISON GAS$", 12 - pokedex_entry 12, 95, gWeezingPokedexText, 305, 3, 256, 0 - .string "SPIKES$", 12 - pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0 - .string "DRILL$", 12 - pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2 - .string "EGG$", 12 - pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0 - .string "VINE$", 12 - pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0 - .string "PARENT$", 12 - pokedex_entry 22, 800, gKangaskhanPokedexText, 256, 0, 387, 8 - .string "DRAGON$", 12 - pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0 - .string "DRAGON$", 12 - pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0 - .string "GOLDFISH$", 12 - pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0 - .string "GOLDFISH$", 12 - pokedex_entry 13, 390, gSeakingPokedexText, 256, 3, 256, 0 - .string "STAR SHAPE$", 12 - pokedex_entry 8, 345, gStaryuPokedexText, 326, 1, 256, 0 - .string "MYSTERIOUS$", 12 - pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0 - .string "BARRIER$", 12 - pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0 - .string "MANTIS$", 12 - pokedex_entry 15, 560, gScytherPokedexText, 256, 1, 293, 2 - .string "HUMAN SHAPE$", 12 - pokedex_entry 14, 406, gJynxPokedexText, 256, 3, 300, 1 - .string "ELECTRIC$", 12 - pokedex_entry 11, 300, gElectabuzzPokedexText, 351, 8, 256, 0 - .string "SPITFIRE$", 12 - pokedex_entry 13, 445, gMagmarPokedexText, 277, 5, 256, 0 - .string "STAG BEETLE$", 12 - pokedex_entry 15, 550, gPinsirPokedexText, 256, 2, 257, 0 - .string "WILD BULL$", 12 - pokedex_entry 14, 884, gTaurosPokedexText, 256, 0, 256, 0 - .string "FISH$", 12 - pokedex_entry 9, 100, gMagikarpPokedexText, 310, 4, 256, 0 - .string "ATROCIOUS$", 12 - pokedex_entry 65, 2350, gGyaradosPokedexText, 256, 6, 481, 13 - .string "TRANSPORT$", 12 - pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8 - .string "TRANSFORM$", 12 - pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0 - .string "EVOLUTION$", 12 - pokedex_entry 3, 65, gEeveePokedexText, 476, 18, 256, 0 - .string "BUBBLE JET$", 12 - pokedex_entry 10, 290, gVaporeonPokedexText, 316, 8, 256, 0 - .string "LIGHTNING$", 12 - pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0 - .string "FLAME$", 12 - pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0 - .string "VIRTUAL$", 12 - pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0 - .string "SPIRAL$", 12 - pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0 - .string "SPIRAL$", 12 - pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0 - .string "SHELLFISH$", 12 - pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0 - .string "SHELLFISH$", 12 - pokedex_entry 13, 405, gKabutopsPokedexText, 271, 3, 256, 0 - .string "FOSSIL$", 12 - pokedex_entry 18, 590, gAerodactylPokedexText, 256, 0, 302, 4 - .string "SLEEPING$", 12 - pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11 - .string "FREEZE$", 12 - pokedex_entry 17, 554, gArticunoPokedexText, 256, 0, 309, 2 - .string "ELECTRIC$", 12 - pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3 - .string "FLAME$", 12 - pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8 - .string "DRAGON$", 12 - pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6 - .string "DRAGON$", 12 - pokedex_entry 40, 165, gDragonairPokedexText, 256, 0, 411, 5 - .string "DRAGON$", 12 - pokedex_entry 22, 2100, gDragonitePokedexText, 256, 0, 309, 4 - .string "GENETIC$", 12 - pokedex_entry 20, 1220, gMewtwoPokedexText, 256, 0, 309, 4 - .string "NEW SPECIES$", 12 - pokedex_entry 4, 40, gMewPokedexText, 457, -2, 256, 0 - .string "LEAF$", 12 - pokedex_entry 9, 64, gChikoritaPokedexText, 512, 20, 256, 0 - .string "LEAF$", 12 - pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0 - .string "HERB$", 12 - pokedex_entry 18, 1005, gMeganiumPokedexText, 256, 0, 277, 1 - .string "FIRE MOUSE$", 12 - pokedex_entry 5, 79, gCyndaquilPokedexText, 539, 21, 256, 0 - .string "VOLCANO$", 12 - pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0 - .string "VOLCANO$", 12 - pokedex_entry 17, 795, gTyphlosionPokedexText, 256, 0, 268, 1 - .string "BIG JAW$", 12 - pokedex_entry 6, 95, gTotodilePokedexText, 487, 20, 256, 0 - .string "BIG JAW$", 12 - pokedex_entry 11, 250, gCroconawPokedexText, 378, 13, 256, 0 - .string "BIG JAW$", 12 - pokedex_entry 23, 888, gFeraligatrPokedexText, 256, 0, 342, 7 - .string "SCOUT$", 12 - pokedex_entry 8, 60, gSentretPokedexText, 439, 12, 256, 0 - .string "LONG BODY$", 12 - pokedex_entry 18, 325, gFurretPokedexText, 346, 11, 256, 0 - .string "OWL$", 12 - pokedex_entry 7, 212, gHoothootPokedexText, 380, -2, 256, 0 - .string "OWL$", 12 - pokedex_entry 16, 408, gNoctowlPokedexText, 278, 3, 256, 0 - .string "FIVE STAR$", 12 - pokedex_entry 10, 108, gLedybaPokedexText, 256, 4, 256, 0 - .string "FIVE STAR$", 12 - pokedex_entry 14, 356, gLedianPokedexText, 256, 2, 256, 0 - .string "STRING SPIT$", 12 - pokedex_entry 5, 85, gSpinarakPokedexText, 414, 21, 256, 0 - .string "LONG LEG$", 12 - pokedex_entry 11, 335, gAriadosPokedexText, 316, 8, 256, 0 - .string "BAT$", 12 - pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1 - .string "ANGLER$", 12 - pokedex_entry 5, 120, gChinchouPokedexText, 424, -2, 256, 0 - .string "LIGHT$", 12 - pokedex_entry 12, 225, gLanturnPokedexText, 269, 6, 256, 0 - .string "TINY MOUSE$", 12 - pokedex_entry 3, 20, gPichuPokedexText, 508, 20, 256, 0 - .string "STAR SHAPE$", 12 - pokedex_entry 3, 30, gCleffaPokedexText, 462, 23, 256, 0 - .string "BALLOON$", 12 - pokedex_entry 3, 10, gIgglybuffPokedexText, 457, -1, 256, 0 - .string "SPIKE BALL$", 12 - pokedex_entry 3, 15, gTogepiPokedexText, 507, 23, 256, 0 - .string "HAPPINESS$", 12 - pokedex_entry 6, 32, gTogeticPokedexText, 424, 17, 256, 0 - .string "TINY BIRD$", 12 - pokedex_entry 2, 20, gNatuPokedexText, 610, 25, 256, 0 - .string "MYSTIC$", 12 - pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4 - .string "WOOL$", 12 - pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0 - .string "WOOL$", 12 - pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0 - .string "LIGHT$", 12 - pokedex_entry 14, 615, gAmpharosPokedexText, 256, 4, 256, 0 - .string "FLOWER$", 12 - pokedex_entry 4, 58, gBellossomPokedexText, 472, 21, 256, 0 - .string "AQUA MOUSE$", 12 - pokedex_entry 4, 85, gMarillPokedexText, 476, 20, 256, 0 - .string "AQUA RABBIT$", 12 - pokedex_entry 8, 285, gAzumarillPokedexText, 448, 16, 256, 0 - .string "IMITATION$", 12 - pokedex_entry 12, 380, gSudowoodoPokedexText, 305, 8, 256, 0 - .string "FROG$", 12 - pokedex_entry 11, 339, gPolitoedPokedexText, 289, 6, 256, 0 - .string "COTTONWEED$", 12 - pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0 - .string "COTTONWEED$", 12 - pokedex_entry 6, 10, gSkiploomPokedexText, 387, 0, 256, 0 - .string "COTTONWEED$", 12 - pokedex_entry 8, 30, gJumpluffPokedexText, 418, -4, 256, 0 - .string "LONG TAIL$", 12 - pokedex_entry 8, 115, gAipomPokedexText, 363, 6, 256, 0 - .string "SEED$", 12 - pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0 - .string "SUN$", 12 - pokedex_entry 8, 85, gSunfloraPokedexText, 444, 15, 256, 0 - .string "CLEAR WING$", 12 - pokedex_entry 12, 380, gYanmaPokedexText, 274, -1, 256, 0 - .string "WATER FISH$", 12 - pokedex_entry 4, 85, gWooperPokedexText, 479, 21, 256, 0 - .string "WATER FISH$", 12 - pokedex_entry 14, 750, gQuagsirePokedexText, 256, 4, 256, 0 - .string "SUN$", 12 - pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0 - .string "MOONLIGHT$", 12 - pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0 - .string "DARKNESS$", 12 - pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1 - .string "ROYAL$", 12 - pokedex_entry 20, 795, gSlowkingPokedexText, 256, 0, 309, 5 - .string "SCREECH$", 12 - pokedex_entry 7, 10, gMisdreavusPokedexText, 407, -8, 256, 0 - .string "SYMBOL$", 12 - pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0 - .string "PATIENT$", 12 - pokedex_entry 13, 285, gWobbuffetPokedexText, 274, 4, 256, 0 - .string "LONG NECK$", 12 - pokedex_entry 15, 415, gGirafarigPokedexText, 281, 1, 256, 0 - .string "BAGWORM$", 12 - pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0 - .string "BAGWORM$", 12 - pokedex_entry 12, 1258, gForretressPokedexText, 293, 5, 256, 0 - .string "LAND SNAKE$", 12 - pokedex_entry 15, 140, gDunsparcePokedexText, 316, 17, 256, 0 - .string "FLYSCORPION$", 12 - pokedex_entry 11, 648, gGligarPokedexText, 350, -1, 256, 0 - .string "IRON SNAKE$", 12 - pokedex_entry 92, 4000, gSteelixPokedexText, 256, 0, 516, 13 - .string "FAIRY$", 12 - pokedex_entry 6, 78, gSnubbullPokedexText, 465, 19, 256, 0 - .string "FAIRY$", 12 - pokedex_entry 14, 487, gGranbullPokedexText, 256, 4, 256, 0 - .string "BALLOON$", 12 - pokedex_entry 5, 39, gQwilfishPokedexText, 430, 0, 256, 0 - .string "PINCER$", 12 - pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0 - .string "MOLD$", 12 - pokedex_entry 6, 205, gShucklePokedexText, 485, 18, 256, 0 - .string "SINGLE HORN$", 12 - pokedex_entry 15, 540, gHeracrossPokedexText, 256, 0, 256, 0 - .string "SHARP CLAW$", 12 - pokedex_entry 9, 280, gSneaselPokedexText, 413, -3, 256, 0 - .string "LITTLE BEAR$", 12 - pokedex_entry 6, 88, gTeddiursaPokedexText, 455, 19, 256, 0 - .string "HIBERNATOR$", 12 - pokedex_entry 18, 1258, gUrsaringPokedexText, 256, 0, 256, 0 - .string "LAVA$", 12 - pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0 - .string "LAVA$", 12 - pokedex_entry 8, 550, gMagcargoPokedexText, 332, 15, 256, 0 - .string "PIG$", 12 - pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0 - .string "SWINE$", 12 - pokedex_entry 11, 558, gPiloswinePokedexText, 306, 10, 256, 0 - .string "CORAL$", 12 - pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0 - .string "JET$", 12 - pokedex_entry 6, 120, gRemoraidPokedexText, 316, 4, 256, 0 - .string "JET$", 12 - pokedex_entry 9, 285, gOctilleryPokedexText, 296, 3, 256, 0 - .string "DELIVERY$", 12 - pokedex_entry 9, 160, gDelibirdPokedexText, 293, 11, 256, 0 - .string "KITE$", 12 - pokedex_entry 21, 2200, gMantinePokedexText, 256, 0, 342, 7 - .string "ARMOR BIRD$", 12 - pokedex_entry 17, 505, gSkarmoryPokedexText, 256, 0, 271, 1 - .string "DARK$", 12 - pokedex_entry 6, 108, gHoundourPokedexText, 393, 16, 256, 0 - .string "DARK$", 12 - pokedex_entry 14, 350, gHoundoomPokedexText, 256, 4, 256, 0 - .string "DRAGON$", 12 - pokedex_entry 18, 1520, gKingdraPokedexText, 256, 0, 287, 0 - .string "LONG NOSE$", 12 - pokedex_entry 5, 335, gPhanpyPokedexText, 465, 21, 256, 0 - .string "ARMOR$", 12 - pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0 - .string "VIRTUAL$", 12 - pokedex_entry 6, 325, gPorygon2PokedexText, 320, 17, 256, 0 - .string "BIG HORN$", 12 - pokedex_entry 14, 712, gStantlerPokedexText, 256, 0, 256, 0 - .string "PAINTER$", 12 - pokedex_entry 12, 580, gSmearglePokedexText, 287, 5, 256, 0 - .string "SCUFFLE$", 12 - pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0 - .string "HANDSTAND$", 12 - pokedex_entry 14, 480, gHitmontopPokedexText, 256, 2, 257, 0 - .string "KISS$", 12 - pokedex_entry 4, 60, gSmoochumPokedexText, 440, 20, 256, 0 - .string "ELECTRIC$", 12 - pokedex_entry 6, 235, gElekidPokedexText, 363, 14, 256, 0 - .string "LIVE COAL$", 12 - pokedex_entry 7, 214, gMagbyPokedexText, 284, 13, 256, 0 - .string "MILK COW$", 12 - pokedex_entry 12, 755, gMiltankPokedexText, 280, 5, 256, 0 - .string "HAPPINESS$", 12 - pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3 - .string "THUNDER$", 12 - pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7 - .string "VOLCANO$", 12 - pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7 - .string "AURORA$", 12 - pokedex_entry 20, 1870, gSuicunePokedexText, 269, 0, 345, 7 - .string "ROCK SKIN$", 12 - pokedex_entry 6, 720, gLarvitarPokedexText, 472, 18, 256, 0 - .string "HARD SHELL$", 12 - pokedex_entry 12, 1520, gPupitarPokedexText, 292, 8, 256, 0 - .string "ARMOR$", 12 - pokedex_entry 20, 2020, gTyranitarPokedexText, 256, 0, 345, 7 - .string "DIVING$", 12 - pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19 - .string "RAINBOW$", 12 - pokedex_entry 38, 1990, gHoOhPokedexText, 256, 0, 610, 17 - .string "TIME TRAVEL$", 12 - pokedex_entry 6, 50, gCelebiPokedexText, 393, -10, 256, 0 - .string "WOOD GECKO$", 12 - pokedex_entry 5, 50, gTreeckoPokedexText, 541, 19, 256, 0 - .string "WOOD GECKO$", 12 - pokedex_entry 9, 216, gGrovylePokedexText, 360, 5, 256, 0 - .string "FOREST$", 12 - pokedex_entry 17, 522, gSceptilePokedexText, 256, -1, 275, 2 - .string "CHICK$", 12 - pokedex_entry 4, 25, gTorchicPokedexText, 566, 19, 256, 0 - .string "YOUNG FOWL$", 12 - pokedex_entry 9, 195, gCombuskenPokedexText, 343, 5, 256, 0 - .string "BLAZE$", 12 - pokedex_entry 19, 520, gBlazikenPokedexText, 256, 0, 301, 4 - .string "MUD FISH$", 12 - pokedex_entry 4, 76, gMudkipPokedexText, 535, 20, 256, 0 - .string "MUD FISH$", 12 - pokedex_entry 7, 280, gMarshtompPokedexText, 340, 7, 256, 0 - .string "MUD FISH$", 12 - pokedex_entry 15, 819, gSwampertPokedexText, 256, 0, 256, 0 - .string "BITE$", 12 - pokedex_entry 5, 136, gPoochyenaPokedexText, 481, 19, 256, 0 - .string "BITE$", 12 - pokedex_entry 10, 370, gMightyenaPokedexText, 362, 9, 256, 0 - .string "TINYRACCOON$", 12 - pokedex_entry 4, 175, gZigzagoonPokedexText, 560, 22, 256, 0 - .string "RUSHING$", 12 - pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0 - .string "WORM$", 12 - pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0 - .string "COCOON$", 12 - pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0 - .string "BUTTERFLY$", 12 - pokedex_entry 10, 284, gBeautiflyPokedexText, 298, -1, 256, 0 - .string "COCOON$", 12 - pokedex_entry 7, 115, gCascoonPokedexText, 391, 20, 256, 0 - .string "POISON MOTH$", 12 - pokedex_entry 12, 316, gDustoxPokedexText, 269, 1, 256, 0 - .string "WATER WEED$", 12 - pokedex_entry 5, 26, gLotadPokedexText, 406, 19, 256, 0 - .string "JOLLY$", 12 - pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0 - .string "CAREFREE$", 12 - pokedex_entry 15, 550, gLudicoloPokedexText, 256, 0, 268, -1 - .string "ACORN$", 12 - pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0 - .string "WILY$", 12 - pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0 - .string "WICKED$", 12 - pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0 - .string "TINYSWALLOW$", 12 - pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0 - .string "SWALLOW$", 12 - pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0 - .string "SEAGULL$", 12 - pokedex_entry 6, 95, gWingullPokedexText, 295, -2, 256, 0 - .string "WATER BIRD$", 12 - pokedex_entry 12, 280, gPelipperPokedexText, 288, 1, 256, 0 - .string "FEELING$", 12 - pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0 - .string "EMOTION$", 12 - pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0 - .string "EMBRACE$", 12 - pokedex_entry 16, 484, gGardevoirPokedexText, 256, 0, 256, 0 - .string "POND SKATER$", 12 - pokedex_entry 5, 17, gSurskitPokedexText, 375, 17, 256, 0 - .string "EYEBALL$", 12 - pokedex_entry 8, 36, gMasquerainPokedexText, 378, 8, 256, 0 - .string "MUSHROOM$", 12 - pokedex_entry 4, 45, gShroomishPokedexText, 513, 22, 256, 0 - .string "MUSHROOM$", 12 - pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0 - .string "SLACKER$", 12 - pokedex_entry 8, 240, gSlakothPokedexText, 291, 16, 256, 0 - .string "WILD MONKEY$", 12 - pokedex_entry 14, 465, gVigorothPokedexText, 301, 2, 256, 0 - .string "LAZY$", 12 - pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1 - .string "TRAINEE$", 12 - pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0 - .string "NINJA$", 12 - pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0 - .string "SHED$", 12 - pokedex_entry 8, 12, gShedinjaPokedexText, 372, -8, 256, 0 - .string "WHISPER$", 12 - pokedex_entry 6, 163, gWhismurPokedexText, 373, 17, 256, 0 - .string "BIG VOICE$", 12 - pokedex_entry 10, 405, gLoudredPokedexText, 356, 10, 256, 0 - .string "LOUD NOISE$", 12 - pokedex_entry 15, 840, gExploudPokedexText, 284, 1, 256, 0 - .string "GUTS$", 12 - pokedex_entry 10, 864, gMakuhitaPokedexText, 256, 10, 256, 0 - .string "ARM THRUST$", 12 - pokedex_entry 23, 2538, gHariyamaPokedexText, 256, 0, 343, 7 - .string "POLKA DOT$", 12 - pokedex_entry 2, 20, gAzurillPokedexText, 603, 23, 256, 0 - .string "COMPASS$", 12 - pokedex_entry 10, 970, gNosepassPokedexText, 256, 9, 289, 3 - .string "KITTEN$", 12 - pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0 - .string "PRIM$", 12 - pokedex_entry 11, 326, gDelcattyPokedexText, 322, 10, 256, 0 - .string "DARKNESS$", 12 - pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0 - .string "DECEIVER$", 12 - pokedex_entry 6, 115, gMawilePokedexText, 466, 17, 256, 0 - .string "IRON ARMOR$", 12 - pokedex_entry 4, 600, gAronPokedexText, 419, 23, 256, 0 - .string "IRON ARMOR$", 12 - pokedex_entry 9, 1200, gLaironPokedexText, 275, 12, 256, 0 - .string "IRON ARMOR$", 12 - pokedex_entry 21, 3600, gAggronPokedexText, 256, -1, 350, 6 - .string "MEDITATE$", 12 - pokedex_entry 6, 112, gMedititePokedexText, 465, 17, 256, 0 - .string "MEDITATE$", 12 - pokedex_entry 13, 315, gMedichamPokedexText, 298, 5, 256, 0 - .string "LIGHTNING$", 12 - pokedex_entry 6, 152, gElectrikePokedexText, 290, 15, 256, 0 - .string "DISCHARGE$", 12 - pokedex_entry 15, 402, gManectricPokedexText, 256, 3, 257, 0 - .string "CHEERING$", 12 - pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0 - .string "CHEERING$", 12 - pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0 - .string "FIREFLY$", 12 - pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0 - .string "FIREFLY$", 12 - pokedex_entry 6, 177, gIllumisePokedexText, 572, 19, 256, 0 - .string "THORN$", 12 - pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0 - .string "STOMACH$", 12 - pokedex_entry 4, 103, gGulpinPokedexText, 593, 23, 256, 0 - .string "POISON BAG$", 12 - pokedex_entry 17, 800, gSwalotPokedexText, 256, 6, 345, 3 - .string "SAVAGE$", 12 - pokedex_entry 8, 208, gCarvanhaPokedexText, 362, 0, 256, 0 - .string "BRUTAL$", 12 - pokedex_entry 18, 888, gSharpedoPokedexText, 256, 0, 317, 3 - .string "BALL WHALE$", 12 - pokedex_entry 20, 1300, gWailmerPokedexText, 256, 2, 493, 0 - .string "FLOAT WHALE$", 12 - pokedex_entry 145, 3980, gWailordPokedexText, 256, 0, 1352, 18 - .string "NUMB$", 12 - pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0 - .string "ERUPTION$", 12 - pokedex_entry 19, 2200, gCameruptPokedexText, 256, 7, 345, 6 - .string "COAL$", 12 - pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0 - .string "BOUNCE$", 12 - pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0 - .string "MANIPULATE$", 12 - pokedex_entry 9, 715, gGrumpigPokedexText, 358, 10, 256, 0 - .string "SPOT PANDA$", 12 - pokedex_entry 11, 50, gSpindaPokedexText, 321, 4, 256, 0 - .string "ANT PIT$", 12 - pokedex_entry 7, 150, gTrapinchPokedexText, 298, 17, 256, 0 - .string "VIBRATION$", 12 - pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0 - .string "MYSTIC$", 12 - pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1 - .string "CACTUS$", 12 - pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0 - .string "SCARECROW$", 12 - pokedex_entry 13, 774, gCacturnePokedexText, 327, 5, 256, 0 - .string "COTTON BIRD$", 12 - pokedex_entry 4, 12, gSwabluPokedexText, 422, -8, 256, 0 - .string "HUMMING$", 12 - pokedex_entry 11, 206, gAltariaPokedexText, 327, 0, 256, 0 - .string "CAT FERRET$", 12 - pokedex_entry 13, 403, gZangoosePokedexText, 256, 3, 256, 0 - .string "FANG SNAKE$", 12 - pokedex_entry 27, 525, gSeviperPokedexText, 275, 7, 256, 0 - .string "METEORITE$", 12 - pokedex_entry 10, 1680, gLunatonePokedexText, 300, 3, 256, 0 - .string "METEORITE$", 12 - pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0 - .string "WHISKERS$", 12 - pokedex_entry 4, 19, gBarboachPokedexText, 581, -3, 256, 0 - .string "WHISKERS$", 12 - pokedex_entry 9, 236, gWhiscashPokedexText, 317, 1, 256, 0 - .string "RUFFIAN$", 12 - pokedex_entry 6, 115, gCorphishPokedexText, 484, 19, 256, 0 - .string "ROGUE$", 12 - pokedex_entry 11, 328, gCrawdauntPokedexText, 365, 9, 256, 0 - .string "CLAY DOLL$", 12 - pokedex_entry 5, 215, gBaltoyPokedexText, 457, 21, 256, 0 - .string "CLAY DOLL$", 12 - pokedex_entry 15, 1080, gClaydolPokedexText, 256, 3, 280, 1 - .string "SEA LILY$", 12 - pokedex_entry 10, 238, gLileepPokedexText, 305, 8, 256, 0 - .string "BARNACLE$", 12 - pokedex_entry 15, 604, gCradilyPokedexText, 267, 0, 256, 0 - .string "OLD SHRIMP$", 12 - pokedex_entry 7, 125, gAnorithPokedexText, 296, 4, 256, 0 - .string "PLATE$", 12 - pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0 - .string "FISH$", 12 - pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0 - .string "TENDER$", 12 - pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7 - .string "WEATHER$", 12 - pokedex_entry 3, 8, gCastformPokedexText, 435, -5, 256, 0 - .string "COLOR SWAP$", 12 - pokedex_entry 10, 220, gKecleonPokedexText, 316, 10, 256, 0 - .string "PUPPET$", 12 - pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0 - .string "MARIONETTE$", 12 - pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0 - .string "REQUIEM$", 12 - pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0 - .string "BECKON$", 12 - pokedex_entry 16, 306, gDusclopsPokedexText, 256, 3, 299, 1 - .string "FRUIT$", 12 - pokedex_entry 20, 1000, gTropiusPokedexText, 256, 0, 344, 7 - .string "WIND CHIME$", 12 - pokedex_entry 6, 10, gChimechoPokedexText, 505, 0, 256, 0 - .string "DISASTER$", 12 - pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0 - .string "BRIGHT$", 12 - pokedex_entry 6, 140, gWynautPokedexText, 484, 19, 256, 0 - .string "SNOW HAT$", 12 - pokedex_entry 7, 168, gSnoruntPokedexText, 380, 15, 256, 0 - .string "FACE$", 12 - pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0 - .string "CLAP$", 12 - pokedex_entry 8, 395, gSphealPokedexText, 315, 16, 256, 0 - .string "BALL ROLL$", 12 - pokedex_entry 11, 876, gSealeoPokedexText, 338, 13, 256, 0 - .string "ICE BREAK$", 12 - pokedex_entry 14, 1506, gWalreinPokedexText, 316, 4, 256, 0 - .string "BIVALVE$", 12 - pokedex_entry 4, 525, gClamperlPokedexText, 691, 22, 256, 0 - .string "DEEP SEA$", 12 - pokedex_entry 17, 270, gHuntailPokedexText, 307, 1, 256, 0 - .string "SOUTH SEA$", 12 - pokedex_entry 18, 226, gGorebyssPokedexText, 278, 5, 256, 0 - .string "LONGEVITY$", 12 - pokedex_entry 10, 234, gRelicanthPokedexText, 316, 7, 256, 0 - .string "RENDEZVOUS$", 12 - pokedex_entry 6, 87, gLuvdiscPokedexText, 371, 2, 256, 0 - .string "ROCK HEAD$", 12 - pokedex_entry 6, 421, gBagonPokedexText, 448, 18, 256, 0 - .string "ENDURANCE$", 12 - pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0 - .string "DRAGON$", 12 - pokedex_entry 15, 1026, gSalamencePokedexText, 256, 0, 256, 0 - .string "IRON BALL$", 12 - pokedex_entry 6, 952, gBeldumPokedexText, 414, -1, 256, 0 - .string "IRON CLAW$", 12 - pokedex_entry 12, 2025, gMetangPokedexText, 256, 6, 256, 0 - .string "IRON LEG$", 12 - pokedex_entry 16, 5500, gMetagrossPokedexText, 256, 4, 447, 9 - .string "ROCK PEAK$", 12 - pokedex_entry 17, 2300, gRegirockPokedexText, 256, 2, 309, 1 - .string "ICEBERG$", 12 - pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2 - .string "IRON$", 12 - pokedex_entry 19, 2050, gRegisteelPokedexText, 256, 0, 359, 6 - .string "EON$", 12 - pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0 - .string "EON$", 12 - pokedex_entry 20, 600, gLatiosPokedexText, 256, 0, 294, 3 - .string "SEA BASIN$", 12 - pokedex_entry 45, 3520, gKyogrePokedexText, 256, 0, 614, 13 - .string "CONTINENT$", 12 - pokedex_entry 35, 9500, gGroudonPokedexText, 256, 0, 515, 14 - .string "SKY HIGH$", 12 - pokedex_entry 70, 2065, gRayquazaPokedexText, 256, 0, 448, 12 - .string "WISH$", 12 - pokedex_entry 3, 11, gJirachiPokedexText, 608, -8, 256, 0 - .string "DNA$", 12 - pokedex_entry 17, 608, gDeoxysPokedexText, 256, 0, 290, 2 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/script_pokemon_util_80F87D8.s b/data/script_pokemon_util_80F87D8.s deleted file mode 100644 index dcf9edeea..000000000 --- a/data/script_pokemon_util_80F87D8.s +++ /dev/null @@ -1,7 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 -gUnknown_0858D8EC:: @ 858D8EC - .byte 3, 4, 5, 14 diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index a644008d0..bbb7662ba 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: end Script_Apprentice_SetLeavingFlags: - setflag FLAG_0x2BD + setflag FLAG_HIDE_APPRENTICE setflag FLAG_0x934 return diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 1fda1133f..21ab4256c 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -31,7 +31,7 @@ Route102_EventScript_274359:: @ 8274359 end Route102_EventScript_274374:: @ 8274374 - msgbox Route102_Text_274507, 5 + msgbox Route102_Text_274507, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route102_EventScript_274393 compare VAR_RESULT, 0 @@ -106,7 +106,7 @@ Route102_EventScript_274421:: @ 8274421 lock faceplayer special EventObjectInteractionGetBerryCountString - msgbox Route102_Text_2745EE, 5 + msgbox Route102_Text_2745EE, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route102_EventScript_274448 compare VAR_RESULT, 0 @@ -155,7 +155,7 @@ Route102_EventScript_27448D:: @ 827448D compare VAR_RESULT, 0 goto_eq Route102_EventScript_2744BE special EventObjectInteractionGetBerryName - msgbox Route102_Text_2746E4, 5 + msgbox Route102_Text_2746E4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route102_EventScript_2744C4 compare VAR_RESULT, 0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index ce3dea170..c92c14763 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -29,11 +29,11 @@ OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5 end OldaleTown_PokemonCenter_2F_EventScript_276AFB:: @ 8276AFB - clearflag FLAG_0x2BE + clearflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN return OldaleTown_PokemonCenter_2F_EventScript_276AFF:: @ 8276AFF - setflag FLAG_0x2BE + setflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN return BattleFrontier_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 @@ -63,7 +63,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19 execram OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A - msgbox gUnknown_08273178, 2 + msgbox gUnknown_08273178, MSGBOX_NPC end OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 @@ -72,16 +72,16 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 checkflag FLAG_SYS_HAS_EON_TICKET goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 - msgbox gUnknown_08273594, 4 + msgbox gUnknown_08273594, MSGBOX_DEFAULT giveitem_std ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET setvar VAR_0x403F, 0 - msgbox gUnknown_082735F2, 4 + msgbox gUnknown_082735F2, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62 - msgbox gUnknown_08273178, 4 + msgbox gUnknown_08273178, MSGBOX_DEFAULT release end @@ -331,12 +331,12 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 lockall applymovement 255, OldaleTown_PokemonCenter_2F_Movement_2725A6 waitmovement 0 - msgbox OldaleTown_PokemonCenter_2F_Text_27964A, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_276E10 waitmovement 0 delay 30 - msgbox OldaleTown_PokemonCenter_2F_Text_279718, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT setvar VAR_0x40CD, 2 releaseall end @@ -354,7 +354,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13 end OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22 - msgbox OldaleTown_PokemonCenter_2F_Text_277EF1, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_277EF1, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_276E30 end @@ -399,7 +399,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276EC2:: @ 8276EC2 end OldaleTown_PokemonCenter_2F_EventScript_276F15:: @ 8276F15 - msgbox OldaleTown_PokemonCenter_2F_Text_279142, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 end @@ -417,7 +417,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E end OldaleTown_PokemonCenter_2F_EventScript_276F47:: @ 8276F47 - msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 end @@ -502,25 +502,25 @@ OldaleTown_PokemonCenter_2F_EventScript_277046:: @ 8277046 OldaleTown_PokemonCenter_2F_EventScript_277072:: @ 8277072 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_27833D, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27833D, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 end OldaleTown_PokemonCenter_2F_EventScript_277083:: @ 8277083 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278307, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278307, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 end OldaleTown_PokemonCenter_2F_EventScript_277094:: @ 8277094 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 end OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278372, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278372, MSGBOX_DEFAULT release end @@ -593,12 +593,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199 return OldaleTown_PokemonCenter_2F_EventScript_2771BF:: @ 82771BF - msgbox OldaleTown_PokemonCenter_2F_Text_278027, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278027, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD - msgbox OldaleTown_PokemonCenter_2F_Text_278061, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278061, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return @@ -659,45 +659,45 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C OldaleTown_PokemonCenter_2F_EventScript_2772AB:: @ 82772AB special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278565, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278565, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_2772B8:: @ 82772B8 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_2772C5:: @ 82772C5 OldaleTown_PokemonCenter_2F_EventScript_2772C5:: @ 82772C5 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_27821C, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27821C, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_2772D2:: @ 82772D2 OldaleTown_PokemonCenter_2F_EventScript_2772D2:: @ 82772D2 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_2772DF:: @ 82772DF special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278255, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278255, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_2772EC:: @ 82772EC special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278291, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278291, MSGBOX_DEFAULT release end MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9 special CloseLink - msgbox MossdeepCity_GameCorner_1F_Text_278D51, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278D51, MSGBOX_DEFAULT release end @@ -709,29 +709,29 @@ OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306 OldaleTown_PokemonCenter_2F_EventScript_27730E:: @ 827730E special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_27731B:: @ 827731B special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278651, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278651, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_277335:: @ 8277335 - msgbox gUnknown_0827306F, 4 + msgbox gUnknown_0827306F, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F - msgbox gUnknown_082730BC, 4 + msgbox gUnknown_082730BC, MSGBOX_DEFAULT releaseall end @@ -917,34 +917,34 @@ RecordCorner_EventScript_277471:: @ 8277471 end EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E - msgbox Text_278452, 4 + msgbox Text_278452, MSGBOX_DEFAULT fadescreen 1 special sp02A_crash_sound waitstate end EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D - msgbox Text_27847B, 4 + msgbox Text_27847B, MSGBOX_DEFAULT fadescreen 1 special sp02A_crash_sound waitstate end EventScript_TradeRoom_TooBusyToNotice:: @ 827749C - msgbox Text_27842E, 4 + msgbox Text_27842E, MSGBOX_DEFAULT closemessage end SingleBattleColosseum_EventScript_2774A6:: @ 82774A6 special sub_8098574 - msgbox SingleBattleColosseum_Text_2784B4, 4 + msgbox SingleBattleColosseum_Text_2784B4, MSGBOX_DEFAULT special sub_809859C closemessage end TradeCenter_EventScript_2774B6:: @ 82774B6 special sub_8098574 - msgbox TradeCenter_Text_2784E2, 4 + msgbox TradeCenter_Text_2784E2, MSGBOX_DEFAULT special sub_809859C closemessage end @@ -970,7 +970,7 @@ RecordCorner_EventScript_2774E0:: @ 82774E0 end gUnknown_082774EF:: @ 82774EF - msgbox Text_2783A8, 5 + msgbox Text_2783A8, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq gUnknown_08277509 erasebox 0, 0, 29, 19 @@ -1029,7 +1029,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - msgbox OldaleTown_PokemonCenter_2F_Text_27961C, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT closemessage special HealPlayerParty setvar VAR_0x8004, 6 @@ -1068,17 +1068,17 @@ OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 return OldaleTown_PokemonCenter_2F_EventScript_27764C:: @ 827764C - msgbox OldaleTown_PokemonCenter_2F_Text_27893E, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27893E, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_273755 end OldaleTown_PokemonCenter_2F_EventScript_27765A:: @ 827765A - msgbox OldaleTown_PokemonCenter_2F_Text_27897B, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27897B, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_273755 end OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 - msgbox OldaleTown_PokemonCenter_2F_Text_2789B5, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2789B5, MSGBOX_DEFAULT release return @@ -1087,15 +1087,15 @@ OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 faceplayer checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 - msgbox OldaleTown_PokemonCenter_2F_Text_279937, 5 + msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27769A - msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, MSGBOX_DEFAULT release return OldaleTown_PokemonCenter_2F_EventScript_27769A:: @ 827769A - msgbox OldaleTown_PokemonCenter_2F_Text_279C91, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_279C91, MSGBOX_DEFAULT release return @@ -1165,7 +1165,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB end OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D - msgbox OldaleTown_PokemonCenter_2F_Text_27909D, 5 + msgbox OldaleTown_PokemonCenter_2F_Text_27909D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_277199 @@ -1202,7 +1202,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 end OldaleTown_PokemonCenter_2F_EventScript_2778B2:: @ 82778B2 - msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_27783B end @@ -1212,12 +1212,12 @@ OldaleTown_PokemonCenter_2F_EventScript_2778C0:: @ 82778C0 end OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB - msgbox OldaleTown_PokemonCenter_2F_Text_279142, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_27783B end OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 - msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, 5 + msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC setvar VAR_0x8004, 12 @@ -1225,7 +1225,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 end OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 - msgbox OldaleTown_PokemonCenter_2F_Text_279114, 5 + msgbox OldaleTown_PokemonCenter_2F_Text_279114, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC special HasAtLeastOneBerry @@ -1236,7 +1236,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 end OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 - msgbox OldaleTown_PokemonCenter_2F_Text_2788FC, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2788FC, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_2776E3 end @@ -1402,12 +1402,12 @@ EventScript_WirelessBoxResults:: @ 8277B8A fadescreen 1 special sub_801A42C waitstate - msgbox OldaleTown_PokemonCenter_2F_Text_27874F, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27874F, MSGBOX_DEFAULT releaseall end EventScript_277BB4:: @ 8277BB4 - msgbox OldaleTown_PokemonCenter_2F_Text_27871F, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27871F, MSGBOX_DEFAULT releaseall end @@ -1476,17 +1476,17 @@ MossdeepCity_GameCorner_1F_EventScript_277C34:: @ 8277C34 end MossdeepCity_GameCorner_1F_EventScript_277C73:: @ 8277C73 - msgbox MossdeepCity_GameCorner_1F_Text_278ACB, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278ACB, MSGBOX_DEFAULT release end MossdeepCity_GameCorner_1F_EventScript_277C7D:: @ 8277C7D - msgbox MossdeepCity_GameCorner_1F_Text_278BF1, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278BF1, MSGBOX_DEFAULT release end MossdeepCity_GameCorner_1F_EventScript_277C87:: @ 8277C87 - msgbox MossdeepCity_GameCorner_1F_Text_278CAC, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278CAC, MSGBOX_DEFAULT release end @@ -1514,7 +1514,7 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 special sub_802C920 compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 0 special sub_81B8958 @@ -1533,7 +1533,7 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 special sub_8027A5C compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 1 special sub_81B8958 @@ -1602,12 +1602,12 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48 delay 60 - msgbox MossdeepCity_GameCorner_1F_Text_278D68, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278D68, MSGBOX_DEFAULT release end MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278E60, 5 + msgbox MossdeepCity_GameCorner_1F_Text_278E60, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 compare VAR_0x8005, 0 @@ -1618,11 +1618,11 @@ MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 end MossdeepCity_GameCorner_1F_EventScript_277E84:: @ 8277E84 - msgbox MossdeepCity_GameCorner_1F_Text_278EDC, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278EDC, MSGBOX_DEFAULT return MossdeepCity_GameCorner_1F_EventScript_277E8D:: @ 8277E8D - msgbox MossdeepCity_GameCorner_1F_Text_278FA4, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278FA4, MSGBOX_DEFAULT return MossdeepCity_GameCorner_1F_EventScript_277E96:: @ 8277E96 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index d89c78f18..d522469c6 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -11,18 +11,18 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 end LilycoveCity_ContestLobby_EventScript_279CEA:: @ 8279CEA - msgbox LilycoveCity_ContestLobby_Text_27AEA8, 4 + msgbox LilycoveCity_ContestLobby_Text_27AEA8, MSGBOX_DEFAULT return LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3 - msgbox LilycoveCity_ContestLobby_Text_27ADA7, 4 + msgbox LilycoveCity_ContestLobby_Text_27ADA7, MSGBOX_DEFAULT giveitem_std ITEM_POKEBLOCK_CASE setflag FLAG_0x05F - msgbox LilycoveCity_ContestLobby_Text_27AE47, 4 + msgbox LilycoveCity_ContestLobby_Text_27AE47, MSGBOX_DEFAULT return LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13 - msgbox LilycoveCity_ContestLobby_Text_27B67B, 4 + msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT switch VAR_0x408A case 4, LilycoveCity_ContestLobby_EventScript_279D2C end @@ -38,7 +38,7 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B call LilycoveCity_ContestLobby_EventScript_27205E - msgbox LilycoveCity_ContestLobby_Text_27B6E7, 4 + msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT release end @@ -66,27 +66,27 @@ LilycoveCity_ContestLobby_EventScript_279D97:: @ 8279D97 end LilycoveCity_ContestLobby_EventScript_279DDF:: @ 8279DDF - msgbox LilycoveCity_ContestLobby_Text_27AF7A, 4 + msgbox LilycoveCity_ContestLobby_Text_27AF7A, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279D97 end LilycoveCity_ContestLobby_EventScript_279DED:: @ 8279DED - msgbox LilycoveCity_ContestLobby_Text_27B17D, 4 + msgbox LilycoveCity_ContestLobby_Text_27B17D, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279D97 end LilycoveCity_ContestLobby_EventScript_279DFB:: @ 8279DFB - msgbox LilycoveCity_ContestLobby_Text_27B221, 4 + msgbox LilycoveCity_ContestLobby_Text_27B221, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279D97 end LilycoveCity_ContestLobby_EventScript_279E09:: @ 8279E09 - msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4 + msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13 - msgbox LilycoveCity_ContestLobby_Text_27B44A, 4 + msgbox LilycoveCity_ContestLobby_Text_27B44A, MSGBOX_DEFAULT choosecontestmon compare VAR_0x8004, 255 goto_eq LilycoveCity_ContestLobby_EventScript_279E09 @@ -148,39 +148,39 @@ LilycoveCity_ContestLobby_EventScript_279EE1:: @ 8279EE1 end LilycoveCity_ContestLobby_EventScript_279F12:: @ 8279F12 - msgbox LilycoveCity_ContestLobby_Text_27B471, 4 + msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279E13 release end LilycoveCity_ContestLobby_EventScript_279F21:: @ 8279F21 - msgbox LilycoveCity_ContestLobby_Text_27B5C4, 5 + msgbox LilycoveCity_ContestLobby_Text_27B5C4, MSGBOX_YESNO switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_279E13 case 1, LilycoveCity_ContestLobby_EventScript_279F87 end LilycoveCity_ContestLobby_EventScript_279F45:: @ 8279F45 - msgbox LilycoveCity_ContestLobby_Text_27B547, 5 + msgbox LilycoveCity_ContestLobby_Text_27B547, MSGBOX_YESNO switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_279E13 case 1, LilycoveCity_ContestLobby_EventScript_279F87 end LilycoveCity_ContestLobby_EventScript_279F69:: @ 8279F69 - msgbox LilycoveCity_ContestLobby_Text_27B4C4, 4 + msgbox LilycoveCity_ContestLobby_Text_27B4C4, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279E13 release end LilycoveCity_ContestLobby_EventScript_279F78:: @ 8279F78 - msgbox LilycoveCity_ContestLobby_Text_27B501, 4 + msgbox LilycoveCity_ContestLobby_Text_27B501, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279E13 release end LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87 - msgbox LilycoveCity_ContestLobby_Text_27B5E2, 4 + msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT closemessage releaseall setvar VAR_0x4086, 1 @@ -276,7 +276,7 @@ LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A0C7 lockall - msgbox LinkContestRoom1_Text_27B711, 4 + msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT releaseall return @@ -388,7 +388,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2 releaseall addvar VAR_0x8006, 65535 playse SE_BOWA2 - special sub_80F8D28 + special ShowContestEntryMonPic call LinkContestRoom1_EventScript_27A217 return @@ -423,7 +423,7 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230 LinkContestRoom1_EventScript_27A26C:: @ 827A26C compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A280 - msgbox LinkContestRoom1_Text_27B830, 4 + msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A280:: @ 827A280 @@ -517,7 +517,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5 setvar VAR_RESULT, 8 - special sub_80F8FE8 + special ScriptRandom compare VAR_RESULT, 0 call_if 1, LinkContestRoom1_EventScript_27A65A compare VAR_RESULT, 1 @@ -847,7 +847,7 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801 LinkContestRoom1_EventScript_27A853:: @ 827A853 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A867 - msgbox LinkContestRoom1_Text_27B904, 4 + msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A867:: @ 827A867 @@ -897,7 +897,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A90F - msgbox LinkContestRoom1_Text_27BA15, 4 + msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A90F:: @ 827A90F @@ -910,7 +910,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F LinkContestRoom1_EventScript_27A91E:: @ 827A91E compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A932 - msgbox LinkContestRoom1_Text_27BA30, 4 + msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A932:: @ 827A932 @@ -923,7 +923,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932 LinkContestRoom1_EventScript_27A941:: @ 827A941 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A955 - msgbox LinkContestRoom1_Text_27BAAC, 4 + msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A955:: @ 827A955 @@ -936,7 +936,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955 LinkContestRoom1_EventScript_27A964:: @ 827A964 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A978 - msgbox LinkContestRoom1_Text_27BB25, 4 + msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A978:: @ 827A978 @@ -987,7 +987,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 LinkContestRoom1_EventScript_27AA00:: @ 827AA00 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27AA14 - msgbox LinkContestRoom1_Text_27BB4C, 4 + msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27AA14:: @ 827AA14 @@ -1086,10 +1086,10 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27ABD8 call LinkContestRoom1_EventScript_27AB9E - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_eq LinkContestRoom1_EventScript_27AB82 lockall - msgbox LinkContestRoom1_Text_27BBA8, 4 + msgbox LinkContestRoom1_Text_27BBA8, MSGBOX_DEFAULT releaseall call LinkContestRoom1_EventScript_27ABF8 call LinkContestRoom1_EventScript_27AC5E @@ -1104,7 +1104,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36 LinkContestRoom1_EventScript_27AB82:: @ 827AB82 lockall - msgbox LinkContestRoom1_Text_27BB7A, 4 + msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall delay 90 special sub_80F88E8 @@ -1127,7 +1127,7 @@ LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE compare VAR_CONTEST_RANK, 3 goto_eq LinkContestRoom1_EventScript_27ABCD - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return LinkContestRoom1_EventScript_27ABCD:: @ 827ABCD @@ -1199,7 +1199,7 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E compare VAR_0x8005, 3 goto_eq LinkContestRoom1_EventScript_27AC77 lockall - msgbox LinkContestRoom1_Text_27BB7A, 4 + msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall return @@ -1212,14 +1212,14 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77 compare VAR_CONTEST_RANK, 3 goto_eq LinkContestRoom1_EventScript_27ACBD lockall - msgbox LinkContestRoom1_Text_27BB7A, 4 + msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall return LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 lockall call LinkContestRoom1_EventScript_27205E - msgbox LinkContestRoom1_Text_27BC2F, 4 + msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT releaseall setvar VAR_0x408A, 4 return @@ -1229,7 +1229,7 @@ LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD compare VAR_RESULT, 0 goto_eq LinkContestRoom1_EventScript_27ACA8 lockall - msgbox LinkContestRoom1_Text_27BB7A, 4 + msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall return @@ -1238,12 +1238,12 @@ LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF incrementgamestat 42 setflag FLAG_SYS_RIBBON_GET lockall - msgbox LinkContestRoom1_Text_27BBD4, 4 + msgbox LinkContestRoom1_Text_27BBD4, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LinkContestRoom1_Text_27BC00, 4 + msgbox LinkContestRoom1_Text_27BC00, MSGBOX_DEFAULT waitfanfare special sub_80F8390 - msgbox LinkContestRoom1_Text_27BC16, 4 + msgbox LinkContestRoom1_Text_27BC16, MSGBOX_DEFAULT releaseall return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 7b306a261..3a2194132 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -9,18 +9,18 @@ Route117_EventScript_291C18:: @ 8291C18 goto_eq Route117_EventScript_291CD1 compare VAR_RESULT, 3 goto_eq Route117_EventScript_291CE8 - msgbox Route117_Text_291FCF, 4 + msgbox Route117_Text_291FCF, MSGBOX_DEFAULT release end Route117_EventScript_291C4D:: @ 8291C4D - msgbox Route117_Text_29205D, 5 + msgbox Route117_Text_29205D, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_EventScript_291C83 - msgbox Route117_Text_2922C6, 5 + msgbox Route117_Text_2922C6, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_EventScript_291C83 - msgbox Route117_Text_292149, 4 + msgbox Route117_Text_292149, MSGBOX_DEFAULT clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare release @@ -30,7 +30,7 @@ Route117_EventScript_291C83:: @ 8291C83 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 goto_if 5, Route117_EventScript_291C9D - msgbox Route117_Text_29216A, 4 + msgbox Route117_Text_29216A, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ Route117_EventScript_291C9D:: @ 8291C9D playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - msgbox Route117_Text_2921CF, 4 + msgbox Route117_Text_2921CF, MSGBOX_DEFAULT special GiveEggFromDaycare clearflag FLAG_PENDING_DAYCARE_EGG release @@ -52,12 +52,12 @@ Route117_EventScript_291CB7:: @ 8291CB7 return Route117_EventScript_291CC8:: @ 8291CC8 - msgbox Route117_Text_2921E5, 4 + msgbox Route117_Text_2921E5, MSGBOX_DEFAULT return Route117_EventScript_291CD1:: @ 8291CD1 special GetDaycareMonNicknames - msgbox Route117_Text_292114, 4 + msgbox Route117_Text_292114, MSGBOX_DEFAULT setvar VAR_0x8004, 0 call Route117_EventScript_291CB7 release @@ -65,7 +65,7 @@ Route117_EventScript_291CD1:: @ 8291CD1 Route117_EventScript_291CE8:: @ 8291CE8 special GetDaycareMonNicknames - msgbox Route117_Text_292299, 4 + msgbox Route117_Text_292299, MSGBOX_DEFAULT special SetDaycareCompatibilityString special ShowFieldMessageStringVar4 waitmessage @@ -87,10 +87,10 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 goto_eq Route117_PokemonDayCare_EventScript_291E2F compare VAR_RESULT, 3 goto_eq Route117_PokemonDayCare_EventScript_291F5C - msgbox Route117_PokemonDayCare_Text_2922F4, 5 + msgbox Route117_PokemonDayCare_Text_2922F4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 - msgbox Route117_PokemonDayCare_Text_292416, 4 + msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT release end @@ -101,7 +101,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 specialvar VAR_RESULT, sub_80722E0 compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291E01 - msgbox Route117_PokemonDayCare_Text_292349, 4 + msgbox Route117_PokemonDayCare_Text_292349, MSGBOX_DEFAULT fadescreen 1 special ChooseSendDaycareMon waitstate @@ -113,7 +113,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 - msgbox Route117_PokemonDayCare_Text_292370, 4 + msgbox Route117_PokemonDayCare_Text_292370, MSGBOX_DEFAULT waitmoncry special StoreSelectedPokemonInDaycare incrementgamestat 47 @@ -124,39 +124,39 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 end Route117_PokemonDayCare_EventScript_291DCA:: @ 8291DCA - msgbox Route117_PokemonDayCare_Text_292476, 4 + msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_291DD4:: @ 8291DD4 - msgbox Route117_PokemonDayCare_Text_2923AF, 5 + msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291DED:: @ 8291DED - msgbox Route117_PokemonDayCare_Text_2925BB, 4 + msgbox Route117_PokemonDayCare_Text_2925BB, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_291DF7:: @ 8291DF7 - msgbox Route117_PokemonDayCare_Text_292617, 4 + msgbox Route117_PokemonDayCare_Text_292617, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_291E01:: @ 8291E01 - msgbox Route117_PokemonDayCare_Text_29266D, 4 + msgbox Route117_PokemonDayCare_Text_29266D, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_291E0B:: @ 8291E0B - msgbox Route117_PokemonDayCare_Text_2923F6, 4 + msgbox Route117_PokemonDayCare_Text_2923F6, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15 - msgbox Route117_PokemonDayCare_Text_2924CC, 4 + msgbox Route117_PokemonDayCare_Text_2924CC, MSGBOX_DEFAULT return Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E @@ -166,13 +166,13 @@ Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E return Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F - msgbox Route117_PokemonDayCare_Text_292488, 4 + msgbox Route117_PokemonDayCare_Text_292488, MSGBOX_DEFAULT setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_291E1E - msgbox Route117_PokemonDayCare_Text_2923AF, 5 + msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 - msgbox Route117_PokemonDayCare_Text_2925F6, 5 + msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA @@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC special GetDaycareCost - msgbox Route117_PokemonDayCare_Text_292549, 5 + msgbox Route117_PokemonDayCare_Text_292549, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291EC8 goto Route117_PokemonDayCare_EventScript_291DCA @@ -206,7 +206,7 @@ Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291EE2 - msgbox Route117_PokemonDayCare_Text_292432, 4 + msgbox Route117_PokemonDayCare_Text_292432, MSGBOX_DEFAULT release end @@ -216,10 +216,10 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 playse SE_REGI - msgbox Route117_PokemonDayCare_Text_292575, 4 + msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT waitse playmoncry VAR_RESULT, 0 - msgbox Route117_PokemonDayCare_Text_292593, 4 + msgbox Route117_PokemonDayCare_Text_292593, MSGBOX_DEFAULT waitmoncry specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 @@ -228,14 +228,14 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 end Route117_PokemonDayCare_EventScript_291F24:: @ 8291F24 - msgbox Route117_PokemonDayCare_Text_29244F, 5 + msgbox Route117_PokemonDayCare_Text_29244F, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291F3D:: @ 8291F3D - msgbox Route117_PokemonDayCare_Text_2924EF, 4 + msgbox Route117_PokemonDayCare_Text_2924EF, MSGBOX_DEFAULT release end @@ -265,15 +265,15 @@ Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B end Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C - msgbox Route117_PokemonDayCare_Text_292488, 4 + msgbox Route117_PokemonDayCare_Text_292488, MSGBOX_DEFAULT setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_291E1E setvar VAR_0x8004, 1 call Route117_PokemonDayCare_EventScript_291E1E - msgbox Route117_PokemonDayCare_Text_2925F6, 5 + msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D - msgbox Route117_PokemonDayCare_Text_292476, 4 + msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT release end @@ -284,14 +284,14 @@ Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95 goto_eq Route117_PokemonDayCare_EventScript_291DCA copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare - msgbox Route117_PokemonDayCare_Text_292575, 4 - msgbox Route117_PokemonDayCare_Text_292476, 4 + msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT + msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT release end EventScript_EggHatch:: @ 8291FC0 lockall - msgbox Text_292668, 4 + msgbox Text_292668, MSGBOX_DEFAULT special EggHatch waitstate releaseall diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index aba6bec97..15bb7a7e6 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -18,10 +18,10 @@ Route123_EventScript_2906BB:: @ 82906BB setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_CUT - msgbox Route103_Text_29072E, 5 + msgbox Route103_Text_29072E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route103_EventScript_29072B - msgbox Route103_Text_290771, 4 + msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect 2 waitstate @@ -47,7 +47,7 @@ Route103_Movement_29071F: @ 829071F step_end Route103_EventScript_290721:: @ 8290721 - msgbox Route103_Text_29077D, 4 + msgbox Route103_Text_29077D, MSGBOX_DEFAULT releaseall end @@ -92,10 +92,10 @@ VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6 setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_ROCK_SMASH - msgbox Route111_Text_29083A, 5 + msgbox Route111_Text_29083A, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route111_EventScript_290837 - msgbox Route111_Text_290771, 4 + msgbox Route111_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect 37 waitstate @@ -132,7 +132,7 @@ Route111_Movement_29082B: @ 829082B step_end Route111_EventScript_29082D:: @ 829082D - msgbox Route111_Text_29087F, 4 + msgbox Route111_Text_29087F, MSGBOX_DEFAULT releaseall end @@ -168,7 +168,7 @@ VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA compare VAR_RESULT, 6 goto_eq FieryPath_EventScript_290915 setfieldeffectargument 0, VAR_RESULT - msgbox FieryPath_Text_29092C, 5 + msgbox FieryPath_Text_29092C, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FieryPath_EventScript_290929 closemessage @@ -186,17 +186,17 @@ FieryPath_EventScript_2908FD:: @ 82908FD FieryPath_EventScript_290908:: @ 8290908 setflag FLAG_SYS_USE_STRENGTH - msgbox FieryPath_Text_29098C, 4 + msgbox FieryPath_Text_29098C, MSGBOX_DEFAULT releaseall end FieryPath_EventScript_290915:: @ 8290915 - msgbox FieryPath_Text_2909D6, 4 + msgbox FieryPath_Text_2909D6, MSGBOX_DEFAULT releaseall end FieryPath_EventScript_29091F:: @ 829091F - msgbox FieryPath_Text_290A16, 4 + msgbox FieryPath_Text_290A16, MSGBOX_DEFAULT releaseall end @@ -230,10 +230,10 @@ EventScript_UseWaterfall:: @ 8290A49 goto_eq EventScript_290A84 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT - msgbox Text_290AC3, 5 + msgbox Text_290AC3, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_290A8C - msgbox Text_290AFC, 4 + msgbox Text_290AFC, MSGBOX_DEFAULT dofieldeffect 43 goto EventScript_290A8C @@ -241,7 +241,7 @@ EventScript_CannotUseWaterfall:: @ 8290A83 lockall EventScript_290A84:: @ 8290A84 - msgbox Text_290A8E, 4 + msgbox Text_290A8E, MSGBOX_DEFAULT EventScript_290A8C:: @ 8290A8C releaseall @@ -266,16 +266,16 @@ EventScript_UseDive:: @ 8290B0F bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 - msgbox Text_290BE8, 5 + msgbox Text_290BE8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_290B58 - msgbox Text_290C1A, 4 + msgbox Text_290C1A, MSGBOX_DEFAULT dofieldeffect 44 goto EventScript_290B58 end EventScript_290B4E:: @ 8290B4E - msgbox Text_290BAA, 4 + msgbox Text_290BAA, MSGBOX_DEFAULT releaseall end @@ -291,17 +291,17 @@ EventScript_UseDiveUnderwater:: @ 8290B5A bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 - msgbox Text_290C6E, 5 + msgbox Text_290C6E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_290BA8 - msgbox Text_290C1A, 4 + msgbox Text_290C1A, MSGBOX_DEFAULT dofieldeffect 44 goto EventScript_290BA8 end EventScript_290B99:: @ 8290B99 lockall - msgbox Text_290C28, 4 + msgbox Text_290C28, MSGBOX_DEFAULT goto EventScript_290BA8 end @@ -329,7 +329,7 @@ Text_290C6E: @ 8290C6E .string "Would you like to use DIVE?$" EventScript_290CAE:: @ 8290CAE - msgbox Text_290CB7, 3 + msgbox Text_290CB7, MSGBOX_SIGN end Text_290CB7: @ 8290CB7 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 5a03a0e98..f95cfa0ab 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -72,142 +72,142 @@ Route111_EventScript_28CD8B:: @ 828CD8B return Route111_EventScript_28CD96:: @ 828CD96 - setflag FLAG_0x31C + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 return Route111_EventScript_28CD9A:: @ 828CD9A - clearflag FLAG_0x31C + clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 return Route111_EventScript_28CD9E:: @ 828CD9E - setflag FLAG_0x31D + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 return Route111_EventScript_28CDA2:: @ 828CDA2 - clearflag FLAG_0x31D + clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 return Route111_EventScript_28CDA6:: @ 828CDA6 - setflag FLAG_0x31E + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 return Route111_EventScript_28CDAA:: @ 828CDAA - clearflag FLAG_0x31E + clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 return Route111_EventScript_28CDAE:: @ 828CDAE - setflag FLAG_0x31F + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 return Route111_EventScript_28CDB2:: @ 828CDB2 - clearflag FLAG_0x31F + clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 return Route111_EventScript_28CDB6:: @ 828CDB6 - setflag FLAG_0x385 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 return Route111_EventScript_28CDBA:: @ 828CDBA - clearflag FLAG_0x385 + clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 return Route111_EventScript_28CDBE:: @ 828CDBE - setflag FLAG_0x386 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 return Route111_EventScript_28CDC2:: @ 828CDC2 - clearflag FLAG_0x386 + clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 return Route111_EventScript_28CDC6:: @ 828CDC6 - setflag FLAG_0x387 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 return Route111_EventScript_28CDCA:: @ 828CDCA - clearflag FLAG_0x387 + clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 return Route111_EventScript_28CDCE:: @ 828CDCE - setflag FLAG_0x388 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 return Route111_EventScript_28CDD2:: @ 828CDD2 - clearflag FLAG_0x388 + clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 return Route111_EventScript_28CDD6:: @ 828CDD6 - trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56 - msgbox Route111_Text_28B5C0, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56 + msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end Route111_EventScript_28CDF6:: @ 828CDF6 - trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56 - msgbox Route111_Text_28B805, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56 + msgbox Route111_Text_28B805, MSGBOX_DEFAULT release end Route118_EventScript_28CE16:: @ 828CE16 - trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B5C0, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 + msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT release end Route118_EventScript_28CE36:: @ 828CE36 - trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B805, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 + msgbox Route118_Text_28B805, MSGBOX_DEFAULT release end Route120_EventScript_28CE56:: @ 828CE56 - trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3 - msgbox Route120_Text_28B5C0, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3 + msgbox Route120_Text_28B5C0, MSGBOX_DEFAULT release end Route120_EventScript_28CE76:: @ 828CE76 - trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3 - msgbox Route120_Text_28B805, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3 + msgbox Route120_Text_28B805, MSGBOX_DEFAULT release end Route111_EventScript_28CE96:: @ 828CE96 - trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B5C0, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 + msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end Route111_EventScript_28CEB6:: @ 828CEB6 - trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B805, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 + msgbox Route111_Text_28B805, MSGBOX_DEFAULT release end Route118_EventScript_28CED6:: @ 828CED6 - trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B5C0, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 + msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT release end Route118_EventScript_28CEF6:: @ 828CEF6 - trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B805, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 + msgbox Route118_Text_28B805, MSGBOX_DEFAULT release end Route111_EventScript_28CF16:: @ 828CF16 Route118_EventScript_28CF16:: @ 828CF16 Route120_EventScript_28CF16:: @ 828CF16 - trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B5C0, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 + msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end Route111_EventScript_28CF36:: @ 828CF36 Route118_EventScript_28CF36:: @ 828CF36 Route120_EventScript_28CF36:: @ 828CF36 - trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B805, 4 + trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 + msgbox Route111_Text_28B805, MSGBOX_DEFAULT release end @@ -220,9 +220,9 @@ Route111_EventScript_28CF56:: @ 828CF56 call_if 1, Route111_EventScript_28CF9F compare VAR_FACING, 4 call_if 1, Route111_EventScript_28CFB1 - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_eq Route111_EventScript_28D0EE - msgbox Route111_Text_28B042, 5 + msgbox Route111_Text_28B042, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end @@ -254,12 +254,12 @@ Route120_EventScript_28CFC3:: @ 828CFC3 call_if 1, Route111_EventScript_28CF9F compare VAR_FACING, 4 call_if 1, Route111_EventScript_28CFB1 - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_eq Route111_EventScript_28D0EE specialvar VAR_RESULT, GabbyAndTyGetLastQuote compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D053 - msgbox Route111_Text_28B137, 4 + msgbox Route111_Text_28B137, MSGBOX_DEFAULT specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia switch VAR_RESULT case 0, Route111_EventScript_28D061 @@ -282,58 +282,58 @@ Route111_Movement_28D051: @ 828D051 step_end Route111_EventScript_28D053:: @ 828D053 - msgbox Route111_Text_28B62D, 5 + msgbox Route111_Text_28B62D, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D061:: @ 828D061 - msgbox Route111_Text_28B3F3, 5 + msgbox Route111_Text_28B3F3, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D06F:: @ 828D06F - msgbox Route111_Text_28B1B3, 5 + msgbox Route111_Text_28B1B3, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D07D:: @ 828D07D - msgbox Route111_Text_28B23D, 5 + msgbox Route111_Text_28B23D, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D08B:: @ 828D08B - msgbox Route111_Text_28B2FA, 5 + msgbox Route111_Text_28B2FA, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D099:: @ 828D099 - msgbox Route111_Text_28B379, 5 + msgbox Route111_Text_28B379, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D0A7:: @ 828D0A7 compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D0E1 - msgbox Route111_Text_28B433, 4 + msgbox Route111_Text_28B433, MSGBOX_DEFAULT setvar VAR_0x8004, 10 call Route111_EventScript_271E7C lock faceplayer compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D0E1 - msgbox Route111_Text_28B4AB, 4 + msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT special GabbyAndTyAfterInterview - setflag FLAG_0x001 + setflag FLAG_TEMP_1 release end Route111_EventScript_28D0E1:: @ 828D0E1 - msgbox Route111_Text_28B577, 4 - setflag FLAG_0x001 + msgbox Route111_Text_28B577, MSGBOX_DEFAULT + setflag FLAG_TEMP_1 release end Route111_EventScript_28D0EE:: @ 828D0EE - msgbox Route111_Text_28B5C0, 4 + msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 46be101e1..52ae750b0 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -11,7 +11,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E066:: @ 828E066 MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 compare VAR_RESULT, 0 @@ -25,17 +25,17 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 special ScrSpecial_HasBardSongBeenChanged compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 - msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E0EA:: @ 828E0EA - msgbox MauvilleCity_PokemonCenter_1F_Text_2903C0, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_2903C0, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290421, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_290421, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 compare VAR_RESULT, 0 @@ -49,20 +49,20 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 faceplayer compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D - msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, MSGBOX_DEFAULT setvar VAR_0x8004, 1 special ScrSpecial_PlayBardSong delay 60 - msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 special ScrSpecial_SaveBardSongLyrics - msgbox MauvilleCity_PokemonCenter_1F_Text_290514, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_290514, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E15D:: @ 828E15D - msgbox MauvilleCity_PokemonCenter_1F_Text_29049B, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_29049B, MSGBOX_DEFAULT release end @@ -70,11 +70,11 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 lock faceplayer setflag FLAG_SYS_HIPSTER_MEET - msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, MSGBOX_DEFAULT special ScrSpecial_GetHipsterSpokenFlag compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C - msgbox MauvilleCity_PokemonCenter_1F_Text_290598, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_290598, MSGBOX_DEFAULT release end @@ -82,12 +82,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C special ScrSpecial_HipsterTeachWord compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290602, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_290602, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290666, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_290666, MSGBOX_DEFAULT special ScrSpecial_SetHipsterSpokenFlag release end @@ -154,7 +154,7 @@ MauvilleCity_PokemonCenter_1F_Text_28E45A: @ 828E45A MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 special ScrSpecial_GetTraderTradedFlag @@ -166,12 +166,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 end MauvilleCity_PokemonCenter_1F_EventScript_28E503:: @ 828E503 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E1E8, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E1E8, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D - msgbox MauvilleCity_PokemonCenter_1F_Text_28E20E, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E20E, MSGBOX_DEFAULT release end @@ -182,7 +182,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 compare VAR_0x8004, 65535 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E special ScrSpecial_DoesPlayerHaveNoDecorations @@ -192,7 +192,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 end MauvilleCity_PokemonCenter_1F_EventScript_28E558:: @ 828E558 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E27F, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E27F, MSGBOX_DEFAULT release end @@ -209,12 +209,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E56E:: @ 828E56E end MauvilleCity_PokemonCenter_1F_EventScript_28E57A:: @ 828E57A - msgbox MauvilleCity_PokemonCenter_1F_Text_28E2E3, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E2E3, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, MSGBOX_DEFAULT special ScrSpecial_TraderMenuGiveDecoration waitstate compare VAR_0x8006, 0 @@ -224,26 +224,26 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 special ScrSpecial_IsDecorationFull compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC - msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 special ScrSpecial_TraderDoDecorationTrade - msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E5D4:: @ 828E5D4 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E356, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E356, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E5DE:: @ 828E5DE - msgbox MauvilleCity_PokemonCenter_1F_Text_28E3EC, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E3EC, MSGBOX_DEFAULT goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 end MauvilleCity_PokemonCenter_1F_EventScript_28E5EC:: @ 828E5EC - msgbox MauvilleCity_PokemonCenter_1F_Text_28E380, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E380, MSGBOX_DEFAULT release end @@ -810,7 +810,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A setvar VAR_0x8009, 0 setvar VAR_0x800A, 0 setvar VAR_0x800B, 0 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot @@ -836,38 +836,38 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7 end MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD - msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, MSGBOX_DEFAULT specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2 MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA - msgbox MauvilleCity_PokemonCenter_1F_Text_28E6AE, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E6AE, MSGBOX_DEFAULT MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F - msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_29020F:: @ 829020F - msgbox MauvilleCity_PokemonCenter_1F_Text_28E726, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E726, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_290219:: @ 8290219 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E64D, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E64D, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_290223:: @ 8290223 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E8D9, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E8D9, MSGBOX_DEFAULT release end @@ -895,7 +895,7 @@ MauvilleCity_PokemonCenter_1F_Text_2902BD: @ 82902BD MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 compare VAR_RESULT, 0 @@ -919,7 +919,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331 end MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B - msgbox MauvilleCity_PokemonCenter_1F_Text_2902A7, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_2902A7, MSGBOX_DEFAULT goto MauvilleCity_PokemonCenter_1F_EventScript_290359 end @@ -935,12 +935,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 end MauvilleCity_PokemonCenter_1F_EventScript_29037A:: @ 829037A - msgbox MauvilleCity_PokemonCenter_1F_Text_290281, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_290281, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_290384:: @ 8290384 - msgbox MauvilleCity_PokemonCenter_1F_Text_2902BD, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_2902BD, MSGBOX_DEFAULT release end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 3fba532bf..cd2885ea5 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -3,12 +3,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539 faceplayer checkflag FLAG_SYS_CHAT_USED goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915F5 - msgbox PetalburgCity_PokemonCenter_1F_Text_291687, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291687, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_291552 end PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552 - msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, MSGBOX_DEFAULT multichoice 17, 6, 20, 0 switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_29159F @@ -18,12 +18,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552 end PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591 - msgbox PetalburgCity_PokemonCenter_1F_Text_291729, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_291552 end PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F - msgbox PetalburgCity_PokemonCenter_1F_Text_291969, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 0 call PetalburgCity_PokemonCenter_1F_EventScript_271E7C @@ -36,7 +36,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F end PetalburgCity_PokemonCenter_1F_EventScript_2915CB:: @ 82915CB - msgbox PetalburgCity_PokemonCenter_1F_Text_2919DC, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_2919DC, MSGBOX_DEFAULT release end @@ -45,22 +45,22 @@ PetalburgCity_PokemonCenter_1F_EventScript_2915D5:: @ 82915D5 special sub_811EECC waitmessage delay 80 - msgbox PetalburgCity_PokemonCenter_1F_Text_291B22, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291B22, MSGBOX_DEFAULT release end PetalburgCity_PokemonCenter_1F_EventScript_2915EB:: @ 82915EB - msgbox PetalburgCity_PokemonCenter_1F_Text_291991, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291991, MSGBOX_DEFAULT release end PetalburgCity_PokemonCenter_1F_EventScript_2915F5:: @ 82915F5 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A1B, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291A1B, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_291603 end PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, MSGBOX_DEFAULT multichoice 17, 6, 20, 0 switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_291650 @@ -70,12 +70,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603 end PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642 - msgbox PetalburgCity_PokemonCenter_1F_Text_291729, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_291603 end PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 0 call PetalburgCity_PokemonCenter_1F_EventScript_271E7C @@ -88,7 +88,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 end PetalburgCity_PokemonCenter_1F_EventScript_29167C:: @ 829167C - msgbox PetalburgCity_PokemonCenter_1F_Text_291ABA, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291ABA, MSGBOX_DEFAULT release end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 734831f7f..81ea87871 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -5,14 +5,14 @@ LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E waitmovement 0 compare VAR_0x8005, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_29274D compare VAR_0x8005, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292758 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT closemessage setvar VAR_0x4092, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292763 @@ -37,7 +37,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763 LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AF0 @@ -61,13 +61,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799 LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 checkflag FLAG_0x051 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_29283F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT call LittlerootTown_BrendansHouse_2F_EventScript_292849 delay 30 setvar VAR_0x4092, 6 setflag FLAG_0x051 - setflag FLAG_0x2F2 - setflag FLAG_0x2F3 + setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 + setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 checkplayergender compare VAR_RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2927DF @@ -85,7 +85,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292857 waitmovement 0 @@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292862 waitmovement 0 @@ -161,7 +161,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE0 waitmovement 0 playbgm MUS_INTER_V, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7 waitmovement 0 @@ -170,8 +170,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D call LittlerootTown_BrendansHouse_1F_EventScript_29296C applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, 4 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929BD @@ -186,7 +186,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AE8 waitmovement 0 playbgm MUS_INTER_V, 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA waitmovement 0 @@ -195,8 +195,8 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC call LittlerootTown_MaysHouse_1F_EventScript_29296C applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, 4 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT + msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929C1 @@ -211,7 +211,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B waitmovement 0 applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_27259A waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT closemessage return @@ -219,7 +219,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT fadedefaultbgm special TurnOffTVScreen setflag FLAG_SYS_TV_HOME @@ -326,23 +326,23 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 compare VAR_0x4092, 7 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 checkflag FLAG_0x0D8 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A43 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -358,22 +358,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43 LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 checkflag FLAG_0x085 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT setflag FLAG_0x085 release end LittlerootTown_BrendansHouse_1F_EventScript_292A86:: @ 8292A86 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, MSGBOX_DEFAULT goto LittlerootTown_BrendansHouse_1F_EventScript_292A9E end LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, MSGBOX_DEFAULT release end @@ -381,12 +381,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E closemessage call LittlerootTown_BrendansHouse_1F_EventScript_272083 incrementgamestat 16 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_292AB0:: @ 8292AB0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, MSGBOX_DEFAULT release end @@ -396,7 +396,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292ABA:: @ 8292ABA faceplayer waitse playmoncry SPECIES_VIGOROTH, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, MSGBOX_DEFAULT waitmoncry release end @@ -407,7 +407,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD faceplayer waitse playmoncry SPECIES_VIGOROTH, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, MSGBOX_DEFAULT waitmoncry release end @@ -464,16 +464,16 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C96 compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CA1 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, MSGBOX_DEFAULT giveitem_std ITEM_SS_TICKET - msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CAC compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CC1 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CD6 @@ -488,7 +488,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D5D delay 20 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_TV_LATI special TurnOnTVScreen @@ -497,13 +497,13 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D72 compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D7D - msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D1E compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT closemessage clearflag FLAG_SYS_TV_LATI setflag FLAG_0x0FF @@ -512,12 +512,12 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D88 compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D9D - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT multichoice 22, 8, 108, 1 copyvar VAR_0x8004, VAR_RESULT special InitRoamer copyvar VAR_0x40D5, VAR_RESULT - msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT closemessage setvar VAR_0x4082, 4 setvar VAR_0x408C, 4 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 3187c95f4..324944bb1 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -247,24 +247,24 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4 EventScript_Pblock1_Ask:: @ 8293C3E lockall - checkflag FLAG_0x340 + checkflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB setvar VAR_0x8009, 1 applymovement 16, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 - msgbox Text_Pblock1_Ask, 5 + msgbox Text_Pblock1_Ask, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_Pblock1_Yes goto EventScript_Pblock1_No end EventScript_Pblock1_No: @ 8293C70 - msgbox Text_Pblock1_No, 4 + msgbox Text_Pblock1_No, MSGBOX_DEFAULT releaseall end EventScript_Pblock1_NoBerries: @ 8293C7A - msgbox Text_Pblock1_NoBerries, 4 + msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT dodailyevents checkflag FLAG_0x921 goto_eq LilycoveCity_ContestLobby_EventScript_293C92 @@ -272,31 +272,31 @@ EventScript_Pblock1_NoBerries: @ 8293C7A end LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92 - msgbox LilycoveCity_ContestLobby_Text_29307D, 4 + msgbox LilycoveCity_ContestLobby_Text_29307D, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C - msgbox LilycoveCity_ContestLobby_Text_292FD1, 4 + msgbox LilycoveCity_ContestLobby_Text_292FD1, MSGBOX_DEFAULT giveitem_std ITEM_PECHA_BERRY setflag FLAG_0x921 goto EventScript_Pblock1_KnowHow end EventScript_Pblock1_KnowHow: @ 8293CB9 - msgbox Text_Pblock1_KnowHow, 5 + msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_Pblock1_Start goto EventScript_Pblock1_Explain end EventScript_Pblock1_Start: @ 8293CD2 - msgbox Text_Pblock1_Start, 4 + msgbox Text_Pblock1_Start, MSGBOX_DEFAULT goto EventScript_StartBlending end EventScript_Pblock1_Explain: @ 8293CE0 - msgbox Text_Pblock1_Explain, 4 + msgbox Text_Pblock1_Explain, MSGBOX_DEFAULT goto EventScript_Pblock1_Start end @@ -310,7 +310,7 @@ EventScript_Pblock1_Yes: @ 8293CEE specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 goto_eq EventScript_Pblock1_NoBerries - msgbox Text_Pblock1_Yes, 4 + msgbox Text_Pblock1_Yes, MSGBOX_DEFAULT goto EventScript_Pblock1_KnowHow end @@ -323,12 +323,12 @@ EventScript_StartBlending: @ 8293D2C end EventScript_Pblock1_FullPokeblock: @ 8293D39 - msgbox Text_Pblock1_FullPokeblock, 4 + msgbox Text_Pblock1_FullPokeblock, MSGBOX_DEFAULT releaseall end EventScript_Pblock1_NoPokeblock: @ 8293D43 - msgbox Text_Pblock1_NoPokeblock, 4 + msgbox Text_Pblock1_NoPokeblock, MSGBOX_DEFAULT releaseall end @@ -338,36 +338,36 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2 applymovement 3, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_293201, 5 + msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293DC6 goto LilycoveCity_ContestLobby_EventScript_293D7D end LilycoveCity_ContestLobby_EventScript_293D7D: @ 8293D7D - msgbox LilycoveCity_ContestLobby_Text_29323D, 4 + msgbox LilycoveCity_ContestLobby_Text_29323D, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87 - msgbox LilycoveCity_ContestLobby_Text_293394, 4 + msgbox LilycoveCity_ContestLobby_Text_293394, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91 - msgbox LilycoveCity_ContestLobby_Text_29328C, 5 + msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293DAA goto LilycoveCity_ContestLobby_EventScript_293DB8 end LilycoveCity_ContestLobby_EventScript_293DAA: @ 8293DAA - msgbox LilycoveCity_ContestLobby_Text_2932C3, 4 + msgbox LilycoveCity_ContestLobby_Text_2932C3, MSGBOX_DEFAULT goto EventScript_StartBlending end LilycoveCity_ContestLobby_EventScript_293DB8: @ 8293DB8 - msgbox LilycoveCity_ContestLobby_Text_2932F1, 4 + msgbox LilycoveCity_ContestLobby_Text_2932F1, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_293DAA end @@ -378,7 +378,7 @@ LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293E14 - msgbox LilycoveCity_ContestLobby_Text_293237, 4 + msgbox LilycoveCity_ContestLobby_Text_293237, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293D91 @@ -387,12 +387,12 @@ LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6 end LilycoveCity_ContestLobby_EventScript_293E0A: @ 8293E0A - msgbox LilycoveCity_ContestLobby_Text_29343E, 4 + msgbox LilycoveCity_ContestLobby_Text_29343E, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293E14: @ 8293E14 - msgbox LilycoveCity_ContestLobby_Text_2934A2, 4 + msgbox LilycoveCity_ContestLobby_Text_2934A2, MSGBOX_DEFAULT releaseall end @@ -404,36 +404,36 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E applymovement 17, LilycoveCity_ContestLobby_Movement_2725A2 applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_293842, 5 + msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293EA3 goto LilycoveCity_ContestLobby_EventScript_293E5A end LilycoveCity_ContestLobby_EventScript_293E5A: @ 8293E5A - msgbox LilycoveCity_ContestLobby_Text_293558, 4 + msgbox LilycoveCity_ContestLobby_Text_293558, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64 - msgbox LilycoveCity_ContestLobby_Text_29367D, 4 + msgbox LilycoveCity_ContestLobby_Text_29367D, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E - msgbox LilycoveCity_ContestLobby_Text_29357E, 5 + msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293E87 goto LilycoveCity_ContestLobby_EventScript_293E95 end LilycoveCity_ContestLobby_EventScript_293E87: @ 8293E87 - msgbox LilycoveCity_ContestLobby_Text_2935B1, 4 + msgbox LilycoveCity_ContestLobby_Text_2935B1, MSGBOX_DEFAULT goto EventScript_StartBlending end LilycoveCity_ContestLobby_EventScript_293E95: @ 8293E95 - msgbox LilycoveCity_ContestLobby_Text_2935E5, 4 + msgbox LilycoveCity_ContestLobby_Text_2935E5, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_293E87 end @@ -444,7 +444,7 @@ LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293EF1 - msgbox LilycoveCity_ContestLobby_Text_29354E, 4 + msgbox LilycoveCity_ContestLobby_Text_29354E, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293E6E @@ -453,27 +453,27 @@ LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3 end LilycoveCity_ContestLobby_EventScript_293EE7: @ 8293EE7 - msgbox LilycoveCity_ContestLobby_Text_293738, 4 + msgbox LilycoveCity_ContestLobby_Text_293738, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293EF1: @ 8293EF1 - msgbox LilycoveCity_ContestLobby_Text_293792, 4 + msgbox LilycoveCity_ContestLobby_Text_293792, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293EFB: @ 8293EFB lockall setvar VAR_0x8009, 1 - msgbox LilycoveCity_ContestLobby_Text_2C42F4, 5 + msgbox LilycoveCity_ContestLobby_Text_2C42F4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293F28 - msgbox LilycoveCity_ContestLobby_Text_2C4332, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4332, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293F1E: @ 8293F1E - msgbox LilycoveCity_ContestLobby_Text_2C439D, 4 + msgbox LilycoveCity_ContestLobby_Text_2C439D, MSGBOX_DEFAULT releaseall end @@ -492,37 +492,37 @@ LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28 end LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64 - msgbox LilycoveCity_ContestLobby_Text_2C43FA, 5 + msgbox LilycoveCity_ContestLobby_Text_2C43FA, MSGBOX_YESNO compare VAR_RESULT, 0 call_if 1, LilycoveCity_ContestLobby_EventScript_293F85 - msgbox LilycoveCity_ContestLobby_Text_2C451B, 4 + msgbox LilycoveCity_ContestLobby_Text_2C451B, MSGBOX_DEFAULT goto EventScript_StartBlending end LilycoveCity_ContestLobby_EventScript_293F85: @ 8293F85 - msgbox LilycoveCity_ContestLobby_Text_2C444C, 4 + msgbox LilycoveCity_ContestLobby_Text_2C444C, MSGBOX_DEFAULT return LilycoveCity_ContestLobby_EventScript_293F8E: @ 8293F8E - msgbox LilycoveCity_ContestLobby_Text_2C4573, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4573, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293F98: @ 8293F98 - msgbox LilycoveCity_ContestLobby_Text_2C45E8, 4 + msgbox LilycoveCity_ContestLobby_Text_2C45E8, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293FA2:: @ 8293FA2 - msgbox LilycoveCity_ContestLobby_Text_2937F9, 2 + msgbox LilycoveCity_ContestLobby_Text_2937F9, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_293FAB:: @ 8293FAB - msgbox LilycoveCity_ContestLobby_Text_293842, 2 + msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_293FB4:: @ 8293FB4 - msgbox LilycoveCity_ContestLobby_Text_29388F, 2 + msgbox LilycoveCity_ContestLobby_Text_29388F, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD @@ -533,7 +533,7 @@ LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8 lock faceplayer - msgbox Text_Pblock1_Talk_0, 4 + msgbox Text_Pblock1_Talk_0, MSGBOX_DEFAULT specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293FEE @@ -542,7 +542,7 @@ LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8 end LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE - msgbox Text_Pblock1_Talk_1, 4 + msgbox Text_Pblock1_Talk_1, MSGBOX_DEFAULT release end @@ -560,15 +560,15 @@ LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8 end LilycoveCity_ContestLobby_EventScript_294028: @ 8294028 - msgbox LilycoveCity_ContestLobby_Text_293BB4, 4 + msgbox LilycoveCity_ContestLobby_Text_293BB4, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_294032: @ 8294032 - msgbox LilycoveCity_ContestLobby_Text_293AF0, 4 + msgbox LilycoveCity_ContestLobby_Text_293AF0, MSGBOX_DEFAULT giveitem_std ITEM_PECHA_BERRY setflag FLAG_0x921 - msgbox LilycoveCity_ContestLobby_Text_293B76, 4 + msgbox LilycoveCity_ContestLobby_Text_293B76, MSGBOX_DEFAULT release end @@ -592,7 +592,7 @@ EventScript_PblockLink:: @ 8294055 end EventScript_PblocLink_Ask: @ 8294092 - msgbox Text_PblockLink_Ask, 5 + msgbox Text_PblockLink_Ask, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_PblocLink_TryConnect compare VAR_RESULT, 0 @@ -600,7 +600,7 @@ EventScript_PblocLink_Ask: @ 8294092 end EventScript_PblocLink_NoBerries: @ 82940B1 - msgbox Text_PblockLink_NoBerries, 4 + msgbox Text_PblockLink_NoBerries, MSGBOX_DEFAULT releaseall end @@ -628,17 +628,17 @@ EventScript_PblocLink_TryConnect: @ 82940BB end EventScript_PblocLink_1Arrived: @ 829411D - msgbox Text_PblockLink_1Arrived, 4 + msgbox Text_PblockLink_1Arrived, MSGBOX_DEFAULT goto EventScript_PblocLink_StartLinkBlending end EventScript_PblocLink_2Arrived: @ 829412B - msgbox Text_PblockLink_2Arrived, 4 + msgbox Text_PblockLink_2Arrived, MSGBOX_DEFAULT goto EventScript_PblocLink_StartLinkBlending end EventScript_PblocLink_3Arrived: @ 8294139 - msgbox Text_PblockLink_3Arrived, 4 + msgbox Text_PblockLink_3Arrived, MSGBOX_DEFAULT goto EventScript_PblocLink_StartLinkBlending end @@ -659,36 +659,36 @@ EventScript_PblocLink_End: @ 8294160 end EventScript_PblocLink_FullPokeblock: @ 8294162 - msgbox Text_PblockLink_FullPokeblock, 4 + msgbox Text_PblockLink_FullPokeblock, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_NoPokeblock: @ 829416C - msgbox Text_PblockLink_NoPokeblock, 4 + msgbox Text_PblockLink_NoPokeblock, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_SomeoneNotReady: @ 8294176 special CloseLink - msgbox LilycoveCity_ContestLobby_Text_2781C7, 4 + msgbox LilycoveCity_ContestLobby_Text_2781C7, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_DifferentSelections: @ 8294183 special CloseLink - msgbox LilycoveCity_ContestLobby_Text_278255, 4 + msgbox LilycoveCity_ContestLobby_Text_278255, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_CloseLink: @ 8294190 special CloseLink - msgbox gUnknown_08272D9C, 4 + msgbox gUnknown_08272D9C, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_LinkError: @ 829419D special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27821C, 4 + msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT releaseall end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index e4b1fce41..84bb3982d 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -13,7 +13,7 @@ EventScript_2A4B5D:: @ 82A4B5D EventScript_2A4B6F:: @ 82A4B6F lockall - msgbox Text_2A4BF4, 5 + msgbox Text_2A4BF4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_2A4B85 releaseall @@ -45,7 +45,7 @@ EventScript_2A4BAC:: @ 82A4BAC special GetPokeblockFeederInFront compare VAR_RESULT, 65535 goto_if 5, EventScript_2A4BEB - msgbox Text_2A4C90, 5 + msgbox Text_2A4C90, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_2A4BD0 releaseall diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 33e7f2e5b..aa1f4afee 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -36,10 +36,10 @@ Route111_Text_27659D: @ 827659D Route111_EventScript_2765FF:: @ 82765FF lock faceplayer - msgbox Route111_Text_2762C9, 5 + msgbox Route111_Text_2762C9, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_EventScript_27661E - msgbox Route111_Text_27655C, 4 + msgbox Route111_Text_27655C, MSGBOX_DEFAULT release end @@ -47,10 +47,10 @@ Route111_EventScript_27661E:: @ 827661E giveitem_std ITEM_TM43 compare VAR_RESULT, 0 goto_eq Route111_EventScript_276680 - msgbox Route111_Text_27636E, 4 + msgbox Route111_Text_27636E, MSGBOX_DEFAULT closemessage setflag FLAG_0x060 - clearflag FLAG_0x3B4 + clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN compare VAR_FACING, 3 call_if 1, Route111_EventScript_27666A compare VAR_FACING, 4 @@ -72,7 +72,7 @@ Route111_EventScript_276675:: @ 8276675 return Route111_EventScript_276680:: @ 8276680 - msgbox Route111_Text_27659D, 4 + msgbox Route111_Text_27659D, MSGBOX_DEFAULT release end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 2292e9984..9033e741f 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -32,18 +32,18 @@ EventScript_27EE54:: @ 827EE54 EventScript_27EE8A:: @ 827EE8A special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, 4 + msgbox gUnknown_08272BCF, MSGBOX_DEFAULT special TurnOffTVScreen releaseall end EventScript_27EE9A:: @ 827EE9A - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, MSGBOX_DEFAULT releaseall end EventScript_27EEA4:: @ 827EEA4 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT special InitRoamer clearflag FLAG_SYS_TV_LATI setflag FLAG_0x0FF @@ -68,7 +68,7 @@ EventScript_27EED0:: @ 827EED0 EventScript_27EED8:: @ 827EED8 special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, 4 + msgbox gUnknown_08272BCF, MSGBOX_DEFAULT goto EventScript_27EED0 end diff --git a/data/shop.s b/data/shop.s deleted file mode 100644 index 45ecbb585..000000000 --- a/data/shop.s +++ /dev/null @@ -1,80 +0,0 @@ -@ the third big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_08589A08:: @ 8589A08 - .4byte BuyMenuTryMakePurchase - .4byte BuyMenuReturnToItemList - -gUnknown_08589A10:: @ 8589A10 - .4byte gUnknown_085E93C7 - .4byte HandleShopMenuBuy - .4byte gUnknown_085E93CB - .4byte HandleShopMenuSell - .4byte gUnknown_085E93D0 - .4byte HandleShopMenuQuit - -gUnknown_08589A28:: @ 8589A28 - .4byte gUnknown_085E93C7 - .4byte HandleShopMenuBuy - .4byte gUnknown_085E93D0 - .4byte HandleShopMenuQuit - -gUnknown_08589A38:: @ 8589A38 - window_template 0, 2, 1, 9, 6, 15, 8 - window_template 0, 2, 1, 9, 4, 15, 8 - -gUnknown_08589A48:: @ 8589A48 - .byte 0, 0, 0, 0 - .4byte BuyMenuPrintItemDescriptionAndShowItemIcon - .4byte BuyMenuPrintPriceInList - .byte 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 - -gUnknown_08589A60:: @ 8589A60 - .4byte 0x1F8 - .4byte 0x11E1 - .4byte 0x21D2 - .4byte 0x31C3 - -gUnknown_08589A70:: @ 8589A70 - window_template 0, 1, 1, 10, 2, 15, 30 - window_template 0, 14, 2, 15, 16, 15, 50 - window_template 0, 0, 13, 14, 6, 15, 0x122 - window_template 0, 1, 11, 12, 2, 15, 0x176 - window_template 0, 18, 11, 10, 2, 15, 0x18E - window_template 0, 2, 15, 27, 4, 15, 0x1A2 - null_window_template - -gUnknown_08589AA8:: @ 8589AA8 - window_template 0, 21, 9, 5, 4, 15, 0x20E - -gUnknown_08589AB0:: @ 8589AB0 - .byte 1, 2, 3 - .byte 0, 2, 3 - .byte 0, 3, 2 - - .align 1 - -gUnknown_08589ABA:: @ 8589ABA - .2byte 0x284, 0x282, 0x280 - -gUnknown_08589AC0:: @ 8589AC0 - .2byte 0x285, 0x283, 0x281 - -gUnknown_08589AC6:: @ 8589AC6 - .2byte 0x28C, 0x28A, 0x288 - -gUnknown_08589ACC:: @ 8589ACC - .2byte 0x28D, 0x28B, 0x289 - -gUnknown_08589AD2:: @ 8589AD2 - .2byte 0x2A0, 0x2A2, 0x2A4 - -gUnknown_08589AD8:: @ 8589AD8 - .2byte 0x2A1, 0x2A3, 0x2A5 - -gUnknown_08589ADE:: @ 8589ADE - .2byte 0x2A8, 0x2AA, 0x2AC diff --git a/data/specials.inc b/data/specials.inc index cec36932a..a1d9734ca 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -94,7 +94,7 @@ gSpecials:: @ 81DBA64 def_special sub_80F8390 def_special sub_80F8850 def_special sub_80F82B4 - def_special sub_80F87D8 + def_special SetContestTrainerGfxIds def_special sub_80F7F30 def_special sub_80F8970 def_special sub_80F8AFC @@ -102,7 +102,7 @@ gSpecials:: @ 81DBA64 def_special sub_80F7F7C def_special sub_80F7FFC def_special sub_80F8D24 - def_special sub_80F8C7C + def_special GiveMonArtistRibbon def_special sub_80B3000 def_special SaveGame def_special sub_80FAFF8 @@ -210,7 +210,7 @@ gSpecials:: @ 81DBA64 def_special ShowLinkBattleRecords def_special IsEnoughForCostInVar0x8005 def_special SubtractMoneyFromVar0x8005 - def_special sub_80F972C + def_special ExecuteWhiteOut def_special sp0C8_whiteout_maybe def_special RotatingGate_InitPuzzle def_special RotatingGate_InitPuzzleAndGraphics @@ -242,16 +242,16 @@ 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 sub_81A5238 - def_special sub_81A5E74 - def_special sub_81A703C - def_special sub_81A8E7C + def_special CallBattlePalaceFunction + def_special CopyEReaderTrainerGreeting + def_special DoSpecialTrainerBattle + def_special CallBattleArenaFunction + def_special CallBattleFactoryFunction + def_special CallBattlePikeFunction + def_special CallBattlePyramidFunction def_special StopMapMusic def_special sub_81B99B4 def_special sub_81B9B80 @@ -259,7 +259,7 @@ gSpecials:: @ 81DBA64 def_special sub_80F9490 def_special ValidateEReaderTrainer def_special GetBestBattleTowerStreak - def_special ReducePlayerPartyToThree + def_special ReducePlayerPartyToSelectedMons def_special BedroomPC def_special PlayerPC def_special FieldShowRegionMap @@ -330,13 +330,13 @@ gSpecials:: @ 81DBA64 def_special sub_80AC81C def_special sp13E_warp_to_last_warp def_special sp13F_fall_to_last_warp - def_special sub_80F8D28 + def_special ShowContestEntryMonPic def_special sub_80F8EB8 - def_special sub_8162794 + def_special SetEReaderTrainerGfxId def_special BattleSetup_StartLatiBattle def_special SetRoute119Weather def_special SetRoute123Weather - def_special sub_80F8FA0 + def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies def_special sub_81B98DC def_special nullsub_54 @@ -350,7 +350,7 @@ gSpecials:: @ 81DBA64 def_special BufferLottoTicketNumber def_special sub_81653CC def_special sub_80F9370 - def_special sub_80F8FE8 + def_special ScriptRandom def_special sub_81AFDD0 def_special sub_80EDCE8 def_special sub_80EE2CC @@ -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/text/pokedex_text.inc b/data/text/pokedex_text.inc deleted file mode 100644 index caa41912d..000000000 --- a/data/text/pokedex_text.inc +++ /dev/null @@ -1,2321 +0,0 @@ -gDummyPokedexText:: @ 855D30D - .string "This is a newly discovered POKéMON.\n" - .string "It is currently under investigation.\n" - .string "No detailed information is available\n" - .string "at this time.$" - -gBulbasaurPokedexText:: @ 855D389 - .string "BULBASAUR can be seen napping in bright\n" - .string "sunlight. There is a seed on its back.\n" - .string "By soaking up the sun’s rays, the seed\n" - .string "grows progressively larger.$" - -gIvysaurPokedexText:: @ 855D41B - .string "To support its bulb, IVYSAUR’s legs\n" - .string "grow sturdy. If it spends more time lying in\n" - .string "the sunlight, the bud will soon bloom into\n" - .string "a large flower.$" - -gVenusaurPokedexText:: @ 855D4A7 - .string "VENUSAUR’s flower is said to take on vivid\n" - .string "colors if it gets plenty of nutrition and\n" - .string "sunlight. The flower’s aroma soothes the\n" - .string "emotions of people.$" - -gCharmanderPokedexText:: @ 855D539 - .string "The flame that burns at the tip of its\n" - .string "tail is an indication of its emotions.\n" - .string "The flame wavers when CHARMANDER is\n" - .string "happy, and blazes when it is enraged.$" - -gCharmeleonPokedexText:: @ 855D5D1 - .string "Without pity, its sharp claws destroy foes.\n" - .string "If it encounters a strong enemy, it\n" - .string "becomes agitated, and the flame on its\n" - .string "tail flares with a bluish white color.$" - -gCharizardPokedexText:: @ 855D66F - .string "A CHARIZARD flies about in search of\n" - .string "strong opponents. It breathes intense\n" - .string "flames that can melt any material. However,\n" - .string "it will never torch a weaker foe.$" - -gSquirtlePokedexText:: @ 855D708 - .string "Its shell is not just for protection.\n" - .string "Its rounded shape and the grooves on its\n" - .string "surface minimize resistance in water,\n" - .string "enabling SQUIRTLE to swim at high speeds.$" - -gWartortlePokedexText:: @ 855D7A7 - .string "Its large tail is covered with rich, thick\n" - .string "fur that deepens in color with age.\n" - .string "The scratches on its shell are evidence\n" - .string "of this POKéMON’s toughness in battle.$" - -gBlastoisePokedexText:: @ 855D845 - .string "The waterspouts that protrude from its\n" - .string "shell are highly accurate. Their bullets of\n" - .string "water can precisely nail tin cans from\n" - .string "a distance of over 160 feet.$" - -gCaterpiePokedexText:: @ 855D8DC - .string "Its voracious appetite compels it to\n" - .string "devour leaves bigger than itself without\n" - .string "hesitation. It releases a terribly strong\n" - .string "odor from its antennae.$" - -gMetapodPokedexText:: @ 855D96C - .string "Its shell is as hard as an iron slab.\n" - .string "A METAPOD does not move very much\n" - .string "because it is preparing its soft innards\n" - .string "for evolution inside the shell.$" - -gButterfreePokedexText:: @ 855D9FD - .string "It has a superior ability to search for\n" - .string "delicious honey from flowers. It can seek,\n" - .string "extract, and carry honey from flowers\n" - .string "blooming over six miles away.$" - -gWeedlePokedexText:: @ 855DA94 - .string "A WEEDLE has an extremely acute sense\n" - .string "of smell. It distinguishes its favorite\n" - .string "kinds of leaves from those it dislikes by\n" - .string "sniffing with its big red proboscis (nose).$" - -gKakunaPokedexText:: @ 855DB38 - .string "It remains virtually immobile while it\n" - .string "clings to a tree. However, on the inside,\n" - .string "it busily prepares for evolution. This is\n" - .string "evident from how hot its shell becomes.$" - -gBeedrillPokedexText:: @ 855DBDB - .string "A BEEDRILL is extremely territorial.\n" - .string "For safety reasons, no one should \n" - .string "ever approach its nest. If angered,\n" - .string "they will attack in a swarm.$" - -gPidgeyPokedexText:: @ 855DC64 - .string "It has an extremely sharp sense of\n" - .string "direction. It can unerringly return home to\n" - .string "its nest, however far it may be removed\n" - .string "from its familiar surroundings.$" - -gPidgeottoPokedexText:: @ 855DCFB - .string "This POKéMON flies around, patrolling its\n" - .string "large territory. If its living space is\n" - .string "violated, it shows no mercy in thoroughly\n" - .string "punishing the foe with its sharp claws.$" - -gPidgeotPokedexText:: @ 855DD9F - .string "This POKéMON has gorgeous, glossy\n" - .string "feathers. Many TRAINERS are so captivated\n" - .string "by the beautiful feathers on its head that\n" - .string "they choose PIDGEOT as their POKéMON.$" - -gRattataPokedexText:: @ 855DE3C - .string "A RATTATA is cautious in the extreme.\n" - .string "Even while it is asleep, it constantly\n" - .string "moves its ears and listens for danger.\n" - .string "It will make its nest anywhere.$" - -gRaticatePokedexText:: @ 855DED0 - .string "A RATICATE’s sturdy fangs grow steadily.\n" - .string "To keep them ground down, it gnaws on\n" - .string "rocks and logs. It may even chew on the\n" - .string "walls of houses.$" - -gSpearowPokedexText:: @ 855DF58 - .string "Its loud cry can be heard over half a mile\n" - .string "away. If its high, keening cry is heard\n" - .string "echoing all around, it is a sign that they\n" - .string "are warning each other of danger.$" - -gFearowPokedexText:: @ 855DFF8 - .string "Its long neck and elongated beak are\n" - .string "ideal for catching prey in soil or water.\n" - .string "It deftly moves this extended and skinny\n" - .string "beak to pluck prey.$" - -gEkansPokedexText:: @ 855E084 - .string "An EKANS curls itself up in a spiral while\n" - .string "it rests. This position allows it to quickly\n" - .string "respond to an enemy from any direction\n" - .string "with a threat from its upraised head.$" - -gArbokPokedexText:: @ 855E129 - .string "This POKéMON has a terrifically strong\n" - .string "constricting power. It can even flatten\n" - .string "steel oil drums. Once it wraps its body\n" - .string "around its foe, escaping is impossible.$" - -gPikachuPokedexText:: @ 855E1C8 - .string "It stores electricity in the electric sacs\n" - .string "on its cheeks. When it releases pent-up\n" - .string "energy in a burst, the electric power is\n" - .string "equal to a lightning bolt.$" - -gRaichuPokedexText:: @ 855E25F - .string "If it stores too much electricity, its\n" - .string "behavior turns aggressive. To avoid this,\n" - .string "it occasionally discharges excess energy\n" - .string "and calms itself down.$" - -gSandshrewPokedexText:: @ 855E2F0 - .string "When it curls up in a ball, it can make any\n" - .string "attack bounce off harmlessly. Its hide has\n" - .string "turned tough and solid as a result of\n" - .string "living in the desert.$" - -gSandslashPokedexText:: @ 855E383 - .string "It curls up in a ball to protect itself from\n" - .string "enemy attacks. It also curls up to prevent\n" - .string "heatstroke during the daytime when\n" - .string "temperatures rise sharply.$" - -gNidoranFPokedexText:: @ 855E419 - .string "Its highly toxic barbs are thought to have\n" - .string "developed as protection for this small-\n" - .string "bodied POKéMON. When enraged, it releases\n" - .string "a horrible toxin from its horn.$" - -gNidorinaPokedexText:: @ 855E4B6 - .string "When it is with its friends or\n" - .string "family, its barbs are tucked away to\n" - .string "prevent injury. It appears to become\n" - .string "nervous if separated from the others.$" - -gNidoqueenPokedexText:: @ 855E545 - .string "It is adept at sending foes flying with\n" - .string "harsh tackles using its tough, scaly body.\n" - .string "This POKéMON is at its strongest when\n" - .string "it is defending its young.$" - -gNidoranMPokedexText:: @ 855E5D9 - .string "The male NIDORAN has developed muscles\n" - .string "that freely move its ears in any direction.\n" - .string "Even the slightest sound does not escape\n" - .string "this POKéMON’s notice.$" - -gNidorinoPokedexText:: @ 855E66C - .string "Its horn is harder than a diamond.\n" - .string "If it senses a hostile presence, all the\n" - .string "barbs on its back bristle up at once, and it\n" - .string "challenges the foe with all its might.$" - -gNidokingPokedexText:: @ 855E70C - .string "A NIDOKING’s thick tail packs enormously\n" - .string "destructive power capable of toppling\n" - .string "a metal transmission tower. Once it goes\n" - .string "on a rampage, there is no stopping it.$" - -gClefairyPokedexText:: @ 855E7AB - .string "On every night of a full moon, they come\n" - .string "out to play. When dawn arrives, the tired\n" - .string "CLEFAIRY go to sleep nestled up against\n" - .string "each other in deep and quiet mountains.$" - -gClefablePokedexText:: @ 855E84E - .string "A CLEFABLE uses its wings to skip lightly \n" - .string "as if it were flying. Its bouncy step\n" - .string "lets it even walk on water. On quiet,\n" - .string "moonlit nights, it strolls on lakes.$" - -gVulpixPokedexText:: @ 855E8EA - .string "It can freely control fire, making fiery\n" - .string "orbs fly like will-o’-the-wisps. Just\n" - .string "before evolution, its six tails grow hot \n" - .string "as if on fire.$" - -gNinetalesPokedexText:: @ 855E972 - .string "It has long been said that each of the\n" - .string "nine tails embody an enchanted power.\n" - .string "A long-lived NINETALES will have fur that\n" - .string "shines like gold.$" - -gJigglypuffPokedexText:: @ 855E9FB - .string "Nothing can avoid falling asleep hearing a\n" - .string "JIGGLYPUFF’s song. The sound waves of its\n" - .string "singing voice match the brain waves of\n" - .string "someone in a deep sleep.$" - -gWigglytuffPokedexText:: @ 855EA90 - .string "Its fur is the ultimate in luxuriousness.\n" - .string "Sleeping alongside a WIGGLYTUFF is simply\n" - .string "divine. Its body expands seemingly without\n" - .string "end when it inhales.$" - -gZubatPokedexText:: @ 855EB24 - .string "While living in pitch-black caverns, their\n" - .string "eyes gradually grew shut and deprived\n" - .string "them of vision. They use ultrasonic waves\n" - .string "to detect obstacles.$" - -gGolbatPokedexText:: @ 855EBB4 - .string "Its fangs easily puncture even thick\n" - .string "animal hide. It loves to feast on the blood\n" - .string "of people and POKéMON. It flits about in\n" - .string "darkness and strikes from behind.$" - -gOddishPokedexText:: @ 855EC50 - .string "This POKéMON grows by absorbing moonlight.\n" - .string "During the daytime, it buries itself in the\n" - .string "ground, leaving only its leaves exposed to\n" - .string "avoid detection by its enemies.$" - -gGloomPokedexText:: @ 855ECF2 - .string "A horribly noxious honey drools from its\n" - .string "mouth. One whiff of the honey can result\n" - .string "in memory loss. Some fans are said to\n" - .string "enjoy this overwhelming stink, however.$" - -gVileplumePokedexText:: @ 855ED92 - .string "In seasons when it produces more pollen,\n" - .string "the air around a VILEPLUME turns yellow\n" - .string "with the powder as it walks. The pollen is\n" - .string "highly toxic and causes paralysis.$" - -gParasPokedexText:: @ 855EE31 - .string "A PARAS has parasitic tochukaso\n" - .string "mushrooms growing on its back. They grow\n" - .string "by drawing nutrients from the host. They\n" - .string "are valued as a medicine for long life.$" - -gParasectPokedexText:: @ 855EECB - .string "PARASECT are known to infest the roots of\n" - .string "large trees en masse and drain nutrients.\n" - .string "When an infested tree dies, they move\n" - .string "onto another tree all at once.$" - -gVenonatPokedexText:: @ 855EF64 - .string "Its coat of thin, stiff hair that covers\n" - .string "its entire body is said to have evolved\n" - .string "for protection. Its large eyes never fail\n" - .string "to spot even miniscule prey.$" - -gVenomothPokedexText:: @ 855EFFC - .string "VENOMOTH are nocturnal--they only are\n" - .string "active at night. Their favorite prey are\n" - .string "insects that gather around streetlights,\n" - .string "attracted by the light in the darkness.$" - -gDiglettPokedexText:: @ 855F09C - .string "DIGLETT are raised in most farms.\n" - .string "The reason is simple--wherever they\n" - .string "burrow, the soil is left perfectly tilled\n" - .string "for growing delicious crops.$" - -gDugtrioPokedexText:: @ 855F129 - .string "Because the triplets originally split from\n" - .string "one body, they think exactly alike.\n" - .string "They work cooperatively to burrow\n" - .string "endlessly through the ground.$" - -gMeowthPokedexText:: @ 855F1B8 - .string "MEOWTH withdraw their sharp claws into\n" - .string "their paws to silently sneak about.\n" - .string "For some reason, this POKéMON loves\n" - .string "shiny coins that glitter with light.$" - -gPersianPokedexText:: @ 855F24C - .string "A PERSIAN’s six bold whiskers sense air\n" - .string "movements to determine what is in its\n" - .string "vicinity. It becomes docile if grabbed\n" - .string "by the whiskers.$" - -gPsyduckPokedexText:: @ 855F2D2 - .string "When its headache intensifies, it starts\n" - .string "using strange powers. However, it has no\n" - .string "recollection of its powers, so it always\n" - .string "looks befuddled and bewildered.$" - -gGolduckPokedexText:: @ 855F36D - .string "A GOLDUCK is an adept swimmer.\n" - .string "It sometimes joins competitive swimmers\n" - .string "in training. It uses psychic powers when\n" - .string "its forehead shimmers with light.$" - -gMankeyPokedexText:: @ 855F3FF - .string "When it starts shaking and its nasal\n" - .string "breathing turns rough, it’s a sure sign\n" - .string "of anger. However, since this happens\n" - .string "instantly, there is no time to flee.$" - -gPrimeapePokedexText:: @ 855F497 - .string "When it becomes furious, its blood\n" - .string "circulation becomes more robust, and\n" - .string "its muscles are made stronger. But it\n" - .string "also becomes much less intelligent.$" - -gGrowlithePokedexText:: @ 855F529 - .string "Its superb sense of smell ensures that\n" - .string "this POKéMON won’t forget any scent,\n" - .string "no matter what. It uses its sense of smell\n" - .string "to detect the emotions of others.$" - -gArcaninePokedexText:: @ 855F5C2 - .string "This fleet-footed POKéMON is said to run\n" - .string "over 6,200 miles in a single day and night.\n" - .string "The fire that blazes wildly within its body\n" - .string "is its source of power.$" - -gPoliwagPokedexText:: @ 855F65B - .string "It is possible to see this POKéMON’s spiral\n" - .string "innards right through its thin skin.\n" - .string "However, the skin is also very flexible.\n" - .string "Even sharp fangs bounce right off it.$" - -gPoliwhirlPokedexText:: @ 855F6FB - .string "Its body surface is always wet and slick\n" - .string "with an oily fluid. Because of this greasy\n" - .string "covering, it can easily slip and slide out\n" - .string "of the clutches of any enemy in battle.$" - -gPoliwrathPokedexText:: @ 855F7A2 - .string "Its highly developed muscles never grow\n" - .string "fatigued, however much it exercises.\n" - .string "This POKéMON can swim back and forth\n" - .string "across the Pacific Ocean without effort.$" - -gAbraPokedexText:: @ 855F83D - .string "A POKéMON that sleeps 18 hours a day.\n" - .string "Observation revealed that it uses\n" - .string "TELEPORT to change its location once\n" - .string "every hour.$" - -gKadabraPokedexText:: @ 855F8B6 - .string "It is rumored that a boy with psychic\n" - .string "abilities suddenly transformed into\n" - .string "KADABRA while he was assisting research\n" - .string "into extrasensory powers.$" - -gAlakazamPokedexText:: @ 855F942 - .string "While it has strong psychic abilities and\n" - .string "high intelligence, an ALAKAZAM’s muscles\n" - .string "are very weak. It uses psychic power to\n" - .string "move its body.$" - -gMachopPokedexText:: @ 855F9CC - .string "It continually undertakes strenuous\n" - .string "training to master all forms of martial\n" - .string "arts. Its strength lets it easily hoist\n" - .string "a sumo wrestler onto its shoulders.$" - -gMachokePokedexText:: @ 855FA64 - .string "A belt is worn by a MACHOKE to keep its\n" - .string "overwhelming power under control.\n" - .string "Because it is so dangerous, no one has\n" - .string "ever removed the belt.$" - -gMachampPokedexText:: @ 855FAEC - .string "It is impossible to defend against punches\n" - .string "and chops doled out by its four arms.\n" - .string "Its fighting spirit flares up when it faces\n" - .string "a tough opponent.$" - -gBellsproutPokedexText:: @ 855FB7B - .string "A BELLSPROUT’s thin and flexible body lets\n" - .string "it bend and sway to avoid any attack,\n" - .string "however strong it may be. From its mouth,\n" - .string "it leaks a fluid that melts even iron.$" - -gWeepinbellPokedexText:: @ 855FC1D - .string "At night, a WEEPINBELL hangs on to a tree\n" - .string "branch with its hooked rear and sleeps.\n" - .string "If it moves around in its sleep, it may\n" - .string "wake up to find itself on the ground.$" - -gVictreebelPokedexText:: @ 855FCBD - .string "The long vine extending from its head is\n" - .string "waved about as if it were a living thing to\n" - .string "attract prey. When an unsuspecting victim\n" - .string "approaches, it is swallowed whole.$" - -gTentacoolPokedexText:: @ 855FD5F - .string "Its body is almost entirely composed of\n" - .string "water. It ensnares its foe with its two\n" - .string "long tentacles, then stabs with the poison\n" - .string "stingers at their tips.$" - -gTentacruelPokedexText:: @ 855FDF2 - .string "It lives in complex rock formations on\n" - .string "the ocean floor and traps prey using its\n" - .string "80 tentacles. Its red orbs glow when it\n" - .string "grows excited or agitated.$" - -gGeodudePokedexText:: @ 855FE85 - .string "It climbs mountain paths using only the\n" - .string "power of its arms. Because they look just\n" - .string "like boulders lining paths, hikers may step\n" - .string "on them without noticing.$" - -gGravelerPokedexText:: @ 855FF1D - .string "They descend from mountains by tumbling\n" - .string "down steep slopes. They are so brutal,\n" - .string "they smash aside obstructing trees and\n" - .string "massive boulders with thunderous tackles.$" - -gGolemPokedexText:: @ 855FFBD - .string "It is said to live in volcanic craters\n" - .string "on mountain peaks. Once a year, it sheds\n" - .string "its hide and grows larger. The shed hide\n" - .string "crumbles and returns to the soil.$" - -gPonytaPokedexText:: @ 8560058 - .string "A PONYTA is very weak at birth. It can\n" - .string "barely stand up. Its legs become stronger\n" - .string "as it stumbles and falls while trying to\n" - .string "keep up with its parent.$" - -gRapidashPokedexText:: @ 85600EB - .string "It usually canters casually in the fields\n" - .string "and plains. But once a RAPIDASH turns\n" - .string "serious, its fiery manes flare and blaze\n" - .string "as it gallops its way up to 150 mph.$" - -gSlowpokePokedexText:: @ 8560189 - .string "It catches prey by dipping its tail in\n" - .string "water at the side of a river. But it often\n" - .string "forgets what it is doing and spends entire\n" - .string "days just loafing at water’s edge.$" - -gSlowbroPokedexText:: @ 8560229 - .string "Its tail has a SHELLDER firmly attached\n" - .string "with a bite. As a result, the tail can’t be\n" - .string "used for fishing anymore. This forces it\n" - .string "to reluctantly swim and catch prey.$" - -gMagnemitePokedexText:: @ 85602CA - .string "The units at its sides are extremely\n" - .string "powerful magnets. They generate enough\n" - .string "magnetism to draw in iron objects from\n" - .string "over 300 feet away.$" - -gMagnetonPokedexText:: @ 8560351 - .string "It is actually three MAGNEMITE linked\n" - .string "by magnetism. It generates powerful radio\n" - .string "waves that raise temperatures by 3.6\n" - .string "degrees F within a 3,300-foot radius.$" - -gFarfetchdPokedexText:: @ 85603EC - .string "It is always seen with a stick from a plant.\n" - .string "Apparently, there are good sticks and bad\n" - .string "sticks. This POKéMON occasionally fights\n" - .string "with others over choice sticks.$" - -gDoduoPokedexText:: @ 856048C - .string "Even while eating or sleeping, one of the\n" - .string "heads remains always vigilant for any sign\n" - .string "of danger. When threatened, it flees at\n" - .string "over 60 miles per hour.$" - -gDodrioPokedexText:: @ 8560521 - .string "A peculiar POKéMON species with three\n" - .string "heads. It vigorously races across grassy\n" - .string "plains even in arid seasons with little\n" - .string "rainfall.$" - -gSeelPokedexText:: @ 85605A2 - .string "SEEL hunt for prey in frigid, ice-covered\n" - .string "seas. When it needs to breathe, it punches\n" - .string "a hole through the ice with the sharply\n" - .string "protruding section of its head.$" - -gDewgongPokedexText:: @ 856063F - .string "It loves to snooze on bitterly cold ice.\n" - .string "The sight of this POKéMON sleeping on\n" - .string "a glacier was mistakenly thought to be\n" - .string "a mermaid by a mariner long ago.$" - -gGrimerPokedexText:: @ 85606D6 - .string "Born from polluted sludge in the sea,\n" - .string "GRIMER’s favorite food is anything filthy.\n" - .string "They feed on wastewater pumped out from\n" - .string "factories.$" - -gMukPokedexText:: @ 856075A - .string "It prefers warm and humid habitats.\n" - .string "In the summertime, the toxic substances\n" - .string "in its body intensify, making MUK reek like\n" - .string "putrid kitchen garbage.$" - -gShellderPokedexText:: @ 85607EA - .string "At night, it burrows a hole in the seafloor\n" - .string "with its broad tongue to make a place to\n" - .string "sleep. While asleep, it closes its shell,\n" - .string "but leaves its tongue hanging out.$" - -gCloysterPokedexText:: @ 856088C - .string "It swims in the sea by swallowing water,\n" - .string "then jetting it out toward the rear.\n" - .string "The CLOYSTER shoots spikes from its\n" - .string "shell using the same system.$" - -gGastlyPokedexText:: @ 856091B - .string "When exposed to a strong wind, a GASTLY’s\n" - .string "gaseous body quickly dwindles away.\n" - .string "They cluster under the eaves of houses\n" - .string "to escape the ravages of wind.$" - -gHaunterPokedexText:: @ 85609AF - .string "If a HAUNTER beckons you while it is\n" - .string "floating in darkness, don’t approach it.\n" - .string "This POKéMON will try to lick you with its\n" - .string "tongue and steal your life away.$" - -gGengarPokedexText:: @ 8560A49 - .string "Deep in the night, your shadow cast by\n" - .string "a streetlight may suddenly overtake you.\n" - .string "It is actually a GENGAR running past\n" - .string "you, pretending to be your shadow.$" - -gOnixPokedexText:: @ 8560AE1 - .string "There is a magnet in its brain that\n" - .string "prevents an ONIX from losing direction\n" - .string "while tunneling. As it grows older, its body\n" - .string "becomes steadily rounder and smoother.$" - -gDrowzeePokedexText:: @ 8560B80 - .string "If your nose becomes itchy while you are\n" - .string "sleeping, it’s a sure sign that a DROWZEE is\n" - .string "standing above your pillow and trying to\n" - .string "eat your dream through your nostrils.$" - -gHypnoPokedexText:: @ 8560C25 - .string "The arcing movement and glitter of the\n" - .string "pendulum in a HYPNO’s hand lull the foe\n" - .string "into deep hypnosis. While searching for\n" - .string "prey, it polishes the pendulum.$" - -gKrabbyPokedexText:: @ 8560CBC - .string "KRABBY live in holes dug into beaches.\n" - .string "On sandy shores with little in the way\n" - .string "of food, they can be seen squabbling with\n" - .string "each other over territory.$" - -gKinglerPokedexText:: @ 8560D4F - .string "It waves its huge, oversized claw in the\n" - .string "air to communicate with others.\n" - .string "But since the claw is so heavy, this\n" - .string "POKéMON quickly tires.$" - -gVoltorbPokedexText:: @ 8560DD4 - .string "It bears an uncanny and unexplained\n" - .string "resemblance to a POKé BALL. Because it\n" - .string "explodes at the slightest shock, even\n" - .string "veteran TRAINERS treat it with caution.$" - -gElectrodePokedexText:: @ 8560E6D - .string "They appear in great numbers at electric\n" - .string "power plants. Because they feed on\n" - .string "electricity, they cause massive and\n" - .string "chaotic blackouts in nearby cities.$" - -gExeggcutePokedexText:: @ 8560F01 - .string "It consists of six eggs that care for each\n" - .string "other. The eggs attract each other and\n" - .string "spin around. When cracks increasingly\n" - .string "appear, it is close to evolution.$" - -gExeggutorPokedexText:: @ 8560F9B - .string "Originally from the tropics, EXEGGUTOR’s\n" - .string "heads grow larger from exposure to strong\n" - .string "sunlight. It is said that when the heads\n" - .string "fall, they group to form an EXEGGCUTE.$" - -gCubonePokedexText:: @ 856103E - .string "It pines for the mother it will never see\n" - .string "again. Seeing a likeness of its mother in\n" - .string "the full moon, it cries. The stains on the\n" - .string "skull it wears are from its tears.$" - -gMarowakPokedexText:: @ 85610E0 - .string "A MAROWAK is the evolved form of a CUBONE\n" - .string "that has grown tough by overcoming the\n" - .string "grief of losing its mother. Its tempered\n" - .string "and hardened spirit is not easily broken.$" - -gHitmonleePokedexText:: @ 8561184 - .string "Its legs freely stretch and contract.\n" - .string "Using these springlike limbs, it bowls over\n" - .string "foes with devastating kicks. After battle,\n" - .string "it rubs down its tired legs.$" - -gHitmonchanPokedexText:: @ 856121E - .string "A HITMONCHAN is said to possess the\n" - .string "spirit of a boxer who aimed to become the\n" - .string "world champion. Having an indomitable\n" - .string "spirit means that it will never give up.$" - -gLickitungPokedexText:: @ 85612BB - .string "Whenever it sees something unfamiliar,\n" - .string "it always licks the object because it\n" - .string "memorizes things by texture and taste.\n" - .string "It is somewhat put off by sour things.$" - -gKoffingPokedexText:: @ 8561356 - .string "Getting up close to a KOFFING will give\n" - .string "you a chance to observe, through its thin\n" - .string "skin, the toxic gases swirling inside. It\n" - .string "blows up at the slightest stimulation.$" - -gWeezingPokedexText:: @ 85613F9 - .string "By diluting its toxic gases with a special\n" - .string "process, the highest grade of perfume can\n" - .string "be extracted. To WEEZING, gases emanating\n" - .string "from garbage are the ultimate feast.$" - -gRhyhornPokedexText:: @ 856149D - .string "Once it starts running, it doesn’t stop.\n" - .string "Its tiny brain makes it so stupid that it\n" - .string "can’t remember why it started running in\n" - .string "the first place.$" - -gRhydonPokedexText:: @ 856152A - .string "Its horn, which rotates like a drill,\n" - .string "destroys tall buildings with one strike.\n" - .string "It stands on its hind legs, and its brain\n" - .string "is well developed.$" - -gChanseyPokedexText:: @ 85615B6 - .string "CHANSEY lay nutritionally excellent eggs\n" - .string "every day. The eggs are so delicious, they\n" - .string "are eagerly devoured by even those people\n" - .string "who have lost their appetite.$" - -gTangelaPokedexText:: @ 8561652 - .string "Its vines snap off easily and painlessly\n" - .string "if they are grabbed, allowing it to make a\n" - .string "quick getaway. The lost vines are replaced\n" - .string "by new growth the very next day.$" - -gKangaskhanPokedexText:: @ 85616F2 - .string "If you come across a young KANGASKHAN\n" - .string "playing by itself, never try to catch it.\n" - .string "The baby’s parent is sure to be in the area,\n" - .string "and it will become violently enraged.$" - -gHorseaPokedexText:: @ 8561795 - .string "By cleverly flicking the fins on its back\n" - .string "side to side, it moves in any direction\n" - .string "while facing forward. It spits ink to\n" - .string "escape if it senses danger.$" - -gSeadraPokedexText:: @ 8561829 - .string "The poisonous barbs all over its body are\n" - .string "highly valued as ingredients for making\n" - .string "traditional herbal medicine. It shows no\n" - .string "mercy to anything approaching its nest.$" - -gGoldeenPokedexText:: @ 85618CC - .string "In the springtime, schools of GOLDEEN\n" - .string "can be seen swimming up falls and rivers.\n" - .string "It metes out staggering damage with its\n" - .string "single horn.$" - -gSeakingPokedexText:: @ 8561951 - .string "It punches holes in boulders on stream-\n" - .string "beds. This is a clever innovation that\n" - .string "prevents its eggs from being attacked or\n" - .string "washed away by the current.$" - -gStaryuPokedexText:: @ 85619E5 - .string "It gathers with others in the night and\n" - .string "makes its red core glow on and off with\n" - .string "the twinkling stars. It can regenerate\n" - .string "limbs if they are severed from its body.$" - -gStarmiePokedexText:: @ 8561A85 - .string "People in ancient times imagined that\n" - .string "STARMIE were transformed from the\n" - .string "reflections of stars that twinkled on\n" - .string "gentle waves at night.$" - -gMrmimePokedexText:: @ 8561B0A - .string "A MR. MIME is a master of pantomime. It can\n" - .string "convince others that something unseeable\n" - .string "actually exists. Once believed, the\n" - .string "imaginary object does become real.$" - -gScytherPokedexText:: @ 8561BA6 - .string "Its blindingly fast speed adds to the\n" - .string "sharpness of its twin forearm scythes.\n" - .string "The scythes can slice through thick logs\n" - .string "in one wicked stroke.$" - -gJynxPokedexText:: @ 8561C32 - .string "A JYNX sashays rhythmically as if it were\n" - .string "dancing. Its motions are so bouncingly\n" - .string "alluring, people seeing it are compelled to\n" - .string "shake their hips without noticing.$" - -gElectabuzzPokedexText:: @ 8561CD2 - .string "When a storm approaches, it competes with\n" - .string "others to scale heights that are likely to\n" - .string "be stricken by lightning. Some towns use\n" - .string "ELECTABUZZ in place of lightning rods.$" - -gMagmarPokedexText:: @ 8561D77 - .string "In battle, it blows out intense flames from\n" - .string "all over its body to intimidate its foe.\n" - .string "These fiery bursts create heat waves that\n" - .string "ignite grass and trees in the area.$" - -gPinsirPokedexText:: @ 8561E1A - .string "Their pincers are strong enough to\n" - .string "shatter thick logs. Because they dislike\n" - .string "cold, PINSIR burrow and sleep under\n" - .string "the ground on chilly nights.$" - -gTaurosPokedexText:: @ 8561EA7 - .string "It is not satisfied unless it is rampaging\n" - .string "at all times. If there is no opponent for\n" - .string "TAUROS to battle, it will charge at thick\n" - .string "trees and knock them down to calm itself.$" - -gMagikarpPokedexText:: @ 8561F50 - .string "Its swimming muscles are weak, so it is\n" - .string "easily washed away by currents. In places\n" - .string "where water pools, you can see many\n" - .string "MAGIKARP deposited there by the flow.$" - -gGyaradosPokedexText:: @ 8561FEC - .string "It is an extremely vicious and violent\n" - .string "POKéMON. When humans begin to fight,\n" - .string "it will appear and burn everything to the\n" - .string "ground with intensely hot flames.$" - -gLaprasPokedexText:: @ 8562084 - .string "People have driven LAPRAS almost to the\n" - .string "point of extinction. In the evenings,\n" - .string "it is said to sing plaintively as it seeks\n" - .string "what few others of its kind still remain.$" - -gDittoPokedexText:: @ 8562127 - .string "A DITTO rearranges its cell structure to\n" - .string "transform itself. However, if it tries to\n" - .string "change based on its memory, it will get\n" - .string "details wrong.$" - -gEeveePokedexText:: @ 85621B1 - .string "An EEVEE has an unstable genetic makeup\n" - .string "that suddenly mutates due to its\n" - .string "environment. Radiation from various\n" - .string "STONES causes this POKéMON to evolve.$" - -gVaporeonPokedexText:: @ 8562244 - .string "VAPOREON underwent a spontaneous\n" - .string "mutation and grew fins and gills that\n" - .string "allow them to live underwater. They have\n" - .string "the ability to freely control water.$" - -gJolteonPokedexText:: @ 85622D9 - .string "Its cells generate weak power that is\n" - .string "amplified by its fur’s static electricity\n" - .string "to drop thunderbolts. The bristling fur is\n" - .string "made of electrically charged needles.$" - -gFlareonPokedexText:: @ 856237A - .string "FLAREON’s fluffy fur releases heat into\n" - .string "the air so that its body does not get\n" - .string "excessively hot. Its body temperature can\n" - .string "rise to a maximum of 1,650 degrees F.$" - -gPorygonPokedexText:: @ 8562418 - .string "It is capable of reverting itself entirely\n" - .string "back to program data in order to enter\n" - .string "cyberspace. A PORYGON is copy-\n" - .string "protected so it cannot be duplicated.$" - -gOmanytePokedexText:: @ 85624AF - .string "One of the ancient and long-since-extinct\n" - .string "POKéMON that have been regenerated\n" - .string "from fossils by humans. If attacked,\n" - .string "it withdraws into its hard shell.$" - -gOmastarPokedexText:: @ 8562543 - .string "An OMASTAR uses its tentacles to capture\n" - .string "its prey. It is believed to have become\n" - .string "extinct because its shell grew too large,\n" - .string "making its movements slow and ponderous.$" - -gKabutoPokedexText:: @ 85625E7 - .string "It is a POKéMON that has been regenerated\n" - .string "from a fossil. However, in rare cases, living\n" - .string "examples have been discovered. KABUTO\n" - .string "have not changed for 300 million years.$" - -gKabutopsPokedexText:: @ 856268D - .string "KABUTOPS once swam underwater to hunt \n" - .string "for prey. It was apparently evolving from\n" - .string "being a water dweller to living on land as\n" - .string "evident from changes in its gills and legs.$" - -gAerodactylPokedexText:: @ 8562735 - .string "AERODACTYL is a POKéMON from the age\n" - .string "of dinosaurs. It was regenerated from DNA\n" - .string "extracted from amber. It is imagined to\n" - .string "have been the king of the skies.$" - -gSnorlaxPokedexText:: @ 85627CD - .string "SNORLAX’s typical day consists of nothing\n" - .string "more than eating and sleeping. It is such\n" - .string "a docile POKéMON that there are children\n" - .string "who use its big belly as a place to play.$" - -gArticunoPokedexText:: @ 8562874 - .string "ARTICUNO is a legendary bird POKéMON that\n" - .string "can control ice. The flapping of its wings\n" - .string "chills the air. As a result, it is said that\n" - .string "when this POKéMON flies, snow will fall.$" - -gZapdosPokedexText:: @ 856291F - .string "ZAPDOS is a legendary bird POKéMON that\n" - .string "has the ability to control electricity.\n" - .string "It usually lives in thunderclouds. It gains\n" - .string "power if it is stricken by lightning bolts.$" - -gMoltresPokedexText:: @ 85629C7 - .string "MOLTRES is a legendary bird POKéMON\n" - .string "that can control fire. If injured, it is said\n" - .string "to dip its body in the molten magma of\n" - .string "a volcano to burn and heal itself.$" - -gDratiniPokedexText:: @ 8562A63 - .string "A DRATINI continually molts and sloughs\n" - .string "off its old skin. It does so because the\n" - .string "life energy within its body steadily builds\n" - .string "to reach uncontrollable levels.$" - -gDragonairPokedexText:: @ 8562B00 - .string "A DRAGONAIR stores an enormous amount of\n" - .string "energy inside its body. It is said to alter\n" - .string "the weather around it by loosing energy\n" - .string "from the crystals on its neck and tail.$" - -gDragonitePokedexText:: @ 8562BA5 - .string "It can circle the globe in just 16 hours.\n" - .string "It is a kindhearted POKéMON that leads\n" - .string "lost and foundering ships in a storm\n" - .string "to the safety of land.$" - -gMewtwoPokedexText:: @ 8562C32 - .string "A POKéMON that was created by genetic\n" - .string "manipulation. However, even though the\n" - .string "scientific power of humans made its body,\n" - .string "they failed to give it a warm heart.$" - -gMewPokedexText:: @ 8562CCE - .string "A MEW is said to possess the genes of all\n" - .string "POKéMON. It is capable of making itself\n" - .string "invisible at will, so it entirely avoids\n" - .string "notice even if it approaches people.$" - -gChikoritaPokedexText:: @ 8562D6E - .string "It waves its leaf around to keep foes\n" - .string "at bay. However, a sweet fragrance also\n" - .string "wafts from the leaf, creating a friendly\n" - .string "atmosphere that becalms the battlers.$" - -gBayleefPokedexText:: @ 8562E0B - .string "A BAYLEEF’s neck is ringed by curled-up\n" - .string "leaves. Inside each leaf is a small tree\n" - .string "shoot. The fragrance of this shoot\n" - .string "makes people peppy.$" - -gMeganiumPokedexText:: @ 8562E93 - .string "The fragrance of a MEGANIUM’s flower\n" - .string "soothes and calms emotions. In battle,\n" - .string "it gives off more of its becalming scent\n" - .string "to blunt the foe’s fighting spirit.$" - -gCyndaquilPokedexText:: @ 8562F2C - .string "It flares flames from its back to protect\n" - .string "itself. The fire burns vigorously if the\n" - .string "POKéMON is angry. When it is tired,\n" - .string "it sputters with incomplete combustion.$" - -gQuilavaPokedexText:: @ 8562FCB - .string "It intimidates foes with intense gusts of\n" - .string "flames and superheated air. Its quick\n" - .string "nimbleness lets it dodge attacks even\n" - .string "while scorching an enemy.$" - -gTyphlosionPokedexText:: @ 856305B - .string "It can hide behind a shimmering heat haze\n" - .string "that it creates using its intense flames.\n" - .string "TYPHLOSION create blazing explosive\n" - .string "blasts that burn everything to cinders.$" - -gTotodilePokedexText:: @ 85630FB - .string "Despite its small body, TOTODILE’s jaws\n" - .string "are very powerful. While it may think it is\n" - .string "just playfully nipping, its bite has enough\n" - .string "strength to cause serious injury.$" - -gCroconawPokedexText:: @ 856319D - .string "Once its jaws clamp down on its foe, it will\n" - .string "absolutely not let go. Because the tips of\n" - .string "its fangs are forked back like fishhooks,\n" - .string "they become irremovably embedded.$" - -gFeraligatrPokedexText:: @ 8563241 - .string "It opens its huge mouth to intimidate\n" - .string "enemies. In battle, it runs using its thick\n" - .string "and powerful hind legs to charge the\n" - .string "foe with incredible speed.$" - -gSentretPokedexText:: @ 85632D3 - .string "They take turns standing guard when it\n" - .string "is time to sleep. The sentry awakens the\n" - .string "others if it senses danger. If one becomes\n" - .string "separated, it turns sleepless with fear.$" - -gFurretPokedexText:: @ 8563377 - .string "A FURRET has a very slim build. When under\n" - .string "attack, it can squirm through narrow\n" - .string "spaces and get away. In spite of its short\n" - .string "limbs, it is very nimble and fleet.$" - -gHoothootPokedexText:: @ 8563416 - .string "It has an internal organ that senses\n" - .string "the earth’s rotation. Using this special\n" - .string "organ, a HOOTHOOT begins hooting at\n" - .string "precisely the same time every day.$" - -gNoctowlPokedexText:: @ 85634AB - .string "It unfailingly catches prey in darkness.\n" - .string "NOCTOWL owe their success to superior\n" - .string "vision that allows them to see in minimal\n" - .string "light, and to their supple and silent wings.$" - -gLedybaPokedexText:: @ 8563551 - .string "LEDYBA communicate using a fluid that\n" - .string "they secrete from where the legs join the\n" - .string "body. They are said to convey feelings to\n" - .string "others by altering the fluid’s scent.$" - -gLedianPokedexText:: @ 85635F1 - .string "It is said that in lands with clean air,\n" - .string "where the stars fill the sky, there live\n" - .string "many LEDIAN. For good reason, they use\n" - .string "the light of the stars as energy.$" - -gSpinarakPokedexText:: @ 856368C - .string "The web it spins can be considered its\n" - .string "second nervous system. It is said that a\n" - .string "SPINARAK determines its prey by the tiny\n" - .string "vibrations it feels through the web.$" - -gAriadosPokedexText:: @ 856372A - .string "Its feet are tipped with tiny hooked claws\n" - .string "that enable it to scuttle on ceilings and\n" - .string "vertical walls. It constricts its foe with\n" - .string "thin and strong silk webbing.$" - -gCrobatPokedexText:: @ 85637C8 - .string "Over the course of evolution, its hind legs\n" - .string "turned into wings. By alternately resting\n" - .string "its front and rear wings, it can fly all day\n" - .string "without having to stop.$" - -gChinchouPokedexText:: @ 8563863 - .string "When it senses danger, it discharges\n" - .string "positive and negative electricity from its\n" - .string "two antennae. It lives in depths beyond\n" - .string "sunlight’s reach.$" - -gLanturnPokedexText:: @ 85638ED - .string "The light-emitting orbs on its back are\n" - .string "very bright. They are formed from a part of\n" - .string "its dorsal fin. This POKéMON illuminates\n" - .string "the inky darkness of deep seas.$" - -gPichuPokedexText:: @ 856398A - .string "It is still inept at retaining electricity.\n" - .string "When it is startled, it discharges power\n" - .string "accidentally. It gets better at holding\n" - .string "power as it grows older.$" - -gCleffaPokedexText:: @ 8563A20 - .string "On nights with many shooting stars,\n" - .string "CLEFFA can be seen dancing in a ring.\n" - .string "They dance until daybreak, when they\n" - .string "quench their thirst with the morning dew.$" - -gIgglybuffPokedexText:: @ 8563AB9 - .string "Its soft and pliable body is very bouncy.\n" - .string "When it sings continuously with all its\n" - .string "might, its body steadily turns a deepening\n" - .string "pink color.$" - -gTogepiPokedexText:: @ 8563B42 - .string "As its energy, it uses the feelings of\n" - .string "compassion and pleasure exuded by\n" - .string "people and POKéMON. It stores up happy\n" - .string "feelings in its shell, then shares them out.$" - -gTogeticPokedexText:: @ 8563BDF - .string "It is said to be a POKéMON that brings good\n" - .string "fortune. When it spots someone who is pure\n" - .string "of heart, a TOGETIC appears and shares its\n" - .string "happiness with that person.$" - -gNatuPokedexText:: @ 8563C7D - .string "It runs up short trees that grow on the\n" - .string "savanna to peck at new shoots.\n" - .string "A NATU’s eyes look as if they are\n" - .string "always observing something.$" - -gXatuPokedexText:: @ 8563D02 - .string "It has the enigmatic power of foreseeing\n" - .string "the future. Some people in different lands\n" - .string "have long believed that XATU are\n" - .string "emissaries from another world.$" - -gMareepPokedexText:: @ 8563D96 - .string "Its fluffy wool rubs together and builds\n" - .string "a static charge. The more energy is\n" - .string "charged, the more brightly the lightbulb\n" - .string "at the tip of its tail glows.$" - -gFlaaffyPokedexText:: @ 8563E2A - .string "Its fleece quality changes to generate\n" - .string "strong static electricity with a small\n" - .string "amount of wool. The bare, slick parts of its\n" - .string "hide are shielded against electricity.$" - -gAmpharosPokedexText:: @ 8563ECC - .string "It gives off so much light that it can be\n" - .string "seen even from space. People in the old\n" - .string "days used its light to send signals back\n" - .string "and forth with others far away.$" - -gBellossomPokedexText:: @ 8563F67 - .string "Its flower petals deepen in color through\n" - .string "exposure to sunlight. When cloudy weather\n" - .string "persists, it does a dance that is thought\n" - .string "to be a ritual for summoning the sun.$" - -gMarillPokedexText:: @ 856400B - .string "Its body is covered with water-repellent\n" - .string "fur. Because of the fur, it can swim\n" - .string "through water at high speed without being\n" - .string "slowed by the water’s resistance.$" - -gAzumarillPokedexText:: @ 85640A5 - .string "It lives in water virtually all day long.\n" - .string "Its body color and pattern act as\n" - .string "camouflage that makes it tough for\n" - .string "enemies to spot in water.$" - -gSudowoodoPokedexText:: @ 856412E - .string "It mimics a tree to avoid being attacked\n" - .string "by enemies. But since its forelegs\n" - .string "remain green throughout the year, it is\n" - .string "easily identified as a fake in the winter.$" - -gPolitoedPokedexText:: @ 85641CD - .string "The curled hair on its head proves its\n" - .string "status as a king. It is said that the\n" - .string "longer and curlier the hair, the more\n" - .string "respect it earns from its peers.$" - -gHoppipPokedexText:: @ 8564261 - .string "This POKéMON drifts and floats with the\n" - .string "wind. If it senses the approach of strong\n" - .string "winds, a HOPPIP links leaves with others\n" - .string "to prepare against being blown away.$" - -gSkiploomPokedexText:: @ 8564301 - .string "It blossoms when the temperature rises\n" - .string "above 64 degrees F. Because its flower’s\n" - .string "blooming changes with the temperature,\n" - .string "it is sometimes used as a thermometer.$" - -gJumpluffPokedexText:: @ 856439F - .string "JUMPLUFF ride warm southern winds to\n" - .string "cross the sea and fly to foreign lands.\n" - .string "This POKéMON lands when it encounters\n" - .string "cold air while it is floating.$" - -gAipomPokedexText:: @ 8564431 - .string "Its tail ends with a dexterous, handlike\n" - .string "appendage. However, because it uses the\n" - .string "tail so much, AIPOM’s real hands have\n" - .string "become rather clumsy.$" - -gSunkernPokedexText:: @ 85644BE - .string "SUNKERN try to minimize movement to\n" - .string "conserve the nutrients they have stored\n" - .string "in their bodies for evolution. They will\n" - .string "not eat, subsisting only on morning dew.$" - -gSunfloraPokedexText:: @ 856455C - .string "SUNFLORA convert solar energy into\n" - .string "nutrition. They are highly active in the\n" - .string "warm daytime but suddenly stop moving as\n" - .string "soon as the sun sets.$" - -gYanmaPokedexText:: @ 85645E7 - .string "It can see 360 degrees without moving\n" - .string "its eyes. It is a great flier capable of\n" - .string "making sudden stops and turning midair to\n" - .string "quickly chase down targeted prey.$" - -gWooperPokedexText:: @ 8564682 - .string "WOOPER usually live in water but come\n" - .string "out onto land seeking food occasionally.\n" - .string "On land, they coat their bodies with a\n" - .string "gooey, toxic film.$" - -gQuagsirePokedexText:: @ 856470B - .string "A QUAGSIRE hunts by leaving its mouth wide\n" - .string "open in water and waiting for its prey to\n" - .string "blunder in. Because it doesn’t move, it\n" - .string "does not get very hungry.$" - -gEspeonPokedexText:: @ 85647A2 - .string "An ESPEON is extremely loyal to any\n" - .string "TRAINER it considers to be worthy. It is\n" - .string "said to have developed precognitive\n" - .string "powers to protect its TRAINER from harm.$" - -gUmbreonPokedexText:: @ 856483C - .string "UMBREON evolved from exposure to the\n" - .string "moon’s energy pulses. It lurks in darkness\n" - .string "and waits for its foes to move. The rings\n" - .string "on its body glow when it leaps to attack.$" - -gMurkrowPokedexText:: @ 85648E0 - .string "MURKROW were feared as the alleged\n" - .string "bearers of ill fortune. It shows strong\n" - .string "interest in anything that sparkles. It will\n" - .string "even try to steal rings from women.$" - -gSlowkingPokedexText:: @ 856497B - .string "It undertakes research every day to\n" - .string "solve the mysteries of the world.\n" - .string "However, it apparently forgets everything\n" - .string "if the SHELLDER on its head comes off.$" - -gMisdreavusPokedexText:: @ 8564A12 - .string "A MISDREAVUS frightens people with a\n" - .string "creepy, sobbing cry. It apparently uses\n" - .string "its red spheres to absorb the fear of foes\n" - .string "as its nutrition.$" - -gUnownPokedexText:: @ 8564A9C - .string "This POKéMON is shaped like ancient text\n" - .string "characters. Although research is ongoing,\n" - .string "it is a mystery as to which came first,\n" - .string "the ancient writings or the various UNOWN.$" - -gWobbuffetPokedexText:: @ 8564B42 - .string "Usually docile, a WOBBUFFET strikes back\n" - .string "ferociously if its black tail is attacked.\n" - .string "It makes its lair in caves where it waits\n" - .string "for nightfall.$" - -gGirafarigPokedexText:: @ 8564BCF - .string "A GIRAFARIG is an herbivore--it eats\n" - .string "grass and tree shoots. While it is eating,\n" - .string "its tail makes chewing and swallowing\n" - .string "motions as if it were also eating.$" - -gPinecoPokedexText:: @ 8564C68 - .string "A PINECO hangs from a tree branch and\n" - .string "waits for prey. While eating, if it is\n" - .string "disturbed by someone shaking its tree, it\n" - .string "falls on the ground and suddenly explodes.$" - -gForretressPokedexText:: @ 8564D0A - .string "It keeps itself inside its steel shell.\n" - .string "The shell is opened when it is catching\n" - .string "prey, but it is so quick that the shell’s\n" - .string "inside cannot be seen.$" - -gDunsparcePokedexText:: @ 8564D9B - .string "Its drill-tipped tail is used to burrow into\n" - .string "the ground backwards. This POKéMON is\n" - .string "known to make its nest in complex shapes\n" - .string "deep under the ground.$" - -gGligarPokedexText:: @ 8564E2E - .string "It glides without making a single sound.\n" - .string "It grasps the face of its foe using its\n" - .string "hind and large front claws, then stabs\n" - .string "with its poison barb.$" - -gSteelixPokedexText:: @ 8564EBC - .string "STEELIX live even further underground\n" - .string "than ONIX. This POKéMON is known to dig\n" - .string "toward the earth’s core, reaching a depth\n" - .string "of over six-tenths of a mile underground.$" - -gSnubbullPokedexText:: @ 8564F5E - .string "By baring its fangs and making a scary\n" - .string "face, it sends smaller POKéMON scurrying\n" - .string "in terror. The SNUBBULL does seem a\n" - .string "little sad at making its foes flee.$" - -gGranbullPokedexText:: @ 8564FF6 - .string "It has a particularly well-developed lower\n" - .string "jaw. The huge fangs are heavy, causing\n" - .string "it to tilt its head. Unless it is startled, it\n" - .string "will not try to bite.$" - -gQwilfishPokedexText:: @ 856508D - .string "A QWILFISH uses the pressure of water\n" - .string "it swallows to shoot toxic quills all at\n" - .string "once from all over its body. It finds\n" - .string "swimming to be somewhat challenging.$" - -gScizorPokedexText:: @ 8565127 - .string "A SCIZOR has a body with the hardness of\n" - .string "steel. It is not easily fazed by ordinary\n" - .string "sorts of attacks. It flaps its wings to\n" - .string "regulate its body temperature.$" - -gShucklePokedexText:: @ 85651C1 - .string "A SHUCKLE hides under rocks, keeping its\n" - .string "body concealed inside its shell while\n" - .string "eating stored berries. The berries mix with\n" - .string "its body fluids to become a juice.$" - -gHeracrossPokedexText:: @ 856525F - .string "They gather in forests seeking the sweet\n" - .string "sap of trees. It is completely clad in a\n" - .string "steel-hard shell. It is proud of its horn,\n" - .string "which it uses to fling foes.$" - -gSneaselPokedexText:: @ 85652F9 - .string "A SNEASEL scales trees by punching its\n" - .string "hooked claws into the bark. It seeks out\n" - .string "unguarded nests and steals eggs for food\n" - .string "while the parents are away.$" - -gTeddiursaPokedexText:: @ 856538E - .string "It licks its palms that are sweetened by\n" - .string "being soaked in honey. A TEDDIURSA makes\n" - .string "its own honey by blending fruits and pollen\n" - .string "collected by BEEDRILL.$" - -gUrsaringPokedexText:: @ 8565423 - .string "In forests, it is said that there are many\n" - .string "streams and towering trees where an\n" - .string "URSARING gathers food. It walks through\n" - .string "its forest collecting food every day.$" - -gSlugmaPokedexText:: @ 85654C0 - .string "It is a species of POKéMON that lives in\n" - .string "volcanic areas. If its body cools, its skin\n" - .string "hardens and immobilizes it. To avoid that,\n" - .string "it sleeps near magma.$" - -gMagcargoPokedexText:: @ 8565556 - .string "The shell on its back is made of hardened\n" - .string "magma. Tens of thousands of years spent\n" - .string "living in volcanic craters have turned\n" - .string "MAGCARGO’s bodies into magma.$" - -gSwinubPokedexText:: @ 85655ED - .string "It roots for food by rubbing its snout\n" - .string "against the ground. Its favorite food is a\n" - .string "mushroom that grows under dried grass.\n" - .string "It occasionally roots out hot springs.$" - -gPiloswinePokedexText:: @ 856568D - .string "A PILOSWINE is covered by a thick coat\n" - .string "of long hair for enduring freezing cold.\n" - .string "It uses its tusks to dig up food that has\n" - .string "been buried under ice.$" - -gCorsolaPokedexText:: @ 856571E - .string "CORSOLA live in warm southern seas.\n" - .string "If the sea becomes polluted, the beautiful\n" - .string "coral stalks become discolored and crumble\n" - .string "away in tatters.$" - -gRemoraidPokedexText:: @ 85657A9 - .string "A REMORAID uses its abdominal muscles\n" - .string "to forcefully expel swallowed water, then\n" - .string "shoot down flying prey. When evolution\n" - .string "approaches, it travels down rivers.$" - -gOctilleryPokedexText:: @ 8565844 - .string "It ensnares its foe with its suction-\n" - .string "cupped tentacles before delivering the\n" - .string "finishing blow. If the foe turns out to be\n" - .string "too strong, it spews ink to escape.$" - -gDelibirdPokedexText:: @ 85658E0 - .string "It carries food bundled up in its tail.\n" - .string "There was a famous explorer who\n" - .string "managed to scale Mt. Everest thanks\n" - .string "to a DELIBIRD sharing its food.$" - -gMantinePokedexText:: @ 856596C - .string "On sunny days, schools of MANTINE can be\n" - .string "seen elegantly leaping over the waves.\n" - .string "It is not bothered by the REMORAID that\n" - .string "hitches rides.$" - -gSkarmoryPokedexText:: @ 85659F3 - .string "A POKéMON that has a body and wings of\n" - .string "steel. People in the past used feathers\n" - .string "fallen from SKARMORY to make swords and\n" - .string "knives.$" - -gHoundourPokedexText:: @ 8565A72 - .string "HOUNDOUR communicate with each other\n" - .string "using a variety of cries to corner their\n" - .string "prey. This POKéMON’s remarkable teamwork\n" - .string "is simply unparalleled.$" - -gHoundoomPokedexText:: @ 8565B01 - .string "In a HOUNDOOM pack, the one with its horns\n" - .string "raked sharply back serves a leadership\n" - .string "role. They choose their leader by fighting\n" - .string "among themselves.$" - -gKingdraPokedexText:: @ 8565B90 - .string "It sleeps quietly, deep on the seafloor.\n" - .string "When it comes up to the surface, it\n" - .string "creates a huge whirlpool that can swallow\n" - .string "even ships.$" - -gPhanpyPokedexText:: @ 8565C13 - .string "PHANPY’s big ears serve as broad fans.\n" - .string "When it becomes hot, it flaps the ears\n" - .string "busily to cool down. Even the young are\n" - .string "very strong.$" - -gDonphanPokedexText:: @ 8565C96 - .string "A DONPHAN is so strong it can easily haul\n" - .string "a dump truck. Its hide has toughened to a\n" - .string "rock-hard state. An ordinary sort of\n" - .string "attack won’t even leave a scratch.$" - -gPorygon2PokedexText:: @ 8565D32 - .string "It was created by humans using the power\n" - .string "of science. It has been given artificial\n" - .string "intelligence that enables it to learn new\n" - .string "gestures and emotions on its own.$" - -gStantlerPokedexText:: @ 8565DD0 - .string "STANTLER’s magnificent antlers were\n" - .string "once traded at high prices as works of art.\n" - .string "As a result, this POKéMON was hunted\n" - .string "close to extinction.$" - -gSmearglePokedexText:: @ 8565E5A - .string "A SMEARGLE marks its territory using a\n" - .string "fluid that leaks out from the tip of its\n" - .string "tail. About 5,000 different marks left by\n" - .string "this POKéMON have been found.$" - -gTyroguePokedexText:: @ 8565EF2 - .string "TYROGUE become stressed out if they do\n" - .string "not get to train every day. When raising\n" - .string "this POKéMON, the TRAINER must establish\n" - .string "a regular training schedule.$" - -gHitmontopPokedexText:: @ 8565F88 - .string "Its technique of kicking while spinning is\n" - .string "a remarkable mix of both offense and\n" - .string "defense. HITMONTOP travel faster\n" - .string "spinning than they do walking.$" - -gSmoochumPokedexText:: @ 8566018 - .string "It actively runs about, but also falls\n" - .string "often. Whenever it falls, it will check its\n" - .string "reflection on a lake’s surface to make\n" - .string "sure its face hasn’t become dirty.$" - -gElekidPokedexText:: @ 85660B5 - .string "If it touches metal and discharges the\n" - .string "electricity it has stored in its body, an\n" - .string "ELEKID begins swinging its arms in circles\n" - .string "to recharge itself.$" - -gMagbyPokedexText:: @ 8566145 - .string "If a MAGBY is spouting yellow flames from\n" - .string "its mouth, it is in good health. When it is\n" - .string "fatigued, black smoke will be mixed in with\n" - .string "the flames.$" - -gMiltankPokedexText:: @ 85661D3 - .string "It gives over five gallons of milk daily.\n" - .string "Its sweet milk is enjoyed by children and\n" - .string "grown-ups alike. People who can’t drink\n" - .string "milk turn it into yogurt and eat it instead.$" - -gBlisseyPokedexText:: @ 856627C - .string "If it senses sadness with its fluffy fur,\n" - .string "a BLISSEY will rush over to the sad person,\n" - .string "however far away, to share an egg of\n" - .string "happiness that brings a smile to any face.$" - -gRaikouPokedexText:: @ 8566322 - .string "RAIKOU embodies the speed of lightning.\n" - .string "Its roars send shock waves shuddering\n" - .string "through the air and ground as if\n" - .string "lightning bolts were crashing down.$" - -gEnteiPokedexText:: @ 85663B5 - .string "ENTEI embodies the passion of magma.\n" - .string "It is thought to have been born in the\n" - .string "eruption of a volcano. It blasts fire that\n" - .string "consumes all that it touches.$" - -gSuicunePokedexText:: @ 856644A - .string "SUICUNE embodies the compassion of\n" - .string "a pure spring of water. It runs across\n" - .string "the land with gliding elegance. It has the\n" - .string "power to purify dirty water.$" - -gLarvitarPokedexText:: @ 85664DC - .string "A LARVITAR is born deep under the ground.\n" - .string "It must eat its way through the soil above\n" - .string "and reach the surface for it to see its\n" - .string "parents’ faces.$" - -gPupitarPokedexText:: @ 8566569 - .string "A PUPITAR creates a gas inside its body\n" - .string "that it ejects under compression to propel\n" - .string "itself like a jet. Its body can withstand\n" - .string "a collision with solid steel.$" - -gTyranitarPokedexText:: @ 8566604 - .string "A TYRANITAR is so overwhelmingly powerful,\n" - .string "it can bring down a whole mountain to make\n" - .string "its nest. It roams in mountains seeking\n" - .string "new opponents to fight.$" - -gLugiaPokedexText:: @ 856669A - .string "LUGIA is so powerful even a light\n" - .string "fluttering of its wings can blow apart\n" - .string "houses. As a result, it chooses to live out\n" - .string "of sight deep under the sea.$" - -gHoOhPokedexText:: @ 856672C - .string "Its feathers--which glow in seven colors\n" - .string "depending on the angle at which they are\n" - .string "struck by light--are thought to bring joy.\n" - .string "It is said to live at the foot of a rainbow.$" - -gCelebiPokedexText:: @ 85667D6 - .string "This POKéMON came from the future by\n" - .string "crossing over time. It is thought that so\n" - .string "long as CELEBI appears, a bright and\n" - .string "shining future awaits us.$" - -gTreeckoPokedexText:: @ 8566864 - .string "It makes its nest in a giant tree in the\n" - .string "forest. It ferociously guards against\n" - .string "anything nearing its territory. It is said\n" - .string "to be the protector of the forest’s trees.$" - -gGrovylePokedexText:: @ 8566909 - .string "Leaves grow out of this POKéMON’s body.\n" - .string "They help obscure a GROVYLE from the eyes\n" - .string "of its enemies while it is in a thickly\n" - .string "overgrown forest.$" - -gSceptilePokedexText:: @ 8566995 - .string "In the jungle, its power is without equal.\n" - .string "This POKéMON carefully grows trees and\n" - .string "plants. It regulates its body temperature\n" - .string "by basking in sunlight.$" - -gTorchicPokedexText:: @ 8566A29 - .string "If attacked, it strikes back by spitting\n" - .string "balls of fire it forms in its stomach.\n" - .string "A TORCHIC dislikes darkness because it\n" - .string "can’t see its surroundings.$" - -gCombuskenPokedexText:: @ 8566ABC - .string "It lashes out with 10 kicks per second.\n" - .string "Its strong fighting instinct compels it\n" - .string "to keep up its offensive until the\n" - .string "opponent gives up.$" - -gBlazikenPokedexText:: @ 8566B42 - .string "It learns martial arts that use punches\n" - .string "and kicks. Every several years, its old\n" - .string "feathers burn off, and new, supple\n" - .string "feathers grow back in their place.$" - -gMudkipPokedexText:: @ 8566BD8 - .string "On land, it can powerfully lift large\n" - .string "boulders by planting its four feet and\n" - .string "heaving. It sleeps by burying itself in soil\n" - .string "at the water’s edge.$" - -gMarshtompPokedexText:: @ 8566C67 - .string "Its toughened hind legs enable it to stand\n" - .string "upright. Because it weakens if its skin\n" - .string "dries out, it replenishes fluids by playing\n" - .string "in mud.$" - -gSwampertPokedexText:: @ 8566CEE - .string "If it senses the approach of a storm and\n" - .string "a tidal wave, it protects its seaside nest\n" - .string "by piling up boulders. It swims as fast as\n" - .string "a jet ski.$" - -gPoochyenaPokedexText:: @ 8566D78 - .string "It savagely threatens foes with bared\n" - .string "fangs. It chases after fleeing targets\n" - .string "tenaciously. It turns tail and runs,\n" - .string "however, if the foe strikes back.$" - -gMightyenaPokedexText:: @ 8566E0C - .string "In the wild, MIGHTYENA live in a pack.\n" - .string "They never defy their leader’s orders.\n" - .string "They defeat foes with perfectly\n" - .string "coordinated teamwork.$" - -gZigzagoonPokedexText:: @ 8566E90 - .string "Rubbing its nose against the ground, it\n" - .string "always wanders about back and forth in\n" - .string "search of something. It is distinguished\n" - .string "by the zigzag footprints it leaves.$" - -gLinoonePokedexText:: @ 8566F2C - .string "It is exceedingly fast if it only has to run\n" - .string "in a straight line. When it spots pond-\n" - .string "dwelling prey underwater, it quickly leaps\n" - .string "in and catches it with its sharp claws.$" - -gWurmplePokedexText:: @ 8566FD4 - .string "It sticks to tree branches and eats\n" - .string "leaves. The thread it spits from its mouth,\n" - .string "which becomes gooey when it touches\n" - .string "air, slows the movement of its foes.$" - -gSilcoonPokedexText:: @ 856706D - .string "It prepares for evolution using the\n" - .string "energy it stored while it was a WURMPLE.\n" - .string "It keeps watch over the surroundings with\n" - .string "its two eyes.$" - -gBeautiflyPokedexText:: @ 85670F2 - .string "Its colorfully patterned wings are its\n" - .string "most prominent feature. It flies through\n" - .string "flower-covered fields collecting pollen.\n" - .string "It attacks ferociously when angered.$" - -gCascoonPokedexText:: @ 8567190 - .string "To avoid detection by its enemies, it hides\n" - .string "motionlessly beneath large leaves and in\n" - .string "the gaps of branches. It also attaches\n" - .string "dead leaves to its body for camouflage.$" - -gDustoxPokedexText:: @ 8567234 - .string "It is a nocturnal POKéMON that flies from\n" - .string "fields and mountains to the attraction of\n" - .string "streetlights at night. It looses highly\n" - .string "toxic powder from its wings.$" - -gLotadPokedexText:: @ 85672CD - .string "This POKéMON lives in ponds with clean\n" - .string "water. It is known to ferry small POKéMON\n" - .string "across ponds by carrying them on the\n" - .string "broad leaf on its head.$" - -gLombrePokedexText:: @ 856735B - .string "In the evening, it takes great delight in\n" - .string "popping out of rivers and startling people.\n" - .string "It feeds on aquatic moss that grows on\n" - .string "rocks in the riverbed.$" - -gLudicoloPokedexText:: @ 85673EF - .string "When it hears festive music, all the cells\n" - .string "in its body become stimulated, and it\n" - .string "begins moving in rhythm. It does not\n" - .string "quail even when it faces a tough opponent.$" - -gSeedotPokedexText:: @ 8567490 - .string "It hangs off branches and absorbs\n" - .string "nutrients. When it finishes eating, its\n" - .string "body becomes so heavy that it drops to\n" - .string "the ground with a thump.$" - -gNuzleafPokedexText:: @ 856751A - .string "A forest-dwelling POKéMON that is skilled\n" - .string "at climbing trees. Its long and pointed\n" - .string "nose is its weak point. It loses power if\n" - .string "the nose is gripped.$" - -gShiftryPokedexText:: @ 85675AB - .string "It is said to arrive on chilly, wintry winds.\n" - .string "Feared from long ago as the guardian of\n" - .string "forests, this POKéMON lives in a deep\n" - .string "forest where people do not venture.$" - -gTaillowPokedexText:: @ 856764B - .string "Although it is small, it is very courageous.\n" - .string "It will take on a larger SKARMORY on an\n" - .string "equal footing. However, its will weakens if\n" - .string "it becomes hungry.$" - -gSwellowPokedexText:: @ 85676DF - .string "A SWELLOW dives upon prey from far above.\n" - .string "It never misses its targets. It takes to\n" - .string "the skies in search of lands with a warm\n" - .string "climate.$" - -gWingullPokedexText:: @ 8567764 - .string "It makes its nest on a sheer cliff at the\n" - .string "edge of the sea. It has trouble keeping\n" - .string "its wings flapping in flight. Instead, it\n" - .string "soars on updrafts.$" - -gPelipperPokedexText:: @ 85677F3 - .string "It skims the tops of waves as it flies.\n" - .string "When it spots prey, it uses its large beak\n" - .string "to scoop up the victim with water.\n" - .string "It protects its eggs in its beak.$" - -gRaltsPokedexText:: @ 856788B - .string "A RALTS has the power to sense the\n" - .string "emotions of people and POKéMON with the\n" - .string "horns on its head. It takes cover if it\n" - .string "senses any hostility.$" - -gKirliaPokedexText:: @ 8567914 - .string "A KIRLIA has the psychic power to create \n" - .string "a rip in the dimensions and see into the\n" - .string "future. It is said to dance with pleasure\n" - .string "on sunny mornings.$" - -gGardevoirPokedexText:: @ 85679A4 - .string "It apparently does not feel the pull of\n" - .string "gravity because it supports itself with\n" - .string "psychic power. It will give its life to\n" - .string "protect its TRAINER.$" - -gSurskitPokedexText:: @ 8567A31 - .string "They gather on puddles after evening\n" - .string "downpours, gliding across the surface\n" - .string "of water as if sliding. It secretes honey\n" - .string "with a sweet aroma from its head.$" - -gMasquerainPokedexText:: @ 8567AC8 - .string "It intimidates foes with the large eyelike\n" - .string "patterns on its antennae. Because it can’t\n" - .string "fly if its wings get wet, it shelters itself\n" - .string "from rain under large trees and eaves.$" - -gShroomishPokedexText:: @ 8567B72 - .string "It loves to eat damp, composted soil in\n" - .string "forests. If you enter a forest after a\n" - .string "long rain, you can see many SHROOMISH\n" - .string "feasting on composted soil.$" - -gBreloomPokedexText:: @ 8567C03 - .string "It scatters spores from holes in the cap\n" - .string "on its head. It loves warm and humid\n" - .string "climates. It feeds on trees and plants in\n" - .string "fields and forests.$" - -gSlakothPokedexText:: @ 8567C8F - .string "It sleeps virtually all day and night long.\n" - .string "It doesn’t change its nest its entire life,\n" - .string "but it sometimes travels great distances\n" - .string "by swimming in rivers.$" - -gVigorothPokedexText:: @ 8567D27 - .string "It can’t keep still because its blood boils\n" - .string "with energy. It runs through the fields\n" - .string "and mountains all day to calm itself. If it\n" - .string "doesn’t, it can’t sleep at night.$" - -gSlakingPokedexText:: @ 8567DC9 - .string "Hordes of SLAKING gather around trees\n" - .string "when fruits come into season. They wait\n" - .string "around patiently for ripened fruits to fall\n" - .string "out of the trees.$" - -gNincadaPokedexText:: @ 8567E55 - .string "It makes its nest at the roots of a mighty\n" - .string "tree. Using its whiskerlike antennae, it\n" - .string "probes its surroundings in the\n" - .string "pitch-black darkness of soil.$" - -gNinjaskPokedexText:: @ 8567EE6 - .string "Because it darts about vigorously at high\n" - .string "speed, it is very difficult to see. Hearing\n" - .string "its distinctive cries for too long induces\n" - .string "a headache.$" - -gShedinjaPokedexText:: @ 8567F73 - .string "A peculiar POKéMON that floats in air even\n" - .string "though its wings remain completely still.\n" - .string "The inside of its body is hollow and\n" - .string "utterly dark.$" - -gWhismurPokedexText:: @ 8567FFB - .string "Its cries equal a jet plane in volume.\n" - .string "It inhales through its ear canals. Because\n" - .string "of this system, it can cry continually\n" - .string "without having to catch its breath.$" - -gLoudredPokedexText:: @ 8568098 - .string "It positions the round speakers on its\n" - .string "head to assail foes with ultrasonic waves\n" - .string "at massive volume. It builds power by\n" - .string "stomping the ground.$" - -gExploudPokedexText:: @ 8568124 - .string "It has sound-generating organs all over\n" - .string "its body. It communicates with others by\n" - .string "adjusting the tone and volume of the cries\n" - .string "it emits.$" - -gMakuhitaPokedexText:: @ 85681AA - .string "It loves to toughen up its body above all\n" - .string "else. If you hear quaking rumbles in a cave,\n" - .string "it is the sound of MAKUHITA undertaking\n" - .string "strenuous training.$" - -gHariyamaPokedexText:: @ 856823D - .string "It has the habit of challenging others\n" - .string "without hesitation to tests of strength.\n" - .string "It’s been known to stand on train tracks\n" - .string "and stop trains using forearm thrusts.$" - -gAzurillPokedexText:: @ 85682DD - .string "Its tail, which is packed with nutrition,\n" - .string "is very bouncy like a rubber ball. On sunny\n" - .string "days they gather at the edge of water and\n" - .string "splash about for fun.$" - -gNosepassPokedexText:: @ 8568373 - .string "Its body emits a powerful magnetism.\n" - .string "It feeds on prey that is pulled in by the\n" - .string "force. Its magnetism is stronger in cold\n" - .string "seasons.$" - -gSkittyPokedexText:: @ 85683F4 - .string "A SKITTY’s adorably cute behavior makes it\n" - .string "highly popular. In battle, it makes its tail\n" - .string "puff out. It threatens foes with a sharp\n" - .string "growl.$" - -gDelcattyPokedexText:: @ 856847C - .string "Rather than keeping a permanent lair,\n" - .string "it habitually seeks comfortable spots and\n" - .string "sleeps there. It is nocturnal and becomes\n" - .string "active at dusk.$" - -gSableyePokedexText:: @ 8568506 - .string "It digs branching holes in caves using its\n" - .string "sharp claws in search of food--raw gems.\n" - .string "A SABLEYE lurks in darkness and is seen\n" - .string "only rarely.$" - -gMawilePokedexText:: @ 856858F - .string "Its giant jaws are actually steel horns\n" - .string "that transformed. It fools foes into\n" - .string "complacency with its adorable gestures,\n" - .string "then chomps them with its huge jaws.$" - -gAronPokedexText:: @ 8568629 - .string "A POKéMON that is clad in steel armor.\n" - .string "A new suit of armor is made when it evolves.\n" - .string "The old, discarded armor is salvaged as\n" - .string "metal for making iron products.$" - -gLaironPokedexText:: @ 85686C5 - .string "When two LAIRON meet in the wild, they\n" - .string "fight for territory by bashing into each\n" - .string "other with their steel bodies. The sound\n" - .string "of their collision carries for miles.$" - -gAggronPokedexText:: @ 8568764 - .string "Its iron horns grow longer a little at\n" - .string "a time. They are used to determine the\n" - .string "AGGRON’s age. The gouges in its armor are\n" - .string "worn with pride as mementos from battles.$" - -gMedititePokedexText:: @ 8568806 - .string "It continually meditates for hours every\n" - .string "day. As a result of rigorous and dedicated\n" - .string "yoga training, it has tempered its\n" - .string "spiritual power so much it can fly.$" - -gMedichamPokedexText:: @ 85688A1 - .string "Through crushingly harsh yoga training, it\n" - .string "gained the power to foretell its foe’s\n" - .string "actions. It battles with elegant, dance-\n" - .string "like movement.$" - -gElectrikePokedexText:: @ 856892B - .string "It generates electricity using friction\n" - .string "from the atmosphere. In seasons with\n" - .string "especially arid air, its entire body blazes\n" - .string "with violent showers of sparks.$" - -gManectricPokedexText:: @ 85689C4 - .string "Because lightning falls in their vicinities,\n" - .string "MANECTRIC were thought to have been born\n" - .string "from lightning. In battle, they create\n" - .string "thunderclouds.$" - -gPluslePokedexText:: @ 8568A50 - .string "It has the trait of cheering on its fellow\n" - .string "POKéMON. By shorting out the electricity\n" - .string "it releases from its paws, it creates\n" - .string "pom-poms for cheering.$" - -gMinunPokedexText:: @ 8568AE1 - .string "At a meeting of POKéMON academics, it was\n" - .string "announced that simultaneous exposure to\n" - .string "electricity from a PLUSLE and MINUN will\n" - .string "promote circulation and boost vitality.$" - -gVolbeatPokedexText:: @ 8568B84 - .string "With their taillights lit, VOLBEAT fly in\n" - .string "a swarm, drawing geometric designs in the\n" - .string "night sky. They move their nests if their\n" - .string "pond water becomes dirty.$" - -gIllumisePokedexText:: @ 8568C1C - .string "A nocturnal POKéMON that becomes active\n" - .string "upon nightfall. It leads a VOLBEAT swarm\n" - .string "to draw patterns in the night sky. Over 200\n" - .string "different patterns have been confirmed.$" - -gRoseliaPokedexText:: @ 8568CC1 - .string "A ROSELIA that drinks nutritionally rich\n" - .string "springwater blooms with lovely flowers.\n" - .string "The fragrance of its flowers has the\n" - .string "effect of making its foes careless.$" - -gGulpinPokedexText:: @ 8568D5B - .string "This POKéMON’s stomach fluid can even\n" - .string "digest scrap iron. In one gulp, it can\n" - .string "swallow something that is as large as\n" - .string "itself.$" - -gSwalotPokedexText:: @ 8568DD6 - .string "Its powerful stomach acid is capable of\n" - .string "digesting almost anything. The one thing\n" - .string "in the whole world a SWALOT can’t digest is\n" - .string "its own stomach.$" - -gCarvanhaPokedexText:: @ 8568E64 - .string "CARVANHA attack ships in swarms, making\n" - .string "them sink. Although it is said to be a very\n" - .string "vicious POKéMON, it timidly flees as soon\n" - .string "as it finds itself alone.$" - -gSharpedoPokedexText:: @ 8568EFC - .string "The vicious and sly gangster of the sea.\n" - .string "Its skin is specially textured to minimize\n" - .string "drag in water. Its speed tops out at over\n" - .string "75 miles per hour.$" - -gWailmerPokedexText:: @ 8568F8D - .string "While this POKéMON usually lives in the sea,\n" - .string "it can survive on land, although not too\n" - .string "long. It loses vitality if its body becomes\n" - .string "dried out.$" - -gWailordPokedexText:: @ 856901A - .string "It breathes through nostrils that it\n" - .string "raises above the sea. By inhaling to its\n" - .string "maximum capacity, a WAILORD can dive close\n" - .string "to 10,000 feet beneath the waves.$" - -gNumelPokedexText:: @ 85690B5 - .string "A NUMEL stores boiling magma in the hump\n" - .string "on its back. It is a hardy POKéMON that can\n" - .string "transport a 220-pound load. It has served\n" - .string "humans at work since long ago.$" - -gCameruptPokedexText:: @ 8569153 - .string "A POKéMON that lives in the crater of\n" - .string "a volcano. Every 10 years, the volcanoes\n" - .string "on its back erupt violently. Research is\n" - .string "under way on the cause of eruption.$" - -gTorkoalPokedexText:: @ 85691EF - .string "It battles using energy it gets from\n" - .string "burning coal. When loosing smoke from its\n" - .string "nostrils, it lets off a sound that is\n" - .string "similar to a locomotive’s horn.$" - -gSpoinkPokedexText:: @ 8569284 - .string "A POKéMON that manipulates psychic power\n" - .string "at will. It doesn’t stop bouncing even when\n" - .string "it is asleep. It loves eating mushrooms\n" - .string "that grow underground.$" - -gGrumpigPokedexText:: @ 8569318 - .string "It stores power in the black pearls on its\n" - .string "forehead. When it uses psychic power, it\n" - .string "performs an odd dance step. Its style of\n" - .string "dancing became hugely popular overseas.$" - -gSpindaPokedexText:: @ 85693BD - .string "It is distinguished by a pattern of\n" - .string "spots that is always different. Its\n" - .string "unsteady, tottering walk has the\n" - .string "effect of fouling its foe’s aim.$" - -gTrapinchPokedexText:: @ 8569447 - .string "Its big jaws crunch through boulders.\n" - .string "Because its head is so big, it has a hard\n" - .string "time getting back upright if it tips over\n" - .string "onto its back.$" - -gVibravaPokedexText:: @ 85694D0 - .string "It looses ultrasonic waves by rubbing its\n" - .string "wings together. Since a VIBRAVA’s wings\n" - .string "are still in the process of growing, it can\n" - .string "only fly short distances.$" - -gFlygonPokedexText:: @ 8569568 - .string "The flapping of its wings sounds like\n" - .string "singing. To prevent detection by enemies,\n" - .string "it hides itself by flapping up a cloud of\n" - .string "desert sand.$" - -gCacneaPokedexText:: @ 85695EF - .string "CACNEA live in deserts with virtually no\n" - .string "rainfall. It battles by swinging its thick,\n" - .string "spiked arms. Once a year, a yellow flower\n" - .string "blooms.$" - -gCacturnePokedexText:: @ 8569676 - .string "After spending thousands of years in\n" - .string "harsh deserts, its blood transformed into\n" - .string "the same substances as sand. It is\n" - .string "nocturnal, so it hunts at night.$" - -gSwabluPokedexText:: @ 8569709 - .string "A POKéMON that has wings like cottony\n" - .string "clouds. After enduring winter, in which\n" - .string "little food is available, SWABLU flocks\n" - .string "move closer to towns in the spring.$" - -gAltariaPokedexText:: @ 85697A3 - .string "It hums in a beautiful soprano voice.\n" - .string "It flies among white clouds in the blue\n" - .string "sky. It launches intensely hot fireballs\n" - .string "from its mouth.$" - -gZangoosePokedexText:: @ 856982A - .string "When it battles, it stands on its hind legs\n" - .string "and attacks with its sharply clawed\n" - .string "forelegs. Its fur bristles if it encounters\n" - .string "any SEVIPER.$" - -gSeviperPokedexText:: @ 85698B3 - .string "SEVIPER and ZANGOOSE are eternal rivals.\n" - .string "It counters a ZANGOOSE’s dazzling agility\n" - .string "with its swordlike tail, which also oozes\n" - .string "a horrible poison.$" - -gLunatonePokedexText:: @ 8569943 - .string "It becomes very active on the night of\n" - .string "a full moon. This POKéMON was first\n" - .string "discovered 40 years ago at the site of\n" - .string "a meteor strike.$" - -gSolrockPokedexText:: @ 85699C6 - .string "Solar energy is the source of this \n" - .string "POKéMON’s power. On sunny days, groups of\n" - .string "SOLROCK line up facing the sun and absorb\n" - .string "its light.$" - -gBarboachPokedexText:: @ 8569A49 - .string "Its body is covered with a slimy film.\n" - .string "The film acts as a barrier to prevent germs\n" - .string "in muddy water from entering the\n" - .string "BARBOACH’s body.$" - -gWhiscashPokedexText:: @ 8569ACE - .string "Mysteriously, it can foretell earthquakes.\n" - .string "In the daytime, it sleeps in mud at the\n" - .string "bottom of a pond. When it awakens, it\n" - .string "continually feeds throughout the night.$" - -gCorphishPokedexText:: @ 8569B6F - .string "Once it grips prey with its large pincers,\n" - .string "it will never let go, no matter what.\n" - .string "It is a hardy POKéMON that can thrive\n" - .string "in any environment.$" - -gCrawdauntPokedexText:: @ 8569BFA - .string "A brutish POKéMON that loves to battle.\n" - .string "A veteran CRAWDAUNT that has prevailed in\n" - .string "hundreds of battles has giant pincers\n" - .string "marked with countless scars.$" - -gBaltoyPokedexText:: @ 8569C8F - .string "A BALTOY moves by spinning on its single\n" - .string "foot. It has been depicted in murals \n" - .string "adorning the walls of a once-bustling city\n" - .string "in an ancient age.$" - -gClaydolPokedexText:: @ 8569D1C - .string "A CLAYDOL sleeps while hovering in midair.\n" - .string "Its arms are separate from its body.\n" - .string "They are kept floating by the POKéMON’s\n" - .string "manipulation of psychic power.$" - -gLileepPokedexText:: @ 8569DB3 - .string "It disguises itself as seaweed by making\n" - .string "its tentacles sway. Unsuspecting prey\n" - .string "that come too close are swallowed whole.\n" - .string "It became extinct 100 million years ago.$" - -gCradilyPokedexText:: @ 8569E54 - .string "It drags its heavy body along the\n" - .string "seafloor. It makes its nest in the shallows\n" - .string "of warm seas. CRADILY can be seen on\n" - .string "beaches when the tide goes out.$" - -gAnorithPokedexText:: @ 8569EE7 - .string "It was resurrected from a fossil using the\n" - .string "power of science. It swims by undulating\n" - .string "the eight wings at its sides. They were\n" - .string "feet that adapted to life in the sea.$" - -gArmaldoPokedexText:: @ 8569F89 - .string "ARMALDO usually lives on land. However,\n" - .string "when it hunts for prey, it dives beneath\n" - .string "the ocean. It swims around using its two\n" - .string "large wings.$" - -gFeebasPokedexText:: @ 856A010 - .string "FEEBAS live in ponds that are heavily\n" - .string "infested with weeds. Because of its\n" - .string "hopelessly shabby appearance, it\n" - .string "seems as if few TRAINERS raise it.$" - -gMiloticPokedexText:: @ 856A09E - .string "It is said to live at the bottom of\n" - .string "large lakes. Considered to be the most\n" - .string "beautiful of all POKéMON, it has been\n" - .string "depicted in paintings and statues.$" - -gCastformPokedexText:: @ 856A132 - .string "It alters its form depending on the\n" - .string "weather. Changes in the climate such as\n" - .string "the temperature and humidity appear to\n" - .string "affect its cellular structure.$" - -gKecleonPokedexText:: @ 856A1C4 - .string "A POKéMON that has the ability to alter its\n" - .string "body colors to match its surroundings.\n" - .string "A KECLEON reverts to its original colors if\n" - .string "it is startled.$" - -gShuppetPokedexText:: @ 856A253 - .string "This POKéMON roams about deep in the\n" - .string "night seeking such negative emotions as\n" - .string "grudges and envy. It retreats to its nest\n" - .string "when the sun begins to rise.$" - -gBanettePokedexText:: @ 856A2E7 - .string "An abandoned plush doll became this\n" - .string "POKéMON. They are said to live in garbage\n" - .string "dumps and wander about in search of the\n" - .string "children that threw them away.$" - -gDuskullPokedexText:: @ 856A37C - .string "A glare from its single scarlet eye makes\n" - .string "even burly grown-ups freeze in utter fear.\n" - .string "It is a nocturnal POKéMON that roams\n" - .string "about under the cloak of darkness.$" - -gDusclopsPokedexText:: @ 856A419 - .string "It is thought that its body is hollow with\n" - .string "only a spectral ball of fire burning inside.\n" - .string "However, no one has been able to\n" - .string "confirm this theory as fact.$" - -gTropiusPokedexText:: @ 856A4AF - .string "It flies by flapping its broad leaves.\n" - .string "The bunch of fruit that grows around its\n" - .string "neck is deliciously sweet. In the spring,\n" - .string "it scatters pollen from its neck.$" - -gChimechoPokedexText:: @ 856A54B - .string "They fly about very actively when the hot\n" - .string "season arrives. They communicate among\n" - .string "themselves using seven different and\n" - .string "distinguishing cries.$" - -gAbsolPokedexText:: @ 856A5D7 - .string "It sharply senses even subtle changes in\n" - .string "the sky and the land to predict natural\n" - .string "disasters. It is a long-lived POKéMON that\n" - .string "has a life-span of 100 years.$" - -gWynautPokedexText:: @ 856A671 - .string "A WYNAUT loves to eat sweet fruits.\n" - .string "It cleverly picks fruits using its earlike\n" - .string "arms. They gather in fruit gardens, drawn\n" - .string "by the fragrance.$" - -gSnoruntPokedexText:: @ 856A6FC - .string "They tend to move about in groups of\n" - .string "around five SNORUNT. In snowy regions,\n" - .string "it is said that when they are seen late at\n" - .string "night, snowfall will arrive by morning.$" - -gGlaliePokedexText:: @ 856A79B - .string "A GLALIE has the power to instantaneously\n" - .string "freeze moisture in the atmosphere.\n" - .string "A dazzling cloud of diamondlike ice\n" - .string "crystals forms around its body.$" - -gSphealPokedexText:: @ 856A82C - .string "It is completely covered with plushy fur.\n" - .string "As a result, it never feels the cold even\n" - .string "when it is rolling about on ice floes or\n" - .string "diving in the sea.$" - -gSealeoPokedexText:: @ 856A8BC - .string "SEALEO live in herds on ice floes. Using its\n" - .string "powerful flippers, it shatters ice.\n" - .string "It dives into the sea to hunt prey five\n" - .string "times a day.$" - -gWalreinPokedexText:: @ 856A942 - .string "To protect its herd, the leader battles\n" - .string "anything that invades its territory, even\n" - .string "at the cost of its life. Its tusks may snap\n" - .string "off in battle.$" - -gClamperlPokedexText:: @ 856A9CF - .string "A CLAMPERL slams its shell closed on prey\n" - .string "to prevent escape. The pearl it creates\n" - .string "upon evolution is said to be infused with\n" - .string "a mysterious energy.$" - -gHuntailPokedexText:: @ 856AA60 - .string "To withstand the crushing pressure of\n" - .string "water deep under the sea, its spine is very\n" - .string "thick and sturdy. Its tail, which is shaped\n" - .string "like a small fish, has eyes that light up.$" - -gGorebyssPokedexText:: @ 856AB09 - .string "A GOREBYSS siphons the body fluids of prey\n" - .string "through its thin, tubular mouth. Its light\n" - .string "pink body color turns vivid when it\n" - .string "finishes feeding.$" - -gRelicanthPokedexText:: @ 856AB95 - .string "A POKéMON that was once believed to have\n" - .string "been extinct. The species has not changed\n" - .string "its form for 100 million years. It walks on\n" - .string "the seafloor using its pectoral fins.$" - -gLuvdiscPokedexText:: @ 856AC3A - .string "LUVDISC make the branches of CORSOLA\n" - .string "their nests. There is a custom from long\n" - .string "ago of giving a LUVDISC as a gift to\n" - .string "express one’s feelings of love.$" - -gBagonPokedexText:: @ 856ACCD - .string "Although it is small, this POKéMON is very\n" - .string "powerful because its body is a bundle of\n" - .string "muscles. It launches head-butts with its\n" - .string "ironlike skull.$" - -gShelgonPokedexText:: @ 856AD5A - .string "It hardly eats while it awaits evolution.\n" - .string "It becomes hardier by enduring hunger.\n" - .string "Its shell peels off the instant it begins\n" - .string "to evolve.$" - -gSalamencePokedexText:: @ 856ADE0 - .string "After many long years, its cellular\n" - .string "structure underwent a sudden mutation to\n" - .string "grow wings. When angered, it loses all\n" - .string "thought and rampages out of control.$" - -gBeldumPokedexText:: @ 856AE79 - .string "When BELDUM gather in a swarm, they move\n" - .string "in perfect unison as if they were but one\n" - .string "POKéMON. They communicate with each other\n" - .string "using brain waves.$" - -gMetangPokedexText:: @ 856AF09 - .string "The claws tipping its arms pack the\n" - .string "destructive power to tear through thick\n" - .string "iron sheets as if they were silk. It flies\n" - .string "at over 60 miles per hour.$" - -gMetagrossPokedexText:: @ 856AF9B - .string "METAGROSS has four brains that are joined\n" - .string "by a complex neural network. As a result of\n" - .string "integration, this POKéMON is smarter than\n" - .string "a supercomputer.$" - -gRegirockPokedexText:: @ 856B02C - .string "A POKéMON that is made entirely of rocks\n" - .string "and boulders. If parts of its body chip off\n" - .string "in battle, REGIROCK repairs itself by\n" - .string "adding new rocks.$" - -gRegicePokedexText:: @ 856B0B9 - .string "Its entire body is made of Antarctic ice.\n" - .string "After extensive studies, researchers\n" - .string "believe the ice was formed during an\n" - .string "ice age.$" - -gRegisteelPokedexText:: @ 856B136 - .string "Its body is harder than any other kind of\n" - .string "metal. The body metal is composed of a\n" - .string "mysterious substance. Not only is it hard,\n" - .string "it shrinks and stretches flexibly.$" - -gLatiasPokedexText:: @ 856B1D5 - .string "They make a small herd of only several\n" - .string "members. They rarely make contact with\n" - .string "people or other POKéMON. They disappear\n" - .string "if they sense enemies.$" - -gLatiosPokedexText:: @ 856B262 - .string "Even in hiding, it can detect the locations\n" - .string "of others and sense their emotions since\n" - .string "it has telepathy. Its intelligence allows\n" - .string "it to understand human languages.$" - -gKyogrePokedexText:: @ 856B303 - .string "KYOGRE has appeared in mythology as the\n" - .string "creator of the sea. After long years of\n" - .string "feuding with GROUDON, it took to sleep at\n" - .string "the bottom of the sea.$" - -gGroudonPokedexText:: @ 856B394 - .string "GROUDON has appeared in mythology as the\n" - .string "creator of the land. It sleeps in magma\n" - .string "underground and is said to make volcanoes\n" - .string "erupt on awakening.$" - -gRayquazaPokedexText:: @ 856B423 - .string "A POKéMON that flies endlessly in the\n" - .string "ozone layer. It is said it would descend\n" - .string "to the ground if KYOGRE and GROUDON\n" - .string "were to fight.$" - -gJirachiPokedexText:: @ 856B4A5 - .string "JIRACHI is said to make wishes come true.\n" - .string "While it sleeps, a tough crystalline shell\n" - .string "envelops the body to protect it from\n" - .string "enemies.$" - -gDeoxysPokedexText:: @ 856B528 - .string "A POKéMON that mutated from an\n" - .string "extraterrestrial virus exposed to a laser\n" - .string "beam. Its body is configured for superior\n" - .string "agility and speed.$" 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" |