diff options
Diffstat (limited to 'data')
114 files changed, 765 insertions, 1274 deletions
diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s deleted file mode 100644 index 208436f4c..000000000 --- a/data/battle_anim_815A0D4.s +++ /dev/null @@ -1,510 +0,0 @@ -#include "constants/battle_anim.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085CE004:: @ 85CE004 - .2byte 0x0000, 0x0004, 0x0010, 0x0004 - .2byte 0x0020, 0x0004, 0x0030, 0x0004 - .2byte 0x0040, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE01C:: @ 85CE01C - .4byte gUnknown_085CE004 - - .align 2 -gUnknown_085CE020:: @ 85CE020 - spr_template ANIM_TAG_SCRATCH, ANIM_TAG_SCRATCH, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 - - .align 2 -gUnknown_085CE038:: @ 85CE038 - spr_template ANIM_TAG_BLACK_SMOKE, ANIM_TAG_BLACK_SMOKE, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4 - - .align 2 -gUnknown_085CE050:: @ 85CE050 - spr_template ANIM_TAG_BLACK_BALL, ANIM_TAG_BLACK_BALL, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC - - .align 2 -gUnknown_085CE068:: @ 85CE068 - .2byte 0x0000, 0x0028, 0x0010, 0x0008 - .2byte 0x0020, 0x0028, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE078:: @ 85CE078 - .4byte gUnknown_085CE068 - - .align 2 -gUnknown_085CE07C:: @ 85CE07C - spr_template ANIM_TAG_OPENING_EYE, ANIM_TAG_OPENING_EYE, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 - - .align 2 -gUnknown_085CE094:: - 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 ANIM_TAG_TEAL_ALERT, ANIM_TAG_TEAL_ALERT, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254 - - .align 2 -gUnknown_085CE0C4:: @ 85CE0C4 - .2byte 0x0180, 0x0180, 0x0000, 0x0000 - .2byte 0xffe0, 0x0018, 0x0500, 0x0000 - .2byte 0x0018, 0xffe0, 0x0500, 0x0000 - .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE0E4:: @ 85CE0E4 - .2byte 0x0030, 0x0030, 0x0000, 0x0000 - .2byte 0x0020, 0x0020, 0x0600, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE0FC:: @ 85CE0FC - .4byte gUnknown_085CE0C4 - .4byte gUnknown_085CE0E4 - - .align 2 -gUnknown_085CE104:: @ 85CE104 - spr_template ANIM_TAG_EYE, ANIM_TAG_EYE, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0 - - .align 2 -gUnknown_085CE11C:: @ 85CE11C - spr_template ANIM_TAG_SPIKES, ANIM_TAG_SPIKES, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4 - - .align 2 -gUnknown_085CE134:: @ 85CE134 - .2byte 0x0000, 0x0003, 0x0010, 0x0003 - .2byte 0x0020, 0x0003, 0x0030, 0x0003 - .2byte 0x0040, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE14C:: @ 85CE14C - .4byte gUnknown_085CE134 - - .align 2 -gUnknown_085CE150:: @ 85CE150 - spr_template ANIM_TAG_LEER, ANIM_TAG_LEER, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0 - - .align 2 -gUnknown_085CE168:: @ 85CE168 - .2byte 0x0000, 0x0003, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE170:: @ 85CE170 - .4byte gUnknown_085CE168 - - .align 2 -gUnknown_085CE174:: @ 85CE174 - .2byte 0xfff9, 0xfff9, 0x10fd, 0x0000 - .2byte 0x0007, 0x0007, 0x1003, 0x0000 - .2byte 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE18C:: @ 85CE18C - .4byte gUnknown_085CE174 - - .align 2 -gUnknown_085CE190:: @ 85CE190 - spr_template ANIM_TAG_LETTER_Z, ANIM_TAG_LETTER_Z, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC - - .align 2 -gUnknown_085CE1A8:: @ 85CE1A8 - .2byte 0x0000, 0x0008, 0x0010, 0x0010, 0x0020, 0x0004, 0x0030, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE1BC:: @ 85CE1BC - .4byte gUnknown_085CE1A8 - - .align 2 -gUnknown_085CE1C0:: @ 85CE1C0 - .2byte 0x0200, 0x0200, 0x0000, 0x0000 - .2byte 0xffe0, 0xffe0, 0x0800, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE1D8:: @ 85CE1D8 - .4byte gUnknown_085CE1C0 - - .align 2 -gUnknown_085CE1DC:: @ 85CE1DC - spr_template ANIM_TAG_FANG_ATTACK, ANIM_TAG_FANG_ATTACK, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC - - .align 2 -gUnknown_085CE1F4:: @ 85CE1F4 - .2byte 0x0000, 0x0180, 0x0000, 0x0000 - .2byte 0x0010, 0x0000, 0x1400, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE20C:: @ 85CE20C - .2byte 0x0140, 0x0180, 0x0000, 0x0000 - .2byte 0xfff0, 0x0000, 0x1300, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE224:: @ 85CE224 - .4byte gUnknown_085CE1F4 - .4byte gUnknown_085CE20C - - .align 2 -gUnknown_085CE22C:: @ 85CE22C - spr_template ANIM_TAG_SPOTLIGHT, ANIM_TAG_SPOTLIGHT, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934 - - .align 2 -gUnknown_085CE244:: - spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4 - - .align 2 -gUnknown_085CE25C:: - spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0 - - .align 2 -gUnknown_085CE274:: @ 85CE274 - .2byte 0x0000, 0x0002, 0x0008, 0x0002 - .2byte 0x0010, 0x0002, 0xfffe, 0x0000 - - .align 2 -gUnknown_085CE284:: @ 85CE284 - .4byte gUnknown_085CE274 - - .align 2 -gUnknown_085CE288:: @ 85CE288 - spr_template ANIM_TAG_RAPID_SPIN, ANIM_TAG_RAPID_SPIN, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0 - - .align 2 -gUnknown_085CE2A0:: @ 85CE2A0 - .2byte 0xfff4, 0x0008, 0x0400, 0x0000, 0x0014, 0xffec, 0x0400, 0x0000, 0xfff8, 0x000c, 0x0400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE2C0:: @ 85CE2C0 - .2byte 0x0000, 0x0008, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE2C8:: @ 85CE2C8 - .4byte gUnknown_085CE2C0 - - .align 2 -gUnknown_085CE2CC:: @ 85CE2CC - .2byte 0x0000, 0x0000, 0x2805, 0x0000, 0x0000, 0x0000, 0x0a0a, 0x0000, 0x0000, 0x0000, 0x0a0f, 0x0000, 0x0000, 0x0000, 0x2814, 0x0000 - .2byte 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE2F4:: @ 85CE2F4 - .4byte gUnknown_085CE2CC - - .align 2 -gUnknown_085CE2F8:: @ 85CE2F8 - spr_template ANIM_TAG_TRI_FORCE_TRIANGLE, ANIM_TAG_TRI_FORCE_TRIANGLE, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C - - .align 2 -gUnknown_085CE310:: @ 85CE310 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0x0020, 0x0003, 0x0030, 0x0003, 0x0020, 0x0043, 0x0010, 0x0043, 0x0000, 0x0043, 0xfffd, 0x0001 - .2byte 0xffff, 0x0000 - - .align 2 -gUnknown_085CE334:: @ 85CE334 - .4byte gUnknown_085CE310 - - .align 2 -gUnknown_085CE338:: @ 85CE338 - spr_template ANIM_TAG_ECLIPSING_ORB, ANIM_TAG_ECLIPSING_ORB, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 - - .align 2 -gUnknown_085CE350:: @ 85CE350 - .2byte 0xfff4, 0x0014, 0x0800, 0x0000, 0x000c, 0xffec, 0x0800, 0x0000, 0x7ffd, 0x0002, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE370:: @ 85CE370 - spr_template ANIM_TAG_POKEBALL, ANIM_TAG_POKEBALL, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394 - - .align 2 -gUnknown_085CE388:: @ 85CE388 - spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C - - .align 2 -gUnknown_085CE3A0:: @ 85CE3A0 - spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570 - - .align 2 -gUnknown_085CE3B8:: @ 85CE3B8 - .2byte 0x0008, 0xfff8, 0x0c00, 0x0000, 0xfff0, 0x0010, 0x0c00, 0x0000, 0x0008, 0xfff8, 0x0c00, 0x0000, 0x7ffd, 0x0001, 0x0000, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE3E0:: @ 85CE3E0 - .2byte 0x0000, 0x0006, 0x1400, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000, 0x0000, 0xffee, 0x0600, 0x0000, 0xffee, 0xffee, 0x0300, 0x0000 - .2byte 0x0000, 0x0000, 0x0f00, 0x0000, 0x0004, 0x0004, 0x0d00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE418:: @ 85CE418 - spr_template ANIM_TAG_BLUE_ORB, ANIM_TAG_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C - - .align 2 -gUnknown_085CE430:: @ 85CE430 - .2byte 0x0000, 0x0006, 0x1400, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000, 0x0007, 0xffe2, 0x0600, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000 - .2byte 0xfffe, 0x0003, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE460:: @ 85CE460 - .byte 0xe8, 0x18, 0xfc, 0x00 - - .align 2 -gUnknown_085CE464:: @ 85CE464 - .2byte 0x0000, 0x0006, 0x0004, 0x0006, 0xfffe, 0x0000 - - .align 2 -gUnknown_085CE470:: @ 85CE470 - .2byte 0x0008, 0x0006, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE478:: @ 85CE478 - .2byte 0x000c, 0x0006, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE480:: @ 85CE480 - .4byte gUnknown_085CE464 - .4byte gUnknown_085CE470 - .4byte gUnknown_085CE478 - - .align 2 -gUnknown_085CE48C:: @ 85CE48C - spr_template ANIM_TAG_GREEN_STAR, ANIM_TAG_GREEN_STAR, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04 - - .align 2 -gUnknown_085CE4A4:: @ 85CE4A4 - .byte 0x78, 0x50, 0x28, 0x00 - - .align 2 -gUnknown_085CE4A8:: @ 85CE4A8 - .2byte 0x0000, 0x0000, 0x0032, 0x0000 - - .align 2 -gUnknown_085CE4B0:: @ 85CE4B0 - .2byte 0x0000, 0xfff1, 0x0700, 0x0000, 0x0000, 0x000f, 0x0700, 0x0000, 0x7ffd, 0x0002, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE4D0:: @ 85CE4D0 - spr_template ANIM_TAG_ANGER, ANIM_TAG_ANGER, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815C400 - - .align 2 -gUnknown_085CE4E8:: @ 85CE4E8 - .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0003, 0x0088, 0x0002, 0x0088, 0x0000, 0x0088, 0x0001, 0x0088 - .2byte 0xfffe, 0x0000 - - .align 2 -gUnknown_085CE50C:: @ 85CE50C - .2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0003, 0x00c8, 0x0002, 0x00c8, 0x0000, 0x00c8, 0x0001, 0x00c8 - .2byte 0xfffe, 0x0000 - - .align 2 -gUnknown_085CE530:: @ 85CE530 - .2byte 0x0000, 0x0008, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE538:: @ 85CE538 - .4byte gUnknown_085CE4E8 - .4byte gUnknown_085CE50C - .4byte gUnknown_085CE530 - - .align 2 -gUnknown_085CE544:: @ 85CE544 - spr_template ANIM_TAG_PINK_PETAL, ANIM_TAG_PINK_PETAL, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0 - - .align 2 -gUnknown_085CE55C:: @ 85CE55C - .byte 0x0c, 0x18, 0x10, 0x16, 0x13, 0x13, 0x15, 0x10, 0x17, 0x0c, 0x16, 0x07, 0x13, 0x04, 0x10, 0x01, 0x0b, 0x00, 0x06, 0x01, 0x04, 0x04, 0x01, 0x07, 0x00, 0x0c, 0x02, 0x11, 0x04, 0x13, 0x08, 0x16 - - .align 2 -gUnknown_085CE57C:: @ 85CE57C - .2byte 0x0000, 0x0005, 0x0004, 0x0009, 0x0008, 0x0005, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE58C:: @ 85CE58C - .4byte gUnknown_085CE57C - - .align 2 -gUnknown_085CE590:: @ 85CE590 - spr_template ANIM_TAG_PAIN_SPLIT, ANIM_TAG_PAIN_SPLIT, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C -gUnknown_085CE5A8:: - spr_template ANIM_TAG_CONFETTI, ANIM_TAG_CONFETTI, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88 -gUnknown_085CE5C0:: - spr_template ANIM_TAG_SPOTLIGHT, ANIM_TAG_SPOTLIGHT, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94 -gBattleAnimSpriteTemplate_85CE5D8:: - spr_template ANIM_TAG_BLUE_ORB, ANIM_TAG_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4 - - .align 2 -gUnknown_085CE5F0:: @ 85CE5F0 - .2byte 0x0010, 0x0000, 0x0400, 0x0000, 0x0000, 0xfffd, 0x1000, 0x0000, 0x0004, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000 - .2byte 0xfffb, 0x0003, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE620:: @ 85CE620 - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0xfff8, 0xfff8, 0x0800, 0x0000, 0x0008, 0x0008, 0x0800, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE640:: @ 85CE640 - .2byte 0x00c0, 0x00c0, 0x0000, 0x0000, 0x0008, 0x0008, 0x0800, 0x0000, 0xfff8, 0xfff8, 0x0800, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE660:: @ 85CE660 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0008, 0x0008, 0x0800, 0x0000, 0xfff8, 0xfff8, 0x0800, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE680:: @ 85CE680 - .4byte gUnknown_085CE620 - .4byte gUnknown_085CE640 - .4byte gUnknown_085CE660 - - .align 2 -gUnknown_085CE68C:: @ 85CE68C - spr_template ANIM_TAG_PINK_CLOUD, ANIM_TAG_PINK_CLOUD, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4 - - .align 2 -gUnknown_085CE6A4:: @ 85CE6A4 - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0xfffc, 0xfffa, 0x1000, 0x0000, 0x0004, 0x0006, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE6C4:: @ 85CE6C4 - .2byte 0x00c0, 0x00c0, 0x0000, 0x0000, 0x0004, 0x0006, 0x1000, 0x0000, 0xfffc, 0xfffa, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE6E4:: @ 85CE6E4 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0004, 0x0006, 0x1000, 0x0000, 0xfffc, 0xfffa, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE704:: @ 85CE704 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0008, 0x000a, 0x1e00, 0x0000, 0xfff8, 0xfff6, 0x1000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE724:: @ 85CE724 - .4byte gUnknown_085CE6A4 - .4byte gUnknown_085CE6C4 - .4byte gUnknown_085CE6E4 - .4byte gUnknown_085CE704 - - .align 2 -gUnknown_085CE734:: @ 85CE734 - spr_template ANIM_TAG_PINK_CLOUD, ANIM_TAG_PINK_CLOUD, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870 - - .align 2 -gUnknown_085CE74C:: @ 85CE74C - .2byte 0xfff0, 0x0010, 0x0600, 0x0000, 0x0010, 0xfff0, 0x0c00, 0x0000, 0xfff0, 0x0010, 0x0600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE76C:: @ 85CE76C - spr_template ANIM_TAG_SWEAT_DROP, ANIM_TAG_SWEAT_DROP, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC - - .align 2 -gUnknown_085CE784:: @ 85CE784 - .byte 0x3c, 0x07, 0xbc, 0x16, 0x5b, 0x22, 0xdb, 0x2d, 0x5a, 0x3d, 0xfa, 0x48, 0x79, 0x54, 0x19, 0x64, 0x19, 0x5c, 0x19, 0x50, 0x19, 0x40, 0x19, 0x34, 0x1a, 0x28, 0x1a, 0x18, 0x1a, 0x0c, 0x1b, 0x00 - .byte 0x3b, 0x00, 0xbb, 0x00, 0x3b, 0x01, 0x9b, 0x01, 0x1c, 0x02, 0x7c, 0x02, 0xfc, 0x02, 0x7d, 0x03 - - .align 2 -gUnknown_085CE7B4:: @ 85CE7B4 - .2byte 0x0000, 0x0003, 0x0010, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_085CE7C0:: @ 85CE7C0 - .2byte 0x0020, 0x0003, 0x0030, 0x0003, 0xfffe, 0x0000 - - .align 2 -gUnknown_085CE7CC:: @ 85CE7CC - .4byte gUnknown_085CE7B4 - .4byte gUnknown_085CE7C0 - - .align 2 -gUnknown_085CE7D4:: @ 85CE7D4 - spr_template ANIM_TAG_NOISE_LINE, ANIM_TAG_NOISE_LINE, gUnknown_08524914, gUnknown_085CE7CC, NULL, gDummySpriteAffineAnimTable, sub_815E01C - - .align 2 -gUnknown_085CE7EC:: @ 85CE7EC - spr_template ANIM_TAG_SMALL_RED_EYE, ANIM_TAG_SMALL_RED_EYE, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404 -gUnknown_085CE804:: - spr_template ANIM_TAG_PAW_PRINT, ANIM_TAG_PAW_PRINT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444 - - .align 2 -gUnknown_085CE81C:: @ 85CE81C - .2byte 0x0000, 0x0000, 0x18fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE82C:: @ 85CE82C - .2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x1804, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE844:: @ 85CE844 - .4byte gUnknown_085CE81C - .4byte gUnknown_085CE82C - - .align 2 -gUnknown_085CE84C:: @ 85CE84C - spr_template ANIM_TAG_RED_BALL, ANIM_TAG_RED_BALL, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy - - .align 2 -gUnknown_085CE864:: - spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8 - - .align 2 -gUnknown_085CE87C:: @ 85CE87C - .2byte 0x0000, 0xfff0, 0x0600, 0x0000, 0x0000, 0x0010, 0x0600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE894:: @ 85CE894 - spr_template ANIM_TAG_SMELLINGSALT_EFFECT, ANIM_TAG_SMELLINGSALT_EFFECT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954 -gUnknown_085CE8AC:: - spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14 -gUnknown_085CE8C4:: - spr_template ANIM_TAG_MAGNIFYING_GLASS, ANIM_TAG_MAGNIFYING_GLASS, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84 -gUnknown_085CE8DC:: - spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C -gUnknown_085CE8F4:: - spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 -gUnknown_085CE90C:: - spr_template ANIM_TAG_X_SIGN, ANIM_TAG_X_SIGN, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C -gUnknown_085CE924:: - spr_template ANIM_TAG_ITEM_BAG, ANIM_TAG_ITEM_BAG, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80 - - .align 2 -gUnknown_085CE93C:: @ 85CE93C - .2byte 0x0000, 0x0004, 0x0040, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_085CE948:: @ 85CE948 - .4byte gUnknown_085CE93C - - .align 2 -gUnknown_085CE94C:: @ 85CE94C - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x08fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE964:: @ 85CE964 - .2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0804, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE97C:: @ 85CE97C - .4byte gUnknown_085CE94C - .4byte gUnknown_085CE964 - - .align 2 -gUnknown_085CE984:: @ 85CE984 - spr_template ANIM_TAG_SLAM_HIT_2, ANIM_TAG_SLAM_HIT_2, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338 - - .align 2 -gUnknown_085CE99C:: @ 85CE99C - .2byte 0x0000, 0x0000, 0x40fc, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085CE9AC:: @ 85CE9AC - .4byte gUnknown_085CE99C - - .align 2 -gUnknown_085CE9B0:: @ 85CE9B0 - spr_template ANIM_TAG_RECYCLE, ANIM_TAG_RECYCLE, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8 - - .align 2 -gUnknown_085CE9C8:: @ 85CE9C8 - .2byte 0x0000, 0x0010, 0x0400, 0x0000, 0xfffe, 0x0000, 0x0800, 0x0000, 0x0000, 0x0004, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000 - .2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index ca338ac9b..6552dd9da 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1326,7 +1326,7 @@ Move_SWORDS_DANCE: setalpha 12, 8 playsewithpan SE_W014, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 - createsprite gBattleAnimSpriteTemplate_8593380, ANIM_ATTACKER, 2, 0, 0 + createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 22 createvisualtask sub_8115D94, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0 waitforvisualfinish @@ -1712,10 +1712,10 @@ Frustration_Strongest: waitforvisualfinish delay 20 playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, ANIM_ATTACKER @@ -1748,7 +1748,7 @@ Frustration_Strong: waitforvisualfinish delay 20 playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask sub_815C3A8, 5 @@ -1769,7 +1769,7 @@ Frustration_Strong: goto Frustration_Continue Frustration_Medium: playsewithpan SE_W207B, SOUND_PAN_ATTACKER - createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 @@ -1843,8 +1843,8 @@ Move_VICE_GRIP: monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_08593590, ANIM_ATTACKER, 2, 0 - createsprite gUnknown_08593590, ANIM_ATTACKER, 2, 1 + createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 0 + createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 9 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 5, 1 @@ -1861,8 +1861,8 @@ Move_GUILLOTINE: fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein playsewithpan SE_W011, SOUND_PAN_TARGET - createsprite gUnknown_085935D0, ANIM_ATTACKER, 2, 0 - createsprite gUnknown_085935D0, ANIM_ATTACKER, 2, 1 + createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0 + createsprite gGuillotineSpriteTemplate, 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 @@ -2750,10 +2750,10 @@ Move_RAGE: monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 - createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, -20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, -28 playsewithpan SE_W207B, SOUND_PAN_ATTACKER delay 20 - createsprite gUnknown_0859368C, ANIM_ATTACKER, 2, 0, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 @@ -2803,7 +2803,7 @@ Move_DOUBLE_TEAM: Move_MINIMIZE: setalpha 10, 8 - createvisualtask sub_8104674, 2 + createvisualtask AnimTask_Minimize, 2 loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 34, 3 waitforvisualfinish blendoff @@ -2872,8 +2872,8 @@ Move_KINESIS: playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground createsprite gUnknown_085966DC, ANIM_ATTACKER, 20 - createsprite gUnknown_08593344, ANIM_ATTACKER, 19, 32, -8, 0 - createsprite gUnknown_08593344, ANIM_ATTACKER, 19, 32, 16, 1 + createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, -8, 0 + createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, 16, 1 loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2 delay 60 playsewithpan SE_W146, SOUND_PAN_ATTACKER @@ -2987,7 +2987,7 @@ Move_FLASH: end Move_SPLASH: - createvisualtask sub_8104938, 2, 0, 3 + createvisualtask AnimTask_Splash, 2, 0, 3 delay 8 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3 waitforvisualfinish @@ -3066,7 +3066,7 @@ Move_SKETCH: createsprite gUnknown_085936D4, ANIM_TARGET, 2 waitforvisualfinish clearmonbg ANIM_TARGET - createvisualtask sub_8104938, 2, 0, 2 + createvisualtask AnimTask_Splash, 2, 0, 2 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2 end @@ -3278,17 +3278,17 @@ Move_FALSE_SWIPE: Move_SWAGGER: loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER - createvisualtask sub_8104AB4, 2 + createvisualtask AnimTask_GrowAndShrink, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_08593658, ANIM_ATTACKER, 2 + createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish delay 24 - createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, -20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET delay 12 - createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish end @@ -3496,10 +3496,10 @@ Move_TORMENT: createvisualtask sub_815AFF0, 2 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 - createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, -20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET delay 20 - createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET end @@ -3606,11 +3606,11 @@ Move_TAUNT: loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish delay 8 - createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, -20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish delay 12 - createsprite gUnknown_0859368C, ANIM_TARGET, 2, 1, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, SOUND_PAN_TARGET end @@ -4008,7 +4008,7 @@ Move_TEETER_DANCE: Move_MUD_SPORT: loadspritegfx ANIM_TAG_MUD_SAND - createvisualtask sub_8104938, 2, 0, 6 + createvisualtask AnimTask_Splash, 2, 0, 6 delay 24 createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, -4, -16 createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, 4, -12 @@ -4381,10 +4381,10 @@ Move_HOWL: Move_BULK_UP: loadspritegfx ANIM_TAG_BREATH - createvisualtask sub_8104AB4, 2 + createvisualtask AnimTask_GrowAndShrink, 2 playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_08593658, ANIM_ATTACKER, 2 + createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish end @@ -5386,7 +5386,7 @@ IceBeam1: Move_WITHDRAW: playsewithpan SE_W029, SOUND_PAN_ATTACKER - createvisualtask sub_81036A0, 5 + createvisualtask AnimTask_Withdraw, 5 waitforvisualfinish end @@ -5443,54 +5443,54 @@ SolarBeamSetUp: blendoff goto SolarBeamEnd SolarBeamSetUp1: - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 40, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -40, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 0, 40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 40, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 0, -40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -40, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, -20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -20, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 20, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -20, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, 20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -20, 30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -20, 30, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 20, -30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 20, -30, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -20, -30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -20, -30, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 20, 30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 20, 30, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, 0, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, 0, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 0, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 0, 16 delay 2 return SolarBeamUnleash: call SetSolarbeamBg panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createvisualtask sub_80FEA58, 5 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 0 + createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 1 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 createvisualtask sub_8116620, 10, 4, 1, 0, 10, RGB(25, 31, 0) - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 2 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 3 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 4 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 5 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 6 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 call SolarBeamUnleash1 call SolarBeamUnleash1 @@ -5499,19 +5499,19 @@ SolarBeamUnleash: call UnsetSolarbeamBg goto SolarBeamEnd SolarBeamUnleash1: - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 0 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 1 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 2 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 3 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 4 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 5 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 6 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 return @@ -5717,28 +5717,28 @@ Move_ABSORB: AbsorbEffect: playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5770,36 +5770,36 @@ Move_MEGA_DRAIN: MegaDrainEffect: 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5831,44 +5831,44 @@ Move_GIGA_DRAIN: GigaDrainEffect: 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -6749,11 +6749,11 @@ Move_COTTON_SPORE: end CottonSpore1: - createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0 + createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0 delay 12 - createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0 + createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0 delay 12 - createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0 + createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0 delay 12 return @@ -6761,7 +6761,7 @@ Move_SPORE: loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask sub_80FEE1C, 2 + createvisualtask AnimTask_SporeDoubleBattle, 2 loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 call Spore1 call Spore1 @@ -6773,11 +6773,11 @@ Move_SPORE: end Spore1: - createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -20, 85, 80, 1 + createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -20, 85, 80, 1 delay 12 - createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -10, 170, 80, 1 + createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -10, 170, 80, 1 delay 12 - createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -15, 0, 80, 1 + createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 80, 1 delay 12 return @@ -6788,23 +6788,23 @@ Move_PETAL_DANCE: setalpha 12, 8 playsewithpan SE_W080, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3 - 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 + createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 8, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -16, -24, 8, 100 delay 15 - 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 + createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 32, -24, 8, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -32, -24, 8, 100 delay 15 - 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 + createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 24, -24, 8, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 8, 100 delay 30 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 16, -24, 0, 100 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -16, -24, 0, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 0, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -16, -24, 0, 100 delay 30 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 20, -16, 14, 80 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -20, -14, 16, 80 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 20, -16, 14, 80 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -20, -14, 16, 80 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 @@ -6827,29 +6827,29 @@ Move_RAZOR_LEAF: setalpha 12, 8 delay 1 loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -2, 10 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -1, 15 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -4, -4, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 3, -3, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -6, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -1, 12 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -4, 13 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 4, -5, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -6, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -5, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 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 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -7025,44 +7025,44 @@ Move_DREAM_EATER: end DreamEaterEffect: 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, 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 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -7509,9 +7509,9 @@ RazorWindContinue: RazorWindSetUp: loadspritegfx ANIM_TAG_GUST 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 + createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 + createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 + createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish playsewithpan SE_W016B, SOUND_PAN_ATTACKER goto RazorWindContinue @@ -7546,7 +7546,7 @@ Move_DISABLE: playsewithpan SE_W197, SOUND_PAN_ATTACKER createsprite gUnknown_0853EE84, ANIM_ATTACKER, 13, 24, -16 waitforvisualfinish - createvisualtask sub_81045B0, 5 + createvisualtask AnimTask_GrowAndGreyscale, 5 loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4 waitforvisualfinish delay 1 @@ -7573,19 +7573,19 @@ Move_RECOVER: end Recover1: - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, -10, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -10, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -35, -10, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -35, -10, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 15, -40, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 15, -40, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -10, -32, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -10, -32, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 25, -20, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 25, -20, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -20, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -20, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 5, -40, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 5, -40, 13 delay 3 return @@ -7597,7 +7597,7 @@ Move_MIMIC: panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 createvisualtask sub_80FF458, 5, 128, 24 delay 15 - createsprite gUnknown_085924DC, ANIM_TARGET, 2, -12, 24 + createsprite gMimicOrbSpriteTemplate, ANIM_TARGET, 2, -12, 24 delay 10 setarg 7, -1 waitforvisualfinish @@ -7611,12 +7611,12 @@ Move_MIMIC: Move_CONSTRICT: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 - createsprite gUnknown_08592494, ANIM_TARGET, 4, 0, 16, 0, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 - createsprite gUnknown_08592494, ANIM_TARGET, 3, 0, 0, 0, 2 - createsprite gUnknown_08592494, ANIM_TARGET, 2, 0, 8, 1, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 2 delay 7 - createsprite gUnknown_08592494, ANIM_TARGET, 3, 0, -8, 1, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, -8, 1, 2 delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 delay 20 @@ -7824,28 +7824,28 @@ Move_FURY_SWIPES: Move_INGRAIN: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS - createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 40 - createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 + createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 + createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 + createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 10 waitforvisualfinish @@ -7854,7 +7854,7 @@ Move_INGRAIN: Move_PRESENT: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2 - createsprite gUnknown_08592610, ANIM_TARGET, 2, 0, -5, 10, 2, -1 + createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 14 playsewithpan SE_W145B, SOUND_PAN_ATTACKER @@ -7889,23 +7889,23 @@ PresentHeal: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W234, SOUND_PAN_TARGET - createsprite gUnknown_08592658, ANIM_TARGET, 4, -16, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, 16, 32, -3, -1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 16, 32, -3, -1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, 32, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 32, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, -32, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -32, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, 0, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 0, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, -8, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, -8, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, 24, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 24, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, -24, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -24, 32, -3, 1 waitforvisualfinish waitsound call HealingEffect2 @@ -8115,8 +8115,8 @@ Move_ENCORE: Move_TRICK: loadspritegfx ANIM_TAG_ITEM_BAG loadspritegfx ANIM_TAG_SPEED_DUST - createsprite gUnknown_085926E8, ANIM_ATTACKER, 2, -40, 80 - createsprite gUnknown_085926E8, ANIM_ATTACKER, 2, -40, 208 + createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80 + createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208 delay 16 playsewithpan SE_W166, 0 createvisualtask sub_8106020, 3 @@ -8167,21 +8167,21 @@ Move_STOCKPILE: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE end Stockpile1: - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, 55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 55, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, -55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -55, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 0, 55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 55, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 0, -55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -55, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, -34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, -34, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, 34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 34, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, -34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -34, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, 34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, 34, 13 delay 1 return @@ -8392,8 +8392,8 @@ Move_HYPER_BEAM: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 16, 0, RGB_BLACK end HyperBeam1: - createsprite gUnknown_08592288, ANIM_TARGET, 2 - createsprite gUnknown_08592288, ANIM_TARGET, 2 + createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2 + createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2 delay 1 return @@ -8790,31 +8790,31 @@ Move_FRENZY_PLANT: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, -43 delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 playsewithpan SE_W010, -22 delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 playsewithpan SE_W010, 0 delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 playsewithpan SE_W010, +21 delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 playsewithpan SE_W010, +42 delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, 1, 3 @@ -9649,26 +9649,26 @@ Move_TWISTER: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET playsewithpan SE_W239, SOUND_PAN_TARGET - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 120, 70, 5, 70, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 120, 70, 5, 70, 30 delay 1 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 55, 6, 60, 25 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 6, 60, 25 delay 1 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 60, 7, 60, 30 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 55, 10, 60, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 60, 7, 60, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 10, 60, 30 delay 3 createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 100, 50, 4, 50, 26 delay 1 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 105, 25, 8, 60, 20 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 105, 25, 8, 60, 20 delay 1 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 40, 10, 48, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 40, 10, 48, 30 delay 3 createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 120, 30, 6, 45, 25 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 35, 10, 60, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 35, 10, 60, 30 delay 3 createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 105, 20, 8, 40, 0 delay 3 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 20, 255, 15, 32, 0 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 110, 10, 8, 32, 20 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 20, 255, 15, 32, 0 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET @@ -9697,29 +9697,29 @@ Move_MAGICAL_LEAF: delay 1 loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 createvisualtask sub_81007C4, 5 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -2, 10 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -1, 15 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -4, -4, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 3, -3, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -6, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -1, 12 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -4, 13 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 4, -5, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -6, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -5, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 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 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 playsewithpan SE_W013, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, 1, 2 @@ -10344,7 +10344,7 @@ General_PokeblockThrow: General_ItemKnockoff: loadspritegfx ANIM_TAG_ITEM_BAG - createsprite gBattleAnimSpriteTemplate_8592628, ANIM_TARGET, 2 + createsprite gKnockOffItemSpriteTemplate, ANIM_TARGET, 2 end General_TurnTrap: @@ -10357,9 +10357,9 @@ General_TurnTrap: Status_BindWrap: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 - createsprite gUnknown_08592494, ANIM_TARGET, 4, 0, 16, 0, 1 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 - createsprite gUnknown_08592494, ANIM_TARGET, 2, 0, 8, 1, 1 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1 delay 3 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 delay 20 @@ -10537,7 +10537,7 @@ General_ItemSteal: createvisualtask sub_8117F30, 2 createvisualtask sub_8172ED0, 2 delay 1 - createsprite gUnknown_08592670, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 + createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 end General_SnatchMove: diff --git a/data/event_scripts.s b/data/event_scripts.s index 4c0a2860f..557515c70 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,5 +1,6 @@ #include "constants/battle_frontier.h" #include "constants/battle_setup.h" +#include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/flags.h" #include "constants/items.h" @@ -847,9 +848,9 @@ VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F EventScript_271354:: @ 8271354 cmdD8 cmdD9 - + .include "data/scripts/trainer_battle.inc" - + Std_MsgboxAutoclose:: @ 8271494 message 0x0 waitmessage @@ -2234,11 +2235,11 @@ RusturfTunnel_EventScript_272216:: @ 8272216 EventScript_27222B:: @ 827222B delay 30 - applymovement 255, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 - applymovement 255, Movement_27224E + applymovement EVENT_OBJ_ID_PLAYER, Movement_27224E waitmovement 0 delay 30 return @@ -2454,7 +2455,7 @@ EverGrandeCity_DrakesRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8 - applymovement 255, EverGrandeCity_SidneysRoom_Movement_2725C6 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6 waitmovement 0 playse SE_DOOR setmetatile 6, 1, 836, 0 @@ -2476,7 +2477,7 @@ EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475 EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475 EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475 EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 - applymovement 255, EverGrandeCity_SidneysRoom_Movement_2725BA + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, 518, 1 @@ -4245,7 +4246,7 @@ gUnknown_0827EE07:: @ 27EE07 gUnknown_0827EE09:: @ 27EE09 .string "8$" - + .include "data/scripts/tv.inc" .include "data/text/tv.inc" @@ -4778,7 +4779,7 @@ MtPyre_2F_MapScript1_2A8331: @ 82A8331 EventScript_FallDownHole:: @ 82A8337 lockall delay 20 - applymovement 255, GraniteCave_B1F_Movement_2A8369 + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 waitmovement 0 playse SE_RU_HYUU delay 60 @@ -4789,7 +4790,7 @@ EventScript_FallDownHole:: @ 82A8337 gUnknown_082A8350:: @ 82A8350 lockall delay 20 - applymovement 255, GraniteCave_B1F_Movement_2A8369 + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 waitmovement 0 playse SE_RU_HYUU delay 60 @@ -9079,7 +9080,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 - applymovement 255, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 @@ -9087,7 +9088,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 - applymovement 255, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 @@ -9168,7 +9169,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 @@ -9176,7 +9177,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 75ac9a4ec..660e13947 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -536,7 +536,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM removeobject 7 call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC - applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 setvar VAR_TEMP_1, 1 end diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index 5ffb5de3d..f83f6f339 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -10,14 +10,14 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 delay 16 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F - applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_257417 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_257417 waitmovement 0 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444 waitmovement 0 msgbox BattleFrontier_BattleArenaCorridor_Text_257449, MSGBOX_SIGN applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446 waitmovement 0 - applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_25742C waitmovement 0 setvar VAR_0x8006, 0 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 36f864c14..79044d471 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -259,12 +259,12 @@ BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003 BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005 applymovement 1, BattleFrontier_BattleArenaLobby_Movement_256034 - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256041 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256041 waitmovement 0 opendoor 2, 2 waitdooranim applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C waitmovement 0 closedoor 2, 2 waitdooranim @@ -308,12 +308,12 @@ BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25607F - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256088 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256088 waitmovement 0 opendoor 11, 2 waitdooranim applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C waitmovement 0 closedoor 11, 2 waitdooranim diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 2d147e426..9b4c045d8 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -551,7 +551,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC setvar VAR_TEMP_1, 1 - applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index a4c0dafc4..f69e7b633 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -15,12 +15,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 waitmovement 0 opendoor 13, 3 waitdooranim applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1AE + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1AE waitmovement 0 closedoor 13, 3 waitdooranim @@ -28,12 +28,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6 - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 waitmovement 0 opendoor 37, 3 waitdooranim applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6 - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 waitmovement 0 closedoor 37, 3 waitdooranim diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index a4a719090..9e906433a 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -313,7 +313,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5 - applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D @@ -324,7 +324,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5 - applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 28d634162..8e4a8c944 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -24,7 +24,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 setvar VAR_0x8006, 1 special CallFrontierUtilFunc setvar VAR_TEMP_0, 1 - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 waitmovement 0 lockall @@ -171,11 +171,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D closemessage applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F waitmovement 0 - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 waitmovement 0 opendoor 5, 1 waitdooranim - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 waitmovement 0 closedoor 5, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index ab3ea4d7c..4298f7579 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -55,7 +55,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B closemessage applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B waitmovement 0 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7 @@ -65,7 +65,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 compare VAR_TEMP_F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B waitmovement 0 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 setvar VAR_0x8004, 11 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index b387fc048..ab6e3ee84 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -223,7 +223,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762 applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 - applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC waitmovement 0 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 setvar VAR_TEMP_0, 0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index a212ce38f..683b633ff 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -27,7 +27,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC - applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A waitmovement 0 compare VAR_0x8006, 2 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 @@ -448,12 +448,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3 - applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9 - applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6 return BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index ccada959e..c377d9580 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -357,7 +357,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 setvar VAR_TEMP_1, 1 - applymovement 255, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 removeobject 2 applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 199a67fa6..98c6f8092 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 delay 16 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 waitmovement 0 lockall setvar VAR_0x8004, 3 @@ -31,12 +31,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 waitmovement 0 opendoor 6, 3 waitdooranim applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 waitmovement 0 closedoor 6, 3 waitdooranim @@ -44,12 +44,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5CB - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2 waitmovement 0 opendoor 10, 3 waitdooranim applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 waitmovement 0 closedoor 10, 3 waitdooranim diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index c81331ddc..223dbc45a 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -303,7 +303,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC compare VAR_FRONTIER_BATTLE_MODE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 - applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F @@ -311,7 +311,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 - applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 0a0df3636..7793fcbc2 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -18,14 +18,14 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8004, 24 setvar VAR_0x8005, 1 special CallBattlePikeFunction - applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80B + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 waitmovement 0 lockall msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, MSGBOX_DEFAULT closemessage releaseall - applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80E + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E waitmovement 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index e4f3e1a6e..82ff5b3ae 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -263,7 +263,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80 BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94 applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7 - applymovement 255, BattleFrontier_BattlePikeLobby_Movement_25BAA6 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_25BAA6 waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 79a10880a..eea909b9c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -112,8 +112,8 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, MSGBOX_DEFAULT closemessage - special SpawnScriptEventObject - applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2 waitmovement 0 playse 267 @@ -215,7 +215,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA waitmovement 0 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -277,7 +277,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA waitmovement 0 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 @@ -285,7 +285,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E msgbox gStringVar4, MSGBOX_DEFAULT closemessage delay 16 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 1 @@ -302,13 +302,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC:: @ 825D5DC - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD waitmovement 0 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC waitmovement 0 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4 waitmovement 0 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF waitmovement 0 end @@ -431,7 +431,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774:: @ 825D774 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B closemessage - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC waitmovement 0 setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index d890b2d06..c2c32e0b1 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -434,7 +434,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4 - applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT setvar VAR_0x8004, 1 @@ -457,7 +457,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C closemessage applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5 waitmovement 0 - applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DD8 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DD8 waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index d7a1a3c3b..a3a004d6b 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -96,7 +96,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 closemessage applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD waitmovement 0 - applymovement 255, BattleFrontier_BattlePyramidTop_Movement_255403 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_255403 waitmovement 0 applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400 waitmovement 0 @@ -138,8 +138,8 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 - special SpawnScriptEventObject - applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT closemessage @@ -185,8 +185,8 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 - special SpawnScriptEventObject - applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 83b78d40e..d8e3d3ce6 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -18,7 +18,7 @@ BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62 BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C setvar VAR_TEMP_0, 1 - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242179 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179 waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 @@ -27,7 +27,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 setvar VAR_TEMP_2, 1 setvar VAR_0x8004, 2 @@ -79,7 +79,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT playfanfare MUS_ME_ASA @@ -146,7 +146,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC closemessage - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 waitmovement 0 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 waitmovement 0 @@ -275,7 +275,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79 BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF call BattleFrontier_BattleTowerBattleRoom_EventScript_242170 closemessage - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 waitmovement 0 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 waitmovement 0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc index 9ff6bbc59..b0a9624f8 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -24,13 +24,13 @@ BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A - applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B39 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39 waitmovement 0 goto BattleFrontier_BattleTowerCorridor_EventScript_241B27 BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37 - applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B36 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36 waitmovement 0 BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 968d45772..aa0fa97ff 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86 - applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A8A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A waitmovement 0 special sub_813A080 waitse @@ -18,7 +18,7 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 waitstate delay 48 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E - applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A92 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92 waitmovement 0 call BattleFrontier_BattleTowerElevator_EventScript_241A28 end diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 0911ea5f2..ec649dd9f 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -769,12 +769,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B call BattleFrontier_BattleTowerLobby_EventScript_23F1E8 call BattleFrontier_BattleTowerLobby_EventScript_23F22D applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F195 - applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F195 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F195 waitmovement 0 opendoor VAR_0x8004, 1 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F199 - applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F19C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F19C waitmovement 0 closedoor VAR_0x8004, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index b0c35a7fc..03bb7be63 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -60,12 +60,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 lockall - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 waitmovement 0 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 moveobjectoffscreen 1 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty @@ -119,19 +119,19 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A waitmovement 0 return BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E waitmovement 0 return BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 waitmovement 0 return diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 30f3a10d5..5ed97bd60 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT closemessage - applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D2 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2662D2 waitmovement 0 goto BattleFrontier_ReceptionGate_EventScript_266229 end @@ -40,18 +40,18 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement 255, BattleFrontier_ReceptionGate_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6 waitmovement 0 playse SE_PIN applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 - applymovement 255, BattleFrontier_ReceptionGate_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598 waitmovement 0 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 EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2662D7 applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266764, MSGBOX_DEFAULT diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 41abdcede..66e2bb9f9 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -123,16 +123,16 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 - applymovement 255, DewfordTown_Movement_1E9911 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 waitmovement 0 hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E97A2 - applymovement 255, DewfordTown_Movement_1E97A2 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2 waitmovement 0 showobjectat 255, MAP_ROUTE104 call DewfordTown_EventScript_2720A8 - applymovement 255, DewfordTown_Movement_1E9914 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914 waitmovement 0 showobjectat 255, MAP_ROUTE104 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY @@ -155,16 +155,16 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 - applymovement 255, DewfordTown_Movement_1E9911 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 waitmovement 0 hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E9865 - applymovement 255, DewfordTown_Movement_1E9865 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865 waitmovement 0 call DewfordTown_EventScript_2720A8 showobjectat 255, MAP_ROUTE109 - applymovement 255, DewfordTown_Movement_1E9918 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index bec9826f3..3a75fca12 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B compare VAR_FACING, 4 goto_eq DewfordTown_Hall_EventScript_1FD739 - applymovement 255, DewfordTown_Hall_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8 waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 return DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA - applymovement 255, DewfordTown_Hall_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6 waitmovement 0 return DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 - applymovement 255, DewfordTown_Hall_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA waitmovement 0 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 compare VAR_FACING, 3 goto_eq DewfordTown_Hall_EventScript_1FD739 - applymovement 255, DewfordTown_Hall_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4 waitmovement 0 return diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 250a3012b..4b51399eb 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -22,10 +22,10 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E lockall - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725C1 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725C1 waitmovement 0 delay 40 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228A42 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228A42 waitmovement 0 setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_228A45 @@ -105,7 +105,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 waitmovement 0 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 @@ -119,12 +119,12 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C1D + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 waitmovement 0 delay 20 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender @@ -134,7 +134,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C20 waitmovement 0 setflag FLAG_HIDE_PETALBURG_GYM_GREETER warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 waitmovement 0 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A4 waitmovement 0 return diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 2a871e18f..5fd0ff139 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -18,24 +18,24 @@ EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846 EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 lockall applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 - applymovement 255, EverGrandeCity_HallOfFame_Movement_229901 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 waitmovement 0 applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_229908 - applymovement 255, EverGrandeCity_HallOfFame_Movement_229908 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 waitmovement 0 delay 20 applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 - applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6 waitmovement 0 delay 20 dofieldeffect 62 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 0f3f6c33e..bc27878ab 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -77,12 +77,12 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 end EverGrandeCity_PokemonLeague_1F_EventScript_229698:: @ 8229698 - applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DA + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_2296DA waitmovement 0 return EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3 - applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DE + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_2296DE waitmovement 0 return diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc index d21216208..f3d0a924e 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -10,12 +10,12 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 lockall setvar VAR_TEMP_0, 1 applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB - applymovement 255, FallarborTown_BattleTentCorridor_Movement_2006FB + applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_2006FB waitmovement 0 opendoor 2, 1 waitdooranim applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701 - applymovement 255, FallarborTown_BattleTentCorridor_Movement_200700 + applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_200700 waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index aed9aa93f..abe8a9202 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -245,12 +245,12 @@ FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF applymovement 1, FallarborTown_BattleTentLobby_Movement_2001FE - applymovement 255, FallarborTown_BattleTentLobby_Movement_200205 + applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200205 waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, FallarborTown_BattleTentLobby_Movement_200202 - applymovement 255, FallarborTown_BattleTentLobby_Movement_200209 + applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200209 waitmovement 0 closedoor 6, 1 waitdooranim diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index da0668bac..ff594021a 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -42,13 +42,13 @@ GraniteCave_StevensRoom_EventScript_22DD0D:: @ 822DD0D return GraniteCave_StevensRoom_EventScript_22DD18:: @ 822DD18 - applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C applymovement 1, GraniteCave_StevensRoom_Movement_22DD45 waitmovement 0 return GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A - applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C applymovement 1, GraniteCave_StevensRoom_Movement_22DD51 waitmovement 0 return diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index a42703900..9d2a8b6dc 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -136,7 +136,7 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 applymovement 8, LavaridgeTown_Movement_27259A waitmovement 0 - applymovement 255, LavaridgeTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_2725A8 waitmovement 0 return @@ -151,7 +151,7 @@ LavaridgeTown_EventScript_1EA6AC:: @ 81EA6AC return LavaridgeTown_EventScript_1EA6B7:: @ 81EA6B7 - applymovement 255, LavaridgeTown_Movement_1EA6DF + applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_1EA6DF applymovement 7, LavaridgeTown_Movement_1EA6E3 waitmovement 0 return diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index a849925bd..b172dfd7a 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -37,7 +37,7 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 addobject 4 applymovement 4, LilycoveCity_ContestLobby_Movement_21A407 waitmovement 4 - applymovement 255, LilycoveCity_ContestLobby_Movement_21A418 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A418 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall @@ -212,7 +212,7 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 addobject 11 applymovement 11, LilycoveCity_ContestLobby_Movement_21A533 waitmovement 11 - applymovement 255, LilycoveCity_ContestLobby_Movement_21A545 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A545 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall @@ -422,12 +422,12 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 delay 20 applymovement 1, LilycoveCity_ContestLobby_Movement_21A706 waitmovement 0 - applymovement 255, LilycoveCity_ContestLobby_Movement_21A6F2 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A6F2 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_27B653, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD - applymovement 255, LilycoveCity_ContestLobby_Movement_21A6E8 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A6E8 waitmovement 0 releaseall return @@ -945,7 +945,7 @@ LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49 delay 20 applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF waitmovement 0 - applymovement 255, LilycoveCity_ContestLobby_Movement_21ACDB + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21ACDB waitmovement 0 messageautoscroll LilycoveCity_ContestLobby_Text_27B653 waitmessage @@ -953,7 +953,7 @@ LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49 closemessage call LilycoveCity_ContestLobby_EventScript_27AD92 applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE5 - applymovement 255, LilycoveCity_ContestLobby_Movement_21ACD0 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21ACD0 waitmovement 0 release return diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 18ef70cfd..35ab3aa8e 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -46,11 +46,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 waitmovement 0 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A waitmovement 0 - applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage - applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_218259 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_218259 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E waitmovement 0 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_218260 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 67ef01e09..7beb75988 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -439,12 +439,12 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC return LilycoveCity_Harbor_EventScript_21E610:: @ 821E610 - applymovement 255, LilycoveCity_Harbor_Movement_21E630 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E630 waitmovement 0 return LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B - applymovement 255, LilycoveCity_Harbor_Movement_21E633 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E633 waitmovement 0 return @@ -525,14 +525,14 @@ LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 LilycoveCity_Harbor_EventScript_21E6A1:: @ 821E6A1 applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 - applymovement 255, LilycoveCity_Harbor_Movement_21E6D7 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E6D7 applymovement 4, LilycoveCity_Harbor_Movement_21E6DC waitmovement 0 return LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 - applymovement 255, LilycoveCity_Harbor_Movement_21E6E4 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E6E4 applymovement 4, LilycoveCity_Harbor_Movement_21E6EA waitmovement 0 return diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index f56102a99..54ba63fb0 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -47,7 +47,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1 waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate @@ -55,7 +55,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate @@ -63,7 +63,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 5f2b64aec..e2bda1ab5 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -68,17 +68,17 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 lockall applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219863 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E waitmovement 0 - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN copyvar VAR_0x4094, 0x1 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index d4c0f4cea..54df8e81a 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -15,12 +15,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 - applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 - applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 waitmovement 0 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 660a3984d..8e70af98b 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -114,7 +114,7 @@ LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 LittlerootTown_EventScript_1E7F17:: @ 81E7F17 delay 15 playse SE_DANSA - applymovement 255, LittlerootTown_Movement_1E7FAC + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FAC waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim @@ -129,12 +129,12 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 msgbox LittlerootTown_Text_1E86BC, MSGBOX_DEFAULT closemessage applymovement 4, LittlerootTown_Movement_1E7F9D - applymovement 255, LittlerootTown_Movement_1E7FA4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA4 waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 4, LittlerootTown_Movement_1E7FA1 - applymovement 255, LittlerootTown_Movement_1E7FA9 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9 waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setvar VAR_0x4092, 3 @@ -280,7 +280,7 @@ LittlerootTown_EventScript_1E80AD:: @ 81E80AD msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_1E80DF - applymovement 255, LittlerootTown_Movement_1E80EB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E80EB waitmovement 0 msgbox LittlerootTown_Text_1E8C07, MSGBOX_DEFAULT closemessage @@ -362,7 +362,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F lockall applymovement 1, LittlerootTown_Movement_2725A8 waitmovement 0 - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT @@ -533,70 +533,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement 255, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement 255, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85FE waitmovement 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 4413a80d5..363579e6e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -62,7 +62,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 lockall msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F783A applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A waitmovement 0 warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 @@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E waitmovement 0 applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString @@ -182,7 +182,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 end LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725AA waitmovement 0 return @@ -228,19 +228,19 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 step_end LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79F7 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F79F7 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A06 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1F79D3:: @ 81F79D3 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79FB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F79FB applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A0C waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F7A02 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F7A02 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A16 waitmovement 0 return diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 2ebc9b900..d0063a0e3 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -94,11 +94,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85CF + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85CF applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6 waitmovement 0 return @@ -106,11 +106,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB waitmovement 0 return @@ -118,11 +118,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED waitmovement 0 return @@ -130,7 +130,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A6 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 824c4d930..a974ce5cb 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -62,7 +62,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 lockall msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F898A applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A waitmovement 0 warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 @@ -95,7 +95,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE waitmovement 0 applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString @@ -221,7 +221,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B end LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725AA waitmovement 0 return @@ -267,19 +267,19 @@ LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 step_end LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA0 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BA0 applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BAF waitmovement 0 return LittlerootTown_MaysHouse_1F_EventScript_1F8B7C:: @ 81F8B7C - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BA4 applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BB5 waitmovement 0 return LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BAB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BAB applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BBF waitmovement 0 return diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 8a2ec10ac..ba3233853 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -95,11 +95,11 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9483 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F9483 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479 waitmovement 0 return @@ -107,11 +107,11 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9497 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F9497 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F waitmovement 0 return @@ -119,7 +119,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A6 waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -130,11 +130,11 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F94BB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F94BB applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2 waitmovement 0 return diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index ec6cd9738..829062a73 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -136,7 +136,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67 lockall - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78 waitmovement 0 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8 end @@ -168,7 +168,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 playse SE_TK_KASYA delay 20 applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 waitmovement 0 checkplayergender compare VAR_RESULT, 0 @@ -181,7 +181,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 waitmovement 0 applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -244,7 +244,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58 LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 lockall - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, MSGBOX_DEFAULT setvar VAR_0x40D3, 5 @@ -534,7 +534,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 checkplayergender compare VAR_RESULT, 0 diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 714983999..818b11da7 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement 255, MagmaHideout_4F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A6 waitmovement 0 delay 150 removeobject 7 @@ -50,7 +50,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage - applymovement 255, MagmaHideout_4F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A8 waitmovement 0 delay 30 applymovement 6, MagmaHideout_4F_Movement_27259E diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index f61620c29..68e27fa58 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -27,7 +27,7 @@ MarineCave_End_EventScript_23B012:: @ 823B012 MarineCave_End_EventScript_23B01B:: @ 823B01B lockall - applymovement 255, MarineCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, MarineCave_End_Movement_2725B2 waitmovement 0 applymovement 1, MarineCave_End_Movement_23B09D waitmovement 0 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 17ace6e10..e0835a87d 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -118,19 +118,19 @@ MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD end MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 - applymovement 255, MauvilleCity_Movement_1DF6DF + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DF applymovement 6, MauvilleCity_Movement_1DF6A8 applymovement 7, MauvilleCity_Movement_1DF6E2 waitmovement 0 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 delay 30 - applymovement 255, MauvilleCity_Movement_1DF6EE + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE applymovement 7, MauvilleCity_Movement_1DF6F3 waitmovement 0 msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT closemessage - applymovement 255, MauvilleCity_Movement_1DF6CC + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6CC applymovement 7, MauvilleCity_Movement_1DF6FA applymovement 6, MauvilleCity_Movement_1DF6B4 waitmovement 0 @@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 end MauvilleCity_EventScript_1DF53D:: @ 81DF53D - applymovement 255, MauvilleCity_Movement_1DF6DC + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DC applymovement 6, MauvilleCity_Movement_1DF6AE applymovement 7, MauvilleCity_Movement_1DF6E8 waitmovement 0 @@ -149,7 +149,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D waitmovement 0 msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT closemessage - applymovement 255, MauvilleCity_Movement_1DF6D0 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D0 applymovement 7, MauvilleCity_Movement_1DF703 applymovement 6, MauvilleCity_Movement_1DF6C0 waitmovement 0 @@ -168,7 +168,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 call_if 1, MauvilleCity_EventScript_1DF5F3 compare VAR_FACING, 4 call_if 1, MauvilleCity_EventScript_1DF601 - applymovement 255, MauvilleCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage @@ -195,13 +195,13 @@ MauvilleCity_EventScript_1DF601:: @ 81DF601 return MauvilleCity_EventScript_1DF616:: @ 81DF616 - applymovement 255, MauvilleCity_Movement_1DF6D5 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D5 applymovement 11, MauvilleCity_Movement_1DF725 waitmovement 0 return MauvilleCity_EventScript_1DF628:: @ 81DF628 - applymovement 255, MauvilleCity_Movement_1DF6D8 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D8 applymovement 11, MauvilleCity_Movement_1DF72F waitmovement 0 return diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 23afa4845..4867ad44f 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -17,7 +17,7 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F lockall playbgm MUS_MGM0, 0 - applymovement 255, MeteorFalls_1F_1R_Movement_2725B0 + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725B0 waitmovement 0 delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 @@ -38,7 +38,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725A4 applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 waitmovement 0 @@ -55,7 +55,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_22BF1D + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_22BF1D applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4 applymovement 6, MeteorFalls_1F_1R_Movement_22BECE waitmovement 0 diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index fe037074f..a4a87e3e7 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -269,13 +269,13 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85 end MossdeepCity_EventScript_1E4CB0:: @ 81E4CB0 - applymovement 255, MossdeepCity_Movement_1E4CD4 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4 applymovement 16, MossdeepCity_Movement_1E4CD8 waitmovement 0 return MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2 - applymovement 255, MossdeepCity_Movement_1E4CD4 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4 applymovement 16, MossdeepCity_Movement_1E4CE2 waitmovement 0 return diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index f42b3f4e4..dd9ebf951 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -118,7 +118,7 @@ MossdeepCity_Gym_EventScript_220999:: @ 8220999 checkflag FLAG_0x064 goto_eq MossdeepCity_Gym_EventScript_2209D0 setflag FLAG_0x064 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 5, 5, 516, 0 setmetatile 2, 7, 569, 1 @@ -133,7 +133,7 @@ MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8 MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 clearflag FLAG_0x064 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 5, 5, 524, 0 setmetatile 2, 7, 568, 1 @@ -145,7 +145,7 @@ MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 checkflag FLAG_0x065 goto_eq MossdeepCity_Gym_EventScript_220A24 setflag FLAG_0x065 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 8, 14, 516, 0 setmetatile 8, 10, 569, 1 @@ -154,7 +154,7 @@ MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 clearflag FLAG_0x065 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 8, 14, 517, 0 setmetatile 8, 10, 568, 1 @@ -166,7 +166,7 @@ MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 checkflag FLAG_0x066 goto_eq MossdeepCity_Gym_EventScript_220A78 setflag FLAG_0x066 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 15, 17, 524, 0 setmetatile 17, 15, 569, 1 @@ -175,7 +175,7 @@ MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 clearflag FLAG_0x066 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 15, 17, 516, 0 setmetatile 17, 15, 568, 1 @@ -187,7 +187,7 @@ MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D checkflag FLAG_0x067 goto_eq MossdeepCity_Gym_EventScript_220ACC setflag FLAG_0x067 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 1, 23, 525, 0 setmetatile 5, 24, 569, 1 @@ -196,7 +196,7 @@ MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC clearflag FLAG_0x067 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 1, 23, 516, 0 setmetatile 5, 24, 568, 1 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 3c31ec06c..96bc41e07 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -32,16 +32,16 @@ MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF playse SE_PIN - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_272598 waitmovement 0 - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_27259A waitmovement 0 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, MSGBOX_DEFAULT closemessage - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_223E07 waitmovement 0 warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 waitstate @@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 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 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A4 waitmovement 0 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 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A8 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 88df5692e..ee89519bc 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -62,7 +62,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if 1, MtChimney_EventScript_22EEC7 compare VAR_FACING, 2 call_if 1, MtChimney_EventScript_22EED2 - applymovement 255, MtChimney_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4 waitmovement 0 msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 89fc9fd38..664f75935 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -19,7 +19,7 @@ MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 lockall - applymovement 255, MtChimney_CableCarStation_Movement_22ACB4 + applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4 applymovement 1, MtChimney_CableCarStation_Movement_22ACAA waitmovement 0 setvar VAR_0x40A3, 0 @@ -42,7 +42,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C msgbox MtChimney_CableCarStation_Text_22ACF8, MSGBOX_DEFAULT closemessage applymovement 1, MtChimney_CableCarStation_Movement_22ACA5 - applymovement 255, MtChimney_CableCarStation_Movement_22ACAF + applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x40A3, 2 diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 13caaab1e..3e19bc95a 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -32,7 +32,7 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 MtPyre_Summit_EventScript_23203C:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement 255, MtPyre_Summit_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2 waitmovement 0 applymovement 2, MtPyre_Summit_Movement_2725AA waitmovement 0 @@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC MtPyre_Summit_EventScript_2320F7:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_23212C waitmovement 0 - applymovement 255, MtPyre_Summit_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8 waitmovement 0 return @@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C MtPyre_Summit_EventScript_232117:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_232132 waitmovement 0 - applymovement 255, MtPyre_Summit_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4 waitmovement 0 return @@ -210,7 +210,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204 end MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement 255, MtPyre_Summit_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6 waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -250,49 +250,49 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 end MtPyre_Summit_EventScript_2322C4:: @ 82322C4 - applymovement 255, MtPyre_Summit_Movement_2323C4 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323C4 applymovement 2, MtPyre_Summit_Movement_2323B6 applymovement 8, MtPyre_Summit_Movement_2323BD waitmovement 0 return MtPyre_Summit_EventScript_2322DD:: @ 82322DD - applymovement 255, MtPyre_Summit_Movement_2323CB + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323CB applymovement 2, MtPyre_Summit_Movement_2323B6 applymovement 8, MtPyre_Summit_Movement_2323BD waitmovement 0 return MtPyre_Summit_EventScript_2322F6:: @ 82322F6 - applymovement 255, MtPyre_Summit_Movement_2323D2 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323D2 applymovement 2, MtPyre_Summit_Movement_2323B6 applymovement 8, MtPyre_Summit_Movement_2323BD waitmovement 0 return MtPyre_Summit_EventScript_23230F:: @ 823230F - applymovement 255, MtPyre_Summit_Movement_2323AE + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323AE applymovement 2, MtPyre_Summit_Movement_2323E7 applymovement 8, MtPyre_Summit_Movement_2323D8 waitmovement 0 return MtPyre_Summit_EventScript_232328:: @ 8232328 - applymovement 255, MtPyre_Summit_Movement_2323B2 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323B2 applymovement 2, MtPyre_Summit_Movement_2323E7 applymovement 8, MtPyre_Summit_Movement_2323DD waitmovement 0 return MtPyre_Summit_EventScript_232341:: @ 8232341 - applymovement 255, MtPyre_Summit_Movement_2323B2 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323B2 applymovement 2, MtPyre_Summit_Movement_2323E7 applymovement 8, MtPyre_Summit_Movement_2323E2 waitmovement 0 return MtPyre_Summit_EventScript_23235A:: @ 823235A - applymovement 255, MtPyre_Summit_Movement_2323EA + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323ED waitmovement 0 applymovement 2, MtPyre_Summit_Movement_2725A8 @@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A return MtPyre_Summit_EventScript_232376:: @ 8232376 - applymovement 255, MtPyre_Summit_Movement_2323EA + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F3 waitmovement 0 applymovement 2, MtPyre_Summit_Movement_2725A8 @@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376 return MtPyre_Summit_EventScript_232392:: @ 8232392 - applymovement 255, MtPyre_Summit_Movement_2323EA + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F8 waitmovement 0 applymovement 2, MtPyre_Summit_Movement_2725A8 diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 8ae17cb37..f2b107947 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -38,12 +38,12 @@ NavelRock_Top_EventScript_26915B:: @ 826915B NavelRock_Top_EventScript_26916F:: @ 826916F lockall setvar VAR_TEMP_1, 1 - special SpawnScriptEventObject + special SpawnCameraObject setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 special sub_813B80C applymovement 1, NavelRock_Top_Movement_269243 - applymovement 127, NavelRock_Top_Movement_269230 + applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230 waitmovement 0 delay 50 setweather 0 @@ -56,10 +56,10 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 special sub_813B80C - applymovement 127, NavelRock_Top_Movement_269234 + applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269234 applymovement 1, NavelRock_Top_Movement_26923A waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject setvar VAR_0x8004, 250 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 714a20b6b..9efc423db 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,7 +23,7 @@ NewMauville_Entrance_MapScript1_2372FB: @ 82372FB NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall - applymovement 255, NewMauville_Entrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, NewMauville_Entrance_Movement_2725A6 waitmovement 0 msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index d2e808116..80867cca6 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -54,20 +54,20 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC OldaleTown_EventScript_1E8F47:: @ 81E8F47 applymovement 2, OldaleTown_Movement_1E8FD7 - applymovement 255, OldaleTown_Movement_1E9001 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9001 waitmovement 0 goto OldaleTown_EventScript_1E8F8C end OldaleTown_EventScript_1E8F5E:: @ 81E8F5E applymovement 2, OldaleTown_Movement_1E8FE2 - applymovement 255, OldaleTown_Movement_1E900B + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E900B waitmovement 0 goto OldaleTown_EventScript_1E8F8C end OldaleTown_EventScript_1E8F75:: @ 81E8F75 - applymovement 255, OldaleTown_Movement_1E8FF9 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E8FF9 applymovement 2, OldaleTown_Movement_1E8FCE waitmovement 0 goto OldaleTown_EventScript_1E8F8C @@ -206,7 +206,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F OldaleTown_EventScript_1E903F:: @ 81E903F lockall - applymovement 255, OldaleTown_Movement_1E9182 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9182 applymovement 3, OldaleTown_Movement_1E9185 waitmovement 0 msgbox OldaleTown_Text_1E9313, MSGBOX_DEFAULT @@ -233,7 +233,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086 lockall applymovement 4, OldaleTown_Movement_1E9170 waitmovement 0 - applymovement 255, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -243,7 +243,7 @@ OldaleTown_EventScript_1E90A6:: @ 81E90A6 lockall applymovement 4, OldaleTown_Movement_1E9173 waitmovement 0 - applymovement 255, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -253,7 +253,7 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 lockall applymovement 4, OldaleTown_Movement_1E9175 waitmovement 0 - applymovement 255, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -299,7 +299,7 @@ OldaleTown_EventScript_1E9148:: @ 81E9148 return OldaleTown_EventScript_1E915E:: @ 81E915E - applymovement 255, OldaleTown_Movement_1E917E + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E917E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 return diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index bdffb6814..beee8d57e 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -33,7 +33,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special SavePlayerParty special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_1DC451 - applymovement 255, PetalburgCity_Movement_1DC430 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC430 waitmovement 0 msgbox PetalburgCity_Text_1EC1F8, MSGBOX_DEFAULT special StartWallyTutorialBattle @@ -58,14 +58,14 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 lockall setflag FLAG_SPECIAL_FLAG_0x4000 applymovement 5, PetalburgCity_Movement_1DC41B - applymovement 255, PetalburgCity_Movement_1DC406 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406 waitmovement 0 setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 5, PetalburgCity_Movement_1DC42D - applymovement 255, PetalburgCity_Movement_1DC418 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC418 waitmovement 0 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE hideobjectat 255, MAP_PETALBURG_CITY @@ -286,7 +286,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA call_if 1, PetalburgCity_EventScript_1DC5FF msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT applymovement 8, PetalburgCity_Movement_2725A8 - applymovement 255, PetalburgCity_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 waitmovement 0 msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT closemessage @@ -299,7 +299,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA PetalburgCity_EventScript_1DC57F:: @ 81DC57F applymovement 8, PetalburgCity_Movement_1DC615 waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725AA waitmovement 0 return @@ -311,38 +311,38 @@ PetalburgCity_EventScript_1DC594:: @ 81DC594 PetalburgCity_EventScript_1DC59F:: @ 81DC59F applymovement 8, PetalburgCity_Movement_1DC61D waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 waitmovement 0 return PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 applymovement 8, PetalburgCity_Movement_1DC622 waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 waitmovement 0 return PetalburgCity_EventScript_1DC5C9:: @ 81DC5C9 applymovement 8, PetalburgCity_Movement_1DC628 - applymovement 255, PetalburgCity_Movement_1DC665 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC665 waitmovement 0 return PetalburgCity_EventScript_1DC5DB:: @ 81DC5DB applymovement 8, PetalburgCity_Movement_1DC633 - applymovement 255, PetalburgCity_Movement_1DC66F + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC66F waitmovement 0 return PetalburgCity_EventScript_1DC5ED:: @ 81DC5ED applymovement 8, PetalburgCity_Movement_1DC641 - applymovement 255, PetalburgCity_Movement_1DC67C + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC67C waitmovement 0 return PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF applymovement 8, PetalburgCity_Movement_1DC64C - applymovement 255, PetalburgCity_Movement_1DC686 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC686 waitmovement 0 return @@ -544,7 +544,7 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 waitmovement 0 applymovement 9, PetalburgCity_Movement_1DC7DB waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 waitmovement 0 setvar VAR_0x40D1, 1 msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT @@ -573,25 +573,25 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 end PetalburgCity_EventScript_1DC78E:: @ 81DC78E - applymovement 255, PetalburgCity_Movement_1DC7EE + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC7EE applymovement 9, PetalburgCity_Movement_1DC7E0 waitmovement 0 return PetalburgCity_EventScript_1DC7A0:: @ 81DC7A0 - applymovement 255, PetalburgCity_Movement_1DC802 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC802 applymovement 9, PetalburgCity_Movement_1DC7F5 waitmovement 0 return PetalburgCity_EventScript_1DC7B2:: @ 81DC7B2 - applymovement 255, PetalburgCity_Movement_1DC815 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC815 applymovement 9, PetalburgCity_Movement_1DC808 waitmovement 0 return PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4 - applymovement 255, PetalburgCity_Movement_1DC828 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC828 applymovement 9, PetalburgCity_Movement_1DC81B waitmovement 0 return diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 6a58c20f7..9b0f4bcb5 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -91,14 +91,14 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT closemessage - applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA applymovement 10, PetalburgCity_Gym_Movement_2049EC waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement 255, PetalburgCity_Gym_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 waitmovement 0 msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT setvar VAR_0x4085, 2 @@ -238,13 +238,13 @@ PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 applymovement 10, PetalburgCity_Gym_Movement_2050E1 waitmovement 0 applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement 255, PetalburgCity_Gym_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 waitmovement 0 return PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return @@ -252,25 +252,25 @@ PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 applymovement 1, PetalburgCity_Gym_Movement_2725AA applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement 255, PetalburgCity_Gym_Movement_205111 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 waitmovement 0 return PetalburgCity_Gym_EventScript_204C91:: @ 8204C91 applymovement 10, PetalburgCity_Gym_Movement_2050F2 - applymovement 255, PetalburgCity_Gym_Movement_205109 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205109 waitmovement 0 return PetalburgCity_Gym_EventScript_204CA3:: @ 8204CA3 applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement 255, PetalburgCity_Gym_Movement_20511B + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_20511B waitmovement 0 return PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 applymovement 10, PetalburgCity_Gym_Movement_2050FA - applymovement 255, PetalburgCity_Gym_Movement_205123 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205123 waitmovement 0 return @@ -281,19 +281,19 @@ PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 255, PetalburgCity_Gym_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 waitmovement 0 return PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement 255, PetalburgCity_Gym_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 waitmovement 0 return PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 applymovement 1, PetalburgCity_Gym_Movement_2725A4 - applymovement 255, PetalburgCity_Gym_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 waitmovement 0 return @@ -524,7 +524,7 @@ PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 PetalburgCity_Gym_EventScript_204FED:: @ 8204FED applymovement 11, PetalburgCity_Gym_Movement_2050C3 waitmovement 0 - applymovement 255, PetalburgCity_Gym_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 applymovement 1, PetalburgCity_Gym_Movement_2725A4 waitmovement 0 return @@ -532,7 +532,7 @@ PetalburgCity_Gym_EventScript_204FED:: @ 8204FED PetalburgCity_Gym_EventScript_205009:: @ 8205009 applymovement 11, PetalburgCity_Gym_Movement_2050CA waitmovement 0 - applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA applymovement 1, PetalburgCity_Gym_Movement_2725AA waitmovement 0 return @@ -540,7 +540,7 @@ PetalburgCity_Gym_EventScript_205009:: @ 8205009 PetalburgCity_Gym_EventScript_205025:: @ 8205025 applymovement 11, PetalburgCity_Gym_Movement_2050D0 waitmovement 0 - applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA applymovement 1, PetalburgCity_Gym_Movement_2725AA waitmovement 0 return @@ -548,19 +548,19 @@ PetalburgCity_Gym_EventScript_205025:: @ 8205025 PetalburgCity_Gym_EventScript_205041:: @ 8205041 applymovement 11, PetalburgCity_Gym_Movement_20507E applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 255, PetalburgCity_Gym_Movement_2050A1 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 waitmovement 0 return PetalburgCity_Gym_EventScript_20505A:: @ 820505A applymovement 11, PetalburgCity_Gym_Movement_205089 - applymovement 255, PetalburgCity_Gym_Movement_2050A9 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A9 waitmovement 0 return PetalburgCity_Gym_EventScript_20506C:: @ 820506C applymovement 11, PetalburgCity_Gym_Movement_205094 - applymovement 255, PetalburgCity_Gym_Movement_2050B1 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050B1 waitmovement 0 return diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 387955f73..7dab2747b 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -30,7 +30,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 call PetalburgWoods_EventScript_22E138 - applymovement 255, PetalburgWoods_Movement_22E1E0 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_22E1E0 applymovement 4, PetalburgWoods_Movement_22E1C2 waitmovement 0 goto PetalburgWoods_EventScript_22E1A7 @@ -41,7 +41,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 call PetalburgWoods_EventScript_22E124 applymovement 4, PetalburgWoods_Movement_22E1D0 waitmovement 0 - applymovement 255, PetalburgWoods_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A4 waitmovement 0 msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage @@ -59,14 +59,14 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 applymovement 4, PetalburgWoods_Movement_22E1EA waitmovement 0 msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT - applymovement 255, PetalburgWoods_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A6 waitmovement 0 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 - applymovement 255, PetalburgWoods_Movement_22E1E0 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_22E1E0 applymovement 4, PetalburgWoods_Movement_22E1D7 waitmovement 0 goto PetalburgWoods_EventScript_22E1A7 @@ -85,7 +85,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 applymovement 3, PetalburgWoods_Movement_22E1FD waitmovement 0 removeobject 3 - applymovement 255, PetalburgWoods_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725AA waitmovement 0 msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index f724914ba..eaf9d7118 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -23,7 +23,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 - applymovement 255, Route101_Movement_1EBDC2 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBDC2 applymovement 2, Route101_Movement_1EBDE7 applymovement 4, Route101_Movement_1EBDB5 waitmovement 0 @@ -45,7 +45,7 @@ Route101_EventScript_1EBD4E:: @ 81EBD4E lockall msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_1EBD90 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD90 waitmovement 0 releaseall end @@ -54,7 +54,7 @@ Route101_EventScript_1EBD64:: @ 81EBD64 lockall msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_1EBD92 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD92 waitmovement 0 releaseall end @@ -63,7 +63,7 @@ Route101_EventScript_1EBD7A:: @ 81EBD7A lockall msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_1EBD94 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD94 waitmovement 0 releaseall end @@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 fadescreen 1 removeobject 4 setobjectxy 255, 6, 13 - applymovement 255, Route101_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4 waitmovement 0 special ChooseStarter waitstate diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index e79ddd041..e2b60e800 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -111,7 +111,7 @@ Route103_EventScript_1EC50A:: @ 81EC50A end Route103_EventScript_1EC53D:: @ 81EC53D - applymovement 255, Route103_Movement_1EC5C8 + applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_1EC5C8 applymovement 2, Route103_Movement_1EC5BE waitmovement 0 playse SE_DANSA @@ -121,7 +121,7 @@ Route103_EventScript_1EC53D:: @ 81EC53D end Route103_EventScript_1EC561:: @ 81EC561 - applymovement 255, Route103_Movement_1EC5D6 + applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_1EC5D6 applymovement 2, Route103_Movement_1EC5CE waitmovement 0 playse SE_DANSA diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 1d591793d..c6f019edb 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -55,12 +55,12 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 - applymovement 255, Route104_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 waitmovement 0 delay 10 addobject 34 clearflag FLAG_HIDE_ROUTE_104_RIVAL - applymovement 255, Route104_Movement_1ECF86 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECF86 waitmovement 0 applymovement 34, Route104_Movement_1ECF8A waitmovement 0 @@ -113,7 +113,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B closemessage delay 30 setflag FLAG_0x0FD - applymovement 255, Route104_Movement_1ECDCD + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 msgbox Route104_Text_1EDCB1, MSGBOX_DEFAULT closemessage @@ -204,7 +204,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F closemessage delay 30 setflag FLAG_0x0FD - applymovement 255, Route104_Movement_1ECDCD + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 msgbox Route104_Text_1EDFC6, MSGBOX_DEFAULT closemessage @@ -372,7 +372,7 @@ Route104_EventScript_1ED099:: @ 81ED099 applymovement 8, Route104_Movement_1ED359 waitmovement 0 removeobject 8 - applymovement 255, Route104_Movement_1ED34F + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F waitmovement 0 hideobjectat 255, MAP_ROUTE104 call Route104_EventScript_2720A0 @@ -384,13 +384,13 @@ Route104_EventScript_1ED099:: @ 81ED099 Route104_EventScript_1ED0D9:: @ 81ED0D9 applymovement 7, Route104_Movement_1ED28C - applymovement 255, Route104_Movement_1ED28C + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED28C waitmovement 0 goto Route104_EventScript_1ED139 Route104_EventScript_1ED0EF:: @ 81ED0EF applymovement 7, Route104_Movement_1ED1C8 - applymovement 255, Route104_Movement_1ED1C8 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED1C8 waitmovement 0 pokenavcall Route104_Text_1EE336 waitmessage @@ -401,7 +401,7 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF closemessage delay 30 setflag FLAG_0x132 - applymovement 255, Route104_Movement_1ED22A + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED22A applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104 waitmovement 7, MAP_ROUTE104 waitmovement 0 @@ -409,11 +409,11 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF Route104_EventScript_1ED139:: @ 81ED139 delay 50 - applymovement 255, Route104_Movement_1ED353 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353 waitmovement 0 call Route104_EventScript_2720A8 showobjectat 255, MAP_DEWFORD_TOWN - applymovement 255, Route104_Movement_1ED355 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 52f6437ae..51430fd91 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -15,19 +15,19 @@ Route109_EventScript_1EE760:: @ 81EE760 end Route109_EventScript_1EE7A5:: @ 81EE7A5 - applymovement 255, Route109_Movement_1EE8FD + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE8FD waitmovement 0 goto Route109_EventScript_1EE7D5 end Route109_EventScript_1EE7B5:: @ 81EE7B5 - applymovement 255, Route109_Movement_1EE905 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE905 waitmovement 0 goto Route109_EventScript_1EE7D5 end Route109_EventScript_1EE7C5:: @ 81EE7C5 - applymovement 255, Route109_Movement_1EE908 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE908 waitmovement 0 goto Route109_EventScript_1EE7D5 end @@ -36,12 +36,12 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 hideobjectat 255, MAP_ROUTE109 call Route109_EventScript_2720A0 applymovement 1, Route109_Movement_1EE84F - applymovement 255, Route109_Movement_1EE84F + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F waitmovement 0 delay 50 call Route109_EventScript_2720A8 showobjectat 255, MAP_DEWFORD_TOWN - applymovement 255, Route109_Movement_1EE900 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900 waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index ee859748f..a1c3383a4 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -21,7 +21,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, MSGBOX_DEFAULT closemessage - applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 + applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 waitmovement 0 releaseall end diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 9bd6c845e..4e78df507 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -39,7 +39,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, MSGBOX_DEFAULT closemessage - applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 + applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 waitmovement 0 releaseall end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 892d9e65f..6f1adef4f 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -241,11 +241,11 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 applymovement 1, Route110_TrickHouseEnd_Movement_26B08B waitmovement 0 playse SE_W153 - applymovement 255, Route110_TrickHouseEnd_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_2725AA waitmovement 0 msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage - applymovement 255, Route110_TrickHouseEnd_Movement_26B089 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_26B089 waitmovement 0 delay 4 turnobject 1, 4 diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 22750f536..c4f30dedb 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -243,9 +243,9 @@ Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E playse SE_PIN - applymovement 255, Route110_TrickHouseEntrance_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_272598 waitmovement 0 - applymovement 255, Route110_TrickHouseEntrance_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A waitmovement 0 compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_269DEE @@ -513,9 +513,9 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 setmetatile 5, 1, 537, 0 special DrawWholeMapView delay 20 - applymovement 255, Route110_TrickHouseEntrance_Movement_2725C9 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_2725C9 waitmovement 0 - applymovement 255, Route110_TrickHouseEntrance_Movement_26A1A7 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7 waitmovement 0 switch VAR_0x4044 case 0, Route110_TrickHouseEntrance_EventScript_26A1A9 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 2be579ab6..8d5de281b 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -227,22 +227,22 @@ Route111_EventScript_1F0F45:: @ 81F0F45 end Route111_EventScript_1F0F7C:: @ 81F0F7C - applymovement 255, Route111_Movement_1F0FA8 + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FA8 waitmovement 0 return Route111_EventScript_1F0F87:: @ 81F0F87 - applymovement 255, Route111_Movement_1F0FAA + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAA waitmovement 0 return Route111_EventScript_1F0F92:: @ 81F0F92 - applymovement 255, Route111_Movement_1F0FAC + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAC waitmovement 0 return Route111_EventScript_1F0F9D:: @ 81F0F9D - applymovement 255, Route111_Movement_1F0FAE + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAE waitmovement 0 return @@ -298,7 +298,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 removeobject 1 call Route111_EventScript_1F1143 - applymovement 255, Route111_Movement_1F114F + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F waitmovement 0 call Route111_EventScript_1F113C addobject 2 @@ -316,7 +316,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 removeobject 2 call Route111_EventScript_1F1143 - applymovement 255, Route111_Movement_1F114F + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F waitmovement 0 call Route111_EventScript_1F113C addobject 3 @@ -334,7 +334,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 removeobject 3 call Route111_EventScript_1F1143 - applymovement 255, Route111_Movement_1F114F + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F waitmovement 0 call Route111_EventScript_1F113C addobject 4 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index a7d3e8c7a..5873b2d53 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -20,7 +20,7 @@ Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 lockall - applymovement 255, Route112_CableCarStation_Movement_22AB80 + applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80 applymovement 1, Route112_CableCarStation_Movement_22AB76 waitmovement 0 setvar VAR_0x40A3, 0 @@ -43,7 +43,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 msgbox Route112_CableCarStation_Text_22ABC2, MSGBOX_DEFAULT closemessage applymovement 1, Route112_CableCarStation_Movement_22AB71 - applymovement 255, Route112_CableCarStation_Movement_22AB7B + applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B waitmovement 0 setvar VAR_0x8004, 0 setvar VAR_0x40A3, 1 diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 7b2a91810..1159128cc 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -26,7 +26,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 lockall applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 - applymovement 255, Route114_FossilManiacsTunnel_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Route114_FossilManiacsTunnel_Movement_2725AA waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_0x40CC, 2 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 2ad7ea58b..ab8377b1c 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -156,7 +156,7 @@ Route116_EventScript_1F2D84:: @ 81F2D84 Route116_EventScript_1F2D95:: @ 81F2D95 lockall applymovement 11, Route116_Movement_2725A8 - applymovement 255, Route116_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Route116_Movement_2725A4 waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 8d1cf48e4..e7aac8ac8 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -70,7 +70,7 @@ Route118_EventScript_1F3E85:: @ 81F3E85 Route118_EventScript_1F3E8E:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement 255, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 waitmovement 0 applymovement 19, Route118_Movement_1F3F61 waitmovement 0 @@ -80,7 +80,7 @@ Route118_EventScript_1F3E8E:: @ 81F3E8E Route118_EventScript_1F3EAE:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement 255, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 waitmovement 0 goto Route118_EventScript_1F3EE4 end @@ -88,7 +88,7 @@ Route118_EventScript_1F3EAE:: @ 81F3EAE Route118_EventScript_1F3EC4:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement 255, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 waitmovement 0 applymovement 19, Route118_Movement_1F3F63 waitmovement 0 @@ -114,19 +114,19 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 end Route118_EventScript_1F3F28:: @ 81F3F28 - applymovement 255, Route118_Movement_1F3F5E + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E applymovement 19, Route118_Movement_1F3F69 waitmovement 0 return Route118_EventScript_1F3F3A:: @ 81F3F3A - applymovement 255, Route118_Movement_1F3F5E + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E applymovement 19, Route118_Movement_1F3F74 waitmovement 0 return Route118_EventScript_1F3F4C:: @ 81F3F4C - applymovement 255, Route118_Movement_1F3F5E + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E applymovement 19, Route118_Movement_1F3F7E waitmovement 0 return diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index fd1d127d1..544330f9a 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -52,7 +52,7 @@ Route119_EventScript_1F4488:: @ 81F4488 call_if 1, Route119_EventScript_1F46C6 compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1F46D1 - applymovement 255, Route119_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_2725AA waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -208,13 +208,13 @@ Route119_EventScript_1F46D1:: @ 81F46D1 return Route119_EventScript_1F46DC:: @ 81F46DC - applymovement 255, Route119_Movement_1F471E + applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_1F471E applymovement 25, Route119_Movement_1F473D waitmovement 0 return Route119_EventScript_1F46EE:: @ 81F46EE - applymovement 255, Route119_Movement_1F4723 + applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_1F4723 applymovement 25, Route119_Movement_1F4747 waitmovement 0 return diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 35dd538df..1feda2f60 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -51,7 +51,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 closemessage addobject 7 applymovement 7, Route119_WeatherInstitute_2F_Movement_270170 - applymovement 255, Route119_WeatherInstitute_2F_Movement_27017C + applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_27017C waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT closemessage @@ -73,7 +73,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 removeobject 3 removeobject 8 removeobject 7 - applymovement 255, Route119_WeatherInstitute_2F_Movement_270184 + applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_270184 waitmovement 0 fadescreen 0 applymovement 5, Route119_WeatherInstitute_2F_Movement_270187 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index ba16b1a2f..1eed96ece 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -240,7 +240,7 @@ Route120_EventScript_1F571C:: @ 81F571C Route120_EventScript_1F572C:: @ 81F572C applymovement 31, Route120_Movement_2725AA - applymovement 255, Route120_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A6 waitmovement 0 msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE @@ -264,12 +264,12 @@ Route120_EventScript_1F572C:: @ 81F572C end Route120_EventScript_1F57A3:: @ 81F57A3 - applymovement 255, Route120_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A4 waitmovement 0 return Route120_EventScript_1F57AE:: @ 81F57AE - applymovement 255, Route120_Movement_1F57B9 + applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_1F57B9 waitmovement 0 return diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 12fa8112e..dcc427b0d 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -8,7 +8,7 @@ Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB lockall - applymovement 255, Route121_SafariZoneEntrance_Movement_22BBDD + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD waitmovement 0 setvar VAR_0x40A4, 0 releaseall @@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 lockall - applymovement 255, Route121_SafariZoneEntrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_2725A6 waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO @@ -78,7 +78,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 hidemoneybox nop nop - applymovement 255, Route121_SafariZoneEntrance_Movement_22BD18 + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18 waitmovement 0 special EnterSafariMode setvar VAR_0x40A4, 2 @@ -116,7 +116,7 @@ Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06 hidemoneybox nop nop - applymovement 255, Route121_SafariZoneEntrance_Movement_22BD16 + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD16 waitmovement 0 releaseall end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 2443051f5..b593528ab 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -31,12 +31,12 @@ Route128_EventScript_1F6B57:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 - applymovement 255, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 waitmovement 0 msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 - applymovement 255, Route128_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A4 applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 msgbox Route128_Text_1F704F, MSGBOX_DEFAULT @@ -54,12 +54,12 @@ Route128_EventScript_1F6B57:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_1F6C87 waitmovement 0 - applymovement 255, Route128_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A8 waitmovement 0 msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 - applymovement 255, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 waitmovement 0 msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT applymovement 3, Route128_Movement_2725AA diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 147c51177..26b1357a5 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -34,7 +34,7 @@ RustboroCity_MapScript2_1E070B: @ 81E070B RustboroCity_EventScript_1E0715:: @ 81E0715 lockall setvar VAR_0x4063, 1 - applymovement 255, RustboroCity_Movement_1E0850 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_1E0850 waitmovement 0 playse SE_KAIDAN delay 10 @@ -46,7 +46,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 applymovement 15, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 @@ -347,7 +347,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E RustboroCity_EventScript_1E0A79:: @ 81E0A79 applymovement 9, RustboroCity_Movement_1E0AD5 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 return @@ -511,7 +511,7 @@ RustboroCity_EventScript_1E0B6F:: @ 81E0B6F waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA waitmovement 0 return @@ -523,7 +523,7 @@ RustboroCity_EventScript_1E0B9B:: @ 81E0B9B waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AC + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC waitmovement 0 return @@ -535,7 +535,7 @@ RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 return @@ -549,7 +549,7 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 return @@ -619,7 +619,7 @@ RustboroCity_EventScript_1E0CDC:: @ 81E0CDC waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA waitmovement 0 return @@ -631,7 +631,7 @@ RustboroCity_EventScript_1E0D08:: @ 81E0D08 waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AE + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE waitmovement 0 return @@ -643,7 +643,7 @@ RustboroCity_EventScript_1E0D34:: @ 81E0D34 waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 return @@ -657,7 +657,7 @@ RustboroCity_EventScript_1E0D60:: @ 81E0D60 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 return @@ -708,7 +708,7 @@ RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E120E waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -724,7 +724,7 @@ RustboroCity_EventScript_1E0E33:: @ 81E0E33 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1215 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -740,7 +740,7 @@ RustboroCity_EventScript_1E0E73:: @ 81E0E73 waitmovement 0 applymovement 14, RustboroCity_Movement_1E121B waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -756,7 +756,7 @@ RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1220 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -772,7 +772,7 @@ RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1224 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -788,7 +788,7 @@ RustboroCity_EventScript_1E0F33:: @ 81E0F33 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1227 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -804,7 +804,7 @@ RustboroCity_EventScript_1E0F73:: @ 81E0F73 waitmovement 0 applymovement 14, RustboroCity_Movement_1E122B waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -820,7 +820,7 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1230 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index dc170677a..ce5a555ef 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -39,13 +39,13 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E closemessage playbgm MUS_TSURETEK, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534 - applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_212558 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_212E2F, MSGBOX_DEFAULT closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543 - applymovement 255, RustboroCity_DevonCorp_3F_Movement_212566 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_212566 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_212609, MSGBOX_DEFAULT giveitem_std ITEM_LETTER diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 1eaaba66c..48dcaffc9 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -86,13 +86,13 @@ RusturfTunnel_EventScript_22CEAE:: @ 822CEAE end RusturfTunnel_EventScript_22CF5D:: @ 822CF5D - applymovement 255, RusturfTunnel_Movement_22D042 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D042 applymovement 1, RusturfTunnel_Movement_22D067 waitmovement 0 return RusturfTunnel_EventScript_22CF6F:: @ 822CF6F - applymovement 255, RusturfTunnel_Movement_22D045 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 applymovement 10, RusturfTunnel_Movement_2725AA @@ -100,7 +100,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F return RusturfTunnel_EventScript_22CF8B:: @ 822CF8B - applymovement 255, RusturfTunnel_Movement_22D045 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 applymovement 10, RusturfTunnel_Movement_2725AA @@ -110,7 +110,7 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 applymovement 1, RusturfTunnel_Movement_2725A6 waitmovement 0 - applymovement 255, RusturfTunnel_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_2725AA waitmovement 0 return @@ -135,7 +135,7 @@ RusturfTunnel_EventScript_22CFD4:: @ 822CFD4 return RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 - applymovement 255, RusturfTunnel_Movement_22D02F + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D02F applymovement 10, RusturfTunnel_Movement_22D023 applymovement 1, RusturfTunnel_Movement_22D058 waitmovement 0 @@ -317,7 +317,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage - applymovement 255, RusturfTunnel_Movement_22D178 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D178 applymovement 6, RusturfTunnel_Movement_22D181 waitmovement 0 removeobject 6 @@ -325,7 +325,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 addobject 5 applymovement 5, RusturfTunnel_Movement_22D18B waitmovement 0 - applymovement 255, RusturfTunnel_Movement_22D17E + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D17E applymovement 5, RusturfTunnel_Movement_22D1A4 waitmovement 0 msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT @@ -338,7 +338,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 waitbuttonpress waitmoncry closemessage - applymovement 255, RusturfTunnel_Movement_22D19F + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D19F applymovement 5, RusturfTunnel_Movement_22D193 applymovement 7, RusturfTunnel_Movement_22D1A7 waitmovement 0 diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 15b0ba8e1..f844986c6 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -204,11 +204,11 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_23C26D waitmovement 0 - applymovement 255, SSTidalCorridor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_2725A8 waitmovement 0 msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage - applymovement 255, SSTidalCorridor_Movement_23C27D + applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_23C27D applymovement 1, SSTidalCorridor_Movement_23C284 applymovement 5, SSTidalCorridor_Movement_23C275 waitmovement 0 diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 6579b6571..8e9a20ad6 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -9,7 +9,7 @@ SafariZone_South_MapScript2_23D284: @ 823D284 SafariZone_South_EventScript_23D28E:: @ 823D28E lockall - applymovement 255, SafariZone_South_Movement_23D2C5 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D2C5 waitmovement 0 applymovement 1, SafariZone_South_Movement_23D2C7 waitmovement 0 @@ -77,7 +77,7 @@ SafariZone_South_EventScript_23D31A:: @ 823D31A SafariZone_South_EventScript_23D33F:: @ 823D33F applymovement 1, SafariZone_South_Movement_23D38A waitmovement 0 - applymovement 255, SafariZone_South_Movement_23D385 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D385 waitmovement 0 goto SafariZone_South_EventScript_23D373 end @@ -85,7 +85,7 @@ SafariZone_South_EventScript_23D33F:: @ 823D33F SafariZone_South_EventScript_23D359:: @ 823D359 applymovement 1, SafariZone_South_Movement_23D38D waitmovement 0 - applymovement 255, SafariZone_South_Movement_23D387 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D387 waitmovement 0 goto SafariZone_South_EventScript_23D373 end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 9406fcb6c..951f967a3 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -7,15 +7,15 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - applymovement 255, SeafloorCavern_Room9_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 waitmovement 0 - applymovement 255, SeafloorCavern_Room9_Movement_23505C + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C waitmovement 0 playbgm MUS_AQA_0, 0 msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement 255, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 @@ -48,7 +48,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 playse SE_TAMA special sub_80B0534 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 - applymovement 255, SeafloorCavern_Room9_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 waitmovement 0 delay 150 removeobject 7 @@ -82,7 +82,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement 255, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 1b2a1e4c9..95f229bcf 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -38,7 +38,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_2393D3 waitmovement 0 - applymovement 255, SkyPillar_Outside_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2725A4 waitmovement 0 msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage @@ -52,7 +52,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 delay 40 msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT closemessage - applymovement 255, SkyPillar_Outside_Movement_2393EB + applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2393EB applymovement 1, SkyPillar_Outside_Movement_2393DE waitmovement 0 setvar VAR_0x8004, 1 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index ef0419cdb..2b734e5b0 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -96,12 +96,12 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 SkyPillar_Top_EventScript_23979A:: @ 823979A lockall fadeoutbgm 1 - applymovement 255, SkyPillar_Top_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Top_Movement_2725B2 waitmovement 0 - special SpawnScriptEventObject - applymovement 127, SkyPillar_Top_Movement_239858 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_239858 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject applymovement 1, SkyPillar_Top_Movement_23983A waitmovement 0 waitse @@ -128,10 +128,10 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A closemessage delay 20 fadeinbgm 1 - special SpawnScriptEventObject - applymovement 127, SkyPillar_Top_Movement_23985C + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_23985C waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject setvar VAR_0x405E, 5 setvar VAR_0x40CA, 1 setvar VAR_0x40D7, 1 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index dc3a81650..f8e1dc454 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -56,7 +56,7 @@ SlateportCity_MapScript2_1DCD12: @ 81DCD12 SlateportCity_EventScript_1DCD1C:: @ 81DCD1C lockall addobject 35 - applymovement 255, SlateportCity_Movement_1DCDA8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DCDA8 applymovement 35, SlateportCity_Movement_1DCDAC waitmovement 0 msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT @@ -576,7 +576,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_1DD33C - applymovement 255, SlateportCity_Movement_1DD34A + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD34A applymovement 10, SlateportCity_Movement_1DD319 applymovement 9, SlateportCity_Movement_1DD326 waitmovement 0 @@ -608,7 +608,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT closemessage applymovement 11, SlateportCity_Movement_1DD337 - applymovement 255, SlateportCity_Movement_1DD344 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD344 waitmovement 0 removeobject 11 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN @@ -892,19 +892,19 @@ SlateportCity_EventScript_1DD5CE:: @ 81DD5CE SlateportCity_EventScript_1DD5DC:: @ 81DD5DC lockall - applymovement 255, SlateportCity_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_2725B2 waitmovement 0 opendoor 10, 12 waitdooranim addobject 35 - applymovement 255, SlateportCity_Movement_1DD630 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD630 applymovement 35, SlateportCity_Movement_1DD637 waitmovement 0 closedoor 10, 12 waitdooranim msgbox SlateportCity_Text_1DF28C, MSGBOX_DEFAULT closemessage - applymovement 255, SlateportCity_Movement_1DD634 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD634 applymovement 35, SlateportCity_Movement_1DD63A waitmovement 0 removeobject 35 diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 7eb935bf1..49a7180cb 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -27,7 +27,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 goto_eq SlateportCity_BattleTentCorridor_EventScript_208EEE setvar VAR_TEMP_0, 1 applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 - applymovement 255, SlateportCity_BattleTentCorridor_Movement_209059 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_209059 waitmovement 0 compare VAR_0x8006, 2 goto_eq SlateportCity_BattleTentCorridor_EventScript_209044 @@ -49,7 +49,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 opendoor 2, 1 waitdooranim applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068 - applymovement 255, SlateportCity_BattleTentCorridor_Movement_20905E + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_20905E waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 8e5c81e12..84349a97f 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -182,12 +182,12 @@ SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9 applymovement 1, SlateportCity_BattleTentLobby_Movement_2089F8 - applymovement 255, SlateportCity_BattleTentLobby_Movement_2089FF + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_2089FF waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, SlateportCity_BattleTentLobby_Movement_2089FC - applymovement 255, SlateportCity_BattleTentLobby_Movement_208A03 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_208A03 waitmovement 0 closedoor 6, 1 waitdooranim diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index efc0ff565..60b78542a 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -43,7 +43,7 @@ SlateportCity_Harbor_EventScript_20C9D3:: @ 820C9D3 SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF lockall setvar VAR_0x8008, 3 - applymovement 255, SlateportCity_Harbor_Movement_20CAEF + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CAEF waitmovement 0 goto SlateportCity_Harbor_EventScript_20C9F5 end @@ -52,7 +52,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 applymovement 7, SlateportCity_Harbor_Movement_2725AA waitmovement 0 applymovement 6, SlateportCity_Harbor_Movement_2725AA - applymovement 255, SlateportCity_Harbor_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage @@ -86,21 +86,21 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 applymovement 4, SlateportCity_Harbor_Movement_20CAE0 waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725AA waitmovement 0 return SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_20CAE6 waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 waitmovement 0 return SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_20CAEB waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 waitmovement 0 return @@ -249,12 +249,12 @@ SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D end SlateportCity_Harbor_EventScript_20CC37:: @ 820CC37 - applymovement 255, SlateportCity_Harbor_Movement_20CC4D + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CC4D waitmovement 0 return SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42 - applymovement 255, SlateportCity_Harbor_Movement_20CC50 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CC50 waitmovement 0 return diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 3c777b184..ceca80c47 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -7,14 +7,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F lockall - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A4 waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 lockall - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A8 waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end @@ -28,7 +28,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 hidemoneybox nop nop - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B waitmovement 0 releaseall end @@ -57,7 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 hidemoneybox nop nop - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B waitmovement 0 releaseall end @@ -178,7 +178,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 end SlateportCity_OceanicMuseum_1F_EventScript_20AF6C:: @ 820AF6C - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFBF + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AFBF applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFCE waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA @@ -191,7 +191,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AF83:: @ 820AF83 end SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93 - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFC4 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AFC4 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7 waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 040a76396..016b21f14 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 fadescreen 0 delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A8 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, 269 @@ -96,7 +96,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C return SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A4 waitmovement 0 return @@ -106,12 +106,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D return SlateportCity_OceanicMuseum_2F_EventScript_20BCA8:: @ 820BCA8 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCBE + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_20BCBE waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCC2 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_20BCC2 waitmovement 0 return diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index de6ca59db..1b16ba339 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -212,10 +212,10 @@ SootopolisCity_EventScript_1E5926:: @ 81E5926 SootopolisCity_EventScript_1E5946:: @ 81E5946 delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5A68 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A68 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject delay 60 fadescreenspeed 1, 8 setweather 15 @@ -269,12 +269,12 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 waitmovement 0 - special SpawnScriptEventObject + special SpawnCameraObject applymovement 10, SootopolisCity_Movement_1E5BD6 applymovement 9, SootopolisCity_Movement_1E5BF7 - applymovement 127, SootopolisCity_Movement_1E5A75 + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A75 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject setvar VAR_0x405E, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall @@ -312,10 +312,10 @@ SootopolisCity_Movement_1E5A75: @ 81E5A75 SootopolisCity_EventScript_1E5A82:: @ 81E5A82 delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5BA4 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BA4 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject delay 60 fadescreenspeed 1, 8 setweather 15 @@ -369,12 +369,12 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 waitmovement 0 - special SpawnScriptEventObject + special SpawnCameraObject applymovement 10, SootopolisCity_Movement_1E5BD6 applymovement 9, SootopolisCity_Movement_1E5BF7 - applymovement 127, SootopolisCity_Movement_1E5BAE + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BAE waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject setvar VAR_0x405E, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall @@ -502,10 +502,10 @@ SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5A68 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A68 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject delay 60 fadescreenspeed 1, 8 call SootopolisCity_EventScript_1E5D82 @@ -516,8 +516,8 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E special sub_813B7D8 waitstate playse SE_T_KAMI - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5E63 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63 waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 @@ -555,10 +555,10 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5BA4 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BA4 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject delay 60 fadescreenspeed 1, 8 call SootopolisCity_EventScript_1E5D82 @@ -568,9 +568,9 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE setvar VAR_0x8004, 1 special sub_813B7D8 waitstate - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5E63 - applymovement 255, SootopolisCity_Movement_1E5E68 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E5E68 waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 @@ -974,18 +974,18 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT closemessage applymovement 7, SootopolisCity_Movement_1E62D4 - applymovement 255, SootopolisCity_Movement_1E630E + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E630E waitmovement 0 delay 120 applymovement 1, SootopolisCity_Movement_1E6341 waitmovement 0 applymovement 7, SootopolisCity_Movement_1E6344 - applymovement 255, SootopolisCity_Movement_1E634F + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E634F waitmovement 0 msgbox SootopolisCity_Text_1E77F0, MSGBOX_DEFAULT closemessage setflag FLAG_0x133 - applymovement 255, SootopolisCity_Movement_1E635A + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E635A waitmovement 0 warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 waitstate @@ -993,13 +993,13 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC SootopolisCity_EventScript_1E6243:: @ 81E6243 applymovement 7, SootopolisCity_Movement_1E6267 - applymovement 255, SootopolisCity_Movement_1E628C + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E628C waitmovement 0 return SootopolisCity_EventScript_1E6255:: @ 81E6255 applymovement 7, SootopolisCity_Movement_1E6267 - applymovement 255, SootopolisCity_Movement_1E62B0 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E62B0 waitmovement 0 return diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 570f936b5..844b3c8b3 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -73,7 +73,7 @@ SootopolisCity_Gym_1F_EventScript_224F15:: @ 8224F15 SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 lockall delay 20 - applymovement 255, SootopolisCity_Gym_1F_Movement_224F42 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_224F42 waitmovement 0 playse SE_RU_HYUU delay 60 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index a2073d3f7..fafcaa05d 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -32,12 +32,12 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 lockall - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F waitmovement 0 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 waitmovement 0 moveobjectoffscreen 1 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 waitmovement 0 compare VAR_0x40C0, 1 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 @@ -135,19 +135,19 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE:: @ 8227AFE applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B34 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B34 waitmovement 0 return SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10:: @ 8227B10 applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B43 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B38 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B38 waitmovement 0 return SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22 applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C waitmovement 0 return diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 9a6b4b1b3..452f2e15c 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -13,7 +13,7 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 lockall - applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 waitmovement 0 special CopyEReaderTrainerGreeting msgbox gStringVar4, MSGBOX_DEFAULT @@ -30,7 +30,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8 closemessage special HealPlayerParty - applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 12d27a61f..d041c3ea3 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -31,12 +31,12 @@ SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17 end BattleFrontier_OutsideWest_EventScript_242A21:: @ 8242A21 - applymovement 255, BattleFrontier_OutsideWest_Movement_242A37 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_OutsideWest_Movement_242A37 waitmovement 0 return BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C - applymovement 255, BattleFrontier_OutsideWest_Movement_242A39 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_OutsideWest_Movement_242A39 waitmovement 0 return diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index b21fdecab..ff1425196 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -66,8 +66,8 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 goto_if 0, SouthernIsland_Interior_EventScript_242B9A setflag FLAG_0x0CE setflag FLAG_TEMP_2 - special SpawnScriptEventObject - applymovement 127, SouthernIsland_Interior_Movement_242BCA + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_242BCA waitmovement 0 delay 50 waitse @@ -76,11 +76,11 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 waitmoncry addobject 2 delay 30 - applymovement 127, SouthernIsland_Interior_Movement_242BCE + applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_242BCE applymovement 2, SouthernIsland_Interior_Movement_242BDA waitmovement 0 delay 50 - special RemoveScriptEventObject + special RemoveCameraObject setvar VAR_LAST_TALKED, 2 compare VAR_0x40D5, 0 call_if 1, SouthernIsland_Interior_EventScript_242BA4 diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index b23cc23f1..4e5580719 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -27,7 +27,7 @@ TerraCave_End_EventScript_23B0E3:: @ 823B0E3 TerraCave_End_EventScript_23B0EC:: @ 823B0EC lockall - applymovement 255, TerraCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, TerraCave_End_Movement_2725B2 waitmovement 0 applymovement 1, TerraCave_End_Movement_23B16E waitmovement 0 diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index e9117efe2..c4e3afbdb 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -10,7 +10,7 @@ TrainerHill_Elevator_EventScript_26935F:: @ 826935F end TrainerHill_Elevator_EventScript_269360:: @ 8269360 - applymovement 255, TrainerHill_Elevator_Movement_2693EB + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693EB waitmovement 0 releaseall warp MAP_TRAINER_HILL_ROOF, 255, 15, 5 @@ -18,7 +18,7 @@ TrainerHill_Elevator_EventScript_269360:: @ 8269360 end TrainerHill_Elevator_EventScript_269375:: @ 8269375 - applymovement 255, TrainerHill_Elevator_Movement_2693E4 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693E4 waitmovement 0 applymovement 1, TrainerHill_Elevator_Movement_2693EE waitmovement 0 @@ -29,11 +29,11 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 releaseall applymovement 1, TrainerHill_Elevator_Movement_2693F0 waitmovement 0 - applymovement 255, TrainerHill_Elevator_Movement_2693DF + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693DF waitmovement 0 call TrainerHill_Elevator_EventScript_2693D9 delay 25 - applymovement 255, TrainerHill_Elevator_Movement_2693E7 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693E7 waitmovement 0 warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8 waitstate diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index c75c22be2..d86caad9c 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -23,7 +23,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_2680FF setobjectxy 255, 9, 6 - applymovement 255, TrainerHill_Entrance_Movement_26837F + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F end TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF @@ -31,7 +31,7 @@ TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF special sp194_trainer_tower compare VAR_RESULT, 1 goto_eq TrainerHill_Entrance_EventScript_26811A - applymovement 255, TrainerHill_Entrance_Movement_26837F + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F end TrainerHill_Entrance_EventScript_26811A:: @ 826811A @@ -62,7 +62,7 @@ TrainerHill_Entrance_MapScript2_26813E: @ 826813E TrainerHill_Entrance_EventScript_268160:: @ 8268160 lockall - applymovement 255, TrainerHill_Entrance_Movement_268385 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268385 waitmovement 0 setmetatile 17, 10, 820, 1 special DrawWholeMapView @@ -83,18 +83,18 @@ TrainerHill_Entrance_EventScript_268182:: @ 8268182 TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5 lockall - applymovement 255, TrainerHill_Entrance_Movement_26837F + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F msgbox TrainerHill_Entrance_Text_268689, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_2681DA TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA lockall - applymovement 255, TrainerHill_Entrance_Movement_26837F + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA closemessage - applymovement 255, TrainerHill_Entrance_Movement_268381 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381 waitmovement 0 setvar VAR_0x40D6, 0 special HealPlayerParty @@ -130,7 +130,7 @@ TrainerHill_Entrance_EventScript_268227:: @ 8268227 TrainerHill_Entrance_EventScript_268229:: @ 8268229 lockall - applymovement 255, TrainerHill_Entrance_Movement_26837F + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F checkflag FLAG_SYS_GAME_CLEAR goto_if 0, TrainerHill_Entrance_EventScript_26836A msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT @@ -185,7 +185,7 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314 setvar VAR_TEMP_5, 0 msgbox TrainerHill_Entrance_Text_26866F, MSGBOX_DEFAULT closemessage - applymovement 255, TrainerHill_Entrance_Movement_268381 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381 waitmovement 0 releaseall end @@ -211,7 +211,7 @@ TrainerHill_Entrance_EventScript_26835C:: @ 826835C TrainerHill_Entrance_EventScript_26836A:: @ 826836A msgbox TrainerHill_Entrance_Text_268430, MSGBOX_DEFAULT closemessage - applymovement 255, TrainerHill_Entrance_Movement_268381 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381 waitmovement 0 releaseall end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 93b7802be..5e07864e4 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -157,7 +157,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 setvar VAR_TEMP_1, 1 - applymovement 255, VerdanturfTown_BattleTentBattleRoom_Movement_202573 + applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_202573 removeobject 2 end diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc index ef577c7f1..e5d7e45e9 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -10,12 +10,12 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A lockall setvar VAR_TEMP_0, 1 applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE - applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020DE + applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020DE waitmovement 0 opendoor 2, 1 waitdooranim applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020E4 - applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020E3 + applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020E3 waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index ec7ecfb1a..81726eda9 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -246,12 +246,12 @@ VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41 applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A70 - applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A70 + applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A70 waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A74 - applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A77 + applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A77 waitmovement 0 closedoor 6, 1 waitdooranim diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 5b3dabbc9..45f6d9d78 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 end VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 - applymovement 255, VictoryRoad_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, VictoryRoad_1F_Movement_2725AA waitmovement 0 msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC diff --git a/data/party_menu.s b/data/party_menu.s index e271b7804..fd1bd7948 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -69,11 +69,11 @@ gUnknown_086156B8:: @ 86156B8 .align 2 gUnknown_086156C4:: @ 86156C4 - .4byte sub_81B2658, 0x0d280b18, 0x08201420, 0x08081440, 0x08182526, 0x08182535, 0x03302318, 0x1040220c + .4byte BlitBitmapToPartyWindow_Default1, 0x0d280b18, 0x08201420, 0x08081440, 0x08182526, 0x08182535, 0x03302318, 0x1040220c .align 2 gUnknown_086156E4:: @ 86156E4 - .4byte sub_81B26BC, 0x0d280316, 0x08200c1e, 0x08080c3e, 0x08180c66, 0x08180c75, 0x03300a58, 0x1040044d + .4byte BlitBitmapToPartyWindow_Default2, 0x0d280316, 0x08200c1e, 0x08080c3e, 0x08180c66, 0x08180c75, 0x03300a58, 0x1040044d .align 2 gUnknown_08615704:: @ 8615704 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f77017830..44116d088 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -237,7 +237,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 waitmovement 0 @@ -258,7 +258,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF setvar VAR_0x4087, 0 compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 @@ -278,7 +278,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 special CloseLink setvar VAR_0x4087, 0 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B @@ -302,7 +302,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 setvar VAR_0x4087, 0 compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 @@ -316,24 +316,24 @@ OldaleTown_PokemonCenter_2F_EventScript_276DAE:: @ 8276DAE delay 60 message OldaleTown_PokemonCenter_2F_Text_27854C waitmessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 waitmovement 0 return OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 return OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 lockall - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_2725A6 waitmovement 0 msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_276E10 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_276E10 waitmovement 0 delay 30 msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT @@ -462,11 +462,11 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 @@ -481,7 +481,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD end OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B - applymovement 255, Movement_277352 + applymovement EVENT_OBJ_ID_PLAYER, Movement_277352 waitmovement 0 return @@ -566,11 +566,11 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 @@ -641,11 +641,11 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 @@ -1040,11 +1040,11 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F delay 60 applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 waitmovement 0 opendoor 5, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 hideobjectat 255, MAP_PETALBURG_CITY closedoor 5, 1 @@ -1379,11 +1379,11 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 hideobjectat 255, MAP_PETALBURG_CITY closedoor 9, 1 @@ -1593,7 +1593,7 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_27734D waitmovement 0 closemessage - applymovement 255, MossdeepCity_GameCorner_1F_Movement_277360 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_277360 waitmovement 0 hideobjectat 255, MAP_PETALBURG_CITY release diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 81ea87871..f22468500 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -15,19 +15,19 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT closemessage setvar VAR_0x4092, 4 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292763 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 return @@ -40,7 +40,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AF0 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 waitmovement 0 releaseall end @@ -83,7 +83,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -96,7 +96,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A4 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -158,17 +158,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2725A8 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29294B - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE0 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0 waitmovement 0 playbgm MUS_INTER_V, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29296C - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -183,17 +183,17 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2725A4 waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29294B - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AE8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8 waitmovement 0 playbgm MUS_INTER_V, 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AEE + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29296C - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -217,7 +217,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A6 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT fadedefaultbgm @@ -565,38 +565,38 @@ LittlerootTown_BrendansHouse_1F_EventScript_292CC1:: @ 8292CC1 return LittlerootTown_BrendansHouse_1F_EventScript_292CD6:: @ 8292CD6 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DCC + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DBC waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292CEF:: @ 8292CEF - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DCC + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DC1 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D08:: @ 8292D08 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DC6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DC6 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DD1 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD1 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DD7 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7 waitmovement 0 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DDE + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE waitmovement 0 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A8 waitmovement 0 @@ -605,14 +605,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 waitmovement 0 return @@ -629,14 +629,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 return diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 35a2731a7..b3f567d0a 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -442,7 +442,7 @@ EventScript_275B5B:: @ 8275B5B end SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 - applymovement 255, SecretBase_RedCave1_Movement_275BB4 + applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4 waitmovement 0 setvar VAR_0x4097, 1 msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO diff --git a/data/specials.inc b/data/specials.inc index 050df4dde..3ae1a14f8 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -286,8 +286,8 @@ gSpecials:: @ 81DBA64 def_special GameClear def_special ShakeScreenInElevator def_special nullsub_55 - def_special SpawnScriptEventObject - def_special RemoveScriptEventObject + def_special SpawnCameraObject + def_special RemoveCameraObject def_special GetPokeblockNameByMonNature def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord |